Changeset 888

Timestamp:

Dec 22, 2007, 11:02:11 PM (18 years ago)

Author:

Gregg Young

Message:

runemf2 now quotes executable strings if needed (Ticket 180); it also reports where it was called from on errors

Location:

trunk

Files:

• HISTORY (modified) (1 diff)
• dll/arccnrs.c (modified) (21 diffs)
• dll/archive.c (modified) (1 diff)
• dll/assoc.c (modified) (2 diffs)
• dll/avv.c (modified) (1 diff)
• dll/collect.c (modified) (1 diff)
• dll/command.c (modified) (3 diffs)
• dll/common.c (modified) (4 diffs)
• dll/comp.c (modified) (1 diff)
• dll/datamin.c (modified) (1 diff)
• dll/defview.c (modified) (1 diff)
• dll/dircnrs.c (modified) (2 diffs)
• dll/extract.c (modified) (1 diff)
• dll/filter.c (modified) (1 diff)
• dll/fm3dll.h (modified) (2 diffs)
• dll/fm3dll.str (modified) (2 diffs)
• dll/init.c (modified) (1 diff)
• dll/instant.c (modified) (2 diffs)
• dll/killproc.c (modified) (1 diff)
• dll/mainwnd.c (modified) (4 diffs)
• dll/mainwnd2.c (modified) (1 diff)
• dll/misc.c (modified) (7 diffs)
• dll/mle.c (modified) (2 diffs)
• dll/newview.c (modified) (4 diffs)
• dll/notebook.c (modified) (9 diffs)
• dll/remap.c (modified) (1 diff)
• dll/seeall.c (modified) (3 diffs)
• dll/srchpath.c (modified) (1 diff)
• dll/sysinfo.c (modified) (1 diff)
• dll/systemf.c (modified) (15 diffs)
• dll/tools.c (modified) (1 diff)
• dll/treecnr.c (modified) (1 diff)
• dll/undel.c (modified) (3 diffs)
• dll/viewinf.c (modified) (1 diff)
• dll/worker.c (modified) (14 diffs)

trunk/HISTORY

@@ -2 +2 @@
 
 3.09(pre)
+ o Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun (Gregg)
  o Update CopyPresParams to copy all types of pres parameters (Gregg)
  o Add "Save as" menu item to internal viewer (Gregg)

trunk/dll/arccnrs.c

@@ -194 +194 @@
           if (*binview)
             ExecOnList((HWND) 0, binview, WINDOWED | SEPARATE, NULL, list,
-                       NULL);
+                       NULL, pszSrcFile, __LINE__);
           else
             StartMLEEditor(HWND_DESKTOP, 16 + 4 + 1, ad->arcname, hwnd);
@@ -201 +201 @@
           if (*viewer) {
             ExecOnList((HWND) 0, viewer, WINDOWED | SEPARATE |
-                         (fViewChild ? CHILD : 0),
-                       NULL, list, NULL);
+                            (fViewChild ? CHILD : 0),
+                             NULL, list, NULL, pszSrcFile, __LINE__);
           }
           else
@@ -213 +213 @@
       ad = WinQueryWindowPtr(hwnd, QWL_USER);
       runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
-              hwnd, NULL, NULL,
+              hwnd, pszSrcFile, __LINE__, 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;
     }
@@ -544 +539 @@
       p = GetCmdSpec(TRUE);
       runemf2(SEPARATE | INVISIBLE | MINIMIZED | BACKGROUND | WAIT,
-              hwndCnr, NULL, "DOS_BACKGROUND_EXECUTION=1",
+              hwndCnr, pszSrcFile, __LINE__, NULL, "DOS_BACKGROUND_EXECUTION=1",
               "%s /C %s %s >%s",
               p,                        // shell
@@ -550 +545 @@
               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 {
@@ -586 +570 @@
           else {
             runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
-                    hwndCnr, NULL, NULL,
+                    hwndCnr, pszSrcFile, __LINE__, 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);
@@ -1386 +1365 @@
           // 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),
-                  dcd->hwndClient, construct, NULL,
+                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                  dcd->hwndClient, pszSrcFile, __LINE__, construct, NULL,
                   "%s %s %s",
                   dcd->info->extract,
                   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);
@@ -1522 +1487 @@
         }
         runemf2(SEPARATE | WINDOWED | WAIT |
-                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                dcd->hwndClient, dcd->workdir, NULL,
+                (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                dcd->hwndClient, pszSrcFile, __LINE__, dcd->workdir, NULL,
                 "%s %s %s",
                 dcd->info->exwdirs ? dcd->info->exwdirs :
@@ -1529 +1494 @@
                 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;
@@ -1607 +1560 @@
 
             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
@@ -1619 +1567 @@
 
               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, " ");
@@ -1632 +1575 @@
 
               if (IsFile(li->list[x]))
-                BldQuotedFileName(szBuffer + strlen(szBuffer), 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, "\"");
+                 BldQuotedFullPathName(szBuffer + strlen(szBuffer), li->list[x], "*");
 
               x++;
@@ -1651 +1583 @@
                   strlen(li->list[x]) + 5 > 1024) {
                 runemf2(SEPARATE | WINDOWED |
-                          (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                          WAIT,
-                        hwnd, NULL, NULL, "%s", szBuffer);
+                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                        WAIT, hwnd, pszSrcFile, __LINE__,
+                        NULL, NULL, "%s", szBuffer);
                 *p = 0;
               }
@@ -1703 +1635 @@
             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;
             do {
               for (x = z; li->list[x] &&
-                   strlen(cl) + strlen(li->list[x]) < 999; x++) {
+                strlen(cl) + strlen(li->list[x]) < 999; 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 | WAIT |
-                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                      hwnd, NullStr, NULL, "%s", cl);
+                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                      hwnd, pszSrcFile, __LINE__, NullStr, NULL, "%s", cl);
               *endofit = 0;
             } while (li->list[x]);
@@ -1834 +1751 @@
              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;
-            do {
-              for (x = z; li->list[x] &&
+             endofit = &cl[strlen(cl)];
+             z = 0;
+             do {
+               for (x = z; li->list[x] &&
                    strlen(cl) + strlen(li->list[x]) < 999; 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) {
@@ -1870 +1767 @@
               z = x;
               runemf2(SEPARATE | WINDOWED |
-                        (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
-                        WAIT,
-                      hwnd, li->targetpath, NULL, "%s", cl);
+                      (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED) |
+                      WAIT, hwnd, pszSrcFile, __LINE__,
+                      li->targetpath, NULL, "%s", cl);
               *endofit = 0;
             } while (li->list[x]);
@@ -1930 +1827 @@
                          WINDOWED | SEPARATEKEEP | PROMPT,
                          li->targetpath,
-                         NULL, GetPString(IDS_EXECARCFILETITLETEXT));
+                         NULL, GetPString(IDS_EXECARCFILETITLETEXT),
+                         pszSrcFile, __LINE__);
             else if (li->type == IDM_VIRUSSCAN)
               ExecOnList(hwnd, virus, PROMPT | WINDOWED | SEPARATEKEEP,
                          li->targetpath, NULL,
-                         GetPString(IDS_VIRUSSCANARCHIVETITLETEXT));
+                         GetPString(IDS_VIRUSSCANARCHIVETITLETEXT),
+                         pszSrcFile, __LINE__);
             else if (li->type == IDM_VIEW || li->type == IDM_VIEWTEXT ||
                      li->type == IDM_VIEWBINARY || li->type == IDM_EDIT ||
@@ -2035 +1934 @@
                                   bined),
                            WINDOWED | SEPARATE, li->targetpath, li->list,
-                           NULL);
+                           NULL, pszSrcFile, __LINE__);
               }
               else {
@@ -2935 +2834 @@
         if (dcd->info->extract)
           runemf2(SEPARATE | WINDOWED |
-                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                  hwnd, dcd->directory, NULL, "%s %s",
-                  dcd->info->extract,
+                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                  hwnd, pszSrcFile, __LINE__,
+                  dcd->directory, NULL, "%s %s", dcd->info->extract,
                   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);
@@ -2954 +2846 @@
         if (dcd->info->exwdirs)
           runemf2(SEPARATE | WINDOWED |
-                    (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
-                  hwnd, dcd->directory, NULL,
-                  "%s %s",
+                  (fArcStuffVisible ? 0 : BACKGROUND | MINIMIZED),
+                  hwnd, pszSrcFile, __LINE__,
+                  dcd->directory, NULL, "%s %s",
                   dcd->info->exwdirs,
                   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);
@@ -3033 +2918 @@
         if (dcd->info->test)
           runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
-                  hwnd, NULL, NULL,
+                  hwnd, pszSrcFile, __LINE__, 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;
 

trunk/dll/archive.c

@@ -264 +264 @@
             *p = 0;
           ExecOnList(hwnd, s, WINDOWED | SEPARATEKEEP | MAXIMIZED | PROMPT,
-                     NULL, NULL, GetPString(IDS_ARCEXECHELPTEXT));
+                     NULL, NULL, GetPString(IDS_ARCEXECHELPTEXT),
+                     pszSrcFile, __LINE__);
         }
         else

trunk/dll/assoc.c

@@ -419 +419 @@
                         info->cl,
                         flags,
-                        NULL, list, GetPString(IDS_EXECASSOCTITLETEXT));
+                        NULL, list, GetPString(IDS_EXECASSOCTITLETEXT),
+                        pszSrcFile, __LINE__);
         if (rc != -1 && dieafter)
           PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
@@ -613 +614 @@
     case ASS_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9];
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
 
         *filename = 0;
-        if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-          strcat(filename, " %a");
-          WinSetDlgItemText(hwnd, ASS_CL, filename);
+        if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+          BldQuotedFileName(szfilename, filename);
+          strcat(szfilename, " %a");
+          WinSetDlgItemText(hwnd, ASS_CL, szfilename);
         }
       }

trunk/dll/avv.c

@@ -797 +797 @@
                           CmdLineDlgProc, FM3ModHandle, EXEC_FRAME, &ex) == 1)
               runemf2(ex.flags,
-                      hwnd,
+                      hwnd, pszSrcFile, __LINE__,
                       NULL,
                       (*ex.environment) ? ex.environment : NULL,

trunk/dll/collect.c

@@ -2300 +2300 @@
                 strcat(li->targetpath, " %a");
                 ExecOnList(dcd->hwndParent, li->targetpath,
-                           PROMPT | WINDOWED, NULL, li->list, NULL);
+                           PROMPT | WINDOWED, NULL, li->list, NULL,
+                           pszSrcFile, __LINE__);
                 FreeList(li->list);
                 li->list = NULL;

trunk/dll/command.c

@@ -561 +561 @@
     case CMD_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9];
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
 
         *filename = 0;
-        if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-          strcat(filename, " %a");
-          WinSetDlgItemText(hwnd, CMD_CL, filename);
+        if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+          BldQuotedFileName(szfilename, filename);
+          strcat(szfilename, " %a");
+          WinSetDlgItemText(hwnd, CMD_CL, szfilename);
         }
       }
@@ -937 +938 @@
         ExecOnList(hwnd,
                    info->cl,
-                   flags, NULL, fakelist, GetPString(IDS_EXECCMDTITLETEXT));
+                   flags, NULL, fakelist, GetPString(IDS_EXECCMDTITLETEXT),
+                   pszSrcFile, __LINE__);
       }
     }
@@ -943 +945 @@
       ExecOnList(hwnd,
                  info->cl,
-                 flags, NULL, list, GetPString(IDS_EXECCMDTITLETEXT));
+                 flags, NULL, list, GetPString(IDS_EXECCMDTITLETEXT),
+                 pszSrcFile, __LINE__);
   }
   FreeList(list);

trunk/dll/common.c

@@ -244 +244 @@
   case IDM_CHKDSK:
     runemf2(SEPARATE | WINDOWED,
-            hwnd, NULL, NULL, "PMCHKDSK.EXE %c:", toupper(*dv));
+            hwnd, pszSrcFile, __LINE__, NULL, NULL,
+            "PMCHKDSK.EXE %c:", toupper(*dv));
     break;
   case IDM_OPTIMIZE:
@@ -255 +256 @@
         strcat(FileSystem, "OPT.CMD");
         runemf2(SEPARATE | WINDOWED,
-                hwnd,
+                hwnd, pszSrcFile, __LINE__,
                 NULL,
                 NULL,
@@ -264 +265 @@
   case IDM_FORMAT:
     runemf2(SEPARATE | WINDOWED,
-            hwnd, NULL, NULL, "PMFORMAT.EXE %c:", toupper(*dv));
+            hwnd, pszSrcFile, __LINE__, NULL, NULL,
+            "PMFORMAT.EXE %c:", toupper(*dv));
     break;
 
@@ -788 +790 @@
     assign_ignores(s);
     runemf2(WINDOWED | SEPARATE,
-            hwnd,
+            hwnd, pszSrcFile, __LINE__,
             NULL,
             NULL,

trunk/dll/comp.c

@@ -2174 +2174 @@
             fakelist[2] = NULL;
             ExecOnList(hwnd, compare,
-                       WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL);
+                       WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
+                       pszSrcFile, __LINE__);
           }
           else {

trunk/dll/datamin.c

@@ -429 +429 @@
           type = SEPARATE | FULLSCREEN;
         }
-        runemf2(type, hwnd, path, NULL, "%s", env);
+        runemf2(type, hwnd, pszSrcFile, __LINE__,
+                path, NULL, "%s", env);
       }
       break;

trunk/dll/defview.c

@@ -16 +16 @@
   09 Jun 07 SHL ShowMultimedia: Initialize hwnd so that OpenObject might work
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
+  20 Dec 07 GKY Open jpg files with OS2 object default since image.exe fails
 
 ***********************************************************************/

trunk/dll/dircnrs.c

@@ -1727 +1727 @@
                   dummy[1] = NULL;
                   ExecOnList(hwnd,
-                             editor, WINDOWED | SEPARATE, NULL, dummy, NULL);
+                             editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+                             pszSrcFile, __LINE__);
                 }
                 else
@@ -2887 +2888 @@
               strcat(li->targetpath, " %a");
               ExecOnList(dcd->hwndParent, li->targetpath,
-                         PROMPT | WINDOWED, NULL, li->list, NULL);
+                         PROMPT | WINDOWED, NULL, li->list, NULL,
+                         pszSrcFile, __LINE__);
               FreeList(li->list);
               li->list = NULL;

trunk/dll/extract.c

@@ -393 +393 @@
                         FM3ModHandle, EXEC_FRAME, MPFROMP(&ex)) && *s) {
             runemf2(ex.flags,
-                    hwnd,
+                    hwnd, pszSrcFile, __LINE__,
                     NULL, (*ex.environment) ? ex.environment : NULL, "%s", s);
           }

trunk/dll/filter.c

@@ -153 +153 @@
         }
       }
-    }
+    }  //while
     fclose(fp);
   }

trunk/dll/fm3dll.h

@@ -65 +65 @@
   10 Nov 07 GKY Add ThousandSeparator variable for file sizes NLS tseparator.
   22 Nov 07 GKY Use CopyPresParams in CheckMenu to fix presparam inconsistencies in menus
+  17 Dec 07 GKY Add variables for using WPURLDEFAULTSETTINGS as the fall back for ftphttprun
 
 ***********************************************************************/
@@ -902 +903 @@
 BOOL ShowSession(HWND hwnd, PID pid);
 INT ExecOnList(HWND hwnd, CHAR * command, INT flags, CHAR * tpath,
-               CHAR ** list, CHAR * prompt);
-INT runemf2(INT type, HWND hwnd, CHAR * directory, CHAR * environment,
+               CHAR ** list, CHAR * prompt, PCSZ pszCallingFile, UINT uiLineNumber);
+INT runemf2(INT type, HWND hwnd, PCSZ pszCallingFile, UINT uiLineNumber,
+            CHAR * directory, CHAR * environment,
             CHAR * formatstring, ...);
 HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,

trunk/dll/fm3dll.str

@@ -588 +588 @@
 1381 China GB
 0
-DosStartSession failed to run "%s %s"
-DosExecPgm failed for %s.
+DosStartSession failed to run "%s %s"\n called from %s %d.
+DosExecPgm failed for %s.\n called from %s %d.
 We are all Books of Blood.
 "Is THIS your card?"
@@ -996 +996 @@
 Can't find drive %s
 Can't drag root directory
-DosQAppType failed for %s.
-apptype 0x%x unexpected for %s.
+DosQAppType failed for %s\n called from %s %d.
+apptype 0x%x unexpected for %s.\n called from %s %d.
 %c:\\DESKTOP
 FM/2: Drive info "%c:"

trunk/dll/init.c

@@ -38 +38 @@
   10 Nov 07 GKY Get thousands separator from country info for file sizes.
   26 Nov 07 GKY Eliminate check of ext path on start up
+  17 Dec 07 GKY Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun
 
 ***********************************************************************/

trunk/dll/instant.c

@@ -144 +144 @@
                 fclose(fp);
                 runemf2(WINDOWED | SEPARATE,
-                        hwnd,
+                        hwnd, pszSrcFile, __LINE__,
                         path, NULL, "%s /C \"%s\"", GetCmdSpec(FALSE), s);
               }
@@ -168 +168 @@
       if (rc == MBID_YES)
         runemf2(WINDOWED | INVISIBLE | BACKGROUND,
-                hwnd, NULL, NULL, "%s /C HELP BATCH", GetCmdSpec(FALSE));
+                hwnd, pszSrcFile, __LINE__, NULL, NULL,
+                "%s /C HELP BATCH", GetCmdSpec(FALSE));
       else if (rc == MBID_CANCEL)
         WinDismissDlg(hwnd, 0);

trunk/dll/killproc.c

@@ -236 +236 @@
     DosDupHandle(fileno(fp), &oldstdout);
     rc = runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
-                 hwnd, NULL, NULL, "%s", "PSTAT.EXE /C");
+                 hwnd, pszSrcFile, __LINE__, NULL, NULL,
+                 "%s", "PSTAT.EXE /C");
     oldstdout = fileno(stdout);
     DosDupHandle(newstdout, &oldstdout);

trunk/dll/mainwnd.c

@@ -1592 +1592 @@
                        WINDOWED | ((fKeepCmdLine) ?
                                    SEPARATEKEEP : SEPARATE),
-                       directory, list, NULL);
+                       directory, list, NULL, pszSrcFile, __LINE__);
             if (list)
               free(list);
@@ -1960 +1960 @@
           strcat(li->targetpath, " %a");
           ExecOnList(hwndMain,
-                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL);
+                     li->targetpath, PROMPT | WINDOWED, NULL, li->list, NULL,
+                     pszSrcFile, __LINE__);
           FreeList(li->list);
           li->list = NULL;
@@ -4234 +4235 @@
           CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP, NULL, NULL,
+                  HWND_DESKTOP, pszSrcFile, __LINE__,
+                  NULL, NULL,
                   "%s %s %s",
                   dircompare,
                   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);
         }
       }
@@ -4648 +4639 @@
         type = SEPARATE | FULLSCREEN;
       }
-      runemf2(type, hwnd, path, NULL, "%s", env);
+      runemf2(type, hwnd, pszSrcFile, __LINE__,
+              path, NULL, "%s", env);
     }
     break;

trunk/dll/mainwnd2.c

@@ -501 +501 @@
           CHAR szPath2[CCHMAXPATH];
           runemf2(SEPARATE,
-                  HWND_DESKTOP, NULL, NULL,
+                  HWND_DESKTOP, pszSrcFile, __LINE__,
+                  NULL, NULL,
                   "%s %s %s",
                   dircompare,
                   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/misc.c

@@ -913 +913 @@
     }
     fclose(fp);
-    ret = runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL, NULL,
+    ret = runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                  NULL, NULL,
                   "VIEW.EXE \"%s\"", filename);
   }
@@ -945 +946 @@
   *cl = 0;
   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;
@@ -960 +955 @@
   if (ret == 1) {
     lastflags = ex.flags;
-    return runemf2(ex.flags, hwnd, path,
+    return runemf2(ex.flags, hwnd, pszSrcFile, __LINE__, path,
                    *ex.environment ? ex.environment : NULL,
                    "%s", cl) != -1;
@@ -1485 +1480 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, list, NULL);
+      ExecOnList(hwnd, binview, WINDOWED | SEPARATE, NULL, list, NULL,
+                 pszSrcFile, __LINE__);
       return;
     }
@@ -1496 +1492 @@
       ExecOnList(hwnd, viewer,
                  WINDOWED | SEPARATE | (fViewChild ? CHILD : 0),
-                 NULL, list, NULL);
+                 NULL, list, NULL, pszSrcFile, __LINE__);
       return;
     }
@@ -1512 +1508 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, list, NULL);
+      ExecOnList(hwnd, bined, WINDOWED | SEPARATE, NULL, list, NULL,
+                 pszSrcFile, __LINE__);
       return;
     }
@@ -1521 +1518 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, list, NULL);
+      ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, list, NULL,
+                 pszSrcFile, __LINE__);
       return;
     }

trunk/dll/mle.c

@@ -17 +17 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   26 Aug 07 GKY DosSleep(1) in loops changed to (0)
+  17 Dec 07 GKY Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun
 
 ***********************************************************************/
@@ -178 +179 @@
           if (ftp && *ftprun)
             runemf2(SEPARATE | WINDOWED,
-                    h, ftprund, NULL, "%s %s", ftprun, temp);
+                    h, pszSrcFile, __LINE__,
+                    ftprund, NULL, "%s %s", ftprun, temp);
           else if (!ftp && *httprun)
             runemf2(SEPARATE | WINDOWED,
-                    h, httprund, NULL, "%s %s", httprun, temp);
+                    h, pszSrcFile, __LINE__,
+                    httprund, NULL, "%s %s", httprun, temp);
         }
       }

trunk/dll/newview.c

@@ -26 +26 @@
   14 Sep 07 SHL Another attempt to correct the fast viewer text load failure
   10 Oct 07 SHL Correct ReLineThread typo
+  17 Dec 07 GKY Make WPURLDEFAULTSETTINGS the fall back for ftp/httprun
 
 ***********************************************************************/
@@ -2289 +2290 @@
                        if (*urld->url)
                          runemf2(SEPARATE | WINDOWED,
-                               hwnd, httprund, NULL, "%s %s", httprun, urld->url);
+                                 hwnd, pszSrcFile, __LINE__,
+                                 httprund, NULL, "%s %s", httprun, urld->url);
                 free(urld);
                 goto NoAdd;
@@ -2295 +2297 @@
                 if (*urld->url)
                   runemf2(SEPARATE | WINDOWED,
-                          hwnd, ftprund, NULL, "%s %s", ftprun, urld->url);
+                          hwnd, pszSrcFile, __LINE__,
+                          ftprund, NULL, "%s %s", ftprun, urld->url);
                 free(urld);
                 goto NoAdd;
@@ -3117 +3120 @@
         dummy[0] = ad->filename;
         dummy[1] = NULL;
-        ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, dummy, NULL);
+        ExecOnList(hwnd, editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+                   pszSrcFile, __LINE__);
       }
       else

trunk/dll/notebook.c

@@ -138 +138 @@
     case CFGA_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9];
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
         USHORT id;
         HWND hwndFocus;
