diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 3202ae8d9..2f3559981 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -128,7 +128,8 @@ winInitializeDefaultScreens (void) dwWidth = GetSystemMetrics (SM_CXSCREEN); dwHeight = GetSystemMetrics (SM_CYSCREEN); - ErrorF ("winInitializeDefaultScreens - w %d h %d\n", dwWidth, dwHeight); + ErrorF ("winInitializeDefaultScreens - w %d h %d\n", + (int) dwWidth, (int) dwHeight); /* Set a default DPI, if no parameter was passed */ if (monitorResolution == 0) @@ -489,8 +490,8 @@ ddxProcessArgument (int argc, char *argv[], int i) { ErrorF ("ddxProcessArgument - screen - Did not find size arg. " "dwWidth: %d dwHeight: %d\n", - g_ScreenInfo[nScreenNum].dwWidth, - g_ScreenInfo[nScreenNum].dwHeight); + (int) g_ScreenInfo[nScreenNum].dwWidth, + (int) g_ScreenInfo[nScreenNum].dwHeight); iArgsProcessed = 2; g_ScreenInfo[nScreenNum].fUserGaveHeightAndWidth = FALSE; } diff --git a/hw/xwin/wincmap.c b/hw/xwin/wincmap.c index 4fb89a2fd..ddf162feb 100644 --- a/hw/xwin/wincmap.c +++ b/hw/xwin/wincmap.c @@ -366,7 +366,7 @@ winGetPaletteDIB (ScreenPtr pScreen, ColormapPtr pcmap) { ErrorF ("winGetPaletteDIB - Got: %d; " "%d %d %d\n", - pixel, nRed, nGreen, nBlue); + (int) pixel, nRed, nGreen, nBlue); } /* FIXME: Not sure that this bit is needed at all */ diff --git a/hw/xwin/wincreatewnd.c b/hw/xwin/wincreatewnd.c index 336131c8a..4b1c76136 100644 --- a/hw/xwin/wincreatewnd.c +++ b/hw/xwin/wincreatewnd.c @@ -145,9 +145,9 @@ winCreateBoundingWindowWindowed (ScreenPtr pScreen) char szTitle[256]; ErrorF ("winCreateBoundingWindowWindowed - User w: %d h: %d\n", - pScreenInfo->dwUserWidth, pScreenInfo->dwUserHeight); + (int) pScreenInfo->dwUserWidth, (int) pScreenInfo->dwUserHeight); ErrorF ("winCreateBoundingWindowWindowed - Current w: %d h: %d\n", - pScreenInfo->dwWidth, pScreenInfo->dwHeight); + (int) pScreenInfo->dwWidth, (int) pScreenInfo->dwHeight); /* Set the common window style flags */ dwWindowStyle = WS_OVERLAPPED | WS_SYSMENU | WS_MINIMIZEBOX; @@ -447,8 +447,8 @@ winGetWorkArea (RECT *prcWorkArea, winScreenInfo *pScreenInfo) return TRUE; ErrorF ("winGetWorkArea - Original WorkArea: %d %d %d %d\n", - prcWorkArea->top, prcWorkArea->left, - prcWorkArea->bottom, prcWorkArea->right); + (int) prcWorkArea->top, (int) prcWorkArea->left, + (int) prcWorkArea->bottom, (int) prcWorkArea->right); /* Get size of full virtual screen */ iWidth = GetSystemMetrics (SM_CXVIRTUALSCREEN); @@ -491,8 +491,8 @@ winGetWorkArea (RECT *prcWorkArea, winScreenInfo *pScreenInfo) ErrorF ("winGetWorkArea - Adjusted WorkArea for multiple " "monitors: %d %d %d %d\n", - prcWorkArea->top, prcWorkArea->left, - prcWorkArea->bottom, prcWorkArea->right); + (int) prcWorkArea->top, (int) prcWorkArea->left, + (int) prcWorkArea->bottom, (int) prcWorkArea->right); return TRUE; } @@ -510,8 +510,8 @@ winAdjustForAutoHide (RECT *prcWorkArea) HWND hwndAutoHide; ErrorF ("winAdjustForAutoHide - Original WorkArea: %d %d %d %d\n", - prcWorkArea->top, prcWorkArea->left, - prcWorkArea->bottom, prcWorkArea->right); + (int) prcWorkArea->top, (int) prcWorkArea->left, + (int) prcWorkArea->bottom, (int) prcWorkArea->right); /* Find out if the Windows taskbar is set to auto-hide */ ZeroMemory (&abd, sizeof (abd)); @@ -556,8 +556,8 @@ winAdjustForAutoHide (RECT *prcWorkArea) } ErrorF ("winAdjustForAutoHide - Adjusted WorkArea: %d %d %d %d\n", - prcWorkArea->top, prcWorkArea->left, - prcWorkArea->bottom, prcWorkArea->right); + (int) prcWorkArea->top, (int) prcWorkArea->left, + (int) prcWorkArea->bottom, (int) prcWorkArea->right); #if 0 /* Obtain the task bar window dimensions */ diff --git a/hw/xwin/winengine.c b/hw/xwin/winengine.c index d76e58628..ba2f989af 100644 --- a/hw/xwin/winengine.c +++ b/hw/xwin/winengine.c @@ -133,7 +133,7 @@ winDetectSupportedEngines () } ErrorF ("winDetectSupportedEngines - Returning, supported engines %08x\n", - g_dwEnginesSupported); + (unsigned int) g_dwEnginesSupported); } @@ -196,7 +196,7 @@ winSetEngine (ScreenPtr pScreen) if (g_dwEnginesSupported & pScreenInfo->dwEnginePreferred) { ErrorF ("winSetEngine - Using user's preference: %d\n", - pScreenInfo->dwEnginePreferred); + (int) pScreenInfo->dwEnginePreferred); pScreenInfo->dwEngine = pScreenInfo->dwEnginePreferred; /* Setup engine function pointers */ diff --git a/hw/xwin/winfillsp.c b/hw/xwin/winfillsp.c index 9ac536274..1b7f3c0ca 100644 --- a/hw/xwin/winfillsp.c +++ b/hw/xwin/winfillsp.c @@ -118,7 +118,7 @@ winFillSpansNativeGDI (DrawablePtr pDrawable, if (hbmpOrig == NULL) FatalError ("winFillSpans - DRAWABLE_PIXMAP - " "SelectObject () failed on\n\tpPixmapPriv->hBitmap: " - "%08x\n", pPixmapPriv->hBitmap); + "%08x\n", (unsigned int) pPixmapPriv->hBitmap); /* Branch on the fill type */ switch (pGC->fillStyle) diff --git a/hw/xwin/winnativegdi.c b/hw/xwin/winnativegdi.c index f7d8a4a1a..48bfb878a 100644 --- a/hw/xwin/winnativegdi.c +++ b/hw/xwin/winnativegdi.c @@ -149,7 +149,7 @@ winInitVisualsNativeGDI (ScreenPtr pScreen) /* Tell the user how many bits per RGB we are using */ ErrorF ("winInitVisualsNativeGDI - Using dwBitsPerRGB: %d\n", - pScreenPriv->dwBitsPerRGB); + (int) pScreenPriv->dwBitsPerRGB); /* Create a single visual according to the Windows screen depth */ switch (pScreenInfo->dwDepth) @@ -239,7 +239,8 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen) { /* No -depth parameter passed, let the user know the depth being used */ ErrorF ("winAdjustVideoModeNativeGDI - Using Windows display " - "depth of %d bits per pixel, %d depth\n", dwBPP, pScreenInfo->dwDepth); + "depth of %d bits per pixel, %d depth\n", + (int) dwBPP, (int) pScreenInfo->dwDepth); /* Use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -248,7 +249,8 @@ winAdjustVideoModeNativeGDI (ScreenPtr pScreen) { /* Warn user if GDI depth is different than -depth parameter */ ErrorF ("winAdjustVideoModeNativeGDI - Command line bpp: %d, "\ - "using bpp: %d\n", pScreenInfo->dwBPP, dwBPP); + "using bpp: %d\n", + (int) pScreenInfo->dwBPP, (int) dwBPP); /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; diff --git a/hw/xwin/winpfbdd.c b/hw/xwin/winpfbdd.c index 7cbdb5e53..9239c5a33 100644 --- a/hw/xwin/winpfbdd.c +++ b/hw/xwin/winpfbdd.c @@ -77,7 +77,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -131,7 +131,7 @@ winAllocateFBPrimaryDD (ScreenPtr pScreen) NULL); if (FAILED (ddrval)) FatalError ("winAllocateFBPrimaryDD - Could not create primary " - "surface %08x\n", ddrval); + "surface %08x\n", (unsigned int) ddrval); ErrorF ("winAllocateFBPrimaryDD - Created primary\n"); @@ -326,10 +326,10 @@ winInitVisualsPrimaryDD (ScreenPtr pScreen) pScreenPriv->dwBitsPerRGB = dwBlueBits; ErrorF ("winInitVisualsPrimaryDD - Masks: %08x %08x %08x bpRGB: %d\n", - pScreenPriv->dwRedMask, - pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask, - pScreenPriv->dwBitsPerRGB); + (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) @@ -408,7 +408,7 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen) { /* No -depth parameter passed, let the user know the depth being used */ ErrorF ("winAdjustVideoModePrimaryDD - Using Windows display " - "depth of %d bits per pixel\n", dwBPP); + "depth of %d bits per pixel\n", (int) dwBPP); /* Use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -418,14 +418,14 @@ winAdjustVideoModePrimaryDD (ScreenPtr pScreen) { /* FullScreen, and GDI depth differs from -depth parameter */ ErrorF ("winAdjustVideoModePrimaryDD - FullScreen, using command " - "line depth: %d\n", pScreenInfo->dwBPP); + "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 " "depth: %d, using depth: %d\n", - pScreenInfo->dwBPP, dwBPP); + (int) pScreenInfo->dwBPP, (int) dwBPP); /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -498,7 +498,7 @@ winActivateAppPrimaryDD (ScreenPtr pScreen) NULL); if (ddrval != DD_OK) FatalError ("winActivateAppPrimaryDD () - Failed blitting offscreen " - "surface to primary surface %08x\n", ddrval); + "surface to primary surface %08x\n", (unsigned int) ddrval); /* Lock the primary surface */ ddrval = IDirectDrawSurface2_Lock (pScreenPriv->pddsPrimary, @@ -596,12 +596,12 @@ winHotKeyAltTabPrimaryDD (ScreenPtr pScreen) if (FAILED (ddrval)) FatalError ("winHotKeyAltTabPrimaryDD - Failed blitting primary " "surface to offscreen surface: %08x\n", - ddrval); + (unsigned int) ddrval); } else { FatalError ("winHotKeyAltTabPrimaryDD - Unknown error from " - "Blt: %08dx\n", ddrval); + "Blt: %08dx\n", (unsigned int) ddrval); } /* Lock the offscreen surface */ diff --git a/hw/xwin/winscrinit.c b/hw/xwin/winscrinit.c index 79e985c6b..8112a7f9e 100644 --- a/hw/xwin/winscrinit.c +++ b/hw/xwin/winscrinit.c @@ -98,7 +98,7 @@ winScreenInit (int index, ErrorF ("winScreenInit - Unsupported display depth: %d\n" \ "Change your Windows display depth to 15, 16, 24, or 32 bits " "per pixel.\n", - pScreenInfo->dwBPP); + (int) pScreenInfo->dwBPP); ErrorF ("winScreenInit - Supported depths: %08x\n", WIN_SUPPORTED_BPPS); #if WIN_CHECK_DEPTH @@ -219,8 +219,9 @@ winFinishScreenInitFB (int index, + winCountBits (pScreenPriv->dwBlueMask); ErrorF ("winFinishScreenInitFB - Masks: %08x %08x %08x\n", - pScreenPriv->dwRedMask, pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask); + (unsigned int) pScreenPriv->dwRedMask, + (unsigned int) pScreenPriv->dwGreenMask, + (unsigned int) pScreenPriv->dwBlueMask); /* Init visuals */ if (!(*pScreenPriv->pwinInitVisuals) (pScreen)) @@ -718,7 +719,7 @@ winFinishScreenInitNativeGDI (int index, ErrorF ("winFinishScreenInitNativeGDI - Successful addition of " "screen %08x\n", - pScreen); + (unsigned int) pScreen); return TRUE; } diff --git a/hw/xwin/winshaddd.c b/hw/xwin/winshaddd.c index a409c27c6..29f57b99b 100644 --- a/hw/xwin/winshaddd.c +++ b/hw/xwin/winshaddd.c @@ -80,7 +80,7 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winCreatePrimarySurfaceShadowDD - Could not create primary " - "surface: %08x\n", ddrval); + "surface: %08x\n", (unsigned int) ddrval); return FALSE; } @@ -98,7 +98,7 @@ winCreatePrimarySurfaceShadowDD (ScreenPtr pScreen) { ErrorF ("winCreatePrimarySurfaceShadowDD - Primary attach clipper " "failed: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -175,7 +175,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDD - Could not create clipper: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -194,7 +194,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDD - Clipper not attached to " "window: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -207,7 +207,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDD - Could not start DirectDraw: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -222,7 +222,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDD - Failed DD2 query: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -242,7 +242,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDD - Could not set " "cooperative level: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -262,7 +262,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDD - Could not get current " "refresh rate: %08x. Continuing.\n", - ddrval); + (unsigned int) ddrval); dwRefreshRateCurrent = 0; } else @@ -309,7 +309,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDD - Could not set "\ "full screen display mode: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } } @@ -332,7 +332,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDD - Could not set "\ "cooperative level: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } } @@ -368,7 +368,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDD - Could not create shadow "\ - "surface: %08x\n", ddrval); + "surface: %08x\n", (unsigned int) ddrval); return FALSE; } @@ -400,7 +400,7 @@ winAllocateFBShadowDD (ScreenPtr pScreen) if (FAILED (ddrval) || pddsdShadow->lpSurface == NULL) { ErrorF ("winAllocateFBShadowDD - Could not lock shadow "\ - "surface: %08x\n", ddrval); + "surface: %08x\n", (unsigned int) ddrval); return FALSE; } @@ -737,12 +737,12 @@ winInitVisualsShadowDD (ScreenPtr pScreen) ErrorF ("winInitVisualsShadowDD - Masks %08x %08x %08x BPRGB %d d %d " "bpp %d\n", - pScreenPriv->dwRedMask, - pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask, - pScreenPriv->dwBitsPerRGB, - pScreenInfo->dwDepth, - pScreenInfo->dwBPP); + (unsigned int) pScreenPriv->dwRedMask, + (unsigned int) pScreenPriv->dwGreenMask, + (unsigned int) pScreenPriv->dwBlueMask, + (int) pScreenPriv->dwBitsPerRGB, + (int) pScreenInfo->dwDepth, + (int) pScreenInfo->dwBPP); /* Create a single visual according to the Windows screen depth */ switch (pScreenInfo->dwDepth) @@ -890,7 +890,7 @@ winAdjustVideoModeShadowDD (ScreenPtr pScreen) { /* No -depth parameter passed, let the user know the depth being used */ ErrorF ("winAdjustVideoModeShadowDD - Using Windows display " - "depth of %d bits per pixel\n", dwBPP); + "depth of %d bits per pixel\n", (int) dwBPP); /* Use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -900,13 +900,13 @@ winAdjustVideoModeShadowDD (ScreenPtr pScreen) { /* FullScreen, and GDI depth differs from -depth parameter */ ErrorF ("winAdjustVideoModeShadowDD - FullScreen, using command line " - "bpp: %d\n", pScreenInfo->dwBPP); + "bpp: %d\n", (int) pScreenInfo->dwBPP); } else if (dwBPP != pScreenInfo->dwBPP) { /* Windowed, and GDI depth differs from -depth parameter */ ErrorF ("winAdjustVideoModeShadowDD - Windowed, command line bpp: " - "%d, using bpp: %d\n", pScreenInfo->dwBPP, dwBPP); + "%d, using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP); /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -1022,7 +1022,7 @@ winBltExposedRegionsShadowDD (ScreenPtr pScreen) else if (ddrval == DDERR_INVALIDOBJECT) ErrorF ("DDERR_INVALIDOBJECT\n"); else - ErrorF ("unknown error: %08x\n", ddrval); + ErrorF ("unknown error: %08x\n", (unsigned int) ddrval); /* Loop around to try the blit one more time */ continue; @@ -1031,7 +1031,8 @@ winBltExposedRegionsShadowDD (ScreenPtr pScreen) { fReturn = FALSE; ErrorF ("winBltExposedRegionsShadowDD - IDirectDrawSurface2_Blt " - "failed, but surface not lost: %08x %d\n", ddrval, ddrval); + "failed, but surface not lost: %08x %d\n", + (unsigned int) ddrval, (int) ddrval); goto winBltExposedRegionsShadowDD_Exit; } else @@ -1160,7 +1161,7 @@ winRedrawScreenShadowDD (ScreenPtr pScreen) { ErrorF ("winRedrawScreenShadowDD - IDirectDrawSurface_Blt () " "failed: %08x\n", - ddrval); + (unsigned int) ddrval); } return TRUE; diff --git a/hw/xwin/winshadddnl.c b/hw/xwin/winshadddnl.c index e902f31b0..021cb1f8a 100644 --- a/hw/xwin/winshadddnl.c +++ b/hw/xwin/winshadddnl.c @@ -84,7 +84,7 @@ winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen) { ErrorF ("winCreatePrimarySurfaceShadowDDNL - Could not create primary " "surface: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -99,7 +99,7 @@ winCreatePrimarySurfaceShadowDDNL (ScreenPtr pScreen) { ErrorF ("winCreatePrimarySurfaceShadowDDNL - Primary attach clipper " "failed: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -192,7 +192,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDDNL - Could not attach clipper: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -211,7 +211,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Clipper not attached " "to window: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -227,7 +227,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not start " "DirectDraw: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -242,7 +242,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDDNL - Failed DD4 query: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -262,7 +262,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not set " "cooperative level: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -282,7 +282,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not get current " "refresh rate: %08x. Continuing.\n", - ddrval); + (unsigned int) ddrval); dwRefreshRateCurrent = 0; } else @@ -329,7 +329,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not set " "full screen display mode: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } } @@ -352,7 +352,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not set " "cooperative level: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } } @@ -374,7 +374,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) { ErrorF ("winAllocateFBShadowDDNL - Could not get primary " "pixformat: %08x\n", - ddrval); + (unsigned int) ddrval); return FALSE; } @@ -408,7 +408,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) ddsdShadow.u4.ddpfPixelFormat = ddpfPrimary; ErrorF ("winAllocateFBShadowDDNL - lPitch: %d\n", - pScreenInfo->dwPaddedWidth); + (int) pScreenInfo->dwPaddedWidth); /* Create the shadow surface */ ddrval = IDirectDraw4_CreateSurface (pScreenPriv->pdd4, @@ -418,13 +418,13 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) if (FAILED (ddrval)) { ErrorF ("winAllocateFBShadowDDNL - Could not create shadow " - "surface: %08x\n", ddrval); + "surface: %08x\n", (unsigned int) ddrval); return FALSE; } #if CYGDEBUG || YES ErrorF ("winAllocateFBShadowDDNL - Created shadow pitch: %d\n", - ddsdShadow.u1.lPitch); + (int) ddsdShadow.u1.lPitch); #endif /* Grab the pitch from the surface desc */ @@ -433,7 +433,7 @@ winAllocateFBShadowDDNL (ScreenPtr pScreen) #if CYGDEBUG || YES ErrorF ("winAllocateFBShadowDDNL - Created shadow stride: %d\n", - pScreenInfo->dwStride); + (int) pScreenInfo->dwStride); #endif /* Save the pointer to our surface memory */ @@ -522,7 +522,7 @@ winShadowUpdateDDNL (ScreenPtr pScreen, { ErrorF ("winShadowUpdateDDNL - IDirectDrawSurface4_Blt () " "failed: %08x\n", - ddrval); + (unsigned int) ddrval); ++s_iFailCount; @@ -733,12 +733,12 @@ winInitVisualsShadowDDNL (ScreenPtr pScreen) ErrorF ("winInitVisualsShadowDDNL - Masks %08x %08x %08x BPRGB %d d %d " "bpp %d\n", - pScreenPriv->dwRedMask, - pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask, - pScreenPriv->dwBitsPerRGB, - pScreenInfo->dwDepth, - pScreenInfo->dwBPP); + (unsigned int) pScreenPriv->dwRedMask, + (unsigned int) pScreenPriv->dwGreenMask, + (unsigned int) pScreenPriv->dwBlueMask, + (int) pScreenPriv->dwBitsPerRGB, + (int) pScreenInfo->dwDepth, + (int) pScreenInfo->dwBPP); /* Create a single visual according to the Windows screen depth */ switch (pScreenInfo->dwDepth) @@ -886,7 +886,7 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen) { /* No -depth parameter passed, let the user know the depth being used */ ErrorF ("winAdjustVideoModeShadowDDNL - Using Windows display " - "depth of %d bits per pixel\n", dwBPP); + "depth of %d bits per pixel\n", (int) dwBPP); /* Use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -896,14 +896,14 @@ winAdjustVideoModeShadowDDNL (ScreenPtr pScreen) { /* FullScreen, and GDI depth differs from -depth parameter */ ErrorF ("winAdjustVideoModeShadowDDNL - FullScreen, using command " - "line bpp: %d\n", pScreenInfo->dwBPP); + "line bpp: %d\n", (int) pScreenInfo->dwBPP); } else if (dwBPP != pScreenInfo->dwBPP) { /* Windowed, and GDI depth differs from -depth parameter */ ErrorF ("winAdjustVideoModeShadowDDNL - Windowed, command line " "bpp: %d, using bpp: %d\n", - pScreenInfo->dwBPP, dwBPP); + (int) pScreenInfo->dwBPP, (int) dwBPP); /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -1008,7 +1008,7 @@ winBltExposedRegionsShadowDDNL (ScreenPtr pScreen) else if (ddrval == DDERR_INVALIDOBJECT) ErrorF ("DDERR_INVALIDOBJECT\n"); else - ErrorF ("unknown error: %08x\n", ddrval); + ErrorF ("unknown error: %08x\n", (unsigned int) ddrval); /* Loop around to try the blit one more time */ continue; @@ -1017,7 +1017,8 @@ winBltExposedRegionsShadowDDNL (ScreenPtr pScreen) { fReturn = FALSE; ErrorF ("winBltExposedRegionsShadowDDNL - IDirectDrawSurface4_Blt " - "failed, but surface not lost: %08x %d\n", ddrval, ddrval); + "failed, but surface not lost: %08x %d\n", + (unsigned int) ddrval, (int) ddrval); goto winBltExposedRegionsShadowDDNL_Exit; } else @@ -1102,7 +1103,7 @@ winRedrawScreenShadowDDNL (ScreenPtr pScreen) { ErrorF ("winRedrawScreenShadowDDNL - IDirectDrawSurface4_Blt () " "failed: %08x\n", - ddrval); + (unsigned int) ddrval); } return TRUE; diff --git a/hw/xwin/winshadgdi.c b/hw/xwin/winshadgdi.c index 16b1969d7..c3496c03f 100644 --- a/hw/xwin/winshadgdi.c +++ b/hw/xwin/winshadgdi.c @@ -261,7 +261,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen) ErrorF ("winAllocateFBShadowGDI - Creating DIB with width: %d height: %d " "depth: %d\n", - pbmih->biWidth, -pbmih->biHeight, pbmih->biBitCount); + (int) pbmih->biWidth, (int) -pbmih->biHeight, pbmih->biBitCount); /* Create a DI shadow bitmap with a bit pointer */ pScreenPriv->hbmpShadow = CreateDIBSection (pScreenPriv->hdcScreen, @@ -291,9 +291,9 @@ winAllocateFBShadowGDI (ScreenPtr pScreen) /* Print information about bitmap allocated */ ErrorF ("winAllocateFBShadowGDI - Dibsection width: %d height: %d " "depth: %d size image: %d\n", - dibsection.dsBmih.biWidth, dibsection.dsBmih.biHeight, + (int) dibsection.dsBmih.biWidth, (int) dibsection.dsBmih.biHeight, dibsection.dsBmih.biBitCount, - dibsection.dsBmih.biSizeImage); + (int) dibsection.dsBmih.biSizeImage); #endif /* Select the shadow bitmap into the shadow DC */ @@ -330,7 +330,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen) ErrorF ("winAllocateFBShadowGDI - WEIRDNESS - biHeight " "still negative: %d\n" "winAllocateFBShadowGDI - WEIRDNESS - Flipping biHeight sign\n", - dibsection.dsBmih.biHeight); + (int) dibsection.dsBmih.biHeight); dibsection.dsBmih.biHeight = -dibsection.dsBmih.biHeight; } @@ -341,7 +341,7 @@ winAllocateFBShadowGDI (ScreenPtr pScreen) #if CYGDEBUG || YES ErrorF ("winAllocateFBShadowGDI - Created shadow stride: %d\n", - pScreenInfo->dwStride); + (int) pScreenInfo->dwStride); #endif /* See if the shadow bitmap will be larger than the DIB size limit */ @@ -577,12 +577,12 @@ winInitVisualsShadowGDI (ScreenPtr pScreen) /* Display debugging information */ ErrorF ("winInitVisualsShadowGDI - Masks %08x %08x %08x BPRGB %d d %d " "bpp %d\n", - pScreenPriv->dwRedMask, - pScreenPriv->dwGreenMask, - pScreenPriv->dwBlueMask, - pScreenPriv->dwBitsPerRGB, - pScreenInfo->dwDepth, - pScreenInfo->dwBPP); + (unsigned int) pScreenPriv->dwRedMask, + (unsigned int) pScreenPriv->dwGreenMask, + (unsigned int) pScreenPriv->dwBlueMask, + (int) pScreenPriv->dwBitsPerRGB, + (int) pScreenInfo->dwDepth, + (int) pScreenInfo->dwBPP); /* Create a single visual according to the Windows screen depth */ switch (pScreenInfo->dwDepth) @@ -728,7 +728,7 @@ winAdjustVideoModeShadowGDI (ScreenPtr pScreen) { /* No -depth parameter passed, let the user know the depth being used */ ErrorF ("winAdjustVideoModeShadowGDI - Using Windows display " - "depth of %d bits per pixel\n", dwBPP); + "depth of %d bits per pixel\n", (int) dwBPP); /* Use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -737,7 +737,7 @@ winAdjustVideoModeShadowGDI (ScreenPtr pScreen) { /* Warn user if GDI depth is different than -depth parameter */ ErrorF ("winAdjustVideoModeShadowGDI - Command line bpp: %d, "\ - "using bpp: %d\n", pScreenInfo->dwBPP, dwBPP); + "using bpp: %d\n", (int) pScreenInfo->dwBPP, (int) dwBPP); /* We'll use GDI's depth */ pScreenInfo->dwBPP = dwBPP; @@ -1056,7 +1056,7 @@ winCreateColormapShadowGDI (ColormapPtr pColormap) { ErrorF ("winCreateColormapShadowGDI - Couldn't allocate palette " "with %d entries\n", - dwEntriesMax); + (int) dwEntriesMax); return FALSE; } diff --git a/hw/xwin/winwndproc.c b/hw/xwin/winwndproc.c index 5b47a212a..460b33ae9 100644 --- a/hw/xwin/winwndproc.c +++ b/hw/xwin/winwndproc.c @@ -170,8 +170,8 @@ winWindowProc (HWND hwnd, UINT message, ErrorF ("winWindowProc - WM_DISPLAYCHANGE - orig bpp: %d, last bpp: %d, " "new bpp: %d\n", - s_pScreenInfo->dwBPP, - s_pScreenPriv->dwLastWindowsBitsPixel, + (int) s_pScreenInfo->dwBPP, + (int) s_pScreenPriv->dwLastWindowsBitsPixel, wParam); ErrorF ("winWindowProc - WM_DISPLAYCHANGE - new width: %d "