From 012c324bfb46fe73fc34f8e69e49b0d73aaec5fd Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Sat, 8 Dec 2007 16:26:40 +0000 Subject: [PATCH] move GetTextExtentExPointI and GetTextExtentPointI from stubs.c to text.c svn path=/trunk/; revision=31083 --- reactos/dll/win32/gdi32/misc/stubs.c | 33 -------------------------- reactos/dll/win32/gdi32/objects/text.c | 28 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 33 deletions(-) diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c index 739b0ebbcf7..20aea783888 100644 --- a/reactos/dll/win32/gdi32/misc/stubs.c +++ b/reactos/dll/win32/gdi32/misc/stubs.c @@ -1569,39 +1569,6 @@ UnloadNetworkFonts(DWORD unknown) SetLastError(ERROR_CALL_NOT_IMPLEMENTED); } -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentExPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - int nMaxExtent, - LPINT lpnFit, - LPINT alpDx, - LPSIZE lpSize) -{ - return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); -} - -/* - * @implemented - */ -BOOL -STDCALL -GetTextExtentPointI(HDC hdc, - LPWORD pgiIn, - int cgi, - LPSIZE lpSize) -{ - return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); -} - - - - - /* * @unimplemented */ diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c index b175a41e909..972b45688ea 100644 --- a/reactos/dll/win32/gdi32/objects/text.c +++ b/reactos/dll/win32/gdi32/objects/text.c @@ -274,6 +274,34 @@ GetTextExtentPoint32W( return NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize); } +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentExPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + int nMaxExtent, + LPINT lpnFit, + LPINT alpDx, + LPSIZE lpSize) +{ + return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1); +} + +/* + * @implemented + */ +BOOL +STDCALL +GetTextExtentPointI(HDC hdc, + LPWORD pgiIn, + int cgi, + LPSIZE lpSize) +{ + return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2); +} /* * @implemented