From 86ee432e0bbb64aad1719bbca89d095154b2cf74 Mon Sep 17 00:00:00 2001 From: Johannes Anderwald Date: Tue, 12 Dec 2006 23:57:24 +0000 Subject: [PATCH] Part 2/2 of WDK compability fixes - reflect previous header changes - fix prototype for GetConsoleAliasA/W CreateSymbolicLinkA/W svn path=/trunk/; revision=25139 --- reactos/dll/win32/kernel32/file/create.c | 6 +++-- reactos/dll/win32/kernel32/file/find.c | 2 +- reactos/dll/win32/kernel32/kernel32.def | 4 +-- reactos/dll/win32/kernel32/misc/console.c | 30 +++++++++++----------- reactos/dll/win32/kernel32/misc/recovery.c | 8 ++++-- reactos/dll/win32/kernel32/misc/stubs.c | 14 +++++----- reactos/dll/win32/kernel32/misc/time.c | 6 ++--- 7 files changed, 38 insertions(+), 32 deletions(-) diff --git a/reactos/dll/win32/kernel32/file/create.c b/reactos/dll/win32/kernel32/file/create.c index ee3d8bbf8b8..47c3f422969 100644 --- a/reactos/dll/win32/kernel32/file/create.c +++ b/reactos/dll/win32/kernel32/file/create.c @@ -370,7 +370,8 @@ HANDLE STDCALL CreateFileW (LPCWSTR lpFileName, /* * @implemented */ -BOOL STDCALL +BOOLEAN +STDCALL CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName, IN LPCWSTR lpTargetFileName, IN DWORD dwFlags) @@ -572,7 +573,8 @@ Cleanup: /* * @implemented */ -BOOL STDCALL +BOOLEAN +STDCALL CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName, IN LPCSTR lpTargetFileName, IN DWORD dwFlags) diff --git a/reactos/dll/win32/kernel32/file/find.c b/reactos/dll/win32/kernel32/file/find.c index acc9a848d9b..1e9be769456 100644 --- a/reactos/dll/win32/kernel32/file/find.c +++ b/reactos/dll/win32/kernel32/file/find.c @@ -705,7 +705,7 @@ InternalCopyStreamInfo(IN OUT PKERNEL32_FIND_STREAM_DATA IData, case FindStreamInfoStandard: { ULONG StreamNameLen; - WIN32_FIND_STREAM_DATAW *StreamData = (WIN32_FIND_STREAM_DATAW*)lpFindStreamData; + WIN32_FIND_STREAM_DATA *StreamData = (WIN32_FIND_STREAM_DATA*)lpFindStreamData; StreamNameLen = IData->pCurrent->StreamNameLength; if (StreamNameLen > sizeof(StreamData->cStreamName) - sizeof(WCHAR)) diff --git a/reactos/dll/win32/kernel32/kernel32.def b/reactos/dll/win32/kernel32/kernel32.def index 16df9f31af6..a22145e03fd 100644 --- a/reactos/dll/win32/kernel32/kernel32.def +++ b/reactos/dll/win32/kernel32/kernel32.def @@ -294,7 +294,7 @@ FreeUserPhysicalPages@12 FreeVirtualBuffer@4 GenerateConsoleCtrlEvent@8 GetACP@0 -GetApplicationRecoveryCallback@12 +GetApplicationRecoveryCallback@20 GetApplicationRestart@16 GetAtomNameA@12 GetAtomNameW@12 @@ -741,7 +741,7 @@ ReadFileScatter@20 ReadProcessMemory@20 RecoveryFinished@4 RecoveryInProgress@4 -RegisterApplicationRecoveryCallback@8 +RegisterApplicationRecoveryCallback@16 RegisterApplicationRestart@8 ;RegisterConsoleIME ;RegisterConsoleOS2 diff --git a/reactos/dll/win32/kernel32/misc/console.c b/reactos/dll/win32/kernel32/misc/console.c index 2f91486efad..026659c9857 100644 --- a/reactos/dll/win32/kernel32/misc/console.c +++ b/reactos/dll/win32/kernel32/misc/console.c @@ -357,14 +357,14 @@ GetConsoleAliasExesLengthW (VOID) * @unimplemented */ DWORD STDCALL -GetConsoleAliasesW (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +GetConsoleAliasesW (LPWSTR AliasBuffer, + DWORD AliasBufferLength, + LPWSTR ExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasesW(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1, Unknown2); + DPRINT1("GetConsoleAliasesW(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", AliasBuffer, AliasBufferLength, ExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -374,14 +374,14 @@ GetConsoleAliasesW (DWORD Unknown0, * @unimplemented */ DWORD STDCALL -GetConsoleAliasesA (DWORD Unknown0, - DWORD Unknown1, - DWORD Unknown2) +GetConsoleAliasesA (LPSTR AliasBuffer, + DWORD AliasBufferLength, + LPSTR ExeName) /* * Undocumented */ { - DPRINT1("GetConsoleAliasesA(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Unknown0, Unknown1, Unknown2); + DPRINT1("GetConsoleAliasesA(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", AliasBuffer, AliasBufferLength, ExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; } @@ -726,7 +726,7 @@ SetConsoleCursor (DWORD Unknown0, BOOL STDCALL SetConsoleDisplayMode (HANDLE hOut, DWORD dwNewMode, - LPDWORD lpdwOldMode) + PCOORD lpdwOldMode) /* * FUNCTION: Set the console display mode. * ARGUMENTS: @@ -735,7 +735,7 @@ SetConsoleDisplayMode (HANDLE hOut, * lpdwOldMode - Address of a variable that receives the old mode. */ { - DPRINT1("SetConsoleDisplayMode(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", hOut, dwNewMode, lpdwOldMode); + DPRINT1("SetConsoleDisplayMode(0x%x, 0x%x, 0x%p) UNIMPLEMENTED!\n", hOut, dwNewMode, lpdwOldMode); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return FALSE; } @@ -1209,7 +1209,7 @@ IntReadConsole(HANDLE hConsoleInput, PVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, - LPVOID lpReserved, + PCONSOLE_READCONSOLE_CONTROL lpReserved, BOOL bUnicode) { PCSR_API_MESSAGE Request; @@ -1300,13 +1300,13 @@ ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, - LPVOID lpReserved) + PCONSOLE_READCONSOLE_CONTROL pInputControl) { return IntReadConsole(hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, - lpReserved, + pInputControl, FALSE); } @@ -1321,13 +1321,13 @@ ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, - LPVOID lpReserved) + PCONSOLE_READCONSOLE_CONTROL pInputControl) { return IntReadConsole(hConsoleInput, lpBuffer, nNumberOfCharsToRead, lpNumberOfCharsRead, - lpReserved, + pInputControl, TRUE); } diff --git a/reactos/dll/win32/kernel32/misc/recovery.c b/reactos/dll/win32/kernel32/misc/recovery.c index 23b027113e3..105c340b501 100644 --- a/reactos/dll/win32/kernel32/misc/recovery.c +++ b/reactos/dll/win32/kernel32/misc/recovery.c @@ -28,7 +28,9 @@ HRESULT WINAPI GetApplicationRecoveryCallback(IN HANDLE hProcess, OUT APPLICATION_RECOVERY_CALLBACK* pRecoveryCallback, - OUT PVOID* ppvParameter) + OUT PVOID* ppvParameter, + PDWORD dwPingInterval, + PDWORD dwFlags) { UNIMPLEMENTED; return E_FAIL; @@ -79,7 +81,9 @@ RecoveryInProgress(OUT PBOOL pbCancelled) HRESULT WINAPI RegisterApplicationRecoveryCallback(IN APPLICATION_RECOVERY_CALLBACK pRecoveyCallback, - IN PVOID pvParameter OPTIONAL) + IN PVOID pvParameter OPTIONAL, + DWORD dwPingInterval, + DWORD dwFlags) { UNIMPLEMENTED; return E_FAIL; diff --git a/reactos/dll/win32/kernel32/misc/stubs.c b/reactos/dll/win32/kernel32/misc/stubs.c index 3349611c531..dd70dcd6f01 100644 --- a/reactos/dll/win32/kernel32/misc/stubs.c +++ b/reactos/dll/win32/kernel32/misc/stubs.c @@ -770,8 +770,8 @@ SetThreadExecutionState( BOOL STDCALL TzSpecificLocalTimeToSystemTime( - LPTIME_ZONE_INFORMATION lpTimeZoneInformation, - LPSYSTEMTIME lpLocalTime, + CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation, + CONST SYSTEMTIME *lpLocalTime, LPSYSTEMTIME lpUniversalTime ) { @@ -857,7 +857,7 @@ DnsHostnameToComputerNameW ( HANDLE STDCALL FindFirstVolumeW( - LPCWSTR lpszVolumeName, + LPWSTR lpszVolumeName, DWORD cchBufferLength ) { @@ -871,7 +871,7 @@ FindFirstVolumeW( HANDLE STDCALL FindFirstVolumeMountPointW( - LPWSTR lpszRootPathName, + LPCWSTR lpszRootPathName, LPWSTR lpszVolumeMountPoint, DWORD cchBufferLength ) @@ -1039,7 +1039,7 @@ DnsHostnameToComputerNameA ( HANDLE STDCALL FindFirstVolumeA( - LPCSTR lpszVolumeName, + LPSTR lpszVolumeName, DWORD cchBufferLength ) { @@ -1053,7 +1053,7 @@ FindFirstVolumeA( HANDLE STDCALL FindFirstVolumeMountPointA( - LPSTR lpszRootPathName, + LPCSTR lpszRootPathName, LPSTR lpszVolumeMountPoint, DWORD cchBufferLength ) @@ -1069,7 +1069,7 @@ BOOL STDCALL FindNextVolumeA( HANDLE hFindVolume, - LPCSTR lpszVolumeName, + LPSTR lpszVolumeName, DWORD cchBufferLength ) { diff --git a/reactos/dll/win32/kernel32/misc/time.c b/reactos/dll/win32/kernel32/misc/time.c index 5acc7acab05..90733f0e591 100644 --- a/reactos/dll/win32/kernel32/misc/time.c +++ b/reactos/dll/win32/kernel32/misc/time.c @@ -413,8 +413,8 @@ GetTickCount64(VOID) */ BOOL STDCALL SystemTimeToTzSpecificLocalTime( - LPTIME_ZONE_INFORMATION lpTimeZoneInformation, - LPSYSTEMTIME lpUniversalTime, + CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation, + CONST SYSTEMTIME *lpUniversalTime, LPSYSTEMTIME lpLocalTime ) { @@ -428,7 +428,7 @@ SystemTimeToTzSpecificLocalTime( lpTzInfo = &TimeZoneInformation; } else - lpTzInfo = lpTimeZoneInformation; + lpTzInfo = (LPTIME_ZONE_INFORMATION)lpTimeZoneInformation; if (!lpUniversalTime) return FALSE;