Alexandre Julliard : iphlpapi/tests: Don't pass a NULL size to GetTcp/ UdpTable, it crashes on Vista.

Alexandre Julliard julliard at winehq.org
Fri Mar 6 09:49:31 CST 2009


Module: wine
Branch: master
Commit: 320286af692f10cd1e80a5729804b8399fc7c6d1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=320286af692f10cd1e80a5729804b8399fc7c6d1

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Mar  5 23:17:35 2009 +0100

iphlpapi/tests: Don't pass a NULL size to GetTcp/UdpTable, it crashes on Vista.

---

 dlls/iphlpapi/tests/iphlpapi.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c
index 23f85ec..8e36858 100644
--- a/dlls/iphlpapi/tests/iphlpapi.c
+++ b/dlls/iphlpapi/tests/iphlpapi.c
@@ -424,15 +424,11 @@ static void testGetTcpTable(void)
     DWORD apiReturn;
     ULONG dwSize = 0;
 
-    apiReturn = gGetTcpTable(NULL, NULL, FALSE);
+    apiReturn = gGetTcpTable(NULL, &dwSize, FALSE);
     if (apiReturn == ERROR_NOT_SUPPORTED) {
       skip("GetTcpTable is not supported\n");
       return;
     }
-    ok(apiReturn == ERROR_INVALID_PARAMETER,
-     "GetTcpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n",
-     apiReturn);
-    apiReturn = gGetTcpTable(NULL, &dwSize, FALSE);
     ok(apiReturn == ERROR_INSUFFICIENT_BUFFER ||
        broken(apiReturn == ERROR_NO_DATA), /* win95 */
      "GetTcpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n",
@@ -455,15 +451,11 @@ static void testGetUdpTable(void)
     DWORD apiReturn;
     ULONG dwSize = 0;
 
-    apiReturn = gGetUdpTable(NULL, NULL, FALSE);
+    apiReturn = gGetUdpTable(NULL, &dwSize, FALSE);
     if (apiReturn == ERROR_NOT_SUPPORTED) {
       skip("GetUdpTable is not supported\n");
       return;
     }
-    ok(apiReturn == ERROR_INVALID_PARAMETER,
-     "GetUdpTable(NULL, NULL, FALSE) returned %d, expected ERROR_INVALID_PARAMETER\n",
-     apiReturn);
-    apiReturn = gGetUdpTable(NULL, &dwSize, FALSE);
     ok(apiReturn == ERROR_INSUFFICIENT_BUFFER,
      "GetUdpTable(NULL, &dwSize, FALSE) returned %d, expected ERROR_INSUFFICIENT_BUFFER\n",
      apiReturn);




More information about the wine-cvs mailing list