Changeset 10431 for trunk/src

Timestamp:

Jan 30, 2004, 11:10:26 PM (22 years ago)

Author:

bird

Message:

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

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (12 diffs)
• windlg.cpp (modified) (4 diffs)
• wndmsg.cpp (modified) (2 diffs)
• wndmsg.h (modified) (2 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.226 2004-01-11 12:03:16 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.227 2004-01-30 22:10:26 bird Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -135 +135 @@
 VOID APIENTRY DspInitSystemDriverName(PSZ pszDriverName, ULONG lenDriverName);
 
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 static char *DbgGetStringSWPFlags(ULONG flags);
 static char *DbgPrintQFCFlags(ULONG flags);
@@ -189 +189 @@
     SetThreadMessageQueue(hmq);
 
-    //initialize keyboard hook for first thread  
+    //initialize keyboard hook for first thread
     hookInit(hab);
 
@@ -259 +259 @@
     dprintf(("CAPS_GRAPHICS_CHAR_HEIGHT = %d", CapsCharHeight));
     if(CapsCharHeight > 16) {
-       CapsCharHeight = 16; 
+       CapsCharHeight = 16;
     }
 
@@ -372 +372 @@
 }
 //******************************************************************************
-// Turn on CD Polling (window with 2 second timer to check CD disk presence) 
-// 
+// Turn on CD Polling (window with 2 second timer to check CD disk presence)
+//
 // NOTE: This can cause PM hangs when executing a program for a very long time
 //       (block in IOCtl)
@@ -553 +553 @@
     // - thread must not be suspended in WaitMessage
     if(!teb || (msg != WM_CREATE && win32wnd == NULL) || teb->o.odin.fWaitMessageSuspend) {
-        if(teb && teb->o.odin.fWaitMessageSuspend) 
+        if(teb && teb->o.odin.fWaitMessageSuspend)
              dprintf(("OS2: fWaitMessageSuspend window %x msg %x -> run default frame proc", hwnd, msg));
         else dprintf(("OS2: Invalid win32wnd pointer for window %x msg %x", hwnd, msg));
@@ -673 +673 @@
         dprintf(("OS2: WM_SHOW %x %d", hwnd, mp1));
         win32wnd->MsgShow((ULONG)mp1);
- 
-        //if a child window is hidden, then the update region of the 
+
+        //if a child window is hidden, then the update region of the
         //parent changes and a WM_ERASEBKGND is required during the next
         //BeginPaint call.
-        if((ULONG)mp1 == FALSE) 
+        if((ULONG)mp1 == FALSE)
         {
             Win32BaseWindow *parent = win32wnd->getParent();
@@ -729 +729 @@
         HDC  hdcWindow[MAX_OPENDCS];
 
-        if(win32wnd->queryOpenDCs(hdcWindow, MAX_OPENDCS, &nrdcs)) 
+        if(win32wnd->queryOpenDCs(hdcWindow, MAX_OPENDCS, &nrdcs))
         {
             RECTL rcl = {0,0,1,1};
@@ -792 +792 @@
         break;
     }
-   
+
 #ifdef DEBUG
     case WM_SETFOCUS:
@@ -1246 +1246 @@
     // - thread must not be suspended in WaitMessage
     if(!teb || (msg != WM_CREATE && win32wnd == NULL) || teb->o.odin.fWaitMessageSuspend) {
-        if(teb && teb->o.odin.fWaitMessageSuspend) 
+        if(teb && teb->o.odin.fWaitMessageSuspend)
              dprintf(("PMFRAME: fWaitMessageSuspend window %x msg %x -> run default frame proc", hwnd, msg));
         else dprintf(("PMFRAME: Invalid win32wnd pointer for window %x msg %x", hwnd, msg));
@@ -1437 +1437 @@
 
         }
-      
+
         //PF Pure flags should not cause any subsequent messages to win32 windows
         //we should route them to DefFrameWndProc and check highlight.
- 
+
         if ((pswp->fl == SWP_FOCUSACTIVATE) || (pswp->fl == SWP_FOCUSDEACTIVATE))
         {
@@ -2541 +2541 @@
 //******************************************************************************
 
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 static char *DbgGetStringSWPFlags(ULONG flags)
 {

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.36 2002-12-17 14:16:47 sandervl Exp $ */
+/* $Id: windlg.cpp,v 1.37 2004-01-30 22:10:25 bird Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -242 +242 @@
   Win32Dialog *dialog;
   BOOL rc;
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
   RECT dlgRect = *rect;
 #endif
@@ -279 +279 @@
     HWND hChildFirst = 0;
 
-    if(!hwndCtrl) 
+    if(!hwndCtrl)
     {
         hChildFirst = GetWindow(hwndDlg,GW_CHILD);
@@ -384 +384 @@
     }
     dprintf(("USER32: GetNextDlgTabItem %x %x %d", hwndDlg,hwndCtrl,fPrevious));
-    return DIALOG_GetNextTabItem(hwndDlg,hwndDlg,hwndCtrl,fPrevious); 
+    return DIALOG_GetNextTabItem(hwndDlg,hwndDlg,hwndCtrl,fPrevious);
 }
 //******************************************************************************

trunk/src/user32/wndmsg.cpp

@@ -1 @@
-/* $Id: wndmsg.cpp,v 1.19 2002-12-18 12:28:08 sandervl Exp $ */
+/* $Id: wndmsg.cpp,v 1.20 2004-01-30 22:10:25 bird Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -20 +20 @@
 #include "dbglocal.h"
 
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 typedef struct
 {

trunk/src/user32/wndmsg.h

@@ -1 @@
-/* $Id: wndmsg.h,v 1.7 2002-12-18 12:28:08 sandervl Exp $ */
+/* $Id: wndmsg.h,v 1.8 2004-01-30 22:10:24 bird Exp $ */
 /*
  * Win32 window message text function for OS/2
@@ -16 +16 @@
 #endif
 
-#ifdef DEBUG
+#ifdef DEBUG_LOGGING
 char *GetMsgText(int Msg);