Changeset 888 for trunk/dll/misc.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/misc.c (modified) (7 diffs)

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;
     }