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

Brendan Shanks : wineoss: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: e0727a40fb3c83d9c74fd5839803081cf36fea49 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0727a40fb3c83d9c74fd583980308… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:41:39 2023 -0700 wineoss: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/wineoss.drv/oss.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 2097137f749..097e048d03b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -72,6 +72,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(oss); static const REFERENCE_TIME def_period = 100000; static const REFERENCE_TIME min_period = 50000; +static ULONG_PTR zero_bits = 0; + static NTSTATUS oss_not_implemented(void *args) { return STATUS_SUCCESS; @@ -221,6 +223,20 @@ static void get_default_device(EDataFlow flow, char device[OSS_DEVNODE_SIZE]) return; } +static NTSTATUS oss_process_attach(void *args) +{ +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; +} + static NTSTATUS oss_main_loop(void *args) { struct main_loop_params *params = args; @@ -550,15 +566,6 @@ static HRESULT setup_oss_device(AUDCLNT_SHAREMODE share, int fd, return ret; } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static NTSTATUS oss_create_stream(void *args) { struct create_stream_params *params = args; @@ -653,7 +660,7 @@ static NTSTATUS oss_create_stream(void *args) if(params->share == AUDCLNT_SHAREMODE_EXCLUSIVE) stream->bufsize_frames -= stream->bufsize_frames % stream->period_frames; size = stream->bufsize_frames * params->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ params->result = E_OUTOFMEMORY; goto exit; @@ -988,7 +995,7 @@ static NTSTATUS oss_get_render_buffer(void *args) stream->tmp_buffer = NULL; } size = frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1098,7 +1105,7 @@ static NTSTATUS oss_get_capture_buffer(void *args) stream->tmp_buffer = NULL; } size = *frames * stream->fmt->nBlockAlign; - if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits(), + if(NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)){ stream->tmp_buffer_frames = 0; return oss_unlock_result(stream, &params->result, E_OUTOFMEMORY); @@ -1690,7 +1697,7 @@ static NTSTATUS oss_aux_message(void *args) unixlib_entry_t __wine_unix_call_funcs[] = { - oss_not_implemented, + oss_process_attach, oss_not_implemented, oss_main_loop, oss_get_endpoint_ids, @@ -2127,7 +2134,7 @@ static NTSTATUS oss_wow64_aux_message(void *args) unixlib_entry_t __wine_unix_call_wow64_funcs[] = { - oss_not_implemented, + oss_process_attach, oss_not_implemented, oss_wow64_main_loop, oss_wow64_get_endpoint_ids,

1 0

Brendan Shanks : winepulse: Set zero_bits correctly for large address aware applications on Wow64.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 2c10f747d4867aa990b26905474f21123263ac87 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c10f747d4867aa990b26905474f21… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jul 7 14:43:44 2023 -0700 winepulse: Set zero_bits correctly for large address aware applications on Wow64. --- dlls/winepulse.drv/pulse.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index ab49a4cc320..0e587033a6d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -119,6 +119,8 @@ static const REFERENCE_TIME DefaultPeriod = 100000; static pthread_mutex_t pulse_mutex; static pthread_cond_t pulse_cond = PTHREAD_COND_INITIALIZER; +static ULONG_PTR zero_bits = 0; + static NTSTATUS pulse_not_implemented(void *args) { return STATUS_SUCCESS; @@ -237,6 +239,16 @@ static NTSTATUS pulse_process_attach(void *args) if (pthread_mutex_init(&pulse_mutex, &attr) != 0) pthread_mutex_init(&pulse_mutex, NULL); +#ifdef _WIN64 + if (NtCurrentTeb()->WowTebOffset) + { + SYSTEM_BASIC_INFORMATION info; + + NtQuerySystemInformation(SystemEmulationBasicInformation, &info, sizeof(info), NULL); + zero_bits = (ULONG_PTR)info.HighestUserAddress | 0x7fffffff; + } +#endif + return STATUS_SUCCESS; } @@ -1077,15 +1089,6 @@ static HRESULT pulse_stream_connect(struct pulse_stream *stream, const char *pul return S_OK; } -static ULONG_PTR zero_bits(void) -{ -#ifdef _WIN64 - return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; -#else - return 0; -#endif -} - static HRESULT get_device_period_helper(EDataFlow flow, const char *pulse_name, REFERENCE_TIME *def, REFERENCE_TIME *min) { struct list *list = (flow == eRender) ? &g_phys_speakers : &g_phys_sources; @@ -1183,7 +1186,7 @@ static NTSTATUS pulse_create_stream(void *args) size = stream->real_bufsize_bytes = stream->bufsize_frames * 2 * pa_frame_size(&stream->ss); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)) + zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; } else { UINT32 i, capture_packets; @@ -1197,7 +1200,7 @@ static NTSTATUS pulse_create_stream(void *args) size = stream->real_bufsize_bytes + capture_packets * sizeof(ACPacket); if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->local_buffer, - zero_bits(), &size, MEM_COMMIT, PAGE_READWRITE)) + zero_bits, &size, MEM_COMMIT, PAGE_READWRITE)) hr = E_OUTOFMEMORY; else { ACPacket *cur_packet = (ACPacket*)((char*)stream->local_buffer + stream->real_bufsize_bytes); @@ -1841,7 +1844,7 @@ static BOOL alloc_tmp_buffer(struct pulse_stream *stream, SIZE_T bytes) stream->tmp_buffer_bytes = 0; } if (NtAllocateVirtualMemory(GetCurrentProcess(), (void **)&stream->tmp_buffer, - zero_bits(), &bytes, MEM_COMMIT, PAGE_READWRITE)) + zero_bits, &bytes, MEM_COMMIT, PAGE_READWRITE)) return FALSE; stream->tmp_buffer_bytes = bytes;

1 0

Sven Baars : wow64win: Call NtUserSetClassLongPtr() from wow64_NtUserSetClassLongPtr().
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 7a2e61aad8f48d79bf889d1d45318d50f23a26af URL: https://gitlab.winehq.org/wine/wine/-/commit/7a2e61aad8f48d79bf889d1d45318d… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Jul 10 11:14:45 2023 +0200 wow64win: Call NtUserSetClassLongPtr() from wow64_NtUserSetClassLongPtr(). --- dlls/wow64win/user.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 8e2853ca0b5..5dea6c279c0 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -3547,8 +3547,8 @@ NTSTATUS WINAPI wow64_NtUserSetClassLongPtr( UINT *args ) { struct client_menu_name menu_name; struct client_menu_name32 *menu_name32 = UlongToPtr( newval ); - NtUserSetClassLong( hwnd, offset, - (UINT_PTR)client_menu_name_32to64( &menu_name, menu_name32 ), ansi ); + NtUserSetClassLongPtr( hwnd, offset, + (UINT_PTR)client_menu_name_32to64( &menu_name, menu_name32 ), ansi ); client_menu_name_64to32( &menu_name, menu_name32 ); return 0; }

1 0

Sven Baars : wow64: Return STATUS_NOT_IMPLEMENTED from wow64_NtSetInformationToken().
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: b96f70a9a0ed67cf65b63376a48fbc3475f84a91 URL: https://gitlab.winehq.org/wine/wine/-/commit/b96f70a9a0ed67cf65b63376a48fbc… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Jul 10 15:26:54 2023 +0200 wow64: Return STATUS_NOT_IMPLEMENTED from wow64_NtSetInformationToken(). --- dlls/wow64/security.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wow64/security.c b/dlls/wow64/security.c index 65962f806cc..82bbb0d2b40 100644 --- a/dlls/wow64/security.c +++ b/dlls/wow64/security.c @@ -488,7 +488,7 @@ NTSTATUS WINAPI wow64_NtSetInformationToken( UINT *args ) default: FIXME( "unsupported class %u\n", class ); - return STATUS_INVALID_INFO_CLASS; + return STATUS_NOT_IMPLEMENTED; } }

1 0

Jacek Caban : user32: Return result from dispatch_win_proc_params.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 84acfd916645ed1e8feddd02d625aa49aca652a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/84acfd916645ed1e8feddd02d625aa… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 13:28:30 2023 +0200 user32: Return result from dispatch_win_proc_params. --- dlls/user32/message.c | 6 ++---- dlls/user32/user_private.h | 2 +- dlls/user32/winproc.c | 30 +++++++++++++----------------- 3 files changed, 16 insertions(+), 22 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 33e81c76e4b..acab4117cf2 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -586,11 +586,10 @@ static LRESULT dispatch_send_message( struct win_proc_params *params, WPARAM wpa thread_info->recursion_count++; - params->result = &retval; thread_info->msg_source = msg_source_unavailable; SPY_EnterMessage( SPY_SENDMESSAGE, params->hwnd, params->msg, params->wparam, params->lparam ); - dispatch_win_proc_params( params ); + retval = dispatch_win_proc_params( params ); SPY_ExitMessage( SPY_RESULT_OK, params->hwnd, params->msg, retval, params->wparam, params->lparam ); thread_info->msg_source = prev_source; @@ -850,10 +849,9 @@ static LRESULT dispatch_message( const MSG *msg, BOOL ansi ) if (!NtUserMessageCall( msg->hwnd, msg->message, msg->wParam, msg->lParam, &params, NtUserGetDispatchParams, ansi )) return 0; - params.result = &retval; SPY_EnterMessage( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); - dispatch_win_proc_params( &params ); + retval = dispatch_win_proc_params( &params ); SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, msg->wParam, msg->lParam ); return retval; } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index c3f877758c1..10f5d83b6f1 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -72,7 +72,7 @@ extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UIN extern INT_PTR WINPROC_CallDlgProcA( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern void winproc_init(void) DECLSPEC_HIDDEN; -extern void dispatch_win_proc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; +extern LRESULT dispatch_win_proc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, UNICODE_STRING *name_str, BOOL ansi ) DECLSPEC_HIDDEN; diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9fd35e1d24e..a72ba43ed92 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -712,36 +712,38 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN } -void dispatch_win_proc_params( struct win_proc_params *params ) +LRESULT dispatch_win_proc_params( struct win_proc_params *params ) { DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness ); + LRESULT result = 0; if (!params->ansi) { if (params->procW == WINPROC_PROC16) WINPROC_CallProcWtoA( wow_handlers.call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->func ); + params->lparam, &result, params->func ); else if (!params->ansi_dst) call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procW ); + &result, params->procW ); else WINPROC_CallProcWtoA( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procA ); + params->lparam, &result, params->procA ); } else { if (params->procA == WINPROC_PROC16) wow_handlers.call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->func ); + &result, params->func ); else if (!params->ansi_dst) WINPROC_CallProcAtoW( call_window_proc, params->hwnd, params->msg, params->wparam, - params->lparam, params->result, params->procW, params->mapping ); + params->lparam, &result, params->procW, params->mapping ); else call_window_proc( params->hwnd, params->msg, params->wparam, params->lparam, - params->result, params->procA ); + &result, params->procA ); } SetThreadDpiAwarenessContext( context ); + return result; } /* make sure that there is space for 'size' bytes in buffer, growing it if needed */ @@ -1201,7 +1203,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) &params->lparam, &buffer, size )) return 0; - dispatch_win_proc_params( params ); + result = dispatch_win_proc_params( params ); NtUserMessageCall( params->hwnd, params->msg, params->wparam, params->lparam, (void *)result, NtUserWinProcResult, FALSE ); @@ -1210,7 +1212,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) } else { - dispatch_win_proc_params( params ); + result = dispatch_win_proc_params( params ); if (result_ptr) { *result_ptr = result; @@ -1254,14 +1256,11 @@ BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, LRESULT WINAPI CallWindowProcA( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { struct win_proc_params params; - LRESULT result; params.func = func; - params.result = &result; if (!NtUserMessageCall( hwnd, msg, wParam, lParam, &params, NtUserCallWindowProc, TRUE )) return 0; - dispatch_win_proc_params( &params ); - return result; + return dispatch_win_proc_params( &params ); } @@ -1273,14 +1272,11 @@ LRESULT WINAPI CallWindowProcA( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam LRESULT WINAPI CallWindowProcW( WNDPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) { struct win_proc_params params; - LRESULT result; params.func = func; - params.result = &result; if (!NtUserMessageCall( hwnd, msg, wParam, lParam, &params, NtUserCallWindowProc, FALSE )) return 0; - dispatch_win_proc_params( &params ); - return result; + return dispatch_win_proc_params( &params ); }

1 0

Jacek Caban : win32u: Return result from dispatch_win_proc_params.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 0958278fc7d3e404f1d6b9d95eb8cb5769544008 URL: https://gitlab.winehq.org/wine/wine/-/commit/0958278fc7d3e404f1d6b9d95eb8cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 13:45:12 2023 +0200 win32u: Return result from dispatch_win_proc_params. --- dlls/win32u/message.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index c3f8b65833e..091f5cadc34 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -225,8 +225,7 @@ static BOOL init_win_proc_params( struct win_proc_params *params, HWND hwnd, UIN } static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, UINT msg, WPARAM wParam, - LPARAM lParam, LRESULT *result, BOOL ansi, - enum wm_char_mapping mapping ) + LPARAM lParam, BOOL ansi, enum wm_char_mapping mapping ) { BOOL is_dialog; WND *win; @@ -249,7 +248,7 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->msg = msg; params->wparam = wParam; params->lparam = lParam; - params->result = result; + params->result = NULL; params->ansi = ansi; params->needs_unpack = FALSE; params->mapping = mapping; @@ -258,20 +257,22 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, return TRUE; } -static BOOL dispatch_win_proc_params( struct win_proc_params *params, size_t size ) +static LRESULT dispatch_win_proc_params( struct win_proc_params *params, size_t size ) { struct ntuser_thread_info *thread_info = NtUserGetThreadInfo(); + LRESULT result = 0; void *ret_ptr; ULONG ret_len; - if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; + if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return 0; thread_info->recursion_count++; + params->result = &result; KeUserModeCallback( NtUserCallWinProc, params, size, &ret_ptr, &ret_len ); - if (ret_len == sizeof(*params->result)) *params->result = *(LRESULT *)ret_ptr; + if (ret_len == sizeof(result)) result = *(LRESULT *)ret_ptr; thread_info->recursion_count--; - return TRUE; + return result; } /* add a data field to a packed message */ @@ -1394,7 +1395,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar call_hooks( WH_CALLWNDPROC, HC_ACTION, same_thread, (LPARAM)&cwp, sizeof(cwp) ); if (size && !(params = malloc( sizeof(*params) + size ))) return 0; - if (!init_window_call_params( params, hwnd, msg, wparam, lparam, &result, !unicode, mapping )) + if (!init_window_call_params( params, hwnd, msg, wparam, lparam, !unicode, mapping )) { if (params != &p) free( params ); return 0; @@ -1406,7 +1407,7 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar params->ansi = FALSE; if (size) memcpy( params + 1, buffer, size ); } - dispatch_win_proc_params( params, sizeof(*params) + size ); + result = dispatch_win_proc_params( params, sizeof(*params) + size ); if (params != &p) free( params ); /* and finally the WH_CALLWNDPROCRET hook */ @@ -2750,12 +2751,10 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) if (msg->lParam && msg->message == WM_TIMER) { params.func = (WNDPROC)msg->lParam; - params.result = &retval; /* FIXME */ if (!init_win_proc_params( &params, msg->hwnd, msg->message, msg->wParam, NtGetTickCount(), FALSE )) return 0; - dispatch_win_proc_params( &params, sizeof(params) ); - return retval; + return dispatch_win_proc_params( &params, sizeof(params) ); } if (msg->message == WM_SYSTIMER) { @@ -2776,8 +2775,8 @@ LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) spy_enter_message( SPY_DISPATCHMESSAGE, msg->hwnd, msg->message, msg->wParam, msg->lParam ); if (init_window_call_params( &params, msg->hwnd, msg->message, msg->wParam, msg->lParam, - &retval, FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) - dispatch_win_proc_params( &params, sizeof(params) ); + FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) + retval = dispatch_win_proc_params( &params, sizeof(params) ); else if (!is_window( msg->hwnd )) RtlSetLastWin32Error( ERROR_INVALID_WINDOW_HANDLE ); else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY ); @@ -3184,7 +3183,7 @@ static BOOL process_message( struct send_message_info *info, DWORD_PTR *res_ptr, /* if we're called from client side and need just a simple winproc call, * just fill dispatch params and let user32 do the rest */ return init_window_call_params( info->params, info->hwnd, info->msg, info->wparam, info->lparam, - NULL, ansi, info->wm_char ); + ansi, info->wm_char ); } thread_info->msg_source = msg_source_unavailable; @@ -3545,7 +3544,7 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserGetDispatchParams: if (!hwnd) return FALSE; if (init_window_call_params( result_info, hwnd, msg, wparam, lparam, - NULL, ansi, WMCHAR_MAP_DISPATCHMESSAGE )) + ansi, WMCHAR_MAP_DISPATCHMESSAGE )) return TRUE; if (!is_window( hwnd )) RtlSetLastWin32Error( ERROR_INVALID_WINDOW_HANDLE ); else RtlSetLastWin32Error( ERROR_MESSAGE_SYNC_ONLY );

1 0

Jacek Caban : win32u: Remove no longer needed result pointer from win_proc_params.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 2d7465eb605a5f7495889081ec75bf43006de25a URL: https://gitlab.winehq.org/wine/wine/-/commit/2d7465eb605a5f7495889081ec75bf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 13:54:44 2023 +0200 win32u: Remove no longer needed result pointer from win_proc_params. We may always use NtCallbackReturn now. --- dlls/user32/winproc.c | 11 ++--------- dlls/win32u/message.c | 2 -- dlls/wow64win/user.c | 24 ++++++------------------ include/ntuser.h | 1 - 4 files changed, 8 insertions(+), 30 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index a72ba43ed92..36acd7b6382 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1181,8 +1181,7 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) { - LRESULT result, *result_ptr = params->result; - params->result = &result; + LRESULT result; if (params->needs_unpack) { @@ -1213,14 +1212,8 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) else { result = dispatch_win_proc_params( params ); - if (result_ptr) - { - *result_ptr = result; - return TRUE; - } - NtCallbackReturn( &result, sizeof(result), TRUE ); } - return TRUE; + return NtCallbackReturn( &result, sizeof(result), TRUE ); } BOOL WINAPI User32CallSendAsyncCallback( const struct send_async_params *params, ULONG size ) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 091f5cadc34..30b67e2c6af 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -248,7 +248,6 @@ static BOOL init_window_call_params( struct win_proc_params *params, HWND hwnd, params->msg = msg; params->wparam = wParam; params->lparam = lParam; - params->result = NULL; params->ansi = ansi; params->needs_unpack = FALSE; params->mapping = mapping; @@ -267,7 +266,6 @@ static LRESULT dispatch_win_proc_params( struct win_proc_params *params, size_t if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return 0; thread_info->recursion_count++; - params->result = &result; KeUserModeCallback( NtUserCallWinProc, params, size, &ret_ptr, &ret_len ); if (ret_len == sizeof(result)) result = *(LRESULT *)ret_ptr; diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 5dea6c279c0..cb383fd1a50 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -285,7 +285,6 @@ struct win_proc_params32 UINT msg; ULONG wparam; ULONG lparam; - ULONG result; BOOL ansi; BOOL ansi_dst; BOOL needs_unpack; @@ -376,15 +375,13 @@ static struct client_menu_name32 *client_menu_name_64to32( const struct client_m return name32; } -static void win_proc_params_64to32( const struct win_proc_params *src, struct win_proc_params32 *dst, - ULONG *result ) +static void win_proc_params_64to32( const struct win_proc_params *src, struct win_proc_params32 *dst ) { dst->func = PtrToUlong( src->func ); dst->hwnd = HandleToUlong( src->hwnd ); dst->msg = src->msg; dst->wparam = src->wparam; dst->lparam = src->lparam; - dst->result = PtrToUlong( result ); dst->ansi = src->ansi; dst->ansi_dst = src->ansi_dst; dst->needs_unpack = src->needs_unpack; @@ -543,8 +540,7 @@ static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) { struct win_proc_params *params = arg; struct win_proc_params32 params32_buf, *params32 = &params32_buf; - LONG result32 = 0; - LRESULT result; + LRESULT result = 0; void *ret_ptr; ULONG ret_len; NTSTATUS status; @@ -555,19 +551,13 @@ static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) return 0; memcpy( params32 + 1, params + 1, size - sizeof(*params) ); } - win_proc_params_64to32( params, params32, NULL ); + win_proc_params_64to32( params, params32 ); status = Wow64KiUserCallbackDispatcher( NtUserCallWinProc, params32, size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len ); - if (ret_len == sizeof(result32)) result32 = *(LONG *)ret_ptr; - result = result32; - if (params->result) - { - *params->result = result; - return status; - } + if (ret_len == sizeof(LONG)) result = *(LONG *)ret_ptr; return NtCallbackReturn( &result, sizeof(result), status ); } @@ -3083,15 +3073,13 @@ NTSTATUS WINAPI wow64_NtUserMessageCall( UINT *args ) { struct win_proc_params32 *params32 = result_info; struct win_proc_params params; - ULONG *result32; - result32 = UlongToPtr( params32->result ); if (type == NtUserCallWindowProc) params.func = UlongToPtr( params32->func ); if (!NtUserMessageCall( hwnd, msg, wparam, lparam, &params, type, ansi )) return FALSE; - win_proc_params_64to32( &params, params32, result32 ); + win_proc_params_64to32( &params, params32 ); return TRUE; } @@ -3106,7 +3094,7 @@ NTSTATUS WINAPI wow64_NtUserMessageCall( UINT *args ) params.hwnd = 0; ret = message_call_32to64( hwnd, msg, wparam, lparam, &params, type, ansi ); - if (params.hwnd) win_proc_params_64to32( &params, params32, NULL ); + if (params.hwnd) win_proc_params_64to32( &params, params32 ); return ret; } diff --git a/include/ntuser.h b/include/ntuser.h index cc6126e53db..2f01f0eafb3 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -147,7 +147,6 @@ struct win_proc_params UINT msg; WPARAM wparam; LPARAM lparam; - LRESULT *result; BOOL ansi; BOOL ansi_dst; BOOL needs_unpack;

1 0

Jacek Caban : win32u: Always use result returned directly from call_window_proc.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 0aa36a8314c51d9c7015279425a05532ec7f0f7f URL: https://gitlab.winehq.org/wine/wine/-/commit/0aa36a8314c51d9c7015279425a055… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 14:12:30 2023 +0200 win32u: Always use result returned directly from call_window_proc. --- dlls/win32u/message.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 30b67e2c6af..49ac4b2de94 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -54,7 +54,6 @@ struct received_message_info UINT type; MSG msg; UINT flags; /* InSendMessageEx return flags */ - LRESULT result; struct received_message_info *prev; }; @@ -1258,7 +1257,6 @@ static BOOL reply_winproc_result( LRESULT result, HWND hwnd, UINT message, WPARA if (info->type == MSG_CLIENT_MESSAGE) { copy_reply( result, hwnd, message, info->msg.wParam, info->msg.lParam, wparam, lparam ); - info->result = result; return TRUE; } @@ -2879,16 +2877,12 @@ static BOOL process_packed_message( struct send_message_info *info, LRESULT *res receive_info.msg.lParam = info->lparam; receive_info.flags = 0; receive_info.prev = thread_info->receive_info; - receive_info.result = 0; thread_info->receive_info = &receive_info; *res_ptr = call_window_proc( info->hwnd, info->msg, info->wparam, info->lparam, !ansi, TRUE, info->wm_char, TRUE, buffer, buffer_size ); if (thread_info->receive_info == &receive_info) - { thread_info->receive_info = receive_info.prev; - *res_ptr = receive_info.result; - } free( buffer ); return TRUE; }

1 0

Jacek Caban : user32: Always use NtCallbackReturn in User32DrawText.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: e0d62e85696609d6b28035ce9f8ea11bcfc174f4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e0d62e85696609d6b28035ce9f8ea1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jul 10 14:35:12 2023 +0200 user32: Always use NtCallbackReturn in User32DrawText. --- dlls/user32/user_main.c | 12 +++--------- dlls/win32u/font.c | 1 - dlls/wow64win/user.c | 14 +++----------- include/ntuser.h | 1 - 4 files changed, 6 insertions(+), 22 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 56d5849f469..ef2b94ba698 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -121,19 +121,13 @@ static NTSTATUS WINAPI User32DrawScrollBar( const struct draw_scroll_bar_params return 0; } -static NTSTATUS WINAPI User32DrawText( const struct draw_text_params *params, ULONG size ) +static NTSTATUS WINAPI User32DrawText( struct draw_text_params *params, ULONG size ) { - RECT rect = params->rect; int ret; size -= FIELD_OFFSET( struct draw_text_params, str ); - ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &rect, params->flags ); - if (params->ret_rect) - { - *params->ret_rect = rect; - return ret; - } - return NtCallbackReturn( &rect, sizeof(rect), ret ); + ret = DrawTextW( params->hdc, params->str, size / sizeof(WCHAR), &params->rect, params->flags ); + return NtCallbackReturn( &params->rect, sizeof(params->rect), ret ); } static NTSTATUS WINAPI User32ImmProcessKey( const struct imm_process_key_params *params, ULONG size ) diff --git a/dlls/win32u/font.c b/dlls/win32u/font.c index c5f62e76f3a..4a341453012 100644 --- a/dlls/win32u/font.c +++ b/dlls/win32u/font.c @@ -7097,7 +7097,6 @@ INT WINAPI DECLSPEC_HIDDEN DrawTextW( HDC hdc, const WCHAR *str, INT count, RECT if (!(params = malloc( size ))) return 0; params->hdc = hdc; params->rect = *rect; - params->ret_rect = rect; params->flags = flags; if (count) memcpy( params->str, str, count * sizeof(WCHAR) ); ret = KeUserModeCallback( NtUserDrawText, params, size, &ret_ptr, &ret_len ); diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index cb383fd1a50..80759765359 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -312,7 +312,6 @@ struct draw_text_params32 ULONG hdc; int count; RECT rect; - ULONG ret_rect; UINT flags; WCHAR str[1]; }; @@ -832,25 +831,18 @@ static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) { struct draw_text_params *params = arg; struct draw_text_params32 *params32; - RECT *rect_ptr = params->ret_rect; + ULONG offset = offsetof( struct draw_text_params, str ) - offsetof( struct draw_text_params32, str ); ULONG ret_len; void *ret_ptr; NTSTATUS ret; - params32 = (struct draw_text_params32 *)(params + 1) - 1; + params32 = (struct draw_text_params32 *)((char *)params + offset); params32->flags = params->flags; - params32->ret_rect = 0; params32->rect = params->rect; params32->count = params->count; params32->hdc = HandleToUlong( params->hdc ); - ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, - size - sizeof(*params) + sizeof(*params32), &ret_ptr, &ret_len ); - if (ret_len == sizeof(RECT) && rect_ptr) - { - *rect_ptr = *(const RECT *)ret_ptr; - return ret; - } + ret = Wow64KiUserCallbackDispatcher( NtUserDrawText, params32, size - offset, &ret_ptr, &ret_len ); return NtCallbackReturn( ret_ptr, ret_len, ret ); } diff --git a/include/ntuser.h b/include/ntuser.h index 2f01f0eafb3..195d4e1322a 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -188,7 +188,6 @@ struct draw_text_params HDC hdc; int count; RECT rect; - RECT *ret_rect; /* FIXME: Use NtCallbackReturn instead */ UINT flags; WCHAR str[1]; };

1 0

Torge Matthies : ntdll: Implement efficiency class reporting for Intel hybrid CPUs.
by Alexandre Julliard 10 Jul '23

10 Jul '23

Module: wine Branch: master Commit: 7026effe958b1d6a840b0511139462c7b4c6e80d URL: https://gitlab.winehq.org/wine/wine/-/commit/7026effe958b1d6a840b0511139462… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Wed Jun 28 19:40:34 2023 +0200 ntdll: Implement efficiency class reporting for Intel hybrid CPUs. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/ntdll/unix/system.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 64411f074d2..4805e765af0 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -230,6 +230,8 @@ struct smbios_chassis_args SYSTEM_CPU_INFORMATION cpu_info = { 0 }; static SYSTEM_PROCESSOR_FEATURES_INFORMATION cpu_features; static char cpu_name[49]; +static ULONG *performance_cores; +static unsigned int performance_cores_capacity = 0; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION *logical_proc_info; static unsigned int logical_proc_info_len, logical_proc_info_alloc_len; static SYSTEM_LOGICAL_PROCESSOR_INFORMATION_EX *logical_proc_info_ex; @@ -642,7 +644,10 @@ static BOOL logical_proc_info_ex_add_by_id( LOGICAL_PROCESSOR_RELATIONSHIP rel, dataex->Processor.Flags = count_bits( mask ) > 1 ? LTP_PC_SMT : 0; else dataex->Processor.Flags = 0; - dataex->Processor.EfficiencyClass = 0; + if (rel == RelationProcessorCore && id / 32 < performance_cores_capacity) + dataex->Processor.EfficiencyClass = (performance_cores[id / 32] >> (id % 32)) & 1; + else + dataex->Processor.EfficiencyClass = 0; dataex->Processor.GroupCount = 1; dataex->Processor.GroupMask[0].Mask = mask; dataex->Processor.GroupMask[0].Group = 0; @@ -845,6 +850,43 @@ static BOOL sysfs_count_list_elements(const char *filename, unsigned int *result return TRUE; } +static void fill_performance_core_info(void) +{ + FILE *fpcore_list; + unsigned int beg, end, i; + char op = ','; + ULONG *p; + + fpcore_list = fopen("/sys/devices/cpu_core/cpus", "r"); + if (!fpcore_list) return; + + performance_cores = calloc(16, sizeof(ULONG)); + if (!performance_cores) goto done; + performance_cores_capacity = 16; + + while (!feof(fpcore_list) && op == ',') + { + if (!fscanf(fpcore_list, "%u %c ", &beg, &op)) break; + if (op == '-') fscanf(fpcore_list, "%u %c ", &end, &op); + else end = beg; + + for(i = beg; i <= end; i++) + { + if (i / 32 > performance_cores_capacity) + { + p = realloc(performance_cores, performance_cores_capacity * 2 * sizeof(ULONG)); + if (!p) goto done; + memset(p + performance_cores_capacity, 0, performance_cores_capacity * sizeof(ULONG)); + performance_cores = p; + performance_cores_capacity *= 2; + } + performance_cores[i / 32] |= 1 << (i % 32); + } + } +done: + fclose(fpcore_list); +} + /* for 'data', max_len is the array count. for 'dataex', max_len is in bytes */ static NTSTATUS create_logical_proc_info(void) { @@ -871,6 +913,8 @@ static NTSTATUS create_logical_proc_info(void) max_cpus, MAXIMUM_PROCESSORS); } + fill_performance_core_info(); + fcpu_list = fopen("/sys/devices/system/cpu/online", "r"); if (!fcpu_list) return STATUS_NOT_IMPLEMENTED; @@ -1034,6 +1078,10 @@ static NTSTATUS create_logical_proc_info(void) logical_proc_info_add_group( num_cpus, all_cpus_mask ); + performance_cores_capacity = 0; + free(performance_cores); + performance_cores = NULL; + return STATUS_SUCCESS; }

1 0