Author: hbelusca Date: Sun Nov 15 15:18:59 2015 New Revision: 69893
URL: http://svn.reactos.org/svn/reactos?rev=69893&view=rev Log: [CSRSRV][CONSRV]: Remove the DPRINTs introduced for solving CORE-10510 and CORE-9742.
Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
Modified: trunk/reactos/subsystems/win32/csrsrv/thredsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/thr... ============================================================================== --- trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrsrv/thredsup.c [iso-8859-1] Sun Nov 15 15:18:59 2015 @@ -438,13 +438,6 @@ { 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)); }
Modified: trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/consrv/... ============================================================================== --- trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c [iso-8859-1] Sun Nov 15 15:18:59 2015 @@ -167,27 +167,9 @@ 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; - - 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; @@ -329,15 +311,8 @@ /* 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) - 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); }