mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 5b4009e8c27c16bdb9a5638c316a72aaee219158.
This commit is contained in:
Alistair Leslie-Hughes
parent
8647380744
commit
f0719cee76
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "5a815669e8e7a3f0a37648510494f8b36c29c1f6"
|
||||
echo "5b4009e8c27c16bdb9a5638c316a72aaee219158"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -247,7 +247,6 @@ patch_enable_all ()
|
||||
enable_winemenubuilder_integration="$1"
|
||||
enable_wineps_drv_PostScript_Fixes="$1"
|
||||
enable_winepulse_PulseAudio_Support="$1"
|
||||
enable_winex11_CandidateWindowPos="$1"
|
||||
enable_winex11_MWM_Decorations="$1"
|
||||
enable_winex11_UpdateLayeredWindow="$1"
|
||||
enable_winex11_Vulkan_support="$1"
|
||||
@ -770,9 +769,6 @@ patch_enable ()
|
||||
winepulse-PulseAudio_Support)
|
||||
enable_winepulse_PulseAudio_Support="$2"
|
||||
;;
|
||||
winex11-CandidateWindowPos)
|
||||
enable_winex11_CandidateWindowPos="$2"
|
||||
;;
|
||||
winex11-MWM_Decorations)
|
||||
enable_winex11_MWM_Decorations="$2"
|
||||
;;
|
||||
@ -3740,19 +3736,6 @@ if test "$enable_winepulse_PulseAudio_Support" -eq 1; then
|
||||
patch_apply winepulse-PulseAudio_Support/0001-winepulse.drv-Use-a-separate-mainloop-and-ctx-for-pu.patch
|
||||
fi
|
||||
|
||||
# Patchset winex11-CandidateWindowPos
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#30938] Update a XIM candidate position when cursor location changes
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/caret.c, dlls/user32/driver.c, dlls/win32u/driver.c, dlls/winex11.drv/init.c, dlls/winex11.drv/x11drv.h,
|
||||
# | dlls/winex11.drv/xim.c, include/wine/gdi_driver.h
|
||||
# |
|
||||
if test "$enable_winex11_CandidateWindowPos" -eq 1; then
|
||||
patch_apply winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
|
||||
fi
|
||||
|
||||
# Patchset winex11-MWM_Decorations
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3796,8 +3779,8 @@ fi
|
||||
# | * [#2155] Forward activate window requests to WM using _NET_ACTIVE_WINDOW
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/driver.c, dlls/win32u/driver.c, dlls/win32u/input.c, dlls/winex11.drv/event.c, dlls/winex11.drv/init.c,
|
||||
# | dlls/winex11.drv/window.c, dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c, include/wine/gdi_driver.h
|
||||
# | * dlls/win32u/driver.c, dlls/win32u/input.c, dlls/winex11.drv/event.c, dlls/winex11.drv/init.c, dlls/winex11.drv/window.c,
|
||||
# | dlls/winex11.drv/x11drv.h, dlls/winex11.drv/x11drv_main.c, include/wine/gdi_driver.h
|
||||
# |
|
||||
if test "$enable_winex11__NET_ACTIVE_WINDOW" -eq 1; then
|
||||
patch_apply winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1687b01c234b57803be7099f81ccce2136642670 Mon Sep 17 00:00:00 2001
|
||||
From 509c461b58dce1eeaa6a9a3c572dfb6031ed3b75 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Thu, 19 Dec 2019 22:34:44 +0100
|
||||
Subject: [PATCH] winex11.drv: Keep track of pointer and device button
|
||||
@ -16,7 +16,7 @@ Original patch by Andrew Eikum <aeikum@codeweavers.com>.
|
||||
4 files changed, 106 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
|
||||
index c6eab6f5cfa..1525dac8280 100644
|
||||
index de849066b95..a65e0ee6441 100644
|
||||
--- a/dlls/winex11.drv/keyboard.c
|
||||
+++ b/dlls/winex11.drv/keyboard.c
|
||||
@@ -1882,13 +1882,24 @@ BOOL X11DRV_MappingNotify( HWND dummy, XEvent *event )
|
||||
@ -51,10 +51,10 @@ index c6eab6f5cfa..1525dac8280 100644
|
||||
}
|
||||
|
||||
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
|
||||
index 9088aada596..6905d0827f8 100644
|
||||
index ea50c6bfbee..81be9d87862 100644
|
||||
--- a/dlls/winex11.drv/mouse.c
|
||||
+++ b/dlls/winex11.drv/mouse.c
|
||||
@@ -27,6 +27,9 @@
|
||||
@@ -26,6 +26,9 @@
|
||||
#include <X11/Xlib.h>
|
||||
#include <X11/cursorfont.h>
|
||||
#include <stdarg.h>
|
||||
@ -64,7 +64,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
|
||||
#include <X11/extensions/XInput2.h>
|
||||
#endif
|
||||
@@ -144,6 +147,14 @@ MAKE_FUNCPTR(XISelectEvents);
|
||||
@@ -143,6 +146,14 @@ MAKE_FUNCPTR(XISelectEvents);
|
||||
#undef MAKE_FUNCPTR
|
||||
#endif
|
||||
|
||||
@ -79,7 +79,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
/***********************************************************************
|
||||
* X11DRV_Xcursor_Init
|
||||
*
|
||||
@@ -249,6 +260,70 @@ void sync_window_cursor( Window window )
|
||||
@@ -248,6 +259,70 @@ void sync_window_cursor( Window window )
|
||||
set_window_cursor( window, cursor );
|
||||
}
|
||||
|
||||
@ -150,7 +150,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
#ifdef HAVE_X11_EXTENSIONS_XINPUT2_H
|
||||
/***********************************************************************
|
||||
* update_relative_valuators
|
||||
@@ -1896,6 +1971,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
|
||||
@@ -1844,6 +1919,8 @@ static BOOL X11DRV_DeviceChanged( XGenericEventCookie *xev )
|
||||
if (event->reason != XISlaveSwitch) return FALSE;
|
||||
|
||||
update_relative_valuators( event->classes, event->num_classes );
|
||||
@ -159,7 +159,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
@@ -1928,13 +2005,12 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
|
||||
@@ -1930,13 +2007,12 @@ static BOOL X11DRV_RawMotion( XGenericEventCookie *xev )
|
||||
|
||||
#endif /* HAVE_X11_EXTENSIONS_XINPUT2_H */
|
||||
|
||||
@ -174,7 +174,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
int event, error;
|
||||
void *libxi_handle = dlopen( SONAME_LIBXI, RTLD_NOW );
|
||||
|
||||
@@ -1950,11 +2026,20 @@ void x11drv_xinput_load(void)
|
||||
@@ -1952,11 +2028,20 @@ void x11drv_xinput_load(void)
|
||||
return; \
|
||||
}
|
||||
|
||||
@ -196,7 +196,7 @@ index 9088aada596..6905d0827f8 100644
|
||||
|
||||
xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index 8cddfa05904..b8d1bb100de 100644
|
||||
index 6db02f5f033..cbd3b240bd4 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -698,6 +698,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
|
||||
@ -204,14 +204,14 @@ index 8cddfa05904..b8d1bb100de 100644
|
||||
extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;
|
||||
extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN;
|
||||
+extern void X11DRV_InitMouse( Display *display ) DECLSPEC_HIDDEN;
|
||||
extern DWORD CDECL X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
|
||||
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
|
||||
extern DWORD X11DRV_MsgWaitForMultipleObjectsEx( DWORD count, const HANDLE *handles, DWORD timeout,
|
||||
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
|
||||
|
||||
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
|
||||
index d8e2a88c5f6..21437d99c5c 100644
|
||||
index 036a139da1a..e45d58cd926 100644
|
||||
--- a/dlls/winex11.drv/x11drv_main.c
|
||||
+++ b/dlls/winex11.drv/x11drv_main.c
|
||||
@@ -629,6 +629,7 @@ static BOOL process_attach(void)
|
||||
@@ -625,6 +625,7 @@ static BOOL process_attach(void)
|
||||
if (use_xkb) use_xkb = XkbUseExtension( gdi_display, NULL, NULL );
|
||||
#endif
|
||||
X11DRV_InitKeyboard( gdi_display );
|
||||
@ -220,5 +220,5 @@ index d8e2a88c5f6..21437d99c5c 100644
|
||||
|
||||
init_user_driver();
|
||||
--
|
||||
2.33.0
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 72a7f7ad3dffa132367cec29b1aa20fcaca6d316 Mon Sep 17 00:00:00 2001
|
||||
From 25d01cd37109d7d28d001563b6baca6fe8d9042f Mon Sep 17 00:00:00 2001
|
||||
From: Felix Yan <felixonmars@gmail.com>
|
||||
Date: Tue, 23 Sep 2014 23:22:17 +0800
|
||||
Subject: [PATCH] winex11.drv: Update a candidate window's position with
|
||||
@ -18,16 +18,14 @@ This patch was based on the original work by Muneyuki Noguchi, and
|
||||
received a lot of help from Sebastian Lackner.
|
||||
---
|
||||
dlls/user32/caret.c | 3 ++
|
||||
dlls/user32/driver.c | 7 ++++
|
||||
dlls/win32u/driver.c | 8 +++++
|
||||
dlls/win32u/driver.c | 7 ++++
|
||||
dlls/winex11.drv/init.c | 1 +
|
||||
dlls/winex11.drv/x11drv.h | 1 +
|
||||
dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++-
|
||||
include/wine/gdi_driver.h | 6 ++++
|
||||
7 files changed, 97 insertions(+), 1 deletion(-)
|
||||
include/wine/gdi_driver.h | 2 ++
|
||||
5 files changed, 84 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
|
||||
index 8bf4962b708..33954123efe 100644
|
||||
index 8bf4962b708..52ebcb8baa9 100644
|
||||
--- a/dlls/user32/caret.c
|
||||
+++ b/dlls/user32/caret.c
|
||||
@@ -27,6 +27,7 @@
|
||||
@ -54,56 +52,23 @@ index 8bf4962b708..33954123efe 100644
|
||||
NtUserSetSystemTimer( hwnd, TIMERID, Caret.timeout, CARET_Callback );
|
||||
}
|
||||
return ret;
|
||||
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
|
||||
index fbbf630a80e..7ce98f4a0f9 100644
|
||||
--- a/dlls/user32/driver.c
|
||||
+++ b/dlls/user32/driver.c
|
||||
@@ -113,6 +113,11 @@ static void CDECL loaderdrv_UpdateClipboard(void)
|
||||
load_driver()->pUpdateClipboard();
|
||||
}
|
||||
|
||||
+static void CDECL loaderdrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
||||
+{
|
||||
+ load_driver()->pUpdateCandidatePos( hwnd, caret_rect );
|
||||
+}
|
||||
+
|
||||
static struct user_driver_funcs lazy_load_driver =
|
||||
{
|
||||
{ NULL },
|
||||
@@ -167,6 +172,8 @@ static struct user_driver_funcs lazy_load_driver =
|
||||
NULL,
|
||||
/* opengl support */
|
||||
NULL,
|
||||
+ /* candidate pos functions */
|
||||
+ loaderdrv_UpdateCandidatePos,
|
||||
/* thread management */
|
||||
NULL,
|
||||
};
|
||||
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
|
||||
index d1062cb5f3a..50fc011e19f 100644
|
||||
index 6b6f1a64ce8..a073d05be27 100644
|
||||
--- a/dlls/win32u/driver.c
|
||||
+++ b/dlls/win32u/driver.c
|
||||
@@ -914,6 +914,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
+
|
||||
static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version )
|
||||
{
|
||||
return NULL;
|
||||
@@ -924,6 +925,11 @@ static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version )
|
||||
@@ -924,6 +924,11 @@ static struct opengl_funcs *nulldrv_wine_get_wgl_driver( UINT version )
|
||||
return (void *)-1;
|
||||
}
|
||||
|
||||
+static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
||||
+static void nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
||||
+{
|
||||
+
|
||||
+}
|
||||
+
|
||||
static void CDECL nulldrv_ThreadDetach( void )
|
||||
static void nulldrv_ThreadDetach( void )
|
||||
{
|
||||
}
|
||||
@@ -1223,6 +1229,7 @@ static const struct user_driver_funcs lazy_load_driver =
|
||||
@@ -1218,6 +1223,7 @@ static const struct user_driver_funcs lazy_load_driver =
|
||||
loaderdrv_wine_get_vulkan_driver,
|
||||
/* opengl support */
|
||||
nulldrv_wine_get_wgl_driver,
|
||||
@ -111,7 +76,7 @@ index d1062cb5f3a..50fc011e19f 100644
|
||||
/* thread management */
|
||||
nulldrv_ThreadDetach,
|
||||
};
|
||||
@@ -1287,6 +1294,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
|
||||
@@ -1287,6 +1293,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v
|
||||
SET_USER_FUNC(SystemParametersInfo);
|
||||
SET_USER_FUNC(wine_get_vulkan_driver);
|
||||
SET_USER_FUNC(wine_get_wgl_driver);
|
||||
@ -120,7 +85,7 @@ index d1062cb5f3a..50fc011e19f 100644
|
||||
#undef SET_USER_FUNC
|
||||
|
||||
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
|
||||
index 9f2be685dec..4fb100e684b 100644
|
||||
index e5162928c07..beea28bc491 100644
|
||||
--- a/dlls/winex11.drv/init.c
|
||||
+++ b/dlls/winex11.drv/init.c
|
||||
@@ -415,6 +415,7 @@ static const struct user_driver_funcs x11drv_funcs =
|
||||
@ -131,20 +96,8 @@ index 9f2be685dec..4fb100e684b 100644
|
||||
.pThreadDetach = X11DRV_ThreadDetach,
|
||||
};
|
||||
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index ce9a254fb5b..9b6d83ae4f3 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -242,6 +242,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
|
||||
struct window_surface *surface ) DECLSPEC_HIDDEN;
|
||||
extern BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
|
||||
UINT flags ) DECLSPEC_HIDDEN;
|
||||
+extern void CDECL X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect ) DECLSPEC_HIDDEN;
|
||||
extern void CDECL X11DRV_ThreadDetach(void) DECLSPEC_HIDDEN;
|
||||
|
||||
/* X11 driver internal functions */
|
||||
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
|
||||
index 3994c2106cc..ec943dcd623 100644
|
||||
index 3994c2106cc..55132bc983e 100644
|
||||
--- a/dlls/winex11.drv/xim.c
|
||||
+++ b/dlls/winex11.drv/xim.c
|
||||
@@ -30,6 +30,7 @@
|
||||
@ -162,7 +115,7 @@ index 3994c2106cc..ec943dcd623 100644
|
||||
+/***********************************************************************
|
||||
+ * X11DRV_UpdateCandidatePos
|
||||
+ */
|
||||
+void CDECL X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
||||
+void X11DRV_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
|
||||
+{
|
||||
+ if (ximStyle & XIMPreeditPosition)
|
||||
+ {
|
||||
@ -247,25 +200,17 @@ index 3994c2106cc..ec943dcd623 100644
|
||||
return xic;
|
||||
}
|
||||
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
|
||||
index b3c77a1d2c1..23bd1e9d8cf 100644
|
||||
index a63e2c3ceda..79e9f869b6e 100644
|
||||
--- a/include/wine/gdi_driver.h
|
||||
+++ b/include/wine/gdi_driver.h
|
||||
@@ -318,10 +318,16 @@ struct user_driver_funcs
|
||||
const RECT *,struct window_surface*);
|
||||
/* system parameters */
|
||||
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
|
||||
+
|
||||
/* vulkan support */
|
||||
const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT);
|
||||
+
|
||||
@@ -324,6 +324,8 @@ struct user_driver_funcs
|
||||
const struct vulkan_funcs * (*pwine_get_vulkan_driver)(UINT);
|
||||
/* opengl support */
|
||||
struct opengl_funcs * (CDECL *pwine_get_wgl_driver)(UINT);
|
||||
+
|
||||
struct opengl_funcs * (*pwine_get_wgl_driver)(UINT);
|
||||
+ /* IME functions */
|
||||
+ void (CDECL *pUpdateCandidatePos)(HWND, const RECT *);
|
||||
+
|
||||
+ void (*pUpdateCandidatePos)(HWND, const RECT *);
|
||||
/* thread management */
|
||||
void (CDECL *pThreadDetach)(void);
|
||||
void (*pThreadDetach)(void);
|
||||
};
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@ -1 +1,2 @@
|
||||
Fixes: [30938] Update a XIM candidate position when cursor location changes
|
||||
Disabled: True
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7b5c53667c808c6714464bca34ba278a698fa8aa Mon Sep 17 00:00:00 2001
|
||||
From d4cd72f2fb59d295be1b108d9c53b52d26cfde48 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 10 Feb 2016 15:09:29 +0800
|
||||
Subject: [PATCH] winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2)
|
||||
@ -7,7 +7,6 @@ And use it as a backend in user32.SetActiveWindow().
|
||||
|
||||
For bug #2155.
|
||||
---
|
||||
dlls/user32/driver.c | 5 ++++
|
||||
dlls/win32u/driver.c | 6 +++++
|
||||
dlls/winex11.drv/event.c | 5 ++++
|
||||
dlls/winex11.drv/init.c | 1 +
|
||||
@ -15,47 +14,24 @@ For bug #2155.
|
||||
dlls/winex11.drv/x11drv.h | 3 +++
|
||||
dlls/winex11.drv/x11drv_main.c | 1 +
|
||||
include/wine/gdi_driver.h | 1 +
|
||||
8 files changed, 70 insertions(+)
|
||||
7 files changed, 65 insertions(+)
|
||||
|
||||
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
|
||||
index 7ce98f4a0f9..0a0d4c429ea 100644
|
||||
--- a/dlls/user32/driver.c
|
||||
+++ b/dlls/user32/driver.c
|
||||
@@ -86,6 +86,10 @@ static void CDECL nulldrv_SetWindowIcon( HWND hwnd, UINT type, HICON icon )
|
||||
{
|
||||
}
|
||||
|
||||
+static void CDECL nulldrv_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags )
|
||||
+{
|
||||
+}
|
||||
+
|
||||
static void CDECL nulldrv_SetWindowText( HWND hwnd, LPCWSTR text )
|
||||
{
|
||||
}
|
||||
@@ -155,6 +159,7 @@ static struct user_driver_funcs lazy_load_driver =
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
+ nulldrv_SetLayeredWindowAttributes,
|
||||
NULL,
|
||||
NULL,
|
||||
nulldrv_SetWindowIcon,
|
||||
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
|
||||
index 50fc011e19f..9ad6c32b1f3 100644
|
||||
index a073d05be27..2ccc80684ae 100644
|
||||
--- a/dlls/win32u/driver.c
|
||||
+++ b/dlls/win32u/driver.c
|
||||
@@ -842,6 +842,10 @@ static BOOL CDECL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
@@ -842,6 +842,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
hdc, rect.left - dx, rect.top - dy, SRCCOPY, 0, 0 );
|
||||
}
|
||||
|
||||
+static void CDECL nulldrv_SetActiveWindow( HWND hwnd )
|
||||
+static void nulldrv_SetActiveWindow( HWND hwnd )
|
||||
+{
|
||||
+}
|
||||
+
|
||||
static void CDECL nulldrv_SetCapture( HWND hwnd, UINT flags )
|
||||
static void nulldrv_SetCapture( HWND hwnd, UINT flags )
|
||||
{
|
||||
}
|
||||
@@ -1209,6 +1213,7 @@ static const struct user_driver_funcs lazy_load_driver =
|
||||
@@ -1203,6 +1207,7 @@ static const struct user_driver_funcs lazy_load_driver =
|
||||
nulldrv_MsgWaitForMultipleObjectsEx,
|
||||
nulldrv_ReleaseDC,
|
||||
nulldrv_ScrollDC,
|
||||
@ -63,7 +39,7 @@ index 50fc011e19f..9ad6c32b1f3 100644
|
||||
nulldrv_SetCapture,
|
||||
nulldrv_SetFocus,
|
||||
loaderdrv_SetLayeredWindowAttributes,
|
||||
@@ -1277,6 +1282,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
|
||||
@@ -1276,6 +1281,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v
|
||||
SET_USER_FUNC(MsgWaitForMultipleObjectsEx);
|
||||
SET_USER_FUNC(ReleaseDC);
|
||||
SET_USER_FUNC(ScrollDC);
|
||||
@ -72,7 +48,7 @@ index 50fc011e19f..9ad6c32b1f3 100644
|
||||
SET_USER_FUNC(SetFocus);
|
||||
SET_USER_FUNC(SetLayeredWindowAttributes);
|
||||
diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c
|
||||
index 6a4f3b5db08..50cb77037c1 100644
|
||||
index 12f98489c72..ace0c379902 100644
|
||||
--- a/dlls/winex11.drv/event.c
|
||||
+++ b/dlls/winex11.drv/event.c
|
||||
@@ -609,6 +609,9 @@ static void set_focus( Display *display, HWND hwnd, Time time )
|
||||
@ -95,7 +71,7 @@ index 6a4f3b5db08..50cb77037c1 100644
|
||||
Foreground window, because in most cases the messages sent
|
||||
above must have already changed the foreground window, in which
|
||||
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
|
||||
index 4fb100e684b..d02414904f2 100644
|
||||
index beea28bc491..05d5c39ba3b 100644
|
||||
--- a/dlls/winex11.drv/init.c
|
||||
+++ b/dlls/winex11.drv/init.c
|
||||
@@ -397,6 +397,7 @@ static const struct user_driver_funcs x11drv_funcs =
|
||||
@ -107,17 +83,17 @@ index 4fb100e684b..d02414904f2 100644
|
||||
.pSetFocus = X11DRV_SetFocus,
|
||||
.pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes,
|
||||
diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c
|
||||
index 8fb1a4a2786..91ee448ac67 100644
|
||||
index 547a49a32b2..d9248d5af6b 100644
|
||||
--- a/dlls/winex11.drv/window.c
|
||||
+++ b/dlls/winex11.drv/window.c
|
||||
@@ -2237,6 +2237,54 @@ BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
@@ -2237,6 +2237,54 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update )
|
||||
}
|
||||
|
||||
|
||||
+/***********************************************************************
|
||||
+ * SetActiveWindow (X11DRV.@)
|
||||
+ */
|
||||
+void CDECL X11DRV_SetActiveWindow( HWND hwnd )
|
||||
+void X11DRV_SetActiveWindow( HWND hwnd )
|
||||
+{
|
||||
+ struct x11drv_thread_data *thread_data = x11drv_init_thread_data();
|
||||
+ struct x11drv_win_data *data;
|
||||
@ -166,18 +142,18 @@ index 8fb1a4a2786..91ee448ac67 100644
|
||||
* SetCapture (X11DRV.@)
|
||||
*/
|
||||
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
|
||||
index 9b6d83ae4f3..8d9511cb579 100644
|
||||
index a59380a8e83..12bf3fef3ae 100644
|
||||
--- a/dlls/winex11.drv/x11drv.h
|
||||
+++ b/dlls/winex11.drv/x11drv.h
|
||||
@@ -219,6 +219,7 @@ extern void CDECL X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_re
|
||||
const RECT *top_rect, DWORD flags ) DECLSPEC_HIDDEN;
|
||||
extern void CDECL X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) DECLSPEC_HIDDEN;
|
||||
extern BOOL CDECL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) DECLSPEC_HIDDEN;
|
||||
+extern void CDECL X11DRV_SetActiveWindow( HWND hwnd ) DECLSPEC_HIDDEN;
|
||||
extern void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN;
|
||||
extern void CDECL X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha,
|
||||
DWORD flags ) DECLSPEC_HIDDEN;
|
||||
@@ -386,6 +387,7 @@ struct x11drv_thread_data
|
||||
@@ -219,6 +219,7 @@ extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect,
|
||||
const RECT *top_rect, DWORD flags ) DECLSPEC_HIDDEN;
|
||||
extern void X11DRV_ReleaseDC( HWND hwnd, HDC hdc ) DECLSPEC_HIDDEN;
|
||||
extern BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) DECLSPEC_HIDDEN;
|
||||
+extern void X11DRV_SetActiveWindow( HWND hwnd ) DECLSPEC_HIDDEN;
|
||||
extern void X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN;
|
||||
extern void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha,
|
||||
DWORD flags ) DECLSPEC_HIDDEN;
|
||||
@@ -385,6 +386,7 @@ struct x11drv_thread_data
|
||||
Display *display;
|
||||
XEvent *current_event; /* event currently being processed */
|
||||
HWND grab_hwnd; /* window that currently grabs the mouse */
|
||||
@ -185,7 +161,7 @@ index 9b6d83ae4f3..8d9511cb579 100644
|
||||
HWND last_focus; /* last window that had focus */
|
||||
XIM xim; /* input method */
|
||||
HWND last_xic_hwnd; /* last xic window */
|
||||
@@ -495,6 +497,7 @@ enum x11drv_atoms
|
||||
@@ -494,6 +496,7 @@ enum x11drv_atoms
|
||||
XATOM_DndSelection,
|
||||
XATOM__ICC_PROFILE,
|
||||
XATOM__MOTIF_WM_HINTS,
|
||||
@ -194,7 +170,7 @@ index 9b6d83ae4f3..8d9511cb579 100644
|
||||
XATOM__NET_STARTUP_INFO,
|
||||
XATOM__NET_SUPPORTED,
|
||||
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
|
||||
index 4c63d5b3b06..58b31acaa28 100644
|
||||
index a139e67f550..f3c03c48477 100644
|
||||
--- a/dlls/winex11.drv/x11drv_main.c
|
||||
+++ b/dlls/winex11.drv/x11drv_main.c
|
||||
@@ -156,6 +156,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] =
|
||||
@ -206,17 +182,17 @@ index 4c63d5b3b06..58b31acaa28 100644
|
||||
"_NET_STARTUP_INFO",
|
||||
"_NET_SUPPORTED",
|
||||
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
|
||||
index 23bd1e9d8cf..a7c0d898d5a 100644
|
||||
index 79e9f869b6e..5fc1f314096 100644
|
||||
--- a/include/wine/gdi_driver.h
|
||||
+++ b/include/wine/gdi_driver.h
|
||||
@@ -300,6 +300,7 @@ struct user_driver_funcs
|
||||
DWORD (CDECL *pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
|
||||
void (CDECL *pReleaseDC)(HWND,HDC);
|
||||
BOOL (CDECL *pScrollDC)(HDC,INT,INT,HRGN);
|
||||
+ void (CDECL *pSetActiveWindow)(HWND);
|
||||
void (CDECL *pSetCapture)(HWND,UINT);
|
||||
void (CDECL *pSetFocus)(HWND);
|
||||
void (CDECL *pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
|
||||
@@ -302,6 +302,7 @@ struct user_driver_funcs
|
||||
DWORD (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,DWORD,DWORD,DWORD);
|
||||
void (*pReleaseDC)(HWND,HDC);
|
||||
BOOL (*pScrollDC)(HDC,INT,INT,HRGN);
|
||||
+ void (*pSetActiveWindow)(HWND);
|
||||
void (*pSetCapture)(HWND,UINT);
|
||||
void (*pSetFocus)(HWND);
|
||||
void (*pSetLayeredWindowAttributes)(HWND,COLORREF,BYTE,DWORD);
|
||||
--
|
||||
2.35.1
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
5a815669e8e7a3f0a37648510494f8b36c29c1f6
|
||||
5b4009e8c27c16bdb9a5638c316a72aaee219158
|
||||
|
||||
Loading…
Reference in New Issue
Block a user