May 2023 - Wine-Commits - list.winehq.org

Gabriel Ivăncescu : mshtml: Stop the plugin when detaching the plugin host.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 35b198c56164effdda37aff5888ca8656343552b URL: https://gitlab.winehq.org/wine/wine/-/commit/35b198c56164effdda37aff5888ca8… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 22 19:03:22 2023 +0300 mshtml: Stop the plugin when detaching the plugin host. Otherwise Gecko keeps it running when it is created via put_classid, and it leaks everything due to holding a ref to it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/nsiface.idl | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/pluginhost.c | 8 ++++++++ 2 files changed, 59 insertions(+) diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 5991e0de45b..43786b490f5 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -164,6 +164,7 @@ typedef nsISupports nsIControllers; typedef nsISupports nsIDOMValidityState; typedef nsISupports nsIPluginInstanceOwner; typedef nsISupports nsIPluginStreamListener; +typedef nsISupports nsIPluginTag; typedef nsISupports nsIContentSink; typedef nsISupports nsIParserFilter; typedef nsISupports nsIDTD; @@ -180,6 +181,7 @@ typedef nsISupports nsIDOMStorageList; typedef nsISupports nsILocalFile; typedef nsISupports nsIDOMHTMLMenuElement; typedef nsISupports nsIDOMCaretPosition; +typedef nsISupports nsIFrame; typedef nsISupports nsIFrameRequestCallback; typedef nsISupports nsICycleCollectorListener; typedef nsISupports nsIDOMHTMLCanvasElement; @@ -199,6 +201,7 @@ typedef nsISupports nsIClassInfo; typedef nsISupports nsILoadContext; typedef nsISupports nsIDomainPolicy; typedef nsISupports nsIScriptContext; +typedef nsISupports nsIObjectFrame; typedef nsISupports nsIObjectInputStream; typedef nsISupports nsIObjectOutputStream; @@ -4299,6 +4302,54 @@ interface nsIPluginInstance : nsIAudioChannelAgentCallback nsresult GetDOMElement(nsIDOMElement **aDOMElement); } +[ + object, + uuid(2eb3195e-3eea-4083-bb1d-d2d70fa35ccb), + local +] +interface nsIObjectLoadingContent : nsISupports +{ + const UINT TYPE_LOADING = 0; + const UINT TYPE_IMAGE = 1; + const UINT TYPE_PLUGIN = 2; + const UINT TYPE_DOCUMENT = 3; + const UINT TYPE_NULL = 4; + + const UINT PLUGIN_UNSUPPORTED = 0; + const UINT PLUGIN_ALTERNATE = 1; + const UINT PLUGIN_DISABLED = 2; + const UINT PLUGIN_BLOCKLISTED = 3; + const UINT PLUGIN_OUTDATED = 4; + const UINT PLUGIN_CRASHED = 5; + const UINT PLUGIN_SUPPRESSED = 6; + const UINT PLUGIN_USER_DISABLED = 7; + const UINT PLUGIN_CLICK_TO_PLAY = 8; + const UINT PLUGIN_VULNERABLE_UPDATABLE = 9; + const UINT PLUGIN_VULNERABLE_NO_UPDATE = 10; + const UINT PLUGIN_ACTIVE = 255; + + nsresult GetActualType(nsACString *aType); + nsresult GetDisplayedType(uint32_t *aType); + nsresult GetContentTypeForMIMEType(const nsACString *aMIMEType, uint32_t *aType); + nsresult GetBaseURI(nsIURI **aResult); + nsresult GetPluginInstance(void /*nsNPAPIPluginInstance*/ **aInstance); + nsresult HasNewFrame(nsIObjectFrame *aFrame); + nsresult GetPrintFrame(nsIFrame **aFrame); + nsresult PluginDestroyed(); + nsresult PluginCrashed(nsIPluginTag *aPluginTag, const nsAString *pluginDumpID, const nsAString *browserDumpID, bool submittedCrashReport); + nsresult PlayPlugin(); + nsresult Reload(bool aClearActivation); + nsresult GetActivated(bool *aActivated); + nsresult StopPluginInstance(); + nsresult SyncStartPluginInstance(); + nsresult AsyncStartPluginInstance(); + nsresult InitializeFromChannel(nsIRequest *aChannel); + nsresult GetSrcURI(nsIURI **aURI); + nsresult GetPluginFallbackType(uint32_t *aPluginFallbackType); + nsresult GetHasRunningPlugin(bool *aHasPlugin); + nsresult GetRunID(uint32_t *aRunID); +} + [ object, uuid(11afa8be-d997-4e07-a6a3-6f872ec3ee7f), diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 83ce9aa5d7f..c81c17690ac 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2677,8 +2677,16 @@ void detach_plugin_host(PluginHost *host) host->doc = NULL; if(host->element) { + nsIDOMElement *nselem = host->element->element.dom_element; + nsIObjectLoadingContent *olc; + host->element->plugin_host = NULL; host->element = NULL; + + if(NS_SUCCEEDED(nsIDOMElement_QueryInterface(nselem, &IID_nsIObjectLoadingContent, (void**)&olc))) { + nsIObjectLoadingContent_StopPluginInstance(olc); + nsIObjectLoadingContent_Release(olc); + } IOleClientSite_Release(&host->IOleClientSite_iface); } }

