DPRINTF->TRACE windows - wine-devel

14 Mar 2003

Change Log: Replace DPRINTF with TRACE
Files changed: windows/dialog.c
                windows/win.c
                windows/winpos.c
Files not changed: windows/dce.c
                    windows/winproc
-- 

Tony Lambregts

Index: dialog.c
===================================================================
RCS file: /home/wine/wine/windows/dialog.c,v
retrieving revision 1.112
diff -u -u -r1.112 dialog.c

--- dialog.c	2 Dec 2002 18:10:57 -0000	1.112
+++ dialog.c	14 Mar 2003 02:29:44 -0000
@@ -391,8 +391,8 @@
             WORD i, count = GET_WORD(p) / sizeof(WORD);
             TRACE("  BEGIN\n");
             TRACE("    ");
-            for (i = 0; i < count; i++) DPRINTF( "%04x,", GET_WORD(p+i+1) );
-            DPRINTF("\n");
+            for (i = 0; i < count; i++) TRACE( "%04x,", GET_WORD(p+i+1) );
+            TRACE("\n");
             TRACE("  END\n" );
         }
         info->data = p + 1;
Index: win.c
===================================================================
RCS file: /home/wine/wine/windows/win.c,v
retrieving revision 1.215
diff -u -u -r1.215 win.c
--- win.c	8 Jan 2003 21:09:25 -0000	1.215
+++ win.c	14 Mar 2003 02:29:45 -0000
@@ -894,28 +894,28 @@
 static void dump_window_styles( DWORD style, DWORD exstyle )
 {
     TRACE( "style:" );
-    if(style & WS_POPUP) DPRINTF(" WS_POPUP");
-    if(style & WS_CHILD) DPRINTF(" WS_CHILD");
-    if(style & WS_MINIMIZE) DPRINTF(" WS_MINIMIZE");
-    if(style & WS_VISIBLE) DPRINTF(" WS_VISIBLE");
-    if(style & WS_DISABLED) DPRINTF(" WS_DISABLED");
-    if(style & WS_CLIPSIBLINGS) DPRINTF(" WS_CLIPSIBLINGS");
-    if(style & WS_CLIPCHILDREN) DPRINTF(" WS_CLIPCHILDREN");
-    if(style & WS_MAXIMIZE) DPRINTF(" WS_MAXIMIZE");
-    if((style & WS_CAPTION) == WS_CAPTION) DPRINTF(" WS_CAPTION");
+    if(style & WS_POPUP) TRACE(" WS_POPUP");
+    if(style & WS_CHILD) TRACE(" WS_CHILD");
+    if(style & WS_MINIMIZE) TRACE(" WS_MINIMIZE");
+    if(style & WS_VISIBLE) TRACE(" WS_VISIBLE");
+    if(style & WS_DISABLED) TRACE(" WS_DISABLED");
+    if(style & WS_CLIPSIBLINGS) TRACE(" WS_CLIPSIBLINGS");
+    if(style & WS_CLIPCHILDREN) TRACE(" WS_CLIPCHILDREN");
+    if(style & WS_MAXIMIZE) TRACE(" WS_MAXIMIZE");
+    if((style & WS_CAPTION) == WS_CAPTION) TRACE(" WS_CAPTION");
     else
     {
-        if(style & WS_BORDER) DPRINTF(" WS_BORDER");
-        if(style & WS_DLGFRAME) DPRINTF(" WS_DLGFRAME");
+        if(style & WS_BORDER) TRACE(" WS_BORDER");
+        if(style & WS_DLGFRAME) TRACE(" WS_DLGFRAME");
     }
-    if(style & WS_VSCROLL) DPRINTF(" WS_VSCROLL");
-    if(style & WS_HSCROLL) DPRINTF(" WS_HSCROLL");
-    if(style & WS_SYSMENU) DPRINTF(" WS_SYSMENU");
-    if(style & WS_THICKFRAME) DPRINTF(" WS_THICKFRAME");
-    if(style & WS_GROUP) DPRINTF(" WS_GROUP");
-    if(style & WS_TABSTOP) DPRINTF(" WS_TABSTOP");
-    if(style & WS_MINIMIZEBOX) DPRINTF(" WS_MINIMIZEBOX");
-    if(style & WS_MAXIMIZEBOX) DPRINTF(" WS_MAXIMIZEBOX");
+    if(style & WS_VSCROLL) TRACE(" WS_VSCROLL");
+    if(style & WS_HSCROLL) TRACE(" WS_HSCROLL");
+    if(style & WS_SYSMENU) TRACE(" WS_SYSMENU");
+    if(style & WS_THICKFRAME) TRACE(" WS_THICKFRAME");
+    if(style & WS_GROUP) TRACE(" WS_GROUP");
+    if(style & WS_TABSTOP) TRACE(" WS_TABSTOP");
+    if(style & WS_MINIMIZEBOX) TRACE(" WS_MINIMIZEBOX");
+    if(style & WS_MAXIMIZEBOX) TRACE(" WS_MAXIMIZEBOX");

     /* FIXME: Add dumping of BS_/ES_/SBS_/LBS_/CBS_/DS_/etc. styles */
 #define DUMPED_STYLES \
@@ -938,29 +938,29 @@
      WS_MINIMIZEBOX | \
      WS_MAXIMIZEBOX)

