Rebase against e6c67c52757508ce92c3819bb14e87c2ab21fa20.

README.md

@@ -128,7 +128,7 @@ for more details.*
 * Do not signal threads until they are really gone
 * Do not use unixfs for devices without mountpoint
 * Do not wait for hook thread startup in IDirectInput8::Initialize ([Wine Bug #21403](https://bugs.winehq.org/show_bug.cgi?id=21403))
-* Enforce that surfaces are flushed after ReleaseDC ([Wine Bug #39465](https://bugs.winehq.org/show_bug.cgi?id=39465))
+* ~~Enforce that surfaces are flushed after ReleaseDC~~ ([Wine Bug #39465](https://bugs.winehq.org/show_bug.cgi?id=39465))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
 * Export additional OpenAL32 functions ([Wine Bug #38972](https://bugs.winehq.org/show_bug.cgi?id=38972))

patches/patchinstall.sh

@@ -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:

patches/user32-Painting/0001-user32-Enforce-that-surfaces-are-flushed-after-Relea.patch

@@ -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
-

patches/user32-Painting/definition

@@ -1 +0,0 @@
-Fixes: [39465] Enforce that surfaces are flushed after ReleaseDC

staging/changelog

@@ -8,6 +8,8 @@ wine-staging (1.8~rc2) UNRELEASED; urgency=low
     specific files (accepted upstream).
   * Removed patch to add NULL pointer check in dibdrv_wglDescribePixelFormat
     (accepted upstream).
+  * Removed patch to enforce that surfaces are flushed after ReleaseDC (fixed
+    upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Wed, 25 Nov 2015 20:21:46 +0100
 
 wine-staging (1.8~rc1) unstable; urgency=low