[ros-diffs] [tkreuzer] 27892: Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change parameter names in GetTextFaceW. Update ntgdibad.h

Author: tkreuzer
Date: Fri Jul 27 03:02:47 2007
New Revision: 27892

URL: http://svn.reactos.org/svn/reactos?rev=27892&view=rev
Log:
Rename NtGdiGettextFace into NtGdiGetTextFaceW and add bAliasName parameter. Change parameter names in GetTextFaceW. Update ntgdibad.h

Modified:
    trunk/reactos/dll/win32/gdi32/objects/text.c
    trunk/reactos/include/reactos/win32k/ntgdibad.h
    trunk/reactos/subsystems/win32/win32k/objects/text.c
    trunk/reactos/tools/nci/w32ksvc.db

Modified: trunk/reactos/dll/win32/gdi32/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/objects/tex...
==============================================================================
--- trunk/reactos/dll/win32/gdi32/objects/text.c (original)
+++ trunk/reactos/dll/win32/gdi32/objects/text.c Fri Jul 27 03:02:47 2007
@@ -308,12 +308,12 @@
 int
 STDCALL
 GetTextFaceW(
-	HDC	a0,
-	int	a1,
-	LPWSTR	a2
-	)
-{
-	return NtGdiGetTextFace(a0, a1, a2);
+	HDC	hDC,
+	int	nCount,
+	LPWSTR	lpFaceName
+	)
+{
+	return NtGdiGetTextFaceW(hDC, nCount, lpFaceName, FALSE);
 }

Modified: trunk/reactos/include/reactos/win32k/ntgdibad.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntgd...
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntgdibad.h (original)
+++ trunk/reactos/include/reactos/win32k/ntgdibad.h Fri Jul 27 03:02:47 2007
@@ -605,13 +605,6 @@
 /* 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

Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/obj...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Fri Jul 27 03:02:47 2007
@@ -3648,13 +3648,22 @@
   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)

Modified: trunk/reactos/tools/nci/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/w32ksvc.db?rev=27...
==============================================================================
--- trunk/reactos/tools/nci/w32ksvc.db (original)
+++ trunk/reactos/tools/nci/w32ksvc.db Fri Jul 27 03:02:47 2007
@@ -152,7 +152,7 @@
 NtGdiGetTextExtentExW		8
 NtGdiGetTextExtent		5
 NtGdiGetTextExtentPoint32		4
-NtGdiGetTextFace			3
+NtGdiGetTextFaceW			4
 NtGdiGetTextMetrics			2
 NtGdiGetViewportExtEx			2
 NtGdiGetViewportOrgEx			2