diff options
Diffstat (limited to 'xorg-server/hw/xwin/winpfbdd.c')
| -rw-r--r-- | xorg-server/hw/xwin/winpfbdd.c | 32 |
1 files changed, 14 insertions, 18 deletions
diff --git a/xorg-server/hw/xwin/winpfbdd.c b/xorg-server/hw/xwin/winpfbdd.c index 010616101..976eba9ad 100644 --- a/xorg-server/hw/xwin/winpfbdd.c +++ b/xorg-server/hw/xwin/winpfbdd.c @@ -73,7 +73,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); @@ -95,7 +95,7 @@ winAllocateFBPrimaryDD(ScreenPtr pScreen) return FALSE; } - ErrorF("winAllocateFBPrimaryDD - Created and initialized DD\n"); + winDebug ("winAllocateFBPrimaryDD - Created and initialized DD\n"); /* Are we windowed or fullscreen? */ if (pScreenInfo->fFullScreen) { @@ -141,7 +141,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 = malloc(sizeof(DDSURFACEDESC)); @@ -175,7 +175,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 @@ -186,7 +186,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, @@ -197,7 +197,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)) @@ -215,7 +215,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; } @@ -339,11 +339,11 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen) else pScreenPriv->dwBitsPerRGB = dwBlueBits; - ErrorF("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n", - (unsigned int) pScreenPriv->dwRedMask, - (unsigned int) pScreenPriv->dwGreenMask, - (unsigned int) pScreenPriv->dwBlueMask, - (int) pScreenPriv->dwBitsPerRGB); + winDebug ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n", + (unsigned int) pScreenPriv->dwRedMask, + (unsigned int) pScreenPriv->dwGreenMask, + (unsigned int) pScreenPriv->dwBlueMask, + (int) pScreenPriv->dwBitsPerRGB); /* Create a single visual according to the Windows screen depth */ switch (pScreenInfo->dwDepth) { @@ -364,9 +364,7 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen) break; case 8: -#if CYGDEBUG winDebug("winInitVisuals - Calling miSetVisualTypesAndMasks\n"); -#endif /* CYGDEBUG */ if (!miSetVisualTypesAndMasks(pScreenInfo->dwDepth, PseudoColorMask, pScreenPriv->dwBitsPerRGB, @@ -378,10 +376,8 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen) "miSetVisualTypesAndMasks failed\n"); return FALSE; } -#if CYGDEBUG winDebug("winInitVisualsPrimaryDD - Returned from " "miSetVisualTypesAndMasks\n"); -#endif /* CYGDEBUG */ break; default: @@ -389,7 +385,7 @@ winInitVisualsPrimaryDD(ScreenPtr pScreen) return FALSE; } - ErrorF("winInitVisualsPrimaryDD - Returning\n"); + winDebug ("winInitVisualsPrimaryDD - Returning\n"); return TRUE; } @@ -516,7 +512,7 @@ winHotKeyAltTabPrimaryDD(ScreenPtr pScreen) winScreenPriv(pScreen); 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; |