winemac: Fix conversion of empty RECT to an empty CGRect.

For some empty RECTs, such as { INT_MAX, INT_MAX, INT_MIN, INT_MIN }, right minus left or bottom minus top underflow and wrap around to positive values.

winemac: Fix conversion of empty RECT to an empty CGRect.
50cd5b6a · Ken Thomases · Alexandre Julliard · 5fa7402a · 50cd5b6a
Commit 50cd5b6a authored Jan 19, 2015 by Ken Thomases Committed by Alexandre Julliard Jan 20, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

macdrv.h dlls/winemac.drv/macdrv.h +3 -1

No files found.
--- a/dlls/winemac.drv/macdrv.h
+++ b/dlls/winemac.drv/macdrv.h
@@ -47,7 +47,9 @@ extern const char* debugstr_cf(CFTypeRef t) DECLSPEC_HIDDEN;

 static inline CGRect cgrect_from_rect(RECT rect)
 {
-    return CGRectMake(rect.left, rect.top, max(0, rect.right - rect.left), max(0, rect.bottom - rect.top));
+    if (rect.left >= rect.right || rect.top >= rect.bottom)
+        return CGRectMake(rect.left, rect.top, 0, 0);
+    return CGRectMake(rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
 }

 static inline RECT rect_from_cgrect(CGRect cgrect)