March 2023 - Wine-Commits - list.winehq.org

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

Alexandros Frantzis : winewayland.drv: Add initial unixlib stub.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 5ef250c0d12c96b35e0889a0864c3e2516ebc296 URL: https://gitlab.winehq.org/wine/wine/-/commit/5ef250c0d12c96b35e0889a0864c3e… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Jun 7 12:17:12 2022 +0300 winewayland.drv: Add initial unixlib stub. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- dlls/winewayland.drv/Makefile.in | 4 ++- dlls/winewayland.drv/dllmain.c | 4 +++ dlls/winewayland.drv/unixlib.h | 32 ++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 30 +++++++++++++++++++ dlls/winewayland.drv/waylanddrv_dll.h | 4 +++ dlls/winewayland.drv/waylanddrv_main.c | 53 ++++++++++++++++++++++++++++++++++ 6 files changed, 126 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in index f5b39ad0af9..292be0cbd3e 100644 --- a/dlls/winewayland.drv/Makefile.in +++ b/dlls/winewayland.drv/Makefile.in @@ -1,6 +1,8 @@ MODULE = winewayland.drv +UNIXLIB = winewayland.so C_SRCS = \ - dllmain.c + dllmain.c \ + waylanddrv_main.c RC_SRCS = version.rc diff --git a/dlls/winewayland.drv/dllmain.c b/dlls/winewayland.drv/dllmain.c index 7ab3341e61d..89d981a4314 100644 --- a/dlls/winewayland.drv/dllmain.c +++ b/dlls/winewayland.drv/dllmain.c @@ -25,6 +25,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) if (reason != DLL_PROCESS_ATTACH) return TRUE; DisableThreadLibraryCalls(instance); + if (__wine_init_unix_call()) return FALSE; + + if (WAYLANDDRV_UNIX_CALL(init, NULL)) + return FALSE; return TRUE; } diff --git a/dlls/winewayland.drv/unixlib.h b/dlls/winewayland.drv/unixlib.h new file mode 100644 index 00000000000..427837523e3 --- /dev/null +++ b/dlls/winewayland.drv/unixlib.h @@ -0,0 +1,32 @@ +/* + * Copyright 2022 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WAYLANDDRV_UNIXLIB_H +#define __WINE_WAYLANDDRV_UNIXLIB_H + +#include <stdarg.h> +#include "winternl.h" +#include "wine/unixlib.h" + +enum waylanddrv_unix_func +{ + waylanddrv_unix_func_init, + waylanddrv_unix_func_count, +}; + +#endif /* __WINE_WAYLANDDRV_UNIXLIB_H */ diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h new file mode 100644 index 00000000000..ec656ea87fb --- /dev/null +++ b/dlls/winewayland.drv/waylanddrv.h @@ -0,0 +1,30 @@ +/* + * Wayland driver + * + * Copyright 2020 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WAYLANDDRV_H +#define __WINE_WAYLANDDRV_H + +#ifndef __WINE_CONFIG_H +# error You must include config.h to use this header +#endif + +#include "unixlib.h" + +#endif /* __WINE_WAYLANDDRV_H */ diff --git a/dlls/winewayland.drv/waylanddrv_dll.h b/dlls/winewayland.drv/waylanddrv_dll.h index 556898d44b2..123b6cd5a61 100644 --- a/dlls/winewayland.drv/waylanddrv_dll.h +++ b/dlls/winewayland.drv/waylanddrv_dll.h @@ -25,4 +25,8 @@ #include "windef.h" #include "winbase.h" +#include "unixlib.h" + +#define WAYLANDDRV_UNIX_CALL(func, params) WINE_UNIX_CALL(waylanddrv_unix_func_ ## func, params) + #endif /* __WINE_WAYLANDDRV_DLL_H */ diff --git a/dlls/winewayland.drv/waylanddrv_main.c b/dlls/winewayland.drv/waylanddrv_main.c new file mode 100644 index 00000000000..396beac5828 --- /dev/null +++ b/dlls/winewayland.drv/waylanddrv_main.c @@ -0,0 +1,53 @@ +/* + * WAYLANDDRV initialization code + * + * Copyright 2020 Alexandre Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#if 0 +#pragma makedep unix +#endif + +#include "config.h" + +#include "ntstatus.h" +#define WIN32_NO_STATUS + +#include "waylanddrv.h" + +static NTSTATUS waylanddrv_unix_init(void *arg) +{ + return 0; +} + +const unixlib_entry_t __wine_unix_call_funcs[] = +{ + waylanddrv_unix_init, +}; + +C_ASSERT(ARRAYSIZE(__wine_unix_call_funcs) == waylanddrv_unix_func_count); + +#ifdef _WIN64 + +const unixlib_entry_t __wine_unix_call_wow64_funcs[] = +{ + waylanddrv_unix_init, +}; + +C_ASSERT(ARRAYSIZE(__wine_unix_call_wow64_funcs) == waylanddrv_unix_func_count); + +#endif /* _WIN64 */

1 0

Alexandros Frantzis : winewayland.drv: Add initial driver stub.
by Alexandre Julliard March 16, 2023

March 16, 2023

Module: wine Branch: master Commit: 2a79056e9a790d2a0b999bccc61cf886be8e8c00 URL: https://gitlab.winehq.org/wine/wine/-/commit/2a79056e9a790d2a0b999bccc61cf8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Aug 31 15:48:36 2021 +0300 winewayland.drv: Add initial driver stub. Add the initial driver stub for the Wayland driver and build it by default. Signed-off-by: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> --- configure | 2 ++ configure.ac | 1 + dlls/winewayland.drv/Makefile.in | 6 ++++++ dlls/winewayland.drv/dllmain.c | 30 ++++++++++++++++++++++++++++++ dlls/winewayland.drv/version.rc | 22 ++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv_dll.h | 28 ++++++++++++++++++++++++++++ dlls/winewayland.drv/winewayland.drv.spec | 0 7 files changed, 89 insertions(+) diff --git a/configure b/configure index 7618e8b4b15..210409724f1 100755 --- a/configure +++ b/configure @@ -1473,6 +1473,7 @@ enable_wineps_drv enable_winepulse_drv enable_wineusb_sys enable_winevulkan +enable_winewayland_drv enable_winex11_drv enable_winexinput_sys enable_wing32 @@ -21733,6 +21734,7 @@ wine_fn_config_makefile dlls/wineps16.drv16 enable_win16 wine_fn_config_makefile dlls/winepulse.drv enable_winepulse_drv wine_fn_config_makefile dlls/wineusb.sys enable_wineusb_sys wine_fn_config_makefile dlls/winevulkan enable_winevulkan +wine_fn_config_makefile dlls/winewayland.drv enable_winewayland_drv wine_fn_config_makefile dlls/winex11.drv enable_winex11_drv wine_fn_config_makefile dlls/winexinput.sys enable_winexinput_sys wine_fn_config_makefile dlls/wing.dll16 enable_win16 diff --git a/configure.ac b/configure.ac index 35af177b013..da9e4c22891 100644 --- a/configure.ac +++ b/configure.ac @@ -3140,6 +3140,7 @@ WINE_CONFIG_MAKEFILE(dlls/wineps16.drv16,enable_win16) WINE_CONFIG_MAKEFILE(dlls/winepulse.drv) WINE_CONFIG_MAKEFILE(dlls/wineusb.sys) WINE_CONFIG_MAKEFILE(dlls/winevulkan) +WINE_CONFIG_MAKEFILE(dlls/winewayland.drv) WINE_CONFIG_MAKEFILE(dlls/winex11.drv) WINE_CONFIG_MAKEFILE(dlls/winexinput.sys) WINE_CONFIG_MAKEFILE(dlls/wing.dll16,enable_win16) diff --git a/dlls/winewayland.drv/Makefile.in b/dlls/winewayland.drv/Makefile.in new file mode 100644 index 00000000000..f5b39ad0af9 --- /dev/null +++ b/dlls/winewayland.drv/Makefile.in @@ -0,0 +1,6 @@ +MODULE = winewayland.drv + +C_SRCS = \ + dllmain.c + +RC_SRCS = version.rc diff --git a/dlls/winewayland.drv/dllmain.c b/dlls/winewayland.drv/dllmain.c new file mode 100644 index 00000000000..7ab3341e61d --- /dev/null +++ b/dlls/winewayland.drv/dllmain.c @@ -0,0 +1,30 @@ +/* + * winewayland.drv entry points + * + * Copyright 2022 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "waylanddrv_dll.h" + +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) +{ + if (reason != DLL_PROCESS_ATTACH) return TRUE; + + DisableThreadLibraryCalls(instance); + + return TRUE; +} diff --git a/dlls/winewayland.drv/version.rc b/dlls/winewayland.drv/version.rc new file mode 100644 index 00000000000..2d99c24f99c --- /dev/null +++ b/dlls/winewayland.drv/version.rc @@ -0,0 +1,22 @@ +/* + * Copyright (c) 2020 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine Wayland driver" +#define WINE_FILENAME_STR "winewayland.drv" + +#include "wine/wine_common_ver.rc" diff --git a/dlls/winewayland.drv/waylanddrv_dll.h b/dlls/winewayland.drv/waylanddrv_dll.h new file mode 100644 index 00000000000..556898d44b2 --- /dev/null +++ b/dlls/winewayland.drv/waylanddrv_dll.h @@ -0,0 +1,28 @@ +/* + * Wayland driver DLL definitions + * + * Copyright 2022 Alexandros Frantzis for Collabora Ltd + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_WAYLANDDRV_DLL_H +#define __WINE_WAYLANDDRV_DLL_H + +#include <stdarg.h> +#include "windef.h" +#include "winbase.h" + +#endif /* __WINE_WAYLANDDRV_DLL_H */ diff --git a/dlls/winewayland.drv/winewayland.drv.spec b/dlls/winewayland.drv/winewayland.drv.spec new file mode 100644 index 00000000000..e69de29bb2d

1 0

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

March 16, 2023

Module: wine Branch: master Commit: eeb098e7b6d4796216969ae284e47734ffedbd34 URL: https://gitlab.winehq.org/wine/wine/-/commit/eeb098e7b6d4796216969ae284e477… Author: Connor McAdams <cmcadams(a)codeweavers.com> Date: Mon Mar 13 11:54:22 2023 -0400 uiautomationcore: Implement IUIAutomationElement::FindFirst{BuildCache}. Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/uiautomationcore/tests/uiautomation.c | 136 +++++++++++++---------------- dlls/uiautomationcore/uia_com_client.c | 120 ++++++++++++++++++++----- 2 files changed, 161 insertions(+), 95 deletions(-)

1 0