Alexandre Julliard : gdiplus/tests: Don' t fail if we do find Microsoft Sans Serif on Wine.

Alexandre Julliard julliard at winehq.org
Thu Jul 1 11:19:32 CDT 2010


Module: wine
Branch: master
Commit: 415bb3c5a0a16c9794b7b206302632629f72adfb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=415bb3c5a0a16c9794b7b206302632629f72adfb

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Jul  1 12:06:35 2010 +0200

gdiplus/tests: Don't fail if we do find Microsoft Sans Serif on Wine.

---

 dlls/gdiplus/tests/font.c |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 80f11bc..c2ed3c7 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -33,6 +33,7 @@ static const WCHAR MSSansSerif[] = {'M','S',' ','S','a','n','s',' ','S','e','r',
 static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t',' ','S','a','n','s',' ','S','e','r','i','f','\0'};
 static const WCHAR TimesNewRoman[] = {'T','i','m','e','s',' ','N','e','w',' ','R','o','m','a','n','\0'};
 static const WCHAR CourierNew[] = {'C','o','u','r','i','e','r',' ','N','e','w','\0'};
+static const WCHAR Tahoma[] = {'T','a','h','o','m','a',0};
 
 static void test_createfont(void)
 {
@@ -295,9 +296,12 @@ static void test_getgenerics (void)
     expect (Ok, stat);
     stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
     expect (Ok, stat);
-    todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0),
-        "Expected Microsoft Sans Serif, got %s\n",
-        wine_dbgstr_w(familyName));
+    if (!lstrcmpiW(familyName, Tahoma))
+        todo_wine ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0),
+                      "Expected Microsoft Sans Serif, got Tahoma\n");
+    else
+        ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0),
+            "Expected Microsoft Sans Serif, got %s\n", wine_dbgstr_w(familyName));
     stat = GdipDeleteFontFamily (family);
     expect (Ok, stat);
 




More information about the wine-cvs mailing list