July 2021 - Wine-commits - list.winehq.org

Zebediah Figura : ws2_32: Move the setsockopt(IP_UNICAST_IF) implementation to ntdll.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: a06bcd03b98dfd82bdc4a72508c8ef6b29634468 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a06bcd03b98dfd82bdc4a725… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 27 00:13:35 2021 -0500 ws2_32: Move the setsockopt(IP_UNICAST_IF) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 5 +---- include/wine/afd.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0269c2b78ae..f33fc014f3b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1797,6 +1797,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_UNICAST_IF case IOCTL_AFD_WINE_GET_IP_UNICAST_IF: return do_getsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_UNICAST_IF: + return do_setsockopt( handle, io, IPPROTO_IP, IP_UNICAST_IF, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f94558520af..d5de709e991 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3705,11 +3705,8 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_UNBLOCK_SOURCE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE, optval, optlen ); -#ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: -#endif - convert_sockopt(&level, &optname); - break; + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_UNICAST_IF, optval, optlen ); default: FIXME("Unknown IPPROTO_IP optname 0x%08x\n", optname); diff --git a/include/wine/afd.h b/include/wine/afd.h index 18e53706fee..c150e2ce474 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -206,6 +206,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_TTL WINE_AFD_IOC(261) #define IOCTL_AFD_WINE_SET_IP_UNBLOCK_SOURCE WINE_AFD_IOC(262) #define IOCTL_AFD_WINE_GET_IP_UNICAST_IF WINE_AFD_IOC(263) +#define IOCTL_AFD_WINE_SET_IP_UNICAST_IF WINE_AFD_IOC(264) struct afd_create_params {

1 0

Alexandre Julliard : wow64: Add thunks for the virtual memory syscalls.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: dffe2bf8e225ec3f92c210ba6d4777cd675ea146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dffe2bf8e225ec3f92c210ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 11:15:25 2021 +0200 wow64: Add thunks for the virtual memory syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/Makefile.in | 3 +- dlls/wow64/syscall.h | 9 ++ dlls/wow64/virtual.c | 255 +++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/wow64_private.h | 24 +++++ 4 files changed, 290 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dffe2bf8e225ec3f92c2…

1 0

Alexandre Julliard : wow64: Add thunks for the memory mapping syscalls.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: 458b859ddf00c91821b7382995a2728775cbc89c URL: https://source.winehq.org/git/wine.git/?a=commit;h=458b859ddf00c91821b73829… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 11:21:23 2021 +0200 wow64: Add thunks for the memory mapping syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.h | 4 +++ dlls/wow64/virtual.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 23d36ff3992..516e0d833c4 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -28,6 +28,7 @@ SYSCALL_ENTRY( NtAllocateUuids ) \ SYSCALL_ENTRY( NtAllocateVirtualMemory ) \ SYSCALL_ENTRY( NtAllocateVirtualMemoryEx ) \ + SYSCALL_ENTRY( NtAreMappedFilesTheSame ) \ SYSCALL_ENTRY( NtCancelTimer ) \ SYSCALL_ENTRY( NtClearEvent ) \ SYSCALL_ENTRY( NtClearPowerRequest ) \ @@ -62,11 +63,13 @@ SYSCALL_ENTRY( NtFlushVirtualMemory ) \ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ + SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ SYSCALL_ENTRY( NtListenPort ) \ SYSCALL_ENTRY( NtLoadKey ) \ SYSCALL_ENTRY( NtLoadKey2 ) \ SYSCALL_ENTRY( NtLockVirtualMemory ) \ SYSCALL_ENTRY( NtMakeTemporaryObject ) \ + SYSCALL_ENTRY( NtMapViewOfSection ) \ SYSCALL_ENTRY( NtOpenDirectoryObject ) \ SYSCALL_ENTRY( NtOpenEvent ) \ SYSCALL_ENTRY( NtOpenIoCompletion ) \ @@ -128,6 +131,7 @@ SYSCALL_ENTRY( NtTerminateJobObject ) \ SYSCALL_ENTRY( NtUnloadKey ) \ SYSCALL_ENTRY( NtUnlockVirtualMemory ) \ + SYSCALL_ENTRY( NtUnmapViewOfSection ) \ SYSCALL_ENTRY( NtWaitForDebugEvent ) \ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index aa680a5fd26..27b46ee74e8 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -89,6 +89,18 @@ NTSTATUS WINAPI wow64_NtAllocateVirtualMemoryEx( UINT *args ) } +/********************************************************************** + * wow64_NtAreMappedFilesTheSame + */ +NTSTATUS WINAPI wow64_NtAreMappedFilesTheSame( UINT *args ) +{ + void *ptr1 = get_ptr( &args ); + void *ptr2 = get_ptr( &args ); + + return NtAreMappedFilesTheSame( ptr1, ptr2 ); +} + + /********************************************************************** * wow64_NtFlushVirtualMemory */ @@ -139,6 +151,32 @@ NTSTATUS WINAPI wow64_NtFreeVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtGetNlsSectionPtr + */ +NTSTATUS WINAPI wow64_NtGetNlsSectionPtr( UINT *args ) +{ + ULONG type = get_ulong( &args ); + ULONG id = get_ulong( &args ); + void *unknown = get_ptr( &args ); + ULONG *addr32 = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtGetNlsSectionPtr( type, id, unknown, addr_32to64( &addr, addr32 ), + size_32to64( &size, size32 )); + if (!status) + { + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} + + /********************************************************************** * wow64_NtLockVirtualMemory */ @@ -164,6 +202,37 @@ NTSTATUS WINAPI wow64_NtLockVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtMapViewOfSection + */ +NTSTATUS WINAPI wow64_NtMapViewOfSection( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + HANDLE process = get_handle( &args ); + ULONG *addr32 = get_ptr( &args ); + ULONG_PTR zero_bits = get_ulong( &args ); + SIZE_T commit = get_ulong( &args ); + const LARGE_INTEGER *offset = get_ptr( &args ); + ULONG *size32 = get_ptr( &args ); + SECTION_INHERIT inherit = get_ulong( &args ); + ULONG alloc = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + + void *addr; + SIZE_T size; + NTSTATUS status; + + status = NtMapViewOfSection( handle, process, addr_32to64( &addr, addr32 ), get_zero_bits( zero_bits ), + commit, offset, size_32to64( &size, size32 ), inherit, alloc, protect ); + if (NT_SUCCESS(status)) + { + put_addr( addr32, addr ); + put_size( size32, size ); + } + return status; +} + + /********************************************************************** * wow64_NtProtectVirtualMemory */ @@ -235,6 +304,18 @@ NTSTATUS WINAPI wow64_NtUnlockVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtUnmapViewOfSection + */ +NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = get_ptr( &args ); + + return NtUnmapViewOfSection( process, addr ); +} + + /********************************************************************** * wow64_NtWriteVirtualMemory */

1 0

Alexandre Julliard : wow64: Add thunks for the write watch syscalls.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: e57d5003088f7ea00516bcdaf92bb068a4b442ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=e57d5003088f7ea00516bcda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 11:24:33 2021 +0200 wow64: Add thunks for the write watch syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.h | 2 ++ dlls/wow64/virtual.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 516e0d833c4..95c2cf646e3 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -64,6 +64,7 @@ SYSCALL_ENTRY( NtFreeVirtualMemory ) \ SYSCALL_ENTRY( NtGetCurrentProcessorNumber ) \ SYSCALL_ENTRY( NtGetNlsSectionPtr ) \ + SYSCALL_ENTRY( NtGetWriteWatch ) \ SYSCALL_ENTRY( NtListenPort ) \ SYSCALL_ENTRY( NtLoadKey ) \ SYSCALL_ENTRY( NtLoadKey2 ) \ @@ -113,6 +114,7 @@ SYSCALL_ENTRY( NtReplyWaitReceivePort ) \ SYSCALL_ENTRY( NtRequestWaitReplyPort ) \ SYSCALL_ENTRY( NtResetEvent ) \ + SYSCALL_ENTRY( NtResetWriteWatch ) \ SYSCALL_ENTRY( NtRestoreKey ) \ SYSCALL_ENTRY( NtSaveKey ) \ SYSCALL_ENTRY( NtSecureConnectPort ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index 27b46ee74e8..fad79a2de60 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -177,6 +177,38 @@ NTSTATUS WINAPI wow64_NtGetNlsSectionPtr( UINT *args ) } +/********************************************************************** + * wow64_NtGetWriteWatch + */ +NTSTATUS WINAPI wow64_NtGetWriteWatch( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + ULONG flags = get_ulong( &args ); + void *base = get_ptr( &args ); + SIZE_T size = get_ulong( &args ); + ULONG *addr_ptr = get_ptr( &args ); + ULONG *count_ptr = get_ptr( &args ); + ULONG *granularity = get_ptr( &args ); + + ULONG_PTR i, count = *count_ptr; + void **addresses; + NTSTATUS status; + + if (!count || !size) return STATUS_INVALID_PARAMETER; + if (flags & ~WRITE_WATCH_FLAG_RESET) return STATUS_INVALID_PARAMETER; + if (!addr_ptr) return STATUS_ACCESS_VIOLATION; + + addresses = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*addresses) ); + if (!(status = NtGetWriteWatch( handle, flags, base, size, addresses, &count, granularity ))) + { + for (i = 0; i < count; i++) addr_ptr[i] = PtrToUlong( addresses[i] ); + *count_ptr = count; + } + RtlFreeHeap( GetProcessHeap(), 0, addresses ); + return status; +} + + /********************************************************************** * wow64_NtLockVirtualMemory */ @@ -279,6 +311,19 @@ NTSTATUS WINAPI wow64_NtReadVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtResetWriteWatch + */ +NTSTATUS WINAPI wow64_NtResetWriteWatch( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *base = get_ptr( &args ); + SIZE_T size = get_ulong( &args ); + + return NtResetWriteWatch( process, base, size ); +} + + /********************************************************************** * wow64_NtUnlockVirtualMemory */

