[CSRSRV][CONSRV][USERSRV]: Display complementary redundant information to try to...

[reactos.git] / reactos / win32ss / user / winsrv / usersrv / shutdown.c

diff --git a/reactos/win32ss/user/winsrv/usersrv/shutdown.c b/reactos/win32ss/user/winsrv/usersrv/shutdown.c
index 8e20ab4..f95dafe 100644 (file)
--- a/reactos/win32ss/user/winsrv/usersrv/shutdown.c
+++ b/reactos/win32ss/user/winsrv/usersrv/shutdown.c
@@ -10,7 +10,6 @@
 
 #include "usersrv.h"
 
-#include <winlogon.h>
 #include <commctrl.h>
 
 #include "resource.h"
@@ -630,7 +629,7 @@ Quit:
 }
 
 static NTSTATUS FASTCALL
-UserExitReactos(PCSR_THREAD CsrThread, UINT Flags)
+UserExitReactOS(PCSR_THREAD CsrThread, UINT Flags)
 {
     NTSTATUS Status;
     LUID CallerLuid;
@@ -756,8 +755,9 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess,
                    IN ULONG Flags,
                    IN BOOLEAN FirstPhase)
 {
-    DPRINT1("UserClientShutdown(0x%p, 0x%x, %s)\n",
-            CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase");
+    DPRINT1("UserClientShutdown(0x%p, 0x%x, %s) - [0x%x, 0x%x]\n",
+            CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase",
+            CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread);
 
     /*
      * Check for process validity
@@ -806,11 +806,11 @@ UserClientShutdown(IN PCSR_PROCESS CsrProcess,
 CSR_API(SrvExitWindowsEx)
 {
     NTSTATUS Status;
-    PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest;
+    PUSER_EXIT_REACTOS ExitReactOSRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactOSRequest;
 
-    Status = UserExitReactos(CsrGetClientThread(), ExitReactosRequest->Flags);
-    ExitReactosRequest->Success   = NT_SUCCESS(Status);
-    ExitReactosRequest->LastError = GetLastError();
+    Status = UserExitReactOS(CsrGetClientThread(), ExitReactOSRequest->Flags);
+    ExitReactOSRequest->Success   = NT_SUCCESS(Status);
+    ExitReactOSRequest->LastError = GetLastError();
 
     return Status;
 }