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

Timestamp:

Aug 11, 2002, 7:07:59 PM (23 years ago)

Author:

umoeller

Message:

Major work on textview control and dialogs.

File:

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

trunk/src/helpers/apps.c

@@ -39 +39 @@
 
 #define INCL_WINPROGRAMLIST     // needed for PROGDETAILS, wppgm.h
+#define INCL_WINSHELLDATA
 #define INCL_WINERRORS
 #define INCL_SHLERRORS
@@ -1146 +1147 @@
  *@@added V0.9.18 (2002-03-27) [umoeller]
  *@@changed V0.9.19 (2002-03-28) [umoeller]: now allocating contiguous buffer
+ *@@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
  */
 
@@ -1163 +1166 @@
 
     if (!pcProgDetails && !ppDetails)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     /*
@@ -1386 +1389 @@
         {
             if (    (ulIsWinApp)
-                 && (    (Details.pszEnvironment == NULL)
-                      || (!strlen(Details.pszEnvironment))
+                 && (    (!(Details.pszEnvironment))
+                      || (!(*Details.pszEnvironment))
                     )
                )
@@ -1729 +1732 @@
 
     if (!pcProgDetails)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     if (pszFailingName)
@@ -1933 +1936 @@
 
     if (!phapp)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     if (!(arc = appBuildProgDetails(&pDetails,
@@ -2015 +2018 @@
 /*
  *@@ appQuickStartApp:
- *      shortcut for simply starting an app and
- *      waiting until it's finished.
+ *      shortcut for simply starting an app.
  *
  *      On errors, NULLHANDLE is returned.
  *
- *      If pulReturnCode != NULL, it receives the
- *      return code of the app.
+ *      Only if pulExitCode != NULL, we wait for
+ *      the app to complete and return the
+ *      exit code.
  *
  *@@added V0.9.16 (2001-10-19) [umoeller]
+ *@@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,
-                      PULONG pulExitCode)
+                      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
 {
     PROGDETAILS    pd = {0};
@@ -2043 +2049 @@
     pd.pszExecutable = (PSZ)pcszFile;
     pd.pszParameters = (PSZ)pcszArgs;
-    if (p = strrchr(pcszFile, '\\'))
+
+    if (    (!(pd.pszStartupDir = (PSZ)pcszWorkingDir))
+         && (p = strrchr(pcszFile, '\\'))
+       )
     {
         strhncpy0(szDir,
@@ -2060 +2069 @@
        )
     {
-        if (appWaitForApp(hwndObject,
+        if (pulExitCode)
+            appWaitForApp(hwndObject,
                           happ,
-                          pulExitCode))
-            happReturn = happ;
+                          pulExitCode);
+
+        happReturn = happ;
+
+        WinDestroyWindow(hwndObject);       // was missing V0.9.20 (2002-08-10) [umoeller]
     }
 
     return happReturn;
 }
+
+/*
+ *@@ appOpenURL:
+ *      opens the system default browser with the given
+ *      URL.
+ *
+ *@@added V0.9.20 (2002-08-10) [umoeller]
+ */
+
+BOOL appOpenURL(PCSZ pcszURL)
+{
+    BOOL        brc = FALSE;
+
+    CHAR        szBrowser[CCHMAXPATH],
+                szStartupDir[CCHMAXPATH];
+    XSTRING     strParameters;
+
+    xstrInit(&strParameters, 0);
+
+    if (PrfQueryProfileString(HINI_USER,
+                              "WPURLDEFAULTSETTINGS",
+                              "DefaultBrowserExe",
+                              "NETSCAPE.EXE",
+                              szBrowser,
+                              sizeof(szBrowser)))
+    {
+        PSZ pszDefParams;
+
+        if (pszDefParams = prfhQueryProfileData(HINI_USER,
+                                                "WPURLDEFAULTSETTINGS",
+                                                "DefaultParameters",
+                                                NULL))
+        {
+            xstrcpy(&strParameters, pszDefParams, 0);
+            xstrcatc(&strParameters, ' ');
+            free(pszDefParams);
+        }
+
+        xstrcat(&strParameters, pcszURL, 0);
+
+        PrfQueryProfileString(HINI_USER,
+                              "WPURLDEFAULTSETTINGS",
+                              "DefaultWorkingDir",
+                              "",
+                              szStartupDir,
+                              sizeof(szStartupDir));
+
+
+        brc = !!appQuickStartApp(szBrowser,
+                                 PROG_DEFAULT,
+                                 strParameters.psz,
+                                 szStartupDir,
+                                 NULL);            // don't wait
+    }
+
+    xstrClear(&strParameters);
+
+    return brc;
+}