October 2022 - wine-commits

Connor McAdams : uiautomationcore: Implement UiaDisconnectProvider.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 890faf87dd691df95e55976b02aa7999d3340c41 URL: https://gitlab.winehq.org/wine/wine/-/commit/890faf87dd691df95e55976b02aa79… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Oct 10 14:11:01 2022 -0400 uiautomationcore: Implement UiaDisconnectProvider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 288 ++++++++++++++++++++++++++++- dlls/uiautomationcore/uia_classes.idl | 1 + dlls/uiautomationcore/uia_client.c | 99 +++++++++- dlls/uiautomationcore/uia_main.c | 6 - dlls/uiautomationcore/uia_private.h | 6 + dlls/uiautomationcore/uia_provider.c | 74 +++++++- include/uiautomationcoreapi.h | 1 + 7 files changed, 465 insertions(+), 10 deletions(-)

1 0

Connor McAdams : uiautomationcore: Track all HUIANODEs returned from the provider thread.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 858e9a4cebe75d10d984a16fce562fd4f79e524f URL: https://gitlab.winehq.org/wine/wine/-/commit/858e9a4cebe75d10d984a16fce562f… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 15 12:35:40 2022 -0400 uiautomationcore: Track all HUIANODEs returned from the provider thread. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 4 ++++ dlls/uiautomationcore/uia_private.h | 3 +++ dlls/uiautomationcore/uia_provider.c | 40 +++++++++++++++++++++++++++++++++--- 3 files changed, 44 insertions(+), 3 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 08fe3b863ae..a648d99f103 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -313,6 +313,8 @@ static ULONG WINAPI uia_node_Release(IWineUiaNode *iface) } IWineUiaProvider_Release(node->prov); + if (!list_empty(&node->prov_thread_list_entry)) + uia_provider_thread_remove_node((HUIANODE)iface); if (node->nested_node) uia_stop_provider_thread(); @@ -751,6 +753,7 @@ HRESULT WINAPI UiaNodeFromProvider(IRawElementProviderSimple *elprov, HUIANODE * } node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; + list_init(&node->prov_thread_list_entry); node->ref = 1; *huianode = (void *)&node->IWineUiaNode_iface; @@ -1127,6 +1130,7 @@ HRESULT WINAPI UiaNodeFromHandle(HWND hwnd, HUIANODE *huianode) node->hwnd = hwnd; node->IWineUiaNode_iface.lpVtbl = &uia_node_vtbl; + list_init(&node->prov_thread_list_entry); node->ref = 1; hr = uia_get_provider_from_hwnd(node); diff --git a/dlls/uiautomationcore/uia_private.h b/dlls/uiautomationcore/uia_private.h index 1efc8fbd1e4..da7f54c8ce3 100644 --- a/dlls/uiautomationcore/uia_private.h +++ b/dlls/uiautomationcore/uia_private.h @@ -20,6 +20,7 @@ #include "uiautomation.h" #include "uia_classes.h" +#include "wine/list.h" extern HMODULE huia_module DECLSPEC_HIDDEN; @@ -38,6 +39,7 @@ struct uia_node { HWND hwnd; BOOL nested_node; + struct list prov_thread_list_entry; }; static inline struct uia_node *impl_from_IWineUiaNode(IWineUiaNode *iface) @@ -50,3 +52,4 @@ const struct uia_prop_info *uia_prop_info_from_id(PROPERTYID prop_id) DECLSPEC_H /* uia_provider.c */ void uia_stop_provider_thread(void) DECLSPEC_HIDDEN; +void uia_provider_thread_remove_node(HUIANODE node) DECLSPEC_HIDDEN; diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c index 7b4a6be4042..fe7dff9112e 100644 --- a/dlls/uiautomationcore/uia_provider.c +++ b/dlls/uiautomationcore/uia_provider.c @@ -1130,6 +1130,7 @@ HRESULT WINAPI UiaProviderFromIAccessible(IAccessible *acc, long child_id, DWORD */ struct uia_provider_thread { + struct list nodes_list; HANDLE hthread; HWND hwnd; LONG ref; @@ -1145,6 +1146,33 @@ static CRITICAL_SECTION_DEBUG provider_thread_cs_debug = }; static CRITICAL_SECTION provider_thread_cs = { &provider_thread_cs_debug, -1, 0, 0, 0, 0 }; +void uia_provider_thread_remove_node(HUIANODE node) +{ + struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); + + TRACE("Removing node %p\n", node); + + EnterCriticalSection(&provider_thread_cs); + list_remove(&node_data->prov_thread_list_entry); + list_init(&node_data->prov_thread_list_entry); + LeaveCriticalSection(&provider_thread_cs); +} + +static HRESULT uia_provider_thread_add_node(HUIANODE node) +{ + struct uia_node *node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); + + TRACE("Adding node %p\n", node); + + node_data->nested_node = TRUE; + + EnterCriticalSection(&provider_thread_cs); + list_add_tail(&provider_thread.nodes_list, &node_data->prov_thread_list_entry); + LeaveCriticalSection(&provider_thread_cs); + + return S_OK; +} + #define WM_GET_OBJECT_UIA_NODE (WM_USER + 1) #define WM_UIA_PROVIDER_THREAD_STOP (WM_USER + 2) static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM wparam, @@ -1155,11 +1183,14 @@ static LRESULT CALLBACK uia_provider_thread_msg_proc(HWND hwnd, UINT msg, WPARAM case WM_GET_OBJECT_UIA_NODE: { HUIANODE node = (HUIANODE)lparam; - struct uia_node *node_data; LRESULT lr; - node_data = impl_from_IWineUiaNode((IWineUiaNode *)node); - node_data->nested_node = TRUE; + if (FAILED(uia_provider_thread_add_node(node))) + { + WARN("Failed to add node %p to provider thread list.\n", node); + UiaNodeRelease(node); + return 0; + } /* * LresultFromObject returns an index into the global atom string table, @@ -1239,6 +1270,7 @@ static BOOL uia_start_provider_thread(void) GetModuleHandleExW(GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS, (const WCHAR *)uia_start_provider_thread, &hmodule); + list_init(&provider_thread.nodes_list); events[0] = ready_event = CreateEventW(NULL, FALSE, FALSE, NULL); if (!(provider_thread.hthread = CreateThread(NULL, 0, uia_provider_thread_proc, ready_event, 0, NULL))) @@ -1276,6 +1308,8 @@ void uia_stop_provider_thread(void) { PostMessageW(provider_thread.hwnd, WM_UIA_PROVIDER_THREAD_STOP, 0, 0); CloseHandle(provider_thread.hthread); + if (!list_empty(&provider_thread.nodes_list)) + ERR("Provider thread shutdown with nodes still in the list\n"); memset(&provider_thread, 0, sizeof(provider_thread)); } LeaveCriticalSection(&provider_thread_cs);

1 0

Connor McAdams : uiautomationcore: Don't use nested node providers for same-thread HWNDs.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 63814b70d1f6f16640179b07eb5ea8a7c80e713d URL: https://gitlab.winehq.org/wine/wine/-/commit/63814b70d1f6f16640179b07eb5ea8… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Sep 15 11:28:00 2022 -0400 uiautomationcore: Don't use nested node providers for same-thread HWNDs. When a client requests an HUIANODE for an HWND that belongs to the same thread, use an IRawElementProvider based provider rather than an IWineUiaNode based provider. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 35 +++++----- dlls/uiautomationcore/uia_client.c | 101 +++++++++++++++++++++-------- 2 files changed, 90 insertions(+), 46 deletions(-) diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c index ff711ccb325..aa5a9afab7f 100644 --- a/dlls/uiautomationcore/tests/uiautomation.c +++ b/dlls/uiautomationcore/tests/uiautomation.c @@ -5484,30 +5484,27 @@ static void test_UiaNodeFromHandle(const char *name) Provider_child.prov_opts = ProviderOptions_ServerSideProvider; Provider_child.hwnd = NULL; hr = UiaGetPropertyValue(node, UIA_LabeledByPropertyId, &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + hr = UiaHUiaNodeFromVariant(&v, &node2); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + hr = UiaGetPropertyValue(node2, UIA_ProviderDescriptionPropertyId, &v); + todo_wine ok(hr == S_OK, "Unexpected hr %#lx\n", hr); if (SUCCEEDED(hr)) { - hr = UiaHUiaNodeFromVariant(&v, &node2); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - hr = UiaGetPropertyValue(node2, UIA_ProviderDescriptionPropertyId, &v); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - if (SUCCEEDED(hr)) - { - check_node_provider_desc_prefix(V_BSTR(&v), GetCurrentProcessId(), NULL); - check_node_provider_desc(V_BSTR(&v), L"Main", L"Provider_child", TRUE); - VariantClear(&v); - } + check_node_provider_desc_prefix(V_BSTR(&v), GetCurrentProcessId(), NULL); + check_node_provider_desc(V_BSTR(&v), L"Main", L"Provider_child", TRUE); + VariantClear(&v); + } - Provider_child.expected_tid = GetCurrentThreadId(); - hr = UiaGetPropertyValue(node2, UIA_ControlTypePropertyId, &v); - ok(hr == S_OK, "Unexpected hr %#lx\n", hr); - ok(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); - ok(V_I4(&v) == uia_i4_prop_val, "Unexpected I4 %#lx\n", V_I4(&v)); - ok_method_sequence(node_from_hwnd4, "node_from_hwnd4"); + Provider_child.expected_tid = GetCurrentThreadId(); + hr = UiaGetPropertyValue(node2, UIA_ControlTypePropertyId, &v); + ok(hr == S_OK, "Unexpected hr %#lx\n", hr); + ok(V_VT(&v) == VT_I4, "Unexpected VT %d\n", V_VT(&v)); + ok(V_I4(&v) == uia_i4_prop_val, "Unexpected I4 %#lx\n", V_I4(&v)); + ok_method_sequence(node_from_hwnd4, "node_from_hwnd4"); - ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); - } + ok(UiaNodeRelease(node2), "UiaNodeRelease returned FALSE\n"); Provider.expected_tid = Provider_child.expected_tid = 0; ok(UiaNodeRelease(node), "UiaNodeRelease returned FALSE\n"); diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index f8317dbb090..08fe3b863ae 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -769,6 +769,11 @@ struct uia_client_thread LONG ref; }; +struct uia_get_node_prov_args { + LRESULT lr; + BOOL unwrap; +}; + static struct uia_client_thread client_thread; static CRITICAL_SECTION client_thread_cs; static CRITICAL_SECTION_DEBUG client_thread_cs_debug = @@ -781,14 +786,17 @@ static CRITICAL_SECTION client_thread_cs = { &client_thread_cs_debug, -1, 0, 0, #define WM_UIA_CLIENT_GET_NODE_PROV (WM_USER + 1) #define WM_UIA_CLIENT_THREAD_STOP (WM_USER + 2) -static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESULT lr); +static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESULT lr, BOOL unwrap); static LRESULT CALLBACK uia_client_thread_msg_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) { switch (msg) { case WM_UIA_CLIENT_GET_NODE_PROV: - return create_wine_uia_nested_node_provider((struct uia_node *)lparam, (LRESULT)wparam); + { + struct uia_get_node_prov_args *args = (struct uia_get_node_prov_args *)wparam; + return create_wine_uia_nested_node_provider((struct uia_node *)lparam, args->lr, args->unwrap); + } default: break; @@ -986,11 +994,14 @@ static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { uia_nested_node_provider_get_prop_val, }; -static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESULT lr) +static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESULT lr, + BOOL unwrap) { + IWineUiaProvider *provider_iface = NULL; struct uia_nested_node_provider *prov; IGlobalInterfaceTable *git; IWineUiaNode *nested_node; + DWORD git_cookie; HRESULT hr; hr = ObjectFromLresult(lr, &IID_IWineUiaNode, 0, (void **)&nested_node); @@ -1000,30 +1011,65 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU return hr; } - prov = heap_alloc_zero(sizeof(*prov)); - if (!prov) - return E_OUTOFMEMORY; - - prov->IWineUiaProvider_iface.lpVtbl = &uia_nested_node_provider_vtbl; - prov->nested_node = nested_node; - prov->ref = 1; - node->prov = &prov->IWineUiaProvider_iface; - /* - * We need to use the GIT on all nested node providers so that our - * IWineUiaNode proxy is used in the correct apartment. + * If we're retrieving a node from an HWND that belongs to the same thread + * as the client making the request, return a normal provider instead of a + * nested node provider. */ - hr = get_global_interface_table(&git); - if (FAILED(hr)) - goto exit; + if (unwrap) + { + struct uia_node *node_data = unsafe_impl_from_IWineUiaNode(nested_node); - hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&prov->IWineUiaProvider_iface, - &IID_IWineUiaProvider, &node->git_cookie); -exit: - if (FAILED(hr)) - IWineUiaProvider_Release(&prov->IWineUiaProvider_iface); + if (!node_data) + { + ERR("Failed to get uia_node structure from nested node\n"); + uia_stop_client_thread(); + return E_FAIL; + } - return hr; + IWineUiaProvider_AddRef(node_data->prov); + provider_iface = node_data->prov; + git_cookie = node_data->git_cookie; + + node_data->git_cookie = 0; + IWineUiaNode_Release(&node_data->IWineUiaNode_iface); + uia_stop_client_thread(); + } + else + { + prov = heap_alloc_zero(sizeof(*prov)); + if (!prov) + return E_OUTOFMEMORY; + + prov->IWineUiaProvider_iface.lpVtbl = &uia_nested_node_provider_vtbl; + prov->nested_node = nested_node; + prov->ref = 1; + provider_iface = &prov->IWineUiaProvider_iface; + + /* + * We need to use the GIT on all nested node providers so that our + * IWineUiaNode proxy is used in the correct apartment. + */ + hr = get_global_interface_table(&git); + if (FAILED(hr)) + { + IWineUiaProvider_Release(&prov->IWineUiaProvider_iface); + return hr; + } + + hr = IGlobalInterfaceTable_RegisterInterfaceInGlobal(git, (IUnknown *)&prov->IWineUiaProvider_iface, + &IID_IWineUiaProvider, &git_cookie); + if (FAILED(hr)) + { + IWineUiaProvider_Release(&prov->IWineUiaProvider_iface); + return hr; + } + } + + node->prov = provider_iface; + node->git_cookie = git_cookie; + + return S_OK; } /* @@ -1033,27 +1079,28 @@ exit: */ static HRESULT uia_get_provider_from_hwnd(struct uia_node *node) { - LRESULT lr; + struct uia_get_node_prov_args args; if (!uia_start_client_thread()) return E_FAIL; SetLastError(NOERROR); - lr = SendMessageW(node->hwnd, WM_GETOBJECT, 0, UiaRootObjectId); + args.lr = SendMessageW(node->hwnd, WM_GETOBJECT, 0, UiaRootObjectId); if (GetLastError() == ERROR_INVALID_WINDOW_HANDLE) { uia_stop_client_thread(); return UIA_E_ELEMENTNOTAVAILABLE; } - if (!lr) + if (!args.lr) { FIXME("No native UIA provider for hwnd %p, MSAA proxy currently unimplemented.\n", node->hwnd); uia_stop_client_thread(); return E_NOTIMPL; } - return SendMessageW(client_thread.hwnd, WM_UIA_CLIENT_GET_NODE_PROV, (WPARAM)lr, (LPARAM)node); + args.unwrap = GetCurrentThreadId() == GetWindowThreadProcessId(node->hwnd, NULL); + return SendMessageW(client_thread.hwnd, WM_UIA_CLIENT_GET_NODE_PROV, (WPARAM)&args, (LPARAM)node); } /***********************************************************************

1 0

Connor McAdams : uiautomationcore: Use a separate vtbl for nested node IWineUiaProviders.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: wine Branch: master Commit: 8099291fa604504a199b9e63288fb66bdd0a878b URL: https://gitlab.winehq.org/wine/wine/-/commit/8099291fa604504a199b9e63288fb6… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Oct 5 15:29:57 2022 -0400 uiautomationcore: Use a separate vtbl for nested node IWineUiaProviders. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/uia_client.c | 106 +++++++++++++++++++++++++++++-------- 1 file changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/uiautomationcore/uia_client.c b/dlls/uiautomationcore/uia_client.c index 1d6360682c2..f8317dbb090 100644 --- a/dlls/uiautomationcore/uia_client.c +++ b/dlls/uiautomationcore/uia_client.c @@ -398,7 +398,6 @@ struct uia_provider { LONG ref; IRawElementProviderSimple *elprov; - IWineUiaNode *node; }; static inline struct uia_provider *impl_from_IWineUiaProvider(IWineUiaProvider *iface) @@ -436,13 +435,7 @@ static ULONG WINAPI uia_provider_Release(IWineUiaProvider *iface) TRACE("%p, refcount %ld\n", prov, ref); if (!ref) { - if (prov->node) - { - IWineUiaNode_Release(prov->node); - uia_stop_client_thread(); - } - else - IRawElementProviderSimple_Release(prov->elprov); + IRawElementProviderSimple_Release(prov->elprov); heap_free(prov); } @@ -655,17 +648,6 @@ static HRESULT WINAPI uia_provider_get_prop_val(IWineUiaProvider *iface, TRACE("%p, %p, %p\n", iface, prop_info, ret_val); VariantInit(ret_val); - if (prov->node) - { - if (prop_info->type == UIAutomationType_Element || prop_info->type == UIAutomationType_ElementArray) - { - FIXME("Element property types currently unsupported for nested nodes.\n"); - return E_NOTIMPL; - } - - return IWineUiaNode_get_prop_val(prov->node, prop_info->guid, ret_val); - } - switch (prop_info->prop_type) { case PROP_TYPE_ELEM_PROP: @@ -924,10 +906,90 @@ static void uia_stop_client_thread(void) LeaveCriticalSection(&client_thread_cs); } +/* + * IWineUiaProvider interface for nested node providers. + * + * Nested node providers represent an HUIANODE that resides in another + * thread or process. We retrieve values from this HUIANODE through the + * IWineUiaNode interface. + */ +struct uia_nested_node_provider { + IWineUiaProvider IWineUiaProvider_iface; + LONG ref; + + IWineUiaNode *nested_node; +}; + +static inline struct uia_nested_node_provider *impl_from_nested_node_IWineUiaProvider(IWineUiaProvider *iface) +{ + return CONTAINING_RECORD(iface, struct uia_nested_node_provider, IWineUiaProvider_iface); +} + +static HRESULT WINAPI uia_nested_node_provider_QueryInterface(IWineUiaProvider *iface, REFIID riid, void **ppv) +{ + *ppv = NULL; + if (IsEqualIID(riid, &IID_IWineUiaProvider) || IsEqualIID(riid, &IID_IUnknown)) + *ppv = iface; + else + return E_NOINTERFACE; + + IWineUiaProvider_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI uia_nested_node_provider_AddRef(IWineUiaProvider *iface) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + ULONG ref = InterlockedIncrement(&prov->ref); + + TRACE("%p, refcount %ld\n", prov, ref); + return ref; +} + +static ULONG WINAPI uia_nested_node_provider_Release(IWineUiaProvider *iface) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + ULONG ref = InterlockedDecrement(&prov->ref); + + TRACE("%p, refcount %ld\n", prov, ref); + if (!ref) + { + IWineUiaNode_Release(prov->nested_node); + uia_stop_client_thread(); + heap_free(prov); + } + + return ref; +} + +static HRESULT WINAPI uia_nested_node_provider_get_prop_val(IWineUiaProvider *iface, + const struct uia_prop_info *prop_info, VARIANT *ret_val) +{ + struct uia_nested_node_provider *prov = impl_from_nested_node_IWineUiaProvider(iface); + + TRACE("%p, %p, %p\n", iface, prop_info, ret_val); + + VariantInit(ret_val); + if (prop_info->type == UIAutomationType_Element || prop_info->type == UIAutomationType_ElementArray) + { + FIXME("Element property types currently unsupported for nested nodes.\n"); + return E_NOTIMPL; + } + + return IWineUiaNode_get_prop_val(prov->nested_node, prop_info->guid, ret_val); +} + +static const IWineUiaProviderVtbl uia_nested_node_provider_vtbl = { + uia_nested_node_provider_QueryInterface, + uia_nested_node_provider_AddRef, + uia_nested_node_provider_Release, + uia_nested_node_provider_get_prop_val, +}; + static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESULT lr) { + struct uia_nested_node_provider *prov; IGlobalInterfaceTable *git; - struct uia_provider *prov; IWineUiaNode *nested_node; HRESULT hr; @@ -942,8 +1004,8 @@ static HRESULT create_wine_uia_nested_node_provider(struct uia_node *node, LRESU if (!prov) return E_OUTOFMEMORY; - prov->IWineUiaProvider_iface.lpVtbl = &uia_provider_vtbl; - prov->node = nested_node; + prov->IWineUiaProvider_iface.lpVtbl = &uia_nested_node_provider_vtbl; + prov->nested_node = nested_node; prov->ref = 1; node->prov = &prov->IWineUiaProvider_iface;

1 0

Zebediah Figura : vkd3d-shader/hlsl: Pass a location pointer to init_node().
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 6b45f290f798f19d7e8b49435397b5fe37f87c3e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6b45f290f798f19d7e8b49435397b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 19:21:34 2022 -0500 vkd3d-shader/hlsl: Pass a location pointer to init_node(). Instead of a flat location structure. --- libs/vkd3d-shader/hlsl.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index f0426620..3edbb978 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -836,12 +836,12 @@ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_va } static void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, - struct hlsl_type *data_type, struct vkd3d_shader_location loc) + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc) { memset(node, 0, sizeof(*node)); node->type = type; node->data_type = data_type; - node->loc = loc; + node->loc = *loc; list_init(&node->uses); } @@ -864,7 +864,7 @@ struct hlsl_ir_store *hlsl_new_store_index(struct hlsl_ctx *ctx, const struct hl if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; - init_node(&store->node, HLSL_IR_STORE, NULL, *loc); + init_node(&store->node, HLSL_IR_STORE, NULL, loc); if (!init_deref(ctx, &store->lhs, lhs->var, lhs->path_len + !!idx)) return NULL; @@ -892,7 +892,7 @@ struct hlsl_ir_store *hlsl_new_store_component(struct hlsl_ctx *ctx, struct hlsl if (!(store = hlsl_alloc(ctx, sizeof(*store)))) return NULL; - init_node(&store->node, HLSL_IR_STORE, NULL, rhs->loc); + init_node(&store->node, HLSL_IR_STORE, NULL, &rhs->loc); if (!init_deref_from_component_index(ctx, &comp_path_block, &store->lhs, lhs, comp, &rhs->loc)) { @@ -920,7 +920,7 @@ struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_typ if (!(c = hlsl_alloc(ctx, sizeof(*c)))) return NULL; - init_node(&c->node, HLSL_IR_CONSTANT, type, *loc); + init_node(&c->node, HLSL_IR_CONSTANT, type, loc); return c; } @@ -981,7 +981,7 @@ struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, data_type, *loc); + init_node(&expr->node, HLSL_IR_EXPR, data_type, loc); expr->op = op; for (i = 0; i < HLSL_MAX_OPERANDS; ++i) hlsl_src_from_node(&expr->operands[i], operands[i]); @@ -1011,7 +1011,7 @@ struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condit if (!(iff = hlsl_alloc(ctx, sizeof(*iff)))) return NULL; - init_node(&iff->node, HLSL_IR_IF, NULL, loc); + init_node(&iff->node, HLSL_IR_IF, NULL, &loc); hlsl_src_from_node(&iff->condition, condition); list_init(&iff->then_instrs.instrs); list_init(&iff->else_instrs.instrs); @@ -1033,7 +1033,7 @@ struct hlsl_ir_load *hlsl_new_load_index(struct hlsl_ctx *ctx, const struct hlsl if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; - init_node(&load->node, HLSL_IR_LOAD, type, *loc); + init_node(&load->node, HLSL_IR_LOAD, type, loc); if (!init_deref(ctx, &load->src, deref->var, deref->path_len + !!idx)) { @@ -1071,7 +1071,7 @@ struct hlsl_ir_load *hlsl_new_load_component(struct hlsl_ctx *ctx, struct hlsl_b type = get_type_from_deref(ctx, deref); comp_type = hlsl_type_get_component_type(ctx, type, comp); - init_node(&load->node, HLSL_IR_LOAD, comp_type, *loc); + init_node(&load->node, HLSL_IR_LOAD, comp_type, loc); if (!init_deref_from_component_index(ctx, &comp_path_block, &load->src, deref, comp, loc)) { @@ -1092,7 +1092,7 @@ struct hlsl_ir_resource_load *hlsl_new_resource_load(struct hlsl_ctx *ctx, if (!(load = hlsl_alloc(ctx, sizeof(*load)))) return NULL; - init_node(&load->node, HLSL_IR_RESOURCE_LOAD, params->format, *loc); + init_node(&load->node, HLSL_IR_RESOURCE_LOAD, params->format, loc); load->load_type = params->type; if (!hlsl_copy_deref(ctx, &load->resource, &params->resource)) { @@ -1119,7 +1119,7 @@ struct hlsl_ir_swizzle *hlsl_new_swizzle(struct hlsl_ctx *ctx, DWORD s, unsigned if (!(swizzle = hlsl_alloc(ctx, sizeof(*swizzle)))) return NULL; init_node(&swizzle->node, HLSL_IR_SWIZZLE, - hlsl_get_vector_type(ctx, val->data_type->base_type, components), *loc); + hlsl_get_vector_type(ctx, val->data_type->base_type, components), loc); hlsl_src_from_node(&swizzle->val, val); swizzle->swizzle = s; return swizzle; @@ -1131,7 +1131,7 @@ struct hlsl_ir_jump *hlsl_new_jump(struct hlsl_ctx *ctx, enum hlsl_ir_jump_type if (!(jump = hlsl_alloc(ctx, sizeof(*jump)))) return NULL; - init_node(&jump->node, HLSL_IR_JUMP, NULL, loc); + init_node(&jump->node, HLSL_IR_JUMP, NULL, &loc); jump->type = type; return jump; } @@ -1142,7 +1142,7 @@ struct hlsl_ir_loop *hlsl_new_loop(struct hlsl_ctx *ctx, struct vkd3d_shader_loc if (!(loop = hlsl_alloc(ctx, sizeof(*loop)))) return NULL; - init_node(&loop->node, HLSL_IR_LOOP, NULL, loc); + init_node(&loop->node, HLSL_IR_LOOP, NULL, &loc); list_init(&loop->body.instrs); return loop; }

1 0

Zebediah Figura : vkd3d-shader/hlsl: Introduce a hlsl_new_expr() helper.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 20fc4375ad281ddbdf70b9830f14faa0d2114a29 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/20fc4375ad281ddbdf70b9830f14f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Sep 26 19:00:09 2022 -0500 vkd3d-shader/hlsl: Introduce a hlsl_new_expr() helper. --- libs/vkd3d-shader/hlsl.c | 40 +++++++++++++++++++++++++++------------- libs/vkd3d-shader/hlsl.h | 13 +++---------- libs/vkd3d-shader/hlsl.y | 12 ++++-------- 3 files changed, 34 insertions(+), 31 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 8eac4fe4..f0426620 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -835,6 +835,16 @@ void hlsl_init_simple_deref_from_var(struct hlsl_deref *deref, struct hlsl_ir_va deref->var = var; } +static void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, + struct hlsl_type *data_type, struct vkd3d_shader_location loc) +{ + memset(node, 0, sizeof(*node)); + node->type = type; + node->data_type = data_type; + node->loc = loc; + list_init(&node->uses); +} + struct hlsl_ir_store *hlsl_new_simple_store(struct hlsl_ctx *ctx, struct hlsl_ir_var *lhs, struct hlsl_ir_node *rhs) { struct hlsl_deref lhs_deref; @@ -962,33 +972,37 @@ struct hlsl_ir_constant *hlsl_new_uint_constant(struct hlsl_ctx *ctx, unsigned i return c; } -struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, - struct hlsl_ir_node *arg, struct vkd3d_shader_location loc) +struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc) { struct hlsl_ir_expr *expr; + unsigned int i; if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg->data_type, loc); + init_node(&expr->node, HLSL_IR_EXPR, data_type, *loc); expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg); + for (i = 0; i < HLSL_MAX_OPERANDS; ++i) + hlsl_src_from_node(&expr->operands[i], operands[i]); return &expr->node; } +struct hlsl_ir_node *hlsl_new_unary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *arg, struct vkd3d_shader_location loc) +{ + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {arg}; + + return hlsl_new_expr(ctx, op, operands, arg->data_type, &loc); +} + struct hlsl_ir_node *hlsl_new_binary_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, struct hlsl_ir_node *arg1, struct hlsl_ir_node *arg2) { - struct hlsl_ir_expr *expr; + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {arg1, arg2}; assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type)); - - if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) - return NULL; - init_node(&expr->node, HLSL_IR_EXPR, arg1->data_type, arg1->loc); - expr->op = op; - hlsl_src_from_node(&expr->operands[0], arg1); - hlsl_src_from_node(&expr->operands[1], arg2); - return &expr->node; + return hlsl_new_expr(ctx, op, operands, arg1->data_type, &arg1->loc); } struct hlsl_ir_if *hlsl_new_if(struct hlsl_ctx *ctx, struct hlsl_ir_node *condition, struct vkd3d_shader_location loc) diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 9039e9bc..e8f01f2b 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -589,16 +589,6 @@ static inline struct hlsl_ir_swizzle *hlsl_ir_swizzle(const struct hlsl_ir_node return CONTAINING_RECORD(node, struct hlsl_ir_swizzle, node); } -static inline void init_node(struct hlsl_ir_node *node, enum hlsl_ir_node_type type, - struct hlsl_type *data_type, struct vkd3d_shader_location loc) -{ - memset(node, 0, sizeof(*node)); - node->type = type; - node->data_type = data_type; - node->loc = loc; - list_init(&node->uses); -} - static inline void hlsl_src_from_node(struct hlsl_src *src, struct hlsl_ir_node *node) { src->node = node; @@ -760,6 +750,9 @@ struct hlsl_ir_expr *hlsl_new_cast(struct hlsl_ctx *ctx, struct hlsl_ir_node *no struct hlsl_ir_constant *hlsl_new_constant(struct hlsl_ctx *ctx, struct hlsl_type *type, const struct vkd3d_shader_location *loc); struct hlsl_ir_expr *hlsl_new_copy(struct hlsl_ctx *ctx, struct hlsl_ir_node *node); +struct hlsl_ir_node *hlsl_new_expr(struct hlsl_ctx *ctx, enum hlsl_ir_expr_op op, + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], + struct hlsl_type *data_type, const struct vkd3d_shader_location *loc); struct hlsl_ir_constant *hlsl_new_float_constant(struct hlsl_ctx *ctx, float f, const struct vkd3d_shader_location *loc); struct hlsl_ir_function_decl *hlsl_new_func_decl(struct hlsl_ctx *ctx, struct hlsl_type *return_type, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index bb98879e..60ca09ce 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -1217,7 +1217,7 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, enum hlsl_ir_expr_op op, struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS], struct hlsl_type *type, const struct vkd3d_shader_location *loc) { - struct hlsl_ir_expr *expr; + struct hlsl_ir_node *expr; unsigned int i; if (type->type == HLSL_CLASS_MATRIX) @@ -1271,15 +1271,11 @@ static struct hlsl_ir_node *add_expr(struct hlsl_ctx *ctx, struct list *instrs, return &load->node; } - if (!(expr = hlsl_alloc(ctx, sizeof(*expr)))) + if (!(expr = hlsl_new_expr(ctx, op, operands, type, loc))) return NULL; - init_node(&expr->node, HLSL_IR_EXPR, type, *loc); - expr->op = op; - for (i = 0; i < HLSL_MAX_OPERANDS; ++i) - hlsl_src_from_node(&expr->operands[i], operands[i]); - list_add_tail(instrs, &expr->node.entry); + list_add_tail(instrs, &expr->entry); - return &expr->node; + return expr; } static void check_integer_type(struct hlsl_ctx *ctx, const struct hlsl_ir_node *instr)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Write SM4 reinterpret instructions.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 1e10b5e6162260a247f95b980213fc97be422e47 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e10b5e6162260a247f95b980213f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Sep 28 15:19:27 2022 -0500 vkd3d-shader/hlsl: Write SM4 reinterpret instructions. --- libs/vkd3d-shader/hlsl_sm4.c | 4 ++++ tests/asuint.shader_test | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/hlsl_sm4.c b/libs/vkd3d-shader/hlsl_sm4.c index 3ce6fc5e..b6d5e92c 100644 --- a/libs/vkd3d-shader/hlsl_sm4.c +++ b/libs/vkd3d-shader/hlsl_sm4.c @@ -1664,6 +1664,10 @@ static void write_sm4_expr(struct hlsl_ctx *ctx, } break; + case HLSL_OP1_REINTERPRET: + write_sm4_unary_op(buffer, VKD3D_SM4_OP_MOV, &expr->node, arg1, 0); + break; + case HLSL_OP1_ROUND: assert(type_is_float(dst_type)); write_sm4_unary_op(buffer, VKD3D_SM4_OP_ROUND_NE, &expr->node, arg1, 0); diff --git a/tests/asuint.shader_test b/tests/asuint.shader_test index 77385515..a08beaf3 100644 --- a/tests/asuint.shader_test +++ b/tests/asuint.shader_test @@ -16,7 +16,7 @@ float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv [test] uniform 0 uint4 123 0xc0000000 456 0x7fd69345 -todo draw quad +draw quad probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0) @@ -31,7 +31,7 @@ float4 main(uniform float2x2 m, uniform float4 v) : sv_target uniform 0 uint4 11 12 0 0 uniform 4 uint4 13 14 0 0 uniform 8 uint4 20 21 22 23 -todo draw quad +draw quad probe (320,240) rgba (13.0, 21.0, 0.0, 0.0)

1 0

Zebediah Figura : vkd3d-shader/hlsl: Parse the asuint() intrinsic.
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: 2d4d2e12447b39ca0a1a5a8155035f9332d824ed URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2d4d2e12447b39ca0a1a5a8155035… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Oct 9 22:59:12 2022 -0500 vkd3d-shader/hlsl: Parse the asuint() intrinsic. --- libs/vkd3d-shader/hlsl.c | 1 + libs/vkd3d-shader/hlsl.h | 1 + libs/vkd3d-shader/hlsl.y | 45 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 47 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index c1cd065a..8eac4fe4 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -1642,6 +1642,7 @@ const char *debug_hlsl_expr_op(enum hlsl_ir_expr_op op) [HLSL_OP1_NEG] = "-", [HLSL_OP1_NRM] = "nrm", [HLSL_OP1_RCP] = "rcp", + [HLSL_OP1_REINTERPRET] = "reinterpret", [HLSL_OP1_ROUND] = "round", [HLSL_OP1_RSQ] = "rsq", [HLSL_OP1_SAT] = "sat", diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 770a4032..9039e9bc 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -312,6 +312,7 @@ enum hlsl_ir_expr_op HLSL_OP1_NEG, HLSL_OP1_NRM, HLSL_OP1_RCP, + HLSL_OP1_REINTERPRET, HLSL_OP1_ROUND, HLSL_OP1_RSQ, HLSL_OP1_SAT, diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 1bdc1433..bb98879e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2053,6 +2053,50 @@ static bool intrinsic_abs(struct hlsl_ctx *ctx, return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_ABS, params->args[0], loc); } +/* Find the type corresponding to the given source type, with the same + * dimensions but a different base type. */ +static struct hlsl_type *convert_numeric_type(const struct hlsl_ctx *ctx, + const struct hlsl_type *type, enum hlsl_base_type base_type) +{ + return hlsl_get_numeric_type(ctx, type->type, base_type, type->dimx, type->dimy); +} + +static bool intrinsic_asuint(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *operands[HLSL_MAX_OPERANDS] = {0}; + struct hlsl_type *data_type; + + if (params->args_count != 1 && params->args_count != 3) + { + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_WRONG_PARAMETER_COUNT, + "Wrong number of arguments to function 'asuint': expected 1 or 3, but got %u.", params->args_count); + return false; + } + + if (params->args_count == 3) + { + hlsl_fixme(ctx, loc, "Double-to-integer conversion."); + return false; + } + + data_type = params->args[0]->data_type; + if (data_type->base_type == HLSL_TYPE_BOOL || data_type->base_type == HLSL_TYPE_DOUBLE) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_type_to_string(ctx, data_type))) + hlsl_error(ctx, loc, VKD3D_SHADER_ERROR_HLSL_INVALID_TYPE, + "Wrong type for argument 0 of asuint(): expected 'int', 'uint', 'float', or 'half', but got '%s'.", + string->buffer); + hlsl_release_string_buffer(ctx, string); + } + data_type = convert_numeric_type(ctx, data_type, HLSL_TYPE_UINT); + + operands[0] = params->args[0]; + return add_expr(ctx, params->instrs, HLSL_OP1_REINTERPRET, operands, data_type, loc); +} + static bool intrinsic_clamp(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -2361,6 +2405,7 @@ intrinsic_functions[] = { /* Note: these entries should be kept in alphabetical order. */ {"abs", 1, true, intrinsic_abs}, + {"asuint", -1, true, intrinsic_asuint}, {"clamp", 3, true, intrinsic_clamp}, {"cross", 2, true, intrinsic_cross}, {"dot", 2, true, intrinsic_dot},

1 0

Zebediah Figura : tests: Add a test for asuint().
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: vkd3d Branch: master Commit: eb70f1aeb5816e746cb1336cadfbd37ddd9a0ec9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eb70f1aeb5816e746cb1336cadfbd… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 27 13:35:16 2022 -0500 tests: Add a test for asuint(). --- tests/asuint.shader_test | 55 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 12 +++++++---- 2 files changed, 63 insertions(+), 4 deletions(-) diff --git a/tests/asuint.shader_test b/tests/asuint.shader_test new file mode 100644 index 00000000..77385515 --- /dev/null +++ b/tests/asuint.shader_test @@ -0,0 +1,55 @@ +[require] +shader model >= 4.0 + +[pixel shader] + +float4 main(uniform float f, uniform int i, uniform uint u, uniform half h) : sv_target +{ + uint4 ret; + + ret.x = asuint(f); + ret.y = asuint(i); + ret.z = asuint(u); + ret.w = asuint(h); + return ret; +} + +[test] +uniform 0 uint4 123 0xc0000000 456 0x7fd69345 +todo draw quad +probe (320,240) rgba (123.0, 3221225472.0, 456.0, 2144768896.0) + + +[pixel shader] + +float4 main(uniform float2x2 m, uniform float4 v) : sv_target +{ + return float4(asuint(m)[0][1], asuint(v).y, 0, 0); +} + +[test] +uniform 0 uint4 11 12 0 0 +uniform 4 uint4 13 14 0 0 +uniform 8 uint4 20 21 22 23 +todo draw quad +probe (320,240) rgba (13.0, 21.0, 0.0, 0.0) + + +[pixel shader fail] + +float4 main() : sv_target +{ + bool b = true; + + return asuint(b); +} + + +[pixel shader fail] + +float4 main() : sv_target +{ + double d = 1.0; + + return asuint(b); +} diff --git a/tests/shader_runner.c b/tests/shader_runner.c index 25986b31..3fb677ce 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -557,7 +557,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) unsigned int offset; if (!sscanf(line, "%u", &offset)) - fatal_error("Unknown uniform type '%s'.\n", line); + fatal_error("Malformed uniform offset '%s'.\n", line); line = strchr(line, ' ') + 1; if (match_string(line, "float4", &line)) @@ -576,12 +576,12 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed float constant '%s'.\n", line); set_uniforms(runner, offset, 1, &f); } - else if (match_string(line, "int4", &line)) + else if (match_string(line, "int4", &line) || match_string(line, "uint4", &line)) { int v[4]; - if (sscanf(line, "%d %d %d %d", &v[0], &v[1], &v[2], &v[3]) < 4) - fatal_error("Malformed int4 constant '%s'.\n", line); + if (sscanf(line, "%i %i %i %i", &v[0], &v[1], &v[2], &v[3]) < 4) + fatal_error("Malformed (u)int4 constant '%s'.\n", line); set_uniforms(runner, offset, 4, v); } else if (match_string(line, "int", &line)) @@ -600,6 +600,10 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) fatal_error("Malformed uint constant '%s'.\n", line); set_uniforms(runner, offset, 1, &u); } + else + { + fatal_error("Unknown uniform type '%s'.\n", line); + } } else {

1 0

Jeremy Newman : take down wineconf post
by Alexandre Julliard 12 Oct '22

12 Oct '22

Module: website Branch: master Commit: 64c506f14d59cf9aa78030e22846266db9c73b1f URL: https://gitlab.winehq.org/winehq/winehq/-/commit/64c506f14d59cf9aa78030e228… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Oct 12 09:43:18 2022 -0500 take down wineconf post --- templates/en/home.template | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/templates/en/home.template b/templates/en/home.template index 255a8fd0..aead4387 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -169,14 +169,7 @@ <div class="whq-page-container margin-top-md"> - <h2 class="title"><a href="https://indico.freedesktop.org/event/2/page/11-overview">WineConf 2022</a></h2> - - <p>Come join us at the annual Wine developers conference being held in Minneapolis, MN on October 5th and 6th.<br> - This year, we are holding the conference in conjunction with <a href="https://www.x.org/">Xorg</a> and <a href="https://fossxr.dev/">FOSSXR</a>, so it should be an especially good time.</p> - - <p class="margin-bottom-md"><a href="https://indico.freedesktop.org/event/2/page/11-overview" class="btn btn-default"><i class="fa fa-info-circle"></i> Read More</a></p> - - <h2 class="title margin-top-md"><a href="{$root}/news">News and Updates</a></h2> + <h2 class="title"><a href="{$root}/news">News and Updates</a></h2>

1 0

Mark Jansen : gdi32: Fix possible overflow.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 4312be1646cad32548f855e25823857092bf31dc URL: https://gitlab.winehq.org/wine/wine/-/commit/4312be1646cad32548f855e2582385… Author: Mark Jansen <mark.jansen(a)reactos.org> Date: Mon Oct 3 13:42:23 2022 +0200 gdi32: Fix possible overflow. According to the documentation of ScriptShape function, the psva argument should have the number of elements indicated by cMaxGlyphs. --- dlls/gdi32/text.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index f2fcb41bcdf..b0134e529f5 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -471,7 +471,7 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ WARN("Out of memory\n"); goto cleanup; } - psva = HeapAlloc(GetProcessHeap(),0,sizeof(SCRIPT_VISATTR) * uCount); + psva = HeapAlloc(GetProcessHeap(),0,sizeof(SCRIPT_VISATTR) * cMaxGlyphs); if (!psva) { WARN("Out of memory\n"); @@ -604,16 +604,22 @@ static BOOL BIDI_Reorder( HDC hDC, /* [in] Display DC */ while (res == E_OUTOFMEMORY) { WORD *new_run_glyphs = HeapReAlloc(GetProcessHeap(), 0, run_glyphs, sizeof(*run_glyphs) * cMaxGlyphs * 2); - if (!new_run_glyphs) + SCRIPT_VISATTR *new_psva = HeapReAlloc(GetProcessHeap(), 0, psva, sizeof(*psva) * cMaxGlyphs * 2); + if (!new_run_glyphs || !new_psva) { WARN("Out of memory\n"); HeapFree(GetProcessHeap(), 0, runOrder); HeapFree(GetProcessHeap(), 0, visOrder); HeapFree(GetProcessHeap(), 0, *lpGlyphs); *lpGlyphs = NULL; + if (new_run_glyphs) + run_glyphs = new_run_glyphs; + if (new_psva) + psva = new_psva; goto cleanup; } run_glyphs = new_run_glyphs; + psva = new_psva; cMaxGlyphs *= 2; res = ScriptShape(hDC, &psc, lpString + done + curItem->iCharPos, cChars, cMaxGlyphs, &curItem->a, run_glyphs, pwLogClust, psva, &cOutGlyphs); }

1 0

Alexandre Julliard : ngen: Add version resource.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 46f307073eab42c7aa953f10892bdd1f041f420b URL: https://gitlab.winehq.org/wine/wine/-/commit/46f307073eab42c7aa953f10892bdd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 11 18:40:37 2022 +0200 ngen: Add version resource. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53773 --- programs/ngen/Makefile.in | 5 +++-- programs/ngen/version.rc | 27 +++++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/programs/ngen/Makefile.in b/programs/ngen/Makefile.in index ec3253c4627..0edb046831e 100644 --- a/programs/ngen/Makefile.in +++ b/programs/ngen/Makefile.in @@ -2,5 +2,6 @@ MODULE = ngen.exe EXTRADLLFLAGS = -mconsole -municode -C_SRCS = \ - ngen_main.c +SOURCES = \ + ngen_main.c \ + version.rc diff --git a/programs/ngen/version.rc b/programs/ngen/version.rc new file mode 100644 index 00000000000..a3b004c6eb9 --- /dev/null +++ b/programs/ngen/version.rc @@ -0,0 +1,27 @@ +/* + * Copyright (c) 2022 Alexandre Julliard + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine ngen" +#define WINE_FILENAME_STR "ngen.exe" +#define WINE_FILETYPE VFT_APP +#define WINE_FILEVERSION 2,0,50727,1433 +#define WINE_FILEVERSION_STR "2.0.50727.1433" +#define WINE_PRODUCTVERSION 2,0,50727,1433 +#define WINE_PRODUCTVERSION_STR "2.0.50727.1433" + +#include "wine/wine_common_ver.rc"

1 0

Francois Gouget : gdi32/tests: Mark tests failing randomly on Windows as flaky.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2d19baa6b57643e56c6e7982a4e43564d24dc7f3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d19baa6b57643e56c6e7982a4e435… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 09:01:48 2022 +0200 gdi32/tests: Mark tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=51313 --- dlls/gdi32/tests/driver.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index 3a300b4dff5..b2d2a0545ff 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -671,6 +671,7 @@ static void test_D3DKMTCheckOcclusion(void) ShowWindow(hwnd, SW_MINIMIZE); occlusion_desc.hWnd = hwnd; status = pD3DKMTCheckOcclusion(&occlusion_desc); + flaky ok(status == STATUS_SUCCESS, "Got unexpected return code %#lx.\n", status); ShowWindow(hwnd, SW_SHOWNORMAL);

1 0

Kevin Puetz : rpcrt4: Add a refcount owned by MIDL_STUB_MESSAGE.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: a7be4256f6081684e8fb0258564f9358eb36cfcf URL: https://gitlab.winehq.org/wine/wine/-/commit/a7be4256f6081684e8fb0258564f93… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Mon Oct 10 23:31:08 2022 +0000 rpcrt4: Add a refcount owned by MIDL_STUB_MESSAGE. In cases where this could have been use-after-free, exceptions were caught/hidden by RpcTryFinally, but still lead to leaks since NdrProxyFreeBuffer wasn't able to call IRPCChannelBuffer::FreeBuffer. StdProxy_GetChannel() now AddRef() on its return value (used to set __proxy_frame::_StubMsg::pRpcChannelBuffer), and NdrProxyFreeBuffer() calls the corresponding Release() and clears the now-weak pointer. This makes the behavior of these function match the observed test results, and fixes the crash/leak when a proxy is released mid-Invoke. --- dlls/rpcrt4/cproxy.c | 5 +++++ dlls/rpcrt4/tests/cstub.c | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index da3e19e50f3..426b1425d3a 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -454,6 +454,9 @@ static void StdProxy_GetChannel(LPVOID iface, StdProxyImpl *This = impl_from_proxy_obj( iface ); TRACE("(%p)->GetChannel(%p) %s\n",This,ppChannel,This->name); + if(This->pChannel) + IRpcChannelBuffer_AddRef(This->pChannel); + *ppChannel = This->pChannel; } @@ -585,6 +588,8 @@ void WINAPI NdrProxyFreeBuffer(void *This, (RPCOLEMESSAGE*)pStubMsg->RpcMsg); pStubMsg->fBufferValid = TRUE; } + IRpcChannelBuffer_Release(pStubMsg->pRpcChannelBuffer); + pStubMsg->pRpcChannelBuffer = NULL; } /*********************************************************************** diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 57e69389ebd..d44ee36088c 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1527,7 +1527,7 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) NdrProxyInitialize(proxy_if1, &rpcMessage, &stubMessage, &stubDesc, 0); /* stubMessage should add its own refcount on test_chanbuf */ - todo_wine ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); ok(stubMessage.pRpcChannelBuffer != NULL, "NULL pRocChannelBuffer\n"); /* stubMessage doesn't add its own refcounts on proxy_if1 or proxy_buffer, @@ -1536,17 +1536,17 @@ static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) * this unadvise could be reentrant to Invoke because SendReceive pumps STA messages. * The source would then erase that conection point entry and Release the proxy. */ IRpcProxyBuffer_Disconnect(proxy_buffer); - todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); IRpcProxyBuffer_Release(proxy_buffer); refs = IUnknown_Release(proxy_if1); ok(refs == 0, "got %ld\n", refs); - todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); /* NdrProxyFreeBuffer must not dereference the the now-freed proxy_if1, * yet should still free the remaining reference on test_chanbuf */ NdrProxyFreeBuffer(proxy_if1, &stubMessage); ok(test_chanbuf.RefCount == 0, "got %ld\n", test_chanbuf.RefCount); - todo_wine ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); + ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); } START_TEST( cstub )

1 0

Kevin Puetz : rpcrt4/tests: Add tests for lifetime of IRpcChannelBuffer.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 59f39b325d2d90c09c8b346ba241dab182084c7b URL: https://gitlab.winehq.org/wine/wine/-/commit/59f39b325d2d90c09c8b346ba241da… Author: Kevin Puetz <PuetzKevinA(a)JohnDeere.com> Date: Fri Sep 23 17:25:26 2022 +0000 rpcrt4/tests: Add tests for lifetime of IRpcChannelBuffer. It's possible for a proxy to be released during the middle of an Invoke. E.g. a specific case where this happened was a single-shot event sink which, upon receiving the event it was waiting for, would immediately call DispEventUnadvise. This removed the proxy pointing to that sink from the connection point's list of subscribers and released the last refcount on the proxy itself. Therefore, all state used to complete an RPC call must be on the stack; once NdrProxySendReceive pumps STA messages and permits reentrancy, the proxy cannot be accessed or relied on to own anything. Add test showing MIDL_STUB_MESSAGE::pRpcChannelBuffer owns a refcount (to ensure it can read [out] parameters from the channel) --- dlls/rpcrt4/tests/cstub.c | 135 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index d8b61d10a1a..57e69389ebd 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1415,6 +1415,140 @@ static void test_delegated_methods(void) ok(hr == S_OK, "got %#lx\n", hr); } +typedef struct tagChannelBufferRefCount +{ + IRpcChannelBuffer IRpcChannelBuffer_iface; + LONG RefCount; +} CChannelBufferRefCount; + +static CChannelBufferRefCount* impl_from_IRpcChannelBuffer(IRpcChannelBuffer* iface) +{ + return CONTAINING_RECORD(iface, CChannelBufferRefCount, IRpcChannelBuffer_iface); +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_query_interface(IRpcChannelBuffer* pchan, + REFIID iid, + void** ppv) +{ + if (IsEqualGUID(&IID_IRpcChannelBuffer, iid)) + { + *ppv = pchan; + IRpcChannelBuffer_AddRef(pchan); + return S_OK; + } + return E_NOINTERFACE; +} + +static ULONG WINAPI test_chanbuf_refcount_chan_add_ref(IRpcChannelBuffer* pchan) +{ + CChannelBufferRefCount* This = impl_from_IRpcChannelBuffer(pchan); + return InterlockedIncrement(&This->RefCount); +} + +static ULONG WINAPI test_chanbuf_refcount_chan_release(IRpcChannelBuffer* pchan) +{ + CChannelBufferRefCount* This = impl_from_IRpcChannelBuffer(pchan); + return InterlockedDecrement(&This->RefCount); +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_get_buffer(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* msg, + REFIID iid) +{ + ok(0, "call to GetBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_send_receive(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* pMessage, + ULONG* pStatus) +{ + ok(0, "call to SendReceive not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_free_buffer(IRpcChannelBuffer* pchan, + RPCOLEMESSAGE* pMessage) +{ + ok(0, "call to FreeBuffer not expected\n"); + return E_NOTIMPL; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_get_dest_ctx(IRpcChannelBuffer* pchan, + DWORD* pdwDestContext, + void** ppvDestContext) +{ + *pdwDestContext = MSHCTX_LOCAL; + *ppvDestContext = NULL; + return S_OK; +} + +static HRESULT WINAPI test_chanbuf_refcount_chan_is_connected(IRpcChannelBuffer* pchan) +{ + ok(0, "call to IsConnected not expected\n"); + return E_NOTIMPL; +} + +static IRpcChannelBufferVtbl test_chanbuf_refcount_test_rpc_chan_vtbl = +{ + test_chanbuf_refcount_chan_query_interface, + test_chanbuf_refcount_chan_add_ref, + test_chanbuf_refcount_chan_release, + test_chanbuf_refcount_chan_get_buffer, + test_chanbuf_refcount_chan_send_receive, + test_chanbuf_refcount_chan_free_buffer, + test_chanbuf_refcount_chan_get_dest_ctx, + test_chanbuf_refcount_chan_is_connected +}; + +static void test_ChannelBufferRefCount(IPSFactoryBuffer *ppsf) +{ + IRpcProxyBuffer* proxy_buffer = NULL; + IUnknown* proxy_if1 = NULL; + CChannelBufferRefCount test_chanbuf = {{&test_chanbuf_refcount_test_rpc_chan_vtbl}, 1}; + + RPC_MESSAGE rpcMessage = {0}; + MIDL_STUB_MESSAGE stubMessage = {0}; + MIDL_STUB_DESC stubDesc = {0}; + ULONG refs; + + HRESULT hr = IPSFactoryBuffer_CreateProxy(ppsf, NULL, &IID_if1, &proxy_buffer, (void**)&proxy_if1); + ok(hr == S_OK, "got %#lx\n", hr); + + ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + hr = IRpcProxyBuffer_Connect(proxy_buffer, &test_chanbuf.IRpcChannelBuffer_iface); + ok(hr == S_OK, "got %#lx\n", hr); + /* proxy_buffer should have acquired its own refcount on test_chanbuf */ + ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + + /* which therefore survives releasing the initial one */ + refs = IRpcChannelBuffer_Release(&test_chanbuf.IRpcChannelBuffer_iface); + ok(refs == 1, "got %ld\n", refs); + + NdrProxyInitialize(proxy_if1, &rpcMessage, &stubMessage, &stubDesc, 0); + /* stubMessage should add its own refcount on test_chanbuf */ + todo_wine ok(test_chanbuf.RefCount == 2, "got %ld\n", test_chanbuf.RefCount); + ok(stubMessage.pRpcChannelBuffer != NULL, "NULL pRocChannelBuffer\n"); + + /* stubMessage doesn't add its own refcounts on proxy_if1 or proxy_buffer, + * so it's possible these are freed out from under it. + * E.g. an event sink might unadvise upon receiving the event it was waiting for; + * this unadvise could be reentrant to Invoke because SendReceive pumps STA messages. + * The source would then erase that conection point entry and Release the proxy. */ + IRpcProxyBuffer_Disconnect(proxy_buffer); + todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + IRpcProxyBuffer_Release(proxy_buffer); + refs = IUnknown_Release(proxy_if1); + ok(refs == 0, "got %ld\n", refs); + todo_wine ok(test_chanbuf.RefCount == 1, "got %ld\n", test_chanbuf.RefCount); + + /* NdrProxyFreeBuffer must not dereference the the now-freed proxy_if1, + * yet should still free the remaining reference on test_chanbuf */ + NdrProxyFreeBuffer(proxy_if1, &stubMessage); + ok(test_chanbuf.RefCount == 0, "got %ld\n", test_chanbuf.RefCount); + todo_wine ok(!stubMessage.pRpcChannelBuffer, "dangling pRpcChannelBuffer = %p\n", stubMessage.pRpcChannelBuffer); +} + START_TEST( cstub ) { IPSFactoryBuffer *ppsf; @@ -1440,6 +1574,7 @@ START_TEST( cstub ) test_delegating_Invoke(ppsf); test_NdrDllRegisterProxy(); test_delegated_methods(); + test_ChannelBufferRefCount(ppsf); OleUninitialize(); }

1 0

Etaash Mathamsetty : ntoskrnl.exe: KeInsertQueueDpc stub.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 92d74369c89aaedd2fa13bfaa036c62bbb079884 URL: https://gitlab.winehq.org/wine/wine/-/commit/92d74369c89aaedd2fa13bfaa036c6… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Mon Oct 10 21:09:24 2022 -0400 ntoskrnl.exe: KeInsertQueueDpc stub. --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index fd18ea706c2..6f5564042a6 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -2569,6 +2569,15 @@ LONG WINAPI KeInsertQueue(PRKQUEUE Queue, PLIST_ENTRY Entry) return 0; } +/*********************************************************************** + * KeInsertQueueDpc (NTOSKRNL.EXE.@) + */ +BOOLEAN WINAPI KeInsertQueueDpc(PRKDPC Dpc, PVOID SystemArgument1, PVOID SystemArgument2) +{ + FIXME( "stub: (%p %p %p)\n", Dpc, SystemArgument1, SystemArgument2 ); + return TRUE; +} + /********************************************************************** * KeQueryActiveProcessors (NTOSKRNL.EXE.@) * diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index a1a42d52fd1..8f8edcac7a0 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -587,7 +587,7 @@ @ stub KeInsertHeadQueue @ stdcall KeInsertQueue(ptr ptr) @ stub KeInsertQueueApc -@ stub KeInsertQueueDpc +@ stdcall KeInsertQueueDpc(ptr ptr ptr) @ stub KeIsAttachedProcess @ stub KeIsExecutingDpc @ stdcall KeLeaveCriticalRegion()

1 0

Alistair Leslie-Hughes : include: Add missing SP defines.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 64c930ab3e8a322f4f1c437ba6ba47c9742d657f URL: https://gitlab.winehq.org/wine/wine/-/commit/64c930ab3e8a322f4f1c437ba6ba47… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Tue Oct 11 16:05:02 2022 +1100 include: Add missing SP defines. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49775 --- include/sperror.h | 138 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 134 insertions(+), 4 deletions(-) diff --git a/include/sperror.h b/include/sperror.h index 4b247994ba0..cd8ed9b948d 100644 --- a/include/sperror.h +++ b/include/sperror.h @@ -23,9 +23,139 @@ #include <winerror.h> -#define SPERR_UNINITIALIZED 0x80045001 -#define SPERR_ALREADY_INITIALIZED 0x80045002 -#define SPERR_NOT_FOUND 0x8004503a -#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SP_END_OF_STREAM 0x00045005 +#define SP_INSUFFICIENT_DATA 0x0004500b +#define SP_AUDIO_PAUSED 0x00045010 +#define SP_AUDIO_CONVERSION_ENABLED 0x00045015 +#define SP_NO_HYPOTHESIS_AVAILABLE 0x00045016 +#define SP_ALREADY_IN_LEX 0x00045018 +#define SP_LEX_NOTHING_TO_SYNC 0x0004501a +#define SP_REQUEST_PENDING 0x00045026 +#define SP_NO_PARSE_FOUND 0x0004502c +#define SP_UNSUPPORTED_ON_STREAM_INPUT 0x00045034 +#define SP_WORD_EXISTS_WITHOUT_PRONUNCIATION 0x00045037 +#define SP_RECOGNIZER_INACTIVE 0x0004504e +#define SP_PARTIAL_PARSE_FOUND 0x00045053 +#define SP_NO_RULE_ACTIVE 0x00045055 +#define SP_STREAM_UNINITIALIZED 0x00045057 +#define SP_AUDIO_STOPPED 0x00045065 +#define SP_COMPLETE_BUT_EXTENDABLE 0x00045074 +#define SP_NO_RULES_TO_ACTIVATE 0x0004507b +#define SP_NO_WORDENTRY_NOTIFICATION 0x0004507c +#define S_LIMIT_REACHED 0x0004507f +#define S_NOTSUPPORTED 0x00045080 + +#define SPERR_UNINITIALIZED 0x80045001 +#define SPERR_ALREADY_INITIALIZED 0x80045002 +#define SPERR_INVALID_FLAGS 0x80045004 +#define SPERR_DEVICE_BUSY 0x80045006 +#define SPERR_DEVICE_NOT_SUPPORTED 0x80045007 +#define SPERR_DEVICE_NOT_ENABLED 0x80045008 +#define SPERR_NO_DRIVER 0x80045009 +#define SPERR_FILE_MUST_BE_UNICODE 0x8004500a +#define SPERR_INVALID_PHRASE_ID 0x8004500c +#define SPERR_BUFFER_TOO_SMALL 0x8004500d +#define SPERR_FORMAT_NOT_SPECIFIED 0x8004500e +#define SPERR_AUDIO_STOPPED 0x8004500f +#define SPERR_RULE_NOT_FOUND 0x80045011 +#define SPERR_TTS_ENGINE_EXCEPTION 0x80045012 +#define SPERR_TTS_NLP_EXCEPTION 0x80045013 +#define SPERR_ENGINE_BUSY 0x80045014 +#define SPERR_CANT_CREATE 0x80045017 +#define SPERR_NOT_IN_LEX 0x80045019 +#define SPERR_LEX_VERY_OUT_OF_SYNC 0x8004501b +#define SPERR_UNDEFINED_FORWARD_RULE_REF 0x8004501c +#define SPERR_EMPTY_RULE 0x8004501d +#define SPERR_GRAMMAR_COMPILER_INTERNAL_ERROR 0x8004501e +#define SPERR_RULE_NOT_DYNAMIC 0x8004501f +#define SPERR_DUPLICATE_RULE_NAME 0x80045020 +#define SPERR_DUPLICATE_RESOURCE_NAME 0x80045021 +#define SPERR_TOO_MANY_GRAMMARS 0x80045022 +#define SPERR_CIRCULAR_REFERENCE 0x80045023 +#define SPERR_INVALID_IMPORT 0x80045024 +#define SPERR_INVALID_WAV_FILE 0x80045025 +#define SPERR_ALL_WORDS_OPTIONAL 0x80045027 +#define SPERR_INSTANCE_CHANGE_INVALID 0x80045028 +#define SPERR_RULE_NAME_ID_CONFLICT 0x80045029 +#define SPERR_NO_RULES 0x8004502a +#define SPERR_CIRCULAR_RULE_REF 0x8004502b +#define SPERR_INVALID_HANDLE 0x8004502d +#define SPERR_REMOTE_CALL_TIMED_OUT 0x8004502e +#define SPERR_AUDIO_BUFFER_OVERFLOW 0x8004502f +#define SPERR_NO_AUDIO_DATA 0x80045030 +#define SPERR_DEAD_ALTERNATE 0x80045031 +#define SPERR_HIGH_LOW_CONFIDENCE 0x80045032 +#define SPERR_INVALID_FORMAT_STRING 0x80045033 +#define SPERR_APPLEX_READ_ONLY 0x80045035 +#define SPERR_NO_TERMINATING_RULE_PATH 0x80045036 +#define SPERR_STREAM_CLOSED 0x80045038 +#define SPERR_NO_MORE_ITEMS 0x80045039 +#define SPERR_NOT_FOUND 0x8004503a +#define SPERR_INVALID_AUDIO_STATE 0x8004503b +#define SPERR_GENERIC_MMSYS_ERROR 0x8004503c +#define SPERR_MARSHALER_EXCEPTION 0x8004503d +#define SPERR_NOT_DYNAMIC_GRAMMAR 0x8004503e +#define SPERR_AMBIGUOUS_PROPERTY 0x8004503f +#define SPERR_INVALID_REGISTRY_KEY 0x80045040 +#define SPERR_INVALID_TOKEN_ID 0x80045041 +#define SPERR_XML_BAD_SYNTAX 0x80045042 +#define SPERR_XML_RESOURCE_NOT_FOUND 0x80045043 +#define SPERR_TOKEN_IN_USE 0x80045044 +#define SPERR_TOKEN_DELETED 0x80045045 +#define SPERR_MULTI_LINGUAL_NOT_SUPPORTED 0x80045046 +#define SPERR_EXPORT_DYNAMIC_RULE 0x80045047 +#define SPERR_STGF_ERROR 0x80045048 +#define SPERR_WORDFORMAT_ERROR 0x80045049 +#define SPERR_STREAM_NOT_ACTIVE 0x8004504a +#define SPERR_ENGINE_RESPONSE_INVALID 0x8004504b +#define SPERR_SR_ENGINE_EXCEPTION 0x8004504c +#define SPERR_STREAM_POS_INVALID 0x8004504d +#define SPERR_REMOTE_CALL_ON_WRONG_THREAD 0x8004504f +#define SPERR_REMOTE_PROCESS_TERMINATED 0x80045050 +#define SPERR_REMOTE_PROCESS_ALREADY_RUNNING 0x80045051 +#define SPERR_LANGID_MISMATCH 0x80045052 +#define SPERR_NOT_TOPLEVEL_RULE 0x80045054 +#define SPERR_LEX_REQUIRES_COOKIE 0x80045056 +#define SPERR_UNSUPPORTED_LANG 0x80045059 +#define SPERR_VOICE_PAUSED 0x8004505a +#define SPERR_AUDIO_BUFFER_UNDERFLOW 0x8004505b +#define SPERR_AUDIO_STOPPED_UNEXPECTEDLY 0x8004505c +#define SPERR_NO_WORD_PRONUNCIATION 0x8004505d +#define SPERR_ALTERNATES_WOULD_BE_INCONSISTENT 0x8004505e +#define SPERR_NOT_SUPPORTED_FOR_SHARED_RECOGNIZER 0x8004505f +#define SPERR_TIMEOUT 0x80045060 +#define SPERR_REENTER_SYNCHRONIZE 0x80045061 +#define SPERR_STATE_WITH_NO_ARCS 0x80045062 +#define SPERR_NOT_ACTIVE_SESSION 0x80045063 +#define SPERR_ALREADY_DELETED 0x80045064 +#define SPERR_RECOXML_GENERATION_FAIL 0x80045066 +#define SPERR_SML_GENERATION_FAIL 0x80045067 +#define SPERR_NOT_PROMPT_VOICE 0x80045068 +#define SPERR_ROOTRULE_ALREADY_DEFINED 0x80045069 +#define SPERR_SCRIPT_DISALLOWED 0x80045070 +#define SPERR_REMOTE_CALL_TIMED_OUT_START 0x80045071 +#define SPERR_REMOTE_CALL_TIMED_OUT_CONNECT 0x80045072 +#define SPERR_SECMGR_CHANGE_NOT_ALLOWED 0x80045073 +#define SPERR_FAILED_TO_DELETE_FILE 0x80045075 +#define SPERR_SHARED_ENGINE_DISABLED 0x80045076 +#define SPERR_RECOGNIZER_NOT_FOUND 0x80045077 +#define SPERR_AUDIO_NOT_FOUND 0x80045078 +#define SPERR_NO_VOWEL 0x80045079 +#define SPERR_UNSUPPORTED_PHONEME 0x8004507a +#define SPERR_WORD_NEEDS_NORMALIZATION 0x8004507d +#define SPERR_CANNOT_NORMALIZE 0x8004507e +#define SPERR_TOPIC_NOT_ADAPTABLE 0x80045081 +#define SPERR_PHONEME_CONVERSION 0x80045082 +#define SPERR_NOT_SUPPORTED_FOR_INPROC_RECOGNIZER 0x80045083 +#define SPERR_OVERLOAD 0x80045084 +#define SPERR_LEX_INVALID_DATA 0x80045085 +#define SPERR_CFG_INVALID_DATA 0x80045086 +#define SPERR_LEX_UNEXPECTED_FORMAT 0x80045087 +#define SPERR_STRING_TOO_LONG 0x80045088 +#define SPERR_STRING_EMPTY 0x80045089 +#define SPERR_NON_WORD_TRANSITION 0x80045090 +#define SPERR_SISR_ATTRIBUTES_NOT_ALLOWED 0x80045091 +#define SPERR_SISR_MIXED_NOT_ALLOWED 0x80045092 +#define SPERR_VOICE_NOT_FOUND 0x80045093 #endif /* SPError_h */

1 0

Gabriel Ivăncescu : shell32: Handle drive letters properly when parsing MyComputer.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 075f80653b2db8c03dc89a023a5d60912c6e622e URL: https://gitlab.winehq.org/wine/wine/-/commit/075f80653b2db8c03dc89a023a5d60… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32: Handle drive letters properly when parsing MyComputer. Besides PathGetDriveNumber being dangerous and having a completely messed up result with \\?\ prefix, a backslash is not required anymore on newer Windows versions. So e.g. C: should succeed to be parsed. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/shfldr_desktop.c | 5 +++-- dlls/shell32/shfldr_mycomp.c | 20 ++++++++++++-------- dlls/shell32/tests/shfldr_special.c | 2 -- dlls/shell32/tests/shlfolder.c | 4 ++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index 7bf54c4e7d0..f4df3ed0190 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -151,7 +151,7 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, DWORD * pchEaten, LPITEMIDLIST * ppidl, DWORD * pdwAttributes) { IDesktopFolderImpl *This = impl_from_IShellFolder2(iface); - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPCWSTR szNext = NULL; LPITEMIDLIST pidlTemp = NULL; PARSEDURLW urldata; @@ -179,7 +179,8 @@ static HRESULT WINAPI ISF_Desktop_fnParseDisplayName (IShellFolder2 * iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - else if (PathGetDriveNumberW (lpszDisplayName) >= 0) + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && lpszDisplayName[1] == ':') { /* it's a filesystem path with a drive. Let MyComputer/UnixDosFolder parse it */ pidlTemp = _ILCreateMyComputer (); diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 5b90458e145..2f4ebd580c1 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -189,7 +189,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, IMyComputerFolderImpl *This = impl_from_IShellFolder2(iface); HRESULT hr = E_INVALIDARG; LPCWSTR szNext = NULL; - WCHAR szElement[MAX_PATH]; + WCHAR c, szElement[MAX_PATH]; LPITEMIDLIST pidlTemp = NULL; CLSID clsid; @@ -209,13 +209,17 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, SHCLSIDFromStringW (szElement + 2, &clsid); pidlTemp = _ILCreateGuid (PT_GUID, &clsid); } - /* do we have an absolute path name ? */ - else if (PathGetDriveNumberW (lpszDisplayName) >= 0 && - lpszDisplayName[2] == (WCHAR) '\\') + /* we can't use PathGetDriveNumberW because we can't have the \\?\ prefix */ + else if ((c = towupper(lpszDisplayName[0])) >= 'A' && c <= 'Z' && + lpszDisplayName[1] == ':' && + (lpszDisplayName[2] == '\\' || lpszDisplayName[2] == '\0')) { - szNext = GetNextElementW (lpszDisplayName, szElement, MAX_PATH); - /* make drive letter uppercase to enable PIDL comparison */ - szElement[0] = toupper(szElement[0]); + /* drive letter has to be uppercase to enable PIDL comparison */ + szElement[0] = c; + szElement[1] = ':'; + szElement[2] = '\\'; + szElement[3] = '\0'; + szNext = &lpszDisplayName[2] + (lpszDisplayName[2] == '\\'); pidlTemp = _ILCreateDrive (szElement); } @@ -224,7 +228,7 @@ static HRESULT WINAPI ISF_MyComputer_fnParseDisplayName (IShellFolder2 *iface, hr = SHELL32_ParseNextElement (iface, hwndOwner, pbc, &pidlTemp, (LPOLESTR) szNext, pchEaten, pdwAttributes); } - else + else if (pidlTemp) { if (pdwAttributes && *pdwAttributes) SHELL32_GetItemAttributes (&This->IShellFolder2_iface, pidlTemp, pdwAttributes); diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index 99d6e8c62a4..22749c231f3 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -85,7 +85,6 @@ static void test_parse_for_my_computer(void) pidl = NULL; eaten = 0xdeadbeef; hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); - todo_wine ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); @@ -101,7 +100,6 @@ static void test_parse_for_my_computer(void) "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); todo_wine ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); - todo_wine ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); ILFree(pidl); diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 02a5c0dfb2d..248fbd1df62 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -199,8 +199,8 @@ static struct {{'c',':','\\',0}, S_OK}, {{'c',':','\\','\\',0}, E_INVALIDARG, 1}, {{'c',':','\\','f','a','k','e',0}, 0x80070002}, /* ERROR_FILE_NOT_FOUND */ - {{'c',':','f','a','k','e',0}, E_INVALIDARG, 1}, - {{'c',':','/',0}, E_INVALIDARG, 1}, + {{'c',':','f','a','k','e',0}, E_INVALIDARG}, + {{'c',':','/',0}, E_INVALIDARG}, {{'c',':','\\','w','i','n','d','o','w','s',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\',0}, S_OK}, {{'c',':','\\','w','i','n','d','o','w','s','\\','.',0}, E_INVALIDARG, 1},

1 0

Gabriel Ivăncescu : shell32/tests: Test drive letters parsing for My Computer.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2b2c09a01c480aa07bee9cb0184929bbdb8239e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2b2c09a01c480aa07bee9cb0184929… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 21:52:23 2022 +0300 shell32/tests: Test drive letters parsing for My Computer. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/tests/shfldr_special.c | 71 +++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) diff --git a/dlls/shell32/tests/shfldr_special.c b/dlls/shell32/tests/shfldr_special.c index cc0bb20ff33..99d6e8c62a4 100644 --- a/dlls/shell32/tests/shfldr_special.c +++ b/dlls/shell32/tests/shfldr_special.c @@ -39,6 +39,76 @@ static inline BOOL SHELL_OsIsUnicode(void) return !(GetVersion() & 0x80000000); } +/* Tests for My Computer */ +static void test_parse_for_my_computer(void) +{ + WCHAR path[] = { '\\','\\','?','\\','C',':','\\',0 }; + IShellFolder *mycomp, *sf; + WCHAR *drive = path + 4; + ITEMIDLIST *pidl; + DWORD eaten; + HRESULT hr; + + hr = SHGetDesktopFolder(&sf); + ok(hr == S_OK, "SHGetDesktopFolder failed with error 0x%lx\n", hr); + if (hr != S_OK) return; + hr = SHGetSpecialFolderLocation(NULL, CSIDL_DRIVES, &pidl); + ok(hr == S_OK, "SHGetSpecialFolderLocation failed with error 0x%lx\n", hr); + if (hr != S_OK) + { + IShellFolder_Release(sf); + return; + } + hr = IShellFolder_BindToObject(sf, pidl, NULL, &IID_IShellFolder, (void**)&mycomp); + ok(hr == S_OK, "IShellFolder::BindToObject failed with error 0x%lx\n", hr); + IShellFolder_Release(sf); + ILFree(pidl); + if (hr != S_OK) return; + + while (drive[0] <= 'Z' && GetDriveTypeW(drive) == DRIVE_NO_ROOT_DIR) drive[0]++; + if (drive[0] > 'Z') + { + skip("No drive found, skipping My Computer tests...\n"); + goto done; + } + + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK, "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl != NULL, "pidl is NULL\n"); + ILFree(pidl); + + /* \\?\ prefix is not valid */ + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, path, &eaten, &pidl, NULL); + todo_wine + ok(hr == E_INVALIDARG, "IShellFolder::ParseDisplayName should have failed with E_INVALIDARG, got 0x%08lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + ok(pidl == NULL, "pidl is not NULL\n"); + ILFree(pidl); + + /* Try without backslash */ + drive[2] = '\0'; + pidl = NULL; + eaten = 0xdeadbeef; + hr = IShellFolder_ParseDisplayName(mycomp, NULL, NULL, drive, &eaten, &pidl, NULL); + ok(hr == S_OK || broken(hr == E_INVALIDARG) /* WinXP */, + "IShellFolder::ParseDisplayName failed with error 0x%lx\n", hr); + todo_wine + ok(eaten == 0xdeadbeef, "eaten should not have been set to %lu\n", eaten); + todo_wine + ok(pidl != NULL || broken(!pidl) /* WinXP */, "pidl is NULL\n"); + ILFree(pidl); + +done: + IShellFolder_Release(mycomp); +} + /* Tests for My Network Places */ static void test_parse_for_entire_network(void) { @@ -294,6 +364,7 @@ static void test_desktop_displaynameof(void) START_TEST(shfldr_special) { + test_parse_for_my_computer(); test_parse_for_entire_network(); test_parse_for_control_panel(); test_printers_folder();

1 0

Francois Gouget : dxgi/tests: Mark the test_swapchain_window_messages() tests failing randomly on Windows as flaky.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6ec99a0e912fe09e08858514cbff0182f956b081 URL: https://gitlab.winehq.org/wine/wine/-/commit/6ec99a0e912fe09e08858514cbff01… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:11:39 2022 +0200 dxgi/tests: Mark the test_swapchain_window_messages() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53229 --- dlls/dxgi/tests/dxgi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 8c16cd37d45..73ea891119f 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -5817,6 +5817,7 @@ static BOOL check_message(const struct message *expected, static LRESULT CALLBACK test_wndproc(HWND hwnd, unsigned int message, WPARAM wparam, LPARAM lparam) { + flaky ok(!expect_no_messages, "Got unexpected message %#x, hwnd %p, wparam %#Ix, lparam %#Ix.\n", message, hwnd, wparam, lparam);

1 0

Francois Gouget : dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 5b10cb08a5d0a911be465cba071cb9d2149d336d URL: https://gitlab.winehq.org/wine/wine/-/commit/5b10cb08a5d0a911be465cba071cb9… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 11:07:41 2022 +0200 dxgi/tests: Mark the test_swapchain_window_styles() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53228 --- dlls/dxgi/tests/dxgi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index 1874bcc0834..8c16cd37d45 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6120,6 +6120,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6136,6 +6137,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6164,6 +6166,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); + flaky_if(i == 4) ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); @@ -6190,7 +6193,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle); } @@ -6206,7 +6209,7 @@ static void test_swapchain_window_styles(void) exstyle = GetWindowLongA(swapchain_desc.OutputWindow, GWL_EXSTYLE); todo_wine ok(style == tests[i].expected_style, "Got unexpected style %#lx, expected %#lx.\n", style, tests[i].expected_style); - todo_wine + flaky_if(i == 4) todo_wine ok(exstyle == tests[i].expected_exstyle, "Got unexpected exstyle %#lx, expected %#lx.\n", exstyle, tests[i].expected_exstyle);

1 0

Paul Gofman : wined3d: Replace NULL device_window with focus window in swapchain desc.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6b5193558960da860903138e1fdcd099ea364c70 URL: https://gitlab.winehq.org/wine/wine/-/commit/6b5193558960da860903138e1fdcd0… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 28 14:01:27 2022 -0500 wined3d: Replace NULL device_window with focus window in swapchain desc. --- dlls/d3d9/tests/device.c | 6 +++--- dlls/wined3d/device.c | 10 ++++++---- dlls/wined3d/swapchain.c | 8 +++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d42b210b01f..5c4417a2568 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1354,7 +1354,7 @@ static void test_swapchain(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); + ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12242,7 +12242,7 @@ static void test_swapchain_parameters(void) hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); @@ -12283,7 +12283,7 @@ static void test_swapchain_parameters(void) ok(hr == D3D_OK, "Got hr %#lx.\n", hr); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); ok(hr == D3D_OK, "Got hr %#lx.\n", hr); - todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", present_parameters2.hDeviceWindow, window); IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1c18177d62..c314292031d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5582,6 +5582,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, struct wined3d_view_desc view_desc; BOOL backbuffer_resized, windowed; HRESULT hr = WINED3D_OK; + HWND device_window; unsigned int i; TRACE("device %p, swapchain_desc %p, mode %p, callback %p, reset_state %#x.\n", @@ -5658,12 +5659,13 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, current_desc->refresh_rate = swapchain_desc->refresh_rate; current_desc->auto_restore_display_mode = swapchain_desc->auto_restore_display_mode; - if (swapchain_desc->device_window && swapchain_desc->device_window != current_desc->device_window) + device_window = swapchain_desc->device_window ? swapchain_desc->device_window : device->create_parms.focus_window; + if (device_window && device_window != current_desc->device_window) { TRACE("Changing the device window from %p to %p.\n", - current_desc->device_window, swapchain_desc->device_window); - current_desc->device_window = swapchain_desc->device_window; - swapchain_state->device_window = swapchain_desc->device_window; + current_desc->device_window, device_window); + current_desc->device_window = device_window; + swapchain_state->device_window = device_window; wined3d_swapchain_set_window(swapchain, NULL); } diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 80e630fd41e..e40707c0e54 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1459,7 +1459,13 @@ static HRESULT wined3d_swapchain_init(struct wined3d_swapchain *swapchain, struc && desc->swap_effect != WINED3D_SWAP_EFFECT_COPY) FIXME("Unimplemented swap effect %#x.\n", desc->swap_effect); - window = desc->device_window ? desc->device_window : device->create_parms.focus_window; + if (!desc->device_window) + { + TRACE("Updating device_window to %p.\n", device->create_parms.focus_window); + desc->device_window = device->create_parms.focus_window; + } + window = desc->device_window; + if (FAILED(hr = wined3d_swapchain_state_init(&swapchain->state, desc, window, device->wined3d, state_parent))) { ERR("Failed to initialise swapchain state, hr %#x.\n", hr);

1 0

Paul Gofman : d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 832383f5cd329b9187dc73c785dc17a487a3b163 URL: https://gitlab.winehq.org/wine/wine/-/commit/832383f5cd329b9187dc73c785dc17… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Sep 27 18:31:20 2022 -0500 d3d9/tests: Add test for NULL hDeviceWindow in presentation parameters. --- dlls/d3d9/tests/device.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index c824edec9df..d42b210b01f 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1348,9 +1348,13 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain2); - ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain2, &d3dpp); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(d3dpp.hDeviceWindow == window, "Got window %p, expected %p.\n", d3dpp.hDeviceWindow, window); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice9_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -12208,7 +12212,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters_windowed.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters_windowed.hDeviceWindow = window; + present_parameters_windowed.hDeviceWindow = NULL; present_parameters_windowed.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters_windowed.SwapEffect = D3DSWAPEFFECT_COPY; present_parameters_windowed.Windowed = TRUE; @@ -12219,7 +12223,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12237,7 +12241,9 @@ static void test_swapchain_parameters(void) ok(SUCCEEDED(hr), "Failed to get swapchain, hr %#lx, test %u.\n", hr, i); hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); - ok(SUCCEEDED(hr), "Failed to get present parameters, hr %#lx, test %u.\n", hr, i); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); ok(present_parameters2.SwapEffect == tests[i].swap_effect, "Swap effect changed from %u to %u, test %u.\n", tests[i].swap_effect, present_parameters2.SwapEffect, i); ok(present_parameters2.BackBufferCount == bb_count, "Backbuffer count changed from %u to %u, test %u.\n", @@ -12256,7 +12262,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -12268,9 +12274,18 @@ static void test_swapchain_parameters(void) if (FAILED(hr)) { + present_parameters_windowed.hDeviceWindow = NULL; hr = IDirect3DDevice9_Reset(device, &present_parameters_windowed); ok(SUCCEEDED(hr), "Failed to reset device, hr %#lx, test %u.\n", hr, i); } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &present_parameters2); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); + todo_wine ok(present_parameters2.hDeviceWindow == window, "Got window %p, expected %p.\n", + present_parameters2.hDeviceWindow, window); + IDirect3DSwapChain9_Release(swapchain); IDirect3DDevice9_Release(device); }

1 0

Paul Gofman : d3d8/tests: Add test for NULL hDeviceWindow in presentation parameters.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 4d4a4ff5b978c0ddbd020fea9fd6d8f147fe5579 URL: https://gitlab.winehq.org/wine/wine/-/commit/4d4a4ff5b978c0ddbd020fea9fd6d8… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Sep 28 13:58:31 2022 -0500 d3d8/tests: Add test for NULL hDeviceWindow in presentation parameters. --- dlls/d3d8/tests/device.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 4f362ad5ea5..12d8aeb89f6 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -413,9 +413,10 @@ static void test_swapchain(void) ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); ok(d3dpp.BackBufferCount == 1, "The back buffer count in the presentparams struct is %d\n", d3dpp.BackBufferCount); + d3dpp.hDeviceWindow = NULL; d3dpp.BackBufferCount = 1; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain2); - ok(SUCCEEDED(hr), "Got hr %#lx.\n", hr); + ok(hr == D3D_OK, "Got hr %#lx.\n", hr); d3dpp.BackBufferCount = 2; hr = IDirect3DDevice8_CreateAdditionalSwapChain(device, &d3dpp, &swapchain3); @@ -8714,6 +8715,7 @@ static void test_swapchain_parameters(void) present_parameters_windowed.Windowed = TRUE; present_parameters_windowed.BackBufferCount = 1; + for (i = 0; i < ARRAY_SIZE(tests); ++i) { UINT bb_count = tests[i].backbuffer_count ? tests[i].backbuffer_count : 1; @@ -8721,7 +8723,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect; @@ -8752,7 +8754,7 @@ static void test_swapchain_parameters(void) memset(&present_parameters, 0, sizeof(present_parameters)); present_parameters.BackBufferWidth = registry_mode.dmPelsWidth; present_parameters.BackBufferHeight = registry_mode.dmPelsHeight; - present_parameters.hDeviceWindow = window; + present_parameters.hDeviceWindow = NULL; present_parameters.BackBufferFormat = D3DFMT_X8R8G8B8; present_parameters.SwapEffect = tests[i].swap_effect;

1 0

Paul Gofman : wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2c9ab24366907a95f5741c20beaaee7eabc765ff URL: https://gitlab.winehq.org/wine/wine/-/commit/2c9ab24366907a95f5741c20beaaee… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:37:51 2022 -0500 wintrust: Support WSS_GET_SECONDARY_SIG_COUNT in Softpub provider. --- dlls/wintrust/softpub.c | 5 +++++ dlls/wintrust/tests/softpub.c | 6 +++--- dlls/wintrust/wintrust_main.c | 4 ++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index d4f0088f620..06b178a98b9 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -909,6 +909,11 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); load_secondary_signatures(data, data->pSigState->hPrimarySig); } + if (data->pSigSettings) + { + if (data->pSigSettings->dwFlags & WSS_GET_SECONDARY_SIG_COUNT) + data->pSigSettings->cSecondarySigs = data->pSigState->cSecondarySigs; + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index eb411bc7daf..77e15b2feb4 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1830,7 +1830,7 @@ static void test_multiple_signatures(void) prov = (CRYPT_PROVIDER_DATA *)data.hWVTStateData; ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); - todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { @@ -1867,7 +1867,7 @@ static void test_multiple_signatures(void) settings.dwVerifiedSigIndex = 0xcccccccc; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 2, "Got %lu.\n", settings.dwVerifiedSigIndex); data.dwStateAction = WTD_STATEACTION_CLOSE; @@ -1881,7 +1881,7 @@ static void test_multiple_signatures(void) settings.dwIndex = 1; status = WinVerifyTrust(NULL, &WVTPolicyGUID, &data); todo_wine ok(status == CERT_E_UNTRUSTEDROOT || status == CERT_E_CHAINING, "Failed, ret %#lx\n", status); - todo_wine ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); + ok(settings.cSecondarySigs == 2, "Got %lu.\n", settings.cSecondarySigs); todo_wine ok(settings.dwVerifiedSigIndex == 1, "Got %lu.\n", settings.dwVerifiedSigIndex); settings.dwIndex = 0; diff --git a/dlls/wintrust/wintrust_main.c b/dlls/wintrust/wintrust_main.c index 33695008b24..925ae7ca85a 100644 --- a/dlls/wintrust/wintrust_main.c +++ b/dlls/wintrust/wintrust_main.c @@ -294,6 +294,10 @@ static LONG WINTRUST_DefaultVerify(HWND hwnd, GUID *actionID, data->hWVTStateData = provData; provData->pWintrustData = data; + + if (WVT_ISINSTRUCT(WINTRUST_DATA, data->cbStruct, pSignatureSettings)) + provData->pSigSettings = data->pSignatureSettings; + if (hwnd == INVALID_HANDLE_VALUE) provData->hWndParent = GetDesktopWindow(); else

1 0

Paul Gofman : wintrust: Load secondary signatures in SoftpubLoadSignature().
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 71f58158c1960a42ab89384ee5640064826fa6a9 URL: https://gitlab.winehq.org/wine/wine/-/commit/71f58158c1960a42ab89384ee56400… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 21:25:18 2022 -0500 wintrust: Load secondary signatures in SoftpubLoadSignature(). --- dlls/wintrust/softpub.c | 54 +++++++++++++++++++++++++++++++++++++++++++ dlls/wintrust/tests/softpub.c | 2 +- include/wintrust.h | 2 ++ 3 files changed, 57 insertions(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1165f03c075..d4f0088f620 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -830,6 +830,57 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) return err; } +static void load_secondary_signatures(CRYPT_PROVIDER_DATA *data, HCRYPTMSG msg) +{ + CRYPT_PROVIDER_SIGSTATE *s = data->pSigState; + CRYPT_ATTRIBUTES *attrs; + unsigned int i, j; + DWORD size; + + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, NULL, &size)) + return; + + if (!(attrs = data->psPfns->pfnAlloc(size))) + { + ERR("No memory.\n"); + return; + } + if (!CryptMsgGetParam(msg, CMSG_SIGNER_UNAUTH_ATTR_PARAM, 0, attrs, &size)) + goto done; + + for (i = 0; i < attrs->cAttr; ++i) + { + if (strcmp(attrs->rgAttr[i].pszObjId, szOID_NESTED_SIGNATURE)) + continue; + + if (!(s->rhSecondarySigs = data->psPfns->pfnAlloc(attrs->rgAttr[i].cValue * sizeof(*s->rhSecondarySigs)))) + { + ERR("No memory"); + goto done; + } + s->cSecondarySigs = 0; + for (j = 0; j < attrs->rgAttr[i].cValue; ++j) + { + if (!(msg = CryptMsgOpenToDecode(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, 0, 0, 0, NULL, NULL))) + { + ERR("Could not create crypt message.\n"); + goto done; + } + if (!CryptMsgUpdate(msg, attrs->rgAttr[i].rgValue[j].pbData, attrs->rgAttr[i].rgValue[j].cbData, TRUE)) + { + ERR("Could not update crypt message, err %lu.\n", GetLastError()); + CryptMsgClose(msg); + goto done; + } + s->rhSecondarySigs[j] = msg; + ++s->cSecondarySigs; + } + break; + } +done: + data->psPfns->pfnFree(attrs); +} + HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { DWORD err = ERROR_SUCCESS; @@ -854,7 +905,10 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) data->pSigState->fSupportMultiSig = TRUE; data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; if (data->hMsg) + { data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + load_secondary_signatures(data, data->pSigState->hPrimarySig); + } } if (!err && data->hMsg) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index 070e7c52034..eb411bc7daf 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1840,7 +1840,7 @@ static void test_multiple_signatures(void) ok(prov->pSigState->fSupportMultiSig, "Got %d.\n", prov->pSigState->fSupportMultiSig); ok(prov->pSigState->dwCryptoPolicySupport == (WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT), "Got %#lx.\n", prov->pSigState->dwCryptoPolicySupport); - todo_wine ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); + ok(prov->pSigState->cSecondarySigs == 2, "Got %lu.\n", prov->pSigState->cSecondarySigs); size = sizeof(buf); bret = CryptMsgGetParam(prov->pSigState->hPrimarySig, CMSG_SIGNER_CERT_INFO_PARAM, 0, buf, &size); diff --git a/include/wintrust.h b/include/wintrust.h index dd85369e322..eeb149822b4 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -475,6 +475,8 @@ CRYPT_PROVIDER_SGNR * WINAPI WTHelperGetProvSignerFromChain( CRYPT_PROVIDER_DATA * WINAPI WTHelperProvDataFromStateData(HANDLE hStateData); CRYPT_PROVIDER_PRIVDATA * WINAPI WTHelperGetProvPrivateDataFromChain(CRYPT_PROVIDER_DATA *,GUID *); +#define szOID_NESTED_SIGNATURE "1.3.6.1.4.1.311.2.4.1" + #define SPC_INDIRECT_DATA_OBJID "1.3.6.1.4.1.311.2.1.4" #define SPC_SP_AGENCY_INFO_OBJID "1.3.6.1.4.1.311.2.1.10" #define SPC_STATEMENT_TYPE_OBJID "1.3.6.1.4.1.311.2.1.11"

1 0

Paul Gofman : wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 2f5ad179e53d8e5d5147f53a2a4578c8d7ab619f URL: https://gitlab.winehq.org/wine/wine/-/commit/2f5ad179e53d8e5d5147f53a2a4578… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 19:44:29 2022 -0500 wintrust: Initialize CRYPT_PROVIDER_SIGSTATE structure in Softpub provider. --- dlls/wintrust/softpub.c | 32 ++++++++++++++++++++++++++++---- dlls/wintrust/tests/softpub.c | 2 +- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 53df5e7fe60..1165f03c075 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -832,14 +832,32 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx) HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) { - DWORD err; + DWORD err = ERROR_SUCCESS; TRACE("(%p)\n", data); if (!data->padwTrustStepErrors) return S_FALSE; - if (data->hMsg) + if (data->pSigState) + { + /* We did not initialize this, probably an unsupported usage. */ + FIXME("pSigState %p already initialized.\n", data->pSigState); + } + if (!(data->pSigState = data->psPfns->pfnAlloc(sizeof(*data->pSigState)))) + { + err = ERROR_OUTOFMEMORY; + } + else + { + data->pSigState->cbStruct = sizeof(*data->pSigState); + data->pSigState->fSupportMultiSig = TRUE; + data->pSigState->dwCryptoPolicySupport = WSS_SIGTRUST_SUPPORT | WSS_OBJTRUST_SUPPORT | WSS_CERTTRUST_SUPPORT; + if (data->hMsg) + data->pSigState->hPrimarySig = CryptMsgDuplicate(data->hMsg); + } + + if (!err && data->hMsg) { DWORD signerCount, size; @@ -859,8 +877,7 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data) else err = TRUST_E_NOSIGNATURE; } - else - err = ERROR_SUCCESS; + if (err) data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err; return !err ? S_OK : S_FALSE; @@ -1375,6 +1392,13 @@ HRESULT WINAPI SoftpubCleanup(CRYPT_PROVIDER_DATA *data) data->psPfns->pfnFree(data->u.pPDSip->psIndirectData); } + if (WVT_ISINSTRUCT(CRYPT_PROVIDER_DATA, data->cbStruct, pSigState) && data->pSigState) + { + CryptMsgClose(data->pSigState->hPrimarySig); + for (i = 0; i < data->pSigState->cSecondarySigs; ++i) + CryptMsgClose(data->pSigState->rhSecondarySigs[i]); + data->psPfns->pfnFree(data->pSigState); + } CryptMsgClose(data->hMsg); if (data->fOpenedFile && diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index ab9655ef7e8..070e7c52034 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1831,7 +1831,7 @@ static void test_multiple_signatures(void) ok(prov->cbStruct == sizeof(*prov), "Got size %lu.\n", prov->cbStruct); ok(prov->csSigners == 1, "Got %lu.\n", prov->csSigners); todo_wine ok(prov->pSigSettings == &settings, "Got %p, expected %p.\n", prov->pSigSettings, &settings); - todo_wine ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); + ok(!!prov->pSigState, "Got %p, expected %p.\n", prov->pSigSettings, &settings); if (prov->cbStruct == sizeof(*prov) && prov->pSigState) { ok(prov->pSigState->cbStruct == sizeof(*prov->pSigState)

1 0

Paul Gofman : wintrust/tests: Add tests for multiple PE signatures.
by Alexandre Julliard 11 Oct '22

11 Oct '22

Module: wine Branch: master Commit: 6071205974f7767d5b967fb2d0e46433498c5b3d URL: https://gitlab.winehq.org/wine/wine/-/commit/6071205974f7767d5b967fb2d0e464… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri Sep 30 16:11:33 2022 -0500 wintrust/tests: Add tests for multiple PE signatures. --- dlls/wintrust/tests/softpub.c | 581 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 581 insertions(+)

1 0

Gabriel Ivăncescu : mshtml: Enumerate document elements with name.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16c6c249a5134de2422fbd3471ead7425c968301 URL: https://gitlab.winehq.org/wine/wine/-/commit/16c6c249a5134de2422fbd3471ead7… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Enumerate document elements with name. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 70 ++++++++++++++++++++++++++++++++++++++- dlls/mshtml/tests/documentmode.js | 1 - 2 files changed, 69 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 40d86a170ac..d86ed07e033 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5890,6 +5890,74 @@ static HRESULT HTMLDocumentNode_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return S_OK; } +static HRESULT HTMLDocumentNode_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid) +{ + DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; + HTMLDocumentNode *This = impl_from_DispatchEx(dispex); + nsIDOMNodeList *node_list; + const PRUnichar *name; + nsIDOMElement *nselem; + nsIDOMNode *nsnode; + nsAString nsstr; + nsresult nsres; + HRESULT hres; + UINT32 i; + + if(!This->nsdoc) + return S_FALSE; + + while(idx < This->elem_vars_cnt) { + hres = has_elem_name(This->nsdoc, This->elem_vars[idx]); + if(SUCCEEDED(hres)) { + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; + } + if(hres != DISP_E_UNKNOWNNAME) + return hres; + idx++; + } + + /* Populate possibly missing DISPIDs */ + nsAString_InitDepend(&nsstr, L"[name]"); + nsres = nsIDOMHTMLDocument_QuerySelectorAll(This->nsdoc, &nsstr, &node_list); + nsAString_Finish(&nsstr); + if(NS_FAILED(nsres)) + return map_nsresult(nsres); + + for(i = 0, hres = S_OK; SUCCEEDED(hres); i++) { + nsres = nsIDOMNodeList_Item(node_list, i, &nsnode); + if(NS_FAILED(nsres)) { + hres = map_nsresult(nsres); + break; + } + if(!nsnode) + break; + + nsres = nsIDOMNode_QueryInterface(nsnode, &IID_nsIDOMElement, (void**)&nselem); + nsIDOMNode_Release(nsnode); + if(nsres != S_OK) + continue; + + nsres = get_elem_attr_value(nselem, L"name", &nsstr, &name); + nsIDOMElement_Release(nselem); + if(NS_FAILED(nsres)) + hres = map_nsresult(nsres); + else { + hres = dispid_from_elem_name(This, name, &id); + nsAString_Finish(&nsstr); + } + } + nsIDOMNodeList_Release(node_list); + if(FAILED(hres)) + return hres; + + if(idx >= This->elem_vars_cnt) + return S_FALSE; + + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; +} + static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); @@ -5948,7 +6016,7 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { HTMLDocumentNode_get_name, HTMLDocumentNode_invoke, NULL, - NULL, + HTMLDocumentNode_next_dispid, HTMLDocumentNode_get_compat_mode, NULL }, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index a3a0e2439cd..ad258b3df2e 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -703,7 +703,6 @@ sync_test("elem_by_id", function() { if(id_elem === "testname") found = true; } - todo_wine. ok(found, "testname was not enumerated in document"); });

1 0

Gabriel Ivăncescu : mshtml: Split the lookup for an element with name into a separate helper.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 6420744c57429ab20818adefc4ebdc864584b4ba URL: https://gitlab.winehq.org/wine/wine/-/commit/6420744c57429ab20818adefc4ebdc… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Split the lookup for an element with name into a separate helper. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 0c96d73eb76..40d86a170ac 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4818,30 +4818,30 @@ static inline HTMLDocument *impl_from_IDispatchEx(IDispatchEx *iface) return CONTAINING_RECORD(iface, HTMLDocument, IDispatchEx_iface); } -static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, BSTR name, DISPID *dispid) +static HRESULT has_elem_name(nsIDOMHTMLDocument *nsdoc, const WCHAR *name) { nsIDOMNodeList *node_list; nsAString name_str; - UINT32 len; - unsigned i; nsresult nsres; - - if(!This->nsdoc) - return DISP_E_UNKNOWNNAME; + UINT32 len; nsAString_InitDepend(&name_str, name); - nsres = nsIDOMHTMLDocument_GetElementsByName(This->nsdoc, &name_str, &node_list); + nsres = nsIDOMHTMLDocument_GetElementsByName(nsdoc, &name_str, &node_list); nsAString_Finish(&name_str); if(NS_FAILED(nsres)) - return E_FAIL; + return map_nsresult(nsres); nsres = nsIDOMNodeList_GetLength(node_list, &len); nsIDOMNodeList_Release(node_list); if(NS_FAILED(nsres)) - return E_FAIL; + return map_nsresult(nsres); + + return len ? S_OK : DISP_E_UNKNOWNNAME; +} - if(!len) - return DISP_E_UNKNOWNNAME; +static HRESULT dispid_from_elem_name(HTMLDocumentNode *This, const WCHAR *name, DISPID *dispid) +{ + unsigned i; for(i=0; i < This->elem_vars_cnt; i++) { if(!wcscmp(name, This->elem_vars[i])) { @@ -4943,7 +4943,12 @@ static HRESULT WINAPI DocDispatchEx_GetDispID(IDispatchEx *iface, BSTR bstrName, if(hres != DISP_E_UNKNOWNNAME) return hres; - return dispid_from_elem_name(This->doc_node, bstrName, pid); + if(This->doc_node->nsdoc) { + hres = has_elem_name(This->doc_node->nsdoc, bstrName); + if(SUCCEEDED(hres)) + hres = dispid_from_elem_name(This->doc_node, bstrName, pid); + } + return hres; } static HRESULT WINAPI DocDispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp,

1 0

Gabriel Ivăncescu : mshtml: Do not enumerate internal dynamic props.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 8de5187d1b2391288afd31116dc40386642c9d92 URL: https://gitlab.winehq.org/wine/wine/-/commit/8de5187d1b2391288afd31116dc403… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Do not enumerate internal dynamic props. Props allocated with dispex_get_dprop_ref or dispex_get_dynid are purely internal to our implementation and must not be enumerated. Note that in case of window, the props themselves become enumerable, but the dynamic props must still be hidden, since it's the custom prop that refers to it that must be enumerated (i.e. the DISPID must match with the custom prop, not the underlying dynamic prop backing it, which would violate the former DISPID obtained for the respective name). Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 7 ++++++- dlls/mshtml/htmlwindow.c | 16 ++++++++++++++- dlls/mshtml/tests/documentmode.js | 42 ++++++++++++++++++++++++++++++++++++++- 3 files changed, 62 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index d7b587f21d2..3d3d854936e 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -85,6 +85,7 @@ typedef struct { } dynamic_prop_t; #define DYNPROP_DELETED 0x01 +#define DYNPROP_HIDDEN 0x02 typedef struct { DispatchEx dispex; @@ -702,6 +703,8 @@ HRESULT dispex_get_dprop_ref(DispatchEx *This, const WCHAR *name, BOOL alloc, VA if(FAILED(hres)) return hres; + if(alloc) + prop->flags |= DYNPROP_HIDDEN; *ret = &prop->var; return S_OK; } @@ -715,6 +718,7 @@ HRESULT dispex_get_dynid(DispatchEx *This, const WCHAR *name, DISPID *id) if(FAILED(hres)) return hres; + prop->flags |= DYNPROP_HIDDEN; *id = DISPID_DYNPROP_0 + (prop - This->dynamic_data->props); return S_OK; } @@ -1860,7 +1864,8 @@ static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BS static HRESULT next_dynamic_id(DispatchEx *dispex, DWORD idx, DISPID *ret_id) { - while(idx < dispex->dynamic_data->prop_cnt && dispex->dynamic_data->props[idx].flags & DYNPROP_DELETED) + while(idx < dispex->dynamic_data->prop_cnt && + (dispex->dynamic_data->props[idx].flags & (DYNPROP_DELETED | DYNPROP_HIDDEN))) idx++; if(idx == dispex->dynamic_data->prop_cnt) { diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 02d6d374255..12f8a304d41 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3874,6 +3874,20 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } +static HRESULT HTMLWindow_next_dispid(DispatchEx *dispex, DISPID id, DISPID *pid) +{ + DWORD idx = (id == DISPID_STARTENUM) ? 0 : id - MSHTML_DISPID_CUSTOM_MIN + 1; + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + + while(idx < This->global_prop_cnt && This->global_props[idx].type != GLOBAL_DISPEXVAR) + idx++; + if(idx >= This->global_prop_cnt) + return S_FALSE; + + *pid = idx + MSHTML_DISPID_CUSTOM_MIN; + return S_OK; +} + static compat_mode_t HTMLWindow_get_compat_mode(DispatchEx *dispex) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); @@ -3971,7 +3985,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { HTMLWindow_get_name, HTMLWindow_invoke, NULL, - NULL, + HTMLWindow_next_dispid, HTMLWindow_get_compat_mode, NULL }, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index cb6d2d01ec2..a3a0e2439cd 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -635,6 +635,8 @@ sync_test("JS objs", function() { }); sync_test("for..in", function() { + var v = document.documentMode, found = 0, r; + function ctor() {} ctor.prototype.test2 = true; @@ -642,7 +644,7 @@ sync_test("for..in", function() { obj.test1 = true; i = 0; - for(var r in obj) { + for(r in obj) { ctor.prototype.test3 = true; arr[r] = true; i++; @@ -652,10 +654,22 @@ sync_test("for..in", function() { ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); + + for(r in document) + if(r === "ondragstart") + found++; + ok(found === 1, "ondragstart enumerated " + found + " times in document"); + document.ondragstart = ""; + found = 0; + for(r in document) + if(r === "ondragstart") + found++; + ok(found === 1, "ondragstart enumerated " + found + " times in document after set to empty string"); }); sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; + var found; var id_elem = document.getElementById("testid"); ok(id_elem.tagName === "FORM", "id_elem.tagName = " + id_elem.tagName); @@ -665,6 +679,32 @@ sync_test("elem_by_id", function() { ok(id_elem === name_elem, "id_elem != id_elem"); else ok(name_elem === null, "name_elem != null"); + + id_elem = window.testid; + ok(id_elem.tagName === "FORM", "window.testid = " + id_elem); + + name_elem = document.testname; + ok(name_elem.tagName === "FORM", "document.testname = " + name_elem); + + for(id_elem in window) + ok(id_elem !== "testid" && id_elem != "testname", id_elem + " was enumerated in window"); + window.testid = 137; + found = false; + for(id_elem in window) { + ok(id_elem != "testname", id_elem + " was enumerated in window after set to 137"); + if(id_elem === "testid") + found = true; + } + ok(found, "testid was not enumerated in window after set to 137"); + + found = false; + for(id_elem in document) { + ok(id_elem !== "testid", "testid was enumerated in document"); + if(id_elem === "testname") + found = true; + } + todo_wine. + ok(found, "testname was not enumerated in document"); }); sync_test("doc_mode", function() {

1 0

Gabriel Ivăncescu : mshtml: Fix enumerating first custom prop after builtins.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 03c4a231c0e09c89c4bb5794e2b17ec95aab0d16 URL: https://gitlab.winehq.org/wine/wine/-/commit/03c4a231c0e09c89c4bb5794e2b17e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 mshtml: Fix enumerating first custom prop after builtins. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/dispex.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/mshtml/dispex.c b/dlls/mshtml/dispex.c index 90650e5acc4..d7b587f21d2 100644 --- a/dlls/mshtml/dispex.c +++ b/dlls/mshtml/dispex.c @@ -1909,6 +1909,8 @@ static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, } func++; } + + id = DISPID_STARTENUM; } if(This->info->desc->vtbl && This->info->desc->vtbl->next_dispid) {

1 0

Gabriel Ivăncescu : jscript: Refill the props at end of enumeration in html mode and retry.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 605819dcd94b1b1b4843fa869ed15402bdc8a18b URL: https://gitlab.winehq.org/wine/wine/-/commit/605819dcd94b1b1b4843fa869ed154… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:22 2022 +0300 jscript: Refill the props at end of enumeration in html mode and retry. If properties were added during enumeration, for example on the prototype, they are actually visited in mshtml scripts in any mode. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 13 ++++++++----- dlls/jscript/tests/lang.js | 2 ++ dlls/mshtml/tests/documentmode.js | 20 ++++++++++++++++++++ 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 746c5246ed1..42f41771ef2 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -2492,16 +2492,16 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty DWORD idx = id; HRESULT hres; - if(id == DISPID_STARTENUM) { + if(id == DISPID_STARTENUM || idx >= obj->prop_cnt) { hres = (enum_type == JSDISP_ENUM_ALL) ? fill_protrefs(obj) : fill_props(obj); if(FAILED(hres)) return hres; - idx = 0; + if(id == DISPID_STARTENUM) + idx = 0; + if(idx >= obj->prop_cnt) + return S_FALSE; } - if(idx >= obj->prop_cnt) - return S_FALSE; - for(iter = &obj->props[idx]; iter < obj->props + obj->prop_cnt; iter++) { if(iter->type == PROP_DELETED) continue; @@ -2513,6 +2513,9 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty return S_OK; } + if(obj->ctx->html_mode) + return jsdisp_next_prop(obj, prop_to_id(obj, iter - 1), enum_type, ret); + return S_FALSE; } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 67e4576813b..5c201d5bf26 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1559,6 +1559,7 @@ inobj.test2 = true; tmp = 0; for(iter in inobj) { + forinTestObj.prototype.test4 = true; arr[iter] = true; tmp++; } @@ -1567,6 +1568,7 @@ ok(tmp === 3, "for..in tmp = " + tmp); ok(arr["test1"] === true, "arr[test1] !== true"); ok(arr["test2"] === true, "arr[test2] !== true"); ok(arr["test3"] === true, "arr[test3] !== true"); +ok(arr["test4"] !== true, "arr[test4] === true"); ok((delete inobj.test1) === true, "delete inobj.test1 returned false"); ok(!("test1" in inobj), "test1 is still in inobj after delete"); diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 90223d53f83..cb6d2d01ec2 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -634,6 +634,26 @@ sync_test("JS objs", function() { test_parses("if(false) { o.if; }", v >= 9); }); +sync_test("for..in", function() { + function ctor() {} + ctor.prototype.test2 = true; + + var arr = new Array(), obj = new ctor(), i, r; + obj.test1 = true; + + i = 0; + for(var r in obj) { + ctor.prototype.test3 = true; + arr[r] = true; + i++; + } + + ok(i === 3, "enum did " + i + " iterations"); + ok(arr["test1"] === true, "arr[test1] !== true"); + ok(arr["test2"] === true, "arr[test2] !== true"); + ok(arr["test3"] === true, "arr[test3] !== true"); +}); + sync_test("elem_by_id", function() { document.body.innerHTML = '<form id="testid" name="testname"></form>';

1 0

Gabriel Ivăncescu : jscript: Fill the builtin props for enumeration on prototypes as well.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 2a228918ef88eec4b776927026a96498afb7eb7d URL: https://gitlab.winehq.org/wine/wine/-/commit/2a228918ef88eec4b776927026a964… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Oct 10 19:55:21 2022 +0300 jscript: Fill the builtin props for enumeration on prototypes as well. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/jscript/dispex.c | 48 ++++++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index e25378e866b..746c5246ed1 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -610,15 +610,41 @@ HRESULT builtin_set_const(script_ctx_t *ctx, jsdisp_t *jsthis, jsval_t value) return S_OK; } +static HRESULT fill_props(jsdisp_t *obj) +{ + dispex_prop_t *prop; + HRESULT hres; + + if(obj->builtin_info->idx_length) { + unsigned i = 0, len = obj->builtin_info->idx_length(obj); + WCHAR name[12]; + + for(i = 0; i < len; i++) { + swprintf(name, ARRAY_SIZE(name), L"%u", i); + hres = find_prop_name(obj, string_hash(name), name, FALSE, &prop); + if(FAILED(hres)) + return hres; + } + } + + return S_OK; +} + static HRESULT fill_protrefs(jsdisp_t *This) { dispex_prop_t *iter, *prop; HRESULT hres; + hres = fill_props(This); + if(FAILED(hres)) + return hres; + if(!This->prototype) return S_OK; - fill_protrefs(This->prototype); + hres = fill_protrefs(This->prototype); + if(FAILED(hres)) + return hres; for(iter = This->prototype->props; iter < This->prototype->props+This->prototype->prop_cnt; iter++) { hres = find_prop_name(This, iter->hash, iter->name, FALSE, &prop); @@ -2467,23 +2493,9 @@ HRESULT jsdisp_next_prop(jsdisp_t *obj, DISPID id, enum jsdisp_enum_type enum_ty HRESULT hres; if(id == DISPID_STARTENUM) { - if(obj->builtin_info->idx_length) { - unsigned i = 0, len = obj->builtin_info->idx_length(obj); - WCHAR name[12]; - - for(i = 0; i < len; i++) { - swprintf(name, ARRAY_SIZE(name), L"%d", i); - hres = find_prop_name(obj, string_hash(name), name, FALSE, &iter); - if(FAILED(hres)) - return hres; - } - } - - if (enum_type == JSDISP_ENUM_ALL) { - hres = fill_protrefs(obj); - if(FAILED(hres)) - return hres; - } + hres = (enum_type == JSDISP_ENUM_ALL) ? fill_protrefs(obj) : fill_props(obj); + if(FAILED(hres)) + return hres; idx = 0; }

1 0

Erich E. Hoover : ntdll: Implement storing DOS attributes in NtCreateFile.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 3602c676dadf823a4868b0b72f326159cb93766e URL: https://gitlab.winehq.org/wine/wine/-/commit/3602c676dadf823a4868b0b72f3261… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Sun Sep 18 18:58:24 2022 +0100 ntdll: Implement storing DOS attributes in NtCreateFile. Co-authored-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/directory.c | 25 ++++++++++++------------- dlls/ntdll/unix/file.c | 14 ++++++++++++++ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/tests/directory.c b/dlls/ntdll/tests/directory.c index 2a5fedb4659..a5ea7900f8d 100644 --- a/dlls/ntdll/tests/directory.c +++ b/dlls/ntdll/tests/directory.c @@ -55,7 +55,6 @@ static NTSTATUS (WINAPI *pRtlWow64EnableFsRedirectionEx)( ULONG disable, ULONG * /* The attribute sets to test */ static struct testfile_s { - BOOL todo; /* set if it doesn't work on wine yet */ BOOL attr_done; /* set if attributes were tested for this file already */ const DWORD attr; /* desired attribute */ WCHAR name[20]; /* filename to use */ @@ -63,16 +62,16 @@ static struct testfile_s { const char *description; /* for error messages */ int nfound; /* How many were found (expect 1) */ } testfiles[] = { - { 0, 0, FILE_ATTRIBUTE_NORMAL, {'l','o','n','g','f','i','l','e','n','a','m','e','.','t','m','p'}, "normal" }, - { 0, 0, FILE_ATTRIBUTE_NORMAL, {'n','.','t','m','p',}, "normal" }, - { 1, 0, FILE_ATTRIBUTE_HIDDEN, {'h','.','t','m','p',}, "hidden" }, - { 1, 0, FILE_ATTRIBUTE_SYSTEM, {'s','.','t','m','p',}, "system" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, {'d','.','t','m','p',}, "directory" }, - { 0, 0, FILE_ATTRIBUTE_NORMAL, {0xe9,'a','.','t','m','p'}, "normal" }, - { 0, 0, FILE_ATTRIBUTE_NORMAL, {0xc9,'b','.','t','m','p'}, "normal" }, - { 0, 0, FILE_ATTRIBUTE_NORMAL, {'e','a','.','t','m','p'}, "normal" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, - { 0, 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } + { 0, FILE_ATTRIBUTE_NORMAL, {'l','o','n','g','f','i','l','e','n','a','m','e','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'n','.','t','m','p',}, "normal" }, + { 0, FILE_ATTRIBUTE_HIDDEN, {'h','.','t','m','p',}, "hidden" }, + { 0, FILE_ATTRIBUTE_SYSTEM, {'s','.','t','m','p',}, "system" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, {'d','.','t','m','p',}, "directory" }, + { 0, FILE_ATTRIBUTE_NORMAL, {0xe9,'a','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {0xc9,'b','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_NORMAL, {'e','a','.','t','m','p'}, "normal" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, {'.'}, ". directory" }, + { 0, FILE_ATTRIBUTE_DIRECTORY, {'.','.'}, ".. directory" } }; static const int test_dir_count = ARRAY_SIZE(testfiles); static const int max_test_dir_size = ARRAY_SIZE(testfiles) + 5; /* size of above plus some for .. etc */ @@ -162,8 +161,8 @@ static void tally_test_file(FILE_BOTH_DIRECTORY_INFORMATION *dir_info) if (namelen != len || memcmp(nameW, testfiles[i].name, len*sizeof(WCHAR))) continue; if (!testfiles[i].attr_done) { - todo_wine_if (testfiles[i].todo) - ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx (is your linux new enough?)\n", wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); + ok (attrib == (testfiles[i].attr & attribmask), "file %s: expected %s (%lx), got %lx\n", + wine_dbgstr_w(testfiles[i].name), testfiles[i].description, testfiles[i].attr, attrib); testfiles[i].attr_done = TRUE; } testfiles[i].nfound++; diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 05c982ffb66..469c714f847 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -4002,6 +4002,20 @@ NTSTATUS WINAPI NtCreateFile( HANDLE *handle, ACCESS_MASK access, OBJECT_ATTRIBU io->Information = FILE_OVERWRITTEN; break; } + + if (io->Information == FILE_CREATED && (attributes & XATTR_ATTRIBS_MASK)) + { + int fd, needs_close; + + /* set any DOS extended attributes */ + if (!server_get_unix_fd( *handle, 0, &fd, &needs_close, NULL, NULL )) + { + if (fd_set_dos_attrib( fd, attributes ) == -1 && errno != ENOTSUP) + WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)", + errno, strerror( errno ) ); + if (needs_close) close( fd ); + } + } } else if (status == STATUS_TOO_MANY_OPENED_FILES) {

1 0

Joel Holdsworth : ntdll: Implement retrieving DOS attributes in NtQueryInformationFile.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 0a223f17e1fb4aafb43906aeffe00eadc81cf8c2 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a223f17e1fb4aafb43906aeffe00e… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Sun Sep 18 19:08:41 2022 +0100 ntdll: Implement retrieving DOS attributes in NtQueryInformationFile. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=9158 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=15679 Co-authored-by: Erich E. Hoover <erich.e.hoover(a)gmail.com> Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/tests/file.c | 8 ++++---- dlls/ntdll/unix/file.c | 26 +++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c index dd0061b13d8..d49d4d5c26f 100644 --- a/dlls/ntdll/tests/file.c +++ b/dlls/ntdll/tests/file.c @@ -1392,7 +1392,7 @@ static void test_file_basic_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fbi.FileAttributes ); /* Then HIDDEN */ memset(&fbi, 0, sizeof(fbi)); @@ -1405,7 +1405,7 @@ static void test_file_basic_information(void) memset(&fbi, 0, sizeof(fbi)); res = pNtQueryInformationFile(h, &io, &fbi, sizeof fbi, FileBasicInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); + ok ( (fbi.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fbi.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fbi, 0, sizeof(fbi)); @@ -1462,7 +1462,7 @@ static void test_file_all_information(void) memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes, res %x\n", res); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_SYSTEM, "attribute %lx not FILE_ATTRIBUTE_SYSTEM\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Then HIDDEN */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); @@ -1475,7 +1475,7 @@ static void test_file_all_information(void) memset(&fai_buf.fai, 0, sizeof(fai_buf.fai)); res = pNtQueryInformationFile(h, &io, &fai_buf.fai, sizeof fai_buf, FileAllInformation); ok ( res == STATUS_SUCCESS, "can't get attributes\n"); - todo_wine ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); + ok ( (fai_buf.fai.BasicInformation.FileAttributes & attrib_mask) == FILE_ATTRIBUTE_HIDDEN, "attribute %lx not FILE_ATTRIBUTE_HIDDEN\n", fai_buf.fai.BasicInformation.FileAttributes ); /* Check NORMAL last of all (to make sure we can clear attributes) */ memset(&fai_buf.fai.BasicInformation, 0, sizeof(fai_buf.fai.BasicInformation)); diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 3b114db4f18..05c982ffb66 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -408,6 +408,21 @@ static int xattr_get( const char *path, const char *name, void *value, size_t si } +static int xattr_fget( int filedes, const char *name, void *value, size_t size ) +{ +#ifdef HAVE_SYS_XATTR_H +# ifdef XATTR_ADDITIONAL_OPTIONS + return fgetxattr( filedes, name, value, size, 0, 0 ); +# else + return fgetxattr( filedes, name, value, size ); +# endif +#else + errno = ENOSYS; + return -1; +#endif +} + + /* get space from the current directory data buffer, allocating a new one if necessary */ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { @@ -1536,7 +1551,8 @@ static BOOL fd_is_mount_point( int fd, const struct stat *st ) /* get the stat info and file attributes for a file (by file descriptor) */ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULONG *attr ) { - int ret; + char attr_data[65]; + int attr_len, ret; *attr = 0; ret = fstat( fd, st ); @@ -1545,6 +1561,14 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON /* consider mount points to be reparse points (IO_REPARSE_TAG_MOUNT_POINT) */ if ((options & FILE_OPEN_REPARSE_POINT) && fd_is_mount_point( fd, st )) *attr |= FILE_ATTRIBUTE_REPARSE_POINT; + + attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); + if (attr_len != -1) + *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); + else if (errno != ENODATA && errno != ENOTSUP) + WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", + errno, strerror( errno ) ); + return ret; }

1 0

Erich E. Hoover : ntdll: Implement storing DOS attributes in NtSetInformationFile.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: ba24a78c5b96beb3f0b48cf8f47b408a58d7c73e URL: https://gitlab.winehq.org/wine/wine/-/commit/ba24a78c5b96beb3f0b48cf8f47b40… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Thu Sep 15 11:09:30 2022 +0100 ntdll: Implement storing DOS attributes in NtSetInformationFile. Co-authored-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- dlls/ntdll/unix/file.c | 96 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 76 insertions(+), 20 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 34bba9657b6..3b114db4f18 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -363,6 +363,36 @@ NTSTATUS errno_to_status( int err ) } +static int xattr_fremove( int filedes, const char *name ) +{ +#ifdef HAVE_SYS_XATTR_H +# ifdef XATTR_ADDITIONAL_OPTIONS + return fremovexattr( filedes, name, 0 ); +# else + return fremovexattr( filedes, name ); +# endif +#else + errno = ENOSYS; + return -1; +#endif +} + + +static int xattr_fset( int filedes, const char *name, const void *value, size_t size ) +{ +#ifdef HAVE_SYS_XATTR_H +# ifdef XATTR_ADDITIONAL_OPTIONS + return fsetxattr( filedes, name, value, size, 0, 0 ); +# else + return fsetxattr( filedes, name, value, size, 0 ); +# endif +#else + errno = ENOSYS; + return -1; +#endif +} + + static int xattr_get( const char *path, const char *name, void *value, size_t size ) { #ifdef HAVE_SYS_XATTR_H @@ -1519,6 +1549,51 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON } +static int fd_set_dos_attrib( int fd, ULONG attr ) +{ + /* we only store the HIDDEN and SYSTEM attributes */ + attr &= XATTR_ATTRIBS_MASK; + if (attr != 0) + { + /* encode the attributes in Samba 3 ASCII format. Samba 4 has extended + * this format with more features, but retains compatibility with the + * earlier format. */ + char data[11]; + int len = sprintf( data, "0x%x", attr ); + return xattr_fset( fd, SAMBA_XATTR_DOS_ATTRIB, data, len ); + } + else return xattr_fremove( fd, SAMBA_XATTR_DOS_ATTRIB ); +} + + +/* set the stat info and file attributes for a file (by file descriptor) */ +NTSTATUS fd_set_file_info( int fd, ULONG attr ) +{ + struct stat st; + + if (fstat( fd, &st ) == -1) return errno_to_status( errno ); + if (attr & FILE_ATTRIBUTE_READONLY) + { + if (S_ISDIR( st.st_mode)) + WARN("FILE_ATTRIBUTE_READONLY ignored for directory.\n"); + else + st.st_mode &= ~0222; /* clear write permission bits */ + } + else + { + /* add write permission only where we already have read permission */ + st.st_mode |= (0600 | ((st.st_mode & 044) >> 1)) & (~start_umask); + } + if (fchmod( fd, st.st_mode ) == -1) return errno_to_status( errno ); + + if (fd_set_dos_attrib( fd, attr ) == -1 && errno != ENOTSUP) + WARN( "Failed to set extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", + errno, strerror( errno ) ); + + return STATUS_SUCCESS; +} + + /* get the stat info and file attributes for a file (by name) */ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) { @@ -4416,7 +4491,6 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, case FileBasicInformation: if (len >= sizeof(FILE_BASIC_INFORMATION)) { - struct stat st; const FILE_BASIC_INFORMATION *info = ptr; LARGE_INTEGER mtime, atime; @@ -4430,25 +4504,7 @@ NTSTATUS WINAPI NtSetInformationFile( HANDLE handle, IO_STATUS_BLOCK *io, status = set_file_times( fd, &mtime, &atime ); if (status == STATUS_SUCCESS && info->FileAttributes) - { - if (fstat( fd, &st ) == -1) status = errno_to_status( errno ); - else - { - if (info->FileAttributes & FILE_ATTRIBUTE_READONLY) - { - if (S_ISDIR( st.st_mode)) - WARN("FILE_ATTRIBUTE_READONLY ignored for directory.\n"); - else - st.st_mode &= ~0222; /* clear write permission bits */ - } - else - { - /* add write permission only where we already have read permission */ - st.st_mode |= (0600 | ((st.st_mode & 044) >> 1)) & (~start_umask); - } - if (fchmod( fd, st.st_mode ) == -1) status = errno_to_status( errno ); - } - } + status = fd_set_file_info( fd, info->FileAttributes ); if (needs_close) close( fd ); }

1 0

Erich E. Hoover : ntdll: Implement retrieving DOS attributes in [fd_]get_file_info().
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 1cd1a286703992aa8cb5a02d22a3f4aeca4efcbe URL: https://gitlab.winehq.org/wine/wine/-/commit/1cd1a286703992aa8cb5a02d22a3f4… Author: Erich E. Hoover <erich.e.hoover(a)gmail.com> Date: Tue Aug 19 22:10:49 2014 -0600 ntdll: Implement retrieving DOS attributes in [fd_]get_file_info(). Co-authored-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> Signed-off-by: Joel Holdsworth <joel(a)airwebreathe.org.uk> --- configure | 40 ++++++++++++++++++++++++++++++++++++ configure.ac | 9 +++++++++ dlls/ntdll/unix/file.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++- include/config.h.in | 6 ++++++ 4 files changed, 109 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 3088184aade..2efb2a37011 100755 --- a/configure +++ b/configure @@ -8323,6 +8323,12 @@ if test "x$ac_cv_header_sys_vnode_h" = xyes then : printf "%s\n" "#define HAVE_SYS_VNODE_H 1" >>confdefs.h +fi +ac_fn_c_check_header_compile "$LINENO" "sys/xattr.h" "ac_cv_header_sys_xattr_h" "$ac_includes_default" +if test "x$ac_cv_header_sys_xattr_h" = xyes +then : + printf "%s\n" "#define HAVE_SYS_XATTR_H 1" >>confdefs.h + fi ac_fn_c_check_header_compile "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default" if test "x$ac_cv_header_syscall_h" = xyes @@ -9105,6 +9111,40 @@ then : fi +if test "x$ac_cv_header_sys_xattr_h" = xyes +then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether getxattr takes additional arguments" >&5 +printf %s "checking whether getxattr takes additional arguments... " >&6; } +if test ${wine_cv_xattr_extra_args+y} +then : + printf %s "(cached) " >&6 +else $as_nop + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <sys/xattr.h> +int +main (void) +{ +getxattr("", "", "", 0, 0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO" +then : + wine_cv_xattr_extra_args=yes +else $as_nop + wine_cv_xattr_extra_args=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext +fi +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $wine_cv_xattr_extra_args" >&5 +printf "%s\n" "$wine_cv_xattr_extra_args" >&6; } + test $wine_cv_xattr_extra_args != yes || +printf "%s\n" "#define XATTR_ADDITIONAL_OPTIONS 1" >>confdefs.h + +fi + DLLFLAGS="" diff --git a/configure.ac b/configure.ac index 1e733962b75..41a29cee398 100644 --- a/configure.ac +++ b/configure.ac @@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\ sys/user.h \ sys/utsname.h \ sys/vnode.h \ + sys/xattr.h \ syscall.h \ utime.h \ valgrind/memcheck.h \ @@ -635,6 +636,14 @@ AC_CHECK_HEADERS([libprocstat.h],,, #include <sys/queue.h> #endif]) +if test "x$ac_cv_header_sys_xattr_h" = xyes +then + AC_CACHE_CHECK([whether getxattr takes additional arguments], wine_cv_xattr_extra_args, + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/xattr.h>]], [[getxattr("", "", "", 0, 0, 0);]])], + [wine_cv_xattr_extra_args=yes],[wine_cv_xattr_extra_args=no])]) + test $wine_cv_xattr_extra_args != yes || AC_DEFINE(XATTR_ADDITIONAL_OPTIONS, 1, [Define if xattr functions take additional arguments (macOS)]) +fi + dnl **** Check for working dll **** AC_SUBST(DLLFLAGS,"") diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 7eb8dbe7ad4..34bba9657b6 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -34,6 +34,7 @@ #include <stdarg.h> #include <string.h> #include <stdlib.h> +#include <stdint.h> #include <stdio.h> #include <limits.h> #include <unistd.h> @@ -98,6 +99,9 @@ #ifdef HAVE_SYS_STATFS_H #include <sys/statfs.h> #endif +#ifdef HAVE_SYS_XATTR_H +#include <sys/xattr.h> +#endif #include <time.h> #include <unistd.h> @@ -167,6 +171,9 @@ typedef struct #define MAX_IGNORED_FILES 4 +#define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB" +#define XATTR_ATTRIBS_MASK (FILE_ATTRIBUTE_HIDDEN|FILE_ATTRIBUTE_SYSTEM) + struct file_identity { dev_t dev; @@ -355,6 +362,22 @@ NTSTATUS errno_to_status( int err ) } } + +static int xattr_get( const char *path, const char *name, void *value, size_t size ) +{ +#ifdef HAVE_SYS_XATTR_H +# ifdef XATTR_ADDITIONAL_OPTIONS + return getxattr( path, name, value, size, 0, 0 ); +# else + return getxattr( path, name, value, size ); +# endif +#else + errno = ENOSYS; + return -1; +#endif +} + + /* get space from the current directory data buffer, allocating a new one if necessary */ static void *get_dir_data_space( struct dir_data *data, unsigned int size ) { @@ -1451,6 +1474,27 @@ static inline ULONG get_file_attributes( const struct stat *st ) } +/* decode the xattr-stored DOS attributes */ +static int parse_samba_dos_attrib_data( char *data, int len ) +{ + char *end; + int val; + + if (len > 2 && data[0] == '0' && data[1] == 'x') + { + data[len] = 0; + val = strtol( data, &end, 16 ); + if (!*end) return val & XATTR_ATTRIBS_MASK; + } + else + { + static BOOL once; + if (!once++) FIXME( "Unhandled " SAMBA_XATTR_DOS_ATTRIB " extended attribute value.\n" ); + } + return 0; +} + + static BOOL fd_is_mount_point( int fd, const struct stat *st ) { struct stat parent; @@ -1479,7 +1523,8 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON static int get_file_info( const char *path, struct stat *st, ULONG *attr ) { char *parent_path; - int ret; + char attr_data[65]; + int attr_len, ret; *attr = 0; ret = lstat( path, st ); @@ -1505,6 +1550,14 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) free( parent_path ); } *attr |= get_file_attributes( st ); + + attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); + if (attr_len != -1) + *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); + else if (errno != ENODATA && errno != ENOTSUP) + WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", + path, errno, strerror( errno ) ); + return ret; } diff --git a/include/config.h.in b/include/config.h.in index de1bf6c61eb..694b11cf8c2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -679,6 +679,9 @@ /* Define to 1 if you have the <sys/vnode.h> header file. */ #undef HAVE_SYS_VNODE_H +/* Define to 1 if you have the <sys/xattr.h> header file. */ +#undef HAVE_SYS_XATTR_H + /* Define to 1 if you have the `tcdrain' function. */ #undef HAVE_TCDRAIN @@ -888,6 +891,9 @@ backward compatibility; new code need not use it. */ #undef STDC_HEADERS +/* Define if xattr functions take additional arguments (macOS) */ +#undef XATTR_ADDITIONAL_OPTIONS + /* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING

1 0

Eric Pouech : conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: c19f3b620acda9125cc975c02992a544b27e5929 URL: https://gitlab.winehq.org/wine/wine/-/commit/c19f3b620acda9125cc975c02992a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Oct 8 17:44:54 2022 +0200 conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL. It should fix the errors around line 1370 in conhost/tests/tty.c, but it doesn't fix other errors around line 1530 and 1550 which are completly unrelated to this change. So failures to be expected on the latter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52648 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 849986a1c29..cab7cd5574f 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1337,6 +1337,9 @@ static void test_read_console_control(void) /* test simple behavior */ for (ctrl = 0; ctrl < ' '; ctrl++) { + DWORD state; + SHORT cc; + /* don't play with fire */ if (ctrl == 0 || ctrl == 3 || ctrl == '\n' || ctrl == 27) continue; @@ -1359,10 +1362,13 @@ static void test_read_console_control(void) strcpy(buf, "def."); buf[3] = ctrl; write_console_pipe(buf); wcscpy(bufw, L"abcdef."); bufw[6] = (WCHAR)ctrl; - child_expect_read_control_result(child_pipe, bufw, - (ctrl == '\t' || ctrl == '\r') ? 0 - : ((ctrl == 30 || ctrl == 31) ? (LEFT_CTRL_PRESSED | SHIFT_PRESSED) - : LEFT_CTRL_PRESSED)); + /* ^H requires special handling */ + cc = (ctrl == 8) ? 0x0200 : VkKeyScanA(ctrl); + if (cc == -1) cc = 0; + state = 0; + if (cc & 0x0100) state |= SHIFT_PRESSED; + if (cc & 0x0200) state |= LEFT_CTRL_PRESSED; + child_expect_read_control_result(child_pipe, bufw, state); skip_sequence("\x1b[?25l"); /* hide cursor */ expect_output_sequence("def"); skip_sequence("\x1b[?25h"); /* show cursor */

1 0

Hugh McMaster : kernelbase: Return full title length from GetConsoleTitle().
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 627f2b3557ccb0038ae957ecf17d1a4f784825dc URL: https://gitlab.winehq.org/wine/wine/-/commit/627f2b3557ccb0038ae957ecf17d1a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri Sep 30 21:38:11 2022 +1000 kernelbase: Return full title length from GetConsoleTitle(). --- dlls/kernel32/tests/console.c | 6 +++--- dlls/kernelbase/console.c | 28 +++++++++++++++++++--------- include/wine/condrv.h | 7 +++++++ programs/conhost/conhost.c | 12 ++++++++---- 4 files changed, 37 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index b10254bc161..c145aa4cb59 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4272,12 +4272,12 @@ static void test_GetConsoleTitleW(void) ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); - todo_wine ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); + ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); ok(!wcscmp(buf, str), "Title = %s\n", wine_dbgstr_w(buf)); ret = GetConsoleTitleW(buf, 2); ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); - todo_wine ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); + ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); if (!skip_nt) ok(!wcscmp(buf, L"t"), "Title = %s\n", wine_dbgstr_w(buf)); ret = GetConsoleTitleW(buf, 4); @@ -4289,7 +4289,7 @@ static void test_GetConsoleTitleW(void) ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); - todo_wine ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); } static void test_file_info(HANDLE input, HANDLE output) diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 590198cf7bf..434399b073a 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -1012,12 +1012,11 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleA( LPSTR title, DWORD size ) DWORD ret; if (!ptr) return 0; + ret = GetConsoleTitleW( ptr, size ); if (ret) - { - WideCharToMultiByte( GetConsoleOutputCP(), 0, ptr, ret + 1, title, size, NULL, NULL); - ret = strlen(title); - } + WideCharToMultiByte( GetConsoleOutputCP(), 0, ptr, -1, title, size, NULL, NULL); + HeapFree( GetProcessHeap(), 0, ptr ); return ret; } @@ -1028,15 +1027,26 @@ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleA( LPSTR title, DWORD size ) */ DWORD WINAPI DECLSPEC_HOTPATCH GetConsoleTitleW( LPWSTR title, DWORD size ) { - if (!size) return 0; + struct condrv_title_params *params; + size_t max_size = sizeof(*params) + (size - 1) * sizeof(WCHAR); + + if (!title || !size) return 0; + + if (!(params = HeapAlloc( GetProcessHeap(), 0, max_size ))) + return 0; if (!console_ioctl( RtlGetCurrentPeb()->ProcessParameters->ConsoleHandle, IOCTL_CONDRV_GET_TITLE, - NULL, 0, title, (size - 1) * sizeof(WCHAR), &size )) + NULL, 0, params, max_size, &size )) return 0; - size /= sizeof(WCHAR); - title[size] = 0; - return size + 1; + if (size < sizeof(*params)) return 0; + + size -= sizeof(*params); + memcpy( title, params->buffer, size ); + title[ size / sizeof(WCHAR) ] = 0; + size = params->title_len; + HeapFree( GetProcessHeap(), 0, params ); + return size; } diff --git a/include/wine/condrv.h b/include/wine/condrv.h index 3355d7177b0..51534720444 100644 --- a/include/wine/condrv.h +++ b/include/wine/condrv.h @@ -159,6 +159,13 @@ struct condrv_output_info_params #define SET_CONSOLE_OUTPUT_INFO_POPUP_ATTR 0x0040 #define SET_CONSOLE_OUTPUT_INFO_FONT 0x0080 +/* IOCTL_CONDRV_GET_TITLE params */ +struct condrv_title_params +{ + unsigned int title_len; + WCHAR buffer[1]; +}; + /* IOCTL_CONDRV_FILL_OUTPUT params */ struct condrv_fill_output_params { diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 792daeb520f..c3a106c9321 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -2675,12 +2675,16 @@ static NTSTATUS console_input_ioctl( struct console *console, unsigned int code, case IOCTL_CONDRV_GET_TITLE: { - WCHAR *result; + size_t title_len, str_size; + struct condrv_title_params *params; if (in_size) return STATUS_INVALID_PARAMETER; + title_len = console->title ? wcslen( console->title ) : 0; + str_size = min( *out_size - sizeof(*params), title_len * sizeof(WCHAR) ); + *out_size = sizeof(*params) + str_size; + if (!(params = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; TRACE( "returning title %s\n", debugstr_w(console->title) ); - *out_size = min( *out_size, console->title ? wcslen( console->title ) * sizeof(WCHAR) : 0 ); - if (!(result = alloc_ioctl_buffer( *out_size ))) return STATUS_NO_MEMORY; - if (*out_size) memcpy( result, console->title, *out_size ); + if (str_size) memcpy( params->buffer, console->title, str_size ); + params->title_len = title_len; return STATUS_SUCCESS; }

1 0

Hugh McMaster : kernel32/tests: Add tests for GetConsoleTitle().
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: e6bea0328a25c944910adfc5a4647a3d407a0c54 URL: https://gitlab.winehq.org/wine/wine/-/commit/e6bea0328a25c944910adfc5a4647a… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Sep 28 10:11:18 2022 +1000 kernel32/tests: Add tests for GetConsoleTitle(). --- dlls/kernel32/tests/console.c | 72 +++++++++++++++++++++++++++++++++---------- 1 file changed, 56 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 5d65b0b75e7..b10254bc161 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -4230,28 +4230,66 @@ static void test_SetConsoleScreenBufferInfoEx(HANDLE std_output) CloseHandle(std_input); } -static void test_console_title(void) +static void test_GetConsoleTitleA(void) { - WCHAR buf[64]; - BOOL ret; + char buf[64], str[] = "test"; + DWORD ret; + + ret = SetConsoleTitleA(str); + ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); + + ret = GetConsoleTitleA(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleTitleA(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleTitleA(buf, ARRAY_SIZE(buf)); + ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); + ok(ret == strlen(str), "Got string length %lu, expected %Iu\n", ret, strlen(str)); + ok(!strcmp(buf, str), "Title = %s\n", wine_dbgstr_a(buf)); + + ret = SetConsoleTitleA(""); + ok(ret, "SetConsoleTitleA failed: %lu\n", GetLastError()); + + ret = GetConsoleTitleA(buf, ARRAY_SIZE(buf)); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); +} + +static void test_GetConsoleTitleW(void) +{ + WCHAR buf[64], str[] = L"test"; + DWORD ret; - ret = SetConsoleTitleW(L"test"); + ret = SetConsoleTitleW(str); ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); + ret = GetConsoleTitleW(NULL, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + + ret = GetConsoleTitleW(buf, 0); + ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); + ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); - ok(!wcscmp(buf, L"test"), "title = %s\n", wine_dbgstr_w(buf)); + todo_wine ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); + ok(!wcscmp(buf, str), "Title = %s\n", wine_dbgstr_w(buf)); - if (!skip_nt) - { - ret = GetConsoleTitleW(buf, 2); - ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); - ok(!wcscmp(buf, L"t"), "title = %s\n", wine_dbgstr_w(buf)); + ret = GetConsoleTitleW(buf, 2); + ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); + todo_wine ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); + if (!skip_nt) ok(!wcscmp(buf, L"t"), "Title = %s\n", wine_dbgstr_w(buf)); - ret = GetConsoleTitleW(buf, 4); - ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); - ok(!wcscmp(buf, L"tes"), "title = %s\n", wine_dbgstr_w(buf)); - } + ret = GetConsoleTitleW(buf, 4); + ok(ret, "GetConsoleTitleW failed: %lu\n", GetLastError()); + ok(ret == wcslen(str), "Got string length %lu, expected %Iu\n", ret, wcslen(str)); + if (!skip_nt) ok(!wcscmp(buf, L"tes"), "Title = %s\n", wine_dbgstr_w(buf)); + + ret = SetConsoleTitleW(L""); + ok(ret, "SetConsoleTitleW failed: %lu\n", GetLastError()); + + ret = GetConsoleTitleW(buf, ARRAY_SIZE(buf)); + todo_wine ok(!ret, "Unexpected string length; error %lu\n", GetLastError()); } static void test_file_info(HANDLE input, HANDLE output) @@ -4584,7 +4622,8 @@ static void test_pseudo_console_child(HANDLE input, HANDLE output) hwnd = GetConsoleWindow(); ok(IsWindow(hwnd), "no console window\n"); - test_console_title(); + test_GetConsoleTitleA(); + test_GetConsoleTitleW(); test_WriteConsoleInputW(input); } @@ -5017,7 +5056,8 @@ START_TEST(console) test_GetConsoleScreenBufferInfoEx(hConOut); test_SetConsoleScreenBufferInfoEx(hConOut); test_file_info(hConIn, hConOut); - test_console_title(); + test_GetConsoleTitleA(); + test_GetConsoleTitleW(); if (!test_current) { test_pseudo_console();

1 0

Jacek Caban : winevulkan: Use host Vulkan structures for private thunks arguments.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 000a7bbb5a10ca9144b7ab7a23c4716edf1a83b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/000a7bbb5a10ca9144b7ab7a23c471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 21:37:45 2022 +0200 winevulkan: Use host Vulkan structures for private thunks arguments. --- dlls/winevulkan/make_vulkan | 176 ++++++++++++++++----------------- dlls/winevulkan/vulkan.c | 70 ++++++++------ dlls/winevulkan/vulkan_thunks.c | 209 +++++++++++----------------------------- dlls/winevulkan/vulkan_thunks.h | 112 +++++++++------------ 4 files changed, 225 insertions(+), 342 deletions(-)

1 0

Alex Henrie : include: Fix typos in NIN_BALLOON*.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 7d223c5326f21cc4152d39b225c6b1528edca559 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d223c5326f21cc4152d39b225c6b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 9 22:33:33 2022 -0600 include: Fix typos in NIN_BALLOON*. Needed to compile Tera Term. --- include/shellapi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index e02869f14e8..b7c136c2efa 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -385,10 +385,10 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp #define NIN_SELECT (WM_USER+0) #define NINF_KEY 1 #define NIN_KEYSELECT (NIN_SELECT|NINF_KEY) /* WM_USER+1 */ -#define NIN_BALOONSHOW (WM_USER+2) -#define NIN_BALOONHIDE (WM_USER+3) -#define NIN_BALOONTIMEOUT (WM_USER+4) -#define NIN_BALOONCLICK (WM_USER+5) +#define NIN_BALLOONSHOW (WM_USER+2) +#define NIN_BALLOONHIDE (WM_USER+3) +#define NIN_BALLOONTIMEOUT (WM_USER+4) +#define NIN_BALLOONUSERCLICK (WM_USER+5) #define NIN_POPUPOPEN (WM_USER+6) #define NIN_POPUPCLOSE (WM_USER+7)

1 0

Alex Henrie : include: Fix typo in LR_VGACOLOR.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 9d2b879d1773a95239d7225503137f79f635d9bc URL: https://gitlab.winehq.org/wine/wine/-/commit/9d2b879d1773a95239d7225503137f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 9 22:14:36 2022 -0600 include: Fix typo in LR_VGACOLOR. Needed to compile Tera Term. --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index b17f30debd3..2f4afffb8a3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3132,7 +3132,7 @@ typedef struct tagTRACKMOUSEEVENT { #define LR_LOADFROMFILE 0x0010 #define LR_LOADTRANSPARENT 0x0020 #define LR_DEFAULTSIZE 0x0040 -#define LR_VGA_COLOR 0x0080 +#define LR_VGACOLOR 0x0080 #define LR_LOADMAP3DCOLORS 0x1000 #define LR_CREATEDIBSECTION 0x2000 #define LR_COPYFROMRESOURCE 0x4000

1 0

Eric Pouech : wined3d: Use I width modifier for debug traces on DWORD_PTR.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 0d359fb8de728ea433e43465d5897de81aebbc3d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d359fb8de728ea433e43465d5897d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:46 2022 +0200 wined3d: Use I width modifier for debug traces on DWORD_PTR. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader_sm4.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3a2263d109f..1a953f8e218 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -282,7 +282,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) { - TRACE("Byte %lu in vertex changed:\n", idx); + TRACE("Byte %Iu in vertex changed:\n", idx); TRACE(" It was type %#x, is %#x now.\n", buffer->conversion_map[idx], conversion_type); ret = TRUE; buffer->conversion_map[idx] = conversion_type; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d47f7cf5d1a..13700c6dfb9 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -781,7 +781,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; - TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + TRACE("slab %p, idx %Iu, context_vk %p.\n", slab, idx, context_vk); wined3d_device_vk_allocator_lock(device_vk); @@ -819,7 +819,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk * if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) { - ERR("Leaking slab %p, slice %#lx.\n", slab, idx); + ERR("Leaking slab %p, slice %#Ix.\n", slab, idx); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e214c47f071..d1c18177d62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1112,7 +1112,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win GLsizeiptr buffer_offset = 0; GLuint id = 0; - TRACE("device_gl %p, context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + TRACE("device_gl %p, context_gl %p, size %Iu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", device_gl, context_gl, size, binding, usage, coherent, flags, bo); if (gl_info->supported[ARB_BUFFER_STORAGE]) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 73001d90833..62aba18a235 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1717,7 +1717,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %Iu).\n", len, remaining); goto fail; } --len; @@ -1920,7 +1920,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; } @@ -1931,7 +1931,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", + WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4b718746b6a..2e4dda2c473 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -630,7 +630,7 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam { if (filter && message != WM_DISPLAYCHANGE) { - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", + TRACE("Filtering message: window %p, message %#x, wparam %#Ix, lparam %#Ix.\n", window, message, wparam, lparam); if (unicode)

1 0

Eric Pouech : wined3d: Ensure method declaration matches implementations.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 25f6693048ab26cabfccccec715b89c6f568dc96 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f6693048ab26cabfccccec715b89… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:45 2022 +0200 wined3d: Ensure method declaration matches implementations. wined3d_resource_ops.resource_sub_resource_map() Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a065d0ae54f..c76a50ea6ae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3689,7 +3689,7 @@ static void texture_resource_sub_resource_get_map_pitch(struct wined3d_resource } static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - void **map_ptr, const struct wined3d_box *box, DWORD flags) + void **map_ptr, const struct wined3d_box *box, uint32_t flags) { struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b02bf1bef36..b7d3b579ed2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4393,7 +4393,7 @@ struct wined3d_resource_ops void (*resource_sub_resource_get_map_pitch)(struct wined3d_resource *resource, unsigned int sub_resource_idx, unsigned int *row_pitch, unsigned int *slice_pitch); HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, - void **map_ptr, const struct wined3d_box *box, DWORD flags); + void **map_ptr, const struct wined3d_box *box, uint32_t flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); };

1 0

Eric Pouech : wined3d: Ensure function declaration matches implementation.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 414543f6abe63d4ba46018615da4b525d96d6127 URL: https://gitlab.winehq.org/wine/wine/-/commit/414543f6abe63d4ba46018615da4b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:43 2022 +0200 wined3d: Ensure function declaration matches implementation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5217ee7d221..b02bf1bef36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2939,7 +2939,7 @@ void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl, void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; +void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -4055,7 +4055,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +void device_invalidate_state(const struct wined3d_device *device, unsigned int state) DECLSPEC_HIDDEN; HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Francois Gouget : d3d9/tests: Mark the test_wndproc() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 61ee891c67037fcadd6d8d831542d5f687c74ded URL: https://gitlab.winehq.org/wine/wine/-/commit/61ee891c67037fcadd6d8d831542d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:32:30 2022 +0200 d3d9/tests: Mark the test_wndproc() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53281 --- dlls/d3d9/tests/d3d9ex.c | 1 + dlls/d3d9/tests/device.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b9c5ecd2e05..d1ea5587f3a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3096,6 +3096,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky_if(i == 0 || i == 1) ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9fe05625190..c824edec9df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4342,6 +4342,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky_if(i == 0) ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL;

