[ros-diffs] [tkreuzer] 28207: call IntGdiExtSelectClipRgn from inside win32k instead of NtGdiSelectClipRgn remove NtGdiSelectClipRgn from win32k

Author: tkreuzer
Date: Tue Aug  7 05:27:17 2007
New Revision: 28207

URL: http://svn.reactos.org/svn/reactos?rev=28207&view=rev
Log:
call IntGdiExtSelectClipRgn from inside win32k instead of NtGdiSelectClipRgn
remove NtGdiSelectClipRgn from win32k

Modified:
    trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
    trunk/reactos/subsystems/win32/win32k/objects/dc.c
    trunk/reactos/subsystems/win32/win32k/w32ksvc.db

Modified: trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/cliprgn.c Tue Aug  7 05:27:17 2007
@@ -433,12 +433,6 @@
    return Result;
 }

-INT STDCALL
-NtGdiSelectClipRgn(HDC hDC, HRGN hRgn)
-{
-   return NtGdiExtSelectClipRgn(hDC, hRgn, RGN_COPY);
-}
-
 int STDCALL NtGdiSetMetaRgn(HDC  hDC)
 {
   UNIMPLEMENTED;

Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Tue Aug  7 05:27:17 2007
@@ -1419,8 +1419,8 @@
         }
         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 @@
       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;

Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Tue Aug  7 05:27:17 2007
@@ -694,7 +694,6 @@
 NtGdiAlphaBlend                         11
 #
 #ReactOS specify syscall 
-NtGdiSelectClipRgn                      2
 NtGdiSelectObject                       2
 NtGdiSelectPalette                      3
 NtGdiSetAbortProc                       2