[PATCH] gdi32: fixed another dev = GET_PC_PHYSDEV mixup (Coverity)

Marcus Meissner meissner at suse.de
Thu Dec 27 16:08:58 CST 2012


---
 dlls/gdi32/font.c |    3 ++-
 1 Datei geändert, 2 Zeilen hinzugefügt(+), 1 Zeile entfernt(-)

diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c
index 7169723..c6a6946 100644
--- a/dlls/gdi32/font.c
+++ b/dlls/gdi32/font.c
@@ -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 )
 {
     TEXTMETRICW tm;
-    PHYSDEV dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint );
+    PHYSDEV dev;
 
     size->cx = size->cy = 0;
     if (!count) return TRUE;
@@ -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->funcs->pGetTextMetrics( dev, &tm );
 
+    dev = GET_DC_PHYSDEV( dc, pGetTextExtentExPoint );
     if (!dev->funcs->pGetTextExtentExPoint( dev, str, count, dx )) return FALSE;
 
     if (dc->breakExtra || dc->breakRem)
-- 
1.7.10.4




More information about the wine-patches mailing list