February 2023 - Wine-commits

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: Implement IUIAutomation::IntNativeArrayToSafeArray.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 3bc59a4e9a7d5b76ff533304d4c56bd4e21c6ebd URL: https://gitlab.winehq.org/wine/wine/-/commit/3bc59a4e9a7d5b76ff533304d4c56b… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Feb 3 14:06:38 2023 -0500 uiautomationcore: Implement IUIAutomation::IntNativeArrayToSafeArray. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 40 ++++++++++++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 29 ++++++++++++++++++++-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index d5cfccf729f..1752682a5a7 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10017,11 +10017,17 @@ exit: static void test_CUIAutomation_value_conversion(IUIAutomation *uia_iface) { static const VARTYPE invalid_int_vts[] = { VT_I8, VT_INT }; + int in_arr[3] = { 0xdeadbeef, 0xfeedbeef, 0x1337b33f }; int *out_arr, out_arr_count, i; + LONG lbound, ubound; SAFEARRAY *sa; VARTYPE vt; HRESULT hr; + UINT dims; + /* + * Conversion from VT_I4 SAFEARRAY to native int array. + */ for (i = 0; i < ARRAY_SIZE(invalid_int_vts); i++) { vt = invalid_int_vts[i]; @@ -10047,6 +10053,40 @@ static void test_CUIAutomation_value_conversion(IUIAutomation *uia_iface) SafeArrayDestroy(sa); CoTaskMemFree(out_arr); + + /* + * Conversion from native int array to VT_I4 SAFEARRAY. + */ + sa = NULL; + hr = IUIAutomation_IntNativeArrayToSafeArray(uia_iface, in_arr, ARRAY_SIZE(in_arr), &sa); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = SafeArrayGetVartype(sa, &vt); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(vt == VT_I4, "Unexpected vt %d.\n", vt); + + dims = SafeArrayGetDim(sa); + ok(dims == 1, "Unexpected array dims %d\n", dims); + + hr = SafeArrayGetLBound(sa, 1, &lbound); + ok(hr == S_OK, "Failed to get LBound with hr %#lx\n", hr); + ok(lbound == 0, "Unexpected LBound %#lx\n", lbound); + + hr = SafeArrayGetUBound(sa, 1, &ubound); + ok(hr == S_OK, "Failed to get UBound with hr %#lx\n", hr); + ok(((ubound - lbound) + 1) == ARRAY_SIZE(in_arr), "Unexpected array size %#lx\n", ((ubound - lbound) + 1)); + + for (i = 0; i < ARRAY_SIZE(in_arr); i++) + { + LONG idx = lbound + i; + int tmp_val; + + hr = SafeArrayGetElement(sa, &idx, &tmp_val); + ok(hr == S_OK, "Failed to get element at idx %ld, hr %#lx\n", idx, hr); + ok(tmp_val == in_arr[i], "Expected %d at idx %d, got %d\n", in_arr[i], i, tmp_val); + } + + SafeArrayDestroy(sa); } struct uia_com_classes { diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index e78fc4ee416..de01517948a 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1366,8 +1366,33 @@ static HRESULT WINAPI uia_iface_RemoveAllEventHandlers(IUIAutomation6 *iface) static HRESULT WINAPI uia_iface_IntNativeArrayToSafeArray(IUIAutomation6 *iface, int *arr, int arr_count, SAFEARRAY **out_sa) { - FIXME("%p, %p, %d, %p: stub\n", iface, arr, arr_count, out_sa); - return E_NOTIMPL; + HRESULT hr = S_OK; + SAFEARRAY *sa; + int *sa_arr; + + TRACE("%p, %p, %d, %p\n", iface, arr, arr_count, out_sa); + + if (!out_sa || !arr || !arr_count) + return E_INVALIDARG; + + *out_sa = NULL; + if (!(sa = SafeArrayCreateVector(VT_I4, 0, arr_count))) + return E_OUTOFMEMORY; + + hr = SafeArrayAccessData(sa, (void **)&sa_arr); + if (FAILED(hr)) + goto exit; + + memcpy(sa_arr, arr, sizeof(*arr) * arr_count); + hr = SafeArrayUnaccessData(sa); + if (SUCCEEDED(hr)) + *out_sa = sa; + +exit: + if (FAILED(hr)) + SafeArrayDestroy(sa); + + return hr; } static HRESULT WINAPI uia_iface_IntSafeArrayToNativeArray(IUIAutomation6 *iface, SAFEARRAY *sa, int **out_arr,

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomation reserved value retrieval methods.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: cd6891962b070708228f1c32bf3480c3ae65a9ca URL: https://gitlab.winehq.org/wine/wine/-/commit/cd6891962b070708228f1c32bf3480… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Jan 12 11:54:28 2023 -0500 uiautomationcore: Implement IUIAutomation reserved value retrieval methods. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 20 ++++++++++++++++++++ dlls/uiautomationcore/uia_com_client.c | 10 ++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index 1752682a5a7..c2982174463 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10109,6 +10109,7 @@ static const struct uia_com_classes com_classes[] = { static void test_CUIAutomation(void) { IUIAutomation *uia_iface; + IUnknown *unk1, *unk2; BOOL has_cui8 = TRUE; HRESULT hr; int i; @@ -10152,6 +10153,25 @@ 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"); + /* Reserved value retrieval methods. */ + hr = UiaGetReservedNotSupportedValue(&unk1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUIAutomation_get_ReservedNotSupportedValue(uia_iface, &unk2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(unk1 == unk2, "unk1 != unk2\n"); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + + hr = UiaGetReservedMixedAttributeValue(&unk1); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + + hr = IUIAutomation_get_ReservedMixedAttributeValue(uia_iface, &unk2); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(unk1 == unk2, "unk1 != unk2\n"); + IUnknown_Release(unk1); + IUnknown_Release(unk2); + test_CUIAutomation_value_conversion(uia_iface); test_ElementFromHandle(uia_iface, has_cui8); test_Element_GetPropertyValue(uia_iface); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index de01517948a..33a1967e489 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1509,14 +1509,16 @@ static HRESULT WINAPI uia_iface_CheckNotSupported(IUIAutomation6 *iface, VARIANT static HRESULT WINAPI uia_iface_get_ReservedNotSupportedValue(IUIAutomation6 *iface, IUnknown **out_unk) { - FIXME("%p, %p: stub\n", iface, out_unk); - return E_NOTIMPL; + TRACE("%p, %p\n", iface, out_unk); + + return UiaGetReservedNotSupportedValue(out_unk); } static HRESULT WINAPI uia_iface_get_ReservedMixedAttributeValue(IUIAutomation6 *iface, IUnknown **out_unk) { - FIXME("%p, %p: stub\n", iface, out_unk); - return E_NOTIMPL; + TRACE("%p, %p\n", iface, out_unk); + + return UiaGetReservedMixedAttributeValue(out_unk); } static HRESULT WINAPI uia_iface_ElementFromIAccessible(IUIAutomation6 *iface, IAccessible *acc, int cid,

