win32u: Use syscall interface for all ntgdi functions.

dlls/win32u/gdiobj.c

@@ -1030,17 +1030,6 @@ BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca )
 
 static struct unix_funcs unix_funcs =
 {
-    NtGdiDoPalette,
-    NtGdiExtEscape,
-    NtGdiGetAndSetDCDword,
-    NtGdiGetDeviceCaps,
-    NtGdiGetDeviceGammaRamp,
-    NtGdiGetNearestColor,
-    NtGdiGetRasterizerCaps,
-    NtGdiResizePalette,
-    NtGdiSetDeviceGammaRamp,
-    NtGdiSetLayout,
-    NtGdiSetSystemPaletteUse,
     NtUserDrawCaptionTemp,
     NtUserDrawMenuBarTemp,
     NtUserEndPaint,

dlls/win32u/syscall.c

@@ -82,6 +82,7 @@ static void * const syscalls[] =
     NtGdiDeleteClientObj,
     NtGdiDeleteObjectApp,
     NtGdiDescribePixelFormat,
+    NtGdiDoPalette,
     NtGdiDrawStream,
     NtGdiEllipse,
     NtGdiEndDoc,
@@ -92,6 +93,7 @@ static void * const syscalls[] =
     NtGdiExcludeClipRect,
     NtGdiExtCreatePen,
     NtGdiExtCreateRegion,
+    NtGdiExtEscape,
     NtGdiExtFloodFill,
     NtGdiExtGetObjectW,
     NtGdiExtSelectClipRgn,
@@ -102,6 +104,7 @@ static void * const syscalls[] =
     NtGdiFlush,
     NtGdiFontIsLinked,
     NtGdiFrameRgn,
+    NtGdiGetAndSetDCDword,
     NtGdiGetAppClipBox,
     NtGdiGetBitmapBits,
     NtGdiGetBitmapDimension,
@@ -114,6 +117,8 @@ static void * const syscalls[] =
     NtGdiGetDCObject,
     NtGdiGetDCPoint,
     NtGdiGetDIBitsInternal,
+    NtGdiGetDeviceCaps,
+    NtGdiGetDeviceGammaRamp,
     NtGdiGetFontData,
     NtGdiGetFontFileData,
     NtGdiGetFontFileInfo,
@@ -121,11 +126,13 @@ static void * const syscalls[] =
     NtGdiGetGlyphIndicesW,
     NtGdiGetGlyphOutline,
     NtGdiGetKerningPairs,
+    NtGdiGetNearestColor,
     NtGdiGetNearestPaletteIndex,
     NtGdiGetOutlineTextMetricsInternalW,
     NtGdiGetPath,
     NtGdiGetPixel,
     NtGdiGetRandomRgn,
+    NtGdiGetRasterizerCaps,
     NtGdiGetRealizationInfo,
     NtGdiGetRegionData,
     NtGdiGetRgnBox,
@@ -161,6 +168,7 @@ static void * const syscalls[] =
     NtGdiRemoveFontMemResourceEx,
     NtGdiRemoveFontResourceW,
     NtGdiResetDC,
+    NtGdiResizePalette,
     NtGdiRestoreDC,
     NtGdiRoundRect,
     NtGdiSaveDC,
@@ -177,11 +185,14 @@ static void * const syscalls[] =
     NtGdiSetBrushOrg,
     NtGdiSetColorAdjustment,
     NtGdiSetDIBitsToDeviceInternal,
+    NtGdiSetDeviceGammaRamp,
+    NtGdiSetLayout,
     NtGdiSetMagicColors,
     NtGdiSetMetaRgn,
     NtGdiSetPixel,
     NtGdiSetPixelFormat,
     NtGdiSetRectRgn,
+    NtGdiSetSystemPaletteUse,
     NtGdiSetTextJustification,
     NtGdiSetVirtualResolution,
     NtGdiStartDoc,

dlls/win32u/win32u.spec

@@ -372,7 +372,7 @@
 @ stub NtGdiDestroyOPMProtectedOutput
 @ stub NtGdiDestroyPhysicalMonitor
 @ stub NtGdiDoBanding
-@ stdcall NtGdiDoPalette(long long long ptr long long)
+@ stdcall -syscall NtGdiDoPalette(long long long ptr long long)
 @ stub NtGdiDrawEscape
 @ stdcall -syscall NtGdiDrawStream(long long ptr)
 @ stub NtGdiDwmCreatedBitmapRemotingOutput
@@ -420,7 +420,7 @@
 @ 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 NtGdiExtEscape(long wstr long long long ptr long ptr)
 @ stdcall -syscall NtGdiExtFloodFill(long long long long long)
 @ stdcall -syscall NtGdiExtGetObjectW(long long ptr)
 @ stdcall -syscall NtGdiExtSelectClipRgn(long long long)
@@ -441,7 +441,7 @@
 @ stub NtGdiForceUFIMapping
 @ stdcall -syscall NtGdiFrameRgn(long long long long long)
 @ stub NtGdiFullscreenControl
-@ stdcall NtGdiGetAndSetDCDword(long long long ptr)
+@ stdcall -syscall NtGdiGetAndSetDCDword(long long long ptr)
 @ stdcall -syscall NtGdiGetAppClipBox(long ptr)
 @ stub NtGdiGetAppliedDeviceGammaRamp
 @ stdcall -syscall NtGdiGetBitmapBits(long long ptr)
@@ -467,9 +467,9 @@
 @ stdcall -syscall NtGdiGetDCPoint(long long ptr)
 @ stub NtGdiGetDCforBitmap
 @ stdcall -syscall NtGdiGetDIBitsInternal(long long long long ptr ptr long long long)
-@ stdcall NtGdiGetDeviceCaps(long long)
+@ stdcall -syscall NtGdiGetDeviceCaps(long long)
 @ stub NtGdiGetDeviceCapsAll
-@ stdcall NtGdiGetDeviceGammaRamp(long ptr)
+@ stdcall -syscall NtGdiGetDeviceGammaRamp(long ptr)
 @ stub NtGdiGetDeviceWidth
 @ stub NtGdiGetDhpdev
 @ stub NtGdiGetETM
@@ -490,7 +490,7 @@
 @ stub NtGdiGetLinkedUFIs
 @ stub NtGdiGetMiterLimit
 @ stub NtGdiGetMonitorID
-@ stdcall NtGdiGetNearestColor(long long)
+@ stdcall -syscall NtGdiGetNearestColor(long long)
 @ stdcall -syscall NtGdiGetNearestPaletteIndex(long long)
 @ stub NtGdiGetNumberOfPhysicalMonitors
 @ stub NtGdiGetOPMInformation
@@ -505,7 +505,7 @@
 @ stub NtGdiGetProcessSessionFonts
 @ stub NtGdiGetPublicFontTableChangeCookie
 @ stdcall -syscall NtGdiGetRandomRgn(long long long)
-@ stdcall NtGdiGetRasterizerCaps(ptr long)
+@ stdcall -syscall NtGdiGetRasterizerCaps(ptr long)
 @ stdcall -syscall NtGdiGetRealizationInfo(long ptr)
 @ stdcall -syscall NtGdiGetRegionData(long long ptr)
 @ stdcall -syscall NtGdiGetRgnBox(long ptr)
@@ -571,7 +571,7 @@
 @ stdcall -syscall NtGdiRemoveFontResourceW(wstr long long long long ptr)
 @ stub NtGdiRemoveMergeFont
 @ stdcall -syscall NtGdiResetDC(long ptr ptr ptr ptr)
-@ stdcall NtGdiResizePalette(long long)
+@ stdcall -syscall NtGdiResizePalette(long long)
 @ stdcall -syscall NtGdiRestoreDC(long long)
 @ stdcall -syscall NtGdiRoundRect(long long long long long long long)
 @ stub NtGdiSTROBJ_bEnum
@@ -598,11 +598,11 @@
 @ stdcall -syscall NtGdiSetColorAdjustment(long ptr)
 @ stub NtGdiSetColorSpace
 @ stdcall -syscall NtGdiSetDIBitsToDeviceInternal(long long long long long long long long long ptr ptr long long long long long)
-@ stdcall NtGdiSetDeviceGammaRamp(ptr ptr)
+@ stdcall -syscall NtGdiSetDeviceGammaRamp(ptr ptr)
 @ stub NtGdiSetFontEnumeration
 @ stub NtGdiSetFontXform
 @ stub NtGdiSetIcmMode
-@ stdcall NtGdiSetLayout(long long long)
+@ stdcall -syscall NtGdiSetLayout(long long long)
 @ stub NtGdiSetLinkedUFIs
 @ stdcall -syscall NtGdiSetMagicColors(long long long)
 @ stdcall -syscall NtGdiSetMetaRgn(long)
@@ -614,7 +614,7 @@
 @ stub NtGdiSetPrivateDeviceGammaRamp
 @ stdcall -syscall NtGdiSetRectRgn(long long long long long)
 @ stub NtGdiSetSizeDevice
-@ stdcall NtGdiSetSystemPaletteUse(long long)
+@ stdcall -syscall NtGdiSetSystemPaletteUse(long long)
 @ stdcall -syscall NtGdiSetTextJustification(long long long)
 @ stub NtGdiSetUMPDSandboxState
 @ stdcall -syscall NtGdiSetVirtualResolution(long long long long long)

dlls/win32u/win32u_private.h

@@ -35,19 +35,6 @@
 struct unix_funcs
 {
     /* win32u functions */
-    LONG     (WINAPI *pNtGdiDoPalette)( HGDIOBJ handle, WORD start, WORD count, void *entries,
-                                        DWORD func, BOOL inbound );
-    INT      (WINAPI *pNtGdiExtEscape)( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size,
-                                        const char *input, INT output_size, char *output );
-    BOOL     (WINAPI *pNtGdiGetAndSetDCDword)( HDC hdc, UINT method, DWORD value, DWORD *result );
-    INT      (WINAPI *pNtGdiGetDeviceCaps)( HDC hdc, INT cap );
-    BOOL     (WINAPI *pNtGdiGetDeviceGammaRamp)( HDC hdc, void *ptr );
-    COLORREF (WINAPI *pNtGdiGetNearestColor)( HDC hdc, COLORREF color );
-    BOOL     (WINAPI *pNtGdiGetRasterizerCaps)( RASTERIZER_STATUS *status, UINT size );
-    BOOL     (WINAPI *pNtGdiResizePalette)( HPALETTE palette, UINT count );
-    BOOL     (WINAPI *pNtGdiSetDeviceGammaRamp)( HDC hdc, void *ptr );
-    DWORD    (WINAPI *pNtGdiSetLayout)( HDC hdc, LONG wox, DWORD layout );
-    UINT     (WINAPI *pNtGdiSetSystemPaletteUse)( HDC hdc, UINT use );
     BOOL     (WINAPI *pNtUserDrawCaptionTemp)( HWND hwnd, HDC hdc, const RECT *rect, HFONT font,
                                                HICON icon, const WCHAR *str, UINT flags );
     DWORD    (WINAPI *pNtUserDrawMenuBarTemp)( HWND hwnd, HDC hdc, RECT *rect, HMENU handle, HFONT font );

dlls/win32u/wrappers.c

@@ -24,81 +24,12 @@
 
 static const struct unix_funcs *unix_funcs;
 
-LONG WINAPI NtGdiDoPalette( HGDIOBJ handle, WORD start, WORD count, void *entries,
-                            DWORD func, BOOL inbound )
-{
-    if (!unix_funcs) return 0;
-    return unix_funcs->pNtGdiDoPalette( handle, start, count, entries, func, inbound );
-}
-
 BOOL WINAPI NtUserEndPaint( HWND hwnd, const PAINTSTRUCT *ps )
 {
     if (!unix_funcs) return FALSE;
     return unix_funcs->pNtUserEndPaint( hwnd, ps );
 }
 
-INT WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escape, INT input_size,
-                           const char *input, INT output_size, char *output )
-{
-    if (!unix_funcs) return 0;
-    return unix_funcs->pNtGdiExtEscape( hdc, driver, driver_id, escape, input_size, input,
-                                        output_size, output );
-}
-
-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 NtGdiGetDeviceCaps( HDC hdc, INT cap )
-{
-    if (!unix_funcs) return 0;
-    return unix_funcs->pNtGdiGetDeviceCaps( hdc, cap );
-}
-
-BOOL WINAPI NtGdiGetDeviceGammaRamp( HDC hdc, void *ptr )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiGetDeviceGammaRamp( hdc, ptr );
-}
-
-COLORREF WINAPI NtGdiGetNearestColor( HDC hdc, COLORREF color )
-{
-    if (!unix_funcs) return CLR_INVALID;
-    return unix_funcs->pNtGdiGetNearestColor( hdc, color );
-}
-
-BOOL WINAPI NtGdiGetRasterizerCaps( RASTERIZER_STATUS *status, UINT size )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiGetRasterizerCaps( status, size );
-}
-
-BOOL WINAPI NtGdiResizePalette( HPALETTE palette, UINT count )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiResizePalette( palette, count );
-}
-
-BOOL WINAPI NtGdiSetDeviceGammaRamp( HDC hdc, void *ptr )
-{
-    if (!unix_funcs) return FALSE;
-    return unix_funcs->pNtGdiSetDeviceGammaRamp( hdc, ptr );
-}
-
-DWORD WINAPI NtGdiSetLayout( HDC hdc, LONG wox, DWORD layout )
-{
-    if (!unix_funcs) return GDI_ERROR;
-    return unix_funcs->pNtGdiSetLayout( hdc, wox, layout );
-}
-
-UINT WINAPI NtGdiSetSystemPaletteUse( HDC hdc, UINT use )
-{
-    if (!unix_funcs) return SYSPAL_ERROR;
-    return unix_funcs->pNtGdiSetSystemPaletteUse( hdc, use );
-}
-
 BOOL WINAPI NtUserDrawCaptionTemp( HWND hwnd, HDC hdc, const RECT *rect, HFONT font,
                                    HICON icon, const WCHAR *str, UINT flags )
 {

dlls/wow64win/gdi.c

@@ -675,6 +675,18 @@ NTSTATUS WINAPI wow64_NtGdiDescribePixelFormat( UINT *args )
     return NtGdiDescribePixelFormat( hdc, format, size, descr );
 }
 
