[ros-diffs] [akhaldi] 71788: [IPHLPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sun Jul  3 11:56:44 2016
New Revision: 71788

URL: http://svn.reactos.org/svn/reactos?rev=71788&view=rev
Log:
[IPHLPAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/rostests/winetests/iphlpapi/iphlpapi.c

Modified: trunk/rostests/winetests/iphlpapi/iphlpapi.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/iphlpapi/iphlpap...
==============================================================================
--- trunk/rostests/winetests/iphlpapi/iphlpapi.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/iphlpapi/iphlpapi.c	[iso-8859-1] Sun Jul  3 11:56:44 2016
@@ -1028,13 +1028,13 @@
     replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN;
     ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN, NULL, replydata, replysz, 1000);
     error = GetLastError();
-todo_wine
     ok (ret, "IcmpSendEcho failed unexpectedly with error %d\n", error);

SetLastError(0xdeadbeef);
     replysz = sizeof(ICMP_ECHO_REPLY) + ICMP_MINLEN;
     ret = pIcmpSendEcho(icmp, address, senddata, ICMP_MINLEN + 1, NULL, replydata, replysz, 1000);
     error = GetLastError();
+todo_wine
     ok (!ret, "IcmpSendEcho succeeded unexpectedly\n");
 todo_wine
     ok (error == IP_GENERAL_FAILURE
@@ -1379,13 +1379,14 @@
     size *= 2;
     osize = size;
     ptr = HeapAlloc(GetProcessHeap(), 0, osize);
-    ret = pGetAdaptersAddresses(AF_UNSPEC, 0, NULL, ptr, &osize);
+    ret = pGetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, ptr, &osize);
     ok(!ret, "expected ERROR_SUCCESS got %u\n", ret);
     ok(osize == size, "expected %d, got %d\n", size, osize);

for (aa = ptr; !ret && aa; aa = aa->Next)
     {
         char temp[128];
+        IP_ADAPTER_PREFIX *prefix;

ok(S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_LH) ||
            S(U(*aa)).Length == sizeof(IP_ADAPTER_ADDRESSES_XP),
@@ -1452,6 +1453,18 @@
             sprintf(temp + strlen(temp), "%d ", aa->ZoneIndices[i]);
         trace("ZoneIndices:           %s\n", temp);
         trace("FirstPrefix:           %p\n", aa->FirstPrefix);
+        prefix = aa->FirstPrefix;
+        while (prefix)
+        {
+            trace("\tLength:                  %u\n", S(U(*prefix)).Length);
+            trace("\tFlags:                   0x%08x\n", S(U(*prefix)).Flags);
+            trace("\tNext:                    %p\n", prefix->Next);
+            trace("\tAddress.lpSockaddr:      %p\n", prefix->Address.lpSockaddr);
+            trace("\tAddress.iSockaddrLength: %d\n", prefix->Address.iSockaddrLength);
+            trace("\tPrefixLength:            %u\n", prefix->PrefixLength);
+            trace("\n");
+            prefix = prefix->Next;
+        }

if (S(U(*aa)).Length < sizeof(IP_ADAPTER_ADDRESSES_LH)) continue;
 #ifndef __REACTOS__