- Wine-Commits - list.winehq.org

Conor McCarthy : tests/shader-runner: Add sampler comparison tests.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: vkd3d Branch: master Commit: 7fcf1b6ca25ae9c0d3d115599ee95de0b1fa6189 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7fcf1b6ca25ae9c0d3d115599ee95… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Feb 23 12:30:16 2024 +1000 tests/shader-runner: Add sampler comparison tests. --- Makefile.am | 1 + tests/hlsl/sample-cmp.shader_test | 144 ++++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 45 +++++++++++- tests/shader_runner.h | 2 + tests/shader_runner_d3d11.c | 2 +- tests/shader_runner_d3d12.c | 1 + tests/shader_runner_gl.c | 62 ++++++++++++---- tests/shader_runner_vulkan.c | 27 +++++++ 8 files changed, 265 insertions(+), 19 deletions(-)

1 0

Giovanni Mascellani : vkd3d-dxbc: Add an option to choose the output filename.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: vkd3d Branch: master Commit: 7273d7f54fb953291b656c139faf86a5292ec94e URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7273d7f54fb953291b656c139faf8… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jan 21 23:52:28 2024 +0100 vkd3d-dxbc: Add an option to choose the output filename. --- programs/vkd3d-dxbc/main.c | 68 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 36c8983d..efe0a8fd 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -70,6 +70,7 @@ enum OPTION_LIST, OPTION_LIST_DATA, OPTION_NO_COLOUR, + OPTION_OUTPUT, OPTION_VERSION, }; @@ -79,11 +80,16 @@ struct action { ACTION_TYPE_EMIT, } type; + union + { + const char *output_filename; + } u; }; struct options { const char *input_filename; + const char *output_filename; bool print_help; bool list; bool list_data; @@ -141,6 +147,7 @@ static bool has_colour(void) static bool parse_command_line(int argc, char **argv, struct options *options) { + struct action *action; int option; static struct option long_options[] = @@ -152,6 +159,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) {"list", no_argument, NULL, OPTION_LIST}, {"list-data", no_argument, NULL, OPTION_LIST_DATA}, {"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, + {"output", required_argument, NULL, OPTION_OUTPUT}, {"version", no_argument, NULL, OPTION_VERSION}, {NULL, 0, NULL, 0}, }; @@ -180,7 +188,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ehtV", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ehtVo:", long_options, NULL)) == -1) break; switch (option) @@ -191,12 +199,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) case 'e': case OPTION_EMIT: - action_push(options, ACTION_TYPE_EMIT); - if (isatty(fileno(stdout))) + action = action_push(options, ACTION_TYPE_EMIT); + if (!options->output_filename && isatty(fileno(stdout))) { - fprintf(stderr, "Output is a tty and output format is binary, exiting.\n"); + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n" + "If this is really what you intended, specify the output explicitly.\n"); return false; } + action->u.output_filename = options->output_filename; break; case 'h': @@ -221,6 +231,11 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->colours = no_colours; break; + case OPTION_OUTPUT: + case 'o': + options->output_filename = optarg; + break; + case 'V': case OPTION_VERSION: options->print_version = true; @@ -243,22 +258,28 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " --colour Enable colour, even when not supported by the output.\n" - " -e, --emit Emit the content of the DXBC blob to the standard output.\n" + " -e, --emit Emit the content of the DXBC blob.\n" " -h, --help Display this information and exit.\n" " -t, --list List the contents of the DXBC blob.\n" " --list-data List the data contained in the DXBC sections.\n" " --no-colour Disable colour, even when supported by the output.\n" " -V, --version Display version information and exit.\n" " --ignore-checksum Do not validate the checksum when parsing the DXBC blob.\n" + " -o, --output=<file> Set the output filename for --emit.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n" "If the input file is '-' or not specified, input will be read from standard\n" - "input.\n" + "input. Similarly, if the output file is '-' or not specified at the point\n" + "--emit is found, output will be written to the standard output.\n" "\n" "Currently this tool can only re-emit the same DXBC blob it loaded. However, it\n" "will recompute the checksum while doing so, so --emit can be useful\n" - "together with --ignore-checksum to fix the checksum for a blob.\n"; + "together with --ignore-checksum to fix the checksum for a blob.\n" + "\n" + "Options --emit and --output can be specified more than once. The DXBC blob\n" + "will be emitted once for each --emit occurrence, each time using the closest\n" + "previous --output occurrence as output filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -337,6 +358,25 @@ static bool read_input(FILE *f, struct vkd3d_shader_code *dxbc) return true; } +static FILE *open_output(const char *filename, bool *close) +{ + FILE *f; + + *close = false; + + if (!filename || !strcmp(filename, "-")) + return stdout; + + if (!(f = fopen(filename, "wb"))) + { + fprintf(stderr, "Unable to open '%s' for writing.\n", filename); + return NULL; + } + + *close = true; + return f; +} + static bool write_output(FILE *f, const struct vkd3d_shader_code *dxbc) { const char *code = dxbc->code; @@ -467,14 +507,14 @@ static void dump_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_s int main(int argc, char **argv) { + bool close_input = false, close_output = false; struct vkd3d_shader_code dxbc, serialized; struct vkd3d_shader_dxbc_desc dxbc_desc; - bool close_input = false; struct options options; + FILE *input, *output; char *messages; uint32_t flags; int fail = 1; - FILE *input; size_t i; int ret; @@ -537,7 +577,13 @@ int main(int argc, char **argv) if (ret < 0) goto done; - if (!write_output(stdout, &serialized)) + if (!(output = open_output(action->u.output_filename, &close_output))) + { + vkd3d_shader_free_shader_code(&serialized); + goto done; + } + + if (!write_output(output, &serialized)) { fprintf(stderr, "Failed to write output blob.\n"); vkd3d_shader_free_shader_code(&serialized); @@ -559,5 +605,7 @@ done: free(options.actions); if (close_input) fclose(input); + if (close_output) + fclose(output); return fail; }

1 0

Giovanni Mascellani : vkd3d-dxbc: Add an option to re-emit the shader with the correct checksum.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: vkd3d Branch: master Commit: b72ad78af633f654f94b1c627682f024e91f620d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/b72ad78af633f654f94b1c627682f… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jan 21 23:52:28 2024 +0100 vkd3d-dxbc: Add an option to re-emit the shader with the correct checksum. --- programs/vkd3d-dxbc/main.c | 135 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 128 insertions(+), 7 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 6d5d6480..36c8983d 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -33,9 +33,38 @@ #include <term.h> #endif +static bool array_reserve(void **elements, size_t *capacity, size_t element_count, size_t element_size) +{ + size_t new_capacity, max_capacity; + void *new_elements; + + if (element_count <= *capacity) + return true; + + max_capacity = ~(size_t)0 / element_size; + if (max_capacity < element_count) + return false; + + new_capacity = max(*capacity, 4); + while (new_capacity < element_count && new_capacity <= max_capacity / 2) + new_capacity *= 2; + + if (new_capacity < element_count) + new_capacity = element_count; + + if (!(new_elements = realloc(*elements, new_capacity * element_size))) + return false; + + *elements = new_elements; + *capacity = new_capacity; + + return true; +} + enum { OPTION_COLOUR = CHAR_MAX + 1, + OPTION_EMIT, OPTION_HELP, OPTION_IGNORE_CHECKSUM, OPTION_LIST, @@ -44,6 +73,14 @@ enum OPTION_VERSION, }; +struct action +{ + enum action_type + { + ACTION_TYPE_EMIT, + } type; +}; + struct options { const char *input_filename; @@ -53,6 +90,9 @@ struct options bool print_version; bool ignore_checksum; + struct action *actions; + size_t action_count, action_capacity; + struct colours { const char *reset; @@ -62,6 +102,23 @@ struct options } colours; }; +static struct action *action_push(struct options *options, enum action_type type) +{ + struct action *action; + + if (!array_reserve((void **)&options->actions, &options->action_capacity, + options->action_count + 1, sizeof(*options->actions))) + { + fprintf(stderr, "Out of memory.\n"); + exit(1); + } + + action = &options->actions[options->action_count++]; + action->type = type; + + return action; +} + static bool has_colour(void) { #ifdef HAVE_NCURSES @@ -89,6 +146,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { {"colour", no_argument, NULL, OPTION_COLOUR}, + {"emit", no_argument, NULL, OPTION_EMIT}, {"help", no_argument, NULL, OPTION_HELP}, {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM}, {"list", no_argument, NULL, OPTION_LIST}, @@ -122,7 +180,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "htV", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ehtV", long_options, NULL)) == -1) break; switch (option) @@ -131,6 +189,16 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->colours = colours; break; + case 'e': + case OPTION_EMIT: + action_push(options, ACTION_TYPE_EMIT); + if (isatty(fileno(stdout))) + { + fprintf(stderr, "Output is a tty and output format is binary, exiting.\n"); + return false; + } + break; + case 'h': case OPTION_HELP: options->print_help = true; @@ -175,6 +243,7 @@ static void print_usage(const char *program_name) "[options...] [file]\n" "Options:\n" " --colour Enable colour, even when not supported by the output.\n" + " -e, --emit Emit the content of the DXBC blob to the standard output.\n" " -h, --help Display this information and exit.\n" " -t, --list List the contents of the DXBC blob.\n" " --list-data List the data contained in the DXBC sections.\n" @@ -185,7 +254,11 @@ static void print_usage(const char *program_name) " interpreted as a filename.\n" "\n" "If the input file is '-' or not specified, input will be read from standard\n" - "input.\n"; + "input.\n" + "\n" + "Currently this tool can only re-emit the same DXBC blob it loaded. However, it\n" + "will recompute the checksum while doing so, so --emit can be useful\n" + "together with --ignore-checksum to fix the checksum for a blob.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -264,6 +337,21 @@ static bool read_input(FILE *f, struct vkd3d_shader_code *dxbc) return true; } +static bool write_output(FILE *f, const struct vkd3d_shader_code *dxbc) +{ + const char *code = dxbc->code; + size_t pos = 0, ret; + + while (pos != dxbc->size) + { + if (!(ret = fwrite(&code[pos], 1, dxbc->size - pos, f))) + return false; + pos += ret; + } + + return true; +} + static const char *dump_tag(char *out, uint32_t tag) { unsigned int i; @@ -379,26 +467,28 @@ static void dump_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_s int main(int argc, char **argv) { + struct vkd3d_shader_code dxbc, serialized; struct vkd3d_shader_dxbc_desc dxbc_desc; - struct vkd3d_shader_code dxbc; + bool close_input = false; struct options options; - bool close_input; char *messages; uint32_t flags; int fail = 1; FILE *input; + size_t i; int ret; if (!parse_command_line(argc, argv, &options)) { print_usage(argv[0]); - return 1; + goto done; } if (options.print_help || (argc < 2 && isatty(fileno(stdin)))) { print_usage(argv[0]); - return 0; + fail = 0; + goto done; } if (options.print_version) @@ -406,7 +496,8 @@ int main(int argc, char **argv) const char *version = vkd3d_shader_get_version(NULL, NULL); fprintf(stdout, "vkd3d-dxbc version " PACKAGE_VERSION " using %s\n", version); - return 0; + fail = 0; + goto done; } if (!(input = open_input(options.input_filename, &close_input))) @@ -432,10 +523,40 @@ int main(int argc, char **argv) if (options.list || options.list_data) dump_dxbc(&dxbc, &dxbc_desc, &options); + for (i = 0; i < options.action_count; ++i) + { + struct action *action = &options.actions[i]; + + switch (action->type) + { + case ACTION_TYPE_EMIT: + ret = vkd3d_shader_serialize_dxbc(dxbc_desc.section_count, dxbc_desc.sections, &serialized, &messages); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + if (ret < 0) + goto done; + + if (!write_output(stdout, &serialized)) + { + fprintf(stderr, "Failed to write output blob.\n"); + vkd3d_shader_free_shader_code(&serialized); + goto done; + } + + vkd3d_shader_free_shader_code(&serialized); + break; + + default: + vkd3d_unreachable(); + } + } + vkd3d_shader_free_dxbc(&dxbc_desc); vkd3d_shader_free_shader_code(&dxbc); fail = 0; done: + free(options.actions); if (close_input) fclose(input); return fail;

