October 2023 - Wine-commits

Nikolay Sivov : d3d10/effect: Add support for 'buge'/'bult' instructions.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: fdc0f3771429b497fc1df2a9e45c16a600c3564a URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc0f3771429b497fc1df2a9e45c16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 12:26:05 2023 +0200 d3d10/effect: Add support for 'buge'/'bult' instructions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 30 +++++++++ dlls/d3d10/tests/effect.c | 162 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 142 insertions(+), 50 deletions(-)

1 0

Nikolay Sivov : d3d10/tests: Compact returned arrays checks.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 2043ffa083fba31408c06d72bb414e2c627baed2 URL: https://gitlab.winehq.org/wine/wine/-/commit/2043ffa083fba31408c06d72bb414e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 12:37:52 2023 +0200 d3d10/tests: Compact returned arrays checks. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/tests/effect.c | 98 ++++++++++++++++------------------------------- 1 file changed, 34 insertions(+), 64 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'ceil' instruction.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 2861ce933b7485a69deb562728d8e88c79de97fc URL: https://gitlab.winehq.org/wine/wine/-/commit/2861ce933b7485a69deb562728d8e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Sep 29 13:42:03 2023 +0200 d3d10/effect: Add support for 'ceil' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 12 ++++ dlls/d3d10/tests/effect.c | 173 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 134 insertions(+), 51 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'floor' instruction.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: dc91367dcf1c9384f95b3a24726111c567ac9a7f URL: https://gitlab.winehq.org/wine/wine/-/commit/dc91367dcf1c9384f95b3a24726111… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 30 10:38:05 2023 +0200 d3d10/effect: Add support for 'floor' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 12 + dlls/d3d10/tests/effect.c | 800 +++++++++++++++++++++++++--------------------- 2 files changed, 448 insertions(+), 364 deletions(-)

1 0

Nikolay Sivov : d3d10/effect: Add support for 'dot' instruction.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 488398982ccbbdcbe33436656d68a4df8f7cfe90 URL: https://gitlab.winehq.org/wine/wine/-/commit/488398982ccbbdcbe33436656d68a4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Sep 30 11:29:27 2023 +0200 d3d10/effect: Add support for 'dot' instruction. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d3d10/effect.c | 33 +- dlls/d3d10/tests/effect.c | 914 +++++++++++++++++++++++++++------------------- 2 files changed, 569 insertions(+), 378 deletions(-)

1 0

