1 files changed, 9 insertions, 9 deletions

diff --git a/xorg-server/hw/xwin/winnativegdi.c b/xorg-server/hw/xwin/winnativegdi.c
index 8a1455b90..88cc52976 100644
--- a/xorg-server/hw/xwin/winnativegdi.c
+++ b/xorg-server/hw/xwin/winnativegdi.c
@@ -109,7 +109,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;
@@ -123,7 +123,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)
@@ -147,7 +147,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;
 }
@@ -202,8 +202,8 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
     }
 
     /* Tell the user how many bits per RGB we are using */
-    ErrorF("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
-           (int) pScreenPriv->dwBitsPerRGB);
+    winDebug ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n",
+              (int) pScreenPriv->dwBitsPerRGB);
 
     /* Create a single visual according to the Windows screen depth */
     switch (pScreenInfo->dwDepth) {
@@ -223,7 +223,7 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
         break;
 
     case 8:
-        ErrorF("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
+        winDebug ("winInitVisuals - Calling miSetVisualTypesAndMasks\n");
         if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth,
                                       StaticColorMask,
                                       pScreenPriv->dwBitsPerRGB,
@@ -241,9 +241,7 @@ winInitVisualsNativeGDI(ScreenPtr pScreen)
         return FALSE;
     }
 
-#if 1
-    ErrorF("winInitVisualsNativeGDI - Returning\n");
-#endif
+    winDebug ("winInitVisualsNativeGDI - Returning\n");
 
     return TRUE;
 }
@@ -359,11 +357,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) {