Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-22 04:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

call IntGdiExtSelectClipRgn from inside win32k instead of NtGdiSelectClipRgn

Browse source 
remove NtGdiSelectClipRgn from win32k

svn path=/trunk/; revision=28207
This commit is contained in:
Timo Kreuzer 2007-08-07 01:27:17 +00:00
parent 4237ee71bd
commit 234451155e
3 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/subsystems/win32/win32k/objects/cliprgn.c
View file

@ -433,12 +433,6 @@ BOOL STDCALL NtGdiRectVisible(HDC hDC,
return Result; return Result;
} }
INT STDCALL
NtGdiSelectClipRgn(HDC hDC, HRGN hRgn)
{
return NtGdiExtSelectClipRgn(hDC, hRgn, RGN_COPY);
}
int STDCALL NtGdiSetMetaRgn(HDC hDC) int STDCALL NtGdiSetMetaRgn(HDC hDC)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;

7
reactos/subsystems/win32/win32k/objects/dc.c
View file

@ -1419,8 +1419,8 @@ IntGdiSetDCState ( HDC hDC, HDC hDCSave )
} }
DC_UnlockDc ( dc ); DC_UnlockDc ( dc );
#else #else
IntGdiExtSelectClipRgn(dc, dcs->w.hClipRgn, RGN_COPY);
DC_UnlockDc ( dc ); DC_UnlockDc ( dc );
NtGdiSelectClipRgn(hDC, dcs->w.hClipRgn);
#endif #endif
NtGdiSelectObject( hDC, dcs->w.hBitmap ); NtGdiSelectObject( hDC, dcs->w.hBitmap );
@ -2050,14 +2050,15 @@ NtGdiSelectObject(HDC hDC, HGDIOBJ hGDIObj)
return objOrg; return objOrg;
case GDI_OBJECT_TYPE_REGION: case GDI_OBJECT_TYPE_REGION:
DC_UnlockDc (dc);
/* /*
* The return value is one of the following values: * The return value is one of the following values:
* SIMPLEREGION * SIMPLEREGION
* COMPLEXREGION * COMPLEXREGION
* NULLREGION * NULLREGION
*/ */
return (HGDIOBJ) NtGdiSelectClipRgn(hDC, (HRGN) hGDIObj); objectType = IntGdiExtSelectClipRgn(dc, (HRGN)hGDIObj, RGN_COPY);
DC_UnlockDc (dc);
return (HGDIOBJ)objectType;
default: default:
break; break;

1
reactos/subsystems/win32/win32k/w32ksvc.db
View file

@ -694,7 +694,6 @@ NtUserValidateHandleSecure 1
NtGdiAlphaBlend 11 NtGdiAlphaBlend 11
# #
#ReactOS specify syscall #ReactOS specify syscall
NtGdiSelectClipRgn 2
NtGdiSelectObject 2 NtGdiSelectObject 2
NtGdiSelectPalette 3 NtGdiSelectPalette 3
NtGdiSetAbortProc 2 NtGdiSetAbortProc 2