January 2022 - Wine-commits

Louis Lenders : wbemprox: Add some properties of SoftwareLicensingProduct class.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: a9826b48e4c385ddce1d7913c41cdc652b8fbf06 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9826b48e4c385ddce1d7913… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Wed Jan 19 12:43:07 2022 +0100 wbemprox: Add some properties of SoftwareLicensingProduct class. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51163 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 16 ++++++++++++++++ dlls/wbemprox/tests/query.c | 26 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 6b63c744b69..5a09d64b8fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -387,6 +387,11 @@ static const struct column col_sid[] = { L"SID", CIM_STRING|COL_FLAG_DYNAMIC|COL_FLAG_KEY }, { L"SidLength", CIM_UINT32 }, }; +static const struct column col_softwarelicensingproduct[] = +{ + { L"LicenseIsAddon", CIM_BOOLEAN }, + { L"LicenseStatus", CIM_UINT32 }, +}; static const struct column col_sounddevice[] = { { L"DeviceID", CIM_STRING|COL_FLAG_DYNAMIC }, @@ -809,6 +814,11 @@ struct record_sid const WCHAR *sid; UINT32 sidlength; }; +struct record_softwarelicensingproduct +{ + int license_is_addon; + UINT32 license_status; +}; struct record_sounddevice { const WCHAR *deviceid; @@ -978,6 +988,11 @@ static const struct record_quickfixengineering data_quickfixengineering[] = { L"http://winehq.org", L"KB1234567" }, }; +static const struct record_softwarelicensingproduct data_softwarelicensingproduct[] = +{ + { 0, 1 }, +}; + static const struct record_stdregprov data_stdregprov[] = { { @@ -4110,6 +4125,7 @@ static struct table cimv2_builtin_classes[] = { L"CIM_DataFile", C(col_datafile), 0, 0, NULL, fill_datafile }, { L"CIM_LogicalDisk", C(col_logicaldisk), 0, 0, NULL, fill_logicaldisk }, { L"CIM_Processor", C(col_processor), 0, 0, NULL, fill_processor }, + { L"SoftwareLicensingProduct", C(col_softwarelicensingproduct), D(data_softwarelicensingproduct) }, { L"StdRegProv", C(col_stdregprov), D(data_stdregprov) }, { L"SystemRestore", C(col_sysrestore), D(data_sysrestore) }, { L"Win32_BIOS", C(col_bios), 0, 0, NULL, fill_bios }, diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 912671f4ad2..583ae578efa 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1835,6 +1835,31 @@ static void test_Win32_WinSAT( IWbemServices *services ) SysFreeString( wql ); } +static void test_SoftwareLicensingProduct( IWbemServices *services ) +{ + BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM SoftwareLicensingProduct" ); + IEnumWbemClassObject *result; + IWbemClassObject *obj; + HRESULT hr; + DWORD count; + + hr = IWbemServices_ExecQuery( services, wql, query, 0, NULL, &result ); + ok( hr == S_OK , "got %08x\n", hr ); + + for (;;) + { + hr = IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); + if (hr != S_OK) break; + check_property( obj, L"LicenseIsAddon", VT_BOOL, CIM_BOOLEAN ); + check_property( obj, L"LicenseStatus", VT_I4, CIM_UINT32 ); + IWbemClassObject_Release( obj ); + } + + IEnumWbemClassObject_Release( result ); + SysFreeString( query ); + SysFreeString( wql ); +} + static void test_Win32_DesktopMonitor( IWbemServices *services ) { BSTR wql = SysAllocString( L"wql" ), query = SysAllocString( L"SELECT * FROM Win32_DesktopMonitor" ); @@ -2187,6 +2212,7 @@ START_TEST(query) test_select( services ); /* classes */ + test_SoftwareLicensingProduct( services ); test_StdRegProv( services ); test_SystemSecurity( services ); test_Win32_Baseboard( services );

1 0

Arkadiusz Hiler : dinput/tests: Don't consider extra IOCTL_HID_GET_STRING an error.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: d397f763384c909d2516c8085d86d85d7d22a3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d397f763384c909d2516c808… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed Jan 19 15:04:19 2022 +0200 dinput/tests: Don't consider extra IOCTL_HID_GET_STRING an error. It's easy to get them on Windows depending what software/services are running. Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/driver_hid.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dinput/tests/driver_hid.c b/dlls/dinput/tests/driver_hid.c index 84b84101592..b8651331fda 100644 --- a/dlls/dinput/tests/driver_hid.c +++ b/dlls/dinput/tests/driver_hid.c @@ -696,8 +696,6 @@ static NTSTATUS WINAPI driver_internal_ioctl( DEVICE_OBJECT *device, IRP *irp ) case IOCTL_HID_GET_STRING: { - static unsigned int once; - if (!once++) todo_wine ok( 0, "unexpected IOCTL_HID_GET_STRING\n" ); memcpy( irp->UserBuffer, L"Wine Test", sizeof(L"Wine Test") ); irp->IoStatus.Information = sizeof(L"Wine Test"); ret = STATUS_SUCCESS;

1 0

Eric Pouech : msi: Don't call RegCloseKey with uninitialized value.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: wine Branch: master Commit: 4240e71a350b16d7ba048a839683c2023d03c831 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4240e71a350b16d7ba048a83… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Jan 17 10:46:21 2022 +0100 msi: Don't call RegCloseKey with uninitialized value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9a47c2b068b..8ee9420af55 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6973,7 +6973,7 @@ static UINT ITERATE_RemoveEnvironmentString( MSIRECORD *rec, LPVOID param ) LPCWSTR name, value, component; WCHAR *p, *q, *deformatted = NULL, *new_value = NULL; DWORD flags, type, size, len, len_value = 0, len_new_value; - HKEY env; + HKEY env = NULL; MSICOMPONENT *comp; MSIRECORD *uirow; int action = 0;

1 0

Alexandre Julliard : Remove the translation status pages.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: tools Branch: master Commit: ece1759c177ecda2a945b50dc1e6d3e76dad5308 URL: https://source.winehq.org/git/tools.git/?a=commit;h=ece1759c177ecda2a945b50… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 19 11:11:46 2022 +0100 Remove the translation status pages. They have been broken by makefile changes, and since the switch to po files are no longer meaningful anyway. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- transl/.gitignore | 5 - transl/Master.sh | 63 --- transl/README | 12 - transl/config-example | 23 - transl/config.php | 5 - transl/img/bar0.gif | Bin 112 -> 0 bytes transl/img/bar1.gif | Bin 112 -> 0 bytes transl/img/bar2.gif | Bin 112 -> 0 bytes transl/img/bar3.gif | Bin 111 -> 0 bytes transl/img/bar4.gif | Bin 112 -> 0 bytes transl/img/bar5.gif | Bin 112 -> 0 bytes transl/img/bar6.gif | Bin 112 -> 0 bytes transl/img/icon-error.png | Bin 1582 -> 0 bytes transl/img/icon-missing.gif | Bin 292 -> 0 bytes transl/img/icon-ok.png | Bin 941 -> 0 bytes transl/img/icon-warning.png | Bin 1692 -> 0 bytes transl/img/iconsm-check.png | Bin 177 -> 0 bytes transl/img/tree-empty.png | Bin 97 -> 0 bytes transl/img/tree-l.png | Bin 113 -> 0 bytes transl/img/tree-t.png | Bin 116 -> 0 bytes transl/img/tree-vert.png | Bin 114 -> 0 bytes transl/index.php | 149 ------ transl/lang.php | 143 ------ transl/lib.php | 344 -------------- transl/lib_res.php | 1106 ------------------------------------------- transl/parse_resfiles.php | 365 -------------- transl/redirect.php | 9 - transl/resfile.php | 123 ----- transl/resource.php | 82 ---- transl/runlog.php | 7 - transl/style.css | 127 ----- winetest/make-winetest | 31 +- 32 files changed, 7 insertions(+), 2587 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=ece1759c177ecda2a94…

1 0

Conor McCarthy : vkd3d: Add DXGI_FORMAT_UNKNOWN to the array of vkd3d_format objects.
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: ecb854c6c1cd749929856a0daaef1ffb4ecfa713 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ecb854c6c1cd749929856a0… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:55 2022 +1000 vkd3d: Add DXGI_FORMAT_UNKNOWN to the array of vkd3d_format objects. This results in a valid format instead of NULL being returned for buffers and any other case where DXGI_FORMAT_UNKNOWN is specified. In some cases invalid use of a buffer or DXGI_FORMAT_UNKNOWN will not result in E_INVALIDARG, and would need to be tested explicitly if proven to be an issue. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 8 +------- libs/vkd3d/resource.c | 8 ++++++++ libs/vkd3d/state.c | 4 ++++ libs/vkd3d/utils.c | 1 + tests/d3d12.c | 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4af2607..4bcb5ef 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3726,8 +3726,6 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i UINT *row_counts, UINT64 *row_sizes, UINT64 *total_bytes) { struct d3d12_device *device = impl_from_ID3D12Device(iface); - static const struct vkd3d_format vkd3d_format_unknown - = {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1, 0}; unsigned int i, sub_resource_idx, miplevel_idx, row_count, row_size, row_pitch; unsigned int width, height, depth, plane_count, sub_resources_per_plane; @@ -3748,11 +3746,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i if (total_bytes) *total_bytes = ~(uint64_t)0; - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_BUFFER) - { - format = &vkd3d_format_unknown; - } - else if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) + if (!(format = vkd3d_format_from_d3d12_resource_desc(device, desc, 0))) { WARN("Invalid format %#x.\n", desc->Format); return; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a4d16ee..14e08b0 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1589,6 +1589,12 @@ static void d3d12_validate_resource_flags(D3D12_RESOURCE_FLAGS flags) static bool d3d12_resource_validate_texture_format(const D3D12_RESOURCE_DESC *desc, const struct vkd3d_format *format) { + if (desc->Format == DXGI_FORMAT_UNKNOWN) + { + WARN("DXGI_FORMAT_UNKNOWN is invalid for textures.\n"); + return false; + } + if (!vkd3d_format_is_compressed(format)) return true; @@ -2273,6 +2279,8 @@ static bool vkd3d_create_buffer_view_for_resource(struct d3d12_device *device, } else if ((format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) { + /* TODO: if view_format is DXGI_FORMAT_UNKNOWN, this is always 1, which + * may not match driver behaviour (return false?). */ element_size = format->byte_count; } else diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 10503a6..b54a652 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2328,6 +2328,8 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, return E_INVALIDARG; } + /* TODO: DXGI_FORMAT_UNKNOWN will return a format with byte_count == 1, + * which may not match driver behaviour (return E_INVALIDARG?). */ if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); @@ -2816,6 +2818,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s const D3D12_INPUT_ELEMENT_DESC *e = &desc->InputLayout.pInputElementDescs[i]; const struct vkd3d_shader_signature_element *signature_element; + /* TODO: DXGI_FORMAT_UNKNOWN will succeed here, which may not match + * driver behaviour (return E_INVALIDARG?). */ if (!(format = vkd3d_get_format(device, e->Format, false))) { WARN("Invalid input element format %#x.\n", e->Format); diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index ec2b4b3..cdb81f6 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -29,6 +29,7 @@ #define UINT VKD3D_FORMAT_TYPE_UINT static const struct vkd3d_format vkd3d_formats[] = { + {DXGI_FORMAT_UNKNOWN, VK_FORMAT_UNDEFINED, 1, 1, 1, 1}, {DXGI_FORMAT_R32G32B32A32_TYPELESS, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR, 1, TYPELESS}, {DXGI_FORMAT_R32G32B32A32_FLOAT, VK_FORMAT_R32G32B32A32_SFLOAT, 16, 1, 1, 1, COLOR, 1}, {DXGI_FORMAT_R32G32B32A32_UINT, VK_FORMAT_R32G32B32A32_UINT, 16, 1, 1, 1, COLOR, 1, UINT}, diff --git a/tests/d3d12.c b/tests/d3d12.c index 3540c9a..b12d6a9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1167,7 +1167,7 @@ static void test_format_support(void) memset(&format_support, 0, sizeof(format_support)); hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_FORMAT_SUPPORT, &format_support, sizeof(format_support)); - todo ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); todo ok(format_support.Support1 == D3D12_FORMAT_SUPPORT1_BUFFER, "Got unexpected support1 %#x.\n", format_support.Support1); ok(!format_support.Support2 || format_support.Support2 == D3D12_FORMAT_SUPPORT2_TILED,

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_CopyResource().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 68b70585a7a14d08d3a50631daff6e2f31398c86 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=68b70585a7a14d08d3a5063… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:57 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_CopyResource(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9ea9d7f..f8e9918 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3573,7 +3573,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); struct d3d12_resource *dst_resource, *src_resource; - const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; VkBufferCopy vk_buffer_copy; VkImageCopy vk_image_copy; @@ -3605,19 +3604,6 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(list->device, - &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } - layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); assert(d3d12_resource_is_texture(dst_resource)); @@ -3627,8 +3613,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm for (i = 0; i < dst_resource->desc.MipLevels; ++i) { - vk_image_copy_from_d3d12(&vk_image_copy, i, i, - &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0); + vk_image_copy_from_d3d12(&vk_image_copy, i, i, &src_resource->desc, &dst_resource->desc, + src_resource->format, dst_resource->format, NULL, 0, 0, 0); vk_image_copy.dstSubresource.layerCount = layer_count; vk_image_copy.srcSubresource.layerCount = layer_count; VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image,

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in d3d12_command_list_ResolveSubresource().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: beb9151e5df03f144e655d108b4675124912de43 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=beb9151e5df03f144e655d1… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:58 2022 +1000 vkd3d: Use the resource's stored format in d3d12_command_list_ResolveSubresource(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index f8e9918..6689c1a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -3663,16 +3663,8 @@ static void STDMETHODCALLTYPE d3d12_command_list_ResolveSubresource(ID3D12Graphi d3d12_command_list_end_current_render_pass(list); - if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(device, &dst_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", dst_resource->desc.Format); - return; - } - if (!(src_format = vkd3d_format_from_d3d12_resource_desc(device, &src_resource->desc, DXGI_FORMAT_UNKNOWN))) - { - WARN("Invalid format %#x.\n", src_resource->desc.Format); - return; - } + dst_format = dst_resource->format; + src_format = src_resource->format; if (dst_format->type == VKD3D_FORMAT_TYPE_TYPELESS || src_format->type == VKD3D_FORMAT_TYPE_TYPELESS) {

1 0

Conor McCarthy : vkd3d: Use the resource's stored format in init_default_texture_view_desc().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: de87352f779943a2378bcea141cbac478f6fa141 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=de87352f779943a2378bcea… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:07:59 2022 +1000 vkd3d: Use the resource's stored format in init_default_texture_view_desc(). Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 14e08b0..9905015 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2439,7 +2439,11 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, { const struct d3d12_device *device = resource->device; - if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) + if (view_format == resource->desc.Format) + { + desc->format = resource->format; + } + else if (!(desc->format = vkd3d_format_from_d3d12_resource_desc(device, &resource->desc, view_format))) { FIXME("Failed to find format (resource format %#x, view format %#x).\n", resource->desc.Format, view_format);

1 0

Conor McCarthy : vkd3d: Handle NULL event handles in ID3D12Fence::SetEventOnCompletion().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: c965b7b213f59adf39626d984e5af1ae9ddd7148 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c965b7b213f59adf39626d9… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:54:11 2022 +1000 vkd3d: Handle NULL event handles in ID3D12Fence::SetEventOnCompletion(). The D3D12 documentation states: "If hEvent is a null handle, then this API will not return until the specified fence value(s) have been reached." Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 39 +++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 2 ++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6689c1a..73ba226 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -806,6 +806,7 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF { struct d3d12_device *device = fence->device; struct vkd3d_signaled_semaphore *current; + bool signal_null_event_cond = false; unsigned int i, j; int rc; @@ -823,7 +824,15 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->value <= value) { - fence->device->signal_event(current->event); + if (current->event) + { + fence->device->signal_event(current->event); + } + else + { + current->latch = true; + signal_null_event_cond = true; + } } else { @@ -834,6 +843,9 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF } fence->event_count = j; + if (signal_null_event_cond) + pthread_cond_broadcast(&fence->null_event_cond); + if (vk_fence) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -916,6 +928,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); + pthread_cond_destroy(&fence->null_event_cond); vkd3d_free(fence); d3d12_device_release(device); @@ -997,6 +1010,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); unsigned int i; + bool *latch; int rc; TRACE("iface %p, value %#"PRIx64", event %p.\n", iface, value, event); @@ -1009,7 +1023,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i if (value <= fence->value) { - fence->device->signal_event(event); + if (event) + fence->device->signal_event(event); pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1036,8 +1051,20 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i fence->events[fence->event_count].value = value; fence->events[fence->event_count].event = event; + fence->events[fence->event_count].latch = false; + latch = &fence->events[fence->event_count].latch; ++fence->event_count; + /* If event is NULL, we need to block until the fence value completes. + * Implement this in a uniform way where we pretend we have a dummy event. + * A NULL fence->events[].event means that we should set latch to true + * and signal a condition variable instead of calling external signal_event callback. */ + if (!event) + { + while (!*latch) + pthread_cond_wait(&fence->null_event_cond, &fence->mutex); + } + pthread_mutex_unlock(&fence->mutex); return S_OK; } @@ -1095,6 +1122,13 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * return hresult_from_errno(rc); } + if ((rc = pthread_cond_init(&fence->null_event_cond, NULL))) + { + ERR("Failed to initialize cond variable, error %d.\n", rc); + pthread_mutex_destroy(&fence->mutex); + return hresult_from_errno(rc); + } + if (flags) FIXME("Ignoring flags %#x.\n", flags); @@ -1112,6 +1146,7 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); + pthread_cond_destroy(&fence->null_event_cond); return hr; } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index aa18fcb..b630b6d 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -367,11 +367,13 @@ struct d3d12_fence uint64_t value; pthread_mutex_t mutex; + pthread_cond_t null_event_cond; struct vkd3d_waiting_event { uint64_t value; HANDLE event; + bool latch; } *events; size_t events_size; size_t event_count;

