April 2024 - Wine-commits - list.winehq.org

Henri Verbeet : vkd3d-dxbc: Close output files after writing them.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 2712a79c55685d1347a3495ca043264b166b0302 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/2712a79c55685d1347a3495ca0432… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:56:52 2024 +0200 vkd3d-dxbc: Close output files after writing them. --- programs/vkd3d-dxbc/main.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index efe0a8fd..6d065f3b 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -514,6 +514,7 @@ int main(int argc, char **argv) FILE *input, *output; char *messages; uint32_t flags; + bool success; int fail = 1; size_t i; int ret; @@ -583,18 +584,15 @@ int main(int argc, char **argv) goto done; } - if (!write_output(output, &serialized)) - { + if (!(success = write_output(output, &serialized))) fprintf(stderr, "Failed to write output blob.\n"); - vkd3d_shader_free_shader_code(&serialized); - goto done; - } + if (close_output) + fclose(output); vkd3d_shader_free_shader_code(&serialized); + if (!success) + goto done; break; - - default: - vkd3d_unreachable(); } } @@ -605,7 +603,5 @@ done: free(options.actions); if (close_input) fclose(input); - if (close_output) - fclose(output); return fail; }

1 0

Henri Verbeet : vkd3d-dxbc: Introduce a helper function to handle ACTION_TYPE_EMIT.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 143b15fc47e472a0c22d8a2917ec1c2e395d9442 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/143b15fc47e472a0c22d8a2917ec1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:57:40 2024 +0200 vkd3d-dxbc: Introduce a helper function to handle ACTION_TYPE_EMIT. --- programs/vkd3d-dxbc/main.c | 66 ++++++++++++++++++++++++++++------------------ 1 file changed, 40 insertions(+), 26 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 6d065f3b..c23cfa81 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -82,7 +82,10 @@ struct action } type; union { - const char *output_filename; + struct emit + { + const char *output_filename; + } emit; } u; }; @@ -206,7 +209,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) "If this is really what you intended, specify the output explicitly.\n"); return false; } - action->u.output_filename = options->output_filename; + action->u.emit.output_filename = options->output_filename; break; case 'h': @@ -505,17 +508,47 @@ static void dump_dxbc(const struct vkd3d_shader_code *dxbc, const struct vkd3d_s } } +static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct emit *emit) +{ + struct vkd3d_shader_code dxbc; + bool close_output; + char *messages; + FILE *output; + bool success; + int ret; + + ret = vkd3d_shader_serialize_dxbc(dxbc_desc->section_count, dxbc_desc->sections, &dxbc, &messages); + if (messages) + fputs(messages, stderr); + vkd3d_shader_free_messages(messages); + if (ret < 0) + return false; + + if (!(output = open_output(emit->output_filename, &close_output))) + { + vkd3d_shader_free_shader_code(&dxbc); + return false; + } + + if (!(success = write_output(output, &dxbc))) + fprintf(stderr, "Failed to write output blob.\n"); + + if (close_output) + fclose(output); + vkd3d_shader_free_shader_code(&dxbc); + return success; +} + 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; + struct vkd3d_shader_code dxbc; + bool close_input = false; struct options options; - FILE *input, *output; char *messages; uint32_t flags; - bool success; int fail = 1; + FILE *input; size_t i; int ret; @@ -571,26 +604,7 @@ int main(int argc, char **argv) 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 (!(output = open_output(action->u.output_filename, &close_output))) - { - vkd3d_shader_free_shader_code(&serialized); - goto done; - } - - if (!(success = write_output(output, &serialized))) - fprintf(stderr, "Failed to write output blob.\n"); - - if (close_output) - fclose(output); - vkd3d_shader_free_shader_code(&serialized); - if (!success) + if (!emit_dxbc(&dxbc_desc, &action->u.emit)) goto done; break; }

1 0

Henri Verbeet : vkd3d-dxbc: Introduce a helper function to apply actions.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 8f529cd0ae962a5801f26cdac41a6b3a8ee4ae18 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/8f529cd0ae962a5801f26cdac41a6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:00 2024 +0200 vkd3d-dxbc: Introduce a helper function to apply actions. --- programs/vkd3d-dxbc/main.c | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index c23cfa81..0fb99bc0 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -539,6 +539,25 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru return success; } +static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, + size_t action_count, const struct action *actions) +{ + for (size_t i = 0; i < action_count; ++i) + { + const struct action *action = &actions[i]; + + switch (action->type) + { + case ACTION_TYPE_EMIT: + if (!emit_dxbc(dxbc_desc, &action->u.emit)) + return false; + break; + } + } + + return true; +} + int main(int argc, char **argv) { struct vkd3d_shader_dxbc_desc dxbc_desc; @@ -549,7 +568,6 @@ int main(int argc, char **argv) uint32_t flags; int fail = 1; FILE *input; - size_t i; int ret; if (!parse_command_line(argc, argv, &options)) @@ -597,22 +615,10 @@ 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: - if (!emit_dxbc(&dxbc_desc, &action->u.emit)) - goto done; - break; - } - } + fail = !apply_actions(&dxbc_desc, options.action_count, options.actions); vkd3d_shader_free_dxbc(&dxbc_desc); vkd3d_shader_free_shader_code(&dxbc); - fail = 0; done: free(options.actions); if (close_input)

1 0

Henri Verbeet : vkd3d-dxbc: Free the blob if parsing it failed.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 806afd7b50a1762c3260e74fde92626744505a55 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/806afd7b50a1762c3260e74fde926… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:30 2024 +0200 vkd3d-dxbc: Free the blob if parsing it failed. --- programs/vkd3d-dxbc/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index 0fb99bc0..aaccffad 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -610,7 +610,10 @@ int main(int argc, char **argv) fputs(messages, stderr); vkd3d_shader_free_messages(messages); if (ret < 0) + { + vkd3d_shader_free_shader_code(&dxbc); goto done; + } if (options.list || options.list_data) dump_dxbc(&dxbc, &dxbc_desc, &options);

1 0

