September 2018 - Wine-Devel

Re: [PATCH v3 3/3] comdlg32/tests: Fix failures on newer Windows 10.

by Marvin

Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=41986 Your paranoid android. === w7pro64 (32 bit Windows report) === comdlg32: 0ad4:itemdlg: unhandled exception c0000005 at 75371EA3

Sept. 13, 2018

Re: [PATCH 2/8] wsdapi/tests: Add test for duplicate message filtering.

by Huw Davies

On Thu, Sep 13, 2018 at 09:44:34AM +0100, Owen Rudge wrote: > Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> > --- > dlls/wsdapi/tests/discovery.c | 134 ++++++++++++++++++++++++++++++++-- > 1 file changed, 129 insertions(+), 5 deletions(-) > > > diff --git a/dlls/wsdapi/tests/discovery.c b/dlls/wsdapi/tests/discovery.c > index f33f469a03..9e1cbf99e2 100644 > --- a/dlls/wsdapi/tests/discovery.c > +++ b/dlls/wsdapi/tests/discovery.c > @@ -72,6 +72,7 @@ static const WCHAR name_cider[] = { 'C','i','d','e','r', 0 }; > > static HANDLE probe_event = NULL; > static UUID probe_message_id; > +static int probe_message_received_count; > > static IWSDiscoveryPublisher *publisher_instance = NULL; > > @@ -790,6 +791,37 @@ after_matchprobe_test: > return S_OK; > } > > +static HRESULT WINAPI IWSDiscoveryPublisherNotify_MsgCount_Impl_ProbeHandler(IWSDiscoveryPublisherNotify *This, > + const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) > +{ > + trace("IWSDiscoveryPublisherNotify_MsgCount_Impl_ProbeHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); > + > + ok(pSoap != NULL, "pSoap == NULL\n"); > + > + if (pSoap != NULL) > + { > + ok(pSoap->Header.MessageID != NULL, "pSoap->Header.MessageID == NULL\n"); > + > + /* Ensure the message ID is at least 9 characters long (to skip past the 'urn:uuid:' prefix) */ > + if ((pSoap->Header.MessageID != NULL) && (lstrlenW(pSoap->Header.MessageID) > 9)) > + { > + UUID uuid; > + RPC_STATUS ret = UuidFromStringW((LPWSTR)pSoap->Header.MessageID + 9, &uuid); > + > + trace("Received message with UUID '%s' (expected UUID '%s')\n", wine_dbgstr_guid(&uuid), > + wine_dbgstr_guid(&probe_message_id)); > + > + /* Check if we've either received a message without a UUID, or the UUID isn't the one we sent. If so, > + ignore it and wait for another message. */ > + if ((ret != RPC_S_OK) || (UuidEqual(&uuid, &probe_message_id, &ret) == FALSE)) return S_OK; > + > + InterlockedIncrement(&probe_message_received_count); > + } > + } > + > + return S_OK; > +} > + > static HRESULT WINAPI IWSDiscoveryPublisherNotifyImpl_ResolveHandler(IWSDiscoveryPublisherNotify *This, const WSD_SOAP_MESSAGE *pSoap, IWSDMessageParameters *pMessageParameters) > { > trace("IWSDiscoveryPublisherNotifyImpl_ResolveHandler called (%p, %p, %p)\n", This, pSoap, pMessageParameters); > @@ -805,7 +837,17 @@ static const IWSDiscoveryPublisherNotifyVtbl publisherNotify_vtbl = > IWSDiscoveryPublisherNotifyImpl_ResolveHandler > }; > > -static BOOL create_discovery_publisher_notify(IWSDiscoveryPublisherNotify **publisherNotify) > +static const IWSDiscoveryPublisherNotifyVtbl publisherNotify_MsgCount_vtbl = > +{ > + IWSDiscoveryPublisherNotifyImpl_QueryInterface, > + IWSDiscoveryPublisherNotifyImpl_AddRef, > + IWSDiscoveryPublisherNotifyImpl_Release, > + IWSDiscoveryPublisherNotify_MsgCount_Impl_ProbeHandler, > + IWSDiscoveryPublisherNotifyImpl_ResolveHandler > +}; > + > +static BOOL create_discovery_publisher_notify(IWSDiscoveryPublisherNotify **publisherNotify, > + const IWSDiscoveryPublisherNotifyVtbl *vtbl) > { > IWSDiscoveryPublisherNotifyImpl *obj; > > @@ -819,7 +861,7 @@ static BOOL create_discovery_publisher_notify(IWSDiscoveryPublisherNotify **publ > return FALSE; > } > > - obj->IWSDiscoveryPublisherNotify_iface.lpVtbl = &publisherNotify_vtbl; > + obj->IWSDiscoveryPublisherNotify_iface.lpVtbl = vtbl; > obj->ref = 1; > > *publisherNotify = &obj->IWSDiscoveryPublisherNotify_iface; > @@ -959,8 +1001,8 @@ static void Publish_tests(void) > ok(rc == STG_E_INVALIDFUNCTION, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV6) returned unexpected result: %08x\n", rc); > > /* Create notification sinks */ > - ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); > - ok(create_discovery_publisher_notify(&sink2) == TRUE, "create_discovery_publisher_notify failed\n"); > + ok(create_discovery_publisher_notify(&sink1, &publisherNotify_vtbl) == TRUE, "create_discovery_publisher_notify failed\n"); > + ok(create_discovery_publisher_notify(&sink2, &publisherNotify_vtbl) == TRUE, "create_discovery_publisher_notify failed\n"); > > /* Get underlying implementation so we can check the ref count */ > sink1Impl = impl_from_IWSDiscoveryPublisherNotify(sink1); > @@ -1200,7 +1242,7 @@ static void UnPublish_tests(void) > ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); > > /* Create notification sink */ > - ok(create_discovery_publisher_notify(&sink1) == TRUE, "create_discovery_publisher_notify failed\n"); > + ok(create_discovery_publisher_notify(&sink1, &publisherNotify_vtbl) == TRUE, "create_discovery_publisher_notify failed\n"); > rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); > ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); > > @@ -1307,6 +1349,87 @@ after_unpublish_test: > WSACleanup(); > } > > +static void Probe_DuplicateMessageFiltering_tests(void) > +{ > + IWSDiscoveryPublisher *publisher = NULL; > + IWSDiscoveryPublisherNotify *sink1 = NULL; > + LPWSTR publisherIdW = NULL, sequenceIdW = NULL; > + WSADATA wsaData; > + int ret; > + HRESULT rc; > + ULONG ref; > + unsigned char *probe_uuid_str; > + > + rc = WSDCreateDiscoveryPublisher(NULL, &publisher); > + ok(rc == S_OK, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: %08x\n", rc); > + ok(publisher != NULL, "WSDCreateDiscoveryPublisher(NULL, &publisher) failed: publisher == NULL\n"); > + > + publisher_instance = publisher; > + > + rc = IWSDiscoveryPublisher_SetAddressFamily(publisher, WSDAPI_ADDRESSFAMILY_IPV4); > + ok(rc == S_OK, "IWSDiscoveryPublisher_SetAddressFamily(WSDAPI_ADDRESSFAMILY_IPV4) failed: %08x\n", rc); > + > + /* Create notification sink */ > + ok(create_discovery_publisher_notify(&sink1, &publisherNotify_MsgCount_vtbl) == TRUE, > + "create_discovery_publisher_notify failed\n"); > + > + /* Register notification sinks */ > + rc = IWSDiscoveryPublisher_RegisterNotificationSink(publisher, sink1); > + ok(rc == S_OK, "IWSDiscoveryPublisher_RegisterNotificationSink failed: %08x\n", rc); > + > + /* Set up network listener */ > + publisherIdW = utf8_to_wide(publisherId); > + if (publisherIdW == NULL) goto after_test; > + > + sequenceIdW = utf8_to_wide(sequenceId); > + if (sequenceIdW == NULL) goto after_test; > + > + ret = WSAStartup(MAKEWORD(2, 2), &wsaData); > + ok(ret == 0, "WSAStartup failed (ret = %d)\n", ret); > + > + /* Publish the service */ > + rc = IWSDiscoveryPublisher_Publish(publisher, publisherIdW, 1, 1, 1, sequenceIdW, NULL, NULL, NULL); > + ok(rc == S_OK, "Publish failed: %08x\n", rc); > + > + heap_free(publisherIdW); > + heap_free(sequenceIdW); > + > + /* Test the receiving of a probe message */ > + UuidCreate(&probe_message_id); > + UuidToStringA(&probe_message_id, &probe_uuid_str); > + > + ok(probe_uuid_str != NULL, "Failed to create UUID for probe message\n"); > + > + if (probe_uuid_str != NULL) > + { > + char probe_message[sizeof(testProbeMessage) + 50]; > + int i; > + > + sprintf(probe_message, testProbeMessage, probe_uuid_str); > + > + for (i = 0; i < 3; i++) > + { > + ok(send_udp_multicast_of_type(probe_message, strlen(probe_message), AF_INET) == TRUE, "Sending Probe message failed\n"); > + } > + > + // Wait for the messages to be received C++ comment. > + Sleep(1000); Can't we poll for this? The tests are starting to take quite a long time to complete, and this doesn't help. > + > + todo_wine ok(probe_message_received_count == 1, "Received %d probe messages\n", probe_message_received_count); > + RpcStringFreeA(&probe_uuid_str); > + } > + > +after_test: > + > + ref = IWSDiscoveryPublisher_Release(publisher); > + ok(ref == 0, "IWSDiscoveryPublisher_Release() has %d references, should have 0\n", ref); > + > + /* Release the sinks */ > + IWSDiscoveryPublisherNotify_Release(sink1); > + > + WSACleanup(); > +} > + > enum firewall_op > { > APP_ADD, > @@ -1453,6 +1576,7 @@ START_TEST(discovery) > CreateDiscoveryPublisher_XMLContext_tests(); > Publish_tests(); > UnPublish_tests(); > + Probe_DuplicateMessageFiltering_tests(); > > CoUninitialize(); > if (firewall_enabled) set_firewall(APP_REMOVE); > >

Sept. 13, 2018

[PATCH v3 3/3] comdlg32/tests: Fix failures on newer Windows 10.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/tests/itemdlg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index 6b63063e29..90001b96be 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1069,7 +1069,7 @@ static void test_advise_helper(IFileDialog *pfd) for(i = 0; i < 10; i++) { hr = IFileDialog_Advise(pfd, pfde, &cookie[i]); ok(hr == S_OK, "got 0x%08x\n", hr); - ok(cookie[i] == i+1, "Got cookie: %d\n", cookie[i]); + ok(cookie[i] == i+cookie[0], "Got cookie: %d\n", cookie[i]); } ok(pfdeimpl->ref == 10+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); @@ -1102,7 +1102,7 @@ static void test_advise_helper(IFileDialog *pfd) hr = IFileDialog_Advise(pfd, pfde, &cookie[0]); ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(cookie[0] == 1, "got cookie: %d\n", cookie[0]); + ok(cookie[0] >= 1, "got cookie: %d\n", cookie[0]); ok(pfdeimpl->ref == 1+1, "got ref %d\n", pfdeimpl->ref); ensure_zero_events(pfdeimpl); -- 2.18.0

Sept. 13, 2018

[PATCH v3 2/3] comdlg32: Check invalid options in IFileDialog::SetOptions.

by Zhiyi Zhang

Fix Steam chat unable to select files. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comdlg32/itemdlg.c | 10 ++++++++++ dlls/comdlg32/tests/itemdlg.c | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index c8eff3438d..ff97ae26d4 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2505,6 +2505,16 @@ static HRESULT WINAPI IFileDialog2_fnSetOptions(IFileDialog2 *iface, FILEOPENDIA FileDialogImpl *This = impl_from_IFileDialog2(iface); TRACE("%p (0x%x)\n", This, fos); + if (fos & ~(FOS_OVERWRITEPROMPT | FOS_STRICTFILETYPES | FOS_NOCHANGEDIR | FOS_PICKFOLDERS | FOS_FORCEFILESYSTEM + | FOS_ALLNONSTORAGEITEMS | FOS_NOVALIDATE | FOS_ALLOWMULTISELECT | FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST + | FOS_CREATEPROMPT | FOS_SHAREAWARE | FOS_NOREADONLYRETURN | FOS_NOTESTFILECREATE | FOS_HIDEMRUPLACES + | FOS_HIDEPINNEDPLACES | FOS_NODEREFERENCELINKS | FOS_DONTADDTORECENT | FOS_FORCESHOWHIDDEN + | FOS_DEFAULTNOMINIMODE | FOS_FORCEPREVIEWPANEON | FOS_SUPPORTSTREAMABLEITEMS)) + { + WARN("Invalid option %#x\n", fos); + return E_INVALIDARG; + } + if( !(This->options & FOS_PICKFOLDERS) && (fos & FOS_PICKFOLDERS) ) { WCHAR buf[30]; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d3be8c8d29..6b63063e29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -536,6 +536,8 @@ static void test_basics(void) const WCHAR fname2[] = {'f','n','a','m','e','2', 0}; const WCHAR fspec2[] = {'*','.','e','x','e',0}; COMDLG_FILTERSPEC filterspec[2] = {{fname1, fspec1}, {fname2, fspec2}}; + const DWORD invalid_fos[] = {0x1, 0x10, 0x400, 0x80000, 0x400000, 0x800000, 0x1000000, 0x4000000, 0x8000000}; + INT i; /* This should work on every platform with IFileDialog */ SHGetDesktopFolder(&psfdesktop); @@ -586,6 +588,23 @@ static void test_basics(void) ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), "Unexpected default options: 0x%08x\n", fdoptions); + /* Check SetOptions invalid options handling */ + for (i = 0; i < ARRAY_SIZE(invalid_fos); i++) + { + hr = IFileOpenDialog_SetOptions(pfod, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileOpenDialog_GetOptions(pfod, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_PATHMUSTEXIST | FOS_FILEMUSTEXIST | FOS_NOCHANGEDIR), "got %08x\n", fdoptions); + + hr = IFileSaveDialog_SetOptions(pfsd, invalid_fos[i]); + ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); + hr = IFileSaveDialog_GetOptions(pfsd, &fdoptions); + ok(hr == S_OK, "got 0x%08x.\n", hr); + ok(fdoptions == (FOS_OVERWRITEPROMPT | FOS_NOREADONLYRETURN | FOS_PATHMUSTEXIST | FOS_NOCHANGEDIR), + "got %08x\n", fdoptions); + } + /* GetResult */ hr = IFileOpenDialog_GetResult(pfod, NULL); ok(hr == E_INVALIDARG, "got 0x%08x.\n", hr); -- 2.18.0

Sept. 13, 2018

[PATCH v3 1/3] comdlg32/tests: Fix crashes.

by Zhiyi Zhang

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- Supersede 150805,150806,150807 dlls/comdlg32/tests/itemdlg.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index d28e682b49..d3be8c8d29 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -1032,10 +1032,14 @@ static void test_advise_helper(IFileDialog *pfd) pfde = IFileDialogEvents_Constructor(); pfdeimpl = impl_from_IFileDialogEvents(pfde); - hr = IFileDialog_Advise(pfd, NULL, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); - hr = IFileDialog_Advise(pfd, pfde, NULL); - ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + /* Null pointer tests crashed on Windows 10 16299 or newer */ + if (0) + { + hr = IFileDialog_Advise(pfd, NULL, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + hr = IFileDialog_Advise(pfd, pfde, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + } hr = IFileDialog_Advise(pfd, NULL, &cookie[0]); ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); ok(pfdeimpl->ref == 1, "got ref %d\n", pfdeimpl->ref); -- 2.18.0

Sept. 13, 2018

[PATCH] ntoskrnl: Allow space for the '\0'.

by Huw Davies

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 804a938372..18524afb07 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1353,7 +1353,7 @@ NTSTATUS WINAPI IoSetDeviceInterfaceState( UNICODE_STRING *name, BOOLEAN enable if (!guid_from_string( (refstr ? refstr : name->Buffer + namelen) - 38, &class )) return STATUS_INVALID_PARAMETER; - len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2; + len = strlenW(DeviceClassesW) + 38 + 1 + namelen + 2 + 1; if (!(path = heap_alloc( len * sizeof(WCHAR) ))) return STATUS_NO_MEMORY; -- 2.18.0

Sept. 13, 2018

[PATCH vkd3d 8/8] tests: Clear command list before uint tests in test_shader_instructions().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Avoids referencing a destroyed render target in the command list. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 85e480c240d9..808562e86127 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5272,6 +5272,7 @@ static void test_shader_instructions(void) ID3D12CommandQueue *queue; unsigned int i, x, y; ID3D12Resource *cb; + HRESULT hr; static const DWORD ps_div_code[] = { @@ -7392,6 +7393,9 @@ static void test_shader_instructions(void) D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } + hr = ID3D12GraphicsCommandList_Close(command_list); + ok(hr == S_OK, "Failed to close command list, hr %#x.\n", hr); + reset_command_list(command_list, context.allocator); ID3D12Resource_Release(context.render_target); desc.rt_format = DXGI_FORMAT_R32G32B32A32_UINT; create_render_target(&context, &desc, &context.render_target, &context.rtv); -- 2.16.4

Sept. 13, 2018

[PATCH vkd3d 7/8] tests: Add missing resource barrier to test_texture().

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 659a5c6a2208..85e480c240d9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9203,6 +9203,8 @@ static void test_texture(void) ID3D12Resource_Release(texture); reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); } ID3D12DescriptorHeap_Release(heap); -- 2.16.4

Sept. 13, 2018

[PATCH vkd3d 6/8] vkd3d: Partially implement clears for texture UAVs.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> In the long term, we may want to use shaders to clear UAVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 37 +++++++++++++++++++++++++++---------- libs/vkd3d/resource.c | 8 ++++++-- libs/vkd3d/vkd3d_private.h | 16 ++++++++++++++-- 3 files changed, 47 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 5e67e6674e95..decff143d0a3 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3881,6 +3881,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID const struct vkd3d_vk_device_procs *vk_procs; const struct d3d12_desc *cpu_descriptor; struct d3d12_resource *resource_impl; + VkImageSubresourceRange range; + VkClearColorValue color; TRACE("iface %p, gpu_handle %#"PRIx64", cpu_handle %lx, resource %p, values %p, rect_count %u, rects %p.\n", iface, gpu_handle.ptr, cpu_handle.ptr, resource, values, rect_count, rects); @@ -3891,11 +3893,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_track_resource_usage(list, resource_impl); - if (d3d12_resource_is_texture(resource_impl)) - { - FIXME("Not implemented for textures.\n"); - return; - } if (rect_count) { FIXME("Clear rects not supported.\n"); @@ -3905,14 +3902,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID d3d12_command_list_end_current_render_pass(list); cpu_descriptor = d3d12_desc_from_cpu_handle(cpu_handle); - if (!cpu_descriptor->view_size) + + if (d3d12_resource_is_buffer(resource_impl)) { - FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); - return; + if (!cpu_descriptor->uav.buffer.size) + { + FIXME("Not supported for UAV descriptor %p.\n", cpu_descriptor); + return; + } + + VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, + cpu_descriptor->uav.buffer.offset, cpu_descriptor->uav.buffer.size, values[0])); } + else + { + color.uint32[0] = values[0]; + color.uint32[1] = values[1]; + color.uint32[2] = values[2]; + color.uint32[3] = values[3]; + + range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + range.baseMipLevel = cpu_descriptor->uav.texture.miplevel_idx; + range.levelCount = 1; + range.baseArrayLayer = cpu_descriptor->uav.texture.layer_idx; + range.layerCount = cpu_descriptor->uav.texture.layer_count; - VK_CALL(vkCmdFillBuffer(list->vk_command_buffer, resource_impl->u.vk_buffer, - cpu_descriptor->view_offset, cpu_descriptor->view_size, values[0])); + VK_CALL(vkCmdClearColorImage(list->vk_command_buffer, + resource_impl->u.vk_image, VK_IMAGE_LAYOUT_GENERAL, &color, 1, &range)); + } } static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewFloat(ID3D12GraphicsCommandList *iface, diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 88ab64552bb5..4490ae23dab9 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1635,8 +1635,8 @@ static void vkd3d_create_buffer_uav(struct d3d12_desc *descriptor, struct d3d12_ { const struct vkd3d_format *format = vkd3d_get_format(DXGI_FORMAT_R32_UINT, false); - descriptor->view_offset = desc->u.Buffer.FirstElement * format->byte_count; - descriptor->view_size = desc->u.Buffer.NumElements * format->byte_count; + descriptor->uav.buffer.offset = desc->u.Buffer.FirstElement * format->byte_count; + descriptor->uav.buffer.size = desc->u.Buffer.NumElements * format->byte_count; } } @@ -1691,6 +1691,10 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, descriptor->magic = VKD3D_DESCRIPTOR_MAGIC_UAV; descriptor->vk_descriptor_type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; descriptor->u.view = view; + + descriptor->uav.texture.miplevel_idx = vkd3d_desc.miplevel_idx; + descriptor->uav.texture.layer_idx = vkd3d_desc.layer_idx; + descriptor->uav.texture.layer_count = vkd3d_desc.layer_count; } void d3d12_desc_create_uav(struct d3d12_desc *descriptor, struct d3d12_device *device, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 5461cc3d36e1..6ba12f9ca1d2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -272,8 +272,20 @@ struct d3d12_desc struct vkd3d_view *view; } u; - VkDeviceSize view_offset; - VkDeviceSize view_size; + union + { + struct + { + VkDeviceSize offset; + VkDeviceSize size; + } buffer; + struct + { + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + } texture; + } uav; }; static inline struct d3d12_desc *d3d12_desc_from_cpu_handle(D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle) -- 2.16.4

Sept. 13, 2018

[PATCH vkd3d 5/8] vkd3d: Fix leaks if d3d12_device_init_pipeline_cache() fails.

by Józef Kucia

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index c1db7d30a9e8..b57e3ceb99e5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1280,6 +1280,14 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) VkResult vr; int rc; + if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) + { + ERR("Failed to initialize mutex, error %d.\n", rc); + return E_FAIL; + } + + rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); + cache_info.sType = VK_STRUCTURE_TYPE_PIPELINE_CACHE_CREATE_INFO; cache_info.pNext = NULL; cache_info.flags = 0; @@ -1292,14 +1300,6 @@ static HRESULT d3d12_device_init_pipeline_cache(struct d3d12_device *device) device->vk_pipeline_cache = VK_NULL_HANDLE; } - rb_init(&device->pipeline_cache, compare_pipeline_cache_entry); - - if ((rc = pthread_mutex_init(&device->pipeline_cache_mutex, NULL))) - { - ERR("Failed to initialize mutex, error %d.\n", rc); - return E_FAIL; - } - return S_OK; } -- 2.16.4

Sept. 13, 2018