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

Timestamp:

Oct 13, 2001, 7:57:58 PM (24 years ago)

Author:

umoeller

Message:

Lots of updates from the last week for conditional compiles and other stuff.

File:

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

trunk/src/helpers/apps.c

@@ -476 +476 @@
 /* ******************************************************************
  *
- *   Application start
+ *   Application information
  *
  ********************************************************************/
-
-/*
- *@@ CallBatchCorrectly:
- *      fixes the specified PROGDETAILS for
- *      command files in the executable part
- *      by inserting /C XXX into the parameters
- *      and setting the executable according
- *      to an environment variable.
- *
- *@@added V0.9.6 (2000-10-16) [umoeller]
- *@@changed V0.9.7 (2001-01-15) [umoeller]: now using XSTRING
- *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from winh.c to apps.c
- */
-
-VOID CallBatchCorrectly(PPROGDETAILS pProgDetails,
-                        PXSTRING pstrParams,        // in/out: modified parameters (reallocated)
-                        const char *pcszEnvVar,     // in: env var spec'g command proc
-                                                    // (e.g. "OS2_SHELL"); can be NULL
-                        const char *pcszDefProc)    // in: def't command proc (e.g. "CMD.EXE")
-{
-    // XXX.CMD file as executable:
-    // fix args to /C XXX.CMD
-
-    PSZ     pszOldParams = NULL;
-    ULONG   ulOldParamsLength = pstrParams->ulLength;
-    if (ulOldParamsLength)
-        // we have parameters already:
-        // make a backup... we'll append that later
-        pszOldParams = strdup(pstrParams->psz);
-
-    // set new params to "/C filename.cmd"
-    xstrcpy(pstrParams, "/C ", 0);
-    xstrcat(pstrParams,
-            pProgDetails->pszExecutable,
-            0);
-
-    if (pszOldParams)
-    {
-        // .cmd had params:
-        // append space and old params
-        xstrcatc(pstrParams, ' ');
-        xstrcat(pstrParams,
-                pszOldParams,
-                ulOldParamsLength);
-        free(pszOldParams);
-    }
-
-    // set executable to $(OS2_SHELL)
-    pProgDetails->pszExecutable = NULL;
-    if (pcszEnvVar)
-        pProgDetails->pszExecutable = getenv(pcszEnvVar);
-    if (!pProgDetails->pszExecutable)
-        pProgDetails->pszExecutable = (PSZ)pcszDefProc;
-                // should be on PATH
-}
 
 /*
@@ -557 +502 @@
  *      --  PROG_VDD
  *
- *      --  PROG_XWP_DLL: new apptype defined in winh.h for
- *          dynamic link libraries.
+ *      --  PROG_DLL
  *
  *      --  PROG_WINDOWEDVDM
@@ -590 +534 @@
         else if ((_ulDosAppType & 0xF0) == FAPPTYP_DLL) // 0x10)
             // DLL bit set
-            *pulWinAppType = PROG_XWP_DLL;
+            *pulWinAppType = PROG_DLL;
         else if (_ulDosAppType & FAPPTYP_DOS)           // 0x20)
             // DOS bit set?
@@ -611 +555 @@
 
 /*
+ *@@ appDescribeAppType:
+ *      returns a "PROG_*" string for the given
+ *      program type. Useful for WPProgram setup
+ *      strings and such.
+ *
+ *@@added V0.9.16 (2001-10-06)
+ */
+
+PCSZ appDescribeAppType(PROGCATEGORY progc)        // in: from PROGDETAILS.progc
+{
+    switch (progc)
+    {
+        case PROG_DEFAULT: return "PROG_DEFAULT";
+        case PROG_FULLSCREEN: return "PROG_FULLSCREEN";
+        case PROG_WINDOWABLEVIO: return "PROG_WINDOWABLEVIO";
+        case PROG_PM: return "PROG_PM";
+        case PROG_GROUP: return "PROG_GROUP";
+        case PROG_VDM: return "PROG_VDM";
+            // same as case PROG_REAL: return "PROG_REAL";
+        case PROG_WINDOWEDVDM: return "PROG_WINDOWEDVDM";
+        case PROG_DLL: return "PROG_DLL";
+        case PROG_PDD: return "PROG_PDD";
+        case PROG_VDD: return "PROG_VDD";
+        case PROG_WINDOW_REAL: return "PROG_WINDOW_REAL";
+        case PROG_30_STD: return "PROG_30_STD";
+            // same as case PROG_WINDOW_PROT: return "PROG_WINDOW_PROT";
+        case PROG_WINDOW_AUTO: return "PROG_WINDOW_AUTO";
+        case PROG_30_STDSEAMLESSVDM: return "PROG_30_STDSEAMLESSVDM";
+            // same as case PROG_SEAMLESSVDM: return "PROG_SEAMLESSVDM";
+        case PROG_30_STDSEAMLESSCOMMON: return "PROG_30_STDSEAMLESSCOMMON";
+            // same as case PROG_SEAMLESSCOMMON: return "PROG_SEAMLESSCOMMON";
+        case PROG_31_STDSEAMLESSVDM: return "PROG_31_STDSEAMLESSVDM";
+        case PROG_31_STDSEAMLESSCOMMON: return "PROG_31_STDSEAMLESSCOMMON";
+        case PROG_31_ENHSEAMLESSVDM: return "PROG_31_ENHSEAMLESSVDM";
+        case PROG_31_ENHSEAMLESSCOMMON: return "PROG_31_ENHSEAMLESSCOMMON";
+        case PROG_31_ENH: return "PROG_31_ENH";
+        case PROG_31_STD: return "PROG_31_STD";
+
+// Warp 4 toolkit defines, whatever these were designed for...
+#ifndef PROG_DOS_GAME
+    #define PROG_DOS_GAME            (PROGCATEGORY)21
+#endif
+#ifndef PROG_WIN_GAME
+    #define PROG_WIN_GAME            (PROGCATEGORY)22
+#endif
+#ifndef PROG_DOS_MODE
+    #define PROG_DOS_MODE            (PROGCATEGORY)23
+#endif
+
+        case PROG_DOS_GAME: return "PROG_DOS_GAME";
+        case PROG_WIN_GAME: return "PROG_WIN_GAME";
+        case PROG_DOS_MODE: return "PROG_DOS_MODE";
+    }
+
+    return NULL;
+}
+
+/*
  *@@ appIsWindowsApp:
  *      checks the specified program category
@@ -657 +659 @@
 
     return (0);
+}
+
+/* ******************************************************************
+ *
+ *   Application start
+ *
+ ********************************************************************/
+
+/*
+ *@@ CallBatchCorrectly:
+ *      fixes the specified PROGDETAILS for
+ *      command files in the executable part
+ *      by inserting /C XXX into the parameters
+ *      and setting the executable according
+ *      to an environment variable.
+ *
+ *@@added V0.9.6 (2000-10-16) [umoeller]
+ *@@changed V0.9.7 (2001-01-15) [umoeller]: now using XSTRING
+ *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from winh.c to apps.c
+ */
+
+VOID CallBatchCorrectly(PPROGDETAILS pProgDetails,
+                        PXSTRING pstrParams,        // in/out: modified parameters (reallocated)
+                        const char *pcszEnvVar,     // in: env var spec'g command proc
+                                                    // (e.g. "OS2_SHELL"); can be NULL
+                        const char *pcszDefProc)    // in: def't command proc (e.g. "CMD.EXE")
+{
+    // XXX.CMD file as executable:
+    // fix args to /C XXX.CMD
+
+    PSZ     pszOldParams = NULL;
+    ULONG   ulOldParamsLength = pstrParams->ulLength;
+    if (ulOldParamsLength)
+        // we have parameters already:
+        // make a backup... we'll append that later
+        pszOldParams = strdup(pstrParams->psz);
+
+    // set new params to "/C filename.cmd"
+    xstrcpy(pstrParams, "/C ", 0);
+    xstrcat(pstrParams,
+            pProgDetails->pszExecutable,
+            0);
+
+    if (pszOldParams)
+    {
+        // .cmd had params:
+        // append space and old params
+        xstrcatc(pstrParams, ' ');
+        xstrcat(pstrParams,
+                pszOldParams,
+                ulOldParamsLength);
+        free(pszOldParams);
+    }
+
+    // set executable to $(OS2_SHELL)
+    pProgDetails->pszExecutable = NULL;
+    if (pcszEnvVar)
+        pProgDetails->pszExecutable = getenv(pcszEnvVar);
+    if (!pProgDetails->pszExecutable)
+        pProgDetails->pszExecutable = (PSZ)pcszDefProc;
+                // should be on PATH
 }