1 0

Alexandre Julliard : wow64: Add a thunk for the NtQueryVirtualMemory syscall.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: ee2ee4d1ef1a6149a919fcad1f8ef324cbe18672 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee2ee4d1ef1a6149a919fcad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 12:00:27 2021 +0200 wow64: Add a thunk for the NtQueryVirtualMemory syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/struct32.h | 36 ++++++++++++++++++++++ dlls/wow64/syscall.h | 1 + dlls/wow64/virtual.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+) diff --git a/dlls/wow64/struct32.h b/dlls/wow64/struct32.h index b96fdae80ca..069564948d0 100644 --- a/dlls/wow64/struct32.h +++ b/dlls/wow64/struct32.h @@ -69,6 +69,42 @@ typedef struct UNICODE_STRING32 ObjectTypeName; } DIRECTORY_BASIC_INFORMATION32; +typedef struct +{ + ULONG BaseAddress; + ULONG AllocationBase; + DWORD AllocationProtect; + ULONG RegionSize; + DWORD State; + DWORD Protect; + DWORD Type; +} MEMORY_BASIC_INFORMATION32; + +typedef struct +{ + UNICODE_STRING32 SectionFileName; +} MEMORY_SECTION_NAME32; + +typedef union +{ + ULONG Flags; + struct { + ULONG Valid : 1; + ULONG ShareCount : 3; + ULONG Win32Protection : 11; + ULONG Shared : 1; + ULONG Node : 6; + ULONG Locked : 1; + ULONG LargePage : 1; + }; +} MEMORY_WORKING_SET_EX_BLOCK32; + +typedef struct +{ + ULONG VirtualAddress; + MEMORY_WORKING_SET_EX_BLOCK32 VirtualAttributes; +} MEMORY_WORKING_SET_EX_INFORMATION32; + typedef struct { ULONG BaseAddress; diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 95c2cf646e3..2cdca8a3e8d 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -105,6 +105,7 @@ SYSCALL_ENTRY( NtQueryTimer ) \ SYSCALL_ENTRY( NtQueryTimerResolution ) \ SYSCALL_ENTRY( NtQueryValueKey ) \ + SYSCALL_ENTRY( NtQueryVirtualMemory ) \ SYSCALL_ENTRY( NtReadVirtualMemory ) \ SYSCALL_ENTRY( NtReleaseKeyedEvent ) \ SYSCALL_ENTRY( NtReleaseMutant ) \ diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index fad79a2de60..e1eaa053109 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -291,6 +291,88 @@ NTSTATUS WINAPI wow64_NtProtectVirtualMemory( UINT *args ) } +/********************************************************************** + * wow64_NtQueryVirtualMemory + */ +NTSTATUS WINAPI wow64_NtQueryVirtualMemory( UINT *args ) +{ + HANDLE handle = get_handle( &args ); + void *addr = get_ptr( &args ); + MEMORY_INFORMATION_CLASS class = get_ulong( &args ); + void *ptr = get_ptr( &args ); + ULONG len = get_ulong( &args ); + ULONG *retlen = get_ptr( &args ); + + SIZE_T res_len = 0; + NTSTATUS status; + + switch (class) + { + case MemoryBasicInformation: /* MEMORY_BASIC_INFORMATION */ + if (len >= sizeof(MEMORY_BASIC_INFORMATION32)) + { + MEMORY_BASIC_INFORMATION info; + MEMORY_BASIC_INFORMATION32 *info32 = ptr; + + if (!(status = NtQueryVirtualMemory( handle, addr, class, &info, sizeof(info), &res_len ))) + { + info32->BaseAddress = PtrToUlong( info.BaseAddress ); + info32->AllocationBase = PtrToUlong( info.AllocationBase ); + info32->AllocationProtect = info.AllocationProtect; + info32->RegionSize = info.RegionSize; + info32->State = info.State; + info32->Protect = info.Protect; + info32->Type = info.Type; + } + } + else status = STATUS_INFO_LENGTH_MISMATCH; + res_len = sizeof(MEMORY_BASIC_INFORMATION32); + break; + + case MemorySectionName: /* MEMORY_SECTION_NAME */ + { + MEMORY_SECTION_NAME *info; + MEMORY_SECTION_NAME32 *info32 = ptr; + SIZE_T size = len + sizeof(*info) - sizeof(*info32); + + info = RtlAllocateHeap( GetProcessHeap(), 0, size ); + if (!(status = NtQueryVirtualMemory( handle, addr, class, info, size, &res_len ))) + { + info32->SectionFileName.Length = info->SectionFileName.Length; + info32->SectionFileName.MaximumLength = info->SectionFileName.MaximumLength; + info32->SectionFileName.Buffer = PtrToUlong( info32 + 1 ); + memcpy( info32 + 1, info->SectionFileName.Buffer, info->SectionFileName.MaximumLength ); + } + res_len += sizeof(*info32) - sizeof(*info); + break; + } + + case MemoryWorkingSetExInformation: /* MEMORY_WORKING_SET_EX_INFORMATION */ + { + MEMORY_WORKING_SET_EX_INFORMATION32 *info32 = ptr; + MEMORY_WORKING_SET_EX_INFORMATION *info; + ULONG i, count = len / sizeof(*info32); + + info = RtlAllocateHeap( GetProcessHeap(), 0, count * sizeof(*info) ); + for (i = 0; i < count; i++) info[i].VirtualAddress = ULongToPtr( info32[i].VirtualAddress ); + if (!(status = NtQueryVirtualMemory( handle, addr, class, info, count * sizeof(*info), &res_len ))) + { + count = res_len / sizeof(*info); + for (i = 0; i < count; i++) info32[i].VirtualAttributes.Flags = info[i].VirtualAttributes.Flags; + res_len = count * sizeof(*info32); + } + break; + } + + default: + FIXME( "unsupported class %u\n", class ); + return STATUS_INVALID_INFO_CLASS; + } + if (!status || status == STATUS_INFO_LENGTH_MISMATCH) put_size( retlen, res_len ); + return status; +} + + /********************************************************************** * wow64_NtReadVirtualMemory */

1 0

Alexandre Julliard : wow64: Add thunks for the Wow64-specific virtual memory syscalls.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: 1d457b14a162c10ae7dca54059fa933ab73695b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d457b14a162c10ae7dca540… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 12:15:07 2021 +0200 wow64: Add thunks for the Wow64-specific virtual memory syscalls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wow64/syscall.c | 3 +++ dlls/wow64/syscall.h | 3 +++ dlls/wow64/virtual.c | 46 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64/wow64_private.h | 11 +++++++++++ 4 files changed, 63 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 6803efbd7e9..2f165879195 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -34,6 +34,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(wow); USHORT native_machine = 0; USHORT current_machine = 0; +ULONG_PTR args_alignment = 0; typedef NTSTATUS (WINAPI *syscall_thunk)( UINT *args ); @@ -271,6 +272,8 @@ static void init_syscall_table( HMODULE ntdll ) const USHORT *ordinals; ULONG id, exp_size, exp_pos, wrap_pos; + args_alignment = (current_machine == IMAGE_FILE_MACHINE_I386) ? sizeof(ULONG) : sizeof(ULONG64); + exports = RtlImageDirectoryEntryToData( ntdll, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &exp_size ); ordinals = get_rva( ntdll, exports->AddressOfNameOrdinals ); functions = get_rva( ntdll, exports->AddressOfFunctions ); diff --git a/dlls/wow64/syscall.h b/dlls/wow64/syscall.h index 2cdca8a3e8d..ab25bcb501d 100644 --- a/dlls/wow64/syscall.h +++ b/dlls/wow64/syscall.h @@ -139,6 +139,9 @@ SYSCALL_ENTRY( NtWaitForKeyedEvent ) \ SYSCALL_ENTRY( NtWaitForMultipleObjects ) \ SYSCALL_ENTRY( NtWaitForSingleObject ) \ + SYSCALL_ENTRY( NtWow64AllocateVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWow64ReadVirtualMemory64 ) \ + SYSCALL_ENTRY( NtWow64WriteVirtualMemory64 ) \ SYSCALL_ENTRY( NtWriteVirtualMemory ) \ SYSCALL_ENTRY( NtYieldExecution ) diff --git a/dlls/wow64/virtual.c b/dlls/wow64/virtual.c index e1eaa053109..36bd91d9f8c 100644 --- a/dlls/wow64/virtual.c +++ b/dlls/wow64/virtual.c @@ -443,6 +443,52 @@ NTSTATUS WINAPI wow64_NtUnmapViewOfSection( UINT *args ) } +/********************************************************************** + * wow64_NtWow64AllocateVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64AllocateVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void **addr = get_ptr( &args ); + ULONG_PTR zero_bits = get_ulong64( &args ); + SIZE_T *size = get_ptr( &args ); + ULONG type = get_ulong( &args ); + ULONG protect = get_ulong( &args ); + + return NtAllocateVirtualMemory( process, addr, zero_bits, size, type, protect ); +} + + +/********************************************************************** + * wow64_NtWow64ReadVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64ReadVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = (void *)(ULONG_PTR)get_ulong64( &args ); + void *buffer = get_ptr( &args ); + SIZE_T size = get_ulong64( &args ); + SIZE_T *ret_size = get_ptr( &args ); + + return NtReadVirtualMemory( process, addr, buffer, size, ret_size ); +} + + +/********************************************************************** + * wow64_NtWow64WriteVirtualMemory64 + */ +NTSTATUS WINAPI wow64_NtWow64WriteVirtualMemory64( UINT *args ) +{ + HANDLE process = get_handle( &args ); + void *addr = (void *)(ULONG_PTR)get_ulong64( &args ); + const void *buffer = get_ptr( &args ); + SIZE_T size = get_ulong64( &args ); + SIZE_T *ret_size = get_ptr( &args ); + + return NtWriteVirtualMemory( process, addr, buffer, size, ret_size ); +} + + /********************************************************************** * wow64_NtWriteVirtualMemory */ diff --git a/dlls/wow64/wow64_private.h b/dlls/wow64/wow64_private.h index f4d195f06fb..6ba77720263 100644 --- a/dlls/wow64/wow64_private.h +++ b/dlls/wow64/wow64_private.h @@ -32,6 +32,7 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON extern USHORT native_machine DECLSPEC_HIDDEN; extern USHORT current_machine DECLSPEC_HIDDEN; +extern ULONG_PTR args_alignment DECLSPEC_HIDDEN; struct object_attr64 { @@ -63,6 +64,16 @@ static inline ULONG get_ulong( UINT **args ) { return *(*args)++; } static inline HANDLE get_handle( UINT **args ) { return LongToHandle( *(*args)++ ); } static inline void *get_ptr( UINT **args ) { return ULongToPtr( *(*args)++ ); } +static inline ULONG64 get_ulong64( UINT **args ) +{ + ULONG64 ret; + + *args = (UINT *)(((ULONG_PTR)*args + args_alignment - 1) & ~(args_alignment - 1)); + ret = *(ULONG64 *)*args; + *args += 2; + return ret; +} + static inline ULONG_PTR get_zero_bits( ULONG_PTR zero_bits ) { return zero_bits ? zero_bits : 0x7fffffff;

1 0

Alexandre Julliard : ntdll/tests: Add a test for a Wow64-only syscall.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: a9828988e91d5a0d7f744c1840f3323de2452c3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9828988e91d5a0d7f744c18… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 13:48:53 2021 +0200 ntdll/tests: Add a test for a Wow64-only syscall. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/wow64.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/ntdll/tests/wow64.c b/dlls/ntdll/tests/wow64.c index 14507623310..90692e66c25 100644 --- a/dlls/ntdll/tests/wow64.c +++ b/dlls/ntdll/tests/wow64.c @@ -1176,24 +1176,16 @@ static void test_iosb(void) static NTSTATUS invoke_syscall( const char *name, ULONG args32[] ) { - NTSTATUS status; ULONG64 args64[] = { -1, PtrToUlong( args32 ) }; - ULONG64 ptr, res, func = get_proc_address64( wow64_module, "Wow64SystemServiceEx" ); - BYTE syscall[32]; + ULONG64 func = get_proc_address64( wow64_module, "Wow64SystemServiceEx" ); + BYTE *syscall = (BYTE *)GetProcAddress( GetModuleHandleA("ntdll.dll"), name ); - if (!(ptr = get_proc_address64( ntdll_module, name ))) return STATUS_NOT_IMPLEMENTED; + ok( syscall != NULL, "syscall %s not found\n", name ); + if (syscall[0] == 0xb8) + args64[0] = *(DWORD *)(syscall + 1); + else + win_skip( "syscall thunk %s not recognized\n", name ); - if (pNtWow64ReadVirtualMemory64) - { - HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); - status = pNtWow64ReadVirtualMemory64( process, ptr, syscall, sizeof(syscall), &res ); - ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); - if (syscall[0] == 0x4c && syscall[1] == 0x8b && syscall[2] == 0xd1 && syscall[3] == 0xb8) - args64[0] = *(DWORD *)(syscall + 4); - else - win_skip( "syscall thunk not recognized\n" ); - NtClose( process ); - } return call_func64( func, ARRAY_SIZE(args64), args64 ); } @@ -1262,6 +1254,25 @@ static void test_syscalls(void) status = NtClose( event ); ok( !status, "NtClose failed %x\n", status ); + + if (pNtWow64ReadVirtualMemory64) + { + TEB64 *teb64 = (TEB64 *)NtCurrentTeb()->GdiBatchCount; + PEB64 peb64, peb64_2; + ULONG64 res, res2; + HANDLE process = OpenProcess( PROCESS_ALL_ACCESS, FALSE, GetCurrentProcessId() ); + ULONG args32[] = { HandleToLong( process ), (ULONG)teb64->Peb, teb64->Peb >> 32, + PtrToUlong(&peb64_2), sizeof(peb64_2), 0, PtrToUlong(&res2) }; + + ok( process != 0, "failed to open current process %u\n", GetLastError() ); + status = pNtWow64ReadVirtualMemory64( process, teb64->Peb, &peb64, sizeof(peb64), &res ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + status = invoke_syscall( "NtWow64ReadVirtualMemory64", args32 ); + ok( !status, "NtWow64ReadVirtualMemory64 failed %x\n", status ); + ok( res2 == res, "wrong len %s / %s\n", wine_dbgstr_longlong(res), wine_dbgstr_longlong(res2) ); + ok( !memcmp( &peb64, &peb64_2, res ), "data is different\n" ); + NtClose( process ); + } } static void test_cpu_area(void)

1 0

Alexandre Julliard : ntdll: Rename the SYSTEM_MODULE and SYSTEM_MODULE_INFORMATION structures.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: eb6fcd3cb9265de0ccf5e9cc767992f5939325c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb6fcd3cb9265de0ccf5e9cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jul 27 16:38:45 2021 +0200 ntdll: Rename the SYSTEM_MODULE and SYSTEM_MODULE_INFORMATION structures. To be consistent with the _EX version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/loader.c | 4 ++-- dlls/ntdll/tests/info.c | 6 +++--- dlls/ntdll/unix/system.c | 8 ++++---- include/winternl.h | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 3339596944a..2b840a864a6 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3119,10 +3119,10 @@ IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock( void *page, UINT count * LdrQueryProcessModuleInformation * */ -NTSTATUS WINAPI LdrQueryProcessModuleInformation(PSYSTEM_MODULE_INFORMATION smi, +NTSTATUS WINAPI LdrQueryProcessModuleInformation(RTL_PROCESS_MODULES *smi, ULONG buf_size, ULONG* req_size) { - SYSTEM_MODULE* sm = &smi->Modules[0]; + RTL_PROCESS_MODULE_INFORMATION *sm = &smi->Modules[0]; ULONG size = sizeof(ULONG); NTSTATUS nts = STATUS_SUCCESS; ANSI_STRING str; diff --git a/dlls/ntdll/tests/info.c b/dlls/ntdll/tests/info.c index c7c849d2537..ccce197206b 100644 --- a/dlls/ntdll/tests/info.c +++ b/dlls/ntdll/tests/info.c @@ -635,7 +635,7 @@ static void test_query_procperf(void) static void test_query_module(void) { const RTL_PROCESS_MODULE_INFORMATION_EX *infoex; - SYSTEM_MODULE_INFORMATION *info; + RTL_PROCESS_MODULES *info; NTSTATUS status; ULONG size, i; char *buffer; @@ -652,7 +652,7 @@ static void test_query_module(void) for (i = 0; i < info->ModulesCount; i++) { - const SYSTEM_MODULE *module = &info->Modules[i]; + RTL_PROCESS_MODULE_INFORMATION *module = &info->Modules[i]; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); @@ -678,7 +678,7 @@ static void test_query_module(void) infoex = (const void *)buffer; for (i = 0; infoex->NextOffset; i++) { - const SYSTEM_MODULE *module = &infoex->BaseInfo; + const RTL_PROCESS_MODULE_INFORMATION *module = &infoex->BaseInfo; ok(module->LoadOrderIndex == i, "%u: got index %u\n", i, module->LoadOrderIndex); ok(module->ImageBaseAddress || is_wow64, "%u: got NULL address for %s\n", i, module->Name); diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index fcc0fb6677e..94961ed524e 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2450,15 +2450,15 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, }; ULONG i; - SYSTEM_MODULE_INFORMATION *smi = info; + RTL_PROCESS_MODULES *smi = info; - len = offsetof( SYSTEM_MODULE_INFORMATION, Modules[ARRAY_SIZE(fake_modules)] ); + len = offsetof( RTL_PROCESS_MODULES, Modules[ARRAY_SIZE(fake_modules)] ); if (len <= size) { memset( smi, 0, len ); for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - SYSTEM_MODULE *sm = &smi->Modules[i]; + RTL_PROCESS_MODULE_INFORMATION *sm = &smi->Modules[i]; sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; sm->ImageSize = 0x200000; sm->LoadOrderIndex = i; @@ -2814,7 +2814,7 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, memset( info, 0, len ); for (i = 0; i < ARRAY_SIZE(fake_modules); i++) { - SYSTEM_MODULE *sm = &module_info[i].BaseInfo; + RTL_PROCESS_MODULE_INFORMATION *sm = &module_info[i].BaseInfo; sm->ImageBaseAddress = (char *)0x10000000 + 0x200000 * i; sm->ImageSize = 0x200000; sm->LoadOrderIndex = i; diff --git a/include/winternl.h b/include/winternl.h index 20905486766..7d732d895d9 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3391,7 +3391,7 @@ typedef void (CALLBACK *PLDR_DLL_NOTIFICATION_FUNCTION)(ULONG, LDR_DLL_NOTIFICAT /* FIXME: to be checked */ #define MAXIMUM_FILENAME_LENGTH 256 -typedef struct _SYSTEM_MODULE +typedef struct _RTL_PROCESS_MODULE_INFORMATION { PVOID Section; /* 00/00 */ PVOID MappedBaseAddress; /* 04/08 */ @@ -3403,13 +3403,13 @@ typedef struct _SYSTEM_MODULE WORD LoadCount; /* 18/24 */ WORD NameOffset; /* 1a/26 */ BYTE Name[MAXIMUM_FILENAME_LENGTH]; /* 1c/28 */ -} SYSTEM_MODULE, *PSYSTEM_MODULE; +} RTL_PROCESS_MODULE_INFORMATION, *PRTL_PROCESS_MODULE_INFORMATION; -typedef struct _SYSTEM_MODULE_INFORMATION +typedef struct _RTL_PROCESS_MODULES { ULONG ModulesCount; - SYSTEM_MODULE Modules[1]; /* FIXME: should be Modules[0] */ -} SYSTEM_MODULE_INFORMATION, *PSYSTEM_MODULE_INFORMATION; + RTL_PROCESS_MODULE_INFORMATION Modules[1]; /* FIXME: should be Modules[0] */ +} RTL_PROCESS_MODULES, *PRTL_PROCESS_MODULES; #define PROCESS_CREATE_FLAGS_BREAKAWAY 0x00000001 #define PROCESS_CREATE_FLAGS_NO_DEBUG_INHERIT 0x00000002 @@ -3426,7 +3426,7 @@ typedef struct _SYSTEM_MODULE_INFORMATION typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX { USHORT NextOffset; - SYSTEM_MODULE BaseInfo; + RTL_PROCESS_MODULE_INFORMATION BaseInfo; ULONG ImageCheckSum; ULONG TimeDateStamp; void *DefaultBase; @@ -3779,7 +3779,7 @@ NTSYSAPI NTSTATUS WINAPI LdrLoadDll(LPCWSTR, DWORD, const UNICODE_STRING*, HMOD NTSYSAPI NTSTATUS WINAPI LdrLockLoaderLock(ULONG,ULONG*,ULONG_PTR*); IMAGE_BASE_RELOCATION * WINAPI LdrProcessRelocationBlock(void*,UINT,USHORT*,INT_PTR); NTSYSAPI NTSTATUS WINAPI LdrQueryImageFileExecutionOptions(const UNICODE_STRING*,LPCWSTR,ULONG,void*,ULONG,ULONG*); -NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(SYSTEM_MODULE_INFORMATION*, ULONG, ULONG*); +NTSYSAPI NTSTATUS WINAPI LdrQueryProcessModuleInformation(RTL_PROCESS_MODULES*, ULONG, ULONG*); NTSYSAPI NTSTATUS WINAPI LdrRegisterDllNotification(ULONG,PLDR_DLL_NOTIFICATION_FUNCTION,void*,void**); NTSYSAPI NTSTATUS WINAPI LdrRemoveDllDirectory(void*); NTSYSAPI NTSTATUS WINAPI LdrSetDefaultDllDirectories(ULONG);

1 0

Francois Gouget : oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: fd0a55ce4623c982ddcfcb0dc74e13cbaa6aaf3e URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd0a55ce4623c982ddcfcb0d… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 27 01:42:08 2021 +0200 oleaut32/tests: Test VarParseNumFromStr()'s handling of LOCALE_SMON*. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 276 +++++++++++++++++++++++++++++++++++++++--- 1 file changed, 257 insertions(+), 19 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fd0a55ce4623c982ddcf…

1 0

Francois Gouget : oleaut32/tests: Add more VarParseNumFromStr() hexadecimal/octal tests.
by Alexandre Julliard 27 Jul '21

27 Jul '21

Module: wine Branch: master Commit: a74e2871abd83422f2a152b537dd510ee73b1cbd URL: https://source.winehq.org/git/wine.git/?a=commit;h=a74e2871abd83422f2a152b5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Jul 27 01:43:17 2021 +0200 oleaut32/tests: Add more VarParseNumFromStr() hexadecimal/octal tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 73bcdb8a260..bed4de469df 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1495,7 +1495,7 @@ static void test_VarParseNumFromStrEn(void) EXPECTFAIL; EXPECTRGB(0,FAILDIG); - /* Octal */ + /* A leading 0 does not an octal number make */ CONVERT("0100", NUMPRS_HEX_OCT); EXPECT(1,NUMPRS_HEX_OCT,0,4,0,2); EXPECTRGB(0,1); @@ -1546,6 +1546,20 @@ static void test_VarParseNumFromStrEn(void) EXPECTRGB(1,2); EXPECTRGB(3,FAILDIG); + /* Only integers are allowed when using an alternative radix */ + CONVERT("&ha.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + todo_wine EXPECTRGB(1,FAILDIG); + + /* Except if it looks like a plain decimal number */ + CONVERT("01.2", NUMPRS_HEX_OCT|NUMPRS_DECIMAL); + EXPECT(2,NUMPRS_HEX_OCT|NUMPRS_DECIMAL,NUMPRS_DECIMAL,4,0,-1); + EXPECT2(1,2); + EXPECTRGB(3,FAILDIG); + /** NUMPRS_PARENS **/ /* Empty parens = error */ @@ -1584,6 +1598,14 @@ static void test_VarParseNumFromStrEn(void) */ EXPECTRGB(4,FAILDIG); + /* With flag, thousands sep. and following digits consumed */ + CONVERT("&h1,000", NUMPRS_HEX_OCT|NUMPRS_THOUSANDS); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_THOUSANDS,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,1); + todo_wine EXPECTRGB(1,FAILDIG); + /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1,001.0", NUMPRS_THOUSANDS); EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); @@ -1636,6 +1658,17 @@ static void test_VarParseNumFromStrEn(void) EXPECT2(1,1); EXPECTRGB(2,FAILDIG); + /* With flag, currency amounts cannot be in hexadecimal */ + CONVERT("$&ha", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + todo_wine EXPECTFAIL; + + CONVERT("&ha$", NUMPRS_HEX_OCT|NUMPRS_CURRENCY); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_CURRENCY,NUMPRS_HEX_OCT,3,4,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECTRGB(0,10); + EXPECTRGB(1,FAILDIG); + /* With flag, the sign cannot be repeated before the amount */ CONVERT("$$11", NUMPRS_CURRENCY); EXPECTFAIL; @@ -1768,6 +1801,20 @@ static void test_VarParseNumFromStrEn(void) EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,3,0,1); EXPECT2(1,FAILDIG); + /* With flag, incompatible with NUMPRS_HEX_OCT */ + CONVERT("&o1e1", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + if (broken(1)) /* FIXME Reenable once Wine is less broken */ + EXPECT(1,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,3,3,0); + todo_wine ok(np.dwOutFlags == NUMPRS_HEX_OCT, "Got dwOutFlags=%08x\n", np.dwOutFlags); + EXPECT2(1,FAILDIG); + + /* With flag, even if it sort of looks like an exponent */ + CONVERT("&h1e2", NUMPRS_HEX_OCT|NUMPRS_EXPONENT); + EXPECT(3,NUMPRS_HEX_OCT|NUMPRS_EXPONENT,NUMPRS_HEX_OCT,5,4,0); + EXPECT2(1,0xe); + EXPECTRGB(2,2); + EXPECTRGB(3,FAILDIG); + /* Negative exponents are accepted without flags */ CONVERT("1e-1", NUMPRS_EXPONENT); EXPECT(1,NUMPRS_EXPONENT,NUMPRS_EXPONENT,4,0,-1);

1 0