From f76e81e2f43dcfd9e17d62bfc65432638fc4faf0 Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Thu, 8 Nov 2007 14:29:31 +0000 Subject: [PATCH] rename NtGdiGetClipBox to NtGdiGetAppClipBox svn path=/trunk/; revision=30272 --- reactos/dll/win32/gdi32/misc/stubs.c | 2 +- reactos/include/reactos/win32k/ntgdibad.h | 8 -------- reactos/subsystems/win32/win32k/objects/cliprgn.c | 7 +++---- reactos/subsystems/win32/win32k/stubs/stubs.c | 13 ------------- reactos/subsystems/win32/win32k/w32ksvc.db | 1 - 5 files changed, 4 insertions(+), 27 deletions(-) diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index 6cc9f710df9..5cd6d4020a4 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -2399,7 +2399,7 @@ GetClipBox(HDC hdc, LPRECT lprc) { /* FIXME some part need be done in user mode */ - return NtGdiGetClipBox(hdc, lprc); + return NtGdiGetAppClipBox(hdc, lprc); } /* diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index e2f3565aa6d..f2f893de950 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -210,14 +210,6 @@ NtGdiGetCharABCWidths(HDC hDC, UINT LastChar, LPABC abc); -/* Use NtGdiGetAppClipBox. */ -int -STDCALL -NtGdiGetClipBox ( - HDC hDC, - LPRECT rc - ); - /* Use NtGdiGetColorSpaceforBitmap. */ HCOLORSPACE STDCALL diff --git a/reactos/subsystems/win32/win32k/objects/cliprgn.c b/reactos/subsystems/win32/win32k/objects/cliprgn.c index d8aaff4f5e3..a34e454e579 100644 --- a/reactos/subsystems/win32/win32k/objects/cliprgn.c +++ b/reactos/subsystems/win32/win32k/objects/cliprgn.c @@ -196,10 +196,10 @@ IntGdiGetClipBox(HDC hDC, LPRECT rc) return retval; } -int STDCALL NtGdiGetClipBox(HDC hDC, - LPRECT rc) +INT STDCALL +NtGdiGetAppClipBox(HDC hDC, LPRECT rc) { - int Ret; + INT Ret; NTSTATUS Status = STATUS_SUCCESS; RECT Saferect; @@ -220,7 +220,6 @@ int STDCALL NtGdiGetClipBox(HDC hDC, if(!NT_SUCCESS(Status)) { - SetLastNtError(Status); return ERROR; } diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c index 1a73ae42d18..dca918b0a4f 100644 --- a/reactos/subsystems/win32/win32k/stubs/stubs.c +++ b/reactos/subsystems/win32/win32k/stubs/stubs.c @@ -2462,19 +2462,6 @@ NtGdiFullscreenControl( return FALSE; } - /* - * @unimplemented - */ -INT -STDCALL -NtGdiGetAppClipBox( - IN HDC hdc, - OUT LPRECT prc) -{ - UNIMPLEMENTED; - return 0; -} - /* * @unimplemented */ diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index 4b5df5f9a18..4d53e50fea2 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -746,7 +746,6 @@ NtGdiGdiComment 3 NtGdiGetAspectRatioFilterEx 2 NtGdiGetBkColor 1 NtGdiGetBkMode 1 -NtGdiGetClipBox 2 NtGdiGetColorSpace 1 NtGdiGetCurrentPositionEx 2 NtGdiGetEnhMetaFile 1