gdi32: Move the release until after the final dc access.

Also only reselect the font if the graphics mode changes. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Move the release until after the final dc access.
d4d65e2d · Huw Davies · Alexandre Julliard · e1130cbb · d4d65e2d
Commit d4d65e2d authored Jul 29, 2016 by Huw Davies Committed by Alexandre Julliard Jul 29, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

dc.c dlls/gdi32/dc.c +2 -2

No files found.
--- a/dlls/gdi32/dc.c
+++ b/dlls/gdi32/dc.c
@@ -1037,9 +1037,9 @@ INT WINAPI SetGraphicsMode( HDC hdc, INT mode )
        ret = dc->GraphicsMode;
        dc->GraphicsMode = mode;
    }
-    release_dc_ptr( dc );
    /* font metrics depend on the graphics mode */
-    if (ret) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT));
+    if (ret != mode) SelectObject(dc->hSelf, GetCurrentObject(dc->hSelf, OBJ_FONT));
+    release_dc_ptr( dc );
    return ret;
 }