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

[PATCH v3] winex11.drv: Search for the drop target in a correct manner.
by John Found April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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 April 23, 2019

April 23, 2019

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

[PATCH 2/5] dxgi: Implement dxgi_factory_GetWindowAssociation().
by Zhiyi Zhang April 23, 2019

April 23, 2019

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/dxgi/factory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 5aadef62e4..65783237e7 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -248,9 +248,18 @@ done: static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IWineDXGIFactory *iface, HWND *window) { - FIXME("iface %p, window %p stub!\n", iface, window); + TRACE("iface %p, window %p.\n", iface, window); - return E_NOTIMPL; + if (!window) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + /* Yes, tests show that it always return NULL for unknown reason. */ + *window = NULL; + + return S_OK; } static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IWineDXGIFactory *iface, -- 2.20.1

1 0

[PATCH 3/3] comctl32/edit: Fix minimum control size conditions when using EC_USEFONTINFO.
by Akihiro Sagawa April 23, 2019

April 23, 2019

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 2/3] comctl32/tests: Use EM_SETMARGINS to test EC_USEFONTINFO margins.
by Akihiro Sagawa April 23, 2019

April 23, 2019

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 1/3] comctl32/tests: Skip margin tests if a font for the target charset isn't available.
by Akihiro Sagawa April 23, 2019

April 23, 2019

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