Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-01 02:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MPR]

Browse source 
Import Wine commit:
- 51b4a42969366cc409808aded23d3602a34206e2, Properly handle the count set to -1 when enumerating connections.

This fixes 'net use' not being able to enumerate multiple connections served by multiple network providers.

CORE-13475

svn path=/trunk/; revision=75172
This commit is contained in:
Pierre Schweitzer 2017-06-23 19:21:29 +00:00
parent ab30fb1d60
commit f8e9e5ec4b
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reactos/dll/win32/mpr/wnet.c
View file

@ -1400,7 +1400,7 @@ static DWORD _copyStringToEnumW(const WCHAR *source, DWORD* left, void** end)
static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count,
void* user_buffer, DWORD* user_size)
{
DWORD ret, index, count, size, i, left;
DWORD ret, index, count, total_count, size, i, left;
void* end;
NETRESOURCEW* curr, * buffer;
HANDLE* handles;
@ -1424,6 +1424,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count,
curr = user_buffer;
end = (char *)user_buffer + size;
count = *user_count;
total_count = 0;
ret = WN_NO_MORE_ENTRIES;
for (index = 0; index < providerTable->numProviders; index++)
@ -1443,6 +1444,7 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count,
ret = providerTable->table[index].enumResource(handles[index],
&count, buffer,
&size);
total_count += count;
if (ret == WN_MORE_DATA)
break;
@ -1477,19 +1479,22 @@ static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, DWORD* user_count,
++curr;
}
count = *user_count - count;
if (*user_count != -1)
count = *user_count - total_count;
else
count = *user_count;
size = left;
}
if (ret != WN_SUCCESS || count == 0)
if (ret != WN_SUCCESS || total_count == 0)
break;
}
}
if (count == 0)
if (total_count == 0)
ret = WN_NO_MORE_ENTRIES;
*user_count = *user_count - count;
*user_count = total_count;
if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES)
ret = WN_SUCCESS;