[KERNEL32]

- Mark almost all of the exported console APIs hotpatchable (normally on windows 2k3, all the exports of kernel32 are hotpatchable...)
- Version check mismatch is not a ReactOS error by itself so adjust the DPRINT a bit.

svn path=/trunk/; revision=65169

diff --git a/reactos/dll/win32/kernel32/client/console/alias.c b/reactos/dll/win32/kernel32/client/console/alias.c
index a949c75..cb05c89 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/alias.c
+++ b/reactos/dll/win32/kernel32/client/console/alias.c
@@ -116,6 +116,7 @@ IntAddConsoleAlias(LPCVOID Source,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 AddConsoleAliasW(LPCWSTR lpSource,
                  LPCWSTR lpTarget,
                  LPCWSTR lpExeName)
@@ -140,6 +141,7 @@ AddConsoleAliasW(LPCWSTR lpSource,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 AddConsoleAliasA(LPCSTR lpSource,
                  LPCSTR lpTarget,
                  LPCSTR lpExeName)
@@ -254,6 +256,7 @@ IntGetConsoleAlias(LPVOID Source,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasW(LPWSTR lpSource,
                  LPWSTR lpTargetBuffer,
                  DWORD TargetBufferLength,
@@ -276,6 +279,7 @@ GetConsoleAliasW(LPWSTR lpSource,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasA(LPSTR lpSource,
                  LPSTR lpTargetBuffer,
                  DWORD TargetBufferLength,
@@ -368,6 +372,7 @@ IntGetConsoleAliases(LPVOID  AliasBuffer,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasesW(LPWSTR AliasBuffer,
                    DWORD AliasBufferLength,
                    LPWSTR ExeName)
@@ -387,6 +392,7 @@ GetConsoleAliasesW(LPWSTR AliasBuffer,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasesA(LPSTR AliasBuffer,
                    DWORD AliasBufferLength,
                    LPSTR ExeName)
@@ -456,6 +462,7 @@ IntGetConsoleAliasesLength(LPVOID lpExeName, BOOLEAN bUnicode)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasesLengthW(LPWSTR lpExeName)
 {
     return IntGetConsoleAliasesLength(lpExeName, TRUE);
@@ -467,6 +474,7 @@ GetConsoleAliasesLengthW(LPWSTR lpExeName)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasesLengthA(LPSTR lpExeName)
 {
     return IntGetConsoleAliasesLength(lpExeName, FALSE);
@@ -523,6 +531,7 @@ IntGetConsoleAliasExes(PVOID lpExeNameBuffer,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasExesW(LPWSTR lpExeNameBuffer,
                      DWORD ExeNameBufferLength)
 {
@@ -536,6 +545,7 @@ GetConsoleAliasExesW(LPWSTR lpExeNameBuffer,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasExesA(LPSTR lpExeNameBuffer,
                      DWORD ExeNameBufferLength)
 {
@@ -572,6 +582,7 @@ IntGetConsoleAliasExesLength(BOOLEAN bUnicode)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasExesLengthW(VOID)
 {
     DPRINT1("GetConsoleAliasExesLengthW called\n");
@@ -584,6 +595,7 @@ GetConsoleAliasExesLengthW(VOID)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleAliasExesLengthA(VOID)
 {
     DPRINT1("GetConsoleAliasExesLengthA called\n");

diff --git a/reactos/dll/win32/kernel32/client/console/console.c b/reactos/dll/win32/kernel32/client/console/console.c
index ee630cb..df6c02f 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/console.c
+++ b/reactos/dll/win32/kernel32/client/console/console.c
@@ -392,6 +392,7 @@ IntCheckForConsoleFileName(IN LPCWSTR pszName,
  */
 HMENU
 WINAPI
+DECLSPEC_HOTPATCH
 ConsoleMenuControl(HANDLE hConsoleOutput,
                    DWORD dwCmdIdLow,
                    DWORD dwCmdIdHigh)
@@ -419,6 +420,7 @@ ConsoleMenuControl(HANDLE hConsoleOutput,
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 DuplicateConsoleHandle(HANDLE hConsole,
                        DWORD dwDesiredAccess,
                        BOOL bInheritHandle,
@@ -571,6 +573,7 @@ GetConsoleFontInfo(HANDLE hConsoleOutput,
  */
 COORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleFontSize(HANDLE hConsoleOutput,
                    DWORD nFont)
 {
@@ -652,6 +655,7 @@ GetCurrentConsoleFont(HANDLE hConsoleOutput,
  */
 ULONG
 WINAPI
+DECLSPEC_HOTPATCH
 GetNumberOfConsoleFonts(VOID)
 {
     DPRINT1("GetNumberOfConsoleFonts() UNIMPLEMENTED!\n");
@@ -757,6 +761,7 @@ OpenConsoleW(LPCWSTR wsName,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCursor(HANDLE  hConsoleOutput,
                  HCURSOR hCursor)
 {
@@ -822,6 +827,7 @@ SetConsoleDisplayMode(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleFont(HANDLE hConsoleOutput,
                DWORD nFont)
 {
@@ -869,6 +875,7 @@ SetConsoleHardwareState(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleKeyShortcuts(DWORD Unknown0,
                        DWORD Unknown1,
                        DWORD Unknown2,
@@ -901,6 +908,7 @@ SetConsoleMaximumWindowSize(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleMenuClose(BOOL bEnable)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -930,6 +938,7 @@ SetConsoleMenuClose(BOOL bEnable)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsolePalette(HANDLE hConsoleOutput,
                   HPALETTE hPalette,
                   UINT dwUsage)
@@ -961,6 +970,7 @@ SetConsolePalette(HANDLE hConsoleOutput,
  */
 INT
 WINAPI
+DECLSPEC_HOTPATCH
 ShowConsoleCursor(HANDLE hConsoleOutput,
                   BOOL bShow)
 {
@@ -997,6 +1007,7 @@ ShowConsoleCursor(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 VerifyConsoleIoHandle(HANDLE hIoHandle)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1028,6 +1039,7 @@ VerifyConsoleIoHandle(HANDLE hIoHandle)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 CloseConsoleHandle(HANDLE hHandle)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1055,6 +1067,7 @@ CloseConsoleHandle(HANDLE hHandle)
  */
 HANDLE
 WINAPI
+DECLSPEC_HOTPATCH
 GetStdHandle(DWORD nStdHandle)
 /*
  * FUNCTION: Get a handle for the standard input, standard output
@@ -1097,6 +1110,7 @@ GetStdHandle(DWORD nStdHandle)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetStdHandle(DWORD  nStdHandle,
              HANDLE hHandle)
 /*
@@ -1249,6 +1263,7 @@ Quit:
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 AllocConsole(VOID)
 {
     BOOL Success;
@@ -1331,6 +1346,7 @@ Quit:
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 FreeConsole(VOID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1419,6 +1435,7 @@ GetConsoleScreenBufferInfo(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCursorPosition(HANDLE hConsoleOutput,
                          COORD dwCursorPosition)
 {
@@ -1484,6 +1501,7 @@ GetConsoleMode(HANDLE hConsoleHandle,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleMode(HANDLE hConsoleHandle,
                DWORD dwMode)
 {
@@ -1550,6 +1568,7 @@ GetNumberOfConsoleInputEvents(HANDLE hConsoleInput,
  */
 COORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetLargestConsoleWindowSize(HANDLE hConsoleOutput)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1675,6 +1694,7 @@ GetNumberOfConsoleMouseButtons(LPDWORD lpNumberOfMouseButtons)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1702,6 +1722,7 @@ SetConsoleActiveScreenBuffer(HANDLE hConsoleOutput)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 FlushConsoleInputBuffer(HANDLE hConsoleInput)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -1729,6 +1750,7 @@ FlushConsoleInputBuffer(HANDLE hConsoleInput)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleScreenBufferSize(HANDLE hConsoleOutput,
                            COORD dwSize)
 {
@@ -1802,6 +1824,7 @@ IntScrollConsoleScreenBuffer(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ScrollConsoleScreenBufferA(HANDLE hConsoleOutput,
                            CONST SMALL_RECT* lpScrollRectangle,
                            CONST SMALL_RECT* lpClipRectangle,
@@ -1822,6 +1845,7 @@ ScrollConsoleScreenBufferA(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ScrollConsoleScreenBufferW(HANDLE hConsoleOutput,
                            CONST SMALL_RECT *lpScrollRectangle,
                            CONST SMALL_RECT *lpClipRectangle,
@@ -1879,6 +1903,7 @@ SetConsoleWindowInfo(HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleTextAttribute(HANDLE hConsoleOutput,
                         WORD wAttributes)
 {
@@ -1979,6 +2004,7 @@ RemoveConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine,
                       BOOL Add)
 {
@@ -2004,6 +2030,7 @@ SetConsoleCtrlHandler(PHANDLER_ROUTINE HandlerRoutine,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GenerateConsoleCtrlEvent(DWORD dwCtrlEvent,
                          DWORD dwProcessGroupId)
 {
@@ -2093,6 +2120,7 @@ IntGetConsoleTitle(LPVOID lpConsoleTitle, DWORD dwNumChars, BOOLEAN bUnicode)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleTitleW(LPWSTR lpConsoleTitle,
                  DWORD nSize)
 {
@@ -2105,6 +2133,7 @@ GetConsoleTitleW(LPWSTR lpConsoleTitle,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleTitleA(LPSTR lpConsoleTitle,
                  DWORD nSize)
 {
@@ -2159,6 +2188,7 @@ IntSetConsoleTitle(CONST VOID *lpConsoleTitle, BOOLEAN bUnicode)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleTitleW(LPCWSTR lpConsoleTitle)
 {
     return IntSetConsoleTitle(lpConsoleTitle, TRUE);
@@ -2170,6 +2200,7 @@ SetConsoleTitleW(LPCWSTR lpConsoleTitle)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleTitleA(LPCSTR lpConsoleTitle)
 {
     return IntSetConsoleTitle(lpConsoleTitle, FALSE);
@@ -2258,6 +2289,7 @@ CreateConsoleScreenBuffer(DWORD dwDesiredAccess,
  */
 UINT
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCP(VOID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2286,6 +2318,7 @@ GetConsoleCP(VOID)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCP(UINT wCodePageID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2316,6 +2349,7 @@ SetConsoleCP(UINT wCodePageID)
  */
 UINT
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleOutputCP(VOID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2344,6 +2378,7 @@ GetConsoleOutputCP(VOID)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleOutputCP(UINT wCodePageID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2594,6 +2629,7 @@ Quit:
  */
 HWND
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleWindow(VOID)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2620,6 +2656,7 @@ GetConsoleWindow(VOID)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleIcon(HICON hIcon)
 {
     CONSOLE_API_MESSAGE ApiMessage;
@@ -2652,6 +2689,7 @@ SetConsoleIcon(HICON hIcon)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleInputExeNameW(IN LPWSTR lpExeName)
 {
     DWORD ExeLength;
@@ -2691,6 +2729,7 @@ SetConsoleInputExeNameW(IN LPWSTR lpExeName)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleInputExeNameA(IN LPSTR lpExeName)
 {
     NTSTATUS Status;
@@ -2766,6 +2805,7 @@ SetConsoleInputExeNameA(IN LPSTR lpExeName)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleInputExeNameW(IN DWORD nBufferLength,
                         OUT LPWSTR lpExeName)
 {
@@ -2804,6 +2844,7 @@ GetConsoleInputExeNameW(IN DWORD nBufferLength,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleInputExeNameA(IN DWORD nBufferLength,
                         OUT LPSTR lpExeName)
 {
@@ -2850,6 +2891,7 @@ GetConsoleCharType(HANDLE hConsole, COORD Coord, PDWORD Type)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2)
 {
     STUB;
@@ -2858,6 +2900,7 @@ GetConsoleCursorMode(HANDLE hConsole, PBOOL pUnknown1, PBOOL pUnknown2)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2)
 {
     STUB;
@@ -2866,6 +2909,7 @@ SetConsoleCursorMode(HANDLE hConsole, BOOL Unknown1, BOOL Unknown2)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode)
 {
     STUB;
@@ -2874,6 +2918,7 @@ GetConsoleNlsMode(HANDLE hConsole, LPDWORD lpMode)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode)
 {
     STUB;
@@ -2882,6 +2927,7 @@ SetConsoleNlsMode(HANDLE hConsole, DWORD dwMode)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknown4)
 {
     STUB;
@@ -2890,6 +2936,7 @@ SetConsoleLocalEUDC(DWORD Unknown1, DWORD Unknown2, DWORD Unknown3, DWORD Unknow
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId)
 {
     STUB;
@@ -2898,6 +2945,7 @@ RegisterConsoleIME(HWND hWnd, LPDWORD ThreadId)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 RegisterConsoleOS2(BOOL bUnknown)
 {
     STUB;
@@ -2906,6 +2954,7 @@ RegisterConsoleOS2(BOOL bUnknown)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleOS2OemFormat(BOOL bUnknown)
 {
     STUB;
@@ -2914,6 +2963,7 @@ SetConsoleOS2OemFormat(BOOL bUnknown)
 
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 UnregisterConsoleIME(VOID)
 {
     STUB;
@@ -2921,6 +2971,7 @@ UnregisterConsoleIME(VOID)
 }
 
 
+static
 BOOL
 IntGetConsoleKeyboardLayoutName(OUT PVOID pszLayoutName,
                                 IN BOOL bAnsi)
@@ -2969,6 +3020,7 @@ IntGetConsoleKeyboardLayoutName(OUT PVOID pszLayoutName,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleKeyboardLayoutNameA(OUT LPSTR pszLayoutName)
 {
     return IntGetConsoleKeyboardLayoutName(pszLayoutName, TRUE);
@@ -2979,6 +3031,7 @@ GetConsoleKeyboardLayoutNameA(OUT LPSTR pszLayoutName)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleKeyboardLayoutNameW(OUT LPWSTR pszLayoutName)
 {
     return IntGetConsoleKeyboardLayoutName(pszLayoutName, FALSE);

diff --git a/reactos/dll/win32/kernel32/client/console/history.c b/reactos/dll/win32/kernel32/client/console/history.c
index fdc5826..e874ca4 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/history.c
+++ b/reactos/dll/win32/kernel32/client/console/history.c
@@ -246,6 +246,7 @@ IntSetConsoleNumberOfCommands(DWORD dwNumCommands,
  */
 VOID
 WINAPI
+DECLSPEC_HOTPATCH
 ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName)
 {
     IntExpungeConsoleCommandHistory(lpExeName, TRUE);
@@ -257,6 +258,7 @@ ExpungeConsoleCommandHistoryW(LPCWSTR lpExeName)
  */
 VOID
 WINAPI
+DECLSPEC_HOTPATCH
 ExpungeConsoleCommandHistoryA(LPCSTR lpExeName)
 {
     IntExpungeConsoleCommandHistory(lpExeName, FALSE);
@@ -268,6 +270,7 @@ ExpungeConsoleCommandHistoryA(LPCSTR lpExeName)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCommandHistoryW(LPWSTR lpHistory,
                           DWORD cbHistory,
                           LPCWSTR lpExeName)
@@ -281,6 +284,7 @@ GetConsoleCommandHistoryW(LPWSTR lpHistory,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCommandHistoryA(LPSTR lpHistory,
                           DWORD cbHistory,
                           LPCSTR lpExeName)
@@ -294,6 +298,7 @@ GetConsoleCommandHistoryA(LPSTR lpHistory,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName)
 {
     return IntGetConsoleCommandHistoryLength(lpExeName, TRUE);
@@ -305,6 +310,7 @@ GetConsoleCommandHistoryLengthW(LPCWSTR lpExeName)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleCommandHistoryLengthA(LPCSTR lpExeName)
 {
     return IntGetConsoleCommandHistoryLength(lpExeName, FALSE);
@@ -316,6 +322,7 @@ GetConsoleCommandHistoryLengthA(LPCSTR lpExeName)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleNumberOfCommandsW(DWORD dwNumCommands,
                             LPCWSTR lpExeName)
 {
@@ -328,6 +335,7 @@ SetConsoleNumberOfCommandsW(DWORD dwNumCommands,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleNumberOfCommandsA(DWORD dwNumCommands,
                             LPCSTR lpExeName)
 {
@@ -340,6 +348,7 @@ SetConsoleNumberOfCommandsA(DWORD dwNumCommands,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleCommandHistoryMode(IN DWORD dwMode)
 {
     CONSOLE_API_MESSAGE ApiMessage;

diff --git a/reactos/dll/win32/kernel32/client/console/readwrite.c b/reactos/dll/win32/kernel32/client/console/readwrite.c
index e231b41..1721fef 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/readwrite.c
+++ b/reactos/dll/win32/kernel32/client/console/readwrite.c
@@ -1172,6 +1172,7 @@ IntFillConsoleOutputCode(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleW(IN HANDLE hConsoleInput,
              OUT LPVOID lpBuffer,
              IN DWORD nNumberOfCharsToRead,
@@ -1192,6 +1193,7 @@ ReadConsoleW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleA(IN HANDLE hConsoleInput,
              OUT LPVOID lpBuffer,
              IN DWORD nNumberOfCharsToRead,
@@ -1212,6 +1214,7 @@ ReadConsoleA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 PeekConsoleInputW(IN HANDLE hConsoleInput,
                   OUT PINPUT_RECORD lpBuffer,
                   IN DWORD nLength,
@@ -1231,6 +1234,7 @@ PeekConsoleInputW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 PeekConsoleInputA(IN HANDLE hConsoleInput,
                   OUT PINPUT_RECORD lpBuffer,
                   IN DWORD nLength,
@@ -1250,6 +1254,7 @@ PeekConsoleInputA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleInputW(IN HANDLE hConsoleInput,
                   OUT PINPUT_RECORD lpBuffer,
                   IN DWORD nLength,
@@ -1269,6 +1274,7 @@ ReadConsoleInputW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleInputA(IN HANDLE hConsoleInput,
                   OUT PINPUT_RECORD lpBuffer,
                   IN DWORD nLength,
@@ -1288,6 +1294,7 @@ ReadConsoleInputA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleInputExW(IN HANDLE hConsoleInput,
                     OUT PINPUT_RECORD lpBuffer,
                     IN DWORD nLength,
@@ -1308,6 +1315,7 @@ ReadConsoleInputExW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleInputExA(IN HANDLE hConsoleInput,
                     OUT PINPUT_RECORD lpBuffer,
                     IN DWORD nLength,
@@ -1328,6 +1336,7 @@ ReadConsoleInputExA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleOutputW(IN HANDLE hConsoleOutput,
                    OUT PCHAR_INFO lpBuffer,
                    IN COORD dwBufferSize,
@@ -1348,6 +1357,7 @@ ReadConsoleOutputW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleOutputA(IN HANDLE hConsoleOutput,
                    OUT PCHAR_INFO lpBuffer,
                    IN COORD dwBufferSize,
@@ -1368,6 +1378,7 @@ ReadConsoleOutputA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
                             OUT LPWSTR lpCharacter,
                             IN DWORD nLength,
@@ -1388,6 +1399,7 @@ ReadConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
                             OUT LPSTR lpCharacter,
                             IN DWORD nLength,
@@ -1408,6 +1420,7 @@ ReadConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 ReadConsoleOutputAttribute(IN HANDLE hConsoleOutput,
                            OUT LPWORD lpAttribute,
                            IN DWORD nLength,
@@ -1432,6 +1445,7 @@ ReadConsoleOutputAttribute(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleW(IN HANDLE hConsoleOutput,
               IN CONST VOID *lpBuffer,
               IN DWORD nNumberOfCharsToWrite,
@@ -1452,6 +1466,7 @@ WriteConsoleW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleA(IN HANDLE hConsoleOutput,
               IN CONST VOID *lpBuffer,
               IN DWORD nNumberOfCharsToWrite,
@@ -1472,6 +1487,7 @@ WriteConsoleA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleInputW(IN HANDLE hConsoleInput,
                    IN CONST INPUT_RECORD *lpBuffer,
                    IN DWORD nLength,
@@ -1491,6 +1507,7 @@ WriteConsoleInputW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleInputA(IN HANDLE hConsoleInput,
                    IN CONST INPUT_RECORD *lpBuffer,
                    IN DWORD nLength,
@@ -1510,6 +1527,7 @@ WriteConsoleInputA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleInputVDMW(IN HANDLE hConsoleInput,
                       IN CONST INPUT_RECORD *lpBuffer,
                       IN DWORD nLength,
@@ -1529,6 +1547,7 @@ WriteConsoleInputVDMW(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleInputVDMA(IN HANDLE hConsoleInput,
                       IN CONST INPUT_RECORD *lpBuffer,
                       IN DWORD nLength,
@@ -1548,6 +1567,7 @@ WriteConsoleInputVDMA(IN HANDLE hConsoleInput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleOutputW(IN HANDLE hConsoleOutput,
                     IN CONST CHAR_INFO *lpBuffer,
                     IN COORD dwBufferSize,
@@ -1568,6 +1588,7 @@ WriteConsoleOutputW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleOutputA(IN HANDLE hConsoleOutput,
                     IN CONST CHAR_INFO *lpBuffer,
                     IN COORD dwBufferSize,
@@ -1588,6 +1609,7 @@ WriteConsoleOutputA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
                              IN LPCWSTR lpCharacter,
                              IN DWORD nLength,
@@ -1608,6 +1630,7 @@ WriteConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
                              IN LPCSTR lpCharacter,
                              IN DWORD nLength,
@@ -1628,6 +1651,7 @@ WriteConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 WriteConsoleOutputAttribute(IN HANDLE hConsoleOutput,
                             IN CONST WORD *lpAttribute,
                             IN DWORD nLength,
@@ -1648,6 +1672,7 @@ WriteConsoleOutputAttribute(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 FillConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
                             IN WCHAR cCharacter,
                             IN DWORD nLength,
@@ -1670,6 +1695,7 @@ FillConsoleOutputCharacterW(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 FillConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
                             IN CHAR cCharacter,
                             IN DWORD nLength,
@@ -1692,6 +1718,7 @@ FillConsoleOutputCharacterA(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 FillConsoleOutputAttribute(IN HANDLE hConsoleOutput,
                            IN WORD wAttribute,
                            IN DWORD nLength,

diff --git a/reactos/dll/win32/kernel32/client/console/vista.c b/reactos/dll/win32/kernel32/client/console/vista.c
index ca691dd..ed18684 100644 (file)
--- a/reactos/dll/win32/kernel32/client/console/vista.c
+++ b/reactos/dll/win32/kernel32/client/console/vista.c
@@ -23,6 +23,7 @@
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
 {
     NTSTATUS Status;
@@ -58,6 +59,7 @@ GetConsoleHistoryInfo(PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
 {
     NTSTATUS Status;
@@ -93,6 +95,7 @@ SetConsoleHistoryInfo(IN PCONSOLE_HISTORY_INFO lpConsoleHistoryInfo)
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle,
                          IN DWORD nSize)
 {
@@ -107,6 +110,7 @@ GetConsoleOriginalTitleW(OUT LPWSTR lpConsoleTitle,
  */
 DWORD
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle,
                          IN DWORD nSize)
 {
@@ -121,6 +125,7 @@ GetConsoleOriginalTitleA(OUT LPSTR lpConsoleTitle,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
                              OUT PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx)
 {
@@ -135,6 +140,7 @@ GetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
                              IN PCONSOLE_SCREEN_BUFFER_INFOEX lpConsoleScreenBufferInfoEx)
 {
@@ -149,6 +155,7 @@ SetConsoleScreenBufferInfoEx(IN HANDLE hConsoleOutput,
  */
 BOOL
 WINAPI
+DECLSPEC_HOTPATCH
 GetCurrentConsoleFontEx(IN HANDLE hConsoleOutput,
                         IN BOOL bMaximumWindow,
                         OUT PCONSOLE_FONT_INFOEX lpConsoleCurrentFontEx)

diff --git a/reactos/dll/win32/kernel32/client/version.c b/reactos/dll/win32/kernel32/client/version.c
index c0afdbf..7e008ab 100644 (file)
--- a/reactos/dll/win32/kernel32/client/version.c
+++ b/reactos/dll/win32/kernel32/client/version.c
@@ -131,7 +131,7 @@ VerifyVersionInfoW(IN LPOSVERSIONINFOEXW lpVersionInformation,
             return FALSE;
 
         case STATUS_REVISION_MISMATCH:
-            DPRINT1("ReactOS returning version mismatch. Investigate!\n");
+            DPRINT1("VerifyVersionInfo -- Version mismatch\n");
             SetLastError(ERROR_OLD_WIN_VERSION);
             return FALSE;