call IntGdiExtSelectClipRgn from inside win32k instead of NtGdiSelectClipRgn

remove NtGdiSelectClipRgn from win32k

svn path=/trunk/; revision=28207

diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c
index f6e7778..29c4e8f 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/cliprgn.c
+++ b/reactos/subsystems/win32/win32k/objects/cliprgn.c
@@ -433,12 +433,6 @@ BOOL STDCALL NtGdiRectVisible(HDC  hDC,
    return Result;
 }
 
-INT STDCALL
-NtGdiSelectClipRgn(HDC hDC, HRGN hRgn)
-{
-   return NtGdiExtSelectClipRgn(hDC, hRgn, RGN_COPY);
-}
-
 int STDCALL NtGdiSetMetaRgn(HDC  hDC)
 {
   UNIMPLEMENTED;

diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c
index 0ec7ed8..5e54bb7 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/dc.c
+++ b/reactos/subsystems/win32/win32k/objects/dc.c
@@ -1419,8 +1419,8 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
         }
         DC_UnlockDc ( dc );
 #else
+        IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY);
         DC_UnlockDc ( dc );
-        NtGdiSelectClipRgn(hDC, dcs->w.hClipRgn);
 #endif
 
         NtGdiSelectObject( hDC, dcs->w.hBitmap );
@@ -2050,14 +2050,15 @@ NtGdiSelectObject(HDC  hDC, HGDIOBJ  hGDIObj)
       return objOrg;
 
     case GDI_OBJECT_TYPE_REGION:
-      DC_UnlockDc (dc);
       /*
        * The return value is one of the following values:
        *  SIMPLEREGION
        *  COMPLEXREGION
        *  NULLREGION
        */
-      return (HGDIOBJ) NtGdiSelectClipRgn(hDC, (HRGN) hGDIObj);
+      objectType = IntGdiExtSelectClipRgn(dc, (HRGN)hGDIObj, RGN_COPY);
+      DC_UnlockDc (dc);
+      return (HGDIOBJ)objectType;
 
     default:
       break;

diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db
index 23afc23..3e394c6 100644 (file)
--- a/reactos/subsystems/win32/win32k/w32ksvc.db
+++ b/reactos/subsystems/win32/win32k/w32ksvc.db
@@ -694,7 +694,6 @@ NtUserValidateHandleSecure              1
 NtGdiAlphaBlend                         11
 #
 #ReactOS specify syscall 
-NtGdiSelectClipRgn                      2
 NtGdiSelectObject                       2
 NtGdiSelectPalette                      3
 NtGdiSetAbortProc                       2