-    if(style & ~DUMPED_STYLES) DPRINTF(" %08lx", style & ~DUMPED_STYLES);
-    DPRINTF("\n");
+    if(style & ~DUMPED_STYLES) TRACE(" %08lx", style & ~DUMPED_STYLES);
+    TRACE("\n");
 #undef DUMPED_STYLES

     TRACE( "exstyle:" );
-    if(exstyle & WS_EX_DLGMODALFRAME) DPRINTF(" WS_EX_DLGMODALFRAME");
-    if(exstyle & WS_EX_DRAGDETECT) DPRINTF(" WS_EX_DRAGDETECT");
-    if(exstyle & WS_EX_NOPARENTNOTIFY) DPRINTF(" WS_EX_NOPARENTNOTIFY");
-    if(exstyle & WS_EX_TOPMOST) DPRINTF(" WS_EX_TOPMOST");
-    if(exstyle & WS_EX_ACCEPTFILES) DPRINTF(" WS_EX_ACCEPTFILES");
-    if(exstyle & WS_EX_TRANSPARENT) DPRINTF(" WS_EX_TRANSPARENT");
-    if(exstyle & WS_EX_MDICHILD) DPRINTF(" WS_EX_MDICHILD");
-    if(exstyle & WS_EX_TOOLWINDOW) DPRINTF(" WS_EX_TOOLWINDOW");
-    if(exstyle & WS_EX_WINDOWEDGE) DPRINTF(" WS_EX_WINDOWEDGE");
-    if(exstyle & WS_EX_CLIENTEDGE) DPRINTF(" WS_EX_CLIENTEDGE");
-    if(exstyle & WS_EX_CONTEXTHELP) DPRINTF(" WS_EX_CONTEXTHELP");
-    if(exstyle & WS_EX_RIGHT) DPRINTF(" WS_EX_RIGHT");
-    if(exstyle & WS_EX_RTLREADING) DPRINTF(" WS_EX_RTLREADING");
-    if(exstyle & WS_EX_LEFTSCROLLBAR) DPRINTF(" WS_EX_LEFTSCROLLBAR");
-    if(exstyle & WS_EX_CONTROLPARENT) DPRINTF(" WS_EX_CONTROLPARENT");
-    if(exstyle & WS_EX_STATICEDGE) DPRINTF(" WS_EX_STATICEDGE");
-    if(exstyle & WS_EX_APPWINDOW) DPRINTF(" WS_EX_APPWINDOW");
-    if(exstyle & WS_EX_LAYERED) DPRINTF(" WS_EX_LAYERED");
+    if(exstyle & WS_EX_DLGMODALFRAME) TRACE(" WS_EX_DLGMODALFRAME");
+    if(exstyle & WS_EX_DRAGDETECT) TRACE(" WS_EX_DRAGDETECT");
+    if(exstyle & WS_EX_NOPARENTNOTIFY) TRACE(" WS_EX_NOPARENTNOTIFY");
+    if(exstyle & WS_EX_TOPMOST) TRACE(" WS_EX_TOPMOST");
+    if(exstyle & WS_EX_ACCEPTFILES) TRACE(" WS_EX_ACCEPTFILES");
+    if(exstyle & WS_EX_TRANSPARENT) TRACE(" WS_EX_TRANSPARENT");
+    if(exstyle & WS_EX_MDICHILD) TRACE(" WS_EX_MDICHILD");
+    if(exstyle & WS_EX_TOOLWINDOW) TRACE(" WS_EX_TOOLWINDOW");
+    if(exstyle & WS_EX_WINDOWEDGE) TRACE(" WS_EX_WINDOWEDGE");
+    if(exstyle & WS_EX_CLIENTEDGE) TRACE(" WS_EX_CLIENTEDGE");
+    if(exstyle & WS_EX_CONTEXTHELP) TRACE(" WS_EX_CONTEXTHELP");
+    if(exstyle & WS_EX_RIGHT) TRACE(" WS_EX_RIGHT");
+    if(exstyle & WS_EX_RTLREADING) TRACE(" WS_EX_RTLREADING");
+    if(exstyle & WS_EX_LEFTSCROLLBAR) TRACE(" WS_EX_LEFTSCROLLBAR");
+    if(exstyle & WS_EX_CONTROLPARENT) TRACE(" WS_EX_CONTROLPARENT");
+    if(exstyle & WS_EX_STATICEDGE) TRACE(" WS_EX_STATICEDGE");
+    if(exstyle & WS_EX_APPWINDOW) TRACE(" WS_EX_APPWINDOW");
+    if(exstyle & WS_EX_LAYERED) TRACE(" WS_EX_LAYERED");

 #define DUMPED_EX_STYLES \
     (WS_EX_DLGMODALFRAME | \
@@ -982,8 +982,8 @@
      WS_EX_APPWINDOW | \
      WS_EX_LAYERED)

