gdi32: Simplify the point type checking logic.

e6f19301 · Huw Davies · Alexandre Julliard · 8e2bc1eb · e6f19301
Commit e6f19301 authored Nov 27, 2012 by Huw Davies Committed by Alexandre Julliard Nov 27, 2012
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 6 deletions

painting.c dlls/gdi32/painting.c +5 -6

No files found.
--- a/dlls/gdi32/painting.c
+++ b/dlls/gdi32/painting.c
@@ -152,12 +152,11 @@ BOOL nulldrv_PolyDraw( PHYSDEV dev, const POINT *points, const BYTE *types, DWOR
        case PT_LINETO:
            break;
        case PT_BEZIERTO:
-            if((i + 2 < count) && (types[i + 1] == PT_BEZIERTO) &&
-               ((types[i + 2] & ~PT_CLOSEFIGURE) == PT_BEZIERTO))
-            {
-                i += 2;
-                break;
-            }
+            if (i + 2 >= count) return FALSE;
+            if (types[i + 1] != PT_BEZIERTO) return FALSE;
+            if ((types[i + 2] & ~PT_CLOSEFIGURE) != PT_BEZIERTO) return FALSE;
+            i += 2;
+            break;
        default:
            return FALSE;
        }