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

Giovanni Mascellani : vkd3d-dxbc: Add an option to ignore checksum.
by Alexandre Julliard 11 Mar '24

11 Mar '24

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-dxbc: Add an option to re-emit the shader with the correct checksum.
by Alexandre Julliard 11 Mar '24

11 Mar '24

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 choose the output filename.
by Alexandre Julliard 11 Mar '24

11 Mar '24

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

Brendan Shanks : opengl32: Replace sprintf with snprintf/asprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard 11 Mar '24

11 Mar '24

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

Brendan Shanks : secur32: Replace sprintf with snprintf to avoid deprecation warnings on macOS.
by Alexandre Julliard 11 Mar '24

11 Mar '24

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

Esme Povirk : gdiplus: Check bounding box in GdipIsVisibleRegionPoint.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 47e9980bb14df2ae8d8a196502843394f093255d URL: https://gitlab.winehq.org/wine/wine/-/commit/47e9980bb14df2ae8d8a1965028433… Author: Esme Povirk <esme(a)codeweavers.com> Date: Sat Oct 28 15:12:57 2023 -0500 gdiplus: Check bounding box in GdipIsVisibleRegionPoint. --- dlls/gdiplus/region.c | 218 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 217 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index 9617f492a51..3034dedae76 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -1313,6 +1314,208 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionRectI(GpRegion* region, INT x, INT y, INT return GdipIsVisibleRegionRect(region, (REAL)x, (REAL)y, (REAL)w, (REAL)h, graphics, res); } +/* get_region_bounding_box + * + * Returns a box guaranteed to enclose the entire region, but not guaranteed to be minimal. + * Sets "empty" if bounding box is empty. + * Sets "infinite" if everything outside bounding box is inside the region. + * In the infinite case, the bounding box encloses all points not in the region. */ +static void get_region_bounding_box(struct region_element *element, + REAL *min_x, REAL *min_y, REAL *max_x, REAL *max_y, BOOL *empty, BOOL *infinite) +{ + REAL left_min_x, left_min_y, left_max_x, left_max_y; + BOOL left_empty, left_infinite; + REAL right_min_x, right_min_y, right_max_x, right_max_y; + BOOL right_empty, right_infinite; + /* For combine modes, we convert the mode to flags as follows to simplify the logic: + * 0x8 = point in combined region if it's in both + * 0x4 = point in combined region if it's in left and not right + * 0x2 = point in combined region if it's not in left and is in right + * 0x1 = point in combined region if it's in neither region */ + int flags; + const int combine_mode_flags[] = { + 0xa, /* CombineModeReplace - shouldn't be used */ + 0x8, /* CombineModeIntersect */ + 0xe, /* CombineModeUnion */ + 0x6, /* CombineModeXor */ + 0x4, /* CombineModeExclude */ + 0x2, /* CombineModeComplement */ + }; + + /* handle unit elements first */ + switch (element->type) + { + case RegionDataInfiniteRect: + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = TRUE; + return; + case RegionDataEmptyRect: + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = FALSE; + return; + case RegionDataPath: + { + GpPath *path = element->elementdata.path; + int i; + + if (path->pathdata.Count <= 1) { + *min_x = *min_y = *max_x = *max_y = 0.0; + *empty = TRUE; + *infinite = FALSE; + return; + } + + *min_x = *max_x = path->pathdata.Points[0].X; + *min_y = *max_y = path->pathdata.Points[0].Y; + *empty = FALSE; + *infinite = FALSE; + + for (i=1; i < path->pathdata.Count; i++) + { + if (path->pathdata.Points[i].X < *min_x) + *min_x = path->pathdata.Points[i].X; + else if (path->pathdata.Points[i].X > *max_x) + *max_x = path->pathdata.Points[i].X; + if (path->pathdata.Points[i].Y < *min_y) + *min_y = path->pathdata.Points[i].Y; + else if (path->pathdata.Points[i].Y > *max_y) + *max_y = path->pathdata.Points[i].Y; + } + + return; + } + case RegionDataRect: + *min_x = element->elementdata.rect.X; + *min_y = element->elementdata.rect.Y; + *max_x = element->elementdata.rect.X + element->elementdata.rect.Width; + *max_y = element->elementdata.rect.Y + element->elementdata.rect.Height; + *empty = FALSE; + *infinite = FALSE; + return; + } + + /* Should be only combine modes left */ + assert(element->type < ARRAY_SIZE(combine_mode_flags)); + + flags = combine_mode_flags[element->type]; + + get_region_bounding_box(element->elementdata.combine.left, + &left_min_x, &left_min_y, &left_max_x, &left_max_y, &left_empty, &left_infinite); + + if (left_infinite) + { + /* change our function so we can ignore the infinity */ + flags = ((flags & 0x3) << 2) | ((flags & 0xc) >> 2); + } + + if (left_empty && (flags & 0x3) == 0) { + /* no points in region regardless of right region, return empty */ + *empty = TRUE; + *infinite = FALSE; + return; + } + + if (left_empty && (flags & 0x3) == 0x3) { + /* all points in region regardless of right region, return infinite */ + *empty = TRUE; + *infinite = TRUE; + return; + } + + get_region_bounding_box(element->elementdata.combine.right, + &right_min_x, &right_min_y, &right_max_x, &right_max_y, &right_empty, &right_infinite); + + if (right_infinite) + { + /* change our function so we can ignore the infinity */ + flags = ((flags & 0x5) << 1) | ((flags & 0xa) >> 1); + } + + /* result is infinite if points in neither region are in the result */ + *infinite = (flags & 0x1); + + if (*infinite) + { + /* Again, we modify our function to ignore the infinity. + * The points we care about are the ones that are different from the outside of our box, + * not the points inside the region, so we invert the whole thing. + * From here we can assume 0x1 is not set. */ + flags ^= 0xf; + } + + if (left_empty) + { + /* We already took care of the cases where the right region doesn't matter, + * so we can just use the right bounding box. */ + *min_x = right_min_x; + *min_y = right_min_y; + *max_x = right_max_x; + *max_y = right_max_y; + *empty = right_empty; + return; + } + + if (right_empty) + { + /* With no points in right region, and infinities eliminated, we only care + * about flag 0x4, the case where a point is in left region and not right. */ + if (flags & 0x4) + { + /* We have a copy of the left region. */ + *min_x = left_min_x; + *min_y = left_min_y; + *max_x = left_max_x; + *max_y = left_max_y; + *empty = left_empty; + return; + } + /* otherwise, it's an empty (or infinite) region */ + *empty = TRUE; + return; + } + + /* From here we know 0x1 isn't set, and we know at least one flag is set. + * We can ignore flag 0x8 because we must assume that any point within the + * intersection of the bounding boxes might be within the region. */ + switch (flags & 0x6) + { + case 0x0: + /* intersection */ + *min_x = fmaxf(left_min_x, right_min_x); + *min_y = fmaxf(left_min_y, right_min_y); + *max_x = fminf(left_max_x, right_max_x); + *max_y = fminf(left_max_y, right_max_y); + *empty = *min_x > *max_x || *min_y > *max_y; + return; + case 0x2: + /* right (or complement) */ + *min_x = right_min_x; + *min_y = right_min_y; + *max_x = right_max_x; + *max_y = right_max_y; + *empty = right_empty; + return; + case 0x4: + /* left (or exclude) */ + *min_x = left_min_x; + *min_y = left_min_y; + *max_x = left_max_x; + *max_y = left_max_y; + *empty = left_empty; + return; + case 0x6: + /* union (or xor) */ + *min_x = fminf(left_min_x, right_min_x); + *min_y = fminf(left_min_y, right_min_y); + *max_x = fmaxf(left_max_x, right_max_x); + *max_y = fmaxf(left_max_y, right_max_y); + *empty = FALSE; + return; + } +} + /***************************************************************************** * GdipIsVisibleRegionPoint [GDIPLUS.@] */ @@ -1320,12 +1523,25 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion* region, REAL x, REAL y, G { HRGN hrgn; GpStatus stat; + REAL min_x, min_y, max_x, max_y; + BOOL empty, infinite; TRACE("(%p, %.2f, %.2f, %p, %p)\n", region, x, y, graphics, res); if(!region || !res) return InvalidParameter; + x = gdip_round(x); + y = gdip_round(y); + + /* Check for cases where we can skip quantization. */ + get_region_bounding_box(&region->node, &min_x, &min_y, &max_x, &max_y, &empty, &infinite); + if (empty || x < min_x || y < min_y || x > max_x || y > max_y) + { + *res = infinite; + return Ok; + } + if((stat = GdipGetRegionHRgn(region, NULL, &hrgn)) != Ok) return stat; @@ -1335,7 +1551,7 @@ GpStatus WINGDIPAPI GdipIsVisibleRegionPoint(GpRegion* region, REAL x, REAL y, G return Ok; } - *res = PtInRegion(hrgn, gdip_round(x), gdip_round(y)); + *res = PtInRegion(hrgn, x, y); DeleteObject(hrgn);

