wine-commits February 2023

wine-commits@winehq.org

1 participants
599 discussions

Connor McAdams : uiautomationcore: Implement IUIAutomation::IntSafeArrayToNativeArray.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: dc79cdc50a2db10c6cdba51ae278c0d6320bf215 URL: https://gitlab.winehq.org/wine/wine/-/commit/dc79cdc50a2db10c6cdba51ae278c0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 13:33:32 2023 -0500 uiautomationcore: Implement IUIAutomation::IntSafeArrayToNativeArray. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 36 ++++++++++++++++++++++++ dlls/uiautomationcore/uia_client.c | 2 +- dlls/uiautomationcore/uia_com_client.c | 44 ++++++++++++++++++++++++++++-- dlls/uiautomationcore/uia_private.h | 1 + 4 files changed, 80 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 872f2b5950b..d5cfccf729f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10014,6 +10014,41 @@ exit: UnregisterClassA("test_Element_GetPropertyValue class", NULL); } +static void test_CUIAutomation_value_conversion(IUIAutomation *uia_iface) +{ + static const VARTYPE invalid_int_vts[] = { VT_I8, VT_INT }; + int *out_arr, out_arr_count, i; + SAFEARRAY *sa; + VARTYPE vt; + HRESULT hr; + + for (i = 0; i < ARRAY_SIZE(invalid_int_vts); i++) + { + vt = invalid_int_vts[i]; + sa = SafeArrayCreateVector(vt, 0, 2); + ok(!!sa, "sa == NULL\n"); + + out_arr_count = 0xdeadbeef; + out_arr = (int *)0xdeadbeef; + hr = IUIAutomation_IntSafeArrayToNativeArray(uia_iface, sa, &out_arr, &out_arr_count); + ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); + ok(!out_arr, "out_arr != NULL\n"); + ok(out_arr_count == 0xdeadbeef, "Unexpected out_arr_count %#x\n", out_arr_count); + SafeArrayDestroy(sa); + } + + /* Only accepts VT_I4 as an input array type. */ + sa = create_i4_safearray(); + hr = IUIAutomation_IntSafeArrayToNativeArray(uia_iface, sa, &out_arr, &out_arr_count); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(out_arr_count == ARRAY_SIZE(uia_i4_arr_prop_val), "Unexpected out_arr_count %#x\n", out_arr_count); + for (i = 0; i < ARRAY_SIZE(uia_i4_arr_prop_val); i++) + ok(out_arr[i] == uia_i4_arr_prop_val[i], "out_arr[%d]: Expected %ld, got %d\n", i, uia_i4_arr_prop_val[i], out_arr[i]); + + SafeArrayDestroy(sa); + CoTaskMemFree(out_arr); +} + struct uia_com_classes { const GUID *clsid; const GUID *iid; @@ -10077,6 +10112,7 @@ static void test_CUIAutomation(void) ok(hr == S_OK, "Failed to create IUIAutomation interface, hr %#lx\n", hr); ok(!!uia_iface, "uia_iface == NULL\n"); + test_CUIAutomation_value_conversion(uia_iface); test_ElementFromHandle(uia_iface, has_cui8); test_Element_GetPropertyValue(uia_iface); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index ce2aeb21622..8d543bd4dc7 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -107,7 +107,7 @@ static HRESULT get_safearray_dim_bounds(SAFEARRAY *sa, UINT dim, LONG *lbound, L return S_OK; } -static HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) +HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) { UINT dims; diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index b6f308275bb..e78fc4ee416 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1373,8 +1373,48 @@ static HRESULT WINAPI uia_iface_IntNativeArrayToSafeArray(IUIAutomation6 *iface, static HRESULT WINAPI uia_iface_IntSafeArrayToNativeArray(IUIAutomation6 *iface, SAFEARRAY *sa, int **out_arr, int *out_arr_count) { - FIXME("%p, %p, %p, %p: stub\n", iface, sa, out_arr, out_arr_count); - return E_NOTIMPL; + LONG lbound, elems; + int *arr, *sa_arr; + VARTYPE vt; + HRESULT hr; + + TRACE("%p, %p, %p, %p\n", iface, sa, out_arr, out_arr_count); + + if (!sa || !out_arr || !out_arr_count) + return E_INVALIDARG; + + *out_arr = NULL; + hr = SafeArrayGetVartype(sa, &vt); + if (FAILED(hr)) + return hr; + + if (vt != VT_I4) + return E_INVALIDARG; + + hr = get_safearray_bounds(sa, &lbound, &elems); + if (FAILED(hr)) + return hr; + + if (!(arr = CoTaskMemAlloc(elems * sizeof(*arr)))) + return E_OUTOFMEMORY; + + hr = SafeArrayAccessData(sa, (void **)&sa_arr); + if (FAILED(hr)) + goto exit; + + memcpy(arr, sa_arr, sizeof(*arr) * elems); + hr = SafeArrayUnaccessData(sa); + if (FAILED(hr)) + goto exit; + + *out_arr = arr; + *out_arr_count = elems; + +exit: + if (FAILED(hr)) + CoTaskMemFree(arr); + + return hr; } static HRESULT WINAPI uia_iface_RectToVariant(IUIAutomation6 *iface, RECT rect, VARIANT *out_var) diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 157ae3583f8..2c6e41eac6d 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -99,6 +99,7 @@ static inline void variant_init_bool(VARIANT *v, BOOL val) } /* uia_client.c */ +HRESULT get_safearray_bounds(SAFEARRAY *sa, LONG *lbound, LONG *elems) DECLSPEC_HIDDEN; int uia_compare_safearrays(SAFEARRAY *sa1, SAFEARRAY *sa2, int prop_type) DECLSPEC_HIDDEN; int get_node_provider_type_at_idx(struct uia_node *node, int idx) DECLSPEC_HIDDEN; HRESULT create_uia_node_from_elprov(IRawElementProviderSimple *elprov, HUIANODE *out_node,

1 0

Connor McAdams : uiautomationcore/tests: Fix UiaNodeFromHandle tests on Windows 11.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: bbc187a2b7614417138263277c2a881ec1a29105 URL: https://gitlab.winehq.org/wine/wine/-/commit/bbc187a2b7614417138263277c2a88… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 22 11:03:36 2023 -0500 uiautomationcore/tests: Fix UiaNodeFromHandle tests on Windows 11. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 49 +++++++++++++++++++----------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 1aa22239602..872f2b5950b 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -1261,6 +1261,12 @@ static struct prov_method_sequence *sequence; { prov , FRAG_NAVIGATE }, /* NavigateDirection_Parent */ \ { prov , PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL } \ +#define NODE_CREATE_SEQ2_OPTIONAL(prov) \ + { prov , PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, \ + { prov , PROV_GET_HOST_RAW_ELEMENT_PROVIDER, METHOD_OPTIONAL }, \ + { prov , FRAG_NAVIGATE, METHOD_OPTIONAL }, /* NavigateDirection_Parent */ \ + { prov , PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL } \ + static void flush_method_sequence(void) { HeapFree(GetProcessHeap(), 0, sequence); @@ -5780,13 +5786,13 @@ static const struct prov_method_sequence node_from_hwnd2[] = { }; static const struct prov_method_sequence node_from_hwnd3[] = { + NODE_CREATE_SEQ2(&Provider), { &Provider, PROV_GET_PROVIDER_OPTIONS }, - /* Win10v1507 and below call this. */ - { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, - { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ - { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS }, + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Win11+ */ + /* Windows 11 sends WM_GETOBJECT twice on nested nodes. */ + NODE_CREATE_SEQ2_OPTIONAL(&Provider), + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 } }; @@ -5865,18 +5871,19 @@ static const struct prov_method_sequence node_from_hwnd7[] = { { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ { &Provider, PROV_GET_PROVIDER_OPTIONS }, { &Provider, PROV_GET_PROVIDER_OPTIONS }, + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Win11+ */ { &Provider_child, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ProviderDescriptionPropertyId */ { 0 } }; static const struct prov_method_sequence node_from_hwnd8[] = { + NODE_CREATE_SEQ2(&Provider), { &Provider, PROV_GET_PROVIDER_OPTIONS }, - /* Win10v1507 and below call this. */ - { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_OPTIONAL }, /* UIA_NativeWindowHandlePropertyId */ - { &Provider, PROV_GET_HOST_RAW_ELEMENT_PROVIDER }, - { &Provider, FRAG_NAVIGATE }, /* NavigateDirection_Parent */ - { &Provider, PROV_GET_PROVIDER_OPTIONS }, - { &Provider, PROV_GET_PROVIDER_OPTIONS }, + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, /* Only done on Win11+ */ + /* Windows 11 sends WM_GETOBJECT twice on nested nodes. */ + NODE_CREATE_SEQ2_OPTIONAL(&Provider), + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, + { &Provider, PROV_GET_PROVIDER_OPTIONS, METHOD_OPTIONAL }, { &Provider, PROV_GET_PROPERTY_VALUE }, /* UIA_ProviderDescriptionPropertyId */ { &Provider, PROV_GET_PROPERTY_VALUE, METHOD_TODO }, /* UIA_ControlTypePropertyId */ { 0 } @@ -6028,7 +6035,8 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) CoInitializeEx(NULL, COINIT_MULTITHREADED); - SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent twice on Windows 11. */ + SET_EXPECT_MULTI(winproc_GETOBJECT_UiaRoot, 2); /* Only sent on Win7. */ SET_EXPECT(winproc_GETOBJECT_CLIENT); prov_root = &Provider.IRawElementProviderSimple_iface; @@ -6040,7 +6048,7 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) Provider.ignore_hwnd_prop = TRUE; hr = UiaNodeFromHandle(hwnd, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider.ref >= 2, "Unexpected refcnt %ld\n", Provider.ref); CHECK_CALLED(winproc_GETOBJECT_UiaRoot); called_winproc_GETOBJECT_CLIENT = expect_winproc_GETOBJECT_CLIENT = 0; @@ -6190,7 +6198,8 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) /* * UiaDisconnectProvider tests. */ - SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only sent twice on Windows 11. */ + SET_EXPECT_MULTI(winproc_GETOBJECT_UiaRoot, 2); prov_root = &Provider.IRawElementProviderSimple_iface; Provider.prov_opts = ProviderOptions_ServerSideProvider; Provider.hwnd = hwnd; @@ -6200,7 +6209,7 @@ static DWORD WINAPI uia_node_from_handle_test_thread(LPVOID param) Provider.prov_opts = ProviderOptions_ServerSideProvider; hr = UiaNodeFromHandle(hwnd, &node); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(Provider.ref >= 2, "Unexpected refcnt %ld\n", Provider.ref); CHECK_CALLED(winproc_GETOBJECT_UiaRoot); hr = UiaGetPropertyValue(node, UIA_ProviderDescriptionPropertyId, &v); @@ -6378,9 +6387,12 @@ static void test_UiaNodeFromHandle(const char *name) /* Only sent twice on Win7. */ SET_EXPECT_MULTI(winproc_GETOBJECT_CLIENT, 2); hr = UiaNodeFromHandle(hwnd, &node); - todo_wine ok(hr == E_FAIL, "Unexpected hr %#lx.\n", hr); + /* Windows 10 and below return E_FAIL, Windows 11 returns S_OK. */ + todo_wine ok(hr == S_OK || broken(hr == E_FAIL), "Unexpected hr %#lx.\n", hr); CHECK_CALLED(winproc_GETOBJECT_UiaRoot); todo_wine CHECK_CALLED(winproc_GETOBJECT_CLIENT); + if (SUCCEEDED(hr)) + UiaNodeRelease(node); /* * COM initialized, no provider returned by UiaReturnRawElementProvider. @@ -6610,7 +6622,8 @@ static void test_UiaNodeFromHandle(const char *name) sprintf(cmdline, "\"%s\" uiautomation UiaNodeFromHandle_client_proc", name); memset(&startup, 0, sizeof(startup)); startup.cb = sizeof(startup); - SET_EXPECT(winproc_GETOBJECT_UiaRoot); + /* Only called twice on Windows 11. */ + SET_EXPECT_MULTI(winproc_GETOBJECT_UiaRoot, 2); /* Only sent on Win7. */ SET_EXPECT(winproc_GETOBJECT_CLIENT); CreateProcessA(NULL, cmdline, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &proc);

1 0

Connor McAdams : uiautomationcore/tests: Fix UiaHUiaNodeFromVariant tests on Windows 11.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 8a4ad6096b37acf453bd24d63279887b668a0dc4 URL: https://gitlab.winehq.org/wine/wine/-/commit/8a4ad6096b37acf453bd24d6327988… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Feb 22 10:39:29 2023 -0500 uiautomationcore/tests: Fix UiaHUiaNodeFromVariant tests on Windows 11. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 86 +++++++++++++----------------- 1 file changed, 37 insertions(+), 49 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 73b0db3073c..1aa22239602 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -5682,40 +5682,15 @@ static void test_UiaGetRuntimeId(void) CoUninitialize(); } -static LONG Object_ref = 1; -static HRESULT WINAPI Object_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) -{ - *ppv = NULL; - if (IsEqualIID(riid, &IID_IUnknown)) - { - *ppv = iface; - IUnknown_AddRef(iface); - return S_OK; - } - - return E_NOINTERFACE; -} - -static ULONG WINAPI Object_AddRef(IUnknown *iface) -{ - return InterlockedIncrement(&Object_ref); -} - -static ULONG WINAPI Object_Release(IUnknown *iface) -{ - return InterlockedDecrement(&Object_ref); -} - -static IUnknownVtbl ObjectVtbl = { - Object_QueryInterface, - Object_AddRef, - Object_Release +static const struct prov_method_sequence node_from_var_seq[] = { + NODE_CREATE_SEQ(&Provider), + { 0 }, }; -static IUnknown Object = {&ObjectVtbl}; static void test_UiaHUiaNodeFromVariant(void) { - HUIANODE node; + HUIANODE node, node2; + ULONG node_ref; HRESULT hr; VARIANT v; @@ -5731,44 +5706,57 @@ static void test_UiaHUiaNodeFromVariant(void) ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); ok(!node, "node != NULL\n"); - node = (void *)0xdeadbeef; + node = NULL; + initialize_provider(&Provider, ProviderOptions_ServerSideProvider, NULL, FALSE); + hr = UiaNodeFromProvider(&Provider.IRawElementProviderSimple_iface, &node); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(Provider.ref == 2, "Unexpected refcnt %ld\n", Provider.ref); + ok(!!node, "node == NULL\n"); + ok_method_sequence(node_from_var_seq, "node_from_var_seq"); + + node2 = (void *)0xdeadbeef; V_VT(&v) = VT_UNKNOWN; - V_UNKNOWN(&v) = &Object; - hr = UiaHUiaNodeFromVariant(&v, &node); + V_UNKNOWN(&v) = (IUnknown *)node; + hr = UiaHUiaNodeFromVariant(&v, &node2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(node == (void *)&Object, "node != NULL\n"); - ok(Object_ref == 2, "Unexpected Object_ref %ld\n", Object_ref); + ok(node == node2, "node != NULL\n"); + + node_ref = IUnknown_AddRef((IUnknown *)node); + ok(node_ref == 3, "Unexpected node_ref %ld\n", node_ref); VariantClear(&v); + IUnknown_Release((IUnknown *)node); #ifdef _WIN64 - node = (void *)0xdeadbeef; + node2 = (void *)0xdeadbeef; V_VT(&v) = VT_I4; V_I4(&v) = 0xbeefdead; - hr = UiaHUiaNodeFromVariant(&v, &node); + hr = UiaHUiaNodeFromVariant(&v, &node2); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - ok(!node, "node != NULL\n"); + ok(!node2, "node2 != NULL\n"); - node = (void *)0xdeadbeef; + node2 = (void *)0xdeadbeef; V_VT(&v) = VT_I8; - V_I8(&v) = 0xbeefdead; - hr = UiaHUiaNodeFromVariant(&v, &node); + V_I8(&v) = (UINT64)node; + hr = UiaHUiaNodeFromVariant(&v, &node2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(node == (void *)V_I8(&v), "node != V_I8\n"); + ok(node2 == (void *)V_I8(&v), "node2 != V_I8\n"); #else - node = (void *)0xdeadbeef; + node2 = (void *)0xdeadbeef; V_VT(&v) = VT_I8; V_I8(&v) = 0xbeefdead; - hr = UiaHUiaNodeFromVariant(&v, &node); + hr = UiaHUiaNodeFromVariant(&v, &node2); ok(hr == E_INVALIDARG, "Unexpected hr %#lx.\n", hr); - ok(!node, "node != NULL\n"); + ok(!node2, "node2 != NULL\n"); - node = (void *)0xdeadbeef; + node2 = (void *)0xdeadbeef; V_VT(&v) = VT_I4; - V_I4(&v) = 0xbeefdead; - hr = UiaHUiaNodeFromVariant(&v, &node); + V_I4(&v) = (UINT32)node; + hr = UiaHUiaNodeFromVariant(&v, &node2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(node == (void *)V_I4(&v), "node != V_I8\n"); + ok(node2 == (void *)V_I4(&v), "node2 != V_I4\n"); #endif + + UiaNodeRelease(node); } static const struct prov_method_sequence node_from_hwnd1[] = {

1 0

Francois Gouget : mscoree/tests: Trace the GetExitCodeProcess() error before it gets lost.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: a8de3504936405e1ed445bf62c1a736c15d22336 URL: https://gitlab.winehq.org/wine/wine/-/commit/a8de3504936405e1ed445bf62c1a73… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 08:52:26 2023 +0100 mscoree/tests: Trace the GetExitCodeProcess() error before it gets lost. --- dlls/mscoree/tests/mscoree.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/mscoree/tests/mscoree.c b/dlls/mscoree/tests/mscoree.c index bb6545b8a21..e5065a41d88 100644 --- a/dlls/mscoree/tests/mscoree.c +++ b/dlls/mscoree/tests/mscoree.c @@ -157,9 +157,8 @@ static BOOL runtime_is_usable(void) WaitForSingleObject(pi.hProcess, INFINITE); ret = GetExitCodeProcess(pi.hProcess, &exitcode); - CloseHandle(pi.hProcess); - ok(ret, "GetExitCodeProcess failed: %lu\n", GetLastError()); + CloseHandle(pi.hProcess); if (!ret || exitcode != 0) {

1 0

Tingzhong Luo : winspool: Check dmSize in IsValidDevmodeW().
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 3eb06cf431b23e256fc27d36e61d26f85e1f0b09 URL: https://gitlab.winehq.org/wine/wine/-/commit/3eb06cf431b23e256fc27d36e61d26… Author: Tingzhong Luo <luotingzhong(a)uniontech.com> Date: Fri Nov 25 16:20:47 2022 +0800 winspool: Check dmSize in IsValidDevmodeW(). --- dlls/winspool.drv/info.c | 6 ++++-- dlls/winspool.drv/tests/info.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 54ecb81d3be..7e1e6138ff2 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -1927,12 +1927,14 @@ BOOL WINAPI IsValidDevmodeW(PDEVMODEW dm, SIZE_T size) #undef F_SIZE }; int i; + const DWORD fields_off = FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields); if (!dm) return FALSE; - if (size < FIELD_OFFSET(DEVMODEW, dmFields) + sizeof(dm->dmFields)) return FALSE; + if (size < fields_off) return FALSE; + if (dm->dmSize < fields_off || size < dm->dmSize + dm->dmDriverExtra) return FALSE; for (i = 0; i < ARRAY_SIZE(map); i++) - if ((dm->dmFields & map[i].flag) && size < map[i].size) + if ((dm->dmFields & map[i].flag) && dm->dmSize < map[i].size) return FALSE; return TRUE; diff --git a/dlls/winspool.drv/tests/info.c b/dlls/winspool.drv/tests/info.c index 92b042e354a..52849277c4c 100644 --- a/dlls/winspool.drv/tests/info.c +++ b/dlls/winspool.drv/tests/info.c @@ -3046,6 +3046,26 @@ static void test_IsValidDevmodeW(void) { DM_NUP, FIELD_OFFSET(DEVMODEW, u2.dmNup) + 4, TRUE }, }; + static const struct + { + DWORD dmSize; + DWORD dmDriverExtra; + DWORD bufSize; + BOOL ret; + } size_test[] = + { + { FIELD_OFFSET(DEVMODEW, dmFields) + 3, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 4, FALSE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 4, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 4, 2, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 4, 3, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 4, 4, FIELD_OFFSET(DEVMODEW, dmFields) + 8, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 4, 5, FIELD_OFFSET(DEVMODEW, dmFields) + 8, FALSE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 12, 1, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 12, 2, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 12, 3, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 12, 4, FIELD_OFFSET(DEVMODEW, dmFields) + 16, TRUE }, + { FIELD_OFFSET(DEVMODEW, dmFields) + 12, 5, FIELD_OFFSET(DEVMODEW, dmFields) + 16, FALSE }, + }; DEVMODEW dm; int i; BOOL ret; @@ -3064,6 +3084,17 @@ static void test_IsValidDevmodeW(void) dm.dmFields = test[i].dmFields; ret = IsValidDevmodeW(&dm, dm.dmSize); ok(ret == test[i].ret, "%d: got %d\n", i, ret); + ret = IsValidDevmodeW(&dm, dm.dmSize + 4); + ok(ret == test[i].ret, "%d: got %d\n", i, ret); + } + + dm.dmFields = 0; + for (i = 0; i < ARRAY_SIZE(size_test); i++) + { + dm.dmSize = size_test[i].dmSize; + dm.dmDriverExtra = size_test[i].dmDriverExtra; + ret = IsValidDevmodeW(&dm, size_test[i].bufSize); + ok(ret == size_test[i].ret, "%d: got %d\n", i, ret); } }

