Fixed some signed/unsigned warnings.
This commit is contained in:
parent
f21aac0e0c
commit
4d75640d79
|
@ -522,10 +522,10 @@ INT WINAPI GetDIBits(
|
||||||
if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && info->bmiHeader.biBitCount >= 15)
|
if(bmp->dib && bmp->dib->dsBm.bmBitsPixel >= 15 && info->bmiHeader.biBitCount >= 15)
|
||||||
{
|
{
|
||||||
/*FIXME: Only RGB dibs supported for now */
|
/*FIXME: Only RGB dibs supported for now */
|
||||||
int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
|
unsigned int srcwidth = bmp->dib->dsBm.bmWidth, srcwidthb = bmp->dib->dsBm.bmWidthBytes;
|
||||||
int dstwidthb = DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount );
|
int dstwidthb = DIB_GetDIBWidthBytes( info->bmiHeader.biWidth, info->bmiHeader.biBitCount );
|
||||||
LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb);
|
LPBYTE dbits = bits, sbits = (LPBYTE) bmp->dib->dsBm.bmBits + (startscan * srcwidthb);
|
||||||
int x, y;
|
unsigned int x, y;
|
||||||
|
|
||||||
if ((info->bmiHeader.biHeight < 0) ^ (bmp->dib->dsBmih.biHeight < 0))
|
if ((info->bmiHeader.biHeight < 0) ^ (bmp->dib->dsBmih.biHeight < 0))
|
||||||
{
|
{
|
||||||
|
|
|
@ -1214,7 +1214,7 @@ BOOL WINAPI EnumEnhMetaFile(
|
||||||
ENHMETAHEADER *emh, *emhTemp;
|
ENHMETAHEADER *emh, *emhTemp;
|
||||||
ENHMETARECORD *emr;
|
ENHMETARECORD *emr;
|
||||||
DWORD offset;
|
DWORD offset;
|
||||||
INT i;
|
UINT i;
|
||||||
HANDLETABLE *ht;
|
HANDLETABLE *ht;
|
||||||
INT savedMode = 0;
|
INT savedMode = 0;
|
||||||
FLOAT xSrcPixSize, ySrcPixSize, xscale, yscale;
|
FLOAT xSrcPixSize, ySrcPixSize, xscale, yscale;
|
||||||
|
|
|
@ -469,7 +469,7 @@ static BOOL MF_PlayMetaFile( HDC hdc, METAHEADER *mh)
|
||||||
|
|
||||||
METARECORD *mr;
|
METARECORD *mr;
|
||||||
HANDLETABLE16 *ht;
|
HANDLETABLE16 *ht;
|
||||||
int offset = 0;
|
unsigned int offset = 0;
|
||||||
WORD i;
|
WORD i;
|
||||||
HPEN hPen;
|
HPEN hPen;
|
||||||
HBRUSH hBrush;
|
HBRUSH hBrush;
|
||||||
|
@ -570,7 +570,7 @@ BOOL16 WINAPI EnumMetaFile16( HDC16 hdc, HMETAFILE16 hmf,
|
||||||
HANDLETABLE16 *ht;
|
HANDLETABLE16 *ht;
|
||||||
HGLOBAL16 hHT;
|
HGLOBAL16 hHT;
|
||||||
SEGPTR spht;
|
SEGPTR spht;
|
||||||
int offset = 0;
|
unsigned int offset = 0;
|
||||||
WORD i, seg;
|
WORD i, seg;
|
||||||
HPEN hPen;
|
HPEN hPen;
|
||||||
HBRUSH hBrush;
|
HBRUSH hBrush;
|
||||||
|
@ -662,7 +662,8 @@ BOOL WINAPI EnumMetaFile(
|
||||||
METARECORD *mr;
|
METARECORD *mr;
|
||||||
HANDLETABLE *ht;
|
HANDLETABLE *ht;
|
||||||
BOOL result = TRUE;
|
BOOL result = TRUE;
|
||||||
int i, offset = 0;
|
int i;
|
||||||
|
unsigned int offset = 0;
|
||||||
HPEN hPen;
|
HPEN hPen;
|
||||||
HBRUSH hBrush;
|
HBRUSH hBrush;
|
||||||
HFONT hFont;
|
HFONT hFont;
|
||||||
|
@ -1216,7 +1217,7 @@ BOOL WINAPI PlayMetaFileRecord( HDC hdc, HANDLETABLE *handletable,
|
||||||
{
|
{
|
||||||
HANDLETABLE16 * ht = (void *)GlobalAlloc(GPTR,
|
HANDLETABLE16 * ht = (void *)GlobalAlloc(GPTR,
|
||||||
handles*sizeof(HANDLETABLE16));
|
handles*sizeof(HANDLETABLE16));
|
||||||
int i = 0;
|
unsigned int i = 0;
|
||||||
TRACE("(%08x,%p,%p,%d)\n", hdc, handletable, metarecord,
|
TRACE("(%08x,%p,%p,%d)\n", hdc, handletable, metarecord,
|
||||||
handles);
|
handles);
|
||||||
for (i=0; i<handles; i++)
|
for (i=0; i<handles; i++)
|
||||||
|
|
|
@ -213,7 +213,7 @@ UINT WINAPI GetPaletteEntries(
|
||||||
LPPALETTEENTRY entries) /* [out] Address of array receiving entries */
|
LPPALETTEENTRY entries) /* [out] Address of array receiving entries */
|
||||||
{
|
{
|
||||||
PALETTEOBJ * palPtr;
|
PALETTEOBJ * palPtr;
|
||||||
INT numEntries;
|
UINT numEntries;
|
||||||
|
|
||||||
TRACE("hpal = %04x, count=%i\n", hpalette, count );
|
TRACE("hpal = %04x, count=%i\n", hpalette, count );
|
||||||
|
|
||||||
|
@ -265,7 +265,7 @@ UINT WINAPI SetPaletteEntries(
|
||||||
LPPALETTEENTRY entries) /* [in] Address of array of structures */
|
LPPALETTEENTRY entries) /* [in] Address of array of structures */
|
||||||
{
|
{
|
||||||
PALETTEOBJ * palPtr;
|
PALETTEOBJ * palPtr;
|
||||||
INT numEntries;
|
UINT numEntries;
|
||||||
|
|
||||||
TRACE("hpal=%04x,start=%i,count=%i\n",hpalette,start,count );
|
TRACE("hpal=%04x,start=%i,count=%i\n",hpalette,start,count );
|
||||||
|
|
||||||
|
|
|
@ -64,7 +64,7 @@ BOOL WINAPI ExtTextOutA( HDC hdc, INT x, INT y, UINT flags,
|
||||||
UINT wlen = MultiByteToWideChar(codepage,0,str,count,NULL,0);
|
UINT wlen = MultiByteToWideChar(codepage,0,str,count,NULL,0);
|
||||||
if (lpDx)
|
if (lpDx)
|
||||||
{
|
{
|
||||||
int i = 0, j = 0;
|
unsigned int i = 0, j = 0;
|
||||||
|
|
||||||
lpDxW = (LPINT)HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT));
|
lpDxW = (LPINT)HeapAlloc( GetProcessHeap(), 0, wlen*sizeof(INT));
|
||||||
while(i < count)
|
while(i < count)
|
||||||
|
|
Loading…
Reference in New Issue