April 2019 - Wine-devel - list.winehq.org

[PATCH resend 1/6] user32/focus: Prevent a recursive loop with the activation messages
by Gabriel Ivăncescu 23 Apr '19

23 Apr '19

When activating a window and sending activation messages to the window procedure, we have to avoid a recursive loop by not sending more of these messages or hooks while we are still activating the window. Some applications actually depend on this behavior. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46274 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Can someone please take a look at these patches and provide feedback if possible? The behavior is very consistent and the tests are pretty much reliable as far as I can see, so it is indeed Windows' behavior on which apps do rely on (since it fixes an annoying issue in Total Commander's Multi-rename function). I understand it touches a sensitive part of Wine, but I think the tests are pretty conclusive. If not, I'd like some feedback on how to solve it better. Of course, I've been running with this patch for some months now and didn't find anything wrong with focus. dlls/user32/focus.c | 44 +++++++++++++++++++++++++++++--------------- dlls/user32/win.h | 1 + 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c index f1c8831..0d32d00 100644 --- a/dlls/user32/focus.c +++ b/dlls/user32/focus.c @@ -78,7 +78,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) { HWND previous = GetActiveWindow(); BOOL ret; - DWORD old_thread, new_thread; + DWORD winflags, old_thread, new_thread; CBTACTIVATESTRUCT cbt; if (previous == hwnd) @@ -87,16 +87,24 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) return TRUE; } - /* call CBT hook chain */ - cbt.fMouse = mouse; - cbt.hWndActive = previous; - if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) return FALSE; - - if (IsWindow(previous)) + /* Prevent a recursive activation loop with the activation messages */ + winflags = win_set_flags(hwnd, WIN_IS_IN_ACTIVATION, 0); + if (!(winflags & WIN_IS_IN_ACTIVATION)) { - SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); - SendMessageW( previous, WM_ACTIVATE, - MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + ret = FALSE; + + /* call CBT hook chain */ + cbt.fMouse = mouse; + cbt.hWndActive = previous; + if (HOOK_CallHooks( WH_CBT, HCBT_ACTIVATE, (WPARAM)hwnd, (LPARAM)&cbt, TRUE )) + goto clear_flags; + + if (IsWindow(previous)) + { + SendMessageW( previous, WM_NCACTIVATE, FALSE, (LPARAM)hwnd ); + SendMessageW( previous, WM_ACTIVATE, + MAKEWPARAM( WA_INACTIVE, IsIconic(previous) ), (LPARAM)hwnd ); + } } SERVER_START_REQ( set_active_window ) @@ -106,9 +114,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) previous = wine_server_ptr_handle( reply->previous ); } SERVER_END_REQ; - if (!ret) return FALSE; + if (!ret) goto clear_flags; if (prev) *prev = previous; - if (previous == hwnd) return TRUE; + if (previous == hwnd) goto clear_flags; if (hwnd) { @@ -116,7 +124,11 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) if (SendMessageW( hwnd, WM_QUERYNEWPALETTE, 0, 0 )) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTEISCHANGING, (WPARAM)hwnd, 0, SMTO_ABORTIFHUNG, 2000, NULL ); - if (!IsWindow(hwnd)) return FALSE; + if (!IsWindow(hwnd)) + { + ret = FALSE; + goto clear_flags; + } } old_thread = previous ? GetWindowThreadProcessId( previous, NULL ) : 0; @@ -148,7 +160,7 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - if (IsWindow(hwnd)) + if (!(winflags & WIN_IS_IN_ACTIVATION) && IsWindow(hwnd)) { SendMessageW( hwnd, WM_NCACTIVATE, (hwnd == GetForegroundWindow()), (LPARAM)previous ); SendMessageW( hwnd, WM_ACTIVATE, @@ -173,7 +185,9 @@ static BOOL set_active_window( HWND hwnd, HWND *prev, BOOL mouse, BOOL focus ) } } - return TRUE; +clear_flags: + win_set_flags(hwnd, 0, WIN_IS_IN_ACTIVATION); + return ret; } diff --git a/dlls/user32/win.h b/dlls/user32/win.h index 81b08fc..d53e1a5 100644 --- a/dlls/user32/win.h +++ b/dlls/user32/win.h @@ -79,6 +79,7 @@ typedef struct tagWND #define WIN_NEEDS_SHOW_OWNEDPOPUP 0x0020 /* WM_SHOWWINDOW:SC_SHOW must be sent in the next ShowOwnedPopup call */ #define WIN_CHILDREN_MOVED 0x0040 /* children may have moved, ignore stored positions */ #define WIN_HAS_IME_WIN 0x0080 /* the window has been registered with imm32 */ +#define WIN_IS_IN_ACTIVATION 0x0100 /* the window is in an activation process */ /* Window functions */ extern HWND get_hwnd_message_parent(void) DECLSPEC_HIDDEN; -- 2.21.0

