usp10/tests: Also restore the previous font when the finger print matches in…

usp10/tests: Also restore the previous font when the finger print matches in _find_font_for_range(). Otherwise the subsequent SelectObject() call will set *origFont to *hfont. Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

usp10/tests: Also restore the previous font when the finger print matches in…
77c74752 · Henri Verbeet · Alexandre Julliard · 6ca15e9c · 77c74752
Commit 77c74752 authored Feb 18, 2018 by Henri Verbeet Committed by Alexandre Julliard Feb 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

usp10.c dlls/usp10/tests/usp10.c +3 -1

No files found.
--- a/dlls/usp10/tests/usp10.c
+++ b/dlls/usp10/tests/usp10.c
@@ -1289,11 +1289,12 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co
            if (*hfont)
            {
                winetest_trace("using font %s\n",lParam.lf.lfFaceName);
-                *origFont = SelectObject(hdc,*hfont);
                if (fingerprint)
                {
                    WORD output[10];
                    int i;
+
+                    *origFont = SelectObject(hdc,*hfont);
                    if (GetGlyphIndicesW(hdc, fingerprint->check, 10, output, 0) != GDI_ERROR)
                    {
                        for (i=0; i < 10; i++)
@@ -1307,6 +1308,7 @@ static int _find_font_for_range(HDC hdc, const CHAR *recommended, BYTE range, co
                            }
                        if (i == 10) rc = 1;
                    }
+                    SelectObject(hdc, *origFont);
                }
                else rc = 1;
            }