mirror of
https://github.com/reactos/reactos.git
synced 2025-02-24 17:34:57 +00:00
[MPR]
Implement connected resources enumeration To be sent upstream. Patch 6/6 CORE-11757 ROSAPPS-303 svn path=/trunk/; revision=72087
This commit is contained in:
parent
d833fdc50e
commit
0549e22a98
1 changed files with 184 additions and 8 deletions
|
@ -90,7 +90,7 @@ typedef struct _WNetEnumerator
|
||||||
DWORD dwScope;
|
DWORD dwScope;
|
||||||
DWORD dwType;
|
DWORD dwType;
|
||||||
DWORD dwUsage;
|
DWORD dwUsage;
|
||||||
LPNETRESOURCEW lpNet;
|
LPVOID lpBuffer;
|
||||||
} WNetEnumerator, *PWNetEnumerator;
|
} WNetEnumerator, *PWNetEnumerator;
|
||||||
|
|
||||||
#define BAD_PROVIDER_INDEX (DWORD)0xffffffff
|
#define BAD_PROVIDER_INDEX (DWORD)0xffffffff
|
||||||
|
@ -416,7 +416,7 @@ static PWNetEnumerator _createGlobalEnumeratorW(DWORD dwScope, DWORD dwType,
|
||||||
ret->dwScope = dwScope;
|
ret->dwScope = dwScope;
|
||||||
ret->dwType = dwType;
|
ret->dwType = dwType;
|
||||||
ret->dwUsage = dwUsage;
|
ret->dwUsage = dwUsage;
|
||||||
ret->lpNet = _copyNetResourceForEnumW(lpNet);
|
ret->lpBuffer = _copyNetResourceForEnumW(lpNet);
|
||||||
}
|
}
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -460,6 +460,28 @@ static PWNetEnumerator _createContextEnumerator(DWORD dwScope, DWORD dwType,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static PWNetEnumerator _createConnectedEnumerator(DWORD dwScope, DWORD dwType,
|
||||||
|
DWORD dwUsage)
|
||||||
|
{
|
||||||
|
PWNetEnumerator ret = HeapAlloc(GetProcessHeap(),
|
||||||
|
HEAP_ZERO_MEMORY, sizeof(WNetEnumerator));
|
||||||
|
|
||||||
|
if (ret)
|
||||||
|
{
|
||||||
|
ret->enumType = WNET_ENUMERATOR_TYPE_CONNECTED;
|
||||||
|
ret->dwScope = dwScope;
|
||||||
|
ret->dwType = dwType;
|
||||||
|
ret->dwUsage = dwUsage;
|
||||||
|
ret->lpBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(HANDLE) * providerTable->numProviders);
|
||||||
|
if (!ret->lpBuffer)
|
||||||
|
{
|
||||||
|
HeapFree(GetProcessHeap(), 0, ret);
|
||||||
|
ret = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/* Thunks the array of wide-string LPNETRESOURCEs lpNetArrayIn into buffer
|
/* Thunks the array of wide-string LPNETRESOURCEs lpNetArrayIn into buffer
|
||||||
* lpBuffer, with size *lpBufferSize. lpNetArrayIn contains *lpcCount entries
|
* lpBuffer, with size *lpBufferSize. lpNetArrayIn contains *lpcCount entries
|
||||||
* to start. On return, *lpcCount reflects the number thunked into lpBuffer.
|
* to start. On return, *lpcCount reflects the number thunked into lpBuffer.
|
||||||
|
@ -821,10 +843,13 @@ DWORD WINAPI WNetOpenEnumW( DWORD dwScope, DWORD dwType, DWORD dwUsage,
|
||||||
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
|
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
|
||||||
break;
|
break;
|
||||||
case RESOURCE_REMEMBERED:
|
case RESOURCE_REMEMBERED:
|
||||||
case RESOURCE_CONNECTED:
|
|
||||||
*lphEnum = _createNullEnumerator();
|
*lphEnum = _createNullEnumerator();
|
||||||
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
|
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
|
||||||
break;
|
break;
|
||||||
|
case RESOURCE_CONNECTED:
|
||||||
|
*lphEnum = _createConnectedEnumerator(dwScope, dwType, dwUsage);
|
||||||
|
ret = *lphEnum ? WN_SUCCESS : WN_OUT_OF_MEMORY;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
WARN("unknown scope 0x%08x\n", dwScope);
|
WARN("unknown scope 0x%08x\n", dwScope);
|
||||||
ret = WN_BAD_VALUE;
|
ret = WN_BAD_VALUE;
|
||||||
|
@ -1048,7 +1073,7 @@ static DWORD _enumerateGlobalPassthroughW(PWNetEnumerator enumerator,
|
||||||
{
|
{
|
||||||
ret = providerTable->table[enumerator->providerIndex].
|
ret = providerTable->table[enumerator->providerIndex].
|
||||||
openEnum(enumerator->dwScope, enumerator->dwType,
|
openEnum(enumerator->dwScope, enumerator->dwType,
|
||||||
enumerator->dwUsage, enumerator->lpNet,
|
enumerator->dwUsage, enumerator->lpBuffer,
|
||||||
&enumerator->handle);
|
&enumerator->handle);
|
||||||
if (ret == WN_SUCCESS)
|
if (ret == WN_SUCCESS)
|
||||||
{
|
{
|
||||||
|
@ -1086,7 +1111,7 @@ static DWORD _enumerateGlobalW(PWNetEnumerator enumerator, LPDWORD lpcCount,
|
||||||
switch (enumerator->dwScope)
|
switch (enumerator->dwScope)
|
||||||
{
|
{
|
||||||
case RESOURCE_GLOBALNET:
|
case RESOURCE_GLOBALNET:
|
||||||
if (enumerator->lpNet)
|
if (enumerator->lpBuffer)
|
||||||
ret = _enumerateGlobalPassthroughW(enumerator, lpcCount,
|
ret = _enumerateGlobalPassthroughW(enumerator, lpcCount,
|
||||||
lpBuffer, lpBufferSize);
|
lpBuffer, lpBufferSize);
|
||||||
else
|
else
|
||||||
|
@ -1207,6 +1232,143 @@ static DWORD _enumerateContextW(PWNetEnumerator enumerator, LPDWORD lpcCount,
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static DWORD _enumerateConnectedW(PWNetEnumerator enumerator, LPDWORD lpcCount,
|
||||||
|
LPVOID lpBuffer, LPDWORD lpBufferSize)
|
||||||
|
{
|
||||||
|
DWORD ret, index, count, size, i, len, left;
|
||||||
|
PVOID end;
|
||||||
|
LPNETRESOURCEW curr, buffer;
|
||||||
|
PHANDLE handles;
|
||||||
|
|
||||||
|
if (!enumerator)
|
||||||
|
return WN_BAD_POINTER;
|
||||||
|
if (enumerator->enumType != WNET_ENUMERATOR_TYPE_CONNECTED)
|
||||||
|
return WN_BAD_VALUE;
|
||||||
|
if (!lpcCount)
|
||||||
|
return WN_BAD_POINTER;
|
||||||
|
if (!lpBuffer)
|
||||||
|
return WN_BAD_POINTER;
|
||||||
|
if (!lpBufferSize)
|
||||||
|
return WN_BAD_POINTER;
|
||||||
|
if (!providerTable)
|
||||||
|
return WN_NO_NETWORK;
|
||||||
|
|
||||||
|
handles = enumerator->lpBuffer;
|
||||||
|
left = *lpBufferSize;
|
||||||
|
size = *lpBufferSize;
|
||||||
|
buffer = HeapAlloc(GetProcessHeap(), 0, *lpBufferSize);
|
||||||
|
if (!buffer)
|
||||||
|
return WN_NO_NETWORK;
|
||||||
|
|
||||||
|
curr = lpBuffer;
|
||||||
|
end = (PVOID)((ULONG_PTR)lpBuffer + size);
|
||||||
|
count = *lpcCount;
|
||||||
|
|
||||||
|
|
||||||
|
for (index = 0; index < providerTable->numProviders; index++)
|
||||||
|
{
|
||||||
|
if (providerTable->table[index].dwEnumScopes)
|
||||||
|
{
|
||||||
|
if (handles[index] == 0)
|
||||||
|
{
|
||||||
|
ret = providerTable->table[index].openEnum(enumerator->dwScope,
|
||||||
|
enumerator->dwType,
|
||||||
|
enumerator->dwUsage,
|
||||||
|
NULL, &handles[index]);
|
||||||
|
if (ret != WN_SUCCESS)
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = providerTable->table[index].enumResource(handles[index],
|
||||||
|
&count,
|
||||||
|
buffer,
|
||||||
|
&size);
|
||||||
|
|
||||||
|
if (ret == WN_MORE_DATA)
|
||||||
|
{
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret == WN_SUCCESS)
|
||||||
|
{
|
||||||
|
for (i = 0; i < count; ++i)
|
||||||
|
{
|
||||||
|
if (left < sizeof(NETRESOURCEW))
|
||||||
|
{
|
||||||
|
ret = WN_MORE_DATA;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
memcpy(curr, &buffer[i], sizeof(NETRESOURCEW));
|
||||||
|
left -= sizeof(NETRESOURCEW);
|
||||||
|
|
||||||
|
len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpLocalName, -1, NULL, 0, NULL, NULL);
|
||||||
|
len *= sizeof(WCHAR);
|
||||||
|
if (left < len)
|
||||||
|
{
|
||||||
|
ret = WN_MORE_DATA;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
end = (PVOID)((ULONG_PTR)end - len);
|
||||||
|
curr->lpLocalName = end;
|
||||||
|
memcpy(end, buffer[i].lpLocalName, len);
|
||||||
|
left -= len;
|
||||||
|
|
||||||
|
len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpRemoteName, -1, NULL, 0, NULL, NULL);
|
||||||
|
len *= sizeof(WCHAR);
|
||||||
|
if (left < len)
|
||||||
|
{
|
||||||
|
ret = WN_MORE_DATA;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
end = (PVOID)((ULONG_PTR)end - len);
|
||||||
|
curr->lpRemoteName = end;
|
||||||
|
memcpy(end, buffer[i].lpRemoteName, len);
|
||||||
|
left -= len;
|
||||||
|
|
||||||
|
len = WideCharToMultiByte(CP_ACP, 0, buffer[i].lpProvider, -1, NULL, 0, NULL, NULL);
|
||||||
|
len *= sizeof(WCHAR);
|
||||||
|
if (left < len)
|
||||||
|
{
|
||||||
|
ret = WN_MORE_DATA;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
end = (PVOID)((ULONG_PTR)end - len);
|
||||||
|
curr->lpProvider = end;
|
||||||
|
memcpy(end, buffer[i].lpProvider, len);
|
||||||
|
left -= len;
|
||||||
|
|
||||||
|
++curr;
|
||||||
|
}
|
||||||
|
|
||||||
|
count = *lpcCount - count;
|
||||||
|
size = left;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ret != WN_SUCCESS || count == 0)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (count == 0)
|
||||||
|
ret = WN_NO_MORE_ENTRIES;
|
||||||
|
|
||||||
|
*lpcCount = *lpcCount - count;
|
||||||
|
if (ret != WN_MORE_DATA && ret != WN_NO_MORE_ENTRIES)
|
||||||
|
ret = WN_SUCCESS;
|
||||||
|
|
||||||
|
HeapFree(GetProcessHeap(), 0, buffer);
|
||||||
|
|
||||||
|
TRACE("Returning %d\n", ret);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
/*********************************************************************
|
/*********************************************************************
|
||||||
* WNetEnumResourceW [MPR.@]
|
* WNetEnumResourceW [MPR.@]
|
||||||
*/
|
*/
|
||||||
|
@ -1251,6 +1413,10 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount,
|
||||||
ret = _enumerateContextW(enumerator, lpcCount, lpBuffer,
|
ret = _enumerateContextW(enumerator, lpcCount, lpBuffer,
|
||||||
lpBufferSize);
|
lpBufferSize);
|
||||||
break;
|
break;
|
||||||
|
case WNET_ENUMERATOR_TYPE_CONNECTED:
|
||||||
|
ret = _enumerateConnectedW(enumerator, lpcCount, lpBuffer,
|
||||||
|
lpBufferSize);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
WARN("bogus enumerator type!\n");
|
WARN("bogus enumerator type!\n");
|
||||||
ret = WN_NO_NETWORK;
|
ret = WN_NO_NETWORK;
|
||||||
|
@ -1267,7 +1433,8 @@ DWORD WINAPI WNetEnumResourceW( HANDLE hEnum, LPDWORD lpcCount,
|
||||||
*/
|
*/
|
||||||
DWORD WINAPI WNetCloseEnum( HANDLE hEnum )
|
DWORD WINAPI WNetCloseEnum( HANDLE hEnum )
|
||||||
{
|
{
|
||||||
DWORD ret;
|
DWORD ret, index;
|
||||||
|
PHANDLE handles;
|
||||||
|
|
||||||
TRACE( "(%p)\n", hEnum );
|
TRACE( "(%p)\n", hEnum );
|
||||||
|
|
||||||
|
@ -1277,12 +1444,21 @@ DWORD WINAPI WNetCloseEnum( HANDLE hEnum )
|
||||||
|
|
||||||
switch (enumerator->enumType)
|
switch (enumerator->enumType)
|
||||||
{
|
{
|
||||||
|
case WNET_ENUMERATOR_TYPE_CONNECTED:
|
||||||
|
handles = enumerator->lpBuffer;
|
||||||
|
for (index = 0; index < providerTable->numProviders; index++)
|
||||||
|
{
|
||||||
|
if (providerTable->table[index].dwEnumScopes && handles[index] != 0)
|
||||||
|
providerTable->table[index].closeEnum(handles[index]);
|
||||||
|
}
|
||||||
|
HeapFree(GetProcessHeap(), 0, handles);
|
||||||
|
ret = WN_SUCCESS;
|
||||||
case WNET_ENUMERATOR_TYPE_NULL:
|
case WNET_ENUMERATOR_TYPE_NULL:
|
||||||
ret = WN_SUCCESS;
|
ret = WN_SUCCESS;
|
||||||
break;
|
break;
|
||||||
case WNET_ENUMERATOR_TYPE_GLOBAL:
|
case WNET_ENUMERATOR_TYPE_GLOBAL:
|
||||||
if (enumerator->lpNet)
|
if (enumerator->lpBuffer)
|
||||||
_freeEnumNetResource(enumerator->lpNet);
|
_freeEnumNetResource(enumerator->lpBuffer);
|
||||||
if (enumerator->handle)
|
if (enumerator->handle)
|
||||||
providerTable->table[enumerator->providerIndex].
|
providerTable->table[enumerator->providerIndex].
|
||||||
closeEnum(enumerator->handle);
|
closeEnum(enumerator->handle);
|
||||||
|
|
Loading…
Reference in a new issue