Skip to content

W
wine-cw
Commit 4a5a3ba7 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

kernel32: Move some more console functions to kernelbase.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 5d09d6d4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 76 additions and 378 deletions
dlls/api-ms-win-core-console-l3-2-0/api-ms-win-core-console-l3-2-0.spec
View file @ 4a5a3ba7
@ stdcall AddConsoleAliasA(str str str) kernel32.AddConsoleAliasA
@ stdcall AddConsoleAliasW(wstr wstr wstr) kernel32.AddConsoleAliasW
@ stdcall ExpungeConsoleCommandHistoryA(str) kernel32.ExpungeConsoleCommandHistoryA
@ stdcall ExpungeConsoleCommandHistoryW(wstr) kernel32.ExpungeConsoleCommandHistoryW
@ stub GetConsoleAliasA
@ stdcall AddConsoleAliasA(str str str) kernelbase.AddConsoleAliasA
@ stdcall AddConsoleAliasW(wstr wstr wstr) kernelbase.AddConsoleAliasW
@ stdcall ExpungeConsoleCommandHistoryA(str) kernelbase.ExpungeConsoleCommandHistoryA
@ stdcall ExpungeConsoleCommandHistoryW(wstr) kernelbase.ExpungeConsoleCommandHistoryW
@ stdcall GetConsoleAliasA(str ptr long str) kernelbase.GetConsoleAliasA
@ stub GetConsoleAliasExesA
@ stdcall GetConsoleAliasExesLengthA() kernel32.GetConsoleAliasExesLengthA
@ stdcall GetConsoleAliasExesLengthW() kernel32.GetConsoleAliasExesLengthW
@ stdcall GetConsoleAliasExesLengthA() kernelbase.GetConsoleAliasExesLengthA
@ stdcall GetConsoleAliasExesLengthW() kernelbase.GetConsoleAliasExesLengthW
@ stub GetConsoleAliasExesW
@ stdcall GetConsoleAliasW(wstr ptr long wstr) kernel32.GetConsoleAliasW
@ stdcall GetConsoleAliasW(wstr ptr long wstr) kernelbase.GetConsoleAliasW
@ stub GetConsoleAliasesA
@ stdcall GetConsoleAliasesLengthA(str) kernel32.GetConsoleAliasesLengthA
@ stdcall GetConsoleAliasesLengthW(wstr) kernel32.GetConsoleAliasesLengthW
@ stdcall GetConsoleAliasesLengthA(str) kernelbase.GetConsoleAliasesLengthA
@ stdcall GetConsoleAliasesLengthW(wstr) kernelbase.GetConsoleAliasesLengthW
@ stub GetConsoleAliasesW
@ stdcall GetConsoleCommandHistoryA(long long long) kernel32.GetConsoleCommandHistoryA
@ stdcall GetConsoleCommandHistoryLengthA(str) kernel32.GetConsoleCommandHistoryLengthA
@ stdcall GetConsoleCommandHistoryLengthW(wstr) kernel32.GetConsoleCommandHistoryLengthW
@ stdcall GetConsoleCommandHistoryW(long long long) kernel32.GetConsoleCommandHistoryW
@ stdcall GetConsoleDisplayMode(ptr) kernel32.GetConsoleDisplayMode
@ stdcall GetConsoleFontSize(long long) kernel32.GetConsoleFontSize
@ stdcall GetConsoleCommandHistoryA(ptr long str) kernelbase.GetConsoleCommandHistoryA
@ stdcall GetConsoleCommandHistoryLengthA(str) kernelbase.GetConsoleCommandHistoryLengthA
@ stdcall GetConsoleCommandHistoryLengthW(wstr) kernelbase.GetConsoleCommandHistoryLengthW
@ stdcall GetConsoleCommandHistoryW(ptr long wstr) kernelbase.GetConsoleCommandHistoryW
@ stdcall GetConsoleDisplayMode(ptr) kernelbase.GetConsoleDisplayMode
@ stdcall GetConsoleFontSize(long long) kernelbase.GetConsoleFontSize
@ stub GetConsoleHistoryInfo
@ stdcall GetConsoleProcessList(ptr long) kernel32.GetConsoleProcessList
@ stdcall GetConsoleProcessList(ptr long) kernelbase.GetConsoleProcessList
@ stub GetConsoleSelectionInfo
@ stdcall GetConsoleWindow() kernel32.GetConsoleWindow
@ stdcall GetCurrentConsoleFont(long long ptr) kernel32.GetCurrentConsoleFont
@ stdcall GetCurrentConsoleFontEx(long long ptr) kernel32.GetCurrentConsoleFontEx
@ stdcall GetNumberOfConsoleMouseButtons(ptr) kernel32.GetNumberOfConsoleMouseButtons
@ stdcall SetConsoleDisplayMode(long long ptr) kernel32.SetConsoleDisplayMode
@ stdcall GetConsoleWindow() kernelbase.GetConsoleWindow
@ stdcall GetCurrentConsoleFont(long long ptr) kernelbase.GetCurrentConsoleFont
@ stdcall GetCurrentConsoleFontEx(long long ptr) kernelbase.GetCurrentConsoleFontEx
@ stdcall GetNumberOfConsoleMouseButtons(ptr) kernelbase.GetNumberOfConsoleMouseButtons
@ stdcall SetConsoleDisplayMode(long long ptr) kernelbase.SetConsoleDisplayMode
@ stub SetConsoleHistoryInfo
@ stub SetConsoleNumberOfCommandsA
@ stub SetConsoleNumberOfCommandsW
@ stdcall SetCurrentConsoleFontEx(long long ptr) kernel32.SetCurrentConsoleFontEx
@ stdcall SetCurrentConsoleFontEx(long long ptr) kernelbase.SetCurrentConsoleFontEx
dlls/kernel32/kernel32.spec
View file @ 4a5a3ba7
......@@ -138,8 +138,8 @@
@ stdcall -import ActivateActCtx(ptr ptr)
@ stdcall AddAtomA(str)
@ stdcall AddAtomW(wstr)
@ stdcall AddConsoleAliasA(str str str)
@ stdcall AddConsoleAliasW(wstr wstr wstr)
@ stdcall -import AddConsoleAliasA(str str str)
@ stdcall -import AddConsoleAliasW(wstr wstr wstr)
@ stdcall -import AddDllDirectory(wstr)
# @ stub AddIntegrityLabelToBoundaryDescriptor
# @ stub AddLocalAlternateComputerNameA
......@@ -443,8 +443,8 @@
@ stub ExitVDM
@ stdcall -import ExpandEnvironmentStringsA(str ptr long)
@ stdcall -import ExpandEnvironmentStringsW(wstr ptr long)
@ stdcall ExpungeConsoleCommandHistoryA(str)
@ stdcall ExpungeConsoleCommandHistoryW(wstr)
@ stdcall -import ExpungeConsoleCommandHistoryA(str)
@ stdcall -import ExpungeConsoleCommandHistoryW(wstr)
@ stub ExtendVirtualBuffer
@ stdcall -i386 -private -norelay FT_Exit0() krnl386.exe16.FT_Exit0
@ stdcall -i386 -private -norelay FT_Exit12() krnl386.exe16.FT_Exit12
......@@ -580,27 +580,27 @@
@ stdcall GetComputerNameExA(long ptr ptr)
@ stdcall -import GetComputerNameExW(long ptr ptr)
@ stdcall GetComputerNameW(ptr ptr)
@ stub GetConsoleAliasA
@ stdcall -import GetConsoleAliasA(str ptr long str)
@ stub GetConsoleAliasExesA
@ stdcall GetConsoleAliasExesLengthA()
@ stdcall GetConsoleAliasExesLengthW()
@ stdcall -import GetConsoleAliasExesLengthA()
@ stdcall -import GetConsoleAliasExesLengthW()
@ stub GetConsoleAliasExesW
@ stdcall GetConsoleAliasW(wstr ptr long wstr)
@ stdcall -import GetConsoleAliasW(wstr ptr long wstr)
@ stub GetConsoleAliasesA
@ stdcall GetConsoleAliasesLengthA(str)
@ stdcall GetConsoleAliasesLengthW(wstr)
@ stdcall -import GetConsoleAliasesLengthA(str)
@ stdcall -import GetConsoleAliasesLengthW(wstr)
@ stub GetConsoleAliasesW
@ stdcall -import GetConsoleCP()
@ stub GetConsoleCharType
@ stdcall GetConsoleCommandHistoryA(long long long)
@ stdcall GetConsoleCommandHistoryLengthA(str)
@ stdcall GetConsoleCommandHistoryLengthW(wstr)
@ stdcall GetConsoleCommandHistoryW(long long long)
@ stdcall -import GetConsoleCommandHistoryA(ptr long str)
@ stdcall -import GetConsoleCommandHistoryLengthA(str)
@ stdcall -import GetConsoleCommandHistoryLengthW(wstr)
@ stdcall -import GetConsoleCommandHistoryW(ptr long wstr)
@ stdcall -import GetConsoleCursorInfo(long ptr)
@ stub GetConsoleCursorMode
@ stdcall GetConsoleDisplayMode(ptr)
@ stdcall -import GetConsoleDisplayMode(ptr)
@ stdcall GetConsoleFontInfo(ptr long long ptr)
@ stdcall GetConsoleFontSize(long long)
@ stdcall -import GetConsoleFontSize(long long)
@ stub GetConsoleHardwareState
# @ stub GetConsoleHistoryInfo
@ stdcall -import GetConsoleInputExeNameA(long ptr)
......@@ -613,19 +613,19 @@
# @ stub GetConsoleOriginalTitleA
# @ stub GetConsoleOriginalTitleW
@ stdcall -import GetConsoleOutputCP()
@ stdcall GetConsoleProcessList(ptr long)
@ stdcall -import GetConsoleProcessList(ptr long)
@ stdcall -import GetConsoleScreenBufferInfo(long ptr)
@ stdcall -import GetConsoleScreenBufferInfoEx(long ptr)
# @ stub GetConsoleSelectionInfo
@ stdcall GetConsoleTitleA(ptr long)
@ stdcall -import GetConsoleTitleA(ptr long)
@ stdcall -import GetConsoleTitleW(ptr long)
@ stdcall GetConsoleWindow()
@ stdcall -import GetConsoleWindow()
@ stdcall GetCurrencyFormatA(long long str ptr ptr long)
@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long)
@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long)
@ stdcall -import GetCurrentActCtx(ptr)
@ stdcall GetCurrentConsoleFont(long long ptr)
@ stdcall GetCurrentConsoleFontEx(long long ptr)
@ stdcall -import GetCurrentConsoleFont(long long ptr)
@ stdcall -import GetCurrentConsoleFontEx(long long ptr)
@ stdcall -import GetCurrentDirectoryA(long ptr)
@ stdcall -import GetCurrentDirectoryW(long ptr)
@ stdcall GetCurrentPackageFamilyName(ptr ptr) kernelbase.GetCurrentPackageFamilyName
......@@ -760,7 +760,7 @@
@ stdcall GetNumberFormatW(long long wstr ptr ptr long)
@ stdcall GetNumberOfConsoleFonts()
@ stdcall -import GetNumberOfConsoleInputEvents(long ptr)
@ stdcall GetNumberOfConsoleMouseButtons(ptr)
@ stdcall -import GetNumberOfConsoleMouseButtons(ptr)
@ stdcall -import GetOEMCP()
@ stdcall -import GetOverlappedResult(long ptr ptr long)
@ stdcall -import GetOverlappedResultEx(long ptr ptr long long)
......@@ -1366,7 +1366,7 @@
@ stdcall -import SetConsoleCursorInfo(long ptr)
@ stub SetConsoleCursorMode
@ stdcall -import SetConsoleCursorPosition(long long)
@ stdcall SetConsoleDisplayMode(long long ptr)
@ stdcall -import SetConsoleDisplayMode(long long ptr)
@ stdcall SetConsoleFont(long long)
@ stub SetConsoleHardwareState
@ stdcall SetConsoleIcon(ptr)
......@@ -1386,7 +1386,7 @@
@ stdcall -import SetConsoleScreenBufferInfoEx(long ptr)
@ stdcall -import SetConsoleScreenBufferSize(long long)
@ stdcall -import SetConsoleTextAttribute(long long)
@ stdcall SetConsoleTitleA(str)
@ stdcall -import SetConsoleTitleA(str)
@ stdcall -import SetConsoleTitleW(wstr)
@ stdcall -import SetConsoleWindowInfo(long long ptr)
@ stdcall SetCriticalSectionSpinCount(ptr long) NTDLL.RtlSetCriticalSectionSpinCount
......
dlls/kernelbase/kernelbase.spec
View file @ 4a5a3ba7
......@@ -19,6 +19,8 @@
@ stdcall AddAuditAccessAce(ptr long long ptr long long)
@ stdcall AddAuditAccessAceEx(ptr long long long ptr long long)
@ stdcall AddAuditAccessObjectAce(ptr long long long ptr ptr ptr long long)
@ stdcall AddConsoleAliasA(str str str)
@ stdcall AddConsoleAliasW(wstr wstr wstr)
@ stdcall AddDllDirectory(wstr)
@ stdcall AddMandatoryAce(ptr long long long ptr)
@ stdcall AddRefActCtx(ptr)
......@@ -343,6 +345,8 @@
@ stdcall ExitThread(long) ntdll.RtlExitUserThread
@ stdcall ExpandEnvironmentStringsA(str ptr long)
@ stdcall ExpandEnvironmentStringsW(wstr ptr long)
@ stdcall ExpungeConsoleCommandHistoryA(str)
@ stdcall ExpungeConsoleCommandHistoryW(wstr)
@ stdcall FatalAppExitA(long str)
@ stdcall FatalAppExitW(long wstr)
@ stdcall FileTimeToLocalFileTime(ptr ptr)
......@@ -441,19 +445,40 @@
@ stdcall GetCompressedFileSizeW(wstr ptr)
@ stdcall GetComputerNameExA(long ptr ptr)
@ stdcall GetComputerNameExW(long ptr ptr)
@ stdcall GetConsoleAliasA(str ptr long str)
#@ stub GetConsoleAliasExesA
@ stdcall GetConsoleAliasExesLengthA()
@ stdcall GetConsoleAliasExesLengthW()
#@ stub GetConsoleAliasExesW
@ stdcall GetConsoleAliasW(wstr ptr long wstr)
#@ stub GetConsoleAliasesA
@ stdcall GetConsoleAliasesLengthA(str)
@ stdcall GetConsoleAliasesLengthW(wstr)
#@ stub GetConsoleAliasesW
@ stdcall GetConsoleCP()
@ stdcall GetConsoleCommandHistoryA(ptr long str)
@ stdcall GetConsoleCommandHistoryLengthA(str)
@ stdcall GetConsoleCommandHistoryLengthW(wstr)
@ stdcall GetConsoleCommandHistoryW(ptr long wstr)
@ stdcall GetConsoleCursorInfo(long ptr)
@ stdcall GetConsoleDisplayMode(ptr)
@ stdcall GetConsoleFontSize(long long)
@ stdcall GetConsoleInputExeNameA(long ptr)
@ stdcall GetConsoleInputExeNameW(long ptr)
@ stdcall GetConsoleMode(long ptr)
@ stdcall GetConsoleOutputCP()
@ stdcall GetConsoleProcessList(ptr long)
@ stdcall GetConsoleScreenBufferInfo(long ptr)
@ stdcall GetConsoleScreenBufferInfoEx(long ptr)
@ stdcall GetConsoleTitleA(ptr long)
@ stdcall GetConsoleTitleW(ptr long)
@ stdcall GetConsoleWindow()
@ stdcall GetCurrencyFormatEx(wstr long wstr ptr ptr long) kernel32.GetCurrencyFormatEx
@ stdcall GetCurrencyFormatW(long long wstr ptr ptr long) kernel32.GetCurrencyFormatW
@ stdcall GetCurrentActCtx(ptr)
# @ stub GetCurrentApplicationUserModelId
@ stdcall GetCurrentConsoleFont(long long ptr)
@ stdcall GetCurrentConsoleFontEx(long long ptr)
@ stdcall GetCurrentDirectoryA(long ptr)
@ stdcall GetCurrentDirectoryW(long ptr)
# @ stub GetCurrentPackageApplicationContext
......@@ -582,6 +607,7 @@
@ stdcall GetNumberFormatEx(wstr long wstr ptr ptr long) kernel32.GetNumberFormatEx
@ stdcall GetNumberFormatW(long long wstr ptr ptr long) kernel32.GetNumberFormatW
@ stdcall GetNumberOfConsoleInputEvents(long ptr)
@ stdcall GetNumberOfConsoleMouseButtons(ptr)
@ stdcall GetOEMCP()
# @ stub GetOsManufacturingMode
# @ stub GetOsSafeBootMode
......@@ -1412,6 +1438,7 @@
@ stdcall SetConsoleCtrlHandler(ptr long)
@ stdcall SetConsoleCursorInfo(long ptr)
@ stdcall SetConsoleCursorPosition(long long)
@ stdcall SetConsoleDisplayMode(long long ptr)
@ stdcall SetConsoleInputExeNameA(str)
@ stdcall SetConsoleInputExeNameW(wstr)
@ stdcall SetConsoleMode(long long)
......@@ -1419,6 +1446,7 @@
@ stdcall SetConsoleScreenBufferInfoEx(long ptr)
@ stdcall SetConsoleScreenBufferSize(long long)
@ stdcall SetConsoleTextAttribute(long long)
@ stdcall SetConsoleTitleA(str)
@ stdcall SetConsoleTitleW(wstr)
@ stdcall SetConsoleWindowInfo(long long ptr)
@ stdcall SetCriticalSectionSpinCount(ptr long) ntdll.RtlSetCriticalSectionSpinCount
......
tools/make_specfiles
View file @ 4a5a3ba7
......@@ -214,6 +214,7 @@ my @dll_groups =
"api-ms-win-core-console-l1-1-0",
"api-ms-win-core-console-l1-2-0",
"api-ms-win-core-console-l2-1-0",
"api-ms-win-core-console-l3-2-0",
"api-ms-win-core-datetime-l1-1-0",
"api-ms-win-core-datetime-l1-1-1",
"api-ms-win-core-debug-l1-1-0",
......@@ -333,7 +334,6 @@ my @dll_groups =
[
"kernel32",
"api-ms-win-core-appinit-l1-1-0",
"api-ms-win-core-console-l3-2-0",
"api-ms-win-core-heap-obsolete-l1-1-0",
"api-ms-win-core-io-l1-1-0",
"api-ms-win-core-io-l1-1-1",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment