Author: hpoussin
Date: Fri Jan 11 16:00:44 2008
New Revision: 31714
URL:
http://svn.reactos.org/svn/reactos?rev=31714&view=rev
Log:
Display hardware wizard only after user logged in.
It still needs improvement, to first try once to install without user intervention, and
then, once an admin is logged on, ask it for still not installed devices.
Modified:
trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
Modified: trunk/reactos/base/services/umpnpmgr/umpnpmgr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/umpnpmgr/ump…
==============================================================================
--- trunk/reactos/base/services/umpnpmgr/umpnpmgr.c (original)
+++ trunk/reactos/base/services/umpnpmgr/umpnpmgr.c Fri Jan 11 16:00:44 2008
@@ -207,6 +207,9 @@
DPRINT("PNP_ReportLogOn(%u, %u) called\n", Admin, ProcessId);
+ if (hInstallEvent != NULL)
+ SetEvent(hInstallEvent);
+
/* Get the users token */
hProcess = OpenProcess(PROCESS_ALL_ACCESS,
TRUE,
@@ -226,8 +229,8 @@
}
/* Trigger the installer thread */
- if (hInstallEvent != NULL)
- SetEvent(hInstallEvent);
+ /*if (hInstallEvent != NULL)
+ SetEvent(hInstallEvent);*/
return CR_SUCCESS;
}
@@ -1679,6 +1682,8 @@
BOOL showWizard;
UNREFERENCED_PARAMETER(lpParameter);
+
+ WaitForSingleObject(hInstallEvent, INFINITE);
showWizard = !SetupIsActive() && !IsConsoleBoot();