September 2021 - Wine-Commits

Jacek Caban : gdi32: Don't use wide string literals ntgdi functions.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 0758578dace8781c7c640e223c2a055c104d63c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0758578dace8781c7c640e22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:14 2021 +0200 gdi32: Don't use wide string literals ntgdi functions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 111 ++++++++++++++++++++------------- dlls/gdi32/gdiobj.c | 176 ++++++++++++++++++++++++++++++++++------------------ 2 files changed, 186 insertions(+), 101 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0758578dace8781c7c64…

1 0

Jacek Caban : user32: Always initialize graphics_driver in load_desktop_driver.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 360510da94ef5e427cec24f264e14fc1d225f918 URL: https://source.winehq.org/git/wine.git/?a=commit;h=360510da94ef5e427cec24f2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:07:02 2021 +0200 user32: Always initialize graphics_driver in load_desktop_driver. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c index 59a163c700d..7de45376740 100644 --- a/dlls/user32/driver.c +++ b/dlls/user32/driver.c @@ -84,7 +84,7 @@ static BOOL load_desktop_driver( HWND hwnd, HMODULE *module ) static const USER_DRIVER *load_driver(void) { void *ptr; - HMODULE graphics_driver; + HMODULE graphics_driver = NULL; USER_DRIVER *driver, *prev; driver = HeapAlloc( GetProcessHeap(), 0, sizeof(*driver) );

1 0

Jacek Caban : gdi32: Fix NT prefix handling in update_external_font_keys.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 773c20ffd1c67ba48346146b178c7a2e8b66cd9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=773c20ffd1c67ba48346146b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:06:56 2021 +0200 gdi32: Fix NT prefix handling in update_external_font_keys. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 189405c2ba1..270c6b01e73 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -6019,7 +6019,7 @@ static void update_external_font_keys(void) path = (WCHAR *)(buffer + info->DataOffset); if (path[0] && path[1] == ':') { - memmove( path, path + ARRAYSIZE(nt_prefixW), sizeof(nt_prefixW) ); + memmove( path + ARRAYSIZE(nt_prefixW), path, info->DataLength ); memcpy( path, nt_prefixW, sizeof(nt_prefixW) ); }

1 0

Jacek Caban : gdi32: Introduce user_callbacks.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: cdfcafafa16f76499f366e1ef50b03056cbbc0f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdfcafafa16f76499f366e1e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 29 14:08:05 2021 +0200 gdi32: Introduce user_callbacks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/Makefile.in | 3 +- dlls/gdi32/driver.c | 74 ++++++++++------------- dlls/gdi32/freetype.c | 18 ++++++ dlls/gdi32/gdiobj.c | 9 +-- dlls/gdi32/ntgdi_private.h | 3 +- dlls/gdi32/palette.c | 27 +++------ dlls/gdi32/region.c | 11 +--- dlls/gdi32/win32u_private.h | 41 +++++++++++++ dlls/gdi32/wrappers.c | 141 ++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 246 insertions(+), 81 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cdfcafafa16f76499f36…

1 0

Connor McAdams : user32/tests: Fix dump_sequence winevent_hook_todo handling.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 1b78c229f52d50f055bef74008d7c6cd9692165d URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b78c229f52d50f055bef740… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Tue Sep 28 21:12:29 2021 -0400 user32/tests: Fix dump_sequence winevent_hook_todo handling. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9602649600f..43253953a9e 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -2665,7 +2665,8 @@ static void dump_sequence(const struct message *expected, const char *context, c } } /* silently drop winevent messages if there is no support for them */ - else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook)) + else if ((expected->flags & optional) || ((expected->flags & winevent_hook) && !hEvent_hook) || + ((expected->flags & winevent_hook_todo) && !strcmp(winetest_platform, "wine"))) expected++; else {

1 0

Rémi Bernon : include: Add IID_IDirectInputPIDDriver definition.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: d0a1ac332d8d3295c7260d68206f27d3e34ae722 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0a1ac332d8d3295c7260d68… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 29 10:24:55 2021 +0200 include: Add IID_IDirectInputPIDDriver definition. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dinputd.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/dinputd.h b/include/dinputd.h index 9c3b435cc6c..141e634b59d 100644 --- a/include/dinputd.h +++ b/include/dinputd.h @@ -27,6 +27,7 @@ #endif DEFINE_GUID(IID_IDirectInputJoyConfig8, 0xEB0D7DFA,0x1990,0x4F27,0xB4,0xD6,0xED,0xF2,0xEE,0xC4,0xA4,0x4C); +DEFINE_GUID(IID_IDirectInputPIDDriver, 0xeec6993a,0xb3fd,0x11d2,0xa9,0x16,0x00,0xc0,0x4f,0xb9,0x86,0x38); typedef struct IDirectInputJoyConfig8 *LPDIRECTINPUTJOYCONFIG8;

1 0

Nikolay Sivov : ole32/composite: Reimplement Reduce().
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: f95fe051f0ef6d8032d81befc944f6907b38d793 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f95fe051f0ef6d8032d81bef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:27 2021 +0300 ole32/composite: Reimplement Reduce(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compositemoniker.c | 89 ++++++++++++++----------------------------- dlls/ole32/tests/moniker.c | 19 ++++++++- 2 files changed, 46 insertions(+), 62 deletions(-) diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index c6d0d3c47a6..80a1a675766 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -408,76 +408,43 @@ static HRESULT WINAPI CompositeMonikerImpl_BindToStorage(IMoniker *iface, IBindC return hr; } -/****************************************************************************** - * CompositeMoniker_Reduce - ******************************************************************************/ -static HRESULT WINAPI -CompositeMonikerImpl_Reduce(IMoniker* iface, IBindCtx* pbc, DWORD dwReduceHowFar, - IMoniker** ppmkToLeft, IMoniker** ppmkReduced) +static HRESULT WINAPI CompositeMonikerImpl_Reduce(IMoniker *iface, IBindCtx *pbc, DWORD howfar, + IMoniker **toleft, IMoniker **reduced) { - HRESULT res; - IMoniker *tempMk,*antiMk,*rightMostMk,*leftReducedComposedMk,*rightMostReducedMk; - IEnumMoniker *enumMoniker; - - TRACE("(%p,%p,%d,%p,%p)\n",iface,pbc,dwReduceHowFar,ppmkToLeft,ppmkReduced); - - if (ppmkReduced==NULL) - return E_POINTER; - - /* This method recursively calls Reduce for each of its component monikers. */ - - if (ppmkToLeft==NULL){ + CompositeMonikerImpl *moniker = impl_from_IMoniker(iface); + IMoniker *m, *reduced_left, *reduced_right; + BOOL was_reduced; + HRESULT hr; - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); + TRACE("%p, %p, %d, %p, %p.\n", iface, pbc, howfar, toleft, reduced); - CreateAntiMoniker(&antiMk); - IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); + if (!pbc || !reduced) + return E_INVALIDARG; - res = IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk, ppmkReduced); - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); + if (FAILED(hr = IMoniker_Reduce(moniker->left, pbc, howfar, NULL, &reduced_left))) + return hr; - return res; + m = moniker->left; + if (FAILED(hr = IMoniker_Reduce(moniker->right, pbc, howfar, &m, &reduced_right))) + { + IMoniker_Release(reduced_left); + return hr; } - else if (*ppmkToLeft==NULL) - return IMoniker_Reduce(iface,pbc,dwReduceHowFar,NULL,ppmkReduced); - - else{ - - /* separate the composite moniker in to left and right moniker */ - IMoniker_Enum(iface,FALSE,&enumMoniker); - IEnumMoniker_Next(enumMoniker,1,&rightMostMk,NULL); - IEnumMoniker_Release(enumMoniker); - - CreateAntiMoniker(&antiMk); - IMoniker_ComposeWith(iface,antiMk,0,&tempMk); - IMoniker_Release(antiMk); - - /* If any of the components reduces itself, the method returns S_OK and passes back a composite */ - /* of the reduced components */ - if (IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,NULL,&rightMostReducedMk) && - IMoniker_Reduce(rightMostMk,pbc,dwReduceHowFar,&tempMk,&leftReducedComposedMk) ){ - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); - - return CreateGenericComposite(leftReducedComposedMk,rightMostReducedMk,ppmkReduced); - } - else{ - /* If no reduction occurred, the method passes back the same moniker and returns MK_S_REDUCED_TO_SELF.*/ - IMoniker_Release(tempMk); - IMoniker_Release(rightMostMk); - - IMoniker_AddRef(iface); + if ((was_reduced = (reduced_left != moniker->left || reduced_right != moniker->right))) + { + hr = CreateGenericComposite(reduced_left, reduced_right, reduced); + } + else + { + *reduced = iface; + IMoniker_AddRef(*reduced); + } - *ppmkReduced=iface; + IMoniker_Release(reduced_left); + IMoniker_Release(reduced_right); - return MK_S_REDUCED_TO_SELF; - } - } + return was_reduced ? hr : MK_S_REDUCED_TO_SELF; } static HRESULT WINAPI CompositeMonikerImpl_ComposeWith(IMoniker *iface, IMoniker *right, diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index ea58c09356e..7e4a42a0ee6 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3439,7 +3439,6 @@ todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMoniker_GetTimeOfLastChange(moniker, bindctx, moniker1, &ft); -todo_wine ok(hr == MK_E_NOTBINDABLE, "Unexpected hr %#x.\n", hr); hr = IRunningObjectTable_Revoke(rot, cookie); @@ -3629,6 +3628,24 @@ todo_wine { IMoniker_Release(moniker); + /* Reduce() */ + hr = create_moniker_from_desc("CI1I2", &moniker); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ALL, NULL, NULL); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + hr = IMoniker_Reduce(moniker, NULL, MKRREDUCE_ALL, NULL, &moniker2); + ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + + hr = IMoniker_Reduce(moniker, bindctx, MKRREDUCE_ALL, NULL, &moniker2); + ok(hr == MK_S_REDUCED_TO_SELF, "Unexpected hr %#x.\n", hr); + ok(moniker2 == moniker, "Unexpected object.\n"); + IMoniker_Release(moniker2); + + IMoniker_Release(moniker); + IBindCtx_Release(bindctx); }

1 0

Nikolay Sivov : ole32/tests: Add a GetComparisonData() test for composite.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: b8ba0e6fe082977e9d7af99f05c8e0c3dad32988 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8ba0e6fe082977e9d7af99f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 29 10:23:24 2021 +0300 ole32/tests: Add a GetComparisonData() test for composite. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/moniker.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index a7c0714a5d7..2d7f0789924 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -3173,6 +3173,7 @@ static void test_generic_composite_moniker(void) IUnknown *unknown; IROTData *rotdata; IMarshal *marshal; + BYTE buffer[100]; IStream *stream; unsigned int i; FILETIME ft; @@ -3606,6 +3607,17 @@ todo_wine hr = IMoniker_GetDisplayName(moniker, bindctx, NULL, &str); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + /* Comparison data, pointer component does not support it. */ + hr = IMoniker_QueryInterface(moniker, &IID_IROTData, (void **)&rotdata); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + len = 0; + hr = IROTData_GetComparisonData(rotdata, buffer, sizeof(buffer), &len); +todo_wine { + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(!len, "Unexpected length %u.\n", len); +} + IROTData_Release(rotdata); + IMoniker_Release(moniker); IBindCtx_Release(bindctx);

1 0

Alex Henrie : ws2_32/tests: Use %u and %Iu in test_ipv6_cmsg instead of casting.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: f1bffc801f7b4b1c2d3e2001dc3d794a708332f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1bffc801f7b4b1c2d3e2001… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Wed Sep 29 00:40:52 2021 -0600 ws2_32/tests: Use %u and %Iu in test_ipv6_cmsg instead of casting. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8cbb393b542..ec8a3b0481b 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2032,11 +2032,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_HOPLIMIT, "expected IPV6_HOPLIMIT, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data >= 32, "expected at least 32, got %i\n", *int_data); setsockopt(server, IPPROTO_IPV6, IPV6_HOPLIMIT, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_HOPLIMIT, error %u\n", WSAGetLastError()); @@ -2054,11 +2054,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_PKTINFO, "expected IPV6_PKTINFO, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(IN6_PKTINFO), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(IN6_PKTINFO)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(IN6_PKTINFO), header->cmsg_len); ok(!memcmp(&pkt_info->ipi6_addr, &localhost.sin6_addr, sizeof(IN6_ADDR)), "expected ::1\n"); rc = setsockopt(server, IPPROTO_IPV6, IPV6_PKTINFO, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_PKTINFO, error %u\n", WSAGetLastError()); @@ -2076,11 +2076,11 @@ static void test_ipv6_cmsg(void) ok(rc == sizeof(payload), "send failed, error %u\n", WSAGetLastError()); rc = pWSARecvMsg(server, &msg, &count, NULL, NULL); ok(!rc, "WSARecvMsg failed, error %u\n", WSAGetLastError()); - ok(count == sizeof(payload), "expected length %i, got %i\n", (INT)sizeof(payload), count); + ok(count == sizeof(payload), "expected length %Iu, got %u\n", sizeof(payload), count); ok(header->cmsg_level == IPPROTO_IPV6, "expected IPPROTO_IPV6, got %i\n", header->cmsg_level); ok(header->cmsg_type == IPV6_TCLASS, "expected IPV6_TCLASS, got %i\n", header->cmsg_type); ok(header->cmsg_len == sizeof(*header) + sizeof(INT), - "expected length %i, got %i\n", (INT)(sizeof(*header) + sizeof(INT)), (INT)header->cmsg_len); + "expected length %Iu, got %Iu\n", sizeof(*header) + sizeof(INT), header->cmsg_len); ok(*int_data == 0, "expected 0, got %i\n", *int_data); rc = setsockopt(server, IPPROTO_IPV6, IPV6_RECVTCLASS, (const char *)&off, sizeof(off)); ok(!rc, "failed to clear IPV6_RECVTCLASS, error %u\n", WSAGetLastError());

1 0

Zebediah Figura : wined3d: Do not call list_remove() on a Vulkan query which has not been started.
by Alexandre Julliard Sept. 29, 2021

Sept. 29, 2021

Module: wine Branch: master Commit: 369168047874c4e8009bac94bffa4585d139daed URL: https://source.winehq.org/git/wine.git/?a=commit;h=369168047874c4e8009bac94… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Sep 28 13:05:14 2021 -0500 wined3d: Do not call list_remove() on a Vulkan query which has not been started. Or call it twice on one which has. This fixes a crash in Mafia: Definitive Edition. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/query.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 24892e42b34..8ee7ae07886 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -1661,7 +1661,6 @@ static BOOL wined3d_query_vk_issue(struct wined3d_query *query, uint32_t flags) { context_vk = wined3d_context_vk(context_acquire(&device_vk->d, NULL, 0)); - list_remove(&query_vk->entry); if (query_vk->pending_count) wined3d_context_vk_remove_pending_queries(context_vk, query_vk); memset((void *)query->data, 0, query->data_size); @@ -1742,7 +1741,8 @@ static void wined3d_query_vk_destroy(struct wined3d_query *query) struct wined3d_query_vk *query_vk = wined3d_query_vk(query); struct wined3d_context_vk *context_vk; - list_remove(&query_vk->entry); + if (query_vk->flags & WINED3D_QUERY_VK_FLAG_STARTED) + list_remove(&query_vk->entry); if (query_vk->pending_count) { context_vk = wined3d_context_vk(context_acquire(query_vk->q.device, NULL, 0)); @@ -1942,7 +1942,6 @@ HRESULT wined3d_query_vk_create(struct wined3d_device *device, enum wined3d_quer data = query_vk + 1; wined3d_query_init(&query_vk->q, device, type, data, data_size, ops, parent, parent_ops); - list_init(&query_vk->entry); switch (type) {

1 0