- Wine-Commits - list.winehq.org

Eric Pouech : kernelbase: Let GetModuleBaseName succeed on 64bit modules in wow64.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 07efff4e9ff3f3cb59da07c61ce80b25932ec957 URL: https://gitlab.winehq.org/wine/wine/-/commit/07efff4e9ff3f3cb59da07c61ce80b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:49 2023 +0100 kernelbase: Let GetModuleBaseName succeed on 64bit modules in wow64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 23 ++++++++++++++++------- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index c4c1bfa59e2..d34268c0828 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -876,6 +876,13 @@ static BOOL get_ldr_module32( HANDLE process, HMODULE module, LDR_DATA_TABLE_ENT struct module_iterator iter; INT ret; +#ifdef _WIN64 + if ((ULONG_PTR)module >> 32) + { + SetLastError( ERROR_INVALID_HANDLE ); + return FALSE; + } +#endif if (!init_module_iterator( &iter, process, TRUE )) return FALSE; while ((ret = module_iterator_next( &iter )) > 0) @@ -1320,7 +1327,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameA( HANDLE process, HMODULE modul DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameW( HANDLE process, HMODULE module, WCHAR *name, DWORD size ) { - BOOL wow64; + BOOL wow64, found = FALSE; if (!IsWow64Process( process, &wow64 )) return 0; @@ -1328,13 +1335,15 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleBaseNameW( HANDLE process, HMODULE modul { LDR_DATA_TABLE_ENTRY32 ldr_module32; - if (!get_ldr_module32(process, module, &ldr_module32)) return 0; - size = min( ldr_module32.BaseDllName.Length / sizeof(WCHAR), size ); - if (!ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.BaseDllName.Buffer, - name, size * sizeof(WCHAR), NULL )) - return 0; + if (get_ldr_module32(process, module, &ldr_module32)) + { + size = min( ldr_module32.BaseDllName.Length / sizeof(WCHAR), size ); + if (ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.BaseDllName.Buffer, + name, size * sizeof(WCHAR), NULL )) + found = TRUE; + } } - else + if (!found) { LDR_DATA_TABLE_ENTRY ldr_module; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 71eadc7114e..15b168cf83f 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -241,7 +241,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap case LIST_MODULES_64BIT: break; } ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); - todo_wine_if(fail) ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); todo_wine_if(fail)

1 0

Eric Pouech : include: Add manifest constants for EnumProcessModulesEx.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 20e7eb5eba8f20f7e050a12aa754e7a3473426fc URL: https://gitlab.winehq.org/wine/wine/-/commit/20e7eb5eba8f20f7e050a12aa754e7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:43 2023 +0100 include: Add manifest constants for EnumProcessModulesEx. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/psapi.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/psapi.h b/include/psapi.h index 66e660b2435..6dcb783934e 100644 --- a/include/psapi.h +++ b/include/psapi.h @@ -137,6 +137,12 @@ extern "C" { #define GetProcessImageFileNameW K32GetProcessImageFileNameW #endif +/* filter flags for EnumProcessModulesEx */ +#define LIST_MODULES_32BIT 0x01 +#define LIST_MODULES_64BIT 0x02 +#define LIST_MODULES_ALL 0x03 +#define LIST_MODULES_DEFAULT 0x00 + BOOL WINAPI EnumProcesses(DWORD*, DWORD, DWORD*); BOOL WINAPI EnumProcessModules(HANDLE, HMODULE*, DWORD, LPDWORD); BOOL WINAPI EnumProcessModulesEx(HANDLE, HMODULE*, DWORD, LPDWORD, DWORD);

1 0

Eric Pouech : kernelbase: Let GetModuleFileNameEx succeed on 64bit modules in wow64.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: c66e876037b06b6fcc6faf12400fe55321bbe72c URL: https://gitlab.winehq.org/wine/wine/-/commit/c66e876037b06b6fcc6faf12400fe5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:50 2023 +0100 kernelbase: Let GetModuleFileNameEx succeed on 64bit modules in wow64. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 16 +++++++++------- dlls/psapi/tests/psapi_main.c | 1 - 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index d34268c0828..fa2262daa2c 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -1409,7 +1409,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExA( HANDLE process, HMODULE mod DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE module, WCHAR *name, DWORD size ) { - BOOL wow64; + BOOL wow64, found = FALSE; DWORD len; if (!size) return 0; @@ -1420,13 +1420,15 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetModuleFileNameExW( HANDLE process, HMODULE mod { LDR_DATA_TABLE_ENTRY32 ldr_module32; - if (!get_ldr_module32( process, module, &ldr_module32 )) return 0; - len = ldr_module32.FullDllName.Length / sizeof(WCHAR); - if (!ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, - name, min( len, size ) * sizeof(WCHAR), NULL )) - return 0; + if (get_ldr_module32( process, module, &ldr_module32 )) + { + len = ldr_module32.FullDllName.Length / sizeof(WCHAR); + if (ReadProcessMemory( process, (void *)(DWORD_PTR)ldr_module32.FullDllName.Buffer, + name, min( len, size ) * sizeof(WCHAR), NULL )) + found = TRUE; + } } - else + if (!found) { LDR_DATA_TABLE_ENTRY ldr_module; diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index 15b168cf83f..2237bad3665 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -243,7 +243,6 @@ static BOOL test_EnumProcessModulesEx_snapshot(HANDLE proc, struct moduleex_snap ret = GetModuleBaseNameA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); ok(ret, "GetModuleBaseName failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); ret = GetModuleFileNameExA(proc, mxsnap[i].modules[j], buffer, sizeof(buffer)); - todo_wine_if(fail) ok(ret, "GetModuleFileNameEx failed: %lu (%u/%lu=%p)\n", GetLastError(), j, mxsnap[i].num_modules, mxsnap[i].modules[j]); memset(&info, 0, sizeof(info)); ret = GetModuleInformation(proc, mxsnap[i].modules[j], &info, sizeof(info));

1 0

Eric Pouech : kernelbase: Implement EnumProcessModulesEx.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: c56971ffbd0c0bbe1658fa3badf5f787bc1ad182 URL: https://gitlab.winehq.org/wine/wine/-/commit/c56971ffbd0c0bbe1658fa3badf5f7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 30 13:45:47 2023 +0100 kernelbase: Implement EnumProcessModulesEx. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/kernelbase/debug.c | 149 +++++++++++++++++++++++++++++++++++++++--- dlls/psapi/tests/psapi_main.c | 31 +++++---- 2 files changed, 159 insertions(+), 21 deletions(-)

1 0