Henri Verbeet : vkd3d-dxbc: Implement extracting section data.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 6c3b87bed04857c61610b27d1d1a521af004959f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/6c3b87bed04857c61610b27d1d1a5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 17:59:48 2024 +0200 vkd3d-dxbc: Implement extracting section data. --- programs/vkd3d-dxbc/main.c | 91 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 81 insertions(+), 10 deletions(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index aaccffad..ff463584 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -65,6 +65,7 @@ enum { OPTION_COLOUR = CHAR_MAX + 1, OPTION_EMIT, + OPTION_EXTRACT, OPTION_HELP, OPTION_IGNORE_CHECKSUM, OPTION_LIST, @@ -79,6 +80,7 @@ struct action enum action_type { ACTION_TYPE_EMIT, + ACTION_TYPE_EXTRACT, } type; union { @@ -86,6 +88,11 @@ struct action { const char *output_filename; } emit; + struct extract + { + const char *section; + const char *output_filename; + } extract; } u; }; @@ -157,6 +164,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) { {"colour", no_argument, NULL, OPTION_COLOUR}, {"emit", no_argument, NULL, OPTION_EMIT}, + {"extract", required_argument, NULL, OPTION_EXTRACT}, {"help", no_argument, NULL, OPTION_HELP}, {"ignore-checksum", no_argument, NULL, OPTION_IGNORE_CHECKSUM}, {"list", no_argument, NULL, OPTION_LIST}, @@ -191,7 +199,7 @@ static bool parse_command_line(int argc, char **argv, struct options *options) for (;;) { - if ((option = getopt_long(argc, argv, "ehtVo:", long_options, NULL)) == -1) + if ((option = getopt_long(argc, argv, "ex:hto:V", long_options, NULL)) == -1) break; switch (option) @@ -212,6 +220,14 @@ static bool parse_command_line(int argc, char **argv, struct options *options) action->u.emit.output_filename = options->output_filename; break; + case 'x': + case OPTION_EXTRACT: + if (!(action = action_push(options, ACTION_TYPE_EXTRACT))) + return false; + action->u.extract.section = optarg; + action->u.extract.output_filename = options->output_filename; + break; + case 'h': case OPTION_HELP: options->print_help = true; @@ -234,8 +250,8 @@ static bool parse_command_line(int argc, char **argv, struct options *options) options->colours = no_colours; break; - case OPTION_OUTPUT: case 'o': + case OPTION_OUTPUT: options->output_filename = optarg; break; @@ -262,27 +278,30 @@ static void print_usage(const char *program_name) "Options:\n" " --colour Enable colour, even when not supported by the output.\n" " -e, --emit Emit the content of the DXBC blob.\n" + " -x, --extract=<section> Extract the data contained in <section>.\n" + " <section> must be of the form 'i:<index>'.\n" " -h, --help Display this information and exit.\n" + " --ignore-checksum Do not validate the checksum when parsing the DXBC\n" + " blob.\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" + " -o, --output=<file> Set the output filename for --emit or --extract.\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. 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" + "--emit or --extract 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" + "will recompute the checksum while doing so, so --emit can be useful together\n" + "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"; + "Options --emit, --extract, and --output can be specified more than once. The\n" + "DXBC blob will be emitted once for each --emit occurrence, each time using the\n" + "closest previous --output occurrence as output filename.\n"; fprintf(stderr, "Usage: %s %s", program_name, usage); } @@ -539,6 +558,53 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru return success; } +static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, + struct vkd3d_shader_dxbc_section_desc *sections, const char *s) +{ + size_t idx; + char *end; + + if (!strncmp("i:", s, 2)) + { + s += 2; + idx = strtoul(s, &end, 10); + if (*end || idx >= section_count) + { + fprintf(stderr, "Invalid section index '%s' specified.\n", s); + return NULL; + } + return &sections[idx]; + } + + fprintf(stderr, "Invalid section specifier '%s' specified.\n", s); + return NULL; +} + +static bool extract_section(struct vkd3d_shader_dxbc_desc *dxbc_desc, const struct extract *extract) +{ + const struct vkd3d_shader_dxbc_section_desc *section; + bool close_output, success = true; + FILE *output; + + if (!(section = get_section(dxbc_desc->section_count, dxbc_desc->sections, extract->section))) + return false; + + if (!(output = open_output(extract->output_filename, &close_output))) + return false; + + if (!extract->output_filename && isatty(fileno(output))) + fprintf(stderr, "Output is a tty, skipping section '%s'.\n" + "If this is really what you intended, specify the output explicitly.\n", + extract->section); + else if (!(success = write_output(output, &section->data))) + fprintf(stderr, "Failed to write output.\n"); + + if (close_output) + fclose(output); + + return success; +} + static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, size_t action_count, const struct action *actions) { @@ -552,6 +618,11 @@ static bool apply_actions(struct vkd3d_shader_dxbc_desc *dxbc_desc, if (!emit_dxbc(dxbc_desc, &action->u.emit)) return false; break; + + case ACTION_TYPE_EXTRACT: + if (!extract_section(dxbc_desc, &action->u.extract)) + return false; + break; } }

1 0

