[ros-diffs] [janderwald] 25139: Part 2/2 of WDK compability fixes - reflect previous header changes - fix prototype for GetConsoleAliasA/W CreateSymbolicLinkA/W

Author: janderwald
Date: Wed Dec 13 02:57:24 2006
New Revision: 25139

URL: http://svn.reactos.org/svn/reactos?rev=25139&view=rev
Log:
Part 2/2 of WDK compability fixes
- reflect previous header changes
- fix prototype for GetConsoleAliasA/W
                    CreateSymbolicLinkA/W


Modified:
    trunk/reactos/dll/win32/kernel32/file/create.c
    trunk/reactos/dll/win32/kernel32/file/find.c
    trunk/reactos/dll/win32/kernel32/kernel32.def
    trunk/reactos/dll/win32/kernel32/misc/console.c
    trunk/reactos/dll/win32/kernel32/misc/recovery.c
    trunk/reactos/dll/win32/kernel32/misc/stubs.c
    trunk/reactos/dll/win32/kernel32/misc/time.c

Modified: trunk/reactos/dll/win32/kernel32/file/create.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/cr…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/create.c (original)
+++ trunk/reactos/dll/win32/kernel32/file/create.c Wed Dec 13 02:57:24 2006
@@ -370,7 +370,8 @@
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOLEAN
+STDCALL
 CreateSymbolicLinkW(IN LPCWSTR lpSymlinkFileName,
                     IN LPCWSTR lpTargetFileName,
                     IN DWORD dwFlags)
@@ -572,7 +573,8 @@
 /*
  * @implemented
  */
-BOOL STDCALL
+BOOLEAN
+STDCALL
 CreateSymbolicLinkA(IN LPCSTR lpSymlinkFileName,
                     IN LPCSTR lpTargetFileName,
                     IN DWORD dwFlags)

Modified: trunk/reactos/dll/win32/kernel32/file/find.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/file/fi…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/file/find.c (original)
+++ trunk/reactos/dll/win32/kernel32/file/find.c Wed Dec 13 02:57:24 2006
@@ -705,7 +705,7 @@
         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))

Modified: trunk/reactos/dll/win32/kernel32/kernel32.def
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/kernel32.def (original)
+++ trunk/reactos/dll/win32/kernel32/kernel32.def Wed Dec 13 02:57:24 2006
@@ -294,7 +294,7 @@
 FreeVirtualBuffer@4
 GenerateConsoleCtrlEvent@8
 GetACP@0
-GetApplicationRecoveryCallback@12
+GetApplicationRecoveryCallback@20
 GetApplicationRestart@16
 GetAtomNameA@12
 GetAtomNameW@12
@@ -741,7 +741,7 @@
 ReadProcessMemory@20
 RecoveryFinished@4
 RecoveryInProgress@4
-RegisterApplicationRecoveryCallback@8
+RegisterApplicationRecoveryCallback@16
 RegisterApplicationRestart@8
 ;RegisterConsoleIME
 ;RegisterConsoleOS2

