[ros-diffs] [tkreuzer] 41485: Fix 64bit issues.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Sat Jun 20 14:40:11 CEST 2009


Author: tkreuzer
Date: Sat Jun 20 16:40:11 2009
New Revision: 41485

URL: http://svn.reactos.org/svn/reactos?rev=41485&view=rev
Log:
Fix 64bit issues.

Modified:
    branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c
    branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c

Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c?rev=41485&r1=41484&r2=41485&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/conio.c [iso-8859-1] Sat Jun 20 16:40:11 2009
@@ -65,7 +65,7 @@
 
       Thread = CreateRemoteThread(ProcessData->Process, NULL, 0,
                                   (LPTHREAD_START_ROUTINE) ProcessData->CtrlDispatcher,
-                                  (PVOID) Event, 0, NULL);
+                                  UlongToPtr(Event), 0, NULL);
       if (NULL == Thread)
         {
           DPRINT1("Failed thread creation (Error: 0x%x)\n", GetLastError());

Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c?rev=41485&r1=41484&r2=41485&view=diff
==============================================================================
--- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/dllmain.c [iso-8859-1] Sat Jun 20 16:40:11 2009
@@ -190,7 +190,7 @@
     OBJECT_ATTRIBUTES ObjectAttributes;
     ULONG nParam = 0;
     PRTL_MESSAGE_RESOURCE_ENTRY MessageResource;
-    ULONG ParameterList[MAXIMUM_HARDERROR_PARAMETERS];
+    ULONG_PTR ParameterList[MAXIMUM_HARDERROR_PARAMETERS];
     LPSTR CaptionText, MessageBody;
     LPWSTR szxCaptionText, szxMessageBody;
     DWORD SizeOfAllUnicodeStrings = 0;
@@ -330,7 +330,7 @@
                 ParameterStringU.MaximumLength = TempStringU.MaximumLength;
                 DPRINT("ParameterStringU=\'%wZ\'\n", &ParameterStringU);
                 RtlUnicodeStringToAnsiString(&ParamStringA, &ParameterStringU, TRUE);
-                ParameterList[nParam] = (ULONG)ParamStringA.Buffer;
+                ParameterList[nParam] = (ULONG_PTR)ParamStringA.Buffer;
                 SizeOfAllUnicodeStrings += ParamStringA.MaximumLength;
             }
         }
@@ -345,7 +345,7 @@
     // get text string of the error code
     Status = RtlFindMessage(
         (PVOID)GetModuleHandle(TEXT("ntdll")),
-        (ULONG)RT_MESSAGETABLE,
+        (ULONG_PTR)RT_MESSAGETABLE,
         LANG_NEUTRAL,
         HardErrorMessage->Status,
         &MessageResource );
@@ -412,7 +412,7 @@
             MessageBody = NULL;
             Status = RtlFindMessage(
                 (PVOID)GetModuleHandle(TEXT("ntdll")),
-                (ULONG)RT_MESSAGETABLE,
+                (ULONG_PTR)RT_MESSAGETABLE,
                 LANG_NEUTRAL,
                 ParameterList[0],
                 &MsgResException);



More information about the Ros-diffs mailing list