diff options
Diffstat (limited to 'emulators/wine-devel/files')
| -rw-r--r-- | emulators/wine-devel/files/patch-dlls-ntdll | 29 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-loader::main.c | 17 | ||||
| -rw-r--r-- | emulators/wine-devel/files/patch-program::Makefile.in | 14 |
3 files changed, 36 insertions, 24 deletions
diff --git a/emulators/wine-devel/files/patch-dlls-ntdll b/emulators/wine-devel/files/patch-dlls-ntdll new file mode 100644 index 000000000000..6ee56acae645 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls-ntdll @@ -0,0 +1,29 @@ +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-devel/files/patch-loader::main.c b/emulators/wine-devel/files/patch-loader::main.c deleted file mode 100644 index b7a60402ad5b..000000000000 --- a/emulators/wine-devel/files/patch-loader::main.c +++ /dev/null @@ -1,17 +0,0 @@ -Index: loader/main.c -=================================================================== -RCS file: /home/wine/wine/loader/main.c,v -retrieving revision 1.90 -retrieving revision 1.89 -diff -u -3 -p -r1.90 -r1.89 ---- loader/main.c 20 Jan 2004 00:28:01 -0000 1.90 -+++ loader/main.c 22 Nov 2003 00:08:26 -0000 1.89 -@@ -29,7 +29,7 @@ int main( int argc, char *argv[] ) - { - char error[1024]; - --#if 0 -+#ifdef __i386__ - static char pe_load[256*1024*1024] __attribute__((aligned(4096))); - wine_set_pe_load_area( pe_load, sizeof(pe_load) ); - #endif diff --git a/emulators/wine-devel/files/patch-program::Makefile.in b/emulators/wine-devel/files/patch-program::Makefile.in index a11e87a3a0d1..2ba5e0de2ca2 100644 --- a/emulators/wine-devel/files/patch-program::Makefile.in +++ b/emulators/wine-devel/files/patch-program::Makefile.in @@ -17,10 +17,10 @@ winhelp \ winver @@ -106,7 +104,6 @@ SYMLINKS = \ - winemenubuilder.exe \ - winemine.exe \ - winepath.exe \ -- winetest.exe \ - winevdm.exe \ - winhelp.exe \ - winver.exe + winemenubuilder.exe$(DLLEXT) \ + winemine.exe$(DLLEXT) \ + winepath.exe$(DLLEXT) \ +- winetest.exe$(DLLEXT) \ + winevdm.exe$(DLLEXT) \ + winhelp.exe$(DLLEXT) \ + winver.exe$(DLLEXT) |