[PATCH] gdi32: Add MS Shell Dlg tests

Alex Henrie alexhenrie24 at gmail.com
Sun May 11 23:05:12 CDT 2014


I don't think I can fix Wine, but Bruno suggested that I submit the new
test cases anyway.

Please double-check that I used todo_wine correctly.
---
 dlls/gdi32/tests/font.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 255771a..0e75088 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -4681,6 +4681,7 @@ static void test_EnumFonts(void)
     int ret;
     LOGFONTA lf;
     HDC hdc;
+    struct enum_fullname_data efnd;
 
     if (!is_truetype_font_installed("Arial"))
     {
@@ -4741,6 +4742,28 @@ static void test_EnumFonts(void)
     ret = EnumFontFamiliesA(hdc, NULL, enum_all_fonts_proc, (LPARAM)&lf);
     ok(ret, "font Arial Italic Bold should not be enumerated\n");
 
+    /* MS Shell Dlg and MS Shell Dlg 2 must exist */
+    memset(&lf, 0, sizeof(lf));
+    lf.lfCharSet = DEFAULT_CHARSET;
+
+    memset(&efnd, 0, sizeof(efnd));
+    strcpy(lf.lfFaceName, "MS Shell Dlg");
+    ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0);
+    ok(ret, "font MS Shell Dlg is not enumerated\n");
+    ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg");
+    todo_wine ok(!ret, "expected MS Shell Dlg got %s\n", efnd.elf[0].elfLogFont.lfFaceName);
+    ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg");
+    ok(ret, "did not expect MS Shell Dlg\n");
+
+    memset(&efnd, 0, sizeof(efnd));
+    strcpy(lf.lfFaceName, "MS Shell Dlg 2");
+    ret = EnumFontFamiliesExA(hdc, &lf, enum_fullname_data_proc, (LPARAM)&efnd, 0);
+    ok(ret, "font MS Shell Dlg 2 is not enumerated\n");
+    ret = strcmp((char*)efnd.elf[0].elfLogFont.lfFaceName, "MS Shell Dlg 2");
+    todo_wine ok(!ret, "expected MS Shell Dlg 2 got %s\n", efnd.elf[0].elfLogFont.lfFaceName);
+    ret = strcmp((char*)efnd.elf[0].elfFullName, "MS Shell Dlg 2");
+    ok(ret, "did not expect MS Shell Dlg 2\n");
+
     DeleteDC(hdc);
 }
 
-- 
1.9.1



More information about the wine-patches mailing list