can now run external commands without spawning a window on win32

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15974 afbd958f-9f77-42d5-a016-97a22340ccf4
eclipse-sumo · Mar 19, 2014 · 8abeacf · 8abeacf
1 parent 2d1b1d7
commit 8abeacf
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 9 deletions.
diff --git a/sumo/src/gui/GUIApplicationWindow.cpp b/sumo/src/gui/GUIApplicationWindow.cpp
@@ -1201,9 +1201,7 @@ GUIApplicationWindow::checkGamingEvents() {
                 const std::string cmd = myJamSounds.get(&myGamingRNG);
                 if (cmd != "")
                     // yay! fun with dangerous commands... Never use this over the internet
-                    system(cmd.c_str());
-                //system("play /home/erdm_ja/Downloads/vehicle040.wav &"); // linux
-                //system("start /min vlc -Idummy D:\\erdm_ja\\Downloads\\vehicle040.wav &"); // windows
+                    SysUtils::runHiddenCommand(cmd);
             }
             // one sound per simulation step is enough
             break;

diff --git a/sumo/src/utils/common/SysUtils.cpp b/sumo/src/utils/common/SysUtils.cpp
@@ -69,6 +69,43 @@ SysUtils::getWindowsTicks() {
 #endif
 
 
+unsigned long 
+SysUtils::runHiddenCommand(const std::string& cmd) {
+#ifndef WIN32
+    return (unsigned long)system(cmd.c_str());
+#else
+    // code inspired by http://www.codeproject.com/Articles/2537/Running-console-applications-silently
+	STARTUPINFO StartupInfo;
+	PROCESS_INFORMATION ProcessInfo;
+	unsigned long rc;
+
+	memset(&StartupInfo, 0, sizeof(StartupInfo));
+	StartupInfo.cb = sizeof(STARTUPINFO);
+	StartupInfo.dwFlags = STARTF_USESHOWWINDOW;
+	StartupInfo.wShowWindow = SW_HIDE;
+
+	// "/c" option - Do the command then terminate the command window
+    std::string winCmd = "CMD.exe /c " + cmd;
+    char* args = new char[winCmd.size()];
+    args[0] = 0;
+    strcpy(args, winCmd.c_str());
+	if (!CreateProcess( NULL, args, NULL, NULL, FALSE,
+		CREATE_NEW_CONSOLE, NULL, NULL, &StartupInfo, &ProcessInfo)) {
+        delete args;
+        return (unsigned long)GetLastError();		
+	}
+
+	WaitForSingleObject(ProcessInfo.hProcess, INFINITE);
+	if(!GetExitCodeProcess(ProcessInfo.hProcess, &rc))
+		rc = 0;
+
+	CloseHandle(ProcessInfo.hThread);
+	CloseHandle(ProcessInfo.hProcess);
+
+    delete args;
+	return rc;
+#endif
+}
 
 /****************************************************************************/
 
diff --git a/sumo/src/utils/common/SysUtils.h b/sumo/src/utils/common/SysUtils.h
@@ -30,6 +30,7 @@
 #include <config.h>
 #endif
 
+#include <string>
 
 // ===========================================================================
 // class definitions
@@ -54,8 +55,10 @@ class SysUtils {
     static long getWindowsTicks();
 #endif
 
-};
 
+    /// @brief run a shell command without popping up any windows (particuarly on win32)
+    static unsigned long runHiddenCommand(const std::string& cmd);
+};
 
 #endif
 

diff --git a/sumo/tools/game/cross/cross.rou.xml b/sumo/tools/game/cross/cross.rou.xml
@@ -1,4 +1,4 @@
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/routes_file.xsd">
+<routes>
     <vTypeDistribution id="DEFAULT_VEHTYPE">
         <vType id="passenger" length="5.0" minGap="2.5" guiShape="passenger" osgFile="vw_golf.3ds" probability="20" /> 
         <vType id="bus" length="12.5" minGap="2.5" guiShape="bus" osgFile="tour_bus.3ds" width="2.4" probability="2"/> 

diff --git a/sumo/tools/game/cross/cross.settings.xml b/sumo/tools/game/cross/cross.settings.xml
@@ -80,9 +80,9 @@
         <legend showSizeLegend="1"/>
     </scheme>
 
-    <event id="jam" commandPosix="play sounds/car_horn1.wav &#x26;"  commandWindows="start /min vlc -Idummy sounds/car_horn1.wav &#x26;" probability="0.1"/>
-    <event id="jam" commandPosix="play sounds/car_horn2.wav &#x26;"  commandWindows="start /min vlc -Idummy sounds/car_horn2.wav &#x26;" probability="0.1"/>
-    <event id="jam" commandPosix="play sounds/car_horn3.wav &#x26;"  commandWindows="start /min vlc -Idummy sounds/car_horn3.wav &#x26;" probability="0.1"/>
+    <event id="jam" commandPosix="play sounds/car_horn1.wav &#x26;"  commandWindows="start /min vlc.exe -Idummy --play-and-exit sounds/car_horn1.wav" probability="0.1"/>
+    <event id="jam" commandPosix="play sounds/car_horn2.wav &#x26;"  commandWindows="start /min vlc.exe -Idummy --play-and-exit sounds/car_horn2.wav" probability="0.1"/>
+    <event id="jam" commandPosix="play sounds/car_horn3.wav &#x26;"  commandWindows="start /min vlc.exe -Idummy --play-and-exit sounds/car_horn3.wav" probability="0.1"/>
     <jamTime value="40"/>
 
 </viewsettings>
diff --git a/sumo/tools/game/square/square.rou.xml b/sumo/tools/game/square/square.rou.xml
@@ -1,4 +1,4 @@
-<routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.sf.net/xsd/routes_file.xsd">
+<routes>
     <routeDistribution id="horizontal">
         <route edges="left0to0/0 0/0to1/0 1/0toright0"/>
         <route edges="left1to0/1 0/1to1/1 1/1toright1"/>