desktop_utils.exe --run supports passing command line parameters. Fixes

#7
kybu · Dec 5, 2015 · fc4bb9d · fc4bb9d
1 parent f226b5a
commit fc4bb9d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 7 deletions.
diff --git a/desktop_utils/desktop.cpp b/desktop_utils/desktop.cpp
@@ -58,26 +58,43 @@ PROCESS_INFORMATION Desktop::createProcess(
   PROCESS_INFORMATION pi;
   memset(&pi, 0, sizeof(pi));
 
-  bo::shared_ptr<wchar_t []> cmdLineTmp;
-  if (!cmdLine.empty()) {
+  bo::movelib::unique_ptr<wchar_t []> cmdLineTmp;
+  bo::movelib::unique_ptr<wchar_t []> appNameTmp;
+
+  if (!appName.empty() && !cmdLine.empty()) {
     wstring tmp = bo::from_utf8(appName + " " + cmdLine);
 
     cmdLineTmp.reset(new wchar_t[tmp.size()+1]);
     memmove(cmdLineTmp.get(), tmp.c_str(), tmp.size()*sizeof(wchar_t));
     cmdLineTmp[tmp.size()] = 0;
   }
+  else if (!cmdLine.empty()) {
+    wstring tmp = bo::from_utf8(cmdLine);
+
+    cmdLineTmp.reset(new wchar_t[tmp.size()+1]);
+    memmove(cmdLineTmp.get(), tmp.c_str(), tmp.size()*sizeof(wchar_t));
+    cmdLineTmp[tmp.size()] = 0;
+  }
+
+  if (!appName.empty()) {
+    wstring tmp = bo::from_utf8(appName);
+
+    appNameTmp.reset(new wchar_t[tmp.size()+1]);
+    memmove(appNameTmp.get(), tmp.c_str(), tmp.size()*sizeof(wchar_t));
+    appNameTmp[tmp.size()] = 0;
+  }
 
   BOOL created = CreateProcess(
-    bo::from_utf8(appName).c_str(),
+    appNameTmp.get(),
     cmdLineTmp.get(),
     NULL, NULL, FALSE, processCreationFlags, NULL, NULL,
     &si, &pi);
 
   if (created == FALSE)
     throw DesktopError(
       bo::format(
-        "Could not create the '%1%' process in the '%2%' desktop!")
-        % appName
+        "Could not run the '%1%' command in the '%2%' desktop!")
+        % (appName.empty() ? bo::to_utf8(cmdLineTmp.get()) : appName.c_str())
         % desktopName);
 
   return pi;

diff --git a/desktop_utils/desktop_utils.cpp b/desktop_utils/desktop_utils.cpp
@@ -78,9 +78,9 @@ ParseStatus parseCommandLine(int argc, _TCHAR *argv[]) {
       cout << header << endl << endl
            << "* Available desktops:" << endl;
 
-      for (string desktop : Desktop::desktops())
+      for (auto desktop : Desktop::desktops())
         cout << desktop << endl;
-
+      
       return ParseStatus::EXIT_0;
     }
 
@@ -135,6 +135,7 @@ int _tmain(int argc, _TCHAR* argv[]) {
 
     Desktop::createProcess(
       desktopName,
+      "",
       headlessCmd);
   }
   catch (runtime_error &e) {

diff --git a/desktop_utils/stdafx.h b/desktop_utils/stdafx.h
@@ -16,6 +16,7 @@
 
 #include <boost/program_options.hpp>
 #include <boost/smart_ptr.hpp>
+#include <boost/move/unique_ptr.hpp>
 #include <boost/format.hpp>
 #include <boost/tuple/tuple.hpp>