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

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

March 2, 2009

Module: wine Branch: master Commit: 44f30a645e65db6385bc9b33d26de2c3264d8e84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44f30a645e65db6385bc9b33d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:52:45 2009 +0100 iphlpapi: Moved AllocateAndGetIpForwardTableFromStack implementation to ipstats.c. --- dlls/iphlpapi/iphlpapi_main.c | 64 +--------------------------------------- dlls/iphlpapi/ipstats.c | 42 +++++++++++++++++++++++++- dlls/iphlpapi/ipstats.h | 7 +---- 3 files changed, 43 insertions(+), 70 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f0ca8ad..3481f86 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -189,63 +189,6 @@ DWORD WINAPI AllocateAndGetIpAddrTableFromStack(PMIB_IPADDRTABLE *ppIpAddrTable, } -static int IpForwardTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) { - const MIB_IPFORWARDROW* rowA = (const MIB_IPFORWARDROW*)a; - const MIB_IPFORWARDROW* rowB = (const MIB_IPFORWARDROW*)b; - - ret = rowA->dwForwardDest - rowB->dwForwardDest; - if (ret == 0) { - ret = rowA->dwForwardProto - rowB->dwForwardProto; - if (ret == 0) { - ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy; - if (ret == 0) - ret = rowA->dwForwardNextHop - rowB->dwForwardNextHop; - } - } - } - else - ret = 0; - return ret; -} - - -/****************************************************************** - * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) - * - * Get the route table. - * Like GetIpForwardTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpForwardTable [Out] pointer into which the MIB_IPFORWARDTABLE 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 ppIfTable is NULL, other error codes - * on failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * - ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppIpForwardTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppIpForwardTable, bOrder, heap, flags); - ret = getRouteTable(ppIpForwardTable, heap, flags); - if (!ret && bOrder) - qsort((*ppIpForwardTable)->table, (*ppIpForwardTable)->dwNumEntries, - sizeof(MIB_IPFORWARDROW), IpForwardTableSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * @@ -535,7 +478,7 @@ DWORD WINAPI GetAdaptersInfo(PIP_ADAPTER_INFO pAdapterInfo, PULONG pOutBufLen) ret = getIPAddrTable(&ipAddrTable, GetProcessHeap(), 0); if (!ret) - ret = getRouteTable(&routeTable, GetProcessHeap(), 0); + ret = AllocateAndGetIpForwardTableFromStack(&routeTable, FALSE, GetProcessHeap(), 0); if (!ret) table = getNonLoopbackInterfaceIndexTable(); if (table) { @@ -1101,7 +1044,7 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getRouteTable(&table, GetProcessHeap(), 0); + ret = AllocateAndGetIpForwardTableFromStack(&table, bOrder, GetProcessHeap(), 0); if (!ret) { DWORD size = FIELD_OFFSET( MIB_IPFORWARDTABLE, table[table->dwNumEntries] ); if (!pIpForwardTable || *pdwSize < size) { @@ -1111,9 +1054,6 @@ DWORD WINAPI GetIpForwardTable(PMIB_IPFORWARDTABLE pIpForwardTable, PULONG pdwSi else { *pdwSize = size; memcpy(pIpForwardTable, table, size); - if (bOrder) - qsort(pIpForwardTable->table, pIpForwardTable->dwNumEntries, - sizeof(MIB_IPFORWARDROW), IpForwardTableSorter); } HeapFree(GetProcessHeap(), 0, table); } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 58ec76f..d01bf22 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1065,12 +1065,44 @@ static MIB_IPFORWARDTABLE *append_ipforward_row( HANDLE heap, DWORD flags, MIB_I return table; } -DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, DWORD flags) +static int compare_ipforward_rows(const void *a, const void *b) +{ + const MIB_IPFORWARDROW *rowA = a; + const MIB_IPFORWARDROW *rowB = b; + int ret; + + if ((ret = rowA->dwForwardDest - rowB->dwForwardDest) != 0) return ret; + if ((ret = rowA->dwForwardProto - rowB->dwForwardProto) != 0) return ret; + if ((ret = rowA->dwForwardPolicy - rowB->dwForwardPolicy) != 0) return ret; + return rowA->dwForwardNextHop - rowB->dwForwardNextHop; +} + +/****************************************************************** + * AllocateAndGetIpForwardTableFromStack (IPHLPAPI.@) + * + * Get the route table. + * Like GetIpForwardTable(), but allocate the returned table from heap. + * + * PARAMS + * ppIpForwardTable [Out] pointer into which the MIB_IPFORWARDTABLE 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 ppIfTable is NULL, other error codes + * on failure, NO_ERROR on success. + */ +DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, + HANDLE heap, DWORD flags) { MIB_IPFORWARDTABLE *table; MIB_IPFORWARDROW row; DWORD ret = NO_ERROR, count = 16; + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpForwardTable, bOrder, heap, flags); + if (!ppIpForwardTable) return ERROR_INVALID_PARAMETER; if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPFORWARDTABLE, table[count] )))) @@ -1225,8 +1257,14 @@ done: #endif if (!table) return ERROR_OUTOFMEMORY; - if (!ret) *ppIpForwardTable = table; + if (!ret) + { + if (bOrder && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, sizeof(row), compare_ipforward_rows ); + *ppIpForwardTable = 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 30b78b2..3e05d56 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -55,12 +55,6 @@ DWORD getUDPStats(MIB_UDPSTATS *stats); /* Returns the number of entries in the route table. */ DWORD getNumRoutes(void); -/* Allocates the route table from heap and returns it to you in - * *ppIpForwardTable. Returns NO_ERROR on success, something else on failure. - */ -DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, - DWORD flags); - /* Returns the number of entries in the arp table. */ DWORD getNumArpEntries(void); @@ -73,5 +67,6 @@ 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); +DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE *ppIpForwardTable, BOOL bOrder, HANDLE heap, DWORD flags); #endif /* ndef WINE_IPSTATS_H_ */

1 0

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

March 2, 2009

Module: wine Branch: master Commit: b406213c42793cc166b90ab2f7d4fc70445b0103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b406213c42793cc166b90ab2f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:51:48 2009 +0100 iphlpapi: Moved AllocateAndGetIpNetTableFromStack implementation to ipstats.c. --- dlls/iphlpapi/iphlpapi_main.c | 50 +---------------------------------------- dlls/iphlpapi/ipstats.c | 39 ++++++++++++++++++++++++++++++- dlls/iphlpapi/ipstats.h | 6 +---- 3 files changed, 39 insertions(+), 56 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 1d2735f..f0ca8ad 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -246,51 +246,6 @@ DWORD WINAPI AllocateAndGetIpForwardTableFromStack(PMIB_IPFORWARDTABLE * } -static int IpNetTableSorter(const void *a, const void *b) -{ - int ret; - - if (a && b) - ret = ((const MIB_IPNETROW*)a)->dwAddr - ((const MIB_IPNETROW*)b)->dwAddr; - else - ret = 0; - return ret; -} - - -/****************************************************************** - * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) - * - * Get the IP-to-physical address mapping table. - * Like GetIpNetTable(), but allocate the returned table from heap. - * - * PARAMS - * ppIpNetTable [Out] pointer into which the MIB_IPNETTABLE 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 ppIpNetTable is NULL, other error codes - * on failure, NO_ERROR on success. - */ -DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, - BOOL bOrder, HANDLE heap, DWORD flags) -{ - DWORD ret; - - TRACE("ppIpNetTable %p, bOrder %d, heap %p, flags 0x%08x\n", - ppIpNetTable, bOrder, heap, flags); - ret = getArpTable(ppIpNetTable, heap, flags); - if (!ret && bOrder) - qsort((*ppIpNetTable)->table, (*ppIpNetTable)->dwNumEntries, - sizeof(MIB_IPADDRROW), IpNetTableSorter); - TRACE("returning %d\n", ret); - return ret; -} - - /****************************************************************** * CreateIpForwardEntry (IPHLPAPI.@) * @@ -1196,7 +1151,7 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getArpTable(&table, GetProcessHeap(), 0); + ret = AllocateAndGetIpNetTableFromStack( &table, bOrder, GetProcessHeap(), 0 ); if (!ret) { DWORD size = FIELD_OFFSET( MIB_IPNETTABLE, table[table->dwNumEntries] ); if (!pIpNetTable || *pdwSize < size) { @@ -1206,9 +1161,6 @@ DWORD WINAPI GetIpNetTable(PMIB_IPNETTABLE pIpNetTable, PULONG pdwSize, BOOL bOr else { *pdwSize = size; memcpy(pIpNetTable, table, size); - if (bOrder) - qsort(pIpNetTable->table, pIpNetTable->dwNumEntries, - sizeof(MIB_IPNETROW), IpNetTableSorter); } HeapFree(GetProcessHeap(), 0, table); } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index 1a3086f..58ec76f 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1296,12 +1296,41 @@ static MIB_IPNETTABLE *append_ipnet_row( HANDLE heap, DWORD flags, MIB_IPNETTABL return table; } -DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags) +static int compare_ipnet_rows(const void *a, const void *b) +{ + const MIB_IPNETROW *rowA = a; + const MIB_IPNETROW *rowB = b; + + return ntohl(rowA->dwAddr) - ntohl(rowB->dwAddr); +} + + +/****************************************************************** + * AllocateAndGetIpNetTableFromStack (IPHLPAPI.@) + * + * Get the IP-to-physical address mapping table. + * Like GetIpNetTable(), but allocate the returned table from heap. + * + * PARAMS + * ppIpNetTable [Out] pointer into which the MIB_IPNETTABLE 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 ppIpNetTable is NULL, other error codes + * on failure, NO_ERROR on success. + */ +DWORD WINAPI AllocateAndGetIpNetTableFromStack(PMIB_IPNETTABLE *ppIpNetTable, BOOL bOrder, + HANDLE heap, DWORD flags) { MIB_IPNETTABLE *table; MIB_IPNETROW row; DWORD ret = NO_ERROR, count = 16; + TRACE("table %p, bOrder %d, heap %p, flags 0x%08x\n", ppIpNetTable, bOrder, heap, flags); + if (!ppIpNetTable) return ERROR_INVALID_PARAMETER; if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_IPNETTABLE, table[count] )))) @@ -1420,8 +1449,14 @@ done: #endif if (!table) return ERROR_OUTOFMEMORY; - if (!ret) *ppIpNetTable = table; + if (!ret) + { + if (bOrder && table->dwNumEntries) + qsort( table->table, table->dwNumEntries, sizeof(row), compare_ipnet_rows ); + *ppIpNetTable = 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 bc2fe7b..30b78b2 100644 --- a/dlls/iphlpapi/ipstats.h +++ b/dlls/iphlpapi/ipstats.h @@ -64,11 +64,6 @@ DWORD getRouteTable(PMIB_IPFORWARDTABLE *ppIpForwardTable, HANDLE heap, /* Returns the number of entries in the arp table. */ DWORD getNumArpEntries(void); -/* Allocates the arp table from heap and returns it to you in *ppIpNetTable. - * Returns NO_ERROR on success, something else on failure. - */ -DWORD getArpTable(PMIB_IPNETTABLE *ppIpNetTable, HANDLE heap, DWORD flags); - /* Returns the number of entries in the UDP state table. */ DWORD getNumUdpEntries(void); @@ -77,5 +72,6 @@ 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); #endif /* ndef WINE_IPSTATS_H_ */

