head 1.5; access; symbols pkgsrc-2013Q4:1.4.0.14 pkgsrc-2013Q4-base:1.4 pkgsrc-2013Q3:1.4.0.12 pkgsrc-2013Q3-base:1.4 pkgsrc-2013Q2:1.4.0.10 pkgsrc-2013Q2-base:1.4 pkgsrc-2013Q1:1.4.0.8 pkgsrc-2013Q1-base:1.4 pkgsrc-2012Q4:1.4.0.6 pkgsrc-2012Q4-base:1.4 pkgsrc-2012Q3:1.4.0.4 pkgsrc-2012Q3-base:1.4 pkgsrc-2012Q2:1.4.0.2 pkgsrc-2012Q2-base:1.4 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.20 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.18 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.16 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.14 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.12 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.10 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.8 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.6 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.4 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.2 pkgsrc-2008Q4-base:1.2 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.5 date 2014.01.19.10.58.23; author adam; state dead; branches; next 1.4; commitid 4D1ECVbACnM1uIlx; 1.4 date 2012.05.23.17.48.54; author marino; state Exp; branches; next 1.3; 1.3 date 2011.05.02.21.23.01; author adam; state Exp; branches; next 1.2; 1.2 date 2008.11.21.18.54.56; author adam; state Exp; branches; next 1.1; 1.1 date 2008.11.21.17.40.31; author adam; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2008.11.21.17.40.31; author adam; state Exp; branches; next ; desc @@ 1.5 log @Changes 1.7.11: - Uniscribe support in the RichEdit control. - Support for condition variables and Slim Reader/Writer locks. - More D3D command stream preparation work. - Optional Start Menu in desktop mode. - Improved support for vertical fonts metrics. - Various bug fixes. @ text @$NetBSD: patch-ac,v 1.4 2012/05/23 17:48:54 marino Exp $ --- dlls/ntdll/directory.c.orig 2010-06-18 17:36:58.000000000 +0000 +++ dlls/ntdll/directory.c @@@@ -129,6 +129,20 @@@@ static inline int getdents64( int fd, ch #endif /* linux */ #define IS_OPTION_TRUE(ch) ((ch) == 'y' || (ch) == 'Y' || (ch) == 't' || (ch) == 'T' || (ch) == '1') +#if defined(__NetBSD_Version__) && __NetBSD_Version__ >= 399000800 +/* + * workaround for obsolete getdirentries() which returns + * the old 32-bit inode struct dirent, while dirent.h has the + * new 64-bit inode struct dirent inode since 3.99.8 + */ +int compat_netbsd_getdirentries(int fd, char *buf, int nbytes, long *basep) +{ + *basep = (long)lseek(fd, 0, SEEK_CUR); + return getdents(fd, buf, (size_t)nbytes); +} +#define getdirentries compat_netbsd_getdirentries +#endif + #define IS_SEPARATOR(ch) ((ch) == '\\' || (ch) == '/') #define INVALID_NT_CHARS '*','?','<','>','|','"' @@@@ -313,7 +327,8 @@@@ static char *get_default_com_device( int strcpy( ret, "/dev/ttyS0" ); ret[strlen(ret) - 1] = '0' + num - 1; } -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ + || defined(__DragonFly__) ret = RtlAllocateHeap( GetProcessHeap(), 0, sizeof("/dev/cuad0") ); if (ret) { @@@@ -486,7 +501,8 @@@@ static char *parse_mount_entries( FILE * } #endif -#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ + || defined(__DragonFly__) #include static char *parse_mount_entries( FILE *f, dev_t dev, ino_t ino ) { @@@@ -587,7 +603,8 @@@@ static char *get_default_drive_device( c } RtlLeaveCriticalSection( &dir_section ); -#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__ ) \ + || defined(__DragonFly__) char *device = NULL; int fd, res = -1; struct stat st; @@@@ -920,7 +937,8 @@@@ static int get_dir_case_sensitivity_attr */ static BOOLEAN get_dir_case_sensitivity_stat( const char *dir ) { -#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \ + || defined(__DragonFly__) struct statfs stfs; if (statfs( dir, &stfs ) == -1) return FALSE; @@@@ -1667,6 +1685,9 @@@@ static int read_directory_getdirentries( BOOLEAN single_entry, const UNICODE_STRING *mask, BOOLEAN restart_scan, FILE_INFORMATION_CLASS class ) { +#ifdef __DragonFly__ +#define d_reclen d_namlen +#endif long restart_pos; ULONG_PTR restart_info_pos = 0; size_t size, initial_size = length; @@@@ -1799,6 +1820,9 @@@@ done: return res; } +#ifdef __DragonFly__ +#undef d_reclen +#endif #ifdef _DARWIN_FEATURE_64_BIT_INODE #undef getdirentries #undef dirent @ 1.4 log @emulators/wine-devel: Add DragonFly support I have no idea if this actually works, but at least it builds which was not the case before. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.3 2011/05/02 21:23:01 adam Exp $ @ 1.3 log @Changes 1.3.19: * New sound driver architecture for MMDevAPI. * Better support for relative mouse events in DInput. * Debugger support for the ARM platform. * Various improvements in D3DX9. * More MSVC runtime functions. * Various bug fixes. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 @@@@ -128,6 +128,20 @@@@ static inline int getdents64( int fd, ch d26 60 @ 1.2 log @Changes 1.1.9: - A large number of regression test fixes. - Performance improvements in memory management. - Improved POP3 support in inetcomm. - Initial implementation of the XInput DLL. - Various bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/directory.c.orig 2008-11-21 17:20:28.000000000 +0100 d5 1 a5 1 @@@@ -130,6 +130,20 @@@@ static inline int getdents64( int fd, ch @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- dlls/ntdll/directory.c.orig 2008-06-27 16:24:42.000000000 +0200 d5 1 a5 1 @@@@ -127,6 +127,20 @@@@ static inline int getdents64( int fd, ch @ 1.1.1.1 log @Wine is a program which allows running Microsoft Windows programs (including DOS, Windows 3.x and Win32 executables) on Unix. It consists of a program loader which loads and executes an Microsoft Windows binary, and a library that implements Windows API calls using their Unix or X11 equivalents. The library may also be used for porting Win32 code into native Unix executables. @ text @@