1 0

Paul Gofman : ntdll: Handle NULL process handle in MapViewOfFile3().
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 376bd69c42a594cb68f416fe2ef0968949a67e7c URL: https://gitlab.winehq.org/wine/wine/-/commit/376bd69c42a594cb68f416fe2ef096… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 10 18:40:18 2022 -0600 ntdll: Handle NULL process handle in MapViewOfFile3(). Based on a patch by Nikolay Sivov. --- dlls/kernelbase/memory.c | 2 ++ dlls/kernelbase/tests/process.c | 2 +- dlls/ntdll/tests/virtual.c | 12 ++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/kernelbase/memory.c b/dlls/kernelbase/memory.c index 4188eebf181..19381e00b31 100644 --- a/dlls/kernelbase/memory.c +++ b/dlls/kernelbase/memory.c @@ -265,6 +265,8 @@ LPVOID WINAPI DECLSPEC_HOTPATCH MapViewOfFile3( HANDLE handle, HANDLE process, P LARGE_INTEGER off; void *addr; + if (!process) process = GetCurrentProcess(); + addr = baseaddr; off.QuadPart = offset; if (!set_ntstatus( NtMapViewOfSectionEx( handle, process, &addr, &off, &size, alloc_type, protection, diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index 2979af39551..14eed7d8fe9 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -123,7 +123,7 @@ static void test_MapViewOfFile3(void) ok( mapping != 0, "CreateFileMapping error %lu\n", GetLastError() ); SetLastError(0xdeadbeef); - ptr = pMapViewOfFile3( mapping, GetCurrentProcess(), NULL, 0, 4096, 0, PAGE_READONLY, NULL, 0); + ptr = pMapViewOfFile3( mapping, NULL, NULL, 0, 4096, 0, PAGE_READONLY, NULL, 0); ok( ptr != NULL, "MapViewOfFile FILE_MAP_READ error %lu\n", GetLastError() ); UnmapViewOfFile( ptr ); diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 5dd53c55f54..2c8b1614b84 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1146,6 +1146,12 @@ static void test_NtMapViewOfSection(void) process = create_target_process("sleep"); ok(process != NULL, "Can't start process\n"); + ptr = NULL; + size = 0; + offset.QuadPart = 0; + status = NtMapViewOfSection(mapping, NULL, &ptr, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE); + ok(status == STATUS_INVALID_HANDLE, "NtMapViewOfSection returned %08lx\n", status); + ptr = NULL; size = 0; offset.QuadPart = 0; @@ -1419,6 +1425,12 @@ static void test_NtMapViewOfSectionEx(void) process = create_target_process("sleep"); ok(process != NULL, "Can't start process\n"); + ptr = NULL; + size = 0x1000; + offset.QuadPart = 0; + status = pNtMapViewOfSectionEx(mapping, NULL, &ptr, &offset, &size, 0, PAGE_READWRITE, NULL, 0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %08lx\n", status); + ptr = NULL; size = 0x1000; offset.QuadPart = 0;

1 0

