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

Jacek Caban : user32: Remove no longer needed helpers.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: eae27293ba5153b8efd3d2e5c0d103c88c3b13b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eae27293ba5153b8efd3d2e5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 7 23:33:24 2022 +0200 user32: Remove no longer needed helpers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/user_main.c | 18 ------------------ dlls/user32/win.c | 2 +- dlls/user32/win.h | 6 +----- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index eeef0d57f62..d0c1cc616a7 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -42,24 +42,6 @@ static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); -/*********************************************************************** - * USER_Lock - */ -void USER_Lock(void) -{ - NtUserCallOneParam( 0, NtUserLock ); -} - - -/*********************************************************************** - * USER_Unlock - */ -void USER_Unlock(void) -{ - NtUserCallOneParam( 1, NtUserLock ); -} - - /*********************************************************************** * USER_CheckNotLock * diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9b9dde82561..bac75063f7d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -54,7 +54,7 @@ void *get_user_handle_ptr( HANDLE handle, unsigned int type ) void release_user_handle_ptr( void *ptr ) { assert( ptr && ptr != OBJ_OTHER_PROCESS ); - USER_Unlock(); + NtUserCallOneParam( 1, NtUserLock ); } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index dfa5fdf3283..9d42aef6645 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -48,14 +48,10 @@ extern HWND *WIN_ListChildren( HWND hwnd ) DECLSPEC_HIDDEN; extern void MDI_CalcDefaultChildPos( HWND hwndClient, INT total, LPPOINT lpPos, INT delta, UINT *id ) DECLSPEC_HIDDEN; extern HDESK open_winstation_desktop( HWINSTA hwinsta, LPCWSTR name, DWORD flags, BOOL inherit, ACCESS_MASK access ) DECLSPEC_HIDDEN; -/* user lock */ -extern void USER_Lock(void) DECLSPEC_HIDDEN; -extern void USER_Unlock(void) DECLSPEC_HIDDEN; - /* to release pointers retrieved by WIN_GetPtr */ static inline void WIN_ReleasePtr( WND *ptr ) { - USER_Unlock(); + release_user_handle_ptr( ptr ); } extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode ) DECLSPEC_HIDDEN;

1 0

Connor McAdams : uiautomationcore: Implement UIA_ControlTypePropertyId for MSAA providers.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: c250b5c777e494ebc0b8b3a0da744b7c5e3ad8b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c250b5c777e494ebc0b8b3a0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue May 17 13:12:58 2022 -0400 uiautomationcore: Implement UIA_ControlTypePropertyId for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 170 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_provider.c | 100 ++++++++++++++++- 2 files changed, 266 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c250b5c777e494ebc0b8…

1 0

Rémi Bernon : include: Add Windows.Gaming.Input.IGamepad2 interface declaration.
by Alexandre Julliard June 8, 2022

June 8, 2022

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: Consistently use FIXME for E_NOINTERFACE messages.
by Alexandre Julliard June 8, 2022

June 8, 2022

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

Alexandre Julliard : kernelbase: Add NORM_IGNORENONSPACE support in LCMapStringEx().
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 5dee0ed75502e0295d09e39d8a80d02954702212 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5dee0ed75502e0295d09e39d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 8 14:57:20 2022 +0200 kernelbase: Add NORM_IGNORENONSPACE support in LCMapStringEx(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36720 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 17 ++++++++++++++ dlls/kernelbase/locale.c | 54 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 64 insertions(+), 7 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 9bd922dff98..9108942b8cc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2462,6 +2462,11 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f const static WCHAR cjk_compat_result[] = { 0x523b, 0x5246, 0x5272, 0x5277, 0x3515, 0x52c7, 0x52c9, 0x52e4, 0 }; + const static WCHAR accents_text[] = { + 0x00e0, 0x00e7, ' ', 0x00e9, ',', 0x00ee, 0x00f1, '/', 0x00f6, 0x00fb, 0x00fd, '!', 0 + }; + const static WCHAR accents_result[] = L"ac e,in/ouy!"; + const static WCHAR accents_result2[] = L"aceinouy"; int ret, ret2, i; WCHAR buf[256], buf2[256]; char *p_buf = (char *)buf, *p_buf2 = (char *)buf2; @@ -2703,6 +2708,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(lower_case) + 1, ret); ok(!lstrcmpW(buf, lower_case), "%s string comparison mismatch\n", func_name); + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORENONSPACE, accents_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(buf) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(buf) + 1, ret); + ok(!lstrcmpW(buf, accents_result), "%s string comparison mismatch %s\n", func_name, debugstr_w(buf)); + /* test NORM_IGNORESYMBOLS */ lstrcpyW(buf, fooW); ret = func_ptr(NORM_IGNORESYMBOLS, lower_case, -1, buf, ARRAY_SIZE(buf)); @@ -2717,6 +2728,12 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f lstrlenW(symbols_stripped) + 1, ret); ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name); + lstrcpyW(buf, fooW); + ret = func_ptr(NORM_IGNORESYMBOLS | NORM_IGNORENONSPACE, accents_text, -1, buf, ARRAY_SIZE(buf)); + ok(ret == lstrlenW(buf) + 1, "%s func_ptr should return %d, ret = %d\n", func_name, + lstrlenW(buf) + 1, ret); + ok(!lstrcmpW(buf, accents_result2), "%s string comparison mismatch %s\n", func_name, debugstr_w(buf)); + /* test small buffer */ lstrcpyW(buf, fooW); ret = func_ptr(LCMAP_SORTKEY, lower_case, -1, buf, 2); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 6995209e30c..257d9f693ba 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -4023,6 +4023,52 @@ static int map_to_fullwidth( const USHORT *table, const WCHAR *src, int srclen, return pos; } + +static inline int nonspace_ignored( WCHAR ch ) +{ + if (get_char_type( CT_CTYPE2, ch ) != C2_OTHERNEUTRAL) return FALSE; + return (get_char_type( CT_CTYPE3, ch ) & (C3_NONSPACING | C3_DIACRITIC)); +} + +/* remove ignored chars for NORM_IGNORENONSPACE/NORM_IGNORESYMBOLS */ +static int map_remove_ignored( DWORD flags, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) +{ + int pos; + + for (pos = 0; srclen; src++, srclen--) + { + if (flags & NORM_IGNORESYMBOLS) + { + if (get_char_type( CT_CTYPE1, *src ) & C1_PUNCT) continue; + if (get_char_type( CT_CTYPE3, *src ) & C3_SYMBOL) continue; + } + if (flags & NORM_IGNORENONSPACE) + { + WCHAR buffer[8]; + const WCHAR *decomp; + unsigned int i, j, len; + + if ((decomp = get_decomposition( *src, &len )) && len > 1) + { + for (i = j = 0; i < len; i++) + if (!nonspace_ignored( decomp[i] )) buffer[j++] = decomp[i]; + + if (i > j) /* something was removed */ + { + if (pos + j <= dstlen) memcpy( dst + pos, buffer, j * sizeof(WCHAR) ); + pos += j; + continue; + } + } + else if (nonspace_ignored( *src )) continue; + } + if (pos < dstlen) dst[pos] = *src; + pos++; + } + return pos; +} + + /* map full-width characters to single or double half-width characters. */ static int map_to_halfwidth( const USHORT *table, const WCHAR *src, int srclen, WCHAR *dst, int dstlen ) { @@ -4124,13 +4170,7 @@ static int lcmap_string( const struct sortguid *sortid, DWORD flags, SetLastError( ERROR_INVALID_FLAGS ); return 0; } - for (ret = 0; srclen; src++, srclen--) - { - if ((flags & NORM_IGNORESYMBOLS) && (get_char_type( CT_CTYPE1, *src ) & (C1_PUNCT | C1_SPACE))) - continue; - if (ret < dstlen) dst[ret] = *src; - ret++; - } + ret = map_remove_ignored( flags, src, srclen, dst, dstlen ); break; case 0: if (case_table)

1 0

Paul Gofman : winhttp: Fix dwResult field in websocket receive error result.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: 66ff3594c4f6d84b9437a247d411562e65c133c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66ff3594c4f6d84b9437a247… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Mon Jun 6 22:01:45 2022 -0500 winhttp: Fix dwResult field in websocket receive error result. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/winhttp/request.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 70d727c7e2e..29887c8d7d0 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -3839,6 +3839,25 @@ static DWORD socket_receive( struct socket *socket, void *buf, DWORD len, DWORD return ret; } +static void socket_receive_complete( struct socket *socket, DWORD ret, WINHTTP_WEB_SOCKET_BUFFER_TYPE type, DWORD len ) +{ + if (!ret) + { + WINHTTP_WEB_SOCKET_STATUS status; + status.dwBytesTransferred = len; + status.eBufferType = type; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); + } + else + { + WINHTTP_WEB_SOCKET_ASYNC_RESULT result; + result.AsyncResult.dwResult = 0; + result.AsyncResult.dwError = ret; + result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; + send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); + } +} + static void task_socket_receive( void *ctx ) { struct socket_receive *r = ctx; @@ -3850,23 +3869,7 @@ static void task_socket_receive( void *ctx ) ret = socket_receive( socket, r->buf, r->len, &count, &type ); if (receive_io_complete( socket )) - { - if (!ret) - { - WINHTTP_WEB_SOCKET_STATUS status; - status.dwBytesTransferred = count; - status.eBufferType = type; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_READ_COMPLETE, &status, sizeof(status) ); - } - else - { - WINHTTP_WEB_SOCKET_ASYNC_RESULT result; - result.AsyncResult.dwResult = API_READ_DATA; - result.AsyncResult.dwError = ret; - result.Operation = WINHTTP_WEB_SOCKET_RECEIVE_OPERATION; - send_callback( &socket->hdr, WINHTTP_CALLBACK_STATUS_REQUEST_ERROR, &result, sizeof(result) ); - } - } + socket_receive_complete( socket, ret, type, count ); } DWORD WINAPI WinHttpWebSocketReceive( HINTERNET hsocket, void *buf, DWORD len, DWORD *ret_len,

1 0

Paul Gofman : winhttp: Replace pending read cancel in WinHttpWebSocketClose() with a generic cancel_queue().
by Alexandre Julliard June 8, 2022

June 8, 2022

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 June 8, 2022

June 8, 2022

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

Connor McAdams : uiautomationcore: Implement MSAA accState based property IDs for MSAA providers.
by Alexandre Julliard June 8, 2022

June 8, 2022

Module: wine Branch: master Commit: f256979be1df085ae9ed1f31ada6f98cbe8c5949 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f256979be1df085ae9ed1f31… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri May 20 12:17:50 2022 -0400 uiautomationcore: Implement MSAA accState based property IDs for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 65 ++++++++++++++++++++++++++++-- dlls/uiautomationcore/uia_provider.c | 39 ++++++++++++++++++ 2 files changed, 100 insertions(+), 4 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index c735e7a0bd5..f3e4b89a120 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -59,6 +59,7 @@ DEFINE_EXPECT(winproc_GETOBJECT_CLIENT); DEFINE_EXPECT(Accessible_accNavigate); DEFINE_EXPECT(Accessible_get_accParent); DEFINE_EXPECT(Accessible_get_accRole); +DEFINE_EXPECT(Accessible_get_accState); DEFINE_EXPECT(Accessible_child_accNavigate); DEFINE_EXPECT(Accessible_child_get_accParent); @@ -72,6 +73,14 @@ static BOOL check_variant_i4(VARIANT *v, int val) return FALSE; } +static BOOL check_variant_bool(VARIANT *v, BOOL val) +{ + if (V_VT(v) == VT_BOOL && V_BOOL(v) == (val ? VARIANT_TRUE : VARIANT_FALSE)) + return TRUE; + + return FALSE; +} + static struct Accessible { IAccessible IAccessible_iface; @@ -82,6 +91,7 @@ static struct Accessible HWND acc_hwnd; HWND ow_hwnd; INT role; + INT state; } Accessible, Accessible_child; static inline struct Accessible* impl_from_Accessible(IAccessible *iface) @@ -217,7 +227,18 @@ static HRESULT WINAPI Accessible_get_accRole(IAccessible *iface, VARIANT child_i static HRESULT WINAPI Accessible_get_accState(IAccessible *iface, VARIANT child_id, VARIANT *out_state) { - ok(0, "unexpected call\n"); + struct Accessible *This = impl_from_Accessible(iface); + + ok(This == &Accessible, "unexpected call\n"); + CHECK_EXPECT(Accessible_get_accState); + + if (This->state) + { + V_VT(out_state) = VT_I4; + V_I4(out_state) = This->state; + return S_OK; + } + return E_NOTIMPL; } @@ -409,7 +430,7 @@ static struct Accessible Accessible = 1, NULL, 0, 0, - 0, + 0, 0, }; static struct Accessible Accessible_child = { @@ -418,7 +439,7 @@ static struct Accessible Accessible_child = 1, &Accessible.IAccessible_iface, 0, 0, - 0, + 0, 0, }; static LRESULT WINAPI test_wnd_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -749,12 +770,24 @@ static const struct msaa_role_uia_type msaa_role_uia_types[] = { { ROLE_SYSTEM_OUTLINEBUTTON, 0 }, }; +struct msaa_state_uia_prop { + INT acc_state; + INT prop_id; +}; + +static const struct msaa_state_uia_prop msaa_state_uia_props[] = { + { STATE_SYSTEM_FOCUSED, UIA_HasKeyboardFocusPropertyId }, + { STATE_SYSTEM_FOCUSABLE, UIA_IsKeyboardFocusablePropertyId }, + { ~STATE_SYSTEM_UNAVAILABLE, UIA_IsEnabledPropertyId }, + { STATE_SYSTEM_PROTECTED, UIA_IsPasswordPropertyId }, +}; + static void test_uia_prov_from_acc_properties(void) { IRawElementProviderSimple *elprov; HRESULT hr; VARIANT v; - int i; + int i, x; /* MSAA role to UIA control type test. */ for (i = 0; i < ARRAY_SIZE(msaa_role_uia_types); i++) @@ -822,6 +855,30 @@ static void test_uia_prov_from_acc_properties(void) Accessible.role = 0; IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); + + hr = pUiaProviderFromIAccessible(&Accessible.IAccessible_iface, CHILDID_SELF, UIA_PFIA_DEFAULT, &elprov); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Accessible.ref == 2, "Unexpected refcnt %ld\n", Accessible.ref); + + /* UIA PropertyId's that correspond directly to individual MSAA state flags. */ + for (i = 0; i < ARRAY_SIZE(msaa_state_uia_props); i++) + { + const struct msaa_state_uia_prop *state = &msaa_state_uia_props[i]; + + for (x = 0; x < 2; x++) + { + Accessible.state = x ? state->acc_state : ~state->acc_state; + SET_EXPECT(Accessible_get_accState); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, state->prop_id, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(check_variant_bool(&v, x), "V_BOOL(&v) = %#x\n", V_BOOL(&v)); + CHECK_CALLED(Accessible_get_accState); + } + } + Accessible.state = 0; + + IRawElementProviderSimple_Release(elprov); + ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); } static void test_UiaProviderFromIAccessible(void) diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index ab2b8305b10..dae0187596d 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -32,6 +32,25 @@ static void variant_init_i4(VARIANT *v, int val) V_I4(v) = val; } +static void variant_init_bool(VARIANT *v, BOOL val) +{ + V_VT(v) = VT_BOOL; + V_BOOL(v) = val ? VARIANT_TRUE : VARIANT_FALSE; +} + +static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag) +{ + HRESULT hr; + VARIANT v; + + VariantInit(&v); + hr = IAccessible_get_accState(acc, cid, &v); + if (SUCCEEDED(hr) && V_VT(&v) == VT_I4 && (V_I4(&v) & flag)) + return TRUE; + + return FALSE; +} + static LONG msaa_role_to_uia_control_type(LONG role) { switch (role) @@ -214,6 +233,26 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, break; + case UIA_HasKeyboardFocusPropertyId: + variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, + STATE_SYSTEM_FOCUSED)); + break; + + case UIA_IsKeyboardFocusablePropertyId: + variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, + STATE_SYSTEM_FOCUSABLE)); + break; + + case UIA_IsEnabledPropertyId: + variant_init_bool(ret_val, !msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, + STATE_SYSTEM_UNAVAILABLE)); + break; + + case UIA_IsPasswordPropertyId: + variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, + STATE_SYSTEM_PROTECTED)); + break; + default: FIXME("Unimplemented propertyId %d\n", prop_id); break;

1 0

Paul Gofman : winhttp/tests: Add tests for closing web socket with pending operations.
by Alexandre Julliard June 8, 2022

June 8, 2022

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