From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Mon, 8 Dec 2008 08:30:30 +0000 (+0000)
Subject: sync trunk head (r37928)
X-Git-Tag: ReactOS-0.3.11~832^3~66
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=26b6703525e5141013f1eb94c616b27ce829ece3

sync trunk head (r37928)

svn path=/branches/ros-amd64-bringup/; revision=37931
---

26b6703525e5141013f1eb94c616b27ce829ece3
diff --cc reactos/dll/win32/kernel32/debug/debugger.c
index 84f81fcc47b,8307530c072..0a9b551bc25
--- a/reactos/dll/win32/kernel32/debug/debugger.c
+++ b/reactos/dll/win32/kernel32/debug/debugger.c
@@@ -232,7 -232,7 +232,7 @@@ ProcessIdToHandle(IN DWORD dwProcessId
      CLIENT_ID ClientId;
  
      /* If we don't have a PID, look it up */
-     if (dwProcessId == -1) dwProcessId = (ULONG_PTR)CsrGetProcessId();
 -    if (dwProcessId == -1U) dwProcessId = (DWORD)CsrGetProcessId();
++    if (dwProcessId == -1U) dwProcessId = (DWORD_PTR)CsrGetProcessId();
  
      /* Open a handle to the process */
      ClientId.UniqueThread = NULL;
diff --cc reactos/dll/win32/kernel32/except/except.c
index 726965bae16,7dcbfd9b191..55bcc9ab575
--- a/reactos/dll/win32/kernel32/except/except.c
+++ b/reactos/dll/win32/kernel32/except/except.c
@@@ -219,10 -213,10 +219,10 @@@ UnhandledExceptionFilter(struct _EXCEPT
     LONG RetValue;
     HANDLE DebugPort = NULL;
     NTSTATUS ErrCode;
 -   ULONG ErrorParameters[4];
 +   ULONG_PTR ErrorParameters[4];
     ULONG ErrorResponse;
  
-    if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
+    if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION &&
         ExceptionInfo->ExceptionRecord->NumberParameters >= 2)
     {
        switch(ExceptionInfo->ExceptionRecord->ExceptionInformation[0])
@@@ -316,9 -310,9 +316,9 @@@
  
     /* Save exception code and address */
     ErrorParameters[0] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionCode;
 -   ErrorParameters[1] = (ULONG)ExceptionInfo->ExceptionRecord->ExceptionAddress;
 +   ErrorParameters[1] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress;
  
-    if (ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION)
+    if ((NTSTATUS)ExceptionInfo->ExceptionRecord->ExceptionCode == STATUS_ACCESS_VIOLATION)
     {
         /* get the type of operation that caused the access violation */
         ErrorParameters[2] = ExceptionInfo->ExceptionRecord->ExceptionInformation[0];