1 0

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

March 2, 2009

Module: wine Branch: master Commit: d069e498e17ae8daea44bf284deb0492c301d219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d069e498e17ae8daea44bf284… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:43:33 2009 +0100 iphlpapi: Reimplement GetUdpTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 39 ++++---------- dlls/iphlpapi/ipstats.c | 118 ++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 89 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index f580ca8..c9ced14 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1685,31 +1685,17 @@ DWORD WINAPI GetUdpStatistics(PMIB_UDPSTATS pStats) */ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) { - DWORD ret; + DWORD ret; + PMIB_UDPTABLE table; - TRACE("pUdpTable %p, pdwSize %p, bOrder %d\n", pUdpTable, pdwSize, - (DWORD)bOrder); - if (!pdwSize) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumUdpEntries(); - DWORD size = sizeof(MIB_UDPTABLE); + TRACE("pUdpTable %p, pdwSize %p, bOrder %d\n", pUdpTable, pdwSize, bOrder); - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_UDPROW); - if (!pUdpTable || *pdwSize < size) { - *pdwSize = size; - ret = ERROR_INSUFFICIENT_BUFFER; - } - else { - PMIB_UDPTABLE table; + if (!pdwSize) return ERROR_INVALID_PARAMETER; - ret = getUdpTable(&table, GetProcessHeap(), 0); - if (!ret) { - size = sizeof(MIB_UDPTABLE); - if (table->dwNumEntries > 1) - size += (table->dwNumEntries - 1) * sizeof(MIB_UDPROW); - if (*pdwSize < size) { + ret = getUdpTable(&table, GetProcessHeap(), 0); + if (!ret) { + DWORD size = FIELD_OFFSET( MIB_UDPTABLE, table[table->dwNumEntries] ); + if (!pUdpTable || *pdwSize < size) { *pdwSize = size; ret = ERROR_INSUFFICIENT_BUFFER; } @@ -1719,16 +1705,11 @@ DWORD WINAPI GetUdpTable(PMIB_UDPTABLE pUdpTable, PDWORD pdwSize, BOOL bOrder) if (bOrder) qsort(pUdpTable->table, pUdpTable->dwNumEntries, sizeof(MIB_UDPROW), UdpTableSorter); - ret = NO_ERROR; } HeapFree(GetProcessHeap(), 0, table); - } - else - ret = ERROR_OUTOFMEMORY; } - } - TRACE("returning %d\n", ret); - return ret; + TRACE("returning %d\n", ret); + return ret; } diff --git a/dlls/iphlpapi/ipstats.c b/dlls/iphlpapi/ipstats.c index ada1430..57398bb 100644 --- a/dlls/iphlpapi/ipstats.c +++ b/dlls/iphlpapi/ipstats.c @@ -1,5 +1,7 @@ -/* Copyright (C) 2003,2006 Juan Lang +/* + * Copyright (C) 2003,2006 Juan Lang * Copyright (C) 2007 TransGaming Technologies Inc. + * Copyright (C) 2009 Alexandre Julliard * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -14,9 +16,6 @@ * You should have received a copy of the GNU Lesser General Public * License along with this library; if not, write to the Free Software * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * This file implements statistics getting using the /proc filesystem exported - * by Linux, and maybe other OSes. */ #include "config.h" @@ -1480,72 +1479,71 @@ DWORD getNumUdpEntries(void) #endif } -DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) +static MIB_UDPTABLE *append_udp_row( HANDLE heap, DWORD flags, MIB_UDPTABLE *table, + DWORD *count, const MIB_UDPROW *row ) { - DWORD ret; + if (table->dwNumEntries >= *count) + { + MIB_UDPTABLE *new_table; + DWORD new_count = table->dwNumEntries * 2; -#if defined(HAVE_SYS_SYSCTL_H) && defined(NET_RT_DUMP) - ERR ("unimplemented!\n"); - return ERROR_NOT_SUPPORTED; -#endif + if (!(new_table = HeapReAlloc( heap, flags, table, FIELD_OFFSET(MIB_UDPTABLE, table[new_count] )))) + { + HeapFree( heap, 0, table ); + return NULL; + } + *count = new_count; + table = new_table; + } + memcpy( &table->table[table->dwNumEntries++], row, sizeof(*row) ); + return table; +} - if (!ppUdpTable) - ret = ERROR_INVALID_PARAMETER; - else { - DWORD numEntries = getNumUdpEntries(); - DWORD size = sizeof(MIB_UDPTABLE); - PMIB_UDPTABLE table; +DWORD getUdpTable(PMIB_UDPTABLE *ppUdpTable, HANDLE heap, DWORD flags) +{ + MIB_UDPTABLE *table; + MIB_UDPROW row; + DWORD ret = NO_ERROR, count = 16; - if (numEntries > 1) - size += (numEntries - 1) * sizeof(MIB_UDPROW); - table = HeapAlloc(heap, flags, size); - if (table) { - FILE *fp; + if (!ppUdpTable) return ERROR_INVALID_PARAMETER; - ret = NO_ERROR; - *ppUdpTable = table; - table->dwNumEntries = 0; - /* get from /proc/net/udp, no error if can't */ - fp = fopen("/proc/net/udp", "r"); - if (fp) { - char buf[512] = { 0 }, *ptr; + if (!(table = HeapAlloc( heap, flags, FIELD_OFFSET(MIB_UDPTABLE, table[count] )))) + return ERROR_OUTOFMEMORY; - /* skip header line */ - ptr = fgets(buf, sizeof(buf), fp); - while (ptr && table->dwNumEntries < numEntries) { - memset(&table->table[table->dwNumEntries], 0, sizeof(MIB_UDPROW)); - ptr = fgets(buf, sizeof(buf), fp); - if (ptr) { - char *endPtr; + table->dwNumEntries = 0; - if (ptr && *ptr) { - strtoul(ptr, &endPtr, 16); /* skip */ - ptr = endPtr; - } - if (ptr && *ptr) { - ptr++; - table->table[table->dwNumEntries].dwLocalAddr = strtoul(ptr, - &endPtr, 16); - ptr = endPtr; - } - if (ptr && *ptr) { - ptr++; - table->table[table->dwNumEntries].dwLocalPort = strtoul(ptr, - &endPtr, 16); - ptr = endPtr; +#ifdef __linux__ + { + FILE *fp; + + if ((fp = fopen("/proc/net/udp", "r"))) + { + char buf[512], *ptr; + DWORD dummy; + + /* skip header line */ + ptr = fgets(buf, sizeof(buf), fp); + while ((ptr = fgets(buf, sizeof(buf), fp))) + { + if (sscanf( ptr, "%u: %x:%x", &dummy, &row.dwLocalAddr, &row.dwLocalPort ) != 3) + continue; + row.dwLocalPort = htons( row.dwLocalPort ); + if (!(table = append_udp_row( heap, flags, table, &count, &row ))) + break; } - table->dwNumEntries++; - } + fclose(fp); } - fclose(fp); - } - else - ret = ERROR_NOT_SUPPORTED; + else ret = ERROR_NOT_SUPPORTED; } - else - ret = ERROR_OUTOFMEMORY; - } - return ret; +#else + FIXME( "not implemented\n" ); + ret = ERROR_NOT_SUPPORTED; +#endif + + if (!table) return ERROR_OUTOFMEMORY; + if (!ret) *ppUdpTable = table; + else HeapFree( heap, flags, table ); + return ret; }

