Author: janderwald Date: Wed Dec 13 02:52:02 2006 New Revision: 25138
URL: http://svn.reactos.org/svn/reactos?rev=25138&view=rev Log: Part 1/2 of WDK compability fixes - add struct CONSOLE_READCONSOLE_CONTROL to wincon.h - add missing pointer typedef - fix declaration of ReadConsoleA ReadConsoleW FindFirstVolumeA FindFirstVolumeW FindFirstVolumeMountPointA FindFirstVolumeMountPointW FindNextVolumeA GetApplicationRecoveryCallback RegisterApplicationRecoveryCallback SystemTimeToTzSpecificLocalTime
- fix typedef of WIN32_FIND_STREAM_DATA
Modified: trunk/reactos/include/psdk/winbase.h trunk/reactos/include/psdk/wincon.h
Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev=... ============================================================================== --- trunk/reactos/include/psdk/winbase.h (original) +++ trunk/reactos/include/psdk/winbase.h Wed Dec 13 02:52:02 2006 @@ -830,7 +830,7 @@ typedef struct _WIN32_FIND_STREAM_DATAW { LARGE_INTEGER StreamSize; WCHAR cStreamName[MAX_PATH + 36]; -} WIN32_FIND_STREAM_DATAW, *PWIN32_FIND_STREAM_DATAW, *LPWIN32_FIND_STREAM_DATAW; +} WIN32_FIND_STREAM_DATA, *PWIN32_FIND_STREAM_DATA; #endif typedef struct _WIN32_STREAM_ID { DWORD dwStreamId; @@ -1347,10 +1347,10 @@ #endif BOOL WINAPI FindFirstFreeAce(PACL,PVOID*); #if (_WIN32_WINNT >= 0x0500) -HANDLE WINAPI FindFirstVolumeA(LPCSTR,DWORD); -HANDLE WINAPI FindFirstVolumeW(LPCWSTR,DWORD); -HANDLE WINAPI FindFirstVolumeMountPointA(LPSTR,LPSTR,DWORD); -HANDLE WINAPI FindFirstVolumeMountPointW(LPWSTR,LPWSTR,DWORD); +HANDLE WINAPI FindFirstVolumeA(LPSTR,DWORD); +HANDLE WINAPI FindFirstVolumeW(LPWSTR,DWORD); +HANDLE WINAPI FindFirstVolumeMountPointA(LPCSTR,LPSTR,DWORD); +HANDLE WINAPI FindFirstVolumeMountPointW(LPCWSTR,LPWSTR,DWORD); #endif BOOL WINAPI FindNextChangeNotification(HANDLE); BOOL WINAPI FindNextFileA(HANDLE,LPWIN32_FIND_DATAA); @@ -1359,7 +1359,7 @@ BOOL WINAPI FindNextStreamW(HANDLE,LPVOID); #endif #if (_WIN32_WINNT >= 0x0500) -BOOL WINAPI FindNextVolumeA(HANDLE,LPCSTR,DWORD); +BOOL WINAPI FindNextVolumeA(HANDLE,LPSTR,DWORD); BOOL WINAPI FindNextVolumeW(HANDLE,LPWSTR,DWORD); BOOL WINAPI FindNextVolumeMountPointA(HANDLE,LPSTR,DWORD); BOOL WINAPI FindNextVolumeMountPointW(HANDLE,LPWSTR,DWORD); @@ -1396,7 +1396,7 @@ BOOL WINAPI GetAce(PACL,DWORD,LPVOID*); BOOL WINAPI GetAclInformation(PACL,PVOID,DWORD,ACL_INFORMATION_CLASS); #if (_WIN32_WINNT >= 0x0600) -HRESULT WINAPI GetApplicationRecoveryCallback(HANDLE,APPLICATION_RECOVERY_CALLBACK*,PVOID*); +HRESULT WINAPI GetApplicationRecoveryCallback(HANDLE,APPLICATION_RECOVERY_CALLBACK*,PVOID*, DWORD*, DWORD*); HRESULT WINAPI GetApplicationRestart(HANDLE,PWSTR,PDWORD,PDWORD); #endif UINT WINAPI GetAtomNameA(ATOM,LPSTR,int); @@ -1856,7 +1856,7 @@ #if (_WIN32_WINNT >= 0x0600) VOID WINAPI RecoveryFinished(BOOL); HRESULT WINAPI RecoveryInProgress(OUT PBOOL); -HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK,PVOID); +HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK,PVOID, DWORD, DWORD); HRESULT WINAPI RegisterApplicationRestart(PCWSTR,DWORD); #endif HANDLE WINAPI RegisterEventSourceA (LPCSTR,LPCSTR); @@ -2002,7 +2002,7 @@ void WINAPI SwitchToFiber(PVOID); BOOL WINAPI SwitchToThread(void); BOOL WINAPI SystemTimeToFileTime(const SYSTEMTIME*,LPFILETIME); -BOOL WINAPI SystemTimeToTzSpecificLocalTime(LPTIME_ZONE_INFORMATION,LPSYSTEMTIME,LPSYSTEMTIME); +BOOL WINAPI SystemTimeToTzSpecificLocalTime(CONST TIME_ZONE_INFORMATION*,CONST SYSTEMTIME*,LPSYSTEMTIME); BOOL WINAPI TerminateProcess(HANDLE,UINT); BOOL WINAPI TerminateThread(HANDLE,DWORD); DWORD WINAPI TlsAlloc(VOID);
Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=2... ============================================================================== --- trunk/reactos/include/psdk/wincon.h (original) +++ trunk/reactos/include/psdk/wincon.h Wed Dec 13 02:52:02 2006 @@ -51,6 +51,13 @@ #define DOUBLE_CLICK 2 #define MOUSE_WHEELED 4
+typedef struct _CONSOLE_READCONSOLE_CONTROL { + ULONG nLength; + ULONG nInitialChars; + ULONG dwCtrlWakeupMask; + ULONG dwControlKeyState; +} CONSOLE_READCONSOLE_CONTROL, *PCONSOLE_READCONSOLE_CONTROL; + typedef struct _CHAR_INFO { union { WCHAR UnicodeChar; @@ -71,7 +78,7 @@ typedef struct _COORD { SHORT X; SHORT Y; -} COORD; +} COORD, *PCOORD; typedef struct _CONSOLE_SELECTION_INFO { DWORD dwFlags; COORD dwSelectionAnchor; @@ -183,8 +190,8 @@ BOOL WINAPI GetNumberOfConsoleMouseButtons(PDWORD); BOOL WINAPI PeekConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI PeekConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD); -BOOL WINAPI ReadConsoleA(HANDLE,PVOID,DWORD,PDWORD,PVOID); -BOOL WINAPI ReadConsoleW(HANDLE,PVOID,DWORD,PDWORD,PVOID); +BOOL WINAPI ReadConsoleA(HANDLE,PVOID,DWORD,PDWORD,PCONSOLE_READCONSOLE_CONTROL); +BOOL WINAPI ReadConsoleW(HANDLE,PVOID,DWORD,PDWORD,PCONSOLE_READCONSOLE_CONTROL); BOOL WINAPI ReadConsoleInputA(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI ReadConsoleInputW(HANDLE,PINPUT_RECORD,DWORD,PDWORD); BOOL WINAPI ReadConsoleOutputAttribute(HANDLE,LPWORD,DWORD,COORD,LPDWORD);