1 files changed, 10 insertions, 10 deletions

diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 1a41bb484..005760d98 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -104,7 +104,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   winScreenPriv(pScreen);

   winScreenInfo		*pScreenInfo = pScreenPriv->pScreenInfo;

 

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

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

 

   /* Flag that the screen is closed */

   pScreenPriv->fClosed = TRUE;

@@ -118,7 +118,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   /* Delete the window property */

   RemoveProp (pScreenPriv->hwndScreen, WIN_SCR_PROP);

   

-  ErrorF ("winCloseScreenNativeGDI - Destroying window\n");

+  winDebug ("winCloseScreenNativeGDI - Destroying window\n");

   

   /* Delete tray icon, if we have one */

   if (!pScreenInfo->fNoTrayIcon)

@@ -144,7 +144,7 @@ winCloseScreenNativeGDI (int nIndex, ScreenPtr pScreen)
   /* Free the screen privates for this screen */

   free (pScreenPriv);

 

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

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

 

   return TRUE;

 }

@@ -203,7 +203,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
     }

 

   /* Tell the user how many bits per RGB we are using */

-  ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",

+  winDebug ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",

 	  (int) pScreenPriv->dwBitsPerRGB);

 

   /* Create a single visual according to the Windows screen depth */

@@ -226,7 +226,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
       break;

 

     case 8:

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

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

       if (!miSetVisualTypesAndMasks (pScreenInfo->dwDepth,

 				     StaticColorMask,

 				     pScreenPriv->dwBitsPerRGB,

@@ -245,9 +245,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen)
       return FALSE;

     }

 

-#if 1

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

-#endif

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

 

   return TRUE;

 }

@@ -293,7 +291,7 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
   if (pScreenInfo->dwBPP == WIN_DEFAULT_BPP)

     {

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

-      ErrorF ("winAdjustVideoModeNativeGDI - Using Windows display "

+      winDebug ("winAdjustVideoModeNativeGDI - Using Windows display "

 	      "depth of %d bits per pixel, %d depth\n",

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

 

@@ -303,7 +301,7 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen)
   else if (dwBPP != pScreenInfo->dwBPP)

     {

       /* Warn user if GDI depth is different than -depth parameter */

-      ErrorF ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\

+      winDebug ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\

 	      "using bpp: %d\n",

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

 

@@ -393,11 +391,13 @@ winCreateDIBNativeGDI (int iWidth, int iHeight, int iDepth,
   pbmih->biPlanes = 1;

   pbmih->biBitCount = iDepth;

   pbmih->biCompression = BI_RGB;

+  /*

   pbmih->biSizeImage = 0;

   pbmih->biXPelsPerMeter = 0;

   pbmih->biYPelsPerMeter = 0;

   pbmih->biClrUsed = 0;

   pbmih->biClrImportant = 0;

+  */

 

   /* Setup color table for mono DIBs */

   if (iDepth == 1)