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

Alexandre Julliard : server: Return STATUS_IMAGE_MACHINE_TYPE_MISMATCH when the mapping's machine differs from the process.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: f6f38e24906ebbe1d22d32c62338be4354a55bd5 URL: https://gitlab.winehq.org/wine/wine/-/commit/f6f38e24906ebbe1d22d32c62338be… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 11:25:40 2023 +0200 server: Return STATUS_IMAGE_MACHINE_TYPE_MISMATCH when the mapping's machine differs from the process. --- dlls/ntdll/loader.c | 8 ++++---- dlls/ntdll/tests/wow64.c | 1 - dlls/ntdll/unix/loader.c | 8 ++++++-- dlls/ntdll/unix/process.c | 2 +- dlls/ntdll/unix/virtual.c | 1 + include/wine/server_protocol.h | 4 +++- server/mapping.c | 20 ++++++++++++-------- server/protocol.def | 1 + server/request.h | 3 ++- server/trace.c | 2 ++ 10 files changed, 32 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index feaacea83e7..b6bf9264f08 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2630,8 +2630,7 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam NTSTATUS status = NtMapViewOfSection( mapping, NtCurrentProcess(), &module, 0, 0, NULL, &len, ViewShare, 0, PAGE_EXECUTE_READ ); - if (status == STATUS_IMAGE_NOT_AT_BASE) status = STATUS_SUCCESS; - if (status) return status; + if (!NT_SUCCESS(status)) return status; if ((*pwm = find_existing_module( module ))) /* already loaded */ { @@ -2643,9 +2642,10 @@ static NTSTATUS load_native_dll( LPCWSTR load_path, const UNICODE_STRING *nt_nam return STATUS_SUCCESS; } #ifdef _WIN64 - if (!convert_to_pe64( module, image_info )) status = STATUS_INVALID_IMAGE_FORMAT; + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH && !convert_to_pe64( module, image_info )) + status = STATUS_INVALID_IMAGE_FORMAT; #endif - if (!status) status = build_module( load_path, nt_name, &module, image_info, id, flags, system, pwm ); + if (NT_SUCCESS(status)) status = build_module( load_path, nt_name, &module, image_info, id, flags, system, pwm ); if (status && module) NtUnmapViewOfSection( NtCurrentProcess(), module ); return status; } diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index e0df09c197c..b99b22fb1af 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -737,7 +737,6 @@ static void test_image_mappings(void) size = 0; ext.ULong = IMAGE_FILE_MACHINE_I386; status = pNtMapViewOfSectionEx( mapping, process, &ptr, &offset, &size, 0, PAGE_READONLY, &ext, 1 ); - todo_wine ok( status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH, "NtMapViewOfSection returned %08lx\n", status ); NtUnmapViewOfSection( process, ptr ); NtClose( mapping ); diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 985f7a7c25a..dba8e2f614e 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1553,7 +1553,7 @@ static NTSTATUS find_builtin_dll( UNICODE_STRING *nt_name, void **module, SIZE_T if (found_image) status = STATUS_NOT_SUPPORTED; WARN( "cannot find builtin library for %s\n", debugstr_us(nt_name) ); done: - if (status >= 0 && ext) + if (NT_SUCCESS(status) && ext) { strcpy( ext, ".so" ); load_builtin_unixlib( *module, ptr ); @@ -1694,7 +1694,11 @@ static NTSTATUS open_main_image( WCHAR *image, void **module, SECTION_IMAGE_INFO if (!status) { status = virtual_map_module( mapping, module, &size, info, 0, machine ); - if (!status && info->u.s.ComPlusNativeReady) info->Machine = native_machine; + if (status == STATUS_IMAGE_MACHINE_TYPE_MISMATCH && info->u.s.ComPlusNativeReady) + { + info->Machine = native_machine; + status = STATUS_SUCCESS; + } NtClose( mapping ); } else if (status == STATUS_INVALID_IMAGE_NOT_MZ && loadorder != LO_NATIVE) diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index dfcfc874d37..fa8022d9968 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -801,7 +801,7 @@ NTSTATUS WINAPI NtCreateUserProcess( HANDLE *process_handle_ptr, HANDLE *thread_ } goto done; } - if (!machine) machine = (pe_info.image_flags & IMAGE_FLAGS_ComPlusNativeReady) ? native_machine : pe_info.machine; + if (!machine) machine = pe_info.machine; if (!(startup_info = create_startup_info( attr.ObjectName, params, &startup_info_size ))) goto done; env_size = get_env_size( params, &winedebug ); diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 059ce303bc0..6835f9cd645 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2810,6 +2810,7 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size req->mapping = wine_server_obj_handle( mapping ); req->base = wine_server_client_ptr( view->base ); req->size = size; + req->machine = image_info->machine; status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 905425753e3..45a50106408 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1998,6 +1998,8 @@ struct map_image_view_request obj_handle_t mapping; client_ptr_t base; mem_size_t size; + unsigned short machine; + char __pad_34[6]; }; struct map_image_view_reply { @@ -6412,7 +6414,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 768 +#define SERVER_PROTOCOL_VERSION 769 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 655a686adea..bcb05ec8f8f 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -385,14 +385,10 @@ struct memory_view *get_exe_view( struct process *process ) static void set_process_machine( struct process *process, struct memory_view *view ) { - unsigned short machine = view->image.machine; - - if (machine == IMAGE_FILE_MACHINE_I386 && (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady)) - { - if (is_machine_supported( IMAGE_FILE_MACHINE_AMD64 )) machine = IMAGE_FILE_MACHINE_AMD64; - else if (is_machine_supported( IMAGE_FILE_MACHINE_ARM64 )) machine = IMAGE_FILE_MACHINE_ARM64; - } - process->machine = machine; + if (view->image.image_flags & IMAGE_FLAGS_ComPlusNativeReady) + process->machine = native_machine; + else + process->machine = view->image.machine; } static int generate_dll_event( struct thread *thread, int code, struct memory_view *view ) @@ -1274,8 +1270,16 @@ DECL_HANDLER(map_image_view) view->committed = NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; view->image = mapping->image; + view->image.machine = req->machine; add_process_view( current, view ); + if (view->base != mapping->image.base) set_error( STATUS_IMAGE_NOT_AT_BASE ); + if (view->image.machine != current->process->machine) + { + /* on 32-bit, the native 64-bit machine is allowed */ + if (is_machine_64bit( current->process->machine ) || view->image.machine != native_machine) + set_error( STATUS_IMAGE_MACHINE_TYPE_MISMATCH ); + } } done: diff --git a/server/protocol.def b/server/protocol.def index 950b98a4e23..95ddb1d5011 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1612,6 +1612,7 @@ enum server_fd_type obj_handle_t mapping; /* file mapping handle */ client_ptr_t base; /* view base address (page-aligned) */ mem_size_t size; /* view size */ + unsigned short machine; /* machine in the mapped view */ @END diff --git a/server/request.h b/server/request.h index 2f430e16cfb..bb1863b2b85 100644 --- a/server/request.h +++ b/server/request.h @@ -1126,7 +1126,8 @@ C_ASSERT( sizeof(struct map_view_request) == 48 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, mapping) == 12 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, base) == 16 ); C_ASSERT( FIELD_OFFSET(struct map_image_view_request, size) == 24 ); -C_ASSERT( sizeof(struct map_image_view_request) == 32 ); +C_ASSERT( FIELD_OFFSET(struct map_image_view_request, machine) == 32 ); +C_ASSERT( sizeof(struct map_image_view_request) == 40 ); C_ASSERT( sizeof(struct map_builtin_view_request) == 16 ); C_ASSERT( FIELD_OFFSET(struct unmap_view_request, base) == 16 ); C_ASSERT( sizeof(struct unmap_view_request) == 24 ); diff --git a/server/trace.c b/server/trace.c index 54dd40c3a62..93c98b85590 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2185,6 +2185,7 @@ static void dump_map_image_view_request( const struct map_image_view_request *re fprintf( stderr, " mapping=%04x", req->mapping ); dump_uint64( ", base=", &req->base ); dump_uint64( ", size=", &req->size ); + fprintf( stderr, ", machine=%04x", req->machine ); } static void dump_map_builtin_view_request( const struct map_builtin_view_request *req ) @@ -5436,6 +5437,7 @@ static const struct { "HANDLE_NOT_CLOSABLE", STATUS_HANDLE_NOT_CLOSABLE }, { "HOST_UNREACHABLE", STATUS_HOST_UNREACHABLE }, { "ILLEGAL_FUNCTION", STATUS_ILLEGAL_FUNCTION }, + { "IMAGE_MACHINE_TYPE_MISMATCH", STATUS_IMAGE_MACHINE_TYPE_MISMATCH }, { "IMAGE_NOT_AT_BASE", STATUS_IMAGE_NOT_AT_BASE }, { "INFO_LENGTH_MISMATCH", STATUS_INFO_LENGTH_MISMATCH }, { "INSTANCE_NOT_AVAILABLE", STATUS_INSTANCE_NOT_AVAILABLE },

1 0

Jacek Caban : win32u: Use syscall interface for NtGdiOpenDCW.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 3b01fb113fc9b21ebed63f25ff7b80b3ab52f3a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b01fb113fc9b21ebed63f25ff7b80… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 12:58:15 2022 +0200 win32u: Use syscall interface for NtGdiOpenDCW. --- dlls/win32u/gdiobj.c | 1 - dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 9 --------- dlls/wow64win/gdi.c | 18 ++++++++++++++++++ dlls/wow64win/syscall.h | 1 + 7 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index f88efbaa679..2088ba3218b 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -1101,7 +1101,6 @@ static struct unix_funcs unix_funcs = NtGdiModifyWorldTransform, NtGdiMoveTo, NtGdiOffsetClipRgn, - NtGdiOpenDCW, NtGdiPatBlt, NtGdiPlgBlt, NtGdiPolyDraw, diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 80c108ab41b..38bb4b6dfbd 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -83,6 +83,7 @@ static void * const syscalls[] = NtGdiHfontCreate, NtGdiInitSpool, NtGdiOffsetRgn, + NtGdiOpenDCW, NtGdiPathToRegion, NtGdiPtInRegion, NtGdiRectInRegion, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 2831b20ece9..b8fdd16b5ff 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -547,7 +547,7 @@ @ stdcall NtGdiMoveTo(long long long ptr) @ stdcall NtGdiOffsetClipRgn(long long long) @ stdcall -syscall NtGdiOffsetRgn(long long long) -@ stdcall NtGdiOpenDCW(ptr ptr ptr long long ptr ptr ptr) +@ stdcall -syscall NtGdiOpenDCW(ptr ptr ptr long long ptr ptr ptr) @ stub NtGdiPATHOBJ_bEnum @ stub NtGdiPATHOBJ_bEnumClipLines @ stub NtGdiPATHOBJ_vEnumStart diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index fe5143d7903..4bafc9bfaaf 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -130,9 +130,6 @@ struct unix_funcs BOOL (WINAPI *pNtGdiModifyWorldTransform)( HDC hdc, const XFORM *xform, DWORD mode ); BOOL (WINAPI *pNtGdiMoveTo)( HDC hdc, INT x, INT y, POINT *pt ); INT (WINAPI *pNtGdiOffsetClipRgn)( HDC hdc, INT x, INT y ); - HDC (WINAPI *pNtGdiOpenDCW)( UNICODE_STRING *device, const DEVMODEW *devmode, - UNICODE_STRING *output, ULONG type, BOOL is_display, - HANDLE hspool, DRIVER_INFO_2W *driver_info, void *pdev ); BOOL (WINAPI *pNtGdiPatBlt)( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ); BOOL (WINAPI *pNtGdiPlgBlt)( HDC hdc, const POINT *point, HDC hdc_src, INT x_src, INT y_src, INT width, INT height, HBITMAP mask, INT x_mask, INT y_mask, diff --git a/dlls/win32u/wrappers.c b/dlls/win32u/wrappers.c index 4e23f325aec..e24f7883fa3 100644 --- a/dlls/win32u/wrappers.c +++ b/dlls/win32u/wrappers.c @@ -426,15 +426,6 @@ INT WINAPI NtGdiOffsetClipRgn( HDC hdc, INT x, INT y ) return unix_funcs->pNtGdiOffsetClipRgn( hdc, x, y ); } -HDC WINAPI NtGdiOpenDCW( UNICODE_STRING *device, const DEVMODEW *devmode, - UNICODE_STRING *output, ULONG type, BOOL is_display, - HANDLE hspool, DRIVER_INFO_2W *driver_info, void *pdev ) -{ - if (!unix_funcs) return 0; - return unix_funcs->pNtGdiOpenDCW( device, devmode, output, type, is_display, - hspool, driver_info, pdev ); -} - BOOL WINAPI NtGdiPatBlt( HDC hdc, INT left, INT top, INT width, INT height, DWORD rop ) { if (!unix_funcs) return FALSE; diff --git a/dlls/wow64win/gdi.c b/dlls/wow64win/gdi.c index 6fa36b5f3a3..abb15da1884 100644 --- a/dlls/wow64win/gdi.c +++ b/dlls/wow64win/gdi.c @@ -623,6 +623,24 @@ NTSTATUS WINAPI wow64_NtGdiOffsetRgn( UINT *args ) return NtGdiOffsetRgn( hrgn, x, y ); } +NTSTATUS WINAPI wow64_NtGdiOpenDCW( UINT *args ) +{ + UNICODE_STRING32 *device32 = get_ptr( &args ); + const DEVMODEW *devmode = get_ptr( &args ); + UNICODE_STRING32 *output32 = get_ptr( &args ); + ULONG type = get_ulong( &args ); + BOOL is_display = get_ulong( &args ); + HANDLE hspool = get_handle( &args ); + DRIVER_INFO_2W *driver_info = get_ptr( &args ); + void *pdev = get_ptr( &args ); + + UNICODE_STRING device, output; + HDC ret = NtGdiOpenDCW( unicode_str_32to64( &device, device32 ), devmode, + unicode_str_32to64( &output, output32 ), type, + is_display, hspool, driver_info, pdev ); + return HandleToUlong( ret ); +} + NTSTATUS WINAPI wow64_NtGdiPathToRegion( UINT *args ) { HDC hdc = get_handle( &args ); diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index b2d4b041779..96c238329b6 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -69,6 +69,7 @@ SYSCALL_ENTRY( NtGdiHfontCreate ) \ SYSCALL_ENTRY( NtGdiInitSpool ) \ SYSCALL_ENTRY( NtGdiOffsetRgn ) \ + SYSCALL_ENTRY( NtGdiOpenDCW ) \ SYSCALL_ENTRY( NtGdiPathToRegion ) \ SYSCALL_ENTRY( NtGdiPtInRegion ) \ SYSCALL_ENTRY( NtGdiRectInRegion ) \

1 0

Jacek Caban : win32u: Use syscall interface for more painting functions.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 0cccc08cd631b155e7b0b589c3d55152a6de6c9f URL: https://gitlab.winehq.org/wine/wine/-/commit/0cccc08cd631b155e7b0b589c3d551… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 25 12:02:35 2023 +0200 win32u: Use syscall interface for more painting functions. --- dlls/win32u/gdiobj.c | 8 ----- dlls/win32u/syscall.c | 8 +++++ dlls/win32u/win32u.spec | 16 ++++----- dlls/win32u/win32u_private.h | 11 ------ dlls/win32u/wrappers.c | 50 -------------------------- dlls/wow64win/gdi.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 +++++ 7 files changed, 108 insertions(+), 77 deletions(-)

1 0

Jacek Caban : win32u: Use syscall interface for more painting functions.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 8cc95b54879fdb988c48411edcd1034c2847a234 URL: https://gitlab.winehq.org/wine/wine/-/commit/8cc95b54879fdb988c48411edcd103… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Jul 31 13:20:35 2022 +0200 win32u: Use syscall interface for more painting functions. --- dlls/win32u/gdiobj.c | 8 ---- dlls/win32u/syscall.c | 8 ++++ dlls/win32u/win32u.spec | 16 ++++---- dlls/win32u/win32u_private.h | 10 ----- dlls/win32u/wrappers.c | 50 ------------------------- dlls/wow64win/gdi.c | 89 ++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 8 ++++ 7 files changed, 113 insertions(+), 76 deletions(-)

1 0

Alexandre Julliard : configure: Don't create the wine64 symlink in multi-arch builds.
by Alexandre Julliard May 25, 2023

May 25, 2023

Module: wine Branch: master Commit: 00538ed195b78a73a7fe4aebdf7dd4577d954dbc URL: https://gitlab.winehq.org/wine/wine/-/commit/00538ed195b78a73a7fe4aebdf7dd4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 25 12:10:24 2023 +0200 configure: Don't create the wine64 symlink in multi-arch builds. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index ee24e91136a..bc130a5fc00 100755 --- a/configure +++ b/configure @@ -21090,7 +21090,7 @@ test "$srcdir" = . || wine_srcdir="$srcdir/" ac_config_links="$ac_config_links wine:tools/winewrapper" wine_fn_config_symlink wine -if test "$HOST_ARCH" = x86_64 -o -n "$with_wine64"; then +if test "$wine_binary" = wine64 -o -n "$with_wine64"; then ac_config_links="$ac_config_links wine64:tools/winewrapper" wine_fn_config_symlink wine64 fi diff --git a/configure.ac b/configure.ac index 0a6171e7fd3..3af0aa5fa98 100644 --- a/configure.ac +++ b/configure.ac @@ -2330,7 +2330,7 @@ wine_srcdir= test "$srcdir" = . || wine_srcdir="$srcdir/" WINE_CONFIG_SYMLINK(wine,tools/winewrapper) -WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["$HOST_ARCH" = x86_64 -o -n "$with_wine64"]) +WINE_CONFIG_SYMLINK(wine64,tools/winewrapper,["$wine_binary" = wine64 -o -n "$with_wine64"]) WINE_CONFIG_MAKEFILE(dlls/acledit) WINE_CONFIG_MAKEFILE(dlls/aclui)

1 0

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