- Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Store minimum compat mode required for events in the ctor table.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: bb0ed22e4486881cacedacdcb764683c2b8cc4eb URL: https://gitlab.winehq.org/wine/wine/-/commit/bb0ed22e4486881cacedacdcb76468… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Store minimum compat mode required for events in the ctor table. Since such event types don't exist as separate event types in older modes, this prevents confusing leaks without bloating the constructors with more boilerplate. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 917ec2db6658b87abb7bbdb257e72ee0e82dc7d5) --- dlls/mshtml/htmlevent.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index bccdfb81121..d8d39413648 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3100,9 +3100,6 @@ static DOMEvent *progress_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_ { DOMProgressEvent *progress_event; - if(compat_mode < COMPAT_MODE_IE10) - return event_ctor(sizeof(DOMEvent), &DOMEvent_dispex, NULL, NULL, nsevent, event_id, compat_mode); - if(!(progress_event = event_ctor(sizeof(DOMProgressEvent), &DOMProgressEvent_dispex, DOMProgressEvent_query_interface, DOMProgressEvent_destroy, nsevent, event_id, compat_mode))) return NULL; @@ -3132,6 +3129,7 @@ static DOMEvent *storage_event_ctor(void *iface, nsIDOMEvent *nsevent, eventid_t static const struct { REFIID iid; DOMEvent *(*ctor)(void *iface, nsIDOMEvent *nsevent, eventid_t, compat_mode_t); + compat_mode_t min_compat_mode; } event_types_ctor_table[] = { [EVENT_TYPE_EVENT] = { NULL, generic_event_ctor }, [EVENT_TYPE_UIEVENT] = { &IID_nsIDOMUIEvent, ui_event_ctor }, @@ -3142,7 +3140,7 @@ static const struct { [EVENT_TYPE_DRAG] = { NULL, generic_event_ctor }, [EVENT_TYPE_PAGETRANSITION] = { NULL, page_transition_event_ctor }, [EVENT_TYPE_CUSTOM] = { &IID_nsIDOMCustomEvent, custom_event_ctor }, - [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor }, + [EVENT_TYPE_PROGRESS] = { &IID_nsIDOMProgressEvent, progress_event_ctor, COMPAT_MODE_IE10 }, [EVENT_TYPE_MESSAGE] = { NULL, message_event_ctor }, [EVENT_TYPE_STORAGE] = { NULL, storage_event_ctor }, }; @@ -3153,6 +3151,9 @@ static DOMEvent *alloc_event(nsIDOMEvent *nsevent, compat_mode_t compat_mode, ev void *iface = NULL; DOMEvent *event; + if(compat_mode < event_types_ctor_table[event_type].min_compat_mode) + event_type = EVENT_TYPE_EVENT; + if(event_types_ctor_table[event_type].iid) nsIDOMEvent_QueryInterface(nsevent, event_types_ctor_table[event_type].iid, &iface);

1 0

Gabriel Ivăncescu : mshtml: Fix URI leak in NewURI on failure.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 223de5aeb7985ca274b66ac24073cdbad9cda5bd URL: https://gitlab.winehq.org/wine/wine/-/commit/223de5aeb7985ca274b66ac24073cd… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Tue Apr 25 20:29:25 2023 +0300 mshtml: Fix URI leak in NewURI on failure. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 1544be253a3e5f9a67a371ab33dfacd7c1dec2a4) --- dlls/mshtml/nsio.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/nsio.c b/dlls/mshtml/nsio.c index f4778ca00f9..26b34da178e 100644 --- a/dlls/mshtml/nsio.c +++ b/dlls/mshtml/nsio.c @@ -3870,16 +3870,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC if(!strncmp(spec, "wine:", 5)) spec += 5; - if(aBaseURI) { - nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); - if(NS_SUCCEEDED(nsres)) { - if(!ensure_uri(base_wine_uri)) - return NS_ERROR_UNEXPECTED; - }else { - WARN("Could not get base nsWineURI: %08lx\n", nsres); - } - } - if(aOriginCharset && *aOriginCharset && _strnicmp(aOriginCharset, "utf", 3)) { BSTR charset; int len; @@ -3897,8 +3887,21 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC MultiByteToWideChar(cp, 0, spec, -1, new_spec, ARRAY_SIZE(new_spec)); + if(aBaseURI) { + nsres = nsIURI_QueryInterface(aBaseURI, &IID_nsWineURI, (void**)&base_wine_uri); + if(NS_SUCCEEDED(nsres)) { + if(!ensure_uri(base_wine_uri)) { + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); + return NS_ERROR_UNEXPECTED; + } + }else { + WARN("Could not get base nsWineURI: %08lx\n", nsres); + } + } + if(base_wine_uri) { hres = combine_url(base_wine_uri->uri, new_spec, &urlmon_uri); + nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); }else { hres = create_uri(new_spec, 0, &urlmon_uri); if(FAILED(hres)) @@ -3910,8 +3913,6 @@ static nsresult NSAPI nsIOServiceHook_NewURI(nsIIOServiceHook *iface, const nsAC nsres = create_nsuri(urlmon_uri, &wine_uri); IUri_Release(urlmon_uri); - if(base_wine_uri) - nsIFileURL_Release(&base_wine_uri->nsIFileURL_iface); if(NS_FAILED(nsres)) return nsres;

