February 2023 - Wine-commits

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

16 Feb '23

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 : include: Add missing SQL prototype.
by Alexandre Julliard 16 Feb '23

16 Feb '23

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

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

16 Feb '23

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 : msdasql: Always return affected rows if required.
by Alexandre Julliard 16 Feb '23

16 Feb '23

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

Connor McAdams : uiautomationcore: Implement get_BoundingRectangle for MSAA providers.
by Alexandre Julliard 16 Feb '23

16 Feb '23

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

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

16 Feb '23

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: Add support for UIA_BoundingRectanglePropertyId.
by Alexandre Julliard 16 Feb '23

16 Feb '23

Module: wine Branch: master Commit: 44aa2ea89fae9324573af49430d9c0795dbac079 URL: https://gitlab.winehq.org/wine/wine/-/commit/44aa2ea89fae9324573af49430d9c0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 10:14:09 2023 -0500 uiautomationcore: Add support for UIA_BoundingRectanglePropertyId. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 185 ++++++++++++++++++++++++----- dlls/uiautomationcore/uia_client.c | 39 ++++++ dlls/uiautomationcore/uia_ids.c | 3 +- 3 files changed, 198 insertions(+), 29 deletions(-)

1 0

Connor McAdams : uiautomationcore: Add support for UIA_ValueIsReadOnlyPropertyId.
by Alexandre Julliard 16 Feb '23

16 Feb '23

Module: wine Branch: master Commit: 2b8c8be7bdf7102e472644a44f622bd62fbfe4e3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b8c8be7bdf7102e472644a44f622b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 11:48:52 2023 -0500 uiautomationcore: Add support for UIA_ValueIsReadOnlyPropertyId. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 129 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 43 ++++++++++ dlls/uiautomationcore/uia_ids.c | 23 ++++- dlls/uiautomationcore/uia_private.h | 8 ++ dlls/uiautomationcore/uia_provider.c | 6 -- 6 files changed, 201 insertions(+), 9 deletions(-)

1 0

Rémi Bernon : include: Move ddk/imm.h to immdev.h.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 68ff9a942e899750238c6653fbc38966c7469781 URL: https://gitlab.winehq.org/wine/wine/-/commit/68ff9a942e899750238c6653fbc389… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 18:56:56 2022 +0100 include: Move ddk/imm.h to immdev.h. --- dlls/imm32/imm.c | 2 +- dlls/imm32/tests/imm32.c | 2 +- dlls/user32/user_main.c | 2 +- dlls/win32u/imm.c | 2 +- dlls/win32u/message.c | 2 +- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 2 +- include/Makefile.in | 2 +- include/{ddk/imm.h => immdev.h} | 21 +++++++++++++-------- 9 files changed, 21 insertions(+), 16 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 17061ae0034..d7af6d79736 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -33,7 +33,7 @@ #include "winerror.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "winnls.h" #include "winreg.h" #include "wine/list.h" diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 496dc284fbc..e6d51a1329e 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -25,7 +25,7 @@ #include "winuser.h" #include "wingdi.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" BOOL WINAPI ImmSetActiveContext(HWND, HIMC, BOOL); diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 0ddbd710b6b..56d5849f469 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -21,7 +21,7 @@ #include "user_private.h" #include "controls.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" diff --git a/dlls/win32u/imm.c b/dlls/win32u/imm.c index 513f116f80f..1ccc09c97b2 100644 --- a/dlls/win32u/imm.c +++ b/dlls/win32u/imm.c @@ -27,7 +27,7 @@ #include <pthread.h> #include "win32u_private.h" #include "ntuser_private.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 2c320377e34..ed4198991cf 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -33,7 +33,7 @@ #include "hidusage.h" #include "dbt.h" #include "dde.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/server.h" #include "wine/debug.h" diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index 19a974b3c24..ee9db0ca396 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -36,7 +36,7 @@ #include "macdrv_dll.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 0599159646f..7fe1e0a0b1e 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -43,7 +43,7 @@ #include "x11drv_dll.h" #include "wine/debug.h" #include "imm.h" -#include "ddk/imm.h" +#include "immdev.h" WINE_DEFAULT_DEBUG_CHANNEL(imm); diff --git a/include/Makefile.in b/include/Makefile.in index 963fe1a2858..49b5f7c4b01 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -195,7 +195,6 @@ SOURCES = \ ddk/hidport.h \ ddk/hidsdi.h \ ddk/hidtypes.h \ - ddk/imm.h \ ddk/mountmgr.h \ ddk/ndis.h \ ddk/ntddcdvd.h \ @@ -359,6 +358,7 @@ SOURCES = \ imagehlp.h \ ime.h \ imm.h \ + immdev.h \ imnact.idl \ imnxport.idl \ in6addr.h \ diff --git a/include/ddk/imm.h b/include/immdev.h similarity index 95% rename from include/ddk/imm.h rename to include/immdev.h index bbbd70a596f..994bb44d74f 100644 --- a/include/ddk/imm.h +++ b/include/immdev.h @@ -16,14 +16,15 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#ifndef _DDKIMM_H_ -#define _DDKIMM_H_ +#ifndef __WINE_IMMDEV_H +#define __WINE_IMMDEV_H #ifdef __cplusplus extern "C" { #endif -typedef struct _tagINPUTCONTEXT { +typedef struct tagINPUTCONTEXT +{ HWND hWnd; BOOL fOpen; POINT ptStatusWndPos; @@ -46,7 +47,8 @@ typedef struct _tagINPUTCONTEXT { DWORD dwReserve[3]; } INPUTCONTEXT, *LPINPUTCONTEXT; -typedef struct _tagIMEINFO { +typedef struct tagIMEINFO +{ DWORD dwPrivateDataSize; DWORD fdwProperty; DWORD fdwConversionCaps; @@ -56,7 +58,8 @@ typedef struct _tagIMEINFO { DWORD fdwSelectCaps; } IMEINFO, *LPIMEINFO; -typedef struct tagCOMPOSITIONSTRING { +typedef struct tagCOMPOSITIONSTRING +{ DWORD dwSize; DWORD dwCompReadAttrLen; DWORD dwCompReadAttrOffset; @@ -84,7 +87,8 @@ typedef struct tagCOMPOSITIONSTRING { DWORD dwPrivateOffset; } COMPOSITIONSTRING, *LPCOMPOSITIONSTRING; -typedef struct tagGUIDELINE { +typedef struct tagGUIDELINE +{ DWORD dwSize; DWORD dwLevel; DWORD dwIndex; @@ -94,7 +98,8 @@ typedef struct tagGUIDELINE { DWORD dwPrivateOffset; } GUIDELINE, *LPGUIDELINE; -typedef struct tagCANDIDATEINFO { +typedef struct tagCANDIDATEINFO +{ DWORD dwSize; DWORD dwCount; DWORD dwOffset[32]; @@ -170,4 +175,4 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMEN } /* extern "C" */ #endif -#endif /* _DDKIMM_H_ */ +#endif /* __WINE_IMMDEV_H */

1 0

Rémi Bernon : include: Fix ImeInquire declaration.
by Alexandre Julliard 15 Feb '23

15 Feb '23

Module: wine Branch: master Commit: 2fdfe16c2d5a92b1204f929ba8074a7c6574c7cf URL: https://gitlab.winehq.org/wine/wine/-/commit/2fdfe16c2d5a92b1204f929ba8074a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Dec 4 18:59:10 2022 +0100 include: Fix ImeInquire declaration. --- dlls/imm32/imm.c | 4 ++-- dlls/winemac.drv/ime.c | 2 +- dlls/winex11.drv/ime.c | 3 +-- include/immdev.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index d7af6d79736..c4c495e86a5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -62,7 +62,7 @@ typedef struct _tagImmHkl{ HWND UIWnd; /* Function Pointers */ - BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, const WCHAR *); + BOOL (WINAPI *pImeInquire)(IMEINFO *, WCHAR *, DWORD); BOOL (WINAPI *pImeConfigure)(HKL, HWND, DWORD, void *); BOOL (WINAPI *pImeDestroy)(UINT); LRESULT (WINAPI *pImeEscape)(HIMC, UINT, void *); @@ -508,7 +508,7 @@ static ImmHkl *IMM_GetImmHkl(HKL hkl) if (ptr->hIME) { LOAD_FUNCPTR(ImeInquire); - if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, NULL)) + if (!ptr->pImeInquire || !ptr->pImeInquire(&ptr->imeInfo, ptr->imeClassName, 0)) { FreeLibrary(ptr->hIME); ptr->hIME = NULL; diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c index ee9db0ca396..7c0495a6fd5 100644 --- a/dlls/winemac.drv/ime.c +++ b/dlls/winemac.drv/ime.c @@ -1367,7 +1367,7 @@ static BOOL WINAPI register_classes( INIT_ONCE *once, void *param, void **contex return TRUE; } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, LPCWSTR lpszOption) +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags) { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c index 7fe1e0a0b1e..ef498760a60 100644 --- a/dlls/winex11.drv/ime.c +++ b/dlls/winex11.drv/ime.c @@ -511,8 +511,7 @@ static void IME_AddToSelected(HIMC hIMC) hSelectedFrom[hSelectedCount-1] = hIMC; } -BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, - LPCWSTR lpszOption) +BOOL WINAPI ImeInquire(LPIMEINFO lpIMEInfo, LPWSTR lpszUIClass, DWORD flags) { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; diff --git a/include/immdev.h b/include/immdev.h index 994bb44d74f..eb6591d1e74 100644 --- a/include/immdev.h +++ b/include/immdev.h @@ -154,7 +154,7 @@ HWND WINAPI ImmCreateSoftKeyboard(UINT, UINT, int, int); BOOL WINAPI ImmDestroySoftKeyboard(HWND); BOOL WINAPI ImmShowSoftKeyboard(HWND, int); -BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, LPCWSTR lpszOptions); +BOOL WINAPI ImeInquire(LPIMEINFO, LPWSTR, DWORD); BOOL WINAPI ImeConfigure (HKL, HWND, DWORD, LPVOID); DWORD WINAPI ImeConversionList(HIMC, LPCWSTR, LPCANDIDATELIST,DWORD,UINT); BOOL WINAPI ImeDestroy(UINT);

1 0