Changeset 1543 for trunk/gsinstaller/gsinstall.cpp

Timestamp:

2000-09-13T15:31:38+12:00 (24 years ago)

Author:

sjboddie

Message:

* empty log message *

File:

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

trunk/gsinstaller/gsinstall.cpp

@@ -213 +213 @@
  */
 void GSInstall::getSourcePath()
-{ static char filename[512];
-    FilePath     *exePath;
+{
+  static char filename[512];
+  FilePath *exePath;
 
   // get the filepath of this executable
   GetModuleFileName(0, filename, 512);
-  exePath   = new FilePath(filename);
+  exePath = new FilePath(filename);
 
   // get the parent (i.e. the folder containing this executable) for the source
   // folder
-  this->sourcePath  = exePath->parent();
+  this->sourcePath = exePath->parent();
 
   // get the gsdl source path
-  this->gsdlSourcePath  = new FilePath(this->sourcePath->pathString(), "gsdl");
+  this->gsdlSourcePath = new FilePath(this->sourcePath->pathString(), "gsdl");
   delete exePath;
 }
@@ -235 +236 @@
  */
 bool GSInstall::copyFiles()
-{   // ensure that we have got the required destination and that we can write there
+{
+  // ensure that we have got the required destination and that we can write there
   if (this->installExe)
-  { this->destinationPath->ensureWriteablePath();
-  }
+    {
+      this->destinationPath->ensureWriteablePath();
+    }
 
   // ensure that the destination path for the collection itself is available
   if (this->installVolume)
-  { this->dataDestPath->ensureWriteablePath();
-  }
+    {
+      this->dataDestPath->ensureWriteablePath();
+    }
 
   // do the copy
-    this->manifest->copy(this->gsdlSourcePath);
+  this->manifest->copy(this->gsdlSourcePath);
 
   return true;
@@ -256 +260 @@
  */
 bool GSInstall::updateRegistry()
-{ // don't do registry stuff under windows 32s
-    if (this->platform.isWindows32s() && FALSE)
-    {   return true;
-  }
+{
+  // don't do registry stuff under windows 32s
+  if (this->platform.isWindows32s() && FALSE)
+    {
+      return true;
+    }
 
   // ensure all pertinent keys already exist for this volume/collection
-    this->gsRegister->ensureKeysExist();
+  this->gsRegister->ensureKeysExist();
 
   // now move on to add key items
-    if (this->installExe)
-  { FilePath *serverPath    = new FilePath(this->destinationPath->pathString(), "server.exe");
-    FilePath *setupPath     = new FilePath(this->destinationPath->pathString(), "gssetup.exe");
-      FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
-    string exeKeyPath, uninstallCmd, uninstallKeyPath;
-    gsPlatform platform;
-
-    // store the normal collection key information
-    this->gsRegister->storeKeyString(   HKEY_LOCAL_MACHINE,
-                                                                        this->gsRegister->collectKeyId(),
-                                      "library",
-                                      serverPath->pathString());
-
-    // This test is in fact for 9x or NT 4+; we're worried about the registry
-    // format, not about the shell as such
-    if (platform.isExplorerShell())
-    { // get special app path key for windows 9x
-        exeKeyPath  =   this->gsRegister->exeKeyId("library.exe");
-
-      // ensure that the exe key exists
-        this->gsRegister->ensureKeyExists(HKEY_LOCAL_MACHINE, exeKeyPath);
-
-        // store default key for this application
-        this->gsRegister->storeKeyString(   HKEY_LOCAL_MACHINE,
-                                                                        exeKeyPath,
-                                          "",
-                                        serverPath->pathString());
-
-      // store path for this application
-        this->gsRegister->storeKeyString(   HKEY_LOCAL_MACHINE,
-                                                                        exeKeyPath,
-                                          "path",
-                                        this->destinationPath->pathString());
-
-      // create uninstall command line
-      uninstallCmd = setupPath->pathString() + " -u " + logPath->pathString();
-      uninstallKeyPath = this->gsRegister->uninstallKeyId(this->configFile->getString("CollectionName"));
-
-      // ensure uninstall key exists
-      this->gsRegister->ensureKeyExists(HKEY_LOCAL_MACHINE, uninstallKeyPath);
-
-      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
-                                                                        "DisplayName",
-                                        this->configFile->getString("CollectionName"));
-      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
-                                                                        "UninstallString", uninstallCmd);
-    }
-    delete setupPath;
-    delete serverPath;
-      delete logPath;
-  }
+  if (this->installExe)
+    {
+      //      FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "server.exe");
+      FilePath *serverPath = new FilePath(this->destinationPath->pathString(), "library.exe");
+      FilePath *setupPath = new FilePath(this->destinationPath->pathString(), "gssetup.exe");
+      FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
+      string exeKeyPath, uninstallCmd, uninstallKeyPath;
+      gsPlatform platform;
+
+      // store the normal collection key information
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE,
+                       this->gsRegister->collectKeyId(),
+                       "library",
+                       serverPath->pathString());
+
+      // This test is in fact for 9x or NT 4+; we're worried about the registry
+      // format, not about the shell as such
+      if (platform.isExplorerShell())
+    {
+      // get special app path key for windows 9x
+      exeKeyPath = this->gsRegister->exeKeyId("library.exe");
+
+      // ensure that the exe key exists
+      this->gsRegister->ensureKeyExists(HKEY_LOCAL_MACHINE, exeKeyPath);
+
+      // store default key for this application
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE,
+                       exeKeyPath,
+                       "",
+                       serverPath->pathString());
+
+      // store path for this application
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE,
+                       exeKeyPath,
+                       "path",
+                       this->destinationPath->pathString());
+
+      // create uninstall command line
+      uninstallCmd = setupPath->pathString() + " -u " + logPath->pathString();
+      uninstallKeyPath = this->gsRegister->uninstallKeyId(this->configFile->getString("CollectionName"));
+
+      // ensure uninstall key exists
+      this->gsRegister->ensureKeyExists(HKEY_LOCAL_MACHINE, uninstallKeyPath);
+      
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
+                       "DisplayName",
+                       this->configFile->getString("CollectionName"));
+      this->gsRegister->storeKeyString(HKEY_LOCAL_MACHINE, uninstallKeyPath,
+                       "UninstallString", uninstallCmd);
+    }
+      delete setupPath;
+      delete serverPath;
+      delete logPath;
+    }
 
   if (this->installVolume || this->installFullVolume)
-  { // no actual key items are held in the volume key; for future use
-  }
+    {   
+      // no actual key items are held in the volume key; for future use
+    }
   return true;
 }
@@ -327 +337 @@
  */
 void GSInstall::setDestination()
-{ // get configuration from the install wizard pages
-    this->destinationPath       = new FilePath(this->selectedDirs[0]->selectedPath());
-    this->installFullVolume = this->selectedDirs[1]->getOption();
+{
+  // get configuration from the install wizard pages
+  this->destinationPath = new FilePath(this->selectedDirs[0]->selectedPath());
+  this->installFullVolume = this->selectedDirs[1]->getOption();
   if (this->installFullVolume || true)  // NB: always take path from 2nd dialog
-  { this->dataDestPath  = new FilePath(this->selectedDirs[1]->selectedPath());
-  }
+    {
+      this->dataDestPath = new FilePath(this->selectedDirs[1]->selectedPath());
+    }
   else
-  { this->dataDestPath  = this->destinationPath;
-  }
+    {
+      this->dataDestPath = this->destinationPath;
+    }
 
   // open the log for writing
@@ -344 +357 @@
 
 bool GSInstall::setUninstall()
-{ char tempPathStr[MAX_PATH];
+{
+  char tempPathStr[MAX_PATH];
 
   // if we failed to get the Windows temporary directory, abort
   if (GetTempPath(MAX_PATH, tempPathStr) == 0)
-  { // TODO: abort!
-    return false;
-  }
+    {
+      // TODO: abort!
+      return false;
+    }
 
   FilePath tempPath(tempPathStr);
@@ -357 +372 @@
   // and the installation log to the temporary directory and run them there
   if (*this->sourcePath != tempPath)
-  { // copy this and install.log to temporary directory and restart
-    FilePath exePath(*this->sourcePath, "gssetup.exe");
-    FilePath logPath(*this->sourcePath, "install.log");
-
-    FilePath exeDest(tempPath, "gssetup.exe");
-    FilePath logDest(tempPath, "install.log");
-
-    CopyFile(exePath.cString(), exeDest.cString(), false);
-    CopyFile(logPath.cString(), logDest.cString(), false);
-
-    // now run the gssetup in the temporary directory
-    launchApp launchUninstall(exeDest);
-    launchUninstall.setCommandLine(" -u " + logPath.pathString());
-    launchUninstall.run(false, 0, "", "", false);
-
-    return false;
-  }
+    {
+      // copy this and install.log to temporary directory and restart
+      FilePath exePath(*this->sourcePath, "gssetup.exe");
+      FilePath logPath(*this->sourcePath, "install.log");
+
+      FilePath exeDest(tempPath, "gssetup.exe");
+      FilePath logDest(tempPath, "install.log");
+      
+      CopyFile(exePath.cString(), exeDest.cString(), false);
+      CopyFile(logPath.cString(), logDest.cString(), false);
+
+      // now run the gssetup in the temporary directory
+      launchApp launchUninstall(exeDest);
+      launchUninstall.setCommandLine(" -u " + logPath.pathString());
+      launchUninstall.run(false, 0, "", "", false);
+
+      return false;
+    }
 
   // open the log for reading from the directory this exe is now in (which
@@ -380 +396 @@
   this->openLog(logPath->pathString(), false);
   delete logPath;
-
+  
   return true;
 }
 
 void GSInstall::uninstall()
-{ FilePath *iniPath;
-    string      command;
+{
+  FilePath *iniPath;
+  string command;
   stringArray params;
 
-    this->manifest = new gsManifest(*this); // get a manifest manager
-
-  iniPath   = new FilePath(this->collectPath->pathString(), "gsdl.ini");
-    gsProfile gsdlProfile(*this, iniPath->pathString());
-
-    while ((command = this->popCommand(params)) != "")
-  { if (!this->manifest->undoAction(command, params))
-    { if (!gsdlProfile.undoAction(command, params))
-        { if (!this->gsRegister->undoAction(command, params))
-        { if (!this->progman->undoAction(command, params))
-            {
-          }
-        }
-      }
-    }
-  }
+  this->manifest = new gsManifest(*this); // get a manifest manager
+
+  iniPath = new FilePath(this->collectPath->pathString(), "gsdl.ini");
+  gsProfile gsdlProfile(*this, iniPath->pathString());
+
+  while ((command = this->popCommand(params)) != "")
+    {
+      if (!this->manifest->undoAction(command, params))
+    { 
+      if (!gsdlProfile.undoAction(command, params))
+        { 
+          if (!this->gsRegister->undoAction(command, params))
+        { 
+          if (!this->progman->undoAction(command, params))
+            {
+            }
+        }
+        }
+    }
+    }
 }
 
@@ -411 +432 @@
  */
 void GSInstall::setManifest()
-{   if (this->installExe)
-    {   this->manifest->selectGroup("library", *this->destinationPath);
-  }
+{
+  if (this->installExe)
+    {
+      this->manifest->selectGroup("library", *this->destinationPath);
+    }
   if (this->installFullVolume)
-  { this->manifest->selectGroup("collection", *this->dataDestPath);
-  }
+    {   
+      this->manifest->selectGroup("collection", *this->dataDestPath);
+    }
   else
-  { this->manifest->selectGroup("database", *this->dataDestPath);
-  }
+    {   
+      this->manifest->selectGroup("database", *this->dataDestPath);
+    }
 }
 
@@ -427 +452 @@
  */
 bool GSInstall::updateProgman()
-{ string groupName;
+{
+  string groupName;
 
   // if we managed to get a connection to the program manager (or explorer
   // shell) then do the requisite updates
   if (this->progman->connect())
-  { // get group name from folders
-    groupName = this->configFile->getString("ProgramGroupName");
-      if (groupName == "")
-    {   // TODO: error handling
-        this->progman->disconnect();
-        return false;
-      }
-
-      // add the group
-        if (!this->progman->addProgramGroup(groupName))
-      { this->progman->disconnect();
-        return false;
+    {
+      // get group name from folders
+      groupName = this->configFile->getString("ProgramGroupName");
+      if (groupName == "")
+    {
+      // TODO: error handling
+      this->progman->disconnect();
+      return false;
+    }
+      
+      // add the group
+      if (!this->progman->addProgramGroup(groupName))
+    {
+      this->progman->disconnect();
+      return false;
     }
-
-    // add a "server" icon
-    FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
-      if (!this->progman->addIcon(groupName, "Library (without nextwork support)", libraryPath.pathString(), ""))
-    { // assume that it may be there already
-      }
-
-    // check for server existence
-    FilePath serverPath(this->destinationPath->pathString(), "server.exe");
-    if (serverPath.exists())
-    { if (!this->progman->addIcon(groupName, "Server", serverPath.pathString(), ""))
-        {   // assume that it may be there already
-      }
-      }
-
-    FilePath readMePath(this->destinationPath->pathString(), "readme.txt");
-      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
+      
+      // add a "server" icon
+      FilePath libraryPath(this->destinationPath->pathString(), "library.exe");
+      if (!this->progman->addIcon(groupName, "Library", libraryPath.pathString(), ""))
     {
-      }
-
-    FilePath supportPath(this->destinationPath->pathString(), "support.html");
-      if (!this->progman->addIcon(groupName, "Technical Support", supportPath.pathString(), ""))
+      // assume that it may be there already
+    }
+
+      // check for server existence
+      //      FilePath serverPath(this->destinationPath->pathString(), "server.exe");
+      //      if (serverPath.exists())
+      //    {
+      //      if (!this->progman->addIcon(groupName, "Server", serverPath.pathString(), ""))
+      //        {
+          // assume that it may be there already
+      //        }
+      //    }
+      
+      FilePath readMePath(this->destinationPath->pathString(), "readme.txt");
+      if (!this->progman->addIcon(groupName, "ReadMe", readMePath.pathString(), ""))
     {
-      }
-
-    // TODO: uninstall icon
-    // FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
-
-    // disconnect from program manager
-    this->progman->disconnect();
-  }
+    }
+
+      FilePath supportPath(this->destinationPath->pathString(), "support.html");
+      if (!this->progman->addIcon(groupName, "Technical Support", supportPath.pathString(), ""))
+    {
+    }
+
+      // TODO: uninstall icon
+      // FilePath uninstallPath(this->destinationPath->pathString(), "gssetup.exe");
+      
+      // disconnect from program manager
+      this->progman->disconnect();
+    }
   return true;
 }
@@ -486 +518 @@
  */
 bool GSInstall::updateProfiles()
-{ FilePath *exePath;
-    FilePath *dataPath;
+{
+  FilePath *exePath;
+  FilePath *dataPath;
   FilePath *iniPath;
 
@@ -493 +526 @@
   // folder of this installation sequence;  if not, then we pick it up from
   // the existing location of that folder
-    if (this->installExe)
-    {   exePath = this->destinationPath;
-  }
+  if (this->installExe)
+    {
+      exePath = this->destinationPath;
+    }
   else
-    {   exePath = this->collectPath;
-  }
-  iniPath   = new FilePath(exePath->pathString(), "gsdl.ini");
+    {
+      exePath = this->collectPath;
+    }
+  iniPath = new FilePath(exePath->pathString(), "gsdl.ini");
 
   // TODO: check if this 'if' structure is correct; suspect that it isn't quite
@@ -507 +542 @@
   //       This all needs investigating
   if (this->installVolume)
-  { // Manufacture the appropriate section name now; an equivalent string
-    // is also constructed
-    string volumeSectionString = this->configFile->getString("CollectionName") +
-                                                             "#" + this->configFile->getString("CollectionVolume");
-
-    // if we're installing the full data for the collection, then take the
-    // data path to be at the selected destination directory for the collection
-    // files; otherwise take the data path to be on the CD/distribution media
-    if (this->installFullVolume)
-    {   dataPath    =   this->dataDestPath;
-    }
-    else
-    {   dataPath    = this->gsdlSourcePath;
-    }
-
-    // create a profile object to write to the gsdl.ini file
-    gsProfile gsdlProfile(*this, iniPath->pathString());
-
-    // if installing the executable, add the database and greenstone home
-    // directories
-    if (this->installExe)
-    {   // set the correct exe entries in gsdl.ini (in the gsdl section)
-            gsdlProfile.writeString("gsdl", "gsdlhome", dataPath->pathString());
-      gsdlProfile.writeString("gsdl", "gdbmhome", this->dataDestPath->pathString());
-    }
-
-    // set the correct collection volume entries in gsdl.ini
-    if (this->installVolume)
-    { // note the collection in the general gsdl section; and add the undo item too
-        gsdlProfile.ensureListMember("gsdl", gsdl_COLLIST, volumeSectionString);
-
-      // note the volume data in its own section
-        gsdlProfile.writeString(volumeSectionString, "gsdlhome", dataPath->pathString());
-        gsdlProfile.writeString(volumeSectionString, "gdbmhome", this->dataDestPath->pathString());
-        gsdlProfile.writeString(volumeSectionString, "staticpath", dataPath->pathString());
-    }
-  }
-
+    {
+      // Manufacture the appropriate section name now; an equivalent string
+      // is also constructed
+      string volumeSectionString = this->configFile->getString("CollectionName") +
+    "#" + this->configFile->getString("CollectionVolume");
+
+      // if we're installing the full data for the collection, then take the
+      // data path to be at the selected destination directory for the collection
+      // files; otherwise take the data path to be on the CD/distribution media
+      if (this->installFullVolume)
+    {
+      dataPath = this->dataDestPath;
+    }
+      else
+    {
+      dataPath = this->gsdlSourcePath;
+    }
+
+      // create a profile object to write to the gsdl.ini file
+      gsProfile gsdlProfile(*this, iniPath->pathString());
+
+      // if installing the executable, add the database and greenstone home
+      // directories
+      if (this->installExe)
+    {
+      // set the correct exe entries in gsdl.ini (in the gsdl section)
+      gsdlProfile.writeString("gsdl", "gsdlhome", dataPath->pathString());
+      gsdlProfile.writeString("gsdl", "gdbmhome", this->dataDestPath->pathString());
+    }
+
+      // set the correct collection volume entries in gsdl.ini
+      if (this->installVolume)
+    {
+      // note the collection in the general gsdl section; and add the undo item too
+      gsdlProfile.ensureListMember("gsdl", gsdl_COLLIST, volumeSectionString);
+
+      // note the volume data in its own section
+      gsdlProfile.writeString(volumeSectionString, "gsdlhome", dataPath->pathString());
+      gsdlProfile.writeString(volumeSectionString, "gdbmhome", this->dataDestPath->pathString());
+      gsdlProfile.writeString(volumeSectionString, "staticpath", dataPath->pathString());
+    }
+    }
+  
   // clean up
   delete iniPath;
-
+  
   return true;
 }
@@ -556 +596 @@
  */
 bool GSInstall::updateSetupExe()
-{ FilePath *destExePath;
+{
+  FilePath *destExePath;
   FilePath srcExeFile(*this->sourcePath, "gssetup.exe");
 
-    if (this->installExe)
-    {   destExePath = this->destinationPath;
-  }
+  if (this->installExe)
+    {
+      destExePath = this->destinationPath;
+    }
   else
-    {   destExePath = this->collectPath;
-  }
-    FilePath destExeFile(*destExePath, "gssetup.exe");
+    {
+      destExePath = this->collectPath;
+    }
+  FilePath destExeFile(*destExePath, "gssetup.exe");
 
   if (!CopyFile(srcExeFile.cString(), destExeFile.cString(), false))
-  { return false;
-  }
+    {
+      return false;
+    }
   return true;
 }
 
 bool GSInstall::installNetscape()
-{   FilePath    netscape32Path(this->sourcePath->pathString(), "netscape\\n32e405.exe");
-  FilePath  netscape16Path(this->sourcePath->pathString(), "netscape\\n16e405.exe");
+{
+  FilePath netscape32Path(this->sourcePath->pathString(), "netscape\\n32e405.exe");
+  FilePath netscape16Path(this->sourcePath->pathString(), "netscape\\n16e405.exe");
 
   launchApp launchNetscape(netscape32Path);
   launchNetscape.platformApp(gsPlatform_WINDOWS32S, netscape16Path);
   if (launchNetscape.run(true, 1,
-                                                "This library is displayed using a web browser.  If you don't "
-                              "currently have a web browser installed on your machine you may "
-                              "install the Netscape 4.05 browser now.\n\n"
-                              "Note that if your current browser was provided by your internet "
-                              "service provider, you should install Netscape in a different "
-                              "directory.\n\n"
-                              "Would you like to install the Netscape 4.05 browser now?",
-                              "Greenstone Installer", false) < 0)
-  { MessageBox(0, "Error", app_name, MB_OK);
-    return false;
-  }
+             "This library is displayed using a web browser.  If you don't "
+             "currently have a web browser installed on your machine you may "
+             "install the Netscape 4.05 browser now.\n\n"
+             "Note that if your current browser was provided by your internet "
+             "service provider, you should install Netscape in a different "
+             "directory.\n\n"
+             "Would you like to install the Netscape 4.05 browser now?",
+             "Greenstone Installer", false) < 0)
+    {
+      MessageBox(0, "Error", app_name, MB_OK);
+      return false;
+    }
   return true;
 }
 
 FilePath *GSInstall::collectionPath()
-{   return this->collectPath;
+{
+  return this->collectPath;
 }
 
 FilePath *GSInstall::installPath()
-{   return this->installToPath;
+{
+  return this->installToPath;
 }
 
 void GSInstall::addSelectedDir(dirSelector *selector)
-{   this->selectedDirs.push_back(selector);
+{
+  this->selectedDirs.push_back(selector);
 }
 
 typedef struct
-{ dirSelector * dirSelect;
+{
+  dirSelector * dirSelect;
 } GSInstall_dirPathData;
 
 HGLOBAL loadDirBrowser()
-{ HRSRC resHdl;
-
-    resHdl = FindResource(app_instance, "MySaveAsDlg", RT_DIALOG);
+{ 
+  HRSRC resHdl;
+
+  resHdl = FindResource(app_instance, "MySaveAsDlg", RT_DIALOG);
   return LoadResource(app_instance, resHdl);
 }
@@ -622 +673 @@
   int sx, sy;
   int dx, dy;
-
+  
   gsInstall_getDesktopExt(&sx, &sy);
   GetWindowRect(dialog, &rect);
@@ -632 +683 @@
 
 BOOL FAR PASCAL GSInstall_dlgproc(HWND Dialog, UINT Message, WPARAM wParam, LPARAM lParam)
-{ static bool first = true;     // static variable to hack the position of the
+{ 
+  static bool first = true;   // static variable to hack the position of the
                               // whole wizard; note doing this in the wizard
                               // property sheet initialisation DOES NOT WORK
 
-    switch (Message)
-    {   case WM_INITDIALOG:
-    {   dirSelector *selector = (dirSelector *) ((PROPSHEETPAGE *) lParam)->lParam;
+  switch (Message)
+    {
+    case WM_INITDIALOG:
+      {
+    dirSelector *selector = (dirSelector *) ((PROPSHEETPAGE *) lParam)->lParam;
 
         SetDlgItemText(Dialog, dirpath_PROMPT, selector->prompt);
-      if (selector->optPrompt != NULL)
-      { SetDlgItemText(Dialog, dirpath_OPTION, selector->optPrompt);
-          EnableWindow(GetDlgItem(Dialog, dirpath_BROWSE), true); // was false
-        EnableWindow(GetDlgItem(Dialog, dirpath_PATH), true);       // was false
+    if (selector->optPrompt != NULL)
+      {
+        SetDlgItemText(Dialog, dirpath_OPTION, selector->optPrompt);
+        EnableWindow(GetDlgItem(Dialog, dirpath_BROWSE), true); // was false
+        EnableWindow(GetDlgItem(Dialog, dirpath_PATH), true); // was false
+      }
+    else
+      {
+        ShowWindow(GetDlgItem(Dialog, dirpath_OPTION), SW_HIDE);
+      }
+    SetWindowLong(Dialog, GWL_USERDATA, ((PROPSHEETPAGE *) lParam)->lParam);
+    SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
+    
+    // if this is the first time this function is called, then centre the
+    // wizard into the centre of our screen.
+    if (first)
+      {
+        gsInstall_wizard_centre(GetParent(Dialog));
+        first = false;
+      }
       }
-      else
-      { ShowWindow(GetDlgItem(Dialog, dirpath_OPTION), SW_HIDE);
-      }
-      SetWindowLong(Dialog, GWL_USERDATA, ((PROPSHEETPAGE *) lParam)->lParam);
-      SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
-
-      // if this is the first time this function is called, then centre the
-      // wizard into the centre of our screen.
-      if (first)
-      { gsInstall_wizard_centre(GetParent(Dialog));
-        first = false;
-      }
-    }
-    return TRUE;
-
+      return TRUE;
+      
     case WM_COMMAND:
-        switch (LOWORD(wParam))
-      { case dirpath_BROWSE:
-            ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->requestPath(Dialog, "Select Directory");
+      switch (LOWORD(wParam))
+    {
+    case dirpath_BROWSE:
+      ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->requestPath(Dialog, "Select Directory");
           SetDlgItemText(Dialog, dirpath_PATH, ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->selectedPath());
-        break;
+      break;
 
         case dirpath_OPTION:
-            ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION));
-            if (HIWORD(wParam) == BN_CLICKED && false) // don't do the enable/disable these days
-          { EnableWindow(GetDlgItem(Dialog, dirpath_BROWSE), IsDlgButtonChecked(Dialog, dirpath_OPTION));
-            EnableWindow(GetDlgItem(Dialog, dirpath_PATH), IsDlgButtonChecked(Dialog, dirpath_OPTION));
-          }
-        break;
-      }
-    break;
-
+      ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA))->setOption(IsDlgButtonChecked(Dialog, dirpath_OPTION));
+      if (HIWORD(wParam) == BN_CLICKED && false) 
+        // don't do the enable/disable these days
+        {
+          EnableWindow(GetDlgItem(Dialog, dirpath_BROWSE), IsDlgButtonChecked(Dialog, dirpath_OPTION));
+          EnableWindow(GetDlgItem(Dialog, dirpath_PATH), IsDlgButtonChecked(Dialog, dirpath_OPTION));
+        }
+      break;
+    }
+      break;
+      
     case WM_NOTIFY:
-        switch (((LPNMHDR) lParam)->code)
-      { case PSN_SETACTIVE:
-        {   dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
-
-            // bodge to set the dialogue path to the correct value
-            if (selector != rootSelector)
-          { selector->setPath(rootSelector->selectedPath());
-            SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
-          }
-
-            if (selector->isFinal())
-            { PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_FINISH);
-            }
-          else
-            { PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_NEXT);
-          }
-        }
-        break;
-
+      switch (((LPNMHDR) lParam)->code)
+    {
+    case PSN_SETACTIVE:
+      {
+        dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
+        
+        // bodge to set the dialogue path to the correct value
+        if (selector != rootSelector)
+          {
+        selector->setPath(rootSelector->selectedPath());
+        SetDlgItemText(Dialog, dirpath_PATH, selector->selectedPath());
+          }
+        
+        if (selector->isFinal())
+          {
+        PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_FINISH);
+          }
+        else
+          {
+        PropSheet_SetWizButtons(GetParent(Dialog), PSWIZB_BACK | PSWIZB_NEXT);
+          }
+      }
+      break;
+      
         case PSN_KILLACTIVE:
-        break;
-
-                case PSN_WIZNEXT:
-          { // note the path from the dialog
-            dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
-            selector->setPathFromEdit(GetDlgItem(Dialog, dirpath_PATH));
-
-            // create a new FilePath object to check on the proposed destination
-                    FilePath *path = new FilePath(selector->selectedPath());
-
-          // if the proposed destination doesn't exist, ask the user whether to
-          // create it now.  TODO: actually create it if asked!
-          if (path->exists() == false)
-          { char buffer[128];
-
+      break;
+      
+    case PSN_WIZNEXT:
+      {
+        // note the path from the dialog
+        dirSelector *selector = ((dirSelector *) GetWindowLong(Dialog, GWL_USERDATA));
+        selector->setPathFromEdit(GetDlgItem(Dialog, dirpath_PATH));
+
+        // create a new FilePath object to check on the proposed destination
+        FilePath *path = new FilePath(selector->selectedPath());
+
+        // if the proposed destination doesn't exist, ask the user whether to
+        // create it now.  TODO: actually create it if asked!
+        if (path->exists() == false)
+          {
+        char buffer[128];
+        
             sprintf(buffer, "Directory %s does not exist - create it?", selector->selectedPath());
 
-            // if the user cancelled that, then don't permit them to go to the next
-            // page of the wizard
+        // if the user cancelled that, then don't permit them to go to the next
+        // page of the wizard
             if (MessageBox(0, buffer, app_name, MB_YESNO | MB_TOPMOST) == IDNO)
-            {   delete path;
-                SetWindowLong(Dialog, DWL_MSGRESULT, TRUE);
-              return TRUE;
-            }
-          }
-          delete path;
+          {
+            delete path;
+            SetWindowLong(Dialog, DWL_MSGRESULT, TRUE);
+            return TRUE;
+          }
           }
-        break;
-
+        delete path;
+      }
+      break;
+      
         case PSN_WIZFINISH:
-          { // Finish the activity now
-            config_complete = true;
+      {
+        // Finish the activity now
+        config_complete = true;
           }
-        break;
-      }
-    break;
-  }
-    return FALSE;
+      break;
+    }
+      break;
+    }
+  return FALSE;
 }
 
 void GSInstall_init_propertySheet(PROPSHEETPAGE &ppage, char *prompt, char *optPrompt,
-                                                                    char *title, GSInstall &installer, bool isFinal)
-{ GSInstall_dirPathData *data = new GSInstall_dirPathData;
-
-    // create the directory Selector
-    data->dirSelect     = new dirSelector(prompt, optPrompt, title, installer.installPath());
+                  char *title, GSInstall &installer, bool isFinal)
+{
+  GSInstall_dirPathData *data = new GSInstall_dirPathData;
+
+  // create the directory Selector
+  data->dirSelect = new dirSelector(prompt, optPrompt, title, installer.installPath());
   data->dirSelect->setFinal(isFinal);
 
   // if there is no extant root selector, make this it
   if (rootSelector == NULL)
-  { rootSelector = data->dirSelect;
-  }
+    {
+      rootSelector = data->dirSelect;
+    }
 
   // add this directory selector to the installer
@@ -756 +827 @@
 
   // set up the rest of the page
-    ppage.dwSize        = sizeof(PROPSHEETPAGE);
-    ppage.dwFlags       = PSP_USETITLE;
-  ppage.hInstance   = app_instance;
-  ppage.pszTemplate = "getDirPath";
-  ppage.pszIcon         = 0;
-  ppage.pszTitle        = app_name;
-  ppage.pfnDlgProc  = (DLGPROC) GSInstall_dlgproc;
-    ppage.lParam      = (LPARAM) data->dirSelect;
-  ppage.pfnCallback = NULL;
+  ppage.dwSize = sizeof(PROPSHEETPAGE);
+  ppage.dwFlags = PSP_USETITLE;
+  ppage.hInstance = app_instance;
+  ppage.pszTemplate = "getDirPath";
+  ppage.pszIcon = 0;
+  ppage.pszTitle = app_name;
+  ppage.pfnDlgProc = (DLGPROC) GSInstall_dlgproc;
+  ppage.lParam = (LPARAM) data->dirSelect;
+  ppage.pfnCallback = NULL;
 }
 
 int CALLBACK GSInstall_wizardProc(HWND dialog, UINT Message, LPARAM lParameter)
-{ switch (Message)
-    { case PSCB_INITIALIZED :
-            // Process PSCB_INITIALIZED
+{
+  switch (Message)
+    {
+    case PSCB_INITIALIZED :
+      // Process PSCB_INITIALIZED
       gsInstall_wizard_centre(dialog);
-        break ;
-
-        case PSCB_PRECREATE :
-            // Process PSCB_PRECREATE
-        break ;
-
-        default :
-            // Unknown message
-        break ;
-    }
+      break ;
+
+    case PSCB_PRECREATE :
+      // Process PSCB_PRECREATE
+      break ;
+
+    default :
+      // Unknown message
+      break ;
+    }
   return 0;
 }
@@ -847 +920 @@
 
     case WM_USER:
-    {
-      // uninstall action
-      if (strstr(app_cmdLine, "-u") != NULL)
-        {
-      // skip past the -u option itself
-      char *at = strstr(app_cmdLine, "-u");
-      at += strlen("-u");
-
-      // extract the log file path from the command line
-      while (*at == ' ')
-        { 
-          at ++;
-        }
-      string logPathString(at);
-      FilePath logPath(logPathString);
-
-      GSInstall install(true);
-      // if we're running in the temporary directory, do the uninstall
-      if (install.setUninstall())
-        {
+      {
+    // uninstall action
+    if (strstr(app_cmdLine, "-u") != NULL)
+      {
+        // skip past the -u option itself
+        char *at = strstr(app_cmdLine, "-u");
+        at += strlen("-u");
+        
+        // extract the log file path from the command line
+        while (*at == ' ')
+          { 
+        at ++;
+          }
+        string logPathString(at);
+        FilePath logPath(logPathString);
+        
+        GSInstall install(true);
+        // if we're running in the temporary directory, do the uninstall
+        if (install.setUninstall())
+          {
           install.uninstall();
-
+          
           // close the log to write back all changes to the log; if the file
           // will be deleted, it must be closed; copying may also fail, so it's
           // safer to close it before doing either.
           install.closeLog();
-
+          
           // if the install is empty, terminate all final items (currently the
           // log and setup executables,
@@ -880 +953 @@
           // delete the log file
           DeleteFile(logPath.cString());
-
+          
           // get it's parent to find where the gssetup executable will be
           FilePath *logParent = logPath.parent();
           FilePath uninstallPath(*logParent, "gssetup.exe");
-
+          
           // delete the gssetup executable
           DeleteFile(uninstallPath.cString());
-
+          
           // dispose of the parent directory information
           delete logParent;
@@ -896 +969 @@
           // do nothing - should be changed already!
         }
-        }
-    }
-      // install wizard
-      else
-    {   
-      GSInstall install(false);
-      GSInstall_init_wizard(install);
-          if (config_complete == false)
-        {
-          MessageBox(0, "Install cancelled", app_name, MB_OK);
-        }
-      else
-        { 
-          // configure the installation
-          install.setDestination();
-          install.setManifest();
-
-          // perform installation
-          install.copyFiles();
-          install.updateProgman();
-          install.updateRegistry();
-          install.updateProfiles();
-          install.updateSetupExe();
-
-          // the log will need reopening (probably failed initially)
-          install.reopenLog();
-          
-          // close log
-          install.closeLog();
-
-          // do further actions
-          install.installNetscape();
-        }
-    }
-      DestroyWindow(Window);
-    }
-    break;
-    
+          }
+      }
+    // install wizard
+    else
+      { 
+        GSInstall install(false);
+        GSInstall_init_wizard(install);
+        if (config_complete == false)
+          {
+        MessageBox(0, "Install cancelled", app_name, MB_OK);
+          }
+        else
+          { 
+        // configure the installation
+        install.setDestination();
+        install.setManifest();
+        
+        // perform installation
+        install.copyFiles();
+        install.updateProgman();
+        install.updateRegistry();
+        install.updateProfiles();
+        install.updateSetupExe();
+        
+        // the log will need reopening (probably failed initially)
+        install.reopenLog();
+        
+        // close log
+        install.closeLog();
+        
+        // do further actions
+        install.installNetscape();
+          }
+    }
+    DestroyWindow(Window);
+      }
+      break;
+      
     case WM_CLOSE:
       /*if (!file_ischanged || IDCANCEL != file_query(Window, file_name))*/
@@ -944 +1017 @@
       }
       break;
-
+      
     default:
       return(DefWindowProc(Window, Message, wParameter, lParameter));
@@ -952 +1025 @@
 
 void GSInstall_init(HINSTANCE instance, int Show)
-{ int sx, sy;
-
-    gsInstall_getDesktopExt(&sx, &sy);
-
-    app_window = CreateWindow("GSInstall:Main", "GreenStone Installer",
-                                                            WS_OVERLAPPEDWINDOW | WS_MAXIMIZE | CS_DBLCLKS,
-                                                            0, 0,
-                                                            sx, sy,
-                                                            NULL,
-                                                            NULL,
-                                                            app_instance,
-                                                            NULL);
-
-    ShowWindow(app_window, Show);
-
+{
+  int sx, sy;
+
+  gsInstall_getDesktopExt(&sx, &sy);
+  
+  app_window = CreateWindow("GSInstall:Main", "GreenStone Installer",
+                WS_OVERLAPPEDWINDOW | WS_MAXIMIZE | CS_DBLCLKS,
+                0, 0,
+                sx, sy,
+                NULL,
+                NULL,
+                app_instance,
+                NULL);
+  
+  ShowWindow(app_window, Show);
+  
   PostMessage(app_window, WM_USER, 0, 0L);
 }