August 2009 - Wine-Commits - list.winehq.org

Alexandre Julliard : shdocvw/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 44e874ab863ea7335ac0e81dc52675ee0878f6d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44e874ab863ea7335ac0e81dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:37:00 2009 +0200 shdocvw/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/shdocvw/tests/webbrowser.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c index 131b29c..c9658a4 100644 --- a/dlls/shdocvw/tests/webbrowser.c +++ b/dlls/shdocvw/tests/webbrowser.c @@ -139,15 +139,6 @@ static IWebBrowser2 *wb; static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading = FALSE; -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]; @@ -174,7 +165,7 @@ static void _test_LocationURL(unsigned line, IUnknown *unk, LPCWSTR exurl) hres = IWebBrowser2_get_LocationURL(wb, &url); ok_(__FILE__,line) (hres == (*exurl ? S_OK : S_FALSE), "get_LocationURL failed: %08x\n", hres); - ok_(__FILE__,line) (!lstrcmpW(url, exurl), "unexpected URL: %s\n", debugstr_w(url)); + ok_(__FILE__,line) (!lstrcmpW(url, exurl), "unexpected URL: %s\n", wine_dbgstr_w(url)); SysFreeString(url); IWebBrowser2_Release(wb); @@ -496,7 +487,7 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const V_VT(V_VARIANTREF(url))); ok(V_BSTR(V_VARIANTREF(url)) != NULL, "V_BSTR(V_VARIANTREF(url)) == NULL\n"); ok(!lstrcmpW(V_BSTR(V_VARIANTREF(url)), about_blankW), "unexpected url %s\n", - debugstr_w(V_BSTR(V_VARIANTREF(url)))); + wine_dbgstr_w(V_BSTR(V_VARIANTREF(url)))); } ok(V_VT(flags) == (VT_BYREF|VT_VARIANT), "V_VT(flags)=%x, expected VT_BYREF|VT_VARIANT\n",

1 0

Alexandre Julliard : msxml3/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 2ce5dba4981bc37be05aa18e837b02c1af06e911 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2ce5dba4981bc37be05aa18e8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:55 2009 +0200 msxml3/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/msxml3/tests/saxreader.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 426fe36..dd0e42c 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -117,13 +117,6 @@ static content_handler_test contentHandlerTest2[] = { static content_handler_test *expectCall; static ISAXLocator *locator; -static const char *debugstr_wn(const WCHAR *szStr, int len) -{ - static char buf[1024]; - WideCharToMultiByte(CP_ACP, 0, szStr, len, buf, sizeof(buf), NULL, NULL); - return buf; -} - static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char *szTest) { WCHAR buf[1024]; @@ -142,7 +135,7 @@ static void test_saxstr(unsigned line, const WCHAR *szStr, int nStr, const char MultiByteToWideChar(CP_ACP, 0, szTest, -1, buf, sizeof(buf)/sizeof(WCHAR)); ok_(__FILE__,line) (!memcmp(szStr, buf, len*sizeof(WCHAR)), "unexpected szStr %s, expected %s\n", - debugstr_wn(szStr, nStr), szTest); + wine_dbgstr_wn(szStr, nStr), szTest); } static BOOL test_expect_call(CH id)

1 0

Alexandre Julliard : mstask/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: ef5864fcc08905ef7848a95312fea8403536e31e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef5864fcc08905ef7848a9531… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:50 2009 +0200 mstask/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/mstask/tests/task.c | 91 +++++++++++++++------------------------------- 1 files changed, 30 insertions(+), 61 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ef5864fcc08905ef7848a…

1 0

Alexandre Julliard : mshtml/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 86f9fce74cd35d5c42dc8da3fa7fa73c2fd4316f URL: http://source.winehq.org/git/wine.git/?a=commit;h=86f9fce74cd35d5c42dc8da3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:46 2009 +0200 mshtml/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/mshtml/tests/dom.c | 183 ++++++++++++++++++++---------------------- dlls/mshtml/tests/htmldoc.c | 17 +--- dlls/mshtml/tests/protocol.c | 9 +-- dlls/mshtml/tests/script.c | 11 +-- 4 files changed, 93 insertions(+), 127 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=86f9fce74cd35d5c42dc8…

1 0

Alexandre Julliard : mlang/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 89bf94c00d700954cf6c4e1486e43b863d684bf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89bf94c00d700954cf6c4e148… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:41 2009 +0200 mlang/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/mlang/tests/mlang.c | 42 ++---------------------------------------- 1 files changed, 2 insertions(+), 40 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 26e89a0..e29da39 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -282,44 +282,6 @@ static void mylstrcpyW(WCHAR* str1, const WCHAR* str2) *str1 = '\0'; } -#define DEBUGSTR_W_MAXLEN 64 - -static CHAR * debugstr_w(const WCHAR * strW) -{ - static CHAR buffers[DEBUGSTR_W_MAXLEN * 2]; - static DWORD pos = 0; - CHAR * strA; - DWORD len = DEBUGSTR_W_MAXLEN - 4; - - strA = &buffers[pos]; - - *strA++ = 'L'; - *strA++ = '"'; - - while (*strW && (len > 4)) { - if ((*strW < ' ') || (*strW > 126)) { - sprintf(strA, "\\%04x", *strW); - strA +=5; - len -=5; - } - else - { - *strA++ = *strW; - len--; - } - strW++; - } - *strA++ = '"'; - *strA = '\0'; - - strA = &buffers[pos]; - pos += DEBUGSTR_W_MAXLEN; - if (pos >= sizeof(buffers)) pos = 0; - - return strA; - -} - static void test_multibyte_to_unicode_translations(IMultiLanguage2 *iML2) { /* these APIs are broken regarding constness of the input buffer */ @@ -1296,14 +1258,14 @@ static void test_GetRfc1766Info(IMultiLanguage2 *iML2) broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, - debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); + wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); } else ok( (!mylstrcmpW(prfc->wszLocaleName, info_table[i].localename)) || broken(!mylstrcmpW(prfc->wszLocaleName, info_table[i].broken_name)) || /* IE < 6.0 */ broken(!mylstrcmpW(prfc->wszLocaleName, short_broken_name)), "#%02d: got %s (expected %s)\n", i, - debugstr_w(prfc->wszLocaleName), debugstr_w(info_table[i].localename)); + wine_dbgstr_w(prfc->wszLocaleName), wine_dbgstr_w(info_table[i].localename)); }

