cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We don't need this patch any longer (and haven't for about nine months),

Browse Source 
since a variant of my original patch which adjusts libs/wine/mmap.c
instead has been accepted upstream, making thise code a noop.
This commit is contained in:
Gerald Pfeifer 2005-09-24 18:22:44 +00:00
parent 57533348da
commit cd0fe4330b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=143494
2 changed files with 0 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
emulators/wine-devel/files/patch-dlls-ntdll
View File

@ -1,29 +0,0 @@
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.41
diff -u -3 -p -r1.41 virtual.c
--- dlls/ntdll/virtual.c 11 Oct 2004 20:59:06 -0000 1.41
+++ dlls/ntdll/virtual.c 3 Dec 2004 04:06:42 -0000
@@ -119,6 +119,12 @@ static CRITICAL_SECTION csVirtual = { &c
/* Note: these are Windows limits, you cannot change them. */
# define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total available address space */
# define USER_SPACE_LIMIT ((void *)0x80000000) /* top of the user address space */
+# ifdef __FreeBSD__
+# define LOW_SPACE_LIMIT ((void *)0x110000) /* lower address space limit */
+# else
+# define LOW_SPACE_LIMIT NULL
+# endif
+
#else
static UINT page_shift;
static UINT page_mask;
@@ -600,7 +606,7 @@ static NTSTATUS map_view( struct file_vi
for (;;)
{
- if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
+ if ((ptr = wine_anon_mmap( LOW_SPACE_LIMIT, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
{
if (errno == ENOMEM) return STATUS_NO_MEMORY;
return STATUS_INVALID_PARAMETER;

29
emulators/wine/files/patch-dlls-ntdll
View File

@ -1,29 +0,0 @@
Index: dlls/ntdll/virtual.c
===================================================================
RCS file: /home/wine/wine/dlls/ntdll/virtual.c,v
retrieving revision 1.41
diff -u -3 -p -r1.41 virtual.c
--- dlls/ntdll/virtual.c 11 Oct 2004 20:59:06 -0000 1.41
+++ dlls/ntdll/virtual.c 3 Dec 2004 04:06:42 -0000
@@ -119,6 +119,12 @@ static CRITICAL_SECTION csVirtual = { &c
/* Note: these are Windows limits, you cannot change them. */
# define ADDRESS_SPACE_LIMIT ((void *)0xc0000000) /* top of the total available address space */
# define USER_SPACE_LIMIT ((void *)0x80000000) /* top of the user address space */
+# ifdef __FreeBSD__
+# define LOW_SPACE_LIMIT ((void *)0x110000) /* lower address space limit */
+# else
+# define LOW_SPACE_LIMIT NULL
+# endif
+
#else
static UINT page_shift;
static UINT page_mask;
@@ -600,7 +606,7 @@ static NTSTATUS map_view( struct file_vi
for (;;)
{
- if ((ptr = wine_anon_mmap( NULL, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
+ if ((ptr = wine_anon_mmap( LOW_SPACE_LIMIT, view_size, VIRTUAL_GetUnixProt(vprot), 0 )) == (void *)-1)
{
if (errno == ENOMEM) return STATUS_NO_MEMORY;
return STATUS_INVALID_PARAMETER;