Paul Gofman : iphlpapi: Sort by adapter index first in GetIpNetTable().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: bfd7b9bcf88299014a3d993b71de0cf9d8d0586f
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=bfd7b9bcf88299014a3d993b7...

Author: Paul Gofman 
Date:   Mon Jun 20 18:57:51 2022 -0500

iphlpapi: Sort by adapter index first in GetIpNetTable().

Signed-off-by: Paul Gofman

---

dlls/iphlpapi/iphlpapi_main.c  |  3 +++
 dlls/iphlpapi/tests/iphlpapi.c | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 5d904d875fe..fc8ee3d2040 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -2282,6 +2282,9 @@ err:
 static int ipnetrow_cmp( const void *a, const void *b )
 {
     const MIB_IPNETROW *rowA = a, *rowB = b;
+
+    if (rowA->dwIndex != rowB->dwIndex) return DWORD_cmp( rowA->dwIndex, rowB->dwIndex );
+
     return DWORD_cmp(RtlUlongByteSwap( rowA->dwAddr ), RtlUlongByteSwap( rowB->dwAddr ));
 }

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 09d02b02f08..84d5143ba8e 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -371,6 +371,7 @@ static void testGetIpNetTable(void)
 {
     DWORD apiReturn;
     ULONG dwSize = 0;
+    unsigned int i;

apiReturn = GetIpNetTable(NULL, NULL, FALSE);
     if (apiReturn == ERROR_NOT_SUPPORTED) {
@@ -390,11 +391,23 @@ static void testGetIpNetTable(void)
         PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize);

memset(buf, 0xcc, dwSize);
-        apiReturn = GetIpNetTable(buf, &dwSize, FALSE);
+        apiReturn = GetIpNetTable(buf, &dwSize, TRUE);
         ok((apiReturn == NO_ERROR && buf->dwNumEntries) || (apiReturn == ERROR_NO_DATA && !buf->dwNumEntries),
             "got apiReturn %lu, dwSize %lu, buf->dwNumEntries %lu.\n",
             apiReturn, dwSize, buf->dwNumEntries);

+        if (apiReturn == NO_ERROR)
+        {
+            for (i = 0; i < buf->dwNumEntries - 1; ++i)
+            {
+                ok( buf->table[i].dwIndex <= buf->table[i + 1].dwIndex,
+                    "Entries are not sorted by index, i %u.\n", i );
+                if (buf->table[i].dwIndex == buf->table[i + 1].dwIndex)
+                    ok(ntohl(buf->table[i].dwAddr) <= ntohl(buf->table[i + 1].dwAddr),
+                       "Entries are not sorted by address, i %u.\n", i );
+            }
+        }
+
         if (apiReturn == NO_ERROR && winetest_debug > 1)
         {
             DWORD i, j;