[PATCH 3/5] iphlpapi/tests: Print a message when skipping GetUdp6Table tests

Alex Henrie alexhenrie24 at gmail.com
Tue Feb 11 00:48:47 CST 2020


Signed-off-by: Alex Henrie <alexhenrie24 at gmail.com>
---
 dlls/iphlpapi/tests/iphlpapi.c | 55 ++++++++++++++++++----------------
 1 file changed, 29 insertions(+), 26 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index a1fdf2716b..c41865f8c9 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -2233,36 +2233,39 @@ static void test_ConvertLengthToIpv4Mask(void)
 
 static void test_GetUdp6Table(void)
 {
-  if (pGetUdp6Table) {
-    DWORD apiReturn;
-    ULONG dwSize = 0;
+  DWORD apiReturn;
+  ULONG dwSize = 0;
 
-    apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE);
-    if (apiReturn == ERROR_NOT_SUPPORTED) {
-      skip("GetUdp6Table is not supported\n");
-      return;
-    }
-    ok(apiReturn == ERROR_INSUFFICIENT_BUFFER,
-     "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n",
-     apiReturn);
-    if (apiReturn == ERROR_INSUFFICIENT_BUFFER) {
-      PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize);
+  if (!pGetUdp6Table) {
+    win_skip("GetUdp6Table not available\n");
+    return;
+  }
 
-      apiReturn = pGetUdp6Table(buf, &dwSize, FALSE);
-      ok(apiReturn == NO_ERROR,
-       "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n",
-       apiReturn);
+  apiReturn = pGetUdp6Table(NULL, &dwSize, FALSE);
+  if (apiReturn == ERROR_NOT_SUPPORTED) {
+    skip("GetUdp6Table is not supported\n");
+    return;
+  }
+  ok(apiReturn == ERROR_INSUFFICIENT_BUFFER,
+   "GetUdp6Table(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n",
+   apiReturn);
+  if (apiReturn == ERROR_INSUFFICIENT_BUFFER) {
+    PMIB_UDP6TABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize);
 
-      if (apiReturn == NO_ERROR && winetest_debug > 1)
-      {
-          DWORD i;
-          trace( "UDP6 table: %u entries\n", buf->dwNumEntries );
-          for (i = 0; i < buf->dwNumEntries; i++)
-              trace( "%u: %s%%%u:%u\n",
-                     i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) );
-      }
-      HeapFree(GetProcessHeap(), 0, buf);
+    apiReturn = pGetUdp6Table(buf, &dwSize, FALSE);
+    ok(apiReturn == NO_ERROR,
+     "GetUdp6Table(buf, &dwSize, FALSE) returned %d, expected NO_ERROR\n",
+     apiReturn);
+
+    if (apiReturn == NO_ERROR && winetest_debug > 1)
+    {
+        DWORD i;
+        trace( "UDP6 table: %u entries\n", buf->dwNumEntries );
+        for (i = 0; i < buf->dwNumEntries; i++)
+            trace( "%u: %s%%%u:%u\n",
+                   i, ntoa6(&buf->table[i].dwLocalAddr), ntohs(buf->table[i].dwLocalScopeId), ntohs(buf->table[i].dwLocalPort) );
     }
+    HeapFree(GetProcessHeap(), 0, buf);
   }
 }
 
-- 
2.25.0




More information about the wine-devel mailing list