[PATCH] gdi32: Use FIELD_OFFSET to calculate the structure size in GetRegionData().

[Henri Verbeet]

This patch may also avoid a Valgrind false positive about reading potentially
uninitialized data in "count" when "rgndata" is NULL, but that would just be a
happy coincidence, of course.
---
 dlls/gdi32/region.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c
index 2632de5..93aa6a7 100644
--- a/dlls/gdi32/region.c
+++ b/dlls/gdi32/region.c
@@ -886,13 +886,13 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
     if(!obj) return 0;
 
     size = obj->numRects * sizeof(RECT);
-    if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL)
+    if (!rgndata || count < FIELD_OFFSET(RGNDATA, Buffer[size]))
     {
         GDI_ReleaseObj( hrgn );
 	if (rgndata) /* buffer is too small, signal it by return 0 */
 	    return 0;
-	else		/* user requested buffer size with rgndata NULL */
-	    return size + sizeof(RGNDATAHEADER);
+        /* user requested buffer size with rgndata NULL */
+        return FIELD_OFFSET(RGNDATA, Buffer[size]);
     }
 
     rgndata->rdh.dwSize = sizeof(RGNDATAHEADER);
@@ -907,7 +907,7 @@ DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
     memcpy( rgndata->Buffer, obj->rects, size );
 
     GDI_ReleaseObj( hrgn );
-    return size + sizeof(RGNDATAHEADER);
+    return FIELD_OFFSET(RGNDATA, Buffer[size]);
 }
 
 
-- 
1.7.10.4