1 0

Giovanni Mascellani : vkd3d-dxbc: Add an option to ignore checksum.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: vkd3d Branch: master Commit: 4b80b06f282fb6d0c16a18ae1a0722c722965631 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4b80b06f282fb6d0c16a18ae1a072… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jan 21 23:25:54 2024 +0100 vkd3d-dxbc: Add an option to ignore checksum. --- programs/vkd3d-dxbc/main.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index e76bcb63..6d5d6480 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -37,6 +37,7 @@ enum { OPTION_COLOUR = CHAR_MAX + 1, OPTION_HELP, + OPTION_IGNORE_CHECKSUM, OPTION_LIST, OPTION_LIST_DATA, OPTION_NO_COLOUR, @@ -50,6 +51,7 @@ struct options bool list; bool list_data; bool print_version; + bool ignore_checksum; struct colours { @@ -86,13 +88,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) static struct option long_options[] = { - {"colour", no_argument, NULL, OPTION_COLOUR}, - {"help", no_argument, NULL, OPTION_HELP}, - {"list", no_argument, NULL, OPTION_LIST}, - {"list-data", no_argument, NULL, OPTION_LIST_DATA}, - {"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, - {"version", no_argument, NULL, OPTION_VERSION}, - {NULL, 0, NULL, 0}, + {"colour", no_argument, NULL, OPTION_COLOUR}, + {"help", no_argument, NULL, OPTION_HELP}, + {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM}, + {"list", no_argument, NULL, OPTION_LIST}, + {"list-data", no_argument, NULL, OPTION_LIST_DATA}, + {"no-colour", no_argument, NULL, OPTION_NO_COLOUR}, + {"version", no_argument, NULL, OPTION_VERSION}, + {NULL, 0, NULL, 0}, }; static const struct colours colours = @@ -133,6 +136,10 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->print_help = true; return true; + case OPTION_IGNORE_CHECKSUM: + options->ignore_checksum = true; + break; + case 't': case OPTION_LIST: options->list = true; @@ -173,6 +180,7 @@ static void print_usage(const char *program_name) " --list-data List the data contained in the DXBC sections.\n" " --no-colour Disable colour, even when supported by the output.\n" " -V, --version Display version information and exit.\n" + " --ignore-checksum Do not validate the checksum when parsing the DXBC blob.\n" " -- Stop option processing. Any subsequent argument is\n" " interpreted as a filename.\n" "\n" @@ -376,6 +384,7 @@ int main(int argc, char **argv) struct options options; bool close_input; char *messages; + uint32_t flags; int fail = 1; FILE *input; int ret; @@ -409,7 +418,11 @@ int main(int argc, char **argv) goto done; } - ret = vkd3d_shader_parse_dxbc(&dxbc, 0, &dxbc_desc, &messages); + flags = 0; + if (options.ignore_checksum) + flags |= VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM; + + ret = vkd3d_shader_parse_dxbc(&dxbc, flags, &dxbc_desc, &messages); if (messages) fputs(messages, stderr); vkd3d_shader_free_messages(messages);

1 0

Giovanni Mascellani : vkd3d-shader/dxbc: Add flag to ignore the DXBC checksum.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: vkd3d Branch: master Commit: 75bc68962d8a2fa358e4268bfc03549ca4fca6f8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/75bc68962d8a2fa358e4268bfc035… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jan 21 00:01:28 2024 +0100 vkd3d-shader/dxbc: Add flag to ignore the DXBC checksum. --- include/vkd3d_shader.h | 19 ++++++++++++++++--- libs/vkd3d-shader/dxbc.c | 31 +++++++++++++++++-------------- 2 files changed, 33 insertions(+), 17 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 1a62f093..1ac5197c 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -218,6 +218,20 @@ enum vkd3d_shader_compile_option_feature_flags VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_COMPILE_OPTION_FEATURE_FLAGS), }; +/** + * Flags for vkd3d_shader_parse_dxbc(). + * + * \since 1.12 + */ +enum vkd3d_shader_parse_dxbc_flags +{ + /** Ignore the checksum and continue parsing even if it is + * incorrect. */ + VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM = 0x00000001, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_PARSE_DXBC_FLAGS), +}; + enum vkd3d_shader_compile_option_name { /** @@ -2385,9 +2399,8 @@ VKD3D_SHADER_API void vkd3d_shader_free_dxbc(struct vkd3d_shader_dxbc_desc *dxbc * * \param dxbc A vkd3d_shader_code structure containing the DXBC blob to parse. * - * \param flags A set of flags modifying the behaviour of the function. No - * flags are defined for this version of vkd3d-shader, and this parameter - * should be set to 0. + * \param flags A combination of zero or more elements of enum + * vkd3d_shader_parse_dxbc_flags. * * \param desc A vkd3d_shader_dxbc_desc structure describing the contents of * the DXBC blob. Its vkd3d_shader_dxbc_section_desc structures will contain diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 37ebc73c..4a8a7b13 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -150,7 +150,7 @@ static const char *shader_get_string(const char *data, size_t data_size, size_t } static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_message_context *message_context, - const char *source_name, struct vkd3d_shader_dxbc_desc *desc) + const char *source_name, uint32_t flags, struct vkd3d_shader_dxbc_desc *desc) { const struct vkd3d_shader_location location = {.source_name = source_name}; struct vkd3d_shader_dxbc_section_desc *sections, *section; @@ -186,17 +186,20 @@ static int parse_dxbc(const struct vkd3d_shader_code *dxbc, struct vkd3d_shader_ checksum[1] = read_u32(&ptr); checksum[2] = read_u32(&ptr); checksum[3] = read_u32(&ptr); - vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum); - if (memcmp(checksum, calculated_checksum, sizeof(checksum))) - { - WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match " - "calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", - checksum[0], checksum[1], checksum[2], checksum[3], - calculated_checksum[0], calculated_checksum[1], - calculated_checksum[2], calculated_checksum[3]); - vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, - "Invalid DXBC checksum."); - return VKD3D_ERROR_INVALID_ARGUMENT; + if (!(flags & VKD3D_SHADER_PARSE_DXBC_IGNORE_CHECKSUM)) + { + vkd3d_compute_dxbc_checksum(data, data_size, calculated_checksum); + if (memcmp(checksum, calculated_checksum, sizeof(checksum))) + { + WARN("Checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x} does not match " + "calculated checksum {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + checksum[0], checksum[1], checksum[2], checksum[3], + calculated_checksum[0], calculated_checksum[1], + calculated_checksum[2], calculated_checksum[3]); + vkd3d_shader_error(message_context, &location, VKD3D_SHADER_ERROR_DXBC_INVALID_CHECKSUM, + "Invalid DXBC checksum."); + return VKD3D_ERROR_INVALID_ARGUMENT; + } } version = read_u32(&ptr); @@ -287,7 +290,7 @@ static int for_each_dxbc_section(const struct vkd3d_shader_code *dxbc, unsigned int i; int ret; - if ((ret = parse_dxbc(dxbc, message_context, source_name, &desc)) < 0) + if ((ret = parse_dxbc(dxbc, message_context, source_name, 0, &desc)) < 0) return ret; for (i = 0; i < desc.section_count; ++i) @@ -313,7 +316,7 @@ int vkd3d_shader_parse_dxbc(const struct vkd3d_shader_code *dxbc, *messages = NULL; vkd3d_shader_message_context_init(&message_context, VKD3D_SHADER_LOG_INFO); - ret = parse_dxbc(dxbc, &message_context, NULL, desc); + ret = parse_dxbc(dxbc, &message_context, NULL, flags, desc); vkd3d_shader_message_context_trace_messages(&message_context); if (!vkd3d_shader_message_context_copy_messages(&message_context, messages) && ret >= 0)

1 0

Brendan Shanks : secur32: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 4860fbe7b5355bfa4a5e98bb2446f69d1c484666 URL: https://gitlab.winehq.org/wine/wine/-/commit/4860fbe7b5355bfa4a5e98bb2446f6… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 13:50:17 2024 -0700 secur32: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- dlls/secur32/schannel_gnutls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel_gnutls.c b/dlls/secur32/schannel_gnutls.c index 600b0d0166a..fc16ded7a64 100644 --- a/dlls/secur32/schannel_gnutls.c +++ b/dlls/secur32/schannel_gnutls.c @@ -401,7 +401,7 @@ static void check_supported_protocols( for(i = 0; i < num_flags; i++) { - sprintf(priority, "NORMAL:-%s", flags[i].gnutls_flag); + snprintf(priority, sizeof(priority), "NORMAL:-%s", flags[i].gnutls_flag); err = pgnutls_priority_set_direct(session, priority, NULL); if (err == GNUTLS_E_SUCCESS) { @@ -1022,7 +1022,7 @@ static NTSTATUS schan_get_cipher_info( void *args ) wcscat( info->szCipherSuite, widthW ); wcscat( info->szCipherSuite, info->szCipher ); wcscat( info->szCipherSuite, underscoreW ); - len = sprintf( buf, "%u", (unsigned int)info->dwCipherLen ) + 1; + len = snprintf( buf, sizeof(buf), "%u", (unsigned int)info->dwCipherLen ) + 1; ptr = info->szCipherSuite + wcslen( info->szCipherSuite ); ntdll_umbstowcs( buf, len, ptr, len ); wcscat( info->szCipherSuite, underscoreW );

1 0

Brendan Shanks : opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 5851ba868612ba4faaeb12d3a58b0304a2d3d490 URL: https://gitlab.winehq.org/wine/wine/-/commit/5851ba868612ba4faaeb12d3a58b03… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 12:22:23 2024 -0700 opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS. --- dlls/opengl32/unix_wgl.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/opengl32/unix_wgl.c b/dlls/opengl32/unix_wgl.c index 453a9824046..b75a940d1d6 100644 --- a/dlls/opengl32/unix_wgl.c +++ b/dlls/opengl32/unix_wgl.c @@ -318,13 +318,13 @@ static HKEY open_hkcu_key( const char *name ) return 0; sid = ((TOKEN_USER *)sid_data)->User.Sid; - len = sprintf( buffer, "\\Registry\\User\\S-%u-%u", sid->Revision, - (int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], - sid->IdentifierAuthority.Value[4] ), - MAKEWORD( sid->IdentifierAuthority.Value[3], - sid->IdentifierAuthority.Value[2] ))); + len = snprintf( buffer, sizeof(buffer), "\\Registry\\User\\S-%u-%u", sid->Revision, + (int)MAKELONG( MAKEWORD( sid->IdentifierAuthority.Value[5], + sid->IdentifierAuthority.Value[4] ), + MAKEWORD( sid->IdentifierAuthority.Value[3], + sid->IdentifierAuthority.Value[2] ))); for (i = 0; i < sid->SubAuthorityCount; i++) - len += sprintf( buffer + len, "-%u", (int)sid->SubAuthority[i] ); + len += snprintf( buffer + len, sizeof(buffer) - len, "-%u", (int)sid->SubAuthority[i] ); ascii_to_unicode( bufferW, buffer, len ); hkcu = reg_open_key( NULL, bufferW, len * sizeof(WCHAR) ); @@ -491,9 +491,9 @@ static const GLubyte *wrap_glGetString( TEB *teb, GLenum name ) /* 4.4 depends on ARB_buffer_storage, which we don't support on wow64. */ if (major > 4 || (major == 4 && minor >= 4)) { - char *str = malloc( 3 + strlen( rest ) + 1 ); + char *str = NULL; - sprintf( str, "4.3%s", rest ); + asprintf( &str, "4.3%s", rest ); if (InterlockedCompareExchangePointer( (void **)&ptr->u.context->version_string, str, NULL )) free( str ); return ptr->u.context->version_string; @@ -536,7 +536,7 @@ static char *build_extension_list( TEB *teb ) capacity = max( capacity, len + strlen( extension ) + 2 ); if (!(tmp = realloc( available_extensions, capacity ))) break; available_extensions = tmp; - len += sprintf( available_extensions + len, "%s ", extension ); + len += snprintf( available_extensions + len, capacity - len, "%s ", extension ); } if (len) available_extensions[len - 1] = 0;

1 0

Jacek Caban : configure: Don't explicitly enable -Wenum-conversion on Clang.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 81111326ff34f681cd00c6be864c9d5aec4e6974 URL: https://gitlab.winehq.org/wine/wine/-/commit/81111326ff34f681cd00c6be864c9d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sun Mar 10 10:39:13 2024 +0100 configure: Don't explicitly enable -Wenum-conversion on Clang. Clang enables -Wenum-conversion by default anyway, we add it to CFLAGS to enable them on GCC. When explicitly enabled, Clang also enables additional warnings. Some of those warnings, like -Wenum-enum-conversion, are too strict to be practical with win32, so avoid enabling them. --- configure | 37 ++++++++++++++++++++++++++++++++++++- configure.ac | 2 +- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 804a03c8fd3..9a7bc56bff4 100755 --- a/configure +++ b/configure @@ -11505,7 +11505,41 @@ if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wabsolute-value" fi } - { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-conversion" | $as_tr_sh` + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-enum-conversion" | $as_tr_sh` +{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wenum-enum-conversion" >&5 +printf %s "checking whether $CC supports -Wenum-enum-conversion... " >&6; } +if eval test \${$as_ac_var+y} +then : + printf %s "(cached) " >&6 +else $as_nop + ac_wine_try_cflags_saved=$CFLAGS +ac_wine_try_cflags_saved_exeext=$ac_exeext +CFLAGS="$CFLAGS -nostdlib -nodefaultlibs -Wenum-enum-conversion" +ac_exeext=".exe" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +void *__os_arm64x_dispatch_ret = 0; +int __cdecl mainCRTStartup(void) { return 0; } +_ACEOF +if ac_fn_c_try_link "$LINENO" +then : + eval "$as_ac_var=yes" +else $as_nop + eval "$as_ac_var=no" +fi +rm -f core conftest.err conftest.$ac_objext conftest.beam \ + conftest$ac_exeext conftest.$ac_ext +CFLAGS=$ac_wine_try_cflags_saved +ac_exeext=$ac_wine_try_cflags_saved_exeext +fi +eval ac_res=\$$as_ac_var + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +printf "%s\n" "$ac_res" >&6; } +if eval test \"x\$"$as_ac_var"\" = x"yes" +then : + : +else $as_nop + { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-Wenum-conversion" | $as_tr_sh` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -Wenum-conversion" >&5 printf %s "checking whether $CC supports -Wenum-conversion... " >&6; } if eval test \${$as_ac_var+y} @@ -11538,6 +11572,7 @@ printf "%s\n" "$ac_res" >&6; } if eval test \"x\$"$as_ac_var"\" = x"yes" then : as_fn_append ${wine_arch}_EXTRACFLAGS " -Wenum-conversion" +fi } fi } { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_-flarge-source-files -Wmisleading-indentation" | $as_tr_sh` diff --git a/configure.ac b/configure.ac index 872cb1591f8..fa81d912106 100644 --- a/configure.ac +++ b/configure.ac @@ -966,7 +966,7 @@ This is an error since --enable-archs=$wine_arch was requested.])]) WINE_TRY_PE_CFLAGS([-Wpointer-arith]) WINE_TRY_PE_CFLAGS([-Wlogical-op]) WINE_TRY_PE_CFLAGS([-Wabsolute-value]) - WINE_TRY_PE_CFLAGS([-Wenum-conversion]) + WINE_TRY_PE_CFLAGS([-Wenum-enum-conversion],[:],WINE_TRY_PE_CFLAGS([-Wenum-conversion])) dnl GCC can't handle large files when -Wmisleading-indentation is enabled (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89549) WINE_TRY_PE_CFLAGS([-flarge-source-files -Wmisleading-indentation],[AS_VAR_APPEND(${wine_arch}_EXTRACFLAGS,[" -Wno-misleading-indentation"])])

