diff --git a/patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch b/patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch index 4e3ea08c..af02425d 100644 --- a/patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch +++ b/patches/dsound-EAX/0008-dsound-Add-EAX-init-and-free-stubs.patch @@ -1,19 +1,19 @@ -From 415ededb3cceae15cb05a1860cef1d4e5e055b27 Mon Sep 17 00:00:00 2001 +From 809bba6e809a3557c9b37deecfc7faab57337764 Mon Sep 17 00:00:00 2001 From: Mark Harmstone Date: Fri, 27 Mar 2015 20:58:37 +0000 Subject: [PATCH] dsound: Add EAX init and free stubs. --- - dlls/dsound/buffer.c | 4 ++++ + dlls/dsound/buffer.c | 6 ++++++ dlls/dsound/dsound_private.h | 2 ++ dlls/dsound/eax.c | 28 +++++++++++++++++++++++++++- - 3 files changed, 33 insertions(+), 1 deletion(-) + 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c -index 6bbf468d136..e27fdfdecc4 100644 +index e8b3fb4a832..6c5c18b6f1e 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c -@@ -1110,6 +1110,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds +@@ -1153,6 +1153,8 @@ HRESULT secondarybuffer_create(DirectSoundDevice *device, const DSBUFFERDESC *ds DSOUND_RecalcVolPan(&(dsb->volpan)); InitializeSRWLock(&dsb->lock); @@ -22,20 +22,22 @@ index 6bbf468d136..e27fdfdecc4 100644 /* register buffer */ err = DirectSoundDevice_AddBuffer(device, dsb); -@@ -1150,6 +1152,8 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) +@@ -1194,6 +1196,10 @@ void secondarybuffer_destroy(IDirectSoundBufferImpl *This) HeapFree(GetProcessHeap(), 0, This->filters); } + free_eax_buffer(This); + - HeapFree(GetProcessHeap(), 0, This); - ++ HeapFree(GetProcessHeap(), 0, This); ++ TRACE("(%p) released\n", This); + + HeapFree(GetProcessHeap(), 0, This); diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h -index 3b4c4f290a4..8dbb9edb594 100644 +index 267b2c044bc..c906eb2adb1 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h -@@ -234,6 +234,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet, +@@ -240,6 +240,8 @@ HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet, HRESULT WINAPI EAX_Set(IDirectSoundBufferImpl *buf, REFGUID guidPropSet, ULONG dwPropID, void *pInstanceData, ULONG cbInstanceData, void *pPropData, ULONG cbPropData) DECLSPEC_HIDDEN; @@ -45,7 +47,7 @@ index 3b4c4f290a4..8dbb9edb594 100644 /* mixer.c */ void DSOUND_CheckEvent(const IDirectSoundBufferImpl *dsb, DWORD playpos, int len) DECLSPEC_HIDDEN; diff --git a/dlls/dsound/eax.c b/dlls/dsound/eax.c -index 3931681d295..c0afb0f1acf 100644 +index 03b6e0a9813..91438efc335 100644 --- a/dlls/dsound/eax.c +++ b/dlls/dsound/eax.c @@ -92,20 +92,46 @@ static const EFXEAXREVERBPROPERTIES efx_presets[] = { @@ -97,5 +99,5 @@ index 3931681d295..c0afb0f1acf 100644 HRESULT WINAPI EAX_Get(IDirectSoundBufferImpl *buf, REFGUID guidPropSet, -- -2.27.0 +2.35.1 diff --git a/patches/dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch b/patches/dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch deleted file mode 100644 index 1d23df3c..00000000 --- a/patches/dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch +++ /dev/null @@ -1,134 +0,0 @@ -From bdd925e61fa6ba20272960bfea8e0638d20060f1 Mon Sep 17 00:00:00 2001 -From: Jactry Zeng -Date: Fri, 3 Jun 2022 02:50:29 -0500 -Subject: [PATCH 1/2] dwmapi: Fill rateRefresh/rateCompose and qpcRefreshPeriod - of DWM_TIMING_INFO from DwmGetCompositionTimingInfo(). - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53038 -Signed-off-by: Jactry Zeng ---- - dlls/dwmapi/Makefile.in | 1 + - dlls/dwmapi/dwmapi_main.c | 27 ++++++++++++++++++++++++++- - dlls/dwmapi/tests/Makefile.in | 2 +- - dlls/dwmapi/tests/dwmapi.c | 22 ++++++++++++++++++++++ - 4 files changed, 50 insertions(+), 2 deletions(-) - -diff --git a/dlls/dwmapi/Makefile.in b/dlls/dwmapi/Makefile.in -index e63dbc2ea00..37411a57608 100644 ---- a/dlls/dwmapi/Makefile.in -+++ b/dlls/dwmapi/Makefile.in -@@ -1,4 +1,5 @@ - MODULE = dwmapi.dll -+IMPORTS = user32 - IMPORTLIB = dwmapi - - EXTRADLLFLAGS = -Wb,--prefer-native -diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c -index 6bb086a87d1..1fb522e389a 100644 ---- a/dlls/dwmapi/dwmapi_main.c -+++ b/dlls/dwmapi/dwmapi_main.c -@@ -211,12 +211,28 @@ HRESULT WINAPI DwmRegisterThumbnail(HWND dest, HWND src, PHTHUMBNAIL thumbnail_i - return E_NOTIMPL; - } - -+static int get_display_frequency(void) -+{ -+ DEVMODEA mode; -+ -+ memset(&mode, 0, sizeof(mode)); -+ mode.dmSize = sizeof(mode); -+ if (EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode)) -+ return mode.dmDisplayFrequency; -+ else -+ { -+ WARN("Failed to query display frequency, returning a fallback value.\n"); -+ return 60; -+ } -+} -+ - /********************************************************************** - * DwmGetCompositionTimingInfo (DWMAPI.@) - */ - HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) - { -- static int i; -+ LARGE_INTEGER performance_frequency; -+ static int i, display_frequency; - - if (!info) - return E_INVALIDARG; -@@ -229,6 +245,15 @@ HRESULT WINAPI DwmGetCompositionTimingInfo(HWND hwnd, DWM_TIMING_INFO *info) - memset(info, 0, info->cbSize); - info->cbSize = sizeof(DWM_TIMING_INFO); - -+ display_frequency = get_display_frequency(); -+ info->rateRefresh.uiNumerator = display_frequency; -+ info->rateRefresh.uiDenominator = 1; -+ info->rateCompose.uiNumerator = display_frequency; -+ info->rateCompose.uiDenominator = 1; -+ -+ QueryPerformanceFrequency(&performance_frequency); -+ info->qpcRefreshPeriod = performance_frequency.QuadPart / display_frequency; -+ - return S_OK; - } - -diff --git a/dlls/dwmapi/tests/Makefile.in b/dlls/dwmapi/tests/Makefile.in -index 6c6130401d6..e819e3ca09a 100644 ---- a/dlls/dwmapi/tests/Makefile.in -+++ b/dlls/dwmapi/tests/Makefile.in -@@ -1,5 +1,5 @@ - TESTDLL = dwmapi.dll --IMPORTS = dwmapi -+IMPORTS = dwmapi user32 - - C_SRCS = \ - dwmapi.c -diff --git a/dlls/dwmapi/tests/dwmapi.c b/dlls/dwmapi/tests/dwmapi.c -index 696aa9c9d86..29dbcbe74bd 100644 ---- a/dlls/dwmapi/tests/dwmapi.c -+++ b/dlls/dwmapi/tests/dwmapi.c -@@ -35,7 +35,11 @@ static void test_DwmIsCompositionEnabled(void) - - static void test_DwmGetCompositionTimingInfo(void) - { -+ LARGE_INTEGER performance_frequency; -+ int result, display_frequency; - DWM_TIMING_INFO timing_info; -+ QPC_TIME refresh_period; -+ DEVMODEA mode; - BOOL enabled; - HRESULT hr; - -@@ -56,9 +60,27 @@ static void test_DwmGetCompositionTimingInfo(void) - hr = DwmGetCompositionTimingInfo(NULL, &timing_info); - ok(hr == MILERR_MISMATCHED_SIZE, "Got hr %#lx.\n", hr); - -+ memset(&mode, 0, sizeof(mode)); -+ mode.dmSize = sizeof(mode); -+ result = EnumDisplaySettingsA(NULL, ENUM_CURRENT_SETTINGS, &mode); -+ ok(!!result, "Failed to get display mode %#lx.\n", GetLastError()); -+ display_frequency = mode.dmDisplayFrequency; -+ ok(!!QueryPerformanceFrequency(&performance_frequency), "Failed to get performance counter frequency.\n"); -+ refresh_period = performance_frequency.QuadPart / display_frequency; -+ - timing_info.cbSize = sizeof(timing_info); - hr = DwmGetCompositionTimingInfo(NULL, &timing_info); - ok(hr == S_OK, "Got hr %#lx.\n", hr); -+ ok(timing_info.cbSize == sizeof(timing_info), "Got wrong struct size %d.\n", timing_info.cbSize); -+ ok(timing_info.rateRefresh.uiDenominator == 1 && timing_info.rateRefresh.uiNumerator == display_frequency, -+ "Got wrong monitor refresh rate %d/%d.\n", timing_info.rateRefresh.uiDenominator, -+ timing_info.rateRefresh.uiNumerator); -+ ok(timing_info.rateCompose.uiDenominator == 1 && timing_info.rateCompose.uiNumerator == display_frequency, -+ "Got wrong composition rate %d/%d.\n", timing_info.rateCompose.uiDenominator, -+ timing_info.rateCompose.uiNumerator); -+ ok(timing_info.qpcRefreshPeriod == refresh_period -+ || broken(timing_info.qpcRefreshPeriod == display_frequency), /* win10 v1507 */ -+ "Got wrong monitor refresh period %s.\n", wine_dbgstr_longlong(timing_info.qpcRefreshPeriod)); - } - - START_TEST(dwmapi) --- -2.35.1 - diff --git a/patches/dwmapi-DwmGetCompositionTimingInfo/0002-dwmapi-Return-S_OK-from-DwmFlush.patch b/patches/dwmapi-DwmGetCompositionTimingInfo/0002-dwmapi-Return-S_OK-from-DwmFlush.patch deleted file mode 100644 index 9da4656e..00000000 --- a/patches/dwmapi-DwmGetCompositionTimingInfo/0002-dwmapi-Return-S_OK-from-DwmFlush.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e1cdd6b53b73325cdb12815135162e43270df2ea Mon Sep 17 00:00:00 2001 -From: Jactry Zeng -Date: Fri, 3 Jun 2022 02:50:30 -0500 -Subject: [PATCH 2/2] dwmapi: Return S_OK from DwmFlush(). - -Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53035 -Signed-off-by: Jactry Zeng ---- - dlls/dwmapi/dwmapi_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c -index 1fb522e389a..1a65410c7eb 100644 ---- a/dlls/dwmapi/dwmapi_main.c -+++ b/dlls/dwmapi/dwmapi_main.c -@@ -92,7 +92,7 @@ HRESULT WINAPI DwmFlush(void) - - if (!once++) FIXME("() stub\n"); - -- return E_NOTIMPL; -+ return S_OK; - } - - /********************************************************************** --- -2.35.1 - diff --git a/patches/dwmapi-DwmGetCompositionTimingInfo/definition b/patches/dwmapi-DwmGetCompositionTimingInfo/definition deleted file mode 100644 index 5f765ea1..00000000 --- a/patches/dwmapi-DwmGetCompositionTimingInfo/definition +++ /dev/null @@ -1,2 +0,0 @@ -Fixes: [53038] - dwmapi: Supply some defaults values for DwmGetCompositionTimingInfo. -Fixes: [53035] - dwmapi: DwmFlush return S_OK. diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index e5adda13..b98a939f 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "f86a66b660267bf245817350a6012e0c5c6547df" + echo "712c547e0869b0caf797694137e36bacea614aa6" } # Show version information @@ -108,7 +108,6 @@ patch_enable_all () enable_dinput_joy_mappings="$1" enable_dsound_EAX="$1" enable_dsound_Fast_Mixer="$1" - enable_dwmapi_DwmGetCompositionTimingInfo="$1" enable_dwrite_FontFallback="$1" enable_eventfd_synchronization="$1" enable_explorer_Video_Registry_Key="$1" @@ -349,9 +348,6 @@ patch_enable () dsound-Fast_Mixer) enable_dsound_Fast_Mixer="$2" ;; - dwmapi-DwmGetCompositionTimingInfo) - enable_dwmapi_DwmGetCompositionTimingInfo="$2" - ;; dwrite-FontFallback) enable_dwrite_FontFallback="$2" ;; @@ -1723,20 +1719,6 @@ if test "$enable_dsound_EAX" -eq 1; then patch_apply dsound-EAX/0023-dsound-Fake-success-for-EAX-Set-Buffer-ListenerPrope.patch fi -# Patchset dwmapi-DwmGetCompositionTimingInfo -# | -# | This patchset fixes the following Wine bugs: -# | * [#53038] - dwmapi: Supply some defaults values for DwmGetCompositionTimingInfo. -# | * [#53035] - dwmapi: DwmFlush return S_OK. -# | -# | Modified files: -# | * dlls/dwmapi/Makefile.in, dlls/dwmapi/dwmapi_main.c, dlls/dwmapi/tests/Makefile.in, dlls/dwmapi/tests/dwmapi.c -# | -if test "$enable_dwmapi_DwmGetCompositionTimingInfo" -eq 1; then - patch_apply dwmapi-DwmGetCompositionTimingInfo/0001-dwmapi-Fill-rateRefresh-rateCompose-and-qpcRefreshPe.patch - patch_apply dwmapi-DwmGetCompositionTimingInfo/0002-dwmapi-Return-S_OK-from-DwmFlush.patch -fi - # Patchset dwrite-FontFallback # | # | This patchset fixes the following Wine bugs: diff --git a/patches/winex11-WM_WINDOWPOSCHANGING/0001-winex11.drv-Send-WM_WINDOWPOSCHANGING-WM_WINDOWPOSCH.patch b/patches/winex11-WM_WINDOWPOSCHANGING/0001-winex11.drv-Send-WM_WINDOWPOSCHANGING-WM_WINDOWPOSCH.patch index 33efc3d9..c06e5670 100644 --- a/patches/winex11-WM_WINDOWPOSCHANGING/0001-winex11.drv-Send-WM_WINDOWPOSCHANGING-WM_WINDOWPOSCH.patch +++ b/patches/winex11-WM_WINDOWPOSCHANGING/0001-winex11.drv-Send-WM_WINDOWPOSCHANGING-WM_WINDOWPOSCH.patch @@ -1,4 +1,4 @@ -From 0c9b32515c444dcd3fb76473c80adcc368f9e8fd Mon Sep 17 00:00:00 2001 +From 0cfe71d332e4ed936cacff341f77cb05e99e9c3c Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Tue, 27 Dec 2016 17:45:05 +0800 Subject: [PATCH] winex11.drv: Send WM_WINDOWPOSCHANGING/WM_WINDOWPOSCHANGED @@ -9,10 +9,10 @@ Subject: [PATCH] winex11.drv: Send WM_WINDOWPOSCHANGING/WM_WINDOWPOSCHANGED 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c -index 9a19eb9b446..d518c81d3e9 100644 +index 99f3f04e00f..ec41cbbd2ac 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c -@@ -592,16 +592,27 @@ static void set_input_focus( struct x11drv_win_data *data ) +@@ -604,16 +604,27 @@ static void set_input_focus( struct x11drv_win_data *data ) */ static void set_focus( Display *display, HWND hwnd, Time time ) { @@ -27,7 +27,7 @@ index 9a19eb9b446..d518c81d3e9 100644 x11drv_thread_data()->active_window = hwnd; TRACE( "setting foreground window to %p\n", hwnd ); - NtUserSetForegroundWindow( hwnd, FALSE ); + NtUserSetForegroundWindow( hwnd ); + /* Some applications expect that a being deactivated topmost window + * receives the WM_WINDOWPOSCHANGING/WM_WINDOWPOSCHANGED messages, @@ -42,5 +42,5 @@ index 9a19eb9b446..d518c81d3e9 100644 NtUserGetGUIThreadInfo( 0, &threadinfo ); focus = threadinfo.hwndFocus; -- -2.34.1 +2.35.1 diff --git a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch index 2840410c..f8109fcb 100644 --- a/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch +++ b/patches/winex11-_NET_ACTIVE_WINDOW/0001-winex11.drv-Add-support-for-_NET_ACTIVE_WINDOW.patch @@ -1,4 +1,4 @@ -From 9236962ab40f697a183cd017d58747902f4634da Mon Sep 17 00:00:00 2001 +From aeaff5bd1a2a1940d6e28388aabc1bc9b7608cd8 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 10 Feb 2016 15:09:29 +0800 Subject: [PATCH] winex11.drv: Add support for _NET_ACTIVE_WINDOW. (v2) @@ -17,10 +17,10 @@ For bug #2155. 7 files changed, 65 insertions(+) diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c -index abe4c7f1489..d18a8121f1f 100644 +index 4a853b516f4..35eab0ec13c 100644 --- a/dlls/win32u/driver.c +++ b/dlls/win32u/driver.c -@@ -807,6 +807,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) +@@ -833,6 +833,10 @@ static BOOL nulldrv_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) hdc, rect.left - dx, rect.top - dy, SRCCOPY, 0, 0 ); } @@ -31,7 +31,7 @@ index abe4c7f1489..d18a8121f1f 100644 static void nulldrv_SetCapture( HWND hwnd, UINT flags ) { } -@@ -1168,6 +1172,7 @@ static const struct user_driver_funcs lazy_load_driver = +@@ -1196,6 +1200,7 @@ static const struct user_driver_funcs lazy_load_driver = nulldrv_MsgWaitForMultipleObjectsEx, nulldrv_ReleaseDC, nulldrv_ScrollDC, @@ -39,7 +39,7 @@ index abe4c7f1489..d18a8121f1f 100644 nulldrv_SetCapture, nulldrv_SetFocus, loaderdrv_SetLayeredWindowAttributes, -@@ -1241,6 +1246,7 @@ void CDECL __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT v +@@ -1270,6 +1275,7 @@ void __wine_set_user_driver( const struct user_driver_funcs *funcs, UINT version SET_USER_FUNC(MsgWaitForMultipleObjectsEx); SET_USER_FUNC(ReleaseDC); SET_USER_FUNC(ScrollDC); @@ -48,10 +48,10 @@ index abe4c7f1489..d18a8121f1f 100644 SET_USER_FUNC(SetFocus); SET_USER_FUNC(SetLayeredWindowAttributes); diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c -index 8fc2a6a4b6c..04510c819b4 100644 +index cbfb228ea09..2c73b4c9eb9 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c -@@ -610,6 +610,9 @@ static void set_focus( Display *display, HWND hwnd, Time time ) +@@ -595,6 +595,9 @@ static void set_focus( Display *display, HWND hwnd, Time time ) Window win; GUITHREADINFO threadinfo; @@ -59,9 +59,9 @@ index 8fc2a6a4b6c..04510c819b4 100644 + x11drv_thread_data()->active_window = hwnd; + TRACE( "setting foreground window to %p\n", hwnd ); - NtUserSetForegroundWindow( hwnd, FALSE ); + NtUserSetForegroundWindow( hwnd ); -@@ -857,6 +860,8 @@ static void focus_out( Display *display , HWND hwnd ) +@@ -851,6 +854,8 @@ static void focus_out( Display *display , HWND hwnd ) if (!focus_win) { @@ -71,10 +71,10 @@ index 8fc2a6a4b6c..04510c819b4 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 65865fcf4fa..ff71e67448e 100644 +index 618bc844f05..533e60a4871 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c -@@ -410,6 +410,7 @@ static const struct user_driver_funcs x11drv_funcs = +@@ -418,6 +418,7 @@ static const struct user_driver_funcs x11drv_funcs = .pMsgWaitForMultipleObjectsEx = X11DRV_MsgWaitForMultipleObjectsEx, .pReleaseDC = X11DRV_ReleaseDC, .pScrollDC = X11DRV_ScrollDC, @@ -83,10 +83,10 @@ index 65865fcf4fa..ff71e67448e 100644 .pSetFocus = X11DRV_SetFocus, .pSetLayeredWindowAttributes = X11DRV_SetLayeredWindowAttributes, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c -index 5603c52ae6c..61afe03c215 100644 +index 3ebbee0856e..6c52e1841df 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c -@@ -2231,6 +2231,54 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) +@@ -2383,6 +2383,54 @@ BOOL X11DRV_ScrollDC( HDC hdc, INT dx, INT dy, HRGN update ) } @@ -142,10 +142,10 @@ index 5603c52ae6c..61afe03c215 100644 * SetCapture (X11DRV.@) */ diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h -index 70da5c26228..205dba5fdca 100644 +index 49c2380559e..d8b5a99fec2 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h -@@ -222,6 +222,7 @@ extern void X11DRV_GetDC( HDC hdc, HWND hwnd, HWND top, const RECT *win_rect, +@@ -228,6 +228,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; @@ -153,7 +153,7 @@ index 70da5c26228..205dba5fdca 100644 extern void X11DRV_SetCapture( HWND hwnd, UINT flags ) DECLSPEC_HIDDEN; extern void X11DRV_SetLayeredWindowAttributes( HWND hwnd, COLORREF key, BYTE alpha, DWORD flags ) DECLSPEC_HIDDEN; -@@ -389,6 +390,7 @@ struct x11drv_thread_data +@@ -369,6 +370,7 @@ struct x11drv_thread_data Display *display; XEvent *current_event; /* event currently being processed */ HWND grab_hwnd; /* window that currently grabs the mouse */ @@ -161,7 +161,7 @@ index 70da5c26228..205dba5fdca 100644 HWND last_focus; /* last window that had focus */ XIM xim; /* input method */ HWND last_xic_hwnd; /* last xic window */ -@@ -494,6 +496,7 @@ enum x11drv_atoms +@@ -479,6 +481,7 @@ enum x11drv_atoms XATOM_DndSelection, XATOM__ICC_PROFILE, XATOM__MOTIF_WM_HINTS, @@ -170,10 +170,10 @@ index 70da5c26228..205dba5fdca 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 a8ef68f489d..aefd1286c53 100644 +index dc987ae70a2..8ebec6301f2 100644 --- a/dlls/winex11.drv/x11drv_main.c +++ b/dlls/winex11.drv/x11drv_main.c -@@ -139,6 +139,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = +@@ -156,6 +156,7 @@ static const char * const atom_names[NB_XATOMS - FIRST_XATOM] = "DndSelection", "_ICC_PROFILE", "_MOTIF_WM_HINTS", @@ -182,10 +182,10 @@ index a8ef68f489d..aefd1286c53 100644 "_NET_STARTUP_INFO", "_NET_SUPPORTED", diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h -index 12a4737d8f2..532e4bdcd9e 100644 +index 998aa3ed3e9..9be79656f0e 100644 --- a/include/wine/gdi_driver.h +++ b/include/wine/gdi_driver.h -@@ -302,6 +302,7 @@ struct user_driver_funcs +@@ -307,6 +307,7 @@ struct user_driver_funcs NTSTATUS (*pMsgWaitForMultipleObjectsEx)(DWORD,const HANDLE*,const LARGE_INTEGER*,DWORD,DWORD); void (*pReleaseDC)(HWND,HDC); BOOL (*pScrollDC)(HDC,INT,INT,HRGN); diff --git a/staging/upstream-commit b/staging/upstream-commit index 76e9c774..3ae996e7 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -f86a66b660267bf245817350a6012e0c5c6547df +712c547e0869b0caf797694137e36bacea614aa6