ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Avoid signed-unsigned integer comparisons.

Browse Source
This commit is contained in:
Andrew Talbot 2013-01-19 23:12:49 +00:00 committed by Alexandre Julliard
parent a8b076d67f
commit f98f70fb41
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dlls/gdi32/bidi.c
View File

@ -358,7 +358,8 @@ BOOL BIDI_Reorder(
{ {
WORD *chartype; WORD *chartype;
BYTE *levels; BYTE *levels;
unsigned i, done, glyph_i; INT i, done;
unsigned glyph_i;
BOOL is_complex; BOOL is_complex;
int maxItems; int maxItems;
@ -501,7 +502,7 @@ BOOL BIDI_Reorder(
glyph_i = 0; glyph_i = 0;
while (done < uCount) while (done < uCount)
{ {
unsigned j; INT j;
classify(lpString + done, chartype, uCount - done); classify(lpString + done, chartype, uCount - done);
/* limit text to first block */ /* limit text to first block */
i = resolveParagraphs(chartype, uCount - done); i = resolveParagraphs(chartype, uCount - done);

2
dlls/gdi32/dib.c
View File

@ -305,7 +305,7 @@ static void *get_pixel_ptr( const BITMAPINFO *info, void *bits, int x, int y )
static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip ) static BOOL build_rle_bitmap( const BITMAPINFO *info, struct gdi_image_bits *bits, HRGN *clip )
{ {
int i = 0; DWORD i = 0;
int left, right; int left, right;
int x, y, width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight; int x, y, width = info->bmiHeader.biWidth, height = info->bmiHeader.biHeight;
HRGN run = NULL; HRGN run = NULL;

7
dlls/gdi32/font.c
View File

@ -1734,7 +1734,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags,
{ {
static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} }; static const MAT2 identity = { {0,1}, {0,0}, {0,0}, {0,1} };
UINT indices[3] = {0, 0, 0x20}; UINT indices[3] = {0, 0, 0x20};
int i; unsigned int i;
DWORD ret, size; DWORD ret, size;
int stride; int stride;
@ -1775,7 +1775,7 @@ static DWORD get_glyph_bitmap( HDC hdc, UINT index, UINT flags, UINT aa_flags,
static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags, static RECT get_total_extents( HDC hdc, INT x, INT y, UINT flags, UINT aa_flags,
LPCWSTR str, UINT count, const INT *dx ) LPCWSTR str, UINT count, const INT *dx )
{ {
int i; UINT i;
RECT rect, bounds; RECT rect, bounds;
reset_bounds( &bounds ); reset_bounds( &bounds );
@ -1814,7 +1814,8 @@ static void draw_glyph( HDC hdc, INT origin_x, INT origin_y, const GLYPHMETRICS
const struct gdi_image_bits *image, const RECT *clip ) const struct gdi_image_bits *image, const RECT *clip )
{ {
static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; static const BYTE masks[8] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
UINT x, y, i, count, max_count; UINT i, count, max_count;
LONG x, y;
BYTE *ptr = image->ptr; BYTE *ptr = image->ptr;
int stride = get_dib_stride( metrics->gmBlackBoxX, 1 ); int stride = get_dib_stride( metrics->gmBlackBoxX, 1 );
POINT *pts; POINT *pts;

2
dlls/gdi32/freetype.c
View File

@ -5316,7 +5316,7 @@ static BOOL enum_face_charsets(const Family *family, Face *face, struct enum_cha
ENUMLOGFONTEXW elf; ENUMLOGFONTEXW elf;
NEWTEXTMETRICEXW ntm; NEWTEXTMETRICEXW ntm;
DWORD type = 0; DWORD type = 0;
int i; DWORD i;
GetEnumStructs(face, face->family->FamilyName, &elf, &ntm, &type); GetEnumStructs(face, face->family->FamilyName, &elf, &ntm, &type);
for(i = 0; i < list->total; i++) { for(i = 0; i < list->total; i++) {

3
dlls/gdi32/painting.c
View File

@ -140,7 +140,8 @@ BOOL nulldrv_PolyBezierTo( PHYSDEV dev, const POINT *points, DWORD count )
BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count ) BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWORD count )
{ {
POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4]; POINT *line_pts = NULL, *bzr_pts = NULL, bzr[4];
INT i, num_pts, num_bzr_pts, space, size; DWORD i;
INT num_pts, num_bzr_pts, space, size;
/* check for valid point types */ /* check for valid point types */
for (i = 0; i < count; i++) for (i = 0; i < count; i++)