1 0

Francois Gouget : gdi32/tests: Fix the SetDeviceGammaRamp() tests on Windows 10 1909.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 9d6a9909c3fcffce928cd836ff20ad0c66f1340c URL: https://gitlab.winehq.org/wine/wine/-/commit/9d6a9909c3fcffce928cd836ff20ad… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 10:47:19 2023 +0100 gdi32/tests: Fix the SetDeviceGammaRamp() tests on Windows 10 1909. SetDeviceGammaRamp() checks the specified ramp to prevent applications from setting malicious gamma ramps (e.g. hiding text by remapping its color to match the background). But Windows 10 1909 has fewer checks than later Windows 10 versions. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54593 --- dlls/gdi32/tests/dc.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 72d0f76f748..8ccadbd6ff6 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1268,12 +1268,14 @@ static void test_gamma(void) /* set one color ramp to zeros */ memset(ramp[0], 0, sizeof(ramp[0])); ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp(zeroes) succeeded\n"); + ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRamp(zeroes) succeeded\n"); /* set one color ramp to a flat straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(!ret, "SetDeviceGammaRamp(low) succeeded\n"); + todo_wine ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRamp(low) succeeded\n"); /* set one color ramp to a steep straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i * 256; @@ -1285,7 +1287,8 @@ static void test_gamma(void) ramp[0][1] = 0x7FFF; for (i = 2; i < 256; i++) ramp[0][i] = 0xFFFF; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRam(bright) succeeded\n"); + ok(!ret || broken(ret /* win1909 */), + "SetDeviceGammaRam(bright) succeeded\n"); /* try ramps which are not uniform */ for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */

1 0

Francois Gouget : gdi32/tests: Make the gamma ramp failures more unique.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 267f612604adeb12bc5eaef696a2150d4a20dcd6 URL: https://gitlab.winehq.org/wine/wine/-/commit/267f612604adeb12bc5eaef696a215… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 09:07:40 2023 +0100 gdi32/tests: Make the gamma ramp failures more unique. Otherwise the only way to identify which failure happened is to check its line number which is not practical across versions. --- dlls/gdi32/tests/dc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index b556fb58f13..72d0f76f748 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1268,37 +1268,37 @@ static void test_gamma(void) /* set one color ramp to zeros */ memset(ramp[0], 0, sizeof(ramp[0])); ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp succeeded\n"); + ok(!ret, "SetDeviceGammaRamp(zeroes) succeeded\n"); /* set one color ramp to a flat straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i; ret = SetDeviceGammaRamp(hdc, &ramp); - todo_wine ok(!ret, "SetDeviceGammaRamp succeeded\n"); + todo_wine ok(!ret, "SetDeviceGammaRamp(low) succeeded\n"); /* set one color ramp to a steep straight rising line */ for (i = 0; i < 256; i++) ramp[0][i] = i * 256; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(steep) failed\n"); /* try a bright gamma ramp */ ramp[0][0] = 0; ramp[0][1] = 0x7FFF; for (i = 2; i < 256; i++) ramp[0][i] = 0xFFFF; ret = SetDeviceGammaRamp(hdc, &ramp); - ok(!ret, "SetDeviceGammaRamp succeeded\n"); + ok(!ret, "SetDeviceGammaRam(bright) succeeded\n"); /* try ramps which are not uniform */ for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */ ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(wrap) failed\n"); for (i = 0; i < 256; i += 2) ramp[0][i] = ramp[0][i + 1] = 256 * i; /* stairs */ ret = SetDeviceGammaRamp(hdc, &ramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(stairs) failed\n"); /* cleanup: set old ramp again */ ret = SetDeviceGammaRamp(hdc, &oldramp); - ok(ret, "SetDeviceGammaRamp failed\n"); + ok(ret, "SetDeviceGammaRamp(old) failed\n"); done: ReleaseDC(NULL, hdc);

