Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CSRSRV] Display some other DPRINTs only when CSRSRV is compiled in debugging mode.

Browse source 
Addendum to 835f3ef1.
This commit is contained in:
Hermès Bélusca-Maïto 2021-04-21 19:47:36 +02:00
parent f9aca9f7d2
commit c5b87ac6ac
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
subsystems/win32/csrsrv/api.c
View file

@ -64,7 +64,11 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg,
(!(ServerDll = CsrLoadedServerDll[ServerId]))) (!(ServerDll = CsrLoadedServerDll[ServerId])))
{ {
/* We are beyond the Maximum Server ID */ /* We are beyond the Maximum Server ID */
DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n", ServerId, ServerDll); #ifdef CSR_DBG
DPRINT1("CSRSS: %lx is invalid ServerDllIndex (%08x)\n",
ServerId, ServerDll);
if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
#endif
ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;
return STATUS_ILLEGAL_FUNCTION; return STATUS_ILLEGAL_FUNCTION;
} }
@ -547,7 +551,6 @@ CsrApiRequestThread(IN PVOID Parameter)
ServerId, ServerDll); ServerId, ServerDll);
if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
#endif #endif
ReplyMsg = NULL; ReplyMsg = NULL;
ReplyPort = CsrApiPort; ReplyPort = CsrApiPort;
continue; continue;
@ -560,10 +563,11 @@ CsrApiRequestThread(IN PVOID Parameter)
if (ApiId >= ServerDll->HighestApiSupported) if (ApiId >= ServerDll->HighestApiSupported)
{ {
/* We are beyond the Maximum API ID, or it doesn't exist */ /* We are beyond the Maximum API ID, or it doesn't exist */
#ifdef CSR_DBG
DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n", DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber), CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
&ServerDll->Name); &ServerDll->Name);
#endif
ReplyPort = CsrApiPort; ReplyPort = CsrApiPort;
ReplyMsg = NULL; ReplyMsg = NULL;
continue; continue;
@ -751,7 +755,6 @@ CsrApiRequestThread(IN PVOID Parameter)
ServerId, ServerDll); ServerId, ServerDll);
if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint(); if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
#endif #endif
ReplyPort = CsrApiPort; ReplyPort = CsrApiPort;
ReplyMsg = &ReceiveMsg; ReplyMsg = &ReceiveMsg;
ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;
@ -765,11 +768,12 @@ CsrApiRequestThread(IN PVOID Parameter)
/* Make sure that the ID is within limits, and the entry exists */ /* Make sure that the ID is within limits, and the entry exists */
if (ApiId >= ServerDll->HighestApiSupported) if (ApiId >= ServerDll->HighestApiSupported)
{ {
#ifdef CSR_DBG
/* We are beyond the Maximum API ID, or it doesn't exist */ /* We are beyond the Maximum API ID, or it doesn't exist */
DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n", DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber), CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
&ServerDll->Name); &ServerDll->Name);
#endif
ReplyPort = CsrApiPort; ReplyPort = CsrApiPort;
ReplyMsg = &ReceiveMsg; ReplyMsg = &ReceiveMsg;
ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION; ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;