1 0

Alexandre Julliard : kernel32/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: f3d87838ff81639077eb99410c1f1a5d0cc6cec5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d87838ff81639077eb99410… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:36 2009 +0200 kernel32/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/kernel32/tests/format_msg.c | 75 +++++++++++++++++--------------------- 1 files changed, 34 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f3d87838ff81639077eb9…

1 0

Alexandre Julliard : jscript/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 475e1d6210e5bf9950211719d8a2662b38b3c2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=475e1d6210e5bf9950211719d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:31 2009 +0200 jscript/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/jscript/tests/run.c | 23 ++++++----------------- 1 files changed, 6 insertions(+), 17 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 5475ebb..21eccc4 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -84,17 +84,6 @@ static const CHAR test_valA[] = "testVal"; static BOOL strict_dispid_check; static const char *test_name = "(null)"; -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 BSTR a2bstr(const char *str) { BSTR ret; @@ -169,7 +158,7 @@ static HRESULT WINAPI DispatchEx_Invoke(IDispatchEx *iface, DISPID dispIdMember, static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { - ok(0, "unexpected call %s %x\n", debugstr_w(bstrName), grfdex); + ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); return E_NOTIMPL; } @@ -220,7 +209,7 @@ static HRESULT WINAPI testObj_DeleteMemberByName(IDispatchEx *iface, BSTR bstrNa { CHECK_EXPECT(testobj_delete); - ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", debugstr_w(bstrName)); + ok(!strcmp_wa(bstrName, "deleteTest"), "unexpected name %s\n", wine_dbgstr_w(bstrName)); ok(grfdex == fdexNameCaseSensitive, "grfdex = %x\n", grfdex); return S_OK; } @@ -296,7 +285,7 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD } if(strict_dispid_check) - ok(0, "unexpected call %s\n", debugstr_w(bstrName)); + ok(0, "unexpected call %s\n", wine_dbgstr_w(bstrName)); return DISP_E_UNKNOWNNAME; } @@ -319,7 +308,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(psp->rgvargs+1) = %d\n", V_VT(pdp->rgvarg)); - ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, debugstr_w(V_BSTR(pdp->rgvarg))); + ok(V_BOOL(pdp->rgvarg+1), "%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; @@ -335,7 +324,7 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(V_VT(pdp->rgvarg) == VT_BSTR, "V_VT(psp->rgvargs) = %d\n", V_VT(pdp->rgvarg)); if(V_VT(pdp->rgvarg) == VT_BSTR) - trace("%s: %s\n", test_name, debugstr_w(V_BSTR(pdp->rgvarg))); + trace("%s: %s\n", test_name, wine_dbgstr_w(V_BSTR(pdp->rgvarg))); return S_OK; @@ -513,7 +502,7 @@ static HRESULT WINAPI ActiveScriptSite_GetItemInfo(IActiveScriptSite *iface, LPC if(!strcmp_wa(pstrName, test_valA)) CHECK_EXPECT(GetItemInfo_testVal); else if(strcmp_wa(pstrName, testA)) - ok(0, "unexpected pstrName %s\n", debugstr_w(pstrName)); + ok(0, "unexpected pstrName %s\n", wine_dbgstr_w(pstrName)); *ppiunkItem = (IUnknown*)&Global; return S_OK;

1 0

Alexandre Julliard : hlink/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: f3664e9bc39bfb7f766a574e05d5afa543417145 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3664e9bc39bfb7f766a574e0… Author: Alexandre Julliard <julliard(a)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);

1 0

Alexandre Julliard : gdiplus/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 186528e298afe3a9b4b6d6c9ada429aeaa916f89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=186528e298afe3a9b4b6d6c9a… Author: Alexandre Julliard <julliard(a)winehq.org> 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); }

1 0

Alexandre Julliard : advapi32/tests: Use the global wine_dbgstr_w instead of a local variant.
by Alexandre Julliard Aug. 19, 2009

Aug. 19, 2009

Module: wine Branch: master Commit: 825487b1eb7893a6d827912c2ade2a4cebfaff48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825487b1eb7893a6d827912c2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 19 13:36:17 2009 +0200 advapi32/tests: Use the global wine_dbgstr_w instead of a local variant. --- dlls/advapi32/tests/registry.c | 55 +-------------------------------------- 1 files changed, 2 insertions(+), 53 deletions(-) diff --git a/dlls/advapi32/tests/registry.c b/dlls/advapi32/tests/registry.c index 71317c4..abc2eb4 100644 --- a/dlls/advapi32/tests/registry.c +++ b/dlls/advapi32/tests/registry.c @@ -111,57 +111,6 @@ static const char *wine_debugstr_an( const char *str, int n ) return res; } -static const char *wine_debugstr_wn( const WCHAR *str, int n ) -{ - char *dst, *res; - size_t size; - - if (!HIWORD(str)) - { - if (!str) return "(null)"; - res = get_temp_buffer( 6 ); - sprintf( res, "#%04x", LOWORD(str) ); - return res; - } - if (n == -1) n = lstrlenW(str); - if (n < 0) n = 0; - size = 12 + min( 300, n * 5); - dst = res = get_temp_buffer( n * 5 + 7 ); - *dst++ = 'L'; - *dst++ = '"'; - while (n-- > 0 && dst <= res + size - 10) - { - WCHAR c = *str++; - switch (c) - { - case '\n': *dst++ = '\\'; *dst++ = 'n'; break; - case '\r': *dst++ = '\\'; *dst++ = 'r'; break; - case '\t': *dst++ = '\\'; *dst++ = 't'; break; - case '"': *dst++ = '\\'; *dst++ = '"'; break; - case '\\': *dst++ = '\\'; *dst++ = '\\'; break; - default: - if (c >= ' ' && c <= 126) - *dst++ = (char)c; - else - { - *dst++ = '\\'; - sprintf(dst,"%04x",c); - dst+=4; - } - } - } - *dst++ = '"'; - if (n > 0) - { - *dst++ = '.'; - *dst++ = '.'; - *dst++ = '.'; - } - *dst = 0; - return res; -} - - #define ADVAPI32_GET_PROC(func) \ p ## func = (void*)GetProcAddress(hadvapi32, #func); @@ -288,8 +237,8 @@ static void _test_hkey_main_Value_W(int line, LPCWSTR name, LPCWSTR string, if (string) { lok(memcmp(value, string, cbData) == 0, "RegQueryValueExW failed: %s/%d != %s/%d\n", - wine_debugstr_wn((WCHAR*)value, cbData / sizeof(WCHAR)), cbData, - wine_debugstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); + wine_dbgstr_wn((WCHAR*)value, cbData / sizeof(WCHAR)), cbData, + wine_dbgstr_wn(string, full_byte_len / sizeof(WCHAR)), full_byte_len); } /* This implies that when cbData == 0, RegQueryValueExW() should not modify the buffer */ lok(*(value+cbData) == 0xbd, "RegQueryValueExW/2 overflowed at %u: %02x != bd\n", cbData, *(value+cbData));

1 0