1 0

Francois Gouget : gdi32/tests: Simplify setting up the non uniform gamma ramps.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 390ed160ef96ad3673448fd48803c6e22792a9cf URL: https://gitlab.winehq.org/wine/wine/-/commit/390ed160ef96ad3673448fd48803c6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon Feb 27 08:51:13 2023 +0100 gdi32/tests: Simplify setting up the non uniform gamma ramps. --- dlls/gdi32/tests/dc.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index c64ef332060..b556fb58f13 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -1288,16 +1288,11 @@ static void test_gamma(void) ok(!ret, "SetDeviceGammaRamp succeeded\n"); /* try ramps which are not uniform */ - ramp[0][0] = 0; - for (i = 1; i < 256; i++) ramp[0][i] = ramp[0][i - 1] + 512; + for (i = 0; i < 256; i++) ramp[0][i] = 512 * i; /* wraps midway */ ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n"); - ramp[0][0] = 0; - for (i = 2; i < 256; i+=2) - { - ramp[0][i - 1] = ramp[0][i - 2]; - ramp[0][i] = ramp[0][i - 2] + 512; - } + for (i = 0; i < 256; i += 2) + ramp[0][i] = ramp[0][i + 1] = 256 * i; /* stairs */ ret = SetDeviceGammaRamp(hdc, &ramp); ok(ret, "SetDeviceGammaRamp failed\n");

1 0

Eric Pouech : dbghelp/tests: Fix tests for process count in wow64.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 291daf542d906b11320128ad4fd17fb99d8fff4b URL: https://gitlab.winehq.org/wine/wine/-/commit/291daf542d906b11320128ad4fd17f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:56 2023 +0100 dbghelp/tests: Fix tests for process count in wow64. Introduce get_process_kind() to discriminate configurations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 65 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index c5b04b7dd7f..3a0ad20dadd 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -553,6 +553,46 @@ static void test_modules_overlap(void) } } +enum process_kind +{ + PCSKIND_ERROR, + PCSKIND_64BIT, /* 64 bit process */ + PCSKIND_32BIT, /* 32 bit only configuration (Wine, some Win 7...) */ + PCSKIND_WINE_OLD_WOW64, /* Wine "old" wow64 configuration */ + PCSKIND_WOW64, /* Wine "new" wow64 configuration, and Windows with wow64 support */ +}; + +static enum process_kind get_process_kind(HANDLE process) +{ + const BOOL is_win64 = sizeof(void*) == 8; + USHORT m1, m2; + + if (!IsWow64Process2(process, &m1, &m2)) return PCSKIND_ERROR; + if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 32) return PCSKIND_32BIT; + if (m1 == IMAGE_FILE_MACHINE_UNKNOWN && get_machine_bitness(m2) == 64) return PCSKIND_64BIT; + if (get_machine_bitness(m1) == 32 && get_machine_bitness(m2) == 64) + { + enum process_kind pcskind = PCSKIND_WOW64; + if (!strcmp(winetest_platform, "wine")) + { + PROCESS_BASIC_INFORMATION pbi; + PEB32 peb32; + const char* peb_addr; + + if (NtQueryInformationProcess(process, ProcessBasicInformation, &pbi, sizeof(pbi), NULL)) + return PCSKIND_ERROR; + + peb_addr = (const char*)pbi.PebBaseAddress; + if (is_win64) peb_addr += 0x1000; + if (!ReadProcessMemory(process, peb_addr, &peb32, sizeof(peb32), NULL)) return PCSKIND_ERROR; + if (*(const DWORD*)((const char*)&peb32 + 0x460 /* CloudFileFlags */)) + pcskind = PCSKIND_WINE_OLD_WOW64; + } + return pcskind; + } + return PCSKIND_ERROR; +} + struct loaded_module_aggregation { HANDLE proc; @@ -599,7 +639,7 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI aggregation->count_ntdll++; if (!wcsnicmp(imagename, system_directory, wcslen(system_directory))) aggregation->count_systemdir++; - if (is_win64 && IsWow64Process(aggregation->proc, &wow64) && wow64 && + if (IsWow64Process(aggregation->proc, &wow64) && wow64 && !wcsnicmp(imagename, wow64_directory, wcslen(wow64_directory))) aggregation->count_wowdir++; @@ -653,9 +693,26 @@ static void test_loaded_modules(void) aggregation.count_32bit, aggregation.count_64bit); ok(aggregation.count_exe == 1 && aggregation.count_ntdll == 1, "Wrong kind aggregation count %u %u\n", aggregation.count_exe, aggregation.count_ntdll); - todo_wine_if(is_wow64) - ok(aggregation.count_systemdir > 2 && !aggregation.count_wowdir, "Wrong directory aggregation count %u %u\n", - aggregation.count_systemdir, aggregation.count_wowdir); + switch (get_process_kind(pi.hProcess)) + { + case PCSKIND_ERROR: + ok(0, "Unknown process kind\n"); + break; + case PCSKIND_64BIT: + case PCSKIND_WOW64: + todo_wine + ok(aggregation.count_systemdir > 2 && aggregation.count_wowdir == 1, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + case PCSKIND_32BIT: + ok(aggregation.count_systemdir > 2 && aggregation.count_wowdir == 0, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + case PCSKIND_WINE_OLD_WOW64: + ok(aggregation.count_systemdir == 1 && aggregation.count_wowdir > 2, "Wrong directory aggregation count %u %u\n", + aggregation.count_systemdir, aggregation.count_wowdir); + break; + } } SymCleanup(pi.hProcess);