2 10

Call for Help: Fix Win10 test failures
by Detlef Riekenberg 23 Apr '19

23 Apr '19

Microsoft did a lot of changes before or with Win10 Build 16299 (marked as 1709). This is discovered by a lot more test failures in winetest, when compared to the older Win10 Build 10240 on the same machine (cw2-gtx560-1709-t64 compared to cw2-gtx560-t64 as an example) Many tests failures look like a more lazy behaviour. for application bugs (use after free / use a busy resource) Please help and fix our tests. Another failure-source is the winetest-failures between different Graphics systems (cw1 with a HD6800, cw2 with a gtx560, newtb vm with emulated vga/spice and a i7 with an intel HD3000), but i didn't look at these yet. http://test.winehq.org/data/f9301c2b66450a1cdd986e9052fcaa76535ba8b7/index_… The results on the machine "dr-i7*" marked with "not run" where removed from winetest-report. The full report is here: http://test.winehq.org/queue/errw_WDX/report -- bye bye ... ... Detlef

2 1

[PATCH V2] ntdll: Improve invalid paramater handling in NtAccessCheck.
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Qian Hong <qhong(a)codeweavers.com> From: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Qian Hong <qhong(a)codeweavers.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/advapi32/tests/security.c | 8 -------- dlls/ntdll/sec.c | 11 ++++++++++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index d9cae64da8b..d886ab713f3 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1454,10 +1454,8 @@ static void test_AccessCheck(void) ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, 0, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1508,12 +1506,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); -todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); -todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); -todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); @@ -1625,12 +1620,9 @@ todo_wine ret = AccessCheck(SecurityDescriptor, Token, KEY_READ, &Mapping, PrivSet, &PrivSetLen, &Access, &AccessStatus); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "AccessCheck should have " "failed with ERROR_INSUFFICIENT_BUFFER, instead of %d\n", err); - todo_wine ok(PrivSetLen == sizeof(PRIVILEGE_SET), "PrivSetLen returns %d\n", PrivSetLen); - todo_wine ok(Access == 0x1abe11ed && AccessStatus == 0x1abe11ed, "Access and/or AccessStatus were changed!\n"); diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c index 02fc77dc1cc..ef91f2319fe 100644 --- a/dlls/ntdll/sec.c +++ b/dlls/ntdll/sec.c @@ -1667,7 +1667,16 @@ NtAccessCheck( SecurityDescriptor, ClientToken, DesiredAccess, GenericMapping, PrivilegeSet, ReturnLength, GrantedAccess, AccessStatus); - if (!PrivilegeSet || !ReturnLength) + if (!ReturnLength) + return STATUS_ACCESS_VIOLATION; + + if (*ReturnLength == 0) + { + *ReturnLength = sizeof(PRIVILEGE_SET); + return STATUS_BUFFER_TOO_SMALL; + } + + if (!PrivilegeSet) return STATUS_ACCESS_VIOLATION; SERVER_START_REQ( access_check ) -- 2.17.0

1 0

[PATCH] kernel/nls: Fix LOCALE_SABBREVCTRYNAME for Serbian
by Vijay Kiran Kamuju 23 Apr '19

23 Apr '19

From: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/kernel32/nls/srb.nls | 2 +- dlls/kernel32/nls/srl.nls | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/nls/srb.nls b/dlls/kernel32/nls/srb.nls index 348cf405239..85de93a6a34 100644 --- a/dlls/kernel32/nls/srb.nls +++ b/dlls/kernel32/nls/srb.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "пон" LOCALE_SABBREVDAYNAME2 "уто" LOCALE_SABBREVDAYNAME3 "сре" diff --git a/dlls/kernel32/nls/srl.nls b/dlls/kernel32/nls/srl.nls index 2566b17b489..eaa33db13da 100644 --- a/dlls/kernel32/nls/srl.nls +++ b/dlls/kernel32/nls/srl.nls @@ -64,7 +64,7 @@ STRINGTABLE LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN LOCALE_ITLZERO "0" LOCALE_S1159 "" LOCALE_S2359 "" - LOCALE_SABBREVCTRYNAME "SPB" + LOCALE_SABBREVCTRYNAME "SRB" LOCALE_SABBREVDAYNAME1 "pon" LOCALE_SABBREVDAYNAME2 "uto" LOCALE_SABBREVDAYNAME3 "sre" -- 2.17.0

1 0

[PATCH v3] winex11.drv: Search for the drop target in a correct manner.
by John Found 23 Apr '19

23 Apr '19

Signed-off-by: John Found <johnfound(a)asm32.info> --- dlls/winex11.drv/xdnd.c | 54 +++++++++++++++++++++++++++++++++++------ 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 2ab28e43bf..1f7f0d932b 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -254,6 +254,38 @@ void X11DRV_XDND_EnterEvent( HWND hWnd, XClientMessageEvent *event ) XFree(xdndtypes); } +/* Recursively searches for a window on given coordinates in a drag&drop specific manner. + * + * Don't use WindowFromPoint instead, because it omits the STATIC and transparent + * windows, but they can be a valid drop targets if have WS_EX_ACCEPTFILES set. + */ +static HWND window_from_point_dnd(HWND hwnd, POINT point) +{ + HWND child; + ScreenToClient(hwnd, &point); + while ((child = ChildWindowFromPointEx(hwnd, point, CWP_SKIPDISABLED | CWP_SKIPINVISIBLE)) && child != hwnd) + { + MapWindowPoints(hwnd, child, &point, 1); + hwnd = child; + } + + return hwnd; +} + +/* Returns the first window down the hierarchy that has WS_EX_ACCEPTFILES set or + * returns NULL, if such window does not exists. + */ +static HWND window_accepting_files(HWND hwnd) +{ + while (hwnd && !(GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_ACCEPTFILES)) + /* MUST to be GetParent, not GetAncestor, because the owner window + * (with WS_EX_ACCEPTFILES) of a window with WS_POPUP is a valid + * drop target. GetParent works exactly this way! + */ + hwnd = GetParent(hwnd); + return hwnd; +} + /************************************************************************** * X11DRV_XDND_PositionEvent * @@ -270,7 +302,7 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) HRESULT hr; XDNDxy = root_to_virtual_screen( event->data.l[2] >> 16, event->data.l[2] & 0xFFFF ); - targetWindow = WindowFromPoint(XDNDxy); + targetWindow = window_from_point_dnd(hWnd, XDNDxy); pointl.x = XDNDxy.x; pointl.y = XDNDxy.y; @@ -334,11 +366,15 @@ void X11DRV_XDND_PositionEvent( HWND hWnd, XClientMessageEvent *event ) if (XDNDAccepted) accept = 1; - else if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + else { - accept = 1; - effect = DROPEFFECT_COPY; + /* fallback search for window able to accept these files. */ + + if (window_accepting_files(targetWindow) && X11DRV_XDND_HasHDROP()) + { + accept = 1; + effect = DROPEFFECT_COPY; + } } TRACE("actionRequested(%ld) accept(%d) chosen(0x%x) at x(%d),y(%d)\n", @@ -423,10 +459,12 @@ void X11DRV_XDND_DropEvent( HWND hWnd, XClientMessageEvent *event ) { /* Only send WM_DROPFILES if Drop didn't succeed or DROPEFFECT_NONE was set. * Doing both causes winamp to duplicate the dropped files (#29081) */ - if ((GetWindowLongW( hWnd, GWL_EXSTYLE ) & WS_EX_ACCEPTFILES) && - X11DRV_XDND_HasHDROP()) + + HWND hwnd_drop = window_accepting_files(window_from_point_dnd(hWnd, XDNDxy)); + + if (hwnd_drop && X11DRV_XDND_HasHDROP()) { - HRESULT hr = X11DRV_XDND_SendDropFiles( hWnd ); + HRESULT hr = X11DRV_XDND_SendDropFiles(hwnd_drop); if (SUCCEEDED(hr)) { accept = 1; -- 2.21.0

1 0

[PATCH 4/4] [resend] comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/edit.c | 47 +++++++++++++--------------------------------- dlls/comctl32/tests/edit.c | 16 +--------------- 2 files changed, 14 insertions(+), 49 deletions(-)

1 0

[PATCH 3/4] [resend] comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Tests assume that WM_SETFONT margins are equal to EM_SETMARGINS with EC_USEFONTINFO ones. This isn't true when font's charset is CJK. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-)

1 0

[PATCH 2/4] [resend] comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH 1/4] comctl32/tests: Use GREEK_CHARSET in margin tests to avoid Associated Charset feature.
by Akihiro Sagawa 23 Apr '19

23 Apr '19

Due to Associated Charset feature, we currently use Chinese typeface in the test in zh_CN locale. For consistency with another locale, we should avoid the fature in tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/comctl32/tests/edit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 3/5] dxgi: Implement Alt+Enter handling.
by Zhiyi Zhang 23 Apr '19

23 Apr '19

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/swapchain.c | 163 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 163 insertions(+) diff --git a/dlls/dxgi/swapchain.c b/dlls/dxgi/swapchain.c index 53da2081e8..9f8539fd28 100644 --- a/dlls/dxgi/swapchain.c +++ b/dlls/dxgi/swapchain.c @@ -39,6 +39,159 @@ WINE_DEFAULT_DEBUG_CHANNEL(dxgi); WINE_DECLARE_DEBUG_CHANNEL(winediag); +extern const WCHAR wine_dxgi_associated_factory_propW[]; +extern const WCHAR wine_dxgi_associated_flags_propW[]; + +static struct list dxgi_swapchain_list = LIST_INIT(dxgi_swapchain_list); +static struct list dxgi_hook_list = LIST_INIT(dxgi_hook_list); + +struct dxgi_swapchain_entry +{ + IDXGISwapChain1 *swapchain; + DWORD thread_id; + struct list entry; +}; + +struct dxgi_hook_entry +{ + HHOOK hook; + DWORD thread_id; + struct list entry; +}; + +static LRESULT CALLBACK associated_window_hook_proc(int code, WPARAM wparam, LPARAM lparam) +{ + struct dxgi_swapchain_entry *swapchain_entry; + IDXGIFactory *dxgi_factory; + MSG *msg = (MSG *)lparam; + HANDLE factory_handle; + BOOL skip = FALSE; + BOOL fullscreen; + DWORD flags; + HWND hwnd; + + if (code == HC_ACTION && msg->message == WM_SYSKEYDOWN && msg->wParam == VK_RETURN && (msg->lParam & (KF_ALTDOWN << 16))) + { + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (FAILED(IDXGISwapChain1_GetHwnd(swapchain_entry->swapchain, &hwnd)) || hwnd != msg->hwnd) + continue; + + if (FAILED(IDXGISwapChain1_GetParent(swapchain_entry->swapchain, &IID_IDXGIFactory, (void **)&dxgi_factory))) + continue; + IDXGIFactory_Release(dxgi_factory); + + factory_handle = GetPropW(hwnd, wine_dxgi_associated_factory_propW); + flags = (DWORD)(UINT_PTR)GetPropW(hwnd, wine_dxgi_associated_flags_propW); + + if (factory_handle && factory_handle != dxgi_factory) + continue; + + if (flags & (DXGI_MWA_NO_WINDOW_CHANGES | DXGI_MWA_NO_ALT_ENTER)) + break; + + if (SUCCEEDED(IDXGISwapChain1_GetFullscreenState(swapchain_entry->swapchain, &fullscreen, NULL))) + IDXGISwapChain1_SetFullscreenState(swapchain_entry->swapchain, !fullscreen, NULL); + skip = TRUE; + break; + } + wined3d_mutex_unlock(); + } + + return skip ? 1 : CallNextHookEx(0, code, wparam, lparam); +} + +static void add_associated_window_hook(IDXGISwapChain1 *swapchain, HWND hwnd) +{ + struct dxgi_swapchain_entry *swapchain_entry; + struct dxgi_hook_entry *hook_entry; + BOOL has_hook = FALSE; + + if (!hwnd) + return; + + if (!(swapchain_entry = heap_alloc_zero(sizeof(*swapchain_entry)))) + return; + + swapchain_entry->swapchain = swapchain; + swapchain_entry->thread_id = GetWindowThreadProcessId(hwnd, NULL); + wined3d_mutex_lock(); + list_add_head(&dxgi_swapchain_list, &swapchain_entry->entry); + /* Add hook for current thread if needed */ + LIST_FOR_EACH_ENTRY(hook_entry, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == swapchain_entry->thread_id) + { + has_hook = TRUE; + break; + } + } + wined3d_mutex_unlock(); + + if (!has_hook) + { + if (!(hook_entry = heap_alloc_zero(sizeof(*hook_entry)))) + { + wined3d_mutex_lock(); + list_remove(&swapchain_entry->entry); + wined3d_mutex_unlock(); + heap_free(swapchain_entry); + return; + } + + hook_entry->thread_id = swapchain_entry->thread_id; + hook_entry->hook = SetWindowsHookExW(WH_GETMESSAGE, associated_window_hook_proc, 0, hook_entry->thread_id); + wined3d_mutex_lock(); + list_add_head(&dxgi_hook_list, &hook_entry->entry); + wined3d_mutex_unlock(); + } +} + +static void remove_associated_window_hook(IDXGISwapChain1 *swapchain) +{ + struct dxgi_swapchain_entry *swapchain_entry, *swapchain_entry2; + struct dxgi_hook_entry *hook_entry, *hook_entry2; + BOOL hook_in_use = FALSE; + DWORD thread_id = 0; + + wined3d_mutex_lock(); + LIST_FOR_EACH_ENTRY_SAFE(swapchain_entry, swapchain_entry2, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->swapchain == swapchain) + { + thread_id = swapchain_entry->thread_id; + list_remove(&swapchain_entry->entry); + heap_free(swapchain_entry); + break; + } + } + /* Check if hook is still used by other swapchains */ + LIST_FOR_EACH_ENTRY(swapchain_entry, &dxgi_swapchain_list, struct dxgi_swapchain_entry, entry) + { + if (swapchain_entry->thread_id == thread_id) + { + hook_in_use = TRUE; + break; + } + } + /* Remove hook if it's not longer used by any thread */ + if (!hook_in_use) + { + LIST_FOR_EACH_ENTRY_SAFE(hook_entry, hook_entry2, &dxgi_hook_list, struct dxgi_hook_entry, entry) + { + if (hook_entry->thread_id == thread_id) + { + list_remove(&hook_entry->entry); + UnhookWindowsHookEx(hook_entry->hook); + heap_free(hook_entry); + break; + } + } + } + wined3d_mutex_unlock(); +} + static DXGI_SWAP_EFFECT dxgi_swap_effect_from_wined3d(enum wined3d_swap_effect swap_effect) { switch (swap_effect) @@ -214,6 +367,9 @@ static ULONG STDMETHODCALLTYPE d3d11_swapchain_Release(IDXGISwapChain1 *iface) if (!refcount) { IWineDXGIDevice *device = swapchain->device; + + remove_associated_window_hook(iface); + if (swapchain->target) { WARN("Releasing fullscreen swapchain.\n"); @@ -842,8 +998,11 @@ HRESULT d3d11_swapchain_init(struct d3d11_swapchain *swapchain, struct dxgi_devi goto cleanup; } } + wined3d_mutex_unlock(); + add_associated_window_hook(&swapchain->IDXGISwapChain1_iface, desc->device_window); + return S_OK; cleanup: @@ -1770,6 +1929,8 @@ static void d3d12_swapchain_destroy(struct d3d12_swapchain *swapchain) const struct dxgi_vk_funcs *vk_funcs = &swapchain->vk_funcs; void *vulkan_module = vk_funcs->vulkan_module; + remove_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface); + d3d12_swapchain_destroy_buffers(swapchain, TRUE); if (swapchain->command_queue) @@ -2731,6 +2892,8 @@ static HRESULT d3d12_swapchain_init(struct d3d12_swapchain *swapchain, IWineDXGI IWineDXGIFactory_AddRef(swapchain->factory = factory); + add_associated_window_hook((IDXGISwapChain1*)&swapchain->IDXGISwapChain3_iface, window); + return S_OK; } -- 2.20.1

1 0