February 2021 - Wine-commits

Francois Gouget : tests: Trace the filename in winetest_wait_child_process().
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 092130e2aa53bce72c2a38cb90906c6c01c4867d URL: https://source.winehq.org/git/wine.git/?a=commit;h=092130e2aa53bce72c2a38cb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:11:49 2021 +0100 tests: Trace the filename in winetest_wait_child_process(). We want the filename next to the line number, just like in every other trace. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/wine/test.h b/include/wine/test.h index 787fea0ba24..c10050012b6 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -507,14 +507,14 @@ void winetest_wait_child_process( HANDLE process ) { DWORD pid = GetProcessId( process ); printf( "%s:%d:%s unhandled exception %08x in child process %04x\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code, pid ); InterlockedIncrement( &failures ); } else if (exit_code) { printf( "%s:%d:%s %u failures in child process\n", - current_test->name, data->current_line, winetest_elapsed(), + data->current_file, data->current_line, winetest_elapsed(), exit_code ); while (exit_code-- > 0) InterlockedIncrement(&failures);

1 0

Francois Gouget : tests: Add ignore_exceptions().
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 4ac37c4e24cf980717a982c22076cc4a5adffdd5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac37c4e24cf980717a982c2… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:14:29 2021 +0100 tests: Add ignore_exceptions(). This lets tests signal that for a while exceptions are expected and should not be counted as test failures. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/test.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/wine/test.h b/include/wine/test.h index c10050012b6..078b0147c4f 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -61,6 +61,7 @@ extern const char *winetest_platform; extern void winetest_set_location( const char* file, int line ); extern void winetest_subtest( const char* name ); +extern void winetest_ignore_exceptions( BOOL ignore ); extern void winetest_start_todo( int is_todo ); extern int winetest_loop_todo(void); extern void winetest_end_todo(void); @@ -97,6 +98,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #ifdef WINETEST_NO_LINE_NUMBERS # define subtest_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_win_skip @@ -104,6 +106,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT # define wait_child_process_(file, line) (winetest_set_location(file, 0), 0) ? (void)0 : winetest_wait_child_process #else # define subtest_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_subtest +# define ignore_exceptions_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ignore_exceptions # define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok # define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip # define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip @@ -112,6 +115,7 @@ extern void __winetest_cdecl winetest_trace( const char *msg, ... ) __WINE_PRINT #endif #define subtest subtest_(__FILE__, __LINE__) +#define ignore_exceptions ignore_exceptions_(__FILE__, __LINE__) #define ok ok_(__FILE__, __LINE__) #define skip skip_(__FILE__, __LINE__) #define win_skip win_skip_(__FILE__, __LINE__) @@ -298,6 +302,14 @@ void winetest_subtest( const char* name ) data->current_file, data->current_line, winetest_elapsed(), name ); } +void winetest_ignore_exceptions( BOOL ignore ) +{ + struct tls_data *data = get_tls_data(); + printf( "%s:%d:%s IgnoreExceptions=%d\n", + data->current_file, data->current_line, winetest_elapsed(), + ignore ? 1 : 0 ); +} + int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition;

1 0

Francois Gouget : kernel32/tests: Ignore exceptions while testing winedbg.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 5007f6fa35db9e6d1f0623bde18d6f56546e31e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5007f6fa35db9e6d1f0623bd… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 12 17:14:52 2021 +0100 kernel32/tests: Ignore exceptions while testing winedbg. test_ExitCode() has one test that makes sure winedbg is non-interactive when ShowCrashDialog is 0. This causes winedbg to output an "unhandled exception" message which should not be counted as a test failure. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/debugger.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index d8eb61fceab..f035d9165c7 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -754,7 +754,9 @@ static void test_ExitCode(void) reg_save_value crash_dlg_value; save_value(hkeyWinedbg, "ShowCrashDialog", &crash_dlg_value); RegSetValueExA(hkeyWinedbg, "ShowCrashDialog", 0, REG_DWORD, (BYTE *)&zero, sizeof(DWORD)); + ignore_exceptions(TRUE); crash_and_winedbg(hkey, test_exe); + ignore_exceptions(FALSE); restore_value(hkeyWinedbg, &crash_dlg_value); RegCloseKey(hkeyWinedbg); }

1 0

Paul Gofman : msvcrt: Ignore inherited FDs with invalid handles in msvcrt_init_io().
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 611742d31fb042d642d5ac30eebf0d73154a3481 URL: https://source.winehq.org/git/wine.git/?a=commit;h=611742d31fb042d642d5ac30… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Feb 15 17:52:16 2021 +0300 msvcrt: Ignore inherited FDs with invalid handles in msvcrt_init_io(). The process std handles should be preserved in this case. Fixes error on startup in "Re:ZERO -Starting Life in Another World- The Prophecy of the Throne" launcher. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 2 +- dlls/msvcrt/tests/file.c | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 73e1a82476f..89d6e7d721f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -586,7 +586,7 @@ void msvcrt_init_io(void) count = min(count, MSVCRT_MAX_FILES); for (i = 0; i < count; i++) { - if ((*wxflag_ptr & WX_OPEN) && *handle_ptr != INVALID_HANDLE_VALUE) + if ((*wxflag_ptr & WX_OPEN) && GetFileType(*handle_ptr) != FILE_TYPE_UNKNOWN) { fdinfo = get_ioinfo_alloc_fd(i); if(fdinfo != &MSVCRT___badioinfo) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0cf8bad124f..fb242d81282 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1454,13 +1454,27 @@ static void test_file_write_read( void ) free(tempf); } -static void test_file_inherit_child(const char* fd_s) +static void test_file_inherit_child(const char* fd_s, const char *handle_str) { + HANDLE handle_value; int fd = atoi(fd_s); + HANDLE *handle_ptr; + unsigned int count; char buffer[32]; + STARTUPINFOA si; int ret; - ret =write(fd, "Success", 8); + GetStartupInfoA(&si); + count = *(unsigned *)si.lpReserved2; + if (handle_str) + { + ok(count == 3, "Got unexpected count %u.\n", count); + sscanf(handle_str, "%p", &handle_value); + handle_ptr = (HANDLE *)(si.lpReserved2 + sizeof(unsigned) + count); + ok(handle_value == handle_ptr[1], "Got unexpected handle %p.\n", handle_ptr[1]); + } + + ret = write(fd, "Success", 8); ok( ret == 8, "Couldn't write in child process on %d (%s)\n", fd, strerror(errno)); lseek(fd, 0, SEEK_SET); ok(read(fd, buffer, sizeof (buffer)) == 8, "Couldn't read back the data\n"); @@ -1643,6 +1657,22 @@ static void test_file_inherit( const char* selfname ) test_stdout_handle( &startup, cmdline, handles[1], TRUE, "large size block" ); CloseHandle( handles[1] ); DeleteFileA("fdopen.tst"); + + /* test inherit block with invalid handle */ + handles[1] = INVALID_HANDLE_VALUE; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "INVALID_HANDLE_VALUE stdout handle" ); + + handles[1] = NULL; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "NULL stdout handle" ); + + handles[1] = (void *)0xdeadbeef; + create_io_inherit_block( &startup, 3, handles ); + sprintf(cmdline, "%s file inherit 1 %p", selfname, handles[1]); + test_stdout_handle( &startup, cmdline, NULL, FALSE, "invalid stdout handle" ); } static void test_invalid_stdin_child( void ) @@ -2714,7 +2744,7 @@ START_TEST(file) if (arg_c >= 3) { if (strcmp(arg_v[2], "inherit") == 0) - test_file_inherit_child(arg_v[3]); + test_file_inherit_child(arg_v[3], arg_c > 4 ? arg_v[4] : NULL); else if (strcmp(arg_v[2], "inherit_no") == 0) test_file_inherit_child_no(arg_v[3]); else if (strcmp(arg_v[2], "pipes") == 0)

1 0

Doug Kingston : winealsa: Add card number to duplicate device descriptions.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: a9c8196e97ec255f4f69d005ea1cbf8fcf2537e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9c8196e97ec255f4f69d005… Author: Doug Kingston <dpk(a)google.com> Date: Mon Feb 15 10:26:13 2021 -0600 winealsa: Add card number to duplicate device descriptions. Devices with the same device description cannot be distinguished. Add card number to the description of second and subsequent instances of devices with the same description. This mimics Windows behavior. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Doug Kingston <dpk(a)google.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 318350471db..cf2edcc7454 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -22,6 +22,8 @@ #include "config.h" #include <stdarg.h> +#define _GNU_SOURCE +#include <stdio.h> #include <math.h> #include "windef.h" @@ -521,6 +523,36 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id } } +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -564,6 +596,17 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, cardpath, err, snd_strerror(err)); alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); }else{ + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical card names, second and subsequent instances get + * card number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR));

1 0

Bernhard Reiter : imagehlp: Partially implement BindImageEx().
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: d129a89d228190baeb8983ecfc18e093255148b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d129a89d228190baeb8983ec… Author: Bernhard Reiter <ockham(a)raz.or.at> Date: Sat Feb 13 11:30:11 2021 -0600 imagehlp: Partially implement BindImageEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=3591 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/modify.c | 91 +++++++++++++++++++++++++++++++++++++++++---- dlls/imagehlp/tests/image.c | 10 ++--- 2 files changed, 88 insertions(+), 13 deletions(-) diff --git a/dlls/imagehlp/modify.c b/dlls/imagehlp/modify.c index 434a666ae94..d740d221bfc 100644 --- a/dlls/imagehlp/modify.c +++ b/dlls/imagehlp/modify.c @@ -44,15 +44,90 @@ BOOL WINAPI BindImage( /*********************************************************************** * BindImageEx (IMAGEHLP.@) */ -BOOL WINAPI BindImageEx( - DWORD Flags, PCSTR ImageName, PCSTR DllPath, PCSTR SymbolPath, - PIMAGEHLP_STATUS_ROUTINE StatusRoutine) +BOOL WINAPI BindImageEx(DWORD flags, const char *module, const char *dll_path, + const char *symbol_path, PIMAGEHLP_STATUS_ROUTINE cb) { - FIXME("(%d, %s, %s, %s, %p): stub\n", - Flags, debugstr_a(ImageName), debugstr_a(DllPath), - debugstr_a(SymbolPath), StatusRoutine - ); - return TRUE; + const IMAGE_IMPORT_DESCRIPTOR *import; + LOADED_IMAGE image; + ULONG size; + + TRACE("flags %#x, module %s, dll_path %s, symbol_path %s, cb %p.\n", + flags, debugstr_a(module), debugstr_a(dll_path), debugstr_a(symbol_path), cb); + + if (!(flags & BIND_NO_UPDATE)) + FIXME("Image modification is not implemented.\n"); + if (flags & ~BIND_NO_UPDATE) + FIXME("Ignoring flags %#x.\n", flags); + + if (!MapAndLoad(module, dll_path, &image, TRUE, TRUE)) + return FALSE; + + if (!(import = ImageDirectoryEntryToData(image.MappedAddress, FALSE, IMAGE_DIRECTORY_ENTRY_IMPORT, &size))) + { + UnMapAndLoad(&image); + return TRUE; /* no imports */ + } + + if (image.FileHeader->OptionalHeader.Magic != IMAGE_NT_OPTIONAL_HDR_MAGIC) + { + FIXME("Unhandled architecture %#x.\n", image.FileHeader->OptionalHeader.Magic); + UnMapAndLoad(&image); + return TRUE; + } + + for (; import->Name && import->FirstThunk; ++import) + { + char full_path[MAX_PATH]; + IMAGE_THUNK_DATA *thunk; + const char *dll_name; + DWORD thunk_rva; + + if (!(dll_name = ImageRvaToVa(image.FileHeader, image.MappedAddress, import->Name, 0))) + { + ERR("Failed to get VA for import name RVA %#x.\n", import->Name); + continue; + } + + if (cb) cb(BindImportModule, module, dll_name, 0, 0); + + if (!SearchPathA(dll_path, dll_name, 0, sizeof(full_path), full_path, 0)) + { + ERR("Import %s was not found.\n", debugstr_a(dll_path)); + continue; + } + + thunk_rva = import->OriginalFirstThunk ? import->OriginalFirstThunk : import->FirstThunk; + if (!(thunk = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk_rva, 0))) + { + ERR("Failed to get VA for import thunk RVA %#x.\n", thunk_rva); + continue; + } + + for (; thunk->u1.Ordinal; ++thunk) + { + if (IMAGE_SNAP_BY_ORDINAL(thunk->u1.Ordinal)) + { + /* FIXME: We apparently need to subtract the actual module's + * ordinal base. */ + FIXME("Ordinal imports are not implemented.\n"); + } + else + { + IMAGE_IMPORT_BY_NAME *name; + + if (!(name = ImageRvaToVa(image.FileHeader, image.MappedAddress, thunk->u1.AddressOfData, 0))) + { + ERR("Failed to get VA for name RVA %#x.\n", thunk->u1.AddressOfData); + continue; + } + + if (cb) cb(BindImportProcedure, module, full_path, 0, (ULONG_PTR)name->Name); + } + } + } + + UnMapAndLoad(&image); + return TRUE; } diff --git a/dlls/imagehlp/tests/image.c b/dlls/imagehlp/tests/image.c index 888744ac203..e2aa9485510 100644 --- a/dlls/imagehlp/tests/image.c +++ b/dlls/imagehlp/tests/image.c @@ -372,7 +372,7 @@ static BOOL WINAPI bind_image_cb(IMAGEHLP_STATUS_REASON reason, const char *file char full_path[MAX_PATH]; BOOL ret; - ok(!!va, "expected nonzero VA\n"); + todo_wine ok(!!va, "expected nonzero VA\n"); ret = SearchPathA(NULL, last_module, ".dll", sizeof(full_path), full_path, NULL); ok(ret, "got error %u\n", GetLastError()); ok(!strcmp(module, full_path), "expected %s, got %s\n", debugstr_a(full_path), debugstr_a(module)); @@ -408,15 +408,15 @@ static void test_bind_image_ex(void) SetLastError(0xdeadbeef); ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, "nonexistent.dll", 0, 0, bind_image_cb); - todo_wine ok(!ret, "expected failure\n"); - todo_wine ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND || GetLastError() == ERROR_INVALID_PARAMETER, "got error %u\n", GetLastError()); ret = BindImageEx(BIND_ALL_IMAGES | BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE, filename, NULL, NULL, bind_image_cb); ok(ret, "got error %u\n", GetLastError()); - todo_wine ok(got_SysAllocString == 1, "got %u imports of SysAllocString\n", got_SysAllocString); - todo_wine ok(got_GetOpenFileNameA == 1, "got %u imports of GetOpenFileNameA\n", got_GetOpenFileNameA); + ok(got_SysAllocString == 1, "got %u imports of SysAllocString\n", got_SysAllocString); + ok(got_GetOpenFileNameA == 1, "got %u imports of GetOpenFileNameA\n", got_GetOpenFileNameA); todo_wine ok(got_SHRegGetIntW == 1, "got %u imports of SHRegGetIntW\n", got_SHRegGetIntW); ret = DeleteFileA(filename);