1 0

Brendan Shanks : mountmgr: Replace some malloc/sprintf/strcpy calls with asprintf.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: 3af1e7df21db5b27fc06ff91c9aa3c12fc6853b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/3af1e7df21db5b27fc06ff91c9aa3c… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 11:55:44 2024 -0700 mountmgr: Replace some malloc/sprintf/strcpy calls with asprintf. --- dlls/mountmgr.sys/unixlib.c | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index 9d7cd904769..47c42d939c6 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -89,22 +89,14 @@ static NTSTATUS errno_to_status( int err ) static char *get_dosdevices_path( const char *dev ) { - const char *home = getenv( "HOME" ); const char *prefix = getenv( "WINEPREFIX" ); - size_t len = (prefix ? strlen(prefix) : strlen(home) + strlen("/.wine")) + sizeof("/dosdevices/") + strlen(dev); - char *path = malloc( len ); + char *path = NULL; + + if (prefix) + asprintf( &path, "%s/dosdevices/%s", prefix, dev ); + else + asprintf( &path, "%s/.wine/dosdevices/%s", getenv( "HOME" ), dev ); - if (path) - { - if (prefix) strcpy( path, prefix ); - else - { - strcpy( path, home ); - strcat( path, "/.wine" ); - } - strcat( path, "/dosdevices/" ); - strcat( path, dev ); - } return path; } @@ -420,9 +412,9 @@ static NTSTATUS read_volume_file( void *args ) { const struct read_volume_file_params *params = args; int ret, fd = -1; - char *name = malloc( strlen(params->volume) + strlen(params->file) + 2 ); + char *name = NULL; - sprintf( name, "%s/%s", params->volume, params->file ); + asprintf( &name, "%s/%s", params->volume, params->file ); if (name[0] != '/') { @@ -508,9 +500,7 @@ static NTSTATUS set_shell_folder( void *args ) if (link && (!strcmp( link, "$HOME" ) || !strncmp( link, "$HOME/", 6 )) && (home = getenv( "HOME" ))) { link += 5; - homelink = malloc( strlen(home) + strlen(link) + 1 ); - strcpy( homelink, home ); - strcat( homelink, link ); + asprintf( &homelink, "%s%s", home, link ); link = homelink; }

1 0

Brendan Shanks : mountmgr: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard March 11, 2024

March 11, 2024

Module: wine Branch: master Commit: a5b8e684226a5d80f57382b40fd6d1bb64a2ff6c URL: https://gitlab.winehq.org/wine/wine/-/commit/a5b8e684226a5d80f57382b40fd6d1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Mar 11 11:55:24 2024 -0700 mountmgr: Replace sprintf with snprintf to avoid deprecation warnings on macOS. --- dlls/mountmgr.sys/unixlib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/unixlib.c b/dlls/mountmgr.sys/unixlib.c index b74b2336a34..9d7cd904769 100644 --- a/dlls/mountmgr.sys/unixlib.c +++ b/dlls/mountmgr.sys/unixlib.c @@ -127,7 +127,7 @@ static void detect_devices( const char **paths, char *names, ULONG size ) for (;;) { - int len = sprintf( unix_path, *paths, i++ ); + int len = snprintf( unix_path, sizeof(unix_path), *paths, i++ ); if (len + 2 > size) break; if (access( unix_path, F_OK ) != 0) break; strcpy( names, unix_path );

1 0