Changeset 887 for trunk/dll/defview.c

Timestamp:

Dec 21, 2007, 1:29:04 AM (18 years ago)

Author:

Gregg Young

Message:

Work around to fix MMPM code not opening .jpg files (ticket 105)

File:

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

trunk/dll/defview.c

@@ -112 +112 @@
              /* printf("%s %d %s\n",
               __FILE__, __LINE__, p); fflush(stdout);*/
-          if  (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC")){
+          if  (!stricmp(p, ".OGG") || !stricmp(p, ".MP3") || !stricmp(p, ".FLAC") ||
+               !stricmp(p, ".JPG") || !stricmp(p, ".JPEG")){
              hmmio = pMMIOOpen(filename,
                     &mmioinfo,
@@ -158 +159 @@
     if (mmFormatInfo.ulMediaType == MMIO_MEDIATYPE_IMAGE &&
         (mmFormatInfo.ulFlags & MMIO_CANREADTRANSLATED)) {
-      // is an image that can be translated
-      RunFM2Util("IMAGE.EXE", filename);
-      played = TRUE;
+      p = strrchr(filename, '.');
+          if (!p)
+              p = ".";
+             /* printf("%s %d %s\n",
+              __FILE__, __LINE__, p); fflush(stdout);*/
+          if  (!stricmp(p, ".JPG") || !stricmp(p, ".JPEG"))
+            OpenObject(filename, Default, hwnd);  //Image fails to display these
+          else       // is an image that can be translated
+            RunFM2Util("IMAGE.EXE", filename);
+          played = TRUE;
     }
     else if (mmFormatInfo.ulMediaType != MMIO_MEDIATYPE_IMAGE) {
@@ -271 +279 @@
     case IDM_EDITBINARY:
       if (*bined) {
-        ExecOnList((HWND) 0, bined, WINDOWED | SEPARATE, NULL, dummy, NULL);
+        ExecOnList((HWND) 0, bined, WINDOWED | SEPARATE, NULL, dummy, NULL,
+                   pszSrcFile, __LINE__);
         break;
       }
@@ -277 +286 @@
     case IDM_EDITTEXT:
       if (*editor)
-        ExecOnList((HWND) 0, editor, WINDOWED | SEPARATE, NULL, dummy, NULL);
+        ExecOnList((HWND) 0, editor, WINDOWED | SEPARATE, NULL, dummy, NULL,
+                   pszSrcFile, __LINE__);
       else {
         type = (type == IDM_EDITTEXT) ? 8 : (type == IDM_EDITBINARY) ? 16 : 0;
@@ -308 +318 @@
                            viewer,
                            WINDOWED | SEPARATE |
-                           ((fViewChild) ? CHILD : 0), NULL, dummy, NULL);
+                           ((fViewChild) ? CHILD : 0), NULL, dummy, NULL,
+                           pszSrcFile, __LINE__);
               }
               else if (fUseNewViewer) {