diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2005-09-24 18:22:44 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2005-09-24 18:22:44 +0000 |
| commit | cd0fe4330b499f9defa1d053860abce2457b4930 (patch) | |
| tree | 97d0ba109ab91ca5fd4f66dd72bae2bb15c8745a /emulators | |
| parent | - update to 0.50 (diff) | |
We don't need this patch any longer (and haven't for about nine months),
since a variant of my original patch which adjusts libs/wine/mmap.c
instead has been accepted upstream, making thise code a noop.
Notes
Notes:
svn path=/head/; revision=143494
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls-ntdll | 29 | ||||
| -rw-r--r-- | emulators/wine/files/patch-dlls-ntdll | 29 |
2 files changed, 0 insertions, 58 deletions
diff --git a/emulators/wine-devel/files/patch-dlls-ntdll b/emulators/wine-devel/files/patch-dlls-ntdll deleted file mode 100644 index 6ee56acae645..000000000000 --- a/emulators/wine-devel/files/patch-dlls-ntdll +++ /dev/null @@ -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; diff --git a/emulators/wine/files/patch-dlls-ntdll b/emulators/wine/files/patch-dlls-ntdll deleted file mode 100644 index 6ee56acae645..000000000000 --- a/emulators/wine/files/patch-dlls-ntdll +++ /dev/null @@ -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; |