March 2009 - Wine-Commits - list.winehq.org

Steven Edwards : include: Add check to asm macro for Windows Services for Unix/ Subsystem for Unix applications.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 3d0c0429ad4bc17277a0061581df70475ff92bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d0c0429ad4bc17277a006158… Author: Steven Edwards <winehacker(a)gmail.com> Date: Sat Feb 28 12:38:58 2009 -0500 include: Add check to asm macro for Windows Services for Unix/Subsystem for Unix applications. --- include/wine/port.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/wine/port.h b/include/wine/port.h index 817f02b..6318374 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -203,7 +203,7 @@ struct statvfs /* Macros to define assembler functions somewhat portably */ -#if defined(__GNUC__) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__APPLE__) +#if defined(__GNUC__) && !defined(__INTERIX) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(__APPLE__) # define __ASM_GLOBAL_FUNC(name,code) \ __asm__( ".text\n\t" \ ".align 4\n\t" \

1 0

Stefan Leichter : ntoskrnl.exe: Stub for MmQuerySystemSize.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 56031d2ba47d3ddb58b2e35bfdcbc41448cae13d URL: http://source.winehq.org/git/wine.git/?a=commit;h=56031d2ba47d3ddb58b2e35bf… Author: Stefan Leichter <Stefan.Leichter(a)camline.com> Date: Sun Mar 1 09:48:51 2009 +0100 ntoskrnl.exe: Stub for MmQuerySystemSize. --- dlls/ntoskrnl.exe/ntoskrnl.c | 11 +++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/wdm.h | 8 ++++++++ 3 files changed, 20 insertions(+), 1 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 0dc9aaf..6371d85 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -1161,6 +1161,17 @@ PVOID WINAPI MmGetSystemRoutineAddress(PUNICODE_STRING SystemRoutineName) return pFunc; } + +/*********************************************************************** + * MmQuerySystemSize (NTOSKRNL.EXE.@) + */ +MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void) +{ + FIXME("stub\n"); + return MmLargeSystem; +} + + /***************************************************** * DllMain */ diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 7b95852..849dd51 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -706,7 +706,7 @@ @ stub MmProbeAndLockProcessPages @ stub MmProbeAndLockSelectedPages @ stub MmProtectMdlSystemAddress -@ stub MmQuerySystemSize +@ stdcall MmQuerySystemSize() @ stub MmRemovePhysicalMemory @ stdcall MmResetDriverPaging(ptr) @ stub MmSectionObjectType diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 0f241b6..3169153 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1001,6 +1001,13 @@ typedef struct _KUSER_SHARED_DATA { } DUMMYUNIONNAME; } KSHARED_USER_DATA, *PKSHARED_USER_DATA; +typedef enum _MM_SYSTEM_SIZE +{ + MmSmallSystem, + MmMediumSystem, + MmLargeSystem +} MM_SYSTEMSIZE; + NTSTATUS WINAPI ObCloseHandle(IN HANDLE handle); #define IoGetCurrentIrpStackLocation(_Irp) ((_Irp)->Tail.Overlay.CurrentStackLocation) @@ -1048,6 +1055,7 @@ ULONG WINAPI KeQueryTimeIncrement(void); PVOID WINAPI MmAllocateNonCachedMemory(SIZE_T); void WINAPI MmFreeNonCachedMemory(PVOID,SIZE_T); +MM_SYSTEMSIZE WINAPI MmQuerySystemSize(void); NTSTATUS WINAPI ObReferenceObjectByHandle(HANDLE,ACCESS_MASK,POBJECT_TYPE,KPROCESSOR_MODE,PVOID*,POBJECT_HANDLE_INFORMATION);

