win32u: Use syscall interface for more clipping functions.

dlls/win32u/gdiobj.c

@@ -1031,23 +1031,13 @@ BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca )
 static struct unix_funcs unix_funcs =
 {
     NtGdiDoPalette,
-    NtGdiExcludeClipRect,
     NtGdiExtEscape,
-    NtGdiExtSelectClipRgn,
     NtGdiGetAndSetDCDword,
-    NtGdiGetAppClipBox,
-    NtGdiGetBoundsRect,
     NtGdiGetDeviceCaps,
     NtGdiGetDeviceGammaRamp,
     NtGdiGetNearestColor,
-    NtGdiGetRandomRgn,
     NtGdiGetRasterizerCaps,
-    NtGdiIntersectClipRect,
-    NtGdiOffsetClipRgn,
-    NtGdiPtVisible,
-    NtGdiRectVisible,
     NtGdiResizePalette,
-    NtGdiSetBoundsRect,
     NtGdiSetDeviceGammaRamp,
     NtGdiSetLayout,
     NtGdiSetSystemPaletteUse,

dlls/win32u/syscall.c

@@ -89,10 +89,12 @@ static void * const syscalls[] =
     NtGdiEndPath,
     NtGdiEnumFonts,
     NtGdiEqualRgn,
+    NtGdiExcludeClipRect,
     NtGdiExtCreatePen,
     NtGdiExtCreateRegion,
     NtGdiExtFloodFill,
     NtGdiExtGetObjectW,
+    NtGdiExtSelectClipRgn,
     NtGdiExtTextOutW,
     NtGdiFillPath,
     NtGdiFillRgn,
@@ -100,8 +102,10 @@ static void * const syscalls[] =
     NtGdiFlush,
     NtGdiFontIsLinked,
     NtGdiFrameRgn,
+    NtGdiGetAppClipBox,
     NtGdiGetBitmapBits,
     NtGdiGetBitmapDimension,
+    NtGdiGetBoundsRect,
     NtGdiGetCharABCWidthsW,
     NtGdiGetCharWidthInfo,
     NtGdiGetCharWidthW,
@@ -121,6 +125,7 @@ static void * const syscalls[] =
     NtGdiGetOutlineTextMetricsInternalW,
     NtGdiGetPath,
     NtGdiGetPixel,
+    NtGdiGetRandomRgn,
     NtGdiGetRealizationInfo,
     NtGdiGetRegionData,
     NtGdiGetRgnBox,
@@ -134,11 +139,13 @@ static void * const syscalls[] =
     NtGdiGradientFill,
     NtGdiHfontCreate,
     NtGdiInitSpool,
+    NtGdiIntersectClipRect,
     NtGdiInvertRgn,
     NtGdiLineTo,
     NtGdiMaskBlt,
     NtGdiModifyWorldTransform,
     NtGdiMoveTo,
+    NtGdiOffsetClipRgn,
     NtGdiOffsetRgn,
     NtGdiOpenDCW,
     NtGdiPatBlt,
@@ -147,7 +154,9 @@ static void * const syscalls[] =
     NtGdiPolyDraw,
     NtGdiPolyPolyDraw,
     NtGdiPtInRegion,
+    NtGdiPtVisible,
     NtGdiRectInRegion,
+    NtGdiRectVisible,
     NtGdiRectangle,
     NtGdiRemoveFontMemResourceEx,
     NtGdiRemoveFontResourceW,
@@ -164,6 +173,7 @@ static void * const syscalls[] =
     NtGdiSelectPen,
     NtGdiSetBitmapBits,
     NtGdiSetBitmapDimension,
+    NtGdiSetBoundsRect,
     NtGdiSetBrushOrg,
     NtGdiSetColorAdjustment,
     NtGdiSetDIBitsToDeviceInternal,

dlls/win32u/win32u.spec

@@ -417,13 +417,13 @@
 @ stub NtGdiEnumObjects
 @ stdcall -syscall NtGdiEqualRgn(long long)
 @ stub NtGdiEudcLoadUnloadLink
-@ stdcall NtGdiExcludeClipRect(long long long long long)
+@ stdcall -syscall NtGdiExcludeClipRect(long long long long long)
 @ stdcall -syscall NtGdiExtCreatePen(long long long long long long long ptr long long long)
 @ stdcall -syscall NtGdiExtCreateRegion(ptr long ptr)
 @ stdcall NtGdiExtEscape(long wstr long long long ptr long ptr)
 @ stdcall -syscall NtGdiExtFloodFill(long long long long long)
 @ stdcall -syscall NtGdiExtGetObjectW(long long ptr)
-@ stdcall NtGdiExtSelectClipRgn(long long long)
+@ stdcall -syscall NtGdiExtSelectClipRgn(long long long)
 @ stdcall -syscall NtGdiExtTextOutW(long long long long ptr ptr long ptr long)
 @ stub NtGdiFONTOBJ_cGetAllGlyphHandles
 @ stub NtGdiFONTOBJ_cGetGlyphs
@@ -442,12 +442,12 @@
 @ stdcall -syscall NtGdiFrameRgn(long long long long long)
 @ stub NtGdiFullscreenControl
 @ stdcall NtGdiGetAndSetDCDword(long long long ptr)
-@ stdcall NtGdiGetAppClipBox(long ptr)
+@ stdcall -syscall NtGdiGetAppClipBox(long ptr)
 @ stub NtGdiGetAppliedDeviceGammaRamp
 @ stdcall -syscall NtGdiGetBitmapBits(long long ptr)
 @ stdcall -syscall NtGdiGetBitmapDimension(long ptr)
 @ stub NtGdiGetBitmapDpiScaleValue
-@ stdcall NtGdiGetBoundsRect(long ptr long)
+@ stdcall -syscall NtGdiGetBoundsRect(long ptr long)
 @ stub NtGdiGetCOPPCompatibleOPMInformation
 @ stub NtGdiGetCertificate
 @ stub NtGdiGetCertificateByHandle
@@ -504,7 +504,7 @@
 @ stdcall -syscall NtGdiGetPixel(long long long)
 @ stub NtGdiGetProcessSessionFonts
 @ stub NtGdiGetPublicFontTableChangeCookie
-@ stdcall NtGdiGetRandomRgn(long long long)
+@ stdcall -syscall NtGdiGetRandomRgn(long long long)
 @ stdcall NtGdiGetRasterizerCaps(ptr long)
 @ stdcall -syscall NtGdiGetRealizationInfo(long ptr)
 @ stdcall -syscall NtGdiGetRegionData(long long ptr)
@@ -533,7 +533,7 @@
 @ stub NtGdiIcmBrushInfo
 @ stub NtGdiInit
 @ stdcall -syscall NtGdiInitSpool()
-@ stdcall NtGdiIntersectClipRect(long long long long long)
+@ stdcall -syscall NtGdiIntersectClipRect(long long long long long)
 @ stdcall -syscall NtGdiInvertRgn(long long)
 @ stdcall -syscall NtGdiLineTo(long long long)
 @ stub NtGdiMakeFontDir
@@ -545,7 +545,7 @@
 @ stdcall -syscall NtGdiModifyWorldTransform(long ptr long)
 @ stub NtGdiMonoBitmap
 @ stdcall -syscall NtGdiMoveTo(long long long ptr)
-@ stdcall NtGdiOffsetClipRgn(long long long)
+@ stdcall -syscall NtGdiOffsetClipRgn(long long long)
 @ stdcall -syscall NtGdiOffsetRgn(long long long)
 @ stdcall -syscall NtGdiOpenDCW(ptr ptr ptr long long ptr ptr ptr)
 @ stub NtGdiPATHOBJ_bEnum
@@ -561,11 +561,11 @@
 @ stdcall -syscall NtGdiPolyPolyDraw(long ptr ptr long long)
 @ stub NtGdiPolyTextOutW
 @ stdcall -syscall NtGdiPtInRegion(long long long)
-@ stdcall NtGdiPtVisible(long long long)
+@ stdcall -syscall NtGdiPtVisible(long long long)
 @ stub NtGdiQueryFontAssocInfo
 @ stub NtGdiQueryFonts
 @ stdcall -syscall NtGdiRectInRegion(long ptr)
-@ stdcall NtGdiRectVisible(long ptr)
+@ stdcall -syscall NtGdiRectVisible(long ptr)
 @ stdcall -syscall NtGdiRectangle(long long long long long)
 @ stdcall -syscall NtGdiRemoveFontMemResourceEx(long)
 @ stdcall -syscall NtGdiRemoveFontResourceW(wstr long long long long ptr)
@@ -592,7 +592,7 @@
 @ stub NtGdiSetBitmapAttributes
 @ stdcall -syscall NtGdiSetBitmapBits(long long ptr)
 @ stdcall -syscall NtGdiSetBitmapDimension(long long long ptr)
-@ stdcall NtGdiSetBoundsRect(long ptr long)
+@ stdcall -syscall NtGdiSetBoundsRect(long ptr long)
 @ stub NtGdiSetBrushAttributes
 @ stdcall -syscall NtGdiSetBrushOrg(long long long ptr)
 @ stdcall -syscall NtGdiSetColorAdjustment(long ptr)

dlls/win32u/win32u_private.h

@@ -37,24 +37,14 @@ struct unix_funcs
     /* win32u functions */
     LONG     (WINAPI *pNtGdiDoPalette)( HGDIOBJ handle, WORD start, WORD count, void *entries,
                                         DWORD func, BOOL inbound );
-    INT      (WINAPI *pNtGdiExcludeClipRect)( HDC hdc, INT left, INT top, INT right, INT bottom );
     INT      (WINAPI *pNtGdiExtEscape)( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size,
                                         const char *input, INT output_size, char *output );
-    INT      (WINAPI *pNtGdiExtSelectClipRgn)( HDC hdc, HRGN region, INT mode );
     BOOL     (WINAPI *pNtGdiGetAndSetDCDword)( HDC hdc, UINT method, DWORD value, DWORD *result );
-    INT      (WINAPI *pNtGdiGetAppClipBox)( HDC hdc, RECT *rect );
-    UINT     (WINAPI *pNtGdiGetBoundsRect)( HDC hdc, RECT *rect, UINT flags );
     INT      (WINAPI *pNtGdiGetDeviceCaps)( HDC hdc, INT cap );
     BOOL     (WINAPI *pNtGdiGetDeviceGammaRamp)( HDC hdc, void *ptr );
     COLORREF (WINAPI *pNtGdiGetNearestColor)( HDC hdc, COLORREF color );
-    INT      (WINAPI *pNtGdiGetRandomRgn)( HDC hdc, HRGN region, INT code );
     BOOL     (WINAPI *pNtGdiGetRasterizerCaps)( RASTERIZER_STATUS *status, UINT size );
-    INT      (WINAPI *pNtGdiIntersectClipRect)( HDC hdc, INT left, INT top, INT right, INT bottom );
-    INT      (WINAPI *pNtGdiOffsetClipRgn)( HDC hdc, INT x, INT y );
-    BOOL     (WINAPI *pNtGdiPtVisible)( HDC hdc, INT x, INT y );
-    BOOL     (WINAPI *pNtGdiRectVisible)( HDC hdc, const RECT *rect );
     BOOL     (WINAPI *pNtGdiResizePalette)( HPALETTE palette, UINT count );
-    UINT     (WINAPI *pNtGdiSetBoundsRect)( HDC hdc, const RECT *rect, UINT flags );
     BOOL     (WINAPI *pNtGdiSetDeviceGammaRamp)( HDC hdc, void *ptr );
     DWORD    (WINAPI *pNtGdiSetLayout)( HDC hdc, LONG wox, DWORD layout );
     UINT     (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use );

dlls/win32u/wrappers.c

@@ -37,12 +37,6 @@ BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps )
     return unix_funcs->pNtUserEndPaint( hwnd, ps );
 }
 