1 0

Alexandre Julliard : configure: Check the correct variable for the Wayland EGL library.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 2ab736e292edad9e46db98e211c64d7fab93d12b URL: https://gitlab.winehq.org/wine/wine/-/commit/2ab736e292edad9e46db98e211c64d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Mar 9 11:21:05 2024 +0100 configure: Check the correct variable for the Wayland EGL library. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56411 --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index eaaa2d7dc3e..59848dcdaf4 100755 --- a/configure +++ b/configure @@ -16356,7 +16356,7 @@ CPPFLAGS=$ac_save_CPPFLAGS if test "x$with_wayland" != "x" then - if test -z "$ac_cv_lib_soname_EGL" -o -z "$HAVE_LIBWAYLAND_EGL" + if test -z "$ac_cv_lib_soname_EGL" -o "$ac_cv_lib_wayland_egl_wl_egl_window_create" != yes then : case "x$with_opengl" in x) as_fn_append wine_notices "|EGL ${notice_platform}development files not found, the Wayland driver won't support OpenGL" ;; diff --git a/configure.ac b/configure.ac index 417b1a63a13..2282758fd10 100644 --- a/configure.ac +++ b/configure.ac @@ -1392,7 +1392,7 @@ then [WAYLAND_EGL_LIBS=""],[$WAYLAND_EGL_LIBS])])]) if test "x$with_wayland" != "x" then - WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o -z "$HAVE_LIBWAYLAND_EGL"], + WINE_NOTICE_WITH(opengl, [test -z "$ac_cv_lib_soname_EGL" -o "$ac_cv_lib_wayland_egl_wl_egl_window_create" != yes], [EGL ${notice_platform}development files not found, the Wayland driver won't support OpenGL]) fi fi

