hw/xwin: Fix format warnings with debug printing of pointers on 64-bit
Fix various pieces of debug output, mainly under --enable-debug, which use a "%08x" printf format for a pointer type. Use "%p" format for 64-bit portability. Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
03d462ddd2
commit
a14f1d94d5
|
@ -90,7 +90,7 @@ winSetAppUserModelID(HWND hWnd, const char *AppID)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
winDebug("winSetAppUserMOdelID - hwnd 0x%08x appid '%s'\n", hWnd, AppID);
|
winDebug("winSetAppUserMOdelID - hwnd 0x%p appid '%s'\n", hWnd, AppID);
|
||||||
|
|
||||||
hr = g_pSHGetPropertyStoreForWindow(hWnd, &IID_IPropertyStore,
|
hr = g_pSHGetPropertyStoreForWindow(hWnd, &IID_IPropertyStore,
|
||||||
(void **) &pps);
|
(void **) &pps);
|
||||||
|
|
|
@ -437,8 +437,8 @@ winChangeDepthDlgProc(HWND hwndDialog, UINT message,
|
||||||
s_pScreenInfo = s_pScreenPriv->pScreenInfo;
|
s_pScreenInfo = s_pScreenPriv->pScreenInfo;
|
||||||
|
|
||||||
#if CYGDEBUG
|
#if CYGDEBUG
|
||||||
winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %08x, "
|
winDebug("winChangeDepthDlgProc - WM_INITDIALOG - s_pScreenPriv: %p, "
|
||||||
"s_pScreenInfo: %08x\n",
|
"s_pScreenInfo: %p\n",
|
||||||
s_pScreenPriv, s_pScreenInfo);
|
s_pScreenPriv, s_pScreenInfo);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,7 @@ winCreateMsgWindow(void)
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
winDebug("winCreateMsgWindow - Created msg window hwnd 0x%x\n", hwndMsg);
|
winDebug("winCreateMsgWindow - Created msg window hwnd 0x%p\n", hwndMsg);
|
||||||
|
|
||||||
return hwndMsg;
|
return hwndMsg;
|
||||||
}
|
}
|
||||||
|
|
|
@ -465,7 +465,7 @@ winXIconToHICON(Display * pDisplay, Window id, int iconSize)
|
||||||
xImageIcon =
|
xImageIcon =
|
||||||
XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height,
|
XGetImage(pDisplay, hints->icon_pixmap, 0, 0, width, height,
|
||||||
0xFFFFFFFF, ZPixmap);
|
0xFFFFFFFF, ZPixmap);
|
||||||
winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%x\n", id,
|
winDebug("winXIconToHICON: id 0x%x icon Ximage 0x%p\n", id,
|
||||||
xImageIcon);
|
xImageIcon);
|
||||||
|
|
||||||
if (hints->icon_mask)
|
if (hints->icon_mask)
|
||||||
|
|
|
@ -47,7 +47,7 @@ winSetShapeMultiWindow(WindowPtr pWin, int kind)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
#if CYGMULTIWINDOW_DEBUG
|
#if CYGMULTIWINDOW_DEBUG
|
||||||
ErrorF("winSetShapeMultiWindow - pWin: %08x kind: %i\n", pWin, kind);
|
ErrorF("winSetShapeMultiWindow - pWin: %p kind: %i\n", pWin, kind);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIN_UNWRAP(SetShape);
|
WIN_UNWRAP(SetShape);
|
||||||
|
|
|
@ -286,7 +286,7 @@ winChangeWindowAttributesMultiWindow(WindowPtr pWin, unsigned long mask)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
#if CYGMULTIWINDOW_DEBUG
|
#if CYGMULTIWINDOW_DEBUG
|
||||||
ErrorF("winChangeWindowAttributesMultiWindow - pWin: %08x\n", pWin);
|
ErrorF("winChangeWindowAttributesMultiWindow - pWin: %p\n", pWin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIN_UNWRAP(ChangeWindowAttributes);
|
WIN_UNWRAP(ChangeWindowAttributes);
|
||||||
|
@ -315,7 +315,7 @@ winUnmapWindowMultiWindow(WindowPtr pWin)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
#if CYGMULTIWINDOW_DEBUG
|
#if CYGMULTIWINDOW_DEBUG
|
||||||
ErrorF("winUnmapWindowMultiWindow - pWin: %08x\n", pWin);
|
ErrorF("winUnmapWindowMultiWindow - pWin: %p\n", pWin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIN_UNWRAP(UnrealizeWindow);
|
WIN_UNWRAP(UnrealizeWindow);
|
||||||
|
@ -346,7 +346,7 @@ winMapWindowMultiWindow(WindowPtr pWin)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
#if CYGMULTIWINDOW_DEBUG
|
#if CYGMULTIWINDOW_DEBUG
|
||||||
ErrorF("winMapWindowMultiWindow - pWin: %08x\n", pWin);
|
ErrorF("winMapWindowMultiWindow - pWin: %p\n", pWin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIN_UNWRAP(RealizeWindow);
|
WIN_UNWRAP(RealizeWindow);
|
||||||
|
@ -378,7 +378,7 @@ winReparentWindowMultiWindow(WindowPtr pWin, WindowPtr pPriorParent)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
winDebug
|
winDebug
|
||||||
("winReparentMultiWindow - pWin:%08x XID:0x%x, reparent from pWin:%08x XID:0x%x to pWin:%08x XID:0x%x\n",
|
("winReparentMultiWindow - pWin:%p XID:0x%x, reparent from pWin:%p XID:0x%x to pWin:%p XID:0x%x\n",
|
||||||
pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id,
|
pWin, pWin->drawable.id, pPriorParent, pPriorParent->drawable.id,
|
||||||
pWin->parent, pWin->parent->drawable.id);
|
pWin->parent, pWin->parent->drawable.id);
|
||||||
|
|
||||||
|
@ -409,7 +409,7 @@ winRestackWindowMultiWindow(WindowPtr pWin, WindowPtr pOldNextSib)
|
||||||
winScreenPriv(pScreen);
|
winScreenPriv(pScreen);
|
||||||
|
|
||||||
#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
|
#if CYGMULTIWINDOW_DEBUG || CYGWINDOWING_DEBUG
|
||||||
winTrace("winRestackMultiWindow - %08x\n", pWin);
|
winTrace("winRestackMultiWindow - %p\n", pWin);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
WIN_UNWRAP(RestackWindow);
|
WIN_UNWRAP(RestackWindow);
|
||||||
|
@ -492,7 +492,7 @@ winCreateWindowsWindow(WindowPtr pWin)
|
||||||
|
|
||||||
winInitMultiWindowClass();
|
winInitMultiWindowClass();
|
||||||
|
|
||||||
winDebug("winCreateWindowsTopLevelWindow - pWin:%08x XID:0x%x \n", pWin,
|
winDebug("winCreateWindowsTopLevelWindow - pWin:%p XID:0x%x \n", pWin,
|
||||||
pWin->drawable.id);
|
pWin->drawable.id);
|
||||||
|
|
||||||
iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
|
iX = pWin->drawable.x + GetSystemMetrics(SM_XVIRTUALSCREEN);
|
||||||
|
@ -618,7 +618,7 @@ winDestroyWindowsWindow(WindowPtr pWin)
|
||||||
HICON hIcon;
|
HICON hIcon;
|
||||||
HICON hIconSm;
|
HICON hIconSm;
|
||||||
|
|
||||||
winDebug("winDestroyWindowsWindow - pWin:%08x XID:0x%x \n", pWin,
|
winDebug("winDestroyWindowsWindow - pWin:%p XID:0x%x \n", pWin,
|
||||||
pWin->drawable.id);
|
pWin->drawable.id);
|
||||||
|
|
||||||
/* Bail out if the Windows window handle is invalid */
|
/* Bail out if the Windows window handle is invalid */
|
||||||
|
|
|
@ -113,8 +113,8 @@ winCreatePixmapNativeGDI(ScreenPtr pScreen,
|
||||||
pbmih);
|
pbmih);
|
||||||
|
|
||||||
#if CYGDEBUG
|
#if CYGDEBUG
|
||||||
winDebug("winCreatePixmap () - Created a pixmap %08x, %dx%dx%d, for "
|
winDebug("winCreatePixmap () - Created a pixmap %p, %dx%dx%d, for "
|
||||||
"screen: %08x\n",
|
"screen: %p\n",
|
||||||
pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
|
pPixmapPriv->hBitmap, iWidth, iHeight, iDepth, pScreen);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -146,7 +146,7 @@ winDestroyPixmapNativeGDI(PixmapPtr pPixmap)
|
||||||
pPixmapPriv = winGetPixmapPriv(pPixmap);
|
pPixmapPriv = winGetPixmapPriv(pPixmap);
|
||||||
|
|
||||||
#if CYGDEBUG
|
#if CYGDEBUG
|
||||||
winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %08x\n",
|
winDebug("winDestroyPixmapNativeGDI - pPixmapPriv->hBitmap: %p\n",
|
||||||
pPixmapPriv->hBitmap);
|
pPixmapPriv->hBitmap);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -629,7 +629,7 @@ winWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
int iBorderHeight, iBorderWidth;
|
int iBorderHeight, iBorderWidth;
|
||||||
|
|
||||||
#if CYGDEBUG
|
#if CYGDEBUG
|
||||||
winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %08x\n",
|
winDebug("winWindowProc - WM_GETMINMAXINFO - pScreenInfo: %p\n",
|
||||||
s_pScreenInfo);
|
s_pScreenInfo);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue