June 2021 - Wine-Commits - list.winehq.org

Rémi Bernon : winebus.sys: Add missing keyboard free_device callback.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: ab8f8258a5b0d4aea1dd487e5c9547da60c7819d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab8f8258a5b0d4aea1dd487e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 29 11:47:30 2021 +0200 winebus.sys: Add missing keyboard free_device callback. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index c1c59b8a8e1..23195dfa75a 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -552,6 +552,10 @@ static void mouse_device_create(void) IoInvalidateDeviceRelations(bus_pdo, BusRelations); } +static void keyboard_free_device(DEVICE_OBJECT *device) +{ +} + static NTSTATUS keyboard_get_reportdescriptor(DEVICE_OBJECT *device, BYTE *buffer, DWORD length, DWORD *ret_length) { TRACE("buffer %p, length %u.\n", buffer, length); @@ -606,6 +610,7 @@ static NTSTATUS keyboard_set_feature_report(DEVICE_OBJECT *device, UCHAR id, BYT static const platform_vtbl keyboard_vtbl = { + .free_device = keyboard_free_device, .get_reportdescriptor = keyboard_get_reportdescriptor, .get_string = keyboard_get_string, .begin_report_processing = keyboard_begin_report_processing,

1 0

Alexandre Julliard : configure: Disable nsiproxy.sys for the Windows build.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 9a7bf63bb2f1df5a9cfb65eb0bb4dd24297fd87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a7bf63bb2f1df5a9cfb65eb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 20:01:00 2021 +0200 configure: Disable nsiproxy.sys for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index 25089c31e18..14c9dd2ff7d 100755 --- a/configure +++ b/configure @@ -8345,6 +8345,7 @@ if test "x$ac_cv_cflags__Wl___disable_stdcall_fixup" = xyes; then : fi ;; esac enable_iphlpapi=${enable_iphlpapi:-no} + enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no} diff --git a/configure.ac b/configure.ac index 5c4f0c8a6cb..09c58aaff28 100644 --- a/configure.ac +++ b/configure.ac @@ -735,6 +735,7 @@ case $host_os in esac dnl Disable modules that can't be used on Windows enable_iphlpapi=${enable_iphlpapi:-no} + enable_nsiproxy_sys=${enable_nsiproxy_sys:-no} enable_ws2_32=${enable_ws2_32:-no} enable_loader=${enable_loader:-no} enable_server=${enable_server:-no}

1 0

Roman Pišl : ntdll: Don't pretend that the whole address space is reserved on non-i386.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 0ec555e58ea9d5b33f4c825e96965ad0cb15d00f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec555e58ea9d5b33f4c825e… Author: Roman Pišl <rpisl(a)seznam.cz> Date: Wed Jun 30 14:53:47 2021 +0200 ntdll: Don't pretend that the whole address space is reserved on non-i386. This is analogous to 61dcca5dbf4d0021f420dc87248b39a1dc1542db. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50735 Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/virtual.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index ef623c0b17a..2484450055d 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -4012,10 +4012,18 @@ static int CDECL get_free_mem_state_callback( void *start, SIZE_T size, void *ar else /* outside of the reserved area, pretend it's allocated */ { info->RegionSize = (char *)start - (char *)info->BaseAddress; +#ifdef __i386__ info->State = MEM_RESERVE; info->Protect = PAGE_NOACCESS; info->AllocationProtect = PAGE_NOACCESS; info->Type = MEM_PRIVATE; +#else + info->State = MEM_FREE; + info->Protect = PAGE_NOACCESS; + info->AllocationBase = 0; + info->AllocationProtect = 0; + info->Type = 0; +#endif } return 1; }

1 0

Huw Davies : nsi: Implement NsiAllocateAndGetTable() and NsiFreeTable().
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: f579cea53b7d25e50d4c5d412d20a2062e6501bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f579cea53b7d25e50d4c5d41… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Jun 30 09:59:25 2021 +0100 nsi: Implement NsiAllocateAndGetTable() and NsiFreeTable(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/nsi/nsi.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++--- dlls/nsi/tests/nsi.c | 5 ++--- 2 files changed, 52 insertions(+), 6 deletions(-) diff --git a/dlls/nsi/nsi.c b/dlls/nsi/nsi.c index 981fcdba954..37054dd0de6 100644 --- a/dlls/nsi/nsi.c +++ b/dlls/nsi/nsi.c @@ -39,9 +39,52 @@ DWORD WINAPI NsiAllocateAndGetTable( DWORD unk, const NPI_MODULEID *module, DWOR void **rw_data, DWORD rw_size, void **dynamic_data, DWORD dynamic_size, void **static_data, DWORD static_size, DWORD *count, DWORD unk2 ) { - FIXME( "%d %p %d %p %d %p %d %p %d %p %d %p %d: stub\n", unk, module, table, key_data, key_size, + DWORD err, num = 0; + void *data[4] = { NULL }; + DWORD sizes[4] = { key_size, rw_size, dynamic_size, static_size }; + int i, attempt; + + TRACE( "%d %p %d %p %d %p %d %p %d %p %d %p %d\n", unk, module, table, key_data, key_size, rw_data, rw_size, dynamic_data, dynamic_size, static_data, static_size, count, unk2 ); - return ERROR_CALL_NOT_IMPLEMENTED; + + for (attempt = 0; attempt < 5; attempt++) + { + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, NULL, 0, NULL, 0, NULL, 0, NULL, 0, &num ); + if (err) return err; + + for (i = 0; i < ARRAY_SIZE(data); i++) + { + if (sizes[i]) + { + data[i] = heap_alloc( sizes[i] * num ); + if (!data[i]) + { + err = ERROR_OUTOFMEMORY; + goto err; + } + } + } + + err = NsiEnumerateObjectsAllParameters( unk, 0, module, table, data[0], sizes[0], data[1], sizes[1], + data[2], sizes[2], data[3], sizes[3], &num ); + if (err != ERROR_MORE_DATA) break; + + NsiFreeTable( data[0], data[1], data[2], data[3] ); + memset( data, 0, sizeof(data) ); + } + + if (!err) + { + if (sizes[0]) *key_data = data[0]; + if (sizes[1]) *rw_data = data[1]; + if (sizes[2]) *dynamic_data = data[2]; + if (sizes[3]) *static_data = data[3]; + *count = num; + } + +err: + if (err) NsiFreeTable( data[0], data[1], data[2], data[3] ); + return err; } DWORD WINAPI NsiEnumerateObjectsAllParameters( DWORD unk, DWORD unk2, const NPI_MODULEID *module, DWORD table, @@ -128,7 +171,11 @@ DWORD WINAPI NsiEnumerateObjectsAllParametersEx( struct nsi_enumerate_all_ex *pa void WINAPI NsiFreeTable( void *key_data, void *rw_data, void *dynamic_data, void *static_data ) { - FIXME( "%p %p %p %p: stub\n", key_data, rw_data, dynamic_data, static_data ); + TRACE( "%p %p %p %p\n", key_data, rw_data, dynamic_data, static_data ); + heap_free( key_data ); + heap_free( rw_data ); + heap_free( dynamic_data ); + heap_free( static_data ); } DWORD WINAPI NsiGetAllParameters( DWORD unk, const NPI_MODULEID *module, DWORD table, const void *key, DWORD key_size, diff --git a/dlls/nsi/tests/nsi.c b/dlls/nsi/tests/nsi.c index 51b149e9f65..35ca0bb07c9 100644 --- a/dlls/nsi/tests/nsi.c +++ b/dlls/nsi/tests/nsi.c @@ -54,9 +54,7 @@ static void test_nsi_api( void ) (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); if (!err) break; } -todo_wine ok( !err, "got %d\n", err ); - if (err) return; rw_size = rw_sizes[i]; for (i = 0; i < count; i++) @@ -68,7 +66,9 @@ todo_wine err = NsiGetAllParameters( 1, &NPI_MS_NDIS_MODULEID, NSI_NDIS_IFINFO_TABLE, luid_tbl + i, sizeof(*luid_tbl), &get_rw, rw_size, &get_dyn, sizeof(get_dyn), &get_stat, sizeof(get_stat) ); +todo_wine ok( !err, "got %d\n", err ); + if (err) break; /* test a selection of members */ ok( IsEqualGUID( &get_rw.network_guid, &rw->network_guid ), "mismatch\n" ); ok( get_rw.alias.Length == rw->alias.Length, "mismatch\n" ); @@ -273,7 +273,6 @@ static void test_ndis_ifinfo( void ) (void **)&stat_tbl, sizeof(*stat_tbl), &count, 0 ); if (!err) break; } -todo_wine ok( !err, "got %d\n", err ); if (err) return; rw_size = rw_sizes[i];

1 0

Zebediah Figura : advapi32/tests: Test the type and impersonation level of a linked token.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 2cbed066096794b06bcbecd7db9975c50605d176 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2cbed066096794b06bcbecd7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 30 00:01:05 2021 -0500 advapi32/tests: Test the type and impersonation level of a linked token. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 77748abe9ec..d39aaba7323 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -8139,6 +8139,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == TRUE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8194,6 +8200,12 @@ static void test_elevation(void) ret = GetTokenInformation(linked.LinkedToken, TokenElevation, &elevation, sizeof(elevation), &size); ok(ret, "got error %u\n", GetLastError()); ok(elevation.TokenIsElevated == FALSE, "got elevation %#x\n", elevation.TokenIsElevated); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + todo_wine ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); /* Asking for the linked token again gives us a different token. */ ret = GetTokenInformation(token, TokenLinkedToken, &linked2, sizeof(linked2), &size); @@ -8249,10 +8261,18 @@ static void test_elevation(void) ret = GetTokenInformation(token2, TokenLinkedToken, &linked, sizeof(linked), &size); ok(ret, "got error %u\n", GetLastError()); if (type == TokenElevationTypeDefault) + { ok(!linked.LinkedToken, "expected no linked token\n"); + ret = GetTokenInformation(linked.LinkedToken, TokenType, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == TokenImpersonation, "got type %#x\n", type); + ret = GetTokenInformation(linked.LinkedToken, TokenImpersonationLevel, &type, sizeof(type), &size); + ok(ret, "got error %u\n", GetLastError()); + ok(type == SecurityIdentification, "got impersonation level %#x\n", type); + CloseHandle(linked.LinkedToken); + } else ok(!!linked.LinkedToken, "expected a linked token\n"); - CloseHandle(linked.LinkedToken); CloseHandle(token2); ret = CreateRestrictedToken(token, 0, 0, NULL, 0, NULL, 0, NULL, &token2);

1 0

Alexandre Julliard : ntdll/tests: Add tests for RtlWow64GetCurrentCpuArea().
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: c9d23a15cef7c8508bc9b82a9247b10a12d4fb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9d23a15cef7c8508bc9b82a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:12:46 2021 +0200 ntdll/tests: Add tests for RtlWow64GetCurrentCpuArea(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 130 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 127 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index d31afa373e2..b7b63f3fd8c 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -34,6 +34,7 @@ static NTSTATUS (WINAPI *pNtWow64WriteVirtualMemory64)(HANDLE,ULONG64,const void #endif static BOOL is_wow64; +static void *code_mem; static void init(void) { @@ -54,6 +55,8 @@ static void init(void) GET_PROC( NtWow64WriteVirtualMemory64 ); #endif #undef GET_PROC + + code_mem = VirtualAlloc( NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE ); } static void test_process_architecture( HANDLE process, USHORT expect_machine, USHORT expect_native ) @@ -463,6 +466,52 @@ static void test_cpu_area(void) #else /* _WIN64 */ +static const BYTE call_func64_code[] = +{ + 0x58, /* pop %eax */ + 0x0e, /* push %cs */ + 0x50, /* push %eax */ + 0x6a, 0x33, /* push $0x33 */ + 0xe8, 0x00, 0x00, 0x00, 0x00, /* call 1f */ + 0x83, 0x04, 0x24, 0x05, /* 1: addl $0x5,(%esp) */ + 0xcb, /* lret */ + /* in 64-bit mode: */ + 0x4c, 0x87, 0xf4, /* xchg %r14,%rsp */ + 0x55, /* push %rbp */ + 0x48, 0x89, 0xe5, /* mov %rsp,%rbp */ + 0x56, /* push %rsi */ + 0x57, /* push %rdi */ + 0x41, 0x8b, 0x4e, 0x10, /* mov 0x10(%r14),%ecx */ + 0x41, 0x8b, 0x76, 0x14, /* mov 0x14(%r14),%esi */ + 0x67, 0x8d, 0x04, 0xcd, 0, 0, 0, 0, /* lea 0x0(,%ecx,8),%eax */ + 0x83, 0xf8, 0x20, /* cmp $0x20,%eax */ + 0x7d, 0x05, /* jge 1f */ + 0xb8, 0x20, 0x00, 0x00, 0x00, /* mov $0x20,%eax */ + 0x48, 0x29, 0xc4, /* 1: sub %rax,%rsp */ + 0x48, 0x83, 0xe4, 0xf0, /* and $~15,%rsp */ + 0x48, 0x89, 0xe7, /* mov %rsp,%rdi */ + 0xf3, 0x48, 0xa5, /* rep movsq */ + 0x48, 0x8b, 0x0c, 0x24, /* mov (%rsp),%rcx */ + 0x48, 0x8b, 0x54, 0x24, 0x08, /* mov 0x8(%rsp),%rdx */ + 0x4c, 0x8b, 0x44, 0x24, 0x10, /* mov 0x10(%rsp),%r8 */ + 0x4c, 0x8b, 0x4c, 0x24, 0x18, /* mov 0x18(%rsp),%r9 */ + 0x41, 0xff, 0x56, 0x08, /* callq *0x8(%r14) */ + 0x48, 0x8d, 0x65, 0xf0, /* lea -0x10(%rbp),%rsp */ + 0x5f, /* pop %rdi */ + 0x5e, /* pop %rsi */ + 0x5d, /* pop %rbp */ + 0x4c, 0x87, 0xf4, /* xchg %r14,%rsp */ + 0xcb, /* lret */ +}; + +static NTSTATUS call_func64( ULONG64 func64, int nb_args, ULONG64 *args ) +{ + NTSTATUS (WINAPI *func)( ULONG64 func64, int nb_args, ULONG64 *args ) = code_mem; + + memcpy( code_mem, call_func64_code, sizeof(call_func64_code) ); + return func( func64, nb_args, args ); +} + static ULONG64 main_module, ntdll_module, wow64_module, wow64cpu_module, wow64win_module; static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) @@ -514,6 +563,53 @@ done: NtClose( process ); } +static ULONG64 get_proc_address64( ULONG64 module, const char *name ) +{ + IMAGE_DOS_HEADER dos; + IMAGE_NT_HEADERS64 nt; + IMAGE_EXPORT_DIRECTORY exports; + ULONG i, *names, *funcs; + USHORT *ordinals; + NTSTATUS status; + HANDLE process; + ULONG64 ret = 0; + char buffer[64]; + + if (!module) return 0; + process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + ok( process != 0, "failed to open current process %u\n", GetLastError() ); + status = pNtWow64ReadVirtualMemory64( process, module, &dos, sizeof(dos), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + dos.e_lfanew, &nt, sizeof(nt), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + nt.OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_EXPORT].VirtualAddress, + &exports, sizeof(exports), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + names = calloc( exports.NumberOfNames, sizeof(*names) ); + ordinals = calloc( exports.NumberOfNames, sizeof(*ordinals) ); + funcs = calloc( exports.NumberOfFunctions, sizeof(*funcs) ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNames, + names, exports.NumberOfNames * sizeof(*names), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfNameOrdinals, + ordinals, exports.NumberOfNames * sizeof(*ordinals), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, module + exports.AddressOfFunctions, + funcs, exports.NumberOfFunctions * sizeof(*funcs), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + for (i = 0; i < exports.NumberOfNames && !ret; i++) + { + status = pNtWow64ReadVirtualMemory64( process, module + names[i], buffer, sizeof(buffer), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + if (!strcmp( buffer, name )) ret = module + funcs[ordinals[i]]; + } + free( funcs ); + free( ordinals ); + free( names ); + NtClose( process ); + return ret; +} + static void check_module( ULONG64 base, const WCHAR *name ) { if (base == (ULONG_PTR)GetModuleHandleW(0)) @@ -650,6 +746,35 @@ static void test_nt_wow64(void) NtClose( process ); } +static void test_cpu_area(void) +{ + TEB64 *teb64 = (TEB64 *)NtCurrentTeb()->GdiBatchCount; + ULONG64 ptr; + NTSTATUS status; + + if (!is_wow64) return; + if (!ntdll_module) return; + + if ((ptr = get_proc_address64( ntdll_module, "RtlWow64GetCurrentCpuArea" ))) + { + USHORT machine = 0xdead; + ULONG64 context, context_ex; + ULONG64 args[] = { (ULONG_PTR)&machine, (ULONG_PTR)&context, (ULONG_PTR)&context_ex }; + + status = call_func64( ptr, ARRAY_SIZE(args), args ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + ok( machine == IMAGE_FILE_MACHINE_I386, "wrong machine %x\n", machine ); + ok( context == teb64->TlsSlots[WOW64_TLS_CPURESERVED] + 4, "wrong context %s / %s\n", + wine_dbgstr_longlong(context), wine_dbgstr_longlong(teb64->TlsSlots[WOW64_TLS_CPURESERVED]) ); + ok( !context_ex, "got context_ex %s\n", wine_dbgstr_longlong(context_ex) ); + args[0] = args[1] = args[2] = 0; + status = call_func64( ptr, ARRAY_SIZE(args), args ); + ok( !status, "RtlWow64GetCpuAreaInfo failed %x\n", status ); + } + else win_skip( "RtlWow64GetCpuAreaInfo not supported\n" ); + +} + #endif /* _WIN64 */ @@ -658,10 +783,9 @@ START_TEST(wow64) init(); test_query_architectures(); test_peb_teb(); -#ifdef _WIN64 - test_cpu_area(); -#else +#ifndef _WIN64 test_nt_wow64(); test_modules(); #endif + test_cpu_area(); }

1 0

Alexandre Julliard : ntdll/tests: Add tests for 64-bit modules in Wow64 mode.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 7700467a38408b7a4161e2a180f00abdf466164c URL: https://source.winehq.org/git/wine.git/?a=commit;h=7700467a38408b7a4161e2a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 30 11:11:32 2021 +0200 ntdll/tests: Add tests for 64-bit modules in Wow64 mode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 8065221c416..d31afa373e2 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -463,6 +463,94 @@ static void test_cpu_area(void) #else /* _WIN64 */ +static ULONG64 main_module, ntdll_module, wow64_module, wow64cpu_module, wow64win_module; + +static void enum_modules64( void (*func)(ULONG64,const WCHAR *) ) +{ + typedef struct + { + LIST_ENTRY64 InLoadOrderLinks; + LIST_ENTRY64 InMemoryOrderLinks; + LIST_ENTRY64 InInitializationOrderLinks; + ULONG64 DllBase; + ULONG64 EntryPoint; + ULONG SizeOfImage; + UNICODE_STRING64 FullDllName; + UNICODE_STRING64 BaseDllName; + /* etc. */ + } LDR_DATA_TABLE_ENTRY64; + + TEB64 *teb64 = (TEB64 *)NtCurrentTeb()->GdiBatchCount; + PEB64 peb64; + ULONG64 ptr; + PEB_LDR_DATA64 ldr; + LDR_DATA_TABLE_ENTRY64 entry; + NTSTATUS status; + HANDLE process; + + process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + ok( process != 0, "failed to open current process %u\n", GetLastError() ); + status = pNtWow64ReadVirtualMemory64( process, teb64->Peb, &peb64, sizeof(peb64), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + todo_wine + ok( peb64.LdrData, "LdrData not initialized\n" ); + if (!peb64.LdrData) goto done; + status = pNtWow64ReadVirtualMemory64( process, peb64.LdrData, &ldr, sizeof(ldr), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ptr = ldr.InLoadOrderModuleList.Flink; + for (;;) + { + WCHAR buffer[256]; + status = pNtWow64ReadVirtualMemory64( process, ptr, &entry, sizeof(entry), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = pNtWow64ReadVirtualMemory64( process, entry.BaseDllName.Buffer, buffer, sizeof(buffer), NULL ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + if (status) break; + func( entry.DllBase, buffer ); + ptr = entry.InLoadOrderLinks.Flink; + if (ptr == peb64.LdrData + offsetof( PEB_LDR_DATA64, InLoadOrderModuleList )) break; + } +done: + NtClose( process ); +} + +static void check_module( ULONG64 base, const WCHAR *name ) +{ + if (base == (ULONG_PTR)GetModuleHandleW(0)) + { + WCHAR *p, module[MAX_PATH]; + + GetModuleFileNameW( 0, module, MAX_PATH ); + if ((p = wcsrchr( module, '\\' ))) p++; + else p = module; + ok( !wcsicmp( name, p ), "wrong name %s / %s\n", debugstr_w(name), debugstr_w(module)); + main_module = base; + return; + } +#define CHECK_MODULE(mod) if (!wcsicmp( name, L"" #mod ".dll" )) { mod ## _module = base; return; } + CHECK_MODULE(ntdll); + CHECK_MODULE(wow64); + CHECK_MODULE(wow64cpu); + CHECK_MODULE(wow64win); +#undef CHECK_MODULE + ok( 0, "unknown module %s %s found\n", wine_dbgstr_longlong(base), wine_dbgstr_w(name)); +} + +static void test_modules(void) +{ + if (!is_wow64) return; + if (!pNtWow64ReadVirtualMemory64) return; + enum_modules64( check_module ); + todo_wine + { + ok( main_module, "main module not found\n" ); + ok( ntdll_module, "64-bit ntdll not found\n" ); + ok( wow64_module, "wow64.dll not found\n" ); + ok( wow64cpu_module, "wow64cpu.dll not found\n" ); + ok( wow64win_module, "wow64win.dll not found\n" ); + } +} + static void test_nt_wow64(void) { const char str[] = "hello wow64"; @@ -574,5 +662,6 @@ START_TEST(wow64) test_cpu_area(); #else test_nt_wow64(); + test_modules(); #endif }

1 0

Zebediah Figura : ws2_32: Handle SO_SNDTIMEO in the server.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 20c19903721faf7bbb0afc1cd878c4199abc6f96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20c19903721faf7bbb0afc1c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 23:25:43 2021 -0500 ws2_32: Handle SO_SNDTIMEO in the server. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 70 +++------------------------------------------------- include/wine/afd.h | 2 ++ server/sock.c | 40 ++++++++++++++++++++++++------ 3 files changed, 39 insertions(+), 73 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 562d05ed4be..ce71e25d63d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -913,34 +913,6 @@ static int convert_sockopt(INT *level, INT *optname) return 0; } -/* Utility: get the SO_RCVTIMEO or SO_SNDTIMEO socket option - * from an fd and return the value converted to milli seconds - * or 0 if there is an infinite time out */ -static inline INT64 get_rcvsnd_timeo( int fd, BOOL is_recv) -{ - struct timeval tv; - socklen_t len = sizeof(tv); - int optname, res; - - if (is_recv) -#ifdef SO_RCVTIMEO - optname = SO_RCVTIMEO; -#else - return 0; -#endif - else -#ifdef SO_SNDTIMEO - optname = SO_SNDTIMEO; -#else - return 0; -#endif - - res = getsockopt(fd, SOL_SOCKET, optname, &tv, &len); - if (res < 0) - return 0; - return (UINT64)tv.tv_sec * 1000 + tv.tv_usec / 1000; -} - int convert_socktype_w2u(int windowssocktype) { unsigned int i; @@ -2283,23 +2255,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_SNDBUF, optval, optlen ); case WS_SO_SNDTIMEO: - { - INT64 timeout; + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_SNDTIMEO, optval, optlen ); - if (!optlen || *optlen < sizeof(int)|| !optval) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - - timeout = get_rcvsnd_timeo(fd, optname == WS_SO_RCVTIMEO); - *(int *)optval = timeout <= UINT_MAX ? timeout : UINT_MAX; - - release_sock_fd( s, fd ); - return ret; - } case WS_SO_TYPE: { int sock_type; @@ -3504,7 +3461,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { int fd; int woptval; - struct timeval tval; struct ip_mreq_source mreq_source; TRACE("(socket %04lx, %s, optval %s, optlen %d)\n", s, @@ -3567,6 +3523,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_SNDBUF: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDBUF, optval, optlen ); + case WS_SO_SNDTIMEO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_SNDTIMEO, optval, optlen ); + /* SO_DEBUG is a privileged operation, ignore it. */ case WS_SO_DEBUG: TRACE("Ignoring SO_DEBUG\n"); @@ -3607,27 +3566,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("setting global SO_OPENTYPE = 0x%x\n", *((const int*)optval) ); return 0; -#ifdef SO_SNDTIMEO - case WS_SO_SNDTIMEO: - if (optval && optlen == sizeof(UINT32)) { - /* WinSock passes milliseconds instead of struct timeval */ - tval.tv_usec = (*(const UINT32*)optval % 1000) * 1000; - tval.tv_sec = *(const UINT32*)optval / 1000; - /* min of 500 milliseconds */ - if (tval.tv_sec == 0 && tval.tv_usec && tval.tv_usec < 500000) - tval.tv_usec = 500000; - optlen = sizeof(struct timeval); - optval = (char*)&tval; - } else if (optlen == sizeof(struct timeval)) { - WARN("SO_SND/RCVTIMEO for %d bytes: assuming unixism\n", optlen); - } else { - WARN("SO_SND/RCVTIMEO for %d bytes is weird: ignored\n", optlen); - return 0; - } - convert_sockopt(&level, &optname); - break; -#endif - case WS_SO_RANDOMIZE_PORT: FIXME("Ignoring WS_SO_RANDOMIZE_PORT\n"); return 0; diff --git a/include/wine/afd.h b/include/wine/afd.h index f2a5abf726d..44a8b1a5ff9 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -177,6 +177,8 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 236, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 237, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_SNDTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 238, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 9a99e512c0d..befa9117c13 100644 --- a/server/sock.c +++ b/server/sock.c @@ -210,6 +210,7 @@ struct sock unsigned int rcvbuf; /* advisory recv buffer size */ unsigned int sndbuf; /* advisory send buffer size */ unsigned int rcvtimeo; /* receive timeout in ms */ + unsigned int sndtimeo; /* send timeout in ms */ unsigned int rd_shutdown : 1; /* is the read end shut down? */ unsigned int wr_shutdown : 1; /* is the write end shut down? */ unsigned int wr_shutdown_pending : 1; /* is a write shutdown pending? */ @@ -1392,6 +1393,7 @@ static struct sock *create_socket(void) sock->rcvbuf = 0; sock->sndbuf = 0; sock->rcvtimeo = 0; + sock->sndtimeo = 0; init_async_queue( &sock->read_q ); init_async_queue( &sock->write_q ); init_async_queue( &sock->ifchange_q ); @@ -2697,6 +2699,35 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_SNDTIMEO: + { + DWORD sndtimeo = sock->sndtimeo; + + if (get_reply_max_size() < sizeof(sndtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &sndtimeo, sizeof(sndtimeo) ); + return 1; + } + + case IOCTL_AFD_WINE_SET_SO_SNDTIMEO: + { + DWORD sndtimeo; + + if (get_req_data_size() < sizeof(sndtimeo)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + sndtimeo = *(DWORD *)get_req_data(); + + sock->sndtimeo = sndtimeo; + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0; @@ -3217,19 +3248,14 @@ DECL_HANDLER(send_socket) /* send() returned EWOULDBLOCK or a short write, i.e. cannot send all data yet */ if (status == STATUS_DEVICE_NOT_READY && !sock->nonblocking) { -#ifdef SO_SNDTIMEO - struct timeval tv; - socklen_t len = sizeof(tv); - /* Set a timeout on the async if necessary. * * We want to do this *only* if the client gave us STATUS_DEVICE_NOT_READY. * If the client gave us STATUS_PENDING, it expects the async to always * block (it was triggered by WSASend*() with a valid OVERLAPPED * structure) and for the timeout not to be respected. */ - if (is_fd_overlapped( fd ) && !getsockopt( get_unix_fd( fd ), SOL_SOCKET, SO_SNDTIMEO, (char *)&tv, &len )) - timeout = tv.tv_sec * -10000000 + tv.tv_usec * -10; -#endif + if (is_fd_overlapped( fd )) + timeout = (timeout_t)sock->sndtimeo * -10000; status = STATUS_PENDING; }

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_SNDBUF.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: 35288d6537652989473dd87258de5b006d60b589 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35288d6537652989473dd872… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 23:25:42 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_SNDBUF. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8606 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 17 +++-------------- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3f15bb4e39b..562d05ed4be 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2088,20 +2088,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_BROADCAST: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen ); - /* Handle common cases. The special cases are below, sorted - * alphabetically */ - case WS_SO_SNDBUF: - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - convert_sockopt(&level, &optname); - if (getsockopt(fd, level, optname, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - release_sock_fd( s, fd ); - return ret; - case WS_SO_BSP_STATE: { CSADDR_INFO *csinfo = (CSADDR_INFO *)optval; @@ -2293,6 +2279,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_REUSEADDR: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_REUSEADDR, optval, optlen ); + case WS_SO_SNDBUF: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_SNDBUF, optval, optlen ); + case WS_SO_SNDTIMEO: { INT64 timeout; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a3f7e002ce7..e579b72ecb5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1214,7 +1214,7 @@ static void test_set_getsockopt(void) value = 0xdeadbeef; err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size); ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() ); - todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + ok( value == 4096, "expected 4096, got %u\n", value ); /* SO_RCVBUF */ value = 4096;

1 0

Zebediah Figura : server: Introduce IOCTL_AFD_WINE_SET_SO_SNDBUF.
by Alexandre Julliard June 30, 2021

June 30, 2021

Module: wine Branch: master Commit: a0bb5564ebcca64b0b82d171ea1fea6731603ff4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a0bb5564ebcca64b0b82d171… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jun 29 23:25:39 2021 -0500 server: Introduce IOCTL_AFD_WINE_SET_SO_SNDBUF. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index d522b8a289f..ddf780500b7 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -175,6 +175,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_RCVTIMEO CTL_CODE(FILE_DEVICE_NETWORK, 232, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 233, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_REUSEADDR CTL_CODE(FILE_DEVICE_NETWORK, 234, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_SNDBUF CTL_CODE(FILE_DEVICE_NETWORK, 235, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 94dbafe44ee..bcbf3d245be 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2650,6 +2650,30 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_SET_SO_SNDBUF: + { + DWORD sndbuf; + + if (get_req_data_size() < sizeof(sndbuf)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + sndbuf = *(DWORD *)get_req_data(); + +#ifdef __APPLE__ + if (!sndbuf) + { + /* setsockopt fails if a zero value is passed */ + return 0; + } +#endif + + if (setsockopt( unix_fd, SOL_SOCKET, SO_SNDBUF, (char *)&sndbuf, sizeof(sndbuf) ) < 0) + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;

1 0