November 2023 - Wine-Commits

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

Nov. 3, 2023

Module: wine Branch: master Commit: 5d7156f10b54a23670ba8c235bcd1512a7be1460 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d7156f10b54a23670ba8c235bcd15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:44:24 2023 +0200 shcore: Avoid implicit enum casts. --- dlls/shcore/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shcore/main.c b/dlls/shcore/main.c index a195d8f307a..67ee3b25171 100644 --- a/dlls/shcore/main.c +++ b/dlls/shcore/main.c @@ -67,7 +67,7 @@ HRESULT WINAPI GetProcessDpiAwareness(HANDLE process, PROCESS_DPI_AWARENESS *val HRESULT WINAPI SetProcessDpiAwareness(PROCESS_DPI_AWARENESS value) { - if (SetProcessDpiAwarenessInternal( value )) return S_OK; + if (SetProcessDpiAwarenessInternal( (DPI_AWARENESS)value )) return S_OK; return HRESULT_FROM_WIN32( GetLastError() ); }

1 0

Jacek Caban : webservices: Store xmlbuf encoding as unsigned int.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 88ec915034d2947088213e79de0b20ade85d372b URL: https://gitlab.winehq.org/wine/wine/-/commit/88ec915034d2947088213e79de0b20… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 24 19:45:52 2023 +0200 webservices: Store xmlbuf encoding as unsigned int. Avoids enum casts when it's used for reader. --- dlls/webservices/heap.c | 2 +- dlls/webservices/webservices_private.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/webservices/heap.c b/dlls/webservices/heap.c index 93c57d523bd..b2ee514b970 100644 --- a/dlls/webservices/heap.c +++ b/dlls/webservices/heap.c @@ -320,7 +320,7 @@ HRESULT WINAPI WsGetHeapProperty( WS_HEAP *handle, WS_HEAP_PROPERTY_ID id, void } #define XML_BUFFER_INITIAL_ALLOCATED_SIZE 256 -struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, WS_XML_WRITER_ENCODING_TYPE encoding, WS_CHARSET charset, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *heap, SIZE_T size, unsigned int encoding, WS_CHARSET charset, const WS_XML_DICTIONARY *dict_static, WS_XML_DICTIONARY *dict ) { struct xmlbuf *ret; diff --git a/dlls/webservices/webservices_private.h b/dlls/webservices/webservices_private.h index 806d79ba4f2..e4a76afb7dd 100644 --- a/dlls/webservices/webservices_private.h +++ b/dlls/webservices/webservices_private.h @@ -27,7 +27,7 @@ struct xmlbuf WS_HEAP *heap; WS_BYTES bytes; SIZE_T size; - WS_XML_WRITER_ENCODING_TYPE encoding; + unsigned int encoding; WS_CHARSET charset; const WS_XML_DICTIONARY *dict_static; WS_XML_DICTIONARY *dict; @@ -38,7 +38,7 @@ void *ws_alloc_zero( WS_HEAP *, SIZE_T ); void *ws_realloc( WS_HEAP *, void *, SIZE_T, SIZE_T ); void *ws_realloc_zero( WS_HEAP *, void *, SIZE_T, SIZE_T ); void ws_free( WS_HEAP *, void *, SIZE_T ); -struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, WS_XML_WRITER_ENCODING_TYPE, WS_CHARSET, +struct xmlbuf *alloc_xmlbuf( WS_HEAP *, SIZE_T, unsigned int, WS_CHARSET, const WS_XML_DICTIONARY *, WS_XML_DICTIONARY * ); void free_xmlbuf( struct xmlbuf * );

1 0

Gabriel Ivăncescu : jscript/tests: Fix variant leak after conversion when testing VariantChangeType.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: 59e00860a7daeb2bea933622f581b0eb2c34cf1d URL: https://gitlab.winehq.org/wine/wine/-/commit/59e00860a7daeb2bea933622f581b0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix variant leak after conversion when testing VariantChangeType. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/caller.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index 8a1ebb83a33..99b6a21e7fb 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -173,6 +173,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_UNKNOWN); ok(V_UNKNOWN(&v) == V_UNKNOWN(src), "V_UNKNOWN(v) != V_UNKNOWN(src)\n"); + VariantClear(&v); } if(V_VT(src) != VT_DISPATCH) @@ -180,6 +181,7 @@ static void test_change_type(IVariantChangeType *change_type, VARIANT *src, cons else { call_change_type(change_type, &v, src, VT_DISPATCH); ok(V_DISPATCH(&v) == V_DISPATCH(src), "V_DISPATCH(v) != V_DISPATCH(src)\n"); + VariantClear(&v); } }

1 0

Gabriel Ivăncescu : jscript/tests: Fix Date object leak in test_default_value.
by Alexandre Julliard Nov. 3, 2023

Nov. 3, 2023

Module: wine Branch: master Commit: febdb0a121a7497098fef744685291dff7840c29 URL: https://gitlab.winehq.org/wine/wine/-/commit/febdb0a121a7497098fef744685291… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Fri Nov 3 20:47:59 2023 +0200 jscript/tests: Fix Date object leak in test_default_value. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/tests/run.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index c5d9c47e63c..509f01e3211 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -3069,6 +3069,7 @@ static void test_default_value(void) V_VT(&v) = VT_EMPTY; hres = IDispatch_Invoke(disp, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET, &dp, &v, NULL, NULL); ok(hres == E_UNEXPECTED, "Invoke failed: %08lx\n", hres); + IDispatch_Release(disp); hres = parse_script_expr(L"new Date()", &v, &script); ok(hres == S_OK, "parse_script_expr failed: %08lx\n", hres);

1 0

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