1 0

Hwang YunSong(황윤성) : wordpad: Updated Korean resource.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 9b309b0142144839f51f4de86cd0ed378fb2c680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b309b0142144839f51f4de86… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 2 16:42:56 2009 +0900 wordpad: Updated Korean resource. --- programs/wordpad/Ko.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/wordpad/Ko.rc b/programs/wordpad/Ko.rc index 79885f5..7bfaf00 100644 --- a/programs/wordpad/Ko.rc +++ b/programs/wordpad/Ko.rc @@ -242,4 +242,5 @@ BEGIN STRING_OPEN_FAILED, "�� ϴ�." STRING_OPEN_ACCESS_DENIED, "�� ϴ�." STRING_PRINTING_NOT_IMPLEMENTED, "�μ�� ʽ��ϴ�" + STRING_MAX_TAB_STOPS, " �� 32�� ̻� �߰� �� ϴ�." END

1 0

Hwang YunSong(황윤성) : setupapi: Updated Korean resource.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: ff878b0c373b5ae8efe2306e322c2518e39fb19d URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff878b0c373b5ae8efe2306e3… Author: Hwang YunSong(황윤성) <hys545(a)dreamwiz.com> Date: Mon Mar 2 16:42:16 2009 +0900 setupapi: Updated Korean resource. --- dlls/setupapi/Ko.rc | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/dlls/setupapi/Ko.rc b/dlls/setupapi/Ko.rc index 9c1fad3..dfd75a9 100644 --- a/dlls/setupapi/Ko.rc +++ b/dlls/setupapi/Ko.rc @@ -20,6 +20,14 @@ LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT +STRINGTABLE DISCARDABLE +{ + IDS_PROMPTDISK "�� '%s' �� %s�� ʿ�� մϴ�" + IDS_UNKNOWN "�˼� ��" + IDS_COPYFROM "�� ġ�� :" + IDS_INFO "�� ġ�� θ� �Է��ϰ�, Ȯ�� Ŭ��Ͻʽÿ�." +} + COPYFILEDLGORD DIALOG LOADONCALL MOVEABLE DISCARDABLE 20, 20, 208, 105 STYLE DS_MODALFRAME | DS_SETFONT | WS_POPUP | WS_VISIBLE | WS_CAPTION CAPTION "�� ..." @@ -32,3 +40,17 @@ BEGIN LTEXT "", DESTSTRORD, 7, 41, 194, 22, WS_CHILD | WS_VISIBLE | WS_GROUP CONTROL "", PROGRESSORD, "setupx_progress", 7, 63, 194, 13, WS_CHILD | WS_VISIBLE | WS_TABSTOP END + +IDPROMPTFORDISK DIALOG MOVEABLE DISCARDABLE 0, 0, 250, 120 +STYLE DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "�ʿ�� ϵ�" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "��ۻ�� ġ ��ũ�� ϰ�, \ �Ʒ�� õ� ��̺갡 �ùٸ�� Ȯ��Ͻÿ� ", IDC_FILENEEDED, 10, 10, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "", IDC_INFO, 10, 50, 175, 22, WS_CHILD | WS_VISIBLE | WS_GROUP + LTEXT "��ۻ�� ϵ� �� :", IDC_COPYFROM, 10, 90, 175, 11, WS_CHILD | WS_VISIBLE | WS_GROUP + CONTROL "", IDC_PATH, "COMBOBOX", WS_TABSTOP | WS_GROUP | WS_VSCROLL | WS_VISIBLE | CBS_DISABLENOSCROLL | CBS_AUTOHSCROLL | CBS_DROPDOWN, 10, 100, 175, 14 + PUSHBUTTON "Ȯ��", IDOK, 195, 10, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "��", IDCANCEL, 195, 30, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "ã��...", IDC_RUNDLG_BROWSE, 195, 100, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP +END

1 0

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

March 2, 2009

Module: wine Branch: master Commit: 53d522bc545ca2d2bca012e5a4a70398144e63c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53d522bc545ca2d2bca012e5a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 2 12:45:12 2009 +0100 iphlpapi: Reimplement GetTcpTable to avoid parsing the same information three times. --- dlls/iphlpapi/iphlpapi_main.c | 52 ++++----- dlls/iphlpapi/ipstats.c | 273 ++++++++++++++++++----------------------- dlls/iphlpapi/ipstats.h | 3 +- 3 files changed, 145 insertions(+), 183 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=53d522bc545ca2d2bca01…

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectTechnique::GetPassByName().
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 5d5ae0c42127adbd868c238455b043619902b371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d5ae0c42127adbd868c23845… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10EffectTechnique::GetPassByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 107 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 108 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index a832c83..956d5ae 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -44,8 +44,11 @@ struct d3d10_effect_variable DWORD idx_offset; }; +/* ID3D10EffectPass */ struct d3d10_effect_pass { + const struct ID3D10EffectPassVtbl *vtbl; + char *name; DWORD start; DWORD variable_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 96eb2f3..88cf8bb 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -31,6 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; +static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl; static inline void read_dword(const char **ptr, DWORD *d) { @@ -158,7 +159,11 @@ static HRESULT parse_fx10_technique_index(struct d3d10_effect_technique *t, cons for (i = 0; i < t->pass_count; ++i) { - hr = parse_fx10_pass_index(&t->passes[i], ptr); + struct d3d10_effect_pass *p = &t->passes[i]; + + p->vtbl = &d3d10_effect_pass_vtbl; + + hr = parse_fx10_pass_index(p, ptr); if (FAILED(hr)) break; } @@ -685,7 +690,20 @@ static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPas static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->pass_count; ++i) + { + struct d3d10_effect_pass *p = &This->passes[i]; + if (!strcmp(p->name, name)) + { + TRACE("Returning pass %p\n", p); + return (ID3D10EffectPass *)p; + } + } return NULL; } @@ -709,3 +727,88 @@ static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = d3d10_effect_technique_GetPassByName, d3d10_effect_technique_ComputeStateBlockMask, }; + +/* ID3D10EffectPass methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_pass_IsValid(ID3D10EffectPass *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetDesc(ID3D10EffectPass *iface, D3D10_PASS_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetVertexShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetGeometryShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_GetPixelShaderDesc(ID3D10EffectPass *iface, + D3D10_PASS_SHADER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByIndex(ID3D10EffectPass *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_pass_GetAnnotationByName(ID3D10EffectPass *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) +{ + FIXME("iface %p, flags %#x stub!\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, + D3D10_STATE_BLOCK_MASK *mask) +{ + FIXME("iface %p, mask %p stub!\n", iface, mask); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectPassVtbl d3d10_effect_pass_vtbl = +{ + /* ID3D10EffectPass methods */ + d3d10_effect_pass_IsValid, + d3d10_effect_pass_GetDesc, + d3d10_effect_pass_GetVertexShaderDesc, + d3d10_effect_pass_GetGeometryShaderDesc, + d3d10_effect_pass_GetPixelShaderDesc, + d3d10_effect_pass_GetAnnotationByIndex, + d3d10_effect_pass_GetAnnotationByName, + d3d10_effect_pass_Apply, + d3d10_effect_pass_ComputeStateBlockMask, +};

