[tkreuzer] 58089: [WIN32K] - In NtGdiGetRandomRgn use the region pointers directly, instead of getting their handles. These regions might not even have a handle. - Fix last error code

Author: tkreuzer
Date: Tue Jan  1 19:23:30 2013
New Revision: 58089

URL: http://svn.reactos.org/svn/reactos?rev=58089&view=rev
Log:
[WIN32K]
- In NtGdiGetRandomRgn use the region pointers directly, instead of getting their handles.
These regions might not even have a handle.
- Fix last error code

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c

Modified: trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dcobjs.c [iso-8859-1] Tue Jan  1 19:23:30 2013
@@ -615,12 +615,13 @@
     INT ret = 0;
     PDC pdc;
     HRGN hrgnSrc = NULL;
+    PREGION prgnSrc = NULL;
     POINTL ptlOrg;
 
     pdc = DC_LockDc(hdc);
     if (!pdc)
     {
-        EngSetLastError(ERROR_INVALID_PARAMETER);
+        EngSetLastError(ERROR_INVALID_HANDLE);
         return -1;
     }
 
@@ -628,33 +629,51 @@
     {
         case CLIPRGN:
             hrgnSrc = pdc->rosdc.hClipRgn;
-//            if (pdc->dclevel.prgnClip) hrgnSrc =
pdc->dclevel.prgnClip->BaseObject.hHmgr;
-            break;
+//            if (pdc->dclevel.prgnClip) prgnSrc = pdc->dclevel.prgnClip;
+            break;
+
         case METARGN:
-            if (pdc->dclevel.prgnMeta)
-                hrgnSrc = pdc->dclevel.prgnMeta->BaseObject.hHmgr;
-            break;
+            prgnSrc = pdc->dclevel.prgnMeta;
+            break;
+
         case APIRGN:
-            if (pdc->prgnAPI) hrgnSrc = pdc->prgnAPI->BaseObject.hHmgr;
-//            else if (pdc->dclevel.prgnClip) hrgnSrc =
pdc->dclevel.prgnClip->BaseObject.hHmgr;
-            else if (pdc->rosdc.hClipRgn) hrgnSrc = pdc->rosdc.hClipRgn;
-            else if (pdc->dclevel.prgnMeta) hrgnSrc =
pdc->dclevel.prgnMeta->BaseObject.hHmgr;
-            break;
+            if (pdc->prgnAPI)
+            {
+                prgnSrc = pdc->prgnAPI;
+            }
+//            else if (pdc->dclevel.prgnClip) prgnSrc = pdc->dclevel.prgnClip;
+            else if (pdc->rosdc.hClipRgn)
+            {
+                hrgnSrc = pdc->rosdc.hClipRgn;
+            }
+            else if (pdc->dclevel.prgnMeta)
+            {
+                prgnSrc = pdc->dclevel.prgnMeta;
+            }
+            break;
+
         case SYSRGN:
-            if (pdc->prgnVis)
-            {
-                PREGION prgnDest = REGION_LockRgn(hrgnDest);
-                ret = IntGdiCombineRgn(prgnDest, pdc->prgnVis, 0, RGN_COPY) == ERROR ?
-1 : 1;
-                REGION_UnlockRgn(prgnDest);
-            }
-            break;
+            prgnSrc = pdc->prgnVis;
+            break;
+
         default:
-            hrgnSrc = NULL;
+            break;
     }
 
     if (hrgnSrc)
     {
         ret = NtGdiCombineRgn(hrgnDest, hrgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1;
+    }
+    else if (prgnSrc)
+    {
+        PREGION prgnDest = REGION_LockRgn(hrgnDest);
+        if (prgnDest)
+        {
+            ret = IntGdiCombineRgn(prgnDest, prgnSrc, 0, RGN_COPY) == ERROR ? -1 : 1;
+            REGION_UnlockRgn(prgnDest);
+        }
+        else
+            ret = -1;
     }
 
     if (iCode == SYSRGN)