Skip to content

W
wine-winehq
Commit 227fc26e authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

gdi32: Use the correct physdev for each driver call (Coverity).

parent dabde6a0
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 2 deletions
dlls/gdi32/font.c
View file @ 227fc26e
...@@ -312,7 +312,7 @@ static UINT get_default_smoothing( HKEY key ) ...@@ -312,7 +312,7 @@ static UINT get_default_smoothing( HKEY key )
static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SIZE *size ) static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SIZE *size )
{ {
TEXTMETRICW tm; TEXTMETRICW tm;
PHYSDEV dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); PHYSDEV dev;
size->cx = size->cy = 0; size->cx = size->cy = 0;
if (!count) return TRUE; if (!count) return TRUE;
...@@ -320,6 +320,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI ...@@ -320,6 +320,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI
dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev = GET_DC_PHYSDEV( dc, pGetTextMetrics );
dev->funcs->pGetTextMetrics( dev, &tm ); dev->funcs->pGetTextMetrics( dev, &tm );
dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint );
if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, dx )) return FALSE; if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, dx )) return FALSE;
if (dc->breakExtra || dc->breakRem) if (dc->breakExtra || dc->breakRem)
...@@ -349,7 +350,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI ...@@ -349,7 +350,7 @@ static BOOL get_char_positions( DC *dc, const WCHAR *str, INT count, INT *dx, SI
static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, INT *dx, SIZE *size ) static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, INT *dx, SIZE *size )
{ {
TEXTMETRICW tm; TEXTMETRICW tm;
PHYSDEV dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint ); PHYSDEV dev;
size->cx = size->cy = 0; size->cx = size->cy = 0;
if (!count) return TRUE; if (!count) return TRUE;
...@@ -357,6 +358,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count, ...@@ -357,6 +358,7 @@ static BOOL get_char_positions_indices( DC *dc, const WORD *indices, INT count,
dev = GET_DC_PHYSDEV( dc, pGetTextMetrics ); dev = GET_DC_PHYSDEV( dc, pGetTextMetrics );
dev->funcs->pGetTextMetrics( dev, &tm ); dev->funcs->pGetTextMetrics( dev, &tm );
dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint );
if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE; if (!dev->funcs->pGetTextExtentExPointI( dev, indices, count, dx )) return FALSE;
if (dc->breakExtra || dc->breakRem) if (dc->breakExtra || dc->breakRem)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment