#include "precomp.h"
-
/*
* @implemented
*/
BOOL
-STDCALL
+WINAPI
TextOutA(
HDC hdc,
int nXStart,
int nYStart,
LPCSTR lpString,
- int cbString)
+ int cchString)
{
ANSI_STRING StringA;
UNICODE_STRING StringU;
} else
StringU.Buffer = NULL;
- ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cbString);
+ ret = TextOutW(hdc, nXStart, nYStart, StringU.Buffer, cchString);
RtlFreeUnicodeString(&StringU);
return ret;
}
* @implemented
*/
BOOL
-STDCALL
+WINAPI
TextOutW(
HDC hdc,
int nXStart,
int nYStart,
LPCWSTR lpString,
- int cbString)
+ int cchString)
{
- return NtGdiExtTextOut(hdc, nXStart, nYStart, 0, NULL, lpString, cbString, NULL);
+ return NtGdiExtTextOutW(hdc, nXStart, nYStart, 0, NULL, (LPWSTR)lpString, cchString, NULL, 0);
}
* @implemented
*/
DWORD
-STDCALL
+WINAPI
GdiGetCodePage(HDC hdc)
{
PDC_ATTR Dc_Attr;
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return 0;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
if (Dc_Attr->ulDirty_ & DIRTY_CHARSET) return LOWORD(NtGdiGetCharSet(hdc));
return LOWORD(Dc_Attr->iCS_CP);
}
* @unimplemented
*/
int
-STDCALL
+WINAPI
GetTextCharacterExtra(
HDC hDc
)
{
PDC_ATTR Dc_Attr;
- if (!GdiGetHandleUserData((HGDIOBJ) hDc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hDc) != GDI_OBJECT_TYPE_DC)) return 0;
+ if (!GdiGetHandleUserData((HGDIOBJ) hDc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
return Dc_Attr->lTextExtra;
// return GetDCDWord( hDc, GdiGetTextCharExtra, 0);
}
* @implemented
*/
int
-STDCALL
+WINAPI
GetTextCharset(HDC hdc)
{
/* MSDN docs say this is equivalent */
-
/*
* @implemented
*/
BOOL
-STDCALL
+WINAPI
GetTextMetricsA(
HDC hdc,
LPTEXTMETRICA lptm
return FALSE;
}
- return TextMetricW2A(lptm, &tmwi.TextMetric);
+ FONT_TextMetricWToA(&tmwi.TextMetric, lptm);
+ return TRUE;
}
* @implemented
*/
BOOL
-STDCALL
+WINAPI
GetTextMetricsW(
HDC hdc,
LPTEXTMETRICW lptm
GetTextExtentPointA(
HDC hdc,
LPCSTR lpString,
- int cbString,
+ int cchString,
LPSIZE lpSize
)
{
RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = GetTextExtentPointW(hdc, StringU.Buffer, cbString, lpSize);
+ ret = GetTextExtentPointW(hdc, StringU.Buffer, cchString, lpSize);
RtlFreeUnicodeString(&StringU);
GetTextExtentPointW(
HDC hdc,
LPCWSTR lpString,
- int cbString,
+ int cchString,
LPSIZE lpSize
)
{
- return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cbString, lpSize, 0);
+ return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 1);
}
BOOL
APIENTRY
GetTextExtentExPointW(
- HDC hdc,
- LPCWSTR lpszStr,
- int cchString,
- int nMaxExtent,
- LPINT lpnFit,
- LPINT alpDx,
- LPSIZE lpSize
+ HDC hdc,
+ LPCWSTR lpszStr,
+ int cchString,
+ int nMaxExtent,
+ LPINT lpnFit,
+ LPINT alpDx,
+ LPSIZE lpSize
)
{
+
+ if(nMaxExtent < -1)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
return NtGdiGetTextExtentExW (
hdc, (LPWSTR)lpszStr, cchString, nMaxExtent, (PULONG)lpnFit, (PULONG)alpDx, lpSize, 0 );
}
LPWSTR lpszStrW;
BOOL rc = 0;
+ if(nMaxExtent < -1)
+ {
+ SetLastError(ERROR_INVALID_PARAMETER);
+ return FALSE;
+ }
+
Status = HEAP_strdupA2W ( &lpszStrW, lpszStr );
if (!NT_SUCCESS (Status))
SetLastError (RtlNtStatusToDosError(Status));
GetTextExtentPoint32A(
HDC hdc,
LPCSTR lpString,
- int cbString,
+ int cchString,
LPSIZE lpSize
)
{
RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cbString, lpSize);
+ ret = GetTextExtentPoint32W(hdc, StringU.Buffer, cchString, lpSize);
RtlFreeUnicodeString(&StringU);
GetTextExtentPoint32W(
HDC hdc,
LPCWSTR lpString,
- int cbString,
+ int cchString,
LPSIZE lpSize
)
{
- return NtGdiGetTextExtentPoint32(hdc, lpString, cbString, lpSize);
+ return NtGdiGetTextExtent(hdc, (LPWSTR)lpString, cchString, lpSize, 0);
}
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
+GetTextExtentExPointI(HDC hdc,
+ LPWORD pgiIn,
+ int cgi,
+ int nMaxExtent,
+ LPINT lpnFit,
+ LPINT alpDx,
+ LPSIZE lpSize)
+{
+ return NtGdiGetTextExtentExW(hdc,pgiIn,cgi,nMaxExtent,(ULONG *)lpnFit, (PULONG) alpDx,lpSize,1);
+}
/*
* @implemented
*/
BOOL
-STDCALL
+WINAPI
+GetTextExtentPointI(HDC hdc,
+ LPWORD pgiIn,
+ int cgi,
+ LPSIZE lpSize)
+{
+ return NtGdiGetTextExtent(hdc,pgiIn,cgi,lpSize,2);
+}
+
+/*
+ * @implemented
+ */
+BOOL
+WINAPI
ExtTextOutA(
HDC hdc,
int X,
UINT fuOptions,
CONST RECT *lprc,
LPCSTR lpString,
- UINT cbCount,
+ UINT cchString,
CONST INT *lpDx
)
{
RtlInitAnsiString(&StringA, (LPSTR)lpString);
RtlAnsiStringToUnicodeString(&StringU, &StringA, TRUE);
- ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cbCount, lpDx);
+ ret = ExtTextOutW(hdc, X, Y, fuOptions, lprc, StringU.Buffer, cchString, lpDx);
RtlFreeUnicodeString(&StringU);
* @implemented
*/
BOOL
-STDCALL
+WINAPI
ExtTextOutW(
HDC hdc,
int X,
UINT fuOptions,
CONST RECT *lprc,
LPCWSTR lpString,
- UINT cbCount,
+ UINT cchString,
CONST INT *lpDx
)
{
- return NtGdiExtTextOut(hdc, X, Y, fuOptions, lprc, lpString, cbCount, lpDx);
+ return NtGdiExtTextOutW(hdc, X, Y, fuOptions, (LPRECT)lprc, (LPWSTR)lpString, cchString, (LPINT)lpDx, 0);
}
* @implemented
*/
INT
-STDCALL
+WINAPI
GetTextFaceW(HDC hDC,
- int nCount,
- LPWSTR lpFaceName)
+ INT nCount,
+ PWSTR pFaceName)
{
- INT retValue = 0;
- if ((!lpFaceName) || (nCount))
- {
- retValue = NtGdiGetTextFaceW(hDC,nCount,lpFaceName,0);
- }
- else
+ /* Validate parameters */
+ if (pFaceName && nCount <= 0)
{
- SetLastError(ERROR_INVALID_PARAMETER);
+ /* Set last error and return failure */
+ GdiSetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
}
- return retValue;
+
+ /* Forward to kernel */
+ return NtGdiGetTextFaceW(hDC, nCount, pFaceName, FALSE);
}
* @implemented
*/
int
-STDCALL
+WINAPI
GetTextFaceA( HDC hdc, INT count, LPSTR name )
{
- INT res = GetTextFaceW(hdc, 0, NULL);
- LPWSTR nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 );
+ INT res;
+ LPWSTR nameW;
+
+ /* Validate parameters */
+ if (name && count <= 0)
+ {
+ /* Set last error and return failure */
+ GdiSetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+
+ res = GetTextFaceW(hdc, 0, NULL);
+ nameW = HeapAlloc( GetProcessHeap(), 0, res * 2 );
+ if (nameW == NULL)
+ {
+ return 0;
+ }
GetTextFaceW( hdc, res, nameW );
if (name)
return res;
}
+
+/*
+ * @implemented
+ */
+INT
+WINAPI
+GetTextFaceAliasW(HDC hdc,
+ int cChar,
+ LPWSTR pszOut)
+{
+ if ( pszOut && !cChar )
+ {
+ GdiSetLastError(ERROR_INVALID_PARAMETER);
+ return 0;
+ }
+ return NtGdiGetTextFaceW(hdc,cChar,pszOut,TRUE);
+}
+
+
BOOL
-STDCALL
+WINAPI
GetFontResourceInfoW(
LPCWSTR lpFileName,
DWORD *pdwBufSize,
bRet = NtGdiGetFontResourceInfoInternalW(
NtFileName.Buffer,
- NtFileName.Length,
+ (NtFileName.Length / sizeof(WCHAR)) + 1,
1,
*pdwBufSize,
pdwBufSize,
* @unimplemented
*/
int
-STDCALL
+WINAPI
SetTextCharacterExtra(
HDC hDC,
int CharExtra
return MFDRV_SetTextCharacterExtra( hDC, CharExtra ); // Wine port.
}
#endif
- if (!GdiGetHandleUserData((HGDIOBJ) hDC, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hDC) != GDI_OBJECT_TYPE_DC)) return cExtra;
+ if (!GdiGetHandleUserData((HGDIOBJ) hDC, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return cExtra;
- if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hDC)
+ if (NtCurrentTeb()->GdiTebBatch.HDC == hDC)
{
if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY)
{
*
*/
UINT
-STDCALL
+WINAPI
GetTextAlign(HDC hdc)
{
PDC_ATTR Dc_Attr;
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return 0;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
return Dc_Attr->lTextAlign;
}
*
*/
COLORREF
-STDCALL
+WINAPI
GetTextColor(HDC hdc)
{
PDC_ATTR Dc_Attr;
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return 0;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return 0;
return Dc_Attr->ulForegroundClr;
}
* @unimplemented
*/
UINT
-STDCALL
+WINAPI
SetTextAlign(HDC hdc,
UINT fMode)
{
}
}
#endif
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return OldMode;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldMode;
OldMode = Dc_Attr->lTextAlign;
Dc_Attr->lTextAlign = fMode; // Raw
* @implemented
*/
COLORREF
-STDCALL
+WINAPI
SetTextColor(
HDC hdc,
COLORREF crColor
}
}
#endif
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return OldColor;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return OldColor;
OldColor = (COLORREF) Dc_Attr->ulForegroundClr;
Dc_Attr->ulForegroundClr = (ULONG) crColor;
if ( Dc_Attr->crForegroundClr != crColor )
{
- Dc_Attr->ulDirty_ |= DIRTY_TEXT;
+ Dc_Attr->ulDirty_ |= (DIRTY_TEXT|DIRTY_LINE|DIRTY_FILL);
Dc_Attr->crForegroundClr = crColor;
}
return OldColor;
* @implemented
*/
BOOL
-STDCALL
+WINAPI
SetTextJustification(
HDC hdc,
int extra,
return FALSE;
}
#endif
- if (!GdiGetHandleUserData((HGDIOBJ) hdc, (PVOID) &Dc_Attr) ||
- (GDI_HANDLE_GET_TYPE(hdc) != GDI_OBJECT_TYPE_DC)) return FALSE;
+ if (!GdiGetHandleUserData((HGDIOBJ) hdc, GDI_OBJECT_TYPE_DC, (PVOID) &Dc_Attr)) return FALSE;
- if (NtCurrentTeb()->GdiTebBatch.HDC == (ULONG)hdc)
+ if (NtCurrentTeb()->GdiTebBatch.HDC == hdc)
{
if (Dc_Attr->ulDirty_ & DC_FONTTEXT_DIRTY)
{
Dc_Attr->lBreakExtra = extra;
return TRUE;
}
-
-
projects / reactos.git / blobdiff