commit f46e1d8a518f53ef3fcd02c3a75896d9a8b39288
author Huw D M Davies <h.davies1@physics.ox.ac.uk> Tue Apr 18 11:54:29 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Apr 18 11:54:29 2000 +0000
tree 36d2cce1eead22ff5214406ce989e9ff95b1c6d4
parent a3d3ff8d34b4cf47365accc73f8f2698776a60f6

Fix return value for OffsetRgn if x and y are 0.

objects/region.c

diff --git a/objects/region.c b/objects/region.c
index 2043018..d397cf3 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -505,14 +505,17 @@
 INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
 {
     RGNOBJ * obj = (RGNOBJ *) GDI_GetObjPtr( hrgn, REGION_MAGIC );
+    INT ret;
 
-    if (obj && (x || y))
-    {
-	INT ret;
+    TRACE("%04x %d,%d\n", hrgn, x, y);
+
+    if (!obj)
+        return ERROR;
+
+    if(x || y) {
 	int nbox = obj->rgn->numRects;
 	RECT *pbox = obj->rgn->rects;
 	
-	TRACE(" %04x %d,%d\n", hrgn, x, y );
 	if(nbox) {
 	    while(nbox--) {
 	        pbox->left += x;
@@ -526,11 +529,10 @@
 	    obj->rgn->extents.top += y;
 	    obj->rgn->extents.bottom += y;
 	}
-	ret = obj->rgn->type;
-	GDI_HEAP_UNLOCK( hrgn );
-	return ret;
     }
-    return ERROR;
+    ret = obj->rgn->type;
+    GDI_HEAP_UNLOCK( hrgn );
+    return ret;
 }