Changeset 217 for trunk/src

Timestamp:

Oct 9, 2009, 11:24:19 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: QProcess: Implemented workarounds for starting applications of different types (#72) and for startDetached() (#71).

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (4 diffs)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -107 +107 @@
 QT_BEGIN_NAMESPACE
 
+extern QString qAppFileName();
+
 enum
 {
@@ -744 +746 @@
                            const QStringList *environment, bool detached = false)
 {
-    // @todo P_DETACH isn't supported by kLIBC atm, do something else
     int mode = detached ? P_DETACH : P_NOWAIT;
 
-    // Create argument list with right number of elements, and set the final
-    // one to 0.
-    char **argv = new char *[arguments.count() + 2];
+    // Create argument list with right number of elements (one extra is for
+    // the program name and one for the terminating 0). We also reserve 3
+    // elements in front of the array for a posssible command processor call
+    // insertion.
+    char **argvBase = new char *[arguments.count() + 2 + 3];
+
+    // Don't use leading elements by default
+    char **argv = argvBase + 3;
+    // Set the final argument to 0
     argv[arguments.count() + 1] = 0;
 
@@ -902 +909 @@
         }
 
+        char *programReal = fullProgramName.data();
+        char **argvReal = argv;
+
+        if (mode == P_DETACH) {
+            // @todo P_DETACH isn't supported by kLIBC atm, prepend the program
+            // to start with "cmd.exe /c detach" as a temporary solution
+            mode = P_NOWAIT;
+            programReal = getenv("COMSPEC"); // returns static!
+            if (programReal == 0)
+                programReal = "cmd.exe";
+            argvReal = argvBase;
+            argvReal[0] = programReal;
+            argvReal[1] = "/c";
+            argvReal[2] = "detach";
+            argv[0] = fullProgramName.data();
+        } else {
+            // get the application type of our program (note that we cannot use
+            // DosGetInfoBlocks/PIB because it could be overwritten there by e.g.
+            // morphing from VIO to PM which doesn't cancel the fact that we
+            // are VIO from the OS/2 loader's POV.
+            ULONG flags;
+            arc = DosQueryAppType(QFile::encodeName(qAppFileName()), &flags);
+            if (arc == NO_ERROR && (flags & 0x7) != FAPPTYP_WINDOWAPI) {
+                // we are originally not the PM application and thus DosExecPgm()
+                // won't be able to start PM applications directly (note that the
+                // other way around it works athough undocumented). Check what
+                // the target program is.
+                arc = DosQueryAppType(fullProgramName, &flags);
+                if (arc == NO_ERROR && (flags & 0x7) == FAPPTYP_WINDOWAPI) {
+                    // its PM, we need a proxy
+                    // @todo use P_SESSION once it's implemented in kLIBC!
+                    // @todo check if FS VIO apps need a proxy
+                    programReal = getenv("COMSPEC"); // returns static!
+                    if (programReal == 0)
+                        programReal = "cmd.exe";
+                    argvReal = argvBase + 1;
+                    argvReal[0] = programReal;
+                    argvReal[1] = "/c";
+                    argv[0] = fullProgramName.data();
+                }
+            }
+        }
+
+#if defined(QPROCESS_DEBUG)
+        qDebug("qt_startProcess: executable \"%s\"",
+               qPrintable(QFile::decodeName(programReal)));
+        for (int i = 0; argvReal[i]; ++i) {
+            qDebug("qt_startProcess:  arg[%d] \"%s\"",
+                   i, qPrintable(QFile::decodeName(argvReal[i])));
+        }
+#endif
+
         // finally, start the thing
-        pid = spawnve(mode, fullProgramName, argv, envv);
+        pid = spawnve(mode, programReal, argvReal, envv);
+
+#if defined(QPROCESS_DEBUG)
+        qDebug("qt_startProcess: pid %d", pid);
+#endif
 
         if (prependedLibPath) {
@@ -914 +977 @@
     for (int i = 1 /* 0 is programName */; i <= arguments.count(); ++i)
         delete [] argv[i];
-    delete [] argv;
+    delete [] argvBase;
     if (envv != environ) {
         for (int i = 0; i < envc; ++i)