Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-03 21:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETSHELL]

Browse source 
CORE-4949
Fix the network adapter name retrieval code. Adapter names should be visible again. Retest please.

svn path=/trunk/; revision=61272
This commit is contained in:
Eric Kohl 2013-12-14 18:19:30 +00:00
parent 602a8fa908
commit d0d5cf63bb
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/netshell/connectmanager.cpp
View file

@ -604,12 +604,15 @@ CNetConnectionManager::EnumerateINetConnections()
} }
RegCloseKey(hSubKey); RegCloseKey(hSubKey);
} }
if (SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, (PBYTE)szNetCfg, sizeof(szNetCfg)/sizeof(WCHAR), &dwSize))
/* Get the adapter device description */
dwSize = 0;
SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, NULL, 0, &dwSize);
if (dwSize != 0)
{ {
szNetCfg[(sizeof(szNetCfg)/sizeof(WCHAR))-1] = L'\0'; pNew->Props.pszwDeviceName = (LPWSTR)CoTaskMemAlloc(dwSize);
pNew->Props.pszwDeviceName = (LPWSTR)CoTaskMemAlloc((wcslen(szNetCfg)+1) * sizeof(WCHAR));
if (pNew->Props.pszwDeviceName) if (pNew->Props.pszwDeviceName)
wcscpy(pNew->Props.pszwDeviceName, szNetCfg); SetupDiGetDeviceRegistryPropertyW(hInfo, &DevInfo, SPDRP_DEVICEDESC, NULL, (PBYTE)pNew->Props.pszwDeviceName, dwSize, &dwSize);
} }
if (pCurrent) if (pCurrent)