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

Zebediah Figura : server: Move sock->error setting completely out of sock_dispatch_events().
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 1d0e21db29b7d5b11cff8726ca3e2d0fe57c9ab6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d0e21db29b7d5b11cff8726ca3e2d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jul 11 23:48:09 2022 -0500 server: Move sock->error setting completely out of sock_dispatch_events(). --- server/sock.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server/sock.c b/server/sock.c index a8c0b56c2bc..53553ab8ee7 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1084,7 +1084,7 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } -static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, int error ) +static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit ) { unsigned int event = (1 << event_bit); @@ -1092,11 +1092,10 @@ static void post_socket_event( struct sock *sock, enum afd_poll_bit event_bit, i { sock->pending_events |= event; sock->reported_events |= event; - sock->errors[event_bit] = error; } } -static void sock_dispatch_events( struct sock *sock, enum connection_state prevstate, int event, int error ) +static void sock_dispatch_events( struct sock *sock, enum connection_state prevstate, int event ) { switch (prevstate) { @@ -1105,29 +1104,29 @@ static void sock_dispatch_events( struct sock *sock, enum connection_state prevs case SOCK_CONNECTING: if (event & POLLOUT) - post_socket_event( sock, AFD_POLL_BIT_CONNECT, 0 ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR, error ); + post_socket_event( sock, AFD_POLL_BIT_CONNECT_ERR ); break; case SOCK_LISTENING: if (event & (POLLIN | POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_ACCEPT, error ); + post_socket_event( sock, AFD_POLL_BIT_ACCEPT ); break; case SOCK_CONNECTED: case SOCK_CONNECTIONLESS: if (event & POLLIN) - post_socket_event( sock, AFD_POLL_BIT_READ, 0 ); + post_socket_event( sock, AFD_POLL_BIT_READ ); if (event & POLLOUT) - post_socket_event( sock, AFD_POLL_BIT_WRITE, 0 ); + post_socket_event( sock, AFD_POLL_BIT_WRITE ); if (event & POLLPRI) - post_socket_event( sock, AFD_POLL_BIT_OOB, 0 ); + post_socket_event( sock, AFD_POLL_BIT_OOB ); if (event & (POLLERR | POLLHUP)) - post_socket_event( sock, AFD_POLL_BIT_HUP, error ); + post_socket_event( sock, AFD_POLL_BIT_HUP ); break; } @@ -1194,6 +1193,7 @@ static void sock_poll_event( struct fd *fd, int event ) { error = errno; event |= POLLERR; + sock->errors[AFD_POLL_BIT_HUP] = error; if ( debug_level ) fprintf( stderr, "recv error on socket %p: %d\n", sock, errno ); } @@ -1218,7 +1218,7 @@ static void sock_poll_event( struct fd *fd, int event ) } event = sock_dispatch_asyncs( sock, event, error ); - sock_dispatch_events( sock, prevstate, event, error ); + sock_dispatch_events( sock, prevstate, event ); complete_async_polls( sock, event, error ); sock_reselect( sock );

1 0

Connor McAdams : include: Add CUIAutomationRegistrar definition.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 93d6b5a4ff0097e9578584b2aaf6a850aef0e9ae URL: https://gitlab.winehq.org/wine/wine/-/commit/93d6b5a4ff0097e9578584b2aaf6a8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Nov 9 18:34:46 2021 -0500 include: Add CUIAutomationRegistrar definition. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationcore.idl | 153 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/include/uiautomationcore.idl b/include/uiautomationcore.idl index c4aa258b5af..5f39ac6d076 100644 --- a/include/uiautomationcore.idl +++ b/include/uiautomationcore.idl @@ -182,4 +182,157 @@ library UIA HRESULT GetSelection([out, retval] SAFEARRAY(VARIANT) *pvarSelectedChildren); [propget] HRESULT DefaultAction([out, retval] BSTR *pszDefaultAction); } + + enum UIAutomationType { + UIAutomationType_Int = 0x01, + UIAutomationType_Bool = 0x02, + UIAutomationType_String = 0x03, + UIAutomationType_Double = 0x04, + UIAutomationType_Point = 0x05, + UIAutomationType_Rect = 0x06, + UIAutomationType_Element = 0x07, + + UIAutomationType_Array = 0x00010000, + UIAutomationType_Out = 0x00020000, + + UIAutomationType_IntArray = ( UIAutomationType_Int | UIAutomationType_Array ), + UIAutomationType_BoolArray = ( UIAutomationType_Bool | UIAutomationType_Array ), + UIAutomationType_StringArray = ( UIAutomationType_String | UIAutomationType_Array ), + UIAutomationType_DoubleArray = ( UIAutomationType_Double | UIAutomationType_Array ), + UIAutomationType_PointArray = ( UIAutomationType_Point | UIAutomationType_Array ), + UIAutomationType_RectArray = ( UIAutomationType_Rect | UIAutomationType_Array ), + UIAutomationType_ElementArray = ( UIAutomationType_Element | UIAutomationType_Array ), + + UIAutomationType_OutInt = ( UIAutomationType_Int | UIAutomationType_Out ), + UIAutomationType_OutBool = ( UIAutomationType_Bool | UIAutomationType_Out ), + UIAutomationType_OutString = ( UIAutomationType_String | UIAutomationType_Out ), + UIAutomationType_OutDouble = ( UIAutomationType_Double | UIAutomationType_Out ), + UIAutomationType_OutPoint = ( UIAutomationType_Point | UIAutomationType_Out ), + UIAutomationType_OutRect = ( UIAutomationType_Rect | UIAutomationType_Out ), + UIAutomationType_OutElement = ( UIAutomationType_Element | UIAutomationType_Out ), + + UIAutomationType_OutIntArray = ( UIAutomationType_Int | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutBoolArray = ( UIAutomationType_Bool | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutStringArray = ( UIAutomationType_String | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutDoubleArray = ( UIAutomationType_Double | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutPointArray = ( UIAutomationType_Point | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutRectArray = ( UIAutomationType_Rect | UIAutomationType_Array | UIAutomationType_Out ), + UIAutomationType_OutElementArray = ( UIAutomationType_Element | UIAutomationType_Array | UIAutomationType_Out ), + }; + +cpp_quote("DEFINE_ENUM_FLAG_OPERATORS(UIAutomationType)") + + struct UIAutomationParameter { + enum UIAutomationType type; + void *pData; + }; + + struct UIAutomationPropertyInfo { + GUID guid; + LPCWSTR pProgrammaticName; + enum UIAutomationType type; + }; + + struct UIAutomationEventInfo { + GUID guid; + LPCWSTR pProgrammaticName; + }; + + struct UIAutomationMethodInfo { + LPCWSTR pProgrammaticName; + BOOL doSetFocus; + UINT cInParameters; + UINT cOutParameters; + [size_is(cInParameters + cOutParameters)]enum UIAutomationType *pParameterTypes; + [size_is(cInParameters + cOutParameters)]LPCWSTR *pParameterNames; + }; + + [ + object, + uuid(c03a7fe4-9431-409f-bed8-ae7c2299bc8d), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationPatternInstance : IUnknown + { + [local] HRESULT GetProperty( + [in] UINT index, + [in] BOOL cached, + [in] enum UIAutomationType type, + [out] void *pPtr); + + [local] HRESULT CallMethod( + [in] UINT index, + [in] const struct UIAutomationParameter *pParams, + [in] UINT cParams); + } + + [ + object, + uuid(d97022f3-a947-465e-8b2a-ac4315fa54e8), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationPatternHandler : IUnknown + { + HRESULT CreateClientWrapper( + [in] IUIAutomationPatternInstance *pPatternInstance, + [out] IUnknown **pClientWrapper); + + [local] HRESULT Dispatch( + [in] IUnknown *pTarget, + [in] UINT index, + [in] const struct UIAutomationParameter *pParams, + [in] UINT cParams); + } + + struct UIAutomationPatternInfo { + GUID guid; + LPCWSTR pProgrammaticName; + GUID providerInterfaceId; + GUID clientInterfaceId; + UINT cProperties; + [size_is(cProperties)]struct UIAutomationPropertyInfo *pProperties; + UINT cMethods; + [size_is(cMethods)]struct UIAutomationMethodInfo *pMethods; + UINT cEvents; + [size_is(cEvents)]struct UIAutomationEventInfo *pEvents; + IUIAutomationPatternHandler *pPatternHandler; + }; + + [ + object, + uuid(8609c4ec-4a1a-4d88-a357-5a66e060e1cf), + pointer_default(unique), + oleautomation + ] + interface IUIAutomationRegistrar : IUnknown + { + HRESULT RegisterProperty( + [in] const struct UIAutomationPropertyInfo *property, + [out] PROPERTYID *propertyId); + + HRESULT RegisterEvent( + [in] const struct UIAutomationEventInfo *event, + [out] EVENTID *eventId); + + HRESULT RegisterPattern( + [in] const struct UIAutomationPatternInfo *pattern, + [out] PATTERNID *pPatternId, + [out] PROPERTYID *pPatternAvailablePropertyId, + [in] UINT propertyIdCount, + [out, size_is(propertyIdCount)] PROPERTYID *pPropertyIds, + [in] UINT eventIdCount, + [out, size_is(eventIdCount)] EVENTID *pEventIds); + }; + + [ + uuid(6e29fabf-9977-42d1-8d0e-ca7e61ad87e6), + version(1.0), + threading(both) + ] + coclass CUIAutomationRegistrar + { + [default] interface IUIAutomationRegistrar; + } }

1 0

Connor McAdams : uiautomationcore/tests: Add basic UIA property tests for UiaGetPropertyValue.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 7dc4a1793ea3139ee34448d1c1cec42c46a853d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/7dc4a1793ea3139ee34448d1c1cec4… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jun 16 12:20:54 2022 -0400 uiautomationcore/tests: Add basic UIA property tests for UiaGetPropertyValue. Add tests for UIA properties that correspond directly with the GetPropertyValue method on IRawElementProviderSimple. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 572 ++++++++++++++++++++++++++++- 1 file changed, 566 insertions(+), 6 deletions(-)

1 0

Connor McAdams : uiautomationcore: Implement UiaGetPropertyValue.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 61fa18aa04e31afeaa42ea768fa63161b427784c URL: https://gitlab.winehq.org/wine/wine/-/commit/61fa18aa04e31afeaa42ea768fa631… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jun 17 15:04:18 2022 -0400 uiautomationcore: Implement UiaGetPropertyValue. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_classes.idl | 17 ++++ dlls/uiautomationcore/uia_client.c | 165 ++++++++++++++++++++++++++++++---- dlls/uiautomationcore/uia_ids.c | 45 ++++++++-- dlls/uiautomationcore/uia_main.c | 13 +-- dlls/uiautomationcore/uia_private.h | 24 +++++ dlls/uiautomationcore/uia_provider.c | 4 +- 6 files changed, 230 insertions(+), 38 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for UIAutomationType_Int properties.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: afb155145ac719cc0efb4b6de12675b473f06187 URL: https://gitlab.winehq.org/wine/wine/-/commit/afb155145ac719cc0efb4b6de12675… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Sun Jun 19 13:08:16 2022 -0400 uiautomationcore: Add support for UIAutomationType_Int properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 18 ++++++----- dlls/uiautomationcore/uia_client.c | 42 ++++++++++++++++++++++++-- dlls/uiautomationcore/uia_ids.c | 48 ++++++++++++++++++++---------- 3 files changed, 82 insertions(+), 26 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for UIAutomationType_Element properties.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 0cea011921304eaa48639fe2f591842289f75fde URL: https://gitlab.winehq.org/wine/wine/-/commit/0cea011921304eaa48639fe2f59184… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 13:25:12 2022 -0400 uiautomationcore: Add support for UIAutomationType_Element properties. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 10 +- dlls/uiautomationcore/uia_client.c | 189 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_ids.c | 18 ++- 3 files changed, 203 insertions(+), 14 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for ProviderOptions_UseComThreading flag.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: e382997c8b86de60bead165a86d433e050766955 URL: https://gitlab.winehq.org/wine/wine/-/commit/e382997c8b86de60bead165a86d433… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Jun 20 15:58:13 2022 -0400 uiautomationcore: Add support for ProviderOptions_UseComThreading flag. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 126 +++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_classes.idl | 40 +++++---- dlls/uiautomationcore/uia_client.c | 83 ++++++++++++++++++- dlls/uiautomationcore/uia_main.c | 4 +- 4 files changed, 233 insertions(+), 20 deletions(-)

1 0

Jacek Caban : user32: Avoid using NtUserDispatchMessage in DispatchMessage.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 26a4fb74ee9966252724627969a35637fb5e8f70 URL: https://gitlab.winehq.org/wine/wine/-/commit/26a4fb74ee9966252724627969a356… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:33:42 2022 +0200 user32: Avoid using NtUserDispatchMessage in DispatchMessage. When possible, call window proc on PE side to allow unwinding exceptions through DispatchMessageW call. --- dlls/user32/message.c | 26 ++++++++++++++++++++++++++ dlls/user32/user_private.h | 1 + dlls/user32/winproc.c | 2 +- dlls/win32u/message.c | 9 +++++++++ include/ntuser.h | 5 +++-- 5 files changed, 40 insertions(+), 3 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f4e9b5b404e..f72d837ac94 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -832,6 +832,22 @@ BOOL WINAPI TranslateMessage( const MSG *msg ) } +static LRESULT dispatch_message( const MSG *msg, BOOL ansi ) +{ + struct win_proc_params params; + LRESULT retval = 0; + + 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 ); + SPY_ExitMessage( SPY_RESULT_OK, msg->hwnd, msg->message, retval, msg->wParam, msg->lParam ); + return retval; +} + + /*********************************************************************** * DispatchMessageA (USER32.@) * @@ -856,6 +872,11 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) __ENDTRY return retval; } + + /* whenever possible, avoid using NtUserDispatchMessage to make the call unwindable */ + if (msg->message != WM_SYSTIMER && msg->message != WM_PAINT) + return dispatch_message( msg, TRUE ); + return NtUserDispatchMessageA( msg ); } @@ -904,6 +925,11 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageW( const MSG* msg ) return retval; } } + + /* whenever possible, avoid using NtUserDispatchMessage to make the call unwindable */ + if (msg->message != WM_SYSTIMER && msg->message != WM_PAINT) + return dispatch_message( msg, FALSE ); + return NtUserDispatchMessage( msg ); } diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 2e09605cc03..81c3c5021ab 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -89,6 +89,7 @@ extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UIN extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam ) DECLSPEC_HIDDEN; extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, 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 void get_winproc_params( struct win_proc_params *params ) DECLSPEC_HIDDEN; extern ATOM get_class_info( HINSTANCE instance, const WCHAR *name, WNDCLASSEXW *info, diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 098bd17fbc0..5fc134c6718 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -719,7 +719,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN } -static void dispatch_win_proc_params( struct win_proc_params *params ) +void dispatch_win_proc_params( struct win_proc_params *params ) { DPI_AWARENESS_CONTEXT context = SetThreadDpiAwarenessContext( params->dpi_awareness ); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 0045c8a54c0..50bce801339 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2952,6 +2952,15 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); + case NtUserGetDispatchParams: + if (!hwnd) return FALSE; + if (init_window_call_params( result_info, hwnd, msg, wparam, lparam, + NULL, ansi, WMCHAR_MAP_DISPATCHMESSAGE )) + return TRUE; + if (!is_window( hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + else SetLastError( ERROR_MESSAGE_SYNC_ONLY ); + return FALSE; + case NtUserSpyEnter: spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 8cd7833717f..b0ebfbfcf5f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -276,8 +276,9 @@ enum NtUserSendMessageCallback = 0x02b8, /* Wine-specific exports */ NtUserClipboardWindowProc = 0x0300, - NtUserSpyEnter = 0x0301, - NtUserSpyExit = 0x0302, + NtUserGetDispatchParams = 0x3001, + NtUserSpyEnter = 0x0302, + NtUserSpyExit = 0x0303, }; /* NtUserThunkedMenuItemInfo codes */

1 0

Jacek Caban : win32u: Remove no longer needed NtUserDispatchMessageA.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 2ef6a6eee67cc3fb5b81e9dc4594bee40e908332 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ef6a6eee67cc3fb5b81e9dc4594be… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 19 18:42:49 2022 +0200 win32u: Remove no longer needed NtUserDispatchMessageA. --- dlls/user32/message.c | 2 +- dlls/win32u/message.c | 16 ++++------------ dlls/win32u/sysparams.c | 3 --- dlls/win32u/win32u_private.h | 1 - include/ntuser.h | 6 ------ 5 files changed, 5 insertions(+), 23 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index f72d837ac94..40babb71eba 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -877,7 +877,7 @@ LRESULT WINAPI DECLSPEC_HOTPATCH DispatchMessageA( const MSG* msg ) if (msg->message != WM_SYSTIMER && msg->message != WM_PAINT) return dispatch_message( msg, TRUE ); - return NtUserDispatchMessageA( msg ); + return NtUserDispatchMessage( msg ); } diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 50bce801339..49dc3fd6d08 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2496,9 +2496,9 @@ NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *r } /********************************************************************** - * dispatch_message + * NtUserDispatchMessage (win32u.@) */ -LRESULT dispatch_message( const MSG *msg, BOOL ansi ) +LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) { struct win_proc_params params; LRESULT retval = 0; @@ -2509,7 +2509,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) params.func = (WNDPROC)msg->lParam; params.result = &retval; /* FIXME */ if (!init_win_proc_params( &params, msg->hwnd, msg->message, - msg->wParam, NtGetTickCount(), ansi )) + msg->wParam, NtGetTickCount(), FALSE )) return 0; __TRY { @@ -2541,7 +2541,7 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) 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, ansi, WMCHAR_MAP_DISPATCHMESSAGE )) + &retval, FALSE, WMCHAR_MAP_DISPATCHMESSAGE )) dispatch_win_proc_params( &params, sizeof(params) ); else if (!is_window( msg->hwnd )) SetLastError( ERROR_INVALID_WINDOW_HANDLE ); else SetLastError( ERROR_MESSAGE_SYNC_ONLY ); @@ -2558,14 +2558,6 @@ LRESULT dispatch_message( const MSG *msg, BOOL ansi ) return retval; } -/********************************************************************** - * NtUserDispatchMessage (win32u.@) - */ -LRESULT WINAPI NtUserDispatchMessage( const MSG *msg ) -{ - return dispatch_message( msg, FALSE ); -} - static BOOL is_message_broadcastable( UINT msg ) { return msg < WM_USER || msg >= 0xc000; diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 2c1f8f4241f..e8b55616f6a 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -4880,9 +4880,6 @@ ULONG_PTR WINAPI NtUserCallOneParam( ULONG_PTR arg, ULONG code ) case NtUserCallOneParam_CreateMenu: return HandleToUlong( create_menu( arg ) ); - case NtUserCallOneParam_DispatchMessageA: - return dispatch_message( (const MSG *)arg, TRUE ); - case NtUserCallOneParam_EnableDC: return set_dce_flags( UlongToHandle(arg), DCHF_ENABLEDC ); diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index a0b3e8c2e9e..a7f0624fdba 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -436,7 +436,6 @@ extern void track_keyboard_menu_bar( HWND hwnd, UINT wparam, WCHAR ch ) DECLSPEC extern void track_mouse_menu_bar( HWND hwnd, INT ht, int x, int y ) DECLSPEC_HIDDEN; /* message.c */ -extern LRESULT dispatch_message( const MSG *msg, BOOL ansi ) DECLSPEC_HIDDEN; extern BOOL kill_system_timer( HWND hwnd, UINT_PTR id ) DECLSPEC_HIDDEN; extern BOOL reply_message_result( LRESULT result, MSG *msg ) DECLSPEC_HIDDEN; extern NTSTATUS send_hardware_message( HWND hwnd, const INPUT *input, const RAWINPUT *rawinput, diff --git a/include/ntuser.h b/include/ntuser.h index b0ebfbfcf5f..67058defb6f 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -902,7 +902,6 @@ enum NtUserCallOneParam_BeginDeferWindowPos, NtUserCallOneParam_CreateCursorIcon, NtUserCallOneParam_CreateMenu, - NtUserCallOneParam_DispatchMessageA, NtUserCallOneParam_EnableDC, NtUserCallOneParam_EnableThunkLock, NtUserCallOneParam_EnumClipboardFormats, @@ -944,11 +943,6 @@ static inline HMENU NtUserCreateMenu( BOOL is_popup ) return UlongToHandle( NtUserCallOneParam( is_popup, NtUserCallOneParam_CreateMenu )); } -static inline LRESULT NtUserDispatchMessageA( const MSG *msg ) -{ - return NtUserCallOneParam( (UINT_PTR)msg, NtUserCallOneParam_DispatchMessageA ); -} - static inline WORD NtUserEnableDC( HDC hdc ) { return NtUserCallOneParam( HandleToUlong(hdc), NtUserCallOneParam_EnableDC );

1 0

Jeff Smith : d3drm/tests: Clean up some magic values.
by Alexandre Julliard 21 Jul '22

21 Jul '22

Module: wine Branch: master Commit: 77189a341fb2e1b71a033b6f579c8b85330a1895 URL: https://gitlab.winehq.org/wine/wine/-/commit/77189a341fb2e1b71a033b6f579c8b… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jul 19 10:09:27 2022 -0500 d3drm/tests: Clean up some magic values. In BMP files with 24-bit depth, color components are stored in BGR order. Due to magic values being used several places in tests to reduce the components, some logical errors are hard to spot. Give names to the magic values to make logical errors more apparent. --- dlls/d3drm/tests/d3drm.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 5745fea4b09..87986547a4d 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -6145,6 +6145,10 @@ static void test_create_device_3(void) IDirect3DRM_Release(d3drm); } +#define MOD_R 247 +#define MOD_G 239 +#define MOD_B 251 + static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) { unsigned int bpp = palettized ? 8 : 24; @@ -6205,9 +6209,9 @@ static char *create_bitmap(unsigned int w, unsigned int h, BOOL palettized) } else { - buffer[i++] = j % 251; - buffer[i++] = j % 239; - buffer[i++] = j++ % 247; + buffer[i++] = j % MOD_B; + buffer[i++] = j % MOD_G; + buffer[i++] = j++ % MOD_R; } } ret = WriteFile(file, buffer, size, &written, NULL); @@ -6253,11 +6257,11 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, const unsigned char *ptr = &data[i * img->bytes_per_line + j * 4]; unsigned int idx = upside_down ? (h - 1 - i) * w + j : i * w + j; - if (ptr[0] != idx % 251 || ptr[1] != idx % 239 || ptr[2] != idx % 247 || ptr[3] != 0xff) + if (ptr[0] != idx % MOD_B || ptr[1] != idx % MOD_G || ptr[2] != idx % MOD_R || ptr[3] != 0xff) { ok(0, "Test %u: Got unexpected color 0x%02x%02x%02x%02x at position %u, %u, " "expected 0x%02x%02x%02x%02x.\n", test_idx, ptr[0], ptr[1], ptr[2], ptr[3], - j, i, idx % 251, idx % 239, idx % 247, 0xff); + j, i, idx % MOD_B, idx % MOD_G, idx % MOD_R, 0xff); return; } } @@ -6283,8 +6287,8 @@ static void test_bitmap_data(unsigned int test_idx, const D3DRMIMAGE *img, for (i = 0; i < img->palette_size; ++i) { unsigned int idx = upside_down ? (h - 1) * w - i + (i % w) * 2 : i; - ok(img->palette[i].red == idx % 251 - && img->palette[i].green == idx % 239 && img->palette[i].blue == idx % 247, + ok(img->palette[i].red == idx % MOD_B + && img->palette[i].green == idx % MOD_G && img->palette[i].blue == idx % MOD_R, "Test %u: Got unexpected palette entry (%u) color 0x%02x%02x%02x.\n", test_idx, i, img->palette[i].red, img->palette[i].green, img->palette[i].blue); ok(img->palette[i].flags == D3DRMPALETTE_READONLY,

1 0