Henri Verbeet : vkd3d-dxbc: Allow the section to extract to be specified by tag.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: vkd3d Branch: master Commit: 73996c994139afcf7630a7df87cade50a0344898 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/73996c994139afcf7630a7df87cad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 3 18:00:19 2024 +0200 vkd3d-dxbc: Allow the section to extract to be specified by tag. --- programs/vkd3d-dxbc/main.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/programs/vkd3d-dxbc/main.c b/programs/vkd3d-dxbc/main.c index ff463584..c08e50af 100644 --- a/programs/vkd3d-dxbc/main.c +++ b/programs/vkd3d-dxbc/main.c @@ -279,7 +279,13 @@ static void print_usage(const char *program_name) " --colour Enable colour, even when not supported by the output.\n" " -e, --emit Emit the content of the DXBC blob.\n" " -x, --extract=<section> Extract the data contained in <section>.\n" - " <section> must be of the form 'i:<index>'.\n" + " <section> may either be of the form 'i:<index>' in\n" + " order to specify a section by its index or of the\n" + " form 't:<tag>' in order to specify a section by its\n" + " tag. <tag> may be either a four-character string or a\n" + " 32-bit hexadecimal integer. For example: 'i:2',\n" + " 't:SHDR', 't:52444853'. If multiple sections match\n" + " the same tag, the first matching section is used.\n" " -h, --help Display this information and exit.\n" " --ignore-checksum Do not validate the checksum when parsing the DXBC\n" " blob.\n" @@ -428,6 +434,26 @@ static const char *dump_tag(char *out, uint32_t tag) return out; } +static bool parse_tag(uint32_t *t, const char *s) +{ + char *end; + + if (strlen(s) == 4) + { + *t = VKD3D_MAKE_TAG(s[0], s[1], s[2], s[3]); + return true; + } + + if (strlen(s) == 8) + { + *t = strtoul(s, &end, 16); + if (!*end) + return true; + } + + return false; +} + static void dump_line(const struct colours *colours, const char *prefix, const uint8_t *data, size_t offset, size_t count) { @@ -561,6 +587,7 @@ static bool emit_dxbc(const struct vkd3d_shader_dxbc_desc *dxbc_desc, const stru static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, struct vkd3d_shader_dxbc_section_desc *sections, const char *s) { + uint32_t tag; size_t idx; char *end; @@ -576,6 +603,23 @@ static struct vkd3d_shader_dxbc_section_desc *get_section(size_t section_count, return &sections[idx]; } + if (!strncmp("t:", s, 2)) + { + s += 2; + if (!parse_tag(&tag, s)) + { + fprintf(stderr, "Invalid section tag '%s' specified.\n", s); + return NULL; + } + for (idx = 0; idx < section_count; ++idx) + { + if (sections[idx].tag == tag) + return &sections[idx]; + } + fprintf(stderr, "Section '%s' not found.\n", s); + return NULL; + } + fprintf(stderr, "Invalid section specifier '%s' specified.\n", s); return NULL; }

1 0

Alistair Leslie-Hughes : include: Add more DBCOLUMN_ defines.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: wine Branch: master Commit: 74a32e2b43b42321d6f05492c4cf64029df106d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/74a32e2b43b42321d6f05492c4cf64… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Nov 24 15:48:36 2023 +1100 include: Add more DBCOLUMN_ defines. --- include/dbs.idl | 36 ++++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) diff --git a/include/dbs.idl b/include/dbs.idl index f72204b1e90..34e58e5a5d0 100644 --- a/include/dbs.idl +++ b/include/dbs.idl @@ -542,10 +542,38 @@ cpp_quote("DEFINE_DBGUID(DBPROPSET_SESSIONALL, 0xc8b522c7, 0x5cf3, 0x11ce cpp_quote("DEFINE_DBGUID(DBPROPSET_DBINITALL, 0xc8b522ca, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") cpp_quote("DEFINE_DBGUID(DBPROPSET_PROPERTIESINERROR, 0xc8b522d4, 0x5cf3, 0x11ce, 0xad, 0xe5, 0x00, 0xaa, 0x00, 0x44, 0x77, 0x3d);") -cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") -cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") -cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") +cpp_quote("DEFINE_DBID(DB_NULLID, DB_NULLGUID, 0, 0);") +cpp_quote("DEFINE_DBID(DBCOLUMN_IDNAME, DBCIDGUID, DBKIND_GUID_PROPID, 2);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NAME, DBCIDGUID, DBKIND_GUID_PROPID, 3);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMBER, DBCIDGUID, DBKIND_GUID_PROPID, 4);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPE, DBCIDGUID, DBKIND_GUID_PROPID, 5);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 7);") +cpp_quote("DEFINE_DBID(DBCOLUMN_SCALE, DBCIDGUID, DBKIND_GUID_PROPID, 8);") +cpp_quote("DEFINE_DBID(DBCOLUMN_FLAGS, DBCIDGUID, DBKIND_GUID_PROPID, 9);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECOLUMNNAME, DBCIDGUID, DBKIND_GUID_PROPID, 10);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASETABLENAME, DBCIDGUID, DBKIND_GUID_PROPID, 11);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLLATINGSEQUENCE, DBCIDGUID, DBKIND_GUID_PROPID, 12);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COMPUTEMODE, DBCIDGUID, DBKIND_GUID_PROPID, 13);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DEFAULTVALUE, DBCIDGUID, DBKIND_GUID_PROPID, 14);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINNAME, DBCIDGUID, DBKIND_GUID_PROPID, 15);") +cpp_quote("DEFINE_DBID(DBCOLUMN_HASDEFAULT, DBCIDGUID, DBKIND_GUID_PROPID, 16);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISAUTOINCREMENT, DBCIDGUID, DBKIND_GUID_PROPID, 17);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISCASESENSITIVE, DBCIDGUID, DBKIND_GUID_PROPID, 18);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISSEARCHABLE, DBCIDGUID, DBKIND_GUID_PROPID, 20);") +cpp_quote("DEFINE_DBID(DBCOLUMN_ISUNIQUE, DBCIDGUID, DBKIND_GUID_PROPID, 21);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASECATALOGNAME, DBCIDGUID, DBKIND_GUID_PROPID, 23);") +cpp_quote("DEFINE_DBID(DBCOLUMN_BASESCHEMANAME, DBCIDGUID, DBKIND_GUID_PROPID, 24);") +cpp_quote("DEFINE_DBID(DBCOLUMN_GUID, DBCIDGUID, DBKIND_GUID_PROPID, 29);") +cpp_quote("DEFINE_DBID(DBCOLUMN_PROPID, DBCIDGUID, DBKIND_GUID_PROPID, 30);") +cpp_quote("DEFINE_DBID(DBCOLUMN_TYPEINFO, DBCIDGUID, DBKIND_GUID_PROPID, 31);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINCATALOG, DBCIDGUID, DBKIND_GUID_PROPID, 32);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DOMAINSCHEMA, DBCIDGUID, DBKIND_GUID_PROPID, 33);") +cpp_quote("DEFINE_DBID(DBCOLUMN_DATETIMEPRECISION, DBCIDGUID, DBKIND_GUID_PROPID, 34);") +cpp_quote("DEFINE_DBID(DBCOLUMN_NUMERICPRECISIONRADIX, DBCIDGUID, DBKIND_GUID_PROPID, 35);") +cpp_quote("DEFINE_DBID(DBCOLUMN_OCTETLENGTH, DBCIDGUID, DBKIND_GUID_PROPID, 36);") +cpp_quote("DEFINE_DBID(DBCOLUMN_COLUMNSIZE, DBCIDGUID, DBKIND_GUID_PROPID, 37);") +cpp_quote("DEFINE_DBID(DBCOLUMN_CLSID, DBCIDGUID, DBKIND_GUID_PROPID, 38);") +cpp_quote("DEFINE_DBID(DBCOLUMN_KEYCOLUMN, DBCIDGUID, DBKIND_GUID_PROPID, 41);") cpp_quote("#define DBPROMPT_PROMPT 0x01") cpp_quote("#define DBPROMPT_COMPLETE 0x02")

1 0

Zebediah Figura : wined3d: Require ARB_texture_non_power_of_two.
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: wine Branch: master Commit: 95633ebbd17e3052d4e4522ac4b14dd37b73d7ea URL: https://gitlab.winehq.org/wine/wine/-/commit/95633ebbd17e3052d4e4522ac4b14d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Mar 18 14:35:50 2024 -0500 wined3d: Require ARB_texture_non_power_of_two. Also allowing r500's "normalized texrect" functionality. Keeping WINED3D_GL_NORMALIZED_TEXRECT is far less invasive and painful than the rest of the NP2 fixup code. --- dlls/wined3d/adapter_gl.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 2486686640f..bc9da1f0881 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -5330,6 +5330,13 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, } } + if (!gl_info->supported[ARB_TEXTURE_NON_POWER_OF_TWO] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) + { + ERR("Required extension ARB_texture_non_power_of_two is not supported.\n"); + wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); + return FALSE; + } + if (gl_info->glsl_version <= MAKEDWORD_VERSION(1, 20)) { ERR("GLSL version %s is too low; 1.20 is required.\n",

1 0

Zhiyi Zhang : gdiplus/tests: Add tests for GdipPrivateAddMemoryFont().
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: wine Branch: master Commit: 242ee3d0133704313473476782ade8a8704fc12a URL: https://gitlab.winehq.org/wine/wine/-/commit/242ee3d0133704313473476782ade8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Mar 29 11:46:14 2024 +0800 gdiplus/tests: Add tests for GdipPrivateAddMemoryFont(). --- dlls/gdiplus/tests/font.c | 64 ++++++++-- dlls/gdiplus/tests/resource.rc | 8 ++ dlls/gdiplus/tests/wine_mac_win.ttf | Bin 0 -> 1140 bytes dlls/gdiplus/tests/wine_mac_win.ttx | 203 ++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/wine_unicode_mac.ttf | Bin 0 -> 1168 bytes dlls/gdiplus/tests/wine_unicode_mac.ttx | 203 ++++++++++++++++++++++++++++++++ 6 files changed, 471 insertions(+), 7 deletions(-)

