- Wine-Commits - list.winehq.org

Rémi Bernon : widl: Use a struct list for the import stack.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 9d537999e315a74ef559fabb79d5b632b8a00208 URL: https://gitlab.winehq.org/wine/wine/-/commit/9d537999e315a74ef559fabb79d5b6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:05:44 2023 +0100 widl: Use a struct list for the import stack. --- tools/widl/parser.h | 4 +--- tools/widl/parser.l | 66 ++++++++++++++++++++++++++++++----------------------- tools/widl/widl.c | 2 -- 3 files changed, 38 insertions(+), 34 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index f465fafa03c..abe215de02f 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -28,12 +28,10 @@ extern char *parser_text; extern int parser_debug; extern int yy_flex_debug; -extern int import_stack_ptr; +extern int parse_only; void push_import( char *import_name ); void pop_import(void); -#define parse_only import_stack_ptr - int is_type(const char *name); int do_warning(const char *toggle, warning_list_t *wnum); diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 47783cbacb3..89383fe810e 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -81,13 +81,15 @@ static void switch_to_acf(void); static warning_list_t *disabled_warnings = NULL; -#define MAX_IMPORT_DEPTH 20 -struct { - YY_BUFFER_STATE state; - char *input_name; - int line_number; -} import_stack[MAX_IMPORT_DEPTH]; -int import_stack_ptr = 0; +struct import_state +{ + YY_BUFFER_STATE buffer; + char *input_name; + int line_number; + struct list entry; +}; +static struct list import_stack = LIST_INIT( import_stack ); +int parse_only = 0; struct import { @@ -159,7 +161,8 @@ struct uuid *parse_uuid(const char *u) } <PP_PRAGMA>midl_echo[^\n]* yyless(9); yy_pop_state(); return tCPPQUOTE; <PP_PRAGMA>winrt[^\n]* { - if(import_stack_ptr) { + if (!list_empty( &import_stack )) + { if(!winrt_mode) error_loc("winrt IDL file imported in non-winrt mode\n"); }else { @@ -234,7 +237,7 @@ SAFEARRAY{ws}*/\( return tSAFEARRAY; <INITIAL,ATTR>\.\.\. return ELLIPSIS; <INITIAL,ATTR>. return yytext[0]; <<EOF>> { - if (import_stack_ptr) + if (!list_empty( &import_stack )) return aEOF; if (acf_name) { @@ -510,32 +513,38 @@ static char *get_buffered_cstring(void) void pop_import(void) { - int ptr = import_stack_ptr-1; - - if (yyin) fclose( yyin ); - yy_delete_buffer( YY_CURRENT_BUFFER ); - yy_switch_to_buffer( import_stack[ptr].state ); - input_name = import_stack[ptr].input_name; - line_number = import_stack[ptr].line_number; - import_stack_ptr--; + struct list *entry = list_head( &import_stack ); + struct import_state *state; + assert( entry ); + + state = LIST_ENTRY( entry, struct import_state, entry ); + list_remove( &state->entry ); + parse_only = !list_empty( &import_stack ); + + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); + yy_switch_to_buffer( state->buffer ); + input_name = state->input_name; + line_number = state->line_number; + free( state ); } void push_import( char *import_name ) { + struct import_state *state; FILE *f; char *path, *name; struct import *import; - int ptr = import_stack_ptr; int ret; - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); + state = xmalloc( sizeof(struct import_state )); + list_add_head( &import_stack, &state->entry ); + parse_only = !list_empty( &import_stack ); - import_stack[ptr].state = YY_CURRENT_BUFFER; - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; - yyin = NULL; + state->buffer = YY_CURRENT_BUFFER; + state->input_name = input_name; + state->line_number = line_number; + input_name = NULL; /* reset buffer for <<EOF>>, in case import fails or already imported */ yy_scan_string( "" ); @@ -573,12 +582,12 @@ void push_import( char *import_name ) static void switch_to_acf(void) { - int ptr = import_stack_ptr; - int ret; char *name; + int ret; FILE *f; - assert(import_stack_ptr == 0); + if (yyin) fclose( yyin ); + yy_delete_buffer( YY_CURRENT_BUFFER ); input_name = acf_name; acf_name = NULL; @@ -595,7 +604,6 @@ static void switch_to_acf(void) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); } diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 1bc52a2a3a2..f259f0abe20 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -871,8 +871,6 @@ int main(int argc,char *argv[]) init_types(); ret = parser_parse(); - fclose(parser_in); - if(ret) { exit(1); }

