- Wine-Commits - list.winehq.org

Rémi Bernon : dinput: Hook window threads instead of the entire prefix.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: e5c540c59b5642254b6e5731a93d3eeba543be7b URL: https://gitlab.winehq.org/wine/wine/-/commit/e5c540c59b5642254b6e5731a93d3e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 15 13:46:49 2023 +0100 dinput: Hook window threads instead of the entire prefix. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54431 --- dlls/dinput/device_private.h | 1 + dlls/dinput/dinput_main.c | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index f6030c5d088..ebe1b49da2f 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -95,6 +95,7 @@ struct dinput_device HWND win; enum device_status status; BOOL use_raw_input; /* use raw input instead of low-level messages */ + HHOOK cbt_hook; /* CBT hook to track foreground changes */ LPDIDEVICEOBJECTDATA data_queue; /* buffer for 'GetDeviceData'. */ int queue_len; /* valid size of the queue */ diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 42541b9084a..0d502821966 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -61,7 +61,6 @@ struct input_thread_state UINT devices_count; HHOOK mouse_ll_hook; HHOOK keyboard_ll_hook; - HHOOK callwndproc_hook; RAWINPUTDEVICE rawinput_devices[2]; struct dinput_device *devices[INPUT_THREAD_MAX_DEVICES]; HANDLE events[INPUT_THREAD_MAX_DEVICES]; @@ -112,12 +111,21 @@ void dinput_hooks_unacquire_device( IDirectInputDevice8W *iface ) SendMessageW( di_em_win, INPUT_THREAD_NOTIFY, NOTIFY_REFRESH_DEVICES, 0 ); } +static void unhook_device_window_foreground_changes( struct dinput_device *device ) +{ + if (!device->cbt_hook) return; + UnhookWindowsHookEx( device->cbt_hook ); + device->cbt_hook = NULL; +} + static void dinput_device_internal_unacquire( IDirectInputDevice8W *iface, DWORD status ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); TRACE( "iface %p.\n", iface ); + unhook_device_window_foreground_changes( impl ); + EnterCriticalSection( &impl->crit ); if (impl->status == STATUS_ACQUIRED) { @@ -198,17 +206,26 @@ static LRESULT CALLBACK cbt_hook_proc( int code, WPARAM wparam, LPARAM lparam ) return CallNextHookEx( 0, code, wparam, lparam ); } +static void hook_device_window_foreground_changes( struct dinput_device *device ) +{ + DWORD tid, pid; + if (!(tid = GetWindowThreadProcessId( device->win, &pid ))) return; + device->cbt_hook = SetWindowsHookExW( WH_CBT, cbt_hook_proc, DINPUT_instance, tid ); +} + static void input_thread_update_device_list( struct input_thread_state *state ) { RAWINPUTDEVICE rawinput_keyboard = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_KEYBOARD, .dwFlags = RIDEV_REMOVE}; RAWINPUTDEVICE rawinput_mouse = {.usUsagePage = HID_USAGE_PAGE_GENERIC, .usUsage = HID_USAGE_GENERIC_MOUSE, .dwFlags = RIDEV_REMOVE}; - UINT count = 0, keyboard_ll_count = 0, mouse_ll_count = 0, foreground_count = 0; + UINT count = 0, keyboard_ll_count = 0, mouse_ll_count = 0; struct dinput_device *device; EnterCriticalSection( &dinput_hook_crit ); LIST_FOR_EACH_ENTRY( device, &acquired_device_list, struct dinput_device, entry ) { - if (device->dwCoopLevel & DISCL_FOREGROUND) foreground_count++; + unhook_device_window_foreground_changes( device ); + if (device->dwCoopLevel & DISCL_FOREGROUND) hook_device_window_foreground_changes( device ); + if (!device->read_event || !device->vtbl->read) continue; state->events[count] = device->read_event; dinput_device_internal_addref( (state->devices[count] = device) ); @@ -250,14 +267,6 @@ static void input_thread_update_device_list( struct input_thread_state *state ) state->devices_count = count; LeaveCriticalSection( &dinput_hook_crit ); - if (foreground_count && !state->callwndproc_hook) - state->callwndproc_hook = SetWindowsHookExW( WH_CBT, cbt_hook_proc, DINPUT_instance, 0 ); - else if (!foreground_count && state->callwndproc_hook) - { - UnhookWindowsHookEx( state->callwndproc_hook ); - state->callwndproc_hook = NULL; - } - if (keyboard_ll_count && !state->keyboard_ll_hook) state->keyboard_ll_hook = SetWindowsHookExW( WH_KEYBOARD_LL, input_thread_ll_hook_proc, DINPUT_instance, 0 ); else if (!keyboard_ll_count && state->keyboard_ll_hook) @@ -413,7 +422,6 @@ static DWORD WINAPI dinput_thread_proc( void *params ) } while (state.devices_count--) dinput_device_internal_release( state.devices[state.devices_count] ); - if (state.callwndproc_hook) UnhookWindowsHookEx( state.callwndproc_hook ); if (state.keyboard_ll_hook) UnhookWindowsHookEx( state.keyboard_ll_hook ); if (state.mouse_ll_hook) UnhookWindowsHookEx( state.mouse_ll_hook ); DestroyWindow( di_em_win );

