Author: jimtabor Date: Fri Apr 20 00:30:28 2007 New Revision: 26425
URL: http://svn.reactos.org/svn/reactos?rev=26425&view=rev Log: Move name NtGdiGetObject to NtGdiExtGetObjectW, no code change.
Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c trunk/reactos/include/reactos/win32k/ntgdibad.h trunk/reactos/subsystems/win32/win32k/objects/dc.c trunk/reactos/tools/nci/w32ksvc.db
Modified: trunk/reactos/dll/win32/gdi32/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/dc.... ============================================================================== --- trunk/reactos/dll/win32/gdi32/objects/dc.c (original) +++ trunk/reactos/dll/win32/gdi32/objects/dc.c Fri Apr 20 00:30:28 2007 @@ -376,7 +376,7 @@ 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 @@ } else { - Result = NtGdiGetObject(Handle, Size, Buffer); + Result = NtGdiExtGetObjectW(Handle, Size, Buffer); }
return Result; @@ -400,7 +400,7 @@ STDCALL GetObjectW(HGDIOBJ Handle, int Size, LPVOID Buffer) { - return NtGdiGetObject(Handle, Size, Buffer); + return NtGdiExtGetObjectW(Handle, Size, Buffer); }
Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntgdibad.h (original) +++ trunk/reactos/include/reactos/win32k/ntgdibad.h Fri Apr 20 00:30:28 2007 @@ -640,11 +640,6 @@ 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);
Modified: trunk/reactos/subsystems/win32/win32k/objects/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dc.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dc.c Fri Apr 20 00:30:28 2007 @@ -1809,7 +1809,7 @@ }
INT STDCALL -NtGdiGetObject(HANDLE handle, INT count, LPVOID buffer) +NtGdiExtGetObjectW(HANDLE handle, INT count, LPVOID buffer) { INT Ret = 0; LPVOID SafeBuf;
Modified: trunk/reactos/tools/nci/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=26... ============================================================================== --- trunk/reactos/tools/nci/w32ksvc.db (original) +++ trunk/reactos/tools/nci/w32ksvc.db Fri Apr 20 00:30:28 2007 @@ -74,6 +74,7 @@ NtGdiExtCreateRegion 3 NtGdiExtEscape 6 NtGdiExtFloodFill 5 +NtGdiExtGetObjectW 3 NtGdiExtSelectClipRgn 3 NtGdiExtTextOut 8 NtGdiFillPath 1 @@ -136,7 +137,6 @@ NtGdiGetMiterLimit 2 NtGdiGetNearestColor 2 NtGdiGetNearestPaletteIndex 2 -NtGdiGetObject 3 NtGdiGetObjectType 1 NtGdiGetOutlineTextMetrics 3 NtGdiGetPaletteEntries 4