March 2018 - Wine-commits - list.winehq.org

Józef Kucia : libs/vkd3d: Handle VK_ERROR_EXTENSION_NOT_PRESENT in hresult_from_vk_result().
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: dd461ca6b8228deb2f42001d5ac00a812444bea5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dd461ca6b8228deb2f42001… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:21 2018 +0200 libs/vkd3d: Handle VK_ERROR_EXTENSION_NOT_PRESENT in hresult_from_vk_result(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d/utils.c b/libs/vkd3d/utils.c index eef194e..a62a746 100644 --- a/libs/vkd3d/utils.c +++ b/libs/vkd3d/utils.c @@ -347,6 +347,7 @@ HRESULT hresult_from_vk_result(VkResult vr) default: FIXME("Unhandled VkResult %d.\n", vr); case VK_ERROR_DEVICE_LOST: + case VK_ERROR_EXTENSION_NOT_PRESENT: return E_FAIL; } }

1 0

Józef Kucia : demos: Do not force sRGB formats for Vulkan swapchains.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: fd36cefbe29c883decba583795191a0a7079c1a5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd36cefbe29c883decba583… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:22 2018 +0200 demos: Do not force sRGB formats for Vulkan swapchains. Fixes the following validation error: IMAGE(ERROR): object: 0x0 type: 0 location: 3302 msgCode: 180357110: vkCreateImageView() format VK_FORMAT_B8G8R8A8_UNORM differs from image 6 format VK_FORMAT_B8G8R8A8_SRGB. Formats MUST be IDENTICAL unless VK_IMAGE_CREATE_MUTABLE_FORMAT BIT was set on image creation. The spec valid usage text states 'If image was not created with the VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT flag, format must be identical to the format used to create image' Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- demos/demo_xcb.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/demos/demo_xcb.h b/demos/demo_xcb.h index 4de1149..9980b50 100644 --- a/demos/demo_xcb.h +++ b/demos/demo_xcb.h @@ -304,17 +304,6 @@ static inline void demo_set_idle_func(struct demo *demo, demo->idle_func = idle_func; } -static inline DXGI_FORMAT demo_get_srgb_format(DXGI_FORMAT format) -{ - switch (format) - { - case DXGI_FORMAT_B8G8R8A8_UNORM: - return DXGI_FORMAT_B8G8R8A8_UNORM_SRGB; - default: - return DXGI_FORMAT_UNKNOWN; - } -} - static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *command_queue, struct demo_window *window, const struct demo_swapchain_desc *desc) { @@ -338,7 +327,7 @@ static inline struct demo_swapchain *demo_swapchain_create(ID3D12CommandQueue *c VkImage *vk_images; VkFormat format; - if ((format = vkd3d_get_vk_format(demo_get_srgb_format(desc->format))) == VK_FORMAT_UNDEFINED) + if ((format = vkd3d_get_vk_format(desc->format)) == VK_FORMAT_UNDEFINED) return NULL; if (FAILED(ID3D12CommandQueue_GetDevice(command_queue, &IID_ID3D12Device, (void **)&d3d12_device)))

1 0

Józef Kucia : libs/vkd3d: Fix error message in vkd3d_check_extensions().
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: 3f235f97878e6a534657bfe365fc07da42588cfb URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=3f235f97878e6a534657bfe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:17 2018 +0200 libs/vkd3d: Fix error message in vkd3d_check_extensions(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 54b3d0e..3c06cd0 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -111,7 +111,7 @@ static unsigned int vkd3d_check_extensions(const VkExtensionProperties *extensio { if (!has_extension(extensions, count, user_extensions[i])) ERR("Required user %s extension %s is not supported.\n", - extension_type, debugstr_a(required_extensions[i])); + extension_type, debugstr_a(user_extensions[i])); ++extension_count; }

1 0

Józef Kucia : libs/vkd3d: Avoid passing invalid miplevel count to Vulkan.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: 4dc706733ef5b6d6d1de11365023c29c2505ce4d URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4dc706733ef5b6d6d1de113… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:18 2018 +0200 libs/vkd3d: Avoid passing invalid miplevel count to Vulkan. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/resource.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index e0ceb4c..81135d3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -102,6 +102,14 @@ HRESULT vkd3d_create_buffer(struct d3d12_device *device, return S_OK; } +static unsigned int max_miplevel_count(const D3D12_RESOURCE_DESC *desc) +{ + unsigned int size = max(desc->Width, desc->Height); + if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + size = max(size, desc->DepthOrArraySize); + return vkd3d_log2i(size) + 1; +} + static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags) { @@ -143,7 +151,7 @@ static HRESULT vkd3d_create_image(struct d3d12_resource *resource, struct d3d12_ image_info.arrayLayers = desc->DepthOrArraySize; } - image_info.mipLevels = desc->MipLevels; + image_info.mipLevels = min(desc->MipLevels, max_miplevel_count(desc)); image_info.samples = vk_samples_from_dxgi_sample_desc(&desc->SampleDesc); if (desc->Layout == D3D12_TEXTURE_LAYOUT_UNKNOWN) @@ -653,12 +661,7 @@ static HRESULT validate_buffer_desc(const D3D12_RESOURCE_DESC *desc) static HRESULT validate_texture_desc(D3D12_RESOURCE_DESC *desc) { if (!desc->MipLevels) - { - unsigned int size = max(desc->Width, desc->Height); - if (desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) - size = max(size, desc->DepthOrArraySize); - desc->MipLevels = vkd3d_log2i(size) + 1; - } + desc->MipLevels = max_miplevel_count(desc); return S_OK; }

1 0

Józef Kucia : libs/vkd3d: Fix copying descriptors with NULL source range sizes.
by Alexandre Julliard 28 Mar '18

28 Mar '18

Module: vkd3d Branch: master Commit: 953a924ca04e4e5667e7f091dc6654d6ea5ebf43 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=953a924ca04e4e5667e7f09… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:19 2018 +0200 libs/vkd3d: Fix copying descriptors with NULL source range sizes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 4 +++- tests/d3d12.c | 6 +----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 3c06cd0..e826478 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1673,6 +1673,7 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, struct d3d12_device *device = impl_from_ID3D12Device(iface); unsigned int dst_range_idx, dst_idx, src_range_idx, src_idx; const struct d3d12_desc *src; + unsigned int src_range_size; struct d3d12_desc *dst; TRACE("iface %p, dst_descriptor_range_count %u, dst_descriptor_range_offsets %p, " @@ -1695,7 +1696,8 @@ static void STDMETHODCALLTYPE d3d12_device_CopyDescriptors(ID3D12Device *iface, for (src_range_idx = 0; src_range_idx < src_descriptor_range_count; ++src_range_idx) { src = d3d12_desc_from_cpu_handle(src_descriptor_range_offsets[src_range_idx]); - for (src_idx = 0; src_idx < src_descriptor_range_sizes[src_range_idx]; ++src_idx) + src_range_size = src_descriptor_range_sizes ? src_descriptor_range_sizes[src_range_idx] : 1; + for (src_idx = 0; src_idx < src_range_size; ++src_idx) { if (dst_idx >= dst_descriptor_range_sizes[dst_range_idx]) { diff --git a/tests/d3d12.c b/tests/d3d12.c index c140a26..587f8b7 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -11413,16 +11413,12 @@ static void test_copy_descriptors(void) dst_handles[0] = get_cpu_sampler_handle(&context, sampler_heap, 0); dst_range_sizes[0] = 4; src_handles[0] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[0] = 1; src_handles[1] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[1] = 1; src_handles[2] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 0); - src_range_sizes[2] = 1; src_handles[3] = get_cpu_sampler_handle(&context, cpu_sampler_heap2, 1); - src_range_sizes[3] = 1; /* s0-s3 */ ID3D12Device_CopyDescriptors(device, 1, dst_handles, dst_range_sizes, - 4, src_handles, src_range_sizes, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER); + 4, src_handles, NULL, D3D12_DESCRIPTOR_HEAP_TYPE_SAMPLER); dst_handles[0] = get_cpu_descriptor_handle(&context, heap, 9); dst_range_sizes[0] = 4;

1 0

Alexandre Julliard : ntdll: Add separate types for XML elements and attributes in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 8cf404ddd24965a4f90fd27f315febaed39f9606 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8cf404ddd24965a4f90fd27f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 15:55:12 2018 +0200 ntdll: Add separate types for XML elements and attributes in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 565 ++++++++++++++++++++++++++++------------------------ 1 file changed, 300 insertions(+), 265 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8cf404ddd24965a4f90f…

1 0

Alexandre Julliard : ntdll: Propagate the error through the XML buffer in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 7b871727e5cbb8581167acbaae2f4e34dc4ee59e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7b871727e5cbb8581167acba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 17:36:35 2018 +0200 ntdll: Propagate the error through the XML buffer in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 682 +++++++++++++++++++++++++--------------------------- 1 file changed, 331 insertions(+), 351 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7b871727e5cbb8581167…

1 0

Alexandre Julliard : ntdll: Check for closing element directly in next_xml_elem().
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 7a349d8d87b89c3ba0c1d478682539f1aca63a5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a349d8d87b89c3ba0c1d478… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 19:39:26 2018 +0200 ntdll: Check for closing element directly in next_xml_elem(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 426 +++++++++++++++++++--------------------------------- 1 file changed, 156 insertions(+), 270 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7a349d8d87b89c3ba0c1…

1 0

Alexandre Julliard : ntdll: Store the namespace separately from the XML element name.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: 1aaaecba46525b7834f965f700ddd3caa7dedbfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1aaaecba46525b7834f965f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 26 21:02:07 2018 +0200 ntdll: Store the namespace separately from the XML element name. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 66 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 75e2e52..bae615b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -102,6 +102,7 @@ typedef struct struct xml_elem { xmlstr_t name; + xmlstr_t ns; }; struct xml_attr @@ -561,6 +562,8 @@ struct actctx_loader unsigned int allocated_dependencies; }; +static const xmlstr_t empty_xmlstr; + static const WCHAR asmv1W[] = {'a','s','m','v','1',':',0}; static const WCHAR asmv2W[] = {'a','s','m','v','2',':',0}; static const WCHAR asmv3W[] = {'a','s','m','v','3',':',0}; @@ -746,13 +749,19 @@ static BOOL xml_attr_cmp( const struct xml_attr *attr, const WCHAR *str ) return xmlstr_cmp( &attr->name, str ); } -static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, const WCHAR *namespace) +static BOOL xml_name_cmp( const struct xml_elem *elem1, const struct xml_elem *elem2 ) { - UINT len = strlenW( namespace ); + return (elem1->name.len == elem2->name.len && + elem1->ns.len == elem2->ns.len && + !strncmpW( elem1->name.ptr, elem2->name.ptr, elem1->name.len ) && + !strncmpW( elem1->ns.ptr, elem2->ns.ptr, elem1->ns.len )); +} - if (!strncmpW(elem->name.ptr, str, elem->name.len) && !str[elem->name.len]) return TRUE; - return (elem->name.len > len && !strncmpW(elem->name.ptr, namespace, len) && - !strncmpW(elem->name.ptr + len, str, elem->name.len - len) && !str[elem->name.len - len]); +static inline BOOL xml_elem_cmp(const struct xml_elem *elem, const WCHAR *str, const WCHAR *namespace) +{ + return (!strncmpW(elem->name.ptr, str, elem->name.len) && !str[elem->name.len] && + (!elem->ns.len || + (!strncmpW(elem->ns.ptr, namespace, elem->ns.len) && namespace[elem->ns.len] == ':'))); } static inline BOOL isxmlspace( WCHAR ch ) @@ -767,7 +776,8 @@ static inline const char* debugstr_xmlstr(const xmlstr_t* str) static inline const char *debugstr_xml_elem( const struct xml_elem *elem ) { - return wine_dbg_sprintf( "%s", debugstr_wn( elem->name.ptr, elem->name.len )); + return wine_dbg_sprintf( "%s ns %s", debugstr_wn( elem->name.ptr, elem->name.len ), + debugstr_wn( elem->ns.ptr, elem->ns.len )); } static inline const char *debugstr_xml_attr( const struct xml_attr *attr ) @@ -1232,6 +1242,26 @@ static BOOL next_xml_attr(xmlbuf_t *xmlbuf, struct xml_attr *attr, BOOL *end) return set_error( xmlbuf ); } +static void read_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem ) +{ + const WCHAR* ptr = xmlbuf->ptr; + + elem->ns = empty_xmlstr; + elem->name.ptr = ptr; + while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && *ptr != '/') + { + if (*ptr == ':') + { + elem->ns.ptr = elem->name.ptr; + elem->ns.len = ptr - elem->ns.ptr; + elem->name.ptr = ptr + 1; + } + ptr++; + } + elem->name.len = ptr - elem->name.ptr; + xmlbuf->ptr = ptr; +} + static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct xml_elem *parent ) { const WCHAR* ptr; @@ -1263,23 +1293,23 @@ static BOOL next_xml_elem( xmlbuf_t *xmlbuf, struct xml_elem *elem, const struct } xmlbuf->ptr = ptr; - while (ptr < xmlbuf->end && !isxmlspace(*ptr) && *ptr != '>' && (*ptr != '/' || ptr == xmlbuf->ptr)) - ptr++; - /* check for element terminating the parent element */ - if (*xmlbuf->ptr == '/' && - ptr - xmlbuf->ptr == parent->name.len + 1 && - !strncmpW( xmlbuf->ptr + 1, parent->name.ptr, parent->name.len )) + if (ptr < xmlbuf->end && *ptr == '/') { - while (ptr < xmlbuf->end && isxmlspace(*ptr)) ptr++; - if (ptr == xmlbuf->end || *ptr != '>') return set_error( xmlbuf ); - xmlbuf->ptr = ptr + 1; + xmlbuf->ptr++; + read_xml_elem( xmlbuf, elem ); + if (!xml_name_cmp( elem, parent )) + { + ERR( "wrong closing element %s for %s\n", + debugstr_xmlstr(&elem->name), debugstr_xmlstr(&parent->name )); + return set_error( xmlbuf ); + } + while (xmlbuf->ptr < xmlbuf->end && isxmlspace(*xmlbuf->ptr)) xmlbuf->ptr++; + if (xmlbuf->ptr == xmlbuf->end || *xmlbuf->ptr++ != '>') return set_error( xmlbuf ); return FALSE; } - elem->name.ptr = xmlbuf->ptr; - elem->name.len = ptr - xmlbuf->ptr; - xmlbuf->ptr = ptr; + read_xml_elem( xmlbuf, elem ); if (xmlbuf->ptr != xmlbuf->end) return TRUE; return set_error( xmlbuf );

1 0

Alexandre Julliard : ntdll: Add support for XML namespaces in manifest parser.
by Alexandre Julliard 27 Mar '18

27 Mar '18

Module: wine Branch: master Commit: ab3debb2b000c428758867f35c568b5f3b813b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab3debb2b000c428758867f3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 12:10:53 2018 +0200 ntdll: Add support for XML namespaces in manifest parser. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 211 ++++++++++++++++++++++++++++++++++------------------ 1 file changed, 140 insertions(+), 71 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ab3debb2b000c4287588…

1 0