- Wine-Commits - list.winehq.org

Rémi Bernon : server: Continuously send pointer update messages while it's down.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 40b65e28a761354c3002d64df7bf9d74db401f68 URL: https://gitlab.winehq.org/wine/wine/-/commit/40b65e28a761354c3002d64df7bf9d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 00:47:06 2024 +0100 server: Continuously send pointer update messages while it's down. --- server/queue.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index bc62c5f1b9d..55f6911faf4 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2221,13 +2221,22 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c struct pointer { struct list entry; + struct timeout_user *timeout; struct desktop *desktop; user_handle_t win; int primary; hw_input_t input; }; -static void queue_pointer_message( struct pointer *pointer ) +static void queue_pointer_message( struct pointer *pointer, int repeated ); + +static void pointer_message_timeout( void *private ) +{ + struct pointer *pointer = private; + queue_pointer_message( pointer, 1 ); +} + +static void queue_pointer_message( struct pointer *pointer, int repeated ) { static const unsigned int messages[][2] = { @@ -2265,7 +2274,13 @@ static void queue_pointer_message( struct pointer *pointer ) queue_hardware_message( desktop, msg, 1 ); } - if (input->hw.msg == WM_POINTERUP) + if (input->hw.msg != WM_POINTERUP) + { + pointer->input.hw.msg = WM_POINTERUPDATE; + pointer->input.hw.wparam &= ~(POINTER_MESSAGE_FLAG_NEW << 16); + pointer->timeout = add_timeout_user( -160000, pointer_message_timeout, pointer ); + } + else { list_remove( &pointer->entry ); free( pointer ); @@ -2280,6 +2295,7 @@ static struct pointer *find_pointer_from_id( struct desktop *desktop, unsigned i if (LOWORD(pointer->input.hw.wparam) == id) return pointer; pointer = mem_alloc( sizeof(struct pointer) ); + pointer->timeout = NULL; pointer->desktop = desktop; pointer->primary = list_empty( &desktop->pointers ); list_add_tail( &desktop->pointers, &pointer->entry ); @@ -2321,10 +2337,11 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ if (input->hw.msg == WM_POINTERDOWN || input->hw.msg == WM_POINTERUP || input->hw.msg == WM_POINTERUPDATE) { pointer = find_pointer_from_id( desktop, LOWORD(input->hw.wparam) ); + if (pointer->timeout) remove_timeout_user( pointer->timeout ); pointer->input = *input; pointer->win = win; - queue_pointer_message( pointer ); + queue_pointer_message( pointer, 0 ); return; } @@ -2661,6 +2678,7 @@ void free_pointers( struct desktop *desktop ) LIST_FOR_EACH_ENTRY_SAFE( pointer, next, &desktop->pointers, struct pointer, entry ) { list_remove( &pointer->entry ); + if (pointer->timeout) remove_timeout_user( pointer->timeout ); free( pointer ); } }

1 0

Rémi Bernon : server: Stop waiting on LL-hooks for non-injected input.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 5b833c83beadcad2ace5f27e95554c164f6f7c86 URL: https://gitlab.winehq.org/wine/wine/-/commit/5b833c83beadcad2ace5f27e95554c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 20 16:05:17 2024 +0100 server: Stop waiting on LL-hooks for non-injected input. --- server/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/server/queue.c b/server/queue.c index 0b9430c5f4d..91284f1da17 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2871,7 +2871,8 @@ DECL_HANDLER(send_hardware_message) { struct desktop *desktop; unsigned int origin = (req->flags & SEND_HWMSG_INJECTED ? IMO_INJECTED : IMO_HARDWARE); - struct msg_queue *sender = get_current_queue(); + struct msg_queue *sender = req->flags & SEND_HWMSG_INJECTED ? get_current_queue() : NULL; + int wait = 0; if (!(desktop = get_hardware_input_desktop( req->win ))) return; if ((origin == IMO_INJECTED && desktop != current->queue->input->desktop) || @@ -2888,10 +2889,10 @@ DECL_HANDLER(send_hardware_message) switch (req->input.type) { case INPUT_MOUSE: - reply->wait = queue_mouse_message( desktop, req->win, &req->input, origin, sender ); + wait = queue_mouse_message( desktop, req->win, &req->input, origin, sender ); break; case INPUT_KEYBOARD: - reply->wait = queue_keyboard_message( desktop, req->win, &req->input, origin, sender ); + wait = queue_keyboard_message( desktop, req->win, &req->input, origin, sender ); break; case INPUT_HARDWARE: queue_custom_hardware_message( desktop, req->win, origin, &req->input ); @@ -2900,6 +2901,7 @@ DECL_HANDLER(send_hardware_message) set_error( STATUS_INVALID_PARAMETER ); } + reply->wait = sender ? wait : 0; reply->new_x = desktop->cursor.x; reply->new_y = desktop->cursor.y; release_object( desktop );

1 0

Alexandros Frantzis : winewayland.drv: Implement wglDescribePixelFormat.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 825ec8c59768942d414153993ecfe894b788de11 URL: https://gitlab.winehq.org/wine/wine/-/commit/825ec8c59768942d414153993ecfe8… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Sep 14 12:26:45 2021 +0300 winewayland.drv: Implement wglDescribePixelFormat. Create an array of supported EGLConfigs, and use this information to populate the PIXELFORMATDESCRIPTOR. --- dlls/winewayland.drv/opengl.c | 120 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 120 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 4dac7df532f..8668423485a 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -25,6 +25,7 @@ #include "config.h" #include <dlfcn.h> +#include <stdlib.h> #include <string.h> #include "waylanddrv.h" @@ -45,12 +46,16 @@ static void *egl_handle; static struct opengl_funcs opengl_funcs; static EGLDisplay egl_display; static char wgl_extensions[4096]; +static EGLConfig *egl_configs; +static int num_egl_configs; #define USE_GL_FUNC(name) #name, static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; #undef USE_GL_FUNC #define DECL_FUNCPTR(f) static typeof(f) * p_##f +DECL_FUNCPTR(eglChooseConfig); +DECL_FUNCPTR(eglGetConfigAttrib); DECL_FUNCPTR(eglGetError); DECL_FUNCPTR(eglGetPlatformDisplay); DECL_FUNCPTR(eglGetProcAddress); @@ -58,6 +63,63 @@ DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglQueryString); #undef DECL_FUNCPTR +static BOOL has_opengl(void); + +static int wayland_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, + PIXELFORMATDESCRIPTOR *pfd) +{ + EGLint val; + EGLConfig config; + + if (!has_opengl()) return 0; + if (!pfd) return num_egl_configs; + if (size < sizeof(*pfd)) return 0; + if (fmt <= 0 || fmt > num_egl_configs) return 0; + + config = egl_configs[fmt - 1]; + + memset(pfd, 0, sizeof(*pfd)); + pfd->nSize = sizeof(*pfd); + pfd->nVersion = 1; + pfd->dwFlags = PFD_SUPPORT_OPENGL | PFD_DRAW_TO_WINDOW | PFD_DOUBLEBUFFER | + PFD_SUPPORT_COMPOSITION; + pfd->iPixelType = PFD_TYPE_RGBA; + pfd->iLayerType = PFD_MAIN_PLANE; + + /* Although the documentation describes cColorBits as excluding alpha, real + * drivers tend to return the full pixel size, so do the same. */ + p_eglGetConfigAttrib(egl_display, config, EGL_BUFFER_SIZE, &val); + pfd->cColorBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_RED_SIZE, &val); + pfd->cRedBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_GREEN_SIZE, &val); + pfd->cGreenBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_BLUE_SIZE, &val); + pfd->cBlueBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_ALPHA_SIZE, &val); + pfd->cAlphaBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_DEPTH_SIZE, &val); + pfd->cDepthBits = val; + p_eglGetConfigAttrib(egl_display, config, EGL_STENCIL_SIZE, &val); + pfd->cStencilBits = val; + + /* Although we don't get information from EGL about the component shifts + * or the native format, the 0xARGB order is the most common. */ + pfd->cBlueShift = 0; + pfd->cGreenShift = pfd->cBlueBits; + pfd->cRedShift = pfd->cGreenBits + pfd->cBlueBits; + if (pfd->cAlphaBits) + pfd->cAlphaShift = pfd->cRedBits + pfd->cGreenBits + pfd->cBlueBits; + else + pfd->cAlphaShift = 0; + + TRACE("fmt %u color %u %u/%u/%u/%u depth %u stencil %u\n", + fmt, pfd->cColorBits, pfd->cRedBits, pfd->cGreenBits, pfd->cBlueBits, + pfd->cAlphaBits, pfd->cDepthBits, pfd->cStencilBits); + + return num_egl_configs; +} + static const char *wayland_wglGetExtensionsStringARB(HDC hdc) { TRACE("() returning \"%s\"\n", wgl_extensions); @@ -120,6 +182,60 @@ static BOOL init_opengl_funcs(void) return TRUE; } +static BOOL init_egl_configs(void) +{ + EGLint i; + const EGLint attribs[] = + { + EGL_RENDERABLE_TYPE, EGL_OPENGL_BIT, + EGL_SURFACE_TYPE, EGL_WINDOW_BIT, + EGL_NONE + }; + + p_eglChooseConfig(egl_display, attribs, NULL, 0, &num_egl_configs); + if (!(egl_configs = malloc(num_egl_configs * sizeof(*egl_configs)))) + { + ERR("Failed to allocate memory for EGL configs\n"); + return FALSE; + } + if (!p_eglChooseConfig(egl_display, attribs, egl_configs, num_egl_configs, + &num_egl_configs) || + !num_egl_configs) + { + free(egl_configs); + egl_configs = NULL; + num_egl_configs = 0; + ERR("Failed to get any configs from eglChooseConfig\n"); + return FALSE; + } + + if (TRACE_ON(waylanddrv)) + { + for (i = 0; i < num_egl_configs; i++) + { + EGLint id, type, visual_id, native, render, color, r, g, b, a, d, s; + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_NATIVE_VISUAL_ID, &visual_id); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_SURFACE_TYPE, &type); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_RENDERABLE_TYPE, &render); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_CONFIG_ID, &id); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_NATIVE_RENDERABLE, &native); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_COLOR_BUFFER_TYPE, &color); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_RED_SIZE, &r); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_GREEN_SIZE, &g); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_BLUE_SIZE, &b); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_ALPHA_SIZE, &a); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_DEPTH_SIZE, &d); + p_eglGetConfigAttrib(egl_display, egl_configs[i], EGL_STENCIL_SIZE, &s); + TRACE("%u: config %d id %d type %x visual %d native %d render %x " + "colortype %d rgba %d,%d,%d,%d depth %u stencil %d\n", + num_egl_configs, i, id, type, visual_id, native, render, + color, r, g, b, a, d, s); + } + } + + return TRUE; +} + static void init_opengl(void) { EGLint egl_version[2]; @@ -156,6 +272,8 @@ static void init_opengl(void) if (!(p_##func = (void *)p_eglGetProcAddress(#func))) \ { ERR("Failed to load symbol %s\n", #func); goto err; } \ } while(0) + LOAD_FUNCPTR_EGL(eglChooseConfig); + LOAD_FUNCPTR_EGL(eglGetConfigAttrib); LOAD_FUNCPTR_EGL(eglGetError); LOAD_FUNCPTR_EGL(eglGetPlatformDisplay); LOAD_FUNCPTR_EGL(eglInitialize); @@ -177,6 +295,7 @@ static void init_opengl(void) TRACE("EGL version %u.%u\n", egl_version[0], egl_version[1]); if (!init_opengl_funcs()) goto err; + if (!init_egl_configs()) goto err; return; @@ -196,6 +315,7 @@ static struct opengl_funcs opengl_funcs = { .wgl = { + .p_wglDescribePixelFormat = wayland_wglDescribePixelFormat, .p_wglGetProcAddress = wayland_wglGetProcAddress, } };

1 0

Alexandros Frantzis : winewayland.drv: Implement wglGetProcAddress.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: d47220a23c108831929fad43feb55b441023cb4c URL: https://gitlab.winehq.org/wine/wine/-/commit/d47220a23c108831929fad43feb55b… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Feb 19 12:47:40 2024 +0200 winewayland.drv: Implement wglGetProcAddress. --- dlls/winewayland.drv/opengl.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 698b6796fc0..4dac7df532f 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -70,6 +70,12 @@ static const char *wayland_wglGetExtensionsStringEXT(void) return wgl_extensions; } +static PROC wayland_wglGetProcAddress(LPCSTR name) +{ + if (!strncmp(name, "wgl", 3)) return NULL; + return (PROC)p_eglGetProcAddress(name); +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -186,6 +192,14 @@ static BOOL has_opengl(void) return !pthread_once(&init_once, init_opengl) && egl_handle; } +static struct opengl_funcs opengl_funcs = +{ + .wgl = + { + .p_wglGetProcAddress = wayland_wglGetProcAddress, + } +}; + /********************************************************************** * WAYLAND_wine_get_wgl_driver */

1 0

Rémi Bernon : winex11: Select XI_Touch* input and translate it to WM_POINTER*.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: c0d0468da96ec6831f26958e937f978dd62a8cbd URL: https://gitlab.winehq.org/wine/wine/-/commit/c0d0468da96ec6831f26958e937f97… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Jan 28 20:07:52 2024 +0100 winex11: Select XI_Touch* input and translate it to WM_POINTER*. --- dlls/winex11.drv/mouse.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 19a82d23ab0..7293480b635 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -273,6 +273,12 @@ void x11drv_xinput2_enable( Display *display, Window window ) XISetMask( mask_bits, XI_RawMotion ); XISetMask( mask_bits, XI_ButtonPress ); } + else + { + XISetMask( mask_bits, XI_TouchBegin ); + XISetMask( mask_bits, XI_TouchUpdate ); + XISetMask( mask_bits, XI_TouchEnd ); + } pXISelectEvents( display, window, &mask, 1 ); } @@ -1742,6 +1748,44 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev ) return TRUE; } +static BOOL X11DRV_TouchEvent( HWND hwnd, XGenericEventCookie *xev ) +{ + RECT virtual = NtUserGetVirtualScreenRect(); + INPUT input = {.type = INPUT_HARDWARE}; + XIDeviceEvent *event = xev->data; + int flags = 0; + POINT pos; + + input.mi.dx = event->event_x; + input.mi.dy = event->event_y; + map_event_coords( hwnd, event->event, event->root, event->root_x, event->root_y, &input ); + pos.x = input.mi.dx * 65535 / (virtual.right - virtual.left); + pos.y = input.mi.dy * 65535 / (virtual.bottom - virtual.top); + + switch (event->evtype) + { + case XI_TouchBegin: + input.hi.uMsg = WM_POINTERDOWN; + flags |= POINTER_MESSAGE_FLAG_NEW; + TRACE("XI_TouchBegin detail %u pos %dx%d, flags %#x\n", event->detail, (int)pos.x, (int)pos.y, flags); + break; + case XI_TouchEnd: + input.hi.uMsg = WM_POINTERUP; + TRACE("XI_TouchEnd detail %u pos %dx%d, flags %#x\n", event->detail, (int)pos.x, (int)pos.y, flags); + break; + case XI_TouchUpdate: + input.hi.uMsg = WM_POINTERUPDATE; + TRACE("XI_TouchUpdate detail %u pos %dx%d, flags %#x\n", event->detail, (int)pos.x, (int)pos.y, flags); + break; + } + + input.hi.wParamL = event->detail; + input.hi.wParamH = POINTER_MESSAGE_FLAG_INRANGE | POINTER_MESSAGE_FLAG_INCONTACT | flags; + NtUserSendHardwareInput( hwnd, 0, &input, MAKELPARAM( pos.x, pos.y ) ); + + return TRUE; +} + #endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ @@ -1807,6 +1851,12 @@ BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *xev ) ret = X11DRV_RawMotion( event ); break; + case XI_TouchBegin: + case XI_TouchUpdate: + case XI_TouchEnd: + ret = X11DRV_TouchEvent( hwnd, event ); + break; + default: TRACE( "Unhandled event %#x\n", event->evtype ); break;

1 0

Alexandros Frantzis : winewayland.drv: Implement wglGetExtensionsString{ARB,EXT}.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: e5d995d82606ab4c83b40b00795a84f93cd689d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/e5d995d82606ab4c83b40b00795a84… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Feb 19 12:14:17 2024 +0200 winewayland.drv: Implement wglGetExtensionsString{ARB,EXT}. --- dlls/winewayland.drv/opengl.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 38bc6704128..698b6796fc0 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -44,6 +44,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(waylanddrv); static void *egl_handle; static struct opengl_funcs opengl_funcs; static EGLDisplay egl_display; +static char wgl_extensions[4096]; #define USE_GL_FUNC(name) #name, static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; @@ -57,6 +58,18 @@ DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglQueryString); #undef DECL_FUNCPTR +static const char *wayland_wglGetExtensionsStringARB(HDC hdc) +{ + TRACE("() returning \"%s\"\n", wgl_extensions); + return wgl_extensions; +} + +static const char *wayland_wglGetExtensionsStringEXT(void) +{ + TRACE("() returning \"%s\"\n", wgl_extensions); + return wgl_extensions; +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -72,6 +85,13 @@ static BOOL has_extension(const char *list, const char *ext) return FALSE; } +static void register_extension(const char *ext) +{ + if (wgl_extensions[0]) strcat(wgl_extensions, " "); + strcat(wgl_extensions, ext); + TRACE("%s\n", ext); +} + static BOOL init_opengl_funcs(void) { unsigned int i; @@ -85,6 +105,12 @@ static BOOL init_opengl_funcs(void) } } + register_extension("WGL_ARB_extensions_string"); + opengl_funcs.ext.p_wglGetExtensionsStringARB = wayland_wglGetExtensionsStringARB; + + register_extension("WGL_EXT_extensions_string"); + opengl_funcs.ext.p_wglGetExtensionsStringEXT = wayland_wglGetExtensionsStringEXT; + return TRUE; }

1 0

Alexandros Frantzis : winewayland.drv: Initialize core GL functions.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: ea522c613596afce654ae92faa97aae39562a1ca URL: https://gitlab.winehq.org/wine/wine/-/commit/ea522c613596afce654ae92faa97aa… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 29 14:30:53 2021 +0300 winewayland.drv: Initialize core GL functions. --- dlls/winewayland.drv/opengl.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 765855e3944..38bc6704128 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -45,6 +45,10 @@ static void *egl_handle; static struct opengl_funcs opengl_funcs; static EGLDisplay egl_display; +#define USE_GL_FUNC(name) #name, +static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; +#undef USE_GL_FUNC + #define DECL_FUNCPTR(f) static typeof(f) * p_##f DECL_FUNCPTR(eglGetError); DECL_FUNCPTR(eglGetPlatformDisplay); @@ -68,6 +72,22 @@ static BOOL has_extension(const char *list, const char *ext) return FALSE; } +static BOOL init_opengl_funcs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(opengl_func_names); i++) + { + if (!(((void **)&opengl_funcs.gl)[i] = p_eglGetProcAddress(opengl_func_names[i]))) + { + ERR("%s not found, disabling OpenGL.\n", opengl_func_names[i]); + return FALSE; + } + } + + return TRUE; +} + static void init_opengl(void) { EGLint egl_version[2]; @@ -124,6 +144,8 @@ static void init_opengl(void) } TRACE("EGL version %u.%u\n", egl_version[0], egl_version[1]); + if (!init_opengl_funcs()) goto err; + return; err:

1 0

Alexandros Frantzis : winewayland.drv: Add skeleton OpenGL driver.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: aaaac72fdbc71fc9e2d0e20351b282ab375390c4 URL: https://gitlab.winehq.org/wine/wine/-/commit/aaaac72fdbc71fc9e2d0e20351b282… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Wed Sep 29 14:17:56 2021 +0300 winewayland.drv: Add skeleton OpenGL driver. The driver performs basic EGL initialization. --- configure | 112 ++++++++++++++++++++++ configure.ac | 11 +++ dlls/winewayland.drv/Makefile.in | 3 +- dlls/winewayland.drv/opengl.c | 163 +++++++++++++++++++++++++++++++++ dlls/winewayland.drv/waylanddrv.h | 1 + dlls/winewayland.drv/waylanddrv_main.c | 1 + 6 files changed, 290 insertions(+), 1 deletion(-)

1 0

Hans Leidekker : wbemprox: Use separate critical sections for tables and table list.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: e7ff2688c8042fb6d7af163480b1d2ec849d0dee URL: https://gitlab.winehq.org/wine/wine/-/commit/e7ff2688c8042fb6d7af163480b1d2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Mar 5 12:44:43 2024 +0100 wbemprox: Use separate critical sections for tables and table list. --- dlls/wbemprox/builtin.c | 13 +++++--- dlls/wbemprox/table.c | 66 ++++++++++++++++++++++++++-------------- dlls/wbemprox/wbemprox_private.h | 2 ++ 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 1095450e053..f6991ac2d8a 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -4374,9 +4374,9 @@ static struct table wmi_builtin_classes[] = static const struct { - const WCHAR *name; - struct table *classes; - unsigned int table_count; + const WCHAR *name; + struct table *tables; + unsigned int table_count; } builtin_namespaces[WBEMPROX_NAMESPACE_LAST] = { @@ -4395,7 +4395,12 @@ void init_table_list( void ) { list_init( &tables[ns] ); for (i = 0; i < builtin_namespaces[ns].table_count; i++) - list_add_tail( &tables[ns], &builtin_namespaces[ns].classes[i].entry ); + { + struct table *table = &builtin_namespaces[ns].tables[i]; + InitializeCriticalSectionEx( &table->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + table->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": table.cs" ); + list_add_tail( &tables[ns], &table->entry ); + } table_list[ns] = &tables[ns]; } } diff --git a/dlls/wbemprox/table.c b/dlls/wbemprox/table.c index 573cf035245..37aa546ad2b 100644 --- a/dlls/wbemprox/table.c +++ b/dlls/wbemprox/table.c @@ -18,6 +18,7 @@ #define COBJMACROS +#include <assert.h> #include <stdarg.h> #include "windef.h" @@ -29,14 +30,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(wbemprox); -static CRITICAL_SECTION table_cs; +static CRITICAL_SECTION table_list_cs; static CRITICAL_SECTION_DEBUG table_debug = { - 0, 0, &table_cs, + 0, 0, &table_list_cs, { &table_debug.ProcessLocksList, &table_debug.ProcessLocksList }, - 0, 0, { (DWORD_PTR)(__FILE__ ": table_cs") } + 0, 0, { (DWORD_PTR)(__FILE__ ": table_list_cs") } }; -static CRITICAL_SECTION table_cs = { &table_debug, -1, 0, 0, 0, 0 }; +static CRITICAL_SECTION table_list_cs = { &table_debug, -1, 0, 0, 0, 0 }; HRESULT get_column_index( const struct table *table, const WCHAR *name, UINT *column ) { @@ -337,31 +338,49 @@ void free_columns( struct column *columns, UINT num_cols ) void free_table( struct table *table ) { if (!table) return; + assert( table->flags & TABLE_FLAG_DYNAMIC ); + + TRACE("destroying %p\n", table); - EnterCriticalSection( &table_cs ); clear_table( table ); - if (table->flags & TABLE_FLAG_DYNAMIC) - { - TRACE("destroying %p\n", table); - free( (WCHAR *)table->name ); - free_columns( (struct column *)table->columns, table->num_cols ); - free( table->data ); - list_remove( &table->entry ); - free( table ); - } - LeaveCriticalSection( &table_cs ); + free( (WCHAR *)table->name ); + free_columns( (struct column *)table->columns, table->num_cols ); + free( table->data ); + + table->cs.DebugInfo->Spare[0] = 0; + DeleteCriticalSection( &table->cs ); + free( table ); } void release_table( struct table *table ) { - if (!InterlockedDecrement( &table->refs )) free_table( table ); - LeaveCriticalSection( &table_cs ); + if (!--table->refs) + { + clear_table( table ); + if (table->flags & TABLE_FLAG_DYNAMIC) + { + EnterCriticalSection( &table_list_cs ); + list_remove( &table->entry ); + table->removed = TRUE; + LeaveCriticalSection( &table_list_cs ); + + LeaveCriticalSection( &table->cs ); + free_table( table ); + return; + } + } + LeaveCriticalSection( &table->cs ); } struct table *grab_table( struct table *table ) { - EnterCriticalSection( &table_cs ); - InterlockedIncrement( &table->refs ); + EnterCriticalSection( &table->cs ); + if (table->removed) + { + LeaveCriticalSection( &table->cs ); + return NULL; + } + table->refs++; return table; } @@ -398,7 +417,10 @@ struct table *create_table( const WCHAR *name, UINT num_cols, const struct colum table->fill = fill; table->flags = TABLE_FLAG_DYNAMIC; table->refs = 0; + table->removed = FALSE; list_init( &table->entry ); + InitializeCriticalSectionEx( &table->cs, 0, RTL_CRITICAL_SECTION_FLAG_FORCE_DEBUG_INFO ); + table->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": table.cs"); return table; } @@ -408,18 +430,18 @@ BOOL add_table( enum wbm_namespace ns, struct table *table ) if (ns == WBEMPROX_NAMESPACE_LAST) return FALSE; - EnterCriticalSection( &table_cs ); + EnterCriticalSection( &table_list_cs ); LIST_FOR_EACH_ENTRY( iter, table_list[ns], struct table, entry ) { if (!wcsicmp( iter->name, table->name )) { TRACE("table %s already exists\n", debugstr_w(table->name)); - LeaveCriticalSection( &table_cs ); + LeaveCriticalSection( &table_list_cs ); return FALSE; } } list_add_tail( table_list[ns], &table->entry ); - LeaveCriticalSection( &table_cs ); + LeaveCriticalSection( &table_list_cs ); TRACE("added %p\n", table); return TRUE; diff --git a/dlls/wbemprox/wbemprox_private.h b/dlls/wbemprox/wbemprox_private.h index 655e3db27c2..5e585049aa6 100644 --- a/dlls/wbemprox/wbemprox_private.h +++ b/dlls/wbemprox/wbemprox_private.h @@ -121,6 +121,8 @@ struct table UINT flags; struct list entry; LONG refs; + CRITICAL_SECTION cs; + BOOL removed; }; struct property

1 0

Rémi Bernon : winex11: Support XInput2 events on individual windows.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 0f1322d2df4c5238c601a2865b6e65ad14bfa26a URL: https://gitlab.winehq.org/wine/wine/-/commit/0f1322d2df4c5238c601a2865b6e65… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Feb 12 10:01:33 2024 +0100 winex11: Support XInput2 events on individual windows. --- dlls/winex11.drv/desktop.c | 2 ++ dlls/winex11.drv/mouse.c | 56 +++++++++++++++++++++++++++++----------------- dlls/winex11.drv/window.c | 9 +++++++- dlls/winex11.drv/x11drv.h | 2 ++ 4 files changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index d6fa078e8a9..cb119c9a7be 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -86,6 +86,8 @@ BOOL X11DRV_CreateDesktop( const WCHAR *name, UINT width, UINT height ) 0, 0, width, height, 0, default_visual.depth, InputOutput, default_visual.visual, CWEventMask | CWCursor | CWColormap, &win_attr ); if (!win) return FALSE; + + x11drv_xinput2_enable( display, win ); XFlush( display ); X11DRV_init_desktop( win, width, height ); diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 03c2152b76b..19a82d23ab0 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -253,11 +253,10 @@ static void update_relative_valuators( XIAnyClassInfo **classes, int num_classes /*********************************************************************** - * enable_xinput2 + * x11drv_xinput2_enable */ -static void enable_xinput2(void) +void x11drv_xinput2_enable( Display *display, Window window ) { - struct x11drv_thread_data *data = x11drv_thread_data(); XIEventMask mask; unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; @@ -267,21 +266,23 @@ static void enable_xinput2(void) mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); - XISetMask( mask_bits, XI_DeviceChanged ); - XISetMask( mask_bits, XI_RawMotion ); - XISetMask( mask_bits, XI_ButtonPress ); - pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); + + if (window == DefaultRootWindow( display )) + { + XISetMask( mask_bits, XI_DeviceChanged ); + XISetMask( mask_bits, XI_RawMotion ); + XISetMask( mask_bits, XI_ButtonPress ); + } + + pXISelectEvents( display, window, &mask, 1 ); } -#endif /*********************************************************************** - * disable_xinput2 + * x11drv_xinput2_disable */ -static void disable_xinput2(void) +void x11drv_xinput2_disable( Display *display, Window window ) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H - struct x11drv_thread_data *data = x11drv_thread_data(); unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; XIEventMask mask; @@ -291,9 +292,11 @@ static void disable_xinput2(void) mask.mask_len = sizeof(mask_bits); mask.deviceid = XIAllMasterDevices; memset( mask_bits, 0, sizeof(mask_bits) ); - XISetMask( mask_bits, XI_DeviceChanged ); - pXISelectEvents( data->display, DefaultRootWindow( data->display ), &mask, 1 ); -#endif + + if (window == DefaultRootWindow( display )) + XISetMask( mask_bits, XI_DeviceChanged ); + + pXISelectEvents( display, window, &mask, 1 ); } @@ -302,7 +305,6 @@ static void disable_xinput2(void) */ void x11drv_xinput2_init( struct x11drv_thread_data *data ) { -#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H unsigned char mask_bits[XIMaskLen(XI_LASTEVENT)]; int major = 2, minor = 2; XIEventMask mask; @@ -332,9 +334,23 @@ void x11drv_xinput2_init( struct x11drv_thread_data *data ) } TRACE( "XInput2 %d.%d available\n", major, minor ); -#endif } +#else /* HAVE_X11_EXTENSIONS_XINPUT2_H */ + +void x11drv_xinput2_enable( Display *display, Window window ) +{ +} + +void x11drv_xinput2_disable( Display *display, Window window ) +{ +} + +void x11drv_xinput2_init( struct x11drv_thread_data *data ) +{ +} + +#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */ /*********************************************************************** * grab_clipping_window @@ -370,7 +386,7 @@ static BOOL grab_clipping_window( const RECT *clip ) } /* enable XInput2 unless we are already clipping */ - if (!data->clipping_cursor) enable_xinput2(); + if (!data->clipping_cursor) x11drv_xinput2_enable( data->display, DefaultRootWindow( data->display ) ); TRACE( "clipping to %s win %lx\n", wine_dbgstr_rect(clip), clip_window ); @@ -403,7 +419,7 @@ static BOOL grab_clipping_window( const RECT *clip ) if (!clipping_cursor) { - disable_xinput2(); + x11drv_xinput2_disable( data->display, DefaultRootWindow( data->display ) ); return FALSE; } clip_rect = *clip; @@ -432,7 +448,7 @@ void ungrab_clipping_window(void) if (clipping_cursor) XUngrabPointer( data->display, CurrentTime ); clipping_cursor = FALSE; data->clipping_cursor = FALSE; - disable_xinput2(); + x11drv_xinput2_disable( data->display, DefaultRootWindow( data->display ) ); } /*********************************************************************** diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 84878e95e37..afa13f01277 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -362,6 +362,7 @@ static void sync_window_style( struct x11drv_win_data *data ) int mask = get_window_attributes( data, &attr ); XChangeWindowAttributes( data->display, data->whole_window, mask, &attr ); + x11drv_xinput2_enable( data->display, data->whole_window ); } } @@ -1700,6 +1701,7 @@ static void create_whole_window( struct x11drv_win_data *data ) data->vis.visual, mask, &attr ); if (!data->whole_window) goto done; + x11drv_xinput2_enable( data->display, data->whole_window ); set_initial_wm_hints( data->display, data->whole_window ); set_wm_hints( data ); @@ -1742,7 +1744,12 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des Window xwin = (Window)NtUserGetProp( data->hwnd, foreign_window_prop ); if (xwin) { - if (!already_destroyed) XSelectInput( data->display, xwin, 0 ); + if (!already_destroyed) + { + x11drv_xinput2_disable( data->display, xwin ); + XSelectInput( data->display, xwin, 0 ); + } + XDeleteContext( data->display, xwin, winContext ); NtUserRemoveProp( data->hwnd, foreign_window_prop ); } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 9c1b8012466..2f46522f59f 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -573,6 +573,8 @@ extern BOOL X11DRV_GenericEvent( HWND hwnd, XEvent *event ); extern int xinput2_opcode; extern void x11drv_xinput2_load(void); extern void x11drv_xinput2_init( struct x11drv_thread_data *data ); +extern void x11drv_xinput2_enable( Display *display, Window window ); +extern void x11drv_xinput2_disable( Display *display, Window window ); extern Bool (*pXGetEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event ); extern void (*pXFreeEventData)( Display *display, XEvent /*XGenericEventCookie*/ *event );

1 0