+NTSTATUS WINAPI wow64_NtGdiDoPalette( UINT *args )
+{
+    HGDIOBJ handle = get_handle( &args );
+    WORD start = get_ulong( &args );
+    WORD count = get_ulong( &args );
+    void *entries = get_ptr( &args );
+    DWORD func = get_ulong( &args );
+    BOOL inbound = get_ulong( &args );
+
+    return NtGdiDoPalette( handle, start, count, entries, func, inbound );
+}
+
 NTSTATUS WINAPI wow64_NtGdiDrawStream( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -777,6 +789,20 @@ NTSTATUS WINAPI wow64_NtGdiExtCreateRegion( UINT *args )
     return HandleToUlong( NtGdiExtCreateRegion( xform, count, data ));
 }
 
+NTSTATUS WINAPI wow64_NtGdiExtEscape( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    WCHAR *driver = get_ptr( &args );
+    INT driver_id = get_ulong( &args );
+    INT escape = get_ulong( &args );
+    INT input_size = get_ulong( &args );
+    const char *input = get_ptr( &args );
+    INT output_size = get_ulong( &args );
+    char *output = get_ptr( &args );
+
+    return NtGdiExtEscape( hdc, driver, driver_id, escape, input_size, input, output_size, output );
+}
+
 NTSTATUS WINAPI wow64_NtGdiExtFloodFill( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -951,6 +977,16 @@ NTSTATUS WINAPI wow64_NtGdiFrameRgn( UINT *args )
     return NtGdiFrameRgn( hdc, hrgn, brush, width, height );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetAndSetDCDword( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    UINT method = get_ulong( &args );
+    DWORD value = get_ulong( &args );
+    DWORD *result = get_ptr( &args );
+
+    return NtGdiGetAndSetDCDword( hdc, method, value, result );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetAppClipBox( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1067,6 +1103,22 @@ NTSTATUS WINAPI wow64_NtGdiGetDIBitsInternal( UINT *args )
                                    max_bits, max_info );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetDeviceCaps( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    INT cap = get_ulong( &args );
+
+    return NtGdiGetDeviceCaps( hdc, cap );
+}
+
+NTSTATUS WINAPI wow64_NtGdiGetDeviceGammaRamp( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    void *ptr = get_ptr( &args );
+
+    return NtGdiGetDeviceGammaRamp( hdc, ptr );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetFontData( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1147,6 +1199,14 @@ NTSTATUS WINAPI wow64_NtGdiGetKerningPairs( UINT *args )
     return NtGdiGetKerningPairs( hdc, count, kern_pair );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetNearestColor( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    COLORREF color = get_ulong( &args );
+
+    return NtGdiGetNearestColor( hdc, color );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetNearestPaletteIndex( UINT *args )
 {
     HPALETTE hpalette = get_handle( &args );
@@ -1238,6 +1298,14 @@ NTSTATUS WINAPI wow64_NtGdiGetRandomRgn( UINT *args )
     return NtGdiGetRandomRgn( hdc, region, code );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetRasterizerCaps( UINT *args )
+{
+    RASTERIZER_STATUS *status = get_ptr( &args );
+    UINT size = get_ulong( &args );
+
+    return NtGdiGetRasterizerCaps( status, size );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetRealizationInfo( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1246,6 +1314,15 @@ NTSTATUS WINAPI wow64_NtGdiGetRealizationInfo( UINT *args )
     return NtGdiGetRealizationInfo( hdc, info );
 }
 
+NTSTATUS WINAPI wow64_NtGdiGetRegionData( UINT *args )
+{
+    HRGN hrgn = get_ptr( &args );
+    DWORD count = get_ulong( &args );
+    RGNDATA *data = get_ptr( &args );
+
+    return NtGdiGetRegionData( hrgn, count, data );
+}
+
 NTSTATUS WINAPI wow64_NtGdiGetTextCharsetInfo( UINT *args )
 {
     HDC hdc = get_ptr( &args );
@@ -1388,15 +1465,6 @@ NTSTATUS WINAPI wow64_NtGdiRectangle( UINT *args )
     return NtGdiRectangle( hdc, left, top, right, bottom );
 }
 
-NTSTATUS WINAPI wow64_NtGdiGetRegionData( UINT *args )
-{
-    HRGN hrgn = get_ptr( &args );
-    DWORD count = get_ulong( &args );
-    RGNDATA *data = get_ptr( &args );
-
-    return NtGdiGetRegionData( hrgn, count, data );
-}
-
 NTSTATUS WINAPI wow64_NtGdiResetDC( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1408,6 +1476,14 @@ NTSTATUS WINAPI wow64_NtGdiResetDC( UINT *args )
     return NtGdiResetDC( hdc, devmode, banding, driver_info, dev );
 }
 
+NTSTATUS WINAPI wow64_NtGdiResizePalette( UINT *args )
+{
+    HPALETTE palette = get_handle( &args );
+    UINT count = get_ulong( &args );
+
+    return NtGdiResizePalette( palette, count );
+}
+
 NTSTATUS WINAPI wow64_NtGdiRestoreDC( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1757,6 +1833,23 @@ NTSTATUS WINAPI wow64_NtGdiSetDIBitsToDeviceInternal( UINT *args )
                                            max_bits, max_info, xform_coords, xform );
 }
 
+NTSTATUS WINAPI wow64_NtGdiSetDeviceGammaRamp( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    void *ptr = get_ptr( &args );
+
+    return NtGdiSetDeviceGammaRamp( hdc, ptr );
+}
+
+NTSTATUS WINAPI wow64_NtGdiSetLayout( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    LONG wox = get_ulong( &args );
+    DWORD layout = get_ulong( &args );
+
+    return NtGdiSetLayout( hdc, wox, layout );
+}
+
 NTSTATUS WINAPI wow64_NtGdiSetMagicColors( UINT *args )
 {
     HDC hdc = get_handle( &args );
@@ -1802,6 +1895,14 @@ NTSTATUS WINAPI wow64_NtGdiSetRectRgn( UINT *args )
     return NtGdiSetRectRgn( hrgn, left, top, right, bottom );
 }
 
+NTSTATUS WINAPI wow64_NtGdiSetSystemPaletteUse( UINT *args )
+{
+    HDC hdc = get_handle( &args );
+    UINT use = get_ulong( &args );
+
+    return NtGdiSetSystemPaletteUse( hdc, use );
+}
+
 NTSTATUS WINAPI wow64_NtGdiSetTextJustification( UINT *args )
 {
     HDC hdc = get_handle( &args );

dlls/wow64win/syscall.h

@@ -68,6 +68,7 @@
     SYSCALL_ENTRY( NtGdiDeleteClientObj ) \
     SYSCALL_ENTRY( NtGdiDeleteObjectApp ) \
     SYSCALL_ENTRY( NtGdiDescribePixelFormat ) \
+    SYSCALL_ENTRY( NtGdiDoPalette ) \
     SYSCALL_ENTRY( NtGdiDrawStream ) \
     SYSCALL_ENTRY( NtGdiEllipse ) \
     SYSCALL_ENTRY( NtGdiEndDoc ) \
@@ -78,6 +79,7 @@
     SYSCALL_ENTRY( NtGdiExcludeClipRect ) \
     SYSCALL_ENTRY( NtGdiExtCreatePen ) \
     SYSCALL_ENTRY( NtGdiExtCreateRegion ) \
+    SYSCALL_ENTRY( NtGdiExtEscape ) \
     SYSCALL_ENTRY( NtGdiExtFloodFill ) \
     SYSCALL_ENTRY( NtGdiExtGetObjectW ) \
     SYSCALL_ENTRY( NtGdiExtSelectClipRgn ) \
@@ -88,6 +90,7 @@
     SYSCALL_ENTRY( NtGdiFlush ) \
     SYSCALL_ENTRY( NtGdiFontIsLinked ) \
     SYSCALL_ENTRY( NtGdiFrameRgn ) \
+    SYSCALL_ENTRY( NtGdiGetAndSetDCDword ) \
     SYSCALL_ENTRY( NtGdiGetAppClipBox ) \
     SYSCALL_ENTRY( NtGdiGetBitmapBits ) \
     SYSCALL_ENTRY( NtGdiGetBitmapDimension ) \
@@ -100,6 +103,8 @@
     SYSCALL_ENTRY( NtGdiGetDCObject ) \
     SYSCALL_ENTRY( NtGdiGetDCPoint ) \
     SYSCALL_ENTRY( NtGdiGetDIBitsInternal ) \
+    SYSCALL_ENTRY( NtGdiGetDeviceCaps ) \
+    SYSCALL_ENTRY( NtGdiGetDeviceGammaRamp ) \
     SYSCALL_ENTRY( NtGdiGetFontData ) \
     SYSCALL_ENTRY( NtGdiGetFontFileData ) \
     SYSCALL_ENTRY( NtGdiGetFontFileInfo ) \
@@ -107,11 +112,13 @@
     SYSCALL_ENTRY( NtGdiGetGlyphIndicesW ) \
     SYSCALL_ENTRY( NtGdiGetGlyphOutline ) \
     SYSCALL_ENTRY( NtGdiGetKerningPairs ) \
+    SYSCALL_ENTRY( NtGdiGetNearestColor ) \
     SYSCALL_ENTRY( NtGdiGetNearestPaletteIndex ) \
     SYSCALL_ENTRY( NtGdiGetOutlineTextMetricsInternalW ) \
     SYSCALL_ENTRY( NtGdiGetPath ) \
     SYSCALL_ENTRY( NtGdiGetPixel ) \
     SYSCALL_ENTRY( NtGdiGetRandomRgn ) \
+    SYSCALL_ENTRY( NtGdiGetRasterizerCaps ) \
     SYSCALL_ENTRY( NtGdiGetRealizationInfo ) \
     SYSCALL_ENTRY( NtGdiGetRegionData ) \
     SYSCALL_ENTRY( NtGdiGetRgnBox ) \
@@ -147,6 +154,7 @@
     SYSCALL_ENTRY( NtGdiRemoveFontMemResourceEx ) \
     SYSCALL_ENTRY( NtGdiRemoveFontResourceW ) \
     SYSCALL_ENTRY( NtGdiResetDC ) \
+    SYSCALL_ENTRY( NtGdiResizePalette ) \
     SYSCALL_ENTRY( NtGdiRestoreDC ) \
     SYSCALL_ENTRY( NtGdiRoundRect ) \
     SYSCALL_ENTRY( NtGdiSaveDC ) \
@@ -163,11 +171,14 @@
     SYSCALL_ENTRY( NtGdiSetBrushOrg ) \
     SYSCALL_ENTRY( NtGdiSetColorAdjustment ) \
     SYSCALL_ENTRY( NtGdiSetDIBitsToDeviceInternal ) \
+    SYSCALL_ENTRY( NtGdiSetDeviceGammaRamp ) \
+    SYSCALL_ENTRY( NtGdiSetLayout ) \
     SYSCALL_ENTRY( NtGdiSetMagicColors ) \
     SYSCALL_ENTRY( NtGdiSetMetaRgn ) \
     SYSCALL_ENTRY( NtGdiSetPixel ) \
     SYSCALL_ENTRY( NtGdiSetPixelFormat ) \
     SYSCALL_ENTRY( NtGdiSetRectRgn ) \
+    SYSCALL_ENTRY( NtGdiSetSystemPaletteUse ) \
     SYSCALL_ENTRY( NtGdiSetTextJustification ) \
     SYSCALL_ENTRY( NtGdiSetVirtualResolution ) \
     SYSCALL_ENTRY( NtGdiStartDoc ) \