Migrating from CreateProcess to ShellExecuteEx

Author: GasDauMin

AUTHORS

@@ -3,3 +3,4 @@
 # their names here.  Please keep the list sorted by first names.
 
 Antoine Beauchamp <[email protected]>
+Mindaugas Ribaconka <[email protected]>

include/shellanything/ActionExecute.h

@@ -40,11 +40,18 @@ namespace shellanything
     virtual ~ActionExecute();
 
     /// <summary>
-    /// Execute an application.
+  /// Execute an application.
+  /// </summary>
+  /// <param name="iContext">The current context of execution.</param>
+  /// <returns>Returns true if the execution is successful. Returns false otherwise.</returns>
+    virtual bool Execute(const Context& iContext) const;
+
+    /// <summary>
+    /// Execute an application with RapidAssist method.
     /// </summary>
     /// <param name="iContext">The current context of execution.</param>
     /// <returns>Returns true if the execution is successful. Returns false otherwise.</returns>
-    virtual bool Execute(const Context & iContext) const;
+    virtual bool StartProcess(const Context & iContext) const;
 
     /// <summary>
     /// Getter for the 'path' parameter.
@@ -76,10 +83,21 @@ namespace shellanything
     /// </summary>
     void SetArguments(const std::string & iArguments);
 
+    /// <summary>
+    /// Getter for the 'verb' parameter.
+    /// </summary>
+    const std::string& GetVerb() const;
+
+    /// <summary>
+    /// Setter for the 'verb' parameter.
+    /// </summary>
+    void SetVerb(const std::string& iArguments);
+
   private:
     std::string mPath;
     std::string mBaseDir;
     std::string mArguments;
+    std::string mVerb;
   };
 
 } //namespace shellanything

src/ActionExecute.cpp

@@ -28,6 +28,7 @@
 #include "rapidassist/filesystem_utf8.h"
 #include "PropertyManager.h"
 
+#include <windows.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>
@@ -45,7 +46,56 @@ namespace shellanything
   {
   }
 
-  bool ActionExecute::Execute(const Context & iContext) const
+  bool ActionExecute::Execute(const Context& iContext) const
+  {
+    PropertyManager& pmgr = PropertyManager::GetInstance();
+    std::string path      = pmgr.Expand(mPath);
+    std::string basedir   = pmgr.Expand(mBaseDir);
+    std::string arguments = pmgr.Expand(mArguments);
+    std::string verb      = pmgr.Expand(mVerb);
+
+    std::wstring pathW      = ra::unicode::Utf8ToUnicode(path);
+    std::wstring argumentsW = ra::unicode::Utf8ToUnicode(arguments);
+    std::wstring basedirW   = ra::unicode::Utf8ToUnicode(basedir);
+    std::wstring verbW      = ra::unicode::Utf8ToUnicode(verb);
+
+    SHELLEXECUTEINFOW info = { 0 };
+
+    info.cbSize = sizeof(SHELLEXECUTEINFOW);
+
+    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.lpFile = pathW.c_str();
+
+    LOG(INFO) << "Exec: '" << path;
+
+    if (!verb.empty())
+    {
+      info.lpVerb = verbW.c_str(); // Verb
+      LOG(INFO) << "Verb: '" << verb;
+    }
+
+    if (!arguments.empty())
+    {
+      info.lpParameters = argumentsW.c_str(); // Arguments
+      LOG(INFO) << "Arguments: '" << arguments;
+    }
+
+    if (!basedir.empty())
+    {
+      info.lpDirectory = basedirW.c_str(); // Default directory
+      LOG(INFO) << "Basedir: '" << basedir;
+    }
+
+    BOOL success = ShellExecuteExW(&info);
+    return (success == TRUE);
+  }
+
+  bool ActionExecute::StartProcess(const Context & iContext) const
   {
     PropertyManager & pmgr = PropertyManager::GetInstance();
     std::string path = pmgr.Expand(mPath);
@@ -146,4 +196,14 @@ namespace shellanything
     mArguments = iArguments;
   }
 
+  const std::string& ActionExecute::GetVerb() const
+  {
+    return mArguments;
+  }
+
+  void ActionExecute::SetVerb(const std::string& iVerb)
+  {
+    mVerb = iVerb;
+  }
+
 } //namespace shellanything

src/ActionOpen.cpp

@@ -69,8 +69,8 @@ namespace shellanything
     info.nShow = SW_SHOWDEFAULT;
     info.lpVerb = L"open";
     info.lpFile = pathW.c_str();
-    info.lpParameters = NULL; //arguments
-    info.lpDirectory = NULL; // default directory
+    info.lpParameters = NULL; // arguments
+    info.lpDirectory = NULL;  // Default directory
 
     BOOL success = ShellExecuteExW(&info);
     return (success == TRUE);

src/ObjectFactory.cpp

@@ -293,6 +293,14 @@ namespace shellanything
         action->SetBaseDir(tmp_str);
       }
 
+      //parse verb
+      tmp_str = "";
+      tmp_int = -1;
+      if (ParseAttribute(element, "verb", true, true, tmp_str, error))
+      {
+        action->SetVerb(tmp_str);
+      }
+
       //done parsing
       return action;
     }