1 0

Rémi Bernon : widl: Handle preprocess-only case separately.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: a6ab03dcd58a5ea954072aff36d310fb578f8031 URL: https://gitlab.winehq.org/wine/wine/-/commit/a6ab03dcd58a5ea954072aff36d310… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Handle preprocess-only case separately. --- tools/widl/widl.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index f259f0abe20..7ed3bfd1f8c 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -836,29 +836,20 @@ int main(int argc,char *argv[]) atexit(rm_tempfile); input = input_name; + if (preprocess_only) exit( wpp_parse( input_name, stdout ) ); + if (!no_preprocess) { - chat("Starting preprocess\n"); - - if (!preprocess_only) - { - FILE *output; - char *name = make_temp_file( header_name, NULL ); - - if (!(output = fopen(name, "wt"))) - error("Could not open fd %s for writing\n", name); + FILE *output; + char *name; - ret = wpp_parse( input_name, output ); - fclose( output ); - input = name; - } - else - { - ret = wpp_parse( input_name, stdout ); - } + name = make_temp_file( header_name, NULL ); + if (!(output = fopen( name, "wt" ))) error( "Could not open fd %s for writing\n", name ); + ret = wpp_parse( input_name, output ); + fclose( output ); + input = name; - if(ret) exit(1); - if(preprocess_only) exit(0); + if (ret) exit( 1 ); } if(!(parser_in = fopen(input, "r"))) {

1 0

Rémi Bernon : widl: Simplify handling of already parsed imports.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 5deda2de3fb6ddcf8d84ed8245597a7b46020df8 URL: https://gitlab.winehq.org/wine/wine/-/commit/5deda2de3fb6ddcf8d84ed8245597a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Jan 25 23:02:38 2023 +0100 widl: Simplify handling of already parsed imports. --- tools/widl/parser.h | 2 +- tools/widl/parser.l | 36 ++++++++++++++++++++---------------- tools/widl/parser.y | 15 ++++----------- 3 files changed, 25 insertions(+), 28 deletions(-) diff --git a/tools/widl/parser.h b/tools/widl/parser.h index 83832ecfcd8..f465fafa03c 100644 --- a/tools/widl/parser.h +++ b/tools/widl/parser.h @@ -29,7 +29,7 @@ extern int parser_debug; extern int yy_flex_debug; extern int import_stack_ptr; -int do_import(char *fname); +void push_import( char *import_name ); void pop_import(void); #define parse_only import_stack_ptr diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 710b6e37636..47783cbacb3 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -512,7 +512,7 @@ void pop_import(void) { int ptr = import_stack_ptr-1; - fclose(yyin); + if (yyin) fclose( yyin ); yy_delete_buffer( YY_CURRENT_BUFFER ); yy_switch_to_buffer( import_stack[ptr].state ); input_name = import_stack[ptr].input_name; @@ -520,7 +520,7 @@ void pop_import(void) import_stack_ptr--; } -int do_import(char *fname) +void push_import( char *import_name ) { FILE *f; char *path, *name; @@ -528,26 +528,32 @@ int do_import(char *fname) int ptr = import_stack_ptr; int ret; + if (import_stack_ptr == MAX_IMPORT_DEPTH) + error_loc("Exceeded max import depth\n"); + + import_stack[ptr].state = YY_CURRENT_BUFFER; + import_stack[ptr].input_name = input_name; + import_stack[ptr].line_number = line_number; + import_stack_ptr++; + yyin = NULL; + + /* reset buffer for <<EOF>>, in case import fails or already imported */ + yy_scan_string( "" ); + LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) - if (!strcmp( import->name, fname )) return 0; /* already imported */ + if (!strcmp( import->name, import_name )) return; /* already imported */ import = xmalloc( sizeof(struct import) ); - import->name = xstrdup( fname ); + import->name = xstrdup( import_name ); list_add_tail( &imports, &import->entry ); /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */ - if (strchr( fname, '/' ) || strchr( fname, '\\' )) - path = xstrdup( fname ); - else if (!(path = wpp_find_include( fname, input_name ))) - error_loc("Unable to open include file %s\n", fname); + if (strchr( import_name, '/' ) || strchr( import_name, '\\' )) + path = xstrdup( import_name ); + else if (!(path = wpp_find_include( import_name, input_name ))) + error_loc( "Unable to open include file %s\n", import_name ); - if (import_stack_ptr == MAX_IMPORT_DEPTH) - error_loc("Exceeded max import depth\n"); - - import_stack[ptr].input_name = input_name; - import_stack[ptr].line_number = line_number; - import_stack_ptr++; input_name = path; line_number = 1; @@ -562,9 +568,7 @@ int do_import(char *fname) if((f = fopen(name, "r")) == NULL) error_loc("Unable to open %s\n", name); - import_stack[ptr].state = YY_CURRENT_BUFFER; yy_switch_to_buffer(yy_create_buffer(f, YY_BUF_SIZE)); - return 1; } static void switch_to_acf(void) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 6777a281ec7..031e5482792 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -331,7 +331,7 @@ int parser_lex( PARSER_STYPE *yylval ); %type <str> libraryhdr callconv cppquote importlib import %type <str> typename m_typename %type <uuid> uuid_string -%type <import> import_start +%type <str> import_start %type <typelib> library_start librarydef %type <statement> statement typedef pragma_warning %type <stmt_list> gbl_statements imp_statements int_statements @@ -504,17 +504,10 @@ typedecl: cppquote: tCPPQUOTE '(' aSTRING ')' { $$ = $3; } ; -import_start: tIMPORT aSTRING ';' { $$ = xmalloc(sizeof(struct _import_t)); - $$->name = $2; - $$->import_performed = do_import($2); - if (!$$->import_performed) yychar = aEOF; - } - ; -import: import_start imp_statements aEOF { $$ = $1->name; - if ($1->import_performed) pop_import(); - free($1); - } +import_start: tIMPORT aSTRING ';' { $$ = $2; push_import($2); } + ; +import: import_start imp_statements aEOF { pop_import(); } ; importlib: tIMPORTLIB '(' aSTRING ')'

1 0

Rémi Bernon : widl: Use a struct list to keep imported files.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 9d1f1a3fb1533f72243bfc9258f421d294fee5ad URL: https://gitlab.winehq.org/wine/wine/-/commit/9d1f1a3fb1533f72243bfc9258f421… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jan 24 22:19:45 2023 +0100 widl: Use a struct list to keep imported files. --- tools/widl/parser.l | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 85d33d6e86a..710b6e37636 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -89,6 +89,13 @@ struct { } import_stack[MAX_IMPORT_DEPTH]; int import_stack_ptr = 0; +struct import +{ + const char *name; + struct list entry; +}; +static struct list imports = LIST_INIT( imports ); + /* converts an integer in string form to an unsigned long and prints an error * on overflow */ static unsigned int xstrtoul(const char *nptr, char **endptr, int base) @@ -513,28 +520,20 @@ void pop_import(void) import_stack_ptr--; } -struct imports { - char *name; - struct imports *next; -} *first_import; - int do_import(char *fname) { FILE *f; char *path, *name; - struct imports *import; + struct import *import; int ptr = import_stack_ptr; int ret; - import = first_import; - while (import && strcmp(import->name, fname)) - import = import->next; - if (import) return 0; /* already imported */ + LIST_FOR_EACH_ENTRY( import, &imports, struct import, entry ) + if (!strcmp( import->name, fname )) return 0; /* already imported */ - import = xmalloc(sizeof(struct imports)); - import->name = xstrdup(fname); - import->next = first_import; - first_import = import; + import = xmalloc( sizeof(struct import) ); + import->name = xstrdup( fname ); + list_add_tail( &imports, &import->entry ); /* don't search for a file name with a path in the include directories, * for compatibility with MIDL */

