March 2021 - Wine-devel - list.winehq.org

[PATCH 6/9] wininet/tests: Use nameless structs and unions.
by Jacek Caban 23 Mar '21

23 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/tests/Makefile.in | 1 - dlls/wininet/tests/urlcache.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-)

2 1

[PATCH v2] winevulkan: Implement vkEnumerateDeviceLayerProperties
by Victor Hermann Chiletto 22 Mar '21

22 Mar '21

Currently, this function is passed through winevulkan to the system's Vulkan loader, which causes the loader to write the system's device layers properties in pProperties. Unreal Engine 4 then calls vkEnumerateDeviceExtensionProperties, using VkLayerProperties::layerName as the pLayerName. winevulkan's implementation of vkEnumerateDeviceExtensionProperties then returns VK_ERROR_LAYER_NOT_PRESENT, crashing UE4. This issue was found while debugging Project Wingman (Steam appid 895870), but it should also happen to any UE4 application using the Vulkan RHI. Signed-off-by: Victor Hermann Chiletto <v(a)hnn.net.br> --- v2: Improve the patch's description dlls/winevulkan/make_vulkan | 1 + dlls/winevulkan/vulkan.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 3ad210e4701..a0e59a0370e 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -153,6 +153,7 @@ FUNCTION_OVERRIDES = { "vkCreateDevice" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkDestroyInstance" : {"dispatch" : False, "driver" : True, "thunk" : False }, "vkEnumerateDeviceExtensionProperties" : {"dispatch" : True, "driver" : False, "thunk" : False}, + "vkEnumerateDeviceLayerProperties": {"dispatch": True, "driver": False, "thunk": False}, "vkEnumeratePhysicalDeviceGroups" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkEnumeratePhysicalDevices" : {"dispatch" : True, "driver" : False, "thunk" : False}, "vkGetPhysicalDeviceExternalBufferProperties" : {"dispatch" : False, "driver" : False, "thunk" : False}, diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 971394eb9dd..23087c9df2e 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1061,6 +1061,14 @@ VkResult WINAPI wine_vkEnumerateInstanceExtensionProperties(const char *layer_na return *count < num_properties ? VK_INCOMPLETE : VK_SUCCESS; } +VkResult WINAPI wine_vkEnumerateDeviceLayerProperties(VkPhysicalDevice phys_dev, uint32_t *count, VkLayerProperties *properties) +{ + TRACE("%p, %p, %p\n", phys_dev, count, properties); + + *count = 0; + return VK_SUCCESS; +} + VkResult WINAPI wine_vkEnumerateInstanceLayerProperties(uint32_t *count, VkLayerProperties *properties) { TRACE("%p, %p\n", count, properties); -- 2.31.0

3 2

[PATCH 9/9] winecfg: Use nameless unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winecfg/Makefile.in | 1 - programs/winecfg/audio.c | 20 ++++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-)

1 0

[PATCH 8/9] winemenubuilder: Use nameless unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/winemenubuilder/Makefile.in | 1 - programs/winemenubuilder/winemenubuilder.c | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-)

1 0

[PATCH 7/9] services: Use nameless unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- programs/services/Makefile.in | 1 - programs/services/rpc.c | 22 +++++++++++----------- 2 files changed, 11 insertions(+), 12 deletions(-)

1 0

[PATCH 5/9] ole32: Use nameless unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ole32/Makefile.in | 2 +- dlls/ole32/stg_prop.c | 206 ++++++++++++++++++++--------------------- 2 files changed, 104 insertions(+), 104 deletions(-)

1 0

[PATCH 4/9] wininet: Use nameless structs and unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/wininet/Makefile.in | 1 - dlls/wininet/urlcache.c | 10 +++++----- 2 files changed, 5 insertions(+), 6 deletions(-)

1 0

[PATCH 2/9] combase: Use nameless unions.
by Jacek Caban 22 Mar '21

22 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/combase/Makefile.in | 1 - dlls/combase/combase.c | 156 +++++++++++++++++++-------------------- 2 files changed, 78 insertions(+), 79 deletions(-)

1 0

[PATCH 2/3] include: Use nameless unions in dxva2api.idl helpers.
by Jacek Caban 22 Mar '21

22 Mar '21

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50836 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 1 - dlls/mfplat/main.c | 62 ++++++++++++++++++------------------ dlls/mfplat/mfplat_private.h | 14 ++++---- dlls/mfreadwrite/Makefile.in | 1 - dlls/mfreadwrite/reader.c | 10 +++--- include/dxva2api.idl | 13 ++++---- 6 files changed, 49 insertions(+), 52 deletions(-)

2 1

[PATCH vkd3d 1/5] vkd3d-shader: Rename hlsl_type_compare() to hlsl_types_are_equal().
by Zebediah Figura 22 Mar '21

22 Mar '21

hlsl_type_compare() implies a stable comparison function, as if to be passed to qsort(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 8 ++++---- libs/vkd3d-shader/hlsl.h | 2 +- libs/vkd3d-shader/hlsl.y | 14 +++++++------- libs/vkd3d-shader/hlsl_codegen.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 988f64dc..cb13e8fd 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -230,7 +230,7 @@ unsigned int hlsl_type_component_count(struct hlsl_type *type) return count; } -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) { if (t1 == t2) return true; @@ -259,7 +259,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) { t1field = LIST_ENTRY(t1cur, struct hlsl_struct_field, entry); t2field = LIST_ENTRY(t2cur, struct hlsl_struct_field, entry); - if (!hlsl_type_compare(t1field->type, t2field->type)) + if (!hlsl_types_are_equal(t1field->type, t2field->type)) return false; if (strcmp(t1field->name, t2field->name)) return false; @@ -271,7 +271,7 @@ bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) } if (t1->type == HLSL_CLASS_ARRAY) return t1->e.array.elements_count == t2->e.array.elements_count - && hlsl_type_compare(t1->e.array.type, t2->e.array.type); + && hlsl_types_are_equal(t1->e.array.type, t2->e.array.type); return true; } @@ -473,7 +473,7 @@ struct hlsl_ir_node *hlsl_new_binary_expr(enum hlsl_ir_expr_op op, struct hlsl_i { struct hlsl_ir_expr *expr; - assert(hlsl_type_compare(arg1->data_type, arg2->data_type)); + assert(hlsl_types_are_equal(arg1->data_type, arg2->data_type)); if (!(expr = vkd3d_calloc(1, sizeof(*expr)))) return NULL; diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 92ac5270..c15a8d93 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -563,10 +563,10 @@ bool hlsl_scope_add_type(struct hlsl_scope *scope, struct hlsl_type *type) DECLS struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, unsigned int default_majority) DECLSPEC_HIDDEN; -bool hlsl_type_compare(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; unsigned int hlsl_type_component_count(struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_row_major(const struct hlsl_type *type) DECLSPEC_HIDDEN; bool hlsl_type_is_void(const struct hlsl_type *type) DECLSPEC_HIDDEN; +bool hlsl_types_are_equal(const struct hlsl_type *t1, const struct hlsl_type *t2) DECLSPEC_HIDDEN; int hlsl_lexer_compile(struct hlsl_ctx *ctx, const struct vkd3d_shader_code *hlsl) DECLSPEC_HIDDEN; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 47694751..af6c3976 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -169,7 +169,7 @@ static bool compatible_data_types(struct hlsl_type *t1, struct hlsl_type *t2) if (t1->type == HLSL_CLASS_ARRAY) { - if (hlsl_type_compare(t1->e.array.type, t2)) + if (hlsl_types_are_equal(t1->e.array.type, t2)) /* e.g. float4[3] to float4 is allowed */ return true; @@ -226,7 +226,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ || (t1->type <= HLSL_CLASS_LAST_NUMERIC && t2->type == HLSL_CLASS_ARRAY)) { /* e.g. float4[3] to float4 is allowed */ - if (t1->type == HLSL_CLASS_ARRAY && hlsl_type_compare(t1->e.array.type, t2)) + if (t1->type == HLSL_CLASS_ARRAY && hlsl_types_are_equal(t1->e.array.type, t2)) return true; if (hlsl_type_component_count(t1) == hlsl_type_component_count(t2)) return true; @@ -254,7 +254,7 @@ static bool implicit_compatible_data_types(struct hlsl_type *t1, struct hlsl_typ } if (t1->type == HLSL_CLASS_STRUCT && t2->type == HLSL_CLASS_STRUCT) - return hlsl_type_compare(t1, t2); + return hlsl_types_are_equal(t1, t2); return false; } @@ -265,7 +265,7 @@ static struct hlsl_ir_node *add_implicit_conversion(struct hlsl_ctx *ctx, struct struct hlsl_type *src_type = node->data_type; struct hlsl_ir_expr *cast; - if (hlsl_type_compare(src_type, dst_type)) + if (hlsl_types_are_equal(src_type, dst_type)) return node; if (!implicit_compatible_data_types(src_type, dst_type)) @@ -1046,7 +1046,7 @@ static struct hlsl_type *expr_common_type(struct hlsl_ctx *ctx, struct hlsl_type return NULL; } - if (hlsl_type_compare(t1, t2)) + if (hlsl_types_are_equal(t1, t2)) return t1; if (!expr_compatible_data_types(t1, t2)) @@ -1158,7 +1158,7 @@ static struct hlsl_ir_expr *add_expr(struct hlsl_ctx *ctx, struct list *instrs, if (!operands[i]) break; - if (hlsl_type_compare(operands[i]->data_type, type)) + if (hlsl_types_are_equal(operands[i]->data_type, type)) continue; if (operands[i]->data_type->dimx * operands[i]->data_type->dimy != 1 && operands[i]->data_type->dimx * operands[i]->data_type->dimy != type->dimx * type->dimy) @@ -1799,7 +1799,7 @@ hlsl_prog: hlsl_note(ctx, decl->loc, VKD3D_SHADER_LOG_ERROR, "\"%s\" was previously defined here.", $2.name); YYABORT; } - else if (!hlsl_type_compare(decl->return_type, $2.decl->return_type)) + else if (!hlsl_types_are_equal(decl->return_type, $2.decl->return_type)) { hlsl_error(ctx, $2.decl->loc, VKD3D_SHADER_ERROR_HLSL_REDEFINED, "Function \"%s\" was already declared with a different return type.", $2.name); diff --git a/libs/vkd3d-shader/hlsl_codegen.c b/libs/vkd3d-shader/hlsl_codegen.c index 283a67e6..5b68a460 100644 --- a/libs/vkd3d-shader/hlsl_codegen.c +++ b/libs/vkd3d-shader/hlsl_codegen.c @@ -73,7 +73,7 @@ static bool fold_redundant_casts(struct hlsl_ctx *ctx, struct hlsl_ir_node *inst if (expr->op != HLSL_IR_UNOP_CAST) return false; - if (hlsl_type_compare(src_type, dst_type) + if (hlsl_types_are_equal(src_type, dst_type) || (src_type->base_type == dst_type->base_type && is_vec1(src_type) && is_vec1(dst_type))) { replace_node(&expr->node, expr->operands[0].node); -- 2.30.1

6 21