commit e6f491aa5ca139aa21014c58a98518bcb66c4be9
author Juan Lang <juan_lang@yahoo.com> Wed Jan 07 01:08:55 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jan 07 01:08:55 2004 +0000
tree d4b11a0a61c6bbc4e3e8e82d7d11fab987f52930
parent 502f6c563460d50071534c6efa208e47db793829

Fixed the dwBCastAddr member of MIB_IPADDRROW, added a test program.

dlls/iphlpapi/iphlpapi_main.c

diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c
index b136d4a..fee533c 100644
--- a/dlls/iphlpapi/iphlpapi_main.c
+++ b/dlls/iphlpapi/iphlpapi_main.c
@@ -602,7 +602,7 @@
 
             memset(pAdapterInfo, 0, size);
             if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,
-             "\\Software\\Wine\\Wine\\Config\\Network", 0, KEY_READ,
+             "Software\\Wine\\Wine\\Config\\Network", 0, KEY_READ,
              &hKey) == ERROR_SUCCESS) {
               DWORD size = sizeof(primaryWINS.String);
               unsigned long addr;
@@ -1042,7 +1042,7 @@
           ret = ERROR_INSUFFICIENT_BUFFER;
         }
         else {
-          DWORD ndx;
+          DWORD ndx, bcast;
 
           pIpAddrTable->dwNumEntries = 0;
           for (ndx = 0; ndx < table->numIndexes; ndx++) {
@@ -1051,8 +1051,13 @@
              getInterfaceIPAddrByIndex(table->indexes[ndx]);
             pIpAddrTable->table[ndx].dwMask =
              getInterfaceMaskByIndex(table->indexes[ndx]);
+            /* the dwBCastAddr member isn't the broadcast address, it indicates
+             * whether the interface uses the 1's broadcast address (1) or the
+             * 0's broadcast address (0).
+             */
+            bcast = getInterfaceBCastAddrByIndex(table->indexes[ndx]);
             pIpAddrTable->table[ndx].dwBCastAddr =
-             getInterfaceBCastAddrByIndex(table->indexes[ndx]);
+             (bcast & pIpAddrTable->table[ndx].dwMask) ? 1 : 0;
             /* FIXME: hardcoded reasm size, not sure where to get it */
             pIpAddrTable->table[ndx].dwReasmSize = 65535;
             pIpAddrTable->table[ndx].unused1 = 0;