Brendan Shanks : ntdll: Respect zero_bits/limit when mapping a PE file.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: c4fba638942f975194704855f2bdf3d80714f020 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4fba638942f975194704855f2bdf3… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Apr 19 14:01:49 2022 -0700 ntdll: Respect zero_bits/limit when mapping a PE file. --- dlls/ntdll/unix/virtual.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index f6e8793396c..d4afb8cc2ad 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -1923,6 +1923,8 @@ static NTSTATUS map_view( struct file_view **view_ret, void *base, size_t size, { if (is_beyond_limit( base, size, address_space_limit )) return STATUS_WORKING_SET_LIMIT_RANGE; + if (limit && is_beyond_limit( base, size, (void *)limit )) + return STATUS_CONFLICTING_ADDRESSES; status = map_fixed_area( base, size, vprot ); if (status != STATUS_SUCCESS) return status; ptr = base;

1 0

Brendan Shanks : ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 82c96f94840ae279fdcfe8e08c243dde89b72bbe URL: https://gitlab.winehq.org/wine/wine/-/commit/82c96f94840ae279fdcfe8e08c243d… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Apr 25 16:32:33 2022 -0700 ntdll/tests: Test NtMapViewOfSection with a 64-bit DLL and zero_bits > 31. --- dlls/ntdll/tests/virtual.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 6831fe3c522..a239a75ad47 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1265,6 +1265,32 @@ static void test_NtMapViewOfSection(void) CloseHandle(file); DeleteFileA(testfile); + /* test zero_bits > 31 with a 64-bit DLL file image mapping */ + if (is_win64) + { + file = CreateFileA("c:\\windows\\system32\\version.dll", GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "Failed to open version.dll\n"); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY|SEC_IMAGE, 0, 0, NULL); + ok(mapping != 0, "CreateFileMapping failed\n"); + + ptr = NULL; + size = 0; + offset.QuadPart = 0; + zero_bits = 0x7fffffff; + status = NtMapViewOfSection(mapping, process, &ptr, zero_bits, 0, &offset, &size, 1, 0, PAGE_READONLY); + + ok(status == STATUS_SUCCESS || status == STATUS_IMAGE_NOT_AT_BASE, "NtMapViewOfSection returned %08lx\n", status); + ok(!((ULONG_PTR)ptr & 0xffff), "returned memory %p is not aligned to 64k\n", ptr); + ok(((UINT_PTR)ptr & ~get_zero_bits_mask(zero_bits)) == 0, "NtMapViewOfSection returned address %p\n", ptr); + + status = NtUnmapViewOfSection(process, ptr); + ok(status == STATUS_SUCCESS, "NtUnmapViewOfSection returned %08lx\n", status); + + NtClose(mapping); + CloseHandle(file); + } + TerminateProcess(process, 0); CloseHandle(process); }

1 0

Hans Leidekker : wpcap/tests: Initial tests.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 8104688879e4cdc1110fd302a282dbdf4295fe05 URL: https://gitlab.winehq.org/wine/wine/-/commit/8104688879e4cdc1110fd302a282db… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Feb 7 09:40:54 2023 +0100 wpcap/tests: Initial tests. --- configure | 1 + configure.ac | 1 + dlls/wpcap/tests/Makefile.in | 4 + dlls/wpcap/tests/wpcap.c | 374 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 380 insertions(+)

1 0

Hans Leidekker : wpcap: Try to enable 32-bit mmap() support in libpcap.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: b97c9be3b822512b83cad6fd5a80c9574a6b1113 URL: https://gitlab.winehq.org/wine/wine/-/commit/b97c9be3b822512b83cad6fd5a80c9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 22:00:48 2023 +0100 wpcap: Try to enable 32-bit mmap() support in libpcap. This feature will be available in version 1.11. --- dlls/wpcap/wpcap.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 39a65885723..8c304ce66a4 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1425,6 +1425,7 @@ int CDECL pcap_wsockinit( void ) #define PCAP_CHAR_ENC_LOCAL 0 #define PCAP_CHAR_ENC_UTF_8 1 +#define PCAP_MMAP_32BIT 2 int CDECL pcap_init( unsigned int opt, char *errbuf ) { @@ -1450,9 +1451,16 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) { char errbuf[PCAP_ERRBUF_SIZE]; struct init_params params = { PCAP_CHAR_ENC_UTF_8, errbuf }; + BOOL is_wow64; if (PCAP_CALL( init, &params ) == PCAP_ERROR) WARN( "failed to enable UTF-8 encoding %s\n", debugstr_a(errbuf) ); + if (IsWow64Process( GetCurrentProcess(), &is_wow64 ) && is_wow64) + { + params.opt = PCAP_MMAP_32BIT; + if (PCAP_CALL( init, &params ) == PCAP_ERROR) + WARN( "failed to enable 32-bit mmap() %s\n", debugstr_a(errbuf) ); + } } break; }

1 0

Hans Leidekker : wpcap: Add wow64 thunks.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: 2432c123e9f46f794aa55fa3fed196ab3ce4f532 URL: https://gitlab.winehq.org/wine/wine/-/commit/2432c123e9f46f794aa55fa3fed196… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 21:47:33 2023 +0100 wpcap: Add wow64 thunks. --- dlls/wpcap/unixlib.c | 465 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 465 insertions(+)

1 0

Hans Leidekker : wpcap: Enable UTF-8 encoding in libpcap.
by Alexandre Julliard Feb. 13, 2023

Feb. 13, 2023

Module: wine Branch: master Commit: fdbbee506226239631937c4d60c2efbc81274c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/fdbbee506226239631937c4d60c2ef… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Feb 6 17:08:11 2023 +0100 wpcap: Enable UTF-8 encoding in libpcap. --- dlls/wpcap/wpcap.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index 2a3be168fdf..39a65885723 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -1424,6 +1424,7 @@ int CDECL pcap_wsockinit( void ) } #define PCAP_CHAR_ENC_LOCAL 0 +#define PCAP_CHAR_ENC_UTF_8 1 int CDECL pcap_init( unsigned int opt, char *errbuf ) { @@ -1442,10 +1443,19 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, void *reserved ) switch (reason) { case DLL_PROCESS_ATTACH: + { DisableThreadLibraryCalls( hinst ); - if (__wine_init_unix_call()) - ERR( "No pcap support, expect problems\n" ); + if (__wine_init_unix_call()) ERR( "No pcap support, expect problems\n" ); + else + { + char errbuf[PCAP_ERRBUF_SIZE]; + struct init_params params = { PCAP_CHAR_ENC_UTF_8, errbuf }; + + if (PCAP_CALL( init, &params ) == PCAP_ERROR) + WARN( "failed to enable UTF-8 encoding %s\n", debugstr_a(errbuf) ); + } break; + } case DLL_PROCESS_DETACH: if (reserved) break; free_datalinks();

1 0