Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 22:56:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[GDI32]

Browse source 
* Fix some print specifiers.

svn path=/trunk/; revision=59899
This commit is contained in:
Amine Khaldi 2013-08-30 10:51:12 +00:00
parent 8e8e30befe
commit d4931ab70e
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/win32ss/gdi/gdi32/misc/misc.c
View file

@ -320,7 +320,7 @@ hGetPEBHandle(HANDLECACHETYPE Type, COLORREF cr)
{ {
if (pBrush_Attr->AttrFlags & ATTR_CACHED) 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; pBrush_Attr->AttrFlags &= ~ATTR_CACHED;
hPtr[Number - 1] = NULL; hPtr[Number - 1] = NULL;
GdiHandleCache->ulNumHandles[Type]--; GdiHandleCache->ulNumHandles[Type]--;

14
reactos/win32ss/gdi/gdi32/objects/bitmap.c
View file

@ -129,7 +129,7 @@ DIB_GetBitmapInfo(const BITMAPINFOHEADER *header,
*size = v5hdr->bV5SizeImage; *size = v5hdr->bV5SizeImage;
return 5; return 5;
} }
DPRINT("(%ld): wrong size for header\n", header->biSize ); DPRINT("(%lu): wrong size for header\n", header->biSize );
return -1; return -1;
} }
@ -527,7 +527,7 @@ CreateDIBitmap( HDC hDC,
return NULL; 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 ) if ( !width || !height )
hBmp = GetStockObject(DEFAULT_BITMAP); hBmp = GetStockObject(DEFAULT_BITMAP);
@ -742,9 +742,9 @@ SetDIBitsToDevice(
{ {
// We don't die, we continue on with a allocated safe pointer to kernel // We don't die, we continue on with a allocated safe pointer to kernel
// space..... // 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)) if (!GdiGetHandleUserData(hdc, GDI_OBJECT_TYPE_DC, (PVOID)&pDc_Attr))
@ -813,7 +813,7 @@ StretchDIBits(HDC hdc,
PVOID pvSafeBits = NULL; PVOID pvSafeBits = NULL;
BOOL Hit = FALSE; BOOL Hit = FALSE;
DPRINT("StretchDIBits %x : %x : %d\n", lpBits, lpBitsInfo, iUsage); DPRINT("StretchDIBits %p : %p : %u\n", lpBits, lpBitsInfo, iUsage);
#if 0 #if 0
// Handle something other than a normal dc object. // Handle something other than a normal dc object.
if (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC) 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 // We don't die, we continue on with a allocated safe pointer to kernel
// space..... // 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);
} }
} }

2
reactos/win32ss/gdi/gdi32/objects/brush.c
View file

@ -421,7 +421,7 @@ SetBrushOrgEx(HDC hdc,
pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG); pTeb->GdiTebBatch.Offset += sizeof(GDIBSSETBRHORG);
pTeb->GdiTebBatch.HDC = hdc; pTeb->GdiTebBatch.HDC = hdc;
pTeb->GdiBatchCount++; 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) if (pTeb->GdiBatchCount >= GDI_BatchLimit)
{ {

4
reactos/win32ss/gdi/gdi32/objects/dc.c
View file

@ -26,7 +26,7 @@ IntCreateDICW ( LPCWSTR lpwszDriver,
} }
else else
{ {
DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%x\n", ghSpooler); DPRINT("WinSpooler.Drv Loaded! hMod -> 0x%p\n", ghSpooler);
} }
if ((!lpwszDevice) && (!lpwszDriver)) if ((!lpwszDevice) && (!lpwszDriver))
@ -328,7 +328,7 @@ DeleteObject(HGDIOBJ hObject)
if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK) if ((DWORD)hObject & GDI_HANDLE_STOCK_MASK)
{ {
// Relax! This is a normal return! // 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; return TRUE;
} }

4
reactos/win32ss/gdi/gdi32/objects/font.c
View file

@ -1082,7 +1082,7 @@ GetOutlineTextMetricsA(
goto end; goto end;
} }
DPRINT("needed = %d\n", needed); DPRINT("needed = %u\n", needed);
if(needed > cbData) if(needed > cbData)
{ {
/* Since the supplied buffer isn't big enough, we'll alloc one /* Since the supplied buffer isn't big enough, we'll alloc one
@ -1801,7 +1801,7 @@ TranslateCharsetInfo(
return FALSE; return FALSE;
} }
if (index >= MAXTCIINDEX || FONT_tci[index].ciCharset == DEFAULT_CHARSET) 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]); index,FONT_tci[index].ciCharset,FONT_tci[index].ciACP,FONT_tci[index].fs.fsCsb[0]);
memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO)); memcpy(lpCs, &FONT_tci[index], sizeof(CHARSETINFO));
return TRUE; return TRUE;