Changeset 1656 for trunk/dll/defview.c

Timestamp:

Jan 8, 2012, 7:19:22 PM (14 years ago)

Author:

Gregg Young

Message:

Completely rework ShowMultimedia to only test and try to open files with known multimedia extensions. This fixes some traps in GBM.DLL and PMCTLS.DLL; mmioIdentifyFile appears to pretty much be broken.

File:

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

trunk/dll/defview.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2008 Steven H.Levine
+  Copyright (c) 2003, 2012 Steven H.Levine
 
   Default file viewer
@@ -28 +28 @@
                 It was redundant.
   12 Dec 09 GKY Pass .WPI files to PM for default handling.
+  02 Jan 12 GKY Completely rework ShowMultimedia to only test and try to open files with known multimedia extensions
+                This fixes some traps in GBM.DLL and PMCTLS.DLL; mmioIdentifyFile appears to pretty much be broken.
 
 ***********************************************************************/
@@ -143 +145 @@
         return played;
     }
+    else
+        return played;
   }
   memset(&mmFormatInfo, 0, sizeof(MMFORMATINFO));
@@ -150 +154 @@
                          MMIO_FORCE_IDENTIFY_FF);
   DosFreeModule(MMIOModHandle);
-  p = strrchr(filename, '.');
-  if (!p)
-    p = ".";
-  /* if identified and not FOURCC_DOS  MPEGs are misidentified as DOS*/
+
+  // if identified and not FOURCC_DOS  MPEGs are misidentified as DOS
   //DbgMsg(pszSrcFile, __LINE__, "FOUCC %x %s %i", mmFormatInfo.fccIOProc,
   //       mmFormatInfo.szDefaultFormatExt, mmFormatInfo.ulMediaType);
@@ -167 +169 @@
     }
     else if (mmFormatInfo.ulMediaType != MMIO_MEDIATYPE_IMAGE) {
-        /* is a multimedia file (WAV, MID, AVI, etc.) */
+        // 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