From: Frédéric Delanoy Subject: gdi32: Use BOOL type where appropriate (try 2) Message-Id: <1395822267-27669-1-git-send-email-frederic.delanoy@gmail.com> Date: Wed, 26 Mar 2014 09:24:27 +0100 --- dlls/gdi32/dibdrv/bitblt.c | 2 +- dlls/gdi32/font.c | 6 +++--- dlls/gdi32/region.c | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index a9c32bf..5bceb33 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -729,7 +729,7 @@ static DWORD execute_rop( dibdrv_physdev *pdev, const RECT *dst_rect, dib_info * for ( ; *opcode; opcode++) { if (OP_DST(*opcode) == DST) result = dibs[DST]; - if (OP_DST(*opcode) == SRC && src->bits.is_copy == FALSE) + if (OP_DST(*opcode) == SRC && !src->bits.is_copy) { err = copy_src_bits( src, &rects[SRC] ); if (err) return err; diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 66072af..cb3693c 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2168,16 +2168,16 @@ BOOL WINAPI ExtTextOutW( HDC hdc, INT x, INT y, UINT flags, DC * dc = get_dc_ptr( hdc ); PHYSDEV physdev; INT breakRem; - static int quietfixme = 0; + static BOOL quietfixme = FALSE; if (!dc) return FALSE; breakRem = dc->breakRem; - if (quietfixme == 0 && flags & (ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN)) + if (!quietfixme && flags & (ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN)) { FIXME("flags ETO_NUMERICSLOCAL | ETO_NUMERICSLATIN unimplemented\n"); - quietfixme = 1; + quietfixme = TRUE; } update_dc( dc ); diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index 2632de5..d299373 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -356,7 +356,7 @@ typedef struct edge_table_entry { struct list winding_entry; INT ymax; /* ycoord at which we exit this edge. */ struct bres_info bres; /* Bresenham info to run the edge */ - int ClockWise; /* flag for winding number rule */ + BOOL ClockWise; /* flag for winding number rule */ } EdgeTableEntry; @@ -2438,12 +2438,12 @@ static void REGION_CreateEdgeTable(const INT *Count, INT nbpolygons, if (PrevPt->y > CurrPt->y) { bottom = PrevPt, top = CurrPt; - pETEs->ClockWise = 0; + pETEs->ClockWise = FALSE; } else { bottom = CurrPt, top = PrevPt; - pETEs->ClockWise = 1; + pETEs->ClockWise = TRUE; } /* -- 1.9.1