1 0

Conor McCarthy : tests: Add tests for NULL event handles in SetEventOnCompletion().
by Alexandre Julliard 19 Jan '22

19 Jan '22

Module: vkd3d Branch: master Commit: 8727b9a435a0f478938a57a5798ad455d6405aea URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8727b9a435a0f478938a57a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 18 15:54:12 2022 +1000 tests: Add tests for NULL event handles in SetEventOnCompletion(). Testing this before NULL event handling is patched results in a crash. Based on a vkd3d-proton patch by Hans-Kristian Arntzen. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 12 ++++++++++-- tests/d3d12_test_utils.h | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index b12d6a9..7d13afc 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4418,11 +4418,14 @@ static void test_fence_values(void) value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); - for (i = 0; i < 100; ++i) + for (i = 0; i < 200; ++i) { ++next_value; queue_signal(queue, fence, next_value); - wait_queue_idle(device, queue); + if ((i * 11) & 8) + wait_queue_idle_no_event(device, queue); + else + wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); } @@ -4459,6 +4462,11 @@ static void test_fence_values(void) wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value <<= 1; + queue_signal(queue, fence, next_value); + wait_queue_idle_no_event(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); next_value = 0; queue_signal(queue, fence, next_value); wait_queue_idle(device, queue); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 46dcd87..b822728 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -28,6 +28,33 @@ struct vec4 static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue); static ID3D12Device *create_device(void); +static inline HRESULT wait_for_fence_no_event(ID3D12Fence *fence, uint64_t value) +{ + if (ID3D12Fence_GetCompletedValue(fence) >= value) + return S_OK; + + /* This is defined to block on the value with infinite timeout. */ + return ID3D12Fence_SetEventOnCompletion(fence, value, NULL); +} + +#define wait_queue_idle_no_event(a, b) wait_queue_idle_no_event_(__LINE__, a, b) +static inline void wait_queue_idle_no_event_(unsigned int line, ID3D12Device *device, ID3D12CommandQueue *queue) +{ + ID3D12Fence *fence; + HRESULT hr; + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, + &IID_ID3D12Fence, (void **)&fence); + assert_that_(line)(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + hr = ID3D12CommandQueue_Signal(queue, fence, 1); + assert_that_(line)(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = wait_for_fence_no_event(fence, 1); + assert_that_(line)(hr == S_OK, "Failed to wait for fence, hr %#x.\n", hr); + + ID3D12Fence_Release(fence); +} + static void set_rect(RECT *rect, int left, int top, int right, int bottom) { rect->left = left;

1 0