1 0

Rémi Bernon : dinput: Forbid acquiring for other process windows.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 7a2d59fb24ae6c6458339f1e8be1a7d160fc5d3c URL: https://gitlab.winehq.org/wine/wine/-/commit/7a2d59fb24ae6c6458339f1e8be1a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Feb 15 13:43:26 2023 +0100 dinput: Forbid acquiring for other process windows. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54431 --- dlls/dinput/device.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index c7b29da9271..c001d1ef29a 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -546,6 +546,7 @@ static HRESULT WINAPI dinput_device_Acquire( IDirectInputDevice8W *iface ) { struct dinput_device *impl = impl_from_IDirectInputDevice8W( iface ); HRESULT hr = DI_OK; + DWORD pid; TRACE( "iface %p.\n", iface ); @@ -556,6 +557,8 @@ static HRESULT WINAPI dinput_device_Acquire( IDirectInputDevice8W *iface ) hr = DIERR_INVALIDPARAM; else if ((impl->dwCoopLevel & DISCL_FOREGROUND) && impl->win != GetForegroundWindow()) hr = DIERR_OTHERAPPHASPRIO; + else if ((impl->dwCoopLevel & DISCL_FOREGROUND) && (!GetWindowThreadProcessId( impl->win, &pid ) || pid != GetCurrentProcessId())) + hr = DIERR_INVALIDPARAM; else { impl->status = STATUS_ACQUIRED;

1 0

Nikolay Sivov : apisetschema: Add ext-ms-win-networking-wlanapi-l1-1-0.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 2f229869d8f3940cafe60563f3938a8fbe78c1d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/2f229869d8f3940cafe60563f3938a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 16 07:40:10 2023 +0100 apisetschema: Add ext-ms-win-networking-wlanapi-l1-1-0. --- dlls/apisetschema/apisetschema.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/apisetschema/apisetschema.spec b/dlls/apisetschema/apisetschema.spec index cb22c25c054..981b80c6976 100644 --- a/dlls/apisetschema/apisetschema.spec +++ b/dlls/apisetschema/apisetschema.spec @@ -384,6 +384,7 @@ apiset ext-ms-win-mm-pehelper-l1-1-0 = mf.dll apiset ext-ms-win-mm-wmvcore-l1-1-0 = wmvcore.dll apiset ext-ms-win-msi-misc-l1-1-0 = msi.dll apiset ext-ms-win-msimg-draw-l1-1-0 = msimg32.dll +apiset ext-ms-win-networking-wlanapi-l1-1-0 = wlanapi.dll apiset ext-ms-win-ntdsapi-activedirectoryclient-l1-1-1 = ntdsapi.dll apiset ext-ms-win-ntuser-caret-l1-1-0 = user32.dll apiset ext-ms-win-ntuser-chartranslation-l1-1-0 = user32.dll

1 0

Francois Gouget : riched20/tests: Check clipboard content after destroying the editor window.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: b5b5b0b365639b889a0240d4992e16174b428f75 URL: https://gitlab.winehq.org/wine/wine/-/commit/b5b5b0b365639b889a0240d4992e16… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 07:57:55 2021 +0200 riched20/tests: Check clipboard content after destroying the editor window. Destroying the editor window should render all the formats so they are still available after. --- dlls/riched20/tests/editor.c | 53 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index ab741f23035..788491f3ffb 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -4791,6 +4791,36 @@ static DWORD CALLBACK test_EM_GETMODIFY_esCallback(DWORD_PTR dwCookie, return 0; } +#define open_clipboard(hwnd) open_clipboard_(__LINE__, hwnd) +static BOOL open_clipboard_(int line, HWND hwnd) +{ + DWORD start = GetTickCount(); + while (1) + { + BOOL ret = OpenClipboard(hwnd); + if (ret || GetLastError() != ERROR_ACCESS_DENIED) + return ret; + if (GetTickCount() - start > 100) + { + char classname[256]; + DWORD le = GetLastError(); + HWND clipwnd = GetOpenClipboardWindow(); + /* Provide a hint as to the source of interference: + * - The class name would typically be CLIPBRDWNDCLASS if the + * clipboard was opened by a Windows application using the + * ole32 API. + * - And it would be __wine_clipboard_manager if it was opened in + * response to a native application. + */ + GetClassNameA(clipwnd, classname, ARRAY_SIZE(classname)); + trace_(__FILE__, line)("%p (%s) opened the clipboard\n", clipwnd, classname); + SetLastError(le); + return ret; + } + Sleep(15); + } +} + static void test_EM_GETMODIFY(void) { HWND hwndRichEdit = new_richedit(NULL); @@ -4807,6 +4837,8 @@ static void test_EM_GETMODIFY(void) CHARFORMAT2A cf2; PARAFORMAT2 pf2; EDITSTREAM es; + BOOL r; + HANDLE hclip; HFONT testFont = CreateFontA (0,0,0,0,FW_LIGHT, 0, 0, 0, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH | @@ -4953,7 +4985,28 @@ static void test_EM_GETMODIFY(void) ok (result != 0, "EM_GETMODIFY returned zero, instead of non-zero for EM_STREAM\n"); + /* Check that the clipboard data is still available after destroying the + * editor window. + */ + SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)"Stayin' alive"); + SendMessageA(hwndRichEdit, EM_SETSEL, 8, -1); + SendMessageA(hwndRichEdit, WM_COPY, 0, 0); + DestroyWindow(hwndRichEdit); + + r = open_clipboard(NULL); + ok(r, "OpenClipboard failed le=%lu\n", GetLastError()); + + hclip = GetClipboardData(CF_TEXT); + todo_wine ok(hclip != NULL, "GetClipboardData() failed le=%lu\n", GetLastError()); + if (hclip) + { + const char* str = GlobalLock(hclip); + ok(strcmp(str, "alive") == 0, "unexpected clipboard content: %s\n", str); + GlobalUnlock(hclip); + } + + CloseClipboard(); } struct exsetsel_s {

1 0

Francois Gouget : riched20/tests: Add context to the EM_FORMATRANGE tests.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 020145248371bbfd2e473e79ba873e8313dde72d URL: https://gitlab.winehq.org/wine/wine/-/commit/020145248371bbfd2e473e79ba873e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 15 12:02:47 2023 +0100 riched20/tests: Add context to the EM_FORMATRANGE tests. --- dlls/riched20/tests/editor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 788491f3ffb..7c959680e84 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5784,6 +5784,7 @@ static void test_EM_FORMATRANGE(void) SIZE stringsize; int len; + winetest_push_context("%d", i); SendMessageA(hwndRichEdit, WM_SETTEXT, 0, (LPARAM)fmtstrings[i].string); gtl.flags = GTL_NUMCHARS | GTL_PRECISE; @@ -5840,6 +5841,7 @@ static void test_EM_FORMATRANGE(void) todo_wine { ok(r == len, "Expected %d, got %d\n", len, r); } + winetest_pop_context(); } ReleaseDC(NULL, hdc);

1 0

Alistair Leslie-Hughes : msdasql: Always return affected rows if required.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 5b9496ade6f8132d0291782d5232f7e0b92caa0e URL: https://gitlab.winehq.org/wine/wine/-/commit/5b9496ade6f8132d0291782d5232f7… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Feb 16 12:59:23 2023 +1100 msdasql: Always return affected rows if required. When using msadosql it always returns the number of records affected or records returned by a SELECT statement. The access database, which is what the defaults tests are using doesn't return the number of records for a SELECT. It's a known issue that you have to MoveLast/MoveFirst before the correct RecordCount value is return for an Access DB. --- dlls/msdasql/session.c | 11 +++++++---- dlls/msdasql/tests/provider.c | 9 ++++++++- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/msdasql/session.c b/dlls/msdasql/session.c index 67dc30bf09e..1e6d2660068 100644 --- a/dlls/msdasql/session.c +++ b/dlls/msdasql/session.c @@ -1242,6 +1242,7 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI RETCODE ret; SQLHSTMT hstmt = command->hstmt; SQLLEN results = -1; + BOOL free_hstmt = TRUE; TRACE("%p, %p, %s, %p %p %p\n", command, outer, debugstr_guid(riid), params, affected, rowset); @@ -1272,21 +1273,23 @@ static HRESULT WINAPI command_Execute(ICommandText *iface, IUnknown *outer, REFI msrowset->refs = 1; ICommandText_QueryInterface(iface, &IID_IUnknown, (void**)&msrowset->caller); msrowset->hstmt = hstmt; + free_hstmt = FALSE; hr = IRowset_QueryInterface(&msrowset->IRowset_iface, riid, (void**)rowset); IRowset_Release(&msrowset->IRowset_iface); } - else + + if (affected) { ret = SQLRowCount(hstmt, &results); if (ret != SQL_SUCCESS) ERR("SQLRowCount failed (%d)\n", ret); - SQLFreeStmt(hstmt, SQL_CLOSE); + *affected = results; } - if (affected) - *affected = results; + if (free_hstmt) + SQLFreeStmt(hstmt, SQL_CLOSE); return hr; } diff --git a/dlls/msdasql/tests/provider.c b/dlls/msdasql/tests/provider.c index 72e13154846..bb549bb2262 100644 --- a/dlls/msdasql/tests/provider.c +++ b/dlls/msdasql/tests/provider.c @@ -569,6 +569,13 @@ static void test_command_rowset(IUnknown *cmd) if (unk) IUnknown_Release(unk); + /* Ensure all rows are deleted - Interactive Test */ + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"delete from testing"); + ok(hr == S_OK, "got 0x%08lx\n", hr); + + hr = ICommandText_Execute(command_text, NULL, &IID_NULL, NULL, NULL, NULL); + ok(hr == S_OK, "got 0x%08lx\n", hr); + hr = ICommandText_SetCommandText(command_text, &DBGUID_DEFAULT, L"insert into testing values(1, 'red', 1.0)"); ok(hr == S_OK, "got 0x%08lx\n", hr); @@ -594,7 +601,7 @@ static void test_command_rowset(IUnknown *cmd) DBCOLUMNINFO *dbcolinfo; OLECHAR *stringsbuffer; - todo_wine ok(affected == -1, "got %Id\n", affected); + ok(affected == -1 || affected == 1, "got %Iu\n", affected); hr = IUnknown_QueryInterface(unk, &IID_IRowset, (void**)&rowset); ok(hr == S_OK, "got 0x%08lx\n", hr);

1 0

