- Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Mimic native behavior for module name.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 4f80a599b66c4f7ea0e35971c89672b64d9b0fa7 URL: https://gitlab.winehq.org/wine/wine/-/commit/4f80a599b66c4f7ea0e35971c89672… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jan 17 16:04:14 2024 +0100 dbghelp: Mimic native behavior for module name. Module names appear in three spots in dbghelp: A) SymGetModuleInfo() .ModuleName B) module enumeration (as parameter in callback) C) in symbol/type research in module!name form Tests show that: - A) and B) always use only the derivation of the image name, whatever the passed module name in SymLoadModule(). - C) can use either the form derived from image name {as A) and B)}, but also the passed module name in SymLoadModule(). Note: B) is limited to 64 characters, while A) is limited to 32 characters (not tested here). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/module.c | 8 ++++---- dlls/dbghelp/tests/path.c | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index b3a073ff41f..628cb1e6442 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -438,6 +438,7 @@ struct module struct process* process; IMAGEHLP_MODULEW64 module; WCHAR modulename[64]; /* used for enumeration */ + WCHAR* alt_modulename; /* used in symbol lookup */ struct module* next; enum dhext_module_type type : 16; unsigned short is_virtual : 1, diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 2507e65e169..a0de4f65056 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -210,6 +210,7 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->module.BaseOfImage = mod_addr; module->module.ImageSize = size; module_set_module(module, name); + module->alt_modulename = NULL; module->module.ImageName[0] = '\0'; lstrcpynW(module->module.LoadedImageName, name, ARRAY_SIZE(module->module.LoadedImageName)); module->module.SymType = SymDeferred; @@ -288,6 +289,7 @@ struct module* module_find_by_nameW(const struct process* pcs, const WCHAR* name for (module = pcs->lmodules; module; module = module->next) { if (!wcsicmp(name, module->modulename)) return module; + if (module->alt_modulename && !wcsicmp(name, module->alt_modulename)) return module; } SetLastError(ERROR_INVALID_NAME); return NULL; @@ -995,11 +997,9 @@ DWORD64 WINAPI SymLoadModuleExW(HANDLE hProcess, HANDLE hFile, PCWSTR wImageNam } } - /* by default module_new fills module.ModuleName from a derivation - * of LoadedImageName. Overwrite it, if we have better information - */ + /* Store alternate name for module when provided. */ if (wModuleName) - module_set_module(module, wModuleName); + module->alt_modulename = pool_wcsdup(&module->pool, wModuleName); if (wImageName) lstrcpynW(module->module.ImageName, wImageName, ARRAY_SIZE(module->module.ImageName)); diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 45b71ed4718..fc9a2e13bf9 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1789,7 +1789,6 @@ static void test_load_modules_details(void) } else expected_module_name[0] = L'\0'; - todo_wine_if(i >= 2) ok(!wcsicmp(im.ModuleName, expected_module_name), "Unexpected module name '%ls'\n", im.ModuleName); ok(!wcsicmp(im.ImageName, test->in_image_name ? test->in_image_name : L""), "Unexpected image name '%ls'\n", im.ImageName); if ((test->options & SYMOPT_DEFERRED_LOADS) || !test->in_image_name) @@ -1853,7 +1852,6 @@ static void test_load_modules_details(void) ret = SymEnumerateModulesW64(dummy, aggregate_module_details_cb, &md); ok(ret, "SymEnumerateModules64 failed: %lu\n", GetLastError()); ok(md.count == 1, "Unexpected module count %u\n", md.count); - todo_wine_if(i >= 2) ok(!wcscmp(md.name, expected_module_name), "Unexpected module name %ls\n", md.name); free(md.name); /* native will fail loading symbol in deferred state, so force loading of debug symbols */

1 0

