gdi32: Use ntgdi names for object functions.

dlls/gdi32/enhmetafile.c

@@ -1439,7 +1439,7 @@ BOOL WINAPI PlayEnhMetaFileRecord(
       {
         const EMRSETCOLORADJUSTMENT *lpSetColorAdjust = (const EMRSETCOLORADJUSTMENT *)mr;
 
-        SetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment );
+        NtGdiSetColorAdjustment( hdc, &lpSetColorAdjust->ColorAdjustment );
 
         break;
       }

dlls/gdi32/gdi32.spec

@@ -189,7 +189,7 @@
 # @ stub GdiEndPageEMF
 @ stdcall GdiEntry13()
 # @ stub GdiFixUpHandle
-@ stdcall GdiFlush()
+@ stdcall GdiFlush() NtGdiFlush
 # @ stub GdiFullscreenControl
 @ stdcall GdiGetBatchLimit()
 @ stdcall GdiGetCharDimensions(long ptr ptr)
@@ -266,7 +266,7 @@
 @ stdcall GetCharacterPlacementW(long wstr long long ptr long)
 @ stdcall GetClipBox(long ptr) NtGdiGetAppClipBox
 @ stdcall GetClipRgn(long long)
-@ stdcall GetColorAdjustment(long ptr)
+@ stdcall GetColorAdjustment(long ptr) NtGdiGetColorAdjustment
 @ stdcall GetColorSpace(long)
 @ stdcall GetCurrentObject(long long)
 @ stdcall GetCurrentPositionEx(long ptr)
@@ -482,7 +482,7 @@
 @ stdcall SetBoundsRect(long ptr long) NtGdiSetBoundsRect
 # @ stub SetBrushAttributes
 @ stdcall SetBrushOrgEx(long long long ptr)
-@ stdcall SetColorAdjustment(long ptr)
+@ stdcall SetColorAdjustment(long ptr) NtGdiSetColorAdjustment
 @ stdcall SetColorSpace(long long)
 @ stdcall SetDCBrushColor(long long)
 @ stdcall SetDCPenColor(long long)
@@ -539,7 +539,7 @@
 @ stdcall TextOutW(long long long wstr long)
 @ stdcall TranslateCharsetInfo(ptr ptr long)
 @ stub UnloadNetworkFonts
-@ stdcall UnrealizeObject(long)
+@ stdcall UnrealizeObject(long) NtGdiUnrealizeObject
 @ stdcall UpdateColors(long) NtGdiUpdateColors
 @ stdcall UpdateICMRegKey(long str str long) UpdateICMRegKeyA
 @ stdcall UpdateICMRegKeyA(long str str long)

dlls/gdi32/gdiobj.c

@@ -407,7 +407,7 @@ static const struct DefaultFontInfo default_fonts[] =
 
 
 /*************************************************************************
- * __wine_make_gdi_object_system    (GDI32.@)
+ * __wine_make_gdi_object_system    (win32u.@)
  *
  * USER has to tell GDI that its system brushes and pens are non-deletable.
  * For a description of the GDI object magics and their flags,
@@ -1065,9 +1065,9 @@ HGDIOBJ WINAPI GetCurrentObject(HDC hdc,UINT type)
 
 
 /***********************************************************************
- *           UnrealizeObject    (GDI32.@)
+ *           NtGdiUnrealizeObject    (win32u.@)
  */
-BOOL WINAPI UnrealizeObject( HGDIOBJ obj )
+BOOL WINAPI NtGdiUnrealizeObject( HGDIOBJ obj )
 {
     const struct gdi_obj_funcs *funcs = NULL;
     GDI_HANDLE_ENTRY *entry;
@@ -1180,9 +1180,9 @@ DWORD WINAPI GdiInitializeLanguagePack( DWORD arg )
 }
 
 /***********************************************************************
- *           GdiFlush    (GDI32.@)
+ *           NtGdiFlush    (win32u.@)
  */
-BOOL WINAPI GdiFlush(void)
+BOOL WINAPI NtGdiFlush(void)
 {
     return TRUE;  /* FIXME */
 }
