Alexandre Julliard : hlink/tests: Use the global wine_dbgstr_w instead of a local variant.
Alexandre Julliard
julliard at winehq.org
Wed Aug 19 11:32:11 CDT 2009
Module: wine
Branch: master
Commit: f3664e9bc39bfb7f766a574e05d5afa543417145
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3664e9bc39bfb7f766a574e05d5afa543417145
Author: Alexandre Julliard <julliard at winehq.org>
Date: Wed Aug 19 13:36:27 2009 +0200
hlink/tests: Use the global wine_dbgstr_w instead of a local variant.
---
dlls/hlink/tests/hlink.c | 17 ++++-------------
1 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c
index 6981942..9e920d9 100644
--- a/dlls/hlink/tests/hlink.c
+++ b/dlls/hlink/tests/hlink.c
@@ -57,15 +57,6 @@ DEFINE_EXPECT(IsSystemMoniker);
DEFINE_EXPECT(BindToStorage);
DEFINE_EXPECT(GetDisplayName);
-static const char *debugstr_w(LPCWSTR str)
-{
- static char buf[1024];
- if(!str)
- return "(null)";
- WideCharToMultiByte(CP_ACP, 0, str, -1, buf, sizeof(buf), NULL, NULL);
- return buf;
-}
-
static const char *debugstr_guid(REFIID riid)
{
static char buf[50];
@@ -597,13 +588,13 @@ static void test_HlinkCreateExtensionServices(void)
hres = IHttpNegotiate_BeginningTransaction(http_negotiate, (void*)0xdeadbeef, (void*)0xdeadbeef,
0, &headers);
ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres);
- ok(!lstrcmpW(headers, headersexW), "unexpected headers \"%s\"\n", debugstr_w(headers));
+ ok(!lstrcmpW(headers, headersexW), "unexpected headers %s\n", wine_dbgstr_w(headers));
CoTaskMemFree(headers);
headers = (void*)0xdeadbeef;
hres = IHttpNegotiate_OnResponse(http_negotiate, 200, (void*)0xdeadbeef, (void*)0xdeadbeef, &headers);
ok(hres == S_OK, "OnResponse failed: %08x\n", hres);
- ok(headers == NULL, "unexpected headers \"%s\"\n", debugstr_w(headers));
+ ok(headers == NULL, "unexpected headers %s\n", wine_dbgstr_w(headers));
IHttpNegotiate_Release(http_negotiate);
IAuthenticate_Release(authenticate);
@@ -635,7 +626,7 @@ static void test_HlinkParseDisplayName(void)
hres = IMoniker_GetDisplayName(mon, bctx, 0, &name);
ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres);
- ok(!lstrcmpW(name, winehq_urlW), "wrong display name %s\n", debugstr_w(name));
+ ok(!lstrcmpW(name, winehq_urlW), "wrong display name %s\n", wine_dbgstr_w(name));
CoTaskMemFree(name);
hres = IMoniker_IsSystemMoniker(mon, &issys);
@@ -662,7 +653,7 @@ static void test_HlinkParseDisplayName(void)
hres = IMoniker_GetDisplayName(mon, bctx, 0, &name);
ok(hres == S_OK, "GetDiasplayName failed: %08x\n", hres);
- ok(!lstrcmpW(name, invalid_urlW), "wrong display name %s\n", debugstr_w(name));
+ ok(!lstrcmpW(name, invalid_urlW), "wrong display name %s\n", wine_dbgstr_w(name));
CoTaskMemFree(name);
hres = IMoniker_IsSystemMoniker(mon, &issys);
More information about the wine-cvs
mailing list