June 2023 - Wine-commits - list.winehq.org

Davide Beatrici : winealsa: Implement main_loop in unixlib.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: b089e4a2bbf9b6c295f29315bbe168610f003d30 URL: https://gitlab.winehq.org/wine/wine/-/commit/b089e4a2bbf9b6c295f29315bbe168… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 12 19:41:57 2023 +0200 winealsa: Implement main_loop in unixlib. --- dlls/winealsa.drv/alsa.c | 24 ++++++++++++++++++++++-- dlls/winealsa.drv/mmdevdrv.c | 7 +++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index dbf85a7947e..4930850e9dc 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -476,6 +476,13 @@ static WCHAR *alsa_get_card_name(int card) return ret; } +static NTSTATUS alsa_main_loop(void *args) +{ + struct main_loop_params *params = args; + NtSetEvent(params->event, NULL); + return STATUS_SUCCESS; +} + static NTSTATUS alsa_get_endpoint_ids(void *args) { static const WCHAR defaultW[] = {'d','e','f','a','u','l','t',0}; @@ -2493,7 +2500,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = { alsa_not_implemented, alsa_not_implemented, - alsa_not_implemented, + alsa_main_loop, alsa_get_endpoint_ids, alsa_create_stream, alsa_release_stream, @@ -2531,6 +2538,19 @@ unixlib_entry_t __wine_unix_call_funcs[] = typedef UINT PTR32; +static NTSTATUS alsa_wow64_main_loop(void *args) +{ + struct + { + PTR32 event; + } *params32 = args; + struct main_loop_params params = + { + .event = ULongToHandle(params32->event) + }; + return alsa_main_loop(&params); +} + static NTSTATUS alsa_wow64_get_endpoint_ids(void *args) { struct @@ -2934,7 +2954,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = { alsa_not_implemented, alsa_not_implemented, - alsa_not_implemented, + alsa_wow64_main_loop, alsa_wow64_get_endpoint_ids, alsa_wow64_create_stream, alsa_wow64_release_stream, diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 7c7096d584a..d2681fc8e9c 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -76,6 +76,8 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; +extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; + extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; @@ -598,6 +600,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + if(FAILED(params.result = main_loop_start())){ + sessions_unlock(); + return params.result; + } + dump_fmt(fmt); params.name = NULL;

1 0

Davide Beatrici : winecoreaudio: Implement main_loop in unixlib.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 9ad0694aed6ad3622975fc37ef26c0437d0efbdc URL: https://gitlab.winehq.org/wine/wine/-/commit/9ad0694aed6ad3622975fc37ef26c0… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 12 19:42:17 2023 +0200 winecoreaudio: Implement main_loop in unixlib. --- dlls/winecoreaudio.drv/coreaudio.c | 24 ++++++++++++++++++++++-- dlls/winecoreaudio.drv/mmdevdrv.c | 7 +++++++ 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index d031b82583e..f41118e62f5 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -196,6 +196,13 @@ static BOOL device_has_channels(AudioDeviceID device, EDataFlow flow) return ret; } +static NTSTATUS unix_main_loop(void *args) +{ + struct main_loop_params *params = args; + NtSetEvent(params->event, NULL); + return STATUS_SUCCESS; +} + static NTSTATUS unix_get_endpoint_ids(void *args) { struct get_endpoint_ids_params *params = args; @@ -1775,7 +1782,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = { unix_not_implemented, unix_not_implemented, - unix_not_implemented, + unix_main_loop, unix_get_endpoint_ids, unix_create_stream, unix_release_stream, @@ -1813,6 +1820,19 @@ unixlib_entry_t __wine_unix_call_funcs[] = typedef UINT PTR32; +static NTSTATUS unix_wow64_main_loop(void *args) +{ + struct + { + PTR32 event; + } *params32 = args; + struct main_loop_params params = + { + .event = ULongToHandle(params32->event) + }; + return unix_main_loop(&params); +} + static NTSTATUS unix_wow64_get_endpoint_ids(void *args) { struct @@ -2157,7 +2177,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = { unix_not_implemented, unix_not_implemented, - unix_not_implemented, + unix_wow64_main_loop, unix_wow64_get_endpoint_ids, unix_wow64_create_stream, unix_wow64_release_stream, diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index f268e9565b4..300d2a8223a 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -70,6 +70,8 @@ static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = static CRITICAL_SECTION g_sessions_lock = { &g_sessions_lock_debug, -1, 0, 0, 0, 0 }; static struct list g_sessions = LIST_INIT(g_sessions); +extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; + extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; @@ -587,6 +589,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + if(FAILED(params.result = main_loop_start())){ + sessions_unlock(); + return params.result; + } + params.name = NULL; params.device = This->device_name; params.flow = This->dataflow;

1 0

Davide Beatrici : wineoss: Implement main_loop in unixlib.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: e55c432a91870d7d86f9a60848c2ec79b63e555b URL: https://gitlab.winehq.org/wine/wine/-/commit/e55c432a91870d7d86f9a60848c2ec… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Mon Jun 12 19:42:38 2023 +0200 wineoss: Implement main_loop in unixlib. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++++++ dlls/wineoss.drv/oss.c | 24 ++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 12f10fd4377..038dcecd07f 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -82,6 +82,8 @@ extern const IAudioClock2Vtbl AudioClock2_Vtbl; extern const IAudioStreamVolumeVtbl AudioStreamVolume_Vtbl; extern const IChannelAudioVolumeVtbl ChannelAudioVolume_Vtbl; +extern HRESULT main_loop_start(void) DECLSPEC_HIDDEN; + extern struct audio_session_wrapper *session_wrapper_create( struct audio_client *client) DECLSPEC_HIDDEN; @@ -575,6 +577,11 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, return AUDCLNT_E_ALREADY_INITIALIZED; } + if(FAILED(params.result = main_loop_start())){ + sessions_unlock(); + return params.result; + } + params.name = NULL; params.device = This->device_name; params.flow = This->dataflow; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index df03d3286d9..5049c711e98 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -221,6 +221,13 @@ static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) return; } +static NTSTATUS oss_main_loop(void *args) +{ + struct main_loop_params *params = args; + NtSetEvent(params->event, NULL); + return STATUS_SUCCESS; +} + static NTSTATUS oss_get_endpoint_ids(void *args) { struct get_endpoint_ids_params *params = args; @@ -1684,7 +1691,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = { oss_not_implemented, oss_not_implemented, - oss_not_implemented, + oss_main_loop, oss_get_endpoint_ids, oss_create_stream, oss_release_stream, @@ -1738,6 +1745,19 @@ static NTSTATUS oss_wow64_test_connect(void *args) return STATUS_SUCCESS; } +static NTSTATUS oss_wow64_main_loop(void *args) +{ + struct + { + PTR32 event; + } *params32 = args; + struct main_loop_params params = + { + .event = ULongToHandle(params32->event) + }; + return oss_main_loop(&params); +} + static NTSTATUS oss_wow64_get_endpoint_ids(void *args) { struct @@ -2108,7 +2128,7 @@ unixlib_entry_t __wine_unix_call_wow64_funcs[] = { oss_not_implemented, oss_not_implemented, - oss_not_implemented, + oss_wow64_main_loop, oss_wow64_get_endpoint_ids, oss_wow64_create_stream, oss_wow64_release_stream,

1 0

Alexandre Julliard : kernel32/tests: Fix the PROCESS_BASIC_INFORMATION exit status type.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 2f3c8be54f3e469616ddb78b134c5617f2e711ca URL: https://gitlab.winehq.org/wine/wine/-/commit/2f3c8be54f3e469616ddb78b134c56… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 22:04:44 2023 +0200 kernel32/tests: Fix the PROCESS_BASIC_INFORMATION exit status type. --- dlls/kernel32/tests/loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index 696ffae4430..2c9e97d7fc7 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -38,7 +38,7 @@ struct PROCESS_BASIC_INFORMATION_PRIVATE { - DWORD_PTR ExitStatus; + NTSTATUS ExitStatus; PPEB PebBaseAddress; DWORD_PTR AffinityMask; DWORD_PTR BasePriority; @@ -3004,7 +3004,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#lx\n", ret); ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, - "expected STILL_ACTIVE, got %Iu\n", pbi.ExitStatus); + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#lx\n", ret); @@ -3040,7 +3040,7 @@ static void child_process(const char *dll_name, DWORD target_offset) ret = pNtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#lx\n", ret); ok(pbi.ExitStatus == STILL_ACTIVE || pbi.ExitStatus == 195, - "expected STILL_ACTIVE, got %Iu\n", pbi.ExitStatus); + "expected STILL_ACTIVE, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(process, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(!ret, "NtSetInformationProcess error %#lx\n", ret); @@ -3555,7 +3555,7 @@ static void test_ExitProcess(void) memset(&pbi, 0, sizeof(pbi)); ret = pNtQueryInformationProcess(pi.hProcess, ProcessBasicInformation, &pbi, sizeof(pbi), NULL); ok(!ret, "NtQueryInformationProcess error %#lx\n", ret); - ok(pbi.ExitStatus == 198, "expected 198, got %Iu\n", pbi.ExitStatus); + ok(pbi.ExitStatus == 198, "expected 198, got %lu\n", pbi.ExitStatus); affinity = 1; ret = pNtSetInformationProcess(pi.hProcess, ProcessAffinityMask, &affinity, sizeof(affinity)); ok(ret == STATUS_PROCESS_IS_TERMINATING, "expected STATUS_PROCESS_IS_TERMINATING, got %#lx\n", ret);

1 0

Alexandre Julliard : server: Also enforce the size of varargs data structures.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 2705e6c319119663836e3c3c7a18649b0afad028 URL: https://gitlab.winehq.org/wine/wine/-/commit/2705e6c319119663836e3c3c7a1864… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 10:47:20 2023 +0200 server: Also enforce the size of varargs data structures. --- include/wine/server_protocol.h | 3 ++- server/protocol.def | 1 + server/request.h | 18 ++++++++++++++++++ tools/make_requests | 22 +++++++++++++++++++++- 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 5a14a3c4370..1dfb9131f50 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -456,6 +456,7 @@ typedef union { enum select_op op; obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + int __pad; } wait; struct { @@ -6413,7 +6414,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 774 +#define SERVER_PROTOCOL_VERSION 775 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index 4237737ab40..90227fad66a 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -472,6 +472,7 @@ typedef union { enum select_op op; /* SELECT_WAIT or SELECT_WAIT_ALL */ obj_handle_t handles[MAXIMUM_WAIT_OBJECTS]; + int __pad; } wait; struct { diff --git a/server/request.h b/server/request.h index ea08babdda8..f1ec5c63579 100644 --- a/server/request.h +++ b/server/request.h @@ -689,13 +689,17 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = C_ASSERT( sizeof(abstime_t) == 8 ); C_ASSERT( sizeof(affinity_t) == 8 ); +C_ASSERT( sizeof(apc_call_t) == 48 ); C_ASSERT( sizeof(apc_param_t) == 8 ); C_ASSERT( sizeof(apc_result_t) == 40 ); C_ASSERT( sizeof(async_data_t) == 40 ); C_ASSERT( sizeof(atom_t) == 4 ); C_ASSERT( sizeof(char) == 1 ); C_ASSERT( sizeof(client_ptr_t) == 8 ); +C_ASSERT( sizeof(context_t) == 1720 ); +C_ASSERT( sizeof(cursor_pos_t) == 24 ); C_ASSERT( sizeof(data_size_t) == 4 ); +C_ASSERT( sizeof(debug_event_t) == 160 ); C_ASSERT( sizeof(file_pos_t) == 8 ); C_ASSERT( sizeof(generic_map_t) == 16 ); C_ASSERT( sizeof(hw_input_t) == 40 ); @@ -704,17 +708,31 @@ C_ASSERT( sizeof(ioctl_code_t) == 4 ); C_ASSERT( sizeof(irp_params_t) == 32 ); C_ASSERT( sizeof(lparam_t) == 8 ); C_ASSERT( sizeof(mem_size_t) == 8 ); +C_ASSERT( sizeof(message_data_t) == 56 ); C_ASSERT( sizeof(mod_handle_t) == 8 ); C_ASSERT( sizeof(obj_handle_t) == 4 ); +C_ASSERT( sizeof(pe_image_info_t) == 80 ); C_ASSERT( sizeof(process_id_t) == 4 ); +C_ASSERT( sizeof(property_data_t) == 16 ); C_ASSERT( sizeof(rectangle_t) == 16 ); +C_ASSERT( sizeof(select_op_t) == 264 ); C_ASSERT( sizeof(short int) == 2 ); +C_ASSERT( sizeof(startup_info_t) == 92 ); +C_ASSERT( sizeof(struct filesystem_event) == 12 ); +C_ASSERT( sizeof(struct handle_info) == 20 ); C_ASSERT( sizeof(struct luid) == 8 ); +C_ASSERT( sizeof(struct luid_attr) == 12 ); +C_ASSERT( sizeof(struct object_attributes) == 16 ); +C_ASSERT( sizeof(struct object_type_info) == 44 ); +C_ASSERT( sizeof(struct process_info) == 40 ); +C_ASSERT( sizeof(struct rawinput_device) == 12 ); +C_ASSERT( sizeof(struct thread_info) == 40 ); C_ASSERT( sizeof(thread_id_t) == 4 ); C_ASSERT( sizeof(timeout_t) == 8 ); C_ASSERT( sizeof(unsigned char) == 1 ); C_ASSERT( sizeof(unsigned int) == 4 ); C_ASSERT( sizeof(unsigned short) == 2 ); +C_ASSERT( sizeof(user_apc_t) == 40 ); C_ASSERT( sizeof(user_handle_t) == 4 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, token) == 12 ); C_ASSERT( FIELD_OFFSET(struct new_process_request, debug) == 16 ); diff --git a/tools/make_requests b/tools/make_requests index e5db1c7fc0a..a3c987c4702 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -52,6 +52,25 @@ my %formats = "generic_map_t" => [ 16, 4, "&dump_generic_map" ], "ioctl_code_t" => [ 4, 4, "&dump_ioctl_code" ], "hw_input_t" => [ 40, 8, "&dump_hw_input" ], + # varargs-only structures + "apc_call_t" => [ 48, 8 ], + "context_t" => [ 1720, 8 ], + "cursor_pos_t" => [ 24, 8 ], + "debug_event_t" => [ 160, 8 ], + "message_data_t" => [ 56, 8 ], + "pe_image_info_t" => [ 80, 8 ], + "property_data_t" => [ 16, 8 ], + "select_op_t" => [ 264, 8 ], + "startup_info_t" => [ 92, 4 ], + "user_apc_t" => [ 40, 8 ], + "struct filesystem_event" => [ 12, 4 ], + "struct handle_info" => [ 20, 4 ], + "struct luid_attr" => [ 12, 4 ], + "struct object_attributes" => [ 16, 4 ], + "struct object_type_info" => [ 44, 4 ], + "struct process_info" => [ 40, 8 ], + "struct rawinput_device" => [ 12, 4 ], + "struct thread_info" => [ 40, 8 ], ); my @requests = (); @@ -479,7 +498,8 @@ push @request_lines, "};\n\n"; foreach my $type (sort keys %formats) { - my $size = ${$formats{$type}}[0]; + my ($size, $align) = @{$formats{$type}}; + die "$type: invalid size $size for alignment $align" if $size % $align; push @request_lines, "C_ASSERT( sizeof($type) == $size );\n"; } push @request_lines, @asserts;

1 0

Alexandre Julliard : ntdll: Support the lower memory limit in MEM_ADDRESS_REQUIREMENTS.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 11cd51139d4b9adaf877f4082d16adccc22cab7c URL: https://gitlab.winehq.org/wine/wine/-/commit/11cd51139d4b9adaf877f4082d16ad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 11:17:03 2023 +0200 ntdll: Support the lower memory limit in MEM_ADDRESS_REQUIREMENTS. --- dlls/ntdll/tests/virtual.c | 62 +++++++++++++++++++++ dlls/ntdll/unix/loader.c | 35 ++++++------ dlls/ntdll/unix/server.c | 27 +++++----- dlls/ntdll/unix/thread.c | 8 +-- dlls/ntdll/unix/unix_private.h | 16 +++--- dlls/ntdll/unix/virtual.c | 119 ++++++++++++++++++++++++----------------- include/wine/server_protocol.h | 11 ++-- server/protocol.def | 9 ++-- server/request.h | 2 +- server/trace.c | 7 ++- tools/make_requests | 2 +- 11 files changed, 199 insertions(+), 99 deletions(-)

1 0

Alexandre Julliard : ntdll: Allocate 64-bit and kernel stacks in high memory.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: a82238fad52761114ab2488d422fad3f70dbb854 URL: https://gitlab.winehq.org/wine/wine/-/commit/a82238fad52761114ab2488d422fad… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 12:17:32 2023 +0200 ntdll: Allocate 64-bit and kernel stacks in high memory. --- dlls/ntdll/unix/thread.c | 8 ++++---- dlls/ntdll/unix/unix_private.h | 5 ++++- dlls/ntdll/unix/virtual.c | 5 +++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/unix/thread.c b/dlls/ntdll/unix/thread.c index e821fa680ce..d312ed6a066 100644 --- a/dlls/ntdll/unix/thread.c +++ b/dlls/ntdll/unix/thread.c @@ -1180,7 +1180,7 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE NTSTATUS status; /* kernel stack */ - if ((status = virtual_alloc_thread_stack( &stack, 0, 0, kernel_stack_size, kernel_stack_size, FALSE ))) + if ((status = virtual_alloc_thread_stack( &stack, limit_4g, 0, kernel_stack_size, kernel_stack_size, FALSE ))) return status; thread_data->kernel_stack = stack.DeallocationStack; @@ -1191,7 +1191,7 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE ((get_machine_context_size( main_image_info.Machine ) + 7) & ~7) + sizeof(ULONG64); /* 64-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, 0, 0, 0x40000, 0x40000, TRUE ))) return status; + if ((status = virtual_alloc_thread_stack( &stack, limit_4g, 0, 0x40000, 0x40000, TRUE ))) return status; cpu = (WOW64_CPURESERVED *)(((ULONG_PTR)stack.StackBase - cpusize) & ~15); cpu->Machine = main_image_info.Machine; @@ -1201,8 +1201,8 @@ NTSTATUS init_thread_stack( TEB *teb, ULONG_PTR limit, SIZE_T reserve_size, SIZE teb->DeallocationStack = stack.DeallocationStack; /* 32-bit stack */ - if ((status = virtual_alloc_thread_stack( &stack, 0, limit ? limit : 0x7fffffff, - reserve_size, commit_size, TRUE ))) + if (!limit || limit >= limit_2g) limit = limit_2g - 1; + if ((status = virtual_alloc_thread_stack( &stack, 0, limit, reserve_size, commit_size, TRUE ))) return status; wow_teb->Tib.StackBase = PtrToUlong( stack.StackBase ); wow_teb->Tib.StackLimit = PtrToUlong( stack.StackLimit ); diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index b7ea96bb20a..1f49d957e0d 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -44,6 +44,9 @@ extern WORD native_machine DECLSPEC_HIDDEN; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); +static const ULONG_PTR limit_2g = (ULONG_PTR)1 << 31; +static const ULONG_PTR limit_4g = (ULONG_PTR)((ULONGLONG)1 << 32); + static inline BOOL is_machine_64bit( WORD machine ) { return (machine == IMAGE_FILE_MACHINE_AMD64 || machine == IMAGE_FILE_MACHINE_ARM64); @@ -513,7 +516,7 @@ static inline NTSTATUS map_section( HANDLE mapping, void **ptr, SIZE_T *size, UL { *ptr = NULL; *size = 0; - return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, is_win64 && wow_peb ? 0x7fffffff : 0, + return NtMapViewOfSection( mapping, NtCurrentProcess(), ptr, is_win64 && wow_peb ? limit_2g - 1 : 0, 0, NULL, size, ViewShare, 0, protect ); } diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index a7f4d7412e5..b062ac5038a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3352,7 +3352,7 @@ TEB *virtual_alloc_first_teb(void) exit(1); } - NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? 0x7fffffff : 0, &total, + NtAllocateVirtualMemory( NtCurrentProcess(), &teb_block, is_win64 ? limit_2g - 1 : 0, &total, MEM_RESERVE | MEM_TOP_DOWN, PAGE_READWRITE ); teb_block_pos = 30; ptr = (char *)teb_block + 30 * block_size; @@ -3390,7 +3390,8 @@ NTSTATUS virtual_alloc_teb( TEB **ret_teb ) { SIZE_T total = 32 * block_size; - if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, is_win64 && is_wow64() ? 0x7fffffff : 0, + if ((status = NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, + is_win64 && is_wow64() ? limit_2g - 1 : 0, &total, MEM_RESERVE, PAGE_READWRITE ))) { server_leave_uninterrupted_section( &virtual_mutex, &sigset );

1 0

Alexandre Julliard : ntdll: Load modules with a high base address in high memory.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: f473e31341a0dbc2eb5222cc1d1cfe468946bf0a URL: https://gitlab.winehq.org/wine/wine/-/commit/f473e31341a0dbc2eb5222cc1d1cfe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 14:44:26 2023 +0200 ntdll: Load modules with a high base address in high memory. --- dlls/ntdll/unix/virtual.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index b062ac5038a..daba5086422 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2829,9 +2829,15 @@ static NTSTATUS virtual_map_image( HANDLE mapping, void **addr_ptr, SIZE_T *size base = wine_server_get_ptr( image_info->base ); if ((ULONG_PTR)base != image_info->base) base = NULL; - if ((char *)base >= (char *)address_space_start) /* make sure the DOS area remains free */ - status = map_view( &view, base, size, alloc_type, vprot, limit_low, limit_high, 0 ); - + limit_low = max( limit_low, (ULONG_PTR)address_space_start ); /* make sure the DOS area remains free */ + status = map_view( &view, base, size, alloc_type, vprot, limit_low, limit_high, 0 ); + if (status && limit_low < limit_4g) + { + if ((ULONG_PTR)base >= limit_4g) status = map_view( &view, NULL, size, alloc_type, vprot, + limit_4g, limit_high, 0 ); + else if (limit_high > limit_2g) status = map_view( &view, NULL, size, alloc_type, vprot, + limit_low, limit_2g - 1, 0 ); + } if (status) status = map_view( &view, NULL, size, alloc_type, vprot, limit_low, limit_high, 0 ); if (status) goto done;

1 0

Alexandre Julliard : ntdll: Make only the necessary pages writable in the ARM64EC code map.
by Alexandre Julliard 13 Jun '23

13 Jun '23

Module: wine Branch: master Commit: 3c4be9856dad0492f8b5356de0656fd79a4a98f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/3c4be9856dad0492f8b5356de0656f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 13 17:45:54 2023 +0200 ntdll: Make only the necessary pages writable in the ARM64EC code map. --- dlls/ntdll/unix/virtual.c | 72 +++++++++++++++++++++++++++++++++-------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index daba5086422..9a42db3c77a 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -123,7 +123,8 @@ struct file_view #define VPROT_COMMITTED 0x20 #define VPROT_WRITEWATCH 0x40 /* per-mapping protection flags */ -#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ +#define VPROT_ARM64EC 0x0100 /* view may contain ARM64EC code */ +#define VPROT_SYSTEM 0x0200 /* system view (underlying mmap not under our control) */ #define VPROT_PLACEHOLDER 0x0400 #define VPROT_FREE_PLACEHOLDER 0x0800 @@ -178,7 +179,7 @@ static void *user_space_limit = (void *)0x7fff0000; static void *working_set_limit = (void *)0x7fff0000; #endif -static UINT64 *arm64ec_map; +static struct file_view *arm64ec_view; struct _KUSER_SHARED_DATA *user_shared_data = (void *)0x7ffe0000; @@ -1027,6 +1028,7 @@ static inline UINT64 maskbits( size_t idx ) */ static void set_arm64ec_range( const void *addr, size_t size ) { + UINT64 *map = arm64ec_view->base; size_t idx = (size_t)addr >> page_shift; size_t end = ((size_t)addr + size + page_mask) >> page_shift; size_t pos = idx / 64; @@ -1034,11 +1036,11 @@ static void set_arm64ec_range( const void *addr, size_t size ) if (end_pos > pos) { - arm64ec_map[pos++] |= maskbits( idx ); - while (pos < end_pos) arm64ec_map[pos++] = ~(UINT64)0; - if (end & 63) arm64ec_map[pos] |= ~maskbits( end ); + map[pos++] |= maskbits( idx ); + while (pos < end_pos) map[pos++] = ~(UINT64)0; + if (end & 63) map[pos] |= ~maskbits( end ); } - else arm64ec_map[pos] |= maskbits( idx ) & ~maskbits( end ); + else map[pos] |= maskbits( idx ) & ~maskbits( end ); } @@ -1047,6 +1049,7 @@ static void set_arm64ec_range( const void *addr, size_t size ) */ static void clear_arm64ec_range( const void *addr, size_t size ) { + UINT64 *map = arm64ec_view->base; size_t idx = (size_t)addr >> page_shift; size_t end = ((size_t)addr + size + page_mask) >> page_shift; size_t pos = idx / 64; @@ -1054,11 +1057,11 @@ static void clear_arm64ec_range( const void *addr, size_t size ) if (end_pos > pos) { - arm64ec_map[pos++] &= ~maskbits( idx ); - while (pos < end_pos) arm64ec_map[pos++] = 0; - if (end & 63) arm64ec_map[pos] &= maskbits( end ); + map[pos++] &= ~maskbits( idx ); + while (pos < end_pos) map[pos++] = 0; + if (end & 63) map[pos] &= maskbits( end ); } - else arm64ec_map[pos] &= ~maskbits( idx ) | maskbits( end ); + else map[pos] &= ~maskbits( idx ) | maskbits( end ); } @@ -1533,7 +1536,7 @@ static void delete_view( struct file_view *view ) /* [in] View */ { if (!(view->protect & VPROT_SYSTEM)) unmap_area( view->base, view->size ); set_page_vprot( view->base, view->size, 0 ); - if (arm64ec_map) clear_arm64ec_range( view->base, view->size ); + if (view->protect & VPROT_ARM64EC) clear_arm64ec_range( view->base, view->size ); unregister_view( view ); free_view( view ); } @@ -1759,6 +1762,24 @@ static NTSTATUS set_protection( struct file_view *view, void *base, SIZE_T size, } +/*********************************************************************** + * commit_arm64ec_map + * + * Make sure that the pages corresponding to the address range of the view + * are committed in the ARM64EC code map. + */ +static void commit_arm64ec_map( struct file_view *view ) +{ + size_t start = ((size_t)view->base >> page_shift) / 8; + size_t end = (((size_t)view->base + view->size) >> page_shift) / 8; + size_t size = ROUND_SIZE( start, end + 1 - start ); + void *base = ROUND_ADDR( (char *)arm64ec_view->base + start, page_mask ); + + view->protect |= VPROT_ARM64EC; + set_vprot( arm64ec_view, base, size, VPROT_READ | VPROT_WRITE | VPROT_COMMITTED ); +} + + /*********************************************************************** * update_write_watches */ @@ -2253,7 +2274,7 @@ static NTSTATUS free_pages( struct file_view *view, char *base, size_t size ) if (!status) { set_page_vprot( base, size, 0 ); - if (arm64ec_map) clear_arm64ec_range( base, size ); + if (view->protect & VPROT_ARM64EC) clear_arm64ec_range( base, size ); unmap_area( base, size ); } return status; @@ -2401,15 +2422,17 @@ static NTSTATUS map_pe_header( void *ptr, size_t size, int fd, BOOL *removable ) */ static void alloc_arm64ec_map(void) { - SIZE_T size = ((ULONG_PTR)user_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ - unsigned int status = NtAllocateVirtualMemory( NtCurrentProcess(), (void **)&arm64ec_map, 0, &size, - MEM_COMMIT, PAGE_READWRITE ); + unsigned int status; + SIZE_T size = ((ULONG_PTR)address_space_limit + page_size) >> (page_shift + 3); /* one bit per page */ + + size = ROUND_SIZE( 0, size ); + status = map_view( &arm64ec_view, NULL, size, 0, VPROT_READ | VPROT_COMMITTED, 0, 0, granularity_mask ); if (status) { ERR( "failed to allocate ARM64EC map: %08x\n", status ); exit(1); } - peb->EcCodeBitMap = arm64ec_map; + peb->EcCodeBitMap = arm64ec_view->base; } @@ -2457,7 +2480,8 @@ static void apply_arm64x_relocations( char *base, const IMAGE_BASE_RELOCATION *r /*********************************************************************** * update_arm64x_mapping */ -static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTION_HEADER *sections ) +static void update_arm64x_mapping( struct file_view *view, IMAGE_NT_HEADERS *nt, + IMAGE_SECTION_HEADER *sections ) { ULONG i, size, sec, offset; const IMAGE_DATA_DIRECTORY *dir; @@ -2465,6 +2489,7 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI const IMAGE_ARM64EC_METADATA *metadata; const IMAGE_DYNAMIC_RELOCATION_TABLE *table; const char *ptr, *end; + char *base = view->base; /* retrieve config directory */ @@ -2479,7 +2504,8 @@ static void update_arm64x_mapping( char *base, IMAGE_NT_HEADERS *nt, IMAGE_SECTI if (size <= offsetof( IMAGE_LOAD_CONFIG_DIRECTORY, CHPEMetadataPointer )) return; if (!cfg->CHPEMetadataPointer) return; - if (!arm64ec_map) alloc_arm64ec_map(); + if (!arm64ec_view) alloc_arm64ec_map(); + commit_arm64ec_map( view ); metadata = (void *)(base + (cfg->CHPEMetadataPointer - nt->OptionalHeader.ImageBase)); if (metadata->CodeMap) { @@ -2707,7 +2733,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena if (machine == IMAGE_FILE_MACHINE_AMD64 || (!machine && main_image_info.Machine == IMAGE_FILE_MACHINE_AMD64)) { - update_arm64x_mapping( ptr, nt, sections ); + update_arm64x_mapping( view, nt, sections ); /* reload changed data from NT header */ image_info->machine = nt->FileHeader.Machine; image_info->entry_point = nt->OptionalHeader.AddressOfEntryPoint; @@ -4179,7 +4205,7 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ } if (type & MEM_RESERVE_PLACEHOLDER && (protect != PAGE_NOACCESS)) return STATUS_INVALID_PARAMETER; - if (!arm64ec_map && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) return STATUS_INVALID_PARAMETER; + if (!arm64ec_view && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) return STATUS_INVALID_PARAMETER; /* Reserve the memory */ @@ -4225,7 +4251,11 @@ static NTSTATUS allocate_virtual_memory( void **ret, SIZE_T *size_ptr, ULONG typ } } - if (!status && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) set_arm64ec_range( base, size ); + if (!status && (attributes & MEM_EXTENDED_PARAMETER_EC_CODE)) + { + commit_arm64ec_map( view ); + set_arm64ec_range( base, size ); + } if (!status) VIRTUAL_DEBUG_DUMP_VIEW( view );

1 0

Connor McAdams : uiautomationcore: Add support for cloning UiaCondition structures.
by Alexandre Julliard 12 Jun '23

12 Jun '23

Module: wine Branch: master Commit: 61712ec79f3b5f92f5482b4dff73652e707d8e34 URL: https://gitlab.winehq.org/wine/wine/-/commit/61712ec79f3b5f92f5482b4dff7365… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 5 10:31:45 2023 -0400 uiautomationcore: Add support for cloning UiaCondition structures. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_utils.c | 143 +++++++++++++++++++++++++++++++++++++- 1 file changed, 142 insertions(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_utils.c b/dlls/uiautomationcore/uia_utils.c index 03416418cce..03fdef40e01 100644 --- a/dlls/uiautomationcore/uia_utils.c +++ b/dlls/uiautomationcore/uia_utils.c @@ -98,18 +98,159 @@ HRESULT get_interface_in_git(REFIID riid, DWORD git_cookie, IUnknown **ret_iface return S_OK; } +/* + * UiaCondition cloning functions. + */ +static void uia_condition_destroy(struct UiaCondition *cond) +{ + if (!cond) + return; + + switch (cond->ConditionType) + { + case ConditionType_Property: + { + struct UiaPropertyCondition *prop_cond = (struct UiaPropertyCondition *)cond; + + VariantClear(&prop_cond->Value); + break; + } + + case ConditionType_Not: + { + struct UiaNotCondition *not_cond = (struct UiaNotCondition *)cond; + + uia_condition_destroy(not_cond->pConditions); + break; + } + + case ConditionType_And: + case ConditionType_Or: + { + struct UiaAndOrCondition *and_or_cond = (struct UiaAndOrCondition *)cond; + int i; + + for (i = 0; i < and_or_cond->cConditions; i++) + uia_condition_destroy(and_or_cond->ppConditions[i]); + heap_free(and_or_cond->ppConditions); + break; + } + + default: + break; + } + + heap_free(cond); +} + +static HRESULT uia_condition_clone(struct UiaCondition **dst, struct UiaCondition *src) +{ + HRESULT hr = S_OK; + + *dst = NULL; + switch (src->ConditionType) + { + case ConditionType_True: + case ConditionType_False: + if (!(*dst = heap_alloc_zero(sizeof(*dst)))) + return E_OUTOFMEMORY; + + (*dst)->ConditionType = src->ConditionType; + break; + + case ConditionType_Property: + { + struct UiaPropertyCondition *prop_cond = heap_alloc_zero(sizeof(*prop_cond)); + struct UiaPropertyCondition *src_cond = (struct UiaPropertyCondition *)src; + + if (!prop_cond) + return E_OUTOFMEMORY; + + *dst = (struct UiaCondition *)prop_cond; + prop_cond->ConditionType = ConditionType_Property; + prop_cond->PropertyId = src_cond->PropertyId; + prop_cond->Flags = src_cond->Flags; + VariantInit(&prop_cond->Value); + hr = VariantCopy(&prop_cond->Value, &src_cond->Value); + break; + } + + case ConditionType_Not: + { + struct UiaNotCondition *not_cond = heap_alloc_zero(sizeof(*not_cond)); + struct UiaNotCondition *src_cond = (struct UiaNotCondition *)src; + + if (!not_cond) + return E_OUTOFMEMORY; + + *dst = (struct UiaCondition *)not_cond; + not_cond->ConditionType = ConditionType_Not; + hr = uia_condition_clone(&not_cond->pConditions, src_cond->pConditions); + break; + } + + case ConditionType_And: + case ConditionType_Or: + { + struct UiaAndOrCondition *and_or_cond = heap_alloc_zero(sizeof(*and_or_cond)); + struct UiaAndOrCondition *src_cond = (struct UiaAndOrCondition *)src; + int i; + + if (!and_or_cond) + return E_OUTOFMEMORY; + + *dst = (struct UiaCondition *)and_or_cond; + and_or_cond->ConditionType = src_cond->ConditionType; + and_or_cond->ppConditions = heap_alloc_zero(sizeof(*and_or_cond->ppConditions) * src_cond->cConditions); + if (!and_or_cond->ppConditions) + { + hr = E_OUTOFMEMORY; + goto exit; + } + + and_or_cond->cConditions = src_cond->cConditions; + for (i = 0; i < src_cond->cConditions; i++) + { + hr = uia_condition_clone(&and_or_cond->ppConditions[i], src_cond->ppConditions[i]); + if (FAILED(hr)) + goto exit; + } + + break; + } + + default: + WARN("Tried to clone condition with invalid type %d\n", src->ConditionType); + return E_INVALIDARG; + } + +exit: + if (FAILED(hr)) + { + uia_condition_destroy(*dst); + *dst = NULL; + } + + return hr; +} + /* * UiaCacheRequest cloning functions. */ void uia_cache_request_destroy(struct UiaCacheRequest *cache_req) { + uia_condition_destroy(cache_req->pViewCondition); heap_free(cache_req->pProperties); heap_free(cache_req->pPatterns); } HRESULT uia_cache_request_clone(struct UiaCacheRequest *dst, struct UiaCacheRequest *src) { - FIXME("Cache request condition cloning currently unimplemented\n"); + HRESULT hr; + + hr = uia_condition_clone(&dst->pViewCondition, src->pViewCondition); + if (FAILED(hr)) + return hr; dst->Scope = src->Scope; dst->automationElementMode = src->automationElementMode;

1 0