1 0

Zhiyi Zhang : gdiplus: Search microsoft platform names first in load_ttf_name_id().
by Alexandre Julliard 04 Apr '24

04 Apr '24

Module: wine Branch: master Commit: 9786ee25554fa9b3d32488685a9751676d0269db URL: https://gitlab.winehq.org/wine/wine/-/commit/9786ee25554fa9b3d32488685a9751… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Mar 28 17:00:39 2024 +0800 gdiplus: Search microsoft platform names first in load_ttf_name_id(). Search names in fonts in the order of Microsoft, Mac and finally Unicode platform. This is also the order win32u uses to load font names. Fix Granado Espada Japan (1219160) launcher crashes at start in the Japanese locale. The game ships a font with a broken name record of Mac platform and encoding ID 0 (Roman) but the name string is in code page 10001 (Japanese). This broken name record is placed before the name records for the Microsoft platform so it gets selected first. Then the name string in the name record doesn't get converted correctly to Unicode because of the wrong code page. Thus the EnumFontFamiliesExW() in GdipPrivateAddMemoryFont() fails to find the font and causes game crash. --- dlls/gdiplus/font.c | 38 +++++++++++++++++++++++--------------- dlls/gdiplus/tests/font.c | 1 - 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index da37279fbef..67d75ed97f6 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1385,12 +1385,13 @@ static WCHAR *copy_name_table_string( const tt_name_record *name, const BYTE *da static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) { + static const WORD platform_id_table[] = {TT_PLATFORM_MICROSOFT, TT_PLATFORM_MACINTOSH, TT_PLATFORM_APPLE_UNICODE}; LANGID lang = GetSystemDefaultLangID(); const tt_header *header; const tt_name_table *name_table; - const tt_name_record *name_record; + const tt_name_record *name_record_table, *name_record; DWORD pos, ofs = 0, count; - int i, res, best_lang = 0, best_index = -1; + int i, j, res, best_lang = 0, best_index = -1; if (sizeof(tt_header) > size) return NULL; @@ -1421,26 +1422,33 @@ static WCHAR *load_ttf_name_id( const BYTE *mem, DWORD_PTR size, DWORD id ) if (pos > size) return NULL; name_table = (const tt_name_table*)&mem[ofs]; + name_record_table = (const tt_name_record *)&mem[pos]; count = GET_BE_WORD(name_table->count); if (GET_BE_WORD(name_table->string_offset) >= size - ofs) return NULL; ofs += GET_BE_WORD(name_table->string_offset); - for (i=0; i<count; i++) + for (i = 0; i < ARRAY_SIZE(platform_id_table); i++) { - name_record = (const tt_name_record*)&mem[pos]; - pos += sizeof(*name_record); - if (pos > size) - return NULL; + for (j = 0; j < count; j++) + { + name_record = name_record_table + j; + if ((const BYTE *)name_record - mem > size) + return NULL; - if (GET_BE_WORD(name_record->name_id) != id) continue; - if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; - if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; + if (GET_BE_WORD(name_record->platform_id) != platform_id_table[i]) continue; + if (GET_BE_WORD(name_record->name_id) != id) continue; + if (GET_BE_WORD(name_record->offset) >= size - ofs) return NULL; + if (GET_BE_WORD(name_record->length) > size - ofs - GET_BE_WORD(name_record->offset)) return NULL; - res = match_name_table_language( name_record, lang ); - if (res > best_lang) - { - best_lang = res; - best_index = i; + res = match_name_table_language(name_record, lang); + if (res > best_lang) + { + best_lang = res; + best_index = j; + } } + + if (best_index != -1) + break; } if (best_lang) diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 6a21ea30361..1bbb18f4c6d 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -1558,7 +1558,6 @@ static void test_GdipPrivateAddMemoryFont(void) { stat = GdipGetFontCollectionFamilyCount(fonts, &count); ok(stat == Ok, "GdipGetFontCollectionFamilyCount failed, error %d\n", stat); - todo_wine ok(count == 1, "Expected count 1, got %d\n", count); } else if (i == 1 && stat == FileNotFound)

1 0