Changeset 773

Timestamp:

Aug 7, 2007, 11:23:27 PM (18 years ago)

Author:

Steven Levine

Message:

Correct some compare directories collector nits
Use BldQuoted... functions
Move BldQuoted... functions near primary callers
Add RUNTYPE_MASK
Use Runtime_Error2 more

Location:

trunk/dll

Files:

• arccnrs.c (modified) (28 diffs)
• autoview.c (modified) (7 diffs)
• comp.c (modified) (12 diffs)
• filldir.c (modified) (10 diffs)
• fm3dll.h (modified) (5 diffs)
• mainwnd.c (modified) (4 diffs)
• mainwnd2.c (modified) (3 diffs)
• makelist.c (modified) (3 diffs)
• misc.c (modified) (2 diffs)
• seeall.c (modified) (5 diffs)
• shadow.c (modified) (3 diffs)
• systemf.c (modified) (3 diffs)
• worker.c (modified) (11 diffs)

trunk/dll/arccnrs.c

@@ -41 +41 @@
   16 Jun 07 SHL Use DosQueryAppType not DosQAppType
   02 Aug 07 SHL Sync with ARCITEM mods
+  06 Aug 07 SHL Use BldFullPathName and BldQuotedFileName
+  06 Aug 07 SHL Move BldQuotedFileName and BldQuotedFullPathNamehere
+                to be near primary caller
 
 ***********************************************************************/
@@ -76 +79 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(ARCCNRS,ArcCnrWndProc,ArcObjWndProc,ArcClientWndProc)
-#pragma alloc_text(ARCCNRS,ArcTextProc,FillArcCnr,ArcFilter)
+#pragma alloc_text(ARCCNRS,ArcCnrWndProc,ArcObjWndProc,ArcClientWndProc,BldQuotedFullPathName)
+#pragma alloc_text(ARCCNRS,ArcTextProc,FillArcCnr,ArcFilter,BldQuotedFileName)
 #pragma alloc_text(ARCCNRS,ArcSort,ArcFrameWndProc,IsArcThere,ArcErrProc)
 #pragma alloc_text(STARTUP,StartArcCnr)
+
+/**
+ * Build quoted full path name in callers buffer given
+ * directory name and filename
+ * @param pszPathName points to drive/directory if not NULL
+ * @returns pointer to quoted path name in caller's buffer
+ */
+
+PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+{
+  UINT c = pszPathName ? strlen(pszPathName) : 0;
+  BOOL q = needs_quoting(pszPathName) ||
+           needs_quoting(pszFileName);
+  PSZ psz = pszFullPathName;
+
+  if (q)
+    *psz++ = '"';
+  if (c > 0) {
+    memcpy(psz, pszPathName, c);
+    psz += c;
+    if (*(psz - 1) != '\\')
+      *psz++ = '\\';
+  }
+  strcpy(psz, pszFileName);
+  if (q) {
+    psz += strlen(psz);
+    *psz++ = '"';
+    *psz = 0;
+  }
+  return pszFullPathName;
+}
+
+/**
+ * Build quoted full path name in callers buffer given a filename
+ * @returns pointer to quoted file name in caller's buffer
+ */
+
+PSZ BldQuotedFileName(PSZ pszQuotedFileName, PSZ pszFileName)
+{
+  BOOL q = needs_quoting(pszFileName);
+  PSZ psz = pszQuotedFileName;
+
+  if (q)
+    *psz++ = '"';
+  strcpy(psz, pszFileName);
+  if (q) {
+    psz += strlen(psz);
+    *psz++ = '"';
+    *psz = 0;
+  }
+  return pszQuotedFileName;
+}
 
 static MRESULT EXPENTRY ArcErrProc(HWND hwnd, ULONG msg, MPARAM mp1,
@@ -85 +140 @@
 {
   ARCDUMP *ad;
+  CHAR szQuotedArcName[CCHMAXPATH];
 
   switch (msg) {
@@ -158 +214 @@
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
-              hwnd, NULL, NULL, "%s %s%s%s", ad->info->test,
-              needs_quoting(ad->arcname) ? "\"" : NullStr,
-              ad->arcname,
-              needs_quoting(ad->arcname) ? "\"" : NullStr);
+              hwnd, NULL, NULL,
+              "%s %s",
+              ad->info->test,
+              BldQuotedFileName(szQuotedArcName, ad->arcname));
+      // runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
+      //              hwnd, NULL, NULL, "%s %s%s%s", ad->info->test,
+              // needs_quoting(ad->arcname) ? "\"" : NullStr,
+              // ad->arcname,
+              // needs_quoting(ad->arcname) ? "\"" : NullStr);
       break;
     }
@@ -383 +444 @@
 static VOID EmptyArcCnr(HWND hwnd)
 {
-#if 0 // fixme to disable or to be configurable
+#if 0 // fixme to be gone or to be configurable
   {
     int state = _heapchk();
@@ -409 +470 @@
   HFILE newstdout;
   CHAR s[CCHMAXPATH * 2], lonename[CCHMAXPATH + 2],
-    *nsize, *osize, *fdate, *fname, *p, *pp, arctemp[33];
+       *nsize, *osize, *fdate, *fname, *p, *pp, arctemp[33];
   BOOL gotstart;
   BOOL gotend;
   BOOL wasquote;
-  BOOL nomove = FALSE;          // fixme to be gone?
+  BOOL nomove = FALSE;                  // fixme to be gone?
   INT highest = 0, x, counter = 0, numarcfiles = 0;
   PARCITEM lastpai;
@@ -484 +545 @@
       p = GetCmdSpec(TRUE);
       runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
-              hwndCnr,
-              NULL,
-              "DOS_BACKGROUND_EXECUTION=1",
-              "%s /C %s %s%s%s > %s",
-              p,
-              info->list,
-              needs_quoting(arcname) ? "\"" : NullStr,
-              arcname,
-              needs_quoting(arcname) ? "\"" : NullStr,
+              hwndCnr, NULL, "DOS_BACKGROUND_EXECUTION=1",
+              "%s /C %s %s >%s",
+              p,                        // shell
+              info->list,               // list command
+              BldQuotedFileName(s, arcname),
               arctemp);
+      // runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
+      //              hwndCnr,
+      //              NULL,
+      //              "DOS_BACKGROUND_EXECUTION=1",
+      //              "%s /C %s %s%s%s > %s",
+      //              p,
+      //              info->list,
+      //              needs_quoting(arcname) ? "\"" : NullStr,
+      //              arcname,
+      //              needs_quoting(arcname) ? "\"" : NullStr,
+      //              arctemp);
     }
     else {
@@ -519 +587 @@
           else {
             runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
-                    hwndCnr, NULL, NULL, "%s %s%s%s", info->list,
-                    needs_quoting(arcname) ? "\"" : NullStr,
-                    arcname,
-                    needs_quoting(arcname) ? "\"" : NullStr);
+                    hwndCnr, NULL, NULL,
+                    "%s %s",
+                    info->list,
+                    BldQuotedFileName(s, arcname));
+            // runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
+            //      hwndCnr, NULL, NULL, "%s %s%s%s", info->list,
+            //      needs_quoting(arcname) ? "\"" : NullStr,
+            //      arcname,
+            //      needs_quoting(arcname) ? "\"" : NullStr);
             oldstdout = fileno(stdout);
             DosError(FERR_DISABLEHARDERR);
@@ -1215 +1288 @@
   DIRCNRDATA *dcd;
   PSZ psz;
+  CHAR szQuotedArcName[CCHMAXPATH];
+  CHAR szQuotedMemberName[CCHMAXPATH];
 
   switch (msg) {
@@ -1312 +1387 @@
           // saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,"%s %s %s\r[%s]",dcd->info->extract,dcd->arcname,membername,construct);
           runemf2(SEPARATE | WINDOWED | WAIT |
-                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                    WAIT,
-                  dcd->hwndClient, construct, NULL, "%s %s%s%s %s%s%s",
+                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                  dcd->hwndClient, construct, NULL,
+                  "%s %s %s",
                   dcd->info->extract,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                  dcd->arcname,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                  needs_quoting(membername) ? "\"" : NullStr,
-                  membername,
-                  needs_quoting(membername) ? "\"" : NullStr);
-          if (*construct && construct[strlen(construct) - 1] != '\\')
-            strcat(construct, "\\");
-          strcat(construct, membername);
+                  BldQuotedFileName(szQuotedArcName, dcd->arcname),
+                  BldQuotedFileName(szQuotedMemberName, membername));
+          // runemf2(SEPARATE | WINDOWED | WAIT |
+          //        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+          //        WAIT,
+          //      dcd->hwndClient, construct, NULL, "%s %s%s%s %s%s%s",
+          //      dcd->info->extract,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+          //      dcd->arcname,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+          //      needs_quoting(membername) ? "\"" : NullStr,
+          //      membername,
+          //      needs_quoting(membername) ? "\"" : NullStr);
+          BldFullPathName(construct, construct, membername);
+          // if (*construct && construct[strlen(construct) - 1] != '\\')
+          //   strcat(construct, "\\");
+          // strcat(construct, membername);
           if (IsFile(construct) != -1) {
             rename(construct, filename);
@@ -1439 +1522 @@
           return 0;
         }
-        runemf2(SEPARATE | WINDOWED |
-                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                  WAIT,
-                dcd->hwndClient, dcd->workdir, NULL, "%s %s%s%s %s%s%s",
+        runemf2(SEPARATE | WINDOWED | WAIT |
+                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                dcd->hwndClient, dcd->workdir, NULL,
+                "%s %s %s",
                 dcd->info->exwdirs ? dcd->info->exwdirs :
                                      dcd->info->extract,
-                needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                dcd->arcname,
-                needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                needs_quoting(s) ? "\"" : NullStr,
-                s,
-                needs_quoting(s) ? "\"" : NullStr);
-
-        // printf("%s %d runemf2 returned\n", __FILE__, __LINE__); fflush(stdout);      // 10 Mar 07 SHL
+                BldQuotedFileName(szQuotedArcName, dcd->arcname),
+                BldQuotedFileName(szQuotedMemberName, s));
+        // runemf2(SEPARATE | WINDOWED |
+        //        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+        //        WAIT,
+        //      dcd->hwndClient, dcd->workdir, NULL, "%s %s%s%s %s%s%s",
+        //      dcd->info->exwdirs ? dcd->info->exwdirs :
+        //                           dcd->info->extract,
+        //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+        //      dcd->arcname,
+        //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+        //      needs_quoting(s) ? "\"" : NullStr,
+        //      s,
+        //      needs_quoting(s) ? "\"" : NullStr);
         if (!dcd->info->exwdirs) {
           p = s;
@@ -1517 +1606 @@
             strcpy(szBuffer, ad.command);
             strcat(szBuffer, " ");
-            if (needs_quoting(ad.arcname))
-              strcat(szBuffer, "\"");
-            strcat(szBuffer, ad.arcname);
-            if (needs_quoting(ad.arcname))
-              strcat(szBuffer, "\"");
-            p = &szBuffer[strlen(szBuffer)];
+
+            BldQuotedFileName(szBuffer + strlen(szBuffer), ad.arcname);
+            // if (needs_quoting(ad.arcname))
+            //   strcat(szBuffer, "\"");
+            // strcat(szBuffer, ad.arcname);
+            // if (needs_quoting(ad.arcname))
+            //   strcat(szBuffer, "\"");
+
+            p = &szBuffer[strlen(szBuffer)];    // Remeber where archiver name ends
+
             if (ad.mask.szMask) {
               strcat(szBuffer, " ");
-              if (needs_quoting(ad.mask.szMask))
-                strcat(szBuffer, "\"");
-              strcat(szBuffer, ad.mask.szMask);
-              if (needs_quoting(ad.mask.szMask))
-                strcat(szBuffer, "\"");
+
+              BldQuotedFileName(szBuffer + strlen(szBuffer), ad.mask.szMask);
+              // if (needs_quoting(ad.mask.szMask))
+              //        strcat(szBuffer, "\"");
+              // strcat(szBuffer, ad.mask.szMask);
+              // if (needs_quoting(ad.mask.szMask))
+              //        strcat(szBuffer, "\"");
             }
             strcat(szBuffer, " ");
             x = 0;
+
+            // Run commands avoiding command line overflow
             while (li->list[x]) {
-              if (needs_quoting(li->list[x]))
-                strcat(szBuffer, "\"");
-              strcat(szBuffer, li->list[x]);
-              if (!IsFile(li->list[x])) {
-                if (szBuffer[strlen(szBuffer) - 1] != '\\')
-                  strcat(szBuffer, "\\");
-                strcat(szBuffer, "*");
-              }
-              if (needs_quoting(li->list[x]))
-                strcat(szBuffer, "\"");
+
+              if (IsFile(li->list[x]))
+                BldQuotedFileName(szBuffer + strlen(szBuffer), li->list[x]);
+              else
+                BldQuotedFullPathName(szBuffer + strlen(szBuffer), li->list[x], "*");
+
+              // if (needs_quoting(li->list[x]))
+              //        strcat(szBuffer, "\"");
+              // strcat(szBuffer, li->list[x]);
+              // if (!IsFile(li->list[x])) {
+              //        if (szBuffer[strlen(szBuffer) - 1] != '\\')
+              //          strcat(szBuffer, "\\");
+              //        strcat(szBuffer, "*");
+              // }
+              // if (needs_quoting(li->list[x]))
+              //        strcat(szBuffer, "\"");
+
               x++;
               if (!li->list[x] || strlen(szBuffer) +
@@ -1554 +1658 @@
               }
               strcat(szBuffer, " ");
-            }
+            } // while
+
             PostMsg(dcd->hwndCnr, UM_RESCAN, MPFROMSHORT(1), MPVOID);
             Broadcast(WinQueryAnchorBlock(hwnd),
@@ -1594 +1699 @@
             if (!li->list || !li->list[0])
               break;
-            if (li->type == IDM_DELETE)
-              sprintf(cl, "%s %s%s%s", dcd->info->delete,
-                      (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
-                      dcd->arcname,
-                      (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
-            else
-              sprintf(cl, "%s %s%s%s", dcd->info->create,
-                      (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
-                      dcd->arcname,
-                      (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
+            strcpy(cl, li->type == IDM_DELETE ?
+                         dcd->info->delete :
+                         dcd->info->create);
+            strcat(cl, " ");
+            BldQuotedFileName(cl + strlen(cl), dcd->arcname);
+            // if (li->type == IDM_DELETE)
+            //   sprintf(cl, "%s %s%s%s", dcd->info->delete,
+            //        (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+            //        dcd->arcname,
+            //        (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
+            // else
+            //   sprintf(cl, "%s %s%s%s", dcd->info->create,
+            //        (needs_quoting(dcd->arcname)) ? "\"" : NullStr,
+            //        dcd->arcname,
+            //        (needs_quoting(dcd->arcname)) ? "\"" : NullStr);
             endofit = &cl[strlen(cl)];
             z = 0;
@@ -1610 +1720 @@
                    strlen(cl) + strlen(li->list[x]) < 999; x++) {
                 strcat(cl, " ");
-                if (needs_quoting(li->list[x]))
-                  strcat(cl, "\"");
-                strcat(cl, li->list[x]);
-                if (needs_quoting(li->list[x]))
-                  strcat(cl, "\"");
+                BldQuotedFileName(cl + strlen(cl), li->list[x]);
+                // if (needs_quoting(li->list[x]))
+                //   strcat(cl, "\"");
+                // strcat(cl, li->list[x]);
+                // if (needs_quoting(li->list[x]))
+                //   strcat(cl, "\"");
               }
               z = x;
-              runemf2(SEPARATE | WINDOWED |
-                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                        WAIT,
+              runemf2(SEPARATE | WINDOWED | WAIT |
+                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
                       hwnd, NullStr, NULL, "%s", cl);
               *endofit = 0;
@@ -1670 +1780 @@
 
               for (x = 0; li->list[x]; x++) {
-                sprintf(fullname, "%s%s%s",
-                        li->targetpath,
-                        (li->targetpath[strlen(li->targetpath) - 1] == '\\') ?
-                        NullStr : "\\", li->list[x]);
+                BldFullPathName(fullname, li->targetpath, li->list[x]);
+                // sprintf(fullname, "%s%s%s",
+                //      li->targetpath,
+                //      (li->targetpath[strlen(li->targetpath) - 1] == '\\') ?
+                //      NullStr : "\\", li->list[x]);
                 if (IsFile(fullname) != -1) {
                   AddToList(li->list[x], &exfiles, &numfiles, &numalloc);
@@ -1708 +1819 @@
             if (!li->list || !li->list[0])
               break;
-            sprintf(cl, "%s %s%s%s", (li->type == IDM_EXTRACT ||
-                                      ((li->type == IDM_VIEW
-                                        || li->type == IDM_VIEWTEXT
-                                        || li->type == IDM_VIEWBINARY
-                                        || li->type == IDM_VIEWARCHIVE
-                                        || li->type == IDM_PRINT
-                                        || li->type == IDM_EDIT
-                                        || li->type == IDM_EDITTEXT
-                                        || li->type == IDM_EDITBINARY
-                                        && li->type == IDM_MCIPLAY)
-                                       && !li->info->exwdirs)) ? li->info->
-                    extract : li->info->exwdirs,
-                    needs_quoting(li->arcname) ? "\"" : NullStr,
-                    li->arcname,
-                    needs_quoting(li->arcname) ? "\"" : NullStr);
+            strcpy(cl,
+                   (li->type == IDM_EXTRACT ||
+                    ((li->type == IDM_VIEW ||
+                      li->type == IDM_VIEWTEXT ||
+                      li->type == IDM_VIEWBINARY ||
+                      li->type == IDM_VIEWARCHIVE ||
+                      li->type == IDM_PRINT ||
+                      li->type == IDM_EDIT ||
+                      li->type == IDM_EDITTEXT ||
+                      (li->type == IDM_EDITBINARY &&
+                       li->type == IDM_MCIPLAY)) &&
+                     !li->info->exwdirs)) ?
+                     li->info->extract :
+                     li->info->exwdirs);
+             strcat(cl, " ");
+             BldQuotedFileName(cl + strlen(cl), li->arcname);
+            // sprintf(cl, "%s %s%s%s", (li->type == IDM_EXTRACT ||
+            //                        ((li->type == IDM_VIEW
+            //                          || li->type == IDM_VIEWTEXT
+            //                          || li->type == IDM_VIEWBINARY
+            //                          || li->type == IDM_VIEWARCHIVE
+            //                          || li->type == IDM_PRINT
+            //                          || li->type == IDM_EDIT
+            //                          || li->type == IDM_EDITTEXT
+            //                          || li->type == IDM_EDITBINARY
+            //                          && li->type == IDM_MCIPLAY)
+            //                         && !li->info->exwdirs)) ? li->info->
+            //      extract : li->info->exwdirs,
+            //      needs_quoting(li->arcname) ? "\"" : NullStr,
+            //      li->arcname,
+            //      needs_quoting(li->arcname) ? "\"" : NullStr);
             endofit = &cl[strlen(cl)];
             z = 0;
@@ -1729 +1856 @@
                    strlen(cl) + strlen(li->list[x]) < 999; x++) {
                 strcat(cl, " ");
-                if (needs_quoting(li->list[x]))
-                  strcat(cl, "\"");
-                strcat(cl, li->list[x]);
-                if (needs_quoting(li->list[x]))
-                  strcat(cl, "\"");
+                BldQuotedFileName(cl + strlen(cl), li->list[x]);
+                // if (needs_quoting(li->list[x]))
+                //   strcat(cl, "\"");
+                // strcat(cl, li->list[x]);
+                // if (needs_quoting(li->list[x]))
+                //   strcat(cl, "\"");
                 ptr = li->list[x];
                 while (*ptr) {
@@ -1831 +1959 @@
                   }
                 }
-                sprintf(cl, "%s%s%s", li->targetpath,
-                        (li->targetpath[strlen(li->targetpath) - 1] == '\\') ?
-                        NullStr : "\\", li->list[x]);
+                BldFullPathName(cl, li->targetpath, li->list[x]);
+                // sprintf(cl, "%s%s%s", li->targetpath,
+                //      (li->targetpath[strlen(li->targetpath) - 1] == '\\') ?
+                //      NullStr : "\\", li->list[x]);
                 temp = li->list[x];
                 li->list[x] = xstrdup(cl, pszSrcFile, __LINE__);
@@ -1953 +2082 @@
                 p++;
               }
-              sprintf(fullname, "%s%s%s", dcd->directory,
-                      (dcd->directory[strlen(dcd->directory) - 1] == '\\') ?
-                      NullStr : "\\", li->list[x]);
+              BldFullPathName(fullname, dcd->directory, li->list[x]);
+              // sprintf(fullname, "%s%s%s", dcd->directory,
+              //              (dcd->directory[strlen(dcd->directory) - 1] == '\\') ?
+              //              NullStr : "\\", li->list[x]);
               if (IsFile(fullname) != -1)
                 if (AddToList(fullname, &list2, &numfiles, &numalloced))
@@ -1964 +2094 @@
                   p++;
                   if (*p) {
-                    sprintf(fullname, "%s%s%s", dcd->directory,
-                            (dcd->directory[strlen(dcd->directory) - 1] ==
-                               '\\') ? NullStr : "\\",
-                            p);
+                    BldFullPathName(fullname, dcd->directory, p);
+                    // sprintf(fullname, "%s%s%s", dcd->directory,
+                    //      (dcd->directory[strlen(dcd->directory) - 1] ==
+                    //         '\\') ? NullStr : "\\",
+                    //      p);
                     if (IsFile(fullname) != -1)
                       if (AddToList(fullname, &list2, &numfiles, &numalloced))
@@ -2029 +2160 @@
 {
   DIRCNRDATA *dcd = INSTDATA(hwnd);
+  CHAR szQuotedArcName[CCHMAXPATH];
 
   switch (msg) {
@@ -2805 +2937 @@
           runemf2(SEPARATE | WINDOWED |
                     (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                  hwnd, dcd->directory, NULL, "%s %s%s%s",
+                  hwnd, dcd->directory, NULL, "%s %s",
                   dcd->info->extract,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                  dcd->arcname,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
+                  BldQuotedFileName(szQuotedArcName, dcd->arcname));
+          // runemf2(SEPARATE | WINDOWED |
+          //        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+          //      hwnd, dcd->directory, NULL, "%s %s%s%s",
+          //      dcd->info->extract,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+          //      dcd->arcname,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr);
         if (SHORT1FROMMP(mp1) == IDM_ARCEXTRACTEXIT)
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2819 +2956 @@
           runemf2(SEPARATE | WINDOWED |
                     (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                  hwnd, dcd->directory, NULL, "%s %s%s%s",
+                  hwnd, dcd->directory, NULL,
+                  "%s %s",
                   dcd->info->exwdirs,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                  dcd->arcname,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
+                  BldQuotedFileName(szQuotedArcName, dcd->arcname));
+          // runemf2(SEPARATE | WINDOWED |
+          //        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+          //      hwnd, dcd->directory, NULL, "%s %s%s%s",
+          //      dcd->info->exwdirs,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+          //      dcd->arcname,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr);
         if (SHORT1FROMMP(mp1) == IDM_ARCEXTRACTWDIRSEXIT)
           PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
@@ -2891 +3034 @@
         if (dcd->info->test)
           runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
-                  hwnd, NULL, NULL, "%s %s%s%s", dcd->info->test,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr,
-                  dcd->arcname,
-                  needs_quoting(dcd->arcname) ? "\"" : NullStr);
+                  hwnd, NULL, NULL,
+                  "%s %s",dcd->info->test,
+                  BldQuotedFileName(szQuotedArcName, dcd->arcname));
+          // runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
+          //      hwnd, NULL, NULL, "%s %s%s%s",dcd->info->test,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr,
+          //      dcd->arcname,
+          //      needs_quoting(dcd->arcname) ? "\"" : NullStr);
         break;
 
@@ -2926 +3073 @@
 
               for (x = 0; li->list && li->list[x]; x++) {
-                sprintf(s, "%s%s%s", dcd->workdir,
-                        (dcd->workdir[strlen(dcd->workdir) - 1] == '\\') ?
-                        NullStr : "\\", li->list[x]);
+                BldFullPathName(s, dcd->workdir, li->list[x]);
+                // sprintf(s, "%s%s%s", dcd->workdir,
+                //      (dcd->workdir[strlen(dcd->workdir) - 1] == '\\') ?
+                //      NullStr : "\\", li->list[x]);
                 if (IsFile(s) != 1) {
                   free(li->list[x]);
@@ -3048 +3196 @@
         if (mp2) {
 
-          PDRAGITEM pDItem;     /* Pointer to DRAGITEM */
-          PDRAGINFO pDInfo;     /* Pointer to DRAGINFO */
+          PDRAGITEM pDItem;             /* Pointer to DRAGITEM */
+          PDRAGINFO pDInfo;             /* Pointer to DRAGINFO */
           PARCITEM pci;
 
@@ -3073 +3221 @@
                            DRM_OS2FILE, /* mechanisms and data */
                            NULL) && !(pDItem->fsControl & DC_PREPARE)) {
-            DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO         */
+            DrgFreeDraginfo(pDInfo);    /* Free DRAGINFO */
             return MRFROM2SHORT(DOR_DROP,       /* Return okay to drop */
                                 fCopyDefault ? DO_COPY : DO_MOVE);

trunk/dll/autoview.c

@@ -351 +351 @@
                       if (info) {
                         sprintf(p, "**%s%s%s\n",
-                                (info->id) ? info->id : "",
-                                (info->id) ? " " : "",
+                                info->id ? info->id : "",
+                                info->id ? " " : "",
                                 GetPString(IDS_ARCHIVETEXT));
                         p += strlen(p);
@@ -412 +412 @@
 
             static FILEFINDBUF4 ffb[130];
-            CHAR fullname[CCHMAXPATH + 4];
-            PSZ pszFullName = fullname, pszCurrFile = currfile, psz;
+            CHAR fullname[CCHMAXPATH + 4];
             HDIR hdir = HDIR_CREATE;
             ULONG x, nm, ml, mc, bufflen;
             PBYTE fb;
             PFILEFINDBUF4 pffbFile;
-            CHAR *buff, *p = "*";
-            APIRET rc;
-
-            psz = p;
-            BldFullPathName(pszFullName, pszCurrFile, psz);
-            *p = 0;
+            PSZ pszBuf;
+            PSZ p;
+            APIRET rc;
+
+            BldFullPathName(fullname, currfile, "*");
             //sprintf(fullname,
             //        "%s%s*",
@@ -452 +450 @@
               }
               bufflen = (CCHMAXPATHCOMP + 42) * nm;
-              buff = xmalloc(bufflen, pszSrcFile, __LINE__);
-              if (buff) {
-                p = buff;
+              pszBuf = xmalloc(bufflen, pszSrcFile, __LINE__);
+              if (pszBuf) {
+                p = pszBuf;
                 *p = 0;
                 fb = (PBYTE) & ffb;
@@ -497 +495 @@
                   x++;
                 }                       // while
-                if (p - buff >= bufflen)
+                if (p - pszBuf >= bufflen)
                   Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
-                if (*buff)
-                  WinSetWindowText(hwndAutoview, buff);
-                free(buff);
+                if (*pszBuf)
+                  WinSetWindowText(hwndAutoview, pszBuf);
+                free(pszBuf);
               }
             }
@@ -516 +514 @@
           PGEA2 pgea;
           PFEA2 pfea;
-          CHAR *value, *buff, *p, *data;
+          CHAR *value, *pszBuf, *p, *data;
           USHORT len, type, plen, dlen;
           BOOL readonly = FALSE;
@@ -542 +540 @@
                   value[pfea->cbValue] = 0;
                   if (*(USHORT *) value == EAT_MVMT) {
-                    buff = xmalloc(65536, pszSrcFile, __LINE__);
-                    if (buff) {
-                      p = buff;
-                      *buff = 0;
+                    pszBuf = xmalloc(65536, pszSrcFile, __LINE__);
+                    if (pszBuf) {
+                      p = pszBuf;
+                      *pszBuf = 0;
                       data = value + (sizeof(USHORT) * 3);
                       type = *(USHORT *) data;
@@ -579 +577 @@
                         data += sizeof(USHORT);
                       }                 // while
-                      if (p - buff >= 65536) {
+                      if (p - pszBuf >= 65536) {
                         Runtime_Error(pszSrcFile, __LINE__, pszBufOvfMsg);
-                        buff[65535] = 0;        // Try to stay alive
+                        pszBuf[65535] = 0;      // Try to stay alive
                         break;
                       }
-                      WinSetWindowText(hwndAutoMLE, buff);
-                      free(buff);
+                      WinSetWindowText(hwndAutoMLE, pszBuf);
+                      free(pszBuf);
                     }
                   }

trunk/dll/comp.c

@@ -28 +28 @@
   01 Aug 07 SHL Rework to remove vast amount of duplicate code
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  06 Aug 07 SHL Move BldFullPathName here to be near primary caller
+  07 Aug 07 SHL COMP_COLLECT: Avoid collecting empty entries when nothing selected
 
 ***********************************************************************/
@@ -49 +51 @@
 #include "fm3str.h"
 
-#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames)
+#pragma alloc_text(COMPAREDIR,FillCnrsThread,FillDirList,CompNames,BldFullPathName)
 #pragma alloc_text(COMPAREDIR1,CompareDlgProc)
 #pragma alloc_text(COMPAREDIR2,SelectCnrsThread,ActionCnrThread)
@@ -64 +66 @@
 
 static PSZ pszSrcFile = __FILE__;
+
+/**
+ * Build full path name in callers buffer given directory
+ * name and filename
+ * @param pszPathName points to drive/directory if not NULL
+ * @returns pointer to full path name in caller's buffer
+ * @note OK for pszFullPathName and pszPathName to point to same buffer
+ *
+ */
+
+PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
+{
+  UINT c = pszPathName ? strlen(pszPathName) : 0;
+  if (c > 0) {
+    memcpy(pszFullPathName, pszPathName, c);
+    if (pszFullPathName[c - 1] != '\\')
+      pszFullPathName[c++] = '\\';
+  }
+  strcpy(pszFullPathName + c, pszFileName);
+  return pszFullPathName;
+}
 
 //=== SnapShot() Write directory tree to file and recurse if requested ===
@@ -361 +384 @@
 
   if (!cmp) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     return;
   }
@@ -458 +481 @@
           case IDM_MOVE:
             if (hwndCnrS == WinWindowFromID(cmp->hwnd, COMP_RIGHTDIR))
-              // 02 Aug 07 SHL fixme to replace this kind of stuff with _makepath or equivalent
               BldFullPathName(szNewName, cmp->leftdir, pci->pszDisplayName);
               //sprintf(szNewName, "%s%s%s",
@@ -716 +738 @@
 
   if (!str || !*str) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     return;
   }
@@ -818 +840 @@
 
   if (!cmp) {
-    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
     _endthread();
   }
@@ -1136 +1158 @@
           if (x >= 0) {
             // File appears on right side
-            BldFullPathName(szBuf, cmp->rightdir, filesl[r]->fname);
+            BldFullPathName(szBuf, cmp->rightdir, filesr[r]->fname);
             //sprintf(szBuf, "%s%s%s", cmp->rightdir,
             //        (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
@@ -1360 +1382 @@
 }
 
-#define hwndLeft  (WinWindowFromID(hwnd,COMP_LEFTDIR))
-#define hwndRight (WinWindowFromID(hwnd,COMP_RIGHTDIR))
+// fixme to be gone - use variable
+#define hwndLeft        (WinWindowFromID(hwnd,COMP_LEFTDIR))
+#define hwndRight       (WinWindowFromID(hwnd,COMP_RIGHTDIR))
 
 //=== CompareDlgProc() Compare directories dialog procedure ===
@@ -1368 +1391 @@
 {
   COMPARE *cmp;
-
-  static HPOINTER hptr = (HPOINTER) 0;
+  BOOL temp;
+
+  static HPOINTER hptr;
 
   switch (msg) {
@@ -2376 +2400 @@
     case COMP_COLLECT:
       cmp = INSTDATA(hwnd);
-      if (cmp) {
-
-        CHAR **listl, **listr = NULL;
-
+      if (!cmp)
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
+      else {
+        CHAR **listl;
+        CHAR **listr = NULL;
         if (!Collector) {
-
           SWP swp;
           HWND hwndC;
-
-          if (!fAutoTile && !ParentIsDesktop(hwnd, cmp->hwndParent) &&
-              (!fExternalCollector && !strcmp(realappname, FM3Str)))
+          if (!fAutoTile &&
+               !ParentIsDesktop(hwnd, cmp->hwndParent) &&
+               !fExternalCollector &&
+               !strcmp(realappname, FM3Str)) {
             GetNextWindowPos(cmp->hwndParent, &swp, NULL, NULL);
-          hwndC = StartCollector((fExternalCollector ||
-                                  strcmp(realappname, FM3Str)) ?
-                                 HWND_DESKTOP : cmp->hwndParent, 4);
+          }
+          hwndC = StartCollector(fExternalCollector ||
+                                 strcmp(realappname, FM3Str) ?
+                                   HWND_DESKTOP :
+                                   cmp->hwndParent,
+                                 4);
           if (hwndC) {
-            if (!fAutoTile && !ParentIsDesktop(hwnd, cmp->hwndParent) &&
-                (!fExternalCollector && !strcmp(realappname, FM3Str)))
-              WinSetWindowPos(hwndC, HWND_TOP, swp.x, swp.y,
-                              swp.cx, swp.cy, SWP_MOVE | SWP_SIZE |
-                              SWP_SHOW | SWP_ZORDER);
-            else if (!ParentIsDesktop(hwnd, cmp->hwndParent) && fAutoTile &&
-                     !strcmp(realappname, FM3Str))
+            if (!fAutoTile &&
+                !ParentIsDesktop(hwnd, cmp->hwndParent) &&
+                !fExternalCollector &&
+                !strcmp(realappname, FM3Str)) {
+              WinSetWindowPos(hwndC, HWND_TOP,
+                              swp.x, swp.y, swp.cx, swp.cy,
+                              SWP_MOVE | SWP_SIZE | SWP_SHOW | SWP_ZORDER);
+            }
+            else if (!ParentIsDesktop(hwnd, cmp->hwndParent) &&
+                     fAutoTile &&
+                     !strcmp(realappname, FM3Str)) {
               TileChildren(cmp->hwndParent, TRUE);
-            DosSleep(32); //05 Aug 07 GKY 64
+            }
+            DosSleep(32); // 05 Aug 07 GKY 64
             PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(COMP_COLLECT, 0), MPVOID);
             break;
@@ -2407 +2440 @@
         else
           StartCollector(cmp->hwndParent, 4);
-        {
-          BOOL temp;
-
-          temp = fSelectedAlways;
-          fSelectedAlways = TRUE;
-          listl = BuildList(hwndLeft);
-          if (!*cmp->rightlist)
-            listr = BuildList(hwndRight);
-          fSelectedAlways = temp;
-        }
+
+        temp = fSelectedAlways;
+        fSelectedAlways = TRUE;
+        listl = BuildList(hwndLeft);
+        if (!*cmp->rightlist)
+          listr = BuildList(hwndRight);
+        fSelectedAlways = temp;
+
         if (listl || listr) {
           if (Collector) {
-            if (listl) {
-              if (!PostMsg(Collector, WM_COMMAND,
-                           MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listl)))
-                FreeList(listl);
-            }
-            if (listr) {
-              if (!PostMsg(Collector, WM_COMMAND,
-                           MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listr)))
-                FreeList(listr);
+            // 07 Aug 07 SHL Avoid collected from empty list
+            if (listl && listl[0] && *listl[0]) {
+              if (PostMsg(Collector, WM_COMMAND,
+                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listl)))
+                listl = NULL;           // Collector will free
+            }
+            if (listr && listr[0] && *listr[0]) {
+              if (PostMsg(Collector, WM_COMMAND,
+                          MPFROM2SHORT(IDM_COLLECTOR, 0), MPFROMP(listr)))
+                listr = NULL;           // Collector will free
             }
             WinSetWindowPos(WinQueryWindow(WinQueryWindow(Collector,
                                                           QW_PARENT),
-                                           QW_PARENT), HWND_TOP, 0, 0, 0, 0,
+                                           QW_PARENT),
+                            HWND_TOP, 0, 0, 0, 0,
                             SWP_ACTIVATE);
           }
-          else {
-            FreeList(listl);
-            FreeList(listr);
-          }
+          FreeList(listl);
+          FreeList(listr);
         }
       }

trunk/dll/filldir.c

@@ -60 +60 @@
 
 static PSZ pszSrcFile = __FILE__;
-extern BOOL needs_quoting(PSZ psz);
 
 #pragma alloc_text(FILLDIR,FillInRecordFromFFB,FillInRecordFromFSA,IDFile)
 #pragma alloc_text(FILLDIR1,ProcessDirectory,FillDirCnr,FillTreeCnr,FileAttrToString)
-#pragma alloc_text(BldFullPathName, BldQuotedFullPathName, BldQuotedFileName)
 #pragma alloc_text(EMPTYCNR,EmptyCnr,FreeCnrItemData,FreeCnrItem,FreeCnrItemList,RemoveCnrItems)
-
-/**
- * Build full path name in callers buffer given directory
- * name and filename
- * @returns pointer to full path name in caller's buffer
- *
- */
-
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
-{
-  UINT c = strlen(pszPathName);
-  if (c > 0) {
-    memcpy(pszFullPathName, pszPathName, c);
-    if (pszFullPathName[c - 1] != '\\')
-      pszFullPathName[c++] = '\\';
-  }
-  strcpy(pszFullPathName + c, pszFileName);
-  return pszFullPathName;
-}
-
-/**
- * Build quoted full path name in callers buffer given
- * directory name and filename
- * @returns pointer to quoted path name in caller's buffer
- *
- */
-
-PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName)
-{
-  UINT c = strlen(pszPathName);
-  BOOL q = needs_quoting(pszPathName) ||
-           needs_quoting(pszFileName);
-  PSZ psz = pszFullPathName;
-
-  if (q)
-    *psz++ = '"';
-  if (c > 0) {
-    memcpy(pszFullPathName, pszPathName, c);
-    if (pszFullPathName[c - 1] != '\\')
-      pszFullPathName[c++] = '\\';
-  }
-  strcpy(pszFullPathName + c, pszFileName);
-  if (q) {
-    *psz++ = '"';
-    *psz = 0;
-  }
-  return pszFullPathName;
-}
-
-
-/**
- * Build quoted full path name in callers buffer given a filename
- * @returns pointer to quoted file name in caller's buffer
- *
- */
-
-PSZ BldQuotedFileName(PSZ pszQuotedFileName, PSZ pszFileName)
-{
-  BOOL q = needs_quoting(pszFileName);
-  PSZ psz = pszQuotedFileName;
-
-  if (q)
-    *psz++ = '"';
-  strcpy(psz, pszFileName);
-  if (q) {
-    psz += strlen(psz);
-    *psz++ = '"';
-    *psz = 0;
-  }
-  return pszQuotedFileName;
-}
 
 /**
@@ -324 +251 @@
    */
   if (!*pffb->achName) {
-    // pci->pszFileName = xstrdup(pszDirectory, pszSrcFile, __LINE__);
-    pci->pszFileName = pci->szFileName;
+    pci->pszFileName = xstrdup(pszDirectory, pszSrcFile, __LINE__);
     strcpy(pci->pszFileName, pszDirectory);
   }
@@ -333 +259 @@
     if (pszDirectory[c - 1] != '\\')
       c2++;
-    // pci->pszFileName = xmalloc(c + c2, pszSrcFile, __LINE__);
-    pci->pszFileName = pci->szFileName;
+    pci->pszFileName = xmalloc(c + c2, pszSrcFile, __LINE__);
     memcpy(pci->pszFileName, pszDirectory, c + 1);
     p = pci->pszFileName + c - 1;
@@ -560 +485 @@
 
   pci->hwndCnr = hwndCnr;
-  // pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
-  pci->pszFileName = pci->szFileName;
+  pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   strcpy(pci->pszFileName, pszFileName);
 
@@ -1260 +1184 @@
               }
               sprintf(suggest + strlen(suggest), "%c" , toupper(*szDrive));
-              // pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-              pci->pszFileName = pci->szFileName;
+              pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
               strcpy(pci->pszFileName, szDrive);
               pci->pszDisplayName = pci->pszFileName;
@@ -1274 +1197 @@
           else {
             // Removable volume
-            // pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-            pci->pszFileName = pci->szFileName;
+            pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
             strcpy(pci->pszFileName, szDrive);
             pci->pszDisplayName = pci->pszFileName;
@@ -1286 +1208 @@
         else {
           pci->rc.hptrIcon = hptrDunno;
-          // pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-          pci->pszFileName = pci->szFileName;
+          pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
           strcpy(pci->pszFileName, szDrive);
           pci->pszDisplayName = pci->pszFileName;
@@ -1299 +1220 @@
         // diskette drive (A or B)
         pci->rc.hptrIcon = hptrFloppy;
-        // pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
-        pci->pszFileName = pci->szFileName;
+        pci->pszFileName = xstrdup(szDrive, pszSrcFile, __LINE__);
         strcpy(pci->pszFileName, szDrive);
         pci->pszDisplayName = pci->pszFileName;
@@ -1372 +1292 @@
     if (pciParent) {
       pciParent->flags |= RECFLAGS_ENV;
-      // pciParent->pszFileName = xstrdup(GetPString(IDS_ENVVARSTEXT), pszSrcFile, __LINE__);
-      pciParent->pszFileName = pciParent->szFileName;
+      pciParent->pszFileName = xstrdup(GetPString(IDS_ENVVARSTEXT), pszSrcFile, __LINE__);
       strcpy(pciParent->pszFileName, GetPString(IDS_ENVVARSTEXT));
       pciParent->pszDisplayName = pciParent->pszFileName;       // 03 Aug 07 SHL
@@ -1661 +1580 @@
   if (!WinSendMsg(hwnd, CM_FREERECORD, MPFROMP(&pci), MPFROMSHORT(1))) {
     // Win_Error2(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,IDS_CMFREEERRTEXT);
-    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,"CM_FREERECORD hwnd %x pci %p", hwnd, pci);
+    Win_Error(hwnd, HWND_DESKTOP, pszSrcFile, __LINE__,
+              "CM_FREERECORD hwnd %x pci %p file %s",
+              hwnd, pci,
+              pci && pci->pszFileName ? pci->pszFileName : "n/a");
   }
 }

trunk/dll/fm3dll.h

@@ -425 +425 @@
   ULONG attrFile;               /* Attributes of this file */
   ULONG flags;
-  CHAR szFileName[CCHMAXPATH];  // Full path name - fixed size for speed
 }
 CNRITEM, *PCNRITEM;
@@ -624 +623 @@
 
 /* filldir.c */
-PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
-PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
-PSZ BldQuotedFileName(PSZ pszQuotedFileName, PSZ pszFileName);
 VOID EmptyCnr(HWND hwnd);
 const PSZ FileAttrToString(ULONG fileAttr);
@@ -900 +896 @@
 HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
           PROGTYPE * progt, ULONG fl, char *formatstring, ...);
+#define RUNTYPE_MASK  0xf
 #define SYNCHRONOUS   1
 #define ASYNCHRONOUS  2
@@ -1064 +1061 @@
 MRESULT EXPENTRY ArcFolderProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 MRESULT EXPENTRY ArcObjWndProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
+PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
+PSZ BldQuotedFileName(PSZ pszQuotedFileName, PSZ pszFileName);
 
 /* assoc.c */
@@ -1117 +1116 @@
 
 /* comp.c */
+PSZ BldFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
 MRESULT EXPENTRY CFileDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 MRESULT EXPENTRY CompareDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);

trunk/dll/mainwnd.c

@@ -35 +35 @@
   12 May 07 SHL Use dcd->ulItemsToUnHilite
   10 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit
+  07 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -1810 +1811 @@
       li = DoFileDrop(hwnd,
                       NULL,
-                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
+                      TRUE, MPFROM2SHORT(TREE_CNR, CN_DROP), MPFROMP(&cnd));
       CheckPmDrgLimit(cnd.pDragInfo);
       if (li) {
@@ -4109 +4110 @@
         else {
 
-          CHAR d1[] = "\"";
-          CHAR d2[] = "\"";
-
-          if (!needs_quoting(wa.szCurrentPath1))
-            *d1 = 0;
-          if (!needs_quoting(wa.szCurrentPath2))
-            *d2 = 0;
+          CHAR szPath1[CCHMAXPATH];
+          CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP,
-                  NULL,
-                  NULL,
-                  "%s %s%s%s %s%s%s",
+                  HWND_DESKTOP, NULL, NULL,
+                  "%s %s %s",
                   dircompare,
-                  d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
+                  BldQuotedFileName(szPath1, wa.szCurrentPath1),
+                  BldQuotedFileName(szPath2, wa.szCurrentPath2));
+          // CHAR d1[] = "\"";
+          // CHAR d2[] = "\"";
+          // if (!needs_quoting(wa.szCurrentPath1))
+          //   *d1 = 0;
+          // if (!needs_quoting(wa.szCurrentPath2))
+          //   *d2 = 0;
+          // runemf2(SEPARATE,
+          //      HWND_DESKTOP, NULL, NULL,
+          //      "%s %s%s%s %s%s%s",
+          //      dircompare,
+          //      d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
         }
       }
@@ -4818 +4824 @@
             DIRCNRDATA *dcd = NULL;
 
-            // 12 May 07 SHL fixme to understand?  backwards maybe? looking for DIR_CNR?
+            // 12 May 07 SHL fixme to understand? backwards maybe? looking for DIR_CNR?
             if (WinQueryWindowUShort(hwndCnr, QWS_ID) != TREE_CNR)
               dcd = INSTDATA(hwndCnr);

trunk/dll/mainwnd2.c

@@ -17 +17 @@
   30 Mar 07 GKY Remove GetPString for window class names
   12 May 07 SHL Pass ulItemsToUnHilite to UnHilite
+  07 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -124 +125 @@
       /*
        * Calculate the position of the client rectangle.
-       * Otherwise,  we'll see a lot of redraw when we move the
+       * Otherwise, we'll see a lot of redraw when we move the
        * client during WM_FORMATFRAME.
        */
@@ -498 +499 @@
         }
         else {
-
-          CHAR *d1 = "\"", *d2 = "\"";
-
-          if (!needs_quoting(wa.szCurrentPath1))
-            *d1 = 0;
-          if (!needs_quoting(wa.szCurrentPath2))
-            *d2 = 0;
+          CHAR szPath1[CCHMAXPATH];
+          CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP,
-                  NULL,
-                  NULL,
-                  "%s %s%s%s %s%s%s",
+                  HWND_DESKTOP, NULL, NULL,
+                  "%s %s %s",
                   dircompare,
-                  d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
+                  BldQuotedFileName(szPath1, wa.szCurrentPath1),
+                  BldQuotedFileName(szPath2, wa.szCurrentPath2));
+          // CHAR *d1 = "\"", *d2 = "\"";
+          // if (!needs_quoting(wa.szCurrentPath1))
+          //   *d1 = 0;
+          // if (!needs_quoting(wa.szCurrentPath2))
+          //   *d2 = 0;
+          // runemf2(SEPARATE,
+          //      HWND_DESKTOP,
+          //      NULL,
+          //      NULL,
+          //      "%s %s%s%s %s%s%s",
+          //      dircompare,
+          //      d1, wa.szCurrentPath1, d1, d2, wa.szCurrentPath2, d2);
         }
       }

trunk/dll/makelist.c

@@ -146 +146 @@
 }
 
+/**
+ * Add string to string list
+ * Enlarges as needed
+ * Ensures 2 NULL end markers exist
+ */
+
 INT AddToList(CHAR * string, CHAR *** list, INT * numfiles, INT * numalloced)
 {
@@ -169 +175 @@
     }
     (*list)[*numfiles] = psz;
-    strcpy((*list)[*numfiles], string);
+    strcpy((*list)[*numfiles], string); // Add entry
     (*numfiles)++;
-    (*list)[*numfiles] = NULL;
-    (*list)[(*numfiles) + 1] = NULL;
+    (*list)[*numfiles] = NULL;          // Add end marker
+    (*list)[(*numfiles) + 1] = NULL;    // Add 2nd end marker - fixme to know why?
 #ifdef __DEBUG_ALLOC__
     _heap_check();
@@ -207 +213 @@
     else
       list = test;
-  }
+  } // while
   return list;
 }

trunk/dll/misc.c

@@ -28 +28 @@
   31 Jul 07 SHL Clean up and report errors (ticket#24)
   03 Aug 07 GKY Direct editting fixed (ticket#24)
+  06 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -922 +923 @@
     *path = 0;
   *cl = 0;
-  if (needs_quoting(filename))
-    strcat(cl, "\"");
-  strcat(cl, filename);
-  if (needs_quoting(filename))
-    strcat(cl, "\"");
+  BldQuotedFileName(cl, filename);
+  // *cl = 0;
+  // if (needs_quoting(filename))
+  //   strcat(cl, "\"");
+  // strcat(cl, filename);
+  // if (needs_quoting(filename))
+  //   strcat(cl, "\"");
   memset(&ex, 0, sizeof(ex));
   ex.flags = lastflags;

trunk/dll/seeall.c

@@ -23 +23 @@
   30 Mar 07 GKY Remove GetPString for window class names
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
+  07 Aug 07 SHL Use BldQuotedFullPathName and BldQuotedFileName
 
 ***********************************************************************/
@@ -465 +466 @@
           x = 0;
           while (list[x]) {
-
             FILESTATUS3 fsa;
-            BOOL spaces;
-
-            if (needs_quoting(list[x])) {
-              spaces = TRUE;
-              strcat(szBuffer, "\"");
-            }
-            else
-              spaces = FALSE;
-            strcat(szBuffer, list[x]);
+            // BOOL spaces;
+            // if (needs_quoting(list[x])) {
+            //   spaces = TRUE;
+            //   strcat(szBuffer, "\"");
+            // }
+            // else
+            //   spaces = FALSE;
+            // strcat(szBuffer, list[x]);
             memset(&fsa, 0, sizeof(fsa));
             DosError(FERR_DISABLEHARDERR);
-            DosQueryPathInfo(list[x], FIL_STANDARD,
-                             &fsa, (ULONG) sizeof(fsa));
+            DosQueryPathInfo(list[x], FIL_STANDARD, &fsa, sizeof(fsa));
             if (fsa.attrFile & FILE_DIRECTORY) {
-              if (szBuffer[strlen(szBuffer) - 1] != '\\')
-                strcat(szBuffer, "\\");
-              strcat(szBuffer, "*");
-            }
-            if (spaces)
-              strcat(szBuffer, "\"");
+              BldQuotedFullPathName(szBuffer + strlen(szBuffer),
+                                    list[x], "*");
+              // if (szBuffer[strlen(szBuffer) - 1] != '\\')
+              //        strcat(szBuffer, "\\");
+              // strcat(szBuffer, "*");
+            }
+            else
+              BldQuotedFileName(szBuffer + strlen(szBuffer), list[x]);
+            // if (spaces)
+            //   strcat(szBuffer, "\"");
             x++;
             if (!list[x] || strlen(szBuffer) + strlen(list[x]) + 5 > 1024) {
-              runemf2(SEPARATE | WINDOWED |
-                      ((fArcStuffVisible) ? 0 :
-                       (BACKGROUND | MINIMIZED)) |
-                      WAIT, HWND_DESKTOP, NULL, NULL, "%s", szBuffer);
+              runemf2(SEPARATE | WINDOWED | WAIT |
+                      (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
+                      HWND_DESKTOP, NULL, NULL,
+                      "%s", szBuffer);
               DosSleep(1);
               *p = 0;
@@ -829 +831 @@
               maskspaces = TRUE;
             runemf2(SEPARATE | WINDOWED |
-                    ((fArcStuffVisible) ? 0 :
-                     (BACKGROUND | MINIMIZED)),
-                    HWND_DESKTOP,
-                    ex.extractdir,
-                    NULL,
+                    (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
+                    HWND_DESKTOP, ex.extractdir, NULL,
                     "%s %s %s%s%s",
                     ex.command,
                     ex.arcname,
-                    (maskspaces) ? "\"" : NullStr,
-                    (*ex.masks) ? ex.masks : "*",
-                    (maskspaces) ? "\"" : NullStr);
+                    maskspaces ? "\"" : NullStr,
+                    *ex.masks ? ex.masks : "*",
+                    maskspaces ? "\"" : NullStr);
           }
         }
@@ -3012 +3011 @@
       list = BuildAList(hwnd);
       if (!list)
-        Runtime_Error(pszSrcFile, __LINE__, "no data");
+        Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
       else {
         WinSetWindowText(pAD->hwndStatus, GetPString(IDS_DRAGGINGFILESTEXT));
@@ -4105 +4104 @@
 
             if (!list)
-              Runtime_Error(pszSrcFile, __LINE__, "no data");
+              Runtime_Error2(pszSrcFile, __LINE__, IDS_NODATATEXT);
             else {
               switch (SHORT1FROMMP(mp1)) {

trunk/dll/shadow.c

@@ -11 +11 @@
   22 Jul 06 SHL Check more run time errors
   16 Jun 07 SHL Update for OpenWatcom
+  06 Aug 07 SHL Use BldFullPathName
 
 ***********************************************************************/
@@ -70 +71 @@
   if (!cnr)
     return obj;
-  sprintf(s, "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
+  BldFullPathName(s, path, objtitle);
+  // sprintf(s, "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
   p = strrchr(objtitle, '.');
   if (p) {
@@ -132 +134 @@
       CHAR *p, temp[CCHMAXPATH + 1];
 
-      sprintf(temp,
-              "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
+      BldFullPathName(temp, path, objtitle);
+      // sprintf(temp,
+      //              "%s%s%s", (path) ? path : "", (path) ? "\\" : "", objtitle);
       p = strrchr(temp, '.');
       if (p) {

trunk/dll/systemf.c

@@ -731 +731 @@
     }
 
-    if ((type & 15) == SYNCHRONOUS ||
-        (type & 15) == ASYNCHRONOUS ||
-        (type & 15) == DETACHED)
+    if ((type & RUNTYPE_MASK) == SYNCHRONOUS ||
+        (type & RUNTYPE_MASK) == ASYNCHRONOUS ||
+        (type & RUNTYPE_MASK) == DETACHED)
     {
       strip_lead_char(" \t", pszPgm);
@@ -826 +826 @@
         }
         ret = DosExecPgm(szObject, sizeof(szObject),
-                         ((type & 15) == ASYNCHRONOUS ?  EXEC_ASYNC : 0) +
-                         ((type & 15) == DETACHED ? EXEC_BACKGROUND : 0),
+                         ((type & RUNTYPE_MASK) == ASYNCHRONOUS ?  EXEC_ASYNC : 0) +
+                         ((type & RUNTYPE_MASK) == DETACHED ? EXEC_BACKGROUND : 0),
                          pszPgm, pszEnvironment, &results, pszPgm);
         if (pszDirectory && *pszDirectory)
@@ -1068 +1068 @@
       sdata.ObjectBuffer = szObject;
       sdata.ObjectBuffLen = sizeof(szObject);
-      if ((type & 15) == SEPARATEKEEP)
+      if ((type & RUNTYPE_MASK) == SEPARATEKEEP)
         sdata.PgmControl |= SSF_CONTROL_NOAUTOCLOSE;
       if (type & MAXIMIZED)

trunk/dll/worker.c

@@ -20 +20 @@
   21 Apr 07 GKY Find FM2Utils by path or utils directory
   16 Jun 07 SHL Update for OpenWatcom
+  07 Aug 07 SHL Use BldQuotedFileName
 
 ***********************************************************************/
@@ -110 +111 @@
 VOID Action(VOID * args)
 {
-  WORKER *wk = (WORKER *) args;
+  WORKER *wk = (WORKER *)args;
   HAB hab2;
   HMQ hmq2;
@@ -116 +117 @@
   INT numfiles = 0, numalloc = 0, plen = 0;
   CHAR *p, *pp;
+  CHAR szQuotedDirName[CCHMAXPATH];
+  CHAR szQuotedFileName[CCHMAXPATH];
 
   if (wk) {
@@ -407 +410 @@
                     maskspaces = TRUE;
                   if (!runemf2(SEPARATE | WINDOWED |
-                               ((fArcStuffVisible) ? 0 :
-                                (BACKGROUND | MINIMIZED)),
-                               HWND_DESKTOP,
-                               ex.extractdir,
-                               NULL,
+                               fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED),
+                               HWND_DESKTOP, ex.extractdir, NULL,
                                "%s %s %s%s%s",
                                ex.command,
                                ex.arcname,
-                               (maskspaces) ? "\"" : NullStr,
-                               (*ex.masks) ? ex.masks : "*",
-                               (maskspaces) ? "\"" : NullStr) &&
+                               maskspaces ? "\"" : NullStr,
+                               *ex.masks ? ex.masks : "*",
+                               maskspaces ? "\"" : NullStr) &&
                       !stricmp(ex.extractdir, wk->directory)) {
                     if (WinIsWindow(hab2, wk->hwndCnr))
@@ -855 +855 @@
                                MPFROMP(wk->li->list[x]));
                   else {
-                    CHAR d1[] = "\"";
-                    CHAR d2[] = "\"";
-
-                    if (!needs_quoting(wk->li->targetpath))
-                      *d1 = 0;
-                    if (!needs_quoting(wk->li->list[x]))
-                      *d2 = 0;
                     runemf2(SEPARATE,
-                            HWND_DESKTOP,
-                            NULL,
-                            NULL,
-                            "%s %s%s%s %s%s%s",
+                            HWND_DESKTOP, NULL, NULL,
+                            "%s %s %s",
                             dircompare,
-                            d1,
-                            wk->li->targetpath, d1, d2, wk->li->list[x], d2);
+                            BldQuotedFileName(szQuotedDirName, wk->li->targetpath),
+                            BldQuotedFileName(szQuotedFileName, wk->li->list[x]));
+                    // CHAR d1[] = "\"";
+                    // CHAR d2[] = "\"";
+                    // if (!needs_quoting(wk->li->targetpath))
+                    //   *d1 = 0;
+                    // if (!needs_quoting(wk->li->list[x]))
+                    //   *d2 = 0;
+                    // runemf2(SEPARATE,
+                    //      HWND_DESKTOP, NULL, NULL,
+                    //      "%s %s%s%s %s%s%s",
+                    //      dircompare,
+                    //      d1, wk->li->targetpath, d1,
+                    //      d2, wk->li->list[x], d2);
                   }
                 }
@@ -1076 +1079 @@
                        wk->li->info->exwdirs : wk->li->info->extract);
                 strcat(szBuffer, " ");
-                if (needs_quoting(wk->li->arcname))
-                  strcat(szBuffer, "\"");
-                strcat(szBuffer, wk->li->arcname);
-                if (needs_quoting(wk->li->arcname))
-                  strcat(szBuffer, "\"");
+                BldQuotedFileName(szBuffer + strlen(szBuffer), wk->li->arcname);
+                // if (needs_quoting(wk->li->arcname))
+                //   strcat(szBuffer, "\"");
+                // strcat(szBuffer, wk->li->arcname);
+                // if (needs_quoting(wk->li->arcname))
+                //   strcat(szBuffer, "\"");
               }
               else {
@@ -1100 +1104 @@
                   pp++;
                 }
-                if (needs_quoting(wk->li->list[x]))
-                  strcat(szBuffer, "\"");
-                strcat(szBuffer, wk->li->list[x]);
-                if (needs_quoting(wk->li->list[x]))
-                  strcat(szBuffer, "\"");
+                BldQuotedFileName(szBuffer + strlen(szBuffer), wk->li->list[x]);
+                // if (needs_quoting(wk->li->list[x]))
+                //   strcat(szBuffer, "\"");
+                // strcat(szBuffer, wk->li->list[x]);
+                // if (needs_quoting(wk->li->list[x]))
+                //   strcat(szBuffer, "\"");
                 x++;
                 if (!wk->li->list[x] || strlen(szBuffer) +
@@ -1110 +1115 @@
                   runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED | WAIT,
                           HWND_DESKTOP,
-                          ((wk->li->type == IDM_FAKEEXTRACT ||
-                            wk->li->type == IDM_FAKEEXTRACTM) ?
-                           wk->li->targetpath : NULL), NULL, "%s", szBuffer);
+                          (wk->li->type == IDM_FAKEEXTRACT ||
+                           wk->li->type == IDM_FAKEEXTRACTM) ?
+                             wk->li->targetpath : NULL,
+                           NULL,
+                           "%s", szBuffer);
                   DosSleep(1);
                   *p = 0;
@@ -1226 +1233 @@
               strcpy(szBuffer, ad.command);
               strcat(szBuffer, " ");
-              if (needs_quoting(ad.arcname))
-                strcat(szBuffer, "\"");
-              strcat(szBuffer, ad.arcname);
-              if (needs_quoting(ad.arcname))
-                strcat(szBuffer, "\"");
+              BldQuotedFileName(szBuffer + strlen(szBuffer), ad.arcname);
+              // if (needs_quoting(ad.arcname))
+              //        strcat(szBuffer, "\"");
+              // strcat(szBuffer, ad.arcname);
+              // if (needs_quoting(ad.arcname))
+              //        strcat(szBuffer, "\"");
               p = &szBuffer[strlen(szBuffer)];
               if (ad.mask.szMask) {
@@ -1239 +1247 @@
               x = 0;
               while (wk->li->list[x]) {
-
                 FILESTATUS3 fsa;
-                BOOL spaces;
-
-                if (needs_quoting(wk->li->list[x])) {
-                  spaces = TRUE;
-                  strcat(szBuffer, "\"");
-                }
-                else
-                  spaces = FALSE;
-                strcat(szBuffer, wk->li->list[x]);
+                // BOOL spaces;
+                // if (needs_quoting(wk->li->list[x])) {
+                //   spaces = TRUE;
+                //   strcat(szBuffer, "\"");
+                // }
+                // else
+                //   spaces = FALSE;
+                // strcat(szBuffer, wk->li->list[x]);
                 memset(&fsa, 0, sizeof(FILESTATUS3));
                 DosError(FERR_DISABLEHARDERR);
@@ -1256 +1262 @@
                                  &fsa, (ULONG) sizeof(FILESTATUS3));
                 if (fsa.attrFile & FILE_DIRECTORY) {
-                  if (szBuffer[strlen(szBuffer) - 1] != '\\')
-                    strcat(szBuffer, "\\");
-                  strcat(szBuffer, "*");
-                }
-                if (spaces)
-                  strcat(szBuffer, "\"");
+                  BldQuotedFullPathName(szBuffer + strlen(szBuffer), wk->li->list[x], "*");
+                  // if (szBuffer[strlen(szBuffer) - 1] != '\\')
+                  //   strcat(szBuffer, "\\");
+                  // strcat(szBuffer, "*");
+                }
+                else
+                  BldQuotedFileName(szBuffer + strlen(szBuffer), wk->li->list[x]);
+                // if (spaces)
+                //   strcat(szBuffer, "\"");
                 x++;
                 if (!wk->li->list[x] ||
                     strlen(szBuffer) + strlen(wk->li->list[x]) + 5 > 1024) {
-                  runemf2(SEPARATE | WINDOWED |
-                          ((fArcStuffVisible) ? 0 :
-                           (BACKGROUND | MINIMIZED)) |
-                          WAIT, HWND_DESKTOP, NULL, NULL, "%s", szBuffer);
+                  runemf2(SEPARATE | WINDOWED | WAIT |
+                          (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
+                          HWND_DESKTOP, NULL, NULL,
+                          "%s", szBuffer);
                   DosSleep(1);
                   *p = 0;