- Wine-Commits - list.winehq.org

Alexandre Julliard : server: Add a separate request to create a memory view for an image mapping.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: c306e76645b38d04d0fdd3a5d5fbafccacad0d38 URL: https://gitlab.winehq.org/wine/wine/-/commit/c306e76645b38d04d0fdd3a5d5fbaf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 11:22:18 2023 +0200 server: Add a separate request to create a memory view for an image mapping. --- dlls/ntdll/unix/virtual.c | 19 +++++++------- include/wine/server_protocol.h | 17 ++++++++++++ server/mapping.c | 59 +++++++++++++++++++++++++++++++----------- server/protocol.def | 8 ++++++ server/request.h | 6 +++++ server/trace.c | 10 +++++++ 6 files changed, 94 insertions(+), 25 deletions(-)

1 0

Alexandre Julliard : ntdll: Add a separate helper function for freeing a placeholder.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: d84704192efcedfffa26f3b807650aa5c6c603de URL: https://gitlab.winehq.org/wine/wine/-/commit/d84704192efcedfffa26f3b807650a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 16:06:21 2023 +0200 ntdll: Add a separate helper function for freeing a placeholder. --- dlls/ntdll/unix/virtual.c | 120 +++++++++++++++++++++++++++------------------- 1 file changed, 71 insertions(+), 49 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 20ecc0f1d38..72d0bbee48c 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2189,42 +2189,15 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz /*********************************************************************** - * view_make_placeholder + * remove_pages_from_view * - * Setup placeholder view. + * Remove some pages of a given view. * virtual_mutex must be held by caller. */ -static void view_make_placeholder( struct file_view *view ) +static NTSTATUS remove_pages_from_view( struct file_view *view, char *base, size_t size ) { - view->protect = VPROT_PLACEHOLDER | VPROT_FREE_PLACEHOLDER; - set_page_vprot( view->base, view->size, 0 ); - anon_mmap_fixed( view->base, view->size, PROT_NONE, 0 ); -} - + assert( size < view->size ); -/*********************************************************************** - * free_pages - * - * Free some pages of a given view. - * virtual_mutex must be held by caller. - */ -static NTSTATUS free_pages( struct file_view *view, char *base, size_t size, BOOL preserve_placeholder ) -{ - if (preserve_placeholder) - { - if (!size) return STATUS_INVALID_PARAMETER_3; - if (!(view->protect & VPROT_PLACEHOLDER)) return STATUS_CONFLICTING_ADDRESSES; - if (view->protect & VPROT_FREE_PLACEHOLDER && size == view->size) return STATUS_CONFLICTING_ADDRESSES; - } - else if (!size) size = view->size; - - if (size == view->size) - { - assert( base == view->base ); - if (preserve_placeholder) view_make_placeholder( view ); - else delete_view( view ); - return STATUS_SUCCESS; - } if (view->base != base && base + size != (char *)view->base + view->size) { struct file_view *new_view = alloc_view(); @@ -2259,28 +2232,68 @@ static NTSTATUS free_pages( struct file_view *view, char *base, size_t size, BOO register_view( view ); VIRTUAL_DEBUG_DUMP_VIEW( view ); } + return STATUS_SUCCESS; +} + + +/*********************************************************************** + * free_pages_preserve_placeholder + * + * Turn pages of a given view into a placeholder. + * virtual_mutex must be held by caller. + */ +static NTSTATUS free_pages_preserve_placeholder( struct file_view *view, char *base, size_t size ) +{ + NTSTATUS status; - if (preserve_placeholder) + if (!size) return STATUS_INVALID_PARAMETER_3; + if (!(view->protect & VPROT_PLACEHOLDER)) return STATUS_CONFLICTING_ADDRESSES; + if (view->protect & VPROT_FREE_PLACEHOLDER && size == view->size) return STATUS_CONFLICTING_ADDRESSES; + + if (size < view->size) { - if (!(view = alloc_view())) - { - ERR( "Out of memory for %p-%p\n", base, base + size ); - return STATUS_NO_MEMORY; - } - view->base = base; - view->size = size; - view_make_placeholder( view ); - register_view( view ); - return STATUS_SUCCESS; + status = remove_pages_from_view( view, base, size ); + if (status) return status; + + status = create_view( &view, base, size, VPROT_PLACEHOLDER | VPROT_FREE_PLACEHOLDER ); + if (status) return status; } - set_page_vprot( base, size, 0 ); - if (arm64ec_map) clear_arm64ec_range( base, size ); - unmap_area( base, size ); + view->protect = VPROT_PLACEHOLDER | VPROT_FREE_PLACEHOLDER; + set_page_vprot( view->base, view->size, 0 ); + anon_mmap_fixed( view->base, view->size, PROT_NONE, 0 ); return STATUS_SUCCESS; } +/*********************************************************************** + * free_pages + * + * Free some pages of a given view. + * virtual_mutex must be held by caller. + */ +static NTSTATUS free_pages( struct file_view *view, char *base, size_t size ) +{ + NTSTATUS status; + + if (size == view->size) + { + assert( base == view->base ); + delete_view( view ); + return STATUS_SUCCESS; + } + + status = remove_pages_from_view( view, base, size ); + if (!status) + { + set_page_vprot( base, size, 0 ); + if (arm64ec_map) clear_arm64ec_range( base, size ); + unmap_area( base, size ); + } + return status; +} + + /*********************************************************************** * allocate_dos_memory * @@ -4431,13 +4444,22 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si else if (!is_view_valloc( view )) status = STATUS_INVALID_PARAMETER; else if (!size && base != view->base) status = STATUS_FREE_VM_NOT_AT_BASE; else if ((char *)view->base + view->size - base < size) status = STATUS_UNABLE_TO_FREE_VM; - else if (type == MEM_DECOMMIT) status = decommit_pages( view, base - (char *)view->base, size ); - else if (type == MEM_RELEASE || (type == (MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER))) + else switch (type) { - status = free_pages( view, base, size, type & MEM_PRESERVE_PLACEHOLDER ); + case MEM_DECOMMIT: + status = decommit_pages( view, base - (char *)view->base, size ); + break; + case MEM_RELEASE: if (!size) size = view->size; + status = free_pages( view, base, size ); + break; + case MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER: + status = free_pages_preserve_placeholder( view, base, size ); + break; + default: + status = STATUS_INVALID_PARAMETER; + break; } - else status = STATUS_INVALID_PARAMETER; if (status == STATUS_SUCCESS) {

