sync trunk head (r37928)

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

diff --cc reactos/dll/cpl/sysdm/startrec.c
Simple merge

diff --cc reactos/dll/win32/advapi32/reg/reg.c
Simple merge

diff --cc reactos/dll/win32/beepmidi/beepmidi.c
Simple merge

diff --cc reactos/dll/win32/kernel32/debug/debugger.c
index 84f81fc,8307530..0a9b551
--- 1/reactos/dll/win32/kernel32/debug/debugger.c
--- 2/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 726965b,7dcbfd9..55bcc9a
--- 1/reactos/dll/win32/kernel32/except/except.c
--- 2/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];

diff --cc reactos/dll/win32/kernel32/thread/thread.c
Simple merge

diff --cc reactos/dll/win32/lsasrv/lsasrv.rbuild
Simple merge

diff --cc reactos/dll/win32/msafd/misc/dllmain.c
Simple merge

diff --cc reactos/drivers/setup/blue/font.c
Simple merge

diff --cc reactos/drivers/video/videoprt/videoprt.c
Simple merge

diff --cc reactos/hal/halx86/include/apic.h
Simple merge

diff --cc reactos/hal/halx86/mp/apic.c
Simple merge

diff --cc reactos/lib/sdk/crt/stdio/file.c
Simple merge

diff --cc reactos/ntoskrnl/config/i386/cmhardwr.c
Simple merge

diff --cc reactos/ntoskrnl/mm/anonmem.c
Simple merge

diff --cc reactos/ntoskrnl/mm/iospace.c
Simple merge

diff --cc reactos/ntoskrnl/mm/mdlsup.c
Simple merge

diff --cc reactos/ntoskrnl/mm/procsup.c
Simple merge

diff --cc reactos/ntoskrnl/ps/kill.c
Simple merge