1 0

Henri Verbeet : d3d10: Implement ID3D10Effect::GetTechniqueByName().
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 5e59028a4eb0e1f3c7ae1895659a876e11287bac URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e59028a4eb0e1f3c7ae18956… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10Effect::GetTechniqueByName(). --- dlls/d3d10/d3d10_private.h | 3 + dlls/d3d10/effect.c | 89 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 91 insertions(+), 1 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 02e0eec..a832c83 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -52,8 +52,11 @@ struct d3d10_effect_pass struct d3d10_effect_variable *variables; }; +/* ID3D10EffectTechnique */ struct d3d10_effect_technique { + const struct ID3D10EffectTechniqueVtbl *vtbl; + char *name; DWORD start; DWORD pass_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 4e725e3..9f1b77e 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -30,6 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') +static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl; + static inline void read_dword(const char **ptr, DWORD *d) { memcpy(d, *ptr, sizeof(*d)); @@ -322,6 +324,9 @@ static HRESULT parse_fx10_body(struct d3d10_effect *e, const char *data, DWORD d for (i = 0; i < e->technique_count; ++i) { struct d3d10_effect_technique *t = &e->techniques[i]; + + t->vtbl = &d3d10_effect_technique_vtbl; + hr = parse_fx10_technique_index(t, &ptr); if (FAILED(hr)) break; @@ -569,7 +574,20 @@ static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqu static struct ID3D10EffectTechnique * STDMETHODCALLTYPE d3d10_effect_GetTechniqueByName(ID3D10Effect *iface, LPCSTR name) { - FIXME("iface %p, name \"%s\" stub!\n", iface, name); + struct d3d10_effect *This = (struct d3d10_effect *)iface; + unsigned int i; + + TRACE("iface %p, name \"%s\"\n", iface, name); + + for (i = 0; i < This->technique_count; ++i) + { + struct d3d10_effect_technique *t = &This->techniques[i]; + if (!strcmp(t->name, name)) + { + TRACE("Returning technique %p\n", t); + return (ID3D10EffectTechnique *)t; + } + } return NULL; } @@ -609,3 +627,72 @@ const struct ID3D10EffectVtbl d3d10_effect_vtbl = d3d10_effect_Optimize, d3d10_effect_IsOptimized, }; + +/* ID3D10EffectTechnique methods */ + +static BOOL STDMETHODCALLTYPE d3d10_effect_technique_IsValid(ID3D10EffectTechnique *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_GetDesc(ID3D10EffectTechnique *iface, + D3D10_TECHNIQUE_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); + + return E_NOTIMPL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByIndex( + ID3D10EffectTechnique *iface, UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_GetAnnotationByName( + ID3D10EffectTechnique *iface, LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, + UINT index) +{ + FIXME("iface %p, index %u stub!\n", iface, index); + + return NULL; +} + +static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface, + LPCSTR name) +{ + FIXME("iface %p, name \"%s\" stub!\n", iface, name); + + return NULL; +} + +static HRESULT STDMETHODCALLTYPE d3d10_effect_technique_ComputeStateBlockMask(ID3D10EffectTechnique *iface, + D3D10_STATE_BLOCK_MASK *mask) +{ + FIXME("iface %p,mask %p stub!\n", iface, mask); + + return E_NOTIMPL; +} + +static const struct ID3D10EffectTechniqueVtbl d3d10_effect_technique_vtbl = +{ + /* ID3D10EffectTechnique methods */ + d3d10_effect_technique_IsValid, + d3d10_effect_technique_GetDesc, + d3d10_effect_technique_GetAnnotationByIndex, + d3d10_effect_technique_GetAnnotationByName, + d3d10_effect_technique_GetPassByIndex, + d3d10_effect_technique_GetPassByName, + d3d10_effect_technique_ComputeStateBlockMask, +};

1 0

Henri Verbeet : d3d10: Implement ID3D10EffectTechnique::GetPassByIndex().
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: f5f87b89be22dc1637fae3245f1250368d0ed763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5f87b89be22dc1637fae3245… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:49 2009 +0100 d3d10: Implement ID3D10EffectTechnique::GetPassByIndex(). --- dlls/d3d10/effect.c | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 88cf8bb..61b4a6f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -682,9 +682,22 @@ static struct ID3D10EffectVariable * STDMETHODCALLTYPE d3d10_effect_technique_Ge static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByIndex(ID3D10EffectTechnique *iface, UINT index) { - FIXME("iface %p, index %u stub!\n", iface, index); + struct d3d10_effect_technique *This = (struct d3d10_effect_technique *)iface; + struct d3d10_effect_pass *p; - return NULL; + TRACE("iface %p, index %u\n", iface, index); + + if (index >= This->pass_count) + { + WARN("Invalid index specified\n"); + return NULL; + } + + p = &This->passes[index]; + + TRACE("Returning pass %p, \"%s\"\n", p, p->name); + + return (ID3D10EffectPass *)p; } static struct ID3D10EffectPass * STDMETHODCALLTYPE d3d10_effect_technique_GetPassByName(ID3D10EffectTechnique *iface,

1 0

Henri Verbeet : d3d10: Fix a typo.
by Alexandre Julliard March 2, 2009

March 2, 2009

Module: wine Branch: master Commit: 892ce1db5e1a7c9ccdc67c9c8edb6661c0fdbcf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=892ce1db5e1a7c9ccdc67c9c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Mar 2 08:52:48 2009 +0100 d3d10: Fix a typo. --- dlls/d3d10/effect.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 09a9378..4e725e3 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -32,8 +32,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); static inline void read_dword(const char **ptr, DWORD *d) { - memcpy(d, *ptr, sizeof(d)); - *ptr += sizeof(d); + memcpy(d, *ptr, sizeof(*d)); + *ptr += sizeof(*d); } static inline void skip_dword_unknown(const char **ptr, unsigned int count)

1 0