[PATCH v2 2/2] iphlpapi/tests: Call GetExtendedTcp/UdpTable() in a loop.

[Hans Leidekker]

From: Hans Leidekker

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54588
---
 dlls/iphlpapi/tests/iphlpapi.c | 103 +++++++++++++++------------------
 1 file changed, 47 insertions(+), 56 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index bd566980500..83922a65f4b 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -1866,9 +1866,27 @@ static void test_GetAdaptersAddresses(void)
     free(ptr);
 }

+static DWORD get_extended_tcp_table( ULONG family, TCP_TABLE_CLASS class, void **table )
+{
+    DWORD ret, size = 0;
+
+    *table = NULL;
+    ret = pGetExtendedTcpTable( NULL, &size, TRUE, family, class, 0 );
+    if (ret != ERROR_INSUFFICIENT_BUFFER) return ret;
+
+    *table = malloc( size );
+    ret = pGetExtendedTcpTable( *table, &size, TRUE, family, class, 0 );
+    while (ret == ERROR_INSUFFICIENT_BUFFER)
+    {
+        *table = realloc( *table, size );
+        ret = pGetExtendedTcpTable( *table, &size, TRUE, family, class, 0 );
+    }
+    return ret;
+}
+
 static void test_GetExtendedTcpTable(void)
 {
-    DWORD ret, size;
+    DWORD ret;
     MIB_TCPTABLE *table;
     MIB_TCPTABLE_OWNER_PID *table_pid;
     MIB_TCPTABLE_OWNER_MODULE *table_module;
@@ -1881,57 +1899,27 @@ static void test_GetExtendedTcpTable(void)
     ret = pGetExtendedTcpTable( NULL, NULL, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 );
     ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table = malloc( size );
-    ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_ALL, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_BASIC_ALL, (void **)&table );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table = malloc( size );
-    ret = pGetExtendedTcpTable( table, &size, TRUE, AF_INET, TCP_TABLE_BASIC_LISTENER, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_BASIC_LISTENER, (void **)&table );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_pid = malloc( size );
-    ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_ALL, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_PID_ALL, (void **)&table_pid );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_pid );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_pid = malloc( size );
-    ret = pGetExtendedTcpTable( table_pid, &size, TRUE, AF_INET, TCP_TABLE_OWNER_PID_LISTENER, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_PID_LISTENER, (void **)&table_pid );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_pid );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_module = malloc( size );
-    ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_ALL, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_MODULE_ALL, (void **)&table_module );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_module );

-    size = 0;
-    ret = pGetExtendedTcpTable( NULL, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_module = malloc( size );
-    ret = pGetExtendedTcpTable( table_module, &size, TRUE, AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, 0 );
+    ret = get_extended_tcp_table( AF_INET, TCP_TABLE_OWNER_MODULE_LISTENER, (void **)&table_module );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_module );
 }
@@ -1985,9 +1973,27 @@ static void test_AllocateAndGetTcpExTableFromStack(void)
     ok( ret == ERROR_NOT_SUPPORTED, "got %lu\n", ret );
 }

+static DWORD get_extended_udp_table( ULONG family, UDP_TABLE_CLASS class, void **table )
+{
+    DWORD ret, size = 0;
+
+    *table = NULL;
+    ret = pGetExtendedUdpTable( NULL, &size, TRUE, family, class, 0 );
+    if (ret != ERROR_INSUFFICIENT_BUFFER) return ret;
+
+    *table = malloc( size );
+    ret = pGetExtendedUdpTable( *table, &size, TRUE, family, class, 0 ); 
+    while (ret == ERROR_INSUFFICIENT_BUFFER)
+    {
+        *table = realloc( *table, size );
+        ret = pGetExtendedUdpTable( *table, &size, TRUE, family, class, 0 ); 
+    }
+    return ret;
+}
+
 static void test_GetExtendedUdpTable(void)
 {
-    DWORD ret, size;
+    DWORD ret;
     MIB_UDPTABLE *table;
     MIB_UDPTABLE_OWNER_PID *table_pid;
     MIB_UDPTABLE_OWNER_MODULE *table_module;
@@ -2000,30 +2006,15 @@ static void test_GetExtendedUdpTable(void)
     ret = pGetExtendedUdpTable( NULL, NULL, TRUE, AF_INET, UDP_TABLE_BASIC, 0 );
     ok( ret == ERROR_INVALID_PARAMETER, "got %lu\n", ret );

-    size = 0;
-    ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table = malloc( size );
-    ret = pGetExtendedUdpTable( table, &size, TRUE, AF_INET, UDP_TABLE_BASIC, 0 );
+    ret = get_extended_udp_table( AF_INET, UDP_TABLE_BASIC, (void **)&table );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table );

-    size = 0;
-    ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_pid = malloc( size );
-    ret = pGetExtendedUdpTable( table_pid, &size, TRUE, AF_INET, UDP_TABLE_OWNER_PID, 0 );
+    ret = get_extended_udp_table( AF_INET, UDP_TABLE_OWNER_PID, (void **)&table_pid );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_pid );

-    size = 0;
-    ret = pGetExtendedUdpTable( NULL, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 );
-    ok( ret == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", ret );
-
-    table_module = malloc( size );
-    ret = pGetExtendedUdpTable( table_module, &size, TRUE, AF_INET, UDP_TABLE_OWNER_MODULE, 0 );
+    ret = get_extended_udp_table( AF_INET, UDP_TABLE_OWNER_MODULE, (void **)&table_module );
     ok( ret == ERROR_SUCCESS, "got %lu\n", ret );
     free( table_module );
 }