Changeset 4 for trunk/classes/c

Timestamp:

Jul 13, 2017, 5:17:57 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27

Location:

trunk/classes/c

Files:

• c_audio/cwaudio.c (modified) (1 diff)
• c_common/helper.c (modified) (2 diffs)
• c_image/cwimage.c (modified) (1 diff)
• c_video/cwmpg.c (modified) (5 diffs)
• c_video/cwvideo.c (modified) (5 diffs)

trunk/classes/c/c_audio/cwaudio.c

@@ -70 +70 @@
 char chrHelpLibrary[CCHMAXPATH]={0};
 char chrInstallDir[CCHMAXPATH]={0};
-char chrMMAudioExt[200]={0};/* Array holding the extensions for wpclsQueryInstanceFilter() */
+char chrMMAudioExt[400]={0};/* Array holding the extensions for wpclsQueryInstanceFilter() */
 char resDLLPath[CCHMAXPATH]={0};
 

trunk/classes/c/c_common/helper.c

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2001/2004
+ * This file is (C) Chris Wohlgemuth 2001-2005
  */
 /*
@@ -329 +329 @@
 }
 
+/* MMCLS_INI_FILE_NAME = "\\cwmm.ini" See ...\common.h */
 PSZ _queryMMClassIniFile(void)
 {
   static char iniName[CCHMAXPATH]= {0};
 
-  if(iniName[0]==0)
-    sprintf(iniName, "%s\\bin\\CWMM.INI", queryInstallDir());
+  if(iniName[0]==0) {
+    /* Default is INI file in users home dir */
+    if(SysQueryHomeDir(iniName, sizeof(iniName))) {
+      strlcat(iniName, MMCLS_INI_FILE_NAME, sizeof(iniName)); /* MMCLS_INI_FILE_NAME = "\\CWMM.INI" */
+      return iniName;
+    }
+
+    sprintf(iniName, "%s\\bin%s", queryInstallDir(), MMCLS_INI_FILE_NAME);
+  }
 
   return iniName;

trunk/classes/c/c_image/cwimage.c

@@ -1974 +1974 @@
           /* This extension is yet unknown */
           if(chrMMImageExt[0]==0) {
+            /* It's the first one */
             sprintf(chrMMImageExt,"*.%s", pmmFormatInfoArray->szDefaultFormatExt);
-            //   fFirstExt=FALSE;
           }
           else {
-            strncat(chrMMImageExt,",*.",sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
-            strncat(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt, sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+            /* Check if the extension is not already added (e.g. TIF has a lot of subformats) */
+            if(!strstr(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt)) {
+              strncat(chrMMImageExt,",*.",sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+              strncat(chrMMImageExt, pmmFormatInfoArray->szDefaultFormatExt, sizeof(chrMMImageExt)-1-strlen(chrMMImageExt));
+            }
           }
           //          HlpWriteToTrapLog("Known Extension: %s\n", chrMMImageKnownExt);

trunk/classes/c/c_video/cwmpg.c

@@ -1 +1 @@
 /*
- * (C) Chris Wohlgemuth 2002-2004
+ * (C) Chris Wohlgemuth 2002-2005
  *
  */
@@ -41 +41 @@
 #include "helpid.h"
 #include "cwmpg.ih"
+#include "cwaudioinc.h" /* For REXX script name */
+#include "sys_funcs.h"
 
 extern char chrHelpLibrary[CCHMAXPATH];
+char chrMMMPGExt[400]={0};/* Array holding the extensions for wpclsQueryInstanceFilter() */
 
 HMODULE queryResModuleHandle(void);
@@ -48 +51 @@
 BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
 ULONG launchPMProg(PSZ pszTitle, PSZ wrapperExe, PSZ parameters,  CWMMDataFile *thisPtr, ULONG ulView);
-
+BOOL getStringFromRexxScript(PSZ rexxFile, char* chrResult, ULONG ulSize);
 
 /*
@@ -155 +158 @@
     M_MMMPGMethodDebug("M_MMMPG","cwmpgM_wpclsQueryInstanceFilter");
 
-    return "*.MPG,*.VBS";
+    /* This list is build in wpclsInitData() */
+    return chrMMMPGExt;
 }
 
@@ -189 +193 @@
 
 
+SOM_Scope void  SOMLINK cwmpgM_wpclsInitData(M_MMMPG *somSelf)
+{
+  static BOOL bGotMPEGExt=FALSE;
+
+    /* M_MMMPGData *somThis = M_MMMPGGetData(somSelf); */
+    M_MMMPGMethodDebug("M_MMMPG","cwmpgM_wpclsInitData");
+
+    /* 
+       Taken from the audio classes. I suspect the same is true for the video classes.
+       Anyway it wont hurt having this here.
+
+       Get extensions of additional audio procs. These extensions may be specified by
+       newly installed IO procs in MMPM2.INI or by using the Multimedia setup. For
+       example the MMIOMP3 procedure for reading MP3 files adds the MP3 extension this
+       way to the system. Extensions already handled by a specialized class will be
+       filtered in the called REXX script e.g. MP3 so only unknown extensions end up here.
+
+       Strangely enough wpclsQueryInstanceFilter() is called during wpclsInitData() so
+       we query the extensions here before calling the parent.
+
+       FIXME:
+       The check is only done once during initialization. This is a little annoyance for
+       the user because new extension specified in the settings will only be picked up
+       on next WPS start. 
+       */
+     if(!bGotMPEGExt)
+      {
+        /* REXX script: "mpegext.rx" */
+        getStringFromRexxScript(MMMPG_GETEXT_RX, chrMMMPGExt, sizeof(chrMMMPGExt));
+        /* Add our default extension *.MPG */
+        if(chrMMMPGExt[0]==0)
+          /* It's the first one */
+          strcpy(chrMMMPGExt,"*.MPG,*.VBS");
+        else 
+          strlcat(chrMMMPGExt, ",*.MPG,*.VBS", sizeof(chrMMMPGExt));
+        bGotMPEGExt=TRUE; 
+      }
+
+    M_MMMPG_parent_M_MMVideo_wpclsInitData(somSelf);
+}
+
 /*
  * SOM_Scope BOOL  SOMLINK cwmpgM_wpclsQueryDefaultHelp(M_CWMPG *somSelf, 

trunk/classes/c/c_video/cwvideo.c

@@ -1 +1 @@
 /*
- * (C) Chris Wohlgemuth 2002-2003
+ * (C) Chris Wohlgemuth 2002-2005
  *
  */
@@ -39 +39 @@
 #include <os2.h>
 #include "cwvideo.ih"
+#include "cwaudioinc.h" /* For REXX script name */
 //#include "cwmmres.h"
 //#include "mmres.h"
@@ -46 +47 @@
 BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
 ULONG launchPMProg(PSZ pszTitle, PSZ wrapperExe, PSZ parameters,  CWMMDataFile *thisPtr, ULONG ulView);
-
+BOOL getStringFromRexxScript(PSZ rexxFile, char* chrResult, ULONG ulSize);
+
+char chrMMVideoExt[400]={0};/* Array holding the extensions for wpclsQueryInstanceFilter() */
 
 /*
@@ -184 +187 @@
 
 
+SOM_Scope PSZ  SOMLINK cwvideoM_wpclsQueryInstanceType(M_MMVideo *somSelf)
+{
+  /*   static char chrTitle[40]={0}; */
+    /* M_MMVideoData *somThis = M_MMVideoGetData(somSelf); */
+    M_MMVideoMethodDebug("M_MMVideo","cwvideoM_wpclsQueryInstanceType");
+
+#if 0
+    /* The type probably shouldn't be translated to make changing files between languages
+       easier.*/
+    if(chrTitle[0]==0)
+      if(!getMessage(chrTitle, IDSTR_CWVIDEOTITLE, sizeof(chrTitle), queryResModuleHandle(), HWND_DESKTOP))
+        strcpy(chrTitle,"Digital video");
+#endif
+    return TYPE_DIGITALVIDEO;
+    /*  return (M_MMVideo_parent_M_CWMMDataFile_wpclsQueryInstanceType(somSelf)); */
+}
+
+SOM_Scope PSZ  SOMLINK cwvideoM_wpclsQueryInstanceFilter(M_MMVideo *somSelf)
+{
+    /* M_MMVideoData *somThis = M_MMVideoGetData(somSelf); */
+    M_MMVideoMethodDebug("M_MMVideo","cwvideoM_wpclsQueryInstanceFilter");
+
+    /* The list of additional extensions is built in wpclsInitData(). 
+
+       FIXME
+       This is a static list read in only once during startup.
+       Should probably be changed later on.
+       */
+    return chrMMVideoExt;
+
+    /* return (M_MMVideo_parent_M_CWMMDataFile_wpclsQueryInstanceFilter(somSelf)); */
+}
+
 /*
  * SOM_Scope PSZ  SOMLINK cwvideoM_wpclsQueryTitle(M_CWVideo *somSelf)
@@ -204 +240 @@
 }
 
+
+SOM_Scope void  SOMLINK cwvideoM_wpclsInitData(M_MMVideo *somSelf)
+{
+  static BOOL bGotVideoExt=FALSE;
+
+    /* M_MMVideoData *somThis = M_MMVideoGetData(somSelf); */
+    M_MMVideoMethodDebug("M_MMVideo","cwvideoM_wpclsInitData");
+
+    /* 
+       Taken from the audio classes. I suspect the same is true for the video classes.
+       Anyway it wont hurt having this here.
+
+       Get extensions of additional audio procs. These extensions may be specified by
+       newly installed IO procs in MMPM2.INI or by using the Multimedia setup. For
+       example the MMIOMP3 procedure for reading MP3 files adds the MP3 extension this
+       way to the system. Extensions already handled by a specialized class will be
+       filtered in the called REXX script e.g. MP3 so only unknown extensions end up here.
+
+       Strangely enough wpclsQueryInstanceFilter() is called during wpclsInitData() so
+       we query the extensions here before calling the parent.
+
+       FIXME:
+       The check is only done once during initialization. This is a little annoyance for
+       the user because new extension specified in the settings will only be picked up
+       on next WPS start. 
+       */
+     if(!bGotVideoExt)
+      {
+        /* REXX script: "videoext.rx" */
+        getStringFromRexxScript(MMVIDEO_GETEXT_RX, chrMMVideoExt, sizeof(chrMMVideoExt));
+        bGotVideoExt=TRUE; 
+      }
+
+    M_MMVideo_parent_M_CWMMDataFile_wpclsInitData(somSelf);
+}
 
 /*