-    if(exstyle & ~DUMPED_EX_STYLES) DPRINTF(" %08lx", exstyle & ~DUMPED_EX_STYLES);
-    DPRINTF("\n");
+    if(exstyle & ~DUMPED_EX_STYLES) TRACE(" %08lx", exstyle & ~DUMPED_EX_STYLES);
+    TRACE("\n");
 #undef DUMPED_EX_STYLES
 }

Index: winpos.c
===================================================================
RCS file: /home/wine/wine/windows/winpos.c,v
retrieving revision 1.143
diff -u -u -r1.143 winpos.c
--- winpos.c	8 Jan 2003 21:09:25 -0000	1.143
+++ winpos.c	14 Mar 2003 02:29:46 -0000
@@ -1127,19 +1127,19 @@
 static void dump_winpos_flags(UINT flags)
 {
     TRACE("flags:");
-    if(flags & SWP_NOSIZE) DPRINTF(" SWP_NOSIZE");
-    if(flags & SWP_NOMOVE) DPRINTF(" SWP_NOMOVE");
-    if(flags & SWP_NOZORDER) DPRINTF(" SWP_NOZORDER");
-    if(flags & SWP_NOREDRAW) DPRINTF(" SWP_NOREDRAW");
-    if(flags & SWP_NOACTIVATE) DPRINTF(" SWP_NOACTIVATE");
-    if(flags & SWP_FRAMECHANGED) DPRINTF(" SWP_FRAMECHANGED");
-    if(flags & SWP_SHOWWINDOW) DPRINTF(" SWP_SHOWWINDOW");
-    if(flags & SWP_HIDEWINDOW) DPRINTF(" SWP_HIDEWINDOW");
-    if(flags & SWP_NOCOPYBITS) DPRINTF(" SWP_NOCOPYBITS");
-    if(flags & SWP_NOOWNERZORDER) DPRINTF(" SWP_NOOWNERZORDER");
-    if(flags & SWP_NOSENDCHANGING) DPRINTF(" SWP_NOSENDCHANGING");
-    if(flags & SWP_DEFERERASE) DPRINTF(" SWP_DEFERERASE");
-    if(flags & SWP_ASYNCWINDOWPOS) DPRINTF(" SWP_ASYNCWINDOWPOS");
+    if(flags & SWP_NOSIZE) TRACE(" SWP_NOSIZE");
+    if(flags & SWP_NOMOVE) TRACE(" SWP_NOMOVE");
+    if(flags & SWP_NOZORDER) TRACE(" SWP_NOZORDER");
+    if(flags & SWP_NOREDRAW) TRACE(" SWP_NOREDRAW");
+    if(flags & SWP_NOACTIVATE) TRACE(" SWP_NOACTIVATE");
+    if(flags & SWP_FRAMECHANGED) TRACE(" SWP_FRAMECHANGED");
+    if(flags & SWP_SHOWWINDOW) TRACE(" SWP_SHOWWINDOW");
+    if(flags & SWP_HIDEWINDOW) TRACE(" SWP_HIDEWINDOW");
+    if(flags & SWP_NOCOPYBITS) TRACE(" SWP_NOCOPYBITS");
+    if(flags & SWP_NOOWNERZORDER) TRACE(" SWP_NOOWNERZORDER");
+    if(flags & SWP_NOSENDCHANGING) TRACE(" SWP_NOSENDCHANGING");
+    if(flags & SWP_DEFERERASE) TRACE(" SWP_DEFERERASE");
+    if(flags & SWP_ASYNCWINDOWPOS) TRACE(" SWP_ASYNCWINDOWPOS");

 #define DUMPED_FLAGS \
     (SWP_NOSIZE | \
@@ -1156,8 +1156,8 @@
     SWP_DEFERERASE | \
     SWP_ASYNCWINDOWPOS)

-    if(flags & ~DUMPED_FLAGS) DPRINTF(" %08x", flags & ~DUMPED_FLAGS);
-    DPRINTF("\n");
+    if(flags & ~DUMPED_FLAGS) TRACE(" %08x", flags & ~DUMPED_FLAGS);
+    TRACE("\n");
 #undef DUMPED_FLAGS
 }


    