gdi32: Use boolean return values in boolean functions

André Hentschel nerv at dawncrow.de
Mon Jan 27 17:04:18 CST 2014


I mostly enjoyed the last hunk here. 0x666 from 1996, maybe we should leave that "message" :)

---
 dlls/gdi32/enhmfdrv/dc.c      | 14 +++++++-------
 dlls/gdi32/enhmfdrv/objects.c |  2 +-
 dlls/gdi32/font.c             |  4 ++--
 dlls/gdi32/gdiobj.c           |  8 ++++----
 dlls/gdi32/mfdrv/objects.c    |  2 +-
 dlls/gdi32/palette.c          |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c
index 389dc38..cbf3f5c 100644
--- a/dlls/gdi32/enhmfdrv/dc.c
+++ b/dlls/gdi32/enhmfdrv/dc.c
@@ -262,7 +262,7 @@ BOOL EMFDRV_SetWindowExtEx( PHYSDEV dev, INT cx, INT cy, SIZE *size )
     emr.szlExtent.cx = cx;
     emr.szlExtent.cy = cy;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pSetWindowExtEx( next, cx, cy, size );
 }
 
@@ -276,7 +276,7 @@ BOOL EMFDRV_SetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
     emr.ptlOrigin.x = x;
     emr.ptlOrigin.y = y;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pSetViewportOrgEx( next, x, y, pt );
 }
 
@@ -290,7 +290,7 @@ BOOL EMFDRV_SetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
     emr.ptlOrigin.x = x;
     emr.ptlOrigin.y = y;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pSetWindowOrgEx( next, x, y, pt );
 }
 
@@ -306,7 +306,7 @@ BOOL EMFDRV_ScaleViewportExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT
     emr.yNum      = yNum;
     emr.yDenom    = yDenom;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pScaleViewportExtEx( next, xNum, xDenom, yNum, yDenom, size );
 }
 
@@ -322,7 +322,7 @@ BOOL EMFDRV_ScaleWindowExtEx( PHYSDEV dev, INT xNum, INT xDenom, INT yNum, INT y
     emr.yNum      = yNum;
     emr.yDenom    = yDenom;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pScaleWindowExtEx( next, xNum, xDenom, yNum, yDenom, size );
 }
 
@@ -376,7 +376,7 @@ BOOL EMFDRV_OffsetViewportOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
     emr.ptlOrigin.x = prev.x + x;
     emr.ptlOrigin.y = prev.y + y;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pOffsetViewportOrgEx( next, x, y, pt );
 }
 
@@ -393,7 +393,7 @@ BOOL EMFDRV_OffsetWindowOrgEx( PHYSDEV dev, INT x, INT y, POINT *pt )
     emr.ptlOrigin.x = prev.x + x;
     emr.ptlOrigin.y = prev.y + y;
 
-    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return 0;
+    if (!EMFDRV_WriteRecord( dev, &emr.emr )) return FALSE;
     return next->funcs->pOffsetWindowOrgEx( next, x, y, pt );
 }
 
diff --git a/dlls/gdi32/enhmfdrv/objects.c b/dlls/gdi32/enhmfdrv/objects.c
index 60414a3..ee2abd7 100644
--- a/dlls/gdi32/enhmfdrv/objects.c
+++ b/dlls/gdi32/enhmfdrv/objects.c
@@ -243,7 +243,7 @@ static BOOL EMFDRV_CreateFontIndirect(PHYSDEV dev, HFONT hFont )
     EMREXTCREATEFONTINDIRECTW emr;
     int i;
 
-    if (!GetObjectW( hFont, sizeof(emr.elfw.elfLogFont), &emr.elfw.elfLogFont )) return 0;
+    if (!GetObjectW( hFont, sizeof(emr.elfw.elfLogFont), &emr.elfw.elfLogFont )) return FALSE;
 
     emr.emr.iType = EMR_EXTCREATEFONTINDIRECTW;
     emr.emr.nSize = (sizeof(emr) + 3) / 4 * 4;
diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 0dfd5b1..66072af 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -3378,7 +3378,7 @@ BOOL WINAPI GetCharWidthFloatA(HDC hdc, UINT iFirstChar,
 		                    UINT iLastChar, PFLOAT pxBuffer)
 {
     FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer);
-    return 0;
+    return FALSE;
 }
 
 /*************************************************************************
@@ -3388,7 +3388,7 @@ BOOL WINAPI GetCharWidthFloatW(HDC hdc, UINT iFirstChar,
 		                    UINT iLastChar, PFLOAT pxBuffer)
 {
     FIXME("%p, %u, %u, %p: stub!\n", hdc, iFirstChar, iLastChar, pxBuffer);
-    return 0;
+    return FALSE;
 }
 
 
diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c
index de64474..a255a4c 100644
--- a/dlls/gdi32/gdiobj.c
+++ b/dlls/gdi32/gdiobj.c
@@ -1325,8 +1325,8 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit )
  */
 BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca)
 {
-        FIXME("stub\n");
-        return 0;
+    FIXME("stub\n");
+    return FALSE;
 }
 
 /*******************************************************************
@@ -1355,6 +1355,6 @@ BOOL WINAPI GdiComment(HDC hdc, UINT cbSize, const BYTE *lpData)
  */
 BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca)
 {
-        FIXME("stub\n");
-        return 0;
+    FIXME("stub\n");
+    return FALSE;
 }
diff --git a/dlls/gdi32/mfdrv/objects.c b/dlls/gdi32/mfdrv/objects.c
index 697644d..e0275dd 100644
--- a/dlls/gdi32/mfdrv/objects.c
+++ b/dlls/gdi32/mfdrv/objects.c
@@ -104,7 +104,7 @@ BOOL MFDRV_DeleteObject( PHYSDEV dev, HGDIOBJ obj )
 
     index = MFDRV_FindObject(dev, obj);
     if( index < 0 )
-        return 0;
+        return FALSE;
 
     mr.rdSize = sizeof mr / 2;
     mr.rdFunction = META_DELETEOBJECT;
diff --git a/dlls/gdi32/palette.c b/dlls/gdi32/palette.c
index fb27f4f..d850d0f 100644
--- a/dlls/gdi32/palette.c
+++ b/dlls/gdi32/palette.c
@@ -703,7 +703,7 @@ BOOL WINAPI UpdateColors(
     HMODULE mod;
     int size = GetDeviceCaps( hDC, SIZEPALETTE );
 
-    if (!size) return 0;
+    if (!size) return FALSE;
 
     mod = GetModuleHandleA("user32.dll");
     if (mod)
@@ -723,7 +723,7 @@ BOOL WINAPI UpdateColors(
             }
         }
     }
-    return 0x666;
+    return TRUE;
 }
 
 /*********************************************************************
-- 
1.8.1.2





More information about the wine-patches mailing list