-INT WINAPI NtGdiExcludeClipRect( HDC hdc, INT left, INT top, INT right, INT bottom )
-{
-    if (!unix_funcs) return ERROR;
-    return unix_funcs->pNtGdiExcludeClipRect( hdc, left, top, right, bottom );
-}
-
 INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size,
                            const char *input, INT output_size, char *output )
 {
@@ -51,30 +45,12 @@ INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, IN
                                         output_size, output );
 }
 
-INT WINAPI NtGdiExtSelectClipRgn( HDC hdc, HRGN region, INT mode )
-{
-    if (!unix_funcs) return ERROR;
-    return unix_funcs->pNtGdiExtSelectClipRgn( hdc, region, mode );
-}
-
 BOOL WINAPI NtGdiGetAndSetDCDword( HDC hdc, UINT method, DWORD value, DWORD *result )
 {
     if (!unix_funcs) return FALSE;
     return unix_funcs->pNtGdiGetAndSetDCDword( hdc, method, value, result );
 }
 
-INT WINAPI NtGdiGetAppClipBox( HDC hdc, RECT *rect )
-{
-    if (!unix_funcs) return ERROR;
-    return unix_funcs->pNtGdiGetAppClipBox( hdc, rect );
-}
-
-UINT WINAPI NtGdiGetBoundsRect( HDC hdc, RECT *rect, UINT flags )
-{
-    if (!unix_funcs) return 0;
-    return unix_funcs->pNtGdiGetBoundsRect( hdc, rect, flags );
-}
-
 INT WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap )
 {
     if (!unix_funcs) return 0;
@@ -93,54 +69,18 @@ COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color )
     return unix_funcs->pNtGdiGetNearestColor( hdc, color );
 }
 
