From bc4ca08f949c54a3e19e3eee15709b256b531812 Mon Sep 17 00:00:00 2001
From: James Tabor <james.tabor@reactos.org>
Date: Fri, 17 Oct 2008 04:34:21 +0000
Subject: [PATCH] Move GetTextFaceAliasW to text.c.

svn path=/trunk/; revision=36780
---
 reactos/dll/win32/gdi32/misc/misc.c    |  2 +-
 reactos/dll/win32/gdi32/misc/stubs.c   | 21 -----------------
 reactos/dll/win32/gdi32/objects/text.c | 31 ++++++++++++++++++--------
 3 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/reactos/dll/win32/gdi32/misc/misc.c b/reactos/dll/win32/gdi32/misc/misc.c
index 293d0fc01a4..ba1ee649a86 100644
--- a/reactos/dll/win32/gdi32/misc/misc.c
+++ b/reactos/dll/win32/gdi32/misc/misc.c
@@ -224,7 +224,7 @@ VOID
 STDCALL
 GdiSetLastError(DWORD dwErrCode)
 {
-    NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode;
+    NtCurrentTeb()->LastErrorValue = (ULONG) dwErrCode;
 }
 
 BOOL
diff --git a/reactos/dll/win32/gdi32/misc/stubs.c b/reactos/dll/win32/gdi32/misc/stubs.c
index d8766ae4c4b..32062ebd9fb 100644
--- a/reactos/dll/win32/gdi32/misc/stubs.c
+++ b/reactos/dll/win32/gdi32/misc/stubs.c
@@ -1239,27 +1239,6 @@ GetTextExtentExPointWPri(HDC hdc,
     return NtGdiGetTextExtentExW(hdc,lpwsz,cwc,dxMax,pcCh,pdxOut,psize,0);
 }
 
-/*
- * @implemented
- */
-INT
-STDCALL
-GetTextFaceAliasW(HDC hdc,
-                  int cChar,
-                  LPWSTR pszOut)
-{
-    INT retValue = 0;
-    if ((!pszOut) || (cChar))
-    {
-        retValue = NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE);
-    }
-    else
-    {
-        SetLastError(ERROR_INVALID_PARAMETER);
-    }
-    return retValue;
-}
-
 /*
  * @unimplemented
  */
diff --git a/reactos/dll/win32/gdi32/objects/text.c b/reactos/dll/win32/gdi32/objects/text.c
index b757829f2d8..9edc9531434 100644
--- a/reactos/dll/win32/gdi32/objects/text.c
+++ b/reactos/dll/win32/gdi32/objects/text.c
@@ -363,18 +363,12 @@ GetTextFaceW(HDC hDC,
              INT nCount,
              PWSTR pFaceName)
 {
-    INT retValue;
-
     if (pFaceName && nCount <= 0)
     {
-        retValue = 0;
+        // GdiSetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
     }
-    else
-    {
-        retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0);
-    }
-
-    return retValue;
+    return NtGdiGetTextFaceW(hDC, nCount, pFaceName, FALSE);
 }
 
 
@@ -401,6 +395,25 @@ GetTextFaceA( HDC hdc, INT count, LPSTR name )
     return res;
 }
 
+
+/*
+ * @implemented
+ */
+INT
+STDCALL
+GetTextFaceAliasW(HDC hdc,
+                  int cChar,
+                  LPWSTR pszOut)
+{
+   if ( pszOut && !cChar )
+   {
+      GdiSetLastError(ERROR_INVALID_PARAMETER);
+      return 0;
+   }
+   return NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE);
+}
+
+
 BOOL
 STDCALL
 GetFontResourceInfoW(