wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 63d6dce04746237c1cb39c22914ed666c55178e1.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-09 23:37:12 +02:00
parent 1be574ad0d
commit 7dc2c0f2c6
8 changed files with 108 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
patches/ntdll-DOS_Area/0001-Revert-ntdll-Support-loading-binaries-that-start-ins.patch
View File

@@ -1,27 +0,0 @@
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

25
patches/ntdll-DOS_Area/0001-ntdll-Fix-code-to-make-DOS-area-accessible.patch Normal file
View File

@@ -0,0 +1,25 @@
From 9b5bb1a278bbdf33a1402603bae315fabfa1d411 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 9 Oct 2017 21:54:22 +0200
Subject: ntdll: Fix code to make DOS area accessible.
---
dlls/ntdll/virtual.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index d28b138e575..3ae72af8cd9 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -1622,7 +1622,7 @@ void virtual_init(void)
/* make the DOS area accessible (except the low 64K) to hide bugs in broken apps like Excel 2003 */
size = (char *)address_space_start - (char *)0x10000;
- if (size && wine_mmap_is_in_reserved_area( (void*)0x10000, size ) == 1)
+ if (address_space_start > (void *)0x10000 && wine_mmap_is_in_reserved_area( (void *)0x10000, size ) == 1)
wine_anon_mmap( (void *)0x10000, size, PROT_READ | PROT_WRITE, MAP_FIXED );
}
--
2.14.1