ntdll-Heap_Delay_Free: Disable patchset, it causes failures for other apps.

Will be re-added after the release when the patch has been improved.
This commit is contained in:
Sebastian Lackner 2015-05-16 03:49:55 +02:00
parent 13effc62f8
commit 95496eedab
3 changed files with 6 additions and 19 deletions

View File

@ -39,7 +39,7 @@ Wine. All those differences are also documented on the
Included bug fixes and improvements
-----------------------------------
**Bug fixes and features included in the next upcoming release [16]:**
**Bug fixes and features included in the next upcoming release [15]:**
* Add HTTP Host header in HttpSendRequest instead of HttpOpenRequest ([Wine Bug #28911](https://bugs.winehq.org/show_bug.cgi?id=28911))
* Add IEnumString stub interface for ACLShellSource ([Wine Bug #18019](https://bugs.winehq.org/show_bug.cgi?id=18019))
@ -56,7 +56,6 @@ Included bug fixes and improvements
* Return default palette entries from GetSystemPaletteEntries for non-palette-based devices
* Support for ObjectTypeInformation class support in NtQueryObject
* Use POSIX implementation to enumerate directory content on FreeBSD ([Wine Bug #35397](https://bugs.winehq.org/show_bug.cgi?id=35397))
* Wait before reusing recently freed memory
**Bug fixes and features in Wine Staging 1.7.42 [221]:**

View File

@ -1 +1,5 @@
Fixes: Wait before reusing recently freed memory
#Fixes: Wait before reusing recently freed memory
# This patch fixes a couple of bugs, but causes other
# failes. Disabled until a better solution is found.
Disabled: true

View File

@ -170,7 +170,6 @@ patch_enable_all ()
enable_ntdll_Fix_Alignment="$1"
enable_ntdll_Fix_Free="$1"
enable_ntdll_FreeBSD_Directory="$1"
enable_ntdll_Heap_Delay_Free="$1"
enable_ntdll_Heap_FreeLists="$1"
enable_ntdll_Junction_Points="$1"
enable_ntdll_LZNT1_Compression="$1"
@ -578,9 +577,6 @@ patch_enable ()
ntdll-FreeBSD_Directory)
enable_ntdll_FreeBSD_Directory="$2"
;;
ntdll-Heap_Delay_Free)
enable_ntdll_Heap_Delay_Free="$2"
;;
ntdll-Heap_FreeLists)
enable_ntdll_Heap_FreeLists="$2"
;;
@ -3844,18 +3840,6 @@ if test "$enable_ntdll_FreeBSD_Directory" -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: