Changeset 178 for trunk/mediafolder/c

Timestamp:

May 21, 2024, 8:09:05 PM (15 months ago)

Author:

gyoung

Message:

Add Media Play Help and M3U help to their folders help menu

Location:

trunk/mediafolder/c

Files:

• m3ufolder/m3ufolderoverriddenwpmethods.cpp (modified) (8 diffs)
• mediafldr/mediadialogprocs.cpp (modified) (1 diff)
• mediafldr/mediafolderoverridenwpclsmethods.cpp (modified) (1 diff)
• mediafldr/mediafolderoverridenwpmethods.cpp (modified) (3 diffs)

trunk/mediafolder/c/m3ufolder/m3ufolderoverriddenwpmethods.cpp

@@ -21 +21 @@
 #include "sys_funcs.h"
 #include "menu_funcs.h"
+
+#if 0
+#define  _PMPRINTF_
+#include "PMPRINTF.H"
+#endif
 
 extern BOOL g_fRegisteredWindowClass;
@@ -57 +62 @@
 
 //void HlpWriteToTrapLog(const char* chrFormat, ...);
+
+void writeLog(const char* chrFormat, ...)
+{
+  char logNameLocal[CCHMAXPATH];
+  FILE *fHandle;
+
+  sprintf(logNameLocal,"d:\\cwmm.log");
+  fHandle=fopen(logNameLocal,"a");
+  if(fHandle) {
+    va_list arg_ptr;
+    void *tb;
+
+    va_start (arg_ptr, chrFormat);
+    vfprintf(fHandle, chrFormat, arg_ptr);
+    va_end (arg_ptr);
+    //    fprintf(fHandle,logText);
+    fclose(fHandle);
+  }
+}
 
 /*****************************************************/
@@ -265 +289 @@
             switch(thisPtr->usLastSelMenuItem)
               {
-#ifndef ECS
+//#ifndef ECS
               case 0x2d3:/* Help menu */
                 {
                   if(hResource) {
                     /* insert separator */
+                    getMessage(text, IDSTR_M3ULISTHELP ,sizeof(text), hResource, hwnd);
+                    menuInsertMenuItem(HWNDFROMMP(mp2), NULL, 0, ID_M3ULISTHELP, text);
                     menuInsertMenuSeparator(HWNDFROMMP(mp2), NULL, MIT_END);
                     /* Insert 'About' item */
@@ -278 +304 @@
                   break;
                 }
-#endif
+//#endif
               case 0x2d1: /* View menu */
                 /* Remove change to Tree from menubar menu */
@@ -701 +727 @@
   M3UTHREADPARMS *parms=(M3UTHREADPARMS*)arg;
 
-
-  if(!parms)
+  writeLog("Thread");
+  if(!parms) {
+    writeLog("!parms");
     return;
+  }
 
   thisPtr=(CWM3UFolder*)parms->thisPtr;
-  if(!somIsObj(thisPtr))
+  if(!somIsObj(thisPtr)) {
+    writeLog("!thisPtr");
     return;
-
-  if(!somIsObj(thisPtr->wpObjM3UFile))
+  }
+
+  if(!somIsObj(thisPtr->wpObjM3UFile)){
+    writeLog("!thisPtr->wpObjM3UFile");
     return;
+  }
 
   ulSize=sizeof(chrFileName);
-  if(!((WPFileSystem*)thisPtr->wpObjM3UFile)->wpQueryRealName(chrFileName, &ulSize, TRUE))
+  if(!((WPFileSystem*)thisPtr->wpObjM3UFile)->wpQueryRealName(chrFileName, &ulSize, TRUE)) {
+    writeLog("!chrFileName");
     return;
-
+  }
+  writeLog("chrFileName %s", chrFileName);
   hab=WinInitialize(0);
   if(hab) {
@@ -736 +770 @@
                   mrc=(PMINIRECORDCORE)WinSendMsg(hwndContainer,CM_QUERYRECORD, MPFROMSHORT(CMA_FIRST),
                                                   MPFROM2SHORT(CMA_FIRST,CMA_ITEMORDER));
-                  if(!mrc || (int)mrc==-1)
-                    break;
+                  if(!mrc || (int)mrc==-1) {
+                    writeLog("No mrc");
+#ifdef _PMPRINTF_
+                    Pmpf(("No mrc"));
+#endif
+                    break;
+                  }
 
                   do {
@@ -750 +789 @@
                       }
                     }
-                    else
-                      break;/* Error */
+                    else {
+                      writeLog("No contentobj");
+#ifdef _PMPRINTF_
+                      Pmpf(("No contentobj"));
+#endif
+                      break;/* Error */
+                    }
 
                     /* Get the name of the audio file */
                     ulSize=sizeof(chrFileName);
                     ((WPFileSystem*)contentObject)->wpQueryRealName(chrFileName,&ulSize,TRUE);
-                    /* Try next object */
+                    /* Try next object */
+                    writeLog("chrFileName %s", chrFileName);
+#ifdef _PMPRINTF_
+                    Pmpf(("chrFileName %s", chrFileName));
+#endif
                     fputs(chrFileName,fStream);
                     fputs("\n",fStream);
@@ -774 +822 @@
   thisPtr->fContentsChanged=FALSE;
   if(!parms->fSaveOnly) {
+    writeLog("Not Saveonly");
+#ifdef _PMPRINTF_
+    Pmpf(("Not Saveonly "));
+#endif
     /* Close and destroy the folder if requested */
     WinPostMsg(parms->hwndFrame, WM_CLOSE, 0, 0);

trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

@@ -256 +256 @@
               if(hResource) {
                 /* insert separator */
+                /* Insert 'About' item */
+                getMessage(text, IDSTR_MEDIAFLDHELP ,sizeof(text), hResource, hwnd);
+                menuInsertMenuItem(HWNDFROMMP(mp2), NULL, 0, ID_MEDIAFLDHELP, text);
                 menuInsertMenuSeparator(HWNDFROMMP(mp2), NULL, MIT_END);
                 /* Insert 'About' item */

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp

@@ -461 +461 @@
 {
   char chrBuf[CCHMAXPATH];
-
+      CHAR *lang = getenv("LANG");
+      PSZ  pszh = "mediafldr";
+      if (lang) {
+          if (!strnicmp(lang, "es", 2)) {
+              pszh = "mediafldr034";
+          }
+          else if (!strnicmp(lang, "tw", 2)) {
+              pszh = "mediafldr088";
+          }
+          else if (!strnicmp(lang, "de", 2)) {
+              pszh = "mediafldr049";
+          }
+          else if (!strnicmp(lang, "ru", 2)) {
+              pszh = "mediafldr007";
+          }
+          else if (!strnicmp(lang, "it", 2)) {
+              pszh = "mediafldr039";
+          }
+          else if (!strnicmp(lang, "fr", 2)) {
+              pszh = "mediafldr033";
+          }
+          else if (!strnicmp(lang, "nl", 2)) {
+              pszh = "mediafldr031";
+          }
+      }
   queryModuleHandle("M_CWMediaFolder");
-  sprintf(chrBuf,"%s\\bin\\mediafld.hlp",chrInstallDir);
+  sprintf(chrBuf,"%s\\bin\\%s.hlp",chrInstallDir, pszh);
   strncpy(chrBuffer, chrBuf, iSize);
   chrBuffer[iSize-1]=0;

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp

@@ -54 +54 @@
 
 PFNWP pfnwpGenericFrame;
+HWND  hwndHelp;
+HELPINIT hini;
 
 void errorResource();
@@ -857 +859 @@
 }
 
-
 /**************************************************************/
 /* Override function: Add the 'About' and the 'Compact' menu  */
@@ -874 +875 @@
       return TRUE;
       //#endif
+    case ID_MEDIAFLDHELP: {
+      STARTDATA SData;
+      ULONG ulSessID;
+      PID pid;
+      CHAR chrBuffer[CCHMAXPATH];
+      CHAR PgmInputs[500];
+      CHAR chrTitle[40];
+      M_CWMediaFolder*  MedFldr = new M_CWMediaFolder;
+
+      getMessage(chrTitle, IDSTR_TITLEMEDIAFOLDER,sizeof(chrTitle), queryResModuleHandle(), HWND_DESKTOP);
+      MedFldr->wpclsQueryDefaultHelp(0, chrBuffer);
+      strcpy(PgmInputs, chrBuffer);
+      strcat(PgmInputs, " \"");
+      strcat(PgmInputs, chrTitle);
+      strcat(PgmInputs, "\"");
+      memset(&SData, 0, sizeof(SData));
+      SData.Length = sizeof(SData);
+      SData.Related = SSF_RELATED_INDEPENDENT;
+      SData.FgBg = SSF_FGBG_FORE;
+      SData.TraceOpt = SSF_TRACEOPT_NONE;
+      SData.InheritOpt = SSF_INHERTOPT_SHELL;
+      SData.PgmControl = SSF_CONTROL_VISIBLE;
+      SData.SessionType = SSF_TYPE_DEFAULT;
+      SData.PgmInputs = PgmInputs;
+      SData.PgmName = "view.exe";
+
+      DosStartSession(&SData, &ulSessID, &pid);
+      delete MedFldr;
+      return TRUE;
+    }
+    case ID_M3ULISTHELP: {
+      STARTDATA SData;
+      ULONG ulSessID;
+      PID pid;
+      CHAR chrBuffer[CCHMAXPATH];
+      CHAR PgmInputs[500];
+      CHAR chrTitle[40];
+      M_CWMediaFolder*  MedFldr = new M_CWMediaFolder;
+
+      getMessage(chrTitle, IDSTR_PLAYLISTVIEWTITLE,sizeof(chrTitle), queryResModuleHandle(), HWND_DESKTOP);
+      MedFldr->wpclsQueryDefaultHelp(0, chrBuffer);
+      strcpy(PgmInputs, chrBuffer);
+      strcat(PgmInputs, " \"");
+      strcat(PgmInputs, chrTitle);
+      strcat(PgmInputs, "\"");
+      memset(&SData, 0, sizeof(SData));
+      SData.Length = sizeof(SData);
+      SData.Related = SSF_RELATED_INDEPENDENT;
+      SData.FgBg = SSF_FGBG_FORE;
+      SData.TraceOpt = SSF_TRACEOPT_NONE;
+      SData.InheritOpt = SSF_INHERTOPT_SHELL;
+      SData.PgmControl = SSF_CONTROL_VISIBLE;
+      SData.SessionType = SSF_TYPE_DEFAULT;
+      SData.PgmInputs = PgmInputs;
+      SData.PgmName = "view.exe";
+
+      DosStartSession(&SData, &ulSessID, &pid);
+      delete MedFldr;
+      return TRUE;
+    }
     case 0x2ce: /* Detail view */
       /* Call parent */