Changeset 627 for trunk/dll/defview.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/defview.c (modified) (4 diffs)

trunk/dll/defview.c

@@ -13 +13 @@
   18 Mar 07 GKY Fixed misindentifycation of nonmultimedia files by ShowMultiMedia
   18 Mar 07 GKY Open mp3, ogg & flac files with OS2 object default since fm2play fails
+  21 Apr 07 GKY Find FM2Utils by path or utils directory
 
 ***********************************************************************/
@@ -41 +42 @@
   BOOL played = FALSE;
   CHAR loaderror[CCHMAXPATH];
+  CHAR fbuf[CCHMAXPATH];
   HMODULE MMIOModHandle = NULLHANDLE;
   PMMIOIDENTIFYFILE pMMIOIdentifyFile = NULL;
@@ -157 +159 @@
     if (mmFormatInfo.ulMediaType == MMIO_MEDIATYPE_IMAGE &&
         (mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
-      /* is an image that can be translated */
-      runemf2(SEPARATE | WINDOWED,
-              HWND_DESKTOP,
-              NULL,
-              NULL,
-              "%sIMAGE.EXE \"%s\"",
-              (fAddUtils) ? "UTILS\\" : NullStr, filename);
+        /* is an image that can be translated */
+      if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                        SEARCH_CUR_DIRECTORY,
+                        "PATH", "IMAGE.EXE", fbuf, CCHMAXPATH - 1)){
+        runemf2(SEPARATE | WINDOWED,
+                HWND_DESKTOP,
+                NULL,
+                NULL,
+                "%sIMAGE.EXE \"%s\"",
+                "UTILS\\", filename);
+      }
+      else {
+        runemf2(SEPARATE | WINDOWED,
+                HWND_DESKTOP,
+                NULL,
+                NULL,
+                "IMAGE.EXE \"%s\"",
+                filename);
+      }
       played = TRUE;
     }
@@ -175 +189 @@
           if  (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC"))
               OpenObject(filename, Default, hwnd);  //FM2Play fails to play these
-          else
-              runemf2(SEPARATE | WINDOWED,
-                      HWND_DESKTOP,
-                      NULL,
-                      NULL,
-                      "%sFM2PLAY.EXE \"%s\"",
-                      (fAddUtils) ? "UTILS\\" : NullStr, filename);
+          else if (DosSearchPath(SEARCH_IGNORENETERRS | SEARCH_ENVIRONMENT |
+                                 SEARCH_CUR_DIRECTORY,
+                                 "PATH", "FM2PLAY.EXE", fbuf, CCHMAXPATH - 1)){
+                 runemf2(SEPARATE | WINDOWED,
+                         HWND_DESKTOP,
+                         NULL,
+                         NULL,
+                         "%sFM2PLAY.EXE \"%s\"",
+                         "UTILS\\" , filename);
+               }
+               else {
+                 runemf2(SEPARATE | WINDOWED,
+                         HWND_DESKTOP,
+                         NULL,
+                         NULL,
+                         "FM2PLAY.EXE \"%s\"",
+                         filename);
+               }
       played = TRUE;
     }