1 0

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumRoutes and GetNumWithOneHeader functions .
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 6aade4122a597f8f043212079c2e2d1813693953 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6aade4122a597f8f043212079… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:55:00 2009 +0100 iphlpapi: Remove the no longer needed getNumRoutes and GetNumWithOneHeader functions. --- dlls/iphlpapi/ipstats.c | 179 ++--------------------------------------------- dlls/iphlpapi/ipstats.h | 3 - 2 files changed, 6 insertions(+), 176 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index c7c08fd..f630906 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -535,13 +535,18 @@ DWORD getIPStats(PMIB_IPSTATS stats) return NO_ERROR; #else FILE *fp; + MIB_IPFORWARDTABLE *fwd_table; if (!stats) return ERROR_INVALID_PARAMETER; memset(stats, 0, sizeof(MIB_IPSTATS)); stats->dwNumIf = stats->dwNumAddr = getNumInterfaces(); - stats->dwNumRoutes = getNumRoutes(); + if (!AllocateAndGetIpForwardTableFromStack( &fwd_table, FALSE, GetProcessHeap(), 0 )) + { + stats->dwNumRoutes = fwd_table->dwNumEntries; + HeapFree( GetProcessHeap(), 0, fwd_table ); + } /* get most of these stats from /proc/net/snmp, no error if can't */ fp = fopen("/proc/net/snmp", "r"); @@ -882,178 +887,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) #endif } -static DWORD getNumWithOneHeader(const char *filename) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_STRUCT_XINPGEN) - size_t Len = 0; - char *Buf; - struct xinpgen *pXIG, *pOrigXIG; - int Protocol; - DWORD NumEntries = 0; - - if (!strcmp (filename, "net.inet.tcp.pcblist")) - Protocol = IPPROTO_TCP; - else if (!strcmp (filename, "net.inet.udp.pcblist")) - Protocol = IPPROTO_UDP; - else - { - ERR ("Unsupported mib '%s', needs protocol mapping\n", - filename); - return 0; - } - - if (sysctlbyname (filename, NULL, &Len, NULL, 0) < 0) - { - WARN ("Unable to read '%s' via sysctlbyname\n", filename); - return 0; - } - - Buf = HeapAlloc (GetProcessHeap (), 0, Len); - if (!Buf) - { - ERR ("Out of memory!\n"); - return 0; - } - - if (sysctlbyname (filename, Buf, &Len, NULL, 0) < 0) - { - ERR ("Failure to read '%s' via sysctlbyname!\n", filename); - HeapFree (GetProcessHeap (), 0, Buf); - return 0; - } - - /* Might be nothing here; first entry is just a header it seems */ - if (Len <= sizeof (struct xinpgen)) - { - HeapFree (GetProcessHeap (), 0, Buf); - return 0; - } - - pOrigXIG = (struct xinpgen *)Buf; - pXIG = pOrigXIG; - - for (pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len); - pXIG->xig_len > sizeof (struct xinpgen); - pXIG = (struct xinpgen *)((char *)pXIG + pXIG->xig_len)) - { - struct tcpcb *pTCPData = NULL; - struct inpcb *pINData; - struct xsocket *pSockData; - - if (Protocol == IPPROTO_TCP) - { - pTCPData = &((struct xtcpcb *)pXIG)->xt_tp; - pINData = &((struct xtcpcb *)pXIG)->xt_inp; - pSockData = &((struct xtcpcb *)pXIG)->xt_socket; - } - else - { - pINData = &((struct xinpcb *)pXIG)->xi_inp; - pSockData = &((struct xinpcb *)pXIG)->xi_socket; - } - - /* Ignore sockets for other protocols */ - if (pSockData->xso_protocol != Protocol) - continue; - - /* Ignore PCBs that were freed while generating the data */ - if (pINData->inp_gencnt > pOrigXIG->xig_gen) - continue; - - /* we're only interested in IPv4 addresses */ - if (!(pINData->inp_vflag & INP_IPV4) || - (pINData->inp_vflag & INP_IPV6)) - continue; - - /* If all 0's, skip it */ - if (!pINData->inp_laddr.s_addr && - !pINData->inp_lport && - !pINData->inp_faddr.s_addr && - !pINData->inp_fport) - continue; - - NumEntries++; - } - - HeapFree (GetProcessHeap (), 0, Buf); - return NumEntries; -#else - FILE *fp; - int ret = 0; - - fp = fopen(filename, "r"); - if (fp) { - char buf[512] = { 0 }, *ptr; - - - ptr = fgets(buf, sizeof(buf), fp); - if (ptr) { - do { - ptr = fgets(buf, sizeof(buf), fp); - if (ptr) - ret++; - } while (ptr); - } - fclose(fp); - } - else - ERR ("Unable to open '%s' to count entries!\n", filename); - - return ret; -#endif -} - -DWORD getNumRoutes(void) -{ -#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) 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 -} static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_IPFORWARDTABLE *table, DWORD *count, const MIB_IPFORWARDROW *row ) diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 871fcec..aad931c 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -52,9 +52,6 @@ DWORD getTCPStats(MIB_TCPSTATS *stats); */ DWORD getUDPStats(MIB_UDPSTATS *stats); -/* Returns the number of entries in the route table. */ -DWORD getNumRoutes(void); - DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags);

