Skip to content

W
wine-cw
Commit 547cdc2b authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Made gdi compile with -DSTRICT.

parent 6c428e5c
Hide whitespace changes
Inline Side-by-side
Showing with 131 additions and 143 deletions
dlls/gdi/Makefile.in
View file @ 547cdc2b
EXTRADEFS = -D_GDI32_ -DWINE_NO_STRICT
EXTRADEFS = -D_GDI32_
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../..
SRCDIR = @srcdir@
......
dlls/gdi/driver.c
View file @ 547cdc2b
......@@ -365,7 +365,7 @@ BOOL DRIVER_GetDriverName( LPCSTR device, LPSTR driver, DWORD size )
INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd,
LPSTR lpModelName, LPSTR OldPort, LPSTR NewPort )
{
FIXME("(%p, %04x, %s, %s, %s)\n", lpfnDevInstallProc, hWnd, lpModelName, OldPort, NewPort );
FIXME("(%p, %p, %s, %s, %s)\n", lpfnDevInstallProc, hWnd, lpModelName, OldPort, NewPort );
return -1;
}
......@@ -389,7 +389,7 @@ INT WINAPI GDI_CallDevInstall16( FARPROC16 lpfnDevInstallProc, HWND hWnd,
INT WINAPI GDI_CallExtDeviceModePropSheet16( HWND hWnd, LPCSTR lpszDevice,
LPCSTR lpszPort, LPVOID lpPropSheet )
{
FIXME("(%04x, %s, %s, %p)\n", hWnd, lpszDevice, lpszPort, lpPropSheet );
FIXME("(%p, %s, %s, %p)\n", hWnd, lpszDevice, lpszPort, lpPropSheet );
return -1;
}
......@@ -410,7 +410,7 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd,
INT ret = -1;
INT (*pExtDeviceMode)(LPSTR,HWND,LPDEVMODEA,LPSTR,LPSTR,LPDEVMODEA,LPSTR,DWORD);
TRACE("(%04x, %p, %s, %s, %p, %s, %ld)\n",
TRACE("(%p, %p, %s, %s, %p, %s, %ld)\n",
hwnd, lpdmOutput, lpszDevice, lpszPort, lpdmInput, lpszProfile, fwMode );
if(!DRIVER_GetDriverName( lpszDevice, buf, sizeof(buf) )) return -1;
......@@ -438,7 +438,7 @@ INT WINAPI GDI_CallExtDeviceMode16( HWND hwnd,
INT WINAPI GDI_CallAdvancedSetupDialog16( HWND hwnd, LPSTR lpszDevice,
LPDEVMODEA devin, LPDEVMODEA devout )
{
TRACE("(%04x, %s, %p, %p)\n", hwnd, lpszDevice, devin, devout );
TRACE("(%p, %s, %p, %p)\n", hwnd, lpszDevice, devin, devout );
return -1;
}
......
dlls/gdi/enhmfdrv/init.c
View file @ 547cdc2b
......@@ -372,7 +372,7 @@ HDC WINAPI CreateEnhMetaFileW(
physDev->hFile = hFile;
}
TRACE("returning %04x\n", dc->hSelf);
TRACE("returning %p\n", dc->hSelf);
ret = dc->hSelf;
GDI_ReleaseObj( dc->hSelf );
......@@ -393,7 +393,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
EMREOF emr;
HANDLE hMapping = 0;
TRACE("(%04x)\n", hdc );
TRACE("(%p)\n", hdc );
if (!(dc = (DC *) GDI_GetObjPtr( hdc, ENHMETAFILE_DC_MAGIC ))) return 0;
physDev = (EMFDRV_PDEVICE *)dc->physDev;
......@@ -436,7 +436,7 @@ HENHMETAFILE WINAPI CloseEnhMetaFile(HDC hdc) /* [in] metafile DC */
HeapFree( GetProcessHeap(), 0, physDev->emh );
hMapping = CreateFileMappingA(physDev->hFile, NULL, PAGE_READONLY, 0,
0, NULL);
TRACE("hMapping = %08x\n", hMapping );
TRACE("hMapping = %p\n", hMapping );
physDev->emh = MapViewOfFile(hMapping, FILE_MAP_READ, 0, 0, 0);
TRACE("view = %p\n", physDev->emh );
CloseHandle( hMapping );
......
dlls/gdi/freetype.c
View file @ 547cdc2b
......@@ -950,7 +950,7 @@ GdiFont WineEngCreateFontInstance(DC *dc, HFONT hfont)
/* check the cache first */
for(ret = GdiFontList; ret; ret = ret->next) {
if(ret->hfont == hfont && !memcmp(&ret->xform, &dc->xformWorld2Vport, offsetof(XFORM, eDx))) {
TRACE("returning cached gdiFont(%p) for hFont %x\n", ret, hfont);
TRACE("returning cached gdiFont(%p) for hFont %p\n", ret, hfont);
return ret;
}
}
......@@ -1104,7 +1104,7 @@ not_found:
ret->orientation = lf.lfOrientation;
ret->name = strdupW(family->FamilyName);
TRACE("caching: gdiFont=%p hfont=%x\n", ret, hfont);
TRACE("caching: gdiFont=%p hfont=%p\n", ret, hfont);
ret->hfont = hfont;
ret->next = GdiFontList;
GdiFontList = ret;
......@@ -1120,7 +1120,7 @@ static void DumpGdiFontList(void)
for(gdiFont = GdiFontList; gdiFont; gdiFont = gdiFont->next) {
LOGFONTW lf;
GetObjectW( gdiFont->hfont, sizeof(lf), &lf );
TRACE("gdiFont=%p hfont=%x (%s)\n",
TRACE("gdiFont=%p hfont=%p (%s)\n",
gdiFont, gdiFont->hfont, debugstr_w(lf.lfFaceName));
}
}
......@@ -1137,7 +1137,7 @@ BOOL WineEngDestroyFontInstance(HFONT handle)
GdiFont gdiPrev = NULL;
BOOL ret = FALSE;
TRACE("destroying hfont=%x\n", handle);
TRACE("destroying hfont=%p\n", handle);
if(TRACE_ON(font))
DumpGdiFontList();
......
dlls/gdi/mfdrv/init.c
View file @ 547cdc2b
......@@ -246,7 +246,7 @@ HDC WINAPI CreateMetaFileA( LPCSTR filename ) /* [in] Filename of disk metafile
else /* memory based metafile */
physDev->mh->mtType = METAFILE_MEMORY;
TRACE("returning %04x\n", dc->hSelf);
TRACE("returning %p\n", dc->hSelf);
ret = dc->hSelf;
GDI_ReleaseObj( dc->hSelf );
return ret;
......@@ -281,7 +281,7 @@ static DC *MFDRV_CloseMetaFile( HDC hdc )
DC *dc;
METAFILEDRV_PDEVICE *physDev;
TRACE("(%04x)\n", hdc );
TRACE("(%p)\n", hdc );
if (!(dc = (DC *) GDI_GetObjPtr( hdc, METAFILE_DC_MAGIC ))) return 0;
physDev = (METAFILEDRV_PDEVICE *)dc->physDev;
......
dlls/gdi/printdrv.c
View file @ 547cdc2b
......@@ -202,7 +202,7 @@ BOOL16 WINAPI QueryAbort16(HDC16 hdc16, INT16 reserved)
ABORTPROC abproc;
if(!dc) {
ERR("Invalid hdc %04x\n", hdc);
ERR("Invalid hdc %p\n", hdc);
return FALSE;
}
......
dlls/gdi/win16drv/font.c
View file @ 547cdc2b
......@@ -95,7 +95,7 @@ BOOL WIN16DRV_GetTextExtentPoint( PHYSDEV dev, LPCWSTR wstr, INT count,
DWORD dwRet, len;
char *str;
TRACE("%04x %s %d %p\n", physDev->hdc, debugstr_wn(wstr, count), count, size);
TRACE("%p %s %d %p\n", physDev->hdc, debugstr_wn(wstr, count), count, size);
len = WideCharToMultiByte( CP_ACP, 0, wstr, count, NULL, 0, NULL, NULL );
......@@ -121,7 +121,7 @@ BOOL WIN16DRV_GetTextMetrics( PHYSDEV dev, TEXTMETRICW *metrics )
{
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dev;
TRACE("%04x \n", physDev->hdc);
TRACE("%p \n", physDev->hdc);
*metrics = physDev->tm;
......
dlls/gdi/win16drv/init.c
View file @ 547cdc2b
......@@ -343,7 +343,7 @@ static INT WIN16DRV_GetDeviceCaps( PHYSDEV dev, INT cap )
WIN16DRV_PDEVICE *physDev = (WIN16DRV_PDEVICE *)dev;
if (cap >= PHYSICALWIDTH || (cap % 2))
{
FIXME("(%04x): unsupported capability %d, will return 0\n", physDev->hdc, cap );
FIXME("(%p): unsupported capability %d, will return 0\n", physDev->hdc, cap );
return 0;
}
return *((WORD *)&physDev->DevCaps + (cap / 2));
......
dlls/gdi/win16drv/text.c
View file @ 547cdc2b
......@@ -51,7 +51,7 @@ BOOL WIN16DRV_ExtTextOut( PHYSDEV dev, INT x, INT y, UINT flags,
if (count == 0)
return FALSE;
TRACE("%04x %d %d %x %p %s %p\n",
TRACE("%p %d %d %x %p %s %p\n",
dc->hSelf, x, y, flags, lprect, debugstr_wn(wstr, count), lpDx);
len = WideCharToMultiByte( CP_ACP, 0, wstr, count, NULL, 0, NULL, NULL );
......
graphics/bitblt.c
View file @ 547cdc2b
......@@ -37,7 +37,7 @@ BOOL WINAPI PatBlt( HDC hdc, INT left, INT top,
if (dc->funcs->pPatBlt)
{
TRACE("%04x %d,%d %dx%d %06lx\n", hdc, left, top, width, height, rop );
TRACE("%p %d,%d %dx%d %06lx\n", hdc, left, top, width, height, rop );
bRet = dc->funcs->pPatBlt( dc->physDev, left, top, width, height, rop );
}
GDI_ReleaseObj( hdc );
......@@ -59,7 +59,7 @@ BOOL WINAPI BitBlt( HDC hdcDst, INT xDst, INT yDst, INT width,
if ((dcDst = DC_GetDCUpdate( hdcDst )))
{
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE("hdcSrc=%04x %d,%d %d bpp->hdcDest=%04x %d,%d %dx%dx%d rop=%06lx\n",
TRACE("hdcSrc=%p %d,%d %d bpp->hdcDest=%p %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, dcSrc ? dcSrc->bitsPerPixel : 0,
hdcDst, xDst, yDst, width, height, dcDst->bitsPerPixel, rop);
if (dcDst->funcs->pBitBlt)
......@@ -90,7 +90,7 @@ BOOL WINAPI StretchBlt( HDC hdcDst, INT xDst, INT yDst,
{
dcSrc = DC_GetDCPtr( hdcSrc );
TRACE("%04x %d,%d %dx%dx%d -> %04x %d,%d %dx%dx%d rop=%06lx\n",
TRACE("%p %d,%d %dx%dx%d -> %p %d,%d %dx%dx%d rop=%06lx\n",
hdcSrc, xSrc, ySrc, widthSrc, heightSrc,
dcSrc ? dcSrc->bitsPerPixel : 0, hdcDst, xDst, yDst,
widthDst, heightDst, dcDst->bitsPerPixel, rop );
......@@ -116,7 +116,7 @@ BOOL WINAPI MaskBlt(HDC hdcDest, INT nXDest, INT nYDest,
INT nXSrc, INT nYSrc, HBITMAP hbmMask,
INT xMask, INT yMask, DWORD dwRop)
{
FIXME("(%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%ld): stub\n",
FIXME("(%p,%d,%d,%d,%d,%p,%d,%d,%p,%d,%d,%ld): stub\n",
hdcDest,nXDest,nYDest,nWidth,nHeight,hdcSource,nXSrc,nYSrc,
hbmMask,xMask,yMask,dwRop);
return 1;
......
graphics/mapping.c
View file @ 547cdc2b
......@@ -160,7 +160,7 @@ INT WINAPI SetMapMode( HDC hdc, INT mode )
}
}
TRACE("%04x %d\n", hdc, mode );
TRACE("%p %d\n", hdc, mode );
ret = dc->MapMode;
horzSize = GetDeviceCaps( hdc, HORZSIZE );
......
graphics/painting.c
View file @ 547cdc2b
......@@ -318,7 +318,7 @@ INT WINAPI ChoosePixelFormat( HDC hdc, const LPPIXELFORMATDESCRIPTOR ppfd )
INT ret = 0;
DC * dc = DC_GetDCPtr( hdc );
TRACE("(%08x,%p)\n",hdc,ppfd);
TRACE("(%p,%p)\n",hdc,ppfd);
if (!dc) return 0;
......@@ -347,7 +347,7 @@ BOOL WINAPI SetPixelFormat( HDC hdc, INT iPixelFormat,
INT bRet = FALSE;
DC * dc = DC_GetDCPtr( hdc );
TRACE("(%d,%d,%p)\n",hdc,iPixelFormat,ppfd);
TRACE("(%p,%d,%p)\n",hdc,iPixelFormat,ppfd);
if (!dc) return 0;
......@@ -375,7 +375,7 @@ INT WINAPI GetPixelFormat( HDC hdc )
INT ret = 0;
DC * dc = DC_GetDCPtr( hdc );
TRACE("(%08x)\n",hdc);
TRACE("(%p)\n",hdc);
if (!dc) return 0;
......@@ -407,7 +407,7 @@ INT WINAPI DescribePixelFormat( HDC hdc, INT iPixelFormat, UINT nBytes,
INT ret = 0;
DC * dc = DC_GetDCPtr( hdc );
TRACE("(%08x,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
TRACE("(%p,%d,%d,%p): stub\n",hdc,iPixelFormat,nBytes,ppfd);
if (!dc) return 0;
......@@ -439,7 +439,7 @@ BOOL WINAPI SwapBuffers( HDC hdc )
INT bRet = FALSE;
DC * dc = DC_GetDCPtr( hdc );
TRACE("(%08x)\n",hdc);
TRACE("(%p)\n",hdc);
if (!dc) return TRUE;
......
graphics/path.c
View file @ 547cdc2b
......@@ -1555,7 +1555,7 @@ BOOL WINAPI StrokePath(HDC hdc)
GdiPath *pPath;
BOOL bRet = FALSE;
TRACE("(%08x)\n", hdc);
TRACE("(%p)\n", hdc);
if(!dc) return FALSE;
if(dc->funcs->pStrokePath)
......
objects/bitmap.c
View file @ 547cdc2b
......@@ -126,8 +126,7 @@ HBITMAP WINAPI CreateBitmap( INT width, INT height, UINT planes,
(HGDIOBJ *)&hbitmap, &bitmap_funcs )))
return 0;
TRACE("%dx%d, %d colors returning %08x\n", width, height,
1 << (planes*bpp), hbitmap);
TRACE("%dx%d, %d colors returning %p\n", width, height, 1 << (planes*bpp), hbitmap);
bmp->size.cx = 0;
bmp->size.cy = 0;
......@@ -169,7 +168,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
HBITMAP hbmpRet = 0;
DC *dc;
TRACE("(%04x,%d,%d) = \n", hdc, width, height );
TRACE("(%p,%d,%d) = \n", hdc, width, height );
if (!(dc = DC_GetDCPtr( hdc ))) return 0;
if ((width >= 0x10000) || (height >= 0x10000)) {
FIXME("got bad width %d or height %d, please look for reason\n",
......@@ -187,7 +186,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height)
hbmpRet = 0;
}
}
TRACE("\t\t%04x\n", hbmpRet);
TRACE("\t\t%p\n", hbmpRet);
GDI_ReleaseObj(hdc);
return hbmpRet;
}
......@@ -249,7 +248,7 @@ LONG WINAPI GetBitmapBits(
}
TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
TRACE("(%p, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
......@@ -308,7 +307,7 @@ LONG WINAPI SetBitmapBits(
if (height > bmp->bitmap.bmHeight) height = bmp->bitmap.bmHeight;
count = height * bmp->bitmap.bmWidthBytes;
TRACE("(%08x, %ld, %p) %dx%d %d colors fetched height: %ld\n",
TRACE("(%p, %ld, %p) %dx%d %d colors fetched height: %ld\n",
hbitmap, count, bits, bmp->bitmap.bmWidth, bmp->bitmap.bmHeight,
1 << bmp->bitmap.bmBitsPixel, height );
......@@ -390,7 +389,7 @@ BOOL BITMAP_SetOwnerDC( HBITMAP hbitmap, DC *dc )
}
else if (bitmap->funcs != dc->funcs)
{
FIXME( "Trying to select bitmap %x in different DC type\n", hbitmap );
FIXME( "Trying to select bitmap %p in different DC type\n", hbitmap );
ret = FALSE;
}
GDI_ReleaseObj( hbitmap );
......
objects/brush.c
View file @ 547cdc2b
......@@ -137,7 +137,7 @@ HBRUSH WINAPI CreateBrushIndirect( const LOGBRUSH * brush )
}
GDI_ReleaseObj( hbrush );
TRACE("%08x\n", hbrush);
TRACE("%p\n", hbrush);
return hbrush;
error:
......@@ -169,7 +169,7 @@ HBRUSH WINAPI CreateHatchBrush( INT style, COLORREF color )
HBRUSH WINAPI CreatePatternBrush( HBITMAP hbitmap )
{
LOGBRUSH logbrush = { BS_PATTERN, 0, 0 };
TRACE("%04x\n", hbitmap );
TRACE("%p\n", hbitmap );
logbrush.lbHatch = (ULONG_PTR)hbitmap;
return CreateBrushIndirect( &logbrush );
......@@ -197,7 +197,7 @@ HBRUSH WINAPI CreateDIBPatternBrush(
{
LOGBRUSH logbrush;
TRACE("%04x\n", hbitmap );
TRACE("%p\n", hbitmap );
logbrush.lbStyle = BS_DIBPATTERN;
logbrush.lbColor = coloruse;
......
objects/clipping.c
View file @ 547cdc2b
......@@ -73,7 +73,7 @@ INT WINAPI ExtSelectClipRgn( HDC hdc, HRGN hrgn, INT fnMode )
DC * dc = DC_GetDCUpdate( hdc );
if (!dc) return ERROR;
TRACE("%04x %04x %d\n", hdc, hrgn, fnMode );
TRACE("%p %p %d\n", hdc, hrgn, fnMode );
if (dc->funcs->pExtSelectClipRgn)
{
......@@ -129,7 +129,7 @@ INT16 WINAPI SelectVisRgn16( HDC16 hdc16, HRGN16 hrgn )
if (!hrgn) return ERROR;
if (!(dc = DC_GetDCPtr( hdc ))) return ERROR;
TRACE("%04x %04x\n", hdc, hrgn );
TRACE("%p %04x\n", hdc, hrgn );
dc->flags &= ~DC_DIRTY;
......@@ -149,7 +149,7 @@ INT WINAPI OffsetClipRgn( HDC hdc, INT x, INT y )
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return ERROR;
TRACE("%04x %d,%d\n", hdc, x, y );
TRACE("%p %d,%d\n", hdc, x, y );
if(dc->funcs->pOffsetClipRgn)
ret = dc->funcs->pOffsetClipRgn( dc->physDev, x, y );
......@@ -171,7 +171,7 @@ INT16 WINAPI OffsetVisRgn16( HDC16 hdc16, INT16 x, INT16 y )
HDC hdc = HDC_32( hdc16 );
DC * dc = DC_GetDCUpdate( hdc );
if (!dc) return ERROR;
TRACE("%04x %d,%d\n", hdc, x, y );
TRACE("%p %d,%d\n", hdc, x, y );
retval = OffsetRgn( dc->hVisRgn, x, y );
CLIPPING_UpdateGCRegion( dc );
GDI_ReleaseObj( hdc );
......@@ -190,7 +190,7 @@ INT WINAPI ExcludeClipRect( HDC hdc, INT left, INT top,
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return ERROR;
TRACE("%04x %dx%d,%dx%d\n", hdc, left, top, right, bottom );
TRACE("%p %dx%d,%dx%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pExcludeClipRect)
ret = dc->funcs->pExcludeClipRect( dc->physDev, left, top, right, bottom );
......@@ -230,7 +230,7 @@ INT WINAPI IntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return ERROR;
TRACE("%04x %d,%d - %d,%d\n", hdc, left, top, right, bottom );
TRACE("%p %d,%d - %d,%d\n", hdc, left, top, right, bottom );
if(dc->funcs->pIntersectClipRect)
ret = dc->funcs->pIntersectClipRect( dc->physDev, left, top, right, bottom );
......@@ -287,7 +287,7 @@ INT16 WINAPI ExcludeVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right,
LPtoDP( hdc, pt, 2 );
TRACE("%04x %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
TRACE("%p %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR;
else
......@@ -320,7 +320,7 @@ INT16 WINAPI IntersectVisRect16( HDC16 hdc16, INT16 left, INT16 top, INT16 right
LPtoDP( hdc, pt, 2 );
TRACE("%04x %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
TRACE("%p %ld,%ld - %ld,%ld\n", hdc, pt[0].x, pt[0].y, pt[1].x, pt[1].y);
if (!(tempRgn = CreateRectRgn( pt[0].x, pt[0].y, pt[1].x, pt[1].y ))) ret = ERROR;
......@@ -343,7 +343,7 @@ BOOL WINAPI PtVisible( HDC hdc, INT x, INT y )
BOOL ret = FALSE;
DC *dc = DC_GetDCUpdate( hdc );
TRACE("%04x %d,%d\n", hdc, x, y );
TRACE("%p %d,%d\n", hdc, x, y );
if (!dc) return FALSE;
if (dc->hGCClipRgn)
{
......@@ -367,8 +367,7 @@ BOOL WINAPI RectVisible( HDC hdc, const RECT* rect )
BOOL ret = FALSE;
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return FALSE;
TRACE("%04x %d,%dx%d,%d\n",
hdc, rect->left, rect->top, rect->right, rect->bottom );
TRACE("%p %d,%dx%d,%d\n", hdc, rect->left, rect->top, rect->right, rect->bottom );
if (dc->hGCClipRgn)
{
POINT pt[2];
......@@ -435,7 +434,7 @@ HRGN16 WINAPI SaveVisRgn16( HDC16 hdc16 )
DC *dc = DC_GetDCUpdate( hdc );
if (!dc) return 0;
TRACE("%04x\n", hdc );
TRACE("%p\n", hdc );
if (!(obj = GDI_GetObjPtr( dc->hVisRgn, REGION_MAGIC )))
{
......@@ -478,7 +477,7 @@ INT16 WINAPI RestoreVisRgn16( HDC16 hdc16 )
if (!dc) return ERROR;
TRACE("%04x\n", hdc );
TRACE("%p\n", hdc );
if (!(obj = GDI_GetObjPtr( dc->hVisRgn, REGION_MAGIC ))) goto done;
saved = HRGN_32(obj->hNext);
......
objects/dc.c
View file @ 547cdc2b
......@@ -281,7 +281,7 @@ HDC WINAPI GetDCState( HDC hdc )
GDI_ReleaseObj( hdc );
return 0;
}
TRACE("(%04x): returning %04x\n", hdc, handle );
TRACE("(%p): returning %p\n", hdc, handle );
newdc->flags = dc->flags | DC_SAVED;
newdc->hPen = dc->hPen;
......@@ -375,7 +375,7 @@ void WINAPI SetDCState( HDC hdc, HDC hdcs )
GDI_ReleaseObj( hdcs );
return;
}
TRACE("%04x %04x\n", hdc, hdcs );
TRACE("%p %p\n", hdc, hdcs );
dc->flags = dcs->flags & ~(DC_SAVED | DC_DIRTY);
dc->hDevice = dcs->hDevice;
......@@ -500,7 +500,7 @@ INT WINAPI SaveDC( HDC hdc )
dcs->header.hNext = dc->header.hNext;
dc->header.hNext = HDC_16(hdcs);
TRACE("(%04x): returning %d\n", hdc, dc->saveLevel+1 );
TRACE("(%p): returning %d\n", hdc, dc->saveLevel+1 );
ret = ++dc->saveLevel;
GDI_ReleaseObj( hdcs );
GDI_ReleaseObj( hdc );
......@@ -516,7 +516,7 @@ BOOL WINAPI RestoreDC( HDC hdc, INT level )
DC * dc, * dcs;
BOOL success;
TRACE("%04x %d\n", hdc, level );
TRACE("%p %d\n", hdc, level );
dc = DC_GetDCUpdate( hdc );
if(!dc) return FALSE;
if(dc->funcs->pRestoreDC)
......@@ -599,8 +599,8 @@ HDC WINAPI CreateDCA( LPCSTR driver, LPCSTR device, LPCSTR output,
dc->flags = 0;
TRACE("(driver=%s, device=%s, output=%s): returning %04x\n",
debugstr_a(driver), debugstr_a(device), debugstr_a(output), dc->hSelf );
TRACE("(driver=%s, device=%s, output=%s): returning %p\n",
debugstr_a(driver), debugstr_a(device), debugstr_a(output), dc->hSelf );
if (dc->funcs->pCreateDC &&
!dc->funcs->pCreateDC( dc, &dc->physDev, buf, device, output, initData ))
......@@ -690,8 +690,7 @@ HDC WINAPI CreateCompatibleDC( HDC hdc )
return 0;
}
TRACE("(%04x): returning %04x\n",
hdc, dc->hSelf );
TRACE("(%p): returning %p\n", hdc, dc->hSelf );
dc->flags = DC_MEMORY;
dc->bitsPerPixel = 1;
......@@ -733,7 +732,7 @@ BOOL WINAPI DeleteDC( HDC hdc )
const DC_FUNCTIONS *funcs = NULL;
DC * dc;
TRACE("%04x\n", hdc );
TRACE("%p\n", hdc );
GDI_CheckNotLock();
......@@ -1205,7 +1204,7 @@ WORD WINAPI SetHookFlags16(HDC16 hdc16, WORD flags)
/* "Undocumented Windows" info is slightly confusing.
*/
TRACE("hDC %04x, flags %04x\n",hdc,flags);
TRACE("hDC %p, flags %04x\n",hdc,flags);
if( flags & DCHF_INVALIDATEVISRGN )
dc->flags |= DC_DIRTY;
......@@ -1369,7 +1368,7 @@ INT WINAPI GetRelAbs( HDC hdc, DWORD dwIgnore )
*/
DWORD WINAPI GetLayout(HDC hdc)
{
FIXME("(%08x): stub\n", hdc);
FIXME("(%p): stub\n", hdc);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
......@@ -1383,7 +1382,7 @@ DWORD WINAPI GetLayout(HDC hdc)
*/
DWORD WINAPI SetLayout(HDC hdc, DWORD layout)
{
FIXME("(%08x,%08lx): stub\n", hdc, layout);
FIXME("(%p,%08lx): stub\n", hdc, layout);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return 0;
}
......@@ -1398,7 +1397,7 @@ DWORD WINAPI SetLayout(HDC hdc, DWORD layout)
*/
COLORREF WINAPI SetDCBrushColor(HDC hdc, COLORREF crColor)
{
FIXME("(%08x, %08lx): stub\n", hdc, crColor);
FIXME("(%p, %08lx): stub\n", hdc, crColor);
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
return CLR_INVALID;
}
objects/dib.c
View file @ 547cdc2b
......@@ -285,7 +285,7 @@ INT WINAPI SetDIBitsToDevice(HDC hdc, INT xDest, INT yDest, DWORD cx,
ySrc, startscan, lines, bits,
info, coloruse );
else {
FIXME("unimplemented on hdc %08x\n", hdc);
FIXME("unimplemented on hdc %p\n", hdc);
ret = 0;
}
......
objects/enhmetafile.c
View file @ 547cdc2b
......@@ -96,7 +96,7 @@ static ENHMETAHEADER *EMF_GetEnhMetaHeader( HENHMETAFILE hmf )
{
ENHMETAHEADER *ret = NULL;
ENHMETAFILEOBJ *metaObj = (ENHMETAFILEOBJ *)GDI_GetObjPtr( hmf, ENHMETAFILE_MAGIC );
TRACE("hmf %04x -> enhmetaObj %p\n", hmf, metaObj);
TRACE("hmf %p -> enhmetaObj %p\n", hmf, metaObj);
if (metaObj)
{
ret = metaObj->emh;
......@@ -305,9 +305,8 @@ BOOL WINAPI PlayEnhMetaFileRecord(
int type;
POINT pt[2];
TRACE(
"hdc = %08x, handletable = %p, record = %p, numHandles = %d\n",
hdc, handletable, mr, handles);
TRACE("hdc = %p, handletable = %p, record = %p, numHandles = %d\n",
hdc, handletable, mr, handles);
if (!mr) return FALSE;
type = mr->iType;
......@@ -1841,7 +1840,7 @@ UINT WINAPI GetEnhMetaFilePaletteEntries( HENHMETAFILE hEmf,
ENHMETAHEADER* enhHeader = EMF_GetEnhMetaHeader( hEmf );
EMF_PaletteCopy infoForCallBack;
TRACE( "(%04x,%d,%p)\n", hEmf, cEntries, lpPe );
TRACE( "(%p,%d,%p)\n", hEmf, cEntries, lpPe );
/* First check if there are any palettes associated with
this metafile. */
......@@ -1888,7 +1887,7 @@ HENHMETAFILE WINAPI SetWinMetaFileBits(UINT cbBuffer,
METAFILEPICT mfp;
RECT rc, *prcFrame = NULL;
TRACE("(%d, %p, %08x, %p)\n", cbBuffer, lpbBuffer, hdcRef, lpmfp);
TRACE("(%d, %p, %p, %p)\n", cbBuffer, lpbBuffer, hdcRef, lpmfp);
if(!(hmf = SetMetaFileBitsEx(cbBuffer, lpbBuffer))) {
WARN("SetMetaFileBitsEx fails\n");
......
objects/font.c
View file @ 547cdc2b
......@@ -319,7 +319,7 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
{
memcpy( &fontPtr->logfont, plf, sizeof(LOGFONTW) );
TRACE("(%ld %ld %ld %ld %x %d %x %d %d) %s %s %s => %04x\n",
TRACE("(%ld %ld %ld %ld %x %d %x %d %d) %s %s %s => %p\n",
plf->lfHeight, plf->lfWidth,
plf->lfEscapement, plf->lfOrientation,
plf->lfPitchAndFamily,
......@@ -333,7 +333,7 @@ HFONT WINAPI CreateFontIndirectW( const LOGFONTW *plf )
/* this should really depend on whether GM_ADVANCED is set */
fontPtr->logfont.lfOrientation = fontPtr->logfont.lfEscapement;
WARN("orientation angle %f set to "
"escapement angle %f for new font %04x\n",
"escapement angle %f for new font %p\n",
plf->lfOrientation/10., plf->lfEscapement/10., hFont);
}
GDI_ReleaseObj( hFont );
......@@ -890,7 +890,7 @@ BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count,
HeapFree( GetProcessHeap(), 0, p );
}
TRACE("(%08x %s %d %p): returning %ld x %ld\n",
TRACE("(%p %s %d %p): returning %ld x %ld\n",
hdc, debugstr_an (str, count), count, size, size->cx, size->cy );
return ret;
}
......@@ -925,7 +925,7 @@ BOOL WINAPI GetTextExtentPoint32W(
GDI_ReleaseObj( hdc );
TRACE("(%08x %s %d %p): returning %ld x %ld\n",
TRACE("(%p %s %d %p): returning %ld x %ld\n",
hdc, debugstr_wn (str, count), count, size, size->cx, size->cy );
return ret;
}
......@@ -961,7 +961,7 @@ BOOL WINAPI GetTextExtentPointI(
GDI_ReleaseObj( hdc );
TRACE("(%08x %p %d %p): returning %ld x %ld\n",
TRACE("(%p %p %d %p): returning %ld x %ld\n",
hdc, indices, count, size, size->cx, size->cy );
return ret;
}
......@@ -1043,7 +1043,7 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
SIZE tSize;
BOOL ret = FALSE;
TRACE("(%08x, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt);
TRACE("(%p, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt);
size->cx = size->cy = nFit = extent = 0;
for(index = 0; index < count; index++)
......@@ -1318,7 +1318,7 @@ UINT WINAPI GetOutlineTextMetricsW(
DC *dc = DC_GetDCPtr( hdc );
UINT ret;
TRACE("(%d,%d,%p)\n", hdc, cbData, lpOTM);
TRACE("(%p,%d,%p)\n", hdc, cbData, lpOTM);
if(!dc) return 0;
if(dc->gdiFont) {
......@@ -1473,7 +1473,7 @@ DWORD WINAPI SetMapperFlags( HDC hDC, DWORD dwFlag )
if(dc->funcs->pSetMapperFlags)
ret = dc->funcs->pSetMapperFlags( dc->physDev, dwFlag );
else
FIXME("(0x%04x, 0x%08lx): stub - harmless\n", hDC, dwFlag);
FIXME("(%p, 0x%08lx): stub - harmless\n", hDC, dwFlag);
GDI_ReleaseObj( hDC );
return ret;
}
......@@ -1492,7 +1492,7 @@ BOOL16 WINAPI GetAspectRatioFilterEx16( HDC16 hdc, LPSIZE16 pAspectRatio )
*/
BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio )
{
FIXME("(%04x, %p): -- Empty Stub !\n", hdc, pAspectRatio);
FIXME("(%p, %p): -- Empty Stub !\n", hdc, pAspectRatio);
return FALSE;
}
......@@ -1617,7 +1617,7 @@ DWORD WINAPI GetGlyphOutlineW( HDC hdc, UINT uChar, UINT fuFormat,
DC *dc = DC_GetDCPtr(hdc);
DWORD ret;
TRACE("(%04x, %04x, %04x, %p, %ld, %p, %p)\n",
TRACE("(%p, %04x, %04x, %p, %ld, %p, %p)\n",
hdc, uChar, fuFormat, lpgm, cbBuffer, lpBuffer, lpmat2 );
if(!dc) return GDI_ERROR;
......@@ -1692,7 +1692,7 @@ BOOL WINAPI GetRasterizerCaps( LPRASTERIZER_STATUS lprs, UINT cbNumBytes)
DWORD WINAPI GetKerningPairsA( HDC hDC, DWORD cPairs, LPKERNINGPAIR lpKerningPairs )
{
int i;
FIXME("(%x,%ld,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs);
FIXME("(%p,%ld,%p): almost empty stub!\n", hDC, cPairs, lpKerningPairs);
for (i = 0; i < cPairs; i++)
lpKerningPairs[i].iKernAmount = 0;
return 0;
......@@ -1837,8 +1837,8 @@ DWORD WINAPI GetGlyphIndicesA(HDC hdc, LPCSTR lpstr, INT count,
WCHAR *lpstrW;
INT countW;
TRACE("(%04x, %s, %d, %p, 0x%lx)\n",
hdc, debugstr_an(lpstr, count), count, pgi, flags);
TRACE("(%p, %s, %d, %p, 0x%lx)\n",
hdc, debugstr_an(lpstr, count), count, pgi, flags);
lpstrW = FONT_mbtowc(hdc, lpstr, count, &countW, NULL);
ret = GetGlyphIndicesW(hdc, lpstrW, countW, pgi, flags);
......@@ -1856,8 +1856,8 @@ DWORD WINAPI GetGlyphIndicesW(HDC hdc, LPCWSTR lpstr, INT count,
DC *dc = DC_GetDCPtr(hdc);
DWORD ret = GDI_ERROR;
TRACE("(%04x, %s, %d, %p, 0x%lx)\n",
hdc, debugstr_wn(lpstr, count), count, pgi, flags);
TRACE("(%p, %s, %d, %p, 0x%lx)\n",
hdc, debugstr_wn(lpstr, count), count, pgi, flags);
if(!dc) return GDI_ERROR;
......
objects/gdiobj.c
View file @ 547cdc2b
......@@ -519,7 +519,7 @@ static HFONT create_stock_font( char const *fontName, const LOGFONTW *font, HKEY
#define TRACE_SEC(handle,text) \
TRACE("(%04x): " text " %ld\n", (handle), GDI_level.crst.RecursionCount)
TRACE("(%p): " text " %ld\n", (handle), GDI_level.crst.RecursionCount)
/***********************************************************************
......@@ -557,7 +557,7 @@ inline static void dec_ref_count( HGDIOBJ handle )
/* handle delayed DeleteObject*/
header->dwCount = 0;
GDI_ReleaseObj( handle );
TRACE( "executing delayed DeleteObject for %04x\n", handle );
TRACE( "executing delayed DeleteObject for %p\n", handle );
DeleteObject( handle );
}
}
......@@ -745,7 +745,7 @@ void *GDI_ReallocObject( WORD size, HGDIOBJ handle, void *object )
return new_ptr;
}
}
else ERR( "Invalid handle %x\n", handle );
else ERR( "Invalid handle %p\n", handle );
}
TRACE_SEC( handle, "leave" );
_LeaveSysLevel( &GDI_level );
......@@ -776,7 +776,7 @@ BOOL GDI_FreeObject( HGDIOBJ handle, void *ptr )
HeapFree( GetProcessHeap(), 0, large_handles[i] );
large_handles[i] = NULL;
}
else ERR( "Invalid handle %x\n", handle );
else ERR( "Invalid handle %p\n", handle );
}
TRACE_SEC( handle, "leave" );
_LeaveSysLevel( &GDI_level );
......@@ -826,7 +826,7 @@ void *GDI_GetObjPtr( HGDIOBJ handle, WORD magic )
{
_LeaveSysLevel( &GDI_level );
SetLastError( ERROR_INVALID_HANDLE );
WARN( "Invalid handle %x\n", handle );
WARN( "Invalid handle %p\n", handle );
}
else TRACE_SEC( handle, "enter" );
......@@ -870,20 +870,20 @@ BOOL WINAPI DeleteObject( HGDIOBJ obj )
if (!(header->wMagic & OBJECT_NOSYSTEM)
&& (header->wMagic >= FIRST_MAGIC) && (header->wMagic <= LAST_MAGIC))
{
TRACE("Preserving system object %04x\n", obj);
TRACE("Preserving system object %p\n", obj);
GDI_ReleaseObj( obj );
return TRUE;
}
if (header->dwCount)
{
TRACE("delayed for %04x because object in use, count %ld\n", obj, header->dwCount );
TRACE("delayed for %p because object in use, count %ld\n", obj, header->dwCount );
header->dwCount |= 0x80000000; /* mark for delete */
GDI_ReleaseObj( obj );
return TRUE;
}
TRACE("%04x\n", obj );
TRACE("%p\n", obj );
/* Delete object */
......@@ -903,7 +903,7 @@ HGDIOBJ WINAPI GetStockObject( INT obj )
HGDIOBJ ret;
if ((obj < 0) || (obj >= NB_STOCK_OBJECTS)) return 0;
ret = stock_objects[obj];
TRACE("returning %4x\n", ret );
TRACE("returning %p\n", ret );
return ret;
}
......@@ -917,7 +917,7 @@ INT16 WINAPI GetObject16( HANDLE16 handle16, INT16 count, LPVOID buffer )
HGDIOBJ handle = HGDIOBJ_32( handle16 );
INT16 result = 0;
TRACE("%04x %d %p\n", handle, count, buffer );
TRACE("%p %d %p\n", handle, count, buffer );
if (!count) return 0;
if (!(ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0;
......@@ -939,7 +939,7 @@ INT WINAPI GetObjectA( HANDLE handle, INT count, LPVOID buffer )
{
GDIOBJHDR * ptr;
INT result = 0;
TRACE("%08x %d %p\n", handle, count, buffer );
TRACE("%p %d %p\n", handle, count, buffer );
if (!count) return 0;
if (!(ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0;
......@@ -960,7 +960,7 @@ INT WINAPI GetObjectW( HANDLE handle, INT count, LPVOID buffer )
{
GDIOBJHDR * ptr;
INT result = 0;
TRACE("%08x %d %p\n", handle, count, buffer );
TRACE("%p %d %p\n", handle, count, buffer );
if (!count) return 0;
if (!(ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0;
......@@ -981,7 +981,7 @@ DWORD WINAPI GetObjectType( HANDLE handle )
{
GDIOBJHDR * ptr;
INT result = 0;
TRACE("%08x\n", handle );
TRACE("%p\n", handle );
if (!(ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE ))) return 0;
......@@ -1049,7 +1049,7 @@ HANDLE WINAPI GetCurrentObject(HDC hdc,UINT type)
case OBJ_BITMAP: ret = dc->hBitmap; break;
default:
/* the SDK only mentions those above */
FIXME("(%08x,%d): unknown type.\n",hdc,type);
FIXME("(%p,%d): unknown type.\n",hdc,type);
break;
}
GDI_ReleaseObj( hdc );
......@@ -1067,7 +1067,7 @@ HGDIOBJ WINAPI SelectObject( HDC hdc, HGDIOBJ handle )
GDIOBJHDR *header = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
if (!header) return 0;
TRACE("hdc=%04x %04x\n", hdc, handle );
TRACE("hdc=%p %p\n", hdc, handle );
if (header->funcs && header->funcs->pSelectObject)
{
......@@ -1094,7 +1094,7 @@ BOOL WINAPI UnrealizeObject( HGDIOBJ obj )
GDIOBJHDR * header = GDI_GetObjPtr( obj, MAGIC_DONTCARE );
if (!header) return FALSE;
TRACE("%04x\n", obj );
TRACE("%p\n", obj );
/* Unrealize object */
......@@ -1129,8 +1129,7 @@ INT WINAPI EnumObjects( HDC hdc, INT nObjType,
LOGPEN pen;
LOGBRUSH brush;
TRACE("%04x %d %08lx %08lx\n",
hdc, nObjType, (DWORD)lpEnumFunc, lParam );
TRACE("%p %d %p %08lx\n", hdc, nObjType, lpEnumFunc, lParam );
switch(nObjType)
{
case OBJ_PEN:
......@@ -1228,7 +1227,7 @@ void WINAPI MakeObjectPrivate16( HGDIOBJ16 handle16, BOOL16 private )
GDIOBJHDR *ptr = GDI_GetObjPtr( handle, MAGIC_DONTCARE );
if (!ptr)
{
ERR("invalid GDI object %04x !\n", handle);
ERR("invalid GDI object %p !\n", handle);
return;
}
ptr->wMagic |= OBJECT_PRIVATE;
......
objects/metafile.c
View file @ 547cdc2b
......@@ -444,7 +444,7 @@ HMETAFILE WINAPI CopyMetaFileA(
METAHEADER *mh2 = NULL;
HANDLE hFile;
TRACE("(%08x,%s)\n", hSrcMetaFile, lpFilename);
TRACE("(%p,%s)\n", hSrcMetaFile, lpFilename);
if(!mh) return 0;
......@@ -636,9 +636,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc16, HMETAFILE16 hmf,
HFONT hFont;
BOOL16 result = TRUE, loaded = FALSE;
TRACE("(%04x, %04x, %08lx, %08lx)\n",
hdc, hmf, (DWORD)lpEnumFunc, lpData);
TRACE("(%p, %04x, %p, %08lx)\n", hdc, hmf, lpEnumFunc, lpData);
if(!mh) return FALSE;
if(mh->mtType == METAFILE_DISK) { /* Create a memory-based copy */
......@@ -728,7 +726,7 @@ BOOL WINAPI EnumMetaFile(
HBRUSH hBrush;
HFONT hFont;
TRACE("(%08x,%08x,%p,%p)\n", hdc, hmf, lpEnumFunc, (void*)lpData);
TRACE("(%p,%p,%p,%p)\n", hdc, hmf, lpEnumFunc, (void*)lpData);
if (!mh) return 0;
if(mh->mtType == METAFILE_DISK)
{
......@@ -805,7 +803,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *ht, METARECORD *mr, UINT
POINT *pt;
BITMAPINFOHEADER *infohdr;
TRACE("(%04x %p %p %u) function %04x\n", hdc, ht, mr, handles, mr->rdFunction);
TRACE("(%p %p %p %u) function %04x\n", hdc, ht, mr, handles, mr->rdFunction);
switch (mr->rdFunction)
{
......@@ -1363,7 +1361,7 @@ UINT WINAPI GetMetaFileBitsEx(
METAHEADER *mh = MF_GetMetaHeader(hmf);
UINT mfSize;
TRACE("(%08x,%d,%p)\n", hmf, nSize, buf);
TRACE("(%p,%d,%p)\n", hmf, nSize, buf);
if (!mh) return 0; /* FIXME: error code */
if(mh->mtType == METAFILE_DISK)
FIXME("Disk-based metafile?\n");
......@@ -1388,8 +1386,7 @@ UINT WINAPI GetWinMetaFileBits(HENHMETAFILE hemf,
HMETAFILE hmf;
UINT ret;
FIXME("(%d,%d,%p,%d,%d): stub\n",
hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef);
FIXME("(%p,%d,%p,%d,%p): stub\n", hemf, cbBuffer, lpbBuffer, fnMapMode, hdcRef);
hdcmf = CreateMetaFileA(NULL);
/* PlayEnhMetaFile(hdcmf, hemf, lpRect); where does the bounding rect come from? */
hmf = CloseMetaFile(hdcmf);
......
objects/palette.c
View file @ 547cdc2b
......@@ -168,7 +168,7 @@ HPALETTE WINAPI CreatePalette(
palettePtr->mapping = NULL;
GDI_ReleaseObj( hpalette );
TRACE(" returning %04x\n", hpalette);
TRACE(" returning %p\n", hpalette);
return hpalette;
}
......@@ -284,7 +284,7 @@ UINT WINAPI GetPaletteEntries(
PALETTEOBJ * palPtr;
UINT numEntries;
TRACE("hpal = %04x, count=%i\n", hpalette, count );
TRACE("hpal = %p, count=%i\n", hpalette, count );
palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hpalette, PALETTE_MAGIC );
if (!palPtr) return 0;
......@@ -334,7 +334,7 @@ UINT WINAPI SetPaletteEntries(
PALETTEOBJ * palPtr;
UINT numEntries;
TRACE("hpal=%04x,start=%i,count=%i\n",hpalette,start,count );
TRACE("hpal=%p,start=%i,count=%i\n",hpalette,start,count );
if (hpalette == GetStockObject(DEFAULT_PALETTE)) return 0;
palPtr = (PALETTEOBJ *) GDI_GetObjPtr( hpalette, PALETTE_MAGIC );
......@@ -373,9 +373,8 @@ BOOL WINAPI ResizePalette(
int prevsize, size = sizeof(LOGPALETTE) + (cEntries - 1) * sizeof(PALETTEENTRY);
int* mapping = NULL;
TRACE("hpal = %04x, prev = %i, new = %i\n",
hPal, palPtr ? palPtr->logpalette.palNumEntries : -1,
cEntries );
TRACE("hpal = %p, prev = %i, new = %i\n",
hPal, palPtr ? palPtr->logpalette.palNumEntries : -1, cEntries );
if( !palPtr ) return FALSE;
cPrevEnt = palPtr->logpalette.palNumEntries;
prevVer = palPtr->logpalette.palVersion;
......@@ -430,7 +429,7 @@ BOOL WINAPI AnimatePalette(
UINT NumEntries, /* [in] Count of entries in palette */
const PALETTEENTRY* PaletteColors) /* [in] Pointer to first replacement */
{
TRACE("%04x (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries);
TRACE("%p (%i - %i)\n", hPal, StartIndex,StartIndex+NumEntries);
if( hPal != GetStockObject(DEFAULT_PALETTE) )
{
......@@ -455,7 +454,7 @@ UINT WINAPI SetSystemPaletteUse(
UINT use) /* [in] Palette-usage flag */
{
UINT old = SystemPaletteUse;
FIXME("(%04x,%04x): stub\n", hdc, use );
FIXME("(%p,%04x): stub\n", hdc, use );
SystemPaletteUse = use;
return old;
}
......@@ -490,7 +489,7 @@ UINT WINAPI GetSystemPaletteEntries(
UINT ret = 0;
DC *dc;
TRACE("hdc=%04x,start=%i,count=%i\n", hdc,start,count);
TRACE("hdc=%p,start=%i,count=%i\n", hdc,start,count);
if ((dc = DC_GetDCPtr( hdc )))
{
......@@ -539,7 +538,7 @@ UINT WINAPI GetNearestPaletteIndex(
}
GDI_ReleaseObj( hpalette );
}
TRACE("(%04x,%06lx): returning %d\n", hpalette, color, index );
TRACE("(%p,%06lx): returning %d\n", hpalette, color, index );
return index;
}
......@@ -666,11 +665,11 @@ HPALETTE WINAPI GDISelectPalette( HDC hdc, HPALETTE hpal, WORD wBkg)
HPALETTE prev;
DC *dc;
TRACE("%04x %04x\n", hdc, hpal );
TRACE("%p %p\n", hdc, hpal );
if (GetObjectType(hpal) != OBJ_PAL)
{
WARN("invalid selected palette %04x\n",hpal);
WARN("invalid selected palette %p\n",hpal);
return 0;
}
if (!(dc = DC_GetDCPtr( hdc ))) return 0;
......@@ -692,7 +691,7 @@ UINT WINAPI GDIRealizePalette( HDC hdc )
if (!dc) return 0;
TRACE("%04x...\n", hdc );
TRACE("%p...\n", hdc );
if( dc->hPalette == GetStockObject( DEFAULT_PALETTE ))
{
......@@ -707,7 +706,7 @@ UINT WINAPI GDIRealizePalette( HDC hdc )
hLastRealizedPalette = dc->hPalette;
pLastRealizedDC = dc->funcs;
}
else TRACE(" skipping (hLastRealizedPalette = %04x)\n", hLastRealizedPalette);
else TRACE(" skipping (hLastRealizedPalette = %p)\n", hLastRealizedPalette);
GDI_ReleaseObj( hdc );
TRACE(" realized %i colors.\n", realized );
......@@ -855,7 +854,7 @@ BOOL WINAPI GetICMProfileA(HDC hDC, LPDWORD lpcbName, LPSTR lpszFilename)
{
DWORD callerLen;
FIXME("(%04x, %p, %p): partial stub\n", hDC, lpcbName, lpszFilename);
FIXME("(%p, %p, %p): partial stub\n", hDC, lpcbName, lpszFilename);
callerLen = *lpcbName;
......
objects/region.c
View file @ 547cdc2b
......@@ -539,7 +539,7 @@ static BOOL REGION_DeleteObject( HGDIOBJ handle, void *obj )
{
RGNOBJ *rgn = obj;
TRACE(" %04x\n", handle );
TRACE(" %p\n", handle );
REGION_DestroyWineRegion( rgn->rgn );
return GDI_FreeObject( handle, obj );
......@@ -562,7 +562,7 @@ INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
INT ret;
TRACE("%04x %d,%d\n", hrgn, x, y);
TRACE("%p %d,%d\n", hrgn, x, y);
if (!obj)
return ERROR;
......@@ -600,7 +600,7 @@ INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
if (obj)
{
INT ret;
TRACE(" %04x\n", hrgn );
TRACE(" %p\n", hrgn );
rect->left = obj->rgn->extents.left;
rect->top = obj->rgn->extents.top;
rect->right = obj->rgn->extents.right;
......@@ -649,8 +649,7 @@ BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
{
RGNOBJ * obj;
TRACE(" %04x %d,%d-%d,%d\n",
hrgn, left, top, right, bottom );
TRACE("%p %d,%d-%d,%d\n", hrgn, left, top, right, bottom );
if (!(obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return FALSE;
......@@ -708,7 +707,7 @@ HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64;
if (!(hrgn = REGION_CreateRegion(d))) return 0;
if (!(obj = GDI_GetObjPtr( hrgn, REGION_MAGIC ))) return 0;
TRACE("(%d,%d-%d,%d %dx%d): ret=%04x\n",
TRACE("(%d,%d-%d,%d %dx%d): ret=%p\n",
left, top, right, bottom, ellipse_width, ellipse_height, hrgn );
/* Ellipse algorithm, based on an article by K. Porter */
......@@ -819,8 +818,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
DWORD size;
RGNOBJ *obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
TRACE(" %04x count = %ld, rgndata = %p\n",
hrgn, count, rgndata);
TRACE(" %p count = %ld, rgndata = %p\n", hrgn, count, rgndata);
if(!obj) return 0;
......@@ -883,7 +881,7 @@ HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA*
REGION_UnionRectWithRegion( pCurRect, obj->rgn );
GDI_ReleaseObj( hrgn );
TRACE("%04x\n", hrgn );
TRACE("%p\n", hrgn );
return hrgn;
}
else ERR("Could not get pointer to newborn Region!\n");
......@@ -1069,8 +1067,7 @@ INT WINAPI CombineRgn(HRGN hDest, HRGN hSrc1, HRGN hSrc2, INT mode)
RGNOBJ *destObj = (RGNOBJ *) GDI_GetObjPtr( hDest, REGION_MAGIC);
INT result = ERROR;
TRACE(" %04x,%04x -> %04x mode=%x\n",
hSrc1, hSrc2, hDest, mode );
TRACE(" %p,%p -> %p mode=%x\n", hSrc1, hSrc2, hDest, mode );
if (destObj)
{
RGNOBJ *src1Obj = (RGNOBJ *) GDI_GetObjPtr( hSrc1, REGION_MAGIC);
......@@ -1121,7 +1118,7 @@ INT WINAPI CombineRgn(HRGN hDest, HRGN hSrc1, HRGN hSrc2, INT mode)
GDI_ReleaseObj( hDest );
} else {
ERR("Invalid rgn=%04x\n", hDest);
ERR("Invalid rgn=%p\n", hDest);
}
return result;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment