- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : jscript: Fix value leak in Array.shift.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 7008706739257212898edbe60feb0ff32d148408 URL: https://gitlab.winehq.org/wine/wine/-/commit/7008706739257212898edbe60feb0f… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix value leak in Array.shift. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/array.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 36f45120055..7e5bcaeaefe 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -527,8 +527,10 @@ static HRESULT Array_shift(script_ctx_t *ctx, jsval_t vthis, WORD flags, unsigne hres = jsdisp_get_idx(jsthis, i, &v); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); - else if(SUCCEEDED(hres)) + else if(SUCCEEDED(hres)) { hres = jsdisp_propput_idx(jsthis, i-1, v); + jsval_release(v); + } } if(SUCCEEDED(hres)) {

1 0

Gabriel Ivăncescu : jscript: Fix EnumVARIANT leak in enumerators.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 0a4b70a5f6a4bb5211c0dd5afd43e0f732645a42 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a4b70a5f6a4bb5211c0dd5afd43e0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript: Fix EnumVARIANT leak in enumerators. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/enumerator.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index d724d0685c9..d962c65d229 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -84,6 +84,8 @@ static void Enumerator_destructor(jsdisp_t *dispex) TRACE("\n"); + if(This->enumvar) + IEnumVARIANT_Release(This->enumvar); jsval_release(This->item); free(dispex); }

1 0

Gabriel Ivăncescu : mshtml: Release the returned lists from Gecko's QuerySelectorAll even on error.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 137a36529d5f9a1e1bdd20b7bed1ab40bc141ab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/137a36529d5f9a1e1bdd20b7bed1ab… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:58 2023 +0200 mshtml: Release the returned lists from Gecko's QuerySelectorAll even on error. Gecko may return a pseudo-element-list even on error (such as with an invalid selector, for example), which holds refs to elements and leaks. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 18 ++++++++++++++---- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/script.c | 4 +++- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4daf5ccc58d..540bbbd1626 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2685,7 +2685,7 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST IHTMLElementCollection **ppelColl) { HTMLDocumentNode *This = impl_from_IHTMLDocument3(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString selector_str; WCHAR *selector; nsresult nsres; @@ -2715,6 +2715,8 @@ static HRESULT WINAPI HTMLDocument3_getElementsByName(IHTMLDocument3 *iface, BST free(selector); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return E_FAIL; } @@ -2781,12 +2783,15 @@ static HRESULT WINAPI HTMLDocument3_getElementsByTagName(IHTMLDocument3 *iface, return E_UNEXPECTED; } + nslist = NULL; nsAString_InitDepend(&nsstr, v); nsres = nsIDOMDocumentFragment_QuerySelectorAll(docfrag, &nsstr, &nslist); nsAString_Finish(&nsstr); nsIDOMDocumentFragment_Release(docfrag); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(nslist) + nsIDOMNodeList_Release(nslist); return E_FAIL; } } @@ -4751,7 +4756,7 @@ static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, B static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLDocumentNode *This = impl_from_IDocumentSelector(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString nsstr; nsresult nsres; HRESULT hres; @@ -4773,6 +4778,8 @@ static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface if(NS_FAILED(nsres)) { WARN("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); } @@ -5946,7 +5953,7 @@ static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPI { DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; const PRUnichar *name; nsIDOMElement *nselem; nsIDOMNode *nsnode; @@ -5973,8 +5980,11 @@ static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPI nsAString_InitDepend(&nsstr, L":-moz-any(applet,embed,form,iframe,img,object)[name]"); nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->html_document, &nsstr, &node_list); nsAString_Finish(&nsstr); - if(NS_FAILED(nsres)) + if(NS_FAILED(nsres)) { + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); + } for(i = 0, hres = S_OK; SUCCEEDED(hres); i++) { nsres = nsIDOMNodeList_Item(node_list, i, &nsnode); diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cfc84523436..687e62f1784 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -6476,7 +6476,7 @@ static HRESULT WINAPI ElementSelector_querySelector(IElementSelector *iface, BST static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) { HTMLElement *This = impl_from_IElementSelector(iface); - nsIDOMNodeList *node_list; + nsIDOMNodeList *node_list = NULL; nsAString nsstr; nsresult nsres; HRESULT hres; @@ -6493,6 +6493,8 @@ static HRESULT WINAPI ElementSelector_querySelectorAll(IElementSelector *iface, nsAString_Finish(&nsstr); if(NS_FAILED(nsres)) { WARN("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return map_nsresult(nsres); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index ad44a1ace41..149abcf70e2 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1605,9 +1605,9 @@ void bind_event_scripts(HTMLDocumentNode *doc) { HTMLPluginContainer *plugin_container; nsIDOMHTMLScriptElement *nsscript; + nsIDOMNodeList *node_list = NULL; HTMLScriptElement *script_elem; EventTarget *event_target; - nsIDOMNodeList *node_list; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1626,6 +1626,8 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsAString_Finish(&selector_str); if(NS_FAILED(nsres)) { ERR("QuerySelectorAll failed: %08lx\n", nsres); + if(node_list) + nsIDOMNodeList_Release(node_list); return; }

1 0

Jacek Caban : qmgr: Avoid implicit enum casts.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: c254ff8dccc4d9505f81d2a17f7a3f9a0283b2fc URL: https://gitlab.winehq.org/wine/wine/-/commit/c254ff8dccc4d9505f81d2a17f7a3f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:44:05 2023 +0200 qmgr: Avoid implicit enum casts. --- dlls/qmgr/job.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/qmgr/job.c b/dlls/qmgr/job.c index 233d894b3ea..aa164051691 100644 --- a/dlls/qmgr/job.c +++ b/dlls/qmgr/job.c @@ -831,7 +831,8 @@ static HRESULT WINAPI BackgroundCopyJob_RemoveCredentials( EnterCriticalSection(&job->cs); - new_cred->Target = new_cred->Scheme = 0; + new_cred->Target = 0; + new_cred->Scheme = 0; free(new_cred->Credentials.Basic.UserName); new_cred->Credentials.Basic.UserName = NULL; free(new_cred->Credentials.Basic.Password);

1 0

Jacek Caban : msctf: Avoid implicit enum casts.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 0d554fee416a53080d00d411ce86b31ebb388c18 URL: https://gitlab.winehq.org/wine/wine/-/commit/0d554fee416a53080d00d411ce86b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:43:39 2023 +0200 msctf: Avoid implicit enum casts. --- dlls/msctf/context.c | 2 +- dlls/msctf/range.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 6280e8f521c..2a7feafae1e 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -305,7 +305,7 @@ static HRESULT WINAPI Context_GetSelection (ITfContext *iface, return TF_E_NOLOCK; else if (SUCCEEDED(hr)) { - pSelection[totalFetched].style.ase = acps.style.ase; + pSelection[totalFetched].style.ase = (TfActiveSelEnd)acps.style.ase; pSelection[totalFetched].style.fInterimChar = acps.style.fInterimChar; Range_Constructor(iface, acps.acpStart, acps.acpEnd, &pSelection[totalFetched].range); totalFetched ++; diff --git a/dlls/msctf/range.c b/dlls/msctf/range.c index c42d91d1682..413cf91c185 100644 --- a/dlls/msctf/range.c +++ b/dlls/msctf/range.c @@ -362,7 +362,7 @@ HRESULT TF_SELECTION_to_TS_SELECTION_ACP(const TF_SELECTION *tf, TS_SELECTION_AC tsAcp->acpStart = This->anchorStart; tsAcp->acpEnd = This->anchorEnd; - tsAcp->style.ase = tf->style.ase; + tsAcp->style.ase = (TsActiveSelEnd)tf->style.ase; tsAcp->style.fInterimChar = tf->style.fInterimChar; return S_OK; }

1 0

Owen Rudge : comdlg32: Perform case-insensitive comparison of extension in file dialog.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 1ee2681394998e726603733c59225259db5c240e URL: https://gitlab.winehq.org/wine/wine/-/commit/1ee2681394998e726603733c592252… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Thu Nov 2 11:02:13 2023 +0000 comdlg32: Perform case-insensitive comparison of extension in file dialog. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 1a598046dff..1cdebf8f738 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -641,7 +641,7 @@ static HRESULT on_default_action(FileDialogImpl *This) if(newext) { WCHAR *ext = PathFindExtensionW(canon_filename); - if(lstrcmpW(ext, newext)) + if(lstrcmpiW(ext, newext)) lstrcatW(canon_filename, newext); } } diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index ddb2dc30fe7..15c898adc50 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1494,6 +1494,7 @@ static void test_filename(void) static const WCHAR filename_dotextW[] = {'w','i','n','e','t','e','s','t','.',0}; static const WCHAR filename_dotanddefW[] = {'w','i','n','e','t','e','s','t','.','.','w','t','e',0}; static const WCHAR filename_defextW[] = {'w','i','n','e','t','e','s','t','.','w','t','e',0}; + static const WCHAR filename_mixedcaseW[] = {'w','i','n','e','t','e','s','t','.','W','T','E',0}; static const WCHAR filename_ext1W[] = {'w','i','n','e','t','e','s','t','.','w','t','1',0}; static const WCHAR filename_ext2W[] = {'w','i','n','e','t','e','s','t','.','w','t','2',0}; static const WCHAR filename_ext1anddefW[] = @@ -1530,6 +1531,8 @@ static void test_filename(void) test_filename_savedlg(filename_noextW, defextW, filterspec, 3, filename_ext1W); /* Default extension, filterspec with "complex" extension */ test_filename_savedlg(filename_noextW, defextW, filterspec2, 1, filename_ext2W); + /* Default extension, filterspec with extension that differs in case from the specified filename */ + test_filename_savedlg(filename_mixedcaseW, defextW, filterspec, 0, filename_mixedcaseW); GetCurrentDirectoryW(MAX_PATH, buf); ok(!!pSHCreateItemFromParsingName, "SHCreateItemFromParsingName is missing.\n");

1 0

Daniel Lehman : msmxl4/tests: Add tests for get_xml.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: aef7bf3e735af0eaf1b56846d4ab37cc340b09de URL: https://gitlab.winehq.org/wine/wine/-/commit/aef7bf3e735af0eaf1b56846d4ab37… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msmxl4/tests: Add tests for get_xml. --- dlls/msxml4/tests/domdoc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 2eaf133f3ee..1784804c0c6 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -66,6 +66,7 @@ static void test_namespaces_as_attributes(void) const WCHAR *basenames[3]; const WCHAR *uris[3]; const WCHAR *texts[3]; + const WCHAR *xmls[3]; }; static const struct test tests[] = { @@ -76,6 +77,7 @@ static void test_namespaces_as_attributes(void) { L"b", L"d", L"ns" }, /* baseName */ { L"nshref", NULL, L"" }, /* namespaceURI */ { L"b attr", L"d attr", L"nshref" }, /* text */ + { L"ns:b=\"b attr\"", L"d=\"d attr\"", L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* property only */ { @@ -85,6 +87,7 @@ static void test_namespaces_as_attributes(void) { L"d" }, /* baseName */ { NULL }, /* namespaceURI */ { L"d attr" }, /* text */ + { L"d=\"d attr\"" }, /* xml */ }, /* namespace only */ { @@ -94,6 +97,7 @@ static void test_namespaces_as_attributes(void) { L"ns" }, /* baseName */ { L"" }, /* namespaceURI */ { L"nshref" }, /* text */ + { L"xmlns:ns=\"nshref\"" }, /* xml */ }, /* no properties or namespaces */ { @@ -186,6 +190,12 @@ static void test_namespaces_as_attributes(void) ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); + str = NULL; + hr = IXMLDOMNode_get_xml(item, &str); + ok(SUCCEEDED(hr), "Failed to get node xml, hr %#lx.\n", hr); + ok(!lstrcmpW(str, test->xmls[i]), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + IXMLDOMNode_Release(item); }

1 0

Alexandre Julliard : include: Use proper dllimports for uxtheme functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: bc5ae2faa84e6cf09d00cb9df8e7788ded4d8773 URL: https://gitlab.winehq.org/wine/wine/-/commit/bc5ae2faa84e6cf09d00cb9df8e778… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:25:19 2023 +0100 include: Use proper dllimports for uxtheme functions. --- dlls/uxtheme/Makefile.in | 1 + include/uxtheme.h | 161 +++++++++++++++++++++++------------------------ 2 files changed, 81 insertions(+), 81 deletions(-)

1 0

Daniel Lehman : msxml4/tests: Use wide string literals.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: e1b2b4e0e65b533ae8b97c78de82c9867953223b URL: https://gitlab.winehq.org/wine/wine/-/commit/e1b2b4e0e65b533ae8b97c78de82c9… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Mon Oct 30 23:27:57 2023 -0700 msxml4/tests: Use wide string literals. --- dlls/msxml4/tests/domdoc.c | 76 +++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 42 deletions(-) diff --git a/dlls/msxml4/tests/domdoc.c b/dlls/msxml4/tests/domdoc.c index 39fe8c5a995..2eaf133f3ee 100644 --- a/dlls/msxml4/tests/domdoc.c +++ b/dlls/msxml4/tests/domdoc.c @@ -39,18 +39,10 @@ static BSTR alloced_bstrs[256]; static int alloced_bstrs_count; -static BSTR alloc_str_from_narrow(const char *str) -{ - int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - BSTR ret = SysAllocStringLen(NULL, len - 1); /* NUL character added automatically */ - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - return ret; -} - -static BSTR _bstr_(const char *str) +static BSTR _bstr_(const WCHAR *str) { assert(alloced_bstrs_count < ARRAY_SIZE(alloced_bstrs)); - alloced_bstrs[alloced_bstrs_count] = alloc_str_from_narrow(str); + alloced_bstrs[alloced_bstrs_count] = SysAllocString(str); return alloced_bstrs[alloced_bstrs_count++]; } @@ -67,45 +59,45 @@ static void test_namespaces_as_attributes(void) { struct test { - const char *xml; + const WCHAR *xml; int explen; - const char *names[3]; - const char *prefixes[3]; - const char *basenames[3]; - const char *uris[3]; - const char *texts[3]; + const WCHAR *names[3]; + const WCHAR *prefixes[3]; + const WCHAR *basenames[3]; + const WCHAR *uris[3]; + const WCHAR *texts[3]; }; static const struct test tests[] = { { - "<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, - { "ns:b", "d", "xmlns:ns" }, /* nodeName */ - { "ns", NULL, "xmlns" }, /* prefix */ - { "b", "d", "ns" }, /* baseName */ - { "nshref", NULL, "" }, /* namespaceURI */ - { "b attr", "d attr", "nshref" }, /* text */ + L"<a ns:b=\"b attr\" d=\"d attr\" xmlns:ns=\"nshref\" />", 3, + { L"ns:b", L"d", L"xmlns:ns" }, /* nodeName */ + { L"ns", NULL, L"xmlns" }, /* prefix */ + { L"b", L"d", L"ns" }, /* baseName */ + { L"nshref", NULL, L"" }, /* namespaceURI */ + { L"b attr", L"d attr", L"nshref" }, /* text */ }, /* property only */ { - "<a d=\"d attr\" />", 1, - { "d" }, /* nodeName */ - { NULL }, /* prefix */ - { "d" }, /* baseName */ - { NULL }, /* namespaceURI */ - { "d attr" }, /* text */ + L"<a d=\"d attr\" />", 1, + { L"d" }, /* nodeName */ + { NULL }, /* prefix */ + { L"d" }, /* baseName */ + { NULL }, /* namespaceURI */ + { L"d attr" }, /* text */ }, /* namespace only */ { - "<a xmlns:ns=\"nshref\" />", 1, - { "xmlns:ns" }, /* nodeName */ - { "xmlns" }, /* prefix */ - { "ns" }, /* baseName */ - { "" }, /* namespaceURI */ - { "nshref" }, /* text */ + L"<a xmlns:ns=\"nshref\" />", 1, + { L"xmlns:ns" }, /* nodeName */ + { L"xmlns" }, /* prefix */ + { L"ns" }, /* baseName */ + { L"" }, /* namespaceURI */ + { L"nshref" }, /* text */ }, /* no properties or namespaces */ { - "<a />", 0, + L"<a />", 0, }, { NULL } @@ -129,7 +121,7 @@ static void test_namespaces_as_attributes(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); node = NULL; - hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_("a"), &node); + hr = IXMLDOMDocument2_selectSingleNode(doc, _bstr_(L"a"), &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); hr = IXMLDOMNode_get_attributes(node, &map); @@ -154,7 +146,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_nodeName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->names[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->names[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -162,7 +154,7 @@ static void test_namespaces_as_attributes(void) if (test->prefixes[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->prefixes[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->prefixes[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -171,7 +163,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_baseName(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->basenames[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->basenames[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); str = NULL; @@ -179,10 +171,10 @@ static void test_namespaces_as_attributes(void) if (test->uris[i]) { ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - if (test->prefixes[i] && !strcmp(test->prefixes[i], "xmlns")) + if (test->prefixes[i] && !lstrcmpW(test->prefixes[i], L"xmlns")) ok(!lstrcmpW(str, L""), "got %s\n", wine_dbgstr_w(str)); else - ok(!lstrcmpW(str, _bstr_(test->uris[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->uris[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); } else @@ -191,7 +183,7 @@ static void test_namespaces_as_attributes(void) str = NULL; hr = IXMLDOMNode_get_text(item, &str); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(!lstrcmpW(str, _bstr_(test->texts[i])), "got %s\n", wine_dbgstr_w(str)); + ok(!lstrcmpW(str, test->texts[i]), "got %s\n", wine_dbgstr_w(str)); SysFreeString(str); IXMLDOMNode_Release(item);

1 0

Alexandre Julliard : include: Use proper dllimports for setupapi functions.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 897098c9945cf95947dc55b97bfcc3e47cdcbebf URL: https://gitlab.winehq.org/wine/wine/-/commit/897098c9945cf95947dc55b97bfcc3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 3 17:23:55 2023 +0100 include: Use proper dllimports for setupapi functions. --- dlls/setupapi/Makefile.in | 1 + include/setupapi.h | 883 +++++++++++++++++++++++----------------------- 2 files changed, 443 insertions(+), 441 deletions(-)

1 0