Alistair Leslie-Hughes : msdasql: Use SQLDriverConnectW to connect to the ODBC driver.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: a40d67e04a23b9034c57ebccbb6231d90cc09b7b URL: https://gitlab.winehq.org/wine/wine/-/commit/a40d67e04a23b9034c57ebccbb6231… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 17:19:32 2023 +1100 msdasql: Use SQLDriverConnectW to connect to the ODBC driver. --- dlls/msdasql/msdasql_main.c | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index 017a2517a72..2f25498abca 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -530,26 +530,35 @@ static ULONG WINAPI dbinit_Release(IDBInitialize *iface) static HRESULT WINAPI dbinit_Initialize(IDBInitialize *iface) { struct msdasql *provider = impl_from_IDBInitialize(iface); - int i; + int i, len; SQLRETURN ret; + WCHAR connection[1024], *p = connection, outstr[1024]; FIXME("%p semi-stub\n", provider); - for(i=0; i < sizeof(provider->properties); i++) + *p = 0; + for(i=0; i < ARRAY_SIZE(provider->properties); i++) { if (provider->properties[i].id == DBPROP_INIT_DATASOURCE) - break; - } - - if (i >= sizeof(provider->properties)) - { - ERR("Datasource not found\n"); - return E_FAIL; + { + len = swprintf(p, ARRAY_SIZE(connection) - (p - connection), + L"DSN=%s;", V_BSTR(&provider->properties[i].value)); + p+= len; + } + else if (provider->properties[i].id == DBPROP_INIT_PROVIDERSTRING) + { + if (V_VT(&provider->properties[i].value) == VT_BSTR && SysStringLen(V_BSTR(&provider->properties[i].value)) ) + { + len = swprintf(p, ARRAY_SIZE(connection) - (p - connection), + L"%s;", V_BSTR(&provider->properties[i].value)); + p+= len; + } + } } - ret = SQLConnectW( provider->hdbc, (SQLWCHAR *)V_BSTR(&provider->properties[i].value), - SQL_NTS, NULL, SQL_NTS, NULL, SQL_NTS ); - TRACE("SQLConnectW ret %d\n", ret); + ret = SQLDriverConnectW( provider->hdbc, NULL, connection, wcslen(connection), + outstr, ARRAY_SIZE(outstr), NULL, 0); + TRACE("SQLDriverConnectW ret %d\n", ret); if (ret != SQL_SUCCESS) { dump_sql_diag_records(SQL_HANDLE_DBC, provider->hdbc);

1 0

Alistair Leslie-Hughes : include: Add missing SQL prototype.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: 96e18688e9a6e56a4007cf0590f422218b61b435 URL: https://gitlab.winehq.org/wine/wine/-/commit/96e18688e9a6e56a4007cf0590f422… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Feb 8 17:48:39 2023 +1100 include: Add missing SQL prototype. --- include/sqlucode.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/sqlucode.h b/include/sqlucode.h index f1eaace87c1..a4721b04208 100644 --- a/include/sqlucode.h +++ b/include/sqlucode.h @@ -32,6 +32,9 @@ extern "C" { #define SQL_WVARCHAR (-9) #define SQL_WLONGVARCHAR (-10) +SQLRETURN WINAPI SQLColAttributesW(SQLHSTMT hstmt, SQLUSMALLINT icol, SQLUSMALLINT fDescType, + SQLPOINTER rgbDesc, SQLSMALLINT cbDescMax, SQLSMALLINT *pcbDesc, SQLLEN *pfDesc); + SQLRETURN WINAPI SQLConnectW(SQLHDBC ConnectionHandle, SQLWCHAR *ServerName, SQLSMALLINT NameLength1, SQLWCHAR *UserName, SQLSMALLINT NameLength2, @@ -43,6 +46,11 @@ SQLRETURN WINAPI SQLDescribeColW(SQLHSTMT StatementHandle, SQLSMALLINT *DataType, SQLULEN *ColumnSize, SQLSMALLINT *DecimalDigits, SQLSMALLINT *Nullable); +SQLRETURN WINAPI SQLDriverConnectW(SQLHDBC ConnectionHandle, + SQLHWND WindowHandle, WCHAR *InConnectionString, + SQLSMALLINT Length, WCHAR *OutConnectionString, SQLSMALLINT BufferLength, + SQLSMALLINT *Length2, SQLUSMALLINT DriverCompletion); + SQLRETURN WINAPI SQLExecDirectW(SQLHSTMT StatementHandle, SQLWCHAR *StatementText, SQLINTEGER TextLength);

1 0

