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

Paul Gofman : winhttp: Replace pending read cancel in WinHttpWebSocketClose() with a generic cancel_queue().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 3eda59afcbd504bc3c1eb1e4e491c0cb6f3015a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3eda59afcbd504bc3c1eb1e4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 19:07:44 2022 -0500 winhttp: Replace pending read cancel in WinHttpWebSocketClose() with a generic cancel_queue(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 108 +++++++++++++++++++++++++++++------------ dlls/winhttp/winhttp_private.h | 3 +- 2 files changed, 78 insertions(+), 33 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3eda59afcbd504bc3c1e…

1 0

Paul Gofman : winhttp: Abort websocket IO on handle close.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 55425e85ab0d80d467e6d6261ea39931820b3ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55425e85ab0d80d467e6d626… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Jun 3 17:33:50 2022 -0500 winhttp: Abort websocket IO on handle close. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/handle.c | 7 ++++++- dlls/winhttp/net.c | 10 +++++++++- dlls/winhttp/request.c | 21 +++++++++++++++++++-- dlls/winhttp/session.c | 3 +++ dlls/winhttp/winhttp_private.h | 2 ++ 5 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 38959fd6456..33a4cd6bb71 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -142,7 +142,12 @@ BOOL free_handle( HINTERNET hinternet ) LeaveCriticalSection( &handle_cs ); - if (hdr) release_object( hdr ); + if (hdr) + { + if (hdr->vtbl->handle_closing) + hdr->vtbl->handle_closing( hdr ); + release_object( hdr ); + } EnterCriticalSection( &handle_cs ); if (next_handle > handle && !handles[handle]) next_handle = handle; diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 07a65c5465f..17520a54f63 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -269,7 +269,8 @@ void netconn_close( struct netconn *conn ) free(conn->extra_buf); DeleteSecurityContext(&conn->ssl_ctx); } - closesocket( conn->socket ); + if (conn->socket != -1) + closesocket( conn->socket ); release_host( conn->host ); free(conn); } @@ -629,6 +630,13 @@ DWORD netconn_recv( struct netconn *conn, void *buf, size_t len, int flags, int return ERROR_SUCCESS; } +void netconn_cancel_io( struct netconn *conn ) +{ + SOCKET socket = InterlockedExchange( (LONG *)&conn->socket, -1 ); + + closesocket( socket ); +} + ULONG netconn_query_data_available( struct netconn *conn ) { return conn->secure ? conn->peek_len : 0; diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 4242551ee3b..269af0826c0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -231,9 +231,10 @@ static BOOL task_needs_completion( struct task_header *task_hdr ) return !InterlockedExchange( &task_hdr->completion_sent, 1 ); } -static void cancel_queue( struct queue *queue ) +static BOOL cancel_queue( struct queue *queue ) { struct task_header *task_hdr, *found; + BOOL cancelled = FALSE; while (1) { @@ -250,9 +251,11 @@ static void cancel_queue( struct queue *queue ) } ReleaseSRWLockExclusive( &queue->lock ); if (!found) break; + cancelled = TRUE; found->callback( found, TRUE ); release_task( found ); } + return cancelled; } static void free_header( struct header *header ) @@ -1885,7 +1888,8 @@ static void finished_reading( struct request *request ) if (!request->netconn) return; - if (request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE) close = TRUE; + if (request->netconn->socket == -1) close = TRUE; + else if (request->hdr.disable_flags & WINHTTP_DISABLE_KEEP_ALIVE) close = TRUE; else if (!query_headers( request, WINHTTP_QUERY_CONNECTION, NULL, connection, &size, NULL ) || !query_headers( request, WINHTTP_QUERY_PROXY_CONNECTION, NULL, connection, &size, NULL )) { @@ -3121,6 +3125,18 @@ BOOL WINAPI WinHttpWriteData( HINTERNET hrequest, const void *buffer, DWORD to_w return !ret; } +static void socket_handle_closing( struct object_header *hdr ) +{ + struct socket *socket = (struct socket *)hdr; + BOOL pending_tasks; + + pending_tasks = cancel_queue( &socket->send_q ); + pending_tasks = cancel_queue( &socket->recv_q ) || pending_tasks; + + if (pending_tasks) + netconn_cancel_io( socket->request->netconn ); +} + static BOOL socket_query_option( struct object_header *hdr, DWORD option, void *buffer, DWORD *buflen ) { FIXME( "unimplemented option %lu\n", option ); @@ -3151,6 +3167,7 @@ static BOOL socket_set_option( struct object_header *hdr, DWORD option, void *bu static const struct object_vtbl socket_vtbl = { + socket_handle_closing, socket_destroy, socket_query_option, socket_set_option, diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3b00d2448d1..01e95895eb3 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -242,6 +242,7 @@ static BOOL session_set_option( struct object_header *hdr, DWORD option, void *b static const struct object_vtbl session_vtbl = { + NULL, session_destroy, session_query_option, session_set_option @@ -382,6 +383,7 @@ static BOOL connect_query_option( struct object_header *hdr, DWORD option, void static const struct object_vtbl connect_vtbl = { + NULL, connect_destroy, connect_query_option, NULL @@ -1085,6 +1087,7 @@ static BOOL request_set_option( struct object_header *hdr, DWORD option, void *b static const struct object_vtbl request_vtbl = { + NULL, request_destroy, request_query_option, request_set_option diff --git a/dlls/winhttp/winhttp_private.h b/dlls/winhttp/winhttp_private.h index 17102107c77..98e05f068ba 100644 --- a/dlls/winhttp/winhttp_private.h +++ b/dlls/winhttp/winhttp_private.h @@ -30,6 +30,7 @@ struct object_header; struct object_vtbl { + void (*handle_closing) ( struct object_header * ); void (*destroy)( struct object_header * ); BOOL (*query_option)( struct object_header *, DWORD, void *, DWORD * ); BOOL (*set_option)( struct object_header *, DWORD, void *, DWORD ); @@ -370,6 +371,7 @@ DWORD netconn_recv( struct netconn *, void *, size_t, int, int * ) DECLSPEC_HIDD DWORD netconn_resolve( WCHAR *, INTERNET_PORT, struct sockaddr_storage *, int ) DECLSPEC_HIDDEN; DWORD netconn_secure_connect( struct netconn *, WCHAR *, DWORD, CredHandle *, BOOL ) DECLSPEC_HIDDEN; DWORD netconn_send( struct netconn *, const void *, size_t, int *, WSAOVERLAPPED * ) DECLSPEC_HIDDEN; +void netconn_cancel_io( struct netconn *conn ) DECLSPEC_HIDDEN; DWORD netconn_set_timeout( struct netconn *, BOOL, int ) DECLSPEC_HIDDEN; BOOL netconn_is_alive( struct netconn * ) DECLSPEC_HIDDEN; const void *netconn_get_certificate( struct netconn * ) DECLSPEC_HIDDEN;

1 0

Paul Gofman : winhttp: Support abort in task_socket_close().
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 1b766caa48e8675f97016a2ee749dc3d89010400 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b766caa48e8675f97016a2e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 20:24:21 2022 -0500 winhttp: Support abort in task_socket_close(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 269af0826c0..2754dc29163 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -4145,13 +4145,18 @@ static void task_socket_close( void *ctx, BOOL abort ) struct socket *socket = (struct socket *)s->task_hdr.obj; DWORD ret; - if (abort) return; + if (abort) + { + socket_close_complete( socket, ERROR_WINHTTP_OPERATION_CANCELLED ); + return; + } TRACE("running %p\n", ctx); ret = socket_close( socket ); receive_io_complete( socket ); - socket_close_complete( socket, ret ); + if (task_needs_completion( &s->task_hdr )) + socket_close_complete( socket, ret ); } DWORD WINAPI WinHttpWebSocketClose( HINTERNET hsocket, USHORT status, void *reason, DWORD len )

1 0

Paul Gofman : winhttp/tests: Add tests for closing web socket with pending operations.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: d0a3248e7a12fd5e794b11b067fbbc8150a5db1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a3248e7a12fd5e794b11b0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 20:43:41 2022 -0500 winhttp/tests: Add tests for closing web socket with pending operations. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/tests/notification.c | 190 +++++++++++++++++++++++++++++++++++++- 1 file changed, 189 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d0a3248e7a12fd5e794b…

1 0

Rémi Bernon : windows.gaming.input: Consistently use FIXME for E_NOINTERFACE messages.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 622d98b74aee8ab725dd899b3d3968f98773fb8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=622d98b74aee8ab725dd899b… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 13:43:48 2022 +0200 windows.gaming.input: Consistently use FIXME for E_NOINTERFACE messages. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/async.c | 2 +- dlls/windows.gaming.input/controller.c | 2 +- dlls/windows.gaming.input/gamepad.c | 2 +- dlls/windows.gaming.input/racing_wheel.c | 2 +- dlls/windows.gaming.input/vector.c | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/windows.gaming.input/async.c b/dlls/windows.gaming.input/async.c index 8483f301b83..c41abe96cd1 100644 --- a/dlls/windows.gaming.input/async.c +++ b/dlls/windows.gaming.input/async.c @@ -73,7 +73,7 @@ static HRESULT WINAPI async_impl_QueryInterface( IWineAsyncInfoImpl *iface, REFI return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index e372ea6c9bf..bd3d441c445 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -99,7 +99,7 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 0c38fb5cd1a..5efc9f13ea8 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -99,7 +99,7 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } diff --git a/dlls/windows.gaming.input/racing_wheel.c b/dlls/windows.gaming.input/racing_wheel.c index 4a494775dc2..d646ca26c03 100644 --- a/dlls/windows.gaming.input/racing_wheel.c +++ b/dlls/windows.gaming.input/racing_wheel.c @@ -99,7 +99,7 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } diff --git a/dlls/windows.gaming.input/vector.c b/dlls/windows.gaming.input/vector.c index db1a9057682..8958b07c0f2 100644 --- a/dlls/windows.gaming.input/vector.c +++ b/dlls/windows.gaming.input/vector.c @@ -54,7 +54,7 @@ static HRESULT WINAPI iterator_QueryInterface( IIterator_IInspectable *iface, RE return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -189,7 +189,7 @@ static HRESULT WINAPI vector_view_QueryInterface( IVectorView_IInspectable *ifac return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; } @@ -384,7 +384,7 @@ static HRESULT WINAPI vector_QueryInterface( IVector_IInspectable *iface, REFIID return S_OK; } - WARN( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; }

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IGamepad2 interface declaration.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: e8b06de490c64fa21015b7edba89c1f19d23a8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8b06de490c64fa21015b7ed… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jun 7 17:24:55 2022 +0200 include: Add Windows.Gaming.Input.IGamepad2 interface declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- include/windows.gaming.input.idl | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index fdae3aa70b1..5fc5265247d 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -446,6 +446,19 @@ namespace Windows.Gaming.Input { HRESULT GetCurrentReading([out, retval] Windows.Gaming.Input.GamepadReading *value); } + [ + contract(Windows.Foundation.UniversalApiContract, 3.0), + exclusiveto(Windows.Gaming.Input.Gamepad), + uuid(3c1689bd-5915-4245-b0c0-c89fae0308ff) + ] + interface IGamepad2 : IInspectable + requires Windows.Gaming.Input.IGamepad, + Windows.Gaming.Input.IGameController + { + HRESULT GetButtonLabel([in] Windows.Gaming.Input.GamepadButtons button, + [out, retval] Windows.Gaming.Input.GameControllerButtonLabel *value); + } + [ contract(Windows.Foundation.UniversalApiContract, 3.0), exclusiveto(Windows.Gaming.Input.RacingWheel),

1 0

Rémi Bernon : windows.gaming.input: Implement stub IGamepad2 interface.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 2692e59f46196c31684f12d5d3b5f1ca17abca81 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2692e59f46196c31684f12d5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jun 8 13:44:13 2022 +0200 windows.gaming.input: Implement stub IGamepad2 interface. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/windows.gaming.input/gamepad.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/windows.gaming.input/gamepad.c b/dlls/windows.gaming.input/gamepad.c index 5efc9f13ea8..112ec49a1d3 100644 --- a/dlls/windows.gaming.input/gamepad.c +++ b/dlls/windows.gaming.input/gamepad.c @@ -61,6 +61,7 @@ struct gamepad IGameControllerImpl IGameControllerImpl_iface; IGameControllerInputSink IGameControllerInputSink_iface; IGamepad IGamepad_iface; + IGamepad2 IGamepad2_iface; IGameController *IGameController_outer; LONG ref; @@ -99,6 +100,12 @@ static HRESULT WINAPI controller_QueryInterface( IGameControllerImpl *iface, REF return S_OK; } + if (IsEqualGUID( iid, &IID_IGamepad2 )) + { + IInspectable_AddRef( (*out = &impl->IGamepad2_iface) ); + return S_OK; + } + FIXME( "%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid( iid ) ); *out = NULL; return E_NOINTERFACE; @@ -330,6 +337,28 @@ static const struct IGamepadVtbl gamepad_vtbl = gamepad_GetCurrentReading, }; +DEFINE_IINSPECTABLE_OUTER( gamepad2, IGamepad2, struct gamepad, IGameController_outer ) + +static HRESULT WINAPI gamepad2_GetButtonLabel( IGamepad2 *iface, GamepadButtons button, GameControllerButtonLabel *value ) +{ + FIXME( "iface %p, button %#x, value %p stub!\n", iface, button, value ); + *value = GameControllerButtonLabel_None; + return S_OK; +} + +static const struct IGamepad2Vtbl gamepad2_vtbl = +{ + gamepad2_QueryInterface, + gamepad2_AddRef, + gamepad2_Release, + /* IInspectable methods */ + gamepad2_GetIids, + gamepad2_GetRuntimeClassName, + gamepad2_GetTrustLevel, + /* IGamepad2 methods */ + gamepad2_GetButtonLabel, +}; + struct gamepad_statics { IActivationFactory IActivationFactory_iface; @@ -542,6 +571,7 @@ static HRESULT WINAPI controller_factory_CreateGameController( ICustomGameContro impl->IGameControllerImpl_iface.lpVtbl = &controller_vtbl; impl->IGameControllerInputSink_iface.lpVtbl = &input_sink_vtbl; impl->IGamepad_iface.lpVtbl = &gamepad_vtbl; + impl->IGamepad2_iface.lpVtbl = &gamepad2_vtbl; impl->ref = 1; TRACE( "created Gamepad %p\n", impl );

1 0

Connor McAdams : include: Add UI Automation Control Type ID definitions.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 84141b5acd11a4a4636364a7a3a1b85e29b5c170 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84141b5acd11a4a4636364a7… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Apr 29 10:24:18 2022 -0400 include: Add UI Automation Control Type ID definitions. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- include/uiautomationclient.idl | 49 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/include/uiautomationclient.idl b/include/uiautomationclient.idl index 917d3456ebf..43ac6b0752f 100644 --- a/include/uiautomationclient.idl +++ b/include/uiautomationclient.idl @@ -253,4 +253,53 @@ library UIAutomationClient { /* } */ + /* FIXME: Uncomment when properly supported in widl + [dllname("<no entry points>")] + module UIA_ControlTypeIds + { + */ + const long UIA_ButtonControlTypeId = 50000; + const long UIA_CalendarControlTypeId = 50001; + const long UIA_CheckBoxControlTypeId = 50002; + const long UIA_ComboBoxControlTypeId = 50003; + const long UIA_EditControlTypeId = 50004; + const long UIA_HyperlinkControlTypeId = 50005; + const long UIA_ImageControlTypeId = 50006; + const long UIA_ListItemControlTypeId = 50007; + const long UIA_ListControlTypeId = 50008; + const long UIA_MenuControlTypeId = 50009; + const long UIA_MenuBarControlTypeId = 50010; + const long UIA_MenuItemControlTypeId = 50011; + const long UIA_ProgressBarControlTypeId = 50012; + const long UIA_RadioButtonControlTypeId = 50013; + const long UIA_ScrollBarControlTypeId = 50014; + const long UIA_SliderControlTypeId = 50015; + const long UIA_SpinnerControlTypeId = 50016; + const long UIA_StatusBarControlTypeId = 50017; + const long UIA_TabControlTypeId = 50018; + const long UIA_TabItemControlTypeId = 50019; + const long UIA_TextControlTypeId = 50020; + const long UIA_ToolBarControlTypeId = 50021; + const long UIA_ToolTipControlTypeId = 50022; + const long UIA_TreeControlTypeId = 50023; + const long UIA_TreeItemControlTypeId = 50024; + const long UIA_CustomControlTypeId = 50025; + const long UIA_GroupControlTypeId = 50026; + const long UIA_ThumbControlTypeId = 50027; + const long UIA_DataGridControlTypeId = 50028; + const long UIA_DataItemControlTypeId = 50029; + const long UIA_DocumentControlTypeId = 50030; + const long UIA_SplitButtonControlTypeId = 50031; + const long UIA_WindowControlTypeId = 50032; + const long UIA_PaneControlTypeId = 50033; + const long UIA_HeaderControlTypeId = 50034; + const long UIA_HeaderItemControlTypeId = 50035; + const long UIA_TableControlTypeId = 50036; + const long UIA_TitleBarControlTypeId = 50037; + const long UIA_SeparatorControlTypeId = 50038; + const long UIA_SemanticZoomControlTypeId = 50039; + const long UIA_AppBarControlTypeId = 50040; + /* + }; + */ }

1 0

Connor McAdams : uiautomationcore/tests: Skip UiaProviderFromIAccessible tests on Win10v1507.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 97357ea62247f6c8a05037580abaa2b4af7c70d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97357ea62247f6c8a0503758… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon May 16 13:38:35 2022 -0400 uiautomationcore/tests: Skip UiaProviderFromIAccessible tests on Win10v1507. In Windows 10 version 1507, UiaProviderFromIAccessible will try to check the IAccessible passed in against the root IAccessible of the HWND associated with the passed in IAccessible. In all other Windows versions, this check is done on a call to get_HostRawElementProvider, or the first time navigating towards a parent or sibling. Rather than work around this, just skip the tests if this happens. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 36 ++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 246f8aba7c1..704e43180bd 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -53,6 +53,7 @@ static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, long, DWORD, expect_ ## func = called_ ## func = FALSE; \ }while(0) +DEFINE_EXPECT(winproc_GETOBJECT_CLIENT); DEFINE_EXPECT(Accessible_accNavigate); static LONG Accessible_ref = 1; @@ -60,6 +61,7 @@ static IAccessible Accessible; static IOleWindow OleWindow; static HWND Accessible_hwnd = NULL; static HWND OleWindow_hwnd = NULL; +static IAccessible *acc_client; static BOOL check_variant_i4(VARIANT *v, int val) { @@ -130,6 +132,7 @@ static HRESULT WINAPI Accessible_get_accParent(IAccessible *iface, IDispatch **o static HRESULT WINAPI Accessible_get_accChildCount(IAccessible *iface, LONG *out_count) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -143,6 +146,7 @@ static HRESULT WINAPI Accessible_get_accChild(IAccessible *iface, VARIANT child_ static HRESULT WINAPI Accessible_get_accName(IAccessible *iface, VARIANT child_id, BSTR *out_name) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -163,12 +167,14 @@ static HRESULT WINAPI Accessible_get_accDescription(IAccessible *iface, VARIANT static HRESULT WINAPI Accessible_get_accRole(IAccessible *iface, VARIANT child_id, VARIANT *out_role) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } static HRESULT WINAPI Accessible_get_accState(IAccessible *iface, VARIANT child_id, VARIANT *out_state) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -222,6 +228,7 @@ static HRESULT WINAPI Accessible_accSelect(IAccessible *iface, LONG select_flags static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *out_left, LONG *out_top, LONG *out_width, LONG *out_height, VARIANT child_id) { + ok(0, "unexpected call\n"); return E_NOTIMPL; } @@ -341,6 +348,24 @@ static IOleWindow OleWindow = {&OleWindowVtbl}; static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) { + switch (message) + { + case WM_GETOBJECT: + if (lParam == (DWORD)OBJID_CLIENT) + { + CHECK_EXPECT(winproc_GETOBJECT_CLIENT); + if (acc_client) + return LresultFromObject(&IID_IAccessible, wParam, (IUnknown *)acc_client); + + break; + } + + break; + + default: + break; + } + return DefWindowProcA(hwnd, message, wParam, lParam); } @@ -633,6 +658,8 @@ static void test_UiaProviderFromIAccessible(void) /* Return an HWND from accNavigate, not OleWindow. */ SET_EXPECT(Accessible_accNavigate); + SET_EXPECT(winproc_GETOBJECT_CLIENT); + acc_client = &Accessible; Accessible_hwnd = hwnd; OleWindow_hwnd = NULL; hr = pUiaProviderFromIAccessible(&Accessible, CHILDID_SELF, UIA_PFIA_DEFAULT, &elprov); @@ -641,6 +668,15 @@ static void test_UiaProviderFromIAccessible(void) ok(Accessible_ref == 2, "Unexpected refcnt %ld\n", Accessible_ref); IRawElementProviderSimple_Release(elprov); ok(Accessible_ref == 1, "Unexpected refcnt %ld\n", Accessible_ref); + acc_client = NULL; + + /* Skip tests on Win10v1507. */ + if (called_winproc_GETOBJECT_CLIENT) + { + win_skip("UiaProviderFromIAccessible behaves inconsistently on Win10 1507, skipping tests.\n"); + return; + } + expect_winproc_GETOBJECT_CLIENT = FALSE; /* Return an HWND from OleWindow, not accNavigate. */ Accessible_hwnd = NULL;

1 0

Connor McAdams : uiautomationcore: Use WindowFromAccessibleObject to get HWND in UiaProviderFromIAccessible.
by Alexandre Julliard 08 Jun '22

08 Jun '22

Module: wine Branch: master Commit: 06344846d5208e5bf8b1f237ba6d0eb312ad05f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=06344846d5208e5bf8b1f237… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 10:37:59 2022 -0400 uiautomationcore: Use WindowFromAccessibleObject to get HWND in UiaProviderFromIAccessible. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/Makefile.in | 2 +- dlls/uiautomationcore/tests/uiautomation.c | 64 +++++++++++++++++++++++++----- dlls/uiautomationcore/uia_provider.c | 28 +++---------- 3 files changed, 61 insertions(+), 33 deletions(-) diff --git a/dlls/uiautomationcore/Makefile.in b/dlls/uiautomationcore/Makefile.in index 61a560d6c2e..a1cf5575814 100644 --- a/dlls/uiautomationcore/Makefile.in +++ b/dlls/uiautomationcore/Makefile.in @@ -1,6 +1,6 @@ MODULE = uiautomationcore.dll IMPORTLIB = uiautomationcore -IMPORTS = uuid ole32 oleaut32 user32 +IMPORTS = uuid ole32 oleaut32 user32 oleacc EXTRADLLFLAGS = -Wb,--prefer-native diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 704e43180bd..344fd2cdbf0 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -53,11 +53,18 @@ static HRESULT (WINAPI *pUiaProviderFromIAccessible)(IAccessible *, long, DWORD, expect_ ## func = called_ ## func = FALSE; \ }while(0) +#define NAVDIR_INTERNAL_HWND 10 + DEFINE_EXPECT(winproc_GETOBJECT_CLIENT); DEFINE_EXPECT(Accessible_accNavigate); +DEFINE_EXPECT(Accessible_get_accParent); +DEFINE_EXPECT(Accessible_child_accNavigate); +DEFINE_EXPECT(Accessible_child_get_accParent); static LONG Accessible_ref = 1; +static LONG Accessible_child_ref = 1; static IAccessible Accessible; +static IAccessible Accessible_child; static IOleWindow OleWindow; static HWND Accessible_hwnd = NULL; static HWND OleWindow_hwnd = NULL; @@ -77,7 +84,7 @@ static HRESULT WINAPI Accessible_QueryInterface(IAccessible *iface, REFIID riid, if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDispatch) || IsEqualIID(riid, &IID_IAccessible)) *obj = iface; - else if (IsEqualIID(riid, &IID_IOleWindow)) + else if (IsEqualIID(riid, &IID_IOleWindow) && (iface == &Accessible)) *obj = &OleWindow; else return E_NOINTERFACE; @@ -88,12 +95,18 @@ static HRESULT WINAPI Accessible_QueryInterface(IAccessible *iface, REFIID riid, static ULONG WINAPI Accessible_AddRef(IAccessible *iface) { - return InterlockedIncrement(&Accessible_ref); + if (iface == &Accessible_child) + return InterlockedIncrement(&Accessible_child_ref); + else + return InterlockedIncrement(&Accessible_ref); } static ULONG WINAPI Accessible_Release(IAccessible *iface) { - return InterlockedDecrement(&Accessible_ref); + if (iface == &Accessible_child) + return InterlockedDecrement(&Accessible_child_ref); + else + return InterlockedDecrement(&Accessible_ref); } static HRESULT WINAPI Accessible_GetTypeInfoCount(IAccessible *iface, UINT *pctinfo) @@ -126,8 +139,16 @@ static HRESULT WINAPI Accessible_Invoke(IAccessible *iface, DISPID disp_id_membe static HRESULT WINAPI Accessible_get_accParent(IAccessible *iface, IDispatch **out_parent) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + if (iface == &Accessible_child) + { + CHECK_EXPECT(Accessible_child_get_accParent); + return IAccessible_QueryInterface(&Accessible, &IID_IDispatch, (void **)out_parent); + } + else + CHECK_EXPECT(Accessible_get_accParent); + + *out_parent = NULL; + return S_FALSE; } static HRESULT WINAPI Accessible_get_accChildCount(IAccessible *iface, LONG *out_count) @@ -235,14 +256,18 @@ static HRESULT WINAPI Accessible_accLocation(IAccessible *iface, LONG *out_left, static HRESULT WINAPI Accessible_accNavigate(IAccessible *iface, LONG nav_direction, VARIANT child_id_start, VARIANT *out_var) { - CHECK_EXPECT(Accessible_accNavigate); + if (iface == &Accessible_child) + CHECK_EXPECT(Accessible_child_accNavigate); + else + CHECK_EXPECT(Accessible_accNavigate); VariantInit(out_var); /* * This is an undocumented way for UI Automation to get an HWND for * IAccessible's contained in a Direct Annotation wrapper object. */ - if ((nav_direction == 10) && check_variant_i4(&child_id_start, CHILDID_SELF)) + if ((nav_direction == NAVDIR_INTERNAL_HWND) && check_variant_i4(&child_id_start, CHILDID_SELF) && + Accessible_hwnd) { V_VT(out_var) = VT_I4; V_I4(out_var) = HandleToUlong(Accessible_hwnd); @@ -326,8 +351,13 @@ static ULONG WINAPI OleWindow_Release(IOleWindow *iface) static HRESULT WINAPI OleWindow_GetWindow(IOleWindow *iface, HWND *hwnd) { - *hwnd = OleWindow_hwnd; - return S_OK; + if (OleWindow_hwnd) + { + *hwnd = OleWindow_hwnd; + return S_OK; + } + + return E_FAIL; } static HRESULT WINAPI OleWindow_ContextSensitiveHelp(IOleWindow *iface, BOOL f_enter_mode) @@ -344,6 +374,7 @@ static const IOleWindowVtbl OleWindowVtbl = { }; static IAccessible Accessible = {&AccessibleVtbl}; +static IAccessible Accessible_child = {&AccessibleVtbl}; static IOleWindow OleWindow = {&OleWindowVtbl}; static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -650,11 +681,13 @@ static void test_UiaProviderFromIAccessible(void) /* Don't return an HWND from accNavigate or OleWindow. */ SET_EXPECT(Accessible_accNavigate); + SET_EXPECT(Accessible_get_accParent); Accessible_hwnd = NULL; OleWindow_hwnd = NULL; hr = pUiaProviderFromIAccessible(&Accessible, CHILDID_SELF, UIA_PFIA_DEFAULT, &elprov); ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); CHECK_CALLED(Accessible_accNavigate); + CHECK_CALLED(Accessible_get_accParent); /* Return an HWND from accNavigate, not OleWindow. */ SET_EXPECT(Accessible_accNavigate); @@ -678,6 +711,19 @@ static void test_UiaProviderFromIAccessible(void) } expect_winproc_GETOBJECT_CLIENT = FALSE; + /* Return an HWND from parent IAccessible's IOleWindow interface. */ + SET_EXPECT(Accessible_child_accNavigate); + SET_EXPECT(Accessible_child_get_accParent); + Accessible_hwnd = NULL; + OleWindow_hwnd = hwnd; + hr = pUiaProviderFromIAccessible(&Accessible_child, CHILDID_SELF, UIA_PFIA_DEFAULT, &elprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + CHECK_CALLED(Accessible_child_accNavigate); + CHECK_CALLED(Accessible_child_get_accParent); + ok(Accessible_child_ref == 2, "Unexpected refcnt %ld\n", Accessible_child_ref); + IRawElementProviderSimple_Release(elprov); + ok(Accessible_child_ref == 1, "Unexpected refcnt %ld\n", Accessible_child_ref); + /* Return an HWND from OleWindow, not accNavigate. */ Accessible_hwnd = NULL; OleWindow_hwnd = hwnd; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 790593dbcab..d2a0da15c3c 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -151,7 +151,6 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD struct msaa_provider *msaa_prov; IServiceProvider *serv_prov; HWND hwnd = NULL; - IOleWindow *win; HRESULT hr; TRACE("(%p, %ld, %#lx, %p)\n", acc, child_id, flags, elprov); @@ -187,28 +186,11 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD IServiceProvider_Release(serv_prov); } - hr = IAccessible_QueryInterface(acc, &IID_IOleWindow, (void **)&win); - if (SUCCEEDED(hr)) - { - hr = IOleWindow_GetWindow(win, &hwnd); - if (FAILED(hr)) - hwnd = NULL; - IOleWindow_Release(win); - } - - if (!IsWindow(hwnd)) - { - VARIANT v, cid; - - VariantInit(&v); - variant_init_i4(&cid, CHILDID_SELF); - hr = IAccessible_accNavigate(acc, 10, cid, &v); - if (SUCCEEDED(hr) && V_VT(&v) == VT_I4) - hwnd = ULongToHandle(V_I4(&v)); - - if (!IsWindow(hwnd)) - return E_FAIL; - } + hr = WindowFromAccessibleObject(acc, &hwnd); + if (FAILED(hr)) + return hr; + if (!hwnd) + return E_FAIL; msaa_prov = heap_alloc(sizeof(*msaa_prov)); if (!msaa_prov)

1 0