Changeset 600 for trunk/src

Timestamp:

Feb 24, 2010, 10:26:07 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib: Fixed QProcess::startDetached() which would not work in 'highmem' mode (which is on by default). Closes #130.

Location:

trunk/src/corelib/io

Files:

• qprocess.cpp (modified) (1 diff)
• qprocess_os2.cpp (modified) (6 diffs)

trunk/src/corelib/io/qprocess.cpp

@@ -2132 +2132 @@
     The started process will run as a regular standalone process.
 
+    \bold{OS/2:} The started process will run in its own session which is
+    completely independent from the session of the starting application and
+    will continue execution after the starting application terminates.
+
     The process will be started in the directory \a workingDirectory.
 
     If the function is successful then *\a pid is set to the process
     identifier of the started process.
+
+    Note that on OS/2, the PID of the started process is unknown and the value
+    returned in \a pid is always 0.
 */
 bool QProcess::startDetached(const QString &program,

trunk/src/corelib/io/qprocess_os2.cpp

@@ -53 +53 @@
 #include <qthread.h>
 
+#if defined(__INNOTEK_LIBC__)
+#include <emx/umalloc.h> // for _lmalloc()
+#endif
+
 /*
     Returns a human readable representation of the first \a len
@@ -941 +945 @@
                     // @todo use P_SESSION once it's implemented in kLIBC!
                     // @todo check if FS VIO apps need a proxy
-                    programReal = getenv("COMSPEC"); // returns static!
+                    programReal = ::getenv("COMSPEC"); // returns static!
                     if (programReal == 0)
                         programReal = "cmd.exe";
@@ -984 +988 @@
                 args.prepend(programReal);
                 args.prepend("/C \"");
-                programReal = getenv("COMSPEC"); // returns static!
+                programReal = ::getenv("COMSPEC"); // returns static!
                 if (programReal == 0)
                     programReal = "cmd.exe";
@@ -993 +997 @@
                 for (char **e = envv; *e; ++e)
                     env += *e + '\0';
+
+#if defined(__INNOTEK_LIBC__)
+            // make sure we store arguments in the low memory for
+            // DosStartSession() as it cannot work with high memory
+            PSZ pgmNameLow = (PSZ)::_lmalloc(::strlen(programReal) + 1);
+            ::strcpy(pgmNameLow, programReal);
+            PSZ argsLow = (PSZ)::_lmalloc(args.size());
+            ::memcpy(argsLow, args, args.size());
+            PSZ envLow = 0;
+            if (!env.isEmpty()) {
+                envLow = (PSZ)::_lmalloc(env.size());
+                ::memcpy(envLow, env, env.size());
+            }
+#else
+            PSZ pgmNameLow = (PSZ)programReal;
+            PSZ argsLow = args.data();
+            PSZ envLow = env.isEmpty() ? 0 : env.data();
+#endif
 
             STARTDATA data;
@@ -1000 +1022 @@
             data.TraceOpt = SSF_TRACEOPT_NONE;
             data.PgmTitle = 0;
-            data.PgmName = (PSZ)programReal;
-            data.PgmInputs = args.data();
+            data.PgmName = pgmNameLow;
+            data.PgmInputs = argsLow;
             data.TermQ = 0;
-            data.Environment = env.isEmpty() ? 0 : env.data();
+            data.Environment = envLow;
             data.InheritOpt = SSF_INHERTOPT_PARENT;
             data.SessionType = SSF_TYPE_DEFAULT;
@@ -1014 +1036 @@
             data.ObjectBuffLen = 0;
 
-            ULONG ulSid, ulPid;
-            if (DosStartSession(&data, &ulSid, &ulPid) == NO_ERROR)
-                pid = ulPid;
+            ULONG ulSid, ulPidDummy;
+            arc = DosStartSession(&data, &ulSid, &ulPidDummy);
+#if defined(QPROCESS_DEBUG)
+            qDebug("qt_startProcess: DosStartSession() returned %ld", arc);
+#endif
+            // Note: for SSF_RELATED_INDEPENDENT, PID of the started process is
+            // unknown, return 0 to indicate this
+            if (arc == NO_ERROR)
+                pid = 0;
+            else
+                pid = -1;
+
+#if defined(__INNOTEK_LIBC__)
+            if (envLow)
+                ::free(envLow);
+            ::free(argsLow);
+            ::free(pgmNameLow);
+#endif
         } else {
             pid = spawnve(mode, programReal, const_cast<char * const *>(argvReal), envv);