diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def index 2f897b5fdb3..6366cede053 100644 --- a/reactos/dll/win32/gdi32/gdi32.def +++ b/reactos/dll/win32/gdi32/gdi32.def @@ -532,12 +532,12 @@ SetAbortProc@8 SetArcDirection@8 SetBitmapAttributes@8 SetBitmapBits@12=NtGdiSetBitmapBits@12 -SetBitmapDimensionEx@16=NtGdiSetBitmapDimensionEx@16 +SetBitmapDimensionEx@16=NtGdiSetBitmapDimension@16 SetBkColor@8=NtGdiSetBkColor@8 SetBkMode@8=NtGdiSetBkMode@8 SetBoundsRect@12 SetBrushAttributes@8 -SetBrushOrgEx@16=NtGdiSetBrushOrgEx@16 +SetBrushOrgEx@16=NtGdiSetBrushOrg@16 SetColorAdjustment@8 SetColorSpace@8 SetDCBrushColor@8 diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index 386510aa4f6..34632abb1b5 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -621,30 +621,12 @@ NtGdiSelectPalette ( BOOL ForceBackground ); -/* Use NtGdiSetBitmapDimension. */ -BOOL -STDCALL -NtGdiSetBitmapDimensionEx ( - HBITMAP hBitmap, - INT Width, - INT Height, - LPSIZE Size - ); - /* Needs to be done in user-mode, using shared GDI Object Attributes. */ COLORREF STDCALL NtGdiSetBkColor (HDC hDC, COLORREF Color); /* Needs to be done in user-mode, using shared GDI Object Attributes. */ INT STDCALL NtGdiSetBkMode(HDC hDC, INT backgroundMode); -/* Use NtGdiSetBrushOrg. */ -BOOL STDCALL -NtGdiSetBrushOrgEx( - HDC hDC, - INT XOrg, - INT YOrg, - LPPOINT Point); - /* Use NtGdiDoPalette with GdiPalSetColorTable, TRUE. */ UINT STDCALL diff --git a/reactos/subsystems/win32/win32k/objects/bitmaps.c b/reactos/subsystems/win32/win32k/objects/bitmaps.c index f34980be77c..0a86004dd00 100644 --- a/reactos/subsystems/win32/win32k/objects/bitmaps.c +++ b/reactos/subsystems/win32/win32k/objects/bitmaps.c @@ -1075,7 +1075,7 @@ NtGdiSetBitmapBits( } BOOL STDCALL -NtGdiSetBitmapDimensionEx( +NtGdiSetBitmapDimension( HBITMAP hBitmap, INT Width, INT Height, diff --git a/reactos/subsystems/win32/win32k/objects/brush.c b/reactos/subsystems/win32/win32k/objects/brush.c index c1a063806a3..67e62704d05 100644 --- a/reactos/subsystems/win32/win32k/objects/brush.c +++ b/reactos/subsystems/win32/win32k/objects/brush.c @@ -694,9 +694,9 @@ NtGdiCreateSolidBrush(COLORREF Color, } /* - * NtGdiSetBrushOrgEx + * NtGdiSetBrushOrg * - * The NtGdiSetBrushOrgEx function sets the brush origin that GDI assigns to + * The NtGdiSetBrushOrg function sets the brush origin that GDI assigns to * the next brush an application selects into the specified device context. * * Status @@ -704,7 +704,7 @@ NtGdiCreateSolidBrush(COLORREF Color, */ BOOL STDCALL -NtGdiSetBrushOrgEx(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) +NtGdiSetBrushOrg(HDC hDC, INT XOrg, INT YOrg, LPPOINT Point) { PDC dc = DC_LockDc(hDC); if (dc == NULL) diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index 5ca144211a3..5604d85a643 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -270,10 +270,10 @@ NtGdiSelectClipPath 2 # NtGdiSelectPen 2 # NtGdiSetBitmapAttributes 2 NtGdiSetBitmapBits 3 -# NtGdiSetBitmapDimension 4 +NtGdiSetBitmapDimension 4 NtGdiSetBoundsRect 3 # NtGdiSetBrushAttributes 2 -# NtGdiSetBrushOrg 4 +NtGdiSetBrushOrg 4 NtGdiSetColorAdjustment 2 NtGdiSetColorSpace 2 NtGdiSetDeviceGammaRamp 2 @@ -694,10 +694,8 @@ NtUserValidateHandleSecure 1 #ReactOS specify syscall NtGdiSelectObject 2 NtGdiSelectPalette 3 -NtGdiSetBitmapDimensionEx 4 NtGdiSetBkColor 2 NtGdiSetBkMode 2 -NtGdiSetBrushOrgEx 4 NtGdiSetDIBColorTable 4 NtGdiSetDIBits 7 NtGdiSetDIBitsToDevice 12