Author: akhaldi Date: Fri Aug 30 10:51:12 2013 New Revision: 59899
URL: http://svn.reactos.org/svn/reactos?rev=59899&view=rev Log: [GDI32] * Fix some print specifiers.
Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c trunk/reactos/win32ss/gdi/gdi32/objects/brush.c trunk/reactos/win32ss/gdi/gdi32/objects/dc.c trunk/reactos/win32ss/gdi/gdi32/objects/font.c
Modified: trunk/reactos/win32ss/gdi/gdi32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/misc/misc... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/misc/misc.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -320,7 +320,7 @@ { 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]--;
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/b... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/bitmap.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -129,7 +129,7 @@ *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 @@ 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 @@ { // 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 @@ 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 @@ { // 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); } }
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/brush.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/b... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/brush.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -421,7 +421,7 @@ 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) {
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/d... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -26,7 +26,7 @@ } 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 @@ 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; }
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/f... ============================================================================== --- trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c [iso-8859-1] Fri Aug 30 10:51:12 2013 @@ -1082,7 +1082,7 @@ 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 @@ 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;
-
akhaldi＠svn.reactos.org