From 6d26689484070b2c4ad4e0e16812c6eb8176cd40 Mon Sep 17 00:00:00 2001 From: Zhiyi Zhang Date: Thu, 18 Mar 2021 20:42:47 +0800 Subject: [PATCH] winex11.drv: Call request_selection_contents() after the XFixes extension is initialized. request_selection_contents() checks whether the XFixes extension is available and will start a timer to check for clipboard content updates at an interval. Running request_selection_contents() before the XFixes extension is initialized will always start a timer and sends unnecessary clipboard content change notifications, causing Office right-click menus to disappear. Signed-off-by: Zhiyi Zhang Signed-off-by: Alexandre Julliard --- dlls/winex11.drv/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 8a0617cfede..b511af3f691 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2064,9 +2064,8 @@ static DWORD WINAPI clipboard_thread( void *arg ) clipboard_thread_id = GetCurrentThreadId(); AddClipboardFormatListener( clipboard_hwnd ); register_builtin_formats(); - request_selection_contents( clipboard_display, TRUE ); - xfixes_init(); + request_selection_contents( clipboard_display, TRUE ); TRACE( "clipboard thread %04x running\n", GetCurrentThreadId() ); while (GetMessageW( &msg, 0, 0, 0 )) DispatchMessageW( &msg );