[CSRSRV][CONSRV]: Remove the DPRINTs introduced for solving CORE-10510 and CORE-9742.

svn path=/trunk/; revision=69893

diff --git a/reactos/subsystems/win32/csrsrv/thredsup.c b/reactos/subsystems/win32/csrsrv/thredsup.c
index 00e47d9..678a468 100644 (file)
--- a/reactos/subsystems/win32/csrsrv/thredsup.c
+++ b/reactos/subsystems/win32/csrsrv/thredsup.c
@@ -438,13 +438,6 @@ CsrThreadRefcountZero(IN PCSR_THREAD CsrThread)
     {
         UnProtectHandle(CsrThread->ThreadHandle);
         Status = NtClose(CsrThread->ThreadHandle);
     {
         UnProtectHandle(CsrThread->ThreadHandle);
         Status = NtClose(CsrThread->ThreadHandle);

-
-        if (!NT_SUCCESS(Status))
-            DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; P:[0x%x, 0x%x] T:[0x%x, 0x%x] Process: 0x%p; Thread: 0x%p; ThreadHandle: 0x%p\n",
-                    Status, CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread,
-                    CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread,
-                    CsrProcess, CsrThread, CsrThread->ThreadHandle);
-

         ASSERT(NT_SUCCESS(Status));
     }
 
         ASSERT(NT_SUCCESS(Status));
     }
 

diff --git a/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
index 6d4edbe..6b63514 100644 (file)
--- a/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
+++ b/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
@@ -167,28 +167,10 @@ GuiConsoleInputThread(PVOID Param)
     if (!NT_SUCCESS(Status)) goto Quit;
 
     /* Connect this CSR thread to the USER subsystem */
     if (!NT_SUCCESS(Status)) goto Quit;
 
     /* Connect this CSR thread to the USER subsystem */

-    {
-    PCSR_THREAD CurrThread = CsrGetClientThread();
-    PCSR_PROCESS CsrProcess;
-
-    DPRINT1("CsrConnectToUser being called; 0x%p [0x%x, 0x%x]...\n",
-            CurrThread, (CurrThread ? CurrThread->ClientId.UniqueProcess : (HANDLE)-1), (CurrThread ? CurrThread->ClientId.UniqueThread : (HANDLE)-1));
-

     pcsrt = CsrConnectToUser();
     if (pcsrt == NULL) goto Quit;
     hThread = pcsrt->ThreadHandle;
 
     pcsrt = CsrConnectToUser();
     if (pcsrt == NULL) goto Quit;
     hThread = pcsrt->ThreadHandle;
 

-    CurrThread = CsrGetClientThread();
-    CsrProcess = CurrThread->Process;
-
-    DPRINT1("CsrConnectToUser was successfully called; P:[0x%x, 0x%x] T:[0x%x, 0x%x] Process: 0x%p; Thread: 0x%p -- hThread = 0x%p, pcsrt = 0x%p; pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n",
-            CsrProcess->ClientId.UniqueProcess, CsrProcess->ClientId.UniqueThread,
-            CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread,
-            CsrProcess, CurrThread,
-            hThread, pcsrt, pcsrt->Process, pcsrt->ThreadHandle,
-            pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread);
-    }
-

     /* Assign the desktop to this thread */
     if (!SetThreadDesktop(DesktopConsoleThreadInfo.DesktopHandle)) goto Quit;
 
     /* Assign the desktop to this thread */
     if (!SetThreadDesktop(DesktopConsoleThreadInfo.DesktopHandle)) goto Quit;
 


@@ -329,15 +311,8 @@ Quit:
     /* Cleanup CSR thread */
     if (pcsrt)
     {
     /* Cleanup CSR thread */
     if (pcsrt)
     {

-        PCSR_THREAD CurrThread = CsrGetClientThread();
-
-        DPRINT1("CsrDereferenceThread being called; [0x%x, 0x%x] -- hThread = 0x%p, pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n",
-                CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread,
-                hThread, pcsrt->Process, pcsrt->ThreadHandle,
-                pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread);
-

         if (hThread != pcsrt->ThreadHandle)
         if (hThread != pcsrt->ThreadHandle)

-            DPRINT1("WARNING!! hThread != pcsrt->ThreadHandle, you may expect crashes soon!!\n");
+            DPRINT1("WARNING!! hThread (0x%p) != pcsrt->ThreadHandle (0x%p), you may expect crashes soon!!\n", hThread, pcsrt->ThreadHandle);

 
         CsrDereferenceThread(pcsrt);
     }
 
         CsrDereferenceThread(pcsrt);
     }