Changeset 23 for trunk/src/helpers/winh.c

Timestamp:

Jan 16, 2001, 8:49:10 PM (25 years ago)

Author:

umoeller

Message:

Fixes for V0.9.7.

File:

• trunk/src/helpers/winh.c (modified) (11 diffs)

trunk/src/helpers/winh.c

@@ -2432 +2432 @@
  *
  *@@added V0.9.6 (2000-10-16) [umoeller]
+ *@@changed V0.9.7 (2001-01-15) [umoeller]: now using XSTRING
  */
 
 VOID CallBatchCorrectly(PPROGDETAILS pProgDetails,
-                        PSZ *ppszParams,            // in/out: modified parameters (reallocated)
+                        PXSTRING pstrParams,        // in/out: modified parameters (reallocated)
                         const char *pcszEnvVar,     // in: env var spec'g command proc
                                                     // (e.g. "OS2_SHELL"); can be NULL
@@ -2442 +2443 @@
     // XXX.CMD file as executable:
     // fix args to /C XXX.CMD
-    XSTRING strNewParams;
-    xstrInit(&strNewParams, 200);
-    xstrcpy(&strNewParams, "/C ");
-    xstrcat(&strNewParams, pProgDetails->pszExecutable);
-    if (*ppszParams)
-    {
-        // append old params
-        xstrcat(&strNewParams, " ");
-        xstrcat(&strNewParams, *ppszParams);
-        free(*ppszParams);
-    }
-    *ppszParams = strNewParams.psz;
-            // freed by caller
+
+    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)
@@ -2508 +2520 @@
 {
     HAPP            happ = NULLHANDLE;
-    PSZ             pszParamsPatched = NULL;
+    XSTRING         strParamsPatched;
     BOOL            fIsWindowsApp = FALSE,
                     fIsWindowsEnhApp = FALSE;
@@ -2527 +2539 @@
     // we need this for string manipulations below...
     if (ProgDetails.pszParameters)
-        pszParamsPatched = strdup(ProgDetails.pszParameters);
+        xstrInitCopy(&strParamsPatched,
+                     ProgDetails.pszParameters,
+                     100);
+    else
+        // no old params:
+        xstrInit(&strParamsPatched, 100);
 
     // _Pmpf((__FUNCTION__ ": old progc: 0x%lX", pcProgDetails->progt.progc));
@@ -2587 +2604 @@
         {
             // enhanced Win-OS/2 session:
-            XSTRING str2;
-            xstrInit(&str2, 200);
-            xstrcpy(&str2, "/3 ");
-            if (pszParamsPatched)
+            PSZ psz = NULL;
+            if (strParamsPatched.ulLength)
+                // "/3 " + existing params
+                psz = strdup(strParamsPatched.psz);
+
+            xstrcpy(&strParamsPatched, "/3 ", 0);
+
+            if (psz)
             {
-                // append existing params
-                xstrcat(&str2, pszParamsPatched);
-                free(pszParamsPatched);
+                xstrcat(&strParamsPatched, psz, 0);
+                free(psz);
             }
-
-            pszParamsPatched = str2.psz;
         }
 
@@ -2633 +2651 @@
                     {
                         CallBatchCorrectly(&ProgDetails,
-                                           &pszParamsPatched,
+                                           &strParamsPatched,
                                            "OS2_SHELL",
                                            "CMD.EXE");
@@ -2649 +2667 @@
                     {
                         CallBatchCorrectly(&ProgDetails,
-                                           &pszParamsPatched,
+                                           &strParamsPatched,
                                            NULL,
                                            "COMMAND.COM");
@@ -2716 +2734 @@
     // _Pmpf(("    new progc: 0x%lX", ProgDetails.progt.progc));
 
-    ProgDetails.pszParameters = pszParamsPatched;
+    ProgDetails.pszParameters = strParamsPatched.psz;
 
     happ = WinStartApp(hwndNotify,
                                 // receives WM_APPTERMINATENOTIFY
                        &ProgDetails,
-                       pszParamsPatched,
+                       strParamsPatched.psz,
                        NULL,            // "reserved", PMREF says...
                        SAF_INSTALLEDCMDLINE);
@@ -2734 +2752 @@
     // _Pmpf((__FUNCTION__ ": got happ 0x%lX", happ));
 
-    if (pszParamsPatched)
-        free(pszParamsPatched);
+    xstrClear(&strParamsPatched);
     if (pszWinOS2Env)
         free(pszWinOS2Env);
@@ -3068 +3085 @@
  *@@ winhReplaceWindowText:
  *      this is a combination of winhQueryWindowText
- *      and xstrrpl (stringh.c) to replace substrings
- *      in a window.
+ *      and strhFindReplace to replace substrings in a window.
  *
  *      This is useful for filling in placeholders
@@ -3093 +3109 @@
     {
         ULONG ulOfs = 0;
-        if (strhrpl(&pszText, &ulOfs, pszSearch, pszReplaceWith) > 0)
+        if (strhFindReplace(&pszText, &ulOfs, pszSearch, pszReplaceWith) > 0)
         {
             WinSetWindowText(hwnd, pszText);