From b242b46662935563320da5e69e62ae8c817ced4d Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 19 Apr 2007 20:30:28 +0000 Subject: [PATCH] Move name NtGdiGetObject to NtGdiExtGetObjectW, no code change. svn path=/trunk/; revision=26425 --- reactos/dll/win32/gdi32/objects/dc.c | 6 +++--- reactos/include/reactos/win32k/ntgdibad.h | 5 ----- reactos/subsystems/win32/win32k/objects/dc.c | 2 +- reactos/tools/nci/w32ksvc.db | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/reactos/dll/win32/gdi32/objects/dc.c b/reactos/dll/win32/gdi32/objects/dc.c index 7aecb4b2bd1..3b66fb2bb43 100644 --- a/reactos/dll/win32/gdi32/objects/dc.c +++ b/reactos/dll/win32/gdi32/objects/dc.c @@ -376,7 +376,7 @@ GetObjectA(HGDIOBJ Handle, int Size, LPVOID Buffer) SetLastError(ERROR_BUFFER_OVERFLOW); return 0; } - Result = NtGdiGetObject(Handle, sizeof(LOGFONTW), &LogFontW); + Result = NtGdiExtGetObjectW(Handle, sizeof(LOGFONTW), &LogFontW); if (0 == Result) { return 0; @@ -386,7 +386,7 @@ GetObjectA(HGDIOBJ Handle, int Size, LPVOID Buffer) } else { - Result = NtGdiGetObject(Handle, Size, Buffer); + Result = NtGdiExtGetObjectW(Handle, Size, Buffer); } return Result; @@ -400,7 +400,7 @@ int STDCALL GetObjectW(HGDIOBJ Handle, int Size, LPVOID Buffer) { - return NtGdiGetObject(Handle, Size, Buffer); + return NtGdiExtGetObjectW(Handle, Size, Buffer); } diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index 5385c39a1b8..de828c0f70e 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -640,11 +640,6 @@ NtGdiGetMetaRgn ( HRGN hrgn ); -/* Should be NtGdiExtGetObjectW. */ -INT STDCALL NtGdiGetObject(HGDIOBJ hGDIObj, - INT BufSize, - LPVOID Object); - /* Should be done in user-mode using shared GDI Objects. */ DWORD STDCALL NtGdiGetObjectType(HGDIOBJ hGDIObj); diff --git a/reactos/subsystems/win32/win32k/objects/dc.c b/reactos/subsystems/win32/win32k/objects/dc.c index b7fca5c74f0..63295e3cc9d 100644 --- a/reactos/subsystems/win32/win32k/objects/dc.c +++ b/reactos/subsystems/win32/win32k/objects/dc.c @@ -1809,7 +1809,7 @@ IntGdiGetObject(HANDLE Handle, INT Count, LPVOID Buffer) } INT STDCALL -NtGdiGetObject(HANDLE handle, INT count, LPVOID buffer) +NtGdiExtGetObjectW(HANDLE handle, INT count, LPVOID buffer) { INT Ret = 0; LPVOID SafeBuf; diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db index 9760153d5ff..48c961618a1 100644 --- a/reactos/tools/nci/w32ksvc.db +++ b/reactos/tools/nci/w32ksvc.db @@ -74,6 +74,7 @@ NtGdiExtCreatePen 11 NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5 +NtGdiExtGetObjectW 3 NtGdiExtSelectClipRgn 3 NtGdiExtTextOut 8 NtGdiFillPath 1 @@ -136,7 +137,6 @@ NtGdiGetMetaRgn 2 NtGdiGetMiterLimit 2 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 -NtGdiGetObject 3 NtGdiGetObjectType 1 NtGdiGetOutlineTextMetrics 3 NtGdiGetPaletteEntries 4