From 6de37632918b9568df448c30da2c4f658fbd7af1 Mon Sep 17 00:00:00 2001 From: James Tabor Date: Thu, 9 Aug 2007 07:21:12 +0000 Subject: [PATCH] - Removed NtGdiSetAbortProc and NtGdiEscape from w32ksvc.db, leaving NtGdiEscape in print.c and updated ntgdibad.h. svn path=/trunk/; revision=28255 --- reactos/dll/win32/gdi32/misc/stubs.c | 4 +++- reactos/include/reactos/win32k/ntgdibad.h | 15 --------------- reactos/subsystems/win32/win32k/objects/print.c | 9 --------- reactos/subsystems/win32/win32k/w32ksvc.db | 2 -- 4 files changed, 3 insertions(+), 27 deletions(-) diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index f355814a1a4..eae795d8495 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -77,7 +77,9 @@ int STDCALL Escape(HDC hdc, INT escape, INT in_count, LPCSTR in_data, LPVOID out_data) { - return NtGdiEscape(hdc,escape,in_count,in_data,out_data); + UNIMPLEMENTED; + SetLastError(ERROR_CALL_NOT_IMPLEMENTED); + return 0; } /* diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index 5c704b8a652..0d9866e0a43 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -229,15 +229,6 @@ NtGdiEnumICMProfiles(HDC hDC, LPWSTR lpstrBuffer, UINT cch ); -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiEscape(HDC hDC, - INT Escape, - INT InSize, - LPCSTR InData, - LPVOID OutData); - /* Use NtGdiExtTextOutW with 0, 0 at the end. */ BOOL STDCALL @@ -661,12 +652,6 @@ NtGdiSelectPalette ( BOOL ForceBackground ); -/* Should be done in user-mode. */ -INT -STDCALL -NtGdiSetAbortProc(HDC hDC, - ABORTPROC AbortProc); - /* Use NtGdiSetBitmapDimension. */ BOOL STDCALL diff --git a/reactos/subsystems/win32/win32k/objects/print.c b/reactos/subsystems/win32/win32k/objects/print.c index 4ba7d2a715a..31e0eef3dad 100644 --- a/reactos/subsystems/win32/win32k/objects/print.c +++ b/reactos/subsystems/win32/win32k/objects/print.c @@ -289,15 +289,6 @@ freeout: return Result; } -INT -STDCALL -NtGdiSetAbortProc(HDC hDC, - ABORTPROC AbortProc) -{ - UNIMPLEMENTED; - return 0; -} - INT APIENTRY NtGdiStartDoc( diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index a8494733ce0..3c2fb2952cc 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -694,7 +694,6 @@ NtUserValidateHandleSecure 1 #ReactOS specify syscall NtGdiSelectObject 2 NtGdiSelectPalette 3 -NtGdiSetAbortProc 2 NtGdiSetBitmapDimensionEx 4 NtGdiSetBkColor 2 NtGdiSetBkMode 2 @@ -777,7 +776,6 @@ NtGdiDeleteObject 1 NtGdiEnumEnhMetaFile 5 NtGdiEnumFonts 4 NtGdiEnumICMProfiles 3 -NtGdiEscape 5 NtGdiExtTextOut 8 NtGdiGdiComment 3 NtGdiGetAspectRatioFilterEx 2