Fixed <open> command for directories and urls.

Author: end2endzone

src/ActionOpen.cpp

@@ -24,14 +24,26 @@
 
 #include "shellanything/ActionOpen.h"
 #include "rapidassist/process.h"
+#include "rapidassist/filesystem.h"
 #include "PropertyManager.h"
 #include "Platform.h"
+#include "utf_strings.h"
 
 #pragma warning( push )
 #pragma warning( disable: 4355 ) // glog\install_dir\include\glog/logging.h(1167): warning C4355: 'this' : used in base member initializer list
 #include <glog/logging.h>
 #pragma warning( pop )
 
+//#define WIN32_LEAN_AND_MEAN 1
+#include <windows.h>
+#undef GetEnvironmentVariable
+#undef DeleteFile
+#undef CreateDirectory
+#undef CopyFile
+#undef CreateFile
+
+#pragma comment(lib, "Urlmon.lib") //for IsValidURL()
+
 namespace shellanything
 {
 
@@ -43,17 +55,58 @@ namespace shellanything
   {
   }
 
+  bool OpenPathGeneric(const std::string & iPath) {
+    SHELLEXECUTEINFO info = { 0 };
+
+    info.cbSize = sizeof(SHELLEXECUTEINFO);
+
+    info.fMask |= SEE_MASK_NOCLOSEPROCESS;
+    info.fMask |= SEE_MASK_NOASYNC;
+    info.fMask |= SEE_MASK_FLAG_DDEWAIT;
+
+    info.hwnd = HWND_DESKTOP;
+    info.nShow = SW_SHOWDEFAULT;
+    info.lpVerb = "open";
+    info.lpFile = iPath.c_str();
+    info.lpParameters = NULL; //arguments
+    info.lpDirectory = NULL; // default directory
+
+    BOOL success = ShellExecuteEx(&info);
+    return (success == TRUE);
+  }
+
   bool ActionOpen::execute(const Context & iContext) const
   {
     PropertyManager & pmgr = PropertyManager::getInstance();
     std::string path = pmgr.expand(mPath);
 
-    //debug
-    LOG(INFO) << "Open file '" << path << "'";
+    //is path a file?
+    if (ra::filesystem::FileExists(path.c_str()))
+    {
+      LOG(INFO) << "Open file '" << path << "'";
+      uint32_t pId = ra::process::OpenDocument(path);
+      return pId != ra::process::INVALID_PROCESS_ID;
+    }
+
+    //is path a directory?
+    if (ra::filesystem::DirectoryExists(path.c_str()))
+    {
+      LOG(INFO) << "Open directory '" << path << "'";
+      bool success = OpenPathGeneric(path);
+      return success;
+    }
 
-    uint32_t pId = ra::process::OpenDocument(path);
+    //is path a valid url?
+    std::wstring wide_path = encoding::utf::ansi_to_unicode(path);
+    if (IsValidURL(NULL, wide_path.c_str(), 0) == S_OK)
+    {
+      LOG(INFO) << "Open url '" << path << "'";
+      bool success = OpenPathGeneric(path);
+      return success;
+    }
 
-    return pId != 0;
+    LOG(ERROR) << "Unable to open '" << path << "'";
+    return false; //file not found
   }
 
   const std::string & ActionOpen::getPath() const

src/shellext.cpp

@@ -622,13 +622,13 @@ HRESULT STDMETHODCALLTYPE CContextMenu::InvokeCommand(LPCMINVOKECOMMANDINFO lpcm
     const shellanything::Action * action = actions[i];
     if (action)
     {
-      SetLastError(0); //reset win32 error code in case the action fails.
+      ra::errors::ResetLastErrorCode(); //reset win32 error code in case the action fails.
       bool success = action->execute(m_Context);
 
       if (!success)
       {
         //try to get an error mesage from win32
-        uint32_t dwError = ra::errors::GetLastErrorCode();
+        ra::errors::errorcode_t dwError = ra::errors::GetLastErrorCode();
         if (dwError)
         {
           std::string error_message = ra::errors::GetErrorCodeDescription(dwError);