1 0

Francois Gouget : d3d9/tests: Mark the test_wndproc_windowed() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 42290cddc53ea1e5b30d2e19e22297a121878f00 URL: https://gitlab.winehq.org/wine/wine/-/commit/42290cddc53ea1e5b30d2e19e22297… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:33:34 2022 +0200 d3d9/tests: Mark the test_wndproc_windowed() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53283 --- dlls/d3d9/tests/d3d9ex.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 19c4eec7921..b9c5ecd2e05 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3297,6 +3297,7 @@ static void test_wndproc_windowed(void) if (thread_params.running_in_foreground) { tmp = GetForegroundWindow(); + flaky ok(tmp == thread_params.dummy_window, "Expected foreground window %p, got %p.\n", thread_params.dummy_window, tmp); }

1 0

Francois Gouget : d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: fc5bb4deef2127b0ecd57078c45bbfe82db9d6f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc5bb4deef2127b0ecd57078c45bbf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:39:11 2022 +0200 d3d9/tests: Mark the test_cursor_pos() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53194 --- dlls/d3d9/tests/device.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index dbdce1e5871..9fe05625190 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -5287,6 +5287,7 @@ static void test_cursor_pos(void) ok(ret, "Failed to set cursor position.\n"); flush_events(); + flaky ok((!expect_pos->x && !expect_pos->y) || broken(expect_pos - points == 7), "Didn't receive MOUSEMOVE %u (%ld, %ld).\n", (unsigned)(expect_pos - points), expect_pos->x, expect_pos->y);

1 0

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 October 2022