Eric Pouech : dbghelp: Search subdirectories in element path.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: d05b7c8e193d4a7e73a391bd4bc812d33dd1989a URL: https://gitlab.winehq.org/wine/wine/-/commit/d05b7c8e193d4a7e73a391bd4bc812… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sun Feb 25 10:36:55 2024 +0100 dbghelp: Search subdirectories in element path. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/path.c | 46 ++++++++++++++++++++++++++++------------------ dlls/dbghelp/tests/path.c | 4 ---- 2 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 0565442bb8b..db0873f133c 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -510,7 +510,7 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul SYMSRV_INDEX_INFOW *info, BOOL* is_unmatched) { struct module_find mf; - WCHAR *ptr; + WCHAR *ptr, *ext; const WCHAR* filename; WCHAR *searchPath = pcs->search_path; WCHAR buffer[MAX_PATH]; @@ -539,22 +539,9 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul /* FIXME: Use Environment-Variables (see MS docs) _NT_SYMBOL_PATH and _NT_ALT_SYMBOL_PATH - FIXME: Implement "Standard Path Elements" (Path) ... (see MS docs) - do a search for (every?) path-element like this ... - <path> - <path>\dll - <path>\symbols\dll - (dll may be exe, or sys depending on the file extension) */ - - /* 2. check module-path */ - file_pathW(module->module.LoadedImageName, buffer); - if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; - if (module->real_path) - { - file_pathW(module->real_path, buffer); - if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; - } + */ + ext = wcsrchr(module->module.LoadedImageName, L'.'); while (searchPath) { size_t len; @@ -562,17 +549,40 @@ BOOL path_find_symbol_file(const struct process* pcs, const struct module* modul ptr = wcschr(searchPath, ';'); len = (ptr) ? ptr - searchPath : wcslen(searchPath); - if (len < ARRAY_SIZE(buffer)) + if (len + 1 < ARRAY_SIZE(buffer)) { memcpy(buffer, searchPath, len * sizeof(WCHAR)); - buffer[len] = '\0'; + buffer[len] = L'\0'; /* return first fully matched file */ if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + len = wcslen(buffer); /* do_searchW removes the trailing \ in buffer when present */ + /* check once max size for \symbols\<ext>\ */ + if (ext && len + 9 /* \symbols\ */ + wcslen(ext + 1) + 1 + 1 <= ARRAY_SIZE(buffer)) + { + buffer[len++] = L'\\'; + wcscpy(buffer + len, ext + 1); + wcscat(buffer + len, L"\\"); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + wcscpy(buffer + len, L"symbols\\"); + wcscat(buffer + len, ext + 1); + wcscat(buffer + len, L"\\"); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + } } else ERR("Too long search element %ls\n", searchPath); searchPath = ptr ? ptr + 1 : NULL; } + + /* check module-path */ + if (module->real_path) + { + file_pathW(module->real_path, buffer); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + } + file_pathW(module->module.LoadedImageName, buffer); + if (do_searchW(filename, buffer, FALSE, module_find_cb, &mf)) return TRUE; + /* if no fully matching file is found, return the best matching file if any */ if ((dbghelp_options & SYMOPT_LOAD_ANYTHING) && mf.matched) { diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index f45cfd29b58..45b71ed4718 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -1581,16 +1581,12 @@ static void test_load_modules_path(void) } else { - todo_wine_if(i == 4 || i == 5 || i == 7 || i == 8 || i == 11) ok(im.SymType == SymPdb, "Unexpected symtype %x\n", im.SymType); make_path(filename, topdir, NULL, test_files[test->found_file].module_path); - todo_wine_if(i == 2 || i == 4 || i == 5 || i == 7 || i == 8 || i == 11 || i == 21) ok(!wcscmp(im.LoadedPdbName, filename), "Expected %ls as loaded pdb file, got '%ls' instead\n", test_files[test->found_file].module_path, im.LoadedPdbName); - todo_wine_if(i == 11 || i == 21) ok(im.PdbAge == test_files[test->found_file].age_or_timestamp, "Expected %lx as pdb-age, got %lx instead\n", test_files[test->found_file].age_or_timestamp, im.PdbAge); - todo_wine_if(i == 11) ok(im.PdbUnmatched == !(test_files[test->found_file].age_or_timestamp == 0x0030cafe), "Expecting matched PDB\n"); } ok(IsEqualGUID(&im.PdbSig70, &guid1), "Unexpected PDB GUID\n");

1 0

Yuxuan Shui : dmime/tests: Call the correct QueryInterface function for DirectMusic track.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 1df0e34293d959c80d3bf6a21083b1d072382916 URL: https://gitlab.winehq.org/wine/wine/-/commit/1df0e34293d959c80d3bf6a21083b1… Author: Yuxuan Shui <yshui(a)codeweavers.com> Date: Mon Feb 19 18:21:23 2024 +0000 dmime/tests: Call the correct QueryInterface function for DirectMusic track. --- dlls/dmime/tests/dmime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 8a95c7f2c21..9c2a9c0e919 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -4122,7 +4122,7 @@ static void test_sequence_track(void) &IID_IDirectMusicTrack, (void **)&track); ok(hr == S_OK, "got %#lx\n", hr); - hr = IDirectMusicSegment_QueryInterface(track, &IID_IPersistStream, (void **)&persist); + hr = IDirectMusicTrack_QueryInterface(track, &IID_IPersistStream, (void **)&persist); ok(hr == S_OK, "got %#lx\n", hr); hr = CreateStreamOnHGlobal(0, TRUE, &stream); ok(hr == S_OK, "got %#lx\n", hr);

1 0