-INT WINAPI NtGdiGetRandomRgn( HDC hdc, HRGN region, INT code )
-{
-    if (!unix_funcs) return -1;
-    return unix_funcs->pNtGdiGetRandomRgn( hdc, region, code );
-}
-
 BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size )
 {
     if (!unix_funcs) return FALSE;
     return unix_funcs->pNtGdiGetRasterizerCaps( status, size );
 }
 
-INT WINAPI NtGdiIntersectClipRect( HDC hdc, INT left, INT top, INT right, INT bottom )
-{
-    if (!unix_funcs) return ERROR;
-    return unix_funcs->pNtGdiIntersectClipRect( hdc, left, top, right, bottom );
-}
-
-INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y )
-{
-    if (!unix_funcs) return ERROR;
-    return unix_funcs->pNtGdiOffsetClipRgn( hdc, x, y );
-}
-
-BOOL WINAPI NtGdiPtVisible( HDC hdc, INT x, INT y )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiPtVisible( hdc, x, y );
-}
-
-BOOL WINAPI NtGdiRectVisible( HDC hdc, const RECT *rect )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiRectVisible( hdc, rect );
-}
-
 BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count )
 {
     if (!unix_funcs) return FALSE;
     return unix_funcs->pNtGdiResizePalette( palette, count );
 }
 
