[CMAKE]

[reactos.git] / subsystems / win32 / win32k / objects / dcobjs.c

diff --git a/subsystems/win32/win32k/objects/dcobjs.c b/subsystems/win32/win32k/objects/dcobjs.c
index 7e6870b..39826dc 100644 (file)
--- a/subsystems/win32/win32k/objects/dcobjs.c
+++ b/subsystems/win32/win32k/objects/dcobjs.c
@@ -181,7 +181,8 @@ GdiSelectPalette(
 
     if(pdc->dctype == DCTYPE_MEMORY)
     {
-        IntGdiRealizePalette(pdc);
+        // This didn't work anyway
+        //IntGdiRealizePalette(hDC);
     }
 
     PALETTE_ShareUnlockPalette(ppal);
@@ -364,10 +365,10 @@ NtGdiSelectBitmap(
     if (hVisRgn)
     {
         GdiSelectVisRgn(hdc, hVisRgn);
-        REGION_FreeRgnByHandle(hVisRgn);
+        GreDeleteObject(hVisRgn);
     }
 
-    /* Return the old bitmp handle */
+    /* Return the old bitmap handle */
     return hbmpOld;
 }
 
@@ -522,7 +523,7 @@ NtGdiGetRandomRgn(
     pdc = DC_LockDc(hdc);
     if (!pdc)
     {
-        EngSetLastError(ERROR_INVALID_HANDLE);
+        EngSetLastError(ERROR_INVALID_PARAMETER);
         return -1;
     }
 
@@ -543,7 +544,12 @@ NtGdiGetRandomRgn(
             else if (pdc->dclevel.prgnMeta) hrgnSrc = pdc->dclevel.prgnMeta->BaseObject.hHmgr;
             break;
         case SYSRGN:
-            if (pdc->prgnVis) hrgnSrc = pdc->prgnVis->BaseObject.hHmgr;
+            if (pdc->prgnVis)
+            {
+                PREGION prgnDest = REGION_LockRgn(hrgnDest);
+                ret = IntGdiCombineRgn(prgnDest, pdc->prgnVis, 0, RGN_COPY) == ERROR ? -1 : 1;
+                REGION_UnlockRgn(prgnDest);
+            }
             break;
         default:
             hrgnSrc = NULL;