[MPR] Import Wine commit: 93fb279f4f3e150eee329b02ca5fb0251d8a239d

Properly handle device-less connections.

CORE-15012
This commit is contained in:
Pierre Schweitzer 2018-09-14 22:30:41 +02:00
parent 13310b3acf
commit f4da2bab03
No known key found for this signature in database
GPG key ID: 7545556C3D585B0B

View file

@ -2652,6 +2652,7 @@ DWORD WINAPI WNetGetUniversalNameW ( LPCWSTR lpLocalPath, DWORD dwInfoLevel,
DWORD WINAPI WNetClearConnections ( HWND owner )
{
HANDLE connected;
PWSTR connection;
DWORD ret, size, count;
NETRESOURCEW * resources, * iter;
@ -2685,7 +2686,14 @@ DWORD WINAPI WNetClearConnections ( HWND owner )
if (ret == WN_SUCCESS || ret == WN_MORE_DATA)
{
for (iter = resources; count; count--, iter++)
WNetCancelConnection2W(iter->lpLocalName, 0, TRUE);
{
if (iter->lpLocalName && iter->lpLocalName[0])
connection = iter->lpLocalName;
else
connection = iter->lpRemoteName;
WNetCancelConnection2W(connection, 0, TRUE);
}
}
else
break;