Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-13 16:15:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CSRSRV][CONSRV][USERSRV]: Display complementary redundant information to try to understand problems in CORE-9742 and CORE-10510 (any discrepancy in the redundant info should be the sign of some corruption).

Browse source 
svn path=/trunk/; revision=69881
This commit is contained in:
Hermès Bélusca-Maïto 2015-11-13 19:56:22 +00:00
parent 014a85563d
commit 8f3b6120b2
3 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/csrsrv/thredsup.c
View file

@ -440,8 +440,10 @@ CsrThreadRefcountZero(IN PCSR_THREAD CsrThread)
Status = NtClose(CsrThread->ThreadHandle);
if (!NT_SUCCESS(Status))
DPRINT1("CSR: NtClose failed, we are going to ASSERT, Status = 0x%08lx; [0x%x, 0x%x] Process: 0x%p; ThreadHandle: 0x%p\n",
Status, CsrThread->ClientId.UniqueProcess, CsrThread->ClientId.UniqueThread, CsrProcess, CsrThread->ThreadHandle);
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));
}

14
reactos/win32ss/user/winsrv/consrv/frontends/gui/guiterm.c
View file

@ -169,17 +169,23 @@ GuiConsoleInputThread(PVOID Param)
/* Connect this CSR thread to the USER subsystem */
{
PCSR_THREAD CurrThread = CsrGetClientThread();
PCSR_PROCESS CsrProcess;
DPRINT1("CsrConnectToUser being called; [0x%x, 0x%x]...\n",
CurrThread->ClientId.UniqueProcess, CurrThread->ClientId.UniqueThread);
DPRINT1("CsrConnectToUser being called; 0x%p [0x%x, 0x%x]...\n",
CurrThread, (CurrThread ? CurrThread->ClientId.UniqueProcess : (ULONG_PTR)-1), (CurrThread ? CurrThread->ClientId.UniqueThread : (ULONG_PTR)-1));
pcsrt = CsrConnectToUser();
if (pcsrt == NULL) goto Quit;
hThread = pcsrt->ThreadHandle;
DPRINT1("CsrConnectToUser was successfully called; [0x%x, 0x%x] -- hThread = 0x%p, pcsrt->Process = 0x%p; pcsrt->ThreadHandle = 0x%p from [0x%x, 0x%x]\n",
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,
hThread, pcsrt->Process, pcsrt->ThreadHandle,
CsrProcess, CurrThread,
hThread, pcsrt, pcsrt->Process, pcsrt->ThreadHandle,
pcsrt->ClientId.UniqueProcess, pcsrt->ClientId.UniqueThread);
}

5
reactos/win32ss/user/winsrv/usersrv/shutdown.c
View file

@ -755,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