Alexandre Julliard : kernel32/tests: Add some dynamic base tests.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 64654d617cf3090c9c91ab15d83f9afa95563849 URL: https://gitlab.winehq.org/wine/wine/-/commit/64654d617cf3090c9c91ab15d83f9a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 13:10:39 2023 +0200 kernel32/tests: Add some dynamic base tests. --- dlls/kernel32/tests/loader.c | 66 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 60 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 53933b36f3f..0e86a0577b1 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -2123,10 +2123,13 @@ static void test_import_resolution(void) char temp_path[MAX_PATH]; char dll_name[MAX_PATH]; DWORD dummy; - void *expect; + void *expect, *tmp; char *str; - HANDLE hfile; + SIZE_T size; + HANDLE hfile, mapping; HMODULE mod, mod2; + NTSTATUS status; + LARGE_INTEGER offset; struct imports { IMAGE_IMPORT_DESCRIPTOR descr[2]; @@ -2148,7 +2151,7 @@ static void test_import_resolution(void) USHORT type_off[32]; } rel; } data, *ptr; - IMAGE_NT_HEADERS nt; + IMAGE_NT_HEADERS nt, *pnt; IMAGE_SECTION_HEADER section; int test, tls_index_save, nb_rel; #if defined(__i386__) @@ -2181,7 +2184,7 @@ static void test_import_resolution(void) static const UCHAR entry_point_code[] = { 0x00 }; #endif - for (test = 0; test < 4; test++) + for (test = 0; test < 7; test++) { #define DATA_RVA(ptr) (page_size + ((char *)(ptr) - (char *)&data)) #ifdef _WIN64 @@ -2193,12 +2196,13 @@ static void test_import_resolution(void) nt.FileHeader.NumberOfSections = 1; nt.FileHeader.SizeOfOptionalHeader = sizeof(IMAGE_OPTIONAL_HEADER); nt.FileHeader.Characteristics = IMAGE_FILE_EXECUTABLE_IMAGE; - if (test != 2) nt.FileHeader.Characteristics |= IMAGE_FILE_DLL; + if (test != 2 && test != 5) nt.FileHeader.Characteristics |= IMAGE_FILE_DLL; nt.OptionalHeader.SectionAlignment = page_size; nt.OptionalHeader.FileAlignment = 0x200; nt.OptionalHeader.SizeOfImage = 2 * page_size; nt.OptionalHeader.SizeOfHeaders = nt.OptionalHeader.FileAlignment; - nt.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; + nt.OptionalHeader.DllCharacteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; + if (test < 6) nt.OptionalHeader.DllCharacteristics |= IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; nt.OptionalHeader.NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES; memset( nt.OptionalHeader.DataDirectory, 0, sizeof(nt.OptionalHeader.DataDirectory) ); nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT].Size = sizeof(data.descr); @@ -2343,6 +2347,56 @@ static void test_import_resolution(void) if (tls_index_save != 9999 && sizeof(tls_init_code) > 1) ok( tls_init_fn_output == DLL_PROCESS_DETACH, "tls init function didn't run or got wrong reason: %d instead of %d\n", tls_init_fn_output, DLL_PROCESS_DETACH ); + break; + case 4: /* map with ntdll */ + case 5: /* map with ntdll, without IMAGE_FILE_DLL */ + case 6: /* map with ntdll, without IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE */ + hfile = CreateFileA(dll_name, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok( hfile != INVALID_HANDLE_VALUE, "CreateFile failed err %lu\n", GetLastError() ); + mapping = CreateFileMappingA( hfile, NULL, SEC_IMAGE | PAGE_READONLY, 0, 0, NULL ); + CloseHandle( hfile ); + if (test == 6 && + (nt_header_template.FileHeader.Machine == IMAGE_FILE_MACHINE_ARMNT || + nt_header_template.FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64)) + { + ok( !mapping, "CreateFileMappingA succeeded\n" ); + ok( GetLastError() == ERROR_BAD_EXE_FORMAT, "wrong error %lu\n", GetLastError() ); + break; + } + ok( mapping != 0, "CreateFileMappingA failed err %lu\n", GetLastError() ); + /* make sure that the address is not available */ + tmp = VirtualAlloc( (void *)nt.OptionalHeader.ImageBase, 0x10000, + MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE ); + mod = NULL; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSection( mapping, GetCurrentProcess(), (void **)&mod, 0, 0, &offset, + &size, 1 /* ViewShare */, 0, PAGE_READONLY ); + todo_wine_if (test < 6) + ok( status == (test == 6 ? STATUS_IMAGE_NOT_AT_BASE : STATUS_SUCCESS), + "NtMapViewOfSection failed %lx\n", status ); + ok( mod != (void *)nt.OptionalHeader.ImageBase, "loaded at image base %p\n", mod ); + pnt = pRtlImageNtHeader( mod ); + ptr = (void *)((char *)mod + page_size); + if (test == 6) + { + ok( (void *)pnt->OptionalHeader.ImageBase != mod, "not relocated from %p\n", mod ); + ok( (char *)ptr->tls.StartAddressOfRawData == (char *)nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data ), + "tls relocated %p / %p\n", (void *)ptr->tls.StartAddressOfRawData, + (char *)nt.OptionalHeader.ImageBase + DATA_RVA( data.tls_data )); + } + else todo_wine + { + ok( (void *)pnt->OptionalHeader.ImageBase == mod, "not at base %p / %p\n", + (void *)pnt->OptionalHeader.ImageBase, mod ); + ok( (char *)ptr->tls.StartAddressOfRawData == (char *)mod + DATA_RVA( data.tls_data ), + "tls not relocated %p / %p\n", (void *)ptr->tls.StartAddressOfRawData, + (char *)mod + DATA_RVA( data.tls_data )); + } + UnmapViewOfFile( mod ); + CloseHandle( mapping ); + if (tmp) VirtualFree( tmp, 0, MEM_RELEASE ); + break; } DeleteFileA( dll_name ); #undef DATA_RVA

1 0

Alexandre Julliard : kernel32/tests: Delete the correct manifest file.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: b862cc032c3336c0c29ad14427e963b4f5657867 URL: https://gitlab.winehq.org/wine/wine/-/commit/b862cc032c3336c0c29ad14427e963… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 17:44:34 2023 +0200 kernel32/tests: Delete the correct manifest file. --- dlls/kernel32/tests/actctx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index fb035567c6e..1a05278fae4 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -3427,7 +3427,7 @@ static void test_settings(void) create_manifest_file( "manifest_settings4.manifest", settings_manifest4, -1, NULL, NULL ); handle = test_create("manifest_settings4.manifest"); ok( handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %lu\n", GetLastError() ); - DeleteFileA( "manifest_settings3.manifest" ); + DeleteFileA( "manifest_settings4.manifest" ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) );

1 0

Alexandre Julliard : ntdll: Do an explicit mmap address search for any range not covering the entire address space.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 30c8da1c9dd8dcc1aee2d328a5fdf7edbf6c7978 URL: https://gitlab.winehq.org/wine/wine/-/commit/30c8da1c9dd8dcc1aee2d328a5fdf7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 14:13:56 2023 +0200 ntdll: Do an explicit mmap address search for any range not covering the entire address space. --- dlls/ntdll/unix/virtual.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f027c0e4b85..6ed44431c9b 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1361,7 +1361,7 @@ static void *map_free_area( void *base, void *end, size_t size, int top_down, in start = try_map_free_area( base, end, step, start, size, unix_prot ); if (!start) - ERR( "couldn't map free area in range %p-%p, size %p", base, end, (void *)size ); + ERR( "couldn't map free area in range %p-%p, size %p\n", base, end, (void *)size ); return start; } @@ -2031,7 +2031,7 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, goto done; } - if (limit_low || limit_high) + if (start > address_space_start || end < address_space_limit || top_down) { if (!(ptr = map_free_area( start, end, size, top_down, get_unix_prot(vprot), align_mask ))) return STATUS_NO_MEMORY;

1 0

Alexandre Julliard : ntdll: Add a helper to find a mapping address for a PE image.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 949920a7dcdb8d9451e2212247ca2165d5f0064a URL: https://gitlab.winehq.org/wine/wine/-/commit/949920a7dcdb8d9451e2212247ca21… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 15:19:49 2023 +0200 ntdll: Add a helper to find a mapping address for a PE image. --- dlls/ntdll/unix/virtual.c | 80 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 56 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 6ed44431c9b..25487d7c3cd 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -566,12 +566,12 @@ static void mmap_init( const struct preload_info *preload_info ) /*********************************************************************** * get_wow_user_space_limit */ -static void *get_wow_user_space_limit(void) +static ULONG_PTR get_wow_user_space_limit(void) { #ifdef _WIN64 - return (void *)(user_space_wow_limit & ~granularity_mask); + return user_space_wow_limit & ~granularity_mask; #endif - return user_space_limit; + return (ULONG_PTR)user_space_limit; } @@ -2595,7 +2595,7 @@ static void update_arm64x_mapping( struct file_view *view, IMAGE_NT_HEADERS *nt, * Map an executable (PE format) image into an existing view. * virtual_mutex must be held by caller. */ -static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filename, int fd, void *orig_base, +static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filename, int fd, pe_image_info_t *image_info, USHORT machine, int shared_fd, BOOL removable ) { @@ -2791,7 +2791,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena } #ifdef VALGRIND_LOAD_PDB_DEBUGINFO - VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - (char *)orig_base); + VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - (char *)wine_server_get_ptr( image_info->base )); #endif return STATUS_SUCCESS; } @@ -2845,6 +2845,54 @@ static unsigned int get_mapping_info( HANDLE handle, ACCESS_MASK access, unsigne } +/*********************************************************************** + * map_image_view + * + * Map a view for a PE image at an appropriate address. + */ +static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *image_info, SIZE_T size, + ULONG_PTR limit_low, ULONG_PTR limit_high, ULONG alloc_type ) +{ + unsigned int vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; + void *base = wine_server_get_ptr( image_info->base ); + NTSTATUS status; + ULONG_PTR start, end; + + limit_low = max( limit_low, (ULONG_PTR)address_space_start ); /* make sure the DOS area remains free */ + if (!limit_high) limit_high = (ULONG_PTR)user_space_limit; + + /* first try the specified base */ + + if (base && (ULONG_PTR)base == image_info->base) + { + status = map_view( view_ret, base, size, alloc_type, vprot, limit_low, limit_high, 0 ); + if (!status) return status; + } + + /* then some appropriate address range */ + + if (image_info->base >= limit_4g) + { + start = max( limit_low, limit_4g ); + end = limit_high; + } + else + { + start = limit_low; + end = min( limit_high, get_wow_user_space_limit() ); + } + if (start < end && (start != limit_low || end != limit_high)) + { + status = map_view( view_ret, NULL, size, alloc_type, vprot, start, end, 0 ); + if (!status) return status; + } + + /* then any suitable address */ + + return map_view( view_ret, NULL, size, alloc_type, vprot, limit_low, limit_high, 0 ); +} + + /*********************************************************************** * virtual_map_image * @@ -2855,14 +2903,12 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size USHORT machine, pe_image_info_t *image_info, WCHAR *filename, BOOL is_builtin ) { - unsigned int vprot = SEC_IMAGE | SEC_FILE | VPROT_COMMITTED | VPROT_READ | VPROT_EXEC | VPROT_WRITECOPY; int unix_fd = -1, needs_close; int shared_fd = -1, shared_needs_close = 0; SIZE_T size = image_info->map_size; struct file_view *view; unsigned int status; sigset_t sigset; - void *base; if ((status = server_get_unix_fd( mapping, 0, &unix_fd, &needs_close, NULL, NULL ))) return status; @@ -2874,26 +2920,12 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size return status; } - status = STATUS_INVALID_PARAMETER; server_enter_uninterrupted_section( &virtual_mutex, &sigset ); - base = wine_server_get_ptr( image_info->base ); - if ((ULONG_PTR)base != image_info->base) base = NULL; - - limit_low = max( limit_low, (ULONG_PTR)address_space_start ); /* make sure the DOS area remains free */ - status = map_view( &view, base, size, alloc_type, vprot, limit_low, limit_high, 0 ); - if (status && limit_low < limit_4g) - { - if ((ULONG_PTR)base >= limit_4g) status = map_view( &view, NULL, size, alloc_type, vprot, - limit_4g, limit_high, 0 ); - else if (limit_high > limit_2g) status = map_view( &view, NULL, size, alloc_type, vprot, - limit_low, limit_2g - 1, 0 ); - } - if (status) status = map_view( &view, NULL, size, alloc_type, vprot, limit_low, limit_high, 0 ); + status = map_image_view( &view, image_info, size, limit_low, limit_high, alloc_type ); if (status) goto done; - status = map_image_into_view( view, filename, unix_fd, base, image_info, - machine, shared_fd, needs_close ); + status = map_image_into_view( view, filename, unix_fd, image_info, machine, shared_fd, needs_close ); if (status == STATUS_SUCCESS) { SERVER_START_REQ( map_image_view ) @@ -4382,7 +4414,7 @@ static NTSTATUS get_extended_params( const MEM_EXTENDED_PARAMETER *parameters, U MEM_ADDRESS_REQUIREMENTS *r = parameters[i].Pointer; ULONG_PTR limit; - if (is_wow64()) limit = (ULONG_PTR)get_wow_user_space_limit(); + if (is_wow64()) limit = get_wow_user_space_limit(); else limit = (ULONG_PTR)user_space_limit; if (r->Alignment)