-UINT WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags )
-{
-    if (!unix_funcs) return 0;
-    return unix_funcs->pNtGdiSetBoundsRect( hdc, rect, flags );
-}
-
 BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr )
 {
     if (!unix_funcs) return FALSE;

dlls/wow64win/gdi.c

@@ -730,6 +730,17 @@ NTSTATUS WINAPI wow64_NtGdiEnumFonts( UINT *args )
     return NtGdiEnumFonts( hdc, type, win32_compat, face_name_len, face_name, charset, count, buf );
 }
 
+NTSTATUS WINAPI wow64_NtGdiExcludeClipRect( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    INT left = get_ulong( &args );
+    INT top = get_ulong( &args );
+    INT right = get_ulong( &args );
+    INT bottom = get_ulong( &args );
+
+    return NtGdiExcludeClipRect( hdc, left, top, right, bottom );
+}
+
 NTSTATUS WINAPI wow64_NtGdiEqualRgn( UINT *args )
 {
     HRGN hrgn1 = get_handle( &args );
@@ -870,6 +881,15 @@ NTSTATUS WINAPI wow64_NtGdiExtGetObjectW( UINT *args )
     }
 }
 
+NTSTATUS WINAPI wow64_NtGdiExtSelectClipRgn( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    HRGN region = get_handle( &args );
+    INT mode = get_ulong( &args );
+
+    return NtGdiExtSelectClipRgn( hdc, region, mode );
+}
+
 NTSTATUS WINAPI wow64_NtGdiExtTextOutW( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -931,6 +951,14 @@ NTSTATUS WINAPI wow64_NtGdiFrameRgn( UINT *args )
     return NtGdiFrameRgn( hdc, hrgn, brush, width, height );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetAppClipBox( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    RECT *rect = get_ptr( &args );
+
+    return NtGdiGetAppClipBox( hdc, rect );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetBitmapBits( UINT *args )
 {
     HBITMAP bitmap = get_handle( &args );
@@ -948,6 +976,15 @@ NTSTATUS WINAPI wow64_NtGdiGetBitmapDimension( UINT *args )
     return NtGdiGetBitmapDimension( bitmap, size );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetBoundsRect( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    RECT *rect = get_ptr( &args );
+    UINT flags = get_ulong( &args );
+
+    return NtGdiGetBoundsRect( hdc, rect, flags );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetCharABCWidthsW( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1192,6 +1229,15 @@ NTSTATUS WINAPI wow64_NtGdiGetPixel( UINT *args )
     return NtGdiGetPixel( hdc, x, y );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetRandomRgn( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    HRGN region = get_handle( &args );
+    INT code = get_ulong( &args );
+
+    return NtGdiGetRandomRgn( hdc, region, code );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetRealizationInfo( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1433,6 +1479,26 @@ NTSTATUS WINAPI wow64_NtGdiInitSpool( UINT *args )
     return NtGdiInitSpool();
 }
 
+NTSTATUS WINAPI wow64_NtGdiIntersectClipRect( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    INT left = get_ulong( &args );
+    INT top = get_ulong( &args );
+    INT right = get_ulong( &args );
+    INT bottom = get_ulong( &args );
+
+    return NtGdiIntersectClipRect( hdc, left, top, right, bottom );
+}
+
+NTSTATUS WINAPI wow64_NtGdiOffsetClipRgn( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    INT x = get_ulong( &args );
+    INT y = get_ulong( &args );
+
+    return NtGdiOffsetClipRgn( hdc, x, y );
+}
+
 NTSTATUS WINAPI wow64_NtGdiOffsetRgn( UINT *args )
 {
     HRGN hrgn = get_handle( &args );
@@ -1506,6 +1572,15 @@ NTSTATUS WINAPI wow64_NtGdiPtInRegion( UINT *args )
     return NtGdiPtInRegion( hrgn, x, y );
 }
 
+NTSTATUS WINAPI wow64_NtGdiPtVisible( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    INT x = get_ulong( &args );
+    INT y = get_ulong( &args );
+
+    return NtGdiPtVisible( hdc, x, y );
+}
+
 NTSTATUS WINAPI wow64_NtGdiRectInRegion( UINT *args )
 {
     HRGN hrgn = get_handle( &args );
@@ -1514,6 +1589,14 @@ NTSTATUS WINAPI wow64_NtGdiRectInRegion( UINT *args )
     return NtGdiRectInRegion( hrgn, rect );
 }
 
+NTSTATUS WINAPI wow64_NtGdiRectVisible( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    const RECT *rect = get_ptr( &args );
+
+    return NtGdiRectVisible( hdc, rect );
+}
+
 NTSTATUS WINAPI wow64_NtGdiRemoveFontMemResourceEx( UINT *args )
 {
     HANDLE handle = get_handle( &args );
@@ -1623,6 +1706,15 @@ NTSTATUS WINAPI wow64_NtGdiSetBitmapDimension( UINT *args )
     return NtGdiSetBitmapDimension( hbitmap, x, y, prev_size );
 }
 
+NTSTATUS WINAPI wow64_NtGdiSetBoundsRect( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    const RECT *rect = get_ptr( &args );
+    UINT flags = get_ulong( &args );
+
+    return NtGdiSetBoundsRect( hdc, rect, flags );
+}
+
 NTSTATUS WINAPI wow64_NtGdiSetBrushOrg( UINT *args )
 {
     HDC hdc = get_handle( &args );

dlls/wow64win/syscall.h

@@ -75,10 +75,12 @@
     SYSCALL_ENTRY( NtGdiEndPath ) \
     SYSCALL_ENTRY( NtGdiEnumFonts ) \
     SYSCALL_ENTRY( NtGdiEqualRgn ) \
+    SYSCALL_ENTRY( NtGdiExcludeClipRect ) \
     SYSCALL_ENTRY( NtGdiExtCreatePen ) \
     SYSCALL_ENTRY( NtGdiExtCreateRegion ) \
     SYSCALL_ENTRY( NtGdiExtFloodFill ) \
     SYSCALL_ENTRY( NtGdiExtGetObjectW ) \
+    SYSCALL_ENTRY( NtGdiExtSelectClipRgn ) \
     SYSCALL_ENTRY( NtGdiExtTextOutW ) \
     SYSCALL_ENTRY( NtGdiFillPath ) \
     SYSCALL_ENTRY( NtGdiFillRgn ) \
@@ -86,8 +88,10 @@
     SYSCALL_ENTRY( NtGdiFlush ) \
     SYSCALL_ENTRY( NtGdiFontIsLinked ) \
     SYSCALL_ENTRY( NtGdiFrameRgn ) \
+    SYSCALL_ENTRY( NtGdiGetAppClipBox ) \
     SYSCALL_ENTRY( NtGdiGetBitmapBits ) \
     SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \
+    SYSCALL_ENTRY( NtGdiGetBoundsRect ) \
     SYSCALL_ENTRY( NtGdiGetCharABCWidthsW ) \
     SYSCALL_ENTRY( NtGdiGetCharWidthInfo ) \
     SYSCALL_ENTRY( NtGdiGetCharWidthW ) \
@@ -107,6 +111,7 @@
     SYSCALL_ENTRY( NtGdiGetOutlineTextMetricsInternalW ) \
     SYSCALL_ENTRY( NtGdiGetPath ) \
     SYSCALL_ENTRY( NtGdiGetPixel ) \
+    SYSCALL_ENTRY( NtGdiGetRandomRgn ) \
     SYSCALL_ENTRY( NtGdiGetRealizationInfo ) \
     SYSCALL_ENTRY( NtGdiGetRegionData ) \
     SYSCALL_ENTRY( NtGdiGetRgnBox ) \
@@ -120,11 +125,13 @@
     SYSCALL_ENTRY( NtGdiGradientFill ) \
     SYSCALL_ENTRY( NtGdiHfontCreate ) \
     SYSCALL_ENTRY( NtGdiInitSpool ) \
+    SYSCALL_ENTRY( NtGdiIntersectClipRect ) \
     SYSCALL_ENTRY( NtGdiInvertRgn ) \
     SYSCALL_ENTRY( NtGdiLineTo ) \
     SYSCALL_ENTRY( NtGdiMaskBlt ) \
     SYSCALL_ENTRY( NtGdiModifyWorldTransform ) \
     SYSCALL_ENTRY( NtGdiMoveTo ) \
+    SYSCALL_ENTRY( NtGdiOffsetClipRgn ) \
     SYSCALL_ENTRY( NtGdiOffsetRgn ) \
     SYSCALL_ENTRY( NtGdiOpenDCW ) \
     SYSCALL_ENTRY( NtGdiPatBlt ) \
@@ -133,7 +140,9 @@
     SYSCALL_ENTRY( NtGdiPolyDraw ) \
     SYSCALL_ENTRY( NtGdiPolyPolyDraw ) \
     SYSCALL_ENTRY( NtGdiPtInRegion ) \
+    SYSCALL_ENTRY( NtGdiPtVisible ) \
     SYSCALL_ENTRY( NtGdiRectInRegion ) \
+    SYSCALL_ENTRY( NtGdiRectVisible ) \
     SYSCALL_ENTRY( NtGdiRectangle ) \
     SYSCALL_ENTRY( NtGdiRemoveFontMemResourceEx ) \
     SYSCALL_ENTRY( NtGdiRemoveFontResourceW ) \
@@ -150,6 +159,7 @@
     SYSCALL_ENTRY( NtGdiSelectPen ) \
     SYSCALL_ENTRY( NtGdiSetBitmapBits ) \
     SYSCALL_ENTRY( NtGdiSetBitmapDimension ) \
+    SYSCALL_ENTRY( NtGdiSetBoundsRect ) \
     SYSCALL_ENTRY( NtGdiSetBrushOrg ) \
     SYSCALL_ENTRY( NtGdiSetColorAdjustment ) \
     SYSCALL_ENTRY( NtGdiSetDIBitsToDeviceInternal ) \