Changeset 209 for trunk/src/helpers/apps.c

Timestamp:

Aug 19, 2002, 11:23:17 PM (23 years ago)

Author:

umoeller

Message:

Dialog formatter rewrite.

File:

• trunk/src/helpers/apps.c (modified) (9 diffs)

trunk/src/helpers/apps.c

@@ -879 +879 @@
     // if the path has spaces, or other invalid characters,
     // include it in quotes V0.9.21 (2002-08-12) [umoeller]
-    if (fQuotes = !!strpbrk(pProgDetails->pszExecutable, " +&|"))
+    if (fQuotes = !!strpbrk(pProgDetails->pszExecutable, " +&|="))
         xstrcatc(pstrParams, '"');
+            // @@bugbug "=" still doesn't work
 
     #ifdef DEBUG_PROGRAMSTART
@@ -1165 +1166 @@
  *@@changed V0.9.20 (2002-07-03) [umoeller]: fixed Win-OS/2 full screen breakage
  *@@changed V0.9.20 (2002-07-03) [umoeller]: fixed broken bat and cmd files when PROG_DEFAULT was set
+ *@@changed V0.9.21 (2002-08-18) [umoeller]: fixed cmd and bat files that had "=" in their paths
  */
 
@@ -1347 +1349 @@
                         arc = ERROR_PATH_NOT_FOUND;
                 }
+
+// V0.9.21: this define is never set. I have thus completely
+// disabled the batch hacks that we used to provide, that is
+// we no longer change the "c:\path\batch.cmd" to "cmd.exe /c c:\path\batch.cmd"
+// because it is perfectly valid to call WinStartApp with a
+// batch file. The problem with my code was that cmd.exe has
+// a weird bug in that if you give it something via /c that
+// has an equals character (=) in its path, e.g. "c:\path=path\batch.cmd",
+// the command parser apparently stops at the first "=" and
+// reports "c:\path" not found or something. What a bitch.
+#ifdef ENABLEBATCHHACKS
 
                 // we frequently get here for BAT and CMD files
@@ -1399 +1412 @@
                     break;
                 } // end switch (Details.progt.progc)
+#endif // ENABLEBATCHHACKS
             }
         }
@@ -2045 +2059 @@
  *@@changed V0.9.20 (2002-08-10) [umoeller]: fixed missing destroy window, made wait optional
  *@@changed V0.9.20 (2002-08-10) [umoeller]: added pcszWorkingDir
- */
-
-HAPP appQuickStartApp(const char *pcszFile,
-                      ULONG ulProgType,             // e.g. PROG_PM
-                      const char *pcszArgs,         // in: arguments (can be NULL)
-                      const char *pcszWorkingDir,   // in: working dir (can be NULL)
-                      PULONG pulExitCode)           // out: exit code; if ptr is NULL, we don't wait
+ *@@changed V0.9.21 (2002-08-18) [umoeller]: changed prototype to return APIRET
+ */
+
+APIRET appQuickStartApp(const char *pcszFile,
+                        ULONG ulProgType,             // e.g. PROG_PM
+                        const char *pcszArgs,         // in: arguments (can be NULL)
+                        const char *pcszWorkingDir,   // in: working dir (can be NULL)
+                        HAPP *phapp,
+                        PULONG pulExitCode)           // out: exit code; if ptr is NULL, we don't wait
 {
+    APIRET         arc = NO_ERROR;
     PROGDETAILS    pd = {0};
-    HAPP           happ,
-                   happReturn = NULLHANDLE;
+    HAPP           happReturn = NULLHANDLE;
     CHAR           szDir[CCHMAXPATH] = "";
     PCSZ           p;
@@ -2077 +2093 @@
 
     if (    (hwndObject = winhCreateObjectWindow(WC_STATIC, NULL))
-         && (!appStartApp(hwndObject,
-                          &pd,
-                          0,
-                          &happ,
-                          0,
-                          NULL))
+         && (!(arc = appStartApp(hwndObject,
+                                 &pd,
+                                 0,
+                                 phapp,
+                                 0,
+                                 NULL)))
        )
     {
         if (pulExitCode)
             appWaitForApp(hwndObject,
-                          happ,
+                          *phapp,
                           pulExitCode);
 
-        happReturn = happ;
-
         WinDestroyWindow(hwndObject);       // was missing V0.9.20 (2002-08-10) [umoeller]
     }
 
-    return happReturn;
+    return arc;
 }
 
@@ -2103 +2117 @@
  *      URL.
  *
+ *      We return TRUE if appQuickStartApp succeeded with
+ *      that URL.
+ *
  *@@added V0.9.20 (2002-08-10) [umoeller]
  */
 
-BOOL appOpenURL(PCSZ pcszURL)
+APIRET appOpenURL(PCSZ pcszURL,           // in: URL to open
+                  PSZ pszAppStarted,      // out: application that was started
+                  ULONG cbAppStarted)     // in: size of that buffer
 {
-    BOOL        brc = FALSE;
+    APIRET      arc = NO_ERROR;
 
     CHAR        szBrowser[CCHMAXPATH],
@@ -2123 +2142 @@
                               sizeof(szBrowser)))
     {
-        PSZ pszDefParams;
+        PSZ     pszDefParams;
+        HAPP    happ;
 
         if (pszDefParams = prfhQueryProfileData(HINI_USER,
@@ -2145 +2165 @@
 
 
-        brc = !!appQuickStartApp(szBrowser,
-                                 PROG_DEFAULT,
-                                 strParameters.psz,
-                                 szStartupDir,
-                                 NULL);            // don't wait
+        arc = appQuickStartApp(szBrowser,
+                               PROG_DEFAULT,
+                               strParameters.psz,
+                               szStartupDir,
+                               &happ,
+                               NULL);     // don't wait
+
+        if (pszAppStarted)
+            strhncpy0(pszAppStarted,
+                      szBrowser,
+                      cbAppStarted);
     }
 
     xstrClear(&strParameters);
 
-    return brc;
+    return arc;
 }