Connor McAdams : uiautomationcore: Add support for UIA_NamePropertyId to MSAA providers.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: ed1ed6aeb36ec31333e29b829c19c83d07e523b2 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed1ed6aeb36ec31333e29b829c19c8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 10:20:12 2023 -0500 uiautomationcore: Add support for UIA_NamePropertyId to MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 28 ++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 13 +++++++++++++ 2 files changed, 41 insertions(+) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index b30e592555c..f0112cd2ffb 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3434,6 +3434,34 @@ static void test_uia_prov_from_acc_properties(void) IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); + + /* UIA_NamePropertyId tests. */ + set_accessible_props(&Accessible, 0, 0, 0, L"Accessible", 0, 0, 0, 0); + 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); + + SET_EXPECT(Accessible_get_accName); + VariantInit(&v); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_NamePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), Accessible.name), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + CHECK_CALLED(Accessible_get_accName); + + /* Name is not cached. */ + set_accessible_props(&Accessible, 0, 0, 0, L"Accessible2", 0, 0, 0, 0); + SET_EXPECT(Accessible_get_accName); + hr = IRawElementProviderSimple_GetPropertyValue(elprov, UIA_NamePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(V_VT(&v) == VT_BSTR, "Unexpected VT %d\n", V_VT(&v)); + ok(!lstrcmpW(V_BSTR(&v), Accessible.name), "Unexpected BSTR %s\n", wine_dbgstr_w(V_BSTR(&v))); + VariantClear(&v); + CHECK_CALLED(Accessible_get_accName); + + 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 c4fbd181ada..58d1db9bae8 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -664,6 +664,19 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface, STATE_SYSTEM_PROTECTED)); break; + case UIA_NamePropertyId: + { + BSTR name; + + hr = IAccessible_get_accName(msaa_prov->acc, msaa_prov->cid, &name); + if (SUCCEEDED(hr) && name) + { + V_VT(ret_val) = VT_BSTR; + V_BSTR(ret_val) = name; + } + break; + } + default: FIXME("Unimplemented propertyId %d\n", prop_id); break;

1 0

Connor McAdams : uiautomationcore: Implement get_BoundingRectangle for MSAA providers.
by Alexandre Julliard Feb. 16, 2023

Feb. 16, 2023

