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

[DESK] Remove call to SetupDiRestartDevices()

Browse source 
This effectively reverts a6005299c6, and
parts of c3da00c42c.

This call is not required, as umpnpmgr already does what is needed.
However, keep the call to EnumDisplayDevices(), so win32k knows that a
new graphic card has been installed.

CORE-18168
This commit is contained in:
Hervé Poussineau 2022-04-30 13:57:54 +02:00
parent dea51f7830
commit 1d66a0aa19
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
dll/cpl/desk/classinst.c
View file

@ -246,35 +246,9 @@ DisplayClassInstaller(
/* FIXME: install OpenGLSoftwareSettings section */ /* FIXME: install OpenGLSoftwareSettings section */
/* Start the device */ /* Reenumerate display devices ; this will rescan for potential new devices */
if (SetupDiRestartDevices(DeviceInfoSet, DeviceInfoData)) DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
{ EnumDisplayDevices(NULL, 0, &DisplayDevice, 0);
/* Reenumerate display devices ; this will rescan for potential new devices */
DisplayDevice.cb = sizeof(DISPLAY_DEVICE);
EnumDisplayDevices(NULL, 0, &DisplayDevice, 0);
}
else
{
rc = GetLastError();
DPRINT("SetupDiRestartDevices() failed with error 0x%lx. Will reboot later.\n", rc);
/* Mark device as needing a restart */
InstallParams.cbSize = sizeof(InstallParams);
if (!SetupDiGetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams))
{
rc = GetLastError();
DPRINT("SetupDiGetDeviceInstallParams() failed with error 0x%lx\n", rc);
goto cleanup;
}
InstallParams.Flags |= DI_NEEDRESTART;
result = SetupDiSetDeviceInstallParams(DeviceInfoSet, DeviceInfoData, &InstallParams);
if (!result)
{
rc = GetLastError();
DPRINT("SetupDiSetDeviceInstallParams() failed with error 0x%lx\n", rc);
goto cleanup;
}
}
rc = ERROR_SUCCESS; rc = ERROR_SUCCESS;