@@ -1207,23 +1207,19 @@ DWORD WINAPI GdiSetBatchLimit( DWORD limit )
 
 
 /*******************************************************************
- *      GetColorAdjustment [GDI32.@]
- *
- *
+ *           NtGdiGetColorAdjustment    (win32u.@)
  */
-BOOL WINAPI GetColorAdjustment(HDC hdc, LPCOLORADJUSTMENT lpca)
+BOOL WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca )
 {
-    FIXME("stub\n");
+    FIXME( "stub\n" );
     return FALSE;
 }
 
 /*******************************************************************
- *      SetColorAdjustment [GDI32.@]
- *
- *
+ *           NtGdiSetColorAdjustment    (win32u.@)
  */
-BOOL WINAPI SetColorAdjustment(HDC hdc, const COLORADJUSTMENT* lpca)
+BOOL WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca )
 {
-    FIXME("stub\n");
+    FIXME( "stub\n" );
     return FALSE;
 }

dlls/gdi32/palette.c

@@ -215,7 +215,7 @@ static UINT set_palette_entries( HPALETTE hpalette, UINT start, UINT count,
     if (start+count > numEntries) count = numEntries - start;
     memcpy( &palPtr->entries[start], entries, count * sizeof(PALETTEENTRY) );
     GDI_ReleaseObj( hpalette );
-    UnrealizeObject( hpalette );
+    NtGdiUnrealizeObject( hpalette );
     return count;
 }
 

include/ntgdi.h

@@ -253,6 +253,7 @@ INT      WINAPI NtGdiExtEscape( HDC hdc, WCHAR *driver, INT driver_id, INT escap
 BOOL     WINAPI NtGdiExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, UINT type );
 BOOL     WINAPI NtGdiExtTextOutW( HDC hdc, INT x, INT y, UINT flags, const RECT *rect,
                                   const WCHAR *str, UINT count, const INT *dx, DWORD cp );
+BOOL     WINAPI NtGdiFlush(void);
 BOOL     WINAPI NtGdiFrameRgn( HDC hdc, HRGN hrgn, HBRUSH brush,
                                INT width, INT height );
 BOOL     WINAPI NtGdiFillPath( HDC hdc );
@@ -265,6 +266,7 @@ BOOL     WINAPI NtGdiGetCharABCWidthsW( HDC hdc, UINT first, UINT last, WCHAR *c
 BOOL     WINAPI NtGdiGetCharWidthInfo( HDC hdc, struct char_width_info *info );
 BOOL     WINAPI NtGdiGetCharWidthW( HDC hdc, UINT first_char, UINT last_char, WCHAR *chars,
                                     ULONG flags, void *buffer );
+BOOL     WINAPI NtGdiGetColorAdjustment( HDC hdc, COLORADJUSTMENT *ca );
 BOOL     WINAPI NtGdiGetDCDword( HDC hdc, UINT method, DWORD *result );
 BOOL     WINAPI NtGdiGetDCPoint( HDC hdc, UINT method, POINT *result );
 INT      WINAPI NtGdiGetDeviceCaps( HDC hdc, INT cap );
@@ -343,6 +345,7 @@ LONG     WINAPI NtGdiSetBitmapBits( HBITMAP hbitmap, LONG count, const void *bit
 BOOL     WINAPI NtGdiSetBitmapDimension( HBITMAP hbitmap, INT x, INT y, SIZE *prev_size );
 BOOL     WINAPI NtGdiSetBrushOrg( HDC hdc, INT x, INT y, POINT *prev_org );
 UINT     WINAPI NtGdiSetBoundsRect( HDC hdc, const RECT *rect, UINT flags );
+BOOL     WINAPI NtGdiSetColorAdjustment( HDC hdc, const COLORADJUSTMENT *ca );
 INT      WINAPI NtGdiSetDIBitsToDeviceInternal( HDC hdc, INT x_dst, INT y_dst, DWORD cx,
                                                 DWORD cy, INT x_src, INT y_src, UINT startscan,
                                                 UINT lines, const void *bits, const BITMAPINFO *bmi,