Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NETCFGX] InstallNetDevice: Run the default device installer before making class-specific changes.

Browse source
This commit is contained in:
Eric Kohl 2019-06-13 14:16:25 +02:00
parent cd579382b5
commit 7b29f4d975
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dll/win32/netcfgx/installer.c
View file

@ -110,6 +110,14 @@ InstallNetDevice(
DWORD dwShowIcon, dwLength, dwValue; DWORD dwShowIcon, dwLength, dwValue;
WCHAR szBuffer[300]; WCHAR szBuffer[300];
/* Install the adapter */
if (!SetupDiInstallDevice(DeviceInfoSet, DeviceInfoData))
{
rc = GetLastError();
ERR("SetupDiInstallDevice() failed (Error %lu)\n", rc);
goto cleanup;
}
/* Get Instance ID */ /* Get Instance ID */
if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength)) if (SetupDiGetDeviceInstanceIdW(DeviceInfoSet, DeviceInfoData, NULL, 0, &dwLength))
{ {
@ -373,6 +381,7 @@ cleanup:
RegCloseKey(hLinkageKey); RegCloseKey(hLinkageKey);
if (hConnectionKey != NULL) if (hConnectionKey != NULL)
RegCloseKey(hConnectionKey); RegCloseKey(hConnectionKey);
return rc; return rc;
} }
@ -558,8 +567,6 @@ cleanup:
HeapFree(GetProcessHeap(), 0, BusType); HeapFree(GetProcessHeap(), 0, BusType);
HeapFree(GetProcessHeap(), 0, UuidString); HeapFree(GetProcessHeap(), 0, UuidString);
if (rc == ERROR_SUCCESS)
rc = ERROR_DI_DO_DEFAULT;
TRACE("Returning 0x%lx\n", rc); TRACE("Returning 0x%lx\n", rc);
return rc; return rc;
} }