Added patch to wait before reusing recently freed memory (fixes Wine Staging Bug #269 and #199).

README.md

@@ -39,10 +39,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [2]:**
+**Bug fixes and features included in the next upcoming release [3]:**
 
 * Add stub for atl80.AtlIPersistPropertyBag_Save ([Wine Bug #33888](https://bugs.winehq.org/show_bug.cgi?id=33888))
 * Improve ReadDataAvailable handling in FilePipeLocalInformation class
+* Wait before reusing recently freed memory
 
 
 **Bug fixes and features in Wine Staging 1.7.42 [221]:**

debian/changelog

@@ -1,6 +1,7 @@
 wine-staging (1.7.43) UNRELEASED; urgency=low
   * Disable patchset shell32-Default_Folder_ACLs (fixes Wine Staging Bug #265).
   * Updated patch to calculate msvcrt exponential math operations with higher precision (fixes Wine Staging Bug #268).
+  * Added patch to wait before reusing recently freed memory (fixes Wine Staging Bug #269 and #199).
   * Added patch to improve ReadDataAvailable handling in FilePipeLocalInformation class.
   * Added patch with tests for shlwapi.AssocGetPerceivedType.
   * Added patch with stub for atl80.AtlIPersistPropertyBag_Save.

patches/ntdll-Heap_Delay_Free/0001-ntdll-Mimic-the-Windows-heap-management-and-delay-re.patch

@@ -0,0 +1,37 @@
+From 5591da91355f5d1ed7238deaaa9939e36101b5e1 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Thu, 7 May 2015 01:26:49 +0200
+Subject: ntdll: Mimic the Windows heap management and delay reusing freed
+ blocks.
+
+---
+ dlls/ntdll/heap.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
+index 95c3554..a5fb206 100644
+--- a/dlls/ntdll/heap.c
++++ b/dlls/ntdll/heap.c
+@@ -628,7 +628,8 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena )
+     ARENA_FREE *pFree;
+     SIZE_T size;
+ 
+-    if (heap->pending_free)
++    if (heap->pending_free && ((pArena->size & ARENA_SIZE_MASK) < 0x1000 ||
++        (heap->flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND))
+     {
+         ARENA_INUSE *prev = heap->pending_free[heap->pending_pos];
+         heap->pending_free[heap->pending_pos] = pArena;
+@@ -1506,8 +1507,7 @@ void heap_set_debug_flags( HANDLE handle )
+                              large->block_size - sizeof(*large) - large->data_size, flags );
+     }
+ 
+-    if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free &&
+-        ((flags & HEAP_FREE_CHECKING_ENABLED) || RUNNING_ON_VALGRIND))
++    if ((heap->flags & HEAP_GROWABLE) && !heap->pending_free)
+     {
+         void *ptr = NULL;
+         SIZE_T size = MAX_FREE_PENDING * sizeof(*heap->pending_free);
+-- 
+2.3.7
+

patches/ntdll-Heap_Delay_Free/definition

@@ -0,0 +1 @@
+Fixes: Wait before reusing recently freed memory

patches/patchinstall.sh

@@ -164,6 +164,7 @@ patch_enable_all ()
 	enable_ntdll_FileFsFullSizeInformation="$1"
 	enable_ntdll_Fix_Alignment="$1"
 	enable_ntdll_Fix_Free="$1"
+	enable_ntdll_Heap_Delay_Free="$1"
 	enable_ntdll_Heap_FreeLists="$1"
 	enable_ntdll_Junction_Points="$1"
 	enable_ntdll_LZNT1_Compression="$1"
@@ -545,6 +546,9 @@ patch_enable ()
 		ntdll-Fix_Free)
 			enable_ntdll_Fix_Free="$2"
 			;;
+		ntdll-Heap_Delay_Free)
+			enable_ntdll_Heap_Delay_Free="$2"
+			;;
 		ntdll-Heap_FreeLists)
 			enable_ntdll_Heap_FreeLists="$2"
 			;;
@@ -3691,6 +3695,18 @@ if test "$enable_ntdll_Fix_Free" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset ntdll-Heap_Delay_Free
+# |
+# | Modified files:
+# |   *	dlls/ntdll/heap.c
+# |
+if test "$enable_ntdll_Heap_Delay_Free" -eq 1; then
+	patch_apply ntdll-Heap_Delay_Free/0001-ntdll-Mimic-the-Windows-heap-management-and-delay-re.patch
+	(
+		echo '+    { "Sebastian Lackner", "ntdll: Mimic the Windows heap management and delay reusing freed blocks.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset ntdll-Heap_FreeLists
 # |
 # | Modified files: