diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index a6571d09e35..f7a9b958d4f 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -2401,8 +2401,8 @@ BOOL STDCALL GetCharABCWidthsFloatW(HDC hdc,UINT FirstChar,UINT LastChar,LPABCFLOAT abcF) { - /* FIXME some part are done in user mode */ - return NtGdiGetCharABCWidthsFloat(hdc, FirstChar, LastChar, abcF); + + return FALSE; } /* @@ -2456,8 +2456,8 @@ GetCharWidthFloatW(HDC hdc, UINT iLastChar, PFLOAT pxBuffer) { - /* FIXME some part need be done in user mode */ - return NtGdiGetCharWidthFloat(hdc, iFirstChar, iLastChar, pxBuffer); + + return FALSE; } /* diff --git a/reactos/dll/win32/gdi32/objects/font.c b/reactos/dll/win32/gdi32/objects/font.c index 33d641d211d..c313eb30a1f 100644 --- a/reactos/dll/win32/gdi32/objects/font.c +++ b/reactos/dll/win32/gdi32/objects/font.c @@ -596,7 +596,7 @@ GetCharWidthFloatA( ) { /* FIXME what to do with iFirstChar and iLastChar ??? */ - return NtGdiGetCharWidthFloat ( hdc, iFirstChar, iLastChar, pxBuffer ); + return FALSE; } @@ -633,7 +633,7 @@ GetCharABCWidthsFloatA( DPRINT1("GCABCWFA iFirstChar %x\n",iFirstChar); /* FIXME what to do with iFirstChar and iLastChar ??? */ - return NtGdiGetCharABCWidthsFloat ( hdc, iFirstChar, iLastChar, lpABCF ); + return FALSE; } /* diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h index 297761a6d8f..6a7668ba1b6 100644 --- a/reactos/include/reactos/win32k/ntgdibad.h +++ b/reactos/include/reactos/win32k/ntgdibad.h @@ -222,32 +222,6 @@ NtGdiGetCharABCWidths(HDC hDC, UINT LastChar, LPABC abc); -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharABCWidthsFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABCFLOAT abcF); - -/* Should be done in user mode. */ -DWORD -STDCALL -NtGdiGetCharacterPlacement(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPGCP_RESULTSW Results, - DWORD Flags); - -/* Should be done in user mode. */ -BOOL -STDCALL -NtGdiGetCharWidthFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - PFLOAT Buffer); - /* Use NtGdiGetAppClipBox. */ int STDCALL diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c index 09b96bb152e..3a3ab3e7685 100644 --- a/reactos/subsystems/win32/win32k/objects/text.c +++ b/reactos/subsystems/win32/win32k/objects/text.c @@ -2251,28 +2251,21 @@ NtGdiGetCharABCWidths(HDC hDC, return TRUE; } + /* + * @unimplemented + */ BOOL STDCALL -NtGdiGetCharABCWidthsFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - LPABCFLOAT abcF) -{ - UNIMPLEMENTED; - return FALSE; -} - -DWORD -STDCALL -NtGdiGetCharacterPlacement(HDC hDC, - LPCWSTR String, - int Count, - int MaxExtent, - LPGCP_RESULTSW Results, - DWORD Flags) -{ - UNIMPLEMENTED; - return 0; +NtGdiGetCharABCWidthsW( + IN HDC hdc, + IN UINT wchFirst, + IN ULONG cwch, + IN OPTIONAL PWCHAR pwch, + IN FLONG fl, + OUT PVOID pvBuf) + { + UNIMPLEMENTED; + return FALSE; } BOOL @@ -2372,17 +2365,6 @@ NtGdiGetCharWidth32(HDC hDC, return TRUE; } -BOOL -STDCALL -NtGdiGetCharWidthFloat(HDC hDC, - UINT FirstChar, - UINT LastChar, - PFLOAT Buffer) -{ - UNIMPLEMENTED; - return FALSE; -} - DWORD STDCALL NtGdiGetFontLanguageInfo(HDC hDC) diff --git a/reactos/subsystems/win32/win32k/stubs/stubs.c b/reactos/subsystems/win32/win32k/stubs/stubs.c index d26628594f1..5c0882d09fc 100644 --- a/reactos/subsystems/win32/win32k/stubs/stubs.c +++ b/reactos/subsystems/win32/win32k/stubs/stubs.c @@ -2475,23 +2475,6 @@ NtGdiGetAppClipBox( return 0; } - /* - * @unimplemented - */ -BOOL -STDCALL -NtGdiGetCharABCWidthsW( - IN HDC hdc, - IN UINT wchFirst, - IN ULONG cwch, - IN OPTIONAL PWCHAR pwch, - IN FLONG fl, - OUT PVOID pvBuf) - { - UNIMPLEMENTED; - return FALSE; -} - /* * @unimplemented */ diff --git a/reactos/subsystems/win32/win32k/w32ksvc.db b/reactos/subsystems/win32/win32k/w32ksvc.db index 48ad2c931fb..9278d9d6717 100644 --- a/reactos/subsystems/win32/win32k/w32ksvc.db +++ b/reactos/subsystems/win32/win32k/w32ksvc.db @@ -748,10 +748,7 @@ NtGdiGetBkColor 1 NtGdiGetBkMode 1 NtGdiGetBrushOrgEx 2 NtGdiGetCharABCWidths 4 -NtGdiGetCharABCWidthsFloat 4 -NtGdiGetCharacterPlacement 6 NtGdiGetCharWidth32 4 -NtGdiGetCharWidthFloat 4 NtGdiGetClipBox 2 NtGdiGetColorSpace 1 NtGdiGetCurrentPositionEx 2