[ros-diffs] [jimtabor] 36780: Move GetTextFaceAliasW to text.c.

Author: jimtabor
Date: Thu Oct 16 23:34:21 2008
New Revision: 36780

URL: http://svn.reactos.org/svn/reactos?rev=36780&view=rev
Log:
Move GetTextFaceAliasW to text.c.

Modified:
    trunk/reactos/dll/win32/gdi32/misc/misc.c
    trunk/reactos/dll/win32/gdi32/misc/stubs.c
    trunk/reactos/dll/win32/gdi32/objects/text.c

Modified: trunk/reactos/dll/win32/gdi32/misc/misc.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/misc.c...
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/misc/misc.c [iso-8859-1] Thu Oct 16 23:34:21 2008
@@ -224,7 +224,7 @@
 STDCALL
 GdiSetLastError(DWORD dwErrCode)
 {
-    NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode;
+    NtCurrentTeb()->LastErrorValue = (ULONG) dwErrCode;
 }

BOOL

Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs....
==============================================================================
--- trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/misc/stubs.c [iso-8859-1] Thu Oct 16 23:34:21 2008
@@ -1237,27 +1237,6 @@
                          LPSIZE psize)
 {
     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;
 }

/*

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 [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/gdi32/objects/text.c [iso-8859-1] Thu Oct 16 23:34:21 2008
@@ -363,18 +363,12 @@
              INT nCount,
              PWSTR pFaceName)
 {
-    INT retValue;
-
     if (pFaceName && nCount <= 0)
     {
-        retValue = 0;
-    }
-    else
-    {
-        retValue = NtGdiGetTextFaceW(hDC, nCount, pFaceName, 0);
-    }
-
-    return retValue;
+        // GdiSetLastError(ERROR_INVALID_PARAMETER);
+        return 0;
+    }
+    return NtGdiGetTextFaceW(hDC, nCount, pFaceName, FALSE);
 }

@@ -400,6 +394,25 @@
     HeapFree( GetProcessHeap(), 0, nameW );
     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