Changeset 104 for trunk/classes/mm-progs/mmfind

Timestamp:

Oct 2, 2023, 11:34:35 PM (23 months ago)

Author:

gyoung

Message:

Remaining changes from merge with Lars 2.9 branch

Location:

trunk

Files:

• . (modified) (1 prop)
• classes/mm-progs/mmfind/image.c (modified) (9 diffs)
• classes/mm-progs/mmfind/mmfind.c (modified) (26 diffs)

trunk/classes/mm-progs/mmfind/image.c

@@ -26 +26 @@
     POINTL aptl[4];
     HPS    hps;
-    BOOL   bReturnCode;
     ULONG  ulHeight;
     ULONG  ulWidth;
@@ -37 +36 @@
      *  Get position of image frame
      */
-    bReturnCode = WinQueryWindowPos ( hwnd, &swp);
+    WinQueryWindowPos ( hwnd, &swp);
 
     WinQueryWindowRect(hwnd, &rectl);
@@ -48 +47 @@
         aptl[0].x=(swp.cx-ulWidth)/2;
         aptl[1].x=aptl[0].x+ulWidth;
-        
+
         aptl[0].y=(swp.cy-ulHeight)/2;
         aptl[1].y=aptl[0].y+ulHeight;
@@ -62 +61 @@
       aptl[0].x=(swp.cx-ulWidth*fRes)/2;
       aptl[1].x=aptl[0].x+ulWidth*fRes;
-      
+
       aptl[0].y=(swp.cy-ulHeight*fRes)/2;
       aptl[1].y=aptl[0].y+ulHeight*fRes;
     }
-    
+
     aptl[2].x = 0;              // source lower left
     aptl[2].y = 0;
-    
+
     aptl[3].x = ulWidth;   // source upper right
     aptl[3].y = ulHeight;
@@ -89 +88 @@
     //       WinDrawBitmap(hps, hBitmap, NULLHANDLE, (PPOINTL)aptl, 0, 0, DBM_NORMAL/*|DBM_STRETCH*/);
 #endif
-    bReturnCode = WinEndPaint (hps);
+    WinEndPaint (hps);
 }
 
@@ -96 +95 @@
 
   switch (msg)
-    {      
+    {
     case WM_PAINT:
       {
@@ -276 +275 @@
         return(0L);
       }
-    
+
 
     // ***************************************************
@@ -282 +281 @@
     // the memory device context obtained above.
     // ***************************************************
-    
+
     ImageSize.cx = dwWidth;
     ImageSize.cy = dwHeight;
@@ -300 +299 @@
                        (ULONG) MB_OK | MB_MOVEABLE |
                        MB_ERROR );
-#endif   
+#endif
         DevCloseDC(hdc);
         DosFreeMem(pRowBuffer);

trunk/classes/mm-progs/mmfind/mmfind.c

@@ -21 +21 @@
  * If you need another license for your project/product (commercial,
  * noncommercial, whatever) contact me at
- * 
+ *
  * http://www.os2world.com/cdwriting
  * http://www.geocities.com/SiliconValley/Sector/5785/
@@ -73 +73 @@
 BOOL bIsMidi=FALSE;             /* No MIDI support atm */
 BOOL bIsPlaying=FALSE;          /* TRUE if currently playing */
-BOOL bPaused=FALSE;             
+BOOL bPaused=FALSE;
 ULONG ulPos;
 ULONG ulTotalLength;
@@ -120 +120 @@
   hps=WinGetPS(HWND_DESKTOP);
 
-  /* Play */  
+  /* Play */
   hbmPlay=GpiLoadBitmap(hps, hResource, IDBMP_PLAY, 0, 0);
 
@@ -143 +143 @@
     ulStyle|=(BS_BITMAP);
     ulStyle&=~BS_TEXT;
-    
+
     if(WinSetWindowULong(hwndTemp, QWL_STYLE, ulStyle)) {
       memset(&btCtrl, 0, sizeof(btCtrl));
@@ -163 +163 @@
     ulStyle|=(BS_BITMAP);
     ulStyle&=~BS_TEXT;
-    
+
     if(WinSetWindowULong(hwndTemp, QWL_STYLE, ulStyle)) {
       memset(&btCtrl, 0, sizeof(btCtrl));
@@ -199 +199 @@
   if(!MsgGetMessage(audioText, IDSTR_AUDIOINFOTEXT, sizeof(audioText), hResMod,HWND_DESKTOP))
     strcpy(audioText, TEXT_INFOTEXT);
-  if(!MsgGetMessage(chrMediaFileTypes[MT_AUDIO], IDSTR_TYPEAUDIO, 
+  if(!MsgGetMessage(chrMediaFileTypes[MT_AUDIO], IDSTR_TYPEAUDIO,
                  sizeof(chrMediaFileTypes[MT_AUDIO]), hResMod, HWND_DESKTOP))
     strcpy(chrMediaFileTypes[MT_AUDIO], TEXT_TYPEAUDIO);
-  if(!MsgGetMessage(chrMediaFileTypes[MT_IMAGE], IDSTR_TYPEIMAGE, 
+  if(!MsgGetMessage(chrMediaFileTypes[MT_IMAGE], IDSTR_TYPEIMAGE,
                  sizeof(chrMediaFileTypes[MT_IMAGE]), hResMod, HWND_DESKTOP))
     strcpy(chrMediaFileTypes[MT_AUDIO], TEXT_TYPEIMAGE);
-  if(!MsgGetMessage(chrMediaFileTypes[MT_VIDEO], IDSTR_TYPEVIDEO, 
+  if(!MsgGetMessage(chrMediaFileTypes[MT_VIDEO], IDSTR_TYPEVIDEO,
                  sizeof(chrMediaFileTypes[MT_VIDEO]), hResMod, HWND_DESKTOP))
     strcpy(chrMediaFileTypes[MT_VIDEO], TEXT_TYPEVIDEO);
@@ -272 +272 @@
   char chrCommand[50];
   char retMsg[100];
-  ULONG rc;
 
   if(bIsPlaying) {
     sprintf(chrCommand,"stop wave%ld wait", hwndNotify);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-    
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+
     sprintf(chrCommand,"close wave%ld wait", hwndNotify);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-
-#if 0    
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+
+#if 0
     _resetDisplay(hwndFrame);
     showPlayTimeDisplay( hwndFrame, TRUE);
@@ -287 +286 @@
 #endif
     bIsPlaying=FALSE;
-    bPaused=FALSE;  
+    bPaused=FALSE;
   }
 
@@ -319 +318 @@
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
 
-  /* Start audio file */  
+  /* Start audio file */
   sprintf(chrCommand,"open \"%s\"  type %s alias wave%ld SHAREABLE wait", chrSourceName, chrDevice, hwndNotify);
 
@@ -326 +325 @@
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS)
     return 0;
-  
+
   /* Set time format */
   sprintf(chrCommand,"SET wave%ld TIME FORMAT MILLISECONDS wait", hwndNotify);
@@ -334 +333 @@
     rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     return 0;
-  }      
+  }
 
 #if 0
@@ -420 +419 @@
 
 /* Every folder has one running play thread to handle play commands */
-void _Optlink playThreadFunc (void *arg)
+void playThreadFunc (void *arg)
 {
   HAB  hab;
@@ -488 +487 @@
   if(MMIO_SUCCESS!=mmioIdentifyFile(chrFile, &mmioInfo, &mmFormatInfo, &fourCC, 0,0))
     {
-      return MT_UNKNOWN; 
+      return MT_UNKNOWN;
     }
 
@@ -539 +538 @@
         }
         /* Fill combo box with media types (audio, image, video) */
-        for(a=0;a<NUMMEDIATYPES;a++) 
-          WinSendMsg(WinWindowFromID(hwnd, IDCB_TYPEOFFILE), LM_INSERTITEM, MRFROMSHORT(LIT_SORTASCENDING), 
+        for(a=0;a<NUMMEDIATYPES;a++)
+          WinSendMsg(WinWindowFromID(hwnd, IDCB_TYPEOFFILE), LM_INSERTITEM, MRFROMSHORT(LIT_SORTASCENDING),
                      MPFROMP(chrMediaFileTypes[a]));
         WinSetWindowText(WinWindowFromID(hwnd, IDCB_TYPEOFFILE), chrMediaFileTypes[0]);
@@ -681 +680 @@
                   mmio.ulFlags=MMIO_READ;
                   mmio.ulTranslate=MMIO_TRANSLATEHEADER;
-                  
+
                   hmmio = mmioOpen(chrFullName, &mmio, MMIO_READ);
                   if(!hmmio)
@@ -689 +688 @@
                   rc = mmioGetHeader(hmmio, &mmAudioHeader,sizeof(MMAUDIOHEADER),
                                      &lBytesRead, 0, 0);
-                  
+
                   mmioClose(hmmio, 0);
                   if(rc!=MMIO_SUCCESS) {
@@ -785 +784 @@
   APIRET   rc;                        /* return code from REXX     */
   SHORT    rexxrc = 0;                /* return code from function */
-  char theScript[CCHMAXPATH];  
+  char theScript[CCHMAXPATH];
   /* By setting the strlength of the output RXSTRING to zero, we   */
   /* force the interpreter to allocate memory and return it to us. */
   /* We could provide a buffer for the interpreter to use instead. */
   rexxretval.strlength = 0L;          /* initialize return to empty*/
-    
+
   sprintf(theScript, "%s\\%s", pszBinDir, rexxFile);
 
@@ -807 +806 @@
 #if 0
   if(rc) {
-    sprintf(text,"Error in the Rexx skript %s\n\n Get more information with 'help REX%04d'.\n", 
+    sprintf(text,"Error in the Rexx skript %s\n\n Get more information with 'help REX%04d'.\n",
             tPt->rexxSkript, rc*-1);
     WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, text, "", 1234, MB_OK|MB_MOVEABLE|MB_ERROR);
@@ -822 +821 @@
   }
   if(rexxretval.strptr)
-    DosFreeMem(rexxretval.strptr);          /* Release storage given to us by REXX.  */      
+    DosFreeMem(rexxretval.strptr);          /* Release storage given to us by REXX.  */
   if(!rc)
     return TRUE;
@@ -845 +844 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_IMAGE;
-    mmFormatInfo.ulFlags|=MMIO_CANREADTRANSLATED;/* Read !!!*/    
+    mmFormatInfo.ulFlags|=MMIO_CANREADTRANSLATED;/* Read !!!*/
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -873 +872 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -891 +890 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -919 +918 @@
             }
           }
-        }  
+        }
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -952 +951 @@
   if(hab) {
     hmq=WinCreateMsgQueue(hab,0);
-    if(hmq) {  
-      /* Check if user started prog by hand */   
+    if(hmq) {
+      /* Check if user started prog by hand */
       if(argc!=NUMPARAMS) {/* Not the right num of params */
         pmUsage();
       }
       else {
-        HWND hwndDlg;       
-
-        /* Get our ressource dll */  
+        HWND hwndDlg;
+
+        /* Get our ressource dll */
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
         /* Load NLV strings */
@@ -1031 +1030 @@
           {
             if(hBitmap)
-              GpiDeleteBitmap(hBitmap);  
+              GpiDeleteBitmap(hBitmap);
             if( fd.lReturn == DID_OK )
               {
@@ -1056 +1055 @@
                     {
                       HOBJECT hObject;
-                      char *chr;
                       if((hObject=WinQueryObject(fd.szFullFile))!=NULLHANDLE)
                         WinOpenObject(hObject, ID_MENU_PLAYER /* OPEN_DEFAULT */, TRUE);
 #if 0
                       /* Open folder */
-                      if((chr=strrchr(fd.szFullFile, '\\'))!=NULLHANDLE) {
-                        *chr=0;
+                      if(strrchr(fd.szFullFile, '\\')!=NULLHANDLE) {
                         if((hObject=WinQueryObject(fd.szFullFile))!=NULLHANDLE)
                           WinOpenObject(hObject, OPEN_CONTENTS, TRUE);