1 0

Alexandre Julliard : ntdll: Always allocate dynamically relocatable dlls top-down.
by Alexandre Julliard 03 Oct '23

03 Oct '23

Module: wine Branch: master Commit: 25db1c5d49dc339e9b5a25514c198a524bd05484 URL: https://gitlab.winehq.org/wine/wine/-/commit/25db1c5d49dc339e9b5a25514c198a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 3 15:23:31 2023 +0200 ntdll: Always allocate dynamically relocatable dlls top-down. --- dlls/ntdll/unix/virtual.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 25487d7c3cd..26bb52bc792 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2857,6 +2857,8 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im void *base = wine_server_get_ptr( image_info->base ); NTSTATUS status; ULONG_PTR start, end; + BOOL top_down = (image_info->image_charact & IMAGE_FILE_DLL) && + (image_info->image_flags & IMAGE_FLAGS_ImageDynamicallyRelocated); limit_low = max( limit_low, (ULONG_PTR)address_space_start ); /* make sure the DOS area remains free */ if (!limit_high) limit_high = (ULONG_PTR)user_space_limit; @@ -2865,6 +2867,7 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im if (base && (ULONG_PTR)base == image_info->base) { + if (top_down) alloc_type |= MEM_TOP_DOWN; status = map_view( view_ret, base, size, alloc_type, vprot, limit_low, limit_high, 0 ); if (!status) return status; } @@ -2883,13 +2886,13 @@ static NTSTATUS map_image_view( struct file_view **view_ret, pe_image_info_t *im } if (start < end && (start != limit_low || end != limit_high)) { - status = map_view( view_ret, NULL, size, alloc_type, vprot, start, end, 0 ); + status = map_view( view_ret, NULL, size, top_down ? MEM_TOP_DOWN : 0, vprot, start, end, 0 ); if (!status) return status; } /* then any suitable address */ - return map_view( view_ret, NULL, size, alloc_type, vprot, limit_low, limit_high, 0 ); + return map_view( view_ret, NULL, size, top_down ? MEM_TOP_DOWN : 0, vprot, limit_low, limit_high, 0 ); }

1 0