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

Józef Kucia : demos: Do not force sRGB formats for Vulkan swapchains.
by Alexandre Julliard March 28, 2018

March 28, 2018

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: Implement d3d12_command_list_CopyResource() for textures.
by Alexandre Julliard March 28, 2018

March 28, 2018

Module: vkd3d Branch: master Commit: 26cbfbe6470c1f8b14dd341b0ec36e45a37b7ac5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=26cbfbe6470c1f8b14dd341… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Mar 28 15:03:20 2018 +0200 libs/vkd3d: Implement d3d12_command_list_CopyResource() for textures. 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/command.c | 39 ++++++++++++++++++++++++++++++++++++--- libs/vkd3d/device.c | 2 +- libs/vkd3d/vkd3d_private.h | 5 +++++ 3 files changed, 42 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 847581c..1c0a18a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2619,7 +2619,12 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList(iface); struct d3d12_resource *dst_resource, *src_resource; + const struct vkd3d_format *src_format, *dst_format; const struct vkd3d_vk_device_procs *vk_procs; + VkBufferCopy vk_buffer_copy; + VkImageCopy vk_image_copy; + unsigned int layer_count; + unsigned int i; TRACE("iface %p, dst_resource %p, src_resource %p.\n", iface, dst, src); @@ -2628,10 +2633,11 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm dst_resource = unsafe_impl_from_ID3D12Resource(dst); src_resource = unsafe_impl_from_ID3D12Resource(src); + d3d12_command_list_track_resource_usage(list, dst_resource); + d3d12_command_list_track_resource_usage(list, src_resource); + if (d3d12_resource_is_buffer(dst_resource)) { - VkBufferCopy vk_buffer_copy; - assert(d3d12_resource_is_buffer(src_resource)); assert(src_resource->desc.Width == dst_resource->desc.Width); @@ -2643,7 +2649,34 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyResource(ID3D12GraphicsComm } else { - FIXME("Not implemented for textures.\n"); + if (!(dst_format = vkd3d_format_from_d3d12_resource_desc(&dst_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", dst_resource->desc.Format); + return; + } + if (!(src_format = vkd3d_format_from_d3d12_resource_desc(&src_resource->desc, DXGI_FORMAT_UNKNOWN))) + { + WARN("Invalid format %#x.\n", src_resource->desc.Format); + return; + } + + layer_count = d3d12_resource_desc_get_layer_count(&dst_resource->desc); + + assert(d3d12_resource_is_texture(dst_resource)); + assert(d3d12_resource_is_texture(src_resource)); + assert(dst_resource->desc.MipLevels == src_resource->desc.MipLevels); + assert(layer_count == d3d12_resource_desc_get_layer_count(&src_resource->desc)); + + for (i = 0; i < dst_resource->desc.MipLevels; ++i) + { + vk_image_copy_from_d3d12(&vk_image_copy, i, i, + &src_resource->desc, &dst_resource->desc, src_format, dst_format, NULL, 0, 0, 0); + vk_image_copy.dstSubresource.layerCount = layer_count; + vk_image_copy.srcSubresource.layerCount = layer_count; + VK_CALL(vkCmdCopyImage(list->vk_command_buffer, src_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_image, + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &vk_image_copy)); + } } } diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index e826478..d61c331 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -1951,7 +1951,7 @@ static void STDMETHODCALLTYPE d3d12_device_GetCopyableFootprints(ID3D12Device *i return; } - array_size = desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D ? 1 : desc->DepthOrArraySize; + array_size = d3d12_resource_desc_get_layer_count(desc); if (first_sub_resource >= desc->MipLevels * array_size || sub_resource_count > desc->MipLevels * array_size - first_sub_resource) diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 62b4652..988522f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -738,6 +738,11 @@ static inline unsigned int d3d12_resource_desc_get_depth(const D3D12_RESOURCE_DE return max(1, d >> miplevel_idx); } +static inline unsigned int d3d12_resource_desc_get_layer_count(const D3D12_RESOURCE_DESC *desc) +{ + return desc->Dimension != D3D12_RESOURCE_DIMENSION_TEXTURE3D ? desc->DepthOrArraySize : 1; +} + enum VkCompareOp vk_compare_op_from_d3d12(D3D12_COMPARISON_FUNC op) DECLSPEC_HIDDEN; bool is_valid_feature_level(D3D_FEATURE_LEVEL feature_level) DECLSPEC_HIDDEN;

1 0

Józef Kucia : libs/vkd3d: Fix copying descriptors with NULL source range sizes.
by Alexandre Julliard March 28, 2018

March 28, 2018

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

Józef Kucia : libs/vkd3d: Avoid passing invalid miplevel count to Vulkan.
by Alexandre Julliard March 28, 2018

March 28, 2018

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 error message in vkd3d_check_extensions().
by Alexandre Julliard March 28, 2018

March 28, 2018

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

Alexandre Julliard : ntdll: Check for closing element directly in next_xml_elem().
by Alexandre Julliard March 27, 2018

March 27, 2018

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 March 27, 2018

March 27, 2018

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 March 27, 2018

March 27, 2018

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

Alexandre Julliard : ntdll: Check the namespace in RtlQueryActivationContextApplicationSettings.
by Alexandre Julliard March 27, 2018

March 27, 2018

Module: wine Branch: master Commit: e46259fb823f55aa331381fe56916d20049d52f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e46259fb823f55aa331381fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 12:10:53 2018 +0200 ntdll: Check the namespace in RtlQueryActivationContextApplicationSettings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/actctx.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 832d3d8..7e3aec4 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -486,6 +486,7 @@ struct entity { WCHAR *name; WCHAR *value; + WCHAR *ns; } settings; } u; }; @@ -954,6 +955,7 @@ static void free_entity_array(struct entity_array *array) case ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS: RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.name); RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.value); + RtlFreeHeap(GetProcessHeap(), 0, entity->u.settings.ns); break; default: FIXME("Unknown entity kind %d\n", entity->kind); @@ -2441,6 +2443,7 @@ static void parse_settings_elem( xmlbuf_t *xmlbuf, struct assembly *assembly, st } entity->u.settings.name = xmlstrdupW( &parent->name ); entity->u.settings.value = xmlstrdupW( &content ); + entity->u.settings.ns = xmlstrdupW( &parent->ns ); while (next_xml_elem(xmlbuf, &elem, parent)) { @@ -4891,7 +4894,7 @@ static NTSTATUS find_guid(ACTIVATION_CONTEXT* actctx, ULONG section_kind, return STATUS_SUCCESS; } -static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings ) +static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR *settings, const WCHAR *ns ) { unsigned int i, j; @@ -4902,7 +4905,8 @@ static const WCHAR *find_app_settings( ACTIVATION_CONTEXT *actctx, const WCHAR * { struct entity *entity = &assembly->entities.base[j]; if (entity->kind == ACTIVATION_CONTEXT_SECTION_APPLICATION_SETTINGS && - !strcmpW( entity->u.settings.name, settings )) + !strcmpW( entity->u.settings.name, settings ) && + !strcmpW( entity->u.settings.ns, ns )) return entity->u.settings.value; } } @@ -5551,7 +5555,6 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL const WCHAR *settings, WCHAR *buffer, SIZE_T size, SIZE_T *written ) { - static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0',0}; ACTIVATION_CONTEXT *actctx = check_actctx( handle ); const WCHAR *res; @@ -5561,16 +5564,20 @@ NTSTATUS WINAPI RtlQueryActivationContextApplicationSettings( DWORD flags, HANDL return STATUS_INVALID_PARAMETER; } - if (ns && strncmpW( ns, namespaceW, strlenW(namespaceW) )) + if (ns) { - WARN( "unknown namespace %s\n", debugstr_w(ns) ); - return STATUS_INVALID_PARAMETER; + if (strcmpW( ns, windowsSettings2005NSW ) && + strcmpW( ns, windowsSettings2011NSW ) && + strcmpW( ns, windowsSettings2016NSW ) && + strcmpW( ns, windowsSettings2017NSW )) + return STATUS_INVALID_PARAMETER; } + else ns = windowsSettings2005NSW; if (!handle) handle = process_actctx; if (!(actctx = check_actctx( handle ))) return STATUS_INVALID_PARAMETER; - if (!(res = find_app_settings( actctx, settings ))) return STATUS_SXS_KEY_NOT_FOUND; + if (!(res = find_app_settings( actctx, settings, ns ))) return STATUS_SXS_KEY_NOT_FOUND; if (written) *written = strlenW(res) + 1; if (size < strlenW(res)) return STATUS_BUFFER_TOO_SMALL;

1 0

Alexandre Julliard : kernel32/tests: Add tests for window settings namespaces.
by Alexandre Julliard March 27, 2018

March 27, 2018

Module: wine Branch: master Commit: 7d16575df660a256f05efaf46d91c720e0a01c46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d16575df660a256f05efaf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Mar 27 13:36:20 2018 +0200 kernel32/tests: Add tests for window settings namespaces. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/actctx.c | 109 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 105 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c index b63abac..8c9ac79 100644 --- a/dlls/kernel32/tests/actctx.c +++ b/dlls/kernel32/tests/actctx.c @@ -464,10 +464,46 @@ static const char settings_manifest[] = " <application xmlns=\"urn:schemas-microsoft-com:asm.v3\">" " <windowsSettings>" " <dpiAware xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">true</dpiAware>" +" <dpiAwareness xmlns=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\">true</dpiAwareness>" " </windowsSettings>" " </application>" "</assembly>"; +static const char settings_manifest2[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <application xmlns=\"urn:schemas-microsoft-com:asm.v3\"" +" xmlns:ws05=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\"" +" xmlns:ws11=\"http://schemas.microsoft.com/SMI/2011/WindowsSettings\"" +" xmlns:ws16=\"http://schemas.microsoft.com/SMI/2016/WindowsSettings\"" +" xmlns:ws17=\"http://schemas.microsoft.com/SMI/2017/WindowsSettings\">" +" <windowsSettings>" +" <ws05:autoElevate>true</ws05:autoElevate>" +" <ws05:disableTheming>true</ws05:disableTheming>" +" <ws11:disableWindowFiltering>true</ws11:disableWindowFiltering>" +" <ws05:dpiAware>true</ws05:dpiAware>" +" <ws16:dpiAwareness>true</ws16:dpiAwareness>" +" <ws17:gdiScaling>true</ws17:gdiScaling>" +" <ws17:highResolutionScrollingAware>true</ws17:highResolutionScrollingAware>" +" <ws16:longPathAware>true</ws16:longPathAware>" +" <ws17:magicFutureSetting>true</ws17:magicFutureSetting>" +" <ws11:printerDriverIsolation>true</ws11:printerDriverIsolation>" +" <ws17:ultraHighResolutionScrollingAware>true</ws17:ultraHighResolutionScrollingAware>" +" </windowsSettings>" +" </application>" +"</assembly>"; + +/* broken manifest found in some binaries: asmv3 namespace is used but not declared */ +static const char settings_manifest3[] = +"<assembly xmlns=\"urn:schemas-microsoft-com:asm.v1\" manifestVersion=\"1.0\">" +" <assemblyIdentity version=\"1.0.0.0\" name=\"Wine.Test\" type=\"win32\"></assemblyIdentity>" +" <asmv3:application>" +" <asmv3:windowsSettings xmlns=\"http://schemas.microsoft.com/SMI/2005/WindowsSettings\">" +" <dpiAware>true</dpiAware>" +" </asmv3:windowsSettings>" +" </asmv3:application>" +"</assembly>"; + DEFINE_GUID(VISTA_COMPAT_GUID, 0xe2011457, 0x1546, 0x43c5, 0xa5, 0xfe, 0x00, 0x8d, 0xee, 0xe3, 0xd3, 0xf0); DEFINE_GUID(WIN7_COMPAT_GUID, 0x35138b9a, 0x5d96, 0x4fbd, 0x8e, 0x2d, 0xa2, 0x44, 0x02, 0x25, 0xf9, 0x3a); DEFINE_GUID(WIN8_COMPAT_GUID, 0x4a2f28e3, 0x53b9, 0x4441, 0xba, 0x9c, 0xd6, 0x9d, 0x4a, 0x4a, 0x6e, 0x38); @@ -2964,9 +3000,11 @@ static void test_compatibility(void) static void test_settings(void) { static const WCHAR dpiAwareW[] = {'d','p','i','A','w','a','r','e',0}; + static const WCHAR dpiAwarenessW[] = {'d','p','i','A','w','a','r','e','n','e','s','s',0}; static const WCHAR dummyW[] = {'d','u','m','m','y',0}; static const WCHAR trueW[] = {'t','r','u','e',0}; - static const WCHAR namespaceW[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + static const WCHAR namespace2005W[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','0','5','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; + static const WCHAR namespace2016W[] = {'h','t','t','p',':','/','/','s','c','h','e','m','a','s','.','m','i','c','r','o','s','o','f','t','.','c','o','m','/','S','M','I','/','2','0','1','6','/','W','i','n','d','o','w','s','S','e','t','t','i','n','g','s',0}; WCHAR buffer[80]; SIZE_T size; HANDLE handle; @@ -3001,26 +3039,60 @@ static void test_settings(void) size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dummyW, buffer, 80, &size ); - ok( !ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !ret, "QueryActCtxSettingsW succeeded\n" ); ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); - ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, 80, &size ); + ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwareW, buffer, 80, &size ); ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); - ret = pQueryActCtxSettingsW( 0, handle, namespaceW, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); + ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); SetLastError( 0xdeadbeef ); size = 0xdead; memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespace2016W, dpiAwareW, buffer, lstrlenW(trueW) + 1, &size ); + ok( !ret, "QueryActCtxSettingsW succeeded\n" ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND || broken( GetLastError() == ERROR_INVALID_PARAMETER ), + "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwarenessW, buffer, lstrlenW(trueW) + 1, &size ); + ok( !ret, "QueryActCtxSettingsW succeeded\n" ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespace2005W, dpiAwarenessW, buffer, lstrlenW(trueW) + 1, &size ); + ok( !ret, "QueryActCtxSettingsW succeeded\n" ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, namespace2016W, dpiAwarenessW, buffer, lstrlenW(trueW) + 1, &size ); + ok( ret || broken( GetLastError() == ERROR_INVALID_PARAMETER ), + "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + if (ret) + { + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); + } + else ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, lstrlenW(trueW), &size ); ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); @@ -3034,6 +3106,35 @@ static void test_settings(void) ok( buffer[0] == 0xcccc, "got %s\n", wine_dbgstr_w(buffer) ); ok( size == sizeof(trueW)/sizeof(WCHAR), "wrong len %lu\n", size ); pReleaseActCtx(handle); + + create_manifest_file( "manifest_settings2.manifest", settings_manifest2, -1, NULL, NULL ); + handle = test_create("manifest_settings2.manifest"); + ok( handle != INVALID_HANDLE_VALUE || broken( handle == INVALID_HANDLE_VALUE ), /* <= vista */ + "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError() ); + DeleteFileA( "manifest_settings2.manifest" ); + if (handle != INVALID_HANDLE_VALUE) + { + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( ret, "QueryActCtxSettingsW failed err %u\n", GetLastError() ); + ok( !lstrcmpW( buffer, trueW ), "got %s\n", wine_dbgstr_w(buffer) ); + ok( size == lstrlenW( buffer ) + 1, "wrong len %lu\n", size ); + pReleaseActCtx(handle); + } + + create_manifest_file( "manifest_settings3.manifest", settings_manifest3, -1, NULL, NULL ); + handle = test_create("manifest_settings3.manifest"); + ok( handle != INVALID_HANDLE_VALUE, "handle == INVALID_HANDLE_VALUE, error %u\n", GetLastError() ); + DeleteFileA( "manifest_settings3.manifest" ); + SetLastError( 0xdeadbeef ); + size = 0xdead; + memset( buffer, 0xcc, sizeof(buffer) ); + ret = pQueryActCtxSettingsW( 0, handle, NULL, dpiAwareW, buffer, 80, &size ); + ok( !ret, "QueryActCtxSettingsW succeeded\n" ); + ok( GetLastError() == ERROR_SXS_KEY_NOT_FOUND, "wrong error %u\n", GetLastError() ); + pReleaseActCtx(handle); } START_TEST(actctx)

1 0