- wine-devel - winehq.org

[PATCH v2] dinput: Report controllers as gamepads, not joysticks
by Andrew Eikum 19 Apr '19

19 Apr '19

This matches what Windows does with common controllers like xbox 360. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- This allows controllers to work in some games like Telltale games and Yakuza Kiwami. dlls/dinput/joystick_linux.c | 9 +++------ dlls/dinput/joystick_linuxinput.c | 9 +++------ dlls/dinput/joystick_osx.c | 7 +++++-- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 963e62f017c..736a06e2b27 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -316,9 +316,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidProduct = joystick_devices[id].guid_product; /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joystick_devices[id].bus_type == BUS_USB && @@ -326,10 +326,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joystick_devices[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 910e755d3ed..cea669b90cb 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -355,9 +355,9 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver lpddi->guidFFDriver = GUID_NULL; if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); /* Assume the joystick as HID if it is attached to USB bus and has a valid VID/PID */ if (joydevs[id].bus_type == BUS_USB && @@ -365,10 +365,7 @@ static void fill_joystick_dideviceinstanceW(LPDIDEVICEINSTANCEW lpddi, DWORD ver { lpddi->dwDevType |= DIDEVTYPE_HID; lpddi->wUsagePage = 0x01; /* Desktop */ - if (lpddi->dwDevType == DI8DEVTYPE_JOYSTICK || lpddi->dwDevType == DIDEVTYPE_JOYSTICK) - lpddi->wUsage = 0x04; /* Joystick */ - else - lpddi->wUsage = 0x05; /* Game Pad */ + lpddi->wUsage = 0x05; /* Game Pad */ } MultiByteToWideChar(CP_ACP, 0, joydevs[id].name, -1, lpddi->tszInstanceName, MAX_PATH); diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 0701b9f42cc..daef1a12ed5 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -969,9 +969,12 @@ static HRESULT joydev_enum_deviceA(DWORD dwDevType, DWORD dwFlags, LPDIDEVICEINS lpddi->guidProduct.Data1 = make_vid_pid(device); /* we only support traditional joysticks for now */ if (version >= 0x0800) - lpddi->dwDevType = DI8DEVTYPE_JOYSTICK | (DI8DEVTYPEJOYSTICK_STANDARD << 8); + lpddi->dwDevType = DI8DEVTYPE_GAMEPAD | (DI8DEVTYPEJOYSTICK_STANDARD << 8); else - lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_TRADITIONAL << 8); + lpddi->dwDevType = DIDEVTYPE_JOYSTICK | (DIDEVTYPEJOYSTICK_GAMEPAD << 8); + lpddi->dwDevType |= DIDEVTYPE_HID; + lpddi->wUsagePage = 0x01; /* Desktop */ + lpddi->wUsage = 0x05; /* Game Pad */ sprintf(lpddi->tszInstanceName, "Joystick %d", id); /* get the device name */ -- 2.21.0

3 4

[PATCH 2/2] wined3d: Avoid enabling all features supported by Vulkan physical device.
by Józef Kucia 19 Apr '19

19 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index e573c66e5614..4c01fb8fe860 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -165,6 +165,32 @@ static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_v return E_FAIL; } +static void wined3d_disable_vulkan_features(VkPhysicalDeviceFeatures *features) +{ + features->depthBounds = VK_FALSE; + features->alphaToOne = VK_FALSE; + features->textureCompressionETC2 = VK_FALSE; + features->textureCompressionASTC_LDR = VK_FALSE; + features->shaderStorageImageMultisample = VK_FALSE; + features->shaderUniformBufferArrayDynamicIndexing = VK_FALSE; + features->shaderSampledImageArrayDynamicIndexing = VK_FALSE; + features->shaderStorageBufferArrayDynamicIndexing = VK_FALSE; + features->shaderStorageImageArrayDynamicIndexing = VK_FALSE; + features->shaderInt16 = VK_FALSE; + features->shaderResourceResidency = VK_FALSE; + features->shaderResourceMinLod = VK_FALSE; + features->sparseBinding = VK_FALSE; + features->sparseResidencyBuffer = VK_FALSE; + features->sparseResidencyImage2D = VK_FALSE; + features->sparseResidencyImage3D = VK_FALSE; + features->sparseResidency2Samples = VK_FALSE; + features->sparseResidency4Samples = VK_FALSE; + features->sparseResidency8Samples = VK_FALSE; + features->sparseResidency16Samples = VK_FALSE; + features->sparseResidencyAliased = VK_FALSE; + features->inheritedQueries = VK_FALSE; +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, @@ -192,6 +218,7 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi physical_device = adapter_vk->physical_device; VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); + wined3d_disable_vulkan_features(&features); queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; queue_info.pNext = NULL; -- 2.21.0

3 2

[PATCH 1/2] wined3d: Use vkGetDeviceProcAddr() to load Vulkan device functions.
by Józef Kucia 19 Apr '19

19 Apr '19

In order to bypass Vulkan loader trampoline. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++-- dlls/wined3d/wined3d_vk.h | 2 +- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 813a027efd26..e573c66e5614 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -30,6 +30,8 @@ struct wined3d_device_vk VkDevice vk_device; VkQueue vk_queue; + + struct wined3d_vk_info vk_info; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) @@ -220,6 +222,18 @@ static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wi device_vk->vk_device = vk_device; VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + device_vk->vk_info = *vk_info; +#define LOAD_DEVICE_PFN(name) \ + if (!(device_vk->vk_info.vk_ops.name = (void *)VK_CALL(vkGetDeviceProcAddr(vk_device, #name)))) \ + { \ + WARN("Could not get device proc addr for '" #name "'.\n"); \ + hr = E_FAIL; \ + goto fail; \ + } +#define VK_DEVICE_PFN LOAD_DEVICE_PFN + VK_DEVICE_FUNCS() +#undef VK_DEVICE_PFN + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { @@ -237,9 +251,8 @@ fail: static void adapter_vk_destroy_device(struct wined3d_device *device) { - struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(device); - const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + const struct wined3d_vk_info *vk_info = &device_vk->vk_info; wined3d_device_cleanup(&device_vk->d); VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); diff --git a/dlls/wined3d/wined3d_vk.h b/dlls/wined3d/wined3d_vk.h index 10c706a10331..13e07ab3db4d 100644 --- a/dlls/wined3d/wined3d_vk.h +++ b/dlls/wined3d/wined3d_vk.h @@ -183,9 +183,9 @@ struct vulkan_ops struct wined3d_vk_info { - VkInstance instance; struct vulkan_ops vk_ops; + VkInstance instance; unsigned int api_version; #ifdef USE_WIN32_VULKAN -- 2.21.0

3 2

[PATCH vkd3d v2 2/6] vkd3d: Implement vkd3d_create_versioned_root_signature_deserializer().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 137 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 135 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 8f9351bbacac..be8c400caf4c 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -92,6 +92,8 @@ struct d3d12_root_signature_deserializer } desc; }; +STATIC_ASSERT(sizeof(D3D12_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_root_signature_desc)); + static struct d3d12_root_signature_deserializer *impl_from_ID3D12RootSignatureDeserializer( ID3D12RootSignatureDeserializer *iface) { @@ -205,13 +207,144 @@ HRESULT vkd3d_create_root_signature_deserializer(const void *data, SIZE_T data_s &IID_ID3D12RootSignatureDeserializer, iid, deserializer); } +/* ID3D12VersionedRootSignatureDeserializer */ +struct d3d12_versioned_root_signature_deserializer +{ + ID3D12VersionedRootSignatureDeserializer ID3D12VersionedRootSignatureDeserializer_iface; + LONG refcount; + + union + { + D3D12_VERSIONED_ROOT_SIGNATURE_DESC d3d12; + struct vkd3d_versioned_root_signature_desc vkd3d; + } desc; +}; + +STATIC_ASSERT(sizeof(D3D12_VERSIONED_ROOT_SIGNATURE_DESC) == sizeof(struct vkd3d_versioned_root_signature_desc)); + +static struct d3d12_versioned_root_signature_deserializer *impl_from_ID3D12VersionedRootSignatureDeserializer( + ID3D12VersionedRootSignatureDeserializer *iface) +{ + return CONTAINING_RECORD(iface, struct d3d12_versioned_root_signature_deserializer, + ID3D12VersionedRootSignatureDeserializer_iface); +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_QueryInterface( + ID3D12VersionedRootSignatureDeserializer *iface, REFIID iid, void **object) +{ + TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object); + + /* QueryInterface() implementation is broken, E_NOINTERFACE is returned for + * IUnknown. + */ + if (IsEqualGUID(iid, &IID_ID3D12VersionedRootSignatureDeserializer)) + { + ID3D12VersionedRootSignatureDeserializer_AddRef(iface); + *object = iface; + return S_OK; + } + + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid)); + + *object = NULL; + return E_NOINTERFACE; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_AddRef(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedIncrement(&deserializer->refcount); + + TRACE("%p increasing refcount to %u.\n", deserializer, refcount); + + return refcount; +} + +static ULONG STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_Release(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + ULONG refcount = InterlockedDecrement(&deserializer->refcount); + + TRACE("%p decreasing refcount to %u.\n", deserializer, refcount); + + if (!refcount) + { + vkd3d_shader_free_versioned_root_signature(&deserializer->desc.vkd3d); + vkd3d_free(deserializer); + } + + return refcount; +} + +static HRESULT STDMETHODCALLTYPE d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion( + ID3D12VersionedRootSignatureDeserializer *iface, D3D_ROOT_SIGNATURE_VERSION version, + const D3D12_VERSIONED_ROOT_SIGNATURE_DESC **desc) +{ + FIXME("iface %p, version %#x, desc %p stub!\n", iface, version, desc); + + *desc = NULL; + return E_NOTIMPL; +} + +static const D3D12_VERSIONED_ROOT_SIGNATURE_DESC * STDMETHODCALLTYPE +d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc(ID3D12VersionedRootSignatureDeserializer *iface) +{ + struct d3d12_versioned_root_signature_deserializer *deserializer = impl_from_ID3D12VersionedRootSignatureDeserializer(iface); + + TRACE("iface %p.\n", iface); + + return &deserializer->desc.d3d12; +} + +static const struct ID3D12VersionedRootSignatureDeserializerVtbl d3d12_versioned_root_signature_deserializer_vtbl = +{ + /* IUnknown methods */ + d3d12_versioned_root_signature_deserializer_QueryInterface, + d3d12_versioned_root_signature_deserializer_AddRef, + d3d12_versioned_root_signature_deserializer_Release, + /* ID3D12VersionedRootSignatureDeserializer methods */ + d3d12_versioned_root_signature_deserializer_GetRootSignatureDescAtVersion, + d3d12_versioned_root_signature_deserializer_GetUnconvertedRootSignatureDesc, +}; + +static HRESULT d3d12_versioned_root_signature_deserializer_init(struct d3d12_versioned_root_signature_deserializer *deserializer, + const struct vkd3d_shader_code *dxbc) +{ + int ret; + + deserializer->ID3D12VersionedRootSignatureDeserializer_iface.lpVtbl = &d3d12_versioned_root_signature_deserializer_vtbl; + deserializer->refcount = 1; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return hresult_from_vkd3d_result(ret); + } + + return S_OK; +} + HRESULT vkd3d_create_versioned_root_signature_deserializer(const void *data, SIZE_T data_size, REFIID iid, void **deserializer) { - FIXME("data %p, data_size %lu, iid %s, deserializer %p stub!\n", + struct d3d12_versioned_root_signature_deserializer *object; + struct vkd3d_shader_code dxbc = {data, data_size}; + HRESULT hr; + + TRACE("data %p, data_size %lu, iid %s, deserializer %p.\n", data, data_size, debugstr_guid(iid), deserializer); - return E_NOTIMPL; + if (!(object = vkd3d_malloc(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d12_versioned_root_signature_deserializer_init(object, &dxbc))) + { + vkd3d_free(object); + return hr; + } + + return return_interface(&object->ID3D12VersionedRootSignatureDeserializer_iface, + &IID_ID3D12VersionedRootSignatureDeserializer, iid, deserializer); } /* ID3DBlob */ -- 2.21.0

2 1

[PATCH vkd3d v2 6/6] vkd3d-shader: Remove vkd3d_shader_parse_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 10 ++-------- libs/vkd3d-shader/dxbc.c | 26 -------------------------- libs/vkd3d-shader/vkd3d_shader.map | 1 - tests/vkd3d_shader_api.c | 14 +++++++------- 4 files changed, 9 insertions(+), 42 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7bf3bd5e4514..ae315e66d4db 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -566,13 +566,10 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, @@ -602,13 +599,10 @@ typedef int (*PFN_vkd3d_shader_compile_dxbc)(const struct vkd3d_shader_code *dxb const struct vkd3d_shader_compile_arguments *compile_args); typedef void (*PFN_vkd3d_shader_free_shader_code)(struct vkd3d_shader_code *code); -typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature); -typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); - typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 082e01d47ced..5903ed8ae155 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2503,32 +2503,6 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont return shader_parse_root_signature(data, data_size, desc); } -int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, - struct vkd3d_root_signature_desc *root_signature) -{ - struct vkd3d_versioned_root_signature_desc desc = {0}; - int ret; - - TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); - - memset(root_signature, 0, sizeof(*root_signature)); - if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return ret; - } - - if (desc.version != VKD3D_ROOT_SIGNATURE_VERSION_1_0) - { - vkd3d_shader_free_versioned_root_signature(&desc); - return VKD3D_ERROR_NOT_IMPLEMENTED; - } - - *root_signature = desc.u.v_1_0; - - return VKD3D_OK; -} - int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_versioned_root_signature_desc *root_signature) { diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index e1f1f1c179a2..2959c5756223 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -9,7 +9,6 @@ global: vkd3d_shader_free_shader_signature; vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; - vkd3d_shader_parse_root_signature; vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/tests/vkd3d_shader_api.c b/tests/vkd3d_shader_api.c index 65099f22f9a7..4e6080dbd901 100644 --- a/tests/vkd3d_shader_api.c +++ b/tests/vkd3d_shader_api.c @@ -54,17 +54,17 @@ static void test_invalid_shaders(void) static void test_vkd3d_shader_pfns(void) { + PFN_vkd3d_shader_parse_versioned_root_signature pfn_vkd3d_shader_parse_versioned_root_signature; + PFN_vkd3d_shader_free_versioned_root_signature pfn_vkd3d_shader_free_versioned_root_signature; PFN_vkd3d_shader_serialize_root_signature pfn_vkd3d_shader_serialize_root_signature; PFN_vkd3d_shader_find_signature_element pfn_vkd3d_shader_find_signature_element; PFN_vkd3d_shader_free_shader_signature pfn_vkd3d_shader_free_shader_signature; PFN_vkd3d_shader_parse_input_signature pfn_vkd3d_shader_parse_input_signature; - PFN_vkd3d_shader_parse_root_signature pfn_vkd3d_shader_parse_root_signature; - PFN_vkd3d_shader_free_root_signature pfn_vkd3d_shader_free_root_signature; PFN_vkd3d_shader_free_shader_code pfn_vkd3d_shader_free_shader_code; PFN_vkd3d_shader_compile_dxbc pfn_vkd3d_shader_compile_dxbc; PFN_vkd3d_shader_scan_dxbc pfn_vkd3d_shader_scan_dxbc; - struct vkd3d_root_signature_desc root_signature_desc; + struct vkd3d_versioned_root_signature_desc root_signature_desc; struct vkd3d_shader_signature_element *element; struct vkd3d_shader_scan_info scan_info; struct vkd3d_shader_signature signature; @@ -90,21 +90,21 @@ static void test_vkd3d_shader_pfns(void) }; static const struct vkd3d_shader_code vs = {vs_code, sizeof(vs_code)}; + pfn_vkd3d_shader_parse_versioned_root_signature = vkd3d_shader_parse_versioned_root_signature; + pfn_vkd3d_shader_free_versioned_root_signature = vkd3d_shader_free_versioned_root_signature; pfn_vkd3d_shader_serialize_root_signature = vkd3d_shader_serialize_root_signature; pfn_vkd3d_shader_find_signature_element = vkd3d_shader_find_signature_element; pfn_vkd3d_shader_free_shader_signature = vkd3d_shader_free_shader_signature; pfn_vkd3d_shader_parse_input_signature = vkd3d_shader_parse_input_signature; - pfn_vkd3d_shader_parse_root_signature = vkd3d_shader_parse_root_signature; - pfn_vkd3d_shader_free_root_signature = vkd3d_shader_free_root_signature; pfn_vkd3d_shader_free_shader_code = vkd3d_shader_free_shader_code; pfn_vkd3d_shader_compile_dxbc = vkd3d_shader_compile_dxbc; pfn_vkd3d_shader_scan_dxbc = vkd3d_shader_scan_dxbc; rc = pfn_vkd3d_shader_serialize_root_signature(&empty_rs_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &dxbc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - rc = pfn_vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc); + rc = pfn_vkd3d_shader_parse_versioned_root_signature(&dxbc, &root_signature_desc); ok(rc == VKD3D_OK, "Got unexpected error code %d.\n", rc); - pfn_vkd3d_shader_free_root_signature(&root_signature_desc); + pfn_vkd3d_shader_free_versioned_root_signature(&root_signature_desc); pfn_vkd3d_shader_free_shader_code(&dxbc); rc = pfn_vkd3d_shader_parse_input_signature(&vs, &signature); -- 2.21.0

2 1

[PATCH vkd3d v2 5/6] vkd3d: Prefer vkd3d_shader_parse_versioned_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 2 +- libs/vkd3d/vkd3d_main.c | 2 +- libs/vkd3d/vkd3d_private.h | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 85ecb395f3dc..7534655673f2 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1006,7 +1006,7 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, HRESULT hr; int ret; - if ((ret = vkd3d_shader_parse_root_signature(&dxbc, &root_signature_desc.vkd3d)) < 0) + if ((ret = vkd3d_parse_root_signature_v_1_0(&dxbc, &root_signature_desc.vkd3d)) < 0) { WARN("Failed to parse root signature, vkd3d result %d.\n", ret); return hresult_from_vkd3d_result(ret); diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index 9af2bbc94250..e074d1cdbca9 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,7 +167,7 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; -static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *out_desc) { struct vkd3d_versioned_root_signature_desc desc, converted_desc; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index be0ef2eb5bf2..c680a04a2567 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -619,6 +619,9 @@ HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *byt size_t bytecode_length, struct d3d12_root_signature **root_signature) DECLSPEC_HIDDEN; struct d3d12_root_signature *unsafe_impl_from_ID3D12RootSignature(ID3D12RootSignature *iface) DECLSPEC_HIDDEN; +int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *desc) DECLSPEC_HIDDEN; + struct d3d12_graphics_pipeline_state { VkPipelineShaderStageCreateInfo stages[VKD3D_MAX_SHADER_STAGES]; -- 2.21.0

2 1

[PATCH vkd3d v2 4/6] vkd3d: Reimplement ID3D12RootSignatureDeserializer on top of vkd3d_shader_parse_versioned_root_signature().
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/vkd3d_main.c | 39 +++++++++++++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/vkd3d_main.c b/libs/vkd3d/vkd3d_main.c index be8c400caf4c..9af2bbc94250 100644 --- a/libs/vkd3d/vkd3d_main.c +++ b/libs/vkd3d/vkd3d_main.c @@ -167,6 +167,40 @@ static const struct ID3D12RootSignatureDeserializerVtbl d3d12_root_signature_des d3d12_root_signature_deserializer_GetRootSignatureDesc, }; +static int vkd3d_parse_root_signature_v_1_0(const struct vkd3d_shader_code *dxbc, + struct vkd3d_root_signature_desc *out_desc) +{ + struct vkd3d_versioned_root_signature_desc desc, converted_desc; + int ret; + + if ((ret = vkd3d_shader_parse_versioned_root_signature(dxbc, &desc)) < 0) + { + WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + return ret; + } + + if (desc.version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + *out_desc = desc.u.v_1_0; + } + else + { + enum vkd3d_root_signature_version version = desc.version; + + ret = vkd3d_shader_convert_root_signature(&converted_desc, VKD3D_ROOT_SIGNATURE_VERSION_1_0, &desc); + vkd3d_shader_free_versioned_root_signature(&desc); + if (ret < 0) + { + WARN("Failed to convert from version %#x, vkd3d result %d.\n", version, ret); + return ret; + } + + *out_desc = converted_desc.u.v_1_0; + } + + return ret; +} + static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signature_deserializer *deserializer, const struct vkd3d_shader_code *dxbc) { @@ -175,11 +209,8 @@ static HRESULT d3d12_root_signature_deserializer_init(struct d3d12_root_signatur deserializer->ID3D12RootSignatureDeserializer_iface.lpVtbl = &d3d12_root_signature_deserializer_vtbl; deserializer->refcount = 1; - if ((ret = vkd3d_shader_parse_root_signature(dxbc, &deserializer->desc.vkd3d)) < 0) - { - WARN("Failed to parse root signature, vkd3d result %d.\n", ret); + if ((ret = vkd3d_parse_root_signature_v_1_0(dxbc, &deserializer->desc.vkd3d)) < 0) return hresult_from_vkd3d_result(ret); - } return S_OK; } -- 2.21.0

2 1

[PATCH vkd3d v2 3/6] vkd3d-shader: Implement conversion between root signature 1.0 and 1.1.
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 6 + libs/vkd3d-shader/dxbc.c | 286 +++++++++++++++++++++++++++++ libs/vkd3d-shader/vkd3d_shader.map | 1 + 3 files changed, 293 insertions(+) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 506d519ea630..7bf3bd5e4514 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -578,6 +578,9 @@ void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_sign int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); @@ -610,6 +613,9 @@ typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_vers typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); +typedef int (*PFN_vkd3d_shader_convert_root_signature)(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src); + typedef int (*PFN_vkd3d_shader_scan_dxbc)(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_scan_info *scan_info); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 9ed7faadf784..082e01d47ced 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2088,6 +2088,11 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, } /* root signatures */ +#define VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE + +#define VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS \ + (VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE | VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE) + struct root_signature_parser_context { const char *data; @@ -2835,3 +2840,284 @@ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc return VKD3D_OK; } + +static void free_descriptor_ranges(const struct vkd3d_root_parameter *parameters, unsigned int count) +{ + unsigned int i; + + if (!parameters) + return; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter *p = &parameters[i]; + + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } +} + +static int convert_root_parameters_to_v_1_0(struct vkd3d_root_parameter *dst, + const struct vkd3d_root_parameter1 *src, unsigned int count) +{ + const struct vkd3d_descriptor_range1 *ranges1; + struct vkd3d_descriptor_range *ranges; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter1 *p1 = &src[i]; + struct vkd3d_root_parameter *p = &dst[i]; + + p->parameter_type = p1->parameter_type; + switch (p->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges = NULL; + if ((p->u.descriptor_table.descriptor_range_count = p1->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges = vkd3d_calloc(p->u.descriptor_table.descriptor_range_count, sizeof(*ranges)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p->u.descriptor_table.descriptor_ranges = ranges; + ranges1 = p1->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p1->u.descriptor_table.descriptor_range_count; ++j) + { + ranges[j].range_type = ranges1[j].range_type; + ranges[j].descriptor_count = ranges1[j].descriptor_count; + ranges[j].base_shader_register = ranges1[j].base_shader_register; + ranges[j].register_space = ranges1[j].register_space; + ranges[j].descriptor_table_offset = ranges1[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p->u.constants = p1->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p->u.descriptor.shader_register = p1->u.descriptor.shader_register; + p->u.descriptor.register_space = p1->u.descriptor.register_space; + break; + default: + WARN("Invalid root parameter type %#x.\n", p->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p->shader_visibility = p1->shader_visibility; + } + + return VKD3D_OK; + +fail: + free_descriptor_ranges(dst, i); + return ret; +} + +static int convert_root_signature_to_v1_0(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc1 *src_desc = &src->u.v_1_1; + struct vkd3d_root_signature_desc *dst_desc = &dst->u.v_1_0; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_0(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + free_descriptor_ranges(parameters, dst_desc->parameter_count); + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +static void free_descriptor_ranges1(const struct vkd3d_root_parameter1 *parameters, unsigned int count) +{ + unsigned int i; + + if (!parameters) + return; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter1 *p = &parameters[i]; + + if (p->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)p->u.descriptor_table.descriptor_ranges); + } +} + +static int convert_root_parameters_to_v_1_1(struct vkd3d_root_parameter1 *dst, + const struct vkd3d_root_parameter *src, unsigned int count) +{ + const struct vkd3d_descriptor_range *ranges; + struct vkd3d_descriptor_range1 *ranges1; + unsigned int i, j; + int ret; + + for (i = 0; i < count; ++i) + { + const struct vkd3d_root_parameter *p = &src[i]; + struct vkd3d_root_parameter1 *p1 = &dst[i]; + + p1->parameter_type = p->parameter_type; + switch (p1->parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ranges1 = NULL; + if ((p1->u.descriptor_table.descriptor_range_count = p->u.descriptor_table.descriptor_range_count)) + { + if (!(ranges1 = vkd3d_calloc(p1->u.descriptor_table.descriptor_range_count, sizeof(*ranges1)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + } + p1->u.descriptor_table.descriptor_ranges = ranges1; + ranges = p->u.descriptor_table.descriptor_ranges; + for (j = 0; j < p->u.descriptor_table.descriptor_range_count; ++j) + { + ranges1[j].range_type = ranges[j].range_type; + ranges1[j].descriptor_count = ranges[j].descriptor_count; + ranges1[j].base_shader_register = ranges[j].base_shader_register; + ranges1[j].register_space = ranges[j].register_space; + ranges1[j].flags = VKD3D_ROOT_SIGNATURE_1_0_DESCRIPTOR_RANGE_FLAGS; + ranges1[j].descriptor_table_offset = ranges[j].descriptor_table_offset; + } + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + p1->u.constants = p->u.constants; + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + p1->u.descriptor.shader_register = p->u.descriptor.shader_register; + p1->u.descriptor.register_space = p->u.descriptor.register_space; + p1->u.descriptor.flags = VKD3D_ROOT_SIGNATURE_1_0_ROOT_DESCRIPTOR_FLAGS; + break; + default: + WARN("Invalid root parameter type %#x.\n", p1->parameter_type); + ret = VKD3D_ERROR_INVALID_ARGUMENT; + goto fail; + + } + p1->shader_visibility = p->shader_visibility; + } + + return VKD3D_OK; + +fail: + free_descriptor_ranges1(dst, i); + return ret; +} + +static int convert_root_signature_to_v1_1(struct vkd3d_versioned_root_signature_desc *dst, + const struct vkd3d_versioned_root_signature_desc *src) +{ + const struct vkd3d_root_signature_desc *src_desc = &src->u.v_1_0; + struct vkd3d_root_signature_desc1 *dst_desc = &dst->u.v_1_1; + struct vkd3d_static_sampler_desc *samplers = NULL; + struct vkd3d_root_parameter1 *parameters = NULL; + int ret; + + if ((dst_desc->parameter_count = src_desc->parameter_count)) + { + if (!(parameters = vkd3d_calloc(dst_desc->parameter_count, sizeof(*parameters)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + if ((ret = convert_root_parameters_to_v_1_1(parameters, src_desc->parameters, src_desc->parameter_count)) < 0) + goto fail; + } + dst_desc->parameters = parameters; + if ((dst_desc->static_sampler_count = src_desc->static_sampler_count)) + { + if (!(samplers = vkd3d_calloc(dst_desc->static_sampler_count, sizeof(*samplers)))) + { + ret = VKD3D_ERROR_OUT_OF_MEMORY; + goto fail; + } + memcpy(samplers, src_desc->static_samplers, src_desc->static_sampler_count * sizeof(*samplers)); + } + dst_desc->static_samplers = samplers; + dst_desc->flags = src_desc->flags; + + return VKD3D_OK; + +fail: + free_descriptor_ranges1(parameters, dst_desc->parameter_count); + vkd3d_free(parameters); + vkd3d_free(samplers); + return ret; +} + +int vkd3d_shader_convert_root_signature(struct vkd3d_versioned_root_signature_desc *dst, + enum vkd3d_root_signature_version version, const struct vkd3d_versioned_root_signature_desc *src) +{ + int ret; + + TRACE("dst %p, version %#x, src %p.\n", dst, version, src); + + if (src->version == version) + { + WARN("Nothing to convert.\n"); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && src->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + WARN("Root signature version %#x not supported.\n", src->version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + memset(dst, 0, sizeof(*dst)); + dst->version = version; + + if (version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + ret = convert_root_signature_to_v1_0(dst, src); + } + else + { + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + ret = convert_root_signature_to_v1_1(dst, src); + } + + return ret; +} diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 52ca4edcc50a..e1f1f1c179a2 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -2,6 +2,7 @@ VKD3D_1_0 { global: vkd3d_shader_compile_dxbc; + vkd3d_shader_convert_root_signature; vkd3d_shader_find_signature_element; vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; -- 2.21.0

2 1

[PATCH vkd3d v2 1/6] vkd3d-shader: Implement parsing of root signature 1.1.
by Józef Kucia 19 Apr '19

19 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_shader.h | 82 +++++++ libs/vkd3d-shader/dxbc.c | 306 +++++++++++++++++++++----- libs/vkd3d-shader/vkd3d_shader.map | 2 + libs/vkd3d-shader/vkd3d_shader_main.c | 35 +++ 4 files changed, 369 insertions(+), 56 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 15a0b22d64dc..506d519ea630 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -216,6 +216,7 @@ struct vkd3d_shader_domain_shader_compile_arguments enum vkd3d_tessellator_output_primitive partitioning; }; +/* root signature 1.0 */ enum vkd3d_filter { VKD3D_FILTER_MIN_MAG_MIP_POINT = 0x0, @@ -393,13 +394,86 @@ struct vkd3d_root_signature_desc enum vkd3d_root_signature_flags flags; }; +/* root signature 1.1 */ +enum vkd3d_root_descriptor_flags +{ + VKD3D_ROOT_DESCRIPTOR_FLAG_NONE = 0x0, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_VOLATILE = 0x2, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_ROOT_DESCRIPTOR_FLAG_DATA_STATIC = 0x8, +}; + +enum vkd3d_descriptor_range_flags +{ + VKD3D_DESCRIPTOR_RANGE_FLAG_NONE = 0x0, + VKD3D_DESCRIPTOR_RANGE_FLAG_DESCRIPTORS_VOLATILE = 0x1, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_VOLATILE = 0x2, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC_WHILE_SET_AT_EXECUTE = 0x4, + VKD3D_DESCRIPTOR_RANGE_FLAG_DATA_STATIC = 0x8, +}; + +struct vkd3d_descriptor_range1 +{ + enum vkd3d_descriptor_range_type range_type; + unsigned int descriptor_count; + unsigned int base_shader_register; + unsigned int register_space; + enum vkd3d_descriptor_range_flags flags; + unsigned int descriptor_table_offset; +}; + +struct vkd3d_root_descriptor_table1 +{ + unsigned int descriptor_range_count; + const struct vkd3d_descriptor_range1 *descriptor_ranges; +}; + +struct vkd3d_root_descriptor1 +{ + unsigned int shader_register; + unsigned int register_space; + enum vkd3d_root_descriptor_flags flags; +}; + +struct vkd3d_root_parameter1 +{ + enum vkd3d_root_parameter_type parameter_type; + union + { + struct vkd3d_root_descriptor_table1 descriptor_table; + struct vkd3d_root_constants constants; + struct vkd3d_root_descriptor1 descriptor; + } u; + enum vkd3d_shader_visibility shader_visibility; +}; + +struct vkd3d_root_signature_desc1 +{ + unsigned int parameter_count; + const struct vkd3d_root_parameter1 *parameters; + unsigned int static_sampler_count; + const struct vkd3d_static_sampler_desc *static_samplers; + enum vkd3d_root_signature_flags flags; +}; + enum vkd3d_root_signature_version { VKD3D_ROOT_SIGNATURE_VERSION_1_0 = 0x1, + VKD3D_ROOT_SIGNATURE_VERSION_1_1 = 0x2, VKD3D_FORCE_32_BIT_ENUM(VKD3D_ROOT_SIGNATURE_VERSION), }; +struct vkd3d_versioned_root_signature_desc +{ + enum vkd3d_root_signature_version version; + union + { + struct vkd3d_root_signature_desc v_1_0; + struct vkd3d_root_signature_desc1 v_1_1; + } u; +}; + /* FIXME: Add support for 64 UAV bind slots. */ #define VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS 8 @@ -496,6 +570,10 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature); void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_signature); +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *root_signature); + /* FIXME: Add support for returning error messages (ID3DBlob). */ int vkd3d_shader_serialize_root_signature(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); @@ -525,6 +603,10 @@ typedef int (*PFN_vkd3d_shader_parse_root_signature)(const struct vkd3d_shader_c struct vkd3d_root_signature_desc *root_signature); typedef void (*PFN_vkd3d_shader_free_root_signature)(struct vkd3d_root_signature_desc *root_signature); +typedef int (*PFN_vkd3d_shader_parse_versioned_root_signature)(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature); +typedef void (*PFN_vkd3d_shader_free_versioned_root_signature)(struct vkd3d_versioned_root_signature_desc *root_signature); + typedef int (*PFN_vkd3d_shader_serialize_root_signature)(const struct vkd3d_root_signature_desc *root_signature, enum vkd3d_root_signature_version version, struct vkd3d_shader_code *dxbc); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 996a7e544c1e..9ed7faadf784 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -2087,18 +2087,25 @@ int shader_extract_from_dxbc(const void *dxbc, size_t dxbc_length, return ret; } -static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_descriptor_range *ranges) +/* root signatures */ +struct root_signature_parser_context +{ + const char *data; + unsigned int data_size; +}; + +static int shader_parse_descriptor_ranges(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range *ranges) { const char *ptr; unsigned int i; - if (!require_space(offset, 5 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 5 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2118,19 +2125,51 @@ static int shader_parse_descriptor_ranges(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_descriptor_table(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor_table *table) +static int shader_parse_descriptor_ranges1(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_descriptor_range1 *ranges) +{ + const char *ptr; + unsigned int i; + + if (!require_space(offset, 6 * count, sizeof(uint32_t), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &ranges[i].range_type); + read_dword(&ptr, &ranges[i].descriptor_count); + read_dword(&ptr, &ranges[i].base_shader_register); + read_dword(&ptr, &ranges[i].register_space); + read_dword(&ptr, &ranges[i].flags); + read_dword(&ptr, &ranges[i].descriptor_table_offset); + + TRACE("Type %#x, descriptor count %u, base shader register %u, " + "register space %u, flags %#x, offset %u.\n", + ranges[i].range_type, ranges[i].descriptor_count, + ranges[i].base_shader_register, ranges[i].register_space, + ranges[i].flags, ranges[i].descriptor_table_offset); + } + + return VKD3D_OK; +} + +static int shader_parse_descriptor_table(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table *table) { struct vkd3d_descriptor_range *ranges; + unsigned int count; const char *ptr; - DWORD count; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &count); read_dword(&ptr, &offset); @@ -2142,20 +2181,47 @@ static int shader_parse_descriptor_table(const char *data, DWORD data_size, if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) return VKD3D_ERROR_OUT_OF_MEMORY; table->descriptor_ranges = ranges; - return shader_parse_descriptor_ranges(data, data_size, offset, count, ranges); + return shader_parse_descriptor_ranges(context, offset, count, ranges); } -static int shader_parse_root_constants(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_constants *constants) +static int shader_parse_descriptor_table1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor_table1 *table) { + struct vkd3d_descriptor_range1 *ranges; + unsigned int count; const char *ptr; - if (!require_space(offset, 3, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; + + read_dword(&ptr, &count); + read_dword(&ptr, &offset); + + TRACE("Descriptor range count %u.\n", count); + + table->descriptor_range_count = count; + + if (!(ranges = vkd3d_calloc(count, sizeof(*ranges)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + table->descriptor_ranges = ranges; + return shader_parse_descriptor_ranges1(context, offset, count, ranges); +} + +static int shader_parse_root_constants(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_constants *constants) +{ + const char *ptr; + + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; read_dword(&ptr, &constants->shader_register); read_dword(&ptr, &constants->register_space); @@ -2167,17 +2233,17 @@ static int shader_parse_root_constants(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_descriptor(const char *data, DWORD data_size, - DWORD offset, struct vkd3d_root_descriptor *descriptor) +static int shader_parse_root_descriptor(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor *descriptor) { const char *ptr; - if (!require_space(offset, 2, sizeof(DWORD), data_size)) + if (!require_space(offset, 2, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u).\n", data_size, offset); + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; read_dword(&ptr, &descriptor->shader_register); read_dword(&ptr, &descriptor->register_space); @@ -2188,19 +2254,41 @@ static int shader_parse_root_descriptor(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_parameters(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_root_parameter *parameters) +static int shader_parse_root_descriptor1(struct root_signature_parser_context *context, + unsigned int offset, struct vkd3d_root_descriptor1 *descriptor) +{ + const char *ptr; + + if (!require_space(offset, 3, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u).\n", context->data_size, offset); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; + + read_dword(&ptr, &descriptor->shader_register); + read_dword(&ptr, &descriptor->register_space); + read_dword(&ptr, &descriptor->flags); + + TRACE("Shader register %u, register space %u, flags %#x.\n", + descriptor->shader_register, descriptor->register_space, descriptor->flags); + + return VKD3D_OK; +} + +static int shader_parse_root_parameters(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_root_parameter *parameters) { const char *ptr; unsigned int i; int ret; - if (!require_space(offset, 3 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2214,15 +2302,15 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, switch (parameters[i].parameter_type) { case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: - ret = shader_parse_descriptor_table(data, data_size, offset, &parameters[i].u.descriptor_table); + ret = shader_parse_descriptor_table(context, offset, &parameters[i].u.descriptor_table); break; case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: - ret = shader_parse_root_constants(data, data_size, offset, &parameters[i].u.constants); + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); break; case VKD3D_ROOT_PARAMETER_TYPE_CBV: case VKD3D_ROOT_PARAMETER_TYPE_SRV: case VKD3D_ROOT_PARAMETER_TYPE_UAV: - ret = shader_parse_root_descriptor(data, data_size, offset, &parameters[i].u.descriptor); + ret = shader_parse_root_descriptor(context, offset, &parameters[i].u.descriptor); break; default: FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); @@ -2236,18 +2324,66 @@ static int shader_parse_root_parameters(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_static_samplers(const char *data, DWORD data_size, - DWORD offset, DWORD count, struct vkd3d_static_sampler_desc *sampler_descs) +static int shader_parse_root_parameters1(struct root_signature_parser_context *context, + DWORD offset, DWORD count, struct vkd3d_root_parameter1 *parameters) { const char *ptr; unsigned int i; + int ret; - if (!require_space(offset, 13 * count, sizeof(DWORD), data_size)) + if (!require_space(offset, 3 * count, sizeof(DWORD), context->data_size)) { - WARN("Invalid data size %#x (offset %u, count %u).\n", data_size, offset, count); + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); return VKD3D_ERROR_INVALID_ARGUMENT; } - ptr = &data[offset]; + ptr = &context->data[offset]; + + for (i = 0; i < count; ++i) + { + read_dword(&ptr, &parameters[i].parameter_type); + read_dword(&ptr, &parameters[i].shader_visibility); + read_dword(&ptr, &offset); + + TRACE("Type %#x, shader visibility %#x.\n", + parameters[i].parameter_type, parameters[i].shader_visibility); + + switch (parameters[i].parameter_type) + { + case VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE: + ret = shader_parse_descriptor_table1(context, offset, &parameters[i].u.descriptor_table); + break; + case VKD3D_ROOT_PARAMETER_TYPE_32BIT_CONSTANTS: + ret = shader_parse_root_constants(context, offset, &parameters[i].u.constants); + break; + case VKD3D_ROOT_PARAMETER_TYPE_CBV: + case VKD3D_ROOT_PARAMETER_TYPE_SRV: + case VKD3D_ROOT_PARAMETER_TYPE_UAV: + ret = shader_parse_root_descriptor1(context, offset, &parameters[i].u.descriptor); + break; + default: + FIXME("Unrecognized type %#x.\n", parameters[i].parameter_type); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + + if (ret < 0) + return ret; + } + + return VKD3D_OK; +} + +static int shader_parse_static_samplers(struct root_signature_parser_context *context, + unsigned int offset, unsigned int count, struct vkd3d_static_sampler_desc *sampler_descs) +{ + const char *ptr; + unsigned int i; + + if (!require_space(offset, 13 * count, sizeof(DWORD), context->data_size)) + { + WARN("Invalid data size %#x (offset %u, count %u).\n", context->data_size, offset, count); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + ptr = &context->data[offset]; for (i = 0; i < count; ++i) { @@ -2269,60 +2405,92 @@ static int shader_parse_static_samplers(const char *data, DWORD data_size, return VKD3D_OK; } -static int shader_parse_root_signature(const char *data, DWORD data_size, - struct vkd3d_root_signature_desc *desc) +static int shader_parse_root_signature(const char *data, unsigned int data_size, + struct vkd3d_versioned_root_signature_desc *desc) { + struct vkd3d_root_signature_desc *v_1_0 = &desc->u.v_1_0; + struct root_signature_parser_context context; + unsigned int count, offset, version; const char *ptr = data; - DWORD count, offset; int ret; + context.data = data; + context.data_size = data_size; + if (!require_space(0, 6, sizeof(DWORD), data_size)) { WARN("Invalid data size %#x.\n", data_size); return VKD3D_ERROR_INVALID_ARGUMENT; } - skip_dword_unknown(&ptr, 1); /* It seems to always be 0x00000001. */ + read_dword(&ptr, &version); + TRACE("Version %#x.\n", version); + if (version != VKD3D_ROOT_SIGNATURE_VERSION_1_0 && version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", version); + return VKD3D_ERROR_INVALID_ARGUMENT; + } + desc->version = version; read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Parameter count %u, offset %u.\n", count, offset); - desc->parameter_count = count; - if (desc->parameter_count) + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) { - struct vkd3d_root_parameter *parameters; - if (!(parameters = vkd3d_calloc(desc->parameter_count, sizeof(*parameters)))) - return VKD3D_ERROR_OUT_OF_MEMORY; - desc->parameters = parameters; - if ((ret = shader_parse_root_parameters(data, data_size, offset, count, parameters)) < 0) - return ret; + v_1_0->parameter_count = count; + if (v_1_0->parameter_count) + { + struct vkd3d_root_parameter *parameters; + if (!(parameters = vkd3d_calloc(v_1_0->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_0->parameters = parameters; + if ((ret = shader_parse_root_parameters(&context, offset, count, parameters)) < 0) + return ret; + } + } + else + { + struct vkd3d_root_signature_desc1 *v_1_1 = &desc->u.v_1_1; + + assert(version == VKD3D_ROOT_SIGNATURE_VERSION_1_1); + + v_1_1->parameter_count = count; + if (v_1_1->parameter_count) + { + struct vkd3d_root_parameter1 *parameters; + if (!(parameters = vkd3d_calloc(v_1_1->parameter_count, sizeof(*parameters)))) + return VKD3D_ERROR_OUT_OF_MEMORY; + v_1_1->parameters = parameters; + if ((ret = shader_parse_root_parameters1(&context, offset, count, parameters)) < 0) + return ret; + } } read_dword(&ptr, &count); read_dword(&ptr, &offset); TRACE("Static sampler count %u, offset %u.\n", count, offset); - desc->static_sampler_count = count; - if (desc->static_sampler_count) + v_1_0->static_sampler_count = count; + if (v_1_0->static_sampler_count) { struct vkd3d_static_sampler_desc *samplers; - if (!(samplers = vkd3d_calloc(desc->static_sampler_count, sizeof(*samplers)))) + if (!(samplers = vkd3d_calloc(v_1_0->static_sampler_count, sizeof(*samplers)))) return VKD3D_ERROR_OUT_OF_MEMORY; - desc->static_samplers = samplers; - if ((ret = shader_parse_static_samplers(data, data_size, offset, count, samplers)) < 0) + v_1_0->static_samplers = samplers; + if ((ret = shader_parse_static_samplers(&context, offset, count, samplers)) < 0) return ret; } - read_dword(&ptr, &desc->flags); - TRACE("Flags %#x.\n", desc->flags); + read_dword(&ptr, &v_1_0->flags); + TRACE("Flags %#x.\n", v_1_0->flags); return VKD3D_OK; } static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *context) { - struct vkd3d_root_signature_desc *desc = context; + struct vkd3d_versioned_root_signature_desc *desc = context; if (tag != TAG_RTS0) return VKD3D_OK; @@ -2332,6 +2500,32 @@ static int rts0_handler(const char *data, DWORD data_size, DWORD tag, void *cont int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_root_signature_desc *root_signature) +{ + struct vkd3d_versioned_root_signature_desc desc = {0}; + int ret; + + TRACE("dxbc {%p, %zu}, root_signature %p.\n", dxbc->code, dxbc->size, root_signature); + + memset(root_signature, 0, sizeof(*root_signature)); + if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, &desc)) < 0) + { + vkd3d_shader_free_versioned_root_signature(&desc); + return ret; + } + + if (desc.version != VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_versioned_root_signature(&desc); + return VKD3D_ERROR_NOT_IMPLEMENTED; + } + + *root_signature = desc.u.v_1_0; + + return VKD3D_OK; +} + +int vkd3d_shader_parse_versioned_root_signature(const struct vkd3d_shader_code *dxbc, + struct vkd3d_versioned_root_signature_desc *root_signature) { int ret; @@ -2340,7 +2534,7 @@ int vkd3d_shader_parse_root_signature(const struct vkd3d_shader_code *dxbc, memset(root_signature, 0, sizeof(*root_signature)); if ((ret = parse_dxbc(dxbc->code, dxbc->size, rts0_handler, root_signature)) < 0) { - vkd3d_shader_free_root_signature(root_signature); + vkd3d_shader_free_versioned_root_signature(root_signature); return ret; } diff --git a/libs/vkd3d-shader/vkd3d_shader.map b/libs/vkd3d-shader/vkd3d_shader.map index 92e4d06b0095..52ca4edcc50a 100644 --- a/libs/vkd3d-shader/vkd3d_shader.map +++ b/libs/vkd3d-shader/vkd3d_shader.map @@ -6,8 +6,10 @@ global: vkd3d_shader_free_root_signature; vkd3d_shader_free_shader_code; vkd3d_shader_free_shader_signature; + vkd3d_shader_free_versioned_root_signature; vkd3d_shader_parse_input_signature; vkd3d_shader_parse_root_signature; + vkd3d_shader_parse_versioned_root_signature; vkd3d_shader_scan_dxbc; vkd3d_shader_serialize_root_signature; diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 55cb56c2e191..d56794105829 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -344,6 +344,41 @@ void vkd3d_shader_free_root_signature(struct vkd3d_root_signature_desc *root_sig memset(root_signature, 0, sizeof(*root_signature)); } +void vkd3d_shader_free_versioned_root_signature(struct vkd3d_versioned_root_signature_desc *desc) +{ + struct vkd3d_root_signature_desc1 *root_signature; + unsigned int i; + + if (!desc->version) + return; + + if (desc->version == VKD3D_ROOT_SIGNATURE_VERSION_1_0) + { + vkd3d_shader_free_root_signature(&desc->u.v_1_0); + return; + } + + if (desc->version != VKD3D_ROOT_SIGNATURE_VERSION_1_1) + { + FIXME("Unknown version %#x.\n", desc->version); + return; + } + + root_signature = &desc->u.v_1_1; + + for (i = 0; i < root_signature->parameter_count; ++i) + { + const struct vkd3d_root_parameter1 *parameter = &root_signature->parameters[i]; + + if (parameter->parameter_type == VKD3D_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) + vkd3d_free((void *)parameter->u.descriptor_table.descriptor_ranges); + } + vkd3d_free((void *)root_signature->parameters); + vkd3d_free((void *)root_signature->static_samplers); + + memset(root_signature, 0, sizeof(*root_signature)); +} + int vkd3d_shader_parse_input_signature(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_signature *signature) { -- 2.21.0

2 1

[PATCH] wined3d: Check GLSL version when using ARB_shader_bit_encoding with uvec4.
by Paul Gofman 19 Apr '19

19 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47039 There are GPUs which support ARB_shader_bit_encoding with GLSL version 1.2 and uvec4 data type is available since GLSL 1.3. Spotted with Intel Ironlake Mobile. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/glsl_shader.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d4678965d..0d0e8b25c9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -442,7 +442,7 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co wined3d_ftoa(values[2], str[2]); wined3d_ftoa(values[3], str[3]); - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) { const unsigned int *uint_values = (const unsigned int *)values; @@ -3316,7 +3316,8 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_UNORM: case WINED3D_DATA_SNORM: case WINED3D_DATA_FLOAT: - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + if (gl_info->supported[ARB_SHADER_BIT_ENCODING] + && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30)) { string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", reg->u.immconst_data[0], reg->u.immconst_data[1], -- 2.20.1

3 7

[PATCH 1/5] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Derek Lesho 19 Apr '19

19 Apr '19

Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 18 ++++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 3789abda35..0ab150ea65 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -3233,6 +3233,24 @@ NTSTATUS WINAPI PsLookupProcessByProcessId(HANDLE processid, PEPROCESS *process) } +/***************************************************** + * PsLookupThreadByThreadId (NTOSKRNL.EXE.@) + */ +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE threadid, PETHREAD *thread) +{ + NTSTATUS status; + HANDLE hThread = OpenThread( THREAD_ALL_ACCESS, FALSE, HandleToUlong(threadid) ); + + if (!hThread) + return STATUS_INVALID_PARAMETER; + + status = ObReferenceObjectByHandle( hThread, THREAD_ALL_ACCESS, PsThreadType, KernelMode, (void**)thread, NULL ); + + NtClose( hThread ); + return status; +} + + /***************************************************** * IoSetThreadHardErrorMode (NTOSKRNL.EXE.@) */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 141c8aa639..f965ff55ec 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -914,7 +914,7 @@ @ stub PsJobType @ stdcall PsLookupProcessByProcessId(ptr ptr) @ stub PsLookupProcessThreadByCid -@ stub PsLookupThreadByThreadId +@ stdcall PsLookupThreadByThreadId(ptr ptr) @ extern PsProcessType @ stub PsReferenceImpersonationToken @ stub PsReferencePrimaryToken diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index c3839da3bf..4b846869fc 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -29,6 +29,7 @@ #include "winternl.h" #include "winioctl.h" #include "ddk/ntddk.h" +#include "ddk/ntifs.h" #include "ddk/wdm.h" #include "driver.h" @@ -1167,6 +1168,22 @@ static void test_resource(void) ok(status == STATUS_SUCCESS, "got status %#x\n", status); } +static void test_lookup_thread(void) +{ + NTSTATUS status; + PETHREAD thread = NULL; + + status = PsLookupThreadByThreadId(PsGetCurrentThreadId(), &thread); + ok(!status, "PsLookupThreadByThreadId failed: %#x\n", status); + ok((PKTHREAD)thread == KeGetCurrentThread(), "thread != KeGetCurrentThread\n"); + + if (thread) + ObDereferenceObject(thread); + + status = PsLookupThreadByThreadId(NULL, &thread); + ok(status == STATUS_INVALID_PARAMETER, "PsLookupThreadByThreadId returned %#x\n", status); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -1210,6 +1227,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_lookaside_list(); test_ob_reference(test_input->path); test_resource(); + test_lookup_thread(); /* print process report */ if (winetest_debug) diff --git a/include/ddk/ntifs.h b/include/ddk/ntifs.h index abe357fbc9..9b57ae7ad7 100644 --- a/include/ddk/ntifs.h +++ b/include/ddk/ntifs.h @@ -131,6 +131,7 @@ typedef struct _FS_FILTER_CALLBACKS BOOLEAN WINAPI FsRtlIsNameInExpression(PUNICODE_STRING, PUNICODE_STRING, BOOLEAN, PWCH); NTSTATUS WINAPI ObQueryNameString(PVOID,POBJECT_NAME_INFORMATION,ULONG,PULONG); +NTSTATUS WINAPI PsLookupThreadByThreadId(HANDLE,PETHREAD*); void WINAPI PsRevertToSelf(void); #endif -- 2.20.1

3 13

[PATCH 2/3] msi/tests: Check the NT key first when retrieving registered owner and organization.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/tests/action.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 60ae92e64c..7a515df9b0 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -2506,9 +2506,9 @@ static void check_reg_str(HKEY prodkey, LPCSTR name, LPCSTR expected, BOOL bcase else { if (bcase) - ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); else - ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected %s, got %s\n", expected, val); + ok_(__FILE__, line)(!lstrcmpiA(val, expected), "Expected \"%s\", got \"%s\"\n", expected, val); } } @@ -3408,7 +3408,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); @@ -3420,7 +3420,7 @@ static void get_owner_company(LPSTR *owner, LPSTR *company) if (!*owner || !*company) { res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, - "Software\\Microsoft\\Windows NT\\CurrentVersion", 0, access, &hkey); + "Software\\Microsoft\\Windows\\CurrentVersion", 0, access, &hkey); if (res == ERROR_SUCCESS) { *owner = reg_get_val_str(hkey, "RegisteredOwner"); -- 2.20.1

2 1

[PATCH 3/3] msi: Always use the 64-bit registry view to retrieve registered owner and organization.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/package.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 490c687d78..1e16fb18ce 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -742,7 +742,7 @@ static VOID set_installer_properties(MSIPACKAGE *package) 'W','i','n','d','o','w','s',' ','N','T','\\', 'C','u','r','r','e','n','t','V','e','r','s','i','o','n',0 }; - static const WCHAR szRegisteredUser[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; + static const WCHAR szRegisteredOwner[] = {'R','e','g','i','s','t','e','r','e','d','O','w','n','e','r',0}; static const WCHAR szRegisteredOrganization[] = { 'R','e','g','i','s','t','e','r','e','d','O','r','g','a','n','i','z','a','t','i','o','n',0 }; @@ -971,10 +971,11 @@ static VOID set_installer_properties(MSIPACKAGE *package) CloseHandle( hkey ); } if ((!username || !companyname) && - RegOpenKeyW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, &hkey ) == ERROR_SUCCESS) + RegOpenKeyExW( HKEY_LOCAL_MACHINE, szCurrentVersionNT, 0, KEY_QUERY_VALUE|KEY_WOW64_64KEY, + &hkey ) == ERROR_SUCCESS) { if (!username && - (username = msi_reg_get_val_str( hkey, szRegisteredUser ))) + (username = msi_reg_get_val_str( hkey, szRegisteredOwner ))) msi_set_property( package->db, szUSERNAME, username, -1 ); if (!companyname && (companyname = msi_reg_get_val_str( hkey, szRegisteredOrganization ))) -- 2.20.1

1 0

[PATCH 1/3] msi: Get rid of redundant KEY_WOW64_64KEY flags.
by Hans Leidekker 19 Apr '19

19 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/msi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index 3eca3bfb8d..8c350f61bd 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1747,11 +1747,11 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, r = ERROR_UNKNOWN_PATCH; - res = RegOpenKeyExW(udprod, szPatches, 0, KEY_WOW64_64KEY|KEY_READ, &patches); + res = RegOpenKeyExW(udprod, szPatches, 0, KEY_READ, &patches); if (res != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_WOW64_64KEY|KEY_READ, &patch ); + res = RegOpenKeyExW( patches, squashed_patch, 0, KEY_READ, &patch ); if (res != ERROR_SUCCESS) goto done; @@ -1761,7 +1761,7 @@ UINT WINAPI MsiGetPatchInfoExW(LPCWSTR szPatchCode, LPCWSTR szProductCode, &prod, FALSE) != ERROR_SUCCESS) goto done; - res = RegOpenKeyExW(prod, szPatches, 0, KEY_WOW64_64KEY|KEY_ALL_ACCESS, &prodpatches); + res = RegOpenKeyExW(prod, szPatches, 0, KEY_ALL_ACCESS, &prodpatches); if (res != ERROR_SUCCESS) goto done; -- 2.20.1

1 0

[PATCH 1/5] mfreadwrite: Duplicate media type returned with GetNativeMediaType().
by Nikolay Sivov 19 Apr '19

19 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 10 ++++++++-- dlls/mfreadwrite/tests/mfplat.c | 6 +++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index 7625669ddb..d80e450c85 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -463,6 +463,7 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR struct source_reader *reader = impl_from_IMFSourceReader(iface); IMFMediaTypeHandler *handler; IMFStreamDescriptor *sd; + IMFMediaType *src_type; BOOL selected; HRESULT hr; @@ -489,11 +490,16 @@ static HRESULT WINAPI src_reader_GetNativeMediaType(IMFSourceReader *iface, DWOR return hr; if (type_index == MF_SOURCE_READER_CURRENT_TYPE_INDEX) - hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, type); + hr = IMFMediaTypeHandler_GetCurrentMediaType(handler, &src_type); else - hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, type); + hr = IMFMediaTypeHandler_GetMediaTypeByIndex(handler, type_index, &src_type); IMFMediaTypeHandler_Release(handler); + if (SUCCEEDED(hr = MFCreateMediaType(type))) + hr = IMFMediaType_CopyAllItems(src_type, (IMFAttributes *)*type); + + IMFMediaType_Release(src_type); + return hr; } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 074c403e49..188e6889fe 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -186,9 +186,9 @@ static struct async_callback *create_async_callback(void) static void test_source_reader(void) { + IMFMediaType *mediatype, *mediatype2; struct async_callback *callback; IMFAttributes *attributes; - IMFMediaType *mediatype; IMFSourceReader *reader; IMFMediaSource *source; IMFByteStream *stream; @@ -267,6 +267,10 @@ todo_wine hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype); ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + hr = IMFSourceReader_GetNativeMediaType(reader, MF_SOURCE_READER_FIRST_AUDIO_STREAM, 0, &mediatype2); + ok(hr == S_OK, "Failed to get native mediatype, hr %#x.\n", hr); + ok(mediatype != mediatype2, "Unexpected media type instance.\n"); + IMFMediaType_Release(mediatype2); IMFMediaType_Release(mediatype); /* MF_SOURCE_READER_CURRENT_TYPE_INDEX is Win8+ */ -- 2.20.1

1 4

[PATCH] ntdll: Add DECLSPEC_HOTPATCH to NtQueryValueKey
by Louis Lenders 19 Apr '19

19 Apr '19

https://bugs.winehq.org/show_bug.cgi?id=45703 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/ntdll/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index c6acd76af9..845e2e030d 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -530,7 +530,7 @@ NTSTATUS WINAPI NtEnumerateValueKey( HANDLE handle, ULONG index, * NOTES * the name in the KeyValueInformation is never set */ -NTSTATUS WINAPI NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, +NTSTATUS WINAPI DECLSPEC_HOTPATCH NtQueryValueKey( HANDLE handle, const UNICODE_STRING *name, KEY_VALUE_INFORMATION_CLASS info_class, void *info, DWORD length, DWORD *result_len ) { -- 2.20.1

1 0

[PATCH 1/8] qedit/tests: Abort on missing qedit.dll.
by Zebediah Figura 19 Apr '19

19 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/tests/mediadet.c | 12 ++++++++++++ dlls/qedit/tests/samplegrabber.c | 12 ++++++++++++ dlls/qedit/tests/timeline.c | 12 ++++++++++++ 3 files changed, 36 insertions(+) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 34c43fd295..311d77bfa0 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -647,6 +647,9 @@ static void test_COM_sg_enumpins(void) START_TEST(mediadet) { + IMediaDet *detector; + HRESULT hr; + if (!init_tests()) { skip("Couldn't initialize tests!\n"); @@ -655,6 +658,15 @@ START_TEST(mediadet) CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (void **)&detector))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create media detector object, hr %#x.\n", hr); + return; + } + IMediaDet_Release(detector); + test_aggregation(); test_mediadet(); test_samplegrabber(); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 22f6ddb673..8bc44b9c22 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -451,8 +451,20 @@ static void test_aggregation(void) START_TEST(samplegrabber) { + IBaseFilter *filter; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_SampleGrabber, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&filter))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create sample grabber filter, hr %#x.\n", hr); + return; + } + IBaseFilter_Release(filter); + test_interfaces(); test_enum_pins(); test_find_pin(); diff --git a/dlls/qedit/tests/timeline.c b/dlls/qedit/tests/timeline.c index 9e24062a9d..0d01d519fd 100644 --- a/dlls/qedit/tests/timeline.c +++ b/dlls/qedit/tests/timeline.c @@ -246,8 +246,20 @@ static void test_timelineobj_interfaces(void) START_TEST(timeline) { + IAMTimeline *timeline; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = CoCreateInstance(&CLSID_AMTimeline, NULL, CLSCTX_INPROC_SERVER, + &IID_IAMTimeline, (void **)&timeline))) + { + /* qedit.dll does not exist on 2003. */ + win_skip("Failed to create timeline object, hr %#x.\n", hr); + return; + } + IAMTimeline_Release(timeline); + test_aggregation(); test_timeline(); test_timelineobj_interfaces(); -- 2.21.0

2 15

[PATCH 1/3] user32: Use GetSysColorBrush().
by Zebediah Figura 19 Apr '19

19 Apr '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/user32/mdi.c | 5 +---- dlls/user32/uitools.c | 11 +++-------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 10a38824ad..ada89bc0c6 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -865,7 +865,6 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) { HDC hMemDC; HBITMAP hBitmap, hOldBitmap; - HBRUSH hBrush; HDC hdc = GetDC(hChild); if (hdc) @@ -877,10 +876,8 @@ static BOOL MDI_AugmentFrameMenu( HWND frame, HWND hChild ) hBitmap = CreateCompatibleBitmap(hdc, cx, cy); hOldBitmap = SelectObject(hMemDC, hBitmap); SetMapMode(hMemDC, MM_TEXT); - hBrush = CreateSolidBrush(GetSysColor(COLOR_MENU)); - DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, hBrush, DI_NORMAL); + DrawIconEx(hMemDC, 0, 0, hIcon, cx, cy, 0, GetSysColorBrush(COLOR_MENU), DI_NORMAL); SelectObject (hMemDC, hOldBitmap); - DeleteObject(hBrush); DeleteDC(hMemDC); ReleaseDC(hChild, hdc); hSysMenuBitmap = hBitmap; diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 73ec34bff1..8657f27869 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -1693,26 +1693,22 @@ static BOOL UITOOLS_DrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp } if (flags & DSS_DISABLED) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DHILIGHT)); + hbrtmp = GetSysColorBrush(COLOR_3DHILIGHT); else if (flags & DSS_DEFAULT) - hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); + hbrtmp = GetSysColorBrush(COLOR_3DSHADOW); /* Draw light or dark shadow */ if (flags & (DSS_DISABLED|DSS_DEFAULT)) { - if(!hbrtmp) goto cleanup; hbsave = SelectObject(hdc, hbrtmp); if(!hbsave) goto cleanup; if(!BitBlt(hdc, x+1, y+1, cx, cy, memdc, 0, 0, 0x00B8074A)) goto cleanup; SelectObject(hdc, hbsave); - DeleteObject(hbrtmp); - hbrtmp = 0; } if (flags & DSS_DISABLED) { - hbr = hbrtmp = CreateSolidBrush(GetSysColor(COLOR_3DSHADOW)); - if(!hbrtmp) goto cleanup; + hbr = GetSysColorBrush(COLOR_3DSHADOW); } else if (!hbr) { @@ -1731,7 +1727,6 @@ cleanup: if(hbsave) SelectObject(hdc, hbsave); if(hbmsave) SelectObject(memdc, hbmsave); - if(hbrtmp) DeleteObject(hbrtmp); if(hbm) DeleteObject(hbm); if(memdc) DeleteDC(memdc); -- 2.21.0

2 3

[PATCH] d3d10core&d3d11: Limit the flood of failures in test_depth_bias().
by Francois Gouget 18 Apr '19

18 Apr '19

Only report the first failed row for each bias clamp test. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- dlls/d3d10core/tests/d3d10core.c | 12 ++++++++---- dlls/d3d11/tests/d3d11.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index f799922ea28..b0ff09d3697 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -15765,6 +15765,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D10Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -15775,21 +15776,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -15797,7 +15800,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 3d6cbf57e20..2850d59757e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -25681,6 +25681,7 @@ static void test_depth_bias(void) for (k = 0; k < ARRAY_SIZE(bias_clamp_tests); ++k) { + BOOL all_match = TRUE; rasterizer_desc.DepthBiasClamp = bias_clamp_tests[k]; ID3D11Device_CreateRasterizerState(device, &rasterizer_desc, &rs); ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); @@ -25691,21 +25692,23 @@ static void test_depth_bias(void) m = quad_slopes[i] / texture_desc.Height; bias = clamp_depth_bias(rasterizer_desc.SlopeScaledDepthBias * m, rasterizer_desc.DepthBiasClamp); get_texture_readback(texture, 0, &rb); - for (y = 0; y < texture_desc.Height; ++y) + for (y = 0; y < texture_desc.Height && all_match; ++y) { depth = min(max(0.0f, depth_values[y] + bias), 1.0f); switch (format) { case DXGI_FORMAT_D32_FLOAT: data = get_readback_float(&rb, 0, y); - ok(compare_float(data, depth, 64), + all_match = compare_float(data, depth, 64); + ok(all_match, "Got depth %.8e, expected %.8e.\n", data, depth); break; case DXGI_FORMAT_D24_UNORM_S8_UINT: u32 = get_readback_data(&rb, 0, y, 0, sizeof(*u32)); u32_value = *u32 >> shift; expected_value = depth * 16777215.0f + 0.5f; - ok(abs(u32_value - expected_value) <= 3, + all_match = abs(u32_value - expected_value) <= 3; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", u32_value, u32_value / 16777215.0f, expected_value, expected_value / 16777215.0f); @@ -25713,7 +25716,8 @@ static void test_depth_bias(void) case DXGI_FORMAT_D16_UNORM: u16 = get_readback_data(&rb, 0, y, 0, sizeof(*u16)); expected_value = depth * 65535.0f + 0.5f; - ok(abs(*u16 - expected_value) <= 1, + all_match = abs(*u16 - expected_value) <= 1; + ok(all_match, "Got value %#x (%.8e), expected %#x (%.8e).\n", *u16, *u16 / 65535.0f, expected_value, expected_value / 65535.0f); break; -- 2.20.1

3 4

[PATCH 1/2] [PATCH 1/2] jscript: (partly) implement Enumerator object
by Andreas Maier 18 Apr '19

18 Apr '19

Enumerator is an MS extension. This fixes installatiion of VyChat219.msi. Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/Makefile.in | 1 + dlls/jscript/enumerator.c | 455 +++++++++++++++++++++++++++++++++++++++++++++ dlls/jscript/global.c | 18 +- dlls/jscript/jscript.h | 10 + dlls/jscript/jsglobal.idl | 3 - dlls/jscript/tests/rsrc.rc | 3 + dlls/jscript/tests/run.c | 1 + 7 files changed, 480 insertions(+), 11 deletions(-) create mode 100644 dlls/jscript/enumerator.c diff --git a/dlls/jscript/Makefile.in b/dlls/jscript/Makefile.in index 34ed193742..1cc58a5ed6 100644 --- a/dlls/jscript/Makefile.in +++ b/dlls/jscript/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ decode.c \ dispex.c \ engine.c \ + enumerator.c \ error.c \ function.c \ global.c \ diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c new file mode 100644 index 0000000000..bd05cdf4da --- /dev/null +++ b/dlls/jscript/enumerator.c @@ -0,0 +1,455 @@ +/* + * Copyright 2019 Andreas Maier + * + * 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 + */ + +#include "config.h" +#include "wine/port.h" + +#include <math.h> +#include <assert.h> + +#include "jscript.h" + +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(jscript); + +#define DATATYPE_ARRAY 0 +#define DATATYPE_STRINGLIST 1 +#define DATATYPE_DRIVECOLLECTION 2 + +typedef struct { + jsdisp_t dispex; + + int index; + int length; + int datatype; + /* constructor with jsarray e.g. ["A","B"] */ + jsdisp_t *array; + /* constructor with stringlist-interface + methods Items and Count are available. + e.g. StringList or IDriveCollection-Interface */ + IDispatch *stringlist; +} EnumeratorInstance; + +static const WCHAR atEndW[] = {'a','t','E','n','d',0}; +static const WCHAR itemW[] = {'i','t','e','m',0}; +static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; +static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; + +static EXCEPINFO excepinfo; +static HRESULT invoke(IDispatch *pDispatch, LPCSTR szName, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, VARTYPE vtResult) +{ + OLECHAR *name = NULL; + DISPID dispid; + HRESULT hr; + UINT i; + UINT len; + + memset(pVarResult, 0, sizeof(VARIANT)); + VariantInit(pVarResult); + + len = MultiByteToWideChar(CP_ACP, 0, szName, -1, NULL, 0 ); + name = HeapAlloc(GetProcessHeap(), 0, len*sizeof(WCHAR) ); + if (!name) return E_FAIL; + MultiByteToWideChar(CP_ACP, 0, szName, -1, name, len ); + hr = IDispatch_GetIDsOfNames(pDispatch, &IID_NULL, &name, 1, LOCALE_USER_DEFAULT, &dispid); + HeapFree(GetProcessHeap(), 0, name); + if (FAILED(hr)) + return hr; + + memset(&excepinfo, 0, sizeof(excepinfo)); + hr = IDispatch_Invoke(pDispatch, dispid, &IID_NULL, LOCALE_NEUTRAL, wFlags, pDispParams, pVarResult, &excepinfo, NULL); + + if ((hr == S_OK) && (vtResult != VT_EMPTY)) + hr = VariantChangeTypeEx(pVarResult, pVarResult, LOCALE_NEUTRAL, 0, vtResult); + + for (i=0; i<pDispParams->cArgs; i++) + VariantClear(&pDispParams->rgvarg[i]); + + return hr; +} + +static HRESULT Dispatch_ItemAllocStr(IDispatch *pStringList, int iIndex, LPWSTR *szString) +{ + VARIANT varresult; + VARIANTARG vararg[1]; + DISPPARAMS dispparams = {vararg, NULL, sizeof(vararg)/sizeof(VARIANTARG), 0}; + UINT charCount; + HRESULT hr; + + *szString = NULL; + + VariantInit(&vararg[0]); + V_VT(&vararg[0]) = VT_I4; + V_I4(&vararg[0]) = iIndex; + + hr = invoke(pStringList, "Item", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_BSTR); + if (FAILED(hr)) + goto CLEANUP; + + charCount = SysStringLen(V_BSTR(&varresult)) + 1; + *szString = (LPWSTR)malloc(charCount * sizeof(WCHAR)); + if (!(*szString)) + { + hr = ERROR_OUTOFMEMORY; + goto CLEANUP; + } + if (!lstrcpynW(*szString, V_BSTR(&varresult), charCount)) + { + hr = E_FAIL; + goto CLEANUP; + } +CLEANUP: + VariantClear(&varresult); + if (FAILED(hr)) + { + free(*szString); + *szString = NULL; + } + return hr; +} + +static HRESULT Dispatch_Count(IDispatch *pStringList, int *pCount) +{ + VARIANT varresult; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + HRESULT hr = invoke(pStringList, "Count", DISPATCH_PROPERTYGET, &dispparams, &varresult, VT_I4); + *pCount = V_I4(&varresult); + VariantClear(&varresult); + return hr; +} + +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline void enum_set_item_result(EnumeratorInstance *This, jsval_t *r) +{ + HRESULT hres; + WCHAR* item; + + if (!r) + return; + + if ((This->index < 0) || + (This->index >= This->length)) + { + *r = jsval_undefined(); + return; + } + + switch (This->datatype) + { + case DATATYPE_ARRAY: + { + hres = jsdisp_get_idx(This->array, This->index, r); + if (FAILED(hres)) + *r = jsval_undefined(); + break; + } + case DATATYPE_STRINGLIST: + { + hres = Dispatch_ItemAllocStr(This->stringlist, This->index, &item); + if (FAILED(hres)) + { + TRACE("item %d <failed>\n", This->index); + *r = jsval_undefined(); + } else + { + TRACE("item %d %s\n", This->index, debugstr_w(item)); + *r = jsval_string(jsstr_alloc(item)); + free(item); + } + break; + } + case DATATYPE_DRIVECOLLECTION: + { + FIXME("getitem for drivecollection not implemented!\n"); + *r = jsval_undefined(); + break; + } + default: + { + *r = jsval_undefined(); + } + } +} + +static void Enumerator_destructor(jsdisp_t *dispex) +{ + EnumeratorInstance *This; + + This = enumerator_from_jsdisp(dispex); + if (This->array) + jsdisp_release(This->array); + if (This->stringlist) + IDispatch_Release(This->stringlist); + + TRACE("Enumerator_destructor\n"); + + heap_free(dispex); +} + +HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + This = enumerator_from_vdisp(jsthis); + + if (r) + *r = jsval_bool(This->index >= This->length); + + TRACE("Enumerator_atEnd %i %i\n", This->length, This->index); + + return S_OK; +} + +HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + TRACE("Enumerator_item\n"); + + This = enumerator_from_vdisp(jsthis); + + enum_set_item_result(This, r); + + return S_OK; +} + +HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + TRACE("Enumerator_moveFirst\n"); + + This = enumerator_from_vdisp(jsthis); + This->index = 0; + + enum_set_item_result(This, r); + + return S_OK; +} + +HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + EnumeratorInstance *This; + + This = enumerator_from_vdisp(jsthis); + + TRACE("Enumerator_moveNext\n"); + + if (This->index < This->length) + This->index++; + + enum_set_item_result(This, r); + + + return S_OK; +} + +static const builtin_prop_t Enumerator_props[] = { + {atEndW, Enumerator_atEnd, PROPF_METHOD}, + {itemW, Enumerator_item, PROPF_METHOD}, + {moveFirstW, Enumerator_moveFirst, PROPF_METHOD}, + {moveNextW, Enumerator_moveNext, PROPF_METHOD}, +}; + +static const builtin_info_t Enumerator_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0}, + ARRAY_SIZE(Enumerator_props), + Enumerator_props, + NULL, + NULL +}; + +static const builtin_info_t EnumeratorInst_info = { + JSCLASS_OBJECT, + {NULL, NULL, 0, NULL}, + 0, + NULL, + Enumerator_destructor, + NULL +}; + +static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, unsigned argc, jsval_t *argv, + jsval_t *r) +{ + jsdisp_t *obj; + HRESULT hres; + + TRACE("EnumeratorConstr_value\n"); + + switch(flags) { + case DISPATCH_CONSTRUCT: { + if (argc != 1) + return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + + hres = create_enumerator(ctx, &argv[0], &obj); + if(FAILED(hres)) + return hres; + + *r = jsval_obj(obj); + break; + } + default: + FIXME("unimplemented flags: %x\n", flags); + return E_NOTIMPL; + } + + return S_OK; +} + +static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, EnumeratorInstance **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + + enumerator = heap_alloc_zero(sizeof(EnumeratorInstance)); + if(!enumerator) + return E_OUTOFMEMORY; + + if(object_prototype) + hres = init_dispex(&enumerator->dispex, ctx, &Enumerator_info, object_prototype); + else + hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, + ctx->enumerator_constr); + + if(FAILED(hres)) { + heap_free(enumerator); + return hres; + } + + *ret = enumerator; + return S_OK; +} + +static const builtin_info_t EnumeratorConstr_info = { + JSCLASS_FUNCTION, + DEFAULT_FUNCTION_VALUE, + 0, + NULL, + NULL, + NULL +}; + +HRESULT create_enumerator_constr(script_ctx_t *ctx, jsdisp_t *object_prototype, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + static const WCHAR EnumeratorW[] = {'E','n','u','m','e','r','a','t','o','r',0}; + + hres = alloc_enumerator(ctx, object_prototype, &enumerator); + if(FAILED(hres)) + return hres; + + hres = create_builtin_constructor(ctx, EnumeratorConstr_value, + EnumeratorW, &EnumeratorConstr_info, + PROPF_CONSTR|1, &enumerator->dispex, ret); + jsdisp_release(&enumerator->dispex); + + return hres; +} + +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) +{ + EnumeratorInstance *enumerator; + HRESULT hres; + IDispatch *dummy; + IDispatch *obj = NULL; + + int jsdatatype = -1; + int jslength = 0; + jsdisp_t *jsarray = NULL; + IDispatch *jsstringlist = NULL; + + if(is_object_instance(*argv)) + { + obj = get_object(*argv); + jsarray = iface_to_jsdisp(obj); + if ((jsarray) && + (is_class(jsarray, JSCLASS_ARRAY))) + { + TRACE("array\n"); + jsdatatype = DATATYPE_ARRAY; + jslength = array_get_length(jsarray); + } + else + { + if (jsarray) + jsdisp_release(jsarray); + /* check if its a stringlist or drivecollection */ + if (SUCCEEDED(IDispatch_QueryInterface(obj, &IID_StringList, (void*)&dummy))) + { + TRACE("Enumerator: stringlist\n"); + jsdatatype = DATATYPE_STRINGLIST; + } + else if (SUCCEEDED(IDispatch_QueryInterface(obj, &IID_IDriveCollection, (void*)&dummy))) + { + TRACE("Enumerator: drivecollection\n"); + jsdatatype = DATATYPE_DRIVECOLLECTION; + } + else + { + FIXME("Enumerator: unexpected type!\n"); + return E_INVALIDARG; + } + + hres = Dispatch_Count(obj, &jslength); + if (FAILED(hres)) + { + ERR("Dispatch_Count failed %d\n", hres); + return -1; + } + TRACE("Count %i\n", jslength); + + jsstringlist = obj; + } + } + else + { + FIXME("type not implemented!\n"); + return E_NOTIMPL; + } + + hres = alloc_enumerator(ctx, NULL, &enumerator); + if(FAILED(hres)) + return hres; + + if (jsstringlist) + IDispatch_AddRef(jsstringlist); + enumerator->index = 0; + enumerator->length = jslength; + enumerator->datatype = jsdatatype; + enumerator->array = jsarray; + enumerator->stringlist = jsstringlist; + + *ret = &enumerator->dispex; + return S_OK; +} diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 33de641483..61a756be0e 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -113,13 +113,6 @@ static WCHAR int_to_char(int i) return 'A'+i-10; } -static HRESULT JSGlobal_Enumerator(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, - jsval_t *r) -{ - FIXME("\n"); - return E_NOTIMPL; -} - static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { @@ -942,7 +935,6 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static const builtin_prop_t JSGlobal_props[] = { {CollectGarbageW, JSGlobal_CollectGarbage, PROPF_METHOD}, - {EnumeratorW, JSGlobal_Enumerator, PROPF_METHOD|7}, {_GetObjectW, JSGlobal_GetObject, PROPF_METHOD|2}, {ScriptEngineW, JSGlobal_ScriptEngine, PROPF_METHOD}, {ScriptEngineBuildVersionW, JSGlobal_ScriptEngineBuildVersion, PROPF_METHOD}, @@ -1019,6 +1011,16 @@ static HRESULT init_constructors(script_ctx_t *ctx, jsdisp_t *object_prototype) if(FAILED(hres)) return hres; + hres = create_enumerator_constr(ctx, object_prototype, &ctx->enumerator_constr); + if(FAILED(hres)) + return hres; + + /* Enumerator is a MS extension */ + hres = jsdisp_define_data_property(ctx->global, EnumeratorW, PROPF_WRITABLE, + jsval_obj(ctx->enumerator_constr)); + if(FAILED(hres)) + return hres; + hres = init_error_constr(ctx, object_prototype); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 2af5b598bd..de539b77b1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -326,6 +326,7 @@ HRESULT create_bool(script_ctx_t*,BOOL,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number(script_ctx_t*,double,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_vbarray(script_ctx_t*,SAFEARRAY*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_json(script_ctx_t*,jsdisp_t**) DECLSPEC_HIDDEN; +HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) DECLSPEC_HIDDEN; typedef enum { NO_HINT, @@ -436,6 +437,7 @@ struct _script_ctx_t { jsdisp_t *array_constr; jsdisp_t *bool_constr; jsdisp_t *date_constr; + jsdisp_t *enumerator_constr; jsdisp_t *error_constr; jsdisp_t *eval_error_constr; jsdisp_t *range_error_constr; @@ -468,6 +470,7 @@ HRESULT create_array_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_bool_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_date_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT init_error_constr(script_ctx_t*,jsdisp_t*) DECLSPEC_HIDDEN; +HRESULT create_enumerator_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_number_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_object_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; HRESULT create_regexp_constr(script_ctx_t*,jsdisp_t*,jsdisp_t**) DECLSPEC_HIDDEN; @@ -590,3 +593,10 @@ static inline void unlock_module(void) { InterlockedDecrement(&module_ref); } + +/* Stringlist_xxx-functions borrowed from wintest (msi) + * FIXME: share it to avoid code duplication ... + */ +/* all these interface have the same item and count-property :-) */ +DEFINE_GUID(IID_StringList, 0x000C1095, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46); +DEFINE_GUID(IID_IDriveCollection, 0xc7c3f5a1, 0x88a3, 0x11d0, 0xab, 0xcb, 0x00, 0xa0, 0xc9, 0x0f, 0xff, 0xc0); diff --git a/dlls/jscript/jsglobal.idl b/dlls/jscript/jsglobal.idl index b8604e99f2..7e0c1a30cf 100644 --- a/dlls/jscript/jsglobal.idl +++ b/dlls/jscript/jsglobal.idl @@ -74,9 +74,6 @@ library JSGlobal [id(DISPID_GLOBAL_VBARRAY)] VARIANT VBArray(); - [id(DISPID_GLOBAL_ENUMERATOR)] - VARIANT Enumerator(); - [id(DISPID_GLOBAL_ESCAPE)] VARIANT escape(VARIANT String); diff --git a/dlls/jscript/tests/rsrc.rc b/dlls/jscript/tests/rsrc.rc index d9ee6b23ae..b130df294a 100644 --- a/dlls/jscript/tests/rsrc.rc +++ b/dlls/jscript/tests/rsrc.rc @@ -25,6 +25,9 @@ cc.js 40 "cc.js" /* @makedep: lang.js */ lang.js 40 "lang.js" +/* @makedep: extension.js */ +extension.js 40 "extension.js" + /* @makedep: regexp.js */ regexp.js 40 "regexp.js" diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index aadb31700d..9e92a418f1 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -2684,6 +2684,7 @@ static BOOL run_tests(void) run_from_res("lang.js"); run_from_res("api.js"); + run_from_res("extension.js"); run_from_res("regexp.js"); run_from_res("cc.js"); -- 2.11.0

3 9

[PATCH 4/4] [v3] user32: Implement WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 18 Apr '19

18 Apr '19

In v3, - fix test failtures on Debian testbot. In v2, - reorder the patch set. - simplify variable usage. Fixes Bug 46685. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46685 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/edit.c | 32 ++++++++++++++++++++++++++++++-- dlls/user32/tests/edit.c | 2 -- 2 files changed, 30 insertions(+), 4 deletions(-)

2 1

[PATCH 4/4] d3d11: Fix d3d10_device_RSGetScissorRects().
by Józef Kucia 18 Apr '19

18 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 6b89a64e2098..4f19c037b117 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -5114,6 +5114,8 @@ static void STDMETHODCALLTYPE d3d10_device_RSGetScissorRects(ID3D10Device1 *ifac if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock(); -- 2.21.0

3 2

[PATCH 3/4] d3d11: Fix d3d11_immediate_context_RSGetScissorRects().
by Józef Kucia 18 Apr '19

18 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 588395b4b6a6..6b89a64e2098 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2061,6 +2061,8 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De if (!rect_count) return; + actual_count = *rect_count; + wined3d_mutex_lock(); wined3d_device_get_scissor_rects(device->wined3d_device, &actual_count, rects); wined3d_mutex_unlock(); -- 2.21.0

3 2

[PATCH 2/4] wined3d: Create Vulkan device for wined3d_device_vk.
by Józef Kucia 18 Apr '19

18 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_vk.c | 116 +++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 848c02c52d3b..813a027efd26 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -27,6 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); struct wined3d_device_vk { struct wined3d_device d; + + VkDevice vk_device; + VkQueue vk_queue; }; static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) @@ -45,6 +48,30 @@ static const char *debug_vk_version(uint32_t version) VK_VERSION_MAJOR(version), VK_VERSION_MINOR(version), VK_VERSION_PATCH(version)); } +static HRESULT hresult_from_vk_result(VkResult vr) +{ + switch (vr) + { + case VK_SUCCESS: + return S_OK; + case VK_ERROR_OUT_OF_HOST_MEMORY: + WARN("Out of host memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_OUT_OF_DEVICE_MEMORY: + WARN("Out of device memory.\n"); + return E_OUTOFMEMORY; + case VK_ERROR_DEVICE_LOST: + WARN("Device lost.\n"); + return E_FAIL; + case VK_ERROR_EXTENSION_NOT_PRESENT: + WARN("Extension not present.\n"); + return E_FAIL; + default: + FIXME("Unhandled VkResult %d.\n", vr); + return E_FAIL; + } +} + #ifdef USE_WIN32_VULKAN static BOOL wined3d_load_vulkan(struct wined3d_vk_info *vk_info) { @@ -106,33 +133,116 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) heap_free(adapter_vk); } +static HRESULT wined3d_select_vulkan_queue_family(const struct wined3d_adapter_vk *adapter_vk, + uint32_t *queue_family_index) +{ + VkPhysicalDevice physical_device = adapter_vk->physical_device; + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + VkQueueFamilyProperties *queue_properties; + uint32_t count, i; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, NULL)); + + if (!(queue_properties = heap_calloc(count, sizeof(*queue_properties)))) + return E_OUTOFMEMORY; + + VK_CALL(vkGetPhysicalDeviceQueueFamilyProperties(physical_device, &count, queue_properties)); + + for (i = 0; i < count; ++i) + { + if (queue_properties[i].queueFlags & VK_QUEUE_GRAPHICS_BIT) + { + *queue_family_index = i; + heap_free(queue_properties); + return WINED3D_OK; + } + } + heap_free(queue_properties); + + WARN("Failed to find graphics queue.\n"); + return E_FAIL; +} + static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { + const struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk_const(adapter); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; + static const float priorities[] = {1.0f}; struct wined3d_device_vk *device_vk; + VkDevice vk_device = VK_NULL_HANDLE; + VkDeviceQueueCreateInfo queue_info; + VkPhysicalDeviceFeatures features; + VkPhysicalDevice physical_device; + VkDeviceCreateInfo device_info; + uint32_t queue_family_index; + VkResult vr; HRESULT hr; if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) return E_OUTOFMEMORY; + if (FAILED(hr = wined3d_select_vulkan_queue_family(adapter_vk, &queue_family_index))) + goto fail; + + physical_device = adapter_vk->physical_device; + + VK_CALL(vkGetPhysicalDeviceFeatures(physical_device, &features)); + + queue_info.sType = VK_STRUCTURE_TYPE_DEVICE_QUEUE_CREATE_INFO; + queue_info.pNext = NULL; + queue_info.flags = 0; + queue_info.queueFamilyIndex = queue_family_index; + queue_info.queueCount = ARRAY_SIZE(priorities); + queue_info.pQueuePriorities = priorities; + + device_info.sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO; + device_info.pNext = NULL; + device_info.flags = 0; + device_info.queueCreateInfoCount = 1; + device_info.pQueueCreateInfos = &queue_info; + device_info.enabledLayerCount = 0; + device_info.ppEnabledLayerNames = NULL; + device_info.enabledExtensionCount = 0; + device_info.ppEnabledExtensionNames = NULL; + device_info.pEnabledFeatures = &features; + + if ((vr = VK_CALL(vkCreateDevice(physical_device, &device_info, NULL, &vk_device))) < 0) + { + WARN("Failed to create Vulkan device, vr %d.\n", vr); + vk_device = VK_NULL_HANDLE; + hr = hresult_from_vk_result(vr); + goto fail; + } + + device_vk->vk_device = vk_device; + VK_CALL(vkGetDeviceQueue(vk_device, queue_family_index, 0, &device_vk->vk_queue)); + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, focus_window, flags, surface_alignment, levels, level_count, device_parent))) { WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(device_vk); - return hr; + goto fail; } return WINED3D_OK; + +fail: + VK_CALL(vkDestroyDevice(vk_device, NULL)); + heap_free(device_vk); + return hr; } static void adapter_vk_destroy_device(struct wined3d_device *device) { + struct wined3d_adapter_vk *adapter_vk = wined3d_adapter_vk(device->adapter); struct wined3d_device_vk *device_vk = wined3d_device_vk(device); + const struct wined3d_vk_info *vk_info = &adapter_vk->vk_info; - wined3d_device_cleanup(device); + wined3d_device_cleanup(&device_vk->d); + VK_CALL(vkDestroyDevice(device_vk->vk_device, NULL)); heap_free(device_vk); } -- 2.21.0

2 1

[PATCH 1/4] wined3d: Make the adapter responsible for creating devices.
by Józef Kucia 18 Apr '19

18 Apr '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 33 +++++++++++ dlls/wined3d/adapter_vk.c | 42 ++++++++++++++ dlls/wined3d/device.c | 100 +++++++++++++++++---------------- dlls/wined3d/directx.c | 50 +++++++++++++---- dlls/wined3d/wined3d_private.h | 10 +++- 5 files changed, 173 insertions(+), 62 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index c195bf4993db..36c29c9a7f58 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4246,6 +4246,37 @@ static void wined3d_adapter_init_fb_cfgs(struct wined3d_adapter_gl *adapter_gl, } } +static HRESULT adapter_gl_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, + enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, + const enum wined3d_feature_level *levels, unsigned int level_count, + struct wined3d_device_parent *device_parent, struct wined3d_device **device) +{ + struct wined3d_device_gl *device_gl; + HRESULT hr; + + if (!(device_gl = heap_alloc_zero(sizeof(*device_gl)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_device_init(&device_gl->d, wined3d, adapter->ordinal, device_type, + focus_window, flags, surface_alignment, levels, level_count, device_parent))) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + heap_free(device_gl); + return hr; + } + + *device = &device_gl->d; + return WINED3D_OK; +} + +static void adapter_gl_destroy_device(struct wined3d_device *device) +{ + struct wined3d_device_gl *device_gl = wined3d_device_gl(device); + + wined3d_device_cleanup(&device_gl->d); + heap_free(device_gl); +} + static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, struct wined3d_caps *caps) { const struct wined3d_d3d_info *d3d_info = &adapter->d3d_info; @@ -4516,6 +4547,8 @@ static void adapter_gl_destroy(struct wined3d_adapter *adapter) static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = { adapter_gl_destroy, + adapter_gl_create_device, + adapter_gl_destroy_device, wined3d_adapter_gl_create_context, adapter_gl_get_wined3d_caps, adapter_gl_check_format, diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index d8937c2983b4..848c02c52d3b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -24,6 +24,16 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +struct wined3d_device_vk +{ + struct wined3d_device d; +}; + +static inline struct wined3d_device_vk *wined3d_device_vk(struct wined3d_device *device) +{ + return CONTAINING_RECORD(device, struct wined3d_device_vk, d); +} + static inline const struct wined3d_adapter_vk *wined3d_adapter_vk_const(const struct wined3d_adapter *adapter) { return CONTAINING_RECORD(adapter, struct wined3d_adapter_vk, a); @@ -96,6 +106,36 @@ static void adapter_vk_destroy(struct wined3d_adapter *adapter) heap_free(adapter_vk); } +static HRESULT adapter_vk_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, + enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, + const enum wined3d_feature_level *levels, unsigned int level_count, + struct wined3d_device_parent *device_parent, struct wined3d_device **device) +{ + struct wined3d_device_vk *device_vk; + HRESULT hr; + + if (!(device_vk = heap_alloc_zero(sizeof(*device_vk)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_device_init(&device_vk->d, wined3d, adapter->ordinal, device_type, + focus_window, flags, surface_alignment, levels, level_count, device_parent))) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + heap_free(device_vk); + return hr; + } + + return WINED3D_OK; +} + +static void adapter_vk_destroy_device(struct wined3d_device *device) +{ + struct wined3d_device_vk *device_vk = wined3d_device_vk(device); + + wined3d_device_cleanup(device); + heap_free(device_vk); +} + static BOOL adapter_vk_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) { @@ -210,6 +250,8 @@ static BOOL adapter_vk_check_format(const struct wined3d_adapter *adapter, static const struct wined3d_adapter_ops wined3d_adapter_vk_ops = { adapter_vk_destroy, + adapter_vk_create_device, + adapter_vk_destroy_device, adapter_vk_create_context, adapter_vk_get_wined3d_caps, adapter_vk_check_format, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 361ac6b1e360..23ba41c56b48 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -476,6 +476,54 @@ static void device_leftover_sampler(struct wine_rb_entry *entry, void *context) ERR("Leftover sampler %p.\n", sampler); } +void wined3d_device_cleanup(struct wined3d_device *device) +{ + unsigned int i; + + if (device->swapchain_count) + wined3d_device_uninit_3d(device); + + wined3d_stateblock_state_cleanup(&device->stateblock_state); + + wined3d_cs_destroy(device->cs); + + if (device->recording && wined3d_stateblock_decref(device->recording)) + ERR("Something's still holding the recording stateblock.\n"); + device->recording = NULL; + + state_cleanup(&device->state); + + for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) + { + heap_free(device->multistate_funcs[i]); + device->multistate_funcs[i] = NULL; + } + + if (!list_empty(&device->resources)) + { + struct wined3d_resource *resource; + + ERR("Device released with resources still bound.\n"); + + LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) + { + ERR("Leftover resource %p with type %s (%#x).\n", + resource, debug_d3dresourcetype(resource->type), resource->type); + } + } + + if (device->contexts) + ERR("Context array not freed!\n"); + if (device->hardwareCursor) + DestroyCursor(device->hardwareCursor); + device->hardwareCursor = 0; + + wine_rb_destroy(&device->samplers, device_leftover_sampler, NULL); + + wined3d_decref(device->wined3d); + device->wined3d = NULL; +} + ULONG CDECL wined3d_device_decref(struct wined3d_device *device) { ULONG refcount = InterlockedDecrement(&device->ref); @@ -484,52 +532,8 @@ ULONG CDECL wined3d_device_decref(struct wined3d_device *device) if (!refcount) { - UINT i; - - if (device->swapchain_count) - wined3d_device_uninit_3d(device); - - wined3d_stateblock_state_cleanup(&device->stateblock_state); - - wined3d_cs_destroy(device->cs); - - if (device->recording && wined3d_stateblock_decref(device->recording)) - ERR("Something's still holding the recording stateblock.\n"); - device->recording = NULL; - - state_cleanup(&device->state); - - for (i = 0; i < ARRAY_SIZE(device->multistate_funcs); ++i) - { - heap_free(device->multistate_funcs[i]); - device->multistate_funcs[i] = NULL; - } - - if (!list_empty(&device->resources)) - { - struct wined3d_resource *resource; - - ERR("Device released with resources still bound.\n"); - - LIST_FOR_EACH_ENTRY(resource, &device->resources, struct wined3d_resource, resource_list_entry) - { - ERR("Leftover resource %p with type %s (%#x).\n", - resource, debug_d3dresourcetype(resource->type), resource->type); - } - } - - if (device->contexts) - ERR("Context array not freed!\n"); - if (device->hardwareCursor) - DestroyCursor(device->hardwareCursor); - device->hardwareCursor = 0; - - wine_rb_destroy(&device->samplers, device_leftover_sampler, NULL); - - wined3d_decref(device->wined3d); - device->wined3d = NULL; - heap_free(wined3d_device_gl(device)); - TRACE("Freed device %p.\n", device); + device->adapter->adapter_ops->adapter_destroy_device(device); + TRACE("Destroyed device %p.\n", device); } return refcount; @@ -5271,8 +5275,8 @@ static BOOL wined3d_select_feature_level(const struct wined3d_adapter *adapter, return FALSE; } -HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, +HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, + unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent) { diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e21b8beaa884..3c89fad7d1a1 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2169,7 +2169,8 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte const enum wined3d_feature_level *feature_levels, unsigned int feature_level_count, struct wined3d_device_parent *device_parent, struct wined3d_device **device) { - struct wined3d_device_gl *device_gl; + const struct wined3d_adapter *adapter; + struct wined3d_device *object; HRESULT hr; TRACE("wined3d %p, adapter_idx %u, device_type %#x, focus_window %p, flags %#x, " @@ -2180,20 +2181,14 @@ HRESULT CDECL wined3d_device_create(struct wined3d *wined3d, unsigned int adapte if (adapter_idx >= wined3d->adapter_count) return WINED3DERR_INVALIDCALL; - if (!(device_gl = heap_alloc_zero(sizeof(*device_gl)))) - return E_OUTOFMEMORY; - - if (FAILED(hr = device_init(&device_gl->d, wined3d, adapter_idx, + adapter = wined3d->adapters[adapter_idx]; + if (FAILED(hr = adapter->adapter_ops->adapter_create_device(wined3d, adapter, device_type, focus_window, flags, surface_alignment, - feature_levels, feature_level_count, device_parent))) - { - WARN("Failed to initialize device, hr %#x.\n", hr); - heap_free(device_gl); + feature_levels, feature_level_count, device_parent, &object))) return hr; - } - TRACE("Created device %p.\n", device_gl); - *device = &device_gl->d; + TRACE("Created device %p.\n", object); + *device = object; device_parent->ops->wined3d_device_created(device_parent, *device); @@ -2206,6 +2201,35 @@ static void adapter_no3d_destroy(struct wined3d_adapter *adapter) heap_free(adapter); } +static HRESULT adapter_no3d_create_device(struct wined3d *wined3d, const struct wined3d_adapter *adapter, + enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, + const enum wined3d_feature_level *levels, unsigned int level_count, + struct wined3d_device_parent *device_parent, struct wined3d_device **device) +{ + struct wined3d_device *object; + HRESULT hr; + + if (!(object = heap_alloc_zero(sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = wined3d_device_init(object, wined3d, adapter->ordinal, device_type, + focus_window, flags, surface_alignment, levels, level_count, device_parent))) + { + WARN("Failed to initialize device, hr %#x.\n", hr); + heap_free(object); + return hr; + } + + *device = object; + return WINED3D_OK; +} + +static void adapter_no3d_destroy_device(struct wined3d_device *device) +{ + wined3d_device_cleanup(device); + heap_free(device); +} + static BOOL wined3d_adapter_no3d_create_context(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format) { @@ -2226,6 +2250,8 @@ static BOOL adapter_no3d_check_format(const struct wined3d_adapter *adapter, static const struct wined3d_adapter_ops wined3d_adapter_no3d_ops = { adapter_no3d_destroy, + adapter_no3d_create_device, + adapter_no3d_destroy_device, wined3d_adapter_no3d_create_context, adapter_no3d_get_wined3d_caps, adapter_no3d_check_format, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f63f3d8d628..15876e4f1edc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2691,6 +2691,11 @@ void wined3d_driver_info_init(struct wined3d_driver_info *driver_info, struct wined3d_adapter_ops { void (*adapter_destroy)(struct wined3d_adapter *adapter); + HRESULT (*adapter_create_device)(struct wined3d *wined3d, const struct wined3d_adapter *adapter, + enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, + BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, + struct wined3d_device_parent *device_parent, struct wined3d_device **device); + void (*adapter_destroy_device)(struct wined3d_device *device); BOOL (*adapter_create_context)(struct wined3d_context *context, struct wined3d_texture *target, const struct wined3d_format *ds_format); void (*adapter_get_wined3d_caps)(const struct wined3d_adapter *adapter, struct wined3d_caps *caps); @@ -3163,13 +3168,14 @@ struct wined3d_device UINT context_count; }; +void wined3d_device_cleanup(struct wined3d_device *device) DECLSPEC_HIDDEN; void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb, UINT rect_count, const RECT *rects, const RECT *draw_rect, DWORD flags, const struct wined3d_color *color, float depth, DWORD stencil) DECLSPEC_HIDDEN; BOOL device_context_add(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_context_remove(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; -HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, - UINT adapter_idx, enum wined3d_device_type device_type, HWND focus_window, DWORD flags, +HRESULT wined3d_device_init(struct wined3d_device *device, struct wined3d *wined3d, + unsigned int adapter_idx, enum wined3d_device_type device_type, HWND focus_window, unsigned int flags, BYTE surface_alignment, const enum wined3d_feature_level *levels, unsigned int level_count, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, -- 2.21.0

2 1

[PATCH 3/4] [resend] [v2] user32/tests: Use calculated WM_SETFONT margins in the CJK case.
by Akihiro Sagawa 18 Apr '19

18 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 52 ++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 8 deletions(-)

1 0

[PATCH 2/4] [resend] user32/tests: Remove win9x workarounds in margin tests.
by Akihiro Sagawa 18 Apr '19

18 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)

1 0

[PATCH 1/4] [resend] user32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Akihiro Sagawa 18 Apr '19

18 Apr '19

Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/user32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH vkd3d 4/8] tests: Introduce universal create_command_queue() helper.
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 123 +++++++++++++----------------------- tests/d3d12_invalid_usage.c | 9 +-- tests/d3d12_test_utils.h | 27 +++++--- tests/vkd3d_api.c | 23 +------ 4 files changed, 68 insertions(+), 114 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0c19bf3289b8..148989b543b0 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -762,7 +762,6 @@ static ID3D12CommandSignature *create_command_signature_(unsigned int line, #define init_compute_test_context(context) init_compute_test_context_(__LINE__, context) static bool init_compute_test_context_(unsigned int line, struct test_context *context) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; ID3D12Device *device; HRESULT hr; @@ -775,21 +774,16 @@ static bool init_compute_test_context_(unsigned int line, struct test_context *c } device = context->device; - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_COMPUTE; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&context->queue); - ok_(line)(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + context->queue = create_command_queue_(line, device, + D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_COMPUTE, &IID_ID3D12CommandAllocator, (void **)&context->allocator); - ok_(line)(SUCCEEDED(hr), "Failed to create command allocator, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); hr = ID3D12Device_CreateCommandList(device, 0, D3D12_COMMAND_LIST_TYPE_COMPUTE, context->allocator, NULL, &IID_ID3D12GraphicsCommandList, (void **)&context->list); - ok_(line)(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + ok_(line)(hr == S_OK, "Failed to create command list, hr %#x.\n", hr); return true; } @@ -2753,7 +2747,6 @@ static void test_object_interface(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; - D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; @@ -2819,13 +2812,8 @@ static void test_object_interface(void) else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) { vkd3d_test_set_context("command queue"); - queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, - &IID_IUnknown, (void **)&unknown); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + unknown = (IUnknown *)create_command_queue(device, + D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandSignature)) { @@ -3578,7 +3566,6 @@ static void test_cpu_signal_fence(void) static void test_gpu_signal_fence(void) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; ID3D12CommandQueue *queue; HANDLE event1, event2; ID3D12Device *device; @@ -3594,30 +3581,24 @@ static void test_gpu_signal_fence(void) return; } - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); - ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); /* XXX: It seems that when a queue is idle a fence is signalled immediately * in D3D12. Vulkan implementations don't signal a fence immediately so * libvkd3d doesn't as well. In order to make this test reliable * wait_queue_idle() is inserted after every ID3D12CommandQueue_Signal(). */ hr = ID3D12CommandQueue_Signal(queue, fence, 10); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == 10, "Got unexpected value %"PRIu64".\n", value); hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == 0, "Got unexpected value %"PRIu64".\n", value); @@ -3629,11 +3610,11 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 5); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); @@ -3641,11 +3622,11 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 6, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 7); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); @@ -3653,34 +3634,34 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 10); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); /* Attach one event to multiple values. */ hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 3, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, 5, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, 9, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, 12, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); for (i = 1; i < 13; ++i) { hr = ID3D12CommandQueue_Signal(queue, fence, i); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); if (i == 3 || i == 5 || i == 9 || i == 12) { @@ -3693,7 +3674,7 @@ static void test_gpu_signal_fence(void) /* Tests with 2 events. */ hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); value = ID3D12Fence_GetCompletedValue(fence); ok(value == 0, "Got unexpected value %"PRIu64".\n", value); @@ -3706,12 +3687,12 @@ static void test_gpu_signal_fence(void) ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 100, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, ~(UINT64)0, event2); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12CommandQueue_Signal(queue, fence, 50); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3719,7 +3700,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 99); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3727,7 +3708,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 100); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); @@ -3737,7 +3718,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 101); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3745,7 +3726,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3753,7 +3734,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 100); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3761,7 +3742,7 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, ~(UINT64)0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3771,14 +3752,14 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, ~(UINT64)0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3787,7 +3768,7 @@ static void test_gpu_signal_fence(void) /* Attach two events to the same value. */ hr = ID3D12CommandQueue_Signal(queue, fence, 0); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); @@ -3795,15 +3776,15 @@ static void test_gpu_signal_fence(void) ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event1); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); hr = ID3D12Fence_SetEventOnCompletion(fence, 1, event2); - ok(SUCCEEDED(hr), "Failed to set event on completion, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); ret = wait_event(event1, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); ret = wait_event(event2, 0); ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, fence, 3); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); wait_queue_idle(device, queue); ret = wait_event(event1, 0); ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); @@ -3866,7 +3847,6 @@ static void fence_busy_wait_main(void *untyped_data) static void test_multithread_fence_wait(void) { struct multithread_fence_wait_data thread_data; - D3D12_COMMAND_QUEUE_DESC command_queue_desc; ID3D12CommandQueue *queue; ID3D12Device *device; unsigned int ret; @@ -3880,20 +3860,14 @@ static void test_multithread_fence_wait(void) return; } - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); thread_data.event = create_event(); thread_data.value = 0; ok(thread_data.event, "Failed to create event.\n"); hr = ID3D12Device_CreateFence(device, thread_data.value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&thread_data.fence); - ok(SUCCEEDED(hr), "Failed to create fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); /* Signal fence on host. */ ++thread_data.value; @@ -3903,7 +3877,7 @@ static void test_multithread_fence_wait(void) ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); hr = ID3D12Fence_Signal(thread_data.fence, thread_data.value); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); ok(join_thread(thread), "Failed to join thread.\n"); @@ -3914,7 +3888,7 @@ static void test_multithread_fence_wait(void) ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); hr = ID3D12Fence_Signal(thread_data.fence, thread_data.value); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); ok(join_thread(thread), "Failed to join thread.\n"); @@ -3926,7 +3900,7 @@ static void test_multithread_fence_wait(void) ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, thread_data.fence, thread_data.value); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); ok(join_thread(thread), "Failed to join thread.\n"); @@ -3937,7 +3911,7 @@ static void test_multithread_fence_wait(void) ok(ret == WAIT_OBJECT_0, "Failed to wait for thread start, return value %#x.\n", ret); hr = ID3D12CommandQueue_Signal(queue, thread_data.fence, thread_data.value); - ok(SUCCEEDED(hr), "Failed to signal fence, hr %#x.\n", hr); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); ok(join_thread(thread), "Failed to join thread.\n"); @@ -5740,7 +5714,6 @@ static void test_draw_uav_only(void) static void test_texture_resource_barriers(void) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; ID3D12CommandAllocator *command_allocator; ID3D12GraphicsCommandList *command_list; D3D12_RESOURCE_BARRIER barriers[8]; @@ -5756,13 +5729,7 @@ static void test_texture_resource_barriers(void) return; } - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&command_allocator); diff --git a/tests/d3d12_invalid_usage.c b/tests/d3d12_invalid_usage.c index 69ffda64fdba..ab5deb5b1e11 100644 --- a/tests/d3d12_invalid_usage.c +++ b/tests/d3d12_invalid_usage.c @@ -35,7 +35,6 @@ static void recreate_command_list_(unsigned int line, ID3D12Device *device, static void test_invalid_texture_resource_barriers(void) { ID3D12Resource *texture, *readback_buffer, *upload_buffer; - D3D12_COMMAND_QUEUE_DESC command_queue_desc; ID3D12CommandAllocator *command_allocator; ID3D12GraphicsCommandList *command_list; ID3D12CommandQueue *queue; @@ -49,13 +48,7 @@ static void test_invalid_texture_resource_barriers(void) return; } - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&command_allocator); diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index 6eb9ceae5576..22ab9e7fcfb4 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -214,6 +214,24 @@ static void transition_sub_resource_state(ID3D12GraphicsCommandList *list, ID3D1 ID3D12GraphicsCommandList_ResourceBarrier(list, 1, &barrier); } +#define create_command_queue(a, b, c) create_command_queue_(__LINE__, a, b, c) +static inline ID3D12CommandQueue *create_command_queue_(unsigned int line, ID3D12Device *device, + D3D12_COMMAND_LIST_TYPE type, int priority) +{ + D3D12_COMMAND_QUEUE_DESC queue_desc; + ID3D12CommandQueue *queue; + HRESULT hr; + + queue_desc.Type = type; + queue_desc.Priority = priority; + queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; + queue_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandQueue(device, &queue_desc, &IID_ID3D12CommandQueue, (void **)&queue); + ok_(line)(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); + + return queue; +} + static void transition_resource_state(ID3D12GraphicsCommandList *list, ID3D12Resource *resource, D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after) { @@ -743,7 +761,6 @@ static void create_render_target_(unsigned int line, struct test_context *contex static inline bool init_test_context_(unsigned int line, struct test_context *context, const struct test_context_desc *desc) { - D3D12_COMMAND_QUEUE_DESC command_queue_desc; D3D12_DESCRIPTOR_HEAP_DESC rtv_heap_desc; ID3D12Device *device; HRESULT hr; @@ -757,13 +774,7 @@ static inline bool init_test_context_(unsigned int line, struct test_context *co } device = context->device; - command_queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; - command_queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - command_queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - command_queue_desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &command_queue_desc, - &IID_ID3D12CommandQueue, (void **)&context->queue); - ok_(line)(SUCCEEDED(hr), "Failed to create command queue, hr %#x.\n", hr); + context->queue = create_command_queue_(line, device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&context->allocator); diff --git a/tests/vkd3d_api.c b/tests/vkd3d_api.c index 0bc481775f77..14d0914512bc 100644 --- a/tests/vkd3d_api.c +++ b/tests/vkd3d_api.c @@ -82,23 +82,6 @@ static ID3D12Device *create_device(void) return SUCCEEDED(hr) ? device : NULL; } -static ID3D12CommandQueue *create_command_queue(ID3D12Device *device, - D3D12_COMMAND_LIST_TYPE type) -{ - D3D12_COMMAND_QUEUE_DESC desc; - ID3D12CommandQueue *queue; - HRESULT hr; - - desc.Type = type; - desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; - desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; - desc.NodeMask = 0; - hr = ID3D12Device_CreateCommandQueue(device, &desc, - &IID_ID3D12CommandQueue, (void **)&queue); - ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); - return queue; -} - static void test_create_instance(void) { struct vkd3d_instance_create_info create_info; @@ -699,11 +682,11 @@ static void test_vkd3d_queue(void) device = create_device(); ok(device, "Failed to create device.\n"); - direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT); + direct_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); ok(direct_queue, "Failed to create direct command queue.\n"); - compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE); + compute_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COMPUTE, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); ok(compute_queue, "Failed to create compute command queue.\n"); - copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY); + copy_queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_COPY, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); ok(copy_queue, "Failed to create copy command queue.\n"); vk_queue_family = vkd3d_get_vk_queue_family_index(direct_queue); -- 2.21.0

2 1

[PATCH vkd3d 2/8] vkd3d: Signal Vulkan semaphore in d3d12_command_queue_Signal().
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> For d3d12_command_queue_Wait(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 219 ++++++++++++++++++++++++++++++++++--- libs/vkd3d/vkd3d_private.h | 9 ++ 2 files changed, 212 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6c9b145fc522..0d30f430367a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -80,6 +80,29 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) pthread_mutex_unlock(&queue->mutex); } +static VkResult vkd3d_queue_wait_idle(struct vkd3d_queue *queue, + const struct vkd3d_vk_device_procs *vk_procs) +{ + VkQueue vk_queue; + VkResult vr; + + if ((vk_queue = vkd3d_queue_acquire(queue))) + { + vr = VK_CALL(vkQueueWaitIdle(vk_queue)); + vkd3d_queue_release(queue); + + if (vr < 0) + WARN("Failed to wait for queue, vr %d.\n", vr); + } + else + { + ERR("Failed to acquire queue %p.\n", queue); + vr = VK_ERROR_OUT_OF_HOST_MEMORY; + } + + return vr; +} + /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, VkFence vk_fence, struct d3d12_fence *fence, uint64_t value) @@ -377,6 +400,104 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } +#define VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE 4 + +static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, bool destroy_all) +{ + struct d3d12_device *device = fence->device; + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkSemaphore vk_semaphore; + size_t semaphore_count; + unsigned int i, j; + + semaphore_count = fence->semaphore_count; + if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + return; + + for (i = 0, j = 0; i < fence->semaphore_count; ++i) + { + if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + break; + + /* The semaphore doesn't have a pending signal operation if the fence + * was signaled. */ + if (!fence->semaphores[i].vk_fence || destroy_all) + { + vk_semaphore = fence->semaphores[i].vk_semaphore; + if (fence->semaphores[i].vk_fence) + WARN("Destroying potentially pending semaphore.\n"); + VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL)); + --semaphore_count; + } + else + { + if (i != j) + fence->semaphores[j] = fence->semaphores[i]; + ++j; + } + } + for (; i < fence->semaphore_count; ++i) + { + fence->semaphores[j++] = fence->semaphores[i]; + } + + if (j != fence->semaphore_count) + TRACE("Destroyed %zu Vulkan semaphores.\n", fence->semaphore_count - j); + + fence->semaphore_count = j; +} + +static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) +{ + int rc; + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return; + } + + d3d12_fence_destroy_vk_semaphores_locked(fence, true); + + pthread_mutex_unlock(&fence->mutex); +} + +static HRESULT d3d12_fence_add_vk_semaphore(struct d3d12_fence *fence, + VkSemaphore vk_semaphore, VkFence vk_fence, uint64_t value) +{ + HRESULT hr = S_OK; + int rc; + + TRACE("fence %p, value %#"PRIx64".\n", fence, value); + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return E_FAIL; + } + + /* Destroy old Vulkan semaphores. */ + d3d12_fence_destroy_vk_semaphores_locked(fence, false); + + if (vkd3d_array_reserve((void **)&fence->semaphores, &fence->semaphores_size, + fence->semaphore_count + 1, sizeof(*fence->semaphores))) + { + fence->semaphores[fence->semaphore_count].value = value; + fence->semaphores[fence->semaphore_count].vk_semaphore = vk_semaphore; + fence->semaphores[fence->semaphore_count].vk_fence = vk_fence; + ++fence->semaphore_count; + } + else + { + ERR("Failed to add semaphore.\n"); + hr = E_OUTOFMEMORY; + } + + pthread_mutex_unlock(&fence->mutex); + + return hr; +} + static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) { struct d3d12_device *device = fence->device; @@ -414,6 +535,17 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF } fence->event_count = j; + if (vk_fence) + { + for (i = 0; i < fence->semaphore_count; ++i) + { + struct vkd3d_signaled_semaphore *current = &fence->semaphores[i]; + + if (current->vk_fence == vk_fence) + current->vk_fence = VK_NULL_HANDLE; + } + } + pthread_mutex_unlock(&fence->mutex); return S_OK; @@ -467,6 +599,10 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); + /* Destroy all Vulkan semaphores associated with this fence. */ + d3d12_fence_destroy_vk_semaphores(fence); + vkd3d_free(fence->semaphores); + vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); @@ -656,6 +792,9 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->events = NULL; fence->events_size = 0; fence->event_count = 0; + fence->semaphores = NULL; + fence->semaphores_size = 0; + fence->semaphore_count = 0; if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { @@ -4915,58 +5054,106 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; + VkSemaphore vk_semaphore = VK_NULL_HANDLE; + VkSemaphoreCreateInfo semaphore_info; + VkFence vk_fence = VK_NULL_HANDLE; VkFenceCreateInfo fence_info; struct d3d12_device *device; struct d3d12_fence *fence; - VkFence vk_fence; + VkSubmitInfo submit_info; VkQueue vk_queue; VkResult vr; + HRESULT hr; TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); device = command_queue->device; vk_procs = &device->vk_procs; + /* XXX: It may be a good idea to re-use Vulkan fences/semaphores. */ + fence = unsafe_impl_from_ID3D12Fence(fence_iface); fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_info.pNext = NULL; fence_info.flags = 0; - - /* XXX: It may be a good idea to re-use Vulkan fences. */ if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, &vk_fence))) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - return hresult_from_vk_result(vr); + vk_fence = VK_NULL_HANDLE; + goto fail_vkresult; } + semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; + semaphore_info.pNext = NULL; + semaphore_info.flags = 0; + if ((vr = VK_CALL(vkCreateSemaphore(device->vk_device, &semaphore_info, NULL, &vk_semaphore))) < 0) + { + WARN("Failed to create Vulkan semaphore, vr %d.\n", vr); + vk_semaphore = VK_NULL_HANDLE; + goto fail_vkresult; + } + + submit_info.sType = VK_STRUCTURE_TYPE_SUBMIT_INFO; + submit_info.pNext = NULL; + submit_info.waitSemaphoreCount = 0; + submit_info.pWaitSemaphores = NULL; + submit_info.pWaitDstStageMask = NULL; + submit_info.commandBufferCount = 0; + submit_info.pCommandBuffers = NULL; + submit_info.signalSemaphoreCount = 1; + submit_info.pSignalSemaphores = &vk_semaphore; + if (!(vk_queue = vkd3d_queue_acquire(command_queue->vkd3d_queue))) { ERR("Failed to acquire queue %p.\n", command_queue->vkd3d_queue); - return E_FAIL; + hr = E_FAIL; + goto fail; } - vr = VK_CALL(vkQueueSubmit(vk_queue, 0, NULL, vk_fence)); + vr = VK_CALL(vkQueueSubmit(vk_queue, 1, &submit_info, vk_fence)); vkd3d_queue_release(command_queue->vkd3d_queue); if (vr < 0) { - WARN("Failed to submit fence, vr %d.\n", vr); - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return hresult_from_vk_result(vr); + WARN("Failed to submit, vr %d.\n", vr); + goto fail_vkresult; } + if (SUCCEEDED(hr = d3d12_fence_add_vk_semaphore(fence, vk_semaphore, vk_fence, value))) + vk_semaphore = VK_NULL_HANDLE; + vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); - if (vr == VK_SUCCESS) + if (vr == VK_NOT_READY) { - return d3d12_fence_signal(fence, value, vk_fence); + if (SUCCEEDED(hr = vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value))) + vk_fence = VK_NULL_HANDLE; } - if (vr != VK_NOT_READY) + else if (vr == VK_SUCCESS) { - WARN("Failed to get fence status, vr %d.\n", vr); - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return hresult_from_vk_result(vr); + TRACE("Already signaled %p, value %#"PRIx64".\n", fence, value); + hr = d3d12_fence_signal(fence, value, vk_fence); + vk_fence = VK_NULL_HANDLE; + } + else + { + FIXME("Failed to get fence status, vr %d.\n", vr); + hr = hresult_from_vk_result(vr); } - return vkd3d_enqueue_gpu_fence(&device->fence_worker, vk_fence, fence, value); + if (vk_fence || vk_semaphore) + { + /* In case of an unexpected failure, try to safely destroy Vulkan objects. */ + vkd3d_queue_wait_idle(command_queue->vkd3d_queue, vk_procs); + goto fail; + } + + return hr; + +fail_vkresult: + hr = hresult_from_vk_result(vr); +fail: + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); + VK_CALL(vkDestroySemaphore(device->vk_device, vk_semaphore, NULL)); + return hr; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *iface, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 68a51c0d85d6..3ca80c0c3031 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -260,6 +260,15 @@ struct d3d12_fence size_t events_size; size_t event_count; + struct vkd3d_signaled_semaphore + { + uint64_t value; + VkSemaphore vk_semaphore; + VkFence vk_fence; + } *semaphores; + size_t semaphores_size; + size_t semaphore_count; + struct d3d12_device *device; struct vkd3d_private_store private_store; -- 2.21.0

2 1

[PATCH vkd3d 8/8] vkd3d: Reject D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME.
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/command.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 3cefd1fdb33f..ec78c6652109 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -1547,6 +1547,7 @@ typedef enum D3D12_COMMAND_QUEUE_PRIORITY { D3D12_COMMAND_QUEUE_PRIORITY_NORMAL = 0, D3D12_COMMAND_QUEUE_PRIORITY_HIGH = 100, + D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME = 10000, } D3D12_COMMAND_QUEUE_PRIORITY; typedef enum D3D12_COMMAND_QUEUE_FLAGS diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7b4daa4c0564..cdccfe8dca56 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5301,6 +5301,12 @@ static HRESULT d3d12_command_queue_init(struct d3d12_command_queue *queue, if (!(queue->vkd3d_queue = d3d12_device_get_vkd3d_queue(device, desc->Type))) return E_NOTIMPL; + if (desc->Priority == D3D12_COMMAND_QUEUE_PRIORITY_GLOBAL_REALTIME) + { + FIXME("Global realtime priority is not implemented.\n"); + return E_NOTIMPL; + } + if (desc->Priority) FIXME("Ignoring priority %#x.\n", desc->Priority); if (desc->Flags) -- 2.21.0

2 1

[PATCH vkd3d 7/8] tests: Add test for ID3D12CommandQueue_Wait().
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 252 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 251 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index d44fff02b998..d37223855a7c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -303,6 +303,27 @@ static const DXGI_FORMAT depth_stencil_formats[] = DXGI_FORMAT_D16_UNORM, }; +static void init_readback(struct resource_readback *rb, ID3D12Resource *buffer, + uint64_t buffer_size, uint64_t width, uint64_t height, unsigned int depth, uint64_t row_pitch) +{ + D3D12_RANGE read_range; + HRESULT hr; + + rb->width = width; + rb->height = height; + rb->depth = depth; + rb->resource = buffer; + rb->row_pitch = row_pitch; + rb->data = NULL; + + ID3D12Resource_AddRef(rb->resource); + + read_range.Begin = 0; + read_range.End = buffer_size; + hr = ID3D12Resource_Map(rb->resource, 0, &read_range, &rb->data); + ok(hr == S_OK, "Failed to map readback buffer, hr %#x.\n", hr); +} + static void get_buffer_readback_with_command_list(ID3D12Resource *buffer, DXGI_FORMAT format, struct resource_readback *rb, ID3D12CommandQueue *queue, ID3D12GraphicsCommandList *command_list) { @@ -6275,7 +6296,7 @@ static void test_bundle_state_inheritance(void) if (!vkd3d_test_platform_is_windows()) { - /* Avoid 2048 test todos. */ + /* FIXME: Avoid 2048 test todos. */ skip("Bundles are not implemented yet.\n"); return; } @@ -27581,6 +27602,234 @@ done: destroy_test_context(&context); } +static void test_queue_wait(void) +{ + D3D12_TEXTURE_COPY_LOCATION dst_location, src_location; + ID3D12GraphicsCommandList *command_list; + ID3D12Resource *readback_buffer, *cb; + ID3D12CommandQueue *queue, *queue2; + D3D12_RESOURCE_DESC resource_desc; + uint64_t row_pitch, buffer_size; + struct test_context_desc desc; + struct resource_readback rb; + ID3D12Fence *fence, *fence2; + struct test_context context; + ID3D12Device *device; + unsigned int ret; + uint64_t value; + float color[4]; + HANDLE event; + HRESULT hr; + + static const float blue[] = {0.0f, 0.0f, 1.0f, 1.0f}; + static const float green[] = {0.0f, 1.0f, 0.0f, 1.0f}; + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + static const DWORD ps_code[] = + { +#if 0 + float4 color; + + float4 main(float4 position : SV_POSITION) : SV_Target + { + return color; + } +#endif + 0x43425844, 0xd18ead43, 0x8b8264c1, 0x9c0a062d, 0xfc843226, 0x00000001, 0x000000e0, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x5449534f, 0x004e4f49, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000044, 0x00000050, + 0x00000011, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, + 0x00000000, 0x06000036, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps = {ps_code, sizeof(ps_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + queue2 = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); + + event = create_event(); + ok(event, "Failed to create event.\n"); + + hr = ID3D12Device_CreateFence(device, 1, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence2); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + context.root_signature = create_cb_root_signature(context.device, + 0, D3D12_SHADER_VISIBILITY_PIXEL, D3D12_ROOT_SIGNATURE_FLAG_NONE); + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, &ps, NULL); + + cb = create_upload_buffer(device, sizeof(color), NULL); + + resource_desc = ID3D12Resource_GetDesc(context.render_target); + + row_pitch = align(resource_desc.Width * format_size(resource_desc.Format), D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); + buffer_size = row_pitch * resource_desc.Height; + readback_buffer = create_readback_buffer(device, buffer_size); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_SetGraphicsRootConstantBufferView(command_list, 0, + ID3D12Resource_GetGPUVirtualAddress(cb)); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + dst_location.pResource = readback_buffer; + dst_location.Type = D3D12_TEXTURE_COPY_TYPE_PLACED_FOOTPRINT; + dst_location.PlacedFootprint.Offset = 0; + dst_location.PlacedFootprint.Footprint.Format = resource_desc.Format; + dst_location.PlacedFootprint.Footprint.Width = resource_desc.Width; + dst_location.PlacedFootprint.Footprint.Height = resource_desc.Height; + dst_location.PlacedFootprint.Footprint.Depth = 1; + dst_location.PlacedFootprint.Footprint.RowPitch = row_pitch; + src_location.pResource = context.render_target; + src_location.Type = D3D12_TEXTURE_COPY_TYPE_SUBRESOURCE_INDEX; + src_location.SubresourceIndex = 0; + ID3D12GraphicsCommandList_CopyTextureRegion(command_list, &dst_location, 0, 0, 0, &src_location, NULL); + + transition_resource_state(command_list, context.render_target, + 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); + + /* Wait() with signaled fence */ + update_buffer_data(cb, 0, sizeof(green), &green); + hr = ID3D12CommandQueue_Wait(queue, fence, 1); + ok(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + release_resource_readback(&rb); + + if (!vkd3d_test_platform_is_windows()) + { + skip("Wait() is not implemented yet.\n"); /* FIXME */ + goto skip_tests; + } + + /* Wait() before CPU signal */ + update_buffer_data(cb, 0, sizeof(blue), &blue); + hr = ID3D12CommandQueue_Wait(queue, fence, 2); + ok(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); + exec_command_list(queue, command_list); + hr = ID3D12CommandQueue_Signal(queue, fence2, 1); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = ID3D12Fence_SetEventOnCompletion(fence2, 1, event); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); + ret = wait_event(event, 0); + ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + release_resource_readback(&rb); + value = ID3D12Fence_GetCompletedValue(fence2); + ok(value == 0, "Got unexpected value %"PRIu64".\n", value); + + hr = ID3D12Fence_Signal(fence, 2); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ret = wait_event(event, INFINITE); + ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); + ret = wait_event(event, 0); + ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + release_resource_readback(&rb); + value = ID3D12Fence_GetCompletedValue(fence2); + ok(value == 1, "Got unexpected value %"PRIu64".\n", value); + + /* Wait() before GPU signal */ + update_buffer_data(cb, 0, sizeof(green), &green); + hr = ID3D12CommandQueue_Wait(queue, fence, 3); + ok(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); + exec_command_list(queue, command_list); + hr = ID3D12CommandQueue_Signal(queue, fence2, 2); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = ID3D12Fence_SetEventOnCompletion(fence2, 2, event); + ok(hr == S_OK, "Failed to set event on completion, hr %#x.\n", hr); + ret = wait_event(event, 0); + ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + release_resource_readback(&rb); + value = ID3D12Fence_GetCompletedValue(fence2); + ok(value == 1, "Got unexpected value %"PRIu64".\n", value); + + hr = ID3D12CommandQueue_Signal(queue2, fence, 3); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + ret = wait_event(event, INFINITE); + ok(ret == WAIT_OBJECT_0, "Got unexpected return value %#x.\n", ret); + ret = wait_event(event, 0); + ok(ret == WAIT_TIMEOUT, "Got unexpected return value %#x.\n", ret); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + release_resource_readback(&rb); + value = ID3D12Fence_GetCompletedValue(fence2); + ok(value == 2, "Got unexpected value %"PRIu64".\n", value); + + /* update constant buffer after Wait() */ + hr = ID3D12CommandQueue_Wait(queue, fence, 5); + ok(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); + exec_command_list(queue, command_list); + hr = ID3D12Fence_Signal(fence, 4); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + update_buffer_data(cb, 0, sizeof(blue), &blue); + hr = ID3D12Fence_Signal(fence, 5); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + release_resource_readback(&rb); + + hr = ID3D12Fence_Signal(fence, 6); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + update_buffer_data(cb, 0, sizeof(green), &green); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xff00ff00, 0); + release_resource_readback(&rb); + +skip_tests: + /* Signal() and Wait() in the same command queue */ + update_buffer_data(cb, 0, sizeof(blue), &blue); + hr = ID3D12CommandQueue_Signal(queue, fence, 7); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + hr = ID3D12CommandQueue_Wait(queue, fence, 7); + ok(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); + exec_command_list(queue, command_list); + wait_queue_idle(device, queue); + init_readback(&rb, readback_buffer, buffer_size, resource_desc.Width, resource_desc.Height, 1, row_pitch); + check_readback_data_uint(&rb, NULL, 0xffff0000, 0); + release_resource_readback(&rb); + + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == 7, "Got unexpected value %"PRIu64".\n", value); + + destroy_event(event); + ID3D12Fence_Release(fence); + ID3D12Fence_Release(fence2); + ID3D12Resource_Release(cb); + ID3D12CommandQueue_Release(queue2); + ID3D12Resource_Release(readback_buffer); + destroy_test_context(&context); +} + START_TEST(d3d12) { parse_args(argc, argv); @@ -27725,4 +27974,5 @@ START_TEST(d3d12) run_test(test_primitive_restart); run_test(test_vertex_shader_stream_output); run_test(test_read_write_subresource); + run_test(test_queue_wait); } -- 2.21.0

2 1

[PATCH vkd3d 6/8] vkd3d: Return S_OK from d3d12_command_queue_Wait().
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 6410dd2875ae..7b4daa4c0564 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5217,7 +5217,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if { FIXME("iface %p, fence %p, value %#"PRIx64" stub!\n", iface, fence, value); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_GetTimestampFrequency(ID3D12CommandQueue *iface, -- 2.21.0

2 1

[PATCH vkd3d 5/8] tests: Add simple test for fence values.
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tests/d3d12.c | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 148989b543b0..d44fff02b998 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -3922,6 +3922,87 @@ static void test_multithread_fence_wait(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } +static void test_fence_values(void) +{ + ID3D12CommandQueue *queue; + UINT64 value, next_value; + ID3D12Device *device; + ID3D12Fence *fence; + ULONG refcount; + unsigned int i; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device.\n"); + return; + } + + queue = create_command_queue(device, D3D12_COMMAND_LIST_TYPE_DIRECT, D3D12_COMMAND_QUEUE_PRIORITY_NORMAL); + + next_value = (uint64_t)1 << 60; + hr = ID3D12Device_CreateFence(device, next_value, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + + for (i = 0; i < 100; ++i) + { + ++next_value; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + for (i = 0; i < 100; ++i) + { + next_value += 10000; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + } + + ID3D12Fence_Release(fence); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + next_value = (uint64_t)1 << 60; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12Fence_Signal(fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(fence); + + hr = ID3D12Device_CreateFence(device, 0, D3D12_FENCE_FLAG_NONE, &IID_ID3D12Fence, (void **)&fence); + ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); + next_value = (uint64_t)1 << 60; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + next_value = 0; + hr = ID3D12CommandQueue_Signal(queue, fence, next_value); + ok(hr == S_OK, "Failed to signal fence, hr %#x.\n", hr); + wait_queue_idle(device, queue); + value = ID3D12Fence_GetCompletedValue(fence); + ok(value == next_value, "Got value %#"PRIx64", expected %#"PRIx64".\n", value, next_value); + ID3D12Fence_Release(fence); + + ID3D12CommandQueue_Release(queue); + refcount = ID3D12Device_Release(device); + ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); +} + static void test_clear_depth_stencil_view(void) { static const float expected_values[] = {0.5f, 0.1f, 0.1f, 0.6, 1.0f, 0.5f}; @@ -27532,6 +27613,7 @@ START_TEST(d3d12) run_test(test_cpu_signal_fence); run_test(test_gpu_signal_fence); run_test(test_multithread_fence_wait); + run_test(test_fence_values); run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view); -- 2.21.0

2 1

[PATCH vkd3d 3/8] vkd3d: Reuse Vulkan fences.
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 98 ++++++++++++++++++++++++++++++-------- libs/vkd3d/vkd3d_private.h | 3 ++ 2 files changed, 80 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 0d30f430367a..6410dd2875ae 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -400,7 +400,46 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } -#define VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE 4 +static VkResult d3d12_fence_create_vk_fence(struct d3d12_fence *fence, VkFence *vk_fence) +{ + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + VkFenceCreateInfo fence_info; + unsigned int i; + VkResult vr; + int rc; + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + goto create_fence; + } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if ((*vk_fence = fence->old_vk_fences[i])) + { + fence->old_vk_fences[i] = VK_NULL_HANDLE; + break; + } + } + + pthread_mutex_unlock(&fence->mutex); + + if (*vk_fence) + return VK_SUCCESS; + +create_fence: + vk_procs = &device->vk_procs; + + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; + fence_info.pNext = NULL; + fence_info.flags = 0; + if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, vk_fence))) < 0) + *vk_fence = VK_NULL_HANDLE; + + return vr; +} static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, bool destroy_all) { @@ -411,12 +450,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, unsigned int i, j; semaphore_count = fence->semaphore_count; - if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && fence->semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) return; for (i = 0, j = 0; i < fence->semaphore_count; ++i) { - if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SEMAPHORE_COUNT_PER_D3D12_FENCE) + if (!destroy_all && semaphore_count < VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE) break; /* The semaphore doesn't have a pending signal operation if the fence @@ -447,8 +486,12 @@ static void d3d12_fence_destroy_vk_semaphores_locked(struct d3d12_fence *fence, fence->semaphore_count = j; } -static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) +static void d3d12_fence_destroy_vk_objects(struct d3d12_fence *fence) { + const struct vkd3d_vk_device_procs *vk_procs; + struct d3d12_device *device = fence->device; + unsigned int i; + int rc; if ((rc = pthread_mutex_lock(&fence->mutex))) @@ -457,6 +500,15 @@ static void d3d12_fence_destroy_vk_semaphores(struct d3d12_fence *fence) return; } + vk_procs = &device->vk_procs; + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i]) + VK_CALL(vkDestroyFence(device->vk_device, fence->old_vk_fences[i], NULL)); + fence->old_vk_fences[i] = VK_NULL_HANDLE; + } + d3d12_fence_destroy_vk_semaphores_locked(fence, true); pthread_mutex_unlock(&fence->mutex); @@ -504,12 +556,6 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF unsigned int i, j; int rc; - if (vk_fence) - { - const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - } - if ((rc = pthread_mutex_lock(&fence->mutex))) { ERR("Failed to lock mutex, error %d.\n", rc); @@ -537,6 +583,8 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (vk_fence) { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + for (i = 0; i < fence->semaphore_count; ++i) { struct vkd3d_signaled_semaphore *current = &fence->semaphores[i]; @@ -544,6 +592,19 @@ static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkF if (current->vk_fence == vk_fence) current->vk_fence = VK_NULL_HANDLE; } + + for (i = 0; i < ARRAY_SIZE(fence->old_vk_fences); ++i) + { + if (fence->old_vk_fences[i] == VK_NULL_HANDLE) + { + fence->old_vk_fences[i] = vk_fence; + VK_CALL(vkResetFences(device->vk_device, 1, &vk_fence)); + vk_fence = VK_NULL_HANDLE; + break; + } + } + if (vk_fence) + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); } pthread_mutex_unlock(&fence->mutex); @@ -599,10 +660,9 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); - /* Destroy all Vulkan semaphores associated with this fence. */ - d3d12_fence_destroy_vk_semaphores(fence); - vkd3d_free(fence->semaphores); + d3d12_fence_destroy_vk_objects(fence); + vkd3d_free(fence->semaphores); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) ERR("Failed to destroy mutex, error %d.\n", rc); @@ -796,6 +856,8 @@ static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device * fence->semaphores_size = 0; fence->semaphore_count = 0; + memset(fence->old_vk_fences, 0, sizeof(fence->old_vk_fences)); + if (FAILED(hr = vkd3d_private_store_init(&fence->private_store))) { pthread_mutex_destroy(&fence->mutex); @@ -5057,7 +5119,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * VkSemaphore vk_semaphore = VK_NULL_HANDLE; VkSemaphoreCreateInfo semaphore_info; VkFence vk_fence = VK_NULL_HANDLE; - VkFenceCreateInfo fence_info; struct d3d12_device *device; struct d3d12_fence *fence; VkSubmitInfo submit_info; @@ -5070,20 +5131,15 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * device = command_queue->device; vk_procs = &device->vk_procs; - /* XXX: It may be a good idea to re-use Vulkan fences/semaphores. */ - fence = unsafe_impl_from_ID3D12Fence(fence_iface); - fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; - fence_info.pNext = NULL; - fence_info.flags = 0; - if ((vr = VK_CALL(vkCreateFence(device->vk_device, &fence_info, NULL, &vk_fence))) < 0) + if ((vr = d3d12_fence_create_vk_fence(fence, &vk_fence)) < 0) { WARN("Failed to create Vulkan fence, vr %d.\n", vr); - vk_fence = VK_NULL_HANDLE; goto fail_vkresult; } + /* XXX: It may be a good idea to re-use Vulkan semaphores. */ semaphore_info.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; semaphore_info.pNext = NULL; semaphore_info.flags = 0; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 3ca80c0c3031..be0ef2eb5bf2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -49,6 +49,7 @@ #define VKD3D_DESCRIPTOR_MAGIC_RTV 0x00565452u #define VKD3D_MAX_SHADER_STAGES 5u +#define VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE 4 struct d3d12_command_list; struct d3d12_device; @@ -269,6 +270,8 @@ struct d3d12_fence size_t semaphores_size; size_t semaphore_count; + VkFence old_vk_fences[VKD3D_MAX_VK_SYNC_OBJECTS_PER_D3D12_FENCE]; + struct d3d12_device *device; struct vkd3d_private_store private_store; -- 2.21.0

2 1

[PATCH vkd3d 1/8] vkd3d: Differentiate GPU and CPU fence signal operations.
by Józef Kucia 18 Apr '19

18 Apr '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 109 +++++++++++++++++++++++-------------- libs/vkd3d/vkd3d_private.h | 6 +- 2 files changed, 71 insertions(+), 44 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b9deffe33328..6c9b145fc522 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -19,6 +19,8 @@ #include "vkd3d_private.h" +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence); + HRESULT vkd3d_queue_create(struct d3d12_device *device, uint32_t family_index, const VkQueueFamilyProperties *properties, struct vkd3d_queue **queue) { @@ -80,7 +82,7 @@ void vkd3d_queue_release(struct vkd3d_queue *queue) /* Fence worker thread */ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, - VkFence vk_fence, ID3D12Fence *fence, UINT64 value) + VkFence vk_fence, struct d3d12_fence *fence, uint64_t value) { int rc; @@ -118,7 +120,7 @@ static HRESULT vkd3d_enqueue_gpu_fence(struct vkd3d_fence_worker *worker, return S_OK; } -static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, ID3D12Fence *fence) +static void vkd3d_fence_worker_remove_fence(struct vkd3d_fence_worker *worker, struct d3d12_fence *fence) { struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -156,6 +158,7 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) struct d3d12_device *device = worker->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; unsigned int i, j; + VkFence vk_fence; HRESULT hr; int vr; @@ -174,12 +177,13 @@ static void vkd3d_wait_for_gpu_fences(struct vkd3d_fence_worker *worker) for (i = 0, j = 0; i < worker->fence_count; ++i) { - if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, worker->vk_fences[i])))) + vk_fence = worker->vk_fences[i]; + if (!(vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)))) { struct vkd3d_waiting_fence *current = &worker->fences[i]; - if (FAILED(hr = ID3D12Fence_Signal(current->fence, current->value))) - ERR("Failed to signal D3D12 fence, hr %d.\n", hr); - VK_CALL(vkDestroyFence(device->vk_device, worker->vk_fences[i], NULL)); + TRACE("Signaling fence %p value %#"PRIx64".\n", current->fence, current->value); + if (FAILED(hr = d3d12_fence_signal(current->fence, current->value, vk_fence))) + ERR("Failed to signal D3D12 fence, hr %#x.\n", hr); continue; } @@ -373,6 +377,48 @@ static struct d3d12_fence *impl_from_ID3D12Fence(ID3D12Fence *iface) return CONTAINING_RECORD(iface, struct d3d12_fence, ID3D12Fence_iface); } +static HRESULT d3d12_fence_signal(struct d3d12_fence *fence, uint64_t value, VkFence vk_fence) +{ + struct d3d12_device *device = fence->device; + unsigned int i, j; + int rc; + + if (vk_fence) + { + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); + } + + if ((rc = pthread_mutex_lock(&fence->mutex))) + { + ERR("Failed to lock mutex, error %d.\n", rc); + return hresult_from_errno(rc); + } + + fence->value = value; + + for (i = 0, j = 0; i < fence->event_count; ++i) + { + struct vkd3d_waiting_event *current = &fence->events[i]; + + if (current->value <= value) + { + fence->device->signal_event(current->event); + } + else + { + if (i != j) + fence->events[j] = *current; + ++j; + } + } + fence->event_count = j; + + pthread_mutex_unlock(&fence->mutex); + + return S_OK; +} + static HRESULT STDMETHODCALLTYPE d3d12_fence_QueryInterface(ID3D12Fence *iface, REFIID riid, void **object) { @@ -419,7 +465,7 @@ static ULONG STDMETHODCALLTYPE d3d12_fence_Release(ID3D12Fence *iface) vkd3d_private_store_destroy(&fence->private_store); - vkd3d_fence_worker_remove_fence(&device->fence_worker, iface); + vkd3d_fence_worker_remove_fence(&device->fence_worker, fence); vkd3d_free(fence->events); if ((rc = pthread_mutex_destroy(&fence->mutex))) @@ -554,39 +600,10 @@ static HRESULT STDMETHODCALLTYPE d3d12_fence_SetEventOnCompletion(ID3D12Fence *i static HRESULT STDMETHODCALLTYPE d3d12_fence_Signal(ID3D12Fence *iface, UINT64 value) { struct d3d12_fence *fence = impl_from_ID3D12Fence(iface); - unsigned int i, j; - int rc; TRACE("iface %p, value %#"PRIx64".\n", iface, value); - if ((rc = pthread_mutex_lock(&fence->mutex))) - { - ERR("Failed to lock mutex, error %d.\n", rc); - return hresult_from_errno(rc); - } - - fence->value = value; - - for (i = 0, j = 0; i < fence->event_count; ++i) - { - struct vkd3d_waiting_event *current = &fence->events[i]; - - if (current->value <= value) - { - fence->device->signal_event(current->event); - } - else - { - if (i != j) - fence->events[j] = *current; - ++j; - } - } - fence->event_count = j; - - pthread_mutex_unlock(&fence->mutex); - - return S_OK; + return d3d12_fence_signal(fence, value, VK_NULL_HANDLE); } static const struct ID3D12FenceVtbl d3d12_fence_vtbl = @@ -608,6 +625,14 @@ static const struct ID3D12FenceVtbl d3d12_fence_vtbl = d3d12_fence_Signal, }; +static struct d3d12_fence *unsafe_impl_from_ID3D12Fence(ID3D12Fence *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &d3d12_fence_vtbl); + return impl_from_ID3D12Fence(iface); +} + static HRESULT d3d12_fence_init(struct d3d12_fence *fence, struct d3d12_device *device, UINT64 initial_value, D3D12_FENCE_FLAGS flags) { @@ -4886,21 +4911,24 @@ static void STDMETHODCALLTYPE d3d12_command_queue_EndEvent(ID3D12CommandQueue *i } static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue *iface, - ID3D12Fence *fence, UINT64 value) + ID3D12Fence *fence_iface, UINT64 value) { struct d3d12_command_queue *command_queue = impl_from_ID3D12CommandQueue(iface); const struct vkd3d_vk_device_procs *vk_procs; VkFenceCreateInfo fence_info; struct d3d12_device *device; + struct d3d12_fence *fence; VkFence vk_fence; VkQueue vk_queue; VkResult vr; - TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence, value); + TRACE("iface %p, fence %p, value %#"PRIx64".\n", iface, fence_iface, value); device = command_queue->device; vk_procs = &device->vk_procs; + fence = unsafe_impl_from_ID3D12Fence(fence_iface); + fence_info.sType = VK_STRUCTURE_TYPE_FENCE_CREATE_INFO; fence_info.pNext = NULL; fence_info.flags = 0; @@ -4929,8 +4957,7 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Signal(ID3D12CommandQueue * vr = VK_CALL(vkGetFenceStatus(device->vk_device, vk_fence)); if (vr == VK_SUCCESS) { - VK_CALL(vkDestroyFence(device->vk_device, vk_fence, NULL)); - return d3d12_fence_Signal(fence, value); + return d3d12_fence_signal(fence, value, vk_fence); } if (vr != VK_NOT_READY) { diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76fec700f82e..68a51c0d85d6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -147,7 +147,7 @@ struct vkd3d_fence_worker size_t vk_fences_size; struct vkd3d_waiting_fence { - ID3D12Fence *fence; + struct d3d12_fence *fence; UINT64 value; } *fences; size_t fences_size; @@ -249,12 +249,12 @@ struct d3d12_fence ID3D12Fence ID3D12Fence_iface; LONG refcount; - UINT64 value; + uint64_t value; pthread_mutex_t mutex; struct vkd3d_waiting_event { - UINT64 value; + uint64_t value; HANDLE event; } *events; size_t events_size; -- 2.21.0

2 1

Sending patches containing binary test files
by Conor McCarthy 18 Apr '19

18 Apr '19

I'm just about ready to send a partial implementation of mspatcha.dll. The tests require 10 binary files of 14 Kb total. Should these be included in a normal patch email or is there another preferred way? I left out interleaved decoding for now, but it turns out even some relatively small executables are interleaved based upon symbol information etc. For example Adobe Reader installation still fails. Interleaving support may not be difficult to add, but there could be other complications. I verified the decoder in Windows with a fuzz tester built in VS. It's far more thorough than the small Wine test suite. If it's useful to anyone I could tidy it up and upload it to github. Regards, Conor

1 0

[PATCH 6/6] mshtml: Use DispHTMLDOMImplementation for IDispatchEx implementation.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/omnavigator.c | 2 +- dlls/mshtml/tests/dom.c | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-)

1 0

[PATCH 5/6] mshtml: Add ISVGTSpanElement stub implementation.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 245 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 21 ++- 3 files changed, 267 insertions(+), 4 deletions(-)

1 0

[PATCH 4/6] mshtml: Add ISVGCircleElement stub implementation.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 2 + dlls/mshtml/svg.c | 172 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 175 insertions(+)

1 0

[PATCH 3/6] mshtml: Add ISVGSVGElement stub implementation.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/mshtml_private.h | 4 +- dlls/mshtml/svg.c | 558 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 1 + 3 files changed, 562 insertions(+), 1 deletion(-)

1 0

[PATCH 2/6] mshtml: Add ISVGElement stub implementation.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/Makefile.in | 1 + dlls/mshtml/htmlelem.c | 24 ++-- dlls/mshtml/mshtml_private.h | 5 +- dlls/mshtml/svg.c | 225 +++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 16 ++- include/mshtml.idl | 16 +++ 6 files changed, 276 insertions(+), 11 deletions(-) create mode 100644 dlls/mshtml/svg.c

1 0

[PATCH 1/6] mshtml/tests: Properly release elem2 in test_elem_bounding_client_rect.
by Jacek Caban 18 Apr '19

18 Apr '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] wintrust: use enhanced crypto provider in VerifyImageHash
by Vijay Kiran Kamuju 18 Apr '19

18 Apr '19

From: Marko Friedemann <marko(a)friedemann.email> Softpub VerifyImageHash uses the default crypto provider and fails for certificates using SHA256 et al. with NTE_BAD_ALGID (80090008). Fixes startup cert error with SWTOR launcher as-of 2017-08-01. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47034 From: Marko Friedemann <marko(a)friedemann.email> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/wintrust/softpub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c index 1273a58f9dc..475f55a7507 100644 --- a/dlls/wintrust/softpub.c +++ b/dlls/wintrust/softpub.c @@ -328,7 +328,7 @@ static DWORD SOFTPUB_VerifyImageHash(CRYPT_PROVIDER_DATA *data, HANDLE file) if (!prov) { - if (!CryptAcquireContextW(&prov, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT)) + if (!CryptAcquireContextW(&prov, NULL, MS_ENH_RSA_AES_PROV_W, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) return GetLastError(); release_prov = TRUE; } -- 2.17.0

1 0

[PATCH] wine.inf: Create CurrentControlSet\Control\Video in registry.
by Vijay Kiran Kamuju 18 Apr '19

18 Apr '19

Based on a suggestion from Zhiyi Zhang and a patch from Michael Müller Registry key System\CurrentControlSet\Control\Video should be non-volatile From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4d28a93c359..14814daf93f 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -694,6 +694,7 @@ HKLM,System\CurrentControlSet\Control\SecurityProviders\Schannel\Protocols\SSL 2 HKLM,System\CurrentControlSet\Control\ServiceGroupOrder,"List",0x00010000,"TDI" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" +HKLM,System\CurrentControlSet\Control\Video,,16 HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKLM,System\Select,"Current",0x10003,1 -- 2.17.0

1 0

[PATCH 1/2] mfreadwrite: Output warning for uninitialized stream descriptor.
by Nikolay Sivov 18 Apr '19

18 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index fd9062f648..7625669ddb 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -727,7 +727,13 @@ static DWORD reader_get_first_stream_index(IMFPresentationDescriptor *descriptor { hr = IMFMediaTypeHandler_GetMajorType(handler, &guid); IMFMediaTypeHandler_Release(handler); - if (SUCCEEDED(hr) && IsEqualGUID(&guid, major)) + if (FAILED(hr)) + { + WARN("Failed to get stream major type, hr %#x.\n", hr); + continue; + } + + if (IsEqualGUID(&guid, major)) { return i; } -- 2.20.1

1 1

[PATCH] msi: Fix architecture handling in the AppSearch action.
by Hans Leidekker 18 Apr '19

18 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/appsearch.c | 7 +++++-- dlls/msi/tests/package.c | 37 ++++++++++++++++++++++++++++++++++++- 2 files changed, 41 insertions(+), 3 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 047085d1f3..6b1768e8af 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -372,6 +372,7 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig const WCHAR *keyPath, *valueName; WCHAR *deformatted = NULL, *ptr = NULL, *end; int root, type; + REGSAM access = KEY_READ; HKEY rootKey, key = NULL; DWORD sz = 0, regType; LPBYTE value = NULL; @@ -406,6 +407,8 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig break; case msidbRegistryRootLocalMachine: rootKey = HKEY_LOCAL_MACHINE; + if (type & msidbLocatorType64bit) access |= KEY_WOW64_64KEY; + else access |= KEY_WOW64_32KEY; break; case msidbRegistryRootUsers: rootKey = HKEY_USERS; @@ -415,10 +418,10 @@ static UINT search_reg( MSIPACKAGE *package, WCHAR **appValue, MSISIGNATURE *sig goto end; } - rc = RegOpenKeyW(rootKey, deformatted, &key); + rc = RegOpenKeyExW( rootKey, deformatted, 0, access, &key ); if (rc) { - TRACE("RegOpenKeyW returned %d\n", rc); + TRACE("RegOpenKeyExW returned %d\n", rc); goto end; } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index d5f156825d..593e254405 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -4036,6 +4036,8 @@ static void test_appsearch(void) add_appsearch_entry( hdb, "'WEBBROWSERPROG', 'NewSignature1'" ); add_appsearch_entry( hdb, "'NOTEPAD', 'NewSignature2'" ); add_appsearch_entry( hdb, "'REGEXPANDVAL', 'NewSignature3'" ); + add_appsearch_entry( hdb, "'32KEYVAL', 'NewSignature4'" ); + add_appsearch_entry( hdb, "'64KEYVAL', 'NewSignature5'" ); create_reglocator_table( hdb ); add_reglocator_entry( hdb, "NewSignature1", 0, "htmlfile\\shell\\open\\command", "", 1 ); @@ -4045,7 +4047,26 @@ static void test_appsearch(void) r = RegSetValueExA(hkey, NULL, 0, REG_EXPAND_SZ, (const BYTE*)reg_expand_value, strlen(reg_expand_value) + 1); ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); RegCloseKey(hkey); - add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", 1 ); + add_reglocator_entry( hdb, "NewSignature3", 1, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature4", 2, "Software\\Winetest_msi", "", msidbLocatorTypeFileName ); + + r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_64KEY, + NULL, &hkey, NULL); + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); + r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", + sizeof("c:\\windows\\system32\\notepad.exe")); + ok( r == ERROR_SUCCESS, "Could not set key value: %d.\n", r); + RegCloseKey(hkey); + add_reglocator_entry( hdb, "NewSignature5", 2, "Software\\Winetest_msi", "", + msidbLocatorTypeFileName|msidbLocatorType64bit ); create_drlocator_table( hdb ); add_drlocator_entry( hdb, "'NewSignature2', 0, 'c:\\windows\\system32', 0" ); @@ -4054,6 +4075,8 @@ static void test_appsearch(void) add_signature_entry( hdb, "'NewSignature1', 'FileName', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature2', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); add_signature_entry( hdb, "'NewSignature3', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature4', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); + add_signature_entry( hdb, "'NewSignature5', 'NOTEPAD.EXE|notepad.exe', '', '', '', '', '', '', ''" ); r = package_from_db( hdb, &hpkg ); if (r == ERROR_INSTALL_PACKAGE_REJECTED) @@ -4086,10 +4109,22 @@ static void test_appsearch(void) ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "32KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + + size = sizeof(prop); + r = MsiGetPropertyA( hpkg, "64KEYVAL", prop, &size ); + ok( r == ERROR_SUCCESS, "get property failed: %d\n", r); + ok( lstrlenA(prop) != 0, "Expected non-zero length\n"); + done: MsiCloseHandle( hpkg ); DeleteFileA(msifile); RegDeleteKeyA(HKEY_CURRENT_USER, "Software\\Winetest_msi"); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_32KEY); + delete_key(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", KEY_WOW64_64KEY); } static void test_appsearch_complocator(void) -- 2.20.1

2 1

[PATCH 1/3] msi: Use KEY_WOW64_* flags in ACTION_Register/UnregisterClassInfo.
by Hans Leidekker 18 Apr '19

18 Apr '19

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/msi/classes.c | 25 ++++++++++++------------- dlls/msi/msipriv.h | 1 - 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 293aa1063b..7b0a4a4d0e 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -747,7 +747,7 @@ static UINT register_appid(const MSIAPPID *appid, LPCWSTR app ) UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) { static const WCHAR szFileType_fmt[] = {'F','i','l','e','T','y','p','e','\\','%','s','\\','%','i',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; HKEY hkey, hkey2, hkey3; MSICLASS *cls; @@ -760,12 +760,12 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegCreateKeyW(HKEY_CLASSES_ROOT, keypath, &hkey) != ERROR_SUCCESS) + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) @@ -873,7 +873,6 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) if (cls->DefInprocHandler32) msi_reg_set_subkey_val( hkey2, szInprocHandler32, NULL, cls->DefInprocHandler32 ); - RegCloseKey(hkey2); /* if there is a FileTypeMask, register the FileType */ @@ -902,7 +901,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) index ++; } } - + uirow = MSI_CreateRecord(1); MSI_RecordSetStringW( uirow, 1, cls->clsid ); MSI_ProcessMessage(package, INSTALLMESSAGE_ACTIONDATA, uirow); @@ -915,7 +914,7 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) { static const WCHAR szFileType[] = {'F','i','l','e','T','y','p','e','\\',0}; - const WCHAR *keypath; + REGSAM access = KEY_ALL_ACCESS; MSIRECORD *uirow; MSICLASS *cls; HKEY hkey, hkey2; @@ -928,13 +927,13 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) if (r != ERROR_SUCCESS) return r; - if (is_64bit && package->platform == PLATFORM_INTEL) - keypath = szWow6432NodeCLSID; + if (package->platform == PLATFORM_INTEL) + access |= KEY_WOW64_32KEY; else - keypath = szCLSID; + access |= KEY_WOW64_64KEY; - if (RegOpenKeyW( HKEY_CLASSES_ROOT, keypath, &hkey ) != ERROR_SUCCESS) - return ERROR_SUCCESS; + if (RegCreateKeyExW( HKEY_CLASSES_ROOT, szCLSID, 0, NULL, 0, access, NULL, &hkey, NULL )) + return ERROR_FUNCTION_FAILED; LIST_FOR_EACH_ENTRY( cls, &package->classes, MSICLASS, entry ) { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index dbab8e2292..8354882e80 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1207,7 +1207,6 @@ static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; static const WCHAR szARM64[] = {'A','r','m','6','4',0}; -static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; -- 2.20.1

3 6

[v3 PATCH] ntdll: Add NtSuspendProcess()/NtResumeProcess() implementation.
by Nikolay Sivov 18 Apr '19

18 Apr '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- Version 3 adds more tests, specifically to show that reaching thread suspend limit is not an error condition for NtSuspendProcess(). What's left is using same thread list loops as Michael's patch, while counter check loop is removed. dlls/ntdll/process.c | 24 +++++- dlls/ntdll/tests/exception.c | 151 ++++++++++++++++++++++++++++++++- include/wine/server_protocol.h | 32 ++++++- server/process.c | 38 +++++++++ server/protocol.def | 12 +++ server/request.h | 8 ++ server/thread.c | 4 +- server/thread.h | 2 + server/trace.c | 16 ++++ 9 files changed, 278 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 6c6c427372..573a7a771d 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -763,8 +763,16 @@ NTSTATUS WINAPI NtOpenProcess(PHANDLE handle, ACCESS_MASK access, */ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( resume_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } /****************************************************************************** @@ -773,8 +781,16 @@ NTSTATUS WINAPI NtResumeProcess( HANDLE handle ) */ NTSTATUS WINAPI NtSuspendProcess( HANDLE handle ) { - FIXME("stub: %p\n", handle); - return STATUS_NOT_IMPLEMENTED; + NTSTATUS ret; + + SERVER_START_REQ( suspend_process ) + { + req->handle = wine_server_obj_handle( handle ); + ret = wine_server_call( req ); + } + SERVER_END_REQ; + + return ret; } diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index b7bf2748b5..3b3f72f07d 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -53,6 +53,8 @@ static NTSTATUS (WINAPI *pNtQueryInformationProcess)(HANDLE, PROCESSINFOCLASS, static NTSTATUS (WINAPI *pNtSetInformationProcess)(HANDLE, PROCESSINFOCLASS, PVOID, ULONG); static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL); static NTSTATUS (WINAPI *pNtClose)(HANDLE); +static NTSTATUS (WINAPI *pNtSuspendProcess)(HANDLE process); +static NTSTATUS (WINAPI *pNtResumeProcess)(HANDLE process); #if defined(__x86_64__) typedef struct @@ -158,6 +160,9 @@ static VOID (CDECL *pRtlUnwindEx)(VOID*, VOID*, EXCEPTION_RECORD*, VOID*, C static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #endif +static int my_argc; +static char** my_argv; + #ifdef __i386__ #ifndef __WINE_WINTRNL_H @@ -167,8 +172,6 @@ static int (CDECL *p_setjmp)(_JUMP_BUFFER*); #define MEM_EXECUTE_OPTION_PERMANENT 0x08 #endif -static int my_argc; -static char** my_argv; static int test_stage; static BOOL is_wow64; @@ -3190,6 +3193,138 @@ static void test_suspend_thread(void) CloseHandle(thread); } +static const char *suspend_process_event_name = "suspend_process_event"; +static const char *suspend_process_event2_name = "suspend_process_event2"; + +static DWORD WINAPI dummy_thread_proc( void *arg ) +{ + return 0; +} + +static void suspend_process_proc(void) +{ + HANDLE event = OpenEventA(SYNCHRONIZE, FALSE, suspend_process_event_name); + HANDLE event2 = OpenEventA(SYNCHRONIZE | EVENT_MODIFY_STATE, FALSE, suspend_process_event2_name); + unsigned int count; + NTSTATUS status; + HANDLE thread; + + ok(event != NULL, "Failed to open event handle.\n"); + ok(event2 != NULL, "Failed to open event handle.\n"); + + thread = CreateThread(NULL, 0, dummy_thread_proc, 0, CREATE_SUSPENDED, NULL); + ok(thread != NULL, "Failed to create auxiliary thread.\n"); + + /* Suspend up to limit. */ + while (!(status = NtSuspendThread(thread, NULL))) + ; + ok(status == STATUS_SUSPEND_COUNT_EXCEEDED, "Unexpected status %#x.\n", status); + + for (;;) + { + SetEvent(event2); + if (WaitForSingleObject(event, 100) == WAIT_OBJECT_0) + break; + } + + status = NtSuspendThread(thread, &count); + ok(!status, "Failed to suspend a thread, status %#x.\n", status); + ok(count == 125, "Unexpected suspend count %u.\n", count); + + status = NtResumeThread(thread, NULL); + ok(!status, "Failed to resume a thread, status %#x.\n", status); + + CloseHandle(event); + CloseHandle(event2); +} + +static void test_suspend_process(void) +{ + PROCESS_INFORMATION info; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + HANDLE event, event2; + NTSTATUS status; + char **argv; + DWORD ret; + + event = CreateEventA(NULL, FALSE, FALSE, suspend_process_event_name); + ok(event != NULL, "Failed to create event.\n"); + + event2 = CreateEventA(NULL, FALSE, FALSE, suspend_process_event2_name); + ok(event2 != NULL, "Failed to create event.\n"); + + winetest_get_mainargs(&argv); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s exception suspend_process", argv[0]); + + ret = CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + ok(ret, "Failed to create target process.\n"); + + /* New process signals this event. */ + ResetEvent(event2); + ret = WaitForSingleObject(event2, INFINITE); + ok(ret == WAIT_OBJECT_0, "Wait failed, %#x.\n", ret); + + /* Suspend main thread */ + status = NtSuspendThread(info.hThread, &ret); + ok(!status && !ret, "Failed to suspend main thread, status %#x.\n", status); + + /* Process wasn't suspended yet. */ + status = pNtResumeProcess(info.hProcess); + ok(!status, "Failed to resume a process, status %#x.\n", status); + + status = pNtSuspendProcess(0); + ok(status == STATUS_INVALID_HANDLE, "Unexpected status %#x.\n", status); + + status = pNtResumeProcess(info.hProcess); + ok(!status, "Failed to resume a process, status %#x.\n", status); + + ResetEvent(event2); + ret = WaitForSingleObject(event2, 200); + ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); + + status = pNtSuspendProcess(info.hProcess); + ok(!status, "Failed to suspend a process, status %#x.\n", status); + + status = NtSuspendThread(info.hThread, &ret); + ok(!status && ret == 1, "Failed to suspend main thread, status %#x.\n", status); + status = NtResumeThread(info.hThread, &ret); + ok(!status && ret == 2, "Failed to resume main thread, status %#x.\n", status); + + ResetEvent(event2); + ret = WaitForSingleObject(event2, 200); + ok(ret == WAIT_TIMEOUT, "Wait failed.\n"); + + status = pNtSuspendProcess(info.hProcess); + ok(!status, "Failed to suspend a process, status %#x.\n", status); + + status = pNtResumeProcess(info.hProcess); + ok(!status, "Failed to resume a process, status %#x.\n", status); + + ResetEvent(event2); + ret = WaitForSingleObject(event2, 200); + ok(ret == WAIT_TIMEOUT, "Wait failed.\n"); + + status = pNtResumeProcess(info.hProcess); + ok(!status, "Failed to resume a process, status %#x.\n", status); + + ResetEvent(event2); + ret = WaitForSingleObject(event2, 200); + ok(ret == WAIT_OBJECT_0, "Wait failed.\n"); + + SetEvent(event); + + winetest_wait_child_process(info.hProcess); + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + + CloseHandle(event); + CloseHandle(event2); +} + START_TEST(exception) { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); @@ -3197,6 +3332,14 @@ START_TEST(exception) HMODULE hmsvcrt = LoadLibraryA("msvcrt.dll"); #endif + my_argc = winetest_get_mainargs( &my_argv ); + + if (my_argc >= 3 && !strcmp(my_argv[2], "suspend_process")) + { + suspend_process_proc(); + return; + } + code_mem = VirtualAlloc(NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); if(!code_mem) { trace("VirtualAlloc failed\n"); @@ -3224,6 +3367,8 @@ START_TEST(exception) pNtSetInformationProcess = (void*)GetProcAddress( hntdll, "NtSetInformationProcess" ); pIsWow64Process = (void *)GetProcAddress(GetModuleHandleA("kernel32.dll"), "IsWow64Process"); + pNtSuspendProcess = (void *)GetProcAddress( hntdll, "NtSuspendProcess" ); + pNtResumeProcess = (void *)GetProcAddress( hntdll, "NtResumeProcess" ); #ifdef __i386__ if (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 )) is_wow64 = FALSE; @@ -3309,6 +3454,7 @@ START_TEST(exception) test_prot_fault(); test_thread_context(); test_suspend_thread(); + test_suspend_process(); #elif defined(__x86_64__) pRtlAddFunctionTable = (void *)GetProcAddress( hntdll, @@ -3351,6 +3497,7 @@ START_TEST(exception) test_dpe_exceptions(); test_wow64_context(); test_suspend_thread(); + test_suspend_process(); if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 88b933cc14..c3d1bb6a59 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -5742,6 +5742,30 @@ struct terminate_job_reply }; + +struct suspend_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct suspend_process_reply +{ + struct reply_header __header; +}; + + + +struct resume_process_request +{ + struct request_header __header; + obj_handle_t handle; +}; +struct resume_process_reply +{ + struct reply_header __header; +}; + + enum request { REQ_new_process, @@ -6040,6 +6064,8 @@ enum request REQ_set_job_limits, REQ_set_job_completion_port, REQ_terminate_job, + REQ_suspend_process, + REQ_resume_process, REQ_NB_REQUESTS }; @@ -6343,6 +6369,8 @@ union generic_request struct set_job_limits_request set_job_limits_request; struct set_job_completion_port_request set_job_completion_port_request; struct terminate_job_request terminate_job_request; + struct suspend_process_request suspend_process_request; + struct resume_process_request resume_process_request; }; union generic_reply { @@ -6644,8 +6672,10 @@ union generic_reply struct set_job_limits_reply set_job_limits_reply; struct set_job_completion_port_reply set_job_completion_port_reply; struct terminate_job_reply terminate_job_reply; + struct suspend_process_reply suspend_process_reply; + struct resume_process_reply resume_process_reply; }; -#define SERVER_PROTOCOL_VERSION 578 +#define SERVER_PROTOCOL_VERSION 579 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/process.c b/server/process.c index 473d3b1a27..1260baf0a9 100644 --- a/server/process.c +++ b/server/process.c @@ -1705,3 +1705,41 @@ DECL_HANDLER(set_job_completion_port) release_object( job ); } + +/* Suspend a process */ +DECL_HANDLER(suspend_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + struct list *ptr, *next; + + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + suspend_thread( thread ); + } + + release_object( process ); + } +} + +/* Resume a process */ +DECL_HANDLER(resume_process) +{ + struct process *process; + + if ((process = get_process_from_handle( req->handle, PROCESS_SUSPEND_RESUME ))) + { + struct list *ptr, *next; + + LIST_FOR_EACH_SAFE( ptr, next, &process->thread_list ) + { + struct thread *thread = LIST_ENTRY( ptr, struct thread, proc_entry ); + resume_thread( thread ); + } + + release_object( process ); + } +} diff --git a/server/protocol.def b/server/protocol.def index b6ad514463..888e22faf7 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3909,3 +3909,15 @@ struct handle_info obj_handle_t handle; /* handle to the job */ int status; /* process exit code */ @END + + +/* Suspend a process */ +@REQ(suspend_process) + obj_handle_t handle; /* process handle */ +@END + + +/* Resume a process */ +@REQ(resume_process) + obj_handle_t handle; /* process handle */ +@END diff --git a/server/request.h b/server/request.h index a3e95137e1..a21252c7a6 100644 --- a/server/request.h +++ b/server/request.h @@ -408,6 +408,8 @@ DECL_HANDLER(process_in_job); DECL_HANDLER(set_job_limits); DECL_HANDLER(set_job_completion_port); DECL_HANDLER(terminate_job); +DECL_HANDLER(suspend_process); +DECL_HANDLER(resume_process); #ifdef WANT_REQUEST_HANDLERS @@ -710,6 +712,8 @@ static const req_handler req_handlers[REQ_NB_REQUESTS] = (req_handler)req_set_job_limits, (req_handler)req_set_job_completion_port, (req_handler)req_terminate_job, + (req_handler)req_suspend_process, + (req_handler)req_resume_process, }; C_ASSERT( sizeof(affinity_t) == 8 ); @@ -2436,6 +2440,10 @@ C_ASSERT( sizeof(struct set_job_completion_port_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct terminate_job_request, status) == 16 ); C_ASSERT( sizeof(struct terminate_job_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct suspend_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct suspend_process_request) == 16 ); +C_ASSERT( FIELD_OFFSET(struct resume_process_request, handle) == 12 ); +C_ASSERT( sizeof(struct resume_process_request) == 16 ); #endif /* WANT_REQUEST_HANDLERS */ diff --git a/server/thread.c b/server/thread.c index b1d324f7de..7057c9bbd0 100644 --- a/server/thread.c +++ b/server/thread.c @@ -570,7 +570,7 @@ void stop_thread_if_suspended( struct thread *thread ) } /* suspend a thread */ -static int suspend_thread( struct thread *thread ) +int suspend_thread( struct thread *thread ) { int old_count = thread->suspend; if (thread->suspend < MAXIMUM_SUSPEND_COUNT) @@ -582,7 +582,7 @@ static int suspend_thread( struct thread *thread ) } /* resume a thread */ -static int resume_thread( struct thread *thread ) +int resume_thread( struct thread *thread ) { int old_count = thread->suspend; if (thread->suspend > 0) diff --git a/server/thread.h b/server/thread.h index bafc08ed42..8bf7d73ead 100644 --- a/server/thread.h +++ b/server/thread.h @@ -131,6 +131,8 @@ extern struct token *thread_get_impersonation_token( struct thread *thread ); extern int set_thread_affinity( struct thread *thread, affinity_t affinity ); extern int is_cpu_supported( enum cpu_type cpu ); extern unsigned int get_supported_cpu_mask(void); +extern int suspend_thread( struct thread *thread ); +extern int resume_thread( struct thread *thread ); /* ptrace functions */ diff --git a/server/trace.c b/server/trace.c index d4d0c3eb8d..5c6325a257 100644 --- a/server/trace.c +++ b/server/trace.c @@ -4582,6 +4582,16 @@ static void dump_terminate_job_request( const struct terminate_job_request *req fprintf( stderr, ", status=%d", req->status ); } +static void dump_suspend_process_request( const struct suspend_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + +static void dump_resume_process_request( const struct resume_process_request *req ) +{ + fprintf( stderr, " handle=%04x", req->handle ); +} + static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_new_process_request, (dump_func)dump_exec_process_request, @@ -4879,6 +4889,8 @@ static const dump_func req_dumpers[REQ_NB_REQUESTS] = { (dump_func)dump_set_job_limits_request, (dump_func)dump_set_job_completion_port_request, (dump_func)dump_terminate_job_request, + (dump_func)dump_suspend_process_request, + (dump_func)dump_resume_process_request, }; static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { @@ -5178,6 +5190,8 @@ static const dump_func reply_dumpers[REQ_NB_REQUESTS] = { NULL, NULL, NULL, + NULL, + NULL, }; static const char * const req_names[REQ_NB_REQUESTS] = { @@ -5477,6 +5491,8 @@ static const char * const req_names[REQ_NB_REQUESTS] = { "set_job_limits", "set_job_completion_port", "terminate_job", + "suspend_process", + "resume_process", }; static const struct -- 2.20.1

1 0

[PATCH 1/2] widl: Simplify type_new_struct() a bit.
by Zebediah Figura 18 Apr '19

18 Apr '19

Avoiding duplication is necessary for typelibs, but there's no reason to explicitly duplicate if we aren't building a typelib. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- tools/widl/typetree.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index b93806be98..4a78350858 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -299,19 +299,17 @@ type_t *type_new_enum(const char *name, struct namespace *namespace, int defined type_t *type_new_struct(char *name, struct namespace *namespace, int defined, var_list_t *fields) { - type_t *tag_type = name ? find_type(name, namespace, tsSTRUCT) : NULL; type_t *t; /* avoid creating duplicate typelib type entries */ - if (tag_type && do_typelib) return tag_type; + if (name && (t = find_type(name, namespace, tsSTRUCT))) + return t; t = make_type(TYPE_STRUCT); t->name = name; t->namespace = namespace; - if (tag_type && tag_type->details.structure) - t->details.structure = tag_type->details.structure; - else if (defined) + if (defined) { t->details.structure = xmalloc(sizeof(*t->details.structure)); t->details.structure->fields = fields; -- 2.21.0

2 3

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-devel