Changeset 1580

Timestamp:

2000-10-04T04:47:02+13:00 (24 years ago)

Author:

cs025

Message:

Fixed fault in detection of success in adding items.
This resulted in the failure to log such actions.

File:

• trunk/gsinstaller/gsProgman.cpp (modified) (4 diffs)

trunk/gsinstaller/gsProgman.cpp

@@ -175 +175 @@
 
   if (this->platform->isExplorerShell())
-    {
-      // add using shell controls
-      LPITEMIDLIST pidl;
-      
-      if (this->platform->isUserAdministrator())
-    {
+  {
+    // add using shell controls
+    LPITEMIDLIST pidl;
+
+    if (this->platform->isUserAdministrator())
+    {
 #if defined (__GNUC__)
       // this is a hack as windows port of gcc doesn't have CSIDL_COMMON_PROGRAMS defined
-      if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
+        if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
 #else
-      if (SHGetSpecialFolderLocation(0, CSIDL_COMMON_PROGRAMS, &pidl) != NOERROR)
+        if (SHGetSpecialFolderLocation(0, CSIDL_COMMON_PROGRAMS, &pidl) != NOERROR)
 #endif
-        {   
-          return false;
-        }
-    }
+        {
+          return false;
+        }
+      }
+    else
+      {
+        if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
+        {
+          return false;
+        }
+      }
+    SHGetPathFromIDList(pidl, buffer);
+
+    // Create the folder as required
+    FilePath *path = new FilePath(buffer, groupName);
+    if (!CreateDirectory((char *) path->cString(), NULL))
+      {
+        // it probably existed already - if so skip it!
+        DWORD reason = GetLastError();
+      if (reason == ERROR_ALREADY_EXISTS)
+      { return true;
+      }
       else
-    {
-      if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
-        {
-          return false;
-        }
-    }
-      SHGetPathFromIDList(pidl, buffer);
-
-      // Create the folder as required
-      FilePath *path = new FilePath(buffer, groupName);
-      if (!CreateDirectory((char *) path->cString(), NULL))
-    {
-      // it probably existed already - if so skip it!
-      DWORD reason = GetLastError();
-      if (reason != ERROR_ALREADY_EXISTS)
-        {
-          return false;
-        }
-    }
-    }
+      { return false;
+      }
+    }
+      delete path;
+  }
   else
     {
@@ -300 +303 @@
 
           // store the link in the "persistent" file
-          reply = ppf->Save(wsz, TRUE);
-          
-          // release the persistent file handle
-          ppf->Release();
+        reply = (ppf->Save(wsz, TRUE) != E_FAIL);
+
+          // release the persistent file handle
+        ppf->Release();
         }
       psl->Release();
@@ -310 +313 @@
     }
   else
-    {   
+    {
       // Back to the dark ages with win 3.1!
       
@@ -402 +405 @@
 
   if (this->platform->isExplorerShell())
-    {
-      // create item using the shell
-      LPITEMIDLIST pidl;
-      //      HRESULT hres;
-      //      IShellLink * psl;
-      FilePath * fullPath;
-
-      // if the user is adminstrator, take the folder from the common programs folder
-      // (in the "All Users" profile)
-      if (this->platform->isUserAdministrator())
-    {
+  {
+    // create item using the shell
+    LPITEMIDLIST pidl;
+    //      HRESULT hres;
+    //      IShellLink * psl;
+    FilePath * fullPath;
+
+    // if the user is adminstrator, take the folder from the common programs folder
+    // (in the "All Users" profile)
+    if (this->platform->isUserAdministrator())
+    {
 #if defined (__GNUC__)
-      // this is a hack as windows port of gcc doesn't have CSIDL_COMMON_PROGRAMS defined
-      if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
+        // this is a hack as windows port of gcc doesn't have CSIDL_COMMON_PROGRAMS defined
+        if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
 #else
-      if (SHGetSpecialFolderLocation(0, CSIDL_COMMON_PROGRAMS, &pidl) != NOERROR)
+        if (SHGetSpecialFolderLocation(0, CSIDL_COMMON_PROGRAMS, &pidl) != NOERROR)
 #endif
         {
           return false;
         }
-    }
-      // otherwise get it from the user's own programs folder in their profile
-      else
-    {
-      if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
-        {
-          return false;
-        }
-    }
-
-      // get path of folder from shell
-      SHGetPathFromIDList(pidl, buffer);
-      
-      // delete file
-      fullPath = new FilePath(4, buffer, groupName.c_str(), iconName.c_str(), "!.lnk");
-      if (!DeleteFile(fullPath->cString()))
-    {
-      reply = false;
-    }
-      delete fullPath;
-    }
-  else
-    {
-      // Back to the dark ages with win 3.1!
-
-      // ensure that the requisite group is active; the add icon command will
-      // use the active group.
-      sprintf(buffer, "[ShowGroup(%s,5)]", groupName.c_str());
-      if (!DDEShellCommand(this->instance, buffer))
-    {
-      // TODO: articulate/determine possible errors; expand error handling
-      return false;
-    }
-
-      // and now add the item itself to the active (given) group
-      sprintf(buffer, "[DeleteItem(%s)]", iconName.c_str());
-      if (!DDEShellCommand(this->instance, buffer))
-    {
-      // TODO: again work out what the problems could be
-      return false;
-    }
-    }
+      }
+    // otherwise get it from the user's own programs folder in their profile
+    else
+      {
+        if (SHGetSpecialFolderLocation(0, CSIDL_PROGRAMS, &pidl) != NOERROR)
+      {
+          return false;
+        }
+      }
+
+    // get path of folder from shell
+        SHGetPathFromIDList(pidl, buffer);
+
+    // delete file
+    fullPath    = new FilePath(4, buffer, groupName.c_str(), iconName.c_str(), "!.lnk");
+        if (!DeleteFile(fullPath->cString()))
+    { reply = false;
+        }
+    delete fullPath;
+  }
+  else
+  {
+    // Back to the dark ages with win 3.1!
+
+    // ensure that the requisite group is active; the add icon command will
+    // use the active group.
+    sprintf(buffer, "[ShowGroup(%s,5)]", groupName.c_str());
+    if (!DDEShellCommand(this->instance, buffer))
+    {
+        // TODO: articulate/determine possible errors; expand error handling
+        return false;
+      }
+
+    // and now add the item itself to the active (given) group
+    sprintf(buffer, "[DeleteItem(%s)]", iconName.c_str());
+    if (!DDEShellCommand(this->instance, buffer))
+      {
+        // TODO: again work out what the problems could be
+        return false;
+      }
+  }
   return reply;
 }