1 0

Alexandre Julliard : server: Store a filename for memory views of .so dlls.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 9ce326eea026f99ecc7c1e45084e8fd53105e8a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9ce326eea026f99ecc7c1e45… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:24:15 2021 +0100 server: Store a filename for memory views of .so dlls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 9 +++++---- dlls/ntdll/unix/unix_private.h | 3 ++- dlls/ntdll/unix/virtual.c | 5 +++-- include/wine/server_protocol.h | 3 ++- server/mapping.c | 25 +++++++++++++++++++------ server/protocol.def | 1 + server/trace.c | 3 ++- 7 files changed, 34 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index e8853415205..b82bc10485b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -981,7 +981,8 @@ static void fill_builtin_image_info( void *module, pe_image_info_t *info ) /*********************************************************************** * dlopen_dll */ -static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_info_t *image_info ) +static NTSTATUS dlopen_dll( const char *so_name, UNICODE_STRING *nt_name, + void **ret_module, pe_image_info_t *image_info ) { struct builtin_module *builtin; void *module, *handle; @@ -1028,7 +1029,7 @@ static NTSTATUS dlopen_dll( const char *so_name, void **ret_module, pe_image_inf dlclose( handle ); return STATUS_NO_MEMORY; } - virtual_create_builtin_view( module, image_info ); + virtual_create_builtin_view( module, nt_name, image_info ); *ret_module = module; return STATUS_SUCCESS; @@ -1107,7 +1108,7 @@ static NTSTATUS CDECL load_so_dll( UNICODE_STRING *nt_name, void **module ) len = nt_name->Length / sizeof(WCHAR); if (len > 3 && !wcsicmp( nt_name->Buffer + len - 3, soW )) nt_name->Length -= 3 * sizeof(WCHAR); - status = dlopen_dll( unix_name, module, &info ); + status = dlopen_dll( unix_name, nt_name, module, &info ); free( unix_name ); return status; } @@ -1261,7 +1262,7 @@ static NTSTATUS open_builtin_file( char *name, OBJECT_ATTRIBUTES *attr, HANDLE * { pe_image_info_t info; - if (!dlopen_dll( name, module, &info )) + if (!dlopen_dll( name, attr->ObjectName, module, &info )) { virtual_fill_image_information( &info, image_info ); status = STATUS_SUCCESS; diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 292a38043dd..af8a14a8c65 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -179,7 +179,8 @@ extern void *anon_mmap_alloc( size_t size, int prot ) DECLSPEC_HIDDEN; extern void virtual_init(void) DECLSPEC_HIDDEN; extern ULONG_PTR get_system_affinity_mask(void) DECLSPEC_HIDDEN; extern void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) DECLSPEC_HIDDEN; -extern NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) DECLSPEC_HIDDEN; +extern NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, + pe_image_info_t *info ) DECLSPEC_HIDDEN; extern TEB *virtual_alloc_first_teb(void) DECLSPEC_HIDDEN; extern NTSTATUS virtual_alloc_teb( TEB **ret_teb ) DECLSPEC_HIDDEN; extern void virtual_free_teb( TEB *teb ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index e0346a28ea3..c35f9c2fc07 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2483,7 +2483,7 @@ void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) /*********************************************************************** * virtual_create_builtin_view */ -NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) +NTSTATUS virtual_create_builtin_view( void *module, const UNICODE_STRING *nt_name, pe_image_info_t *info ) { NTSTATUS status; sigset_t sigset; @@ -2500,7 +2500,7 @@ NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) VPROT_COMMITTED | VPROT_READ | VPROT_WRITECOPY | VPROT_EXEC ); if (!status) { - TRACE( "created %p-%p\n", base, (char *)base + size ); + TRACE( "created %p-%p for %s\n", base, (char *)base + size, debugstr_us(nt_name) ); /* The PE header is always read-only, no write, no execute. */ set_page_vprot( base, page_size, VPROT_COMMITTED | VPROT_READ ); @@ -2521,6 +2521,7 @@ NTSTATUS virtual_create_builtin_view( void *module, pe_image_info_t *info ) req->base = wine_server_client_ptr( view->base ); req->size = size; wine_server_add_data( req, info, sizeof(*info) ); + wine_server_add_data( req, nt_name->Buffer, nt_name->Length ); status = wine_server_call( req ); } SERVER_END_REQ; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 9b9626c1c84..d2a361df26d 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1923,6 +1923,7 @@ struct map_view_request mem_size_t size; file_pos_t start; /* VARARG(image,pe_image_info); */ + /* VARARG(name,unicode_str); */ }; struct map_view_reply { @@ -6265,7 +6266,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 674 +#define SERVER_PROTOCOL_VERSION 675 /* ### protocol_version end ### */ diff --git a/server/mapping.c b/server/mapping.c index 0e97391f74b..17c7ca26b3a 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -134,6 +134,8 @@ struct memory_view client_ptr_t base; /* view base address (in process addr space) */ mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ + data_size_t namelen; + WCHAR name[1]; /* filename for .so dll image views */ }; @@ -1000,6 +1002,12 @@ const pe_image_info_t *get_view_image_info( const struct memory_view *view, clie /* get the file name for a mapped view */ int get_view_nt_name( const struct memory_view *view, struct unicode_str *name ) { + if (view->namelen) /* .so builtin */ + { + name->str = view->name; + name->len = view->namelen; + return 1; + } if (!view->fd) return 0; get_nt_name( view->fd, name ); return 1; @@ -1157,6 +1165,7 @@ DECL_HANDLER(map_view) { struct mapping *mapping = NULL; struct memory_view *view; + data_size_t namelen = 0; if (!req->size || (req->base & page_mask) || req->base + req->size < req->base) /* overflow */ { @@ -1175,13 +1184,16 @@ DECL_HANDLER(map_view) if (!req->mapping) /* image mapping for a .so dll */ { - if (!(view = mem_alloc( sizeof(*view) ))) return; + if (get_req_data_size() > sizeof(view->image)) namelen = get_req_data_size() - sizeof(view->image); + if (!(view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) return; memset( view, 0, sizeof(*view) ); - view->base = req->base; - view->size = req->size; - view->start = req->start; - view->flags = SEC_IMAGE; + view->base = req->base; + view->size = req->size; + view->start = req->start; + view->flags = SEC_IMAGE; + view->namelen = namelen; memcpy( &view->image, get_req_data(), min( sizeof(view->image), get_req_data_size() )); + memcpy( view->name, (pe_image_info_t *)get_req_data() + 1, namelen ); add_process_view( current, view ); return; } @@ -1204,12 +1216,13 @@ DECL_HANDLER(map_view) goto done; } - if ((view = mem_alloc( sizeof(*view) ))) + if ((view = mem_alloc( offsetof( struct memory_view, name[namelen] )))) { view->base = req->base; view->size = req->size; view->start = req->start; view->flags = mapping->flags; + view->namelen = namelen; view->fd = !is_fd_removable( mapping->fd ) ? (struct fd *)grab_object( mapping->fd ) : NULL; view->committed = mapping->committed ? (struct ranges *)grab_object( mapping->committed ) : NULL; view->shared = mapping->shared ? (struct shared_map *)grab_object( mapping->shared ) : NULL; diff --git a/server/protocol.def b/server/protocol.def index caed5c37352..f85826cc277 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1540,6 +1540,7 @@ enum server_fd_type mem_size_t size; /* view size */ file_pos_t start; /* start offset in mapping */ VARARG(image,pe_image_info);/* image info for .so builtins */ + VARARG(name,unicode_str); /* image filename for .so builtins */ @END diff --git a/server/trace.c b/server/trace.c index 8984b75590d..5265cc69a15 100644 --- a/server/trace.c +++ b/server/trace.c @@ -1308,7 +1308,7 @@ static void dump_varargs_pe_image_info( const char *prefix, data_size_t size ) info.header_size, info.file_size, info.checksum ); dump_client_cpu( ",cpu=", &info.cpu ); fputc( '}', stderr ); - remove_data( size ); + remove_data( min( size, sizeof(info) )); } static void dump_varargs_rawinput_devices(const char *prefix, data_size_t size ) @@ -2158,6 +2158,7 @@ static void dump_map_view_request( const struct map_view_request *req ) dump_uint64( ", size=", &req->size ); dump_uint64( ", start=", &req->start ); dump_varargs_pe_image_info( ", image=", cur_size ); + dump_varargs_unicode_str( ", name=", cur_size ); } static void dump_unmap_view_request( const struct unmap_view_request *req )

1 0

Alexandre Julliard : ntdll: Allocate the initial process parameters on the Unix side.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 0d3972ce8ab4a5f7db4ba97161cc6c4c3fdd19f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d3972ce8ab4a5f7db4ba971… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:30:28 2021 +0100 ntdll: Allocate the initial process parameters on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 89 +++++++----------------- dlls/ntdll/unix/env.c | 150 ++++++++++++++++++++++++++++++++++------- dlls/ntdll/unix/loader.c | 2 +- dlls/ntdll/unix/unix_private.h | 2 +- dlls/ntdll/unixlib.h | 3 +- 5 files changed, 151 insertions(+), 95 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0d3972ce8ab4a5f7db4b…

1 0

Alexandre Julliard : ntdll: Set the initial environment and command line in the process parameters on the Unix side.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 528f9d3217c2eed9ba8a8c643668660a9a047d31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=528f9d3217c2eed9ba8a8c64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 12:43:56 2021 +0100 ntdll: Set the initial environment and command line in the process parameters on the Unix side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 224 +++++++++-------------------------------- dlls/ntdll/unix/env.c | 174 ++++++++++++++++++++++++++++---- dlls/ntdll/unix/loader.c | 3 - dlls/ntdll/unix/unix_private.h | 3 - dlls/ntdll/unixlib.h | 5 +- 5 files changed, 198 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=528f9d3217c2eed9ba8a…

1 0

Alexandre Julliard : ntdll: Also set the dynamic environment strings in the initial parameters.
by Alexandre Julliard 15 Feb '21

15 Feb '21

Module: wine Branch: master Commit: 0a6f070f5ebb9b2013fa4ba24dd7d8c16399cf71 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a6f070f5ebb9b2013fa4ba2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 15 15:52:48 2021 +0100 ntdll: Also set the dynamic environment strings in the initial parameters. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/env.c | 17 +---- dlls/ntdll/unix/env.c | 156 +++++++++++++++++++++++++---------------- dlls/ntdll/unix/loader.c | 1 - dlls/ntdll/unix/unix_private.h | 1 - dlls/ntdll/unixlib.h | 3 +- 5 files changed, 96 insertions(+), 82 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a6f070f5ebb9b2013fa…

1 0