1 0

Brendan Shanks : winemac: Fix memory leak in UpdateDisplayDevices.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 37dc69fee4641f4994946b4a68a2128679fa4ba5 URL: https://gitlab.winehq.org/wine/wine/-/commit/37dc69fee4641f4994946b4a68a212… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Mar 21 14:42:30 2023 -0700 winemac: Fix memory leak in UpdateDisplayDevices. (cherry picked from commit 644c54b1036dec4266e723319a362070f8e3ba8f) --- dlls/winemac.drv/display.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winemac.drv/display.c b/dlls/winemac.drv/display.c index dab81cc8ffb..f3eeebf3ce0 100644 --- a/dlls/winemac.drv/display.c +++ b/dlls/winemac.drv/display.c @@ -1211,6 +1211,7 @@ BOOL macdrv_UpdateDisplayDevices( const struct gdi_device_manager *device_manage device_manager->add_mode( mode, param ); } + free(modes); macdrv_free_monitors(monitors); }

1 0

Gabriel Ivăncescu : mshtml: Fix nsparser leak if script_elem_from_nsscript failed.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 5233c1a6a997e87047d8dba7278bd0841e26281b URL: https://gitlab.winehq.org/wine/wine/-/commit/5233c1a6a997e87047d8dba7278bd0… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsparser leak if script_elem_from_nsscript failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 541257b0a20440a8f1e6e7376fc8593d08b3f32a) --- dlls/mshtml/mutation.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index e308c1af31b..f29f9e50226 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -343,8 +343,11 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa hres = script_elem_from_nsscript(nsscript, &script_elem); nsIDOMHTMLScriptElement_Release(nsscript); - if(FAILED(hres)) + if(FAILED(hres)) { + if(nsparser) + nsIParser_Release(nsparser); return NS_ERROR_FAILURE; + } if(nsparser) { nsIParser_BeginEvaluatingParserInsertedScript(nsparser);

1 0

Gabriel Ivăncescu : mshtml: Fix nsuri leak if create_channelbsc failed.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 137d857585d54ed942be3b791878cebeb95aa770 URL: https://gitlab.winehq.org/wine/wine/-/commit/137d857585d54ed942be3b791878ce… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsuri leak if create_channelbsc failed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit fb0b55c52056e9dc6358857b13f534b2579b64ab) --- dlls/mshtml/persist.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 581a25c4e2e..d40318bbd49 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -371,20 +371,22 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind hres = create_doc_uri(uri, &nsuri); if(!nav_uri) IUri_Release(uri); - if(SUCCEEDED(hres)) { - if(async_bsc) - bscallback = async_bsc; - else - hres = create_channelbsc(mon, NULL, NULL, 0, TRUE, &bscallback); + if(FAILED(hres)) { + CoTaskMemFree(url); + return hres; } + if(async_bsc) + bscallback = async_bsc; + else + hres = create_channelbsc(mon, NULL, NULL, 0, TRUE, &bscallback); + if(SUCCEEDED(hres)) { if(window->base.inner_window->doc) remove_target_tasks(window->base.inner_window->task_magic); abort_window_bindings(window->base.inner_window); hres = load_nsuri(window, nsuri, NULL, bscallback, LOAD_FLAGS_BYPASS_CACHE); - nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(SUCCEEDED(hres)) { hres = create_pending_window(window, bscallback); TRACE("pending window for %p %p %p\n", window, bscallback, window->pending_window); @@ -392,6 +394,7 @@ HRESULT set_moniker(HTMLOuterWindow *window, IMoniker *mon, IUri *nav_uri, IBind if(bscallback != async_bsc) IBindStatusCallback_Release(&bscallback->bsc.IBindStatusCallback_iface); } + nsISupports_Release((nsISupports*)nsuri); /* FIXME */ if(FAILED(hres)) { CoTaskMemFree(url);

1 0

Gabriel Ivăncescu : mshtml: Fix nsevent leak in create_document_event.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 4145a8bac21a7bd85ab86a760b4e8183434ddb40 URL: https://gitlab.winehq.org/wine/wine/-/commit/4145a8bac21a7bd85ab86a760b4e81… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:57 2023 +0200 mshtml: Fix nsevent leak in create_document_event. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit 45263e333c8eb8bd79f172c89df91e511494784e) --- dlls/mshtml/htmlevent.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index bcde9f38bba..bccdfb81121 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -3253,6 +3253,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven } event = alloc_event(nsevent, doc->document_mode, event_info[event_id].type, event_id); + nsIDOMEvent_Release(nsevent); if(!event) return E_OUTOFMEMORY;

1 0

Eric Pouech : evr: Fix incorrect integral computation.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 29fdccb7d1a189c1c8d32e9fa36ee0f00fd39a32 URL: https://gitlab.winehq.org/wine/wine/-/commit/29fdccb7d1a189c1c8d32e9fa36ee0… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed May 3 09:00:19 2023 +0200 evr: Fix incorrect integral computation. Note: typeof (int * unsigned) is unsigned. So: - on 64bit CPUs, where sizeof(int) = 4 < sizeof(void*) = 8, - when the result of the multiplication is supposed to be negative - there's no propagation of the negative sign from 32bit to 64 bit integers Fixes a crash in Age of Empire II. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> (cherry picked from commit 0cc4a38aae9ded4493550bbff8d51f49d71c9dd6) --- dlls/evr/evr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 26a2a3a1eb5..803c1d2dff9 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -382,7 +382,7 @@ static HRESULT evr_copy_sample_buffer(struct evr *filter, IMediaSample *input_sa { if (SUCCEEDED(hr = IDirect3DSurface9_LockRect(surface, &locked_rect, NULL, D3DLOCK_DISCARD))) { - if (src_stride < 0) src -= src_stride * (lines - 1); + if (src_stride < 0) src += (-src_stride) * (lines - 1); MFCopyImage(locked_rect.pBits, locked_rect.Pitch, src, src_stride, width * 4, lines); IDirect3DSurface9_UnlockRect(surface); }

1 0

Gabriel Ivăncescu : mshtml: Fix nsscript leak in bind_event_scripts.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 77f8a0368ac9f564232134d50ed4fcf2c130399f URL: https://gitlab.winehq.org/wine/wine/-/commit/77f8a0368ac9f564232134d50ed4fc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 20 19:44:58 2023 +0200 mshtml: Fix nsscript leak in bind_event_scripts. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> (cherry picked from commit c6c266a4b90d2c7b87bad1f083ecadffa78dde54) --- dlls/mshtml/script.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 5321080a8f9..30d9e9520f3 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1625,6 +1625,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) nsIDOMNode_Release(script_node); hres = script_elem_from_nsscript(nsscript, &script_elem); + nsIDOMHTMLScriptElement_Release(nsscript); if(FAILED(hres)) continue;

1 0

Brendan Shanks : msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: 0b618af1a50c26dc3d5d3cbfed9a756eefb2e104 URL: https://gitlab.winehq.org/wine/wine/-/commit/0b618af1a50c26dc3d5d3cbfed9a75… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Thu Apr 20 14:39:42 2023 -0700 msvcrt: Fix crash when rethrowing after a non-C++ exception on x86_64. (cherry picked from commit e414561a96156b028f73b0cf223ccf3dc9ad3587) --- dlls/msvcrt/except_x86_64.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index d40b9985cd2..b07a7b83772 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -579,14 +579,14 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, return ExceptionContinueSearch; } + if (rec->ExceptionCode == CXX_EXCEPTION && + (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2])) + { + TRACE("rethrow detected.\n"); + *rec = *msvcrt_get_thread_data()->exc_record; + } if (rec->ExceptionCode == CXX_EXCEPTION) { - if (!rec->ExceptionInformation[1] && !rec->ExceptionInformation[2]) - { - TRACE("rethrow detected.\n"); - *rec = *msvcrt_get_thread_data()->exc_record; - } - exc_type = (cxx_exception_type *)rec->ExceptionInformation[2]; if (TRACE_ON(seh))

1 0

Eric Pouech : winedbg: Don't crash when no search path has been set.
by Alexandre Julliard July 19, 2023

July 19, 2023

Module: wine Branch: stable Commit: d873b191009725d7a6fb71265b58cfa267f5cd35 URL: https://gitlab.winehq.org/wine/wine/-/commit/d873b191009725d7a6fb71265b58cf… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Apr 4 19:09:38 2023 +0200 winedbg: Don't crash when no search path has been set. Note: it's anyway wrong to search source files inside modules' path (a proper fix will require revisiting source file handling). This fix will actually be sufficient when running wine from within its build tree. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 24069aad307829c710f4eaee5aa2b35586bd7f14) --- programs/winedbg/source.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/programs/winedbg/source.c b/programs/winedbg/source.c index 044eccaab5e..74f31d986c6 100644 --- a/programs/winedbg/source.c +++ b/programs/winedbg/source.c @@ -122,17 +122,18 @@ static BOOL source_locate_file(const char* srcfile, char* path) strcpy(path, srcfile); found = TRUE; } - else if (dbg_curr_process->search_path) + else { const char* spath; - + const char* sp = dbg_curr_process->search_path; + if (!sp) sp = "."; spath = srcfile; while (!found) { while (*spath && *spath != '/' && *spath != '\\') spath++; if (!*spath) break; spath++; - found = SearchPathA(dbg_curr_process->search_path, spath, NULL, MAX_PATH, path, NULL); + found = SearchPathA(sp, spath, NULL, MAX_PATH, path, NULL); } } return found;

1 0