install the registry keys before enabling the driver
authorThomas Bluemel <thomas@reactsoft.com>
Wed, 24 Aug 2005 21:54:13 +0000 (21:54 +0000)
committerThomas Bluemel <thomas@reactsoft.com>
Wed, 24 Aug 2005 21:54:13 +0000 (21:54 +0000)
svn path=/trunk/; revision=17523

reactos/subsys/system/vmwinst/vmwinst.c

index f31d141..74b5397 100644 (file)
@@ -503,14 +503,7 @@ PageWelcomeProc(
         {
           if(DriverFilesFound)
           {
         {
           if(DriverFilesFound)
           {
-            if(!AddVmwareRegistryEntries())
-            {
-              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;
-            }
+            /* FIXME - check for existing registry entries! */
             if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
             {
 
             if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
             {
 
@@ -633,6 +626,11 @@ InstInstallationThread(LPVOID lpParameter)
 
   if(AbortInstall != 0) goto done;
   PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0);
 
   if(AbortInstall != 0) goto done;
   PostMessage(hInstallationNotifyWnd, WM_INSTSTATUSUPDATE, IDS_ENABLINGDRIVER, 0);
+  if(!AddVmwareRegistryEntries())
+  {
+    PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOADDREGENTRIES, 0);
+    goto cleanup;
+  }
   if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
   {
     PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0);
   if(!EnableVmwareDriver(TRUE, TRUE, TRUE))
   {
     PostMessage(hInstallationNotifyWnd, WM_INSTABORT, IDS_FAILEDTOACTIVATEDRIVER, 0);