From d4931ab70e15033bb88c44e0e0964365779747d8 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Fri, 30 Aug 2013 10:51:12 +0000 Subject: [PATCH] [GDI32] * Fix some print specifiers. svn path=/trunk/; revision=59899 --- reactos/win32ss/gdi/gdi32/misc/misc.c | 2 +- reactos/win32ss/gdi/gdi32/objects/bitmap.c | 14 +++++++------- reactos/win32ss/gdi/gdi32/objects/brush.c | 2 +- reactos/win32ss/gdi/gdi32/objects/dc.c | 4 ++-- reactos/win32ss/gdi/gdi32/objects/font.c | 4 ++-- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/reactos/win32ss/gdi/gdi32/misc/misc.c b/reactos/win32ss/gdi/gdi32/misc/misc.c index eb2e873bd9d..f326114f129 100644 --- a/reactos/win32ss/gdi/gdi32/misc/misc.c +++ b/reactos/win32ss/gdi/gdi32/misc/misc.c @@ -320,7 +320,7 @@ hGetPEBHandle(HANDLECACHETYPE Type, COLORREF cr) { if (pBrush_Attr->AttrFlags & ATTR_CACHED) { - DPRINT("Get Handle! Type %d Count %d PEB 0x%x\n", Type, GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); + DPRINT("Get Handle! Type %d Count %lu PEB 0x%p\n", Type, GdiHandleCache->ulNumHandles[Type], NtCurrentTeb()->ProcessEnvironmentBlock); pBrush_Attr->AttrFlags &= ~ATTR_CACHED; hPtr[Number - 1] = NULL; GdiHandleCache->ulNumHandles[Type]--; diff --git a/reactos/win32ss/gdi/gdi32/objects/bitmap.c b/reactos/win32ss/gdi/gdi32/objects/bitmap.c index 5ec142134b7..132d531b60a 100644 --- a/reactos/win32ss/gdi/gdi32/objects/bitmap.c +++ b/reactos/win32ss/gdi/gdi32/objects/bitmap.c @@ -129,7 +129,7 @@ DIB_GetBitmapInfo(const BITMAPINFOHEADER *header, *size = v5hdr->bV5SizeImage; return 5; } - DPRINT("(%ld): wrong size for header\n", header->biSize ); + DPRINT("(%lu): wrong size for header\n", header->biSize ); return -1; } @@ -527,7 +527,7 @@ CreateDIBitmap( HDC hDC, return NULL; } - DPRINT("pBMI %x, Size bpp %d, dibsize %d, Conv %d, BSS %d\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); + DPRINT("pBMI %p, Size bpp %u, dibsize %d, Conv %u, BSS %u\n", Data,bpp,dibsize,InfoSize,cjBmpScanSize); if ( !width || !height ) hBmp = GetStockObject(DEFAULT_BITMAP); @@ -742,9 +742,9 @@ SetDIBitsToDevice( { // We don't die, we continue on with a allocated safe pointer to kernel // space..... - DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,Bits,cjBmpScanSize); + DPRINT1("SetDIBitsToDevice fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,Bits,cjBmpScanSize); } - DPRINT("SetDIBitsToDevice Allocate Bits %d!!!\n", cjBmpScanSize); + DPRINT("SetDIBitsToDevice Allocate Bits %u!!!\n", cjBmpScanSize); } if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr)) @@ -813,7 +813,7 @@ StretchDIBits(HDC hdc, PVOID pvSafeBits = NULL; BOOL Hit = FALSE; - DPRINT("StretchDIBits %x : %x : %d\n", lpBits, lpBitsInfo, iUsage); + DPRINT("StretchDIBits %p : %p : %u\n", lpBits, lpBitsInfo, iUsage); #if 0 // Handle something other than a normal dc object. if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) @@ -888,9 +888,9 @@ StretchDIBits(HDC hdc, { // We don't die, we continue on with a allocated safe pointer to kernel // space..... - DPRINT1("StretchDIBits fail to read BitMapInfo: %x or Bits: %x & Size: %d\n",pConvertedInfo,lpBits,cjBmpScanSize); + DPRINT1("StretchDIBits fail to read BitMapInfo: %p or Bits: %p & Size: %u\n",pConvertedInfo,lpBits,cjBmpScanSize); } - DPRINT("StretchDIBits Allocate Bits %d!!!\n", cjBmpScanSize); + DPRINT("StretchDIBits Allocate Bits %u!!!\n", cjBmpScanSize); } } diff --git a/reactos/win32ss/gdi/gdi32/objects/brush.c b/reactos/win32ss/gdi/gdi32/objects/brush.c index aca4b848ae0..4ef0b79e53a 100644 --- a/reactos/win32ss/gdi/gdi32/objects/brush.c +++ b/reactos/win32ss/gdi/gdi32/objects/brush.c @@ -421,7 +421,7 @@ SetBrushOrgEx(HDC hdc, pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); pTeb->GdiTebBatch.HDC = hdc; pTeb->GdiBatchCount++; - DPRINT("Loading the Flush!! COUNT-> %d\n", pTeb->GdiBatchCount); + DPRINT("Loading the Flush!! COUNT-> %lu\n", pTeb->GdiBatchCount); if (pTeb->GdiBatchCount >= GDI_BatchLimit) { diff --git a/reactos/win32ss/gdi/gdi32/objects/dc.c b/reactos/win32ss/gdi/gdi32/objects/dc.c index 810eaa75219..3e0d52477b9 100644 --- a/reactos/win32ss/gdi/gdi32/objects/dc.c +++ b/reactos/win32ss/gdi/gdi32/objects/dc.c @@ -26,7 +26,7 @@ IntCreateDICW ( LPCWSTR lpwszDriver, } else { - DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%x\n", ghSpooler); + DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%p\n", ghSpooler); } if ((!lpwszDevice) && (!lpwszDriver)) @@ -328,7 +328,7 @@ DeleteObject(HGDIOBJ hObject) if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) { // Relax! This is a normal return! - DPRINT("Trying to delete system object 0x%x\n", hObject); + DPRINT("Trying to delete system object 0x%p\n", hObject); return TRUE; } diff --git a/reactos/win32ss/gdi/gdi32/objects/font.c b/reactos/win32ss/gdi/gdi32/objects/font.c index bdfa058da0a..02f0f3849f7 100644 --- a/reactos/win32ss/gdi/gdi32/objects/font.c +++ b/reactos/win32ss/gdi/gdi32/objects/font.c @@ -1082,7 +1082,7 @@ GetOutlineTextMetricsA( goto end; } - DPRINT("needed = %d\n", needed); + DPRINT("needed = %u\n", needed); if(needed > cbData) { /* Since the supplied buffer isn't big enough, we'll alloc one @@ -1801,7 +1801,7 @@ TranslateCharsetInfo( return FALSE; } if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) return FALSE; - DPRINT("Index %d Charset %d CodePage %d FontSig %d\n", + DPRINT("Index %d Charset %u CodePage %u FontSig %lu\n", index,FONT_tci[index].ciCharset,FONT_tci[index].ciACP,FONT_tci[index].fs.fsCsb[0]); memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); return TRUE;