From e71bc2b3e600009ff9afc33a412fc52f28d6e7cb Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sat, 20 Jun 2009 12:40:11 +0000
Subject: [PATCH] Fix 64bit issues.

svn path=/branches/ros-amd64-bringup/; revision=41485
---
 reactos/subsystems/win32/csrss/win32csr/conio.c   | 2 +-
 reactos/subsystems/win32/csrss/win32csr/dllmain.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/reactos/subsystems/win32/csrss/win32csr/conio.c b/reactos/subsystems/win32/csrss/win32csr/conio.c
index a15af0dad57..fa3244e0d7e 100644
--- a/reactos/subsystems/win32/csrss/win32csr/conio.c
+++ b/reactos/subsystems/win32/csrss/win32csr/conio.c
@@ -65,7 +65,7 @@ ConioConsoleCtrlEventTimeout(DWORD Event, PCSRSS_PROCESS_DATA ProcessData, DWORD
 
       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());
diff --git a/reactos/subsystems/win32/csrss/win32csr/dllmain.c b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
index e6ef5573f81..d1d16c03224 100644
--- a/reactos/subsystems/win32/csrss/win32csr/dllmain.c
+++ b/reactos/subsystems/win32/csrss/win32csr/dllmain.c
@@ -190,7 +190,7 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
     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 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
                 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 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
     // 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 @@ Win32CsrHardError(IN PCSRSS_PROCESS_DATA ProcessData,
             MessageBody = NULL;
             Status = RtlFindMessage(
                 (PVOID)GetModuleHandle(TEXT("ntdll")),
-                (ULONG)RT_MESSAGETABLE,
+                (ULONG_PTR)RT_MESSAGETABLE,
                 LANG_NEUTRAL,
                 ParameterList[0],
                 &MsgResException);