@@ -148 +148 @@
           switch (id) {
           case CFGA_VIRUS:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename){
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %p");
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
             break;
           case CFGA_EXTRACTPATH:
@@ -194 +197 @@
       *szDefArc = 0;
     PrfWriteProfileString(fmprof, appname, "DefArc", szDefArc);
-    WinQueryDlgItemText(hwnd, CFGA_VIRUS, CCHMAXPATH, virus);
-    virus[CCHMAXPATH - 1] = 0;
-    bstrip(virus);
+    {
+      CHAR szBuf[CCHMAXPATH], buf[10] = "\"%-/";
+
+      WinQueryDlgItemText(hwnd, CFGA_VIRUS, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strcspn(szBuf, buf))
+        BldQuotedFileName(virus, szBuf);
+      else
+        memcpy(virus, szBuf, strlen(szBuf) + 1);
+      if (!strchr(virus, '%') && strlen(virus) > 3)
+        strcat(virus, " %p");
+    }
     if (!*virus)
       strcpy(virus, "OS2SCAN.EXE %p /SUB /A");
@@ -414 +427 @@
     case CFGV_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9];
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
         USHORT id;
         HWND hwndFocus;
@@ -427 +440 @@
           case CFGV_VIEWER:
           case CFGV_EDITOR:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              strcat(filename, " %a");
-              WinSetDlgItemText(hwnd, id, filename);
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
             }
             break;
           case CFGV_HTTPRUN:
           case CFGV_FTPRUN:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename)
-              WinSetDlgItemText(hwnd, id, filename);
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename){
+              BldQuotedFileName(szfilename, filename);
+              WinSetDlgItemText(hwnd, id, szfilename);
+            }
             break;
           default:
@@ -448 +464 @@
 
   case WM_CLOSE:
