Changeset 627 for trunk/dll/arccnrs.c

Timestamp:

Apr 21, 2007, 9:00:20 PM (18 years ago)

Author:

Gregg Young

Message:

Eliminate global fAddUtils so can search both path and \utils for FM2PLAY.EXE & Image.exe

File:

• trunk/dll/arccnrs.c (modified) (3 diffs)

trunk/dll/arccnrs.c

@@ -36 +36 @@
   06 Apr 07 GKY Add some error checking in drag/drop
   20 Apr 07 SHL Sync with NumItemsToUnhilite mods
+  21 Apr 07 GKY Find FM2Utils by path or utils directory
 
 ***********************************************************************/
@@ -1767 +1768 @@
               if (li->type == IDM_MCIPLAY) {
 
-                FILE *fp;
+                FILE *fp;
+                CHAR fbuf[CCHMAXPATH];
 
                 fp = xfopen("$FM2PLAY.$$$", "w", pszSrcFile, __LINE__);
@@ -1775 +1777 @@
                     fprintf(fp, "%s\n", li->list[x]);
                   fprintf(fp, ";end\n");
-                  fclose(fp);
-                  runemf2(SEPARATE | WINDOWED, HWND_DESKTOP, NULL,
-                          NULL, "%sFM2PLAY.EXE /@$FM2PLAY.$$$",
-                          fAddUtils ? "UTILS\\" : NullStr);
-                }
+                  fclose(fp);
+                  if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                                 SEARCH_CUR_DIRECTORY,
+                                 "PATH", "FM2PLAY.EXE", fbuf, CCHMAXPATH - 1)){
+                    runemf2(SEPARATE | WINDOWED,
+                            HWND_DESKTOP,
+                            NULL,
+                            NULL,
+                            "%sFM2PLAY.EXE /@$FM2PLAY.$$$",
+                            "UTILS\\");
+                  }
+                   else {
+                     runemf2(SEPARATE | WINDOWED,
+                             HWND_DESKTOP,
+                             NULL,
+                             NULL,
+                             "FM2PLAY.EXE /@$FM2PLAY.$$$");
+                  }
+                }
               }
               else if (li->type == IDM_PRINT) {