October 2023 - Wine-commits

Giovanni Mascellani : tests: Skip test_execute_indirect() on WARP.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: fe88dafdbd655534472aa9bc3cab0196fa3e5a0a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/fe88dafdbd655534472aa9bc3cab0… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 13:54:20 2023 +0200 tests: Skip test_execute_indirect() on WARP. The device is eventually lost, indirect commands are likely not supported on WARP. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 0be155da..9e859b4f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -24530,6 +24530,12 @@ static void test_execute_indirect(void) static const uint32_t count_data[] = {2, 1}; static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + if (test_options.use_warp_device) + { + skip("Broken on WARP.\n"); + return; + } + memset(&desc, 0, sizeof(desc)); desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT; desc.no_pipeline = true;

1 0

Giovanni Mascellani : tests: Skip test_unbounded_resource_arrays() on WARP.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 0d4a5f18601ec357b4df169ac6604d134297da06 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d4a5f18601ec357b4df169ac6604… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 13:54:54 2023 +0200 tests: Skip test_unbounded_resource_arrays() on WARP. Most reads on WARP are off by a few units. I haven't investigated the reason. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e859b4f..02c36c43 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -36063,6 +36063,12 @@ static void test_unbounded_resource_arrays(void) 0x00100556, 0x00000000, 0x01000015, 0x0100003e, }; + if (test_options.use_warp_device) + { + skip("Broken on WARP.\n"); + return; + } + if (!init_compute_test_context(&context)) return; device = context.device;

1 0

Giovanni Mascellani : tests: Skip test_atomic_instructions() on WARP.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: eaf35c394d949c16e6694a7cefde64a83c2c36c9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/eaf35c394d949c16e6694a7cefde6… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Oct 13 14:15:02 2023 +0200 tests: Skip test_atomic_instructions() on WARP. Pipeline creation fails with E_INVALIDARG, atomics are likely not supported on WARP. --- tests/d3d12.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 02c36c43..c2a6ca92 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -23325,6 +23325,12 @@ static void test_atomic_instructions(void) {{~0u, ~0u}, { 0}, {0xffff, ~0u, 0}, {0xffff, 0, ~0u}}, }; + if (test_options.use_warp_device) + { + skip("Broken on WARP.\n"); + return; + } + memset(&desc, 0, sizeof(desc)); desc.rt_width = 1; desc.rt_height = 1;

1 0

Henri Verbeet : vkd3d-utils: Check for a NULL 'blob' pointer in D3DCreateBlob().
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 47d4097efaa616452c10b708d878136fa3528c8e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/47d4097efaa616452c10b708d8781… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Sep 21 16:49:11 2023 +0200 vkd3d-utils: Check for a NULL 'blob' pointer in D3DCreateBlob(). --- libs/vkd3d-utils/vkd3d_utils_main.c | 6 ++++++ libs/vkd3d-utils/vkd3d_utils_private.h | 4 ++++ tests/hlsl_d3d12.c | 24 ++++++++++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index b0c025f4..e7985e3c 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -537,6 +537,12 @@ HRESULT WINAPI D3DCreateBlob(SIZE_T data_size, ID3DBlob **blob) TRACE("data_size %lu, blob %p.\n", data_size, blob); + if (!blob) + { + WARN("Invalid 'blob' pointer specified.\n"); + return D3DERR_INVALIDCALL; + } + if (!(data = vkd3d_calloc(data_size, 1))) return E_OUTOFMEMORY; diff --git a/libs/vkd3d-utils/vkd3d_utils_private.h b/libs/vkd3d-utils/vkd3d_utils_private.h index 1b8254b6..e0a697de 100644 --- a/libs/vkd3d-utils/vkd3d_utils_private.h +++ b/libs/vkd3d-utils/vkd3d_utils_private.h @@ -31,4 +31,8 @@ #include "vkd3d_memory.h" #include <vkd3d_utils.h> +#ifndef D3DERR_INVALIDCALL +#define D3DERR_INVALIDCALL _HRESULT_TYPEDEF_(0x8876086c) +#endif + #endif /* __VKD3D_UTILS_PRIVATE_H */ diff --git a/tests/hlsl_d3d12.c b/tests/hlsl_d3d12.c index ff29f1f7..de3737f6 100644 --- a/tests/hlsl_d3d12.c +++ b/tests/hlsl_d3d12.c @@ -20,6 +20,10 @@ #include "d3d12_crosstest.h" #include "vkd3d_common.h" +#ifndef D3DERR_INVALIDCALL +#define D3DERR_INVALIDCALL 0x8876086c +#endif + struct test_options test_options = {0}; #define check_preprocess(a, b, c, d, e) check_preprocess_(__LINE__, a, b, c, d, e) @@ -602,6 +606,25 @@ static void test_thread_id(void) destroy_test_context(&context); } +static void test_create_blob(void) +{ + unsigned int refcount; + ID3D10Blob *blob; + HRESULT hr; + + hr = D3DCreateBlob(1, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x.\n", hr); + + hr = D3DCreateBlob(0, NULL); + ok(hr == D3DERR_INVALIDCALL, "Got hr %#x.\n", hr); + + hr = D3DCreateBlob(0, &blob); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + refcount = ID3D10Blob_Release(blob); + ok(!refcount, "Got refcount %u.\n", refcount); +} + START_TEST(hlsl_d3d12) { parse_args(argc, argv); @@ -610,4 +633,5 @@ START_TEST(hlsl_d3d12) run_test(test_preprocess); run_test(test_thread_id); + run_test(test_create_blob); }

1 0

Henri Verbeet : tests: Use the same viewport origin and front-face orientation in the Vulkan and D3D runners.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: e53178f39502ba4ae0169a21f4f1cea5f54c4255 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e53178f39502ba4ae0169a21f4f1c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Oct 6 14:16:59 2023 +0200 tests: Use the same viewport origin and front-face orientation in the Vulkan and D3D runners. I.e., top-left origin, and clockwise front-facing. These end up cancelling each other out when drawing full-screen quads, but that's not necessarily true for other geometry. --- tests/shader_runner_vulkan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/shader_runner_vulkan.c b/tests/shader_runner_vulkan.c index ebb15eba..f89b4d62 100644 --- a/tests/shader_runner_vulkan.c +++ b/tests/shader_runner_vulkan.c @@ -599,7 +599,8 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru VkPipelineVertexInputStateCreateInfo input_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_VERTEX_INPUT_STATE_CREATE_INFO}; VkPipelineColorBlendStateCreateInfo blend_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_COLOR_BLEND_STATE_CREATE_INFO}; VkPipelineMultisampleStateCreateInfo ms_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_MULTISAMPLE_STATE_CREATE_INFO}; - static const VkViewport viewport = {.width = RENDER_TARGET_WIDTH, .height = RENDER_TARGET_HEIGHT, .maxDepth = 1}; + static const VkViewport viewport = {.y = RENDER_TARGET_HEIGHT, + .width = RENDER_TARGET_WIDTH, .height = -RENDER_TARGET_HEIGHT, .maxDepth = 1}; VkPipelineViewportStateCreateInfo vp_desc = {.sType = VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_STATE_CREATE_INFO}; static const VkRect2D rt_rect = {.extent.width = RENDER_TARGET_WIDTH, .extent.height = RENDER_TARGET_HEIGHT}; VkGraphicsPipelineCreateInfo pipeline_desc = {.sType = VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_CREATE_INFO}; @@ -699,6 +700,7 @@ static VkPipeline create_graphics_pipeline(const struct vulkan_shader_runner *ru vp_desc.pScissors = &rt_rect; rs_desc.cullMode = VK_CULL_MODE_NONE; + rs_desc.frontFace = VK_FRONT_FACE_CLOCKWISE; rs_desc.lineWidth = 1.0f; ms_desc.rasterizationSamples = VK_SAMPLE_COUNT_1_BIT; @@ -1190,6 +1192,7 @@ static bool get_graphics_queue_index(const struct vulkan_shader_runner *runner, static const char *const required_device_extensions[] = { VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, + VK_KHR_MAINTENANCE1_EXTENSION_NAME, }; static bool has_extension(const VkExtensionProperties *extensions, uint32_t count, const char *extension_name)

1 0

Conor McCarthy : vkd3d-shader/dxil: Validate the entry point info.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 62badbff7ac181318df2eb6489c6c15485cb8a0f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/62badbff7ac181318df2eb6489c6c… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 28 16:25:39 2023 +1000 vkd3d-shader/dxil: Validate the entry point info. --- libs/vkd3d-shader/dxil.c | 112 ++++++++++++++++++++++++++++--- libs/vkd3d-shader/vkd3d_shader_private.h | 2 + 2 files changed, 105 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 9e591af2..fdcb8401 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -358,6 +358,8 @@ struct sm6_parser struct sm6_symbol *global_symbols; size_t global_symbol_count; + const char *entry_point; + struct vkd3d_shader_dst_param *output_params; struct vkd3d_shader_dst_param *input_params; @@ -2710,6 +2712,11 @@ static bool sm6_metadata_value_is_node(const struct sm6_metadata_value *m) return m && m->type == VKD3D_METADATA_NODE; } +static bool sm6_metadata_value_is_string(const struct sm6_metadata_value *m) +{ + return m && m->type == VKD3D_METADATA_STRING; +} + static enum vkd3d_result sm6_parser_function_init(struct sm6_parser *sm6, const struct dxil_block *block, struct sm6_function *function) { @@ -3135,6 +3142,77 @@ static enum vkd3d_result sm6_parser_metadata_init(struct sm6_parser *sm6, const return VKD3D_OK; } +static const struct sm6_metadata_value *sm6_parser_find_named_metadata(struct sm6_parser *sm6, const char *name) +{ + const struct sm6_metadata_node *node; + unsigned int i; + + for (i = 0; i < sm6->named_metadata_count; ++i) + { + if (strcmp(sm6->named_metadata[i].name, name)) + continue; + + node = sm6->named_metadata[i].value.u.node; + if (!node->operand_count) + return NULL; + if (node->operand_count > 1) + { + FIXME("Ignoring %u extra operands for %s.\n", node->operand_count - 1, name); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS, + "Ignoring %u extra operands for metadata node %s.", node->operand_count - 1, name); + } + return node->operands[0]; + } + + return NULL; +} + +static enum vkd3d_result sm6_parser_entry_point_init(struct sm6_parser *sm6) +{ + const struct sm6_metadata_value *m = sm6_parser_find_named_metadata(sm6, "dx.entryPoints"); + const struct sm6_metadata_node *entry_node = m ? m->u.node : NULL; + const struct sm6_value *value; + + if (!entry_node || entry_node->operand_count < 2 || !(m = entry_node->operands[0])) + { + WARN("No entry point definition found.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "No entry point definition found in the metadata."); + return VKD3D_ERROR_INVALID_SHADER; + } + + if (m->type != VKD3D_METADATA_VALUE) + { + WARN("Entry point definition is not a value.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "Entry point definition is not a metadata value."); + return VKD3D_ERROR_INVALID_SHADER; + } + + value = m->u.value; + if (!sm6_value_is_function_dcl(value)) + { + WARN("Entry point value is not a function definition.\n"); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "Entry point metadata value does not contain a function definition."); + return VKD3D_ERROR_INVALID_SHADER; + } + + sm6->entry_point = value->u.function.name; + if (!sm6_metadata_value_is_string(entry_node->operands[1]) + || ascii_strcasecmp(sm6->entry_point, entry_node->operands[1]->u.string_value)) + { + WARN("Entry point function name %s mismatch.\n", sm6->entry_point); + vkd3d_shader_parser_warning(&sm6->p, VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH, + "Entry point function name %s does not match the name in metadata.", sm6->entry_point); + } + + sm6_parser_init_input_signature(sm6, &sm6->p.shader_desc.input_signature); + sm6_parser_init_output_signature(sm6, &sm6->p.shader_desc.output_signature); + + return VKD3D_OK; +} + static void sm6_metadata_value_destroy(struct sm6_metadata_value *m) { switch (m->type) @@ -3245,6 +3323,15 @@ static const struct vkd3d_shader_parser_ops sm6_parser_ops = .parser_destroy = sm6_parser_destroy, }; +static struct sm6_function *sm6_parser_get_function(const struct sm6_parser *sm6, const char *name) +{ + size_t i; + for (i = 0; i < sm6->function_count; ++i) + if (!ascii_strcasecmp(sm6->functions[i].declaration->u.function.name, name)) + return &sm6->functions[i]; + return NULL; +} + static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t *byte_code, size_t byte_code_size, const char *source_name, struct vkd3d_shader_message_context *message_context) { @@ -3257,6 +3344,7 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t enum bitcode_block_abbreviation abbr; struct vkd3d_shader_version version; struct dxil_block *block; + struct sm6_function *fn; enum vkd3d_result ret; unsigned int i, j; @@ -3469,8 +3557,8 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t return ret; } - sm6_parser_init_output_signature(sm6, output_signature); - sm6_parser_init_input_signature(sm6, input_signature); + if ((ret = sm6_parser_entry_point_init(sm6)) < 0) + return ret; if ((ret = sm6_parser_module_init(sm6, &sm6->root_block, 0)) < 0) { @@ -3494,14 +3582,20 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, const uint32_t sm6->p.shader_desc.ssa_count = sm6->ssa_next_id; - for (i = 0; i < sm6->function_count; ++i) + if (!(fn = sm6_parser_get_function(sm6, sm6->entry_point))) { - if (!sm6_block_emit_instructions(sm6->functions[i].blocks[0], sm6)) - { - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, - "Out of memory emitting shader instructions."); - return VKD3D_ERROR_OUT_OF_MEMORY; - } + WARN("Failed to find entry point %s.\n", sm6->entry_point); + vkd3d_shader_parser_error(&sm6->p, VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT, + "The definition of the entry point function '%s' was not found.", sm6->entry_point); + return VKD3D_ERROR_INVALID_SHADER; + } + + assert(sm6->function_count == 1); + if (!sm6_block_emit_instructions(fn->blocks[0], sm6)) + { + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXIL_OUT_OF_MEMORY, + "Out of memory emitting shader instructions."); + return VKD3D_ERROR_OUT_OF_MEMORY; } dxil_block_destroy(&sm6->root_block); diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 060647a6..a0140c67 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -177,6 +177,7 @@ enum vkd3d_shader_error VKD3D_SHADER_ERROR_DXIL_INVALID_OPERAND = 8012, VKD3D_SHADER_ERROR_DXIL_UNHANDLED_INTRINSIC = 8013, VKD3D_SHADER_ERROR_DXIL_INVALID_METADATA = 8014, + VKD3D_SHADER_ERROR_DXIL_INVALID_ENTRY_POINT = 8015, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_MAGIC_NUMBER = 8300, VKD3D_SHADER_WARNING_DXIL_UNKNOWN_SHADER_TYPE = 8301, @@ -184,6 +185,7 @@ enum vkd3d_shader_error VKD3D_SHADER_WARNING_DXIL_INVALID_MODULE_LENGTH = 8303, VKD3D_SHADER_WARNING_DXIL_IGNORING_OPERANDS = 8304, VKD3D_SHADER_WARNING_DXIL_TYPE_MISMATCH = 8305, + VKD3D_SHADER_WARNING_DXIL_ENTRY_POINT_MISMATCH = 8306, VKD3D_SHADER_ERROR_VSIR_NOT_IMPLEMENTED = 9000, VKD3D_SHADER_ERROR_VSIR_INVALID_HANDLER = 9001,

