[ros-diffs] [tkreuzer] 56330: [CSRSRV/CSRSRV2] Hard error parameters are ULONG_PTR, no need to truncate them

Author: tkreuzer
Date: Tue Apr  3 15:02:51 2012
New Revision: 56330

URL: http://svn.reactos.org/svn/reactos?rev=56330&view=rev
Log:
[CSRSRV/CSRSRV2]
Hard error parameters are ULONG_PTR, no need to truncate them

Modified:
    trunk/reactos/subsystems/csr/csrsrv/server.c
    trunk/reactos/subsystems/win32/csrss/csrsrv/server.c

Modified: trunk/reactos/subsystems/csr/csrsrv/server.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/csr/csrsrv/serve...
==============================================================================
--- trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/csr/csrsrv/server.c [iso-8859-1] Tue Apr  3 15:02:51 2012
@@ -662,10 +662,10 @@
             RtlInitUnicodeString(&ErrorSource, L"Windows SubSystem");

/* Set the parameters */
-            ErrorParameters[0] = PtrToUlong(&ErrorSource);
+            ErrorParameters[0] = (ULONG_PTR)&ErrorSource;
             ErrorParameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode;
-            ErrorParameters[2] = PtrToUlong(ExceptionInfo->ExceptionRecord->ExceptionAddress);
-            ErrorParameters[3] = PtrToUlong(ExceptionInfo->ContextRecord);
+            ErrorParameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress;
+            ErrorParameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord;

/* Bugcheck */
             Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED,

Modified: trunk/reactos/subsystems/win32/csrss/csrsrv/server.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csrs...
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/csrsrv/server.c [iso-8859-1] Tue Apr  3 15:02:51 2012
@@ -226,7 +226,7 @@
                 /* No, save the pointer to its shared section in our list */
                 CsrSrvSharedStaticServerData[ServerDll->ServerId] = ServerDll->SharedSection;
             }
-            
+
             /* ReactOS Specific hax */
             if (ServerDll->HighestApiSupported == 0xDEADBABE)
             {
@@ -673,10 +673,10 @@
             RtlInitUnicodeString(&ErrorSource, L"Windows SubSystem");

/* Set the parameters */
-            ErrorParameters[0] = PtrToUlong(&ErrorSource);
+            ErrorParameters[0] = (ULONG_PTR)&ErrorSource;
             ErrorParameters[1] = ExceptionInfo->ExceptionRecord->ExceptionCode;
-            ErrorParameters[2] = PtrToUlong(ExceptionInfo->ExceptionRecord->ExceptionAddress);
-            ErrorParameters[3] = PtrToUlong(ExceptionInfo->ContextRecord);
+            ErrorParameters[2] = (ULONG_PTR)ExceptionInfo->ExceptionRecord->ExceptionAddress;
+            ErrorParameters[3] = (ULONG_PTR)ExceptionInfo->ContextRecord;

/* Bugcheck */
             Status = NtRaiseHardError(STATUS_SYSTEM_PROCESS_TERMINATED,