Changeset 630 for trunk/dll/defview.c

Timestamp:

Apr 23, 2007, 12:07:06 AM (18 years ago)

Author:

Gregg Young

Message:

Improved fix of utility app path problem

File:

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

trunk/dll/defview.c

@@ -42 +42 @@
   BOOL played = FALSE;
   CHAR loaderror[CCHMAXPATH];
-  CHAR fbuf[CCHMAXPATH];
   HMODULE MMIOModHandle = NULLHANDLE;
   PMMIOIDENTIFYFILE pMMIOIdentifyFile = NULL;
@@ -158 +157 @@
   if (!rc && mmFormatInfo.fccIOProc != FOURCC_DOS) {
     if (mmFormatInfo.ulMediaType == MMIO_MEDIATYPE_IMAGE &&
-        (mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
-        /* 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);
-      }
+        (mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
+      // is an image that can be translated
+      RunFM2Util("IMAGE.EXE", filename);
       played = TRUE;
     }
@@ -189 +171 @@
           if  (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC"))
               OpenObject(filename, Default, hwnd);  //FM2Play fails to play these
-          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;
+          else
+            RunFM2Util("FM2PLAY.EXE", filename);
+          played = TRUE;
     }
   }