[PATCH 0/1] MR245: iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.

[Paul Gofman (＠gofman)]

Fixes SCP: Secret Laboratory crash on launch after recent game update.

Windows normally returns some entries even if there is no active network connection. I however was able to test no data case on the up to date Windows 10 by disabling all the network adapters and clearing arp cache with 'arp -d *'. So GetIpNetTable() returns ERROR_INSUFFICIENT_BUFFER when called without buffer (first time in test) with some excessive buffer size. But then when called with the buffer it returns ERROR_NO_DATA and sets number of entries in the table to 0.

[PATCH 1/1] iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found.

[Paul Gofman]

From: Paul Gofman

Signed-off-by: Paul Gofman 
---
 dlls/iphlpapi/iphlpapi_main.c  | 7 +++++++
 dlls/iphlpapi/tests/iphlpapi.c | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index 5a4acdb9c5a..33b12361d70 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -2326,6 +2326,13 @@ DWORD WINAPI GetIpNetTable( MIB_IPNETTABLE *table, ULONG *size, BOOL sort )
     }

table->dwNumEntries = count;
+
+    if (!count)
+    {
+        err = ERROR_NO_DATA;
+        goto err;
+    }
+
     for (i = 0; i < count; i++)
     {
         MIB_IPNETROW *row = table->table + i;
diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index c40ae3989c6..29256eb2774 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -388,11 +388,11 @@ static void testGetIpNetTable(void)
     else if (apiReturn == ERROR_INSUFFICIENT_BUFFER) {
         PMIB_IPNETTABLE buf = HeapAlloc(GetProcessHeap(), 0, dwSize);

+        memset(buf, 0xcc, dwSize);
         apiReturn = GetIpNetTable(buf, &dwSize, FALSE);
-        ok(apiReturn == NO_ERROR ||
-           apiReturn == ERROR_NO_DATA, /* empty ARP table's okay */
-           "GetIpNetTable(buf, &dwSize, FALSE) returned %ld, expected NO_ERROR\n",
-           apiReturn);
+        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 && winetest_debug > 1)
         {

[PATCH 0/1] MR245: iphlpapi: Return ERROR_NO_DATA from GetIpNetTable() if no entries are found. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.