Changeset 1765 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2000-12-08T04:16:25+13:00 (23 years ago)

Author:

cs025

Message:

Fixes for Windows 3.1; avoids crashes at the expense of functionality (to be
reinstated).

File:

• trunk/gsinstaller/gsinstall.cpp (modified) (8 diffs)

trunk/gsinstaller/gsinstall.cpp

@@ -262 +262 @@
 {
   // don't do registry stuff under windows 32s
-  if (this->platform.isWindows32s() && FALSE)
+  // TODO: actually reinstate what is required
+  if (this->platform.isWindows32s())
     {
       return true;
@@ -509 +510 @@
 
 
+    if (this->platform.isWindows32s() == false) // NB: don't add this shortcut under
+                                              // Windows32s as it causes a crash
+                                              // 
+                                              // TODO: reinstate this with Win3.1
+                                              // happy code
+  {
       FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
       FilePath logPath(this->destinationPath->pathString(), "install.log");
@@ -515 +522 @@
       {
       }
-
+    }
       // disconnect from program manager
       this->progman->disconnect();
@@ -621 +628 @@
   FilePath destExeFile(*destExePath, "gssetup.exe");
 
-  if (!CopyFile(srcExeFile.cString(), destExeFile.cString(), false))
-    {
-      return false;
-    }
+  if (this->platform.isWindows32s() == false) // NB: Don't copy the setup executable
+                                                                                        // to Windows32s as it causes a hang!
+  { if (!CopyFile(srcExeFile.cString(), destExeFile.cString(), false))
+        {
+        return false;
+        }
+  }
   return true;
 }
@@ -740 +750 @@
         case dirpath_OPTION:
       ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION));
-      if (HIWORD(wParam) == BN_CLICKED && false) 
+      if (HIWORD(wParam) == BN_CLICKED && false)
         // don't do the enable/disable these days
         {
@@ -777 +787 @@
         case PSN_KILLACTIVE:
       break;
-      
+
     case PSN_WIZNEXT:
       {
@@ -994 +1004 @@
           }
         else
-          { 
+          {
         // configure the installation
         install.setDestination();
         install.setManifest();
-        
-        // perform installation
-        install.copyFiles();
-        install.updateProgman();
-        install.updateRegistry();
+
+        install.copyFiles();       // caused page fault; Windows 3.1
+        install.updateProgman();   // caused divide overflow; Windows 3.1
+    install.updateRegistry();
         install.updateProfiles();
-        install.updateSetupExe();
+        install.updateSetupExe();  // caused bomb-out of Windows; 3.1
 
         // close log
@@ -1024 +1033 @@
       DestroyWindow(Window);
       return 0L;
-      
+
     case WM_DESTROY:
       {