1 0

Alexandre Julliard : ntdll: Implement RtlRestoreContext on ARM64EC.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 6d8b4e661fee3c6a1d675de80e89c11c14fff53b URL: https://gitlab.winehq.org/wine/wine/-/commit/6d8b4e661fee3c6a1d675de80e89c1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 12:16:10 2024 +0100 ntdll: Implement RtlRestoreContext on ARM64EC. --- dlls/ntdll/signal_arm64ec.c | 85 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_arm64ec.c b/dlls/ntdll/signal_arm64ec.c index 6f73919c886..8acb5c767ed 100644 --- a/dlls/ntdll/signal_arm64ec.c +++ b/dlls/ntdll/signal_arm64ec.c @@ -1893,12 +1893,95 @@ int __attribute__((naked)) NTDLL__setjmpex( _JUMP_BUFFER *buf, void *frame ) } +/********************************************************************** + * call_consolidate_callback + * + * Wrapper function to call a consolidate callback from a fake frame. + * If the callback executes RtlUnwindEx (like for example done in C++ handlers), + * we have to skip all frames which were already processed. To do that we + * trick the unwinding functions into thinking the call came from somewhere + * else. + */ +static void __attribute__((naked,noreturn)) consolidate_callback( CONTEXT *context, + void *(CALLBACK *callback)(EXCEPTION_RECORD *), + EXCEPTION_RECORD *rec ) +{ + asm( ".seh_proc consolidate_callback\n\t" + "stp x29, x30, [sp, #-16]!\n\t" + ".seh_save_fplr_x 16\n\t" + "sub sp, sp, #0x4d0\n\t" + ".seh_stackalloc 0x4d0\n\t" + ".seh_endprologue\n\t" + "mov x4, sp\n\t" + /* copy the context onto the stack */ + "mov x5, #0x4d0/16\n" /* sizeof(CONTEXT) */ + "1:\tldp x6, x7, [x0], #16\n\t" + "stp x6, x7, [x4], #16\n\t" + "subs x5, x5, #1\n\t" + "b.ne 1b\n\t" + "mov x0, x2\n\t" /* rec */ + "b invoke_callback\n\t" + ".seh_endproc\n\t" + ".seh_proc invoke_callback\n" + "invoke_callback:\n\t" + ".seh_ec_context\n\t" + ".seh_endprologue\n\t" + "mov x11, x1\n\t" /* callback */ + "adr x10, $iexit_thunk$cdecl$i8$i8\n\t" + "adrp x16, __os_arm64x_dispatch_icall\n\t" + "ldr x16, [x16, #:lo12:__os_arm64x_dispatch_icall]\n\t" + "blr x16\n\t" + "blr x11\n\t" + "str x0, [sp, #0xf8]\n\t" /* context->Rip */ + "mov x0, sp\n\t" /* context */ + "mov w1, #0\n\t" + "bl \"#NtContinue\"\n\t" + ".seh_endproc" ); +} + + /******************************************************************* * RtlRestoreContext (NTDLL.@) */ void CDECL RtlRestoreContext( CONTEXT *context, EXCEPTION_RECORD *rec ) { - FIXME( "not implemented\n" ); + EXCEPTION_REGISTRATION_RECORD *teb_frame = NtCurrentTeb()->Tib.ExceptionList; + + if (rec && rec->ExceptionCode == STATUS_LONGJUMP && rec->NumberParameters >= 1) + { + struct _JUMP_BUFFER *jmp = (struct _JUMP_BUFFER *)rec->ExceptionInformation[0]; + + context->Rbx = jmp->Rbx; + context->Rsp = jmp->Rsp; + context->Rbp = jmp->Rbp; + context->Rsi = jmp->Rsi; + context->Rdi = jmp->Rdi; + context->R12 = jmp->R12; + context->R13 = jmp->R13; + context->R14 = jmp->R14; + context->R15 = jmp->R15; + context->Rip = jmp->Rip; + context->MxCsr = jmp->MxCsr; + context->FltSave.MxCsr = jmp->MxCsr; + context->FltSave.ControlWord = jmp->FpCsr; + memcpy( &context->Xmm6, &jmp->Xmm6, 10 * sizeof(M128A) ); + } + else if (rec && rec->ExceptionCode == STATUS_UNWIND_CONSOLIDATE && rec->NumberParameters >= 1) + { + void * (CALLBACK *consolidate)(EXCEPTION_RECORD *) = (void *)rec->ExceptionInformation[0]; + TRACE( "calling consolidate callback %p (rec=%p)\n", consolidate, rec ); + consolidate_callback( context, consolidate, rec ); + } + + /* hack: remove no longer accessible TEB frames */ + while ((ULONG64)teb_frame < context->Rsp) + { + TRACE( "removing TEB frame: %p\n", teb_frame ); + teb_frame = __wine_pop_frame( teb_frame ); + } + + TRACE( "returning to %p stack %p\n", (void *)context->Rip, (void *)context->Rsp ); + NtContinue( context, FALSE ); }

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on x86-64.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: f127448d00b9f4c4869c737c8c38038ed15fc4f8 URL: https://gitlab.winehq.org/wine/wine/-/commit/f127448d00b9f4c4869c737c8c3803… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:52:36 2024 +0100 ntdll: Implement RtlWalkFrameChain on x86-64. --- dlls/ntdll/signal_x86_64.c | 30 ++++++++++++++++++++++++++++++ include/rtlsupportapi.h | 1 + 2 files changed, 31 insertions(+) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 8b1de07ccc9..1e928cad2c9 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -958,6 +958,36 @@ __ASM_GLOBAL_FUNC( RtlRaiseException, "call " __ASM_NAME("RtlRaiseStatus") /* does not return */ ); +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + UNWIND_HISTORY_TABLE table; + RUNTIME_FUNCTION *func; + PEXCEPTION_ROUTINE handler; + ULONG_PTR frame, base; + CONTEXT context; + void *data; + ULONG i, skip = flags >> 8, num_entries = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + func = RtlLookupFunctionEntry( context.Rip, &base, &table ); + if (RtlVirtualUnwind2( UNW_FLAG_NHANDLER, base, context.Rip, func, &context, NULL, + &data, &frame, NULL, NULL, NULL, &handler, 0 )) + break; + if (!context.Rip) break; + if (!frame || !is_valid_frame( frame )) break; + if (context.Rsp == (ULONG_PTR)NtCurrentTeb()->Tib.StackBase) break; + if (i >= skip) buffer[num_entries++] = (void *)context.Rip; + } + return num_entries; +} + + static inline ULONG hash_pointers( void **ptrs, ULONG count ) { /* Based on MurmurHash2, which is in the public domain */ diff --git a/include/rtlsupportapi.h b/include/rtlsupportapi.h index 32f0099c0b6..becb6179a56 100644 --- a/include/rtlsupportapi.h +++ b/include/rtlsupportapi.h @@ -28,6 +28,7 @@ NTSYSAPI void WINAPI RtlRaiseException(EXCEPTION_RECORD*); NTSYSAPI void CDECL RtlRestoreContext(CONTEXT*,EXCEPTION_RECORD*); NTSYSAPI void WINAPI RtlUnwind(void*,void*,EXCEPTION_RECORD*,void*); NTSYSAPI void* WINAPI RtlPcToFileHeader(void*,void**); +NTSYSAPI ULONG WINAPI RtlWalkFrameChain(void**,ULONG,ULONG); #ifndef __i386__