1 0

Alexandros Frantzis : winewayland.drv: Report basic monitor information.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 697b58f406cecd98539452239018a218943ccabb URL: https://gitlab.winehq.org/wine/wine/-/commit/697b58f406cecd98539452239018a2… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Mar 7 13:21:38 2023 +0200 winewayland.drv: Report basic monitor information. Whenever the Wayland output display state changes (including during initialization), update the monitor information on the Wine side to reflect these changes. For now all monitors are placed at 0,0 in the monitor space, and only the current mode is reported. These deficiencies will be addressed in upcoming commits. We currently support a single GPU, and a single monitor for each adapter. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/Makefile.in | 4 +- dlls/winewayland.drv/display.c | 155 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland.c | 94 +++++++++++++++++++- dlls/winewayland.drv/wayland_output.c | 134 ++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 47 ++++++++++ dlls/winewayland.drv/waylanddrv_main.c | 15 +++- 6 files changed, 446 insertions(+), 3 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Report all advertised monitor modes to Wine.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: b35f4424b239a82249bd048a8852749a08bb6c37 URL: https://gitlab.winehq.org/wine/wine/-/commit/b35f4424b239a82249bd048a885274… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Mar 10 17:57:38 2023 +0200 winewayland.drv: Report all advertised monitor modes to Wine. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/display.c | 23 ++++++---- dlls/winewayland.drv/wayland_output.c | 83 ++++++++++++++++++++++++++++++++--- dlls/winewayland.drv/waylanddrv.h | 5 ++- 3 files changed, 94 insertions(+), 17 deletions(-) diff --git a/dlls/winewayland.drv/display.c b/dlls/winewayland.drv/display.c index 9e75809fec9..e72b26a9da0 100644 --- a/dlls/winewayland.drv/display.c +++ b/dlls/winewayland.drv/display.c @@ -90,8 +90,8 @@ static void wayland_add_device_monitor(const struct gdi_device_manager *device_m struct gdi_monitor monitor = {0}; SetRect(&monitor.rc_monitor, 0, 0, - output->current_mode.width, - output->current_mode.height); + output->current_mode->width, + output->current_mode->height); /* We don't have a direct way to get the work area in Wayland. */ monitor.rc_work = monitor.rc_monitor; @@ -117,12 +117,17 @@ static void populate_devmode(struct wayland_output_mode *output_mode, DEVMODEW * mode->dmDisplayFrequency = output_mode->refresh / 1000; } -static void wayland_add_device_mode(const struct gdi_device_manager *device_manager, - void *param, struct wayland_output *output) +static void wayland_add_device_modes(const struct gdi_device_manager *device_manager, + void *param, struct wayland_output *output) { - DEVMODEW mode; - populate_devmode(&output->current_mode, &mode); - device_manager->add_mode(&mode, param); + struct wayland_output_mode *output_mode; + + RB_FOR_EACH_ENTRY(output_mode, &output->modes, struct wayland_output_mode, entry) + { + DEVMODEW mode; + populate_devmode(output_mode, &mode); + device_manager->add_mode(&mode, param); + } } /*********************************************************************** @@ -144,10 +149,10 @@ BOOL WAYLAND_UpdateDisplayDevices(const struct gdi_device_manager *device_manage wl_list_for_each(output, &process_wayland->output_list, link) { - if (!output->current_mode.refresh) continue; + if (!output->current_mode) continue; wayland_add_device_adapter(device_manager, param, output_id); wayland_add_device_monitor(device_manager, param, output); - wayland_add_device_mode(device_manager, param, output); + wayland_add_device_modes(device_manager, param, output); output_id++; } diff --git a/dlls/winewayland.drv/wayland_output.c b/dlls/winewayland.drv/wayland_output.c index c8192f94fc7..be9ea32bd72 100644 --- a/dlls/winewayland.drv/wayland_output.c +++ b/dlls/winewayland.drv/wayland_output.c @@ -39,6 +39,64 @@ static uint32_t next_output_id = 0; * Output handling */ +/* Compare a mode rb_tree key with the provided mode rb_entry and return -1 if + * the key compares less than the entry, 0 if the key compares equal to the + * entry, and 1 if the key compares greater than the entry. + * + * The comparison is based on comparing the width, height and refresh in that + * order. */ +static int wayland_output_mode_cmp_rb(const void *key, + const struct rb_entry *entry) +{ + const struct wayland_output_mode *key_mode = key; + const struct wayland_output_mode *entry_mode = + RB_ENTRY_VALUE(entry, const struct wayland_output_mode, entry); + + if (key_mode->width < entry_mode->width) return -1; + if (key_mode->width > entry_mode->width) return 1; + if (key_mode->height < entry_mode->height) return -1; + if (key_mode->height > entry_mode->height) return 1; + if (key_mode->refresh < entry_mode->refresh) return -1; + if (key_mode->refresh > entry_mode->refresh) return 1; + + return 0; +} + +static void wayland_output_add_mode(struct wayland_output *output, + int32_t width, int32_t height, + int32_t refresh, BOOL current) +{ + struct rb_entry *mode_entry; + struct wayland_output_mode *mode; + struct wayland_output_mode key = + { + .width = width, + .height = height, + .refresh = refresh, + }; + + mode_entry = rb_get(&output->modes, &key); + if (mode_entry) + { + mode = RB_ENTRY_VALUE(mode_entry, struct wayland_output_mode, entry); + } + else + { + mode = calloc(1, sizeof(*mode)); + if (!mode) + { + ERR("Failed to allocate space for wayland_output_mode\n"); + return; + } + mode->width = width; + mode->height = height; + mode->refresh = refresh; + rb_put(&output->modes, mode, &mode->entry); + } + + if (current) output->current_mode = mode; +} + static void output_handle_geometry(void *data, struct wl_output *wl_output, int32_t x, int32_t y, int32_t physical_width, int32_t physical_height, @@ -54,22 +112,26 @@ static void output_handle_mode(void *data, struct wl_output *wl_output, { struct wayland_output *output = data; - if (!(flags & WL_OUTPUT_MODE_CURRENT)) return; - /* Windows apps don't expect a zero refresh rate, so use a default value. */ if (refresh == 0) refresh = default_refresh; - output->current_mode.width = width; - output->current_mode.height = width; - output->current_mode.refresh = refresh; + wayland_output_add_mode(output, width, height, refresh, + (flags & WL_OUTPUT_MODE_CURRENT)); } static void output_handle_done(void *data, struct wl_output *wl_output) { struct wayland_output *output = data; + struct wayland_output_mode *mode; + + TRACE("name=%s\n", output->name); - TRACE("name=%s mode=%dx%d\n", - output->name, output->current_mode.width, output->current_mode.height); + RB_FOR_EACH_ENTRY(mode, &output->modes, struct wayland_output_mode, entry) + { + TRACE("mode %dx%d @ %d %s\n", + mode->width, mode->height, mode->refresh, + output->current_mode == mode ? "*" : ""); + } wayland_init_display_devices(); } @@ -108,6 +170,7 @@ BOOL wayland_output_create(uint32_t id, uint32_t version) wl_output_add_listener(output->wl_output, &output_listener, output); wl_list_init(&output->link); + rb_init(&output->modes, wayland_output_mode_cmp_rb); snprintf(output->name, sizeof(output->name), "WaylandOutput%d", next_output_id++); @@ -121,6 +184,11 @@ err: return FALSE; } +static void wayland_output_mode_free_rb(struct rb_entry *entry, void *ctx) +{ + free(RB_ENTRY_VALUE(entry, struct wayland_output_mode, entry)); +} + /********************************************************************** * wayland_output_destroy * @@ -128,6 +196,7 @@ err: */ void wayland_output_destroy(struct wayland_output *output) { + rb_destroy(&output->modes, wayland_output_mode_free_rb, NULL); wl_list_remove(&output->link); wl_output_destroy(output->wl_output); free(output); diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 768e22f2caf..8458ed17df2 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "wine/gdi_driver.h" +#include "wine/rbtree.h" #include "unixlib.h" @@ -53,6 +54,7 @@ struct wayland struct wayland_output_mode { + struct rb_entry entry; int32_t width; int32_t height; int32_t refresh; @@ -62,7 +64,8 @@ struct wayland_output { struct wl_list link; struct wl_output *wl_output; - struct wayland_output_mode current_mode; + struct rb_tree modes; + struct wayland_output_mode *current_mode; char name[20]; uint32_t global_id; };

