head 1.8; access; symbols pkgsrc-2013Q4:1.7.0.14 pkgsrc-2013Q4-base:1.7 pkgsrc-2013Q3:1.7.0.12 pkgsrc-2013Q3-base:1.7 pkgsrc-2013Q2:1.7.0.10 pkgsrc-2013Q2-base:1.7 pkgsrc-2013Q1:1.7.0.8 pkgsrc-2013Q1-base:1.7 pkgsrc-2012Q4:1.7.0.6 pkgsrc-2012Q4-base:1.7 pkgsrc-2012Q3:1.7.0.4 pkgsrc-2012Q3-base:1.7 pkgsrc-2012Q2:1.7.0.2 pkgsrc-2012Q2-base:1.7 pkgsrc-2012Q1:1.6.0.8 pkgsrc-2012Q1-base:1.6 pkgsrc-2011Q4:1.6.0.6 pkgsrc-2011Q4-base:1.6 pkgsrc-2011Q3:1.6.0.4 pkgsrc-2011Q3-base:1.6 pkgsrc-2011Q2:1.6.0.2 pkgsrc-2011Q2-base:1.6 pkgsrc-2011Q1:1.5.0.18 pkgsrc-2011Q1-base:1.5 pkgsrc-2010Q4:1.5.0.16 pkgsrc-2010Q4-base:1.5 pkgsrc-2010Q3:1.5.0.14 pkgsrc-2010Q3-base:1.5 pkgsrc-2010Q2:1.5.0.12 pkgsrc-2010Q2-base:1.5 pkgsrc-2010Q1:1.5.0.10 pkgsrc-2010Q1-base:1.5 pkgsrc-2009Q4:1.5.0.8 pkgsrc-2009Q4-base:1.5 pkgsrc-2009Q3:1.5.0.6 pkgsrc-2009Q3-base:1.5 pkgsrc-2009Q2:1.5.0.4 pkgsrc-2009Q2-base:1.5 pkgsrc-2009Q1:1.5.0.2 pkgsrc-2009Q1-base:1.5 pkgsrc-2008Q4:1.1.1.1.0.2 pkgsrc-2008Q4-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.8 date 2014.01.19.10.58.23; author adam; state dead; branches; next 1.7; commitid 4D1ECVbACnM1uIlx; 1.7 date 2012.05.23.17.48.54; author marino; state Exp; branches; next 1.6; 1.6 date 2011.05.02.21.23.01; author adam; state Exp; branches; next 1.5; 1.5 date 2009.02.28.15.30.13; author adam; state Exp; branches; next 1.4; 1.4 date 2009.02.19.19.26.17; author adam; state Exp; branches; next 1.3; 1.3 date 2009.01.30.19.39.04; author adam; state Exp; branches; next 1.2; 1.2 date 2009.01.17.10.11.14; 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.8 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-ad,v 1.7 2012/05/23 17:48:54 marino Exp $ --- dlls/iphlpapi/ipstats.c.orig 2010-12-10 22:33:07.000000000 +0300 +++ dlls/iphlpapi/ipstats.c @@@@ -27,6 +27,10 @@@@ #include #include #include +#if defined(__NetBSD__) +#include +#endif +#include #ifdef HAVE_ALIAS_H #include #endif @@@@ -489,7 +493,7 @@@@ DWORD WINAPI GetIcmpStatistics(PMIB_ICMP } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__) { int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) @@@@ -655,7 +659,9 @@@@ DWORD WINAPI GetIpStatistics(PMIB_IPSTAT } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) \ + && !defined(__NetBSD__) \ + && !defined(__DragonFly__) { int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) @@@@ -804,7 +810,9 @@@@ DWORD WINAPI GetTcpStatistics(PMIB_TCPST } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) \ + && !defined(__NetBSD__) \ + && !defined(__DragonFly__) { #ifndef TCPTV_MIN /* got removed in Mac OS X for some reason */ #define TCPTV_MIN 2 @@@@ -915,7 +923,7 @@@@ DWORD WINAPI GetUdpStatistics(PMIB_UDPST } if (kc) kstat_close( kc ); } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) { int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) @@@@ -1347,7 +1355,7 @@@@ DWORD WINAPI AllocateAndGetIpNetTableFro } else ret = ERROR_NOT_SUPPORTED; } -#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) +#elif defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) { int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) @ 1.7 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-ad,v 1.6 2011/05/02 21:23:01 adam Exp $ @ 1.6 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: patch-ad,v 1.5 2009/02/28 15:30:13 adam Exp $ d4 1 a4 1 +++ dlls/iphlpapi/ipstats.c 2010-12-22 00:38:30.000000000 +0300 d16 1 a16 1 @@@@ -489,7 +493,7 @@@@ d25 1 a25 1 @@@@ -655,7 +659,7 @@@@ d30 3 a32 1 +#elif defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__) d36 1 a36 1 @@@@ -804,7 +808,7 @@@@ d41 3 a43 1 +#elif defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) d47 1 a47 1 @@@@ -915,7 +919,7 @@@@ d56 1 a56 1 @@@@ -1347,7 +1351,7 @@@@ @ 1.5 log @Changes 1.1.16: * Improved SANE scanner support. * Support for digital CD audio playback. * Improved cookies management in Wininet. * Support for building stand-alone 16-bit modules. * Many fixes to the regression tests on Windows. * Various bug fixes. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- dlls/iphlpapi/ipstats.c.orig 2009-02-27 23:21:46.000000000 +0100 +++ dlls/iphlpapi/ipstats.c a5 1 #include d7 1 d16 8 a23 7 @@@@ -287,7 +291,7 @@@@ DWORD getInterfaceStatsByName(const char DWORD getICMPStats(MIB_ICMP *stats) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) +#if defined(HAVE_SYS_SYSCTL_H) && defined(ICMPCTL_STATS) && !defined(__NetBSD__) int mib[] = {CTL_NET, PF_INET, IPPROTO_ICMP, ICMPCTL_STATS}; d25 8 a32 8 size_t needed; @@@@ -484,7 +488,7 @@@@ DWORD getICMPStats(MIB_ICMP *stats) DWORD getIPStats(PMIB_IPSTATS stats) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) +#if defined(HAVE_SYS_SYSCTL_H) && defined(IPCTL_STATS) && !defined(__NetBSD__) int mib[] = {CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS}; d34 7 a40 7 int ip_ttl, ip_forwarding; @@@@ -653,7 +657,7 @@@@ DWORD getIPStats(PMIB_IPSTATS stats) DWORD getTCPStats(MIB_TCPSTATS *stats) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) d43 8 a50 8 #define TCPTV_REXMTMAX 128 @@@@ -790,7 +794,7 @@@@ DWORD getTCPStats(MIB_TCPSTATS *stats) DWORD getUDPStats(MIB_UDPSTATS *stats) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) +#if defined(HAVE_SYS_SYSCTL_H) && defined(UDPCTL_STATS) && !defined(__NetBSD__) int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; d52 6 a57 42 struct udpstat udp_stat; @@@@ -1032,7 +1036,11 @@@@ DWORD getNumRoutes(void) /* Ignore all entries except for gateway routes which aren't multicast */ +#if !defined(RTF_MULTICAST) + if (!(rtm->rtm_flags & RTF_GATEWAY)) +#else if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST)) +#endif continue; RouteCount++; @@@@ -1108,8 +1116,12 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE /* Ignore all entries except for gateway routes which aren't multicast */ +#if !defined(RTF_MULTICAST) + if (!(rtm->rtm_flags & RTF_GATEWAY)) +#else if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST)) +#endif continue; memset (&table->table[table->dwNumEntries], 0, @@@@ -1270,7 +1282,7 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE DWORD getNumArpEntries(void) { -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) int mib[] = {CTL_NET, PF_ROUTE, 0, AF_INET, NET_RT_FLAGS, RTF_LLINFO}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) DWORD arpEntries = 0; @@@@ -1326,7 +1338,7 @@@@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN if (numEntries > 1) size += (numEntries - 1) * sizeof(MIB_IPNETROW); table = HeapAlloc(heap, flags, size); -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) && !defined(__NetBSD__) if (table) d60 1 @ 1.4 log @Changes 1.1.15: * Gecko engine update. * Better region support in GdiPlus. * Support for cross-compilation in winegcc. * Beginnings of MS Text Framework support. * Many fixes to the regression tests on Windows. * Various bug fixes. @ text @d3 1 a3 1 --- dlls/iphlpapi/ipstats.c.orig 2009-02-13 18:01:33.000000000 +0100 d5 1 a5 1 @@@@ -28,6 +28,10 @@@@ d16 1 a16 1 @@@@ -286,7 +290,7 @@@@ DWORD getInterfaceStatsByName(const char d25 1 a25 1 @@@@ -483,7 +487,7 @@@@ DWORD getICMPStats(MIB_ICMP *stats) d34 1 a34 1 @@@@ -652,7 +656,7 @@@@ DWORD getIPStats(PMIB_IPSTATS stats) d43 1 a43 1 @@@@ -789,7 +793,7 @@@@ DWORD getTCPStats(MIB_TCPSTATS *stats) d52 1 a52 1 @@@@ -1031,7 +1035,11 @@@@ DWORD getNumRoutes(void) d64 1 a64 1 @@@@ -1107,8 +1115,12 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d77 1 a77 1 @@@@ -1269,7 +1281,7 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d86 1 a86 1 @@@@ -1325,7 +1337,7 @@@@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN @ 1.3 log @Changes 1.1.14: * Various bug fixes for Internet Explorer 7. * Many crypt32 improvements, including new export wizard. * Better support for windowless Richedit. * Improvements to the print dialog. * Many fixes to the regression tests on Windows. * Various bug fixes. @ text @d3 1 a3 1 --- dlls/iphlpapi/ipstats.c.orig 2009-01-30 17:54:01.000000000 +0100 d25 1 a25 1 @@@@ -479,7 +483,7 @@@@ DWORD getICMPStats(MIB_ICMP *stats) d34 1 a34 1 @@@@ -648,7 +652,7 @@@@ DWORD getIPStats(PMIB_IPSTATS stats) d43 1 a43 1 @@@@ -785,7 +789,7 @@@@ DWORD getTCPStats(MIB_TCPSTATS *stats) d52 1 a52 1 @@@@ -1027,7 +1031,11 @@@@ DWORD getNumRoutes(void) d64 1 a64 1 @@@@ -1103,8 +1111,12 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d77 1 a77 1 @@@@ -1265,7 +1277,7 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d86 1 a86 1 @@@@ -1321,7 +1333,7 @@@@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN @ 1.2 log @Changes 1.1.13: * Freedesktop.org-compliant startup notifications. * Many fixes for 64-bit application support. * Improved graphics support in Internet Explorer. * Various Richedit improvements. * Better certificate manager dialog. * Various bug fixes. @ text @d3 1 a3 1 --- dlls/iphlpapi/ipstats.c.orig 2009-01-16 17:28:07.000000000 +0100 d16 10 a25 1 @@@@ -467,7 +471,7 @@@@ DWORD getICMPStats(MIB_ICMP *stats) d34 1 a34 1 @@@@ -636,7 +640,7 @@@@ DWORD getIPStats(PMIB_IPSTATS stats) d43 1 a43 1 @@@@ -773,7 +777,7 @@@@ DWORD getTCPStats(MIB_TCPSTATS *stats) d52 1 a52 1 @@@@ -1015,7 +1019,11 @@@@ DWORD getNumRoutes(void) d64 1 a64 1 @@@@ -1091,8 +1099,12 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d77 1 a77 1 @@@@ -1253,7 +1265,7 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d86 1 a86 1 @@@@ -1309,7 +1321,7 @@@@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN @ 1.1 log @Initial revision @ text @d3 1 a3 1 --- dlls/iphlpapi/ipstats.c.orig 2008-07-11 17:55:55.000000000 +0200 d16 1 a16 1 @@@@ -463,7 +467,7 @@@@ DWORD getICMPStats(MIB_ICMP *stats) d25 1 a25 1 @@@@ -632,7 +636,7 @@@@ DWORD getIPStats(PMIB_IPSTATS stats) d34 1 a34 1 @@@@ -769,7 +773,7 @@@@ DWORD getTCPStats(MIB_TCPSTATS *stats) d43 1 a43 1 @@@@ -1011,7 +1015,11 @@@@ DWORD getNumRoutes(void) d55 1 a55 1 @@@@ -1087,8 +1095,12 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d68 1 a68 1 @@@@ -1249,7 +1261,7 @@@@ DWORD getRouteTable(PMIB_IPFORWARDTABLE d77 1 a77 1 @@@@ -1305,7 +1317,7 @@@@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN @ 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 @@