mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Added patch to revert changes to address_space_start in virtual_init.
Breaks loading of all DOS executables.
This commit is contained in:
parent
f79f1d1e79
commit
25313a5526
@ -0,0 +1,27 @@
|
||||
From 86b46494b8aa3be24829c67bece699479e6df905 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 8 Oct 2017 11:14:26 +0200
|
||||
Subject: Revert "ntdll: Support loading binaries that start inside the DOS
|
||||
area."
|
||||
|
||||
This reverts commit a27f187503f55de4b0c703bdb2d24dd07cd63cc1.
|
||||
---
|
||||
dlls/ntdll/virtual.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
|
||||
index 7bb4eb4787a..f33579840a2 100644
|
||||
--- a/dlls/ntdll/virtual.c
|
||||
+++ b/dlls/ntdll/virtual.c
|
||||
@@ -1596,8 +1596,6 @@ void virtual_init(void)
|
||||
{
|
||||
preload_reserve_start = (void *)start;
|
||||
preload_reserve_end = (void *)end;
|
||||
- /* some apps start inside the DOS area */
|
||||
- address_space_start = min( address_space_start, preload_reserve_start );
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
@ -241,6 +241,7 @@ patch_enable_all ()
|
||||
enable_ntdll_Builtin_Prot="$1"
|
||||
enable_ntdll_CLI_Images="$1"
|
||||
enable_ntdll_CriticalSection="$1"
|
||||
enable_ntdll_DOS_Area="$1"
|
||||
enable_ntdll_DOS_Attributes="$1"
|
||||
enable_ntdll_Dealloc_Thread_Stack="$1"
|
||||
enable_ntdll_DeviceType_Systemroot="$1"
|
||||
@ -1005,6 +1006,9 @@ patch_enable ()
|
||||
ntdll-CriticalSection)
|
||||
enable_ntdll_CriticalSection="$2"
|
||||
;;
|
||||
ntdll-DOS_Area)
|
||||
enable_ntdll_DOS_Area="$2"
|
||||
;;
|
||||
ntdll-DOS_Attributes)
|
||||
enable_ntdll_DOS_Attributes="$2"
|
||||
;;
|
||||
@ -6324,6 +6328,18 @@ if test "$enable_ntdll_CriticalSection" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DOS_Area
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntdll/virtual.c
|
||||
# |
|
||||
if test "$enable_ntdll_DOS_Area" -eq 1; then
|
||||
patch_apply ntdll-DOS_Area/0001-Revert-ntdll-Support-loading-binaries-that-start-ins.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "Revert \"ntdll: Support loading binaries that start inside the DOS area.\".", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntdll-DOS_Attributes
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Loading…
Reference in New Issue
Block a user