1 0

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumTcpEntries function.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 18a5a77bacd76d5720b783af93fe6704d215dc78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18a5a77bacd76d5720b783af9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:54:35 2009 +0100 iphlpapi: Remove the no longer needed getNumTcpEntries function. --- dlls/iphlpapi/ipstats.c | 16 ++++++---------- dlls/iphlpapi/ipstats.h | 3 --- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 103ef45..c7c08fd 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -693,6 +693,7 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) #else FILE *fp; + MIB_TCPTABLE *tcp_table; if (!stats) return ERROR_INVALID_PARAMETER; @@ -772,7 +773,11 @@ DWORD getTCPStats(MIB_TCPSTATS *stats) stats->dwOutRsts = strtoul(ptr, &endPtr, 10); ptr = endPtr; } - stats->dwNumConns = getNumTcpEntries(); + if (!AllocateAndGetTcpTableFromStack( &tcp_table, FALSE, GetProcessHeap(), 0 )) + { + stats->dwNumConns = tcp_table->dwNumEntries; + HeapFree( GetProcessHeap(), 0, tcp_table ); + } } } fclose(fp); @@ -1565,15 +1570,6 @@ DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOr } -DWORD getNumTcpEntries(void) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) - return getNumWithOneHeader ("net.inet.tcp.pcblist"); -#else - return getNumWithOneHeader ("/proc/net/tcp"); -#endif -} - static MIB_TCPTABLE *append_tcp_row( HANDLE heap, DWORD flags, MIB_TCPTABLE *table, DWORD *count, const MIB_TCPROW *row ) { diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 2c82981..871fcec 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,9 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Returns the number of entries in the TCP state table. */ -DWORD getNumTcpEntries(void); - DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, HANDLE heap, DWORD flags);

1 0

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumUdpEntries function.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 3573c6497076e35d7a5111e4136156ae26a1ae89 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3573c6497076e35d7a5111e41… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:54:16 2009 +0100 iphlpapi: Remove the no longer needed getNumUdpEntries function. --- dlls/iphlpapi/ipstats.c | 16 +++++++--------- dlls/iphlpapi/ipstats.h | 3 --- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 5ce373f..103ef45 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -793,6 +793,7 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) int mib[] = {CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_STATS}; #define MIB_LEN (sizeof(mib) / sizeof(mib[0])) struct udpstat udp_stat; + MIB_UDPTABLE *udp_table; size_t needed; if (!stats) return ERROR_INVALID_PARAMETER; @@ -809,7 +810,12 @@ DWORD getUDPStats(MIB_UDPSTATS *stats) stats->dwOutDatagrams = udp_stat.udps_opackets; stats->dwNoPorts = udp_stat.udps_noport; stats->dwInErrors = udp_stat.udps_hdrops + udp_stat.udps_badsum + udp_stat.udps_fullsock + udp_stat.udps_badlen; - stats->dwNumAddrs = getNumUdpEntries(); + if (!AllocateAndGetUdpTableFromStack( &udp_table, FALSE, GetProcessHeap(), 0 )) + { + stats->dwNumAddrs = udp_table->dwNumEntries; + HeapFree( GetProcessHeap(), 0, udp_table ); + } + else stats->dwNumAddrs = 0; return NO_ERROR; #else @@ -1453,14 +1459,6 @@ done: return ret; } -DWORD getNumUdpEntries(void) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(HAVE_NETINET_IN_PCB_H) - return getNumWithOneHeader ("net.inet.udp.pcblist"); -#else - return getNumWithOneHeader("/proc/net/udp"); -#endif -} static MIB_UDPTABLE *append_udp_row( HANDLE heap, DWORD flags, MIB_UDPTABLE *table, DWORD *count, const MIB_UDPROW *row ) diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 88c4839..2c82981 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,9 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Returns the number of entries in the UDP state table. */ -DWORD getNumUdpEntries(void); - /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void);

1 0

Alexandre Julliard : iphlpapi: Remove the no longer needed getNumArpEntries function.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 7a5c5099bcb8a1079bcd31f3d93609a86327e487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a5c5099bcb8a1079bcd31f3d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:53:41 2009 +0100 iphlpapi: Remove the no longer needed getNumArpEntries function. --- dlls/iphlpapi/ipstats.c | 45 --------------------------------------------- dlls/iphlpapi/ipstats.h | 3 --- 2 files changed, 0 insertions(+), 48 deletions(-) diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index d01bf22..5ce373f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1268,51 +1268,6 @@ done: return ret; } -DWORD getNumArpEntries(void) -{ -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - 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; - size_t needed; - char *buf, *lim, *next; - struct rt_msghdr *rtm; - struct sockaddr_inarp *sinarp; - struct sockaddr_dl *sdl; - - if (sysctl (mib, MIB_LEN, NULL, &needed, NULL, 0) == -1) - { - ERR ("failed to get size of arp table\n"); - return 0; - } - - buf = HeapAlloc (GetProcessHeap (), 0, needed); - if (!buf) return 0; - - if (sysctl (mib, MIB_LEN, buf, &needed, NULL, 0) == -1) - { - ERR ("failed to get arp table\n"); - HeapFree (GetProcessHeap (), 0, buf); - return 0; - } - - lim = buf + needed; - next = buf; - while(next < lim) - { - rtm = (struct rt_msghdr *)next; - sinarp=(struct sockaddr_inarp *)(rtm + 1); - sdl = (struct sockaddr_dl *)((char *)sinarp + ROUNDUP(sinarp->sin_len)); - if(sdl->sdl_alen) /* arp entry */ - arpEntries++; - next += rtm->rtm_msglen; - } - HeapFree (GetProcessHeap (), 0, buf); - return arpEntries; -#endif - return getNumWithOneHeader("/proc/net/arp"); -} - static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABLE *table, DWORD *count, const MIB_IPNETROW *row ) { diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 3e05d56..88c4839 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,9 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Returns the number of entries in the arp table. */ -DWORD getNumArpEntries(void); - /* Returns the number of entries in the UDP state table. */ DWORD getNumUdpEntries(void);

1 0

Alexandre Julliard : iphlpapi: Reimplement GetIpForwardTable to avoid parsing the same information three times .
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 3ce9eb0f85618ba22700927b4196a06a152a009c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce9eb0f85618ba22700927b4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:49:09 2009 +0100 iphlpapi: Reimplement GetIpForwardTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 45 +++----- dlls/iphlpapi/ipstats.c | 247 +++++++++++++++++----------------------- 2 files changed, 119 insertions(+), 173 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3ce9eb0f85618ba227009…

1 0

Alexandre Julliard : iphlpapi: Moved AllocateAndGetTcpTableFromStack implementation to ipstats.c.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: bc08fb99d3a6ef662556e6eda5788016d7045ad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc08fb99d3a6ef662556e6eda… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:51:02 2009 +0100 iphlpapi: Moved AllocateAndGetTcpTableFromStack implementation to ipstats.c. --- dlls/iphlpapi/iphlpapi_main.c | 66 +---------------------------------------- dlls/iphlpapi/ipstats.c | 44 ++++++++++++++++++++++++++- dlls/iphlpapi/ipstats.h | 6 +--- 3 files changed, 44 insertions(+), 72 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 735091b..1d2735f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -291,67 +291,6 @@ DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, } -static int TcpTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) { - const MIB_TCPROW* rowA = a; - const MIB_TCPROW* rowB = b; - - ret = ntohl (rowA->dwLocalAddr) - ntohl (rowB->dwLocalAddr); - if (ret == 0) { - ret = ntohs ((unsigned short)rowA->dwLocalPort) - - ntohs ((unsigned short)rowB->dwLocalPort); - if (ret == 0) { - ret = ntohl (rowA->dwRemoteAddr) - ntohl (rowB->dwRemoteAddr); - if (ret == 0) - ret = ntohs ((unsigned short)rowA->dwRemotePort) - - ntohs ((unsigned short)rowB->dwRemotePort); - } - } - } - else - ret = 0; - return ret; -} - - -/****************************************************************** - * AllocateAndGetTcpTableFromStack (IPHLPAPI.@) - * - * Get the TCP connection table. - * Like GetTcpTable(), but allocate the returned table from heap. - * - * PARAMS - * ppTcpTable [Out] pointer into which the MIB_TCPTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() - * returns otherwise. - */ -DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, - BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppTcpTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppTcpTable, bOrder, heap, flags); - - *ppTcpTable = NULL; - ret = getTcpTable(ppTcpTable, heap, flags); - if (!ret && bOrder) - qsort((*ppTcpTable)->table, (*ppTcpTable)->dwNumEntries, - sizeof(MIB_TCPROW), TcpTableSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * @@ -1525,7 +1464,7 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getTcpTable(&table, GetProcessHeap(), 0); + ret = AllocateAndGetTcpTableFromStack(&table, bOrder, GetProcessHeap(), 0); if (!ret) { DWORD size = FIELD_OFFSET( MIB_TCPTABLE, table[table->dwNumEntries] ); if (!pTcpTable || *pdwSize < size) { @@ -1535,9 +1474,6 @@ DWORD WINAPI GetTcpTable(PMIB_TCPTABLE pTcpTable, PDWORD pdwSize, BOOL bOrder) else { *pdwSize = size; memcpy(pTcpTable, table, size); - if (bOrder) - qsort(pTcpTable->table, pTcpTable->dwNumEntries, - sizeof(MIB_TCPROW), TcpTableSorter); } HeapFree(GetProcessHeap(), 0, table); } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 2277b80..1a3086f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1591,12 +1591,46 @@ static DWORD TCPStateToMIBState (int state) } -DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, HANDLE heap, DWORD flags) +static int compare_tcp_rows(const void *a, const void *b) +{ + const MIB_TCPROW *rowA = a; + const MIB_TCPROW *rowB = b; + int ret; + + if ((ret = ntohl (rowA->dwLocalAddr) - ntohl (rowB->dwLocalAddr)) != 0) return ret; + if ((ret = ntohs ((unsigned short)rowA->dwLocalPort) - + ntohs ((unsigned short)rowB->dwLocalPort)) != 0) return ret; + if ((ret = ntohl (rowA->dwRemoteAddr) - ntohl (rowB->dwRemoteAddr)) != 0) return ret; + return ntohs ((unsigned short)rowA->dwRemotePort) - ntohs ((unsigned short)rowB->dwRemotePort); +} + + +/****************************************************************** + * AllocateAndGetTcpTableFromStack (IPHLPAPI.@) + * + * Get the TCP connection table. + * Like GetTcpTable(), but allocate the returned table from heap. + * + * PARAMS + * ppTcpTable [Out] pointer into which the MIB_TCPTABLE is + * allocated and returned. + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppTcpTable is NULL, whatever GetTcpTable() + * returns otherwise. + */ +DWORD WINAPI AllocateAndGetTcpTableFromStack( PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, + HANDLE heap, DWORD flags) { MIB_TCPTABLE *table; MIB_TCPROW row; DWORD ret = NO_ERROR, count = 16; + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppTcpTable, bOrder, heap, flags); + if (!ppTcpTable) return ERROR_INVALID_PARAMETER; if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_TCPTABLE, table[count] )))) @@ -1713,7 +1747,13 @@ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, HANDLE heap, DWORD flags) #endif if (!table) return ERROR_OUTOFMEMORY; - if (!ret) *ppTcpTable = table; + if (!ret) + { + if (bOrder && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, sizeof(row), compare_tcp_rows ); + *ppTcpTable = table; + } else HeapFree( heap, flags, table ); + TRACE( "returning ret %u table %p\n", ret, table ); return ret; } diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 431b414..bc2fe7b 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -75,11 +75,7 @@ DWORD getNumUdpEntries(void); /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void); -/* Allocates the TCP state table from heap and returns it to you in *ppTcpTable. - * Returns NO_ERROR on success, something else on failure. - */ -DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, HANDLE heap, DWORD flags); - DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, BOOL bOrder, HANDLE heap, DWORD flags); #endif /* ndef WINE_IPSTATS_H_ */

1 0

Alexandre Julliard : iphlpapi: Moved AllocateAndGetUdpTableFromStack implementation to ipstats.c.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 95827a8237fea9ef3fa0558a99009ff5c9c7cd9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=95827a8237fea9ef3fa0558a9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:50:30 2009 +0100 iphlpapi: Moved AllocateAndGetUdpTableFromStack implementation to ipstats.c. --- dlls/iphlpapi/iphlpapi_main.c | 56 +---------------------------------------- dlls/iphlpapi/ipstats.c | 41 ++++++++++++++++++++++++++++- dlls/iphlpapi/ipstats.h | 7 +--- 3 files changed, 42 insertions(+), 62 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 0c5f209..735091b 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -352,57 +352,6 @@ DWORD WINAPI AllocateAndGetTcpTableFromStack(PMIB_TCPTABLE *ppTcpTable, } -static int UdpTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) { - const MIB_UDPROW* rowA = (const MIB_UDPROW*)a; - const MIB_UDPROW* rowB = (const MIB_UDPROW*)b; - - ret = rowA->dwLocalAddr - rowB->dwLocalAddr; - if (ret == 0) - ret = rowA->dwLocalPort - rowB->dwLocalPort; - } - else - ret = 0; - return ret; -} - - -/****************************************************************** - * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) - * - * Get the UDP listener table. - * Like GetUdpTable(), but allocate the returned table from heap. - * - * PARAMS - * ppUdpTable [Out] pointer into which the MIB_UDPTABLE is - * allocated and returned. - * bOrder [In] whether to sort the table - * heap [In] heap from which the table is allocated - * flags [In] flags to HeapAlloc - * - * RETURNS - * ERROR_INVALID_PARAMETER if ppUdpTable is NULL, whatever GetUdpTable() - * returns otherwise. - */ -DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, - BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppUdpTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppUdpTable, bOrder, heap, flags); - ret = getUdpTable(ppUdpTable, heap, flags); - if (!ret && bOrder) - qsort((*ppUdpTable)->table, (*ppUdpTable)->dwNumEntries, - sizeof(MIB_UDPROW), UdpTableSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * @@ -1650,7 +1599,7 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getUdpTable(&table, GetProcessHeap(), 0); + ret = AllocateAndGetUdpTableFromStack( &table, bOrder, GetProcessHeap(), 0 ); if (!ret) { DWORD size = FIELD_OFFSET( MIB_UDPTABLE, table[table->dwNumEntries] ); if (!pUdpTable || *pdwSize < size) { @@ -1660,9 +1609,6 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) else { *pdwSize = size; memcpy(pUdpTable, table, size); - if (bOrder) - qsort(pUdpTable->table, pUdpTable->dwNumEntries, - sizeof(MIB_UDPROW), UdpTableSorter); } HeapFree(GetProcessHeap(), 0, table); } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 9cfaa21..2277b80 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1454,12 +1454,43 @@ static MIB_UDPTABLE *append_udp_row( HANDLE heap, DWORD flags, MIB_UDPTABLE *tab return table; } -DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) +static int compare_udp_rows(const void *a, const void *b) +{ + const MIB_UDPROW *rowA = a; + const MIB_UDPROW *rowB = b; + int ret; + + if ((ret = rowA->dwLocalAddr - rowB->dwLocalAddr) != 0) return ret; + return rowA->dwLocalPort - rowB->dwLocalPort; +} + + +/****************************************************************** + * AllocateAndGetUdpTableFromStack (IPHLPAPI.@) + * + * Get the UDP listener table. + * Like GetUdpTable(), but allocate the returned table from heap. + * + * PARAMS + * ppUdpTable [Out] pointer into which the MIB_UDPTABLE is + * allocated and returned. + * bOrder [In] whether to sort the table + * heap [In] heap from which the table is allocated + * flags [In] flags to HeapAlloc + * + * RETURNS + * ERROR_INVALID_PARAMETER if ppUdpTable is NULL, whatever GetUdpTable() + * returns otherwise. + */ +DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, + HANDLE heap, DWORD flags) { MIB_UDPTABLE *table; MIB_UDPROW row; DWORD ret = NO_ERROR, count = 16; + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppUdpTable, bOrder, heap, flags); + if (!ppUdpTable) return ERROR_INVALID_PARAMETER; if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_UDPTABLE, table[count] )))) @@ -1496,8 +1527,14 @@ DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) #endif if (!table) return ERROR_OUTOFMEMORY; - if (!ret) *ppUdpTable = table; + if (!ret) + { + if (bOrder && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, sizeof(row), compare_udp_rows ); + *ppUdpTable = table; + } else HeapFree( heap, flags, table ); + TRACE( "returning ret %u table %p\n", ret, table ); return ret; } diff --git a/dlls/iphlpapi/ipstats.h b/dlls/iphlpapi/ipstats.h index 147276e..431b414 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -72,11 +72,6 @@ DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags); /* Returns the number of entries in the UDP state table. */ DWORD getNumUdpEntries(void); -/* Allocates the UDP state table from heap and returns it to you in *ppUdpTable. - * Returns NO_ERROR on success, something else on failure. - */ -DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags); - /* Returns the number of entries in the TCP state table. */ DWORD getNumTcpEntries(void); @@ -85,4 +80,6 @@ DWORD getNumTcpEntries(void); */ DWORD getTcpTable(PMIB_TCPTABLE *ppTcpTable, HANDLE heap, DWORD flags); +DWORD WINAPI AllocateAndGetUdpTableFromStack(PMIB_UDPTABLE *ppUdpTable, BOOL bOrder, HANDLE heap, DWORD flags); + #endif /* ndef WINE_IPSTATS_H_ */

1 0

Alexandre Julliard : iphlpapi: Reimplement GetIpNetTable to avoid parsing the same information three times .
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: add9e025c2456e6e109ebcb0d3360b02f8b3e8cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=add9e025c2456e6e109ebcb0d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:45:58 2009 +0100 iphlpapi: Reimplement GetIpNetTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 37 ++----- dlls/iphlpapi/ipstats.c | 232 ++++++++++++++++++++--------------------- 2 files changed, 122 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=add9e025c2456e6e109eb…

1 0