1 0

Connor McAdams : uiautomationcore: Implement IUIAutomationElement::FindAll{BuildCache}.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: fdb3c9f93a959b4cbccc9ec60234a0632c36563f URL: https://gitlab.winehq.org/wine/wine/-/commit/fdb3c9f93a959b4cbccc9ec60234a0… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Thu Mar 9 11:37:21 2023 -0500 uiautomationcore: Implement IUIAutomationElement::FindAll{BuildCache}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 232 ++++++++++++++--------------- dlls/uiautomationcore/uia_com_client.c | 146 +++++++++++++++--- 2 files changed, 235 insertions(+), 143 deletions(-)

1 0

Connor McAdams : uiautomationcore/tests: Add tests for IUIAutomationElement find methods.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 3b68d75f535e717cf3e423614bc6cdd8911c5741 URL: https://gitlab.winehq.org/wine/wine/-/commit/3b68d75f535e717cf3e423614bc6cd… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Wed Mar 8 10:32:11 2023 -0500 uiautomationcore/tests: Add tests for IUIAutomationElement find methods. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 667 ++++++++++++++++++++++++++++- 1 file changed, 644 insertions(+), 23 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Perform basic per-process Wayland initialization.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 50c1b1974f9751a4cfe12360ba516f20708a6d6e URL: https://gitlab.winehq.org/wine/wine/-/commit/50c1b1974f9751a4cfe12360ba516f… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Aug 31 16:21:21 2021 +0300 winewayland.drv: Perform basic per-process Wayland initialization. Try to connect to the Wayland compositor, and fail driver initialization if we are unable to do so. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- configure | 111 +++++++++++++++++++++++++++++++++ configure.ac | 12 ++++ dlls/winewayland.drv/Makefile.in | 3 + dlls/winewayland.drv/wayland.c | 41 ++++++++++++ dlls/winewayland.drv/waylanddrv.h | 14 +++++ dlls/winewayland.drv/waylanddrv_main.c | 2 + include/config.h.in | 3 + tools/gitlab/image.docker | 1 + 8 files changed, 187 insertions(+)

1 0

Alexandros Frantzis : win32u: Allow drivers to set the null user driver.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 243c19098ee2e5c87a6bdbebdbb4c5cf598a9de2 URL: https://gitlab.winehq.org/wine/wine/-/commit/243c19098ee2e5c87a6bdbebdbb4c5… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Feb 28 19:22:54 2023 +0200 win32u: Allow drivers to set the null user driver. Allow passing NULL as the user driver to __wine_set_user_driver(), to set the internal null user driver. This is useful for drivers that may need to tentatively set their own user driver during setup and reset it on failure. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/win32u/driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c index eb736de272d..5bae77da5f4 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c @@ -1241,7 +1241,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version } driver = malloc( sizeof(*driver) ); - *driver = *funcs; + *driver = funcs ? *funcs : null_user_driver; #define SET_USER_FUNC(name) \ do { if (!driver->p##name) driver->p##name = nulldrv_##name; } while(0)

1 0