1 0

Alexandre Julliard : ntdll: Implement RtlWalkFrameChain on i386.
by Alexandre Julliard 11 Mar '24

11 Mar '24

Module: wine Branch: master Commit: 37ded7380e6e79f52ecb01c9f3d284bb51376a6e URL: https://gitlab.winehq.org/wine/wine/-/commit/37ded7380e6e79f52ecb01c9f3d284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 11 16:52:50 2024 +0100 ntdll: Implement RtlWalkFrameChain on i386. --- dlls/ntdll/signal_i386.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c index 178848cd7ca..cade0c973c2 100644 --- a/dlls/ntdll/signal_i386.c +++ b/dlls/ntdll/signal_i386.c @@ -451,6 +451,29 @@ __ASM_STDCALL_FUNC( RtlRaiseException, 4, "ret $4" ) /* actually never returns */ +/************************************************************************* + * RtlWalkFrameChain (NTDLL.@) + */ +ULONG WINAPI RtlWalkFrameChain( void **buffer, ULONG count, ULONG flags ) +{ + CONTEXT context; + ULONG *frame; + ULONG i, skip = flags >> 8, pos = 0; + + RtlCaptureContext( &context ); + + for (i = 0; i < count; i++) + { + if (!is_valid_frame( context.Ebp )) break; + if (i >= skip) buffer[pos++] = (void *)context.Eip; + frame = (ULONG *)context.Ebp; + context.Ebp = frame[0]; + context.Eip = frame[1]; + } + return pos; +} + + /************************************************************************* * RtlCaptureStackBackTrace (NTDLL.@) */

1 0