January 2007 - Wine-Commits

Francois Gouget : wintrust: Better match the PSDK types and fix the winapi_check warnings.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 923c95a6da14d5344de44f05997000e966a38c4e URL: http://source.winehq.org/git/wine.git/?a=commit;h=923c95a6da14d5344de44f059… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:18:40 2007 +0100 wintrust: Better match the PSDK types and fix the winapi_check warnings. --- dlls/wintrust/register.c | 2 +- include/wintrust.h | 2 +- tools/winapi/win32.api | 15 +++++++++++++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/register.c b/dlls/wintrust/register.c index 310c184..6f0f575 100644 --- a/dlls/wintrust/register.c +++ b/dlls/wintrust/register.c @@ -707,7 +707,7 @@ static BOOL WINTRUST_RegisterGenChainVer * WintrustAddDefaultForUsage will only return TRUE or FALSE, no last * error is set, not even when the registry cannot be written to. */ -BOOL WINAPI WintrustAddDefaultForUsage(const CHAR *pszUsageOID, +BOOL WINAPI WintrustAddDefaultForUsage(const char *pszUsageOID, CRYPT_PROVIDER_REGDEFUSAGE *psDefUsage) { static const WCHAR CBAlloc[] = {'C','a','l','l','b','a','c','k','A','l','l','o','c','F','u','n','c','t','i','o','n', 0}; diff --git a/include/wintrust.h b/include/wintrust.h index af2049e..0f52346 100644 --- a/include/wintrust.h +++ b/include/wintrust.h @@ -362,7 +362,7 @@ static const WCHAR WT_PROVIDER_CERTTRUST BOOL WINAPI WintrustAddActionID(GUID*,DWORD,CRYPT_REGISTER_ACTIONID*); BOOL WINAPI WintrustRemoveActionID(GUID*); BOOL WINAPI WintrustLoadFunctionPointers(GUID*,CRYPT_PROVIDER_FUNCTIONS*); -BOOL WINAPI WintrustAddDefaultForUsage(const CHAR*,CRYPT_PROVIDER_REGDEFUSAGE*); +BOOL WINAPI WintrustAddDefaultForUsage(const char*,CRYPT_PROVIDER_REGDEFUSAGE*); void WINAPI WintrustGetRegPolicyFlags(DWORD*); LONG WINAPI WinVerifyTrust(HWND,GUID*,LPVOID); HRESULT WINAPI WinVerifyTrustEx(HWND,GUID*,WINTRUST_DATA*); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 20053b1..9035fac 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -5330,6 +5330,8 @@ BOOL DWORD HANDLE HCATADMIN +HCATINFO +HCRYPTPROV HRESULT HWND LONG @@ -5338,14 +5340,27 @@ LONG BYTE * CRYPT_PROVIDER_DATA * +CRYPT_PROVIDER_FUNCTIONS * +CRYPT_PROVIDER_REGDEFUSAGE * CRYPT_PROVIDER_SGNR * CRYPT_REGISTER_ACTIONID * +CRYPTCATMEMBER * DWORD * GUID * HCATADMIN * +HCATINFO * LPVOID +PCCERT_CONTEXT WINTRUST_DATA * +%str + +char * + +%wstr + +LPWSTR + %void void

1 0

Francois Gouget : usp10: Update win32.api to fix the winapi_check warnings.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: aa94c6850b2a200f75272892d768c86a43f662cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa94c6850b2a200f75272892d… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:18:21 2007 +0100 usp10: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index 81d1f4c..20053b1 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4503,11 +4503,13 @@ LPWSTR %long +BOOL DWORD HDC HRESULT LCID UINT +WORD int %ptr @@ -4522,13 +4524,18 @@ SCRIPT_CONTROL * SCRIPT_DIGITSUBSTITUTE * SCRIPT_FONTPROPERTIES * SCRIPT_ITEM * +SCRIPT_LOGATTR * SCRIPT_PROPERTIES *** SCRIPT_STATE * +SCRIPT_STRING_ANALYSIS SCRIPT_STRING_ANALYSIS * SCRIPT_TABDEF * SCRIPT_VISATTR * +SIZE * +UINT * WORD * int * +LONG * void * %wstr

1 0

Francois Gouget : winecoreaudio.drv: Update win32. api to fix the winapi_check warnings.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: d98dcb310e1c1552f1767512c255b4906dc85a96 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d98dcb310e1c1552f1767512c… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Jan 26 13:17:49 2007 +0100 winecoreaudio.drv: Update win32.api to fix the winapi_check warnings. --- tools/winapi/win32.api | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index a130b0d..81d1f4c 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -4744,6 +4744,21 @@ WORD DWORD_PTR +%%winecoreaudio.drv + +%long + +DWORD +HDRVR +LPARAM +LRESULT +UINT +WORD + +%long --pointer + +DWORD_PTR + %%wined3d.dll %long