-    WinQueryDlgItemText(hwnd, CFGV_VIEWER, CCHMAXPATH, viewer);
-    viewer[CCHMAXPATH - 1] = 0;
-    bstrip(viewer);
-    WinQueryDlgItemText(hwnd, CFGV_EDITOR, CCHMAXPATH, editor);
-    editor[CCHMAXPATH - 1] = 0;
-    bstrip(editor);
-    WinQueryDlgItemText(hwnd, CFGV_BINVIEW, CCHMAXPATH, binview);
-    binview[CCHMAXPATH - 1] = 0;
-    bstrip(binview);
-    WinQueryDlgItemText(hwnd, CFGV_BINED, CCHMAXPATH, bined);
-    bined[CCHMAXPATH - 1] = 0;
-    bstrip(bined);
-    WinQueryDlgItemText(hwnd, CFGV_FTPRUN, CCHMAXPATH, ftprun);
-    ftprun[CCHMAXPATH - 1] = 0;
-    bstrip(ftprun);
-    WinQueryDlgItemText(hwnd, CFGV_HTTPRUN, CCHMAXPATH, httprun);
-    httprun[CCHMAXPATH - 1] = 0;
-    bstrip(httprun);
-    PrfWriteProfileString(fmprof, appname, "Viewer", viewer);
-    PrfWriteProfileString(fmprof, appname, "Editor", editor);
-    PrfWriteProfileString(fmprof, appname, "BinView", binview);
-    PrfWriteProfileString(fmprof, appname, "BinEd", bined);
-    PrfWriteProfileString(fmprof, appname, "FTPRun", ftprun);
-    PrfWriteProfileString(fmprof, appname, "HTTPRun", httprun);
-    fUseNewViewer = WinQueryButtonCheckstate(hwnd, CFGV_USENEWVIEWER);
-    PrfWriteProfileData(fmprof, appname, "UseNewViewer", &fUseNewViewer,
-                        sizeof(BOOL));
-    fGuessType = WinQueryButtonCheckstate(hwnd, CFGV_GUESSTYPE);
-    PrfWriteProfileData(fmprof, appname, "GuessType", &fGuessType,
-                        sizeof(BOOL));
-    fViewChild = WinQueryButtonCheckstate(hwnd, CFGV_VIEWCHILD);
-    PrfWriteProfileData(fmprof, appname, "ViewChild", &fViewChild,
-                        sizeof(BOOL));
-    fCheckMM = WinQueryButtonCheckstate(hwnd, CFGV_CHECKMM);
-    PrfWriteProfileData(fmprof, appname, "CheckMM", &fCheckMM, sizeof(BOOL));
-    break;
+    {
+      CHAR szBuf[CCHMAXPATH], buf[10] = "\"%-/";
+
+      WinQueryDlgItemText(hwnd, CFGV_VIEWER, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strcspn(szBuf, buf))
+        BldQuotedFileName(viewer, szBuf);
+      else
+        memcpy(viewer, szBuf, strlen(szBuf) + 1);
+      if (!strchr(viewer, '%') && strlen(viewer) > 3)
+        strcat(viewer, " %a");
+      WinQueryDlgItemText(hwnd, CFGV_EDITOR, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strcspn(szBuf, buf))
+        BldQuotedFileName(editor, szBuf);
+      else
+        memcpy(editor, szBuf, strlen(szBuf) + 1);
+      if (!strchr(editor, '%') && strlen(editor) > 3)
+        strcat(editor, " %a");
+      WinQueryDlgItemText(hwnd, CFGV_BINVIEW, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strcspn(szBuf, buf))
+        BldQuotedFileName(binview, szBuf);
+      else
+        memcpy(binview, szBuf, strlen(szBuf) + 1);
+      if (!strchr(binview, '%') && strlen(binview) > 3)
+        strcat(binview, " %a");
+      WinQueryDlgItemText(hwnd, CFGV_BINED, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strcspn(szBuf, buf))
+        BldQuotedFileName(bined, szBuf);
+      else
+        memcpy(bined, szBuf, strlen(szBuf) + 1);
+      if (!strchr(bined, '%') && strlen(bined) > 3)
+        strcat(bined, " %a");
+      WinQueryDlgItemText(hwnd, CFGV_FTPRUN, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strchr(szBuf, '"'))
+        BldQuotedFileName(ftprun, szBuf);
+      else
+        memcpy(ftprun, szBuf, strlen(szBuf) + 1);
+      WinQueryDlgItemText(hwnd, CFGV_HTTPRUN, CCHMAXPATH, szBuf);
+      szBuf[CCHMAXPATH - 1] = 0;
+      bstrip(szBuf);
+      if (!strchr(szBuf, '"'))
+        BldQuotedFileName(httprun, szBuf);
+      else
+        memcpy(httprun, szBuf, strlen(szBuf) + 1);
+      PrfWriteProfileString(fmprof, appname, "Viewer", viewer);
+      PrfWriteProfileString(fmprof, appname, "Editor", editor);
+      PrfWriteProfileString(fmprof, appname, "BinView", binview);
+      PrfWriteProfileString(fmprof, appname, "BinEd", bined);
+
+      PrfWriteProfileString(fmprof, appname, "FTPRun", ftprun);
+      PrfWriteProfileString(fmprof, appname, "HTTPRun", httprun);
+      fUseNewViewer = WinQueryButtonCheckstate(hwnd, CFGV_USENEWVIEWER);
+      PrfWriteProfileData(fmprof, appname, "UseNewViewer", &fUseNewViewer,
+                          sizeof(BOOL));
+      fGuessType = WinQueryButtonCheckstate(hwnd, CFGV_GUESSTYPE);
+      PrfWriteProfileData(fmprof, appname, "GuessType", &fGuessType,
+                          sizeof(BOOL));
+      fViewChild = WinQueryButtonCheckstate(hwnd, CFGV_VIEWCHILD);
+      PrfWriteProfileData(fmprof, appname, "ViewChild", &fViewChild,
+                          sizeof(BOOL));
+      fCheckMM = WinQueryButtonCheckstate(hwnd, CFGV_CHECKMM);
+      PrfWriteProfileData(fmprof, appname, "CheckMM", &fCheckMM, sizeof(BOOL));
+      break;
+    }
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);
@@ -996 +1049 @@
     case CFGC_FIND:
       {
-        CHAR filename[CCHMAXPATH + 9];
+        CHAR filename[CCHMAXPATH + 9], szfilename[CCHMAXPATH + 9];
         USHORT id;
         HWND hwndFocus;
@@ -1007 +1060 @@
           case CFGC_COMPARE:
           case CFGC_DIRCOMPARE:
-            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
-              strcat(filename, " %a");
-              WinSetDlgItemText(hwnd, id, filename);
+            if (insert_filename(hwnd, filename, 2, FALSE) && *filename) {
+              BldQuotedFileName(szfilename, filename);
+              strcat(szfilename, " %a");
+              WinSetDlgItemText(hwnd, id, szfilename);
             }
             break;
@@ -1023 +1077 @@
 
   case WM_CLOSE:
-    WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, CCHMAXPATH, dircompare);
-    dircompare[CCHMAXPATH - 1] = 0;
-    bstrip(dircompare);
-    PrfWriteProfileString(fmprof, appname, "DirCompare", dircompare);
-    WinQueryDlgItemText(hwnd, CFGC_COMPARE, CCHMAXPATH, compare);
-    compare[CCHMAXPATH - 1] = 0;
-    bstrip(compare);
-    PrfWriteProfileString(fmprof, appname, "Compare", compare);
-    break;
+    {
+      CHAR szBuf[CCHMAXPATH], buf[10] = "\"%-/";
+
+      WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, CCHMAXPATH, szBuf);
+        szBuf[CCHMAXPATH - 1] = 0;
+        bstrip(szBuf);
+        if (!strcspn(szBuf, buf))
+          BldQuotedFileName(dircompare, szBuf);
+        else
+          memcpy(dircompare, szBuf, strlen(szBuf) + 1);
+        if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
+          strcat(dircompare, " %a");
+      PrfWriteProfileString(fmprof, appname, "DirCompare", dircompare);
+      WinQueryDlgItemText(hwnd, CFGC_COMPARE, CCHMAXPATH, szBuf);
+        szBuf[CCHMAXPATH - 1] = 0;
+        bstrip(szBuf);
+        if (!strcspn(szBuf, buf))
+          BldQuotedFileName(compare, szBuf);
+        else
+          memcpy(compare, szBuf, strlen(szBuf) + 1);
+        if (!strchr(compare, '%') && strlen(compare) > 3)
+          strcat(compare, " %a");
+      PrfWriteProfileString(fmprof, appname, "Compare", compare);
+      break;
+    }
   }
   return WinDefDlgProc(hwnd, msg, mp1, mp2);

trunk/dll/remap.c

@@ -595 +595 @@
             case MAP_INFO:
               runemf2(SEPARATEKEEP | WINDOWED | MAXIMIZED,
-                      hwnd,
+                      hwnd, pszSrcFile, __LINE__,
                       NULL, NULL, "%s /C NET USE %s", GetCmdSpec(FALSE), d);
               break;

trunk/dll/seeall.c

@@ -466 +466 @@
           while (list[x]) {
             FILESTATUS3 fsa;
-            // 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);
@@ -480 +472 @@
               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 | WAIT |
                       (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
-                      HWND_DESKTOP, NULL, NULL,
-                      "%s", szBuffer);
+                      HWND_DESKTOP, pszSrcFile, __LINE__,
+                      NULL, NULL, "%s", szBuffer);
               DosSleep(1);              // Let archiver get started
               *p = 0;
@@ -831 +818 @@
             runemf2(SEPARATE | WINDOWED |
                     (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
-                    HWND_DESKTOP, ex.extractdir, NULL,
+                    HWND_DESKTOP, pszSrcFile, __LINE__,
+                    ex.extractdir, NULL,
                     "%s %s %s%s%s",
                     ex.command,

trunk/dll/srchpath.c

@@ -62 +62 @@
     }
     ret = runemf2(SEPARATE | WINDOWED,
-                  HWND_DESKTOP,
+                  HWND_DESKTOP, pszSrcFile, __LINE__,
                   NULL,
                   NULL,

trunk/dll/sysinfo.c

@@ -63 +63 @@
       DosDupHandle(fileno(fp), &oldstdout);
       runemf2(SEPARATE | INVISIBLE | FULLSCREEN | BACKGROUND | WAIT,
-              hwnd, NULL, NULL, "%s", "RMVIEW.EXE");
+              hwnd, pszSrcFile, __LINE__,
+              NULL, NULL, "%s", "RMVIEW.EXE");
       oldstdout = fileno(stdout);
       DosDupHandle(newstdout, &oldstdout);

trunk/dll/systemf.c

@@ -71 +71 @@
 
 int ExecOnList(HWND hwnd, char *command, int flags, char *tpath,
-               char **list, char *prompt)
+               char **list, char *prompt, PCSZ pszCallingFile, UINT uiLineNumber)
 {
   /* executes the command once for all files in list */
@@ -591 +591 @@
       ex.flags = flags;
     ex.flags &= (~PROMPT);
-    return runemf2(ex.flags, hwnd, path,
+    return runemf2(ex.flags, hwnd, pszCallingFile, uiLineNumber, path,
                    (*ex.environment) ? ex.environment : NULL,
                    "%s", commandline);
@@ -599 +599 @@
 //== runemf2() run requested app, return -1 if problem starting else return app rc ==
 
-int runemf2(int type, HWND hwnd, char *pszDirectory, char *pszEnvironment,
+int runemf2(int type, HWND hwnd, PCSZ pszCallingFile, UINT uiLineNumber,
+            char *pszDirectory, char *pszEnvironment,
             char *formatstring,...)
 {
@@ -605 +606 @@
 
    * status = runemf2(SEPARATE | WINDOWED,
-   *                  hwnd,
+   *                  hwnd, pszCallingFile, __LINE__,
    *                  NullStr,
    *                  NULL,
@@ -613 +614 @@
    *
    * use (HWND)0 for hwnd if window handle not handy.
+   * pszCallingFile and __LINE__ are used to determine caller for easier error tracking
    */
 
@@ -634 +636 @@
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
+  char szTempPgm[CCHMAXPATH], tempcom[1024], temparg[1024], buf[10] = " &|<>";
+  char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
+  UINT offsetquote;
 
   typedef struct {
@@ -675 +680 @@
   *pszPgm = 0;
   va_start(parguments,
-           formatstring);
+           formatstring);
   vsprintf(pszPgm,
            formatstring,
-           parguments);
+           parguments);
   va_end(parguments);
-
+  offsetexe = strstr(pszPgm, ".exe");
+  offsetcmd = strstr(pszPgm, ".cmd");
+  offsetcom = strstr(pszPgm, ".com");
+  offsetbtm = strstr(pszPgm, ".btm");
+  offsetbat = strstr(pszPgm, ".bat");
+  if (offsetexe)
+    offset = offsetexe;
+  else if (offsetcom)
+    offset = offsetcom;
+  else if (offsetcmd)
+    offset = offsetcmd;
+  else if (offsetbtm)
+    offset = offsetbtm;
+  else if (offsetbat)
+    offset = offsetbat;
+  else
+    offset = NULL;
+  offsetquote = strcspn(pszPgm, buf);
+  if (pszPgm[0] != '\"' && offsetquote < offset - pszPgm && offsetquote != NULL){
+    strcpy(tempcom, pszPgm);
+    tempcom[offset + 4 - pszPgm] = '\0';
+    strcpy (temparg, &pszPgm[offset + 4 - pszPgm]);
+    pszDirectory = szTempdir;
+    strcpy(pszDirectory, tempcom);
+    offset = strrchr(pszDirectory, '\\');
+    pszDirectory[offset +1 - pszDirectory] = '\0';
+    BldQuotedFileName(szTempPgm, tempcom);
+    strcat(szTempPgm, temparg);
+    memcpy(pszPgm, szTempPgm, 1024);
+    //printf("%s\n %s\n%s %s\n %d %d",
+    //       pszPgm, szTempPgm, tempcom, temparg, offset, offsetquote); fflush(stdout);
+  }
   if (pszEnvironment) {
     p = &pszEnvironment[strlen(pszEnvironment)] + 1;
@@ -789 +825 @@
           Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
                     GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
-                    pszPgm);
+                    pszPgm, pszCallingFile, __LINE__);
           DosFreeMem(pszPgm);
           if (pszArgs)
@@ -801 +837 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                          ulAppType, pszPgm);
+                          ulAppType, pszPgm, pszCallingFile, __LINE__);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -813 +849 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                          ulAppType, pszPgm);
+                          ulAppType, pszPgm, pszCallingFile, __LINE__);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -834 +870 @@
         if (ret) {
           Dos_Error(MB_ENTER,ret,hwnd,pszSrcFile,__LINE__,
-                    GetPString(IDS_DOSEXECPGMFAILEDTEXT), pszPgm);
+                    GetPString(IDS_DOSEXECPGMFAILEDTEXT), pszPgm,
+                    pszCallingFile, __LINE__);
         }
       }
@@ -903 +940 @@
       }
 
-      /* goddamned OS/2 limit */
+      // goddamned OS/2 limit
 
       if (strlen(pszPgm) + strlen(pszArgs) > 1024)
@@ -922 +959 @@
           *pszDirectory)
         switch_to(szSavedir);
-      if (rc) {
+      if (rc){
         Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
                   GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
-                  pszPgm);
+                  pszPgm, pszCallingFile, __LINE__);
         DosFreeMem(pszPgm);
         if (pszArgs)
@@ -937 +974 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                        pszPgm);
+                        pszPgm, pszCallingFile, __LINE__);
           DosFreeMem(pszPgm);
           if (pszArgs)
@@ -1106 +1143 @@
       if (ret && ret != ERROR_SMG_START_IN_BACKGROUND) {
         Dos_Error(MB_CANCEL,ret,hwnd,pszSrcFile,__LINE__,
-                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),pszPgm,pszArgs);
+                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),pszPgm,pszArgs,
+                  pszCallingFile, __LINE__);
       }
       else if (type & WAIT) {

trunk/dll/tools.c

@@ -791 +791 @@
         }
         runemf2(SEPARATE | WINDOWED,
-                hwnd, NULL, NULL, "ICONEDIT.EXE %s", filename);
+                hwnd, pszSrcFile, __LINE__,
+                NULL, NULL, "ICONEDIT.EXE %s", filename);
       }
       break;

trunk/dll/treecnr.c

@@ -2411 +2411 @@
 
       case IDM_PARTITION:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "MINILVM.EXE");
         break;
 
       case IDM_PARTITIONDF:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "DFSOS2.EXE");
         break;
 
       case IDM_PARTITIONLVMG:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "LVMGUI.CMD");
         break;
 
       case IDM_PARTITIONFD:
-        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL, NULL,
+        runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, pszSrcFile, __LINE__,
+                NULL, NULL,
                 "%s", "FDISKPM.EXE");
         break;

trunk/dll/undel.c

@@ -90 +90 @@
       DosDupHandle(fileno(fp), &oldstdout);
       runemf2(SEPARATE | INVISIBLE | WINDOWED | BACKGROUND | WAIT,
-              hwnd,
+              hwnd, pszSrcFile, __LINE__,
               NULL,
               NULL,
@@ -124 +124 @@
             if (temp == MBID_YES)
               runemf2(BACKGROUND | INVISIBLE | SEPARATE | WINDOWED,
-                      hwnd,
+                      hwnd, pszSrcFile, __LINE__,
                       NULL, NULL, "%s /C HELP UNDELETE", GetCmdSpec(FALSE));
             if (temp == MBID_CANCEL)
@@ -427 +427 @@
             fclose(fp);
             runemf2(WINDOWED | BACKGROUND | SEPARATE | INVISIBLE,
-                    hwnd,
+                    hwnd, pszSrcFile, __LINE__,
                     NULL, NULL, "%s /C \\FMUNDEL.CMD", GetCmdSpec(FALSE));
           }

trunk/dll/viewinf.c

@@ -575 +575 @@
             runemf2(SEPARATE | WINDOWED | MINIMIZED |
                     BACKGROUND | INVISIBLE,
-                    hwnd,
+                    hwnd, pszSrcFile, __LINE__,
                     NULL, NULL, "%s /C %s", GetCmdSpec(FALSE), filename);
           }

trunk/dll/worker.c

@@ -412 +412 @@
                   if (!runemf2(SEPARATE | WINDOWED |
                                fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED),
-                               HWND_DESKTOP, ex.extractdir, NULL,
+                               HWND_DESKTOP, pszSrcFile, __LINE__, ex.extractdir, NULL,
                                "%s %s %s%s%s",
                                ex.command,
@@ -857 +857 @@
                   else {
                     runemf2(SEPARATE,
-                            HWND_DESKTOP, NULL, NULL,
+                            HWND_DESKTOP, pszSrcFile, __LINE__,
+                            NULL, NULL,
                             "%s %s %s",
                             dircompare,
                             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);
                   }
                 }
@@ -884 +873 @@
                   ExecOnList(wk->hwndFrame,
                              compare,
-                             WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL);
+                             WINDOWED | SEPARATEKEEP, NULL, fakelist, NULL,
+                             pszSrcFile, __LINE__);
                 }
                 else {
@@ -1029 +1019 @@
                        "%a",
                        WINDOWED | SEPARATE | PROMPT,
-                       NULL, wk->li->list, GetPString(IDS_DOITYOURSELFTEXT));
+                       NULL, wk->li->list, GetPString(IDS_DOITYOURSELFTEXT),
+                       pszSrcFile, __LINE__);
             break;
 
@@ -1081 +1072 @@
                 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 {
@@ -1106 +1092 @@
                 }
                 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) +
                     strlen(wk->li->list[x]) + 5 > 1024) {
                   runemf2(SEPARATE | WINDOWED | BACKGROUND | MINIMIZED | WAIT,
-                          HWND_DESKTOP,
+                          HWND_DESKTOP, pszSrcFile, __LINE__,
                           (wk->li->type == IDM_FAKEEXTRACT ||
                            wk->li->type == IDM_FAKEEXTRACTM) ?
@@ -1235 +1216 @@
               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) {
@@ -1249 +1225 @@
               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]);
                 memset(&fsa, 0, sizeof(FILESTATUS3));
                 DosError(FERR_DISABLEHARDERR);
@@ -1264 +1232 @@
                 if (fsa.attrFile & FILE_DIRECTORY) {
                   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] ||
@@ -1277 +1240 @@
                   runemf2(SEPARATE | WINDOWED | WAIT |
                           (fArcStuffVisible ? 0 : (BACKGROUND | MINIMIZED)),
-                          HWND_DESKTOP, NULL, NULL,
+                          HWND_DESKTOP, pszSrcFile, __LINE__, NULL, NULL,
                           "%s", szBuffer);
                   DosSleep(1);
@@ -1305 +1268 @@
               ExecOnList((HWND) 0,
                          binview,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL);
+                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         pszSrcFile, __LINE__);
               break;
             }
@@ -1315 +1279 @@
                          WINDOWED | SEPARATE |
                          ((fViewChild) ? CHILD : 0),
-                         NULL, wk->li->list, NULL);
+                         NULL, wk->li->list, NULL,
+                         pszSrcFile, __LINE__);
             else {
 
@@ -1349 +1314 @@
               ExecOnList((HWND) 0,
                          bined,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL);
+                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         pszSrcFile, __LINE__);
               break;
             }
@@ -1358 +1324 @@
               ExecOnList((HWND) 0,
                          editor,
-                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL);
+                         WINDOWED | SEPARATE, NULL, wk->li->list, NULL,
+                         pszSrcFile, __LINE__);
             else {