head 1.27; access; symbols pkgsrc-2013Q4:1.26.0.22 pkgsrc-2013Q4-base:1.26 pkgsrc-2013Q3:1.26.0.20 pkgsrc-2013Q3-base:1.26 pkgsrc-2013Q2:1.26.0.18 pkgsrc-2013Q2-base:1.26 pkgsrc-2013Q1:1.26.0.16 pkgsrc-2013Q1-base:1.26 pkgsrc-2012Q4:1.26.0.14 pkgsrc-2012Q4-base:1.26 pkgsrc-2012Q3:1.26.0.12 pkgsrc-2012Q3-base:1.26 pkgsrc-2012Q2:1.26.0.10 pkgsrc-2012Q2-base:1.26 pkgsrc-2012Q1:1.26.0.8 pkgsrc-2012Q1-base:1.26 pkgsrc-2011Q4:1.26.0.6 pkgsrc-2011Q4-base:1.26 pkgsrc-2011Q3:1.26.0.4 pkgsrc-2011Q3-base:1.26 pkgsrc-2011Q2:1.26.0.2 pkgsrc-2011Q2-base:1.26 pkgsrc-2011Q1:1.25.0.28 pkgsrc-2011Q1-base:1.25 pkgsrc-2010Q4:1.25.0.26 pkgsrc-2010Q4-base:1.25 pkgsrc-2010Q3:1.25.0.24 pkgsrc-2010Q3-base:1.25 pkgsrc-2010Q2:1.25.0.22 pkgsrc-2010Q2-base:1.25 pkgsrc-2010Q1:1.25.0.20 pkgsrc-2010Q1-base:1.25 pkgsrc-2009Q4:1.25.0.18 pkgsrc-2009Q4-base:1.25 pkgsrc-2009Q3:1.25.0.16 pkgsrc-2009Q3-base:1.25 pkgsrc-2009Q2:1.25.0.14 pkgsrc-2009Q2-base:1.25 pkgsrc-2009Q1:1.25.0.12 pkgsrc-2009Q1-base:1.25 pkgsrc-2008Q4:1.25.0.10 pkgsrc-2008Q4-base:1.25 pkgsrc-2008Q3:1.25.0.8 pkgsrc-2008Q3-base:1.25 cube-native-xorg:1.25.0.6 cube-native-xorg-base:1.25 pkgsrc-2008Q2:1.25.0.4 pkgsrc-2008Q2-base:1.25 cwrapper:1.25.0.2 pkgsrc-2008Q1:1.23.0.8 pkgsrc-2008Q1-base:1.23 pkgsrc-2007Q4:1.23.0.6 pkgsrc-2007Q4-base:1.23 pkgsrc-2007Q3:1.23.0.4 pkgsrc-2007Q3-base:1.23 pkgsrc-2007Q2:1.23.0.2 pkgsrc-2007Q2-base:1.23 pkgsrc-2007Q1:1.22.0.2 pkgsrc-2007Q1-base:1.22 pkgsrc-2006Q4:1.19.0.2 pkgsrc-2006Q4-base:1.19 pkgsrc-2006Q3:1.17.0.6 pkgsrc-2006Q3-base:1.17 pkgsrc-2006Q2:1.17.0.4 pkgsrc-2006Q2-base:1.17 pkgsrc-2006Q1:1.17.0.2 pkgsrc-2006Q1-base:1.17 pkgsrc-2005Q4:1.14.0.2 pkgsrc-2005Q4-base:1.14 pkgsrc-2005Q3:1.13.0.2 pkgsrc-2005Q3-base:1.13 pkgsrc-2005Q2:1.12.0.2 pkgsrc-2005Q2-base:1.12 pkgsrc-2005Q1:1.11.0.2 pkgsrc-2005Q1-base:1.11 pkgsrc-2004Q4:1.8.0.4 pkgsrc-2004Q4-base:1.8 pkgsrc-2004Q3:1.8.0.2 pkgsrc-2004Q3-base:1.8 pkgsrc-2004Q2:1.7.0.2 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.5.0.4 pkgsrc-2004Q1-base:1.5 pkgsrc-2003Q4:1.5.0.2 pkgsrc-2003Q4-base:1.5 buildlink2-base:1.5 netbsd-1-5-PATCH001:1.4 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.4 comdex-fall-1999:1.4 netbsd-1-4-PATCH001:1.4 netbsd-1-4-RELEASE:1.4 netbsd-1-3-PATCH003:1.3; locks; strict; comment @# @; 1.27 date 2014.01.17.09.01.58; author adam; state dead; branches; next 1.26; commitid Rg5oZxqUQPN1Urlx; 1.26 date 2011.05.04.20.31.40; author adam; state Exp; branches; next 1.25; 1.25 date 2008.06.28.00.12.40; author jmcneill; state Exp; branches; next 1.24; 1.24 date 2008.06.22.23.38.18; author dholland; state Exp; branches; next 1.23; 1.23 date 2007.05.12.20.40.43; author adam; state Exp; branches; next 1.22; 1.22 date 2007.03.17.23.07.58; author adam; state Exp; branches; next 1.21; 1.21 date 2007.01.30.13.11.04; author adam; state Exp; branches; next 1.20; 1.20 date 2007.01.02.15.33.33; author adam; state Exp; branches; next 1.19; 1.19 date 2006.10.18.20.37.21; author adam; state Exp; branches; next 1.18; 1.18 date 2006.10.08.01.05.55; author wiz; state Exp; branches; next 1.17; 1.17 date 2006.03.06.13.46.01; author adam; state Exp; branches; next 1.16; 1.16 date 2006.02.26.07.48.11; author wiz; state Exp; branches; next 1.15; 1.15 date 2006.01.20.14.58.18; author adam; state Exp; branches; next 1.14; 1.14 date 2005.10.10.08.32.23; author adam; state Exp; branches; next 1.13; 1.13 date 2005.07.26.13.24.36; author adam; state Exp; branches; next 1.12; 1.12 date 2005.05.25.08.23.43; author adam; state Exp; branches; next 1.11; 1.11 date 2005.03.11.21.18.15; author rillig; state Exp; branches; next 1.10; 1.10 date 2005.02.16.12.22.11; author adam; state Exp; branches; next 1.9; 1.9 date 2005.01.14.13.00.05; author adam; state dead; branches; next 1.8; 1.8 date 2004.08.28.21.09.08; author ben; state Exp; branches; next 1.7; 1.7 date 2004.05.06.15.51.35; author adam; state dead; branches; next 1.6; 1.6 date 2004.04.09.12.44.22; author adam; state Exp; branches; next 1.5; 1.5 date 2002.03.15.04.10.21; author junyoung; state dead; branches; next 1.4; 1.4 date 98.12.14.02.17.11; author tv; state Exp; branches; next 1.3; 1.3 date 98.08.07.10.40.35; author agc; state Exp; branches; next 1.2; 1.2 date 98.06.19.18.47.18; author tron; state Exp; branches; next 1.1; 1.1 date 98.06.18.23.48.53; author tron; state Exp; branches; next ; desc @@ 1.27 log @Changes 1.6.2: - Color management support updated to liblcms version 2. - Various bug fixes. @ text @$NetBSD: patch-af,v 1.26 2011/05/04 20:31:40 adam Exp $ --- dlls/ntdll/signal_i386.c.orig 2009-07-03 18:28:33.000000000 +0200 +++ dlls/ntdll/signal_i386.c @@@@ -446,8 +446,13 @@@@ enum i386_trap_code TRAP_x86_PAGEFLT = T_PAGEFLT, /* Page fault */ TRAP_x86_ARITHTRAP = T_ARITHTRAP, /* Floating point exception */ TRAP_x86_ALIGNFLT = T_ALIGNFLT, /* Alignment check exception */ +#if defined(__NetBSD__) + TRAP_x86_MCHK = T_MCA, /* Machine check exception */ + TRAP_x86_CACHEFLT = T_XMM /* Cache flush exception */ +#else TRAP_x86_MCHK = T_MCHK, /* Machine check exception */ TRAP_x86_CACHEFLT = T_XMMFLT /* Cache flush exception */ +#endif #else TRAP_x86_DIVIDE = 0, /* Division by zero exception */ TRAP_x86_TRCTRAP = 1, /* Single-step exception */ @ 1.26 log @Changes 1.2.3: * Translation updates * Various bug fixes @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.7 2011/05/02 21:23:01 adam Exp $ @ 1.25 log @Fix exception handling on i386. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 52 --- dlls/ntdll/signal_i386.c.orig 2008-06-17 10:07:31.000000000 -0400 +++ dlls/ntdll/signal_i386.c 2008-06-27 18:35:37.000000000 -0400 @@@@ -199,7 +199,7 @@@@ #endif /* bsdi */ -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) typedef struct sigcontext SIGCONTEXT; @@@@ -332,6 +332,39 @@@@ #endif /* __APPLE__ */ +#if defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000) +# include +# include +# include + +typedef ucontext_t SIGCONTEXT; + +#define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.__gregs[_REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBP]) +#define ESP_sig(context) _UC_MACHINE_SP(context) + +#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) +#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) +#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) + +#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_EFL]) +#define EIP_sig(context) _UC_MACHINE_PC(context) +#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) + +#define FPU_sig(context) NULL +#define FPUX_sig(context) ((XMM_SAVE_AREA32 *)&((context)->uc_mcontext.__fpregs)) + +#endif /* __NetBSD__ */ + WINE_DEFAULT_DEBUG_CHANNEL(seh); typedef int (*wine_signal_handler)(unsigned int sig); @@@@ -366,8 +399,13 @@@@ a18 12 @@@@ -1561,7 +1599,11 @@@@ #endif /* HAVE_SIGALTSTACK */ sig_act.sa_mask = server_block_set; +#if defined(__NetBSD__) && (__NetBSD_Version__ < 200000000) + sig_act.sa_flags = SA_RESTART; +#else sig_act.sa_flags = SA_SIGINFO | SA_RESTART; +#endif #ifdef SA_ONSTACK sig_act.sa_flags |= SA_ONSTACK; #endif @ 1.24 log @Update emulators/wine to 1.0, as requested in PR pkg/38985. Add missing dep on libxml2. Also merge some stuff from wip/wine: - more options (esound, ldap, dbus, ssl, x11) - split PLIST to accomodate extra files on Linux and FreeBSD (PR pkg/36320) This also fixes the broken build against current openldap. (PR pkg/38025) @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.23 2007/05/12 20:40:43 adam Exp $ d4 2 a5 2 +++ dlls/ntdll/signal_i386.c 2008-06-22 13:19:30.000000000 -0400 @@@@ -199,7 +199,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -332,6 +332,39 @@@@ typedef ucontext_t SIGCONTEXT; d32 1 a32 1 +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP])) d42 1 a42 1 +#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP])) d54 1 a54 1 @@@@ -366,8 +399,13 @@@@ enum i386_trap_code d68 1 a68 1 @@@@ -1561,7 +1599,11 @@@@ BOOL SIGNAL_Init(void) @ 1.23 log @Changes 0.9.37: - MSI automation with JScript/VBScript support. - Various MSHTML improvements. - The usual assortment of Direct3D fixes. - Support for a few more exe protection schemes. - Lots of bug fixes. @ text @d1 1 a1 1 $NetBSD$ d3 3 a5 3 --- dlls/ntdll/signal_i386.c.orig 2007-05-11 19:35:02.000000000 +0200 +++ dlls/ntdll/signal_i386.c @@@@ -167,7 +167,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -290,6 +290,43 @@@@ typedef ucontext_t SIGCONTEXT; d32 1 d37 1 a39 1 +#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) a41 1 + a42 2 +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP])) + d46 2 a47 4 +#define FAULT_ADDRESS (__siginfo->si_addr) + +#define HANDLER_DEF(name) void name( int __signal, siginfo_t *__siginfo, SIGCONTEXT *__context ) +#define HANDLER_CONTEXT (__context) d54 1 a54 1 @@@@ -322,8 +359,13 @@@@ enum i386_trap_code d68 1 a68 1 @@@@ -1385,7 +1427,11 @@@@ BOOL SIGNAL_Init(void) @ 1.22 log @Changes 0.9.33: - Many Direct3D fixes and performance improvements. - More comctl32 tests and some bug fixes. - Compatibility improvements in cmd.exe. - Still more fixes to builtin OLE. - Support for process control on Solaris. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2007-03-16 17:40:46.000000000 +0100 d72 1 a72 1 @@@@ -1376,7 +1418,11 @@@@ BOOL SIGNAL_Init(void) @ 1.21 log @Changes 0.9.30: - Many improvements to Direct3D shaders and state management. - Support for inter-process memory allocations. - OLE32 marshalling fixes. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2007-01-25 16:53:50.000000000 +0100 d5 1 a5 1 @@@@ -163,7 +163,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -268,6 +268,43 @@@@ typedef ucontext_t SIGCONTEXT; d55 1 a55 2 #include "wine/exception.h" #include "wine/debug.h" d57 2 a58 1 @@@@ -303,8 +340,10 @@@@ enum i386_trap_code d62 4 a65 1 +#if !defined(__NetBSD__) d72 1 a72 12 @@@@ -1152,8 +1191,10 @@@@ static void segv_handler( int signal, si case TRAP_x86_DNA: /* Device not available exception */ case TRAP_x86_DOUBLEFLT: /* Double fault exception */ case TRAP_x86_TSSFLT: /* Invalid TSS exception */ +#if !defined(__NetBSD__) case TRAP_x86_MCHK: /* Machine check exception */ case TRAP_x86_CACHEFLT: /* Cache flush exception */ +#endif rec->ExceptionCode = EXCEPTION_ILLEGAL_INSTRUCTION; break; } @@@@ -1342,7 +1383,11 @@@@ BOOL SIGNAL_Init(void) @ 1.20 log @Changes 0.9.28: - OpenGL in child windows should work again. - Better mouse support in games. - Beginnings of new state management in Direct3D. - Improved audio and font support on Mac OS. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-12-22 17:17:47.000000000 +0100 d80 4 a83 4 @@@@ -1345,7 +1386,11 @@@@ BOOL SIGNAL_Init(void) sigaddset( &sig_act.sa_mask, SIGINT ); sigaddset( &sig_act.sa_mask, SIGUSR1 ); sigaddset( &sig_act.sa_mask, SIGUSR2 ); a88 1 d91 1 @ 1.19 log @Changes 0.9.23: - Massive update of printf formats for Win64 compatibility. - Dynamic drive support on MacOSX. - Still more MSI fixes and improvements. - Lots of bug fixes. Changes 0.9.22: - The usual assortment of MSI improvements. - Several bug fixes to the various common controls. - Pixel shaders enabled by default in D3D. - Various improvements to the build process. - Many translation updates. - Lots of bug fixes. Changes 0.9.20: - XEmbed system tray support. - Many improvements to NTLM support. - Many messages made localizable instead of hardcoded to English. - Improved support for various OpenGL platforms. - More improvements to the IDL compiler. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-10-13 16:43:39.000000000 +0200 d69 1 a69 1 @@@@ -1148,8 +1187,10 @@@@ static void segv_handler( int signal, si d80 1 a80 1 @@@@ -1341,7 +1382,11 @@@@ BOOL SIGNAL_Init(void) @ 1.18 log @Fix signal handling problem in wine. From David Holland in PR 32800. Bump PKGREVISION. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.17 2006/03/06 13:46:01 adam Exp $ d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-07-27 14:55:50.000000000 +0000 d5 1 a5 1 @@@@ -215,7 +215,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -339,8 +339,45 @@@@ typedef ucontext_t SIGCONTEXT; a17 2 -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ||\ - defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) d25 16 a40 16 +#define EAX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EAX]) +#define EBX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBX]) +#define ECX_sig(context) ((context)->uc_mcontext.__gregs[_REG_ECX]) +#define EDX_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDX]) +#define ESI_sig(context) ((context)->uc_mcontext.__gregs[_REG_ESI]) +#define EDI_sig(context) ((context)->uc_mcontext.__gregs[_REG_EDI]) +#define EBP_sig(context) ((context)->uc_mcontext.__gregs[_REG_EBP]) + +#define CS_sig(context) ((context)->uc_mcontext.__gregs[_REG_CS]) +#define DS_sig(context) ((context)->uc_mcontext.__gregs[_REG_DS]) +#define ES_sig(context) ((context)->uc_mcontext.__gregs[_REG_ES]) +#define FS_sig(context) ((context)->uc_mcontext.__gregs[_REG_FS]) +#define GS_sig(context) ((context)->uc_mcontext.__gregs[_REG_GS]) +#define SS_sig(context) ((context)->uc_mcontext.__gregs[_REG_SS]) + +#define EFL_sig(context) ((context)->uc_mcontext.__gregs[_REG_EFL]) d42 2 a43 2 +#define EIP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP])) +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_ESP])) d45 2 a46 2 +#define TRAP_sig(context) ((context)->uc_mcontext.__gregs[_REG_TRAPNO]) +#define ERROR_sig(context) ((context)->uc_mcontext.__gregs[_REG_ERR]) d48 1 a48 1 +#define FAULT_ADDRESS (__siginfo->si_addr) d53 1 a53 1 +#endif /* NetBSD */ d55 2 a56 2 +#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) ||\ + defined(__FreeBSD_kernel__) || defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) d58 24 a81 3 #define EAX_sig(context) ((context)->sc_eax) #define EBX_sig(context) ((context)->sc_ebx) @@@@ -1440,9 +1477,9 @@@@ static int set_handler( int sig, int hav d84 5 d90 2 a91 8 -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) +#if defined(linux) || (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__OpenBSD__) sig_act.sa_flags = SA_RESTART; -#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) +#elif defined (__svr4__) || defined(_SCO_DS) || defined(__APPLE__) || (defined(__NetBSD__) && (__NetBSD_Version__ >= 200000000)) sig_act.sa_flags = SA_SIGINFO | SA_RESTART; #else sig_act.sa_flags = 0; @ 1.17 log @Changes 0.9.9: - Many new features and improvements in Richedit. - More Web browser support. - Recursive directory change notifications. - Wine installation is now fully relocatable. - Direct3D 8 and 9 now use the same code. - Many debugger improvements. - Systray is now handled by the explorer process. - Lots of bug fixes @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-03-02 18:16:51.000000000 +0100 d62 12 @ 1.16 log @Update to 0.9.8: 0.9.8: - Better Web browser support. - Beginnings of a Wordpad application. - Many richedit improvements. - A number of Direct3D fixes. - A few more options in winecfg. - Lots of bug fixes. 0.9.7: - Directory change notifications can use inotify now. - Hardware breakpoints in the Wine debugger. - Beginnings of support for tape APIs. - A bunch of improvements to the IDL compiler. - Better scheme for mapping My Documents etc. to Unix directories. - Lots of bug fixes. pkgsrc change: Install fnt2bdf and bin2res tools. Improve PLIST. Ok adam@@ @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.15 2006/01/20 14:58:18 adam Exp $ d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-02-15 16:02:43.000000000 +0000 d5 1 a5 1 @@@@ -208,7 +208,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -332,8 +332,45 @@@@ typedef ucontext_t SIGCONTEXT; @ 1.15 log @Changes 0.9.6: - A bunch of OLE fixes and improvements. - DirectSound improvements, including full duplex support. - Fix for the Windows metafile vulnerability. - Many static control improvements. - Some fixes for copy protection support. - Lots of bug fixes. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2006-01-19 15:14:04.000000000 +0100 d5 1 a5 1 @@@@ -204,7 +204,7 @@@@ typedef struct trapframe SIGCONTEXT; d9 2 a10 2 -#if defined(__NetBSD__) || defined(__FreeBSD__) || defined(__OpenBSD__) +#if (defined(__NetBSD__) && (__NetBSD_Version__ < 200000000)) || defined(__FreeBSD__) || defined(__OpenBSD__) d14 1 a14 1 @@@@ -328,7 +328,45 @@@@ typedef ucontext_t SIGCONTEXT; d18 2 a19 1 -#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) ||\ a56 1 + d58 1 a58 1 defined(__OpenBSD__) || defined(__EMX__) || defined(__CYGWIN__) d61 1 @ 1.14 log @Changes 20050930: - Joystick force feedback support. - Beginnings of Win64 support. - Many MSI fixes and cleanups. - Font linking support. - Several OLE fixes. - Some fixes for MacOS/x86. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2005-09-27 09:36:15.000000000 +0000 d14 1 a14 1 @@@@ -325,7 +325,40 @@@@ typedef ucontext_t SIGCONTEXT; d24 1 a24 4 +typedef struct __ucontext SIGCONTEXT; + +#define HANDLER_DEF(name) void name( int __signal, int code, SIGCONTEXT *__context ) +#define HANDLER_CONTEXT __context d44 9 a52 1 +#define ESP_sig(context) (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_EIP])) @ 1.13 log @Changes 20050725: * Beginnings of theme support in common controls. * Many MSHTML improvements. * A bunch of OLE fixes for InstallShield installers. * Many Direct3D fixes and improvements. * Beginnings of LDAP support. * Various cleanups after removal of the config file. * Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2005-07-03 11:24:54.000000000 +0000 d14 1 a14 1 @@@@ -324,7 +324,40 @@@@ typedef struct sigcontext SIGCONTEXT; @ 1.12 log @Changes 20050419: - Mailslot support. - Support for side mouse buttons (X buttons). - More Richedit improvements. - Loading of Windows registry files disabled for now. - Many code cleanups. - Lots of bug fixes. Changes 20050524: - Many MSI improvements. - More features in the file manager. - Better compatibility for Winelib import libraries. - SGML documentation moved out of the source tree. - Header files cleanups. - Lots of bug fixes. @ text @d3 1 a3 1 --- dlls/ntdll/signal_i386.c.orig 2005-05-16 17:52:10.000000000 +0000 d5 1 a5 1 @@@@ -205,7 +205,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -305,7 +305,40 @@@@ typedef struct ucontext SIGCONTEXT; @ 1.11 log @NetBSD-1.6.2 does not have . So only use it for NetBSD>=2.0. Approved by wiz. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.10 2005/02/16 12:22:11 adam Exp $ d3 3 a5 3 --- dlls/ntdll/signal_i386.c.orig Thu Dec 2 19:19:25 2004 +++ dlls/ntdll/signal_i386.c Fri Feb 25 01:31:18 2005 @@@@ -206,7 +206,7 @@@@ typedef struct trapframe SIGCONTEXT; d14 1 a14 1 @@@@ -306,7 +306,40 @@@@ typedef struct ucontext SIGCONTEXT; @ 1.10 log @Changes 20050211: * Still more work on the MSI dll. * More OLE work, including a builtin stdole32.tlb. * Fixed inter-process window resize and repaint. * Lots of bug fixes. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- dlls/ntdll/signal_i386.c.orig 2005-02-16 10:30:28.000000000 +0000 +++ dlls/ntdll/signal_i386.c d10 1 a10 1 +#if defined(__FreeBSD__) || defined(__OpenBSD__) d19 1 a19 1 +#if defined(__NetBSD__) d52 1 a52 1 +#if defined(linux) || defined(__FreeBSD__) ||\ @ 1.9 log @Changes 20050111: - Many OLE bug fixes and improvements. - A lot more work on the MSI dll. - Update regions now handled in the Wine server. - Beginnings of typelib generation in the IDL compiler. - Many janitorial cleanups. - Lots of bug fixes. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.8 2004/08/28 21:09:08 ben Exp $ d3 3 a5 14 --- dlls/winmm/wineoss/audio.c.orig Tue May 4 18:09:24 2004 +++ dlls/winmm/wineoss/audio.c @@@@ -958,10 +958,10 @@@@ LONG OSS_WaveInit(void) for (i = 0; i < MAX_WAVEDRV; ++i) { if (i == 0) { - sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp"); + sprintf((char *)OSS_Devices[i].dev_name, DEVOSSAUDIO); sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer"); } else { - sprintf((char *)OSS_Devices[i].dev_name, "/dev/dsp%d", i); + sprintf((char *)OSS_Devices[i].dev_name, "%s%d", DEVOSSAUDIO, i); sprintf((char *)OSS_Devices[i].mixer_name, "/dev/mixer%d", i); } d7 49 @ 1.8 log @Patch wine to use mk/ossaudio.buildlink3.mk and DEVOSSAUDIO instead of hardcoding /dev/dsp. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Changes 20040505: - Many more filesystem improvements, including autodetection of drive types and devices, and support for editing the drive configuration with winecfg. - Many Direct3D improvements. - Several fixes to the various sound drivers. - Lots of bug fixes @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.6 2004/04/09 12:44:22 adam Exp $ d3 14 a16 8 --- programs/winetest/util.c.orig 2004-04-09 14:30:40.000000000 +0000 +++ programs/winetest/util.c @@@@ -19,7 +19,6 @@@@ * */ #include -#include #include a17 1 #include "winetest.h" @ 1.6 log @Changes 20040408: * DOS devices and drives are now configured through symlinks. * Many shell32 improvements. * New task manager merged from ReactOS. * First version of wineprefixcreate tool for initial setup. * Lots of bug fixes. @ text @d1 1 a1 1 $NetBSD$ @ 1.5 log @Update Wine to 20020228 snapshot. @ text @d1 1 a1 1 $NetBSD: patch-af,v 1.4 1998/12/14 02:17:11 tv Exp $ d3 8 a10 5 --- multimedia/mcicda.c.orig Thu Dec 10 04:03:00 1998 +++ multimedia/mcicda.c Sun Dec 13 11:00:34 1998 @@@@ -18,6 +18,10 @@@@ #include "debug.h" #include "multimedia.h" d12 1 a12 519 +#ifdef __NetBSD__ +#include +#include +#else #ifdef HAVE_LINUX_CDROM_H # include #endif @@@@ -30,12 +34,17 @@@@ #ifdef HAVE_SYS_CDIO_H # include #endif +#endif +#ifdef __NetBSD__ +#define CDAUDIO_DEV "/dev/rcd0d" +#else #ifdef __FreeBSD__ # define CDAUDIO_DEV "/dev/rcd0c" #else # define CDAUDIO_DEV "/dev/cdrom" #endif +#endif #ifdef SOUND_VERSION # define IOCTL(a,b,c) ioctl(a,b,&c) @@@@ -50,7 +59,7 @@@@ #define CDFRAMES_PERMIN 4500 #define SECONDS_PERMIN 60 -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) typedef struct { int nUseCount; /* Incremented for each shared open */ BOOL16 fShareable; /* TRUE if first open was shareable */ @@@@ -61,7 +70,7 @@@@ int unixdev; #ifdef linux struct cdrom_subchnl sc; -#elif defined(__FreeBSD__) +#else struct cd_sub_channel_info sc; #endif int cdMode; @@@@ -103,27 +112,25 @@@@ */ static UINT16 CDAUDIO_GetNumberOfTracks(WINE_CDAUDIO* wcda) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) #ifdef linux struct cdrom_tochdr hdr; -#elif defined(__FreeBSD__) +#else struct ioc_toc_header hdr; #endif if (wcda->nTracks == 0) { - if (ioctl(wcda->unixdev, #ifdef linux - CDROMREADTOCHDR -#elif defined(__FreeBSD__) - CDIOREADTOCHEADER + if (ioctl(wcda->unixdev, CDROMREADTOCHDR, &hdr)) { +#else + if (ioctl(wcda->unixdev, CDIOREADTOCHEADER, &hdr)) { #endif - , &hdr)) { WARN(cdaudio, "(%p) -- Error occured !\n", wcda); return (WORD)-1; } #ifdef linux wcda->nTracks = hdr.cdth_trk1; -#elif defined(__FreeBSD__) +#else wcda->nTracks = hdr.ending_track - hdr.starting_track + 1; #endif } @@@@ -139,13 +146,13 @@@@ */ static BOOL32 CDAUDIO_GetTracksInfo(WINE_CDAUDIO* wcda) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) int i, length; int start, last_start = 0; int total_length = 0; #ifdef linux struct cdrom_tocentry entry; -#elif defined(__FreeBSD__) +#else struct ioc_read_toc_entry entry; struct cd_toc_entry toc_buffer; #endif @@@@ -177,31 +184,29 @@@@ if (i == wcda->nTracks) #ifdef linux entry.cdte_track = CDROM_LEADOUT; -#elif defined(__FreeBSD__) +#else #define LEADOUT 0xaa entry.starting_track = LEADOUT; /* XXX */ #endif else #ifdef linux entry.cdte_track = i + 1; -#elif defined(__FreeBSD__) +#else entry.starting_track = i + 1; #endif #ifdef linux entry.cdte_format = CDROM_MSF; -#elif defined(__FreeBSD__) +#else bzero((char *)&toc_buffer, sizeof(toc_buffer)); entry.address_format = CD_MSF_FORMAT; entry.data_len = sizeof(toc_buffer); entry.data = &toc_buffer; #endif - if (ioctl(wcda->unixdev, #ifdef linux - CDROMREADTOCENTRY -#elif defined(__FreeBSD__) - CDIOREADTOCENTRYS + if (ioctl(wcda->unixdev, CDROMREADTOCENTRY, &entry)) { +#else + if (ioctl(wcda->unixdev, CDIOREADTOCENTRYS, &entry)) { #endif - , &entry)) { WARN(cdaudio, "error read entry\n"); return FALSE; } @@@@ -209,7 +214,7 @@@@ start = CDFRAMES_PERSEC * (SECONDS_PERMIN * entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) + entry.cdte_addr.msf.frame; -#elif defined(__FreeBSD__) +#else start = CDFRAMES_PERSEC * (SECONDS_PERMIN * toc_buffer.addr.msf.minute + toc_buffer.addr.msf.second) + toc_buffer.addr.msf.frame; @@@@ -230,7 +235,7 @@@@ wcda->lpbTrackFlags[i] = #ifdef linux (entry.cdte_adr << 4) | (entry.cdte_ctrl & 0x0f); -#elif defined(__FreeBSD__) +#else (toc_buffer.addr_type << 4) | (toc_buffer.control & 0x0f); #endif TRACE(cdaudio, "track #%u flags=%02x\n", i + 1, wcda->lpbTrackFlags[i]); @@@@ -248,7 +253,7 @@@@ */ static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS32A lpOpenParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) DWORD dwDeviceID; WINE_CDAUDIO* wcda; @@@@ -328,7 +333,7 @@@@ */ static DWORD CDAUDIO_mciClose(UINT16 wDevID, DWORD dwParam, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); @@@@ -351,7 +356,7 @@@@ static DWORD CDAUDIO_mciGetDevCaps(UINT16 wDevID, DWORD dwFlags, LPMCI_GETDEVCAPS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; @@@@ -403,7 +408,7 @@@@ */ static DWORD CDAUDIO_mciInfo(UINT16 wDevID, DWORD dwFlags, LPMCI_INFO_PARMS16 lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) DWORD ret = 0; LPSTR str = 0; WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); @@@@ -445,7 +450,7 @@@@ static DWORD CDAUDIO_CalcFrame(WINE_CDAUDIO* wcda, DWORD dwTime) { DWORD dwFrame = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) UINT16 wTrack; TRACE(cdaudio,"(%p, %08lX, %lu);\n", wcda, wcda->dwTimeFormat, dwTime); @@@@ -487,9 +492,9 @@@@ */ static BOOL32 CDAUDIO_GetCDStatus(WINE_CDAUDIO* wcda) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) int oldmode = wcda->cdMode; -#ifdef __FreeBSD__ +#if defined(__FreeBSD__) || defined(__NetBSD__) struct ioc_read_subchannel read_sc; read_sc.address_format = CD_MSF_FORMAT; @@@@ -500,13 +505,11 @@@@ #elif linux wcda->sc.cdsc_format = CDROM_MSF; #endif - if (ioctl(wcda->unixdev, #ifdef linux - CDROMSUBCHNL, &wcda->sc -#elif defined(__FreeBSD__) - CDIOCREADSUBCHANNEL, &read_sc + if (ioctl(wcda->unixdev, CDROMSUBCHNL, &wcda->sc)) { +#else + if (ioctl(wcda->unixdev, CDIOCREADSUBCHANNEL, &read_sc)) { #endif - )) { TRACE(cdaudio,"opened or no_media !\n"); wcda->cdMode = MCI_MODE_OPEN; /* was NOT_READY */ return TRUE; @@@@ -514,13 +517,13 @@@@ switch ( #ifdef linux wcda->sc.cdsc_audiostatus -#elif defined(__FreeBSD__) +#else wcda->sc.header.audio_status #endif ) { #ifdef linux case CDROM_AUDIO_INVALID: -#elif defined(__FreeBSD__) +#else case CD_AS_AUDIO_INVALID: #endif WARN(cdaudio, "device doesn't support status, using MCI status.\n"); @@@@ -528,7 +531,7 @@@@ break; #ifdef linux case CDROM_AUDIO_NO_STATUS: -#elif defined(__FreeBSD__) +#else case CD_AS_NO_STATUS: #endif wcda->cdMode = MCI_MODE_STOP; @@@@ -536,7 +539,7 @@@@ break; #ifdef linux case CDROM_AUDIO_PLAY: -#elif defined(__FreeBSD__) +#else case CD_AS_PLAY_IN_PROGRESS: #endif wcda->cdMode = MCI_MODE_PLAY; @@@@ -544,7 +547,7 @@@@ break; #ifdef linux case CDROM_AUDIO_PAUSED: -#elif defined(__FreeBSD__) +#else case CD_AS_PLAY_PAUSED: #endif wcda->cdMode = MCI_MODE_PAUSE; @@@@ -554,7 +557,7 @@@@ #ifdef linux TRACE(cdaudio,"status=%02X !\n", wcda->sc.cdsc_audiostatus); -#elif defined(__FreeBSD__) +#else TRACE(cdaudio,"status=%02X !\n", wcda->sc.header.audio_status); #endif @@@@ -565,7 +568,7 @@@@ CDFRAMES_PERMIN * wcda->sc.cdsc_absaddr.msf.minute + CDFRAMES_PERSEC * wcda->sc.cdsc_absaddr.msf.second + wcda->sc.cdsc_absaddr.msf.frame; -#elif defined(__FreeBSD__) +#else wcda->nCurTrack = wcda->sc.what.position.track_number; wcda->dwCurFrame = CDFRAMES_PERMIN * wcda->sc.what.position.absaddr.msf.minute + @@@@ -578,7 +581,7 @@@@ wcda->sc.cdsc_absaddr.msf.minute, wcda->sc.cdsc_absaddr.msf.second, wcda->sc.cdsc_absaddr.msf.frame); -#elif defined(__FreeBSD__) +#else TRACE(cdaudio,"%02u-%02u:%02u:%02u \n", wcda->sc.what.position.track_number, wcda->sc.what.position.absaddr.msf.minute, @@@@ -605,7 +608,7 @@@@ static DWORD CDAUDIO_CalcTime(WINE_CDAUDIO* wcda, DWORD dwFrame) { DWORD dwTime = 0; -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) UINT16 wTrack; UINT16 wMinutes; UINT16 wSeconds; @@@@ -651,7 +654,7 @@@@ */ static DWORD CDAUDIO_mciStatus(UINT16 wDevID, DWORD dwFlags, LPMCI_STATUS_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); DWORD ret = 0; @@@@ -759,13 +762,13 @@@@ */ static DWORD CDAUDIO_mciPlay(UINT16 wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) int start, end; WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); DWORD ret = 0; #ifdef linux struct cdrom_msf msf; -#elif defined(__FreeBSD__) +#else struct ioc_play_msf msf; #endif @@@@ -796,7 +799,7 @@@@ msf.cdmsf_min1 = end / CDFRAMES_PERMIN; msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.cdmsf_frame1 = end % CDFRAMES_PERSEC; -#elif defined(__FreeBSD__) +#else msf.start_m = start / CDFRAMES_PERMIN; msf.start_s = (start % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.start_f = start % CDFRAMES_PERSEC; @@@@ -804,23 +807,19 @@@@ msf.end_s = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.end_f = end % CDFRAMES_PERSEC; #endif - if (ioctl(wcda->unixdev, #ifdef linux - CDROMSTART -#elif defined(__FreeBSD__) - CDIOCSTART + if (ioctl(wcda->unixdev, CDROMSTART)) { +#else + if (ioctl(wcda->unixdev, CDIOCSTART, NULL)) { #endif - )) { WARN(cdaudio, "motor doesn't start !\n"); return MCIERR_HARDWARE; } - if (ioctl(wcda->unixdev, #ifdef linux - CDROMPLAYMSF -#elif defined(__FreeBSD__) - CDIOCPLAYMSF + if (ioctl(wcda->unixdev, CDROMPLAYMSF, &msf)) { +#else + if (ioctl(wcda->unixdev, CDIOCPLAYMSF, &msf)) { #endif - , &msf)) { WARN(cdaudio, "device doesn't play !\n"); return MCIERR_HARDWARE; } @@@@ -828,7 +827,7 @@@@ TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0, msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); -#elif defined(__FreeBSD__) +#else TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", msf.start_m, msf.start_s, msf.start_f, msf.end_m, msf.end_s, msf.end_f); @@@@ -854,20 +853,19 @@@@ */ static DWORD CDAUDIO_mciStop(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (ioctl(wcda->unixdev, #ifdef linux - CDROMSTOP -#elif defined(__FreeBSD__) - CDIOCSTOP + if (ioctl(wcda->unixdev, CDROMSTOP)) +#else + if (ioctl(wcda->unixdev, CDIOCSTOP, NULL)) #endif - )) return MCIERR_HARDWARE; + return MCIERR_HARDWARE; wcda->mciMode = MCI_MODE_STOP; if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); @@@@ -885,20 +883,19 @@@@ */ static DWORD CDAUDIO_mciPause(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (ioctl(wcda->unixdev, #ifdef linux - CDROMPAUSE -#elif defined(__FreeBSD__) - CDIOCPAUSE + if (ioctl(wcda->unixdev, CDROMPAUSE)) +#else + if (ioctl(wcda->unixdev, CDIOCPAUSE, NULL)) #endif - )) return MCIERR_HARDWARE; + return MCIERR_HARDWARE; wcda->mciMode = MCI_MODE_PAUSE; if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); @@@@ -916,20 +913,19 @@@@ */ static DWORD CDAUDIO_mciResume(UINT16 wDevID, DWORD dwFlags, LPMCI_GENERIC_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; - if (ioctl(wcda->unixdev, #ifdef linux - CDROMRESUME -#elif defined(__FreeBSD__) - CDIOCRESUME + if (ioctl(wcda->unixdev, CDROMRESUME)) +#else + if (ioctl(wcda->unixdev, CDIOCRESUME, NULL)) #endif - )) return MCIERR_HARDWARE; + return MCIERR_HARDWARE; wcda->mciMode = MCI_MODE_STOP; if (lpParms && (dwFlags & MCI_NOTIFY)) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", lpParms->dwCallback); @@@@ -947,7 +943,7 @@@@ */ static DWORD CDAUDIO_mciSeek(UINT16 wDevID, DWORD dwFlags, LPMCI_SEEK_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) DWORD dwRet; MCI_PLAY_PARMS PlayParms; WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); @@@@ -957,13 +953,11 @@@@ if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; if (lpParms == NULL) return MCIERR_NULL_PARAMETER_BLOCK; - if (ioctl(wcda->unixdev, #ifdef linux - CDROMRESUME -#elif defined(__FreeBSD__) - CDIOCRESUME + if (ioctl(wcda->unixdev, CDROMRESUME)) { +#else + if (ioctl(wcda->unixdev, CDIOCRESUME, NULL)) { #endif - )) { perror("ioctl CDROMRESUME"); return MCIERR_HARDWARE; } @@@@ -1004,16 +998,16 @@@@ if (wcda == NULL) return MCIERR_INVALID_DEVICE_ID; -#ifdef __FreeBSD__ - if (ioctl(wcda->unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; + #if defined(__FreeBSD__) || defined(__NetBSD__) + if (ioctl(wcda->unixdev, CDIOCALLOW, NULL)) return MCIERR_HARDWARE; if (open) { - if (ioctl(wcda->unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; + if (ioctl(wcda->unixdev, CDIOCEJECT, NULL)) return MCIERR_HARDWARE; wcda->mciMode = MCI_MODE_OPEN; } else { - if (ioctl(wcda->unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; + if (ioctl(wcda->unixdev, CDIOCCLOSE, NULL)) return MCIERR_HARDWARE; wcda->mciMode = MCI_MODE_STOP; } - if (ioctl(wcda->unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; + if (ioctl(wcda->unixdev, CDIOCPREVENT, NULL)) return MCIERR_HARDWARE; #elif linux if (open) { if (ioctl(wcda->unixdev, CDROMEJECT)) return MCIERR_HARDWARE; @@@@ -1032,7 +1026,7 @@@@ */ static DWORD CDAUDIO_mciSet(UINT16 wDevID, DWORD dwFlags, LPMCI_SET_PARMS lpParms) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) WINE_CDAUDIO* wcda = CDAUDIO_mciGetOpenDrv(wDevID); TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); @@@@ -1087,7 +1081,7 @@@@ LONG MCICDAUDIO_DriverProc32(DWORD dwDevID, HDRVR16 hDriv, DWORD wMsg, DWORD dwParam1, DWORD dwParam2) { -#if defined(linux) || defined(__FreeBSD__) +#if defined(linux) || defined(__FreeBSD__) || defined(__NetBSD__) switch(wMsg) { case DRV_LOAD: return 1; case DRV_FREE: return 1; @ 1.4 log @Update to 981211. Works even better now, though the compile-for-native still does not work quite right (the global constructors created by wrc don't work). @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Add NetBSD RCS Ids. @ text @d3 3 a5 4 --- multimedia/mcicda.c.orig Sun May 31 18:14:54 1998 +++ multimedia/mcicda.c Fri Jun 19 19:30:10 1998 @@@@ -15,6 +15,10 @@@@ #include "mmsystem.h" d7 1 d16 1 a16 1 @@@@ -24,12 +28,17 @@@@ d34 1 a34 1 @@@@ -44,7 +53,7 @@@@ d41 4 a44 4 int nUseCount; /* Incremented for each shared open */ BOOL16 fShareable; /* TRUE if first open was shareable */ @@@@ -55,7 +64,7 @@@@ int unixdev; d46 2 a47 2 struct cdrom_subchnl sc; -#elif __FreeBSD__ d49 1 a49 1 struct cd_sub_channel_info sc; d51 4 a54 4 int mode; @@@@ -80,28 +89,26 @@@@ */ static UINT16 CDAUDIO_GetNumberOfTracks(UINT16 wDevID) d59 2 a60 2 struct cdrom_tochdr hdr; -#elif __FreeBSD__ d62 1 a62 1 struct ioc_toc_header hdr; d64 3 a66 3 if (CDADev[wDevID].nTracks == 0) { - if (ioctl(CDADev[wDevID].unixdev, d68 11 a78 12 - CDROMREADTOCHDR -#elif __FreeBSD__ - CDIOREADTOCHEADER + if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCHDR, &hdr)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOREADTOCHEADER, &hdr)) { #endif - , &hdr)) { WARN(cdaudio, "(%04X) -- Error occured !\n", wDevID); return (WORD)-1; } d80 2 a81 2 CDADev[wDevID].nTracks = hdr.cdth_trk1; -#elif __FreeBSD__ d83 1 a83 1 CDADev[wDevID].nTracks = hdr.ending_track - hdr.starting_track + 1; d85 4 a88 4 } @@@@ -117,13 +124,13 @@@@ */ static BOOL32 CDAUDIO_GetTracksInfo(UINT16 wDevID) d92 3 a94 3 int i, length; int start, last_start = 0; int total_length = 0; d96 2 a97 2 struct cdrom_tocentry entry; -#elif __FreeBSD__ d99 2 a100 2 struct ioc_read_toc_entry entry; struct cd_toc_entry toc_buffer; d102 2 a103 2 @@@@ -154,31 +161,29 @@@@ if (i == CDADev[wDevID].nTracks) d105 2 a106 2 entry.cdte_track = CDROM_LEADOUT; -#elif __FreeBSD__ d109 1 a109 1 entry.starting_track = LEADOUT; /* XXX */ d111 1 a111 1 else d113 2 a114 2 entry.cdte_track = i + 1; -#elif __FreeBSD__ d116 1 a116 1 entry.starting_track = i + 1; d119 2 a120 2 entry.cdte_format = CDROM_MSF; -#elif __FreeBSD__ d122 4 a125 4 bzero((char *)&toc_buffer, sizeof(toc_buffer)); entry.address_format = CD_MSF_FORMAT; entry.data_len = sizeof(toc_buffer); entry.data = &toc_buffer; d127 1 a127 1 - if (ioctl(CDADev[wDevID].unixdev, d129 4 a132 4 - CDROMREADTOCENTRY -#elif __FreeBSD__ - CDIOREADTOCENTRYS + if (ioctl(CDADev[wDevID].unixdev, CDROMREADTOCENTRY, &entry)) { d134 1 a134 1 + if (ioctl(CDADev[wDevID].unixdev, CDIOREADTOCENTRYS, &entry)) { d136 25 a160 16 - , &entry)) { WARN(cdaudio, "error read entry\n"); return FALSE; } @@@@ -186,7 +191,7 @@@@ start = CDFRAMES_PERSEC * (SECONDS_PERMIN * entry.cdte_addr.msf.minute + entry.cdte_addr.msf.second) + entry.cdte_addr.msf.frame; -#elif __FreeBSD__ +#else start = CDFRAMES_PERSEC * (SECONDS_PERMIN * toc_buffer.addr.msf.minute + toc_buffer.addr.msf.second) + toc_buffer.addr.msf.frame; @@@@ -223,7 +228,7 @@@@ */ static DWORD CDAUDIO_mciOpen(UINT16 wDevID, DWORD dwFlags, LPMCI_OPEN_PARMS16 lpParms) d164 5 a168 5 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -286,7 +291,7 @@@@ */ d173 4 a176 4 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwParam, lpParms); if (CDADev[wDevID].lpdwTrackLen != NULL) free(CDADev[wDevID].lpdwTrackLen); @@@@ -302,7 +307,7 @@@@ d178 1 a178 1 LPMCI_GETDEVCAPS_PARMS lpParms) d182 5 a186 5 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -354,7 +359,7 @@@@ */ d191 5 a195 5 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -383,7 +388,7 @@@@ static DWORD CDAUDIO_CalcFrame(UINT16 wDevID, DWORD dwFormatType, DWORD dwTime) d197 1 a197 1 DWORD dwFrame = 0; d200 1 a200 1 UINT16 wTrack; d202 4 a205 4 TRACE(cdaudio,"(%04X, %08lX, %lu);\n", @@@@ -429,9 +434,11 @@@@ */ static BOOL32 CDAUDIO_GetCDStatus(UINT16 wDevID) d209 1 a209 1 int oldmode = CDADev[wDevID].mode; d211 7 a217 21 +#ifdef linux + CDADev[wDevID].sc.cdsc_format = CDROM_MSF; +#else struct ioc_read_subchannel read_sc; read_sc.address_format = CD_MSF_FORMAT; @@@@ -439,16 +446,12 @@@@ read_sc.track = 0; read_sc.data_len = sizeof(CDADev[wDevID].sc); read_sc.data = (struct cd_sub_channel_info *)&CDADev[wDevID].sc; -#elif linux - CDADev[wDevID].sc.cdsc_format = CDROM_MSF; #endif - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSUBCHNL, &CDADev[wDevID].sc -#elif __FreeBSD__ - CDIOCREADSUBCHANNEL, &read_sc + if (ioctl(CDADev[wDevID].unixdev, CDROMSUBCHNL, &CDADev[wDevID].sc)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCREADSUBCHANNEL, &read_sc)) { d219 1 a219 6 - )) { TRACE(cdaudio,"opened or no_media !\n"); CDADev[wDevID].mode = MCI_MODE_NOT_READY; return TRUE; @@@@ -456,25 +459,25 @@@@ switch ( d221 4 a224 2 CDADev[wDevID].sc.cdsc_audiostatus -#elif __FreeBSD__ d226 1 a226 1 CDADev[wDevID].sc.header.audio_status d228 6 a233 1 ) { d235 2 a236 2 case CDROM_AUDIO_INVALID: -#elif __FreeBSD__ d238 1 a238 1 case CD_AS_AUDIO_INVALID: d240 1 a240 1 WARN(cdaudio, "device doesn't support status, returning NOT_READY.\n"); d242 2 a243 2 CDADev[wDevID].mode = MCI_MODE_NOT_READY; -#elif __FreeBSD__ d245 1 a245 1 CDADev[wDevID].mode = MCI_MODE_STOP; d247 3 a249 1 break; d251 2 a252 2 case CDROM_AUDIO_NO_STATUS: -#elif __FreeBSD__ d254 1 a254 1 case CD_AS_NO_STATUS: d256 3 a258 3 CDADev[wDevID].mode = MCI_MODE_STOP; @@@@ -482,7 +485,7 @@@@ break; d260 2 a261 2 case CDROM_AUDIO_PLAY: -#elif __FreeBSD__ d263 1 a263 1 case CD_AS_PLAY_IN_PROGRESS: d265 3 a267 3 CDADev[wDevID].mode = MCI_MODE_PLAY; @@@@ -490,7 +493,7 @@@@ break; d269 2 a270 2 case CDROM_AUDIO_PAUSED: -#elif __FreeBSD__ d272 1 a272 1 case CD_AS_PLAY_PAUSED: d274 2 a275 2 CDADev[wDevID].mode = MCI_MODE_PAUSE; @@@@ -500,7 +503,7 @@@@ d277 3 a279 3 TRACE(cdaudio,"status=%02X !\n", CDADev[wDevID].sc.cdsc_audiostatus); -#elif __FreeBSD__ d281 2 a282 2 TRACE(cdaudio,"status=%02X !\n", CDADev[wDevID].sc.header.audio_status); d284 5 a288 5 @@@@ -511,7 +514,7 @@@@ CDFRAMES_PERMIN * CDADev[wDevID].sc.cdsc_absaddr.msf.minute + CDFRAMES_PERSEC * CDADev[wDevID].sc.cdsc_absaddr.msf.second + CDADev[wDevID].sc.cdsc_absaddr.msf.frame; -#elif __FreeBSD__ d290 8 a297 8 CDADev[wDevID].nCurTrack = CDADev[wDevID].sc.what.position.track_number; CDADev[wDevID].dwCurFrame = CDFRAMES_PERMIN * CDADev[wDevID].sc.what.position.absaddr.msf.minute + @@@@ -524,7 +527,7 @@@@ CDADev[wDevID].sc.cdsc_absaddr.msf.minute, CDADev[wDevID].sc.cdsc_absaddr.msf.second, CDADev[wDevID].sc.cdsc_absaddr.msf.frame); -#elif __FreeBSD__ d299 5 a303 5 TRACE(cdaudio,"%02u-%02u:%02u:%02u \n", CDADev[wDevID].sc.what.position.track_number, CDADev[wDevID].sc.what.position.absaddr.msf.minute, @@@@ -551,7 +554,7 @@@@ static DWORD CDAUDIO_CalcTime(UINT16 wDevID, DWORD dwFormatType, DWORD dwFrame) d305 1 a305 1 DWORD dwTime = 0; d308 5 a312 5 UINT16 wTrack; UINT16 wMinutes; UINT16 wSeconds; @@@@ -604,7 +607,7 @@@@ */ d317 5 a321 5 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; @@@@ -705,11 +708,11 @@@@ */ d326 3 a328 1 int start, end; d330 2 a331 2 struct cdrom_msf msf; -#elif __FreeBSD__ d333 1 a333 1 struct ioc_play_msf msf; d335 51 a385 51 @@@@ -740,7 +743,7 @@@@ msf.cdmsf_min1 = end / CDFRAMES_PERMIN; msf.cdmsf_sec1 = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.cdmsf_frame1 = end % CDFRAMES_PERSEC; -#elif __FreeBSD__ +#else msf.start_m = start / CDFRAMES_PERMIN; msf.start_s = (start % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.start_f = start % CDFRAMES_PERSEC; @@@@ -748,23 +751,19 @@@@ msf.end_s = (end % CDFRAMES_PERMIN) / CDFRAMES_PERSEC; msf.end_f = end % CDFRAMES_PERSEC; #endif - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSTART -#elif __FreeBSD__ - CDIOCSTART + if (ioctl(CDADev[wDevID].unixdev, CDROMSTART)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCSTART, 0)) { #endif - )) { WARN(cdaudio, "motor doesn't start !\n"); return MCIERR_HARDWARE; } - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMPLAYMSF -#elif __FreeBSD__ - CDIOCPLAYMSF + if (ioctl(CDADev[wDevID].unixdev, CDROMPLAYMSF, &msf)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCPLAYMSF, &msf)) { #endif - , &msf)) { WARN(cdaudio, "device doesn't play !\n"); return MCIERR_HARDWARE; } @@@@ -772,7 +771,7 @@@@ TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", msf.cdmsf_min0, msf.cdmsf_sec0, msf.cdmsf_frame0, msf.cdmsf_min1, msf.cdmsf_sec1, msf.cdmsf_frame1); -#elif __FreeBSD__ +#else TRACE(cdaudio,"msf = %d:%d:%d %d:%d:%d\n", msf.start_m, msf.start_s, msf.start_f, msf.end_m, msf.end_s, msf.end_f); @@@@ -797,17 +796,15 @@@@ */ d390 22 a411 18 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMSTOP -#elif __FreeBSD__ - CDIOCSTOP + if (ioctl(CDADev[wDevID].unixdev, CDROMSTOP)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCSTOP, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_STOP; if (dwFlags & MCI_NOTIFY) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", @@@@ -826,17 +823,15 @@@@ */ d416 22 a437 18 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMPAUSE -#elif __FreeBSD__ - CDIOCPAUSE + if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCRESUME, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_PAUSE; if (dwFlags & MCI_NOTIFY) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", @@@@ -855,17 +850,15 @@@@ */ d442 22 a463 18 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMRESUME -#elif __FreeBSD__ - CDIOCRESUME + if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCRESUME, 0)) return MCIERR_HARDWARE; #endif - )) return MCIERR_HARDWARE; CDADev[wDevID].mode = MCI_MODE_STOP; if (dwFlags & MCI_NOTIFY) { TRACE(cdaudio, "MCI_NOTIFY_SUCCESSFUL %08lX !\n", @@@@ -884,19 +877,17 @@@@ */ d468 44 a511 20 DWORD dwRet; MCI_PLAY_PARMS PlayParms; TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; - if (ioctl(CDADev[wDevID].unixdev, #ifdef linux - CDROMRESUME -#elif __FreeBSD__ - CDIOCRESUME + if (ioctl(CDADev[wDevID].unixdev, CDROMRESUME)) { +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCRESUME, 0)) { #endif - )) { perror("ioctl CDROMRESUME"); return MCIERR_HARDWARE; } @@@@ -933,7 +924,7 @@@@ */ d516 6 a521 41 TRACE(cdaudio,"(%04X, %08lX, %p);\n", wDevID, dwFlags, lpParms); if (lpParms == NULL) return MCIERR_INTERNAL; /* @@@@ -959,24 +950,24 @@@@ } if (dwFlags & MCI_SET_DOOR_OPEN) { TRACE(cdaudio, "MCI_SET_DOOR_OPEN !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[wDevID].unixdev, CDIOCEJECT, 0)) return MCIERR_HARDWARE; #endif CDADev[wDevID].nTracks = 0; } if (dwFlags & MCI_SET_DOOR_CLOSED) { TRACE(cdaudio, "MCI_SET_DOOR_CLOSED !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; - if (ioctl(CDADev[wDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[wDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; /* XXX should it be ",1" ??? */ +#else + if (ioctl(CDADev[wDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; +#ifdef CDIOCCLOSE + if (ioctl(CDADev[wDevID].unixdev, CDIOCCLOSE, 0)) return MCIERR_HARDWARE; +#endif #endif CDADev[wDevID].nTracks = 0; } @@@@ -1002,7 +993,7 @@@@ LONG CDAUDIO_DriverProc(DWORD dwDevID, HDRVR16 hDriv, WORD wMsg, DWORD dwParam1, DWORD dwParam2) d525 3 a527 38 switch(wMsg) { case DRV_LOAD: return 1; @@@@ -1059,23 +1050,24 @@@@ (LPMCI_SEEK_PARMS)PTR_SEG_TO_LIN(dwParam2)); case MCI_SET_DOOR_OPEN: TRACE(cdaudio, "MCI_SET_DOOR_OPEN !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCEJECT)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; + if (ioctl(CDADev[dwDevID].unixdev, CDIOCEJECT, 0)) return MCIERR_HARDWARE; #endif CDADev[dwDevID].nTracks = 0; return 0; case MCI_SET_DOOR_CLOSED: TRACE(cdaudio,"MCI_SET_DOOR_CLOSED !\n"); -#ifdef __FreeBSD__ - if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCCLOSE)) return MCIERR_HARDWARE; - if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT)) return MCIERR_HARDWARE; -#elif linux +#ifdef linux if (ioctl(CDADev[dwDevID].unixdev, CDROMEJECT, 1)) return MCIERR_HARDWARE; +#else + if (ioctl(CDADev[dwDevID].unixdev, CDIOCALLOW, 0)) return MCIERR_HARDWARE; +#ifdef CDIOCCLOSE + if (ioctl(CDADev[dwDevID].unixdev, CDIOCCLOSE, 0)) return MCIERR_HARDWARE; +#endif + if (ioctl(CDADev[dwDevID].unixdev, CDIOCPREVENT, 0)) return MCIERR_HARDWARE; #endif CDADev[dwDevID].nTracks = 0; return 0; @ 1.2 log @Get package to work with NetBSD 1.3, 1.3.1 and 1.3.2. @ text @d1 2 @ 1.1 log @Update Wine to 14-Jun-98 snapshot. XXX Audio support is probably broken due to massive use of unsupported XXX Linux stuff in the OSS interface which I commented out. However XXX I don't have an application to test it. @ text @d2 1 a2 1 +++ multimedia/mcicda.c Wed Jun 17 19:00:35 1998 d481 1 a481 1 @@@@ -959,24 +950,22 @@@@ d510 1 d512 1 d516 1 a516 1 @@@@ -1002,7 +991,7 @@@@ d525 1 a525 1 @@@@ -1059,23 +1048,22 @@@@ d553 1 d555 1 @