Changeset 570

Timestamp:

Mar 19, 2007, 4:19:33 AM (19 years ago)

Author:

Gregg Young

Message:

Updated arc visible viewer child hang fix; fixed 70 misid of files by showMM

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• defview.c (modified) (5 diffs)
• fm3dll.h (modified) (2 diffs)

trunk/dll/arccnrs.c

@@ -1372 +1372 @@
         free(s);
         if (IsFile(filename) == 1) {
-          if (fViewChild)
-            DosSleep(250);              // Allow unzip session to finish closing 14 Mar 07 SHL
+          if (fViewChild && fArcStuffVisible)
+            DosSleep(100);              // Allow unzip session to finish closing 14 Mar 07 SHL
           WinSendMsg(dcd->hwndCnr, UM_ENTER, MPFROMP(filename), MPVOID);
         }

trunk/dll/defview.c

@@ -5 +5 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2006 Steven H.Levine
+  Copyright (c) 2003, 2007 Steven H.Levine
 
   Default file viewer
@@ -11 +11 @@
   20 Nov 03 SHL ShowMultimedia: try to convince fmplay to not play exes (Gregg Young)
   14 Jul 06 SHL Use Runtime_Error
+  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
 
 ***********************************************************************/
@@ -41 +43 @@
   HMODULE MMIOModHandle = NULLHANDLE;
   PMMIOIDENTIFYFILE pMMIOIdentifyFile = NULL;
+  PMMIOGETINFO pMMIOGetInfo = NULL;
+  PMMIOCLOSE pMMIOClose = NULL;
+  PMMIOOPEN pMMIOOpen = NULL;
+  MMIOINFO mmioinfo;
+  HMMIO  hmmio;
   FOURCC fccStorageSystem = 0;
   MMFORMATINFO mmFormatInfo;
-  APIRET rc;
+  APIRET rc, rc1;
+  HWND hwnd;
+  char *p;
 
   if (no_mmos2 || !filename || !*filename)
@@ -63 +72 @@
       return played;
     }
+    if (DosQueryProcAddr(MMIOModHandle,
+                         0,
+                         "mmioGetInfo", (PFN *) & pMMIOGetInfo)) {
+      DosFreeModule(MMIOModHandle);
+      no_mmos2 = TRUE;
+      return played;
+    }
+    if (DosQueryProcAddr(MMIOModHandle,
+                         0,
+                         "mmioClose", (PFN *) & pMMIOClose)) {
+      DosFreeModule(MMIOModHandle);
+      no_mmos2 = TRUE;
+      return played;
+    }
+    if (DosQueryProcAddr(MMIOModHandle,
+                         0,
+                         "mmioOpen", (PFN *) & pMMIOOpen)) {
+      DosFreeModule(MMIOModHandle);
+      no_mmos2 = TRUE;
+      return played;
+    }
   }
 
   /* attempt to identify the file using MMPM/2 */
+  //printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
+  memset( &mmioinfo, '\0', sizeof(MMIOINFO) );
+  /*Eliminate non multimedia files*/
+  hmmio = pMMIOOpen(filename,
+                    &mmioinfo,
+                    MMIO_READ);
+  /*printf("%s %d %d %d %d %d\n",
+          __FILE__, __LINE__,mmioinfo.ulFlags, mmioinfo.ulErrorRet,
+         mmioinfo.pIOProc, mmioinfo.aulInfo); fflush(stdout);*/
+         if (!hmmio){
+             p = strrchr(filename, '.'); //Added to save mp3, ogg & flac which fail above test
+          if (!p)
+              p = ".";
+             /* printf("%s %d %s\n",
+              __FILE__, __LINE__, p); fflush(stdout);*/
+          if  (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC")){
+             hmmio = pMMIOOpen(filename,
+                    &mmioinfo,
+                    MMIO_READ | MMIO_NOIDENTIFY);
+             if (!hmmio){
+                 DosFreeModule(MMIOModHandle);
+                 printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
+                 return played;
+             }
+          }
+          else {
+             DosFreeModule(MMIOModHandle);
+                // printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
+                 return played;
+          }
+         }
+         if (!hmmio){
+                 DosFreeModule(MMIOModHandle);
+                // printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
+                 return played;
+             }
+
+  rc1 = pMMIOGetInfo( hmmio,
+              &mmioinfo,
+                     0L);   //
+  //printf("%s %d\n ", __FILE__, __LINE__); fflush(stdout);
   memset(&mmFormatInfo, 0, sizeof(MMFORMATINFO));
   mmFormatInfo.ulStructLen = sizeof(MMFORMATINFO);
   rc = pMMIOIdentifyFile(filename,
-                         0L,
+                         &mmioinfo,
                          &mmFormatInfo,
-                         &fccStorageSystem, 0L, MMIO_FORCE_IDENTIFY_SS | MMIO_FORCE_IDENTIFY_FF);
+                         &fccStorageSystem, 0L,
+                         MMIO_FORCE_IDENTIFY_FF);
+   /*printf("%s %d %d %d %d\n %d %d %d %s\n",
+          __FILE__, __LINE__,mmioinfo.ulFlags,
+          mmioinfo.pIOProc, mmioinfo.aulInfo,
+          mmFormatInfo.fccIOProc, mmFormatInfo.fccIOProc,
+          mmFormatInfo.ulIOProcType, mmFormatInfo.szDefaultFormatExt); fflush(stdout);*/
   /* free module handle */
+  rc1 = pMMIOClose(hmmio, 0L);
   DosFreeModule(MMIOModHandle);
 
@@ -89 +167 @@
     }
     else if (mmFormatInfo.ulMediaType != MMIO_MEDIATYPE_IMAGE) {
-      /* is a multimedia file (WAV, MID, AVI, etc.) */
-      runemf2(SEPARATE | WINDOWED,
-              HWND_DESKTOP,
-              NULL,
-              NULL,
-              "%sFM2PLAY.EXE \"%s\"",
-              (fAddUtils) ? "UTILS\\" : NullStr, filename);
+        /* is a multimedia file (WAV, MID, AVI, etc.) */
+        p = strrchr(filename, '.');
+          if (!p)
+              p = ".";
+             /* printf("%s %d %s\n",
+              __FILE__, __LINE__, p); fflush(stdout);*/
+          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);
       played = TRUE;
     }

trunk/dll/fm3dll.h

@@ -38 +38 @@
   17 Feb 07 GKY Add more file system types
   17 Feb 07 GKY Add SelectDriveIcon to streamline update.c
+  18 Mar 07 GKY Add MM import typedefines for fix for files misindentified as multimedia
 
 ***********************************************************************/
@@ -1403 +1404 @@
                                           PFOURCC, DWORD, DWORD);
 typedef MMIOIDENTIFYFILE *PMMIOIDENTIFYFILE;
+typedef DWORD(APIENTRY MMIOOPEN)( PSZ, PMMIOINFO, DWORD);
+typedef MMIOOPEN *PMMIOOPEN;
+typedef WORD (APIENTRY MMIOGETINFO)( HMMIO, PMMIOINFO, WORD);
+typedef MMIOGETINFO *PMMIOGETINFO;
+typedef WORD (APIENTRY MMIOCLOSE)( HMMIO, WORD);
+typedef MMIOCLOSE *PMMIOCLOSE;
 
 #pragma pack()