diff --git a/reactos/include/win32k/ntgdibad.h b/reactos/include/win32k/ntgdibad.h index a2d22bb01e7..0148c2875b1 100644 --- a/reactos/include/win32k/ntgdibad.h +++ b/reactos/include/win32k/ntgdibad.h @@ -714,14 +714,6 @@ NtGdiGetTextExtentExPoint(HDC hDC, LPINT Dx, LPSIZE Size); -/* Rename to NtGdiGetTextExtent. Add 0 at the end. */ -BOOL -STDCALL -NtGdiGetTextExtentPoint(HDC hDC, - LPCWSTR String, - int Count, - LPSIZE Size); - /* Rename to NtGdiGetTextFaceW, add FALSE at the end. */ int STDCALL diff --git a/reactos/lib/gdi32/objects/text.c b/reactos/lib/gdi32/objects/text.c index b7b5e831a76..1844c44c6c8 100644 --- a/reactos/lib/gdi32/objects/text.c +++ b/reactos/lib/gdi32/objects/text.c @@ -155,7 +155,7 @@ GetTextExtentPointW( LPSIZE lpSize ) { - return NtGdiGetTextExtentPoint(hdc, lpString, cbString, lpSize); + return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0); } diff --git a/reactos/subsys/win32k/objects/text.c b/reactos/subsys/win32k/objects/text.c index fd2382622f4..ec6e5c760e5 100644 --- a/reactos/subsys/win32k/objects/text.c +++ b/reactos/subsys/win32k/objects/text.c @@ -2446,12 +2446,13 @@ NtGdiGetTextExtentExPoint(HDC hDC, BOOL STDCALL -NtGdiGetTextExtentPoint(HDC hDC, - LPCWSTR String, - int Count, - LPSIZE Size) +NtGdiGetTextExtent(HDC hdc, + LPWSTR lpwsz, + INT cwc, + LPSIZE psize, + UINT flOpts) { - return NtGdiGetTextExtentExPoint(hDC, String, Count, 0, NULL, NULL, Size); + return NtGdiGetTextExtentExPoint(hdc, lpwsz, cwc, 0, NULL, NULL, psize); } BOOL diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db index f8cb45e7011..246e22ecf36 100644 --- a/reactos/tools/nci/w32ksvc.db +++ b/reactos/tools/nci/w32ksvc.db @@ -159,7 +159,7 @@ NtGdiGetTextCharset 1 NtGdiGetTextCharsetInfo 3 NtGdiGetTextColor 1 NtGdiGetTextExtentExPoint 7 -NtGdiGetTextExtentPoint 4 +NtGdiGetTextExtent 5 NtGdiGetTextExtentPoint32 4 NtGdiGetTextFace 3 NtGdiGetTextMetrics 2