1 0

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

May 25, 2023

Module: wine Branch: master Commit: 4142d1e0496634ddb5df0df7de10c062cf4e57df URL: https://gitlab.winehq.org/wine/wine/-/commit/4142d1e0496634ddb5df0df7de10c0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 10 18:43:05 2022 -0600 ntdll: Support MEM_PRESERVE_PLACEHOLDER in NtFreeVirtualMemory(). --- dlls/kernelbase/tests/process.c | 35 ++++++++++++++------------------ dlls/ntdll/tests/virtual.c | 19 +++++++---------- dlls/ntdll/unix/virtual.c | 45 +++++++++++++++++++++++++++++++++++++---- 3 files changed, 63 insertions(+), 36 deletions(-) diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index f7b321cc09f..b629b61ea5d 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -178,14 +178,14 @@ static void test_VirtualAlloc2(void) ok(info.RegionSize == 2 * size, "Unexpected size.\n"); ret = VirtualFree(placeholder1, size, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(ret, "Failed to split placeholder.\n"); + ok(ret, "Failed to split placeholder.\n"); memset(&info, 0, sizeof(info)); VirtualQuery(placeholder1, &info, sizeof(info)); ok(info.AllocationProtect == PAGE_NOACCESS, "Unexpected protection %#lx.\n", info.AllocationProtect); ok(info.State == MEM_RESERVE, "Unexpected state %#lx.\n", info.State); ok(info.Type == MEM_PRIVATE, "Unexpected type %#lx.\n", info.Type); - todo_wine ok(info.RegionSize == size, "Unexpected size.\n"); + ok(info.RegionSize == size, "Unexpected size.\n"); placeholder2 = (void *)((BYTE *)placeholder1 + size); memset(&info, 0, sizeof(info)); @@ -199,10 +199,10 @@ static void test_VirtualAlloc2(void) ok(!!section, "Failed to create a section.\n"); view1 = pMapViewOfFile3(section, NULL, placeholder1, 0, size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, NULL, 0); - todo_wine ok(!!view1, "Failed to map a section.\n"); + ok(!!view1, "Failed to map a section.\n"); view2 = pMapViewOfFile3(section, NULL, placeholder2, 0, size, MEM_REPLACE_PLACEHOLDER, PAGE_READWRITE, NULL, 0); - todo_wine ok(!!view2, "Failed to map a section.\n"); + ok(!!view2, "Failed to map a section.\n"); CloseHandle(section); UnmapViewOfFile(view1); @@ -218,19 +218,16 @@ static void test_VirtualAlloc2(void) p1 = p + size / 2; p2 = p1 + size / 4; ret = VirtualFree(p1, size / 4, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(ret, "Failed to split a placeholder.\n"); - if (ret) - { - check_region_size(p, size / 2); - check_region_size(p1, size / 4); - } + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p, size / 2); + check_region_size(p1, size / 4); check_region_size(p2, 2 * size - size / 2 - size / 4); ret = VirtualFree(p, 0, MEM_RELEASE); ok(ret, "Failed to release a region.\n"); ret = VirtualFree(p1, 0, MEM_RELEASE); - todo_wine ok(ret, "Failed to release a region.\n"); + ok(ret, "Failed to release a region.\n"); ret = VirtualFree(p2, 0, MEM_RELEASE); - todo_wine ok(ret, "Failed to release a region.\n"); + ok(ret, "Failed to release a region.\n"); /* Split in two regions, specifying lower part. */ p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); @@ -239,14 +236,13 @@ static void test_VirtualAlloc2(void) p1 = p; p2 = p + size / 2; ret = VirtualFree(p1, size / 2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(ret, "Failed to split a placeholder.\n"); - if (ret) - check_region_size(p1, size / 2); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size / 2); check_region_size(p2, 2 * size - size / 2); ret = VirtualFree(p1, 0, MEM_RELEASE); ok(ret, "Failed to release a region.\n"); ret = VirtualFree(p2, 0, MEM_RELEASE); - todo_wine ok(ret, "Failed to release a region.\n"); + ok(ret, "Failed to release a region.\n"); /* Split in two regions, specifying second half. */ p = pVirtualAlloc2(NULL, NULL, 2 * size, MEM_RESERVE_PLACEHOLDER | MEM_RESERVE, PAGE_NOACCESS, NULL, 0); @@ -255,14 +251,13 @@ static void test_VirtualAlloc2(void) p1 = p; p2 = p + size; ret = VirtualFree(p2, size, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(ret, "Failed to split a placeholder.\n"); - if (ret) - check_region_size(p1, size); + ok(ret, "Failed to split a placeholder.\n"); + check_region_size(p1, size); check_region_size(p2, size); ret = VirtualFree(p1, 0, MEM_RELEASE); ok(ret, "Failed to release a region.\n"); ret = VirtualFree(p2, 0, MEM_RELEASE); - todo_wine ok(ret, "Failed to release a region.\n"); + ok(ret, "Failed to release a region.\n"); } static void test_VirtualAllocFromApp(void) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 604e234b100..1718aaf30f9 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -354,13 +354,10 @@ static void test_NtAllocateVirtualMemoryEx(void) p2 = p1 + size / 4; size2 = size / 4; status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); - if (status == STATUS_SUCCESS) - { - check_region_size(p, size / 2); - check_region_size(p1, size / 4); - } + check_region_size(p, size / 2); + check_region_size(p1, size / 4); check_region_size(p2, size - size / 2 - size / 4); status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p, &size2, MEM_RELEASE); @@ -381,11 +378,10 @@ static void test_NtAllocateVirtualMemoryEx(void) p2 = p1 + size / 4; size2 = size / 4; status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); ok(p1 == addr1, "Unexpected address.\n"); - if (status == STATUS_SUCCESS) - check_region_size(p1, size / 4); + check_region_size(p1, size / 4); check_region_size(p2, size - size / 4); status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); @@ -404,10 +400,9 @@ static void test_NtAllocateVirtualMemoryEx(void) size2 = size / 2; status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p2, &size2, MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER); - todo_wine ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); + ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); ok(p2 == p1 + size / 2, "Unexpected address.\n"); - if (status == STATUS_SUCCESS) - check_region_size(p1, size / 2); + check_region_size(p1, size / 2); check_region_size(p2, size / 2); status = NtFreeVirtualMemory(NtCurrentProcess(), (void **)&p1, &size2, MEM_RELEASE); ok(status == STATUS_SUCCESS, "Unexpected status %08lx.\n", status); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 35f43f956bd..20ecc0f1d38 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2188,18 +2188,41 @@ static NTSTATUS decommit_pages( struct file_view *view, size_t start, size_t siz } +/*********************************************************************** + * view_make_placeholder + * + * Setup placeholder view. + * virtual_mutex must be held by caller. + */ +static void view_make_placeholder( struct file_view *view ) +{ + view->protect = VPROT_PLACEHOLDER | VPROT_FREE_PLACEHOLDER; + set_page_vprot( view->base, view->size, 0 ); + anon_mmap_fixed( view->base, view->size, PROT_NONE, 0 ); +} + + /*********************************************************************** * free_pages * * Free some pages of a given view. * virtual_mutex must be held by caller. */ -static NTSTATUS free_pages( struct file_view *view, char *base, size_t size ) +static NTSTATUS free_pages( struct file_view *view, char *base, size_t size, BOOL preserve_placeholder ) { + if (preserve_placeholder) + { + if (!size) return STATUS_INVALID_PARAMETER_3; + if (!(view->protect & VPROT_PLACEHOLDER)) return STATUS_CONFLICTING_ADDRESSES; + if (view->protect & VPROT_FREE_PLACEHOLDER && size == view->size) return STATUS_CONFLICTING_ADDRESSES; + } + else if (!size) size = view->size; + if (size == view->size) { assert( base == view->base ); - delete_view( view ); + if (preserve_placeholder) view_make_placeholder( view ); + else delete_view( view ); return STATUS_SUCCESS; } if (view->base != base && base + size != (char *)view->base + view->size) @@ -2237,6 +2260,20 @@ static NTSTATUS free_pages( struct file_view *view, char *base, size_t size ) VIRTUAL_DEBUG_DUMP_VIEW( view ); } + if (preserve_placeholder) + { + if (!(view = alloc_view())) + { + ERR( "Out of memory for %p-%p\n", base, base + size ); + return STATUS_NO_MEMORY; + } + view->base = base; + view->size = size; + view_make_placeholder( view ); + register_view( view ); + return STATUS_SUCCESS; + } + set_page_vprot( base, size, 0 ); if (arm64ec_map) clear_arm64ec_range( base, size ); unmap_area( base, size ); @@ -4395,10 +4432,10 @@ NTSTATUS WINAPI NtFreeVirtualMemory( HANDLE process, PVOID *addr_ptr, SIZE_T *si else if (!size && base != view->base) status = STATUS_FREE_VM_NOT_AT_BASE; else if ((char *)view->base + view->size - base < size) status = STATUS_UNABLE_TO_FREE_VM; else if (type == MEM_DECOMMIT) status = decommit_pages( view, base - (char *)view->base, size ); - else if (type == MEM_RELEASE) + else if (type == MEM_RELEASE || (type == (MEM_RELEASE | MEM_PRESERVE_PLACEHOLDER))) { + status = free_pages( view, base, size, type & MEM_PRESERVE_PLACEHOLDER ); if (!size) size = view->size; - status = free_pages( view, base, size ); } else status = STATUS_INVALID_PARAMETER;

