Changeset 10433 for trunk/src

Timestamp:

Jan 30, 2004, 11:17:00 PM (22 years ago)

Author:

bird

Message:

#682: Test for DEBUG_LOGGING not DEBUG. dprintf may be used in release.

Location:

trunk/src/kernel32

Files:

• hmcomm.cpp (modified) (10 diffs)
• oslibdebug.cpp (modified) (9 diffs)
• windllbase.cpp (modified) (2 diffs)

trunk/src/kernel32/hmcomm.cpp

@@ -1 @@
-/* $Id: hmcomm.cpp,v 1.40 2003-07-28 11:35:31 sandervl Exp $ */
+/* $Id: hmcomm.cpp,v 1.41 2004-01-30 22:16:59 bird Exp $ */
 
 /*
@@ -62 +62 @@
 static DWORD CommWriteIOHandler(LPASYNCIOREQUEST lpRequest, DWORD *lpdwResult, DWORD *lpdwTimeOut);
 static DWORD CommPollIOHandler(LPASYNCIOREQUEST lpRequest, DWORD *lpdwResult, DWORD *lpdwTimeOut);
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 static char *DebugCommEvent(DWORD dwEvents);
 static char *DebugModemStatus(DWORD dwModemStatus);
@@ -249 +249 @@
             comnr = comname[3] - '1';
 
-            if(handler[comnr] == NULL) 
+            if(handler[comnr] == NULL)
             {
                 try {
@@ -445 +445 @@
         dwEvent |= (COMEvt&0x0080)? EV_ERR:0;
         dwEvent |= (COMEvt&0x0100)? EV_RING:0;
- 
+
 #ifdef DEBUG
         if(dwEvent & EV_ERR) {
@@ -460 +460 @@
         }
 #endif
-        if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR)) 
+        if((dwEvent & EV_RXCHAR) && (dwMask & EV_RXCHAR))
         {
             //check if there's really data in the in queue
@@ -552 +552 @@
                         &ulBytesWritten);
 
-    if(lpNumberOfBytesWritten) { 
+    if(lpNumberOfBytesWritten) {
        *lpNumberOfBytesWritten = (ret) ? ulBytesWritten : 0;
        dprintf2(("KERNEL32:HMDeviceCommClass::WriteFile %d byte(s) written", *lpNumberOfBytesWritten));
@@ -942 +942 @@
   USHORT COMErr;
 
-  if(lpdwErrors == NULL) 
+  if(lpdwErrors == NULL)
      lpdwErrors = &dwError;
- 
+
   dprintf(("HMDeviceCommClass::ClearCommError"));
   ulLen = sizeof(USHORT);
@@ -1666 +1666 @@
     }
 }
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 //******************************************************************************
 //******************************************************************************
@@ -1672 +1672 @@
 {
     static char szCommEvents[128];
- 
+
     szCommEvents[0] = 0;
 
@@ -1706 +1706 @@
 {
     static char szModemStatus[128];
- 
+
     szModemStatus[0] = 0;
 

trunk/src/kernel32/oslibdebug.cpp

@@ -1 @@
-/* $Id: oslibdebug.cpp,v 1.7 2002-05-28 09:53:34 sandervl Exp $ */
+/* $Id: oslibdebug.cpp,v 1.8 2004-01-30 22:17:00 bird Exp $ */
 
 /*
@@ -93 +93 @@
   HEV    hevSem           = 0,
          hevQSem          = 0,
-         hevWinQSem       = 0;   
+         hevWinQSem       = 0;  
   uDB_t  DbgBuf           = {0};
   int    rc, rc2;
@@ -237 +237 @@
         // break;
         if (DbgBuf.Value == 0 && DbgBuf.Buffer == XCPT_BREAKPOINT)
-        { 
+        {
           dprintf(("Breakpoint encountered"));
-          // This may be win32 event exception as well as common int3 
+          // This may be win32 event exception as well as common int3
           Priority = 0;
           ulElemCode = 0;
@@ -252 +252 @@
              //Forward it to receiver
              lpde2 = (LPDEBUG_EVENT) malloc(sizeof(DEBUG_EVENT));
-             OSLibDebugReadMemory ( lpde, lpde2,sizeof(DEBUG_EVENT),NULL);  
+             OSLibDebugReadMemory ( lpde, lpde2,sizeof(DEBUG_EVENT),NULL);
+             #ifdef DEBUG
              dprintf(("DebugThread Win32 Event %s",GetDebugMsgText(lpde2->dwDebugEventCode)));
+             #endif
              DosWriteQueue(QueueHandle, 0, sizeof(DEBUG_EVENT), lpde2, 0);
              //Stay stopped
           }
           dprintf(("DebugThread - waiting for continue signal"));
-          DosWaitEventSem(hevSem, SEM_INDEFINITE_WAIT);          
+          DosWaitEventSem(hevSem, SEM_INDEFINITE_WAIT);
           DosResetEventSem(hevSem,&ulNumCalled);
           DbgBuf.Cmd = DBG_C_ReadReg;
@@ -272 +274 @@
           DbgBuf.Value = XCPT_CONTINUE_EXECUTION;
           goto DebugApi;
-       } 
+       }
        DbgBuf.Cmd = DBG_C_Continue;
        DbgBuf.Value = XCPT_CONTINUE_SEARCH;
@@ -592 +594 @@
   USHORT sel = RestoreOS2FS();
   APIRET rc;
-  dprintf(("OSLibDebugReadMemory - reading from pid %d",superpid));        
+  dprintf(("OSLibDebugReadMemory - reading from pid %d",superpid));     
   DbgBuf.Pid = superpid;
   DbgBuf.Cmd = DBG_C_ReadMemBuf;
@@ -625 +627 @@
   PID    pidOwner;
 
-  dprintf(("OSLibAddWin32Event"));         
+  dprintf(("OSLibAddWin32Event"));      
   // open main debug semaphore
   strcat(SemName, itoa(getpid(),tmp, 10));
@@ -662 +664 @@
   }
   _interrupt(3);
-  free(lpde_copy);  
+  free(lpde_copy);
   DosCloseEventSem(hevSem);
   DosCloseQueue(WinQueueHandle);
@@ -668 +670 @@
   return TRUE;
 fail:
-  if (lpde_copy) free(lpde_copy);  
+  if (lpde_copy) free(lpde_copy);
   DosCloseEventSem(hevSem);
   DosCloseQueue(WinQueueHandle);

trunk/src/kernel32/windllbase.cpp

@@ -1 @@
-/* $Id: windllbase.cpp,v 1.34 2004-01-15 10:39:06 sandervl Exp $ */
+/* $Id: windllbase.cpp,v 1.35 2004-01-30 22:17:00 bird Exp $ */
 
 /*
@@ -213 +213 @@
  Win32DllBase *dll;
 
+#ifdef DEBUG
     dprintf(("Win32DllBase::AddRef %s->%s %d", parentname, getModuleName(), referenced+1));
+#endif
     ++referenced;
 #ifdef DEBUG