Module: wine Branch: master Commit: bb66ad4459059a338cbf788d64f77cd75986bcab URL: https://gitlab.winehq.org/wine/wine/-/commit/bb66ad4459059a338cbf788d64f77c… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 10:17:43 2023 -0500 uiautomationcore: Implement get_BoundingRectangle for MSAA providers. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 79 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_provider.c | 30 +++++++++++- 2 files changed, 107 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 0ce2693d479..b30e592555c 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -3440,7 +3440,9 @@ static void test_UiaProviderFromIAccessible(void) { ILegacyIAccessibleProvider *accprov; IRawElementProviderSimple *elprov, *elprov2; + IRawElementProviderFragment *elfrag; enum ProviderOptions prov_opt; + struct UiaRect rect; IAccessible *acc; IUnknown *unk; WNDCLASSA cls; @@ -3958,6 +3960,83 @@ static void test_UiaProviderFromIAccessible(void) IRawElementProviderSimple_Release(elprov); ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); + /* + * Test IRawElementProviderFragment_get_BoundingRectangle. + */ + set_accessible_props(&Accessible, ROLE_SYSTEM_DOCUMENT, STATE_SYSTEM_FOCUSABLE, 0, L"acc_name", 25, 25, 50, 50); + /* Test the case where Accessible is not the root for its HWND. */ + acc_client = NULL; + 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); + + hr = IRawElementProviderSimple_QueryInterface(elprov, &IID_IRawElementProviderFragment, (void **)&elfrag); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elfrag, "elfrag == NULL\n"); + + SET_EXPECT(winproc_GETOBJECT_CLIENT); + SET_EXPECT(Accessible_get_accRole); + SET_EXPECT(Accessible_get_accState); + SET_EXPECT(Accessible_accLocation); + hr = IRawElementProviderFragment_get_BoundingRectangle(elfrag, &rect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rect.left == (double)Accessible.left, "Unexpected left value %f\n", rect.left); + ok(rect.top == (double)Accessible.top, "Unexpected top value %f\n", rect.top); + ok(rect.width == (double)Accessible.width, "Unexpected width value %f\n", rect.width); + ok(rect.height == (double)Accessible.height, "Unexpected height value %f\n", rect.height); + CHECK_CALLED(winproc_GETOBJECT_CLIENT); + CHECK_CALLED(Accessible_get_accRole); + CHECK_CALLED(Accessible_get_accState); + CHECK_CALLED(Accessible_accLocation); + + /* If Accessible has STATE_SYSTEM_OFFSCREEN, it will return an empty rect. */ + set_accessible_props(&Accessible, ROLE_SYSTEM_DOCUMENT, STATE_SYSTEM_OFFSCREEN, 0, L"acc_name", 0, 0, 50, 50); + SET_EXPECT(Accessible_get_accState); + hr = IRawElementProviderFragment_get_BoundingRectangle(elfrag, &rect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rect.left == 0.0, "Unexpected left value %f\n", rect.left); + ok(rect.top == 0.0, "Unexpected top value %f\n", rect.top); + ok(rect.width == 0.0, "Unexpected width value %f\n", rect.width); + ok(rect.height == 0.0, "Unexpected height value %f\n", rect.height); + CHECK_CALLED(Accessible_get_accState); + + IRawElementProviderFragment_Release(elfrag); + IRawElementProviderSimple_Release(elprov); + ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); + + /* Test case where accessible is the root accessible. */ + set_accessible_props(&Accessible, ROLE_SYSTEM_DOCUMENT, 0, 0, L"acc_name", 0, 0, 0, 0); + acc_client = &Accessible.IAccessible_iface; + 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); + + hr = IRawElementProviderSimple_QueryInterface(elprov, &IID_IRawElementProviderFragment, (void **)&elfrag); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(!!elfrag, "elfrag == NULL\n"); + + SET_EXPECT(winproc_GETOBJECT_CLIENT); + hr = IRawElementProviderFragment_get_BoundingRectangle(elfrag, &rect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rect.left == 0.0, "Unexpected left value %f\n", rect.left); + ok(rect.top == 0.0, "Unexpected top value %f\n", rect.top); + ok(rect.width == 0.0, "Unexpected width value %f\n", rect.width); + ok(rect.height == 0.0, "Unexpected height value %f\n", rect.height); + CHECK_CALLED(winproc_GETOBJECT_CLIENT); + + /* Second call does nothing. */ + hr = IRawElementProviderFragment_get_BoundingRectangle(elfrag, &rect); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(rect.left == 0.0, "Unexpected left value %f\n", rect.left); + ok(rect.top == 0.0, "Unexpected top value %f\n", rect.top); + ok(rect.width == 0.0, "Unexpected width value %f\n", rect.width); + ok(rect.height == 0.0, "Unexpected height value %f\n", rect.height); + + IRawElementProviderFragment_Release(elfrag); + IRawElementProviderSimple_Release(elprov); + ok(Accessible.ref == 1, "Unexpected refcnt %ld\n", Accessible.ref); + acc_client = NULL; + test_uia_prov_from_acc_properties(); test_uia_prov_from_acc_navigation(); test_uia_prov_from_acc_ia2(); diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index c851ecaf685..c4fbd181ada 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -868,8 +868,34 @@ static HRESULT WINAPI msaa_fragment_GetRuntimeId(IRawElementProviderFragment *if static HRESULT WINAPI msaa_fragment_get_BoundingRectangle(IRawElementProviderFragment *iface, struct UiaRect *ret_val) { - FIXME("%p, %p: stub!\n", iface, ret_val); - return E_NOTIMPL; + struct msaa_provider *msaa_prov = impl_from_msaa_fragment(iface); + LONG left, top, width, height; + HRESULT hr; + + TRACE("%p, %p\n", iface, ret_val); + + memset(ret_val, 0, sizeof(*ret_val)); + + /* + * If this IAccessible is at the root of its HWND, the BaseHwnd provider + * will supply the bounding rectangle. + */ + if (msaa_check_root_acc(msaa_prov)) + return S_OK; + + if (msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_OFFSCREEN)) + return S_OK; + + hr = IAccessible_accLocation(msaa_prov->acc, &left, &top, &width, &height, msaa_prov->cid); + if (FAILED(hr)) + return hr; + + ret_val->left = left; + ret_val->top = top; + ret_val->width = width; + ret_val->height = height; + + return S_OK; } static HRESULT WINAPI msaa_fragment_GetEmbeddedFragmentRoots(IRawElementProviderFragment *iface,

1 0