1 0

Paul Gofman : ntdll/tests: Add more tests for placeholders.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: f99b972771f15229cd4466285e5a3a500513d438 URL: https://gitlab.winehq.org/wine/wine/-/commit/f99b972771f15229cd4466285e5a3a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Nov 9 21:23:19 2022 -0600 ntdll/tests: Add more tests for placeholders. --- dlls/kernelbase/tests/process.c | 14 ++++ dlls/ntdll/tests/virtual.c | 150 ++++++++++++++++++++++++++++++++++++++-- 2 files changed, 160 insertions(+), 4 deletions(-)

1 0

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

May 25, 2023

Module: wine Branch: master Commit: 04e2b02aa9bdc231f07b4e99f3b2a2b096faad86 URL: https://gitlab.winehq.org/wine/wine/-/commit/04e2b02aa9bdc231f07b4e99f3b2a2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 10 18:58:26 2022 -0600 ntdll: Support MEM_REPLACE_PLACEHOLDER in NtAllocateVirtualMemoryEx(). --- dlls/ntdll/unix/virtual.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6a6fce6436a..35f43f956bd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4068,7 +4068,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ if (*ret) { - if (type & MEM_RESERVE) /* Round down to 64k boundary */ + if (type & MEM_RESERVE && !(type & MEM_REPLACE_PLACEHOLDER)) /* Round down to 64k boundary */ base = ROUND_ADDR( *ret, granularity_mask ); else base = ROUND_ADDR( *ret, page_mask ); @@ -4092,7 +4092,8 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ /* Compute the alloc type flags */ - if (!(type & (MEM_COMMIT | MEM_RESERVE | MEM_RESET))) + if (!(type & (MEM_COMMIT | MEM_RESERVE | MEM_RESET)) + || (type & MEM_REPLACE_PLACEHOLDER && !(type & MEM_RESERVE))) { WARN("called with wrong alloc type flags (%08x) !\n", (int)type); return STATUS_INVALID_PARAMETER; @@ -4291,7 +4292,7 @@ NTSTATUS WINAPI NtAllocateVirtualMemoryEx( HANDLE process, PVOID *ret, SIZE_T *s ULONG count ) { static const ULONG type_mask = MEM_COMMIT | MEM_RESERVE | MEM_TOP_DOWN | MEM_WRITE_WATCH - | MEM_RESET | MEM_RESERVE_PLACEHOLDER; + | MEM_RESET | MEM_RESERVE_PLACEHOLDER | MEM_REPLACE_PLACEHOLDER; ULONG_PTR limit = 0; ULONG_PTR align = 0; ULONG attributes = 0;

1 0

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