Modified: trunk/reactos/dll/win32/kernel32/misc/console.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/console.c (original)
+++ trunk/reactos/dll/win32/kernel32/misc/console.c Wed Dec 13 02:57:24 2006
@@ -357,14 +357,14 @@
  * @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 @@
  * @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 @@
 BOOL STDCALL
 SetConsoleDisplayMode (HANDLE hOut,
 		       DWORD dwNewMode,
-		       LPDWORD lpdwOldMode)
+		       PCOORD lpdwOldMode)
      /*
       * FUNCTION: Set the console display mode.
       * ARGUMENTS:
@@ -735,7 +735,7 @@
       *       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 @@
                PVOID lpBuffer,
                DWORD nNumberOfCharsToRead,
                LPDWORD lpNumberOfCharsRead,
-               LPVOID lpReserved,
+               PCONSOLE_READCONSOLE_CONTROL lpReserved,
                BOOL bUnicode)
 {
   PCSR_API_MESSAGE Request; 
@@ -1300,13 +1300,13 @@
              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 @@
              LPVOID lpBuffer,
              DWORD nNumberOfCharsToRead,
              LPDWORD lpNumberOfCharsRead,
-             LPVOID lpReserved)
+             PCONSOLE_READCONSOLE_CONTROL pInputControl)
 {
   return IntReadConsole(hConsoleInput,
                         lpBuffer,
                         nNumberOfCharsToRead,
                         lpNumberOfCharsRead,
-                        lpReserved,
+                        pInputControl,
                         TRUE);
 }
 

Modified: trunk/reactos/dll/win32/kernel32/misc/recovery.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/recovery.c (original)
+++ trunk/reactos/dll/win32/kernel32/misc/recovery.c Wed Dec 13 02:57:24 2006
@@ -28,7 +28,9 @@
 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 @@
 HRESULT
 WINAPI
 RegisterApplicationRecoveryCallback(IN APPLICATION_RECOVERY_CALLBACK pRecoveyCallback,
-                                    IN PVOID pvParameter  OPTIONAL)
+                                    IN PVOID pvParameter  OPTIONAL,
+                                    DWORD dwPingInterval,
+                                    DWORD dwFlags)
 {
     UNIMPLEMENTED;
     return E_FAIL;

Modified: trunk/reactos/dll/win32/kernel32/misc/stubs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/st…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/stubs.c (original)
+++ trunk/reactos/dll/win32/kernel32/misc/stubs.c Wed Dec 13 02:57:24 2006
@@ -770,8 +770,8 @@
 BOOL
 STDCALL
 TzSpecificLocalTimeToSystemTime(
-    LPTIME_ZONE_INFORMATION lpTimeZoneInformation,
-    LPSYSTEMTIME lpLocalTime,
+    CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation,
+    CONST SYSTEMTIME *lpLocalTime,
     LPSYSTEMTIME lpUniversalTime
     )
 {
@@ -857,7 +857,7 @@
 HANDLE
 STDCALL
 FindFirstVolumeW(
-    LPCWSTR lpszVolumeName,
+    LPWSTR lpszVolumeName,
     DWORD cchBufferLength
     )
 {
@@ -871,7 +871,7 @@
 HANDLE
 STDCALL
 FindFirstVolumeMountPointW(
-    LPWSTR lpszRootPathName,
+    LPCWSTR lpszRootPathName,
     LPWSTR lpszVolumeMountPoint,
     DWORD cchBufferLength
     )
@@ -1039,7 +1039,7 @@
 HANDLE
 STDCALL
 FindFirstVolumeA(
-    LPCSTR lpszVolumeName,
+    LPSTR lpszVolumeName,
     DWORD cchBufferLength
     )
 {
@@ -1053,7 +1053,7 @@
 HANDLE
 STDCALL
 FindFirstVolumeMountPointA(
-    LPSTR lpszRootPathName,
+    LPCSTR lpszRootPathName,
     LPSTR lpszVolumeMountPoint,
     DWORD cchBufferLength
     )
@@ -1069,7 +1069,7 @@
 STDCALL
 FindNextVolumeA(
     HANDLE hFindVolume,
-    LPCSTR lpszVolumeName,
+    LPSTR lpszVolumeName,
     DWORD cchBufferLength
     )
 {

Modified: trunk/reactos/dll/win32/kernel32/misc/time.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ti…
==============================================================================
--- trunk/reactos/dll/win32/kernel32/misc/time.c (original)
+++ trunk/reactos/dll/win32/kernel32/misc/time.c Wed Dec 13 02:57:24 2006
@@ -413,8 +413,8 @@
  */
 BOOL STDCALL
 SystemTimeToTzSpecificLocalTime(
-                                LPTIME_ZONE_INFORMATION lpTimeZoneInformation,
-                                LPSYSTEMTIME lpUniversalTime,
+                                CONST TIME_ZONE_INFORMATION *lpTimeZoneInformation,
+                                CONST SYSTEMTIME *lpUniversalTime,
                                 LPSYSTEMTIME lpLocalTime
                                )
 {
@@ -428,7 +428,7 @@
     lpTzInfo = &TimeZoneInformation;
   }
   else
-    lpTzInfo = lpTimeZoneInformation;
+    lpTzInfo = (LPTIME_ZONE_INFORMATION)lpTimeZoneInformation;
 
   if (!lpUniversalTime)
     return FALSE;