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));
}
/* 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);
}
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