ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: The text extents functions fail if passed a negative count.

This commit is contained in:
Huw Davies 2011-10-11 15:46:19 +01:00 committed by Alexandre Julliard
parent 2b1c639fee
commit 5bd304bd0e
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dlls/gdi32/font.c
View File

@ -920,9 +920,14 @@ BOOL WINAPI GetTextExtentPoint32A( HDC hdc, LPCSTR str, INT count,
{
BOOL ret = FALSE;
INT wlen;
LPWSTR p = FONT_mbtowc(hdc, str, count, &wlen, NULL);
LPWSTR p;
if (p) {
if (count < 0) return FALSE;
p = FONT_mbtowc(hdc, str, count, &wlen, NULL);
if (p)
{
ret = GetTextExtentPoint32W( hdc, p, wlen, size );
HeapFree( GetProcessHeap(), 0, p );
}
@ -975,10 +980,15 @@ BOOL WINAPI GetTextExtentExPointI( HDC hdc, const WORD *indices, INT count, INT
LPINT nfit, LPINT dxs, LPSIZE size )
{
BOOL ret = FALSE;
DC * dc = get_dc_ptr( hdc );
DC *dc;
if (count < 0) return FALSE;
dc = get_dc_ptr( hdc );
if (!dc) return FALSE;
if(dc->gdiFont) {
if(dc->gdiFont)
{
ret = WineEngGetTextExtentExPointI(dc->gdiFont, indices, count, max_ext, nfit, dxs, size);
size->cx = abs(INTERNAL_XDSTOWS(dc, size->cx));
size->cy = abs(INTERNAL_YDSTOWS(dc, size->cy));
@ -1051,11 +1061,15 @@ BOOL WINAPI GetTextExtentExPointA( HDC hdc, LPCSTR str, INT count,
INT wlen;
INT *walpDx = NULL;
LPWSTR p = NULL;
if (alpDx &&
NULL == (walpDx = HeapAlloc(GetProcessHeap(), 0, count * sizeof(INT))))
return FALSE;
if (count < 0) return FALSE;
if (alpDx)
{
walpDx = HeapAlloc( GetProcessHeap(), 0, count * sizeof(INT) );
if (!walpDx) return FALSE;
}
p = FONT_mbtowc(hdc, str, count, &wlen, NULL);
ret = GetTextExtentExPointW( hdc, p, wlen, maxExt, lpnFit, walpDx, size);
if (walpDx)
@ -1118,9 +1132,10 @@ BOOL WINAPI GetTextExtentExPointW( HDC hdc, LPCWSTR str, INT count,
TRACE("(%p, %s, %d)\n",hdc,debugstr_wn(str,count),maxExt);
if (count < 0) return FALSE;
dc = get_dc_ptr(hdc);
if (! dc)
return FALSE;
if (!dc) return FALSE;
GetTextMetricsW(hdc, &tm);

9
dlls/gdi32/tests/font.c
View File

@ -1054,6 +1054,7 @@ static void test_text_extents(void)
HFONT hfont;
SIZE sz;
SIZE sz1, sz2;
BOOL ret;
memset(&lf, 0, sizeof(lf));
strcpy(lf.lfFaceName, "Arial");
@ -1110,6 +1111,14 @@ static void test_text_extents(void)
"GetTextExtentExPointW with lpnFit and alpDx both NULL returns incorrect results\n");
HeapFree(GetProcessHeap(), 0, extents);
/* extents functions fail with -ve counts (the interesting case being -1) */
ret = GetTextExtentPointA(hdc, "o", -1, &sz);
ok(ret == FALSE, "got %d\n", ret);
ret = GetTextExtentExPointA(hdc, "o", -1, 0, NULL, NULL, &sz);
ok(ret == FALSE, "got %d\n", ret);
ret = GetTextExtentExPointW(hdc, wt, -1, 0, NULL, NULL, &sz1);
ok(ret == FALSE, "got %d\n", ret);
hfont = SelectObject(hdc, hfont);
DeleteObject(hfont);
ReleaseDC(NULL, hdc);