1 0

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

27 Feb '23

Module: wine Branch: master Commit: b3a87694a470cae9ed3e9d52a97c13596ab2b354 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3a87694a470cae9ed3e9d52a97c13… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Fri Jan 27 16:22:51 2023 -0500 uiautomationcore: Implement IUIAutomation::CheckNotSupported. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 17 ++++++++++++++++- dlls/uiautomationcore/uia_com_client.c | 12 ++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index c2982174463..b33a09d4f11 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -10108,10 +10108,11 @@ static const struct uia_com_classes com_classes[] = { static void test_CUIAutomation(void) { + BOOL has_cui8 = TRUE, tmp_b; IUIAutomation *uia_iface; IUnknown *unk1, *unk2; - BOOL has_cui8 = TRUE; HRESULT hr; + VARIANT v; int i; CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -10160,6 +10161,13 @@ static void test_CUIAutomation(void) hr = IUIAutomation_get_ReservedNotSupportedValue(uia_iface, &unk2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk1 == unk2, "unk1 != unk2\n"); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = unk1; + hr = IUIAutomation_CheckNotSupported(uia_iface, v, &tmp_b); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(tmp_b == TRUE, "tmp_b != TRUE\n"); + IUnknown_Release(unk1); IUnknown_Release(unk2); @@ -10169,6 +10177,13 @@ static void test_CUIAutomation(void) hr = IUIAutomation_get_ReservedMixedAttributeValue(uia_iface, &unk2); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); ok(unk1 == unk2, "unk1 != unk2\n"); + + V_VT(&v) = VT_UNKNOWN; + V_UNKNOWN(&v) = unk1; + hr = IUIAutomation_CheckNotSupported(uia_iface, v, &tmp_b); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(tmp_b == FALSE, "tmp_b != FALSE\n"); + IUnknown_Release(unk1); IUnknown_Release(unk2); diff --git a/dlls/uiautomationcore/uia_com_client.c b/dlls/uiautomationcore/uia_com_client.c index 33a1967e489..f8fdfaa6505 100644 --- a/dlls/uiautomationcore/uia_com_client.c +++ b/dlls/uiautomationcore/uia_com_client.c @@ -1503,8 +1503,16 @@ static HRESULT WINAPI uia_iface_PollForPotentialSupportedProperties(IUIAutomatio static HRESULT WINAPI uia_iface_CheckNotSupported(IUIAutomation6 *iface, VARIANT in_val, BOOL *match) { - FIXME("%p, %s, %p: stub\n", iface, debugstr_variant(&in_val), match); - return E_NOTIMPL; + IUnknown *unk; + + TRACE("%p, %s, %p\n", iface, debugstr_variant(&in_val), match); + + *match = FALSE; + UiaGetReservedNotSupportedValue(&unk); + if (V_VT(&in_val) == VT_UNKNOWN && (V_UNKNOWN(&in_val) == unk)) + *match = TRUE; + + return S_OK; } static HRESULT WINAPI uia_iface_get_ReservedNotSupportedValue(IUIAutomation6 *iface, IUnknown **out_unk)

1 0

Francois Gouget : ntdll/tests: Minimize the stack size for test_tp_multi_wait().
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 9e5d54eac4085fa90049a6f52749ae78b86b05b6 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e5d54eac4085fa90049a6f52749ae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Feb 8 03:43:27 2023 +0100 ntdll/tests: Minimize the stack size for test_tp_multi_wait(). This test creates 512 threads so the default 2 MB stack size requires 1 GB which can cause out-of-virtual-memory-space issues. So cause threadpool to use the smallest possible stack size, which should be 1 MB, halving the virtual memory usage. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54064 --- dlls/ntdll/tests/threadpool.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index a7457e0a315..d8ca80a99a4 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -1898,6 +1898,7 @@ static void CALLBACK multi_wait_cb(TP_CALLBACK_INSTANCE *instance, void *userdat static void test_tp_multi_wait(void) { + TP_POOL_STACK_INFORMATION stack_info; TP_CALLBACK_ENVIRON environment; HANDLE semaphores[512]; TP_WAIT *waits[512]; @@ -1917,6 +1918,11 @@ static void test_tp_multi_wait(void) status = pTpAllocPool(&pool, NULL); ok(!status, "TpAllocPool failed with status %lx\n", status); ok(pool != NULL, "expected pool != NULL\n"); + /* many threads -> use the smallest stack possible */ + stack_info.StackReserve = 256 * 1024; + stack_info.StackCommit = 4 * 1024; + status = pTpSetPoolStackInformation(pool, &stack_info); + ok(!status, "TpQueryPoolStackInformation failed: %lx\n", status); memset(&environment, 0, sizeof(environment)); environment.Version = 1;

1 0

Alexandre Julliard : libs: Import the Zydis library version 4.0.0.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 7bc94bc8f0e92960c6de458982875fa2c7410f4d URL: https://gitlab.winehq.org/wine/wine/-/commit/7bc94bc8f0e92960c6de458982875f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 11:41:16 2023 +0100 libs: Import the Zydis library version 4.0.0. Also some needed header files from Zycore version 1.4.1. --- configure | 28 + configure.ac | 2 + libs/zydis/LICENSE | 23 + libs/zydis/Makefile.in | 18 + libs/zydis/include/Zycore/Allocator.h | 142 + libs/zydis/include/Zycore/Comparison.h | 316 + libs/zydis/include/Zycore/Defines.h | 527 ++ libs/zydis/include/Zycore/Format.h | 285 + libs/zydis/include/Zycore/LibC.h | 511 ++ libs/zydis/include/Zycore/Object.h | 84 + libs/zydis/include/Zycore/Status.h | 287 + libs/zydis/include/Zycore/String.h | 1011 +++ libs/zydis/include/Zycore/Types.h | 236 + libs/zydis/include/Zycore/Vector.h | 722 ++ libs/zydis/include/Zydis/Decoder.h | 303 + libs/zydis/include/Zydis/DecoderTypes.h | 1447 ++++ libs/zydis/include/Zydis/Defines.h | 76 + libs/zydis/include/Zydis/Disassembler.h | 135 + libs/zydis/include/Zydis/Encoder.h | 460 ++ libs/zydis/include/Zydis/Formatter.h | 1146 +++ libs/zydis/include/Zydis/FormatterBuffer.h | 306 + libs/zydis/include/Zydis/Generated/EnumISAExt.h | 104 + libs/zydis/include/Zydis/Generated/EnumISASet.h | 198 + .../Zydis/Generated/EnumInstructionCategory.h | 124 + libs/zydis/include/Zydis/Generated/EnumMnemonic.h | 1770 +++++ libs/zydis/include/Zydis/Generated/EnumRegister.h | 321 + libs/zydis/include/Zydis/Internal/DecoderData.h | 332 + libs/zydis/include/Zydis/Internal/FormatterATT.h | 183 + libs/zydis/include/Zydis/Internal/FormatterBase.h | 324 + libs/zydis/include/Zydis/Internal/FormatterIntel.h | 271 + libs/zydis/include/Zydis/Internal/SharedData.h | 979 +++ libs/zydis/include/Zydis/Internal/String.h | 470 ++ libs/zydis/include/Zydis/MetaInfo.h | 86 + libs/zydis/include/Zydis/Mnemonic.h | 88 + libs/zydis/include/Zydis/Register.h | 337 + libs/zydis/include/Zydis/Segment.h | 178 + libs/zydis/include/Zydis/SharedTypes.h | 727 ++ libs/zydis/include/Zydis/ShortString.h | 93 + libs/zydis/include/Zydis/Status.h | 167 + libs/zydis/include/Zydis/Utils.h | 111 + libs/zydis/include/Zydis/Zydis.h | 185 + libs/zydis/src/Decoder.c | 5074 +++++++++++++ libs/zydis/src/DecoderData.c | 174 + libs/zydis/src/Disassembler.c | 105 + libs/zydis/src/Formatter.c | 656 ++ libs/zydis/src/FormatterATT.c | 422 ++ libs/zydis/src/FormatterBase.c | 797 ++ libs/zydis/src/FormatterBuffer.c | 191 + libs/zydis/src/FormatterIntel.c | 455 ++ libs/zydis/src/Generated/AccessedFlags.inc | 78 + libs/zydis/src/Generated/DecoderTables.inc | 7585 +++++++++++++++++++ libs/zydis/src/Generated/EnumMnemonic.inc | 1758 +++++ libs/zydis/src/Generated/EnumRegister.inc | 289 + libs/zydis/src/Generated/FormatterStrings.inc | 816 ++ .../zydis/src/Generated/InstructionDefinitions.inc | 7839 ++++++++++++++++++++ libs/zydis/src/Generated/InstructionEncodings.inc | 23 + libs/zydis/src/Generated/OperandDefinitions.inc | 7816 +++++++++++++++++++ libs/zydis/src/Generated/RegisterClassLookup.inc | 23 + libs/zydis/src/Generated/RegisterLookup.inc | 269 + libs/zydis/src/Mnemonic.c | 52 + libs/zydis/src/Register.c | 265 + libs/zydis/src/SharedData.c | 186 + libs/zydis/src/String.c | 376 + libs/zydis/src/Utils.c | 171 + libs/zydis/src/Zydis.c | 86 + 65 files changed, 50619 insertions(+)

1 0

Alexandre Julliard : winedbg: Use the Zydis library for disassembly.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 1774db388be65dc89b8e887995e6628dacfad3d6 URL: https://gitlab.winehq.org/wine/wine/-/commit/1774db388be65dc89b8e887995e662… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Feb 27 12:46:57 2023 +0100 winedbg: Use the Zydis library for disassembly. --- programs/winedbg/Makefile.in | 5 +- programs/winedbg/be_i386.c | 5 +- programs/winedbg/be_x86_64.c | 4 +- programs/winedbg/db_disasm.c | 1815 ---------------------------------------- programs/winedbg/db_disasm64.c | 1670 ------------------------------------ programs/winedbg/debugger.h | 1 + programs/winedbg/memory.c | 97 ++- 7 files changed, 92 insertions(+), 3505 deletions(-)

1 0

Eric Pouech : dbghelp/tests: Add wrapper for EnumerateLoadedModulesW64().
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: 394361cdd0ec55f5c6b584007ebe53360cf171ed URL: https://gitlab.winehq.org/wine/wine/-/commit/394361cdd0ec55f5c6b584007ebe53… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:49 2023 +0100 dbghelp/tests: Add wrapper for EnumerateLoadedModulesW64(). Since this API sporadically fails with STATUS_INFO_LENGTH_MISMATCH as GetLastError() (sic!) on Windows 11, retrying the call let us get the relevant output. No clear explanation of the cause of the failure, it's maybe generated when modules are still loaded into child process and it detects modification of the modules' list while enumerating all modules. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 618ee6e8cdb..04833e28dc7 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -16,6 +16,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "ntstatus.h" +#define WIN32_NO_STATUS #include "windows.h" #include "psapi.h" #include "verrsrc.h" @@ -308,6 +310,24 @@ static BOOL CALLBACK nth_module_cb(const char* name, DWORD64 base, void* usr) return FALSE; } +/* wrapper around EnumerateLoadedModuleW64 which sometimes fails for unknown reasons on Win11, + * with STATUS_INFO_LENGTH_MISMATCH as GetLastError()! + */ +static BOOL wrapper_EnumerateLoadedModulesW64(HANDLE proc, PENUMLOADED_MODULES_CALLBACKW64 cb, void* usr) +{ + BOOL ret; + int retry; + + for (retry = !strcmp(winetest_platform, "wine") ? 1 : 5; retry >= 0; retry--) + { + ret = EnumerateLoadedModulesW64(proc, cb, usr); + if (ret || GetLastError() != STATUS_INFO_LENGTH_MISMATCH) + break; + Sleep(10); + } + return ret; +} + static BOOL test_modules(void) { BOOL ret; @@ -600,7 +620,7 @@ static void test_loaded_modules(void) memset(&aggregation, 0, sizeof(aggregation)); aggregation.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); if (is_win64) @@ -649,7 +669,7 @@ static void test_loaded_modules(void) memset(&aggregation, 0, sizeof(aggregation)); aggregation.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); todo_wine @@ -687,7 +707,7 @@ static void test_loaded_modules(void) ok(ret, "SymInitialize failed: %lu\n", GetLastError()); memset(&aggregation2, 0, sizeof(aggregation2)); aggregation2.proc = pi.hProcess; - ret = EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); + ret = wrapper_EnumerateLoadedModulesW64(pi.hProcess, aggregate_cb, &aggregation2); ok(ret, "EnumerateLoadedModulesW64 failed: %lu\n", GetLastError()); ok(aggregation2.count_32bit && aggregation2.count_64bit, "Wrong bitness aggregation count %u %u\n",

1 0

Eric Pouech : dbghelp/tests: Adapt test_modules_overlap() for Windows 11.
by Alexandre Julliard 27 Feb '23

27 Feb '23

Module: wine Branch: master Commit: fbe23dafe1be3614f4eae15f857e50c9296291be URL: https://gitlab.winehq.org/wine/wine/-/commit/fbe23dafe1be3614f4eae15f857e50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:50 2023 +0100 dbghelp/tests: Adapt test_modules_overlap() for Windows 11. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54535 --- dlls/dbghelp/tests/dbghelp.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 04833e28dc7..34df4dd437b 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -285,7 +285,7 @@ struct nth_module { HANDLE proc; unsigned int index; - BOOL will_fail; + BOOL could_fail; IMAGEHLP_MODULE64 module; }; @@ -297,9 +297,10 @@ static BOOL CALLBACK nth_module_cb(const char* name, DWORD64 base, void* usr) if (nth->index--) return TRUE; nth->module.SizeOfStruct = sizeof(nth->module); ret = SymGetModuleInfo64(nth->proc, base, &nth->module); - if (nth->will_fail) + if (nth->could_fail) { - ok(!ret, "SymGetModuleInfo64 should have failed\n"); + /* Windows11 succeeds into loading the overlapped module */ + ok(!ret || broken(base == nth->module.BaseOfImage), "SymGetModuleInfo64 should have failed\n"); nth->module.BaseOfImage = base; } else @@ -497,7 +498,7 @@ static void test_modules_overlap(void) } ok(nth.index == -1, "Expecting more modules\n"); ok(nth.module.BaseOfImage == tests[i].outputs[j].base, "Wrong base\n"); - if (!nth.will_fail) + if (!nth.could_fail) { ok(nth.module.ImageSize == tests[i].outputs[j].size, "Wrong size\n"); ok(!strcasecmp(nth.module.ModuleName, tests[i].outputs[j].name), "Wrong name\n");

1 0

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

27 Feb '23

Module: wine Branch: master Commit: 91a644ae8acb2fda56f5460ad59f90286ffc3d78 URL: https://gitlab.winehq.org/wine/wine/-/commit/91a644ae8acb2fda56f5460ad59f90… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Feb 25 17:50:52 2023 +0100 dbghelp/tests: Introduce ends_withW helper. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/tests/dbghelp.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/dbghelp/tests/dbghelp.c b/dlls/dbghelp/tests/dbghelp.c index 34df4dd437b..576a25200dd 100644 --- a/dlls/dbghelp/tests/dbghelp.c +++ b/dlls/dbghelp/tests/dbghelp.c @@ -196,6 +196,14 @@ static void test_search_path(void) ok(!strcmp(search_path, "."), "Got search path '%s', expected '.'\n", search_path); } +static BOOL ends_withW(const WCHAR* str, const WCHAR* suffix) +{ + size_t strlen = wcslen(str); + size_t sfxlen = wcslen(suffix); + + return strlen >= sfxlen && !wcsicmp(str + strlen - sfxlen, suffix); +} + static USHORT get_module_machine(const char* path) { HANDLE hFile, hMap; @@ -541,18 +549,15 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI { struct loaded_module_aggregation* aggregation = usr; IMAGEHLP_MODULEW64 im; - size_t image_len; BOOL ret, wow64; WCHAR buffer[MAX_PATH]; memset(&im, 0, sizeof(im)); im.SizeOfStruct = sizeof(im); - image_len = wcslen(imagename); - ret = SymGetModuleInfoW64(aggregation->proc, base, &im); if (ret) - ok(aggregation->count_exe && image_len >= 4 && !wcscmp(imagename + image_len - 4, L".exe"), + ok(aggregation->count_exe && ends_withW(imagename, L".exe"), "%ls shouldn't already be loaded\n", imagename); else { @@ -581,7 +586,7 @@ static BOOL CALLBACK aggregate_cb(PCWSTR imagename, DWORD64 base, ULONG sz, PVOI ok(0, "Unsupported machine %lx\n", im.MachineType); break; } - if (image_len >= 4 && !wcsicmp(imagename + image_len - 4, L".exe")) + if (ends_withW(imagename, L".exe")) aggregation->count_exe++; if (!wcsicmp(im.ModuleName, L"ntdll")) aggregation->count_ntdll++;

1 0