Alexandre Julliard : gdiplus/tests: Use the global wine_dbgstr_w instead of a local variant.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed Aug 19 13:36:22 2009 +0200

gdiplus/tests: Use the global wine_dbgstr_w instead of a local variant.

---

dlls/gdiplus/tests/font.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c
index 0da5b2f..9b0ab16 100644
--- a/dlls/gdiplus/tests/font.c
+++ b/dlls/gdiplus/tests/font.c
@@ -31,14 +31,6 @@ static const WCHAR MicrosoftSansSerif[] = {'M','i','c','r','o','s','o','f','t','
 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 char *debugstr_w(LPCWSTR str)
-{
-   static char buf[1024];
-   WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL);
-   return buf;
-}
-
-
 static void test_createfont(void)
 {
     GpFontFamily* fontfamily = NULL, *fontfamily2;
@@ -71,7 +63,7 @@ static void test_createfont(void)
     stat = GdipGetFamilyName(fontfamily2, familyname, 0);
     expect(Ok, stat);
     ok (lstrcmpiW(arial, familyname) == 0, "Expected arial, got %s\n",
-            debugstr_w(familyname));
+            wine_dbgstr_w(familyname));
     stat = GdipDeleteFontFamily(fontfamily2);
     expect(Ok, stat);

@@ -305,7 +297,7 @@ static void test_getgenerics (void)
     ok ((lstrcmpiW(familyName, MicrosoftSansSerif) == 0) ||
         (lstrcmpiW(familyName,MSSansSerif) == 0),
         "Expected Microsoft Sans Serif or MS Sans Serif, got %s\n",
-        debugstr_w(familyName));
+        wine_dbgstr_w(familyName));
     stat = GdipDeleteFontFamily (family);
     expect (Ok, stat);

@@ -320,7 +312,7 @@ serif:
     stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
     expect (Ok, stat);
     ok (lstrcmpiW(familyName, TimesNewRoman) == 0,
-        "Expected Times New Roman, got %s\n", debugstr_w(familyName));
+        "Expected Times New Roman, got %s\n", wine_dbgstr_w(familyName));
     stat = GdipDeleteFontFamily (family);
     expect (Ok, stat);

@@ -335,7 +327,7 @@ monospace:
     stat = GdipGetFamilyName (family, familyName, LANG_NEUTRAL);
     expect (Ok, stat);
     ok (lstrcmpiW(familyName, CourierNew) == 0,
-        "Expected Courier New, got %s\n", debugstr_w(familyName));
+        "Expected Courier New, got %s\n", wine_dbgstr_w(familyName));
     stat = GdipDeleteFontFamily (family);
     expect (Ok, stat);
 }