1 0

Mike McCormack : msi: Add todos around tests that aren't being run yet, but will fail.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 595983f4983ddb76b5e606a4e813beaa990d9b15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=595983f4983ddb76b5e606a4e… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 21:14:25 2007 +0900 msi: Add todos around tests that aren't being run yet, but will fail. --- dlls/msi/tests/iface.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/msi/tests/iface.c b/dlls/msi/tests/iface.c index 556e6f5..d7dc640 100644 --- a/dlls/msi/tests/iface.c +++ b/dlls/msi/tests/iface.c @@ -63,6 +63,7 @@ static void test_msi_dispid(void) return; } + todo_wine { ok( get_dispid( disp, "OpenPackage" ) == 2, "dispid wrong\n"); ok( get_dispid( disp, "OpenProduct" ) == 3, "dispid wrong\n"); ok( get_dispid( disp, "OpenDatabase" ) == 4, "dispid wrong\n"); @@ -118,6 +119,7 @@ static void test_msi_dispid(void) ok( get_dispid( disp, "PatchesEx" ) == 55, "dispid wrong\n"); ok( get_dispid( disp, "ExtractPatchXMLData" ) == 57, "dispid wrong\n"); + } /* MSDN claims the following functions exist but IDispatch->GetIDsOfNames disagrees */ if (0) @@ -166,7 +168,12 @@ static void test_msi_invoke(void) r = IDispatch_Invoke( installer, dispid, &IID_NULL, 0, DISPATCH_METHOD, &param, &result, NULL, NULL); - ok( r == S_OK, "dispatch failed %08x\n", r); + todo_wine ok( r == S_OK, "dispatch failed %08x\n", r); + if (FAILED(r)) + { + skip( "failed to create record\n"); + return; + } ok( V_VT(&result) == VT_DISPATCH, "type wrong\n");

1 0

Mike McCormack : msi: Fix a typo.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 7fe5166340aabf2872acc187073027f6d1f8c258 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fe5166340aabf2872acc1870… Author: Mike McCormack <mike(a)codeweavers.com> Date: Fri Jan 26 21:14:07 2007 +0900 msi: Fix a typo. --- dlls/msi/msi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msi/msi_main.c b/dlls/msi/msi_main.c index dc9d7f4..2d82091 100644 --- a/dlls/msi/msi_main.c +++ b/dlls/msi/msi_main.c @@ -127,7 +127,7 @@ static HRESULT WINAPI MsiCF_CreateInstan TRACE("%p %p %s %p\n", This, pOuter, debugstr_guid(riid), ppobj); - r = This->create_object( pOuter, ppobj ); + r = This->create_object( pOuter, (LPVOID*) &unk ); if (SUCCEEDED(r)) { r = IUnknown_QueryInterface( unk, riid, ppobj );

1 0

Alexandre Julliard : winspool: Fix make rules for import library.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 3120a8ba0a67dc7b3e91a15d854c04275190bf6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3120a8ba0a67dc7b3e91a15d8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:07:37 2007 +0100 winspool: Fix make rules for import library. --- dlls/winspool.drv/Makefile.in | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/winspool.drv/Makefile.in b/dlls/winspool.drv/Makefile.in index 2139aa1..f9ae2a5 100644 --- a/dlls/winspool.drv/Makefile.in +++ b/dlls/winspool.drv/Makefile.in @@ -15,9 +15,12 @@ RC_SRCS = winspool.rc @MAKE_DLL_RULES@ -$(IMPORTLIB): $(MAINSPEC) +libwinspool.def: $(MAINSPEC) $(WINEBUILD) -w --def -o $@ --export $(SRCDIR)/$(MAINSPEC) +libwinspool.a: $(SPEC_DEF) + $(DLLTOOL) -k -l $@ -d $(SPEC_DEF) + clean:: $(RM) $(IMPORTLIB)

1 0

Alexandre Julliard : snmpapi: Fix printf format warnings in tests.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: be570f4655f536a08dbcff18ce8233fdd5fe89f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be570f4655f536a08dbcff18c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 26 13:07:05 2007 +0100 snmpapi: Fix printf format warnings in tests. --- dlls/snmpapi/tests/util.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/snmpapi/tests/util.c b/dlls/snmpapi/tests/util.c index c3540fe..160ec19 100644 --- a/dlls/snmpapi/tests/util.c +++ b/dlls/snmpapi/tests/util.c @@ -83,23 +83,23 @@ static void test_SnmpUtilOidToA(void) ret = SnmpUtilOidToA(&oid2); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect2), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n %d\n", - ret, expect2, strlen(ret)); + ok(!strcmp(ret, expect2), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ret, expect2); ret = SnmpUtilOidToA(&oid3); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n %d\n", - ret, expect3, strlen(ret)); + ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ret, expect3); ret = SnmpUtilOidToA(&oid4); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n %d\n", - ret, expect3, strlen(ret)); + ok(!strcmp(ret, expect3), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ret, expect3); ret = SnmpUtilOidToA(&oid5); ok(ret != NULL, "SnmpUtilOidToA failed\n"); - ok(!strcmp(ret, expect4), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n %d\n", - ret, expect4, strlen(ret)); + ok(!strcmp(ret, expect4), "SnmpUtilOidToA failed got \n%s\n expected \n%s\n", + ret, expect4); } static void test_SnmpUtilAsnAnyCpyFree(void)

1 0

Mark Adams : iphlpapi: Support for non-linux platforms, including Mac OS X.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 641abc997cf97df2fd22af0da1cc8eee1272e8aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=641abc997cf97df2fd22af0da… Author: Mark Adams <mark(a)transgaming.com> Date: Thu Jan 25 20:16:25 2007 -0500 iphlpapi: Support for non-linux platforms, including Mac OS X. - Add error messages when unimplemented functions are called on non-linux platforms. - Implement retrieving the interface list on MacOS X (and other platforms that use NET_RT_DUMP). --- dlls/iphlpapi/ipstats.c | 219 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 218 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 129380c..f5b1149 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -20,6 +20,7 @@ #include "config.h" #include "wine/port.h" +#include "wine/debug.h" #include <stdarg.h> #include <stdio.h> @@ -51,6 +52,14 @@ #include <netinet/tcp_fsm.h> #endif +#ifdef HAVE_SYS_SYSCTL_H +#include <sys/sysctl.h> +#endif + +#define ROUNDUP(a) \ + ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#define ADVANCE(x, n) (x += ROUNDUP(((struct sockaddr *)n)->sa_len)) + #include "windef.h" #include "winbase.h" #include "iprtrmib.h" @@ -71,6 +80,8 @@ #define TCPS_CLOSING 11 #endif +WINE_DEFAULT_DEBUG_CHANNEL(iphlpapi); + DWORD getInterfaceStatsByName(const char *name, PMIB_IFROW entry) { FILE *fp; @@ -152,6 +163,9 @@ DWORD getInterfaceStatsByName(const char } fclose(fp); } + else + ERR ("unimplemented!\n"); + return NO_ERROR; } @@ -279,6 +293,9 @@ DWORD getICMPStats(MIB_ICMP *stats) } fclose(fp); } + else + ERR ("unimplemented!\n"); + return NO_ERROR; } @@ -390,6 +407,9 @@ DWORD getIPStats(PMIB_IPSTATS stats) } fclose(fp); } + else + ERR ("unimplemented!\n"); + return NO_ERROR; } @@ -480,6 +500,9 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) } fclose(fp); } + else + ERR ("unimplemented!\n"); + return NO_ERROR; } @@ -533,6 +556,9 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) } fclose(fp); } + else + ERR ("unimplemented!\n"); + return NO_ERROR; } @@ -556,12 +582,66 @@ static DWORD getNumWithOneHeader(const c } fclose(fp); } + else + ERR ("Unable to open '%s' to count entries!\n", filename); + return ret; } DWORD getNumRoutes(void) { - return getNumWithOneHeader("/proc/net/route"); +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + int mib[6] = {CTL_NET, PF_ROUTE, 0, PF_INET, NET_RT_DUMP, 0}; + size_t needed; + char *buf, *lim, *next; + struct rt_msghdr *rtm; + DWORD RouteCount = 0; + + if (sysctl (mib, 6, NULL, &needed, NULL, 0) < 0) + { + ERR ("sysctl 1 failed!\n"); + return 0; + } + + buf = HeapAlloc (GetProcessHeap (), 0, needed); + if (!buf) + { + ERR ("HeapAlloc of %ld failed!\n", needed); + return 0; + } + + if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) + { + ERR ("sysctl 2 failed!\n"); + HeapFree (GetProcessHeap (), 0, buf); + return 0; + } + + lim = buf + needed; + for (next = buf; next < lim; next += rtm->rtm_msglen) + { + rtm = (struct rt_msghdr *)next; + + if (rtm->rtm_type != RTM_GET) + { + WARN ("Got unexpected message type 0x%x!\n", + rtm->rtm_type); + continue; + } + + /* Ignore all entries except for gateway routes which aren't + multicast */ + if (!(rtm->rtm_flags & RTF_GATEWAY) || (rtm->rtm_flags & RTF_MULTICAST)) + continue; + + RouteCount++; + } + + HeapFree (GetProcessHeap (), 0, buf); + return RouteCount; +#else + return getNumWithOneHeader("/proc/net/route"); +#endif } DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, @@ -577,6 +657,122 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE sizeof(MIB_IPFORWARDTABLE) + (numRoutes - 1) * sizeof(MIB_IPFORWARDROW)); if (table) { +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + int mib[6] = {CTL_NET, PF_ROUTE, 0, PF_INET, NET_RT_DUMP, 0}; + size_t needed; + char *buf, *lim, *next, *addrPtr; + struct rt_msghdr *rtm; + + if (sysctl (mib, 6, NULL, &needed, NULL, 0) < 0) + { + ERR ("sysctl 1 failed!\n"); + HeapFree (GetProcessHeap (), 0, table); + return NO_ERROR; + } + + buf = HeapAlloc (GetProcessHeap (), 0, needed); + if (!buf) + { + ERR ("HeapAlloc of %ld failed!\n", needed); + HeapFree (GetProcessHeap (), 0, table); + return ERROR_OUTOFMEMORY; + } + + if (sysctl (mib, 6, buf, &needed, NULL, 0) < 0) + { + ERR ("sysctl 2 failed!\n"); + HeapFree (GetProcessHeap (), 0, table); + HeapFree (GetProcessHeap (), 0, buf); + return NO_ERROR; + } + + *ppIpForwardTable = table; + table->dwNumEntries = 0; + + lim = buf + needed; + for (next = buf; next < lim; next += rtm->rtm_msglen) + { + int i; + + rtm = (struct rt_msghdr *)next; + + if (rtm->rtm_type != RTM_GET) + { + WARN ("Got unexpected message type 0x%x!\n", + rtm->rtm_type); + continue; + } + + /* Ignore all entries except for gateway routes which aren't + multicast */ + if (!(rtm->rtm_flags & RTF_GATEWAY) || + (rtm->rtm_flags & RTF_MULTICAST)) + continue; + + memset (&table->table[table->dwNumEntries], 0, + sizeof (MIB_IPFORWARDROW)); + table->table[table->dwNumEntries].dwForwardIfIndex = rtm->rtm_index; + table->table[table->dwNumEntries].dwForwardType = + MIB_IPROUTE_TYPE_INDIRECT; + table->table[table->dwNumEntries].dwForwardMetric1 = + rtm->rtm_rmx.rmx_hopcount; + table->table[table->dwNumEntries].dwForwardProto = + MIB_IPPROTO_LOCAL; + + addrPtr = (char *)(rtm + 1); + + for (i = 1; i; i <<= 1) + { + struct sockaddr *sa; + DWORD addr; + + if (!(i & rtm->rtm_addrs)) + continue; + + sa = (struct sockaddr *)addrPtr; + ADVANCE (addrPtr, sa); + + /* default routes are encoded by length-zero sockaddr */ + if (sa->sa_len == 0) + addr = 0; + else if (sa->sa_family != AF_INET) + { + ERR ("Received unsupported sockaddr family 0x%x\n", + sa->sa_family); + addr = 0; + } + else + { + struct sockaddr_in *sin = (struct sockaddr_in *)sa; + + addr = sin->sin_addr.s_addr; + } + + switch (i) + { + case RTA_DST: + table->table[table->dwNumEntries].dwForwardDest = addr; + break; + + case RTA_GATEWAY: + table->table[table->dwNumEntries].dwForwardNextHop = addr; + break; + + case RTA_NETMASK: + table->table[table->dwNumEntries].dwForwardMask = addr; + break; + + default: + ERR ("Unexpected address type 0x%x\n", i); + } + } + + table->dwNumEntries++; + } + + HeapFree (GetProcessHeap (), 0, buf); + ret = NO_ERROR; +#else FILE *fp; ret = NO_ERROR; @@ -656,6 +852,12 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE } fclose(fp); } + else + { + ERR ("unimplemented!\n"); + return ERROR_INVALID_PARAMETER; + } +#endif } else ret = ERROR_OUTOFMEMORY; @@ -672,6 +874,11 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpN { DWORD ret; +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + ERR ("unimplemented!\n"); + return ERROR_INVALID_PARAMETER; +#endif + if (!ppIpNetTable) ret = ERROR_INVALID_PARAMETER; else { @@ -765,6 +972,11 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTa { DWORD ret; +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + ERR ("unimplemented!\n"); + return ERROR_INVALID_PARAMETER; +#endif + if (!ppUdpTable) ret = ERROR_INVALID_PARAMETER; else { @@ -828,6 +1040,11 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTa { DWORD ret; +#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) + ERR ("unimplemented!\n"); + return ERROR_INVALID_PARAMETER; +#endif + if (!ppTcpTable) ret = ERROR_INVALID_PARAMETER; else {

1 0

Mark Adams : iphlpapi: Filter out no-ip addresses when building ip address table.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: 1e263e663bbeacfa3b79bf894cd071438e617465 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e263e663bbeacfa3b79bf894… Author: Mark Adams <mark(a)transgaming.com> Date: Thu Jan 25 20:15:58 2007 -0500 iphlpapi: Filter out no-ip addresses when building ip address table. --- dlls/iphlpapi/ifenum.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index c1d1a0a..9590032 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -696,7 +696,11 @@ static DWORD enumIPAddresses(PDWORD pcAd if (ioctlRet == 0) { ifPtr = ifc->ifc_buf; while (ifPtr && ifPtr < ifc->ifc_buf + ifc->ifc_len) { - numAddresses++; + struct ifreq *ifr = (struct ifreq *)ifPtr; + + if (ifr->ifr_addr.sa_family == AF_INET) + numAddresses++; + ifPtr += ifreq_len((struct ifreq *)ifPtr); } } @@ -752,6 +756,11 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *p while (!ret && ifPtr && ifPtr < ifc.ifc_buf + ifc.ifc_len) { struct ifreq *ifr = (struct ifreq *)ifPtr; + ifPtr += ifreq_len(ifr); + + if (ifr->ifr_addr.sa_family != AF_INET) + continue; + ret = getInterfaceIndexByName(ifr->ifr_name, &(*ppIpAddrTable)->table[i].dwIndex); memcpy(&(*ppIpAddrTable)->table[i].dwAddr, ifr->ifr_addr.sa_data + 2, @@ -770,7 +779,6 @@ DWORD getIPAddrTable(PMIB_IPADDRTABLE *p (*ppIpAddrTable)->table[i].unused1 = 0; (*ppIpAddrTable)->table[i].wType = 0; - ifPtr += ifreq_len(ifr); i++; } }

1 0

Mark Adams : iphlpapi: Clarify interface counting.
by Alexandre Julliard Jan. 26, 2007

Jan. 26, 2007

Module: wine Branch: master Commit: a91d69190ee1ab9676aacf05537d5afe8a494e54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a91d69190ee1ab9676aacf055… Author: Mark Adams <mark(a)transgaming.com> Date: Thu Jan 25 20:14:53 2007 -0500 iphlpapi: Clarify interface counting. --- dlls/iphlpapi/ifenum.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/iphlpapi/ifenum.c b/dlls/iphlpapi/ifenum.c index fb3348f..c1d1a0a 100644 --- a/dlls/iphlpapi/ifenum.c +++ b/dlls/iphlpapi/ifenum.c @@ -673,14 +673,16 @@ static DWORD enumIPAddresses(PDWORD pcAd int ioctlRet = 0; DWORD guessedNumAddresses = 0, numAddresses = 0; caddr_t ifPtr; + int lastlen; ret = NO_ERROR; ifc->ifc_len = 0; ifc->ifc_buf = NULL; /* there is no way to know the interface count beforehand, so we need to loop again and again upping our max each time - until returned < max */ + until returned is constant across 2 calls */ do { + lastlen = ifc->ifc_len; HeapFree(GetProcessHeap(), 0, ifc->ifc_buf); if (guessedNumAddresses == 0) guessedNumAddresses = INITIAL_INTERFACES_ASSUMED; @@ -689,8 +691,7 @@ static DWORD enumIPAddresses(PDWORD pcAd ifc->ifc_len = sizeof(struct ifreq) * guessedNumAddresses; ifc->ifc_buf = HeapAlloc(GetProcessHeap(), 0, ifc->ifc_len); ioctlRet = ioctl(fd, SIOCGIFCONF, ifc); - } while (ioctlRet == 0 && - ifc->ifc_len > (sizeof(struct ifreq) * (guessedNumAddresses - 2))); + } while ((ioctlRet == 0) && (ifc->ifc_len != lastlen)); if (ioctlRet == 0) { ifPtr = ifc->ifc_buf;

1 0