Alexandros Frantzis : winewayland.drv: Handle resizing of OpenGL content.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 4bba16fd185801efe9989b2b5068d3dd1b746677 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bba16fd185801efe9989b2b5068d3… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Mon Feb 26 14:34:50 2024 +0200 winewayland.drv: Handle resizing of OpenGL content. Wayland surfaces don't have an inherent native size that the EGL implementation can track, so we need to explicitly tell EGL about changes in the native size with wl_egl_window_resize. Since the resize can be triggered outside the GL render thread, and wl_egl_window_resize is not thread safe (with respect to other EGL/GL calls), we cannot call it directly at will. Instead we mark the wayland_gl_drawable as resized, and actually call the wl_egl_window_resize function from the thread in which the respective drawable is current. Note that the first EGL/GL operation that requires a new backbuffer latches whatever native size we have reported, until the next eglSwapBuffers. In order to ensure the current native size is applied as soon as possible (to avoid glitches), we check for and apply resizes at a few extra points where a new backbuffer may be required (e.g., glClear, eglMakeCurrent). --- dlls/winewayland.drv/opengl.c | 59 ++++++++++++++++++++++++++++++++++ dlls/winewayland.drv/wayland_surface.c | 2 ++ dlls/winewayland.drv/waylanddrv.h | 1 + 3 files changed, 62 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 004aad26e79..4692d2f1e15 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -68,6 +68,7 @@ DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglMakeCurrent); DECL_FUNCPTR(eglQueryString); DECL_FUNCPTR(eglSwapBuffers); +DECL_FUNCPTR(glClear); #undef DECL_FUNCPTR static pthread_mutex_t gl_object_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -82,6 +83,7 @@ struct wayland_gl_drawable struct wayland_client_surface *client; struct wl_egl_window *wl_egl_window; EGLSurface surface; + LONG resized; }; struct wgl_context @@ -228,6 +230,28 @@ static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *ne if (old) wayland_gl_drawable_release(old); } +static void wayland_gl_drawable_sync_size(struct wayland_gl_drawable *gl) +{ + int client_width, client_height; + struct wayland_surface *wayland_surface; + + if (InterlockedCompareExchange(&gl->resized, FALSE, TRUE)) + { + if (!(wayland_surface = wayland_surface_lock_hwnd(gl->hwnd))) return; + + client_width = wayland_surface->window.client_rect.right - + wayland_surface->window.client_rect.left; + client_height = wayland_surface->window.client_rect.bottom - + wayland_surface->window.client_rect.top; + if (client_width == 0 || client_height == 0) + client_width = client_height = 1; + + wl_egl_window_resize(gl->wl_egl_window, client_width, client_height, 0, 0); + + pthread_mutex_unlock(&wayland_surface->mutex); + } +} + static void wayland_gl_drawable_sync_surface_state(struct wayland_gl_drawable *gl) { struct wayland_surface *wayland_surface; @@ -263,6 +287,10 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, draw ? draw->surface : EGL_NO_SURFACE, read ? read->surface : EGL_NO_SURFACE); + /* Since making an EGL surface current may latch the native size, + * perform any pending resizes before calling it. */ + if (draw) wayland_gl_drawable_sync_size(draw); + pthread_mutex_lock(&gl_object_mutex); ret = p_eglMakeCurrent(egl_display, @@ -380,6 +408,15 @@ out: return ctx; } +void wayland_glClear(GLbitfield mask) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + /* Since glClear is one of the operations that may latch the native size, + * perform any pending resizes before calling it. */ + if (ctx && ctx->draw) wayland_gl_drawable_sync_size(ctx->draw); + p_glClear(mask); +} + static BOOL wayland_wglCopyContext(struct wgl_context *src, struct wgl_context *dst, UINT mask) { @@ -528,6 +565,7 @@ static BOOL wayland_wglSwapBuffers(HDC hdc) if (ctx) wgl_context_refresh(ctx); wayland_gl_drawable_sync_surface_state(gl); p_eglSwapBuffers(egl_display, gl->surface); + wayland_gl_drawable_sync_size(gl); wayland_gl_drawable_release(gl); @@ -569,6 +607,9 @@ static BOOL init_opengl_funcs(void) } } + p_glClear = opengl_funcs.gl.p_glClear; + opengl_funcs.gl.p_glClear = wayland_glClear; + register_extension("WGL_ARB_extensions_string"); opengl_funcs.ext.p_wglGetExtensionsStringARB = wayland_wglGetExtensionsStringARB; @@ -768,6 +809,20 @@ void wayland_destroy_gl_drawable(HWND hwnd) wayland_update_gl_drawable(hwnd, NULL); } +/********************************************************************** + * wayland_resize_gl_drawable + */ +void wayland_resize_gl_drawable(HWND hwnd) +{ + struct wayland_gl_drawable *gl; + + if (!(gl = wayland_gl_drawable_get(hwnd))) return; + /* wl_egl_window_resize is not thread safe, so we just mark the + * drawable as resized and perform the resize in the proper thread. */ + InterlockedExchange(&gl->resized, TRUE); + wayland_gl_drawable_release(gl); +} + #else /* No GL */ struct opengl_funcs *WAYLAND_wine_get_wgl_driver(UINT version) @@ -779,4 +834,8 @@ void wayland_destroy_gl_drawable(HWND hwnd) { } +void wayland_resize_gl_drawable(HWND hwnd) +{ +} + #endif diff --git a/dlls/winewayland.drv/wayland_surface.c b/dlls/winewayland.drv/wayland_surface.c index a955f3688c5..e212e74362a 100644 --- a/dlls/winewayland.drv/wayland_surface.c +++ b/dlls/winewayland.drv/wayland_surface.c @@ -519,6 +519,8 @@ static void wayland_surface_reconfigure_client(struct wayland_surface *surface) } wl_surface_commit(surface->client->wl_surface); + + wayland_resize_gl_drawable(surface->hwnd); } /********************************************************************** diff --git a/dlls/winewayland.drv/waylanddrv.h b/dlls/winewayland.drv/waylanddrv.h index 7da33dc9f18..7cf813a1ca3 100644 --- a/dlls/winewayland.drv/waylanddrv.h +++ b/dlls/winewayland.drv/waylanddrv.h @@ -297,6 +297,7 @@ void wayland_pointer_clear_constraint(void); */ void wayland_destroy_gl_drawable(HWND hwnd); +void wayland_resize_gl_drawable(HWND hwnd); /********************************************************************** * Helpers

1 0

Alexandros Frantzis : winewayland.drv: Implement wglSetPixelFormat(WINE).
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: e7ccb1480abd105ca6a56484a25c4d07e65704a4 URL: https://gitlab.winehq.org/wine/wine/-/commit/e7ccb1480abd105ca6a56484a25c4d… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Sep 14 13:19:52 2021 +0300 winewayland.drv: Implement wglSetPixelFormat(WINE). Introduce the internal wayland_gl_drawable object, which associates a window (and its backing Wayland surface) with an EGL surface. --- configure | 90 ++++++++++++++++++- configure.ac | 7 +- dlls/winewayland.drv/Makefile.in | 4 +- dlls/winewayland.drv/opengl.c | 185 +++++++++++++++++++++++++++++++++++++- dlls/winewayland.drv/waylanddrv.h | 6 ++ dlls/winewayland.drv/window.c | 1 + include/config.h.in | 3 + 7 files changed, 290 insertions(+), 6 deletions(-)

1 0

Alexandros Frantzis : winewayland.drv: Implement OpenGL context creation.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: e8f7660c7597c30680a6e70317ac2136082a0e03 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8f7660c7597c30680a6e70317ac21… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Sep 14 13:44:37 2021 +0300 winewayland.drv: Implement OpenGL context creation. Each WGL context is backed by a config-less EGL context. We require the EGL_KHR_no_config_context extension. --- dlls/winewayland.drv/opengl.c | 97 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 96 insertions(+), 1 deletion(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 695f0d17317..0108ac799a1 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -54,8 +54,11 @@ static const char *opengl_func_names[] = { ALL_WGL_FUNCS }; #undef USE_GL_FUNC #define DECL_FUNCPTR(f) static typeof(f) * p_##f +DECL_FUNCPTR(eglBindAPI); DECL_FUNCPTR(eglChooseConfig); +DECL_FUNCPTR(eglCreateContext); DECL_FUNCPTR(eglCreateWindowSurface); +DECL_FUNCPTR(eglDestroyContext); DECL_FUNCPTR(eglDestroySurface); DECL_FUNCPTR(eglGetConfigAttrib); DECL_FUNCPTR(eglGetError); @@ -67,6 +70,7 @@ DECL_FUNCPTR(eglQueryString); static pthread_mutex_t gl_object_mutex = PTHREAD_MUTEX_INITIALIZER; static struct list gl_drawables = LIST_INIT(gl_drawables); +static struct list gl_contexts = LIST_INIT(gl_contexts); struct wayland_gl_drawable { @@ -78,6 +82,13 @@ struct wayland_gl_drawable EGLSurface surface; }; +struct wgl_context +{ + struct list entry; + EGLConfig config; + EGLContext context; +}; + /* lookup the existing drawable for a window, gl_object_mutex must be held */ static struct wayland_gl_drawable *find_drawable_for_hwnd(HWND hwnd) { @@ -87,6 +98,24 @@ static struct wayland_gl_drawable *find_drawable_for_hwnd(HWND hwnd) return NULL; } +static struct wayland_gl_drawable *wayland_gl_drawable_acquire(struct wayland_gl_drawable *gl) +{ + InterlockedIncrement(&gl->ref); + return gl; +} + +static struct wayland_gl_drawable *wayland_gl_drawable_get(HWND hwnd) +{ + struct wayland_gl_drawable *ret; + + pthread_mutex_lock(&gl_object_mutex); + if ((ret = find_drawable_for_hwnd(hwnd))) + ret = wayland_gl_drawable_acquire(ret); + pthread_mutex_unlock(&gl_object_mutex); + + return ret; +} + static void wayland_gl_drawable_release(struct wayland_gl_drawable *gl) { if (InterlockedDecrement(&gl->ref)) return; @@ -215,6 +244,57 @@ static BOOL set_pixel_format(HDC hdc, int format, BOOL internal) return TRUE; } +static struct wgl_context *create_context(HDC hdc) +{ + struct wayland_gl_drawable *gl; + struct wgl_context *ctx; + + if (!(gl = wayland_gl_drawable_get(NtUserWindowFromDC(hdc)))) return NULL; + + if (!(ctx = calloc(1, sizeof(*ctx)))) + { + ERR("Failed to allocate memory for GL context\n"); + goto out; + } + + ctx->context = p_eglCreateContext(egl_display, EGL_NO_CONFIG_KHR, + EGL_NO_CONTEXT, NULL); + + pthread_mutex_lock(&gl_object_mutex); + list_add_head(&gl_contexts, &ctx->entry); + pthread_mutex_unlock(&gl_object_mutex); + + TRACE("ctx=%p egl_context=%p\n", ctx, ctx->context); + +out: + wayland_gl_drawable_release(gl); + return ctx; +} + +static BOOL wayland_wglCopyContext(struct wgl_context *src, + struct wgl_context *dst, UINT mask) +{ + FIXME("%p -> %p mask %#x unsupported\n", src, dst, mask); + return FALSE; +} + +static struct wgl_context *wayland_wglCreateContext(HDC hdc) +{ + TRACE("hdc=%p\n", hdc); + p_eglBindAPI(EGL_OPENGL_API); + return create_context(hdc); +} + +static BOOL wayland_wglDeleteContext(struct wgl_context *ctx) +{ + pthread_mutex_lock(&gl_object_mutex); + list_remove(&ctx->entry); + pthread_mutex_unlock(&gl_object_mutex); + p_eglDestroyContext(egl_display, ctx->context); + free(ctx); + return TRUE; +} + static BOOL has_opengl(void); static int wayland_wglDescribePixelFormat(HDC hdc, int fmt, UINT size, @@ -405,7 +485,7 @@ static BOOL init_egl_configs(void) static void init_opengl(void) { EGLint egl_version[2]; - const char *egl_client_exts; + const char *egl_client_exts, *egl_exts; if (!(egl_handle = dlopen(SONAME_LIBEGL, RTLD_NOW|RTLD_GLOBAL))) { @@ -438,8 +518,11 @@ 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(eglBindAPI); LOAD_FUNCPTR_EGL(eglChooseConfig); + LOAD_FUNCPTR_EGL(eglCreateContext); LOAD_FUNCPTR_EGL(eglCreateWindowSurface); + LOAD_FUNCPTR_EGL(eglDestroyContext); LOAD_FUNCPTR_EGL(eglDestroySurface); LOAD_FUNCPTR_EGL(eglGetConfigAttrib); LOAD_FUNCPTR_EGL(eglGetError); @@ -462,6 +545,15 @@ static void init_opengl(void) } TRACE("EGL version %u.%u\n", egl_version[0], egl_version[1]); + egl_exts = p_eglQueryString(egl_display, EGL_EXTENSIONS); +#define REQUIRE_EXT(ext) \ + do { \ + if (!has_extension(egl_exts, #ext)) \ + { ERR("Failed to find required extension %s\n", #ext); goto err; } \ + } while(0) + REQUIRE_EXT(EGL_KHR_no_config_context); +#undef REQUIRE_EXT + if (!init_opengl_funcs()) goto err; if (!init_egl_configs()) goto err; @@ -483,6 +575,9 @@ static struct opengl_funcs opengl_funcs = { .wgl = { + .p_wglCopyContext = wayland_wglCopyContext, + .p_wglCreateContext = wayland_wglCreateContext, + .p_wglDeleteContext = wayland_wglDeleteContext, .p_wglDescribePixelFormat = wayland_wglDescribePixelFormat, .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglSetPixelFormat = wayland_wglSetPixelFormat,

1 0

Alexandros Frantzis : winewayland.drv: Implement wglMakeCurrent and wglMakeContextCurrentARB.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 075a0e26231e37f554eb3164d4fede2d65490eaf URL: https://gitlab.winehq.org/wine/wine/-/commit/075a0e26231e37f554eb3164d4fede… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Tue Feb 20 14:06:34 2024 +0200 winewayland.drv: Implement wglMakeCurrent and wglMakeContextCurrentARB. --- dlls/winewayland.drv/opengl.c | 79 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 0108ac799a1..85ad94903eb 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -65,6 +65,7 @@ DECL_FUNCPTR(eglGetError); DECL_FUNCPTR(eglGetPlatformDisplay); DECL_FUNCPTR(eglGetProcAddress); DECL_FUNCPTR(eglInitialize); +DECL_FUNCPTR(eglMakeCurrent); DECL_FUNCPTR(eglQueryString); #undef DECL_FUNCPTR @@ -87,6 +88,7 @@ struct wgl_context struct list entry; EGLConfig config; EGLContext context; + struct wayland_gl_drawable *draw, *read; }; /* lookup the existing drawable for a window, gl_object_mutex must be held */ @@ -206,12 +208,56 @@ static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *ne if ((old = find_drawable_for_hwnd(hwnd))) list_remove(&old->entry); if (new) list_add_head(&gl_drawables, &new->entry); + /* TODO: Update context drawables */ pthread_mutex_unlock(&gl_object_mutex); if (old) wayland_gl_drawable_release(old); } +static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, + HWND read_hwnd) +{ + BOOL ret; + struct wayland_gl_drawable *draw, *read; + struct wayland_gl_drawable *old_draw = NULL, *old_read = NULL; + + draw = wayland_gl_drawable_get(draw_hwnd); + read = wayland_gl_drawable_get(read_hwnd); + + TRACE("%p/%p context %p surface %p/%p\n", + draw_hwnd, read_hwnd, ctx->context, + draw ? draw->surface : EGL_NO_SURFACE, + read ? read->surface : EGL_NO_SURFACE); + + pthread_mutex_lock(&gl_object_mutex); + + ret = p_eglMakeCurrent(egl_display, + draw ? draw->surface : EGL_NO_SURFACE, + read ? read->surface : EGL_NO_SURFACE, + ctx->context); + if (ret) + { + old_draw = ctx->draw; + old_read = ctx->read; + ctx->draw = draw; + ctx->read = read; + NtCurrentTeb()->glContext = ctx; + } + else + { + old_draw = draw; + old_read = read; + } + + pthread_mutex_unlock(&gl_object_mutex); + + if (old_draw) wayland_gl_drawable_release(old_draw); + if (old_read) wayland_gl_drawable_release(old_read); + + return ret; +} + static BOOL set_pixel_format(HDC hdc, int format, BOOL internal) { HWND hwnd = NtUserWindowFromDC(hdc); @@ -291,6 +337,8 @@ static BOOL wayland_wglDeleteContext(struct wgl_context *ctx) list_remove(&ctx->entry); pthread_mutex_unlock(&gl_object_mutex); p_eglDestroyContext(egl_display, ctx->context); + if (ctx->draw) wayland_gl_drawable_release(ctx->draw); + if (ctx->read) wayland_gl_drawable_release(ctx->read); free(ctx); return TRUE; } @@ -370,6 +418,31 @@ static PROC wayland_wglGetProcAddress(LPCSTR name) return (PROC)p_eglGetProcAddress(name); } +static BOOL wayland_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, + struct wgl_context *ctx) +{ + BOOL ret; + + TRACE("draw_hdc=%p read_hdc=%p ctx=%p\n", draw_hdc, read_hdc, ctx); + + if (!ctx) + { + p_eglMakeCurrent(egl_display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); + NtCurrentTeb()->glContext = NULL; + return TRUE; + } + + ret = wgl_context_make_current(ctx, NtUserWindowFromDC(draw_hdc), NtUserWindowFromDC(read_hdc)); + if (!ret) RtlSetLastWin32Error(ERROR_INVALID_HANDLE); + + return ret; +} + +static BOOL wayland_wglMakeCurrent(HDC hdc, struct wgl_context *ctx) +{ + return wayland_wglMakeContextCurrentARB(hdc, hdc, ctx); +} + static BOOL wayland_wglSetPixelFormat(HDC hdc, int format, const PIXELFORMATDESCRIPTOR *pfd) { @@ -425,6 +498,10 @@ static BOOL init_opengl_funcs(void) register_extension("WGL_WINE_pixel_format_passthrough"); opengl_funcs.ext.p_wglSetPixelFormatWINE = wayland_wglSetPixelFormatWINE; + register_extension("WGL_ARB_make_current_read"); + opengl_funcs.ext.p_wglGetCurrentReadDCARB = (void *)1; /* never called */ + opengl_funcs.ext.p_wglMakeContextCurrentARB = wayland_wglMakeContextCurrentARB; + return TRUE; } @@ -528,6 +605,7 @@ static void init_opengl(void) LOAD_FUNCPTR_EGL(eglGetError); LOAD_FUNCPTR_EGL(eglGetPlatformDisplay); LOAD_FUNCPTR_EGL(eglInitialize); + LOAD_FUNCPTR_EGL(eglMakeCurrent); #undef LOAD_FUNCPTR_EGL egl_display = p_eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, @@ -580,6 +658,7 @@ static struct opengl_funcs opengl_funcs = .p_wglDeleteContext = wayland_wglDeleteContext, .p_wglDescribePixelFormat = wayland_wglDescribePixelFormat, .p_wglGetProcAddress = wayland_wglGetProcAddress, + .p_wglMakeCurrent = wayland_wglMakeCurrent, .p_wglSetPixelFormat = wayland_wglSetPixelFormat, } };

1 0

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

March 6, 2024

Module: wine Branch: master Commit: aed0c822f16e8dad1b9b1504c54fa0e215e0470f URL: https://gitlab.winehq.org/wine/wine/-/commit/aed0c822f16e8dad1b9b1504c54fa0… Author: Alexandros Frantzis <alexandros.frantzis(a)collabora.com> Date: Fri Feb 23 10:53:34 2024 +0200 winewayland.drv: Implement wglSwapBuffers. --- dlls/winewayland.drv/opengl.c | 86 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 2 deletions(-) diff --git a/dlls/winewayland.drv/opengl.c b/dlls/winewayland.drv/opengl.c index 85ad94903eb..004aad26e79 100644 --- a/dlls/winewayland.drv/opengl.c +++ b/dlls/winewayland.drv/opengl.c @@ -67,6 +67,7 @@ DECL_FUNCPTR(eglGetProcAddress); DECL_FUNCPTR(eglInitialize); DECL_FUNCPTR(eglMakeCurrent); DECL_FUNCPTR(eglQueryString); +DECL_FUNCPTR(eglSwapBuffers); #undef DECL_FUNCPTR static pthread_mutex_t gl_object_mutex = PTHREAD_MUTEX_INITIALIZER; @@ -88,7 +89,7 @@ struct wgl_context struct list entry; EGLConfig config; EGLContext context; - struct wayland_gl_drawable *draw, *read; + struct wayland_gl_drawable *draw, *read, *new_draw, *new_read; }; /* lookup the existing drawable for a window, gl_object_mutex must be held */ @@ -200,6 +201,18 @@ err: return NULL; } +static void update_context_drawables(struct wayland_gl_drawable *new, + struct wayland_gl_drawable *old) +{ + struct wgl_context *ctx; + + LIST_FOR_EACH_ENTRY(ctx, &gl_contexts, struct wgl_context, entry) + { + if (ctx->draw == old || ctx->new_draw == old) ctx->new_draw = new; + if (ctx->read == old || ctx->new_read == old) ctx->new_read = new; + } +} + static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *new) { struct wayland_gl_drawable *old; @@ -208,13 +221,33 @@ static void wayland_update_gl_drawable(HWND hwnd, struct wayland_gl_drawable *ne if ((old = find_drawable_for_hwnd(hwnd))) list_remove(&old->entry); if (new) list_add_head(&gl_drawables, &new->entry); - /* TODO: Update context drawables */ + if (old && new) update_context_drawables(new, old); pthread_mutex_unlock(&gl_object_mutex); if (old) wayland_gl_drawable_release(old); } +static void wayland_gl_drawable_sync_surface_state(struct wayland_gl_drawable *gl) +{ + struct wayland_surface *wayland_surface; + + if (!(wayland_surface = wayland_surface_lock_hwnd(gl->hwnd))) return; + + wayland_surface_ensure_contents(wayland_surface); + + /* Handle any processed configure request, to ensure the related + * surface state is applied by the compositor. */ + if (wayland_surface->processing.serial && + wayland_surface->processing.processed && + wayland_surface_reconfigure(wayland_surface)) + { + wl_surface_commit(wayland_surface->wl_surface); + } + + pthread_mutex_unlock(&wayland_surface->mutex); +} + static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, HWND read_hwnd) { @@ -242,6 +275,7 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, old_read = ctx->read; ctx->draw = draw; ctx->read = read; + ctx->new_draw = ctx->new_read = NULL; NtCurrentTeb()->glContext = ctx; } else @@ -258,6 +292,35 @@ static BOOL wgl_context_make_current(struct wgl_context *ctx, HWND draw_hwnd, return ret; } +static void wgl_context_refresh(struct wgl_context *ctx) +{ + BOOL refresh = FALSE; + struct wayland_gl_drawable *old_draw = NULL, *old_read = NULL; + + pthread_mutex_lock(&gl_object_mutex); + + if (ctx->new_draw) + { + old_draw = ctx->draw; + ctx->draw = wayland_gl_drawable_acquire(ctx->new_draw); + ctx->new_draw = NULL; + refresh = TRUE; + } + if (ctx->new_read) + { + old_read = ctx->read; + ctx->read = wayland_gl_drawable_acquire(ctx->new_read); + ctx->new_read = NULL; + refresh = TRUE; + } + if (refresh) p_eglMakeCurrent(egl_display, ctx->draw, ctx->read, ctx->context); + + pthread_mutex_unlock(&gl_object_mutex); + + if (old_draw) wayland_gl_drawable_release(old_draw); + if (old_read) wayland_gl_drawable_release(old_read); +} + static BOOL set_pixel_format(HDC hdc, int format, BOOL internal) { HWND hwnd = NtUserWindowFromDC(hdc); @@ -454,6 +517,23 @@ static BOOL wayland_wglSetPixelFormatWINE(HDC hdc, int format) return set_pixel_format(hdc, format, TRUE); } +static BOOL wayland_wglSwapBuffers(HDC hdc) +{ + struct wgl_context *ctx = NtCurrentTeb()->glContext; + HWND hwnd = NtUserWindowFromDC(hdc); + struct wayland_gl_drawable *gl; + + if (!(gl = wayland_gl_drawable_get(hwnd))) return FALSE; + + if (ctx) wgl_context_refresh(ctx); + wayland_gl_drawable_sync_surface_state(gl); + p_eglSwapBuffers(egl_display, gl->surface); + + wayland_gl_drawable_release(gl); + + return TRUE; +} + static BOOL has_extension(const char *list, const char *ext) { size_t len = strlen(ext); @@ -606,6 +686,7 @@ static void init_opengl(void) LOAD_FUNCPTR_EGL(eglGetPlatformDisplay); LOAD_FUNCPTR_EGL(eglInitialize); LOAD_FUNCPTR_EGL(eglMakeCurrent); + LOAD_FUNCPTR_EGL(eglSwapBuffers); #undef LOAD_FUNCPTR_EGL egl_display = p_eglGetPlatformDisplay(EGL_PLATFORM_WAYLAND_KHR, @@ -660,6 +741,7 @@ static struct opengl_funcs opengl_funcs = .p_wglGetProcAddress = wayland_wglGetProcAddress, .p_wglMakeCurrent = wayland_wglMakeCurrent, .p_wglSetPixelFormat = wayland_wglSetPixelFormat, + .p_wglSwapBuffers = wayland_wglSwapBuffers, } };

1 0

Rémi Bernon : server: Generate WM_POINTERENTER / WM_POINTERLEAVE messages.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: d8b8ac85ebf0d11e64f88dee54bfd506c47d29b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/d8b8ac85ebf0d11e64f88dee54bfd5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Feb 15 12:26:54 2024 +0100 server: Generate WM_POINTERENTER / WM_POINTERLEAVE messages. --- dlls/dinput/tests/device8.c | 30 +++++------------------------- server/queue.c | 28 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 34 deletions(-)

1 0

Rémi Bernon : server: Send emulated mouse messages on primary pointer updates.
by Alexandre Julliard March 6, 2024

March 6, 2024

Module: wine Branch: master Commit: 24ad74ee26f53947cbccb468f68440fe4c6c4714 URL: https://gitlab.winehq.org/wine/wine/-/commit/24ad74ee26f53947cbccb468f68440… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Feb 13 11:11:58 2024 +0100 server: Send emulated mouse messages on primary pointer updates. --- server/queue.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/server/queue.c b/server/queue.c index 55f6911faf4..0e8653bedf0 100644 --- a/server/queue.c +++ b/server/queue.c @@ -2274,6 +2274,23 @@ static void queue_pointer_message( struct pointer *pointer, int repeated ) queue_hardware_message( desktop, msg, 1 ); } + if (!repeated && pointer->primary && (msg = alloc_hardware_message( 0xff515700, source, time, 0 ))) + { + unsigned int message = WM_MOUSEMOVE; + if (input->hw.msg == WM_POINTERDOWN) message = WM_LBUTTONDOWN; + else if (input->hw.msg == WM_POINTERUP) message = WM_LBUTTONUP; + + msg->win = get_user_full_handle( win ); + msg->msg = message; + msg->wparam = 0; + msg->lparam = 0; + msg->x = x; + msg->y = y; + + if (!send_hook_ll_message( desktop, msg, input, NULL )) + queue_hardware_message( desktop, msg, 0 ); + } + if (input->hw.msg != WM_POINTERUP) { pointer->input.hw.msg = WM_POINTERUPDATE;

1 0