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

[PATCH v2] d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties.
by Zebediah Figura 26 Feb '21

26 Feb '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- This doesn't fix a validation layer warning, but the validation layers are broken: <https://github.com/KhronosGroup/Vulkan-ValidationLayers/issues/2457> dlls/d3d12/d3d12_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 3dd4ec796b0..388de0b56c2 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -265,7 +265,9 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0) goto done; - if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2) + if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2 + && check_vk_instance_extension(vk_instance, pfn_vkGetInstanceProcAddr, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) { TRACE("Matching adapters by UUIDs.\n"); @@ -331,6 +333,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe }; static const char * const optional_instance_extensions[] = { + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, }; static const char * const device_extensions[] = -- 2.30.1

3 2

[PATCH v3] widl: Fix C++ RuntimeClass string constants declaration.
by Rémi Bernon 26 Feb '21

26 Feb '21

MinGW g++ requires initialized selectany to have extern linkage. Also, because of the various ways WCHAR may be defined, using an array initializer is the simplest way to support all cases. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- As suggested, reduce the number of cases here and use array initializer in C++. tools/widl/header.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index bea5da124a4..16c8b57fd6e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1880,11 +1880,15 @@ static void write_runtimeclass(FILE *header, type_t *runtimeclass) if (contract) write_apicontract_guard_start(header, contract); fprintf(header, "#ifndef RUNTIMECLASS_%s_DEFINED\n", c_name); fprintf(header, "#define RUNTIMECLASS_%s_DEFINED\n", c_name); - fprintf(header, "#if defined(_MSC_VER) || defined(__MINGW32__)\n"); + fprintf(header, "#if !defined(_MSC_VER) && !defined(__MINGW32__)\n"); + fprintf(header, "static const WCHAR RuntimeClass_%s[] = {", c_name); + for (i = 0, len = strlen(name); i < len; ++i) fprintf(header, "'%c',", name[i]); + fprintf(header, "0};\n"); + fprintf(header, "#elif defined(__GNUC__) && !defined(__cplusplus)\n"); /* FIXME: MIDL generates extern const here but GCC warns if extern is initialized */ fprintf(header, "const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = L\"%s\";\n", c_name, name); fprintf(header, "#else\n"); - fprintf(header, "static const WCHAR RuntimeClass_%s[] = {", c_name); + fprintf(header, "extern const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = {", c_name); for (i = 0, len = strlen(name); i < len; ++i) fprintf(header, "'%c',", name[i]); fprintf(header, "0};\n"); fprintf(header, "#endif\n"); -- 2.30.0

2 1

[PATCH 4/4] include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode.
by Jacek Caban 26 Feb '21

26 Feb '21

It's not yet supported on aarch64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes building for aarch64 in msvc mode. include/winnt.h | 60 ++++++++++++++++++++++++------------------------- 1 file changed, 30 insertions(+), 30 deletions(-)

1 0

[PATCH 3/4] include: Add MSVC ARM version of NtCurrentTeb.
by Jacek Caban 26 Feb '21

26 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- With that headers seem good enough for ARM MSVC builds, but many modules will not link due to missing 64-bit integer support functions. include/winnt.h | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[PATCH 2/4] include: Fix __dmb declaration.
by Jacek Caban 26 Feb '21

26 Feb '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/msvcrt/intrin.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 13 +++++-------- 2 files changed, 45 insertions(+), 8 deletions(-)

1 0

[PATCH 1/4] include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Jacek Caban 26 Feb '21

26 Feb '21

From: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- I'm resending it unmodified as part of a series to avoid conflicts with my patcher. include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/4] widl: Fix C++ RuntimeClass string constants declaration.
by Rémi Bernon 26 Feb '21

26 Feb '21

MinGW g++ requires initialized selectany to have extern linkage. When supported, we define WCHAR as char16_t, which requires u"" string literal. When not supported, and when WCHAR is unsigned short, it then requires to use an array initializer instead of a L"" string literal. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/widl/header.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index a472af49066..23de3e12aca 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1836,8 +1836,18 @@ static void write_runtimeclass(FILE *header, type_t *runtimeclass) fprintf(header, "#ifndef RUNTIMECLASS_%s_DEFINED\n", c_name); fprintf(header, "#define RUNTIMECLASS_%s_DEFINED\n", c_name); fprintf(header, "#if defined(_MSC_VER) || defined(__MINGW32__)\n"); + fprintf(header, "#ifdef __cplusplus\n"); + fprintf(header, "#if defined(WINE_UNICODE_NATIVE)\n"); + fprintf(header, "extern const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = L\"%s\";\n", c_name, name); + fprintf(header, "#else\n"); + fprintf(header, "extern const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = {", c_name); + for (i = 0, len = strlen(name); i < len; ++i) fprintf(header, "'%c',", name[i]); + fprintf(header, "0};\n"); + fprintf(header, "#endif /* __cplusplus */\n"); + fprintf(header, "#else\n"); /* FIXME: MIDL generates extern const here but GCC warns if extern is initialized */ fprintf(header, "const DECLSPEC_SELECTANY WCHAR RuntimeClass_%s[] = L\"%s\";\n", c_name, name); + fprintf(header, "#endif\n"); fprintf(header, "#else\n"); fprintf(header, "static const WCHAR RuntimeClass_%s[] = {", c_name); for (i = 0, len = strlen(name); i < len; ++i) fprintf(header, "'%c',", name[i]); -- 2.30.0

2 11

[PATCH vkd3d] vkd3d-shader: Keep track of declared SPIR-V output components.
by Henri Verbeet 26 Feb '21

26 Feb '21

