Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change...

svn path=/trunk/; revision=27892

diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index e4ad1cc..69833d7 100644 (file)
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/reactos/dll/win32/gdi32/objects/text.c
@@ -308,12 +308,12 @@ ExtTextOutW(
 int
 STDCALL
 GetTextFaceW(
-       HDC     a0,
-       int     a1,
-       LPWSTR  a2
+       HDC     hDC,
+       int     nCount,
+       LPWSTR  lpFaceName
        )
 {
-       return NtGdiGetTextFace(a0, a1, a2);
+       return NtGdiGetTextFaceW(hDC, nCount, lpFaceName, FALSE);
 }
 
 

diff --git a/reactos/include/reactos/win32k/ntgdibad.h b/reactos/include/reactos/win32k/ntgdibad.h
index 19f5f1b..e7ebe94 100644 (file)
--- a/reactos/include/reactos/win32k/ntgdibad.h
+++ b/reactos/include/reactos/win32k/ntgdibad.h
@@ -605,13 +605,6 @@ NtGdiGetTextCharset(HDC  hDC);
 /* Needs to be done in user-mode, using shared GDI Object Attributes. */
 COLORREF STDCALL  NtGdiGetTextColor(HDC  hDC);
 
-/* Rename to NtGdiGetTextFaceW, add FALSE at the end. */
-int
-STDCALL
-NtGdiGetTextFace(HDC  hDC,
-                     int  Count,
-                     LPWSTR  FaceName);
-
 /* Use NtGdiGetTextMetricsW with 0 at the end */
 BOOL
 STDCALL

diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
index c5e9793..1c6966b 100644 (file)
--- a/reactos/subsystems/win32/win32k/objects/text.c
+++ b/reactos/subsystems/win32/win32k/objects/text.c
@@ -3648,14 +3648,23 @@ NtGdiGetTextExtentPoint32(HDC hDC,
   return TRUE;
 }
 
-INT STDCALL
-NtGdiGetTextFace(HDC hDC, INT Count, LPWSTR FaceName)
+W32KAPI
+INT
+APIENTRY
+NtGdiGetTextFaceW(
+    IN HDC hDC,
+    IN INT Count,
+    OUT OPTIONAL LPWSTR FaceName,
+    IN BOOL bAliasName
+)
 {
    PDC Dc;
    HFONT hFont;
    PTEXTOBJ TextObj;
    NTSTATUS Status;
 
+   /* FIXME: Handle bAliasName */
+
    Dc = DC_LockDc(hDC);
    if (Dc == NULL)
    {

diff --git a/reactos/tools/nci/w32ksvc.db b/reactos/tools/nci/w32ksvc.db
index c410e9a..a761cea 100644 (file)
--- a/reactos/tools/nci/w32ksvc.db
+++ b/reactos/tools/nci/w32ksvc.db
@@ -152,7 +152,7 @@ NtGdiGetTextColor                   1
 NtGdiGetTextExtentExW          8
 NtGdiGetTextExtent             5
 NtGdiGetTextExtentPoint32              4
-NtGdiGetTextFace                       3
+NtGdiGetTextFaceW                      4
 NtGdiGetTextMetrics                    2
 NtGdiGetViewportExtEx                  2
 NtGdiGetViewportOrgEx                  2