From cb8070f58713ced7cbddef8bce2bef338e142bd0 Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Fri, 31 Aug 2007 23:32:54 +0000 Subject: [PATCH] redirect GetTextCharsetInfo to win32k implement GetTextExtentPointI svn path=/trunk/; revision=28727 --- reactos/dll/win32/gdi32/gdi32.def | 2 +- reactos/dll/win32/gdi32/misc/stubs.c | 16 ++++++---------- reactos/dll/win32/gdi32/objects/text.c | 19 ++----------------- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/reactos/dll/win32/gdi32/gdi32.def b/reactos/dll/win32/gdi32/gdi32.def index 49c207730b4..3f4fbba4ab5 100644 --- a/reactos/dll/win32/gdi32/gdi32.def +++ b/reactos/dll/win32/gdi32/gdi32.def @@ -438,7 +438,7 @@ GetSystemPaletteUse@4 GetTextAlign@4=NtGdiGetTextAlign@4 GetTextCharacterExtra@4 GetTextCharset@4 -GetTextCharsetInfo@12 +GetTextCharsetInfo@12=NtGdiGetTextCharsetInfo@12 GetTextColor@4=NtGdiGetTextColor@4 GetTextExtentExPointA@28 GetTextExtentExPointI@28 diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index 7d9077eba00..638b3ada863 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -1761,20 +1761,16 @@ GetTextExtentExPointI( } /* - * @unimplemented + * @implemented */ BOOL STDCALL -GetTextExtentPointI( - HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize -) +GetTextExtentPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + LPSIZE lpSize) { - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); } diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c index 6935b20ac64..e7b90c84b77 100644 --- a/reactos/dll/win32/gdi32/objects/text.c +++ b/reactos/dll/win32/gdi32/objects/text.c @@ -72,28 +72,13 @@ GetTextCharacterExtra( */ int STDCALL -GetTextCharset( - HDC hdc - ) +GetTextCharset(HDC hdc) { /* MSDN docs say this is equivalent */ - return GetTextCharsetInfo(hdc, NULL, 0); + return NtGdiGetTextCharsetInfo(hdc,NULL,0); } -/* - * @implemented - */ -int -STDCALL -GetTextCharsetInfo( - HDC hdc, - LPFONTSIGNATURE lpSig, - DWORD dwFlags - ) -{ - return NtGdiGetTextCharsetInfo(hdc, lpSig, dwFlags); -} /*