1 files changed, 14 insertions, 18 deletions

diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c
index 840a839f0..eaa0499fe 100644
--- a/xorg-server/hw/xwin/winpfbdd.c
+++ b/xorg-server/hw/xwin/winpfbdd.c
@@ -75,7 +75,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   DDSURFACEDESC		*pddsdOffscreen = NULL;

   RECT			rcClient;

 

-  ErrorF ("winAllocateFBPrimaryDD\n");

+  winDebug ("winAllocateFBPrimaryDD\n");

 

   /* Get client area location in screen coords */

   GetClientRect (pScreenPriv->hwndScreen, &rcClient);

@@ -100,7 +100,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     }

 

 

-  ErrorF ("winAllocateFBPrimaryDD - Created and initialized DD\n");

+  winDebug ("winAllocateFBPrimaryDD - Created and initialized DD\n");

 

   /* Are we windowed or fullscreen? */

   if (pScreenInfo->fFullScreen)

@@ -151,7 +151,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
        FatalError ("winAllocateFBPrimaryDD - Could not create primary "

 		  "surface %08x\n", (unsigned int) ddrval);

 

-  ErrorF ("winAllocateFBPrimaryDD - Created primary\n");

+  winDebug ("winAllocateFBPrimaryDD - Created primary\n");

 

   /* Allocate a DD surface description for our screen privates */

   pddsdPrimary = pScreenPriv->pddsdPrimary

@@ -187,7 +187,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     FatalError ("winAllocateFBPrimaryDD - Could not create shadow "

 		"surface\n");

   

-  ErrorF ("winAllocateFBPrimaryDD - Created offscreen\n");

+  winDebug ("winAllocateFBPrimaryDD - Created offscreen\n");

 

   /* Allocate a DD surface description for our screen privates */

   pddsdOffscreen = pScreenPriv->pddsdOffscreen

@@ -198,7 +198,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   ZeroMemory (pddsdOffscreen, sizeof (*pddsdOffscreen));

   pddsdOffscreen->dwSize = sizeof (*pddsdOffscreen);

 

-  ErrorF ("winAllocateFBPrimaryDD - Locking primary\n");

+  winDebug ("winAllocateFBPrimaryDD - Locking primary\n");

 

   /* Lock the primary surface */

   ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary,

@@ -210,7 +210,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
     FatalError ("winAllocateFBPrimaryDD - Could not lock "

 		"primary surface\n");

 

-  ErrorF ("winAllocateFBPrimaryDD - Locked primary\n");

+  winDebug ("winAllocateFBPrimaryDD - Locked primary\n");

 

   /* We don't know how to deal with anything other than RGB */

   if (!(pddsdPrimary->ddpfPixelFormat.dwFlags & DDPF_RGB))

@@ -228,7 +228,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen)
   pScreenPriv->dwGreenMask = pddsdPrimary->ddpfPixelFormat.u3.dwGBitMask;

   pScreenPriv->dwBlueMask = pddsdPrimary->ddpfPixelFormat.u4.dwBBitMask;

 

-  ErrorF ("winAllocateFBPrimaryDD - Returning\n");

+  winDebug ("winAllocateFBPrimaryDD - Returning\n");

 

   return TRUE;

 }

@@ -247,7 +247,7 @@ winCloseScreenPrimaryDD (int nIndex, ScreenPtr pScreen)
   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

   Bool			fReturn;

   

-  ErrorF ("winCloseScreenPrimaryDD - Freeing screen resources\n");

+  winDebug ("winCloseScreenPrimaryDD - Freeing screen resources\n");

 

   /* Flag that the screen is closed */

   pScreenPriv->fClosed = TRUE;

@@ -343,7 +343,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
   else

     pScreenPriv->dwBitsPerRGB = dwBlueBits;

   

-  ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",

+  winDebug ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n",

 	  (unsigned int) pScreenPriv->dwRedMask,

 	  (unsigned int) pScreenPriv->dwGreenMask,

 	  (unsigned int) pScreenPriv->dwBlueMask,

@@ -370,9 +370,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
       break;

 

     case 8:

-#if CYGDEBUG

       winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");

-#endif /* CYGDEBUG */

       if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

 				     PseudoColorMask,

 				     pScreenPriv->dwBitsPerRGB,

@@ -385,10 +383,8 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
 		  "miSetVisualTypesAndMasks failed\n");

 	  return FALSE;

 	}

-#if CYGDEBUG

       winDebug ("winInitVisualsPrimaryDD - Returned from "

 	      "miSetVisualTypesAndMasks\n");

-#endif /* CYGDEBUG */

       break;

 

     default:

@@ -396,7 +392,7 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen)
       return FALSE;

     }

 

-  ErrorF ("winInitVisualsPrimaryDD - Returning\n");

+  winDebug ("winInitVisualsPrimaryDD - Returning\n");

 

   return TRUE;

 }

@@ -425,7 +421,7 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

     {

       /* No -depth parameter passed, let the user know the depth being used */

-      ErrorF ("winAdjustVideoModePrimaryDD - Using Windows display "

+      winDebug ("winAdjustVideoModePrimaryDD - Using Windows display "

 	      "depth of %d bits per pixel\n", (int) dwBPP);

 

       /* Use GDI's depth */

@@ -435,13 +431,13 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen)
 	   && pScreenInfo->dwBPP != dwBPP)

     {

       /* FullScreen, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModePrimaryDD - FullScreen, using command "

+      winDebug ("winAdjustVideoModePrimaryDD - FullScreen, using command "

 	      "line depth: %d\n", (int) pScreenInfo->dwBPP);

     }

   else if (dwBPP != pScreenInfo->dwBPP)

     {

       /* Windowed, and GDI depth differs from -depth parameter */

-      ErrorF ("winAdjustVideoModePrimaryDD - Windowed, command line "

+      winDebug ("winAdjustVideoModePrimaryDD - Windowed, command line "

 	      "depth: %d, using depth: %d\n",

 	      (int) pScreenInfo->dwBPP, (int) dwBPP);

 

@@ -559,7 +555,7 @@ winHotKeyAltTabPrimaryDD (ScreenPtr pScreen)
   RECT			rcClient, rcSrc;

   HRESULT		ddrval = DD_OK;

 

-  ErrorF ("\nwinHotKeyAltTabPrimaryDD\n\n");

+  winDebug ("\nwinHotKeyAltTabPrimaryDD\n\n");

 

   /* Alt+Tab was pressed, we will lose focus very soon */

   pScreenPriv->fActive = FALSE;