ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winex11drv: Win64 printf format warning fixes.

This commit is contained in:
Vitaliy Margolen 2006-10-07 17:34:01 -06:00 committed by Alexandre Julliard
parent e60c86657a
commit 6069d0d596
25 changed files with 84 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/winex11.drv/Makefile.in
View File

@ -6,7 +6,6 @@ MODULE = winex11.drv
IMPORTS = user32 gdi32 advapi32 kernel32 ntdll
EXTRAINCL = @X_CFLAGS@
EXTRALIBS = @X_LIBS@ @X_PRE_LIBS@ @XLIB@ @X_EXTRA_LIBS@
EXTRADEFS = -DWINE_NO_LONG_AS_INT
C_SRCS = \
bitblt.c \

8
dlls/winex11.drv/bitblt.c
View File

@ -1256,7 +1256,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
widthDst = pts[1].x - pts[0].x;
heightDst = pts[1].y - pts[0].y;
TRACE(" rectdst=%d,%d-%d,%d orgdst=%ld,%ld\n",
TRACE(" rectdst=%d,%d-%d,%d orgdst=%d,%d\n",
xDst, yDst, widthDst, heightDst,
physDevDst->org.x, physDevDst->org.y );
@ -1273,14 +1273,14 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
heightSrc = pts[1].y - pts[0].y;
fStretch = (widthSrc != widthDst) || (heightSrc != heightDst);
TRACE(" rectsrc=%d,%d-%d,%d orgsrc=%ld,%ld\n",
TRACE(" rectsrc=%d,%d-%d,%d orgsrc=%d,%d\n",
xSrc, ySrc, widthSrc, heightSrc,
physDevSrc->org.x, physDevSrc->org.y );
if (!BITBLT_GetVisRectangles( physDevDst, xDst, yDst, widthDst, heightDst,
physDevSrc, xSrc, ySrc, widthSrc, heightSrc,
&visRectSrc, &visRectDst ))
return TRUE;
TRACE(" vissrc=%ld,%ld-%ld,%ld visdst=%ld,%ld-%ld,%ld\n",
TRACE(" vissrc=%d,%d-%d,%d visdst=%d,%d-%d,%d\n",
visRectSrc.left, visRectSrc.top,
visRectSrc.right, visRectSrc.bottom,
visRectDst.left, visRectDst.top,
@ -1292,7 +1292,7 @@ static BOOL BITBLT_InternalStretchBlt( X11DRV_PDEVICE *physDevDst, INT xDst, INT
if (!BITBLT_GetVisRectangles( physDevDst, xDst, yDst, widthDst, heightDst,
NULL, 0, 0, 0, 0, NULL, &visRectDst ))
return TRUE;
TRACE(" vissrc=none visdst=%ld,%ld-%ld,%ld\n",
TRACE(" vissrc=none visdst=%d,%d-%d,%d\n",
visRectDst.left, visRectDst.top,
visRectDst.right, visRectDst.bottom );
}

4
dlls/winex11.drv/bitmap.c
View File

@ -180,7 +180,7 @@ LONG X11DRV_GetBitmapBits( HBITMAP hbitmap, void *buffer, LONG count )
if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0;
TRACE("(bmp=%p, buffer=%p, count=0x%lx)\n", hbitmap, buffer, count);
TRACE("(bmp=%p, buffer=%p, count=0x%x)\n", hbitmap, buffer, count);
wine_tsx11_lock();
@ -310,7 +310,7 @@ LONG X11DRV_SetBitmapBits( HBITMAP hbitmap, const void *bits, LONG count )
if (!physBitmap || !GetObjectW( hbitmap, sizeof(bitmap), &bitmap )) return 0;
TRACE("(bmp=%p, bits=%p, count=0x%lx)\n", hbitmap, bits, count);
TRACE("(bmp=%p, bits=%p, count=0x%x)\n", hbitmap, bits, count);
height = count / bitmap.bmWidthBytes;

2
dlls/winex11.drv/brush.c
View File

@ -167,7 +167,7 @@ static Pixmap BRUSH_DitherMono( COLORREF color )
int idx = gray * (sizeof gray_dither/sizeof gray_dither[0] + 1)/256 - 1;
Pixmap pixmap;
TRACE("color=%06lx -> gray=%x\n", color, gray);
TRACE("color=%06x -> gray=%x\n", color, gray);
wine_tsx11_lock();
pixmap = XCreateBitmapFromData( gdi_display, root_window,

8
dlls/winex11.drv/clipboard.c
View File

@ -623,7 +623,7 @@ static BOOL X11DRV_CLIPBOARD_InsertClipboardData(UINT wFormatID, HANDLE16 hData1
{
LPWINE_CLIPDATA lpData = X11DRV_CLIPBOARD_LookupData(wFormatID);
TRACE("format=%d lpData=%p hData16=%08x hData32=%p flags=0x%08lx lpFormat=%p override=%d\n",
TRACE("format=%d lpData=%p hData16=%08x hData32=%p flags=0x%08x lpFormat=%p override=%d\n",
wFormatID, lpData, hData16, hData32, flags, lpFormat, override);
if (lpData && !override)
@ -2333,7 +2333,7 @@ int X11DRV_AcquireClipboard(HWND hWndClipWindow)
}
else
{
TRACE("Thread %lx is acquiring selection with thread %lx's window %p\n",
TRACE("Thread %x is acquiring selection with thread %x's window %p\n",
GetCurrentThreadId(),
GetWindowThreadProcessId(hWndClipWindow, NULL), hWndClipWindow);
@ -2773,7 +2773,7 @@ static Atom X11DRV_SelectionRequest_TARGETS( Display *display, Window requestor,
}
while (lpData != ClipData);
TRACE(" found %ld formats\n", cTargets);
TRACE(" found %d formats\n", cTargets);
/* Allocate temp buffer */
targets = HeapAlloc( GetProcessHeap(), 0, cTargets * sizeof(Atom));
@ -2999,7 +2999,7 @@ static void X11DRV_HandleSelectionRequest( HWND hWnd, XSelectionRequestEvent *ev
if (hClipData && (lpClipData = GlobalLock(hClipData)))
{
TRACE("\tUpdating property %s, %ld bytes\n", debugstr_w(lpFormat->Name), cBytes);
TRACE("\tUpdating property %s, %d bytes\n", debugstr_w(lpFormat->Name), cBytes);
wine_tsx11_lock();
XChangeProperty(display, request, rprop, event->target,

8
dlls/winex11.drv/dce.c
View File

@ -76,7 +76,7 @@ static void dump_cache(void)
LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry )
{
TRACE("%p: hwnd %p dcx %08lx %s %s\n",
TRACE("%p: hwnd %p dcx %08x %s %s\n",
dce, dce->hwnd, dce->flags,
(dce->flags & DCX_CACHE) ? "Cache" : "Owned",
dce->count ? "InUse" : "" );
@ -432,7 +432,7 @@ HDC X11DRV_GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags )
HWND parent;
LONG window_style = GetWindowLongW( hwnd, GWL_STYLE );
TRACE("hwnd %p, hrgnClip %p, flags %08lx\n", hwnd, hrgnClip, flags);
TRACE("hwnd %p, hrgnClip %p, flags %08x\n", hwnd, hrgnClip, flags);
/* fixup flags */
@ -493,7 +493,7 @@ HDC X11DRV_GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags )
if (!dce->hwnd) dceEmpty = dce;
else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags))
{
TRACE("\tfound valid %p dce [%p], flags %08lx\n",
TRACE("\tfound valid %p dce [%p], flags %08x\n",
dce, hwnd, dce->flags );
bUpdateVisRgn = FALSE;
break;
@ -554,7 +554,7 @@ HDC X11DRV_GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags )
SaveDC( dce->hdc ); /* save the state again for next time */
}
TRACE("(%p,%p,0x%lx): returning %p\n", hwnd, hrgnClip, flags, dce->hdc);
TRACE("(%p,%p,0x%x): returning %p\n", hwnd, hrgnClip, flags, dce->hdc);
return dce->hdc;
}

4
dlls/winex11.drv/desktop.c
View File

@ -121,11 +121,11 @@ static void X11DRV_desktop_SetCurrentMode(int mode)
{
DWORD dwBpp = screen_depth;
if (dwBpp == 24) dwBpp = 32;
TRACE("Resizing Wine desktop window to %ldx%ld\n", dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);
TRACE("Resizing Wine desktop window to %dx%d\n", dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);
X11DRV_resize_desktop(dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);
if (dwBpp != dd_modes[mode].dwBPP)
{
FIXME("Cannot change screen BPP from %ld to %ld\n", dwBpp, dd_modes[mode].dwBPP);
FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP);
}
}

26
dlls/winex11.drv/dib.c
View File

@ -251,7 +251,7 @@ static int DIB_GetBitmapInfoEx( const BITMAPINFOHEADER *header, LONG *width,
*size = header->biSizeImage;
return 1;
}
ERR("(%ld): unknown/wrong size for header\n", header->biSize );
ERR("(%d): unknown/wrong size for header\n", header->biSize );
return -1;
}
@ -2161,7 +2161,7 @@ static void X11DRV_DIB_SetImageBits_16( int lines, const BYTE *srcbits,
default:
notsupported:
WARN("from 16 bit DIB (%lx,%lx,%lx) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
WARN("from 16 bit DIB (%x,%x,%x) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
rSrc, gSrc, bSrc, bmpImage->bits_per_pixel, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask );
/* fall through */
@ -2514,7 +2514,7 @@ static void X11DRV_DIB_GetImageBits_16( int lines, BYTE *dstbits,
int rShift,gShift,bShift;
WORD* dstpixel;
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 16 bit DIB (%lx,%lx,%lx)\n",
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 16 bit DIB (%x,%x,%x)\n",
bmpImage->depth, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask,
rDst, gDst, bDst);
@ -2689,7 +2689,7 @@ static void X11DRV_DIB_SetImageBits_24( int lines, const BYTE *srcbits,
default:
notsupported:
WARN("from 24 bit DIB (%lx,%lx,%lx) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
WARN("from 24 bit DIB (%x,%x,%x) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
rSrc, gSrc, bSrc, bmpImage->bits_per_pixel, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask );
/* fall through */
@ -2910,7 +2910,7 @@ static void X11DRV_DIB_GetImageBits_24( int lines, BYTE *dstbits,
/* ==== any bmp format -> 888 dib ==== */
BYTE* dstbyte;
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 24 bit DIB (%lx,%lx,%lx)\n",
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 24 bit DIB (%x,%x,%x)\n",
bmpImage->depth, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask,
rDst, gDst, bDst );
@ -3167,7 +3167,7 @@ static void X11DRV_DIB_SetImageBits_32(int lines, const BYTE *srcbits,
default:
notsupported:
WARN("from 32 bit DIB (%lx,%lx,%lx) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
WARN("from 32 bit DIB (%x,%x,%x) to unknown %d bit bitmap (%lx,%lx,%lx)\n",
rSrc, gSrc, bSrc, bmpImage->bits_per_pixel, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask );
/* fall through */
@ -3495,7 +3495,7 @@ static void X11DRV_DIB_GetImageBits_32( int lines, BYTE *dstbits,
int rShift,gShift,bShift;
DWORD* dstpixel;
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 32 bit DIB (%lx,%lx,%lx)\n",
WARN("from unknown %d bit bitmap (%lx,%lx,%lx) to 32 bit DIB (%x,%x,%x)\n",
bmpImage->depth, bmpImage->red_mask,
bmpImage->green_mask, bmpImage->blue_mask,
rDst,gDst,bDst);
@ -3580,7 +3580,7 @@ static int X11DRV_DIB_SetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
}
}
TRACE("Dib: depth=%d r=%lx g=%lx b=%lx\n",
TRACE("Dib: depth=%d r=%x g=%x b=%x\n",
descr->infoBpp,descr->rMask,descr->gMask,descr->bMask);
TRACE("Bmp: depth=%d/%d r=%lx g=%lx b=%lx\n",
bmpImage->depth,bmpImage->bits_per_pixel,
@ -3731,7 +3731,7 @@ static int X11DRV_DIB_GetImageBits( const X11DRV_DIB_IMAGEBITS_DESCR *descr )
bmpImage, descr->xDest, descr->yDest );
}
TRACE("Dib: depth=%2d r=%lx g=%lx b=%lx\n",
TRACE("Dib: depth=%2d r=%x g=%x b=%x\n",
descr->infoBpp,descr->rMask,descr->gMask,descr->bMask);
TRACE("Bmp: depth=%2d/%2d r=%lx g=%lx b=%lx\n",
bmpImage->depth,bmpImage->bits_per_pixel,
@ -4046,7 +4046,7 @@ INT X11DRV_GetDIBits( X11DRV_PDEVICE *physDev, HBITMAP hbitmap, UINT startscan,
core_header = (bitmap_type == 0);
colorPtr = (LPBYTE) info + (WORD) info->bmiHeader.biSize;
TRACE("%u scanlines of (%i,%i) -> (%li,%i) starting from %u\n",
TRACE("%u scanlines of (%i,%i) -> (%i,%i) starting from %u\n",
lines, dib.dsBm.bmWidth, dib.dsBm.bmHeight, width, descr.lines, startscan);
if( lines > dib.dsBm.bmHeight ) lines = dib.dsBm.bmHeight;
@ -4170,7 +4170,7 @@ static void X11DRV_DIB_DoProtectDIBSection( X_PHYSBITMAP *physBitmap, DWORD new_
DWORD old_prot;
VirtualProtect(physBitmap->base, physBitmap->size, new_prot, &old_prot);
TRACE("Changed protection from %ld to %ld\n", old_prot, new_prot);
TRACE("Changed protection from %d to %d\n", old_prot, new_prot);
}
/***********************************************************************
@ -4267,7 +4267,7 @@ void X11DRV_DIB_CopyDIBSection(X11DRV_PDEVICE *physDevSrc, X11DRV_PDEVICE *physD
X_PHYSBITMAP *physBitmap;
int nColorMap = 0, *colorMap = NULL, aColorMap = FALSE;
TRACE("(%p,%p,%ld,%ld,%ld,%ld,%ld,%ld)\n", physDevSrc->hdc, physDevDst->hdc,
TRACE("(%p,%p,%d,%d,%d,%d,%d,%d)\n", physDevSrc->hdc, physDevDst->hdc,
xSrc, ySrc, xDest, yDest, width, height);
/* this function is meant as an optimization for BitBlt,
* not to be called otherwise */
@ -4496,7 +4496,7 @@ static INT X11DRV_DIB_Lock(X_PHYSBITMAP *physBitmap, INT req, BOOL lossy)
INT ret = DIB_Status_None;
if (!physBitmap->image) return ret; /* not a DIB section */
TRACE("Locking %p from thread %04lx\n", physBitmap->hbitmap, GetCurrentThreadId());
TRACE("Locking %p from thread %04x\n", physBitmap->hbitmap, GetCurrentThreadId());
EnterCriticalSection(&physBitmap->lock);
ret = physBitmap->status;
if (req != DIB_Status_None)

2
dlls/winex11.drv/event.c
View File

@ -421,7 +421,7 @@ static void handle_wm_protocols( HWND hwnd, XClientMessageEvent *event )
Time event_time = (Time)event->data.l[1];
HWND last_focus = x11drv_thread_data()->last_focus;
TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08lx), focus=%p, active=%p, fg=%p, last=%p\n",
TRACE( "got take focus msg for %p, enabled=%d, visible=%d (style %08x), focus=%p, active=%p, fg=%p, last=%p\n",
hwnd, IsWindowEnabled(hwnd), IsWindowVisible(hwnd), GetWindowLongW(hwnd, GWL_STYLE),
GetFocus(), GetActiveWindow(), GetForegroundWindow(), last_focus );

2
dlls/winex11.drv/graphics.c
View File

@ -1287,7 +1287,7 @@ X11DRV_ExtFloodFill( X11DRV_PDEVICE *physDev, INT x, INT y, COLORREF color,
RECT rect;
POINT pt;
TRACE("X11DRV_ExtFloodFill %d,%d %06lx %d\n", x, y, color, fillType );
TRACE("X11DRV_ExtFloodFill %d,%d %06x %d\n", x, y, color, fillType );
pt.x = x;
pt.y = y;

4
dlls/winex11.drv/keyboard.c
View File

@ -1808,7 +1808,7 @@ HKL X11DRV_GetKeyboardLayout(DWORD dwThreadid)
LANGID langid;
if (dwThreadid && dwThreadid != GetCurrentThreadId())
FIXME("couldn't return keyboard layout for thread %04lx\n", dwThreadid);
FIXME("couldn't return keyboard layout for thread %04x\n", dwThreadid);
#if 0
layout = main_key_tab[kbd_layout].lcid;
@ -2203,7 +2203,7 @@ INT X11DRV_GetKeyNameText(LONG lParam, LPWSTR lpBuffer, INT nSize)
/* Finally issue FIXME for unknown keys */
FIXME("(%08lx,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi);
FIXME("(%08x,%p,%d): unsupported key, vkey=%04x, ansi=%04x\n",lParam,lpBuffer,nSize,vkey,ansi);
if (lpBuffer && nSize)
*lpBuffer = 0;
return 0;

2
dlls/winex11.drv/mouse.c
View File

@ -285,7 +285,7 @@ void X11DRV_send_mouse_input( HWND hwnd, DWORD flags, DWORD x, DWORD y,
if ((injected_flags & LLMHF_INJECTED) &&
((flags & MOUSEEVENTF_ABSOLUTE) || x || y)) /* we have to actually move the cursor */
{
TRACE( "warping to (%ld,%ld)\n", pt.x, pt.y );
TRACE( "warping to (%d,%d)\n", pt.x, pt.y );
wine_tsx11_lock();
XWarpPointer( thread_display(), root_window, root_window, 0, 0, 0, 0, pt.x, pt.y );
wine_tsx11_unlock();

8
dlls/winex11.drv/opengl.c
View File

@ -1487,7 +1487,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
unsigned int needed_size = GetGlyphOutline_ptr(hdc, glyph, GGO_BITMAP, &gm, 0, NULL, NULL);
int height, width_int;
TRACE("Glyph : %3d / List : %ld\n", glyph, listBase);
TRACE("Glyph : %3d / List : %d\n", glyph, listBase);
if (needed_size == GDI_ERROR) {
TRACE(" - needed size : %d (GDI_ERROR)\n", needed_size);
goto error;
@ -1508,7 +1508,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, DWORD first, DWORD count, DWORD
unsigned char *bitmap_ = (unsigned char *) bitmap;
TRACE(" - bbox : %d x %d\n", gm.gmBlackBoxX, gm.gmBlackBoxY);
TRACE(" - origin : (%ld , %ld)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
TRACE(" - origin : (%d , %d)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
TRACE(" - increment : %d - %d\n", gm.gmCellIncX, gm.gmCellIncY);
if (needed_size != 0) {
TRACE(" - bitmap :\n");
@ -1582,7 +1582,7 @@ BOOL X11DRV_wglUseFontBitmapsA(X11DRV_PDEVICE *physDev, DWORD first, DWORD count
{
Font fid = physDev->font;
TRACE("(%p, %ld, %ld, %ld) using font %ld\n", physDev->hdc, first, count, listBase, fid);
TRACE("(%p, %d, %d, %d) using font %ld\n", physDev->hdc, first, count, listBase, fid);
if (fid == 0) {
return internal_wglUseFontBitmaps(physDev->hdc, first, count, listBase, GetGlyphOutlineA);
@ -1600,7 +1600,7 @@ BOOL X11DRV_wglUseFontBitmapsW(X11DRV_PDEVICE *physDev, DWORD first, DWORD count
{
Font fid = physDev->font;
TRACE("(%p, %ld, %ld, %ld) using font %ld\n", physDev->hdc, first, count, listBase, fid);
TRACE("(%p, %d, %d, %d) using font %ld\n", physDev->hdc, first, count, listBase, fid);
if (fid == 0) {
return internal_wglUseFontBitmaps(physDev->hdc, first, count, listBase, GetGlyphOutlineW);

20
dlls/winex11.drv/palette.c
View File

@ -446,8 +446,8 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template
sysPixel[i] = color.pixel;
TRACE("syscolor(%lx) -> pixel %i\n",
*(const COLORREF*)(sys_pal_template+i), (int)color.pixel);
TRACE("syscolor(%x) -> pixel %i\n", *(const COLORREF*)(sys_pal_template+i),
(int)color.pixel);
/* Set EGA mapping if color in the first or last eight */
@ -844,7 +844,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
{
case 0x10: /* DIBINDEX */
if( X11DRV_GetDIBColorTable( physDev, idx, 1, &quad ) != 1 ) {
WARN("DIBINDEX(%lx) : idx %d is out of bounds, assuming black\n", color , idx);
WARN("DIBINDEX(%x) : idx %d is out of bounds, assuming black\n", color , idx);
GDI_ReleaseObj( hPal );
return 0;
}
@ -855,7 +855,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
if( idx >= palPtr->logpalette.palNumEntries)
{
WARN("PALETTEINDEX(%lx) : idx %d is out of bounds, assuming black\n", color, idx);
WARN("PALETTEINDEX(%x) : idx %d is out of bounds, assuming black\n", color, idx);
GDI_ReleaseObj( hPal );
return 0;
}
@ -958,7 +958,7 @@ int X11DRV_PALETTE_ToPhysical( X11DRV_PDEVICE *physDev, COLORREF color )
index = color & 0xffff;
if( index >= palPtr->logpalette.palNumEntries )
WARN("PALETTEINDEX(%lx) : index %i is out of bounds\n", color, index);
WARN("PALETTEINDEX(%x) : index %i is out of bounds\n", color, index);
else if( palPtr->mapping ) index = palPtr->mapping[index];
/* TRACE(palette,"PALETTEINDEX(%04x) -> pixel %i\n", (WORD)color, index);
@ -1167,8 +1167,8 @@ static UINT X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNu
if( !prevMapping || palPtr->mapping[uStart] != index ) iRemapped++;
palPtr->mapping[uStart] = index;
TRACE("entry %i (%lx) -> pixel %i\n", uStart,
*(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), index);
TRACE("entry %i (%x) -> pixel %i\n", uStart,
*(COLORREF*)(palPtr->logpalette.palPalEntry + uStart), index);
}
return iRemapped;
@ -1192,7 +1192,7 @@ UINT X11DRV_GetSystemPaletteEntries( X11DRV_PDEVICE *physDev, UINT start, UINT c
entries[i].peGreen = COLOR_sysPal[start + i].peGreen;
entries[i].peBlue = COLOR_sysPal[start + i].peBlue;
entries[i].peFlags = 0;
TRACE("\tidx(%02x) -> RGB(%08lx)\n", start + i, *(COLORREF*)(entries + i) );
TRACE("\tidx(%02x) -> RGB(%08x)\n", start + i, *(COLORREF*)(entries + i) );
}
return count;
}
@ -1225,7 +1225,7 @@ COLORREF X11DRV_GetNearestColor( X11DRV_PDEVICE *physDev, COLORREF color )
if (!GetPaletteEntries( hpal, index, 1, &entry ))
{
WARN("RGB(%lx) : idx %d is out of bounds, assuming NULL\n", color, index );
WARN("RGB(%x) : idx %d is out of bounds, assuming NULL\n", color, index );
if (!GetPaletteEntries( hpal, 0, 1, &entry )) return CLR_INVALID;
}
color = RGB( entry.peRed, entry.peGreen, entry.peBlue );
@ -1233,7 +1233,7 @@ COLORREF X11DRV_GetNearestColor( X11DRV_PDEVICE *physDev, COLORREF color )
color &= 0x00ffffff;
nearest = (0x00ffffff & *(COLORREF*)(COLOR_sysPal + X11DRV_SysPaletteLookupPixel(color, FALSE)));
TRACE("(%06lx): returning %06lx\n", color, nearest );
TRACE("(%06x): returning %06x\n", color, nearest );
return nearest;
}

2
dlls/winex11.drv/scroll.c
View File

@ -50,7 +50,7 @@ static void dump_region( const char *p, HRGN hrgn)
}
if (!(data = HeapAlloc( GetProcessHeap(), 0, size ))) return;
GetRegionData( hrgn, size, data );
TRACE("%s %ld rects:", p, data->rdh.nCount );
TRACE("%s %d rects:", p, data->rdh.nCount );
for (i = 0, rect = (RECT *)data->Buffer; i<20 && i < data->rdh.nCount; i++, rect++)
TRACE( " %s", wine_dbgstr_rect( rect));
TRACE("\n");

18
dlls/winex11.drv/settings.c
View File

@ -171,12 +171,12 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW
devmode->dmSize = sizeof(DEVMODEW);
if (n == ENUM_CURRENT_SETTINGS)
{
TRACE("mode %ld (current) -- getting current mode (%s)\n", n, handler_name);
TRACE("mode %d (current) -- getting current mode (%s)\n", n, handler_name);
n = pGetCurrentMode();
}
if (n == ENUM_REGISTRY_SETTINGS)
{
TRACE("mode %ld (registry) -- getting default mode (%s)\n", n, handler_name);
TRACE("mode %d (registry) -- getting default mode (%s)\n", n, handler_name);
n = dd_mode_default;
}
if (n < dd_mode_count)
@ -189,19 +189,19 @@ BOOL X11DRV_EnumDisplaySettingsEx( LPCWSTR name, DWORD n, LPDEVMODEW devmode, DW
if (devmode->dmDisplayFrequency)
{
devmode->dmFields |= DM_DISPLAYFREQUENCY;
TRACE("mode %ld -- %ldx%ldx%ldbpp @%ld Hz (%s)\n", n,
TRACE("mode %d -- %dx%dx%dbpp @%d Hz (%s)\n", n,
devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel,
devmode->dmDisplayFrequency, handler_name);
}
else
{
TRACE("mode %ld -- %ldx%ldx%ldbpp (%s)\n", n,
TRACE("mode %d -- %dx%dx%dbpp (%s)\n", n,
devmode->dmPelsWidth, devmode->dmPelsHeight, devmode->dmBitsPerPel,
handler_name);
}
return TRUE;
}
TRACE("mode %ld -- not present (%s)\n", n, handler_name);
TRACE("mode %d -- not present (%s)\n", n, handler_name);
return FALSE;
}
@ -240,12 +240,12 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
DEVMODEW dm;
BOOL def_mode = TRUE;
TRACE("(%s,%p,%p,0x%08lx,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid);
TRACE("(%s,%p,%p,0x%08x,%p)\n",debugstr_w(devname),devmode,hwnd,flags,lpvoid);
TRACE("flags=%s\n",_CDS_flags(flags));
if (devmode)
{
TRACE("DM_fields=%s\n",_DM_fields(devmode->dmFields));
TRACE("width=%ld height=%ld bpp=%ld freq=%ld (%s)\n",
TRACE("width=%d height=%d bpp=%d freq=%d (%s)\n",
devmode->dmPelsWidth,devmode->dmPelsHeight,
devmode->dmBitsPerPel,devmode->dmDisplayFrequency, handler_name);
@ -295,7 +295,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
continue;
}
/* we have a valid mode */
TRACE("Requested display settings match mode %ld (%s)\n", i, handler_name);
TRACE("Requested display settings match mode %d (%s)\n", i, handler_name);
if (!(flags & CDS_TEST))
pSetCurrentMode(i);
return DISP_CHANGE_SUCCESSFUL;
@ -315,7 +315,7 @@ LONG X11DRV_ChangeDisplaySettingsEx( LPCWSTR devname, LPDEVMODEW devmode,
*/
static DWORD PASCAL X11DRV_Settings_SetMode(LPDDHAL_SETMODEDATA data)
{
TRACE("Mode %ld requested by DDHAL (%s)\n", data->dwModeIndex, handler_name);
TRACE("Mode %d requested by DDHAL (%s)\n", data->dwModeIndex, handler_name);
pSetCurrentMode(data->dwModeIndex);
X11DRV_DDHAL_SwitchMode(data->dwModeIndex, NULL, NULL);
data->ddRVal = DD_OK;

2
dlls/winex11.drv/text.c
View File

@ -68,7 +68,7 @@ X11DRV_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flags,
physDev->hdc, (UINT16)(physDev->font), x, y,
debugstr_wn (wstr, count), count, flags, lpDx);
if (lprect != NULL) TRACE("\trect=(%ld,%ld - %ld,%ld)\n",
if (lprect != NULL) TRACE("\trect=(%d,%d - %d,%d)\n",
lprect->left, lprect->top,
lprect->right, lprect->bottom );

6
dlls/winex11.drv/window.c
View File

@ -721,7 +721,7 @@ void X11DRV_sync_window_position( Display *display, struct x11drv_win_data *data
{
DWORD style = GetWindowLongW( data->hwnd, GWL_STYLE );
TRACE( "setting win %lx pos %ld,%ld,%ldx%ld after %lx changes=%x\n",
TRACE( "setting win %lx pos %d,%d,%dx%d after %lx changes=%x\n",
data->whole_window, data->whole_rect.left, data->whole_rect.top,
data->whole_rect.right - data->whole_rect.left,
data->whole_rect.bottom - data->whole_rect.top, changes.sibling, mask );
@ -1104,7 +1104,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
X11DRV_set_window_pos( hwnd, insert_after, &wndPtr->rectWindow, &rect, 0, NULL );
TRACE( "win %p window %ld,%ld,%ld,%ld client %ld,%ld,%ld,%ld whole %ld,%ld,%ld,%ld X client %ld,%ld,%ld,%ld xwin %x\n",
TRACE( "win %p window %d,%d,%d,%d client %d,%d,%d,%d whole %d,%d,%d,%d X client %d,%d,%d,%d xwin %x\n",
hwnd, wndPtr->rectWindow.left, wndPtr->rectWindow.top,
wndPtr->rectWindow.right, wndPtr->rectWindow.bottom,
wndPtr->rectClient.left, wndPtr->rectClient.top,
@ -1135,7 +1135,7 @@ BOOL X11DRV_CreateWindow( HWND hwnd, CREATESTRUCTA *cs, BOOL unicode )
WIN_ReleasePtr( wndPtr );
/* send it anyway */
if (((rect.right-rect.left) <0) ||((rect.bottom-rect.top)<0))
WARN("sending bogus WM_SIZE message 0x%08lx\n",
WARN("sending bogus WM_SIZE message 0x%08x\n",
MAKELONG(rect.right-rect.left, rect.bottom-rect.top));
SendMessageW( hwnd, WM_SIZE, SIZE_RESTORED,
MAKELONG(rect.right-rect.left, rect.bottom-rect.top));

14
dlls/winex11.drv/winpos.c
View File

@ -165,7 +165,7 @@ static BOOL SWP_DoWinPosChanging( WINDOWPOS* pWinpos, RECT* pNewWindowRect, RECT
TRACE( "hwnd %p, after %p, swp %d,%d %dx%d flags %08x\n",
pWinpos->hwnd, pWinpos->hwndInsertAfter, pWinpos->x, pWinpos->y,
pWinpos->cx, pWinpos->cy, pWinpos->flags );
TRACE( "current %s style %08lx new %s\n",
TRACE( "current %s style %08x new %s\n",
wine_dbgstr_rect( &wndPtr->rectWindow ), wndPtr->dwStyle,
wine_dbgstr_rect( pNewWindowRect ));
@ -668,7 +668,7 @@ BOOL X11DRV_set_window_pos( HWND hwnd, HWND insert_after, const RECT *rectWindow
win->dwStyle = new_style;
data->window_rect = *rectWindow;
TRACE( "win %p window %s client %s style %08lx\n",
TRACE( "win %p window %s client %s style %08x\n",
hwnd, wine_dbgstr_rect(rectWindow), wine_dbgstr_rect(rectClient), new_style );
/* FIXME: copy the valid bits */
@ -1294,7 +1294,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
rect.top = y;
rect.right = x + event->width;
rect.bottom = y + event->height;
TRACE( "win %p new X rect %ld,%ld,%ldx%ld (event %d,%d,%dx%d)\n",
TRACE( "win %p new X rect %d,%d,%dx%d (event %d,%d,%dx%d)\n",
hwnd, rect.left, rect.top, rect.right-rect.left, rect.bottom-rect.top,
event->x, event->y, event->width, event->height );
X11DRV_X_to_window_rect( data, &rect );
@ -1310,7 +1310,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
GetWindowRect( hwnd, &rect );
if (rect.left == x && rect.top == y) flags |= SWP_NOMOVE;
else
TRACE( "%p moving from (%ld,%ld) to (%d,%d)\n",
TRACE( "%p moving from (%d,%d) to (%d,%d)\n",
hwnd, rect.left, rect.top, x, y );
if ((rect.right - rect.left == cx && rect.bottom - rect.top == cy) ||
@ -1321,7 +1321,7 @@ void X11DRV_ConfigureNotify( HWND hwnd, XEvent *xev )
flags |= SWP_NOSIZE;
}
else
TRACE( "%p resizing from (%ldx%ld) to (%dx%d)\n",
TRACE( "%p resizing from (%dx%d) to (%dx%d)\n",
hwnd, rect.right - rect.left, rect.bottom - rect.top, cx, cy );
data->lock_changes++;
@ -1596,7 +1596,7 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
if (!(data = X11DRV_get_win_data( hwnd ))) return;
TRACE("hwnd %p (%smanaged), command %04x, hittest %ld, pos %ld,%ld\n",
TRACE("hwnd %p (%smanaged), command %04x, hittest %d, pos %d,%d\n",
hwnd, data->managed ? "" : "NOT ", syscommand, hittest, pt.x, pt.y);
/* if we are managed then we let the WM do all the work */
@ -1621,7 +1621,7 @@ void X11DRV_SysCommandSizeMove( HWND hwnd, WPARAM wParam )
case WMSZ_BOTTOMLEFT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMLEFT; break;
case WMSZ_BOTTOMRIGHT: dir = _NET_WM_MOVERESIZE_SIZE_BOTTOMRIGHT; break;
default:
ERR("Invalid hittest value: %ld\n", hittest);
ERR("Invalid hittest value: %d\n", hittest);
dir = _NET_WM_MOVERESIZE_SIZE_KEYBOARD;
}
X11DRV_WMMoveResizeWindow( hwnd, pt.x, pt.y, dir );

2
dlls/winex11.drv/x11ddraw.c
View File

@ -363,7 +363,7 @@ static void X11DRV_DDHAL_SetInfo(void)
INT X11DRV_DCICommand(INT cbInput, const DCICMD *lpCmd, LPVOID lpOutData)
{
TRACE("(%d,(%ld,%ld,%ld),%p)\n", cbInput, lpCmd->dwCommand,
TRACE("(%d,(%d,%d,%d),%p)\n", cbInput, lpCmd->dwCommand,
lpCmd->dwParam1, lpCmd->dwParam2, lpOutData);
switch (lpCmd->dwCommand) {

2
dlls/winex11.drv/xdnd.c
View File

@ -157,7 +157,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event )
if (GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES)
accept = 1;
TRACE("action req: %ld accept(%d) at x(%ld),y(%ld)\n",
TRACE("action req: %ld accept(%d) at x(%d),y(%d)\n",
event->data.l[4], accept, XDNDxy.x, XDNDxy.y);
/*

3
dlls/winex11.drv/xim.c
View File

@ -107,8 +107,7 @@ static BOOL X11DRV_ImmSetInternalString(DWORD dwIndex, DWORD dwOffset,
unsigned int byte_selection = selLength * sizeof(WCHAR);
BOOL rc = FALSE;
TRACE("( %li, %li, %ld, %p, %ld):\n", dwOffset, selLength, dwIndex, lpComp,
dwCompLen );
TRACE("( %i, %i, %d, %p, %d):\n", dwOffset, selLength, dwIndex, lpComp, dwCompLen );
if (dwIndex == GCS_COMPSTR)
{

8
dlls/winex11.drv/xrandr.c
View File

@ -200,11 +200,11 @@ static void X11DRV_XRandR_SetCurrentMode(int mode)
size = pXRRConfigCurrentConfiguration (sc, &rot);
if (dwBpp != dd_modes[mode].dwBPP)
{
FIXME("Cannot change screen BPP from %ld to %ld\n", dwBpp, dd_modes[mode].dwBPP);
FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP);
}
mode = mode%real_xrandr_modes_count;
TRACE("Changing Resolution to %ldx%ld @%d Hz\n",
TRACE("Changing Resolution to %dx%d @%d Hz\n",
dd_modes[mode].dwWidth,
dd_modes[mode].dwHeight,
dd_modes[mode].wRefreshRate);
@ -222,7 +222,7 @@ static void X11DRV_XRandR_SetCurrentMode(int mode)
if (dd_modes[mode].wRefreshRate == real_xrandr_rates[i][j])
{
rate = real_xrandr_rates[i][j];
TRACE("Resizing X display to %ldx%ld @%d Hz\n",
TRACE("Resizing X display to %dx%d @%d Hz\n",
dd_modes[mode].dwWidth, dd_modes[mode].dwHeight, rate);
stat = pXRRSetScreenConfigAndRate (gdi_display, sc, root,
size, rot, rate, CurrentTime);
@ -231,7 +231,7 @@ static void X11DRV_XRandR_SetCurrentMode(int mode)
}
else
{
TRACE("Resizing X display to %ldx%ld <default Hz>\n",
TRACE("Resizing X display to %dx%d <default Hz>\n",
dd_modes[mode].dwWidth, dd_modes[mode].dwHeight);
stat = pXRRSetScreenConfig (gdi_display, sc, root, size, rot, CurrentTime);
}

10
dlls/winex11.drv/xrender.c
View File

@ -455,7 +455,7 @@ static BOOL get_gasp_flags(X11DRV_PDEVICE *physDev, WORD *flags)
break;
gasp += 2;
}
TRACE("got flags %04x for ppem %ld\n", *flags, ppem);
TRACE("got flags %04x for ppem %d\n", *flags, ppem);
HeapFree(GetProcessHeap(), 0, buffer);
return TRUE;
@ -547,7 +547,7 @@ BOOL X11DRV_XRender_SelectFont(X11DRV_PDEVICE *physDev, HFONT hfont)
LFANDSIZE lfsz;
GetObjectW(hfont, sizeof(lfsz.lf), &lfsz.lf);
TRACE("h=%ld w=%ld weight=%ld it=%d charset=%d name=%s\n",
TRACE("h=%d w=%d weight=%d it=%d charset=%d name=%s\n",
lfsz.lf.lfHeight, lfsz.lf.lfWidth, lfsz.lf.lfWeight,
lfsz.lf.lfItalic, lfsz.lf.lfCharSet, debugstr_w(lfsz.lf.lfFaceName));
lfsz.devsize.cx = X11DRV_XWStoDS( physDev, lfsz.lf.lfWidth );
@ -742,7 +742,7 @@ static BOOL UploadGlyph(X11DRV_PDEVICE *physDev, int glyph, AA_Type format)
GetGlyphOutlineW(physDev->hdc, glyph, ggo_format, &gm, buflen, buf, NULL);
formatEntry->realized[glyph] = TRUE;
TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%ld,%ld\n",
TRACE("buflen = %d. Got metrics: %dx%d adv=%d,%d origin=%d,%d\n",
buflen,
gm.gmBlackBoxX, gm.gmBlackBoxY, gm.gmCellIncX, gm.gmCellIncY,
gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y);
@ -1261,7 +1261,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
}
assert(formatEntry);
TRACE("Writing %s at %ld,%ld\n", debugstr_wn(wstr,count),
TRACE("Writing %s at %d,%d\n", debugstr_wn(wstr,count),
physDev->org.x + x, physDev->org.y + y);
if(X11DRV_XRender_Installed) {
@ -1358,7 +1358,7 @@ BOOL X11DRV_XRender_ExtTextOut( X11DRV_PDEVICE *physDev, INT x, INT y, UINT flag
cur.y += formatEntry->gis[wstr[idx]].yOff;
}
}
TRACE("glyph extents %ld,%ld - %ld,%ld drawable x,y %ld,%ld\n", extents.left, extents.top,
TRACE("glyph extents %d,%d - %d,%d drawable x,y %d,%d\n", extents.left, extents.top,
extents.right, extents.bottom, physDev->org.x + x, physDev->org.y + y);
if(physDev->org.x + x + extents.left >= 0) {

4
dlls/winex11.drv/xvidmode.c
View File

@ -72,7 +72,7 @@ static void convert_modeline(int dotclock, const XF86VidModeModeLine *mode, LPDD
info->wRefreshRate = dotclock * 1000 / (mode->htotal * mode->vtotal);
else
info->wRefreshRate = 0;
TRACE(" width=%ld, height=%ld, refresh=%d\n",
TRACE(" width=%d, height=%d, refresh=%d\n",
info->dwWidth, info->dwHeight, info->wRefreshRate);
info->lPitch = 0;
info->dwBPP = bpp;
@ -118,7 +118,7 @@ static void X11DRV_XF86VM_SetCurrentMode(int mode)
/* only set modes from the original color depth */
if (dwBpp != dd_modes[mode].dwBPP)
{
FIXME("Cannot change screen BPP from %ld to %ld\n", dwBpp, dd_modes[mode].dwBPP);
FIXME("Cannot change screen BPP from %d to %d\n", dwBpp, dd_modes[mode].dwBPP);
}
mode = mode % real_xf86vm_mode_count;