Replace ErrorF with winDebug in all CYGDEBUG sections

14 files changed, 78 insertions, 78 deletions

diff --git a/hw/xwin/InitInput.c b/hw/xwin/InitInput.c
index d55c7ade0..6219fa2b9 100644
--- a/hw/xwin/InitInput.c
+++ b/hw/xwin/InitInput.c
@@ -118,7 +118,7 @@ InitInput (int argc, char *argv[])
   DeviceIntPtr		pMouse, pKeyboard;
 
 #if CYGDEBUG
-  ErrorF ("InitInput\n");
+  winDebug ("InitInput\n");
 #endif
 
 #ifdef XWIN_CLIPBOARD
@@ -167,7 +167,7 @@ InitInput (int argc, char *argv[])
     }
 
 #if CYGDEBUG
-  ErrorF ("InitInput - returning\n");
+  winDebug ("InitInput - returning\n");
 #endif
 }
 
diff --git a/hw/xwin/winallpriv.c b/hw/xwin/winallpriv.c
index 072fb494e..8fca13926 100644
--- a/hw/xwin/winallpriv.c
+++ b/hw/xwin/winallpriv.c
@@ -47,7 +47,7 @@ winAllocatePrivates (ScreenPtr pScreen)
   winPrivScreenPtr	pScreenPriv;
 
 #if CYGDEBUG
-  ErrorF ("winAllocateScreenPrivates - g_ulServerGeneration: %d "
+  winDebug ("winAllocateScreenPrivates - g_ulServerGeneration: %d "
 	  "serverGeneration: %d\n",
 	  g_ulServerGeneration, serverGeneration);
 #endif
@@ -119,7 +119,7 @@ Bool
 winInitCmapPrivates (ColormapPtr pcmap)
 {
 #if CYGDEBUG
-  ErrorF ("winInitCmapPrivates\n");
+  winDebug ("winInitCmapPrivates\n");
 #endif
   
   /*
@@ -145,7 +145,7 @@ winAllocateCmapPrivates (ColormapPtr pCmap)
   static unsigned long		s_ulPrivateGeneration = 0;
 
 #if CYGDEBUG
-  ErrorF ("winAllocateCmapPrivates\n");
+  winDebug ("winAllocateCmapPrivates\n");
 #endif
 
   /* Get a new privates index when the server generation changes */
@@ -173,7 +173,7 @@ winAllocateCmapPrivates (ColormapPtr pCmap)
   winSetCmapPriv (pCmap, pCmapPriv);
 
 #if CYGDEBUG
-  ErrorF ("winAllocateCmapPrivates - Returning\n");
+  winDebug ("winAllocateCmapPrivates - Returning\n");
 #endif
 
   return TRUE;
diff --git a/hw/xwin/windialogs.c b/hw/xwin/windialogs.c
index ad8272843..4a1862896 100755
--- a/hw/xwin/windialogs.c
+++ b/hw/xwin/windialogs.c
@@ -443,7 +443,7 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
   static ScreenPtr		s_pScreen = NULL;
 
 #if CYGDEBUG
-  ErrorF ("winChangeDepthDlgProc\n");
+  winDebug ("winChangeDepthDlgProc\n");
 #endif
 
   /* Branch on message type */
@@ -451,7 +451,7 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
     {
     case WM_INITDIALOG:
 #if CYGDEBUG
-      ErrorF ("winChangeDepthDlgProc - WM_INITDIALOG\n");
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG\n");
 #endif
 
       /* Store pointers to private structures for future use */
@@ -460,13 +460,13 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
       s_pScreen = s_pScreenInfo->pScreen;
 
 #if CYGDEBUG
-      ErrorF ("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
 	      "s_pScreenInfo: %08x, s_pScreen: %08x\n",
 	      s_pScreenPriv, s_pScreenInfo, s_pScreen);
 #endif
 
 #if CYGDEBUG
-      ErrorF ("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
+      winDebug ("winChangeDepthDlgProc - WM_INITDIALOG - orig bpp: %d, "
 	      "last bpp: %d\n",
 	      s_pScreenInfo->dwBPP,
 	      s_pScreenPriv->dwLastWindowsBitsPixel);
@@ -484,7 +484,7 @@ winChangeDepthDlgProc (HWND hwndDialog, UINT message,
 
     case WM_DISPLAYCHANGE:
 #if CYGDEBUG
-      ErrorF ("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
+      winDebug ("winChangeDepthDlgProc - WM_DISPLAYCHANGE - orig bpp: %d, "
 	      "last bpp: %d, new bpp: %d\n",
 	      s_pScreenInfo->dwBPP,
 	      s_pScreenPriv->dwLastWindowsBitsPixel,
@@ -598,7 +598,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
   static ScreenPtr		s_pScreen = NULL;
 
 #if CYGDEBUG
-  ErrorF ("winAboutDlgProc\n");
+  winDebug ("winAboutDlgProc\n");
 #endif
 
   /* Branch on message type */
@@ -606,7 +606,7 @@ winAboutDlgProc (HWND hwndDialog, UINT message,
     {
     case WM_INITDIALOG:
 #if CYGDEBUG
-      ErrorF ("winAboutDlgProc - WM_INITDIALOG\n");
+      winDebug ("winAboutDlgProc - WM_INITDIALOG\n");
 #endif
 
       /* Store pointers to private structures for future use */
diff --git a/hw/xwin/winfont.c b/hw/xwin/winfont.c
index 08361c9ee..4c633af80 100644
--- a/hw/xwin/winfont.c
+++ b/hw/xwin/winfont.c
@@ -36,7 +36,7 @@ Bool
 winRealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
 {
 #if CYGDEBUG
-  ErrorF ("winRealizeFont()\n");
+  winDebug ("winRealizeFont()\n");
 #endif
   return TRUE;
 }
@@ -47,7 +47,7 @@ Bool
 winUnrealizeFontNativeGDI (ScreenPtr pScreen, FontPtr pFont)
 {
 #if CYGDEBUG
-  ErrorF ("winUnrealizeFont()\n");
+  winDebug ("winUnrealizeFont()\n");
 #endif
   return TRUE;
 }
diff --git a/hw/xwin/winmultiwindowshape.c b/hw/xwin/winmultiwindowshape.c
index a21bbe9f3..be335fe32 100755
--- a/hw/xwin/winmultiwindowshape.c
+++ b/hw/xwin/winmultiwindowshape.c
@@ -91,7 +91,7 @@ winReshapeMultiWindow (WindowPtr pWin)
   winWindowPriv(pWin);
 
 #if CYGDEBUG
-  ErrorF ("winReshape ()\n");
+  winDebug ("winReshape ()\n");
 #endif
   
   /* Bail if the window is the root window */
diff --git a/hw/xwin/winmultiwindowwm.c b/hw/xwin/winmultiwindowwm.c
index 36cae5fae..1beaf6512 100644
--- a/hw/xwin/winmultiwindowwm.c
+++ b/hw/xwin/winmultiwindowwm.c
@@ -1050,7 +1050,7 @@ winInitWM (void **ppWMInfo,
     }
 
 #if CYGDEBUG || YES
-  ErrorF ("winInitWM - Returning.\n");
+  winDebug ("winInitWM - Returning.\n");
 #endif
 
   return TRUE;
diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c
index 227d74dc8..959fef991 100644
--- a/hw/xwin/winpfbdd.c
+++ b/hw/xwin/winpfbdd.c
@@ -377,7 +377,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
 
     case 8:
 #if CYGDEBUG
-      ErrorF ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+      winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
 #endif /* CYGDEBUG */
       if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,
 				     PseudoColorMask,
@@ -392,7 +392,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
 	  return FALSE;
 	}
 #if CYGDEBUG
-      ErrorF ("winInitVisualsPrimaryDD - Returned from "
+      winDebug ("winInitVisualsPrimaryDD - Returned from "
 	      "miSetVisualTypesAndMasks\n");
 #endif /* CYGDEBUG */
       break;
diff --git a/hw/xwin/winpixmap.c b/hw/xwin/winpixmap.c
index ff775179b..e1fa34f0c 100644
--- a/hw/xwin/winpixmap.c
+++ b/hw/xwin/winpixmap.c
@@ -76,7 +76,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
     }
 
 #if CYGDEBUG
-  ErrorF ("winCreatePixmap () - w %d h %d d %d bw %d\n",
+  winDebug ("winCreatePixmap () - w %d h %d d %d bw %d\n",
 	  iWidth, iHeight, iDepth,
 	  PixmapBytePad (iWidth, iDepth));
 #endif
@@ -119,7 +119,7 @@ winCreatePixmapNativeGDI (ScreenPtr pScreen,
 						(BITMAPINFO **) &pPixmapPriv->pbmih);
 
 #if CYGDEBUG
-  ErrorF ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
+  winDebug ("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for " \
 	  "screen: %08x\n",
 	  pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
 #endif
@@ -140,7 +140,7 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
   winPrivPixmapPtr		pPixmapPriv = NULL;
   
 #if CYGDEBUG
-  ErrorF ("winDestroyPixmapNativeGDI ()\n");
+  winDebug ("winDestroyPixmapNativeGDI ()\n");
 #endif
 
   /* Bail early if there is not a pixmap to destroy */
@@ -154,7 +154,7 @@ winDestroyPixmapNativeGDI (PixmapPtr pPixmap)
   pPixmapPriv = winGetPixmapPriv (pPixmap);
 
 #if CYGDEBUG
-  ErrorF ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
+  winDebug ("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
 	  pPixmapPriv->hBitmap);
 #endif
 
diff --git a/hw/xwin/winprocarg.c b/hw/xwin/winprocarg.c
index 3119aeb19..a7302fe82 100755
--- a/hw/xwin/winprocarg.c
+++ b/hw/xwin/winprocarg.c
@@ -214,7 +214,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
     }
 
 #if CYGDEBUG
-  winErrorFVerb (2, "ddxProcessArgument - arg: %s\n", argv[i]);
+  winDebug ("ddxProcessArgument - arg: %s\n", argv[i]);
 #endif
 
   /*
@@ -249,7 +249,7 @@ ddxProcessArgument (int argc, char *argv[], int i)
       int		iWidth, iHeight;
 
 #if CYGDEBUG
-      winErrorFVerb (2, "ddxProcessArgument - screen - argc: %d i: %d\n",
+      winDebug ("ddxProcessArgument - screen - argc: %d i: %d\n",
 	      argc, i);
 #endif
 
diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c
index 3a03e3faf..6dd37cf04 100644
--- a/hw/xwin/winscrinit.c
+++ b/hw/xwin/winscrinit.c
@@ -108,7 +108,7 @@ winScreenInit (int index,
   HDC			hdc;
 
 #if CYGDEBUG || YES
-  winErrorFVerb (2, "winScreenInit - dwWidth: %ld dwHeight: %ld\n",
+  winDebug ("winScreenInit - dwWidth: %ld dwHeight: %ld\n",
 	  pScreenInfo->dwWidth, pScreenInfo->dwHeight);
 #endif
 
diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c
index 241f0bc6c..7aa553560 100644
--- a/hw/xwin/winshaddd.c
+++ b/hw/xwin/winshaddd.c
@@ -146,7 +146,7 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
     }
   
 #if CYGDEBUG
-  ErrorF ("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
+  winDebug ("winCreatePrimarySurfaceShadowDD - Created primary surface\n");
 #endif
 
   /*
@@ -164,7 +164,7 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winCreatePrimarySurfaceShadowDD - Attached clipper to "
+  winDebug ("winCreatePrimarySurfaceShadowDD - Attached clipper to "
 	  "primary surface\n");
 #endif
 
@@ -226,7 +226,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   DDSURFACEDESC		*pddsdShadow = NULL;
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD\n");
+  winDebug ("winAllocateFBShadowDD\n");
 #endif
 
   /* Create a clipper */
@@ -241,7 +241,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Created a clipper\n");
+  winDebug ("winAllocateFBShadowDD - Created a clipper\n");
 #endif
 
   /* Get a device context for the screen  */
@@ -260,7 +260,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Attached clipper to window\n");
+  winDebug ("winAllocateFBShadowDD - Attached clipper to window\n");
 #endif
 
   /* Create a DirectDraw object, store the address at lpdd */
@@ -273,7 +273,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD () - Created and initialized DD\n");
+  winDebug ("winAllocateFBShadowDD () - Created and initialized DD\n");
 #endif
 
   /* Get a DirectDraw2 interface pointer */
@@ -434,7 +434,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
     }
   
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Created shadow\n");
+  winDebug ("winAllocateFBShadowDD - Created shadow\n");
 #endif
 
   /* Allocate a DD surface description for our screen privates */
@@ -449,7 +449,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   pddsdShadow->dwSize = sizeof (*pddsdShadow);
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Locking shadow\n");
+  winDebug ("winAllocateFBShadowDD - Locking shadow\n");
 #endif
 
   /* Lock the shadow surface */
@@ -466,7 +466,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Locked shadow\n");
+  winDebug ("winAllocateFBShadowDD - Locked shadow\n");
 #endif
 
   /* We don't know how to deal with anything other than RGB */
@@ -489,7 +489,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen)
   pScreenPriv->dwBlueMask = pddsdShadow->ddpfPixelFormat.u4.dwBBitMask;
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowDD - Returning\n");
+  winDebug ("winAllocateFBShadowDD - Returning\n");
 #endif
 
   return TRUE;
@@ -673,7 +673,7 @@ winCloseScreenShadowDD (int nIndex, ScreenPtr pScreen)
   Bool			fReturn;
   
 #if CYGDEBUG
-  ErrorF ("winCloseScreenShadowDD - Freeing screen resources\n");
+  winDebug ("winCloseScreenShadowDD - Freeing screen resources\n");
 #endif
 
   /* Flag that the screen is closed */
@@ -918,7 +918,7 @@ winInitVisualsShadowDD (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winInitVisualsShadowDD - Returning\n");
+  winDebug ("winInitVisualsShadowDD - Returning\n");
 #endif
 
   return TRUE;
@@ -1365,7 +1365,7 @@ winDestroyColormapShadowDD (ColormapPtr pColormap)
   if (pColormap->flags & IsDefault)
     {
 #if CYGDEBUG
-      ErrorF ("winDestroyColormapShadowDD - Destroying default "
+      winDebug ("winDestroyColormapShadowDD - Destroying default "
 	      "colormap\n");
 #endif
       
diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c
index a455ca033..71a993acf 100644
--- a/hw/xwin/winshadgdi.c
+++ b/hw/xwin/winshadgdi.c
@@ -139,7 +139,7 @@ winQueryScreenDIBFormat (ScreenPtr pScreen, BITMAPINFOHEADER *pbmih)
   /* Get a pointer to bitfields */
   pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
 
-  ErrorF ("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",
+  winDebug ("winQueryScreenDIBFormat - First call masks: %08x %08x %08x\n",
 	  pdw[0], pdw[1], pdw[2]);
 #endif
 
@@ -226,11 +226,11 @@ winQueryRGBBitsAndMasks (ScreenPtr pScreen)
       pdw = (DWORD*) ((CARD8*)pbmih + sizeof (BITMAPINFOHEADER));
       
 #if CYGDEBUG
-      ErrorF ("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
+      winDebug ("%s - Masks: %08x %08x %08x\n", __FUNCTION__,
 	      pdw[0], pdw[1], pdw[2]);
-      ErrorF ("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
+      winDebug ("%s - Bitmap: %dx%d %d bpp %d planes\n", __FUNCTION__,
               pbmih->biWidth, pbmih->biHeight, pbmih->biBitCount, pbmih->biPlanes);
-      ErrorF ("%s - Compression: %d %s\n", __FUNCTION__,
+      winDebug ("%s - Compression: %d %s\n", __FUNCTION__,
               pbmih->biCompression,
               (pbmih->biCompression == BI_RGB?"(BI_RGB)":
                (pbmih->biCompression == BI_RLE8?"(BI_RLE8)":
@@ -388,7 +388,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
   else
     {
 #if CYGDEBUG
-      ErrorF ("winAllocateFBShadowGDI - Shadow buffer allocated\n");
+      winDebug ("winAllocateFBShadowGDI - Shadow buffer allocated\n");
 #endif
     }
 
@@ -399,7 +399,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 
 #if CYGDEBUG || YES
   /* Print information about bitmap allocated */
-  ErrorF ("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
+  winDebug ("winAllocateFBShadowGDI - Dibsection width: %d height: %d "
 	  "depth: %d size image: %d\n",
 	  (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight,
 	  dibsection.dsBmih.biBitCount,
@@ -411,7 +411,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 		pScreenPriv->hbmpShadow);
 
 #if CYGDEBUG
-  ErrorF ("winAllocateFBShadowGDI - Attempting a shadow blit\n");
+  winDebug ("winAllocateFBShadowGDI - Attempting a shadow blit\n");
 #endif
 
   /* Do a test blit from the shadow to the screen, I think */
@@ -424,7 +424,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
   if (fReturn)
     {
 #if CYGDEBUG
-      ErrorF ("winAllocateFBShadowGDI - Shadow blit success\n");
+      winDebug ("winAllocateFBShadowGDI - Shadow blit success\n");
 #endif
     }
   else
@@ -452,7 +452,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen)
 			   * 8) / pScreenInfo->dwBPP;
 
 #if CYGDEBUG || YES
-  ErrorF ("winAllocateFBShadowGDI - Created shadow stride: %d\n",
+  winDebug ("winAllocateFBShadowGDI - Created shadow stride: %d\n",
 	  (int) pScreenInfo->dwStride);
 #endif
 
@@ -622,7 +622,7 @@ winCloseScreenShadowGDI (int nIndex, ScreenPtr pScreen)
   Bool			fReturn;
 
 #if CYGDEBUG
-  ErrorF ("winCloseScreenShadowGDI - Freeing screen resources\n");
+  winDebug ("winCloseScreenShadowGDI - Freeing screen resources\n");
 #endif
 
   /* Flag that the screen is closed */
@@ -813,7 +813,7 @@ winInitVisualsShadowGDI (ScreenPtr pScreen)
     }
 
 #if CYGDEBUG
-  ErrorF ("winInitVisualsShadowGDI - Returning\n");
+  winDebug ("winInitVisualsShadowGDI - Returning\n");
 #endif
 
   return TRUE;
@@ -1007,14 +1007,14 @@ winRealizeInstalledPaletteShadowGDI (ScreenPtr pScreen)
   winPrivCmapPtr	pCmapPriv = NULL;
 
 #if CYGDEBUG
-  ErrorF ("winRealizeInstalledPaletteShadowGDI\n");
+  winDebug ("winRealizeInstalledPaletteShadowGDI\n");
 #endif
 
   /* Don't do anything if there is not a colormap */
   if (pScreenPriv->pcmapInstalled == NULL)
     {
 #if CYGDEBUG
-      ErrorF ("winRealizeInstalledPaletteShadowGDI - No colormap "
+      winDebug ("winRealizeInstalledPaletteShadowGDI - No colormap "
 	      "installed\n");
 #endif
       return TRUE;
@@ -1244,7 +1244,7 @@ winDestroyColormapShadowGDI (ColormapPtr pColormap)
   if (pColormap->flags & IsDefault)
     {
 #if CYGDEBUG
-      ErrorF ("winDestroyColormapShadowGDI - Destroying default "
+      winDebug ("winDestroyColormapShadowGDI - Destroying default "
 	      "colormap\n");
 #endif
       
diff --git a/hw/xwin/winwindow.c b/hw/xwin/winwindow.c
index 22031a974..86dd71178 100644
--- a/hw/xwin/winwindow.c
+++ b/hw/xwin/winwindow.c
@@ -227,7 +227,7 @@ winCreateWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
 
 #if CYGDEBUG
-  ErrorF ("winCreateWindowRootless ()\n");
+  winDebug ("winCreateWindowRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->CreateWindow(pWin);
@@ -248,7 +248,7 @@ winDestroyWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
 
 #if CYGDEBUG
-  ErrorF ("winDestroyWindowRootless ()\n");
+  winDebug ("winDestroyWindowRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->DestroyWindow(pWin);
@@ -274,7 +274,7 @@ winPositionWindowRootless (WindowPtr pWin, int x, int y)
   Bool			fResult = FALSE;
 
 #if CYGDEBUG
-  ErrorF ("winPositionWindowRootless ()\n");
+  winDebug ("winPositionWindowRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->PositionWindow(pWin, x, y);
@@ -294,7 +294,7 @@ winChangeWindowAttributesRootless (WindowPtr pWin, unsigned long mask)
   Bool			fResult = FALSE;
 
 #if CYGDEBUG
-  ErrorF ("winChangeWindowAttributesRootless ()\n");
+  winDebug ("winChangeWindowAttributesRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->ChangeWindowAttributes(pWin, mask);
@@ -316,7 +316,7 @@ winUnmapWindowRootless (WindowPtr pWin)
   winWindowPriv(pWin);
 
 #if CYGDEBUG
-  ErrorF ("winUnmapWindowRootless ()\n");
+  winDebug ("winUnmapWindowRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->UnrealizeWindow(pWin);
@@ -343,7 +343,7 @@ winMapWindowRootless (WindowPtr pWin)
   Bool			fResult = FALSE;
 
 #if CYGDEBUG
-  ErrorF ("winMapWindowRootless ()\n");
+  winDebug ("winMapWindowRootless ()\n");
 #endif
 
   fResult = winGetScreenPriv(pWin->drawable.pScreen)->RealizeWindow(pWin);
@@ -363,7 +363,7 @@ void
 winSetShapeRootless (WindowPtr pWin)
 {
 #if CYGDEBUG
-  ErrorF ("winSetShapeRootless ()\n");
+  winDebug ("winSetShapeRootless ()\n");
 #endif
 
   winGetScreenPriv(pWin->drawable.pScreen)->SetShape(pWin);
@@ -393,7 +393,7 @@ winAddRgn (WindowPtr pWin, pointer data)
   if (pWin->parent != NULL) 
     {
 #if CYGDEBUG
-      ErrorF ("winAddRgn ()\n");
+      winDebug ("winAddRgn ()\n");
 #endif
       if (pWin->mapped)
 	{
@@ -477,7 +477,7 @@ winReshapeRootless (WindowPtr pWin)
   winWindowPriv(pWin);
 
 #if CYGDEBUG
-  ErrorF ("winReshapeRootless ()\n");
+  winDebug ("winReshapeRootless ()\n");
 #endif
 
   /* Bail if the window is the root window */
diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c
index 344877ceb..c8caaff92 100644
--- a/hw/xwin/winwndproc.c
+++ b/hw/xwin/winwndproc.c
@@ -88,7 +88,7 @@ winWindowProc (HWND hwnd, UINT message,
       && (s_pScreenPriv = GetProp (hwnd, WIN_SCR_PROP)) != NULL)
     {
 #if CYGDEBUG
-      ErrorF ("winWindowProc - Setting privates handle\n");
+      winDebug ("winWindowProc - Setting privates handle\n");
 #endif
       s_pScreenInfo = s_pScreenPriv->pScreenInfo;
       s_pScreen = s_pScreenInfo->pScreen;
@@ -111,7 +111,7 @@ winWindowProc (HWND hwnd, UINT message,
 
     case WM_CREATE:
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_CREATE\n");
+      winDebug ("winWindowProc - WM_CREATE\n");
 #endif
       
       /*
@@ -261,14 +261,14 @@ winWindowProc (HWND hwnd, UINT message,
 	   */
 
 #if CYGDEBUG
-	  ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Dimensions changed\n");
+	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Dimensions changed\n");
 #endif
 	  
 	  /* Release the old primary surface */
 	  (*s_pScreenPriv->pwinReleasePrimarySurface) (s_pScreen);
 
 #if CYGDEBUG
-	  ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Released "
+	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Released "
 		  "primary surface\n");
 #endif
 
@@ -276,7 +276,7 @@ winWindowProc (HWND hwnd, UINT message,
 	  (*s_pScreenPriv->pwinCreatePrimarySurface) (s_pScreen);
 
 #if CYGDEBUG
-	  ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Recreated "
+	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Recreated "
 		  "primary surface\n");
 #endif
 
@@ -291,7 +291,7 @@ winWindowProc (HWND hwnd, UINT message,
       else
 	{
 #if CYGDEBUG
-	  ErrorF ("winWindowProc - WM_DISPLAYCHANGE - Dimensions did not "
+	  winDebug ("winWindowProc - WM_DISPLAYCHANGE - Dimensions did not "
 		  "change\n");
 #endif
 	}
@@ -322,7 +322,7 @@ winWindowProc (HWND hwnd, UINT message,
 	int			iWidth, iHeight;
 
 #if CYGDEBUG
-	ErrorF ("winWindowProc - WM_SIZE\n");
+	winDebug ("winWindowProc - WM_SIZE\n");
 #endif
 
 	/* Break if we do not use scrollbars */
@@ -424,7 +424,7 @@ winWindowProc (HWND hwnd, UINT message,
 	int			iVertPos;
 
 #if CYGDEBUG
-	ErrorF ("winWindowProc - WM_VSCROLL\n");
+	winDebug ("winWindowProc - WM_VSCROLL\n");
 #endif
       
 	/* Get vertical scroll bar info */
@@ -509,7 +509,7 @@ winWindowProc (HWND hwnd, UINT message,
 	int			iHorzPos;
 
 #if CYGDEBUG
-	ErrorF ("winWindowProc - WM_HSCROLL\n");
+	winDebug ("winWindowProc - WM_HSCROLL\n");
 #endif
       
 	/* Get horizontal scroll bar info */
@@ -595,7 +595,7 @@ winWindowProc (HWND hwnd, UINT message,
 	int			iBorderHeight, iBorderWidth;
 
 #if CYGDEBUG	
-	ErrorF ("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
+	winDebug ("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
 		s_pScreenInfo);
 #endif
 
@@ -641,7 +641,7 @@ winWindowProc (HWND hwnd, UINT message,
 
     case WM_ERASEBKGND:
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_ERASEBKGND\n");
+      winDebug ("winWindowProc - WM_ERASEBKGND\n");
 #endif
       /*
        * Pretend that we did erase the background but we don't care,
@@ -652,7 +652,7 @@ winWindowProc (HWND hwnd, UINT message,
 
     case WM_PAINT:
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_PAINT\n");
+      winDebug ("winWindowProc - WM_PAINT\n");
 #endif
       /* Only paint if we have privates and the server is enabled */
       if (s_pScreenPriv == NULL
@@ -675,7 +675,7 @@ winWindowProc (HWND hwnd, UINT message,
     case WM_PALETTECHANGED:
       {
 #if CYGDEBUG
-	ErrorF ("winWindowProc - WM_PALETTECHANGED\n");
+	winDebug ("winWindowProc - WM_PALETTECHANGED\n");
 #endif
 	/*
 	 * Don't process if we don't have privates or a colormap,
@@ -904,7 +904,7 @@ winWindowProc (HWND hwnd, UINT message,
       if (s_pScreenPriv == NULL || s_pScreenInfo->fIgnoreInput)
 	break;
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_MOUSEWHEEL\n");
+      winDebug ("winWindowProc - WM_MOUSEWHEEL\n");
 #endif
       winMouseWheel (s_pScreen, GET_WHEEL_DELTA_WPARAM(wParam));
       break;
@@ -1067,7 +1067,7 @@ winWindowProc (HWND hwnd, UINT message,
 	}
 
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_ACTIVATE\n");
+      winDebug ("winWindowProc - WM_ACTIVATE\n");
 #endif
 
       /*
@@ -1095,7 +1095,7 @@ winWindowProc (HWND hwnd, UINT message,
 	break;
 
 #if CYGDEBUG
-      ErrorF ("winWindowProc - WM_ACTIVATEAPP\n");
+      winDebug ("winWindowProc - WM_ACTIVATEAPP\n");
 #endif
 
       /* Activate or deactivate */