install the registry keys before enabling the driver

svn path=/trunk/; revision=17523
This commit is contained in:
Thomas Bluemel 2005-08-24 21:54:13 +00:00
parent 85266e68b5
commit a8e3f13a42

View file

@ -503,14 +503,7 @@ PageWelcomeProc(
{ {
if(DriverFilesFound) if(DriverFilesFound)
{ {
if(!AddVmwareRegistryEntries()) /* FIXME - check for existing registry entries! */
{
WCHAR Msg[1024];
LoadString(hAppInstance, IDS_FAILEDTOADDREGENTRIES, Msg, sizeof(Msg) / sizeof(WCHAR));
MessageBox(GetParent(hwndDlg), Msg, NULL, MB_ICONWARNING);
SetWindowLong(hwndDlg, DWL_MSGRESULT, IDD_WELCOMEPAGE);
return TRUE;
}
if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
{ {
@ -633,6 +626,11 @@ InstInstallationThread(LPVOID lpParameter)
if(AbortInstall != 0) goto done; if(AbortInstall != 0) goto done;
PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0); PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0);
if(!AddVmwareRegistryEntries())
{
PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0);
goto cleanup;
}
if(!EnableVmwareDriver(TRUE, TRUE, TRUE)) if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
{ {
PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0); PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0);