[PATCH v7 1/1] win32u: fix NtGdiExtCreateRegion implementation

[Bartosz Kosiorek]

From: Bartosz Kosiorek

---
 dlls/gdi32/tests/clipping.c | 11 +++++------
 dlls/win32u/region.c        |  4 +++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c
index ce66f9cad09..de096753744 100644
--- a/dlls/gdi32/tests/clipping.c
+++ b/dlls/gdi32/tests/clipping.c
@@ -57,7 +57,7 @@ static void test_GetRandomRgn(void)
     ok(ret != 0, "GetRandomRgn rets %d\n", ret);
     GetRgnBox(hrgn, &ret_rc);
     ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %s\n", wine_dbgstr_rect(&ret_rc));
- 
+
     ret = GetRandomRgn(hdc, hrgn, 2);
     ok(ret == 0, "GetRandomRgn rets %d\n", ret);

@@ -97,7 +97,7 @@ static void test_GetRandomRgn(void)
     ok(ret != 0, "GetRandomRgn rets %d\n", ret);
     GetRgnBox(hrgn, &ret_rc);
     ok(EqualRect(&rc, &ret_rc), "GetRandomRgn %s\n", wine_dbgstr_rect(&ret_rc));
- 
+
     IntersectRect(&rc2, &rc, &rc2);

ret = GetRandomRgn(hdc, hrgn, 3);
@@ -225,11 +225,12 @@ static void test_ExtCreateRegion(void)
     /* Cannot be smaller than sizeof(RGNDATAHEADER) */
     SetLastError(0xdeadbeef);
     hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) - 1, &rgn.data);
-    todo_wine
     ok(!hrgn, "ExtCreateRegion should fail\n");
+    /* From Windows 7 returns ERROR_INVALID_PARAMETER error */
     todo_wine
     ok(GetLastError() == ERROR_INVALID_PARAMETER ||
-       broken(GetLastError() == 0xdeadbeef), "0xdeadbeef, got %lu\n", GetLastError());
+       broken(GetLastError() == 0xdeadbeef),
+       "Expected ERROR_INVALID_PARAMETER (win7+) or 0xdeadbeef, got %lu\n", GetLastError());

SetLastError(0xdeadbeef);
     hrgn = ExtCreateRegion(NULL, sizeof(rgn), &rgn.data);
@@ -267,10 +268,8 @@ static void test_ExtCreateRegion(void)
     /* Buffer cannot be smaller than sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) */
     SetLastError(0xdeadbeef);
     hrgn = ExtCreateRegion(NULL, sizeof(RGNDATAHEADER) + 2 * sizeof(RECT) - 1, &rgn.data);
-    todo_wine
     ok(!hrgn, "ExtCreateRegion should fail\n");
     ok(GetLastError() == 0xdeadbeef, "0xdeadbeef, got %lu\n", GetLastError());
-
 }

static void test_GetClipRgn(void)
diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c
index f32984d1c54..88c80e274b6 100644
--- a/dlls/win32u/region.c
+++ b/dlls/win32u/region.c
@@ -896,7 +896,9 @@ HRGN WINAPI NtGdiExtCreateRegion( const XFORM *xform, DWORD count, const RGNDATA
     WINEREGION *obj;
     const RECT *pCurRect, *pEndRect;

-    if (!rgndata || rgndata->rdh.dwSize < sizeof(RGNDATAHEADER))
+    if (!rgndata ||
+        rgndata->rdh.dwSize < sizeof(RGNDATAHEADER) ||
+        count < (sizeof(RGNDATAHEADER) + rgndata->rdh.nCount * sizeof(RECT)))
         return 0;

/* XP doesn't care about the type */