Changeset 888 for trunk/dll/mainwnd.c

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

File:

• trunk/dll/mainwnd.c (modified) (4 diffs)

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;