1 0

Eric Pouech : dbghelp/tests: Introduce get_machine_bitness() helper.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 8aea0395075dad57457fae1b50e8a06353ae49e2 URL: https://gitlab.winehq.org/wine/wine/-/commit/8aea0395075dad57457fae1b50e8a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:55 2023 +0100 dbghelp/tests: Introduce get_machine_bitness() helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 0c95a2a6206..c5b04b7dd7f 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -206,6 +206,23 @@ static BOOL ends_withW(const WCHAR* str, const WCHAR* suffix) return strlen >= sfxlen && !wcsicmp(str + strlen - sfxlen, suffix); } +static unsigned get_machine_bitness(USHORT machine) +{ + switch (machine) + { + case IMAGE_FILE_MACHINE_I386: + case IMAGE_FILE_MACHINE_ARM: + case IMAGE_FILE_MACHINE_ARMNT: + return 32; + case IMAGE_FILE_MACHINE_AMD64: + case IMAGE_FILE_MACHINE_ARM64: + return 64; + default: + ok(0, "Unsupported machine %x\n", machine); + return 0; + } +} + static USHORT get_module_machine(const char* path) { HANDLE hFile, hMap; @@ -570,22 +587,11 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI ok(ret, "SymGetModuleInfoW64 failed: %lu\n", GetLastError()); } - switch (im.MachineType) + switch (get_machine_bitness(im.MachineType)) { - case IMAGE_FILE_MACHINE_UNKNOWN: - break; - case IMAGE_FILE_MACHINE_I386: - case IMAGE_FILE_MACHINE_ARM: - case IMAGE_FILE_MACHINE_ARMNT: - aggregation->count_32bit++; - break; - case IMAGE_FILE_MACHINE_AMD64: - case IMAGE_FILE_MACHINE_ARM64: - aggregation->count_64bit++; - break; - default: - ok(0, "Unsupported machine %lx\n", im.MachineType); - break; + case 32: aggregation->count_32bit++; break; + case 64: aggregation->count_64bit++; break; + default: break; } if (ends_withW(imagename, L".exe")) aggregation->count_exe++;

1 0

← Newer
1
2
3
4
5
6
7
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2023