Paul Gofman : ntdll: Support MEM_REPLACE_PLACEHOLDER in map_view().
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: b7ea896fdbba5ea23ceec23b71626537d0091c0c URL: https://gitlab.winehq.org/wine/wine/-/commit/b7ea896fdbba5ea23ceec23b716265… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 18 20:42:05 2023 -0600 ntdll: Support MEM_REPLACE_PLACEHOLDER in map_view(). --- dlls/ntdll/unix/virtual.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 959ac67694f..6a6fce6436a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1980,6 +1980,23 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, void *ptr; NTSTATUS status; + if (alloc_type & MEM_REPLACE_PLACEHOLDER) + { + struct file_view *view; + + if (!(view = find_view( base, 0 ))) return STATUS_INVALID_PARAMETER; + if (view->base != base || view->size != size) return STATUS_CONFLICTING_ADDRESSES; + if (!(view->protect & VPROT_FREE_PLACEHOLDER)) return STATUS_INVALID_PARAMETER; + + TRACE( "found view %p, size %p, protect %#x.\n", view->base, (void *)view->size, view->protect ); + + view->protect = vprot | VPROT_PLACEHOLDER; + set_vprot( view, base, size, vprot ); + if (vprot & VPROT_WRITEWATCH) reset_write_watches( base, size ); + *view_ret = view; + return STATUS_SUCCESS; + } + if (base) { if (is_beyond_limit( base, size, address_space_limit ))

1 0

Paul Gofman : ntdll: Support MEM_RESERVE_PLACEHOLDER in NtAllocateVirtualMemoryEx().
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 383d43d6cc359582fef9449bea42eb838c990213 URL: https://gitlab.winehq.org/wine/wine/-/commit/383d43d6cc359582fef9449bea42eb… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 10 18:53:10 2022 -0600 ntdll: Support MEM_RESERVE_PLACEHOLDER in NtAllocateVirtualMemoryEx(). Based on a patch by Nikolay Sivov. --- dlls/kernelbase/tests/process.c | 37 ++++++++-------- dlls/ntdll/tests/virtual.c | 95 ++++++++++++++++++----------------------- dlls/ntdll/unix/virtual.c | 15 ++++++- 3 files changed, 75 insertions(+), 72 deletions(-)

1 0

Paul Gofman : ntdll: Pass allocation type to map_view().
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 9dd6a66060942abdf1dfdd33c346f2c1fd92505a URL: https://gitlab.winehq.org/wine/wine/-/commit/9dd6a66060942abdf1dfdd33c346f2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 10 18:48:14 2022 -0600 ntdll: Pass allocation type to map_view(). Based on a patch by Nikolay Sivov. --- dlls/ntdll/unix/virtual.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 9ebede0b159..0ab9577d6a3 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1970,8 +1970,9 @@ static NTSTATUS map_fixed_area( void *base, size_t size, unsigned int vprot ) * virtual_mutex must be held by caller. */ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, - int top_down, unsigned int vprot, ULONG_PTR limit, size_t align_mask ) + unsigned int alloc_type, unsigned int vprot, ULONG_PTR limit, size_t align_mask ) { + int top_down = alloc_type & MEM_TOP_DOWN; void *ptr; NTSTATUS status; @@ -2244,7 +2245,7 @@ static NTSTATUS allocate_dos_memory( struct file_view **view, unsigned int vprot if (mmap_is_in_reserved_area( low_64k, dosmem_size - 0x10000 ) != 1) { addr = anon_mmap_tryfixed( low_64k, dosmem_size - 0x10000, unix_prot, 0 ); - if (addr == MAP_FAILED) return map_view( view, NULL, dosmem_size, FALSE, vprot, 0, 0 ); + if (addr == MAP_FAILED) return map_view( view, NULL, dosmem_size, 0, vprot, 0, 0 ); } /* now try to allocate the low 64K too */ @@ -2724,9 +2725,9 @@ static NTSTATUS virtual_map_image( HANDLE mapping, ACCESS_MASK access, void **ad if ((ULONG_PTR)base != image_info->base) base = NULL; if ((char *)base >= (char *)address_space_start) /* make sure the DOS area remains free */ - status = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, limit, 0 ); + status = map_view( &view, base, size, alloc_type, vprot, limit, 0 ); - if (status) status = map_view( &view, NULL, size, alloc_type & MEM_TOP_DOWN, vprot, limit, 0 ); + if (status) status = map_view( &view, NULL, size, alloc_type, vprot, limit, 0 ); if (status) goto done; status = map_image_into_view( view, filename, unix_fd, base, image_info, @@ -2850,7 +2851,7 @@ static unsigned int virtual_map_section( HANDLE handle, PVOID *addr_ptr, ULONG_P server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - res = map_view( &view, base, size, alloc_type & MEM_TOP_DOWN, vprot, limit, 0 ); + res = map_view( &view, base, size, alloc_type, vprot, limit, 0 ); if (res) goto done; TRACE( "handle=%p size=%lx offset=%s\n", handle, size, wine_dbgstr_longlong(offset.QuadPart) ); @@ -3419,7 +3420,7 @@ NTSTATUS virtual_alloc_thread_stack( INITIAL_TEB *stack, ULONG_PTR limit, SIZE_T server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - status = map_view( &view, NULL, size, FALSE, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, limit, 0 ); + status = map_view( &view, NULL, size, 0, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED, limit, 0 ); if (status != STATUS_SUCCESS) goto done; #ifdef VALGRIND_STACK_REGISTER @@ -4093,7 +4094,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ if (vprot & VPROT_WRITECOPY) status = STATUS_INVALID_PAGE_PROTECTION; else if (is_dos_memory) status = allocate_dos_memory( &view, vprot ); - else status = map_view( &view, base, size, type & MEM_TOP_DOWN, vprot, limit, + else status = map_view( &view, base, size, type, vprot, limit, align ? align - 1 : granularity_mask ); if (status == STATUS_SUCCESS) base = view->base;

