Changeset 1765 for trunk/gsinstaller
- Timestamp:
- 2000-12-08T04:16:25+13:00 (23 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gsinstaller/gsinstall.cpp
r1657 r1765 262 262 { 263 263 // don't do registry stuff under windows 32s 264 if (this->platform.isWindows32s() && FALSE) 264 // TODO: actually reinstate what is required 265 if (this->platform.isWindows32s()) 265 266 { 266 267 return true; … … 509 510 510 511 512 if (this->platform.isWindows32s() == false) // NB: don't add this shortcut under 513 // Windows32s as it causes a crash 514 // 515 // TODO: reinstate this with Win3.1 516 // happy code 517 { 511 518 FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe"); 512 519 FilePath logPath(this->destinationPath->pathString(), "install.log"); … … 515 522 { 516 523 } 517 524 } 518 525 // disconnect from program manager 519 526 this->progman->disconnect(); … … 621 628 FilePath destExeFile(*destExePath, "gssetup.exe"); 622 629 623 if (!CopyFile(srcExeFile.cString(), destExeFile.cString(), false)) 624 { 625 return false; 626 } 630 if (this->platform.isWindows32s() == false) // NB: Don't copy the setup executable 631 // to Windows32s as it causes a hang! 632 { if (!CopyFile(srcExeFile.cString(), destExeFile.cString(), false)) 633 { 634 return false; 635 } 636 } 627 637 return true; 628 638 } … … 740 750 case dirpath_OPTION: 741 751 ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION)); 742 if (HIWORD(wParam) == BN_CLICKED && false) 752 if (HIWORD(wParam) == BN_CLICKED && false) 743 753 // don't do the enable/disable these days 744 754 { … … 777 787 case PSN_KILLACTIVE: 778 788 break; 779 789 780 790 case PSN_WIZNEXT: 781 791 { … … 994 1004 } 995 1005 else 996 { 1006 { 997 1007 // configure the installation 998 1008 install.setDestination(); 999 1009 install.setManifest(); 1000 1001 // perform installation 1002 install.copyFiles(); 1003 install.updateProgman(); 1004 install.updateRegistry(); 1010 1011 install.copyFiles(); // caused page fault; Windows 3.1 1012 install.updateProgman(); // caused divide overflow; Windows 3.1 1013 install.updateRegistry(); 1005 1014 install.updateProfiles(); 1006 install.updateSetupExe(); 1015 install.updateSetupExe(); // caused bomb-out of Windows; 3.1 1007 1016 1008 1017 // close log … … 1024 1033 DestroyWindow(Window); 1025 1034 return 0L; 1026 1035 1027 1036 case WM_DESTROY: 1028 1037 {
Note:
See TracChangeset
for help on using the changeset viewer.