Much like we do for input components, for much of the same reasons. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 93 +++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 56 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1448d3b4..a7361aa5 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4657,6 +4657,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler enum vkd3d_shader_component_type component_type; const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_shader_phase *phase; + struct vkd3d_symbol *symbol = NULL; struct vkd3d_symbol reg_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; @@ -4692,6 +4693,7 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler component_type = builtin->component_type; if (!builtin->spirv_array_size) output_component_count = builtin->component_count; + component_idx = 0; } else { @@ -4717,23 +4719,24 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_symbol_make_register(&reg_symbol, reg); - if (compiler->output_info[signature_idx].id) - { - id = compiler->output_info[signature_idx].id; - if (compiler->output_info[signature_idx].array_element_mask) - { - use_private_variable = true; - write_mask = VKD3DSP_WRITEMASK_ALL; - entry = rb_get(&compiler->symbol_table, &reg_symbol); - } - } - else if (!use_private_variable && (entry = rb_get(&compiler->symbol_table, &reg_symbol))) + if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { - id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; + symbol = RB_ENTRY_VALUE(entry, struct vkd3d_symbol, entry); + id = symbol->id; } - else + + if (!symbol || ~symbol->info.reg.dcl_mask & signature_element->mask) { - if (builtin) + if (compiler->output_info[signature_idx].id) + { + id = compiler->output_info[signature_idx].id; + if (compiler->output_info[signature_idx].array_element_mask) + { + use_private_variable = true; + write_mask = VKD3DSP_WRITEMASK_ALL; + } + } + else if (builtin) { if (phase) id = vkd3d_dxbc_compiler_emit_shader_phase_builtin_variable(compiler, phase, builtin); @@ -4745,9 +4748,6 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler calculate_sysval_array_mask(compiler, shader_signature, sysval); vkd3d_dxbc_compiler_emit_register_execution_mode(compiler, &dst->reg); - - if (component_idx) - FIXME("Unhandled component index %u.\n", component_idx); } else { @@ -4778,25 +4778,22 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler vkd3d_spirv_build_op_decorate(builder, id, SpvDecorationPatch, NULL, 0); vkd3d_dxbc_compiler_decorate_xfb_output(compiler, id, output_component_count, signature_element); - } - - compiler->output_info[signature_idx].id = id; - compiler->output_info[signature_idx].component_type = component_type; - if (use_private_variable) - storage_class = SpvStorageClassPrivate; + compiler->output_info[signature_idx].id = id; + compiler->output_info[signature_idx].component_type = component_type; + } - if (entry) - var_id = RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry)->id; - else if (!use_private_variable) - var_id = id; - else if (is_patch_constant) - var_id = compiler->hs.patch_constants_id; - else - var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, - storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); - if (!entry) + if (!symbol) { + var_id = id; + if (use_private_variable) + storage_class = SpvStorageClassPrivate; + if (is_patch_constant) + var_id = compiler->hs.patch_constants_id; + else if (use_private_variable) + var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + storage_class, VKD3D_SHADER_COMPONENT_FLOAT, VKD3D_VEC4_SIZE); + vkd3d_symbol_set_register_info(&reg_symbol, var_id, storage_class, use_private_variable ? VKD3D_SHADER_COMPONENT_FLOAT : component_type, write_mask); reg_symbol.info.reg.is_aggregate = use_private_variable ? is_patch_constant : array_size; @@ -4816,6 +4813,11 @@ static void vkd3d_dxbc_compiler_emit_output(struct vkd3d_dxbc_compiler *compiler if (!is_patch_constant) vkd3d_dxbc_compiler_emit_register_debug_name(builder, var_id, reg); } + else + { + symbol->info.reg.dcl_mask |= signature_element->mask; + var_id = symbol->id; + } if (use_private_variable) { @@ -6100,33 +6102,12 @@ static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *c } } - if (phase->type == VKD3DSIH_HS_FORK_PHASE || phase->type == VKD3DSIH_HS_JOIN_PHASE) - { - signature = compiler->patch_constant_signature; - - memset(&reg, 0, sizeof(reg)); - reg.idx[1].offset = ~0u; - - for (i = 0; i < signature->element_count; ++i) - { - const struct vkd3d_shader_signature_element *e = &signature->elements[i]; - - reg.type = VKD3DSPR_OUTPUT; - reg.idx[0].offset = e->register_index; - vkd3d_symbol_make_register(&reg_symbol, &reg); - - if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) - { - rb_remove(&compiler->symbol_table, entry); - vkd3d_symbol_free(entry, NULL); - } - } - } - if (phase->instance_count) { + memset(&reg, 0, sizeof(reg)); reg.type = phase->type == VKD3DSIH_HS_FORK_PHASE ? VKD3DSPR_FORKINSTID : VKD3DSPR_JOININSTID; reg.idx[0].offset = ~0u; + reg.idx[1].offset = ~0u; vkd3d_symbol_make_register(&reg_symbol, &reg); if ((entry = rb_get(&compiler->symbol_table, &reg_symbol))) { -- 2.11.0

1 0

[PATCH] kernelbase: Fix GetFileVersionInfo*() crashes with malformed resources.
by Arkadiusz Hiler 26 Feb '21

26 Feb '21

Some Unity games ship with an encrypted Assembly-CSharp.dll, including the resources directory, yet the engine still calls GetFileVersionInfoSizeW() on those files. This may results in a page fault when trying to find the version resource and takes the whole process down. The change fixes crashes when launching Home Behind 2 and Crown Trick. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50075 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> --- dlls/kernelbase/version.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index 58c49aa148b..a7b55de9706 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -42,6 +42,7 @@ #include "kernelbase.h" #include "wine/debug.h" +#include "wine/exception.h" WINE_DEFAULT_DEBUG_CHANNEL(ver); @@ -547,15 +548,23 @@ static DWORD find_version_resource( HANDLE handle, DWORD *reslen, DWORD *offset, if (read_data( handle, mzh.e_lfanew, &magic, sizeof(magic) ) != sizeof(magic)) return 0; *offset = mzh.e_lfanew; - switch (magic) + __TRY { - case IMAGE_OS2_SIGNATURE: - if (!find_ne_resource( handle, reslen, offset )) magic = 0; - break; - case IMAGE_NT_SIGNATURE: - if (!find_pe_resource( handle, reslen, offset, flags )) magic = 0; - break; + switch (magic) + { + case IMAGE_OS2_SIGNATURE: + if (!find_ne_resource( handle, reslen, offset )) magic = 0; + break; + case IMAGE_NT_SIGNATURE: + if (!find_pe_resource( handle, reslen, offset, flags )) magic = 0; + break; + } } + __EXCEPT_PAGE_FAULT + { + magic = 0; + } + __ENDTRY WARN( "Can't handle %04x files.\n", magic ); return magic; } -- 2.30.1

1 0

[PATCH] include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Dmitry Timoshkov 26 Feb '21

26 Feb '21

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 48f1715c3b6..3a9d13b055c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6944,7 +6944,7 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); + return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); } #ifdef _WIN64 -- 2.30.1

1 0