Move GetTextFaceAliasW to text.c.

svn path=/trunk/; revision=36780
This commit is contained in:
James Tabor 2008-10-17 04:34:21 +00:00
parent 8c7bebfed8
commit bc4ca08f94
3 changed files with 23 additions and 31 deletions

View file

@ -224,7 +224,7 @@ VOID
STDCALL
GdiSetLastError(DWORD dwErrCode)
{
NtCurrentTeb ()->LastErrorValue = (ULONG) dwErrCode;
NtCurrentTeb()->LastErrorValue = (ULONG) dwErrCode;
}
BOOL

View file

@ -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
*/

View file

@ -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(