ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- fix broadcast address for name lookups after iphlpapi change 

- fix bad registry key opening
This commit is contained in:
Juan Lang 2004-01-30 22:55:25 +00:00 committed by Alexandre Julliard
parent b1ff875d0e
commit c935908e2a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dlls/netapi32/nbt.c
View File

@ -662,9 +662,13 @@ static UCHAR NetBTInternalFindName(NetBTAdapter *adapter, PNCB ncb,
} }
if (ret == NRC_GOODRET && *cacheEntry == NULL) if (ret == NRC_GOODRET && *cacheEntry == NULL)
{ {
ret = NetBTNameWaitLoop(adapter, fd, ncb, DWORD bcastAddr =
adapter->ipr.dwBCastAddr, TRUE, gBCastQueryTimeout, adapter->ipr.dwAddr & adapter->ipr.dwMask;
gBCastQueries, &newEntry);
if (adapter->ipr.dwBCastAddr)
bcastAddr |= ~adapter->ipr.dwMask;
ret = NetBTNameWaitLoop(adapter, fd, ncb, bcastAddr,
TRUE, gBCastQueryTimeout, gBCastQueries, &newEntry);
if (ret == NRC_GOODRET && newEntry) if (ret == NRC_GOODRET && newEntry)
{ {
ret = NetBTStoreCacheEntry(&adapter->nameCache, ret = NetBTStoreCacheEntry(&adapter->nameCache,
@ -1433,11 +1437,11 @@ void NetBTInit(void)
/* Try to open the Win9x NetBT configuration key */ /* Try to open the Win9x NetBT configuration key */
ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"\\SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey); "SYSTEM\\CurrentControlSet\\Services\\VxD\\MSTCP", 0, KEY_READ, &hKey);
/* If that fails, try the WinNT NetBT configuration key */ /* If that fails, try the WinNT NetBT configuration key */
if (ret != ERROR_SUCCESS) if (ret != ERROR_SUCCESS)
ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ret = RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"\\SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", 0, "SYSTEM\\CurrentControlSet\\Services\\NetBT\\Parameters", 0,
KEY_READ, &hKey); KEY_READ, &hKey);
if (ret == ERROR_SUCCESS) if (ret == ERROR_SUCCESS)
{ {
@ -1494,7 +1498,7 @@ void NetBTInit(void)
* same place. Just do a global WINS configuration instead. * same place. Just do a global WINS configuration instead.
*/ */
if (RegOpenKeyExA(HKEY_LOCAL_MACHINE, if (RegOpenKeyExA(HKEY_LOCAL_MACHINE,
"\\Software\\Wine\\Wine\\Config\\Network", 0, KEY_READ, &hKey) "Software\\Wine\\Wine\\Config\\Network", 0, KEY_READ, &hKey)
== ERROR_SUCCESS) == ERROR_SUCCESS)
{ {
static const char *nsValueNames[] = { "WinsServer", "BackupWinsServer" }; static const char *nsValueNames[] = { "WinsServer", "BackupWinsServer" };