1 0

Gabriel Ivăncescu : mshtml: Explicitly hold ref to the plugin host in NPP_New.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 08dc691dfb410de7115db3f9c34b225327e21f67 URL: https://gitlab.winehq.org/wine/wine/-/commit/08dc691dfb410de7115db3f9c34b22… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 22 19:03:22 2023 +0300 mshtml: Explicitly hold ref to the plugin host in NPP_New. Currently this worked by luck because it is leaking; the element holding it never releases it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/npplugin.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index a1c38e5ed1a..6dfb65c0a6e 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -301,6 +301,7 @@ static NPError CDECL NPP_New(NPMIMEType pluginType, NPP instance, UINT16 mode, I } instance->pdata = container->plugin_host; + IOleClientSite_AddRef(&container->plugin_host->IOleClientSite_iface); node_release(&container->element.node); return err;

1 0

Gabriel Ivăncescu : mshtml: Release ref from the element when detaching the plugin host.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 5c939222d339f02264f92183a973d4471c495425 URL: https://gitlab.winehq.org/wine/wine/-/commit/5c939222d339f02264f92183a973d4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon May 22 19:03:22 2023 +0300 mshtml: Release ref from the element when detaching the plugin host. When the plugin host is created, its only ref is being held by the element it is associated with. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/pluginhost.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 4ee5c37de19..83ce9aa5d7f 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -2672,14 +2672,15 @@ void detach_plugin_host(PluginHost *host) release_plugin_ifaces(host); + list_remove(&host->entry); + list_init(&host->entry); + host->doc = NULL; + if(host->element) { host->element->plugin_host = NULL; host->element = NULL; + IOleClientSite_Release(&host->IOleClientSite_iface); } - - list_remove(&host->entry); - list_init(&host->entry); - host->doc = NULL; } HRESULT create_plugin_host(HTMLDocumentNode *doc, HTMLPluginContainer *container)

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: baebde4b29131ee620ce545b4b28f973674bfdd0 URL: https://gitlab.winehq.org/wine/wine/-/commit/baebde4b29131ee620ce545b4b28f9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Thu May 25 00:14:14 2023 +0300 po: Update Lithuanian translation. --- po/lt.po | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/po/lt.po b/po/lt.po index 13a491fc5d4..a4b5f05e436 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2023-05-03 00:00+0300\n" +"PO-Revision-Date: 2023-05-25 00:13+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -17144,38 +17144,6 @@ msgid "regsvr32: Successfully uninstalled DLL '%1'\n" msgstr "regsvr32: Sėkmingai pašalinta DLL biblioteka „%1“\n" #: programs/start/start.rc:56 -#, fuzzy -#| msgid "" -#| "Start a program, or open a document in the program normally used for " -#| "files\n" -#| "with that suffix.\n" -#| "Usage:\n" -#| "start [options] program_filename [...]\n" -#| "start [options] document_filename\n" -#| "\n" -#| "Options:\n" -#| "\"title\" Specifies the title of the child windows.\n" -#| "/d directory Start the program in the specified directory.\n" -#| "/b Don't create a new console for the program.\n" -#| "/i Start the program with fresh environment variables.\n" -#| "/min Start the program minimized.\n" -#| "/max Start the program maximized.\n" -#| "/low Start the program in the idle priority class.\n" -#| "/normal Start the program in the normal priority class.\n" -#| "/high Start the program in the high priority class.\n" -#| "/realtime Start the program in the realtime priority class.\n" -#| "/abovenormal Start the program in the abovenormal priority class.\n" -#| "/belownormal Start the program in the belownormal priority class.\n" -#| "/node n Start the program on the specified NUMA node.\n" -#| "/affinity mask Start the program with the specified affinity mask.\n" -#| "/wait Wait for the started program to finish, then exit with " -#| "its\n" -#| "exit code.\n" -#| "/unix Use a Unix filename and start the file like Windows\n" -#| "Explorer.\n" -#| "/exec Exec the specified file (for internal Wine usage).\n" -#| "/ProgIDOpen Open a document using the specified progID.\n" -#| "/? Display this help and exit.\n" msgid "" "Start a program, or open a document in the program normally used for files\n" "with that suffix.\n" @@ -17228,6 +17196,7 @@ msgstr "" "/belownormal Paleisti programą prioriteto klasėje žemiau normalios.\n" "/node n Paleisti programą nurodytame NUMA mazge.\n" "/affinity mask Paleisti programą su nurodyta atitikimo kauke.\n" +"/machine arch Priverstinai naudoti architektūrą (x86,arm,amd64,arm64).\n" "/wait Laukti, kol paleista programa baigs darbą, tada išeiti su " "jos\n" " išėjimo kodu.\n"

1 0

Alex Henrie : mshtml: Only allow one thread to use Gecko.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 624b008f2ea2de1acedc7700141e88543f3752a0 URL: https://gitlab.winehq.org/wine/wine/-/commit/624b008f2ea2de1acedc7700141e88… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue May 16 22:54:33 2023 -0600 mshtml: Only allow one thread to use Gecko. The new test doesn't pass, but it doesn't crash either, and that's enough to fix the WinZip installer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54071 --- dlls/mshtml/nsembed.c | 3 ++- dlls/mshtml/tests/dom.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 9952a553afd..95c07c90390 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -818,7 +818,8 @@ BOOL load_gecko(void) MESSAGE("Could not find Wine Gecko. HTML rendering will be disabled.\n"); } }else { - ret = pCompMgr != NULL; + FIXME("Gecko can only be used from one thread.\n"); + ret = FALSE; } LeaveCriticalSection(&cs_load_gecko); diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bb86a7e0a1b..07c4fec9bd8 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -11980,6 +11980,29 @@ static void test_document_mode_lock(void) IHTMLDocument2_Release(doc); } +static DWORD WINAPI create_document_proc(void *param) +{ + IHTMLDocument2 *doc = NULL; + HRESULT hres; + + CoInitialize(NULL); + + hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, + &IID_IHTMLDocument2, (void**)&doc); + todo_wine + ok(hres == S_OK, "Creation of an HTMLDocument in a separate thread failed: %08lx\n", hres); + + if (doc) IHTMLDocument2_Release(doc); + return 0; +} + +static void test_threads(void) +{ + HANDLE thread = CreateThread(NULL, 0, create_document_proc, 0, 0, NULL); + DWORD ret = WaitForSingleObject(thread, 2000); + ok(!ret, "Document creation thread failed to complete\n"); +} + static void test_custom_user_agent(IHTMLDocument2 *doc) { static const WCHAR ua[] = L"1234567890xxxABC"; @@ -12080,6 +12103,7 @@ START_TEST(dom) test_quirks_mode(); test_document_mode_lock(); + test_threads(); /* Run this last since it messes with the process-wide user agent */ if (winetest_interactive || ! is_ie_hardened()) {

1 0

Alex Henrie : mshtml: Fix memory leak on error path in add_func_info (Coverity).
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: e7c6cdddf364b81daebb29a6649f3b0033473042 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7c6cdddf364b81daebb29a6649f3b… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Thu May 11 18:01:57 2023 -0600 mshtml: Fix memory leak on error path in add_func_info (Coverity). --- dlls/mshtml/dispex.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 817d77dda7d..e332dfdbd9d 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -302,8 +302,10 @@ static void add_func_info(dispex_data_t *data, tid_t tid, const FUNCDESC *desc, if(info == data->funcs+data->func_cnt) { if(data->func_cnt == data->func_size) { info = realloc(data->funcs, data->func_size * 2 * sizeof(func_info_t)); - if(!info) + if(!info) { + SysFreeString(name); return; + } memset(info + data->func_size, 0, data->func_size * sizeof(func_info_t)); data->funcs = info; data->func_size *= 2;

1 0