Changeset 1783 for trunk/dll/defview.c

Timestamp:

Jul 19, 2014, 10:39:26 PM (11 years ago)

Author:

Gregg Young

Message:

Fix shift click on windows bitmap opens fm2play because MMOS2 identifies it as an audio file. Ticket [541]

File:

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

trunk/dll/defview.c

@@ -31 +31 @@
                 This fixes some traps in GBM.DLL and PMCTLS.DLL; mmioIdentifyFile appears to pretty much be broken.
   28 Jun 14 GKY Fix errors identified with CPPCheck
+  19 Jul 14 GKY MMOS2 misids all kinds of things including window bitmaps as audio files
+                Removed FM2play from code since the misid leads to a failure to open the
+                bitmaps.
 
 ***********************************************************************/
@@ -161 +164 @@
   if (!rc && (mmFormatInfo.fccIOProc != FOURCC_DOS ||
               !stricmp(p, PCSZ_DOTMPG) || !stricmp(p, PCSZ_DOTMPEG))) {
-    if (mmFormatInfo.ulMediaType == MMIO_MEDIATYPE_IMAGE &&
-        (mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
-      //if (!stricmp(p, PCSZ_DOTJPG) || !stricmp(p, PCSZ_DOTJPEG))
-        OpenObject(filename, Default, hwnd);  //Image fails to display these
-     // else       // is an image that can be translated
-      //  RunFM2Util(PCSZ_IMAGEEXE, filename); // 29 Oct 11 GKY Image.exe doesn't handle multilayer bitmaps or jpgs
-      played = TRUE;
-    }
-    else if (mmFormatInfo.ulMediaType != MMIO_MEDIATYPE_IMAGE) {
-        // is a multimedia file (WAV, MID, AVI, etc.)
-      if (!stricmp(p, PCSZ_DOTOGG) || !stricmp(p, PCSZ_DOTMP3) || !stricmp(p, PCSZ_DOTFLAC))
-        OpenObject(filename, Default, hwnd);  //FM2Play fails to play these
-      else
-        RunFM2Util(PCSZ_FM2PLAYEXE, filename);
-      played = TRUE;
+    if ((mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
+        OpenObject(filename, Default, hwnd);
+        played = TRUE;
     }
   }
@@ -354 +345 @@
                 StartMLEEditor(hwndParent, 5, filename, hwndFrame);
             }
-            //}
           }
         }