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

Addendum to 835f3ef1.

diff --git a/subsystems/win32/csrsrv/api.c b/subsystems/win32/csrsrv/api.c
index 6ff8694..39229a1 100644 (file)
--- a/subsystems/win32/csrsrv/api.c
+++ b/subsystems/win32/csrsrv/api.c
@@ -64,7 +64,11 @@ CsrCallServerFromServer(IN PCSR_API_MESSAGE ReceiveMsg,
         (!(ServerDll = CsrLoadedServerDll[ServerId])))
     {
         /* We are beyond the Maximum Server ID */
         (!(ServerDll = CsrLoadedServerDll[ServerId])))
     {
         /* 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;
         return STATUS_ILLEGAL_FUNCTION;
     }
         ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;
         return STATUS_ILLEGAL_FUNCTION;
     }


@@ -547,7 +551,6 @@ CsrApiRequestThread(IN PVOID Parameter)
                             ServerId, ServerDll);
                     if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
 #endif
                             ServerId, ServerDll);
                     if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
 #endif

-

                     ReplyMsg = NULL;
                     ReplyPort = CsrApiPort;
                     continue;
                     ReplyMsg = NULL;
                     ReplyPort = CsrApiPort;
                     continue;


@@ -560,10 +563,11 @@ CsrApiRequestThread(IN PVOID Parameter)
                 if (ApiId >= ServerDll->HighestApiSupported)
                 {
                     /* We are beyond the Maximum API ID, or it doesn't exist */
                 if (ApiId >= ServerDll->HighestApiSupported)
                 {
                     /* We are beyond the Maximum API ID, or it doesn't exist */

+#ifdef CSR_DBG

                     DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
                             CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
                             &ServerDll->Name);
                     DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
                             CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
                             &ServerDll->Name);

-
+#endif

                     ReplyPort = CsrApiPort;
                     ReplyMsg = NULL;
                     continue;
                     ReplyPort = CsrApiPort;
                     ReplyMsg = NULL;
                     continue;


@@ -751,7 +755,6 @@ CsrApiRequestThread(IN PVOID Parameter)
                     ServerId, ServerDll);
             if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
 #endif
                     ServerId, ServerDll);
             if (NtCurrentPeb()->BeingDebugged) DbgBreakPoint();
 #endif

-

             ReplyPort = CsrApiPort;
             ReplyMsg = &ReceiveMsg;
             ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;
             ReplyPort = CsrApiPort;
             ReplyMsg = &ReceiveMsg;
             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 */
         if (ApiId >= ServerDll->HighestApiSupported)
         {
         /* Make sure that the ID is within limits, and the entry exists */
         if (ApiId >= ServerDll->HighestApiSupported)
         {

+#ifdef CSR_DBG

             /* We are beyond the Maximum API ID, or it doesn't exist */
             DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
                     CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
                     &ServerDll->Name);
             /* We are beyond the Maximum API ID, or it doesn't exist */
             DPRINT1("CSRSS: %lx is invalid ApiTableIndex for %Z\n",
                     CSR_API_NUMBER_TO_API_ID(ReceiveMsg.ApiNumber),
                     &ServerDll->Name);

-
+#endif

             ReplyPort = CsrApiPort;
             ReplyMsg = &ReceiveMsg;
             ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;
             ReplyPort = CsrApiPort;
             ReplyMsg = &ReceiveMsg;
             ReplyMsg->Status = STATUS_ILLEGAL_FUNCTION;