October 2021 - Wine-Devel - list.winehq.org

[PATCH 00/21] Introduce FIXME_ONCE macro
by David Kahurani Oct. 15, 2021

Oct. 15, 2021

The following patches introduce the FIXME_ONCE macro which suppresses repeated FIXMEs into WARNings. The current FIXME macro tends to be insufficient in cases where a developer wishes to suppresses fixmes other than the first. It is based on the vkd3d version. David Kahurani (21): include/wine: suppress subsequent FIXMEs into WARNINGs dlls/kernelbase: Use FIXME_ONCE dlls/ntdll: Use FIXME_ONCE dlls/gdiplus: Use FIXME_ONCE dlls/kernel32: Use FIXME_ONCE dlls/msvcrt: Use FIXME_ONCE dlls/dwrite: Use FIXME_ONCE dlls/gdi32: Use FIXME_ONCE dlls/advapi32: Use FIXME_ONCE dlls/dxgi: Use FIXME_ONCE dlls/iphlpapi: Use FIXME_ONCE dlls/jscript: Use FIXME_ONCE dlls/msctf: Use FIXME_ONCE dlls/ntoskrnl.exe: Use FIXME_ONCE dlls/rpcrt4: Use FIXME_ONCE dlls/sechost: Use FIXME_ONCE dlls/wbemprox: Use FIXME_ONCE dlls/winecoreaudio.drv: Use FIXME_ONCE dlls/wined3d: Use FIXME_ONCE dlls/wtsapi32: Use FIXME_ONCE dlls/xinput1_3: Use FIXME_ONCE dlls/advapi32/eventlog.c | 3 +-- dlls/dwrite/analyzer.c | 5 +---- dlls/dwrite/font.c | 5 +---- dlls/dxgi/adapter.c | 4 +--- dlls/gdi32/uniscribe/opentype.c | 21 +++++---------------- dlls/gdi32/uniscribe/usp10.c | 6 ++---- dlls/gdiplus/graphics.c | 26 +++++++------------------- dlls/gdiplus/graphicspath.c | 4 +--- dlls/gdiplus/metafile.c | 9 ++------- dlls/iphlpapi/iphlpapi_main.c | 4 +--- dlls/jscript/global.c | 4 +--- dlls/kernel32/console.c | 4 +--- dlls/kernel32/process.c | 3 +-- dlls/kernelbase/locale.c | 10 ++++------ dlls/kernelbase/main.c | 5 +---- dlls/kernelbase/process.c | 3 +-- dlls/kernelbase/sync.c | 3 +-- dlls/kernelbase/thread.c | 3 +-- dlls/msctf/inputprocessor.c | 9 ++------- dlls/msvcrt/concurrency.c | 3 +-- dlls/msvcrt/cpp.c | 3 +-- dlls/ntdll/misc.c | 4 +--- dlls/ntdll/unix/socket.c | 19 ++++--------------- dlls/ntdll/unix/system.c | 8 +++----- dlls/ntdll/unix/thread.c | 3 +-- dlls/ntdll/unix/virtual.c | 9 +++------ dlls/ntoskrnl.exe/ntoskrnl.c | 3 +-- dlls/rpcrt4/ndr_marshall.c | 10 ++-------- dlls/sechost/trace.c | 3 +-- dlls/wbemprox/class.c | 6 ++---- dlls/winecoreaudio.drv/audiounit.c | 6 ++---- dlls/wined3d/state.c | 4 +--- dlls/wtsapi32/wtsapi32.c | 3 +-- dlls/xinput1_3/main.c | 4 +--- include/wine/debug.h | 30 +++++++++++++++++++++++++++--- 35 files changed, 87 insertions(+), 162 deletions(-) -- 2.33.0

3 23

[PATCH 1/6] include: Fix the type of the "output" parameter of IWMReaderAllocatorEx::AllocateForOutputEx().
by Zebediah Figura Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/wmsdkidl.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wmsdkidl.idl b/include/wmsdkidl.idl index 716abe056db..945a8faaca4 100644 --- a/include/wmsdkidl.idl +++ b/include/wmsdkidl.idl @@ -1082,7 +1082,7 @@ interface IWMReaderAllocatorEx : IUnknown [in] void *pvContext); HRESULT AllocateForOutputEx( - [in] WORD wOutputNum, + [in] DWORD output, [in] DWORD cbBuffer, [out] INSSBuffer **ppBuffer, [in] DWORD dwFlags, -- 2.33.0

1 5

[PATCH] kernel32/tests: Add a couple of tests for error handling when reading past EOF.
by Zebediah Figura Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/kernel32/tests/file.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index ea0a32f258d..b4c7adacf7e 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -5927,6 +5927,7 @@ static void test_move_file(void) static void test_eof(void) { char temp_path[MAX_PATH], filename[MAX_PATH], buffer[20]; + OVERLAPPED overlapped = {0}; LARGE_INTEGER file_size; HANDLE file, mapping; unsigned int i; @@ -5961,9 +5962,25 @@ static void test_eof(void) ok(ret, "failed to get size, error %u\n", GetLastError()); ok(!file_size.QuadPart, "got size %I64d\n", file_size.QuadPart); + SetLastError(0xdeadbeef); ret = ReadFile(file, buffer, sizeof(buffer), &size, NULL); ok(ret, "failed to read, error %u\n", GetLastError()); ok(!size, "got size %u\n", size); + ok(GetLastError() == 0xdeadbeef, "got error %u\n", GetLastError()); + + SetFilePointer(file, 2, NULL, SEEK_SET); + + SetLastError(0xdeadbeef); + size = 0xdeadbeef; + overlapped.Offset = 2; + ret = ReadFile(file, buffer, sizeof(buffer), &size, &overlapped); + ok(!ret, "expected failure\n"); + ok(GetLastError() == ERROR_HANDLE_EOF, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + todo_wine ok((NTSTATUS)overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + ok(!overlapped.InternalHigh, "got size %Iu\n", overlapped.InternalHigh); + + SetFilePointer(file, 2, NULL, SEEK_SET); ret = SetEndOfFile(file); ok(ret, "failed to set EOF, error %u\n", GetLastError()); -- 2.33.0

1 0

[PATCH v2 1/2] mfplat/tests: Test reading past the end of a file stream.
by Zebediah Figura Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 541459c715b..b9aa4bbb68d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1947,8 +1947,10 @@ static void test_file_stream(void) WCHAR pathW[MAX_PATH]; DWORD caps, count; WCHAR *filename; + BYTE data[8]; HRESULT hr; WCHAR *str; + ULONG size; BOOL eos; filename = load_resource(L"test.mp4"); @@ -2023,6 +2025,32 @@ static void test_file_stream(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(position == 2 * bytestream_length, "Unexpected position.\n"); + hr = IMFByteStream_IsEndOfStream(bytestream, &eos); + ok(hr == S_OK, "Failed query end of stream, hr %#x.\n", hr); + ok(eos == TRUE, "Unexpected IsEndOfStream result, %u.\n", eos); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF) || broken(hr == S_OK) /* win8 */, + "Unexpected hr %#x.\n", hr); + ok(!size || broken(size == 0xdeadbeef) /* win < 8 */, "Got size %u.\n", size); + + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length - 4); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(size == 4, "Got size %u.\n", size); + + hr = IMFByteStream_SetCurrentPosition(bytestream, bytestream_length); + ok(hr == S_OK, "Failed to set bytestream position, hr %#x.\n", hr); + + size = 0xdeadbeef; + hr = IMFByteStream_Read(bytestream, data, sizeof(data), &size); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!size, "Got size %u.\n", size); + hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &bytestream2); ok(hr == S_OK, "got 0x%08x\n", hr); -- 2.33.0

3 5

[PATCH 9/9 v2] user32: Set IMM active context on window activation.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/tests/imm32.c | 11 +++++++++-- dlls/user32/focus.c | 13 +++++++++++++ dlls/user32/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 3 +++ 4 files changed, 55 insertions(+), 2 deletions(-)

3 2

[PATCH 9/9] user32: Set IMM active context on window activation.
by Piotr Caban Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/imm32/tests/imm32.c | 7 +++++++ dlls/user32/focus.c | 13 +++++++++++++ dlls/user32/misc.c | 30 ++++++++++++++++++++++++++++++ dlls/user32/user_private.h | 3 +++ 4 files changed, 53 insertions(+)

2 1

Re: include: Always add defines for the Interlocked* functions.
by Jacek Caban Oct. 15, 2021

Oct. 15, 2021

Hi Alexandre, > -static FORCEINLINE LONG WINAPI InterlockedIncrement( LONG volatile *dest ) > -{ > - return _InterlockedIncrement( (long volatile *)dest ); > -} What was wrong with those inlines? Note that the commit removes LONG* to long* casts and causes warnings on clang msvc target. Jacek

2 2

[PATCH v2] winex11.drv: Detach vulkan surfaces during thread detach.
by Paul Gofman Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- v2: - wine_vk_surface_destroy() for the old surface in X11DRV_vkCreateWin32SurfaceKHR(). Supersedes 217240. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). Since it turns out like the issue is actually winex11 - Vulkan specific, the new version of the patch implements the clean up in the Vulkan side. The introduced list of surfaces can potentially be reused later (maybe with some additions) for Vulkan child window rendering implementation. dlls/winex11.drv/vulkan.c | 56 ++++++++++++++++++++++++++++------ dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 51 insertions(+), 10 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 1bbdba2ce1d..4f6624b3db8 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -57,12 +57,16 @@ static XContext vulkan_hwnd_context; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 +static struct list surface_list = LIST_INIT( surface_list ); + struct wine_vk_surface { LONG ref; + struct list entry; Window window; VkSurfaceKHR surface; /* native surface */ HWND hwnd; + DWORD hwnd_thread_id; }; typedef struct VkXlibSurfaceCreateInfoKHR @@ -207,6 +211,10 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (InterlockedDecrement(&surface->ref)) return; + EnterCriticalSection(&context_section); + list_remove(&surface->entry); + LeaveCriticalSection(&context_section); + if (surface->window) XDestroyWindow(gdi_display, surface->window); @@ -219,12 +227,33 @@ void wine_vk_surface_destroy(HWND hwnd) EnterCriticalSection(&context_section); if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) { + surface->hwnd_thread_id = 0; + surface->hwnd = NULL; wine_vk_surface_release(surface); } XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); LeaveCriticalSection(&context_section); } +void vulkan_thread_detach(void) +{ + struct wine_vk_surface *surface, *next; + DWORD thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&context_section); + LIST_FOR_EACH_ENTRY_SAFE(surface, next, &surface_list, struct wine_vk_surface, entry) + { + if (surface->hwnd_thread_id != thread_id) + continue; + + TRACE("Detaching surface %p, hwnd %p.\n", surface, surface->hwnd); + XReparentWindow(gdi_display, surface->window, get_dummy_parent(), 0, 0); + XSync(gdi_display, False); + wine_vk_surface_destroy(surface->hwnd); + } + LeaveCriticalSection(&context_section); +} + static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -278,7 +307,7 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, { VkResult res; VkXlibSurfaceCreateInfoKHR create_info_host; - struct wine_vk_surface *x11_surface, *prev; + struct wine_vk_surface *x11_surface; TRACE("%p %p %p %p\n", instance, create_info, allocator, surface); @@ -298,8 +327,15 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, x11_surface->ref = 1; x11_surface->hwnd = create_info->hwnd; - x11_surface->window = x11_surface->hwnd ? create_client_window(create_info->hwnd, &default_visual) - : create_dummy_client_window(); + if (x11_surface->hwnd) + { + x11_surface->window = create_client_window(create_info->hwnd, &default_visual); + x11_surface->hwnd_thread_id = GetWindowThreadProcessId(x11_surface->hwnd, NULL); + } + else + { + x11_surface->window = create_dummy_client_window(); + } if (!x11_surface->window) { @@ -323,16 +359,14 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + EnterCriticalSection(&context_section); if (x11_surface->hwnd) { - EnterCriticalSection(&context_section); - if (!XFindContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char **)&prev)) - { - wine_vk_surface_release(prev); - } + wine_vk_surface_destroy( x11_surface->hwnd ); XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); - LeaveCriticalSection(&context_section); } + list_add_tail(&surface_list, &x11_surface->entry); + LeaveCriticalSection(&context_section); *surface = (uintptr_t)x11_surface; @@ -713,4 +747,8 @@ void wine_vk_surface_destroy(HWND hwnd) { } +void vulkan_thread_detach(void) +{ +} + #endif /* SONAME_LIBVULKAN */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..7ec2639e309 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1446,7 +1446,7 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co * * Create a dummy parent window for child windows that don't have a true X11 parent. */ -static Window get_dummy_parent(void) +Window get_dummy_parent(void) { static Window dummy_parent; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..e82ee921830 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -587,11 +587,13 @@ extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; +extern Window get_dummy_parent(void) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, BOOL known_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; +extern void vulkan_thread_detach(void) DECLSPEC_HIDDEN; extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ) DECLSPEC_HIDDEN; extern Window init_clip_window(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..bd21afc8174 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -645,6 +645,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + vulkan_thread_detach(); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); -- 2.31.1

1 0

[PATCH] winex11.drv: Detach vulkan surfaces during thread detach.
by Paul Gofman Oct. 15, 2021

Oct. 15, 2021

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Supersedes 217240. X11DRV_ThreadDetach() destroys thread data part of which (e. g., display) is still present in window data in winex11.drv and accessible through hwnd. That causes all sort of hangs and crashes when the window is still used for Vulkan rendering (even if only to tear down the device and swapchain). Since it turns out like the issue is actually winex11 - Vulkan specific, the new version of the patch implements the clean up in the Vulkan side. The introduced list of surfaces can potentially be reused later (maybe with some additions) for Vulkan child window rendering implementation. dlls/winex11.drv/vulkan.c | 49 +++++++++++++++++++++++++++++++--- dlls/winex11.drv/window.c | 2 +- dlls/winex11.drv/x11drv.h | 2 ++ dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/vulkan.c b/dlls/winex11.drv/vulkan.c index 1bbdba2ce1d..df40b3bd7ae 100644 --- a/dlls/winex11.drv/vulkan.c +++ b/dlls/winex11.drv/vulkan.c @@ -57,12 +57,16 @@ static XContext vulkan_hwnd_context; #define VK_STRUCTURE_TYPE_XLIB_SURFACE_CREATE_INFO_KHR 1000004000 +static struct list surface_list = LIST_INIT( surface_list ); + struct wine_vk_surface { LONG ref; + struct list entry; Window window; VkSurfaceKHR surface; /* native surface */ HWND hwnd; + DWORD hwnd_thread_id; }; typedef struct VkXlibSurfaceCreateInfoKHR @@ -207,6 +211,10 @@ static void wine_vk_surface_release(struct wine_vk_surface *surface) if (InterlockedDecrement(&surface->ref)) return; + EnterCriticalSection(&context_section); + list_remove(&surface->entry); + LeaveCriticalSection(&context_section); + if (surface->window) XDestroyWindow(gdi_display, surface->window); @@ -219,12 +227,33 @@ void wine_vk_surface_destroy(HWND hwnd) EnterCriticalSection(&context_section); if (!XFindContext(gdi_display, (XID)hwnd, vulkan_hwnd_context, (char **)&surface)) { + surface->hwnd_thread_id = 0; + surface->hwnd = NULL; wine_vk_surface_release(surface); } XDeleteContext(gdi_display, (XID)hwnd, vulkan_hwnd_context); LeaveCriticalSection(&context_section); } +void vulkan_thread_detach(void) +{ + struct wine_vk_surface *surface, *next; + DWORD thread_id = GetCurrentThreadId(); + + EnterCriticalSection(&context_section); + LIST_FOR_EACH_ENTRY_SAFE(surface, next, &surface_list, struct wine_vk_surface, entry) + { + if (surface->hwnd_thread_id != thread_id) + continue; + + TRACE("Detaching surface %p, hwnd %p.\n", surface, surface->hwnd); + XReparentWindow(gdi_display, surface->window, get_dummy_parent(), 0, 0); + XSync(gdi_display, False); + wine_vk_surface_destroy(surface->hwnd); + } + LeaveCriticalSection(&context_section); +} + static VkResult X11DRV_vkCreateInstance(const VkInstanceCreateInfo *create_info, const VkAllocationCallbacks *allocator, VkInstance *instance) { @@ -298,8 +327,15 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, x11_surface->ref = 1; x11_surface->hwnd = create_info->hwnd; - x11_surface->window = x11_surface->hwnd ? create_client_window(create_info->hwnd, &default_visual) - : create_dummy_client_window(); + if (x11_surface->hwnd) + { + x11_surface->window = create_client_window(create_info->hwnd, &default_visual); + x11_surface->hwnd_thread_id = GetWindowThreadProcessId(x11_surface->hwnd, NULL); + } + else + { + x11_surface->window = create_dummy_client_window(); + } if (!x11_surface->window) { @@ -323,16 +359,17 @@ static VkResult X11DRV_vkCreateWin32SurfaceKHR(VkInstance instance, goto err; } + EnterCriticalSection(&context_section); if (x11_surface->hwnd) { - EnterCriticalSection(&context_section); if (!XFindContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char **)&prev)) { wine_vk_surface_release(prev); } XSaveContext(gdi_display, (XID)create_info->hwnd, vulkan_hwnd_context, (char *)wine_vk_surface_grab(x11_surface)); - LeaveCriticalSection(&context_section); } + list_add_tail(&surface_list, &x11_surface->entry); + LeaveCriticalSection(&context_section); *surface = (uintptr_t)x11_surface; @@ -713,4 +750,8 @@ void wine_vk_surface_destroy(HWND hwnd) { } +void vulkan_thread_detach(void) +{ +} + #endif /* SONAME_LIBVULKAN */ diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 0057a341525..7ec2639e309 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -1446,7 +1446,7 @@ static void move_window_bits( HWND hwnd, Window window, const RECT *old_rect, co * * Create a dummy parent window for child windows that don't have a true X11 parent. */ -static Window get_dummy_parent(void) +Window get_dummy_parent(void) { static Window dummy_parent; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 5ed2fcf73fb..e82ee921830 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -587,11 +587,13 @@ extern struct x11drv_win_data *get_win_data( HWND hwnd ) DECLSPEC_HIDDEN; extern void release_win_data( struct x11drv_win_data *data ) DECLSPEC_HIDDEN; extern Window X11DRV_get_whole_window( HWND hwnd ) DECLSPEC_HIDDEN; extern XIC X11DRV_get_ic( HWND hwnd ) DECLSPEC_HIDDEN; +extern Window get_dummy_parent(void) DECLSPEC_HIDDEN; extern void sync_gl_drawable( HWND hwnd, BOOL known_child ) DECLSPEC_HIDDEN; extern void set_gl_drawable_parent( HWND hwnd, HWND parent ) DECLSPEC_HIDDEN; extern void destroy_gl_drawable( HWND hwnd ) DECLSPEC_HIDDEN; extern void wine_vk_surface_destroy( HWND hwnd ) DECLSPEC_HIDDEN; +extern void vulkan_thread_detach(void) DECLSPEC_HIDDEN; extern void wait_for_withdrawn_state( HWND hwnd, BOOL set ) DECLSPEC_HIDDEN; extern Window init_clip_window(void) DECLSPEC_HIDDEN; diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c index e8b273d055e..bd21afc8174 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c @@ -645,6 +645,7 @@ void CDECL X11DRV_ThreadDetach(void) if (data) { + vulkan_thread_detach(); if (data->xim) XCloseIM( data->xim ); if (data->font_set) XFreeFontSet( data->display, data->font_set ); XCloseDisplay( data->display ); -- 2.31.1

1 0

[PATCH 1/5] winemac.drv: Simplify cursor clipping code paths.
by Tim Clem Oct. 15, 2021

Oct. 15, 2021

Centralizes all clipping behavior into -startClippingCursor: and -stopClippingCursor. Signed-off-by: Tim Clem <tclem(a)codeweavers.com> --- The current methods are confusingly named and, in some cases, broken. -updateCursorClippingState has an incomplete picture of when clipping should be enabled or disabled. Worse, -deactivateCursorClipping just disables the event tap without calling CGAssociateMouseAndMouseCursorPosition(true), so it will lock up the cursor if called while the app is active. There are two main scenarios where -updateCursorClippingState is called: when a window is being dragged and when the app is (de)activated. The drag-related calls can be removed entirely because the handlers in window.c call ClipCursor(NULL) when a window is being dragged. (This is in fact the only reason that the cursor doesn't get locked up when windows are dragged right now.) As for app (de)activation, the tap already ignores events if the app isn't active, so the -updateCursorClippingState calls there can be removed as well. (Moreover, Windows will cancel cursor clipping if the app loses focus; the next patch calls -stopClippingCursor when the app resigns active.) dlls/winemac.drv/cocoa_app.m | 52 +++++++++++------------------------- 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 2d18da7f99a8..806252651613 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1456,33 +1456,6 @@ - (BOOL) setCursorPosition:(CGPoint)pos return ret; } - - (void) activateCursorClipping - { - if (cursorClippingEventTap && !CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, TRUE); - [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; - } - } - - - (void) deactivateCursorClipping - { - if (cursorClippingEventTap && CGEventTapIsEnabled(cursorClippingEventTap)) - { - CGEventTapEnable(cursorClippingEventTap, FALSE); - [warpRecords removeAllObjects]; - lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; - } - } - - - (void) updateCursorClippingState - { - if (clippingCursor && [NSApp isActive] && ![windowsBeingDragged count]) - [self activateCursorClipping]; - else - [self deactivateCursorClipping]; - } - - (void) updateWindowsForCursorClipping { WineWindow* window; @@ -1510,7 +1483,10 @@ - (BOOL) startClippingCursor:(CGRect)rect clippingCursor = TRUE; cursorClipRect = rect; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, TRUE); + [self setCursorPosition:NSPointToCGPoint([self flippedMouseLocation:[NSEvent mouseLocation]])]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1518,12 +1494,21 @@ - (BOOL) startClippingCursor:(CGRect)rect - (BOOL) stopClippingCursor { - CGError err = CGAssociateMouseAndMouseCursorPosition(true); + CGError err; + + if (!clippingCursor) + return TRUE; + + err = CGAssociateMouseAndMouseCursorPosition(true); if (err != kCGErrorSuccess) return FALSE; clippingCursor = FALSE; - [self updateCursorClippingState]; + + CGEventTapEnable(cursorClippingEventTap, FALSE); + [warpRecords removeAllObjects]; + lastSetCursorPositionTime = [[NSProcessInfo processInfo] systemUptime]; + [self updateWindowsForCursorClipping]; return TRUE; @@ -1554,7 +1539,6 @@ - (void) window:(WineWindow*)window isBeingDragged:(BOOL)dragged [windowsBeingDragged addObject:window]; else [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; } - (void) windowWillOrderOut:(WineWindow*)window @@ -1584,7 +1568,6 @@ - (void) handleWindowDrag:(WineWindow*)window begin:(BOOL)begin [windowsBeingDragged removeObject:window]; eventType = WINDOW_DRAG_END; } - [self updateCursorClippingState]; event = macdrv_create_event(eventType, window); if (eventType == WINDOW_DRAG_BEGIN) @@ -2161,7 +2144,6 @@ - (void) setupObservations }); } [windowsBeingDragged removeObject:window]; - [self updateCursorClippingState]; }]; if (useDragNotifications) { @@ -2305,8 +2287,6 @@ - (void)applicationDidBecomeActive:(NSNotification *)notification [self setMode:mode forDisplay:[displayID unsignedIntValue]]; } - [self updateCursorClippingState]; - [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; @@ -2349,8 +2329,6 @@ - (void)applicationDidResignActive:(NSNotification *)notification macdrv_event* event; WineEventQueue* queue; - [self updateCursorClippingState]; - [self invalidateGotFocusEvents]; event = macdrv_create_event(APP_DEACTIVATED, nil); -- 2.33.0

1 5