head 1.19; access; symbols OPENPKG_E1_MP_HEAD:1.18 OPENPKG_E1_MP:1.18 OPENPKG_E1_MP_2_STABLE:1.18.2.2 OPENPKG_E1_FP:1.18.2.2 OPENPKG_2_STABLE_MP:1.18 OPENPKG_2_STABLE_20061018:1.18.2.2 OPENPKG_2_STABLE:1.18.0.2 OPENPKG_CW_FP:1.13 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.19 date 2008.09.06.17.18.34; author rse; state Exp; branches; next 1.18; commitid e0nYZo4JCGjBCJht; 1.18 date 2006.04.01.11.17.26; author rse; state Exp; branches 1.18.2.1; next 1.17; commitid IBoVqooEWSxocsrr; 1.17 date 2006.02.19.08.26.14; author rse; state Exp; branches; next 1.16; commitid ZgMTEUxBA7dnzamr; 1.16 date 2006.01.12.09.44.56; author rse; state Exp; branches; next 1.15; commitid gY8AvPHBQ8v6eihr; 1.15 date 2005.11.12.19.28.16; author rse; state Exp; branches; next 1.14; commitid fuB0wpc5Gf4Npv9r; 1.14 date 2005.10.27.10.28.44; author rse; state Exp; branches; next 1.13; commitid FcfrSEHP36cAWo7r; 1.13 date 2004.12.24.11.43.27; author rse; state Exp; branches; next 1.12; 1.12 date 2004.08.14.06.59.18; author rse; state Exp; branches; next 1.11; 1.11 date 2004.07.17.06.59.57; author rse; state Exp; branches; next 1.10; 1.10 date 2004.06.18.14.42.14; author thl; state Exp; branches; next 1.9; 1.9 date 2004.05.06.09.37.44; author rse; state Exp; branches; next 1.8; 1.8 date 2004.04.13.15.06.38; author ms; state Exp; branches; next 1.7; 1.7 date 2004.01.23.11.03.55; author rse; state Exp; branches; next 1.6; 1.6 date 2003.12.28.12.10.20; author rse; state Exp; branches; next 1.5; 1.5 date 2003.11.19.10.43.14; author thl; state Exp; branches; next 1.4; 1.4 date 2003.10.17.13.47.28; author ms; state Exp; branches; next 1.3; 1.3 date 2003.09.12.10.04.13; author rse; state Exp; branches; next 1.2; 1.2 date 2003.08.15.13.58.33; author rse; state Exp; branches; next 1.1; 1.1 date 2003.07.17.20.53.45; author rse; state Exp; branches; next ; 1.18.2.1 date 2006.04.01.11.17.26; author rse; state dead; branches; next 1.18.2.2; commitid iZxwRSmmWscPXUQr; 1.18.2.2 date 2006.10.16.14.57.57; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.19 log @upgrading package: wine 1.1.2 -> 1.1.4 @ text @Index: include/winternl.h --- include/winternl.h.orig 2008-09-05 17:28:27 +0200 +++ include/winternl.h 2008-09-06 09:45:18 +0200 @@@@ -22,6 +22,7 @@@@ #define __WINE_WINTERNL_H #include +#include #ifdef __cplusplus extern "C" { @ 1.18 log @upgrading package: wine 0.9.10 -> 0.9.11 @ text @d2 2 a3 2 --- include/winternl.h.orig 2006-03-31 14:38:41 +0200 +++ include/winternl.h 2006-04-01 09:37:25 +0200 a11 11 Index: programs/Makefile.in --- programs/Makefile.in.orig 2006-03-31 14:38:41 +0200 +++ programs/Makefile.in 2006-04-01 09:37:25 +0200 @@@@ -35,7 +35,6 @@@@ winemenubuilder \ winemine \ winepath \ - winetest \ winevdm \ winhelp \ winver \ @ 1.18.2.1 log @file wine.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:57:56 +0000 @ text @d1 22 @ 1.18.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 22 Index: include/winternl.h --- include/winternl.h.orig 2006-03-31 14:38:41 +0200 +++ include/winternl.h 2006-04-01 09:37:25 +0200 @@@@ -22,6 +22,7 @@@@ #define __WINE_WINTERNL_H #include +#include #ifdef __cplusplus extern "C" { Index: programs/Makefile.in --- programs/Makefile.in.orig 2006-03-31 14:38:41 +0200 +++ programs/Makefile.in 2006-04-01 09:37:25 +0200 @@@@ -35,7 +35,6 @@@@ winemenubuilder \ winemine \ winepath \ - winetest \ winevdm \ winhelp \ winver \ @ 1.17 log @upgrading package: wine 0.9.6 -> 0.9.8 @ text @d2 2 a3 2 --- include/winternl.h.orig 2006-02-15 17:02:58 +0100 +++ include/winternl.h 2006-02-19 09:01:59 +0100 d13 2 a14 2 --- programs/Makefile.in.orig 2006-02-15 17:02:59 +0100 +++ programs/Makefile.in 2006-02-19 09:01:59 +0100 a22 8 @@@@ -127,7 +126,6 @@@@ winemenubuilder.exe$(DLLEXT) \ winemine.exe$(DLLEXT) \ winepath.exe$(DLLEXT) \ - winetest.exe$(DLLEXT) \ winevdm.exe$(DLLEXT) \ winhelp.exe$(DLLEXT) \ winver.exe$(DLLEXT) \ @ 1.16 log @upgrading package: wine 0.9.3 -> 0.9.5 @ text @d2 2 a3 2 --- include/winternl.h.orig 2006-01-04 17:05:13 +0100 +++ include/winternl.h 2006-01-12 10:23:21 +0100 d13 2 a14 2 --- programs/Makefile.in.orig 2006-01-04 17:05:16 +0100 +++ programs/Makefile.in 2006-01-12 10:23:21 +0100 d22 2 a23 10 winver @@@@ -69,7 +68,6 @@@@ winemenubuilder \ winemine \ winepath \ - winetest \ winevdm \ winhelp \ winver @@@@ -126,7 +124,6 @@@@ d30 1 a30 1 winver.exe$(DLLEXT) @ 1.15 log @upgrading package: wine 0.9 -> 0.9.1 @ text @d1 5 a5 17 Index: dlls/ntdll/virtual.c --- dlls/ntdll/virtual.c.orig 2005-09-26 11:57:38 +0200 +++ dlls/ntdll/virtual.c 2005-10-27 10:21:46 +0200 @@@@ -118,6 +118,12 @@@@ /* 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_size; @@@@ -619,7 +625,7 @@@@ d7 5 a11 7 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; d13 3 a15 3 --- programs/Makefile.in.orig 2005-07-12 22:41:52 +0200 +++ programs/Makefile.in 2005-10-27 10:21:46 +0200 @@@@ -33,7 +33,6 @@@@ d23 1 a23 1 @@@@ -65,7 +64,6 @@@@ d31 1 a31 1 @@@@ -120,7 +118,6 @@@@ a38 11 Index: include/winternl.h --- include/winternl.h.orig 2005-11-07 12:14:45 +0100 +++ include/winternl.h 2005-11-12 20:05:19 +0100 @@@@ -22,6 +22,7 @@@@ #define __WINE_WINTERNL_H #include +#include #ifdef __cplusplus extern "C" { @ 1.14 log @upgrading package: wine 20050930 -> 0.9 @ text @d53 11 @ 1.13 log @1. fix run-time under FreeBSD by applying an important ports-collection patch; 2. adjust winesetup for latest Wine world order (where wineprefixcreate exists) @ text @d1 17 a17 5 Index: Makefile.in --- Makefile.in.orig Wed Apr 9 08:10:49 2003 +++ Makefile.in Wed Apr 9 08:14:06 2003 @@@@ -82,8 +82,7 @@@@ install-dev:: $(INSTALLDEVSUBDIRS:%=%/__install__) $(INSTALLBOTHSUBDIRS:%=%/__install-dev__) install-aclocal d19 7 a25 7 install:: install-lib install-dev install-aclocal - -$(LDCONFIG) - @@if test -n "`LANG=C $(LDD) $(bindir)/wine|grep not.found`"; \ + @@if false ; \ then \ echo "*************************************************" ; \ echo "*************************************************" ; \ d27 3 a29 3 --- programs/Makefile.in.orig 2004-08-11 22:59:09 +0200 +++ programs/Makefile.in 2004-08-14 08:41:56 +0200 @@@@ -32,7 +32,6 @@@@ d37 1 a37 1 @@@@ -63,7 +62,6 @@@@ d45 1 a45 1 @@@@ -116,7 +114,6 @@@@ a52 25 Index: dlls/ntdll/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; @ 1.12 log @upgrading package: wine 20040716 -> 20040813 @ text @d41 25 @ 1.11 log @upgrading package: wine 20040615 -> 20040716 @ text @d1 1 d14 4 a17 4 Index: programs/Makefile --- programs/Makefile.in.orig 2004-06-18 14:38:14 +0200 +++ programs/Makefile.in 2004-06-18 16:27:52 +0200 @@@@ -31,7 +31,6 @@@@ d25 1 a25 1 @@@@ -61,7 +60,6 @@@@ d33 8 a40 8 @@@@ -113,7 +111,6 @@@@ winemenubuilder.exe \ winemine.exe \ winepath.exe \ - winetest.exe \ winevdm.exe \ winhelp.exe \ winver.exe @ 1.10 log @upgrading package: wine 20040505 -> 20040615 @ text @a12 12 Index: dlls/ntdll/cdrom.c --- dlls/ntdll/cdrom.c.orig 2004-06-15 02:45:01 +0200 +++ dlls/ntdll/cdrom.c 2004-06-18 16:11:27 +0200 @@@@ -1736,7 +1736,7 @@@@ TRACE("\n"); return CDROM_GetStatusCode(ioctl(fd, DVD_AUTH, &auth_info)); #elif defined(__FreeBSD__) || defined(__NetBSD__) - return CDROM_GetStatusCode(ioctl(cdrom_cache[dev].fd, (rmv->PreventMediaRemoval) ? CDIOCPREVENT : CDIOCALLOW, NULL)); + return STATUS_NOT_SUPPORTED; #else return STATUS_NOT_SUPPORTED; #endif @ 1.9 log @upgrading package: wine 20040408 -> 20040505 @ text @d13 39 @ 1.8 log @upgrading package: wine 20040309 -> 20040408 @ text @a12 10 --- programs/winetest/util.c.orig 2004-04-13 16:43:43.000000000 +0200 +++ programs/winetest/util.c 2004-04-13 16:43:47.000000000 +0200 @@@@ -19,7 +19,6 @@@@ * */ #include -#include #include #include "winetest.h" @ 1.7 log @try new version, hopefully it runs better @ text @d13 8 a20 10 --- dlls/msi/Makefile.in.orig Wed Aug 13 03:27:48 2003 +++ dlls/msi/Makefile.in Fri Aug 15 10:50:59 2003 @@@@ -26,6 +26,8 @@@@ @@MAKE_DLL_RULES@@ +tokenize.c: y.tab.h + y.tab.c y.tab.h: sql.y $(YACC) -d -t $(SRCDIR)/sql.y d22 1 @ 1.6 log @include bugfix from FreeBSD ports collection @ text @a23 12 Index: loader/kthread.c --- loader/kthread.c.orig 2003-11-09 02:25:23.000000000 +0100 +++ loader/kthread.c 2003-12-28 10:30:13.000000000 +0100 @@@@ -300,7 +300,7 @@@@ "ret;\n" "1:\n\t" /* parent -> caller thread */ "addl $8,%%esp" : - : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM) + : "r" (sp), "g" (SYS_rfork), "g" (RFPROC | RFMEM | RFTHREAD) : "eax", "edx"); return 0; } @ 1.5 log @upgrading package: wine 20031016 -> 20031118 @ text @d24 12 @ 1.4 log @upgrading package: wine 20030911 -> 20031016 @ text @a23 12 --- scheduler/pthread.c.orig 2003-10-17 12:53:46.000000000 +0200 +++ scheduler/pthread.c 2003-10-17 12:54:16.000000000 +0200 @@@@ -180,7 +180,9 @@@@ descr = &initial_descr; writejump( "__errno_location", __errno_location ); writejump( "__h_errno_location", __h_errno_location ); +#if !defined(__FreeBSD__) writejump( "__res_state", __res_state ); +#endif } descr->cancel_state = PTHREAD_CANCEL_ENABLE; descr->cancel_type = PTHREAD_CANCEL_ASYNCHRONOUS; @ 1.3 log @upgrading package: wine 20030813 -> 20030911 @ text @d15 1 a15 1 @@@@ -29,6 +29,8 @@@@ d24 6 a29 6 --- scheduler/pthread.c.orig 2003-09-11 03:09:09.000000000 +0200 +++ scheduler/pthread.c 2003-09-12 11:18:49.000000000 +0200 @@@@ -156,7 +156,9 @@@@ initial_descr.cancel_type = PTHREAD_CANCEL_ASYNCHRONOUS; writejump( "__errno_location", __errno_location ); writejump( "__h_errno_location", __h_errno_location ); d31 1 a31 1 writejump( "__res_state", __res_state ); d33 3 a35 3 if (libc_uselocale) libc_uselocale( -1 /*LC_GLOBAL_LOCALE*/ ); } @ 1.2 log @fix building @ text @d24 12 @ 1.1 log @first cut for a Wine (Wine Is Not an Emulator) package @ text @d13 11 @