wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

user32-Mouse_Message_Hwnd: Add back a missing return statement (thanks Dmitry).

Browse Source
This commit is contained in:
Sebastian Lackner 2017-05-29 12:25:31 +02:00
parent 5d31795ffc
commit 76c2635a7a
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
patches/user32-Mouse_Message_Hwnd/0004-server-Add-support-for-a-layered-window-region.-v2.patch
View File

@ -1,14 +1,14 @@
From ac68b0ca43fd70c641d4b84477858db8c38af20a Mon Sep 17 00:00:00 2001
From 0a05b54ff85992ae187dc095634e0317e30954e9 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 17 May 2017 23:55:55 +0800
Subject: server: Add support for a layered window region. (v2)
---
dlls/user32/tests/input.c | 2 --
dlls/winex11.drv/bitblt.c | 46 ++++++++++++++++++++++++++++++++++-
dlls/winex11.drv/bitblt.c | 45 ++++++++++++++++++++++++++++++++++
server/protocol.def | 7 ++++++
server/window.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 114 insertions(+), 3 deletions(-)
4 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 08c4c5435c6..87c491657a9 100644
@ -29,7 +29,7 @@ index 08c4c5435c6..87c491657a9 100644
got_button_up = TRUE;
break;
diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index 80256dce569..474131da741 100644
index 80256dce569..ef23e99dce8 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -48,6 +48,7 @@
@ -89,16 +89,15 @@ index 80256dce569..474131da741 100644
/***********************************************************************
* update_surface_region
*/
@@ -1627,7 +1670,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
@@ -1627,6 +1670,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
if (!surface->is_argb && surface->color_key == CLR_INVALID)
{
XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet );
- return;
+ set_layer_region( surface, NULL );
return;
}
data->rdh.dwSize = sizeof(data->rdh);
@@ -1737,6 +1780,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
@@ -1737,6 +1781,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
HeapFree( GetProcessHeap(), 0, data );
}