1 0

Conor McCarthy : vkd3d-shader/dxil: Read the DXIL input and output signatures.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: vkd3d Branch: master Commit: 8648ca0e776214ffa1538a791c15a9fcf29911fb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8648ca0e776214ffa1538a791c15a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu Sep 28 16:33:11 2023 +1000 vkd3d-shader/dxil: Read the DXIL input and output signatures. These can differ from the DXBC signatures by having multiple rows, and load/store instructions reference them by id instead of register index. --- libs/vkd3d-shader/dxbc.c | 2 + libs/vkd3d-shader/dxil.c | 358 ++++++++++++++++++++++++++++++- libs/vkd3d-shader/vkd3d_shader_private.h | 4 + 3 files changed, 360 insertions(+), 4 deletions(-)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .man.in files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: 4e9f1a41b9d828ddc17463e01efc46ece175adca URL: https://gitlab.winehq.org/wine/wine/-/commit/4e9f1a41b9d828ddc17463e01efc46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:43:34 2023 +0200 makefiles: Always use the global SOURCES variable for .man.in files. --- programs/msiexec/Makefile.in | 11 ++++------- programs/notepad/Makefile.in | 13 +++++-------- programs/regedit/Makefile.in | 11 ++++------- programs/regsvr32/Makefile.in | 10 ++++------ programs/wineboot/Makefile.in | 10 ++++------ programs/winecfg/Makefile.in | 14 +++++--------- programs/wineconsole/Makefile.in | 10 ++++------ programs/winedbg/Makefile.in | 15 ++++++--------- programs/winefile/Makefile.in | 13 +++++-------- programs/winemine/Makefile.in | 13 +++++-------- programs/winepath/Makefile.in | 6 +++--- server/Makefile.in | 8 +++----- tools/make_makefiles | 11 +---------- tools/widl/Makefile.in | 17 ++++++----------- tools/winebuild/Makefile.in | 6 +++--- tools/winedump/Makefile.in | 6 +++--- tools/winegcc/Makefile.in | 9 ++++----- tools/winemaker/Makefile.in | 2 +- tools/wmc/Makefile.in | 7 +++---- tools/wrc/Makefile.in | 19 +++++++------------ 20 files changed, 80 insertions(+), 131 deletions(-)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .svg files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: 2205218b24a4eebb07f97c3b17d9310d3b3aad3f URL: https://gitlab.winehq.org/wine/wine/-/commit/2205218b24a4eebb07f97c3b17d931… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:47:59 2023 +0200 makefiles: Always use the global SOURCES variable for .svg files. --- dlls/appwiz.cpl/Makefile.in | 9 ++---- dlls/comctl32/Makefile.in | 27 ++++++++---------- dlls/comdlg32/Makefile.in | 14 ++++------ dlls/credui/Makefile.in | 9 ++---- dlls/hhctrl.ocx/Makefile.in | 14 ++++------ dlls/ieframe/Makefile.in | 12 +++----- dlls/inetcpl.cpl/Makefile.in | 9 ++---- dlls/joy.cpl/Makefile.in | 9 ++---- dlls/light.msstyles/Makefile.in | 7 ++--- dlls/ole32/Makefile.in | 28 ++++++++----------- dlls/riched20/Makefile.in | 13 +++------ dlls/shell32/Makefile.in | 61 +++++++++++++++++++---------------------- dlls/user32/Makefile.in | 31 ++++++++++----------- programs/cmd/Makefile.in | 8 ++---- programs/hh/Makefile.in | 10 +++---- programs/iexplore/Makefile.in | 8 ++---- programs/taskmgr/Makefile.in | 9 ++---- programs/winetest/Makefile.in | 11 +++----- programs/winhlp32/Makefile.in | 13 ++++----- programs/wordpad/Makefile.in | 11 +++----- tools/make_makefiles | 3 +- 21 files changed, 125 insertions(+), 191 deletions(-)

1 0

Alexandre Julliard : makefiles: Always use the global SOURCES variable for .l files.
by Alexandre Julliard 16 Oct '23

16 Oct '23

Module: wine Branch: master Commit: 94771cf07ad41b0f7d792559771222855ac01ba6 URL: https://gitlab.winehq.org/wine/wine/-/commit/94771cf07ad41b0f7d792559771222… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Oct 14 13:50:44 2023 +0200 makefiles: Always use the global SOURCES variable for .l files. --- dlls/d3dcompiler_33/Makefile.in | 15 +++++---------- dlls/d3dcompiler_34/Makefile.in | 15 +++++---------- dlls/d3dcompiler_35/Makefile.in | 15 +++++---------- dlls/d3dcompiler_36/Makefile.in | 15 +++++---------- dlls/d3dcompiler_37/Makefile.in | 15 +++++---------- dlls/d3dcompiler_38/Makefile.in | 15 +++++---------- dlls/d3dcompiler_39/Makefile.in | 15 +++++---------- dlls/d3dcompiler_40/Makefile.in | 15 +++++---------- dlls/d3dcompiler_41/Makefile.in | 15 +++++---------- dlls/d3dcompiler_42/Makefile.in | 15 +++++---------- dlls/d3dcompiler_43/Makefile.in | 15 +++++---------- dlls/d3dcompiler_46/Makefile.in | 15 +++++---------- dlls/d3dcompiler_47/Makefile.in | 15 +++++---------- dlls/msxml3/Makefile.in | 22 ++++++++-------------- tools/make_makefiles | 4 +--- 15 files changed, 74 insertions(+), 147 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index c9aff6e7edd..5bc3b44e879 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 9d8f48e48ee..e31d74fd902 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index 1da7eca6c01..49be82f2593 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 62be7b22281..30f3e183396 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index e8759d9e577..072e27a86d2 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index da528cc0509..a03cdd730c8 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index 94ec5aae839..2f9231871f1 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 10665d863ca..f6451bcad53 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 5d522857173..433a2cb03a3 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 613ddee223e..9f4f571b5bd 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index d02280305e8..51993fd0d79 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -6,18 +6,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 1d82dfed1d9..1466c060ebf 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index e7df065061c..a98ca7243c1 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -7,18 +7,13 @@ EXTRAINCL = $(VKD3D_PE_CFLAGS) EXTRADLLFLAGS = -Wb,--prefer-native -C_SRCS = \ +SOURCES = \ asmparser.c \ + asmshader.l \ + asmshader.y \ blob.c \ bytecodewriter.c \ compiler.c \ reflection.c \ - utils.c - -LEX_SRCS = \ - asmshader.l - -BISON_SRCS = \ - asmshader.y - -RC_SRCS = version.rc + utils.c \ + version.rc diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in index 2bf789732da..7e59a223143 100644 --- a/dlls/msxml3/Makefile.in +++ b/dlls/msxml3/Makefile.in @@ -2,7 +2,7 @@ MODULE = msxml3.dll IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS) -C_SRCS = \ +SOURCES = \ attribute.c \ bsc.c \ cdata.c \ @@ -17,6 +17,7 @@ C_SRCS = \ factory.c \ httprequest.c \ main.c \ + msxml3_v1.idl \ mxnamespace.c \ mxwriter.c \ node.c \ @@ -26,24 +27,17 @@ C_SRCS = \ pi.c \ saxreader.c \ schema.c \ + schemas.rc \ selection.c \ stylesheet.c \ text.c \ uuid.c \ + version.rc \ xdr.c \ xmldoc.c \ xmlelem.c \ xmlparser.c \ - xmlview.c - -LEX_SRCS = xslpattern.l - -BISON_SRCS = xslpattern.y - -RC_SRCS = \ - schemas.rc \ - version.rc - -IDL_SRCS = \ - msxml3_v1.idl \ - xmlparser.idl + xmlparser.idl \ + xmlview.c \ + xslpattern.l \ + xslpattern.y diff --git a/tools/make_makefiles b/tools/make_makefiles index 1e52ee1cf67..bd84414d9c5 100755 --- a/tools/make_makefiles +++ b/tools/make_makefiles @@ -338,12 +338,11 @@ sub assign_sources_to_makefiles(@) my $make = $makefiles{"$dir/Makefile.in"}; my $name = substr( $file, length($dir) + 1 ); - if ($name =~ /\.(in|m|mc|po|sfd|svg)$/) + if ($name =~ /\.(in|l|m|mc|po|sfd|svg)$/) { push @{${$make}{"=SOURCES"}}, $name; next; } - elsif ($name =~ /\.l$/) { push @{${$make}{"=LEX_SRCS"}}, $name; } elsif ($name =~ /\.y$/) { push @{${$make}{"=BISON_SRCS"}}, $name; } elsif ($name =~ /\.c$/) { @@ -395,7 +394,6 @@ sub assign_sources_to_makefiles(@) preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "C_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "RC_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "IDL_SRCS" ); - preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "LEX_SRCS" ); preserve_shared_source_files( $makefiles{$file}, $makefiles{$parent}, "BISON_SRCS" ); } }

1 0