You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
Rebase against e6c67c52757508ce92c3819bb14e87c2ab21fa20.
This commit is contained in:
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "4a315cd78a3c97d76ae06e3185ab01a70eb9a1a2"
|
||||
echo "e6c67c52757508ce92c3819bb14e87c2ab21fa20"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -282,7 +282,6 @@ patch_enable_all ()
|
||||
enable_user32_Invalidate_Key_State="$1"
|
||||
enable_user32_ListBox_Size="$1"
|
||||
enable_user32_Mouse_Message_Hwnd="$1"
|
||||
enable_user32_Painting="$1"
|
||||
enable_user32_Refresh_MDI_Menus="$1"
|
||||
enable_user32_ScrollWindowEx="$1"
|
||||
enable_user32_SetCoalescableTimer="$1"
|
||||
@ -952,9 +951,6 @@ patch_enable ()
|
||||
user32-Mouse_Message_Hwnd)
|
||||
enable_user32_Mouse_Message_Hwnd="$2"
|
||||
;;
|
||||
user32-Painting)
|
||||
enable_user32_Painting="$2"
|
||||
;;
|
||||
user32-Refresh_MDI_Menus)
|
||||
enable_user32_Refresh_MDI_Menus="$2"
|
||||
;;
|
||||
@ -5484,21 +5480,6 @@ if test "$enable_user32_Mouse_Message_Hwnd" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-Painting
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#39465] Enforce that surfaces are flushed after ReleaseDC
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/user32/painting.c
|
||||
# |
|
||||
if test "$enable_user32_Painting" -eq 1; then
|
||||
patch_apply user32-Painting/0001-user32-Enforce-that-surfaces-are-flushed-after-Relea.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "user32: Enforce that surfaces are flushed after ReleaseDC.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset user32-Refresh_MDI_Menus
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
@ -1,27 +0,0 @@
|
||||
From 6d947439d536cbf2f0505113439577f346575707 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Fri, 27 Feb 2015 22:37:16 +0100
|
||||
Subject: user32: Enforce that surfaces are flushed after ReleaseDC.
|
||||
|
||||
If a second thread draws on the surfaces while the main thread is idle then
|
||||
the window doesn't update properly. Can be reproduced for example with:
|
||||
https://www-user.tu-chemnitz.de/~heha/petzold/ch20c.htm
|
||||
---
|
||||
dlls/user32/painting.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c
|
||||
index 1dea98d..7f0e015 100644
|
||||
--- a/dlls/user32/painting.c
|
||||
+++ b/dlls/user32/painting.c
|
||||
@@ -1116,6 +1116,7 @@ HDC WINAPI GetWindowDC( HWND hwnd )
|
||||
*/
|
||||
INT WINAPI ReleaseDC( HWND hwnd, HDC hdc )
|
||||
{
|
||||
+ flush_window_surfaces( FALSE );
|
||||
return release_dc( hwnd, hdc, FALSE );
|
||||
}
|
||||
|
||||
--
|
||||
2.6.2
|
||||
|
@ -1 +0,0 @@
|
||||
Fixes: [39465] Enforce that surfaces are flushed after ReleaseDC
|
Reference in New Issue
Block a user