September 2023 - Wine-Commits

Conor McCarthy : vkd3d-shader/dxil: Convert into an error the warning for an unhandled instrinsic.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: f61c853f61027247673ac6432732642fe37bf79c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/f61c853f61027247673ac64327326… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Mon Sep 25 12:12:29 2023 +1000 vkd3d-shader/dxil: Convert into an error the warning for an unhandled instrinsic. --- libs/vkd3d-shader/dxil.c | 2 +- libs/vkd3d-shader/vkd3d_shader_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 285c4cfd..bb50ad62 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2407,7 +2407,7 @@ static void sm6_parser_decode_dx_op(struct sm6_parser *sm6, struct sm6_block *co if (op >= ARRAY_SIZE(sm6_dx_op_table) || !sm6_dx_op_table[op].operand_info) { FIXME("Unhandled dx intrinsic function id %u, '%s'.\n", op, name); - vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_UNHANDLED_INTRINSIC, + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC, "Call to intrinsic function %s is unhandled.", name); sm6_parser_emit_unhandled(sm6, ins, dst); return; diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 5b36cc53..af75ef3b 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -175,13 +175,13 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_TYPE_ID = 8010, VKD3D_SHADER_ERROR_DXIL_INVALID_MODULE = 8011, VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND = 8012, + VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC = 8013, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, VKD3D_SHADER_WARNING_DXIL_INVALID_BLOCK_LENGTH = 8302, VKD3D_SHADER_WARNING_DXIL_INVALID_MODULE_LENGTH = 8303, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, - VKD3D_SHADER_WARNING_DXIL_UNHANDLED_INTRINSIC = 8305, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0

Conor McCarthy : vkd3d-shader/dxil: Do not access null code blocks on failure.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: b30b95e8240e8359fedc85c5eab58e109cde94c3 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b30b95e8240e8359fedc85c5eab58… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 14 19:00:00 2023 +1000 vkd3d-shader/dxil: Do not access null code blocks on failure. --- libs/vkd3d-shader/dxil.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index e3dcfb79..285c4cfd 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -2522,11 +2522,11 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const struct sm6_function *function) { struct vkd3d_shader_instruction *ins; + size_t i, block_idx, block_count; const struct dxil_record *record; bool ret_found, is_terminator; struct sm6_block *code_block; struct sm6_value *dst; - size_t i, block_idx; if (sm6->function_count) { @@ -2552,12 +2552,12 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const return VKD3D_ERROR_INVALID_SHADER; } - if (!(function->block_count = block->records[0]->operands[0])) + if (!(block_count = block->records[0]->operands[0])) { WARN("Function contains no blocks.\n"); return VKD3D_ERROR_INVALID_SHADER; } - if (function->block_count > 1) + if (block_count > 1) { FIXME("Branched shaders are not supported yet.\n"); return VKD3D_ERROR_INVALID_SHADER; @@ -2568,6 +2568,7 @@ static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const ERR("Failed to allocate code block.\n"); return VKD3D_ERROR_OUT_OF_MEMORY; } + function->block_count = block_count; code_block = function->blocks[0]; sm6->cur_max_value = function->value_count;

1 0

Andrey Gusev : vkd3d: Add ID3D12Device3 interface stub.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 56cd609308cd51f56532b732f111a11b784c5c99 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/56cd609308cd51f56532b732f111a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 26 15:08:44 2023 +0300 vkd3d: Add ID3D12Device3 interface stub. --- libs/vkd3d/device.c | 221 ++++++++++++++++++++++++++------------------- libs/vkd3d/resource.c | 2 +- libs/vkd3d/vkd3d_main.c | 4 +- libs/vkd3d/vkd3d_private.h | 12 +-- 4 files changed, 135 insertions(+), 104 deletions(-)

1 0

Giovanni Mascellani : tests: Work around a MoltenVK bug in test_tgsm().
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 4374d45655ab0661f2f95755f13dba3537083392 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4374d45655ab0661f2f95755f13db… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Mon Sep 25 22:32:47 2023 +0200 tests: Work around a MoltenVK bug in test_tgsm(). --- tests/d3d12.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 3f2fc91b..6ffcd92e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21638,6 +21638,7 @@ static void test_tgsm(void) /* cs_structured_tgsm */ reset_command_list(command_list, context.allocator); + bug_if(is_mvk_device(context.device)) context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, cs_structured_tgsm); buffer2 = create_default_buffer(device, 1024, @@ -21690,7 +21691,8 @@ static void test_tgsm(void) } release_resource_readback(&rb); - ID3D12PipelineState_Release(context.pipeline_state); + if (context.pipeline_state) + ID3D12PipelineState_Release(context.pipeline_state); /* cs_structured_tgsm_float */ reset_command_list(command_list, context.allocator);

1 0

Giovanni Mascellani : vkd3d: Expose the image view usage to Vulkan.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 83ddfb9e8d3d38a2ed24dfefba560f1156e91966 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/83ddfb9e8d3d38a2ed24dfefba560… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 21 23:10:25 2023 +0200 vkd3d: Expose the image view usage to Vulkan. This prevents a failure with MoltenVK, which is not able to create 2D-array view for any usage other than color attachment. --- libs/vkd3d/command.c | 1 + libs/vkd3d/device.c | 1 + libs/vkd3d/resource.c | 18 ++++++++++++++++++ libs/vkd3d/vkd3d_private.h | 2 ++ 4 files changed, 22 insertions(+) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 3be45120..4ac0329f 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5462,6 +5462,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_ClearUnorderedAccessViewUint(ID view_desc.layer_idx = view->info.texture.layer_idx; view_desc.layer_count = view->info.texture.layer_count; view_desc.vk_image_aspect = VK_IMAGE_ASPECT_COLOR_BIT; + view_desc.usage = VK_IMAGE_USAGE_STORAGE_BIT; if (!vkd3d_create_texture_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, resource_impl->u.vk_image, &view_desc, &uint_view)) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 69727e09..a5746ce9 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -83,6 +83,7 @@ static const struct vkd3d_optional_extension_info optional_device_extensions[] = VK_EXTENSION(KHR_DRAW_INDIRECT_COUNT, KHR_draw_indirect_count), VK_EXTENSION(KHR_GET_MEMORY_REQUIREMENTS_2, KHR_get_memory_requirements2), VK_EXTENSION(KHR_IMAGE_FORMAT_LIST, KHR_image_format_list), + VK_EXTENSION(KHR_MAINTENANCE2, KHR_maintenance2), VK_EXTENSION(KHR_MAINTENANCE3, KHR_maintenance3), VK_EXTENSION(KHR_PUSH_DESCRIPTOR, KHR_push_descriptor), VK_EXTENSION(KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE, KHR_sampler_mirror_clamp_to_edge), diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 0dfb4d37..3ff533df 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2998,6 +2998,7 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, desc->components.b = VK_COMPONENT_SWIZZLE_IDENTITY; desc->components.a = VK_COMPONENT_SWIZZLE_IDENTITY; desc->allowed_swizzle = false; + desc->usage = 0; return true; } @@ -3039,6 +3040,7 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, uint32_t magic, VkIm { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; const struct vkd3d_format *format = desc->format; + VkImageViewUsageCreateInfoKHR usage_desc; struct VkImageViewCreateInfo view_desc; VkImageView vk_view = VK_NULL_HANDLE; struct vkd3d_view *object; @@ -3060,6 +3062,13 @@ bool vkd3d_create_texture_view(struct d3d12_device *device, uint32_t magic, VkIm view_desc.subresourceRange.levelCount = desc->miplevel_count; view_desc.subresourceRange.baseArrayLayer = desc->layer_idx; view_desc.subresourceRange.layerCount = desc->layer_count; + if (device->vk_info.KHR_maintenance2) + { + usage_desc.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_USAGE_CREATE_INFO; + usage_desc.pNext = NULL; + usage_desc.usage = desc->usage; + view_desc.pNext = &usage_desc; + } if ((vr = VK_CALL(vkCreateImageView(device->vk_device, &view_desc, NULL, &vk_view))) < 0) { WARN("Failed to create Vulkan image view, vr %d.\n", vr); @@ -3196,6 +3205,7 @@ static void vkd3d_create_null_srv(struct d3d12_desc *descriptor, vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_ZERO; vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_ZERO; vkd3d_desc.allowed_swizzle = true; + vkd3d_desc.usage = VK_IMAGE_USAGE_SAMPLED_BIT; vkd3d_create_texture_view(device, VKD3D_DESCRIPTOR_MAGIC_SRV, vk_image, &vkd3d_desc, &descriptor->s.u.view); } @@ -3268,6 +3278,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = VK_REMAINING_MIP_LEVELS; vkd3d_desc.allowed_swizzle = true; + vkd3d_desc.usage = VK_IMAGE_USAGE_SAMPLED_BIT; if (desc) { @@ -3421,6 +3432,7 @@ static void vkd3d_create_null_uav(struct d3d12_desc *descriptor, vkd3d_desc.components.b = VK_COMPONENT_SWIZZLE_B; vkd3d_desc.components.a = VK_COMPONENT_SWIZZLE_A; vkd3d_desc.allowed_swizzle = false; + vkd3d_desc.usage = VK_IMAGE_USAGE_STORAGE_BIT; vkd3d_create_texture_view(device, VKD3D_DESCRIPTOR_MAGIC_UAV, vk_image, &vkd3d_desc, &descriptor->s.u.view); } @@ -3480,6 +3492,8 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; + vkd3d_desc.usage = VK_IMAGE_USAGE_STORAGE_BIT; + if (vkd3d_format_is_compressed(vkd3d_desc.format)) { WARN("UAVs cannot be created for compressed formats.\n"); @@ -3747,6 +3761,8 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; + vkd3d_desc.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + if (vkd3d_desc.format->vk_aspect_mask != VK_IMAGE_ASPECT_COLOR_BIT) { WARN("Trying to create RTV for depth/stencil format %#x.\n", vkd3d_desc.format->dxgi_format); @@ -3847,6 +3863,8 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev if (!init_default_texture_view_desc(&vkd3d_desc, resource, desc ? desc->Format : 0)) return; + vkd3d_desc.usage = VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT; + if (!(vkd3d_desc.format->vk_aspect_mask & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) { WARN("Trying to create DSV for format %#x.\n", vkd3d_desc.format->dxgi_format); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fceb06fc..0fa63e1f 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -121,6 +121,7 @@ struct vkd3d_vulkan_info bool KHR_draw_indirect_count; bool KHR_get_memory_requirements2; bool KHR_image_format_list; + bool KHR_maintenance2; bool KHR_maintenance3; bool KHR_push_descriptor; bool KHR_sampler_mirror_clamp_to_edge; @@ -835,6 +836,7 @@ struct vkd3d_texture_view_desc VkImageAspectFlags vk_image_aspect; VkComponentMapping components; bool allowed_swizzle; + VkImageUsageFlags usage; }; struct vkd3d_desc_header

1 0

Giovanni Mascellani : ci: Wrap complex commands in CI scripts.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 2dd4211b77724cc14fc1b521788111efb578cc39 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2dd4211b77724cc14fc1b52178811… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Sep 22 10:51:48 2023 +0200 ci: Wrap complex commands in CI scripts. --- gitlab/build-crosstest | 4 +++- gitlab/build-linux | 5 ++++- gitlab/build-mac | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index d5f6ae00..7963e58b 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -14,7 +14,9 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && make -j$(nproc) crosstest || touch ../pipeline_failed +../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && \ + make -j$(nproc) crosstest || \ + touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT rsync -Rr tests/*.exe ../artifacts/$COMMIT diff --git a/gitlab/build-linux b/gitlab/build-linux index b6071ef9..318bbba4 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,7 +11,10 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos && make -j$(nproc) && make -j$(nproc) check || touch ../pipeline_failed +../configure --enable-demos && \ + make -j$(nproc) && \ + make -j$(nproc) check || \ + touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT diff --git a/gitlab/build-mac b/gitlab/build-mac index 401bdc5a..ffa46d67 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,7 +11,10 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed +../configure && \ + make -j$(sysctl -n hw.ncpu) && \ + make -j$(sysctl -n hw.ncpu) check || \ + touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT

1 0

Giovanni Mascellani : ci: Build crosstests with -Wno-array-bounds.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 335f9fb31e2c9a98b8365b0ee7b14e73570a8339 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/335f9fb31e2c9a98b8365b0ee7b14… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Sep 22 10:50:38 2023 +0200 ci: Build crosstests with -Wno-array-bounds. --- gitlab/build-crosstest | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest index 99997ffa..d5f6ae00 100755 --- a/gitlab/build-crosstest +++ b/gitlab/build-crosstest @@ -7,11 +7,14 @@ COMMIT=$(git rev-parse --short HEAD) set -Eeuxo pipefail +# Building with -Wno-array-bounds because MinGW headers currently emit +# a lot of those + ./autogen.sh rm -fr build mkdir build cd build -../configure && make -j$(nproc) crosstest || touch ../pipeline_failed +../configure CROSSCC32="i686-w64-mingw32-gcc -Wno-array-bounds" CROSSCC64="x86_64-w64-mingw32-gcc -Wno-array-bounds" && make -j$(nproc) crosstest || touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT rsync -Rr tests/*.exe ../artifacts/$COMMIT

1 0

Giovanni Mascellani : ci: Build crosstests in a dedicated CI job.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: vkd3d Branch: master Commit: 81da13b9e296cb0a84cc648e3d26b8f0139461d1 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/81da13b9e296cb0a84cc648e3d26b… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Thu Sep 21 15:35:11 2023 +0200 ci: Build crosstests in a dedicated CI job. Mostly to avoid polluting other logs and artifacts, and also to avoid recompiling crosstests over and over. Eventually the artifacts produced at this stage should be run on native Windows. --- gitlab/build-crosstest | 19 +++++++++++++++++++ gitlab/build-linux | 4 ++-- gitlab/build-mac | 4 ++-- gitlab/build.yml | 26 ++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 4 deletions(-) diff --git a/gitlab/build-crosstest b/gitlab/build-crosstest new file mode 100755 index 00000000..99997ffa --- /dev/null +++ b/gitlab/build-crosstest @@ -0,0 +1,19 @@ +#!/bin/bash + +echo "Building $(git log -1)" +echo "---" + +COMMIT=$(git rev-parse --short HEAD) + +set -Eeuxo pipefail + +./autogen.sh +rm -fr build +mkdir build +cd build +../configure && make -j$(nproc) crosstest || touch ../pipeline_failed + +mkdir -p ../artifacts/$COMMIT +rsync -Rr tests/*.exe ../artifacts/$COMMIT + +git reset --hard diff --git a/gitlab/build-linux b/gitlab/build-linux index 4162442d..b6071ef9 100755 --- a/gitlab/build-linux +++ b/gitlab/build-linux @@ -11,9 +11,9 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure --enable-demos && make -j$(nproc) && make -j$(nproc) crosstest && make -j$(nproc) check || touch ../pipeline_failed +../configure --enable-demos && make -j$(nproc) && make -j$(nproc) check || touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr doc/* tests/*.exe test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr doc/* test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build-mac b/gitlab/build-mac index e423330e..401bdc5a 100755 --- a/gitlab/build-mac +++ b/gitlab/build-mac @@ -11,9 +11,9 @@ set -Eeuxo pipefail rm -fr build mkdir build cd build -../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) crosstest && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed +../configure && make -j$(sysctl -n hw.ncpu) && make -j$(sysctl -n hw.ncpu) check || touch ../pipeline_failed mkdir -p ../artifacts/$COMMIT -rsync -Rr tests/*.exe test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT +rsync -Rr test-suite.log tests/*.log tests/*/*.log ../artifacts/$COMMIT git reset --hard diff --git a/gitlab/build.yml b/gitlab/build.yml index 7cc88f1f..e78e7081 100644 --- a/gitlab/build.yml +++ b/gitlab/build.yml @@ -56,6 +56,32 @@ build-llvmpipe-32: CC: 'gcc -m32' VKD3D_SHADER_CONFIG: 'force_validation' +build-crosstest: + stage: build + rules: + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' + image: $CI_REGISTRY/wine/vkd3d:debian-bookworm + interruptible: true + needs: + - job: build-image + optional: true + dependencies: [] + script: + - git config --global --add safe.directory $CI_PROJECT_DIR + - git clean -fdx + - git reset --hard + - rm -fr .git/rebase-merge + - mkdir artifacts + - cat /proc/cpuinfo > artifacts/cpuinfo.txt + - cat /proc/meminfo > artifacts/meminfo.txt + - vulkaninfo > artifacts/vulkaninfo.txt + - git rebase $CI_MERGE_REQUEST_DIFF_BASE_SHA --exec ./gitlab/build-crosstest + - if [ -f pipeline_failed ] ; then exit 1 ; fi + artifacts: + when: always + paths: + - artifacts + build-mac: stage: build rules:

1 0

Alexandre Julliard : server: Require ASLR support on non-x86 platforms.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 256977973970d32a051f32752f09e07d00893b22 URL: https://gitlab.winehq.org/wine/wine/-/commit/256977973970d32a051f32752f09e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 19:13:01 2023 +0200 server: Require ASLR support on non-x86 platforms. --- server/mapping.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/server/mapping.c b/server/mapping.c index 0a69261c0ee..2d0a0b783e2 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -726,6 +726,15 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_32bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_I386) /* non-x86 platforms are more strict */ + { + if (nt.opt.hdr32.SectionAlignment & page_mask) + return STATUS_INVALID_IMAGE_FORMAT; + if (!(nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) + return STATUS_INVALID_IMAGE_FORMAT; + if (!(nt.opt.hdr32.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE)) + return STATUS_INVALID_IMAGE_FORMAT; + } if (nt.opt.hdr32.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) { clr_va = nt.opt.hdr32.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress; @@ -760,6 +769,15 @@ static unsigned int get_image_params( struct mapping *mapping, file_pos_t file_s if (!is_machine_64bit( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; if (!is_machine_supported( nt.FileHeader.Machine )) return STATUS_INVALID_IMAGE_FORMAT; + if (nt.FileHeader.Machine != IMAGE_FILE_MACHINE_AMD64) /* non-x86 platforms are more strict */ + { + if (nt.opt.hdr64.SectionAlignment & page_mask) + return STATUS_INVALID_IMAGE_FORMAT; + if (!(nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_NX_COMPAT)) + return STATUS_INVALID_IMAGE_FORMAT; + if (!(nt.opt.hdr64.DllCharacteristics & IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE)) + return STATUS_INVALID_IMAGE_FORMAT; + } if (nt.opt.hdr64.NumberOfRvaAndSizes > IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR) { clr_va = nt.opt.hdr64.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;

1 0

Alexandre Julliard : winebuild: Set ASLR-related dll flags by default.
by Alexandre Julliard Sept. 26, 2023

Sept. 26, 2023

Module: wine Branch: master Commit: 518e394794160818ffe6826c874ff2f550c95bbb URL: https://gitlab.winehq.org/wine/wine/-/commit/518e394794160818ffe6826c874ff2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Sep 25 19:07:47 2023 +0200 winebuild: Set ASLR-related dll flags by default. --- tools/winebuild/build.h | 14 ++++++++++++-- tools/winebuild/main.c | 5 +++++ tools/winebuild/utils.c | 2 +- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/tools/winebuild/build.h b/tools/winebuild/build.h index dfa8574a5da..96bb0ce16c5 100644 --- a/tools/winebuild/build.h +++ b/tools/winebuild/build.h @@ -216,8 +216,18 @@ static inline int is_pe(void) #define IMAGE_FILE_UP_SYSTEM_ONLY 0x4000 #define IMAGE_FILE_BYTES_REVERSED_HI 0x8000 -#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ -#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_PREFER_NATIVE 0x0010 /* Wine extension */ +#define IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA 0x0020 +#define IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE 0x0040 +#define IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY 0x0080 +#define IMAGE_DLLCHARACTERISTICS_NX_COMPAT 0x0100 +#define IMAGE_DLLCHARACTERISTICS_NO_ISOLATION 0x0200 +#define IMAGE_DLLCHARACTERISTICS_NO_SEH 0x0400 +#define IMAGE_DLLCHARACTERISTICS_NO_BIND 0x0800 +#define IMAGE_DLLCHARACTERISTICS_APPCONTAINER 0x1000 +#define IMAGE_DLLCHARACTERISTICS_WDM_DRIVER 0x2000 +#define IMAGE_DLLCHARACTERISTICS_GUARD_CF 0x4000 +#define IMAGE_DLLCHARACTERISTICS_TERMINAL_SERVER_AWARE 0x8000 #define IMAGE_SUBSYSTEM_NATIVE 1 #define IMAGE_SUBSYSTEM_WINDOWS_GUI 2 diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index c5f5b56c20e..ac925471771 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -641,9 +641,14 @@ int main(int argc, char **argv) /* fall through */ case MODE_EXE: if (get_ptr_size() == 4) + { spec->characteristics |= IMAGE_FILE_32BIT_MACHINE; + } else + { spec->characteristics |= IMAGE_FILE_LARGE_ADDRESS_AWARE; + spec->dll_characteristics |= IMAGE_DLLCHARACTERISTICS_HIGH_ENTROPY_VA; + } files = load_resources( files, spec ); if (spec_file_name && !parse_input_file( spec )) break; diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index 64437acf9ce..77478476b1c 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -629,7 +629,7 @@ DLLSPEC *alloc_dll_spec(void) spec->subsystem_major = 4; spec->subsystem_minor = 0; spec->syscall_table = 0; - spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT; + spec->dll_characteristics = IMAGE_DLLCHARACTERISTICS_NX_COMPAT | IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE; return spec; }

1 0