Changeset 104 for trunk/classes/mm-progs

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/MMPlayer/customprocs.c (modified) (23 diffs)
• classes/mm-progs/MMPlayer/display.c (modified) (7 diffs)
• classes/mm-progs/MMPlayer/mmplayer.c (modified) (39 diffs)
• classes/mm-progs/MMPlayer/playaudio.c (modified) (9 diffs)
• classes/mm-progs/audioconverter/audconv.c (modified) (37 diffs)
• classes/mm-progs/imageconverter/imgconv.c (modified) (59 diffs)
• classes/mm-progs/include/mmprogs_defaults.h (modified) (2 diffs)
• classes/mm-progs/lib (copied) (copied from branches/v2.9_Lars/classes/mm-progs/lib )
• classes/mm-progs/makefile (modified) (3 diffs)
• classes/mm-progs/master_volume/makefile (modified) (1 diff)
• classes/mm-progs/master_volume/volume.c (modified) (30 diffs)
• classes/mm-progs/mmfind/image.c (modified) (9 diffs)
• classes/mm-progs/mmfind/mmfind.c (modified) (26 diffs)
• classes/mm-progs/mmprog.inc (modified) (1 diff)
• classes/mm-progs/videoplayer/mmplayer.c (modified) (38 diffs)
• classes/mm-progs/volume/classvol.c (modified) (19 diffs)

trunk/classes/mm-progs/MMPlayer/customprocs.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/
@@ -43 +43 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 
@@ -70 +71 @@
       {
         PDRAGINFO pdi=PVOIDFROMMP(mp1);
-        
+
         return handleDrag0ver( pdi, WinQueryWindow(hwnd, QW_PARENT));
       }
@@ -76 +77 @@
       {
         PDRAGINFO pdi=PVOIDFROMMP(mp1);
-        
+
         return handleDrop( pdi, WinQueryWindow(hwnd, QW_PARENT));
       }
@@ -104 +105 @@
         if(swp.fl & SWP_MINIMIZE)
           break;
-  
+
         hps=WinBeginPaint(hwnd, NULLHANDLE, NULLHANDLE);
         WinQueryWindowRect(hwnd, &rcl);
         WinDrawBitmap(hps, allBMPs[MAIN_BMP_IDX].hbm,
-                      NULLHANDLE, 
+                      NULLHANDLE,
                       (PPOINTL)&rcl,
                       0, 0,
-                      DBM_IMAGEATTRS);    
+                      DBM_IMAGEATTRS);
         WinEndPaint(hps);
         return MRFALSE;
@@ -183 +184 @@
 
   WinDrawBitmap(ubPtr->hps, ci.hbmSource,
-                &ci.rclSource, 
+                &ci.rclSource,
                 (PPOINTL)&rcl,
                 0, 0,
@@ -211 +212 @@
   if(ulShowFeedback==2)
     return 1;
-  
+
   switch(usControl)
     {
@@ -237 +238 @@
   hps=WinGetPS(hwnd);
   WinDrawBitmap(hps, ci.hbmSource,
-                &ci.rclSource, 
+                &ci.rclSource,
                 (PPOINTL)&rcl,
                 0, 0,
@@ -255 +256 @@
 
   switch (msg)
-    {      
+    {
 #if 0
       /* Drag and drop of audio files */
@@ -330 +331 @@
         USHORT usWidth=WinQueryWindowUShort(hwnd, SLIDERARMWIDTH);
 
-        if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET && 
+        if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET &&
            y<=WinQueryWindowUShort(hwnd, SLIDERY)+WinQueryWindowUShort(hwnd, SLIDERCY)
            && y>=WinQueryWindowUShort(hwnd, SLIDERY)) {
@@ -346 +347 @@
         if(SHORT1FROMMP(mp2)) {
           hps=WinGetPS(hwnd);
-          WinQueryWindowRect(hwnd, &rcl);        
+          WinQueryWindowRect(hwnd, &rcl);
           GpiSetLineType(hps, LINETYPE_DOT);
           ptl.x=rcl.xLeft;
@@ -369 +370 @@
       if(WinQueryFocus(HWND_DESKTOP)==hwnd) {
         if(SHORT2FROMMP(mp2)==VK_TAB && (SHORT1FROMMP(mp1) & KC_VIRTUALKEY))
-          if(SHORT1FROMMP(mp1) & (KC_KEYUP|KC_PREVDOWN)) 
+          if(SHORT1FROMMP(mp1) & (KC_KEYUP|KC_PREVDOWN))
             return (MRESULT)TRUE;
 
@@ -486 +487 @@
         USHORT usWidth=WinQueryWindowUShort(hwnd, SLIDERARMWIDTH);
 
-        if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET && 
+        if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET &&
            y<=WinQueryWindowUShort(hwnd, SLIDERY)+WinQueryWindowUShort(hwnd, SLIDERCY)
            && y>=WinQueryWindowUShort(hwnd, SLIDERY)){
@@ -522 +523 @@
         USHORT usWidth=WinQueryWindowUShort(hwnd, SLIDERARMWIDTH);
 
-       
+
         lTemp=lPos;
-     
+
         rcl.xLeft=WinQueryWindowULong(hwnd, SLIDERX);
         rcl.yBottom=WinQueryWindowULong(hwnd, SLIDERY);
@@ -624 +625 @@
           LONG  lPos=WinQueryWindowULong(hwnd, SLIDERARMPOS);
           USHORT usWidth=WinQueryWindowUShort(hwnd, SLIDERARMWIDTH);
-          if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET && 
+          if(x<=lPos+usWidth+SLOFFSET && x>=lPos+SLOFFSET &&
              y<=WinQueryWindowUShort(hwnd, SLIDERY)+WinQueryWindowUShort(hwnd, SLIDERCY)
              && y>=WinQueryWindowUShort(hwnd, SLIDERY)) {
@@ -689 +690 @@
         hps=WinBeginPaint(hwnd, NULLHANDLE, NULLHANDLE);
         rcl3=rcl=rcl2;
-        /* Arm pos */        
+        /* Arm pos */
         rcl2.xLeft+=lPos;
-        /* Arm size */        
+        /* Arm size */
         rcl2.xRight=rcl2.xLeft+usWidth;
-        
+
         /* Shaft */
         /* Left part */
@@ -742 +743 @@
         if(!rc)
           {
-            WinFillRect(hps,&rcl2, CLR_PALEGRAY);        
+            WinFillRect(hps,&rcl2, CLR_PALEGRAY);
             WinDrawBorder(hps, &rcl2, 2, 2, 0, 0 ,0x0400);
           }
@@ -779 +780 @@
       return (MRESULT)FALSE;
     }
-  
+
   switch(poi->idItem)
     {
@@ -786 +787 @@
         //DosBeep(5000, 50);
       WinDrawBitmap(poi->hps, ciArm.hbmSource,
-                    &ciArm.rclSource, 
+                    &ciArm.rclSource,
                     (PPOINTL)&poi->rclItem,
                     0, 0,
@@ -796 +797 @@
         WinDrawBitmap(poi->hps,
                       ci.hbmSource,
-                      &ci.rclSource, 
+                      &ci.rclSource,
                       (PPOINTL)&poi->rclItem,
                       0, 0,
@@ -815 +816 @@
         if(!WinDrawBitmap(poi->hps, ci.hbmSource,
                           &rcl,
-                          //&ci.rclSource, 
+                          //&ci.rclSource,
                           (PPOINTL)&poi->rclItem,
                           0, 0,
@@ -863 +864 @@
         char text[100];
         CONTROLINFO ci;
-        
+
         ci=ciControls[CTRLIDX_PLAYTIME];//ciVolSliderArm;
-        
+
         hps=WinBeginPaint(hwnd, NULLHANDLE, NULL);
         if(WinQueryWindowText(hwnd, sizeof(text), text))
@@ -871 +872 @@
             POINTL ptl= {0};
             WinDrawBitmap(hps, ci.hbmSource,
-                          &ci.rclSource, 
+                          &ci.rclSource,
                           &ptl,
                           0, 0,

trunk/classes/mm-progs/MMPlayer/display.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/
@@ -42 +42 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 
 /* 0: time, 1: remaining, 2: filename */
@@ -88 +89 @@
 
 
-/* This funktion sets the playtime display according to the user settings.
+/* This function sets the playtime display according to the user settings.
    Supported are remaining time, elapsed time and ID3-tag display */
-void setPlayTimeText(hwndFrame)
+void setPlayTimeText(HWND hwndFrame)
 {
   char text[CCHMAXPATH];
@@ -112 +113 @@
         /* Show filename */
         text[0]=0;
-        
+
         if(ulTemp>=3)
           text[0]=0;
         else if(ulTemp>=0)
           strcpy(text, chrPtrName);
-        
+
 #if 0
         else
           ulTemp=15; /* Show playtime for midi files */
 #endif
-     
+
         if(ulTemp>=3||!strlen(text)) {
           /* Play time */
@@ -135 +136 @@
         ulDisplayTimer=ulTemp;
         break;
-        
+
 #if 0
         /* Show ID3 tag */
@@ -149 +150 @@
             if(ulTemp>=15)
               text[0]=0;
-            else if(ulTemp>=12) 
+            else if(ulTemp>=12)
               methodPtr(cwAudio, &chrPtr, sizeof(text), IDINFO_GENRE);
             else if(ulTemp>=9)
@@ -162 +163 @@
           else
             ulTemp=15; /* Show playtime for midi files */
-          
+
           if(ulTemp>=15||!strlen(text)) {
             /* Play time */

trunk/classes/mm-progs/MMPlayer/mmplayer.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/
@@ -52 +52 @@
 #include "sys_funcs.h"
 
-#ifndef OPEN_DEFAULT 
+#ifndef OPEN_DEFAULT
 /*  Open views for the wpOpen() method */
 
@@ -135 +135 @@
 
 /* Every folder has one running play thread to handle play commands */
-void _Optlink playThreadFunc (void *arg);
+void playThreadFunc (void *arg);
 void controlPlaying(HWND hwndDialog, ULONG ulAction, ULONG ulReserved);
 BOOL stopAudioFile(HWND hwndFrame);
@@ -211 +211 @@
   WinQueryPointerPos(HWND_DESKTOP, &ptl) ;
   WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
-  WinPopupMenu(hwnd, hwnd, hwndPopup, 
+  WinPopupMenu(hwnd, hwnd, hwndPopup,
                ptl.x, ptl.y, 0, PU_HCONSTRAIN | PU_VCONSTRAIN |
-               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  ); 
-  
+               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  );
+
 }
 
@@ -227 +227 @@
   hResource=BMP_RESSOURCEHANDLE; //_queryResModuleHandle();
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -327 +327 @@
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclSource.xLeft,ci.rclSource.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
-                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE); 
+                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE);
   oldPlayTimeProc=WinSubclassWindow(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), playTimeTextProc);
 
   /* Pos slider */
   ci=ciControls[CTRLIDX_POSSLIDER];//ciPosSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
                   ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE | SWP_SIZE);
-  
+
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
   /* Vol slider */
   ci=ciControls[CTRLIDX_VOLSLIDER];//ciVolSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
@@ -351 +351 @@
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
 }
@@ -370 +370 @@
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
     /* Problem with MCI. Clean up. The Timer will be stopped in the method */
-    stopAudioFile(hwndFrame); 
+    stopAudioFile(hwndFrame);
   }
   else {
     if(!stricmp(retMsg, "stopped")) {
       /* Audio file played. */
-      stopAudioFile(hwndFrame); 
+      stopAudioFile(hwndFrame);
     }
     showPlayTimeDisplay(hwndFrame, TRUE);/* Ensure display is visible */
@@ -391 +391 @@
       return usItems;
     }
-  
+
   return 0;
 }
@@ -397 +397 @@
 BOOL DrgVerifyTypeCW(PDRAGITEM pDragItem, char * chrType)
 {
-  /* DrgVerifyType() seems not to work when several types are in the list?? 
+  /* DrgVerifyType() seems not to work when several types are in the list??
      Dokumentation says, it works... */
   /* Only check for a single type for now */
@@ -467 +467 @@
     for(ulHash=0;*theString!='\0'; theString++)
       ulHash=*theString+37*ulHash;
-  
+
   return ulHash%HASHSIZE;
 }
@@ -538 +538 @@
 MRESULT handleDrag0ver(PDRAGINFO pdi, HWND hwnd)
 {
-  
+
   /* Only accept one file */
   if(DrgGetNumObjects(pdi)!=1) {
@@ -546 +546 @@
   if(DrgCheckForKnownType(pdi, hwnd))
     return MRFROM2SHORT(DOR_DROP, DO_COPY);
-  
-  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);  
+
+  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);
 }
 
@@ -562 +562 @@
       char chrFile[CCHMAXPATH];
       PDRAGITEM pDragItem;
-      
+
       pDragItem=DrgQueryDragitemPtr(pdi, 0);
-      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile); 
-      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName); 
+      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile);
+      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName);
       strcat(chrSourceName, chrFile);
-      
+
       /* Start new file */
       controlPlaying(hwnd, PLAY_FIRST, 0);
@@ -608 +608 @@
              MPFROM2SHORT(SC_SIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Minimize from the system menu */
              MM_DELETEITEM,
              MPFROM2SHORT(SC_MINIMIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Maximize from the system menu */
              MM_DELETEITEM,
@@ -648 +648 @@
 
   switch (msg)
-    {      
+    {
     case DM_DRAGOVER:
       {
@@ -676 +676 @@
         swctl.fbJump=SWL_JUMPABLE;
         WinAddSwitchEntry(&swctl);
-        
+
         adjustDialogControlPos(hwnd);
-        
+
         /* Set volume slider*/
         WinSendMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERVOLUME),
@@ -684 +684 @@
                     MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
                     MPFROMLONG( ulVolume));
-        
+
         /* Subclass buttons for DnD */
         orgButtonProc=WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPLAY), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPAUSE), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERSTOP), buttonProc);
-                
+
         FixSysMenu(hwnd);
 
@@ -695 +695 @@
         if(allBMPs[MAIN_BMP_IDX].hbm) {
           SWP swp;
-          
-          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);         
-          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE, 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME), 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME), 
+
+          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);
+          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE,
+                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME),
+                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME),
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy,
                           SWP_SIZE|SWP_MOVE);
           orgBgProc=WinSubclassWindow(WinWindowFromID(hwnd, ID_CLIENT), bgProc);
-          
+
           WinSetWindowPos(hwnd, NULLHANDLE, 0, 0,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx+WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME)*2,
@@ -732 +732 @@
       /*****************************************************/
     case WM_APPTERMINATENOTIFY:
-      
+
       switch(SHORT1FROMMP(mp1))
         {
@@ -745 +745 @@
           return MRFALSE;
         case NOTIFY_CONTEXT:
-          /* Show context menu. */            
+          /* Show context menu. */
           HlpContextMenu(hwnd, iWhichDisplay+ID_MENUITEMELAPSED, TRUE);
           return MRFALSE;
@@ -752 +752 @@
         }
       return MRFALSE;
-      
+
       /*****************************************************/
       /* The following two messages are for device sharing */
@@ -760 +760 @@
         char chrCommand[100];
         int iWavePriv;
-    
+
         iWavePriv=ulPid;
 
@@ -791 +791 @@
       /* SETPOSITIONADVICE does not work for some reason,  */
       /* so a timer is used. Yes, it's quit cumbersome...  */
-      /*****************************************************/  
+      /*****************************************************/
     case WM_TIMER:
       if(SHORT1FROMMP(mp1)==IDTIMER_PLAY) {
@@ -812 +812 @@
             /* Set slider position */
 
-            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR), 
+            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR),
                         SLM_SETSLIDERINFO,
                         MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
@@ -898 +898 @@
         default:
           break;
-        }              
+        }
       break;
 
@@ -909 +909 @@
         char chrCommand[50];
         char retMsg[20];
-        
+
         switch(SHORT2FROMMP(mp1))
           {
@@ -939 +939 @@
                       static long lLastPos=0;
                       long lPos=LONGFROMMP(mp2);
-              
+
                       bPosDragging=TRUE;
                       lPos*=ulTotalLength/100;
                       if(lPos/1000!=lLastPos) {
                         /* Prevent flickering */
-                        sprintf(chrCommand, "%d:%02d", lPos/1000/60, (lPos/1000)%60);
+                        sprintf(chrCommand, "%lu:%02lu", lPos/1000/60, (lPos/1000)%60);
                         WinSetWindowText(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), chrCommand);
                         lLastPos=lPos/1000;
@@ -963 +963 @@
                     {
                       ULONG ulValue;
-                      
+
                       ulValue=LONGFROMMP(mp2);
                       ulVolume=ulValue;
@@ -975 +975 @@
 
                       bPosDragging=FALSE;
-                      lPos*=1000;                      
+                      lPos*=1000;
                       lPos*=ulTotalLength/100;
                       lPos/=1000;// Use only full seconds
@@ -982 +982 @@
                       seekAudioFile(lPos);
                       /* restart timer */
-                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);  
+                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);
                       ulPos=lPos/1000;
                       break;
@@ -999 +999 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -1019 +1019 @@
                      ))==NULLHANDLE)
     return FALSE;
-  
+
   ulSize=sizeof(chrFileName);
-  
+
   if ((rc = DosOpen(chrFileName, &handle, &act,
                     0L, 0, OPEN_ACTION_OPEN_IF_EXISTS,
@@ -1085 +1085 @@
 BOOL writeVolumeToIni(char * iniFile, char* chrApp, char *chrKey, ULONG ulVolume)
 {
-  
+
   return IniSaveInt(iniFile, chrApp, chrKey, ulVolume);
 }
@@ -1108 +1108 @@
   if(MMIO_SUCCESS!=mmioIdentifyFile(chrFile, &mmioInfo, &mmFormatInfo, &fourCC, 0,0))
     {
-      return 0; 
+      return 0;
     }
 
   if(mmFormatInfo.ulMediaType==MMIO_MEDIATYPE_MIDI)
     return 1; /* Midi */
-  
+
   /* Any other audio file */
   return 2;
@@ -1143 +1143 @@
   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();
@@ -1161 +1161 @@
           {
             /* FIXME: Identify error !!!*/
-            
+
           };
-        
+
         if(rc==1)
           {
@@ -1176 +1176 @@
           strcpy(chrClassName, params[1]);
 
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         //        RESSOURCEHANDLE=0;
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
@@ -1189 +1189 @@
         WinRegisterClass(WinQueryAnchorBlock(HWND_DESKTOP), SLIDER_CLASS, privateSliderProc,0, SLADDBYTES);
 
-        _loadBmps();        
+        _loadBmps();
         DosGetInfoBlocks(&ptib, &ppib);
         ulPid=ppib->pib_ulpid;
         _beginthread(playThreadFunc,NULL,8192*16, NULLHANDLE); //Fehlerbehandlung fehlt
 
-        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc, 
+        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc,
                        RESSOURCEHANDLE, IDDLG_MMPLAYER, 0) == DID_ERROR )
           {
             /*
-              Text:   
-              Title:  "Installation problem"                       
-              */             
+              Text:
+              Title:  "Installation problem"
+              */
             messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                         title, IDSTR_INSTALLERRORTITLE , sizeof(title),

trunk/classes/mm-progs/MMPlayer/playaudio.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 @@
   char chrCommand[50];
   char retMsg[100];
-  ULONG rc;
 
   iWavePriv=ulPid;
@@ -79 +78 @@
   if(bPaused) {
     sprintf(chrCommand,"RESUME wave%d wait", iWavePriv);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     bPaused=FALSE;
     showPlayTimeDisplay( hwndFrame, TRUE);
@@ -85 +84 @@
   else {
     sprintf(chrCommand,"PAUSE wave%d wait", iWavePriv);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     bPaused=TRUE;
   }
@@ -96 +95 @@
   char chrCommand[50];
   char retMsg[100];
-  ULONG rc;
 
   iWavePriv=ulPid;
-  
+
   if(bIsPlaying) {
     sprintf(chrCommand,"stop wave%d wait", iWavePriv);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-    
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+
     sprintf(chrCommand,"close wave%d wait", iWavePriv);
-    rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-    
+    mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+
     _resetDisplay(hwndFrame);
     showPlayTimeDisplay( hwndFrame, TRUE);
     WinStopTimer(WinQueryAnchorBlock(hwndFrame), hwndFrame, IDTIMER_PLAY);
     bIsPlaying=FALSE;
-    bPaused=FALSE;  
+    bPaused=FALSE;
   }
   return TRUE;
@@ -155 +153 @@
   hwndNotify=hwndFrame;//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);
 
-  /* Start audio file */  
+  /* Start audio file */
   sprintf(chrCommand,"open \"%s\"  type %s alias wave%d SHAREABLE wait", chrSourceName, chrDevice, iWavePriv);
   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwndNotify, 0);
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS)
     return 0;
-  
+
   /* Set time format */
   sprintf(chrCommand,"SET wave%d TIME FORMAT MILLISECONDS wait", iWavePriv);
@@ -168 +166 @@
     rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     return 0;
-  }      
+  }
 
 #if 0
@@ -219 +217 @@
   char chrCommand[50];
   char retMsg[20];
-  APIRET rc;
 
   sprintf(chrCommand,"PLAY wave%ld from %ld", ulPid, lPosSec);
-  rc=mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
+  mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
   //  ulStartPosition=lPosSec;
   bPaused=FALSE;
@@ -269 +266 @@
 
 /* Every folder has one running play thread to handle play commands */
-void _Optlink playThreadFunc (void *arg)
+void playThreadFunc (void *arg)
 {
   HAB  hab;

trunk/classes/mm-progs/audioconverter/audconv.c

@@ -18 +18 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */          
+ */
 /*
  * 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/
@@ -70 +70 @@
 //#define INI_NAME_COLOR        "color"
 
-void HlpSendCommandToObject(char* chrObject, char* command);
+void HlpSendCommandToObject(PSZ chrObject, PSZ command);
 BOOL percentRegisterBarClass(void);
-BOOL IniSaveWindowPos(char * iniFile, char* chrApp, char *chrKey, HWND hwnd);
-BOOL IniRestoreWindowPos(char * iniFile, char* chrApp, char *chrKey, HWND hwnd);
-BOOL IniSaveWindowClrs(char * chrIniFile, char* chrApp , HWND hwnd);
-BOOL IniRestoreWindowClrs(char * chrIniFile, char* chrApp , HWND hwnd);
-BOOL HlpBuildMMProgIniFileName(char* chrProgname, char * chrBuffer, ULONG ulBufferSize);
-HMODULE queryResModuleHandle(char *chrExePath);
+BOOL IniSaveWindowPos(PSZ iniFile, PSZ chrApp, PSZ chrKey, HWND hwnd);
+BOOL IniRestoreWindowPos(PSZ iniFile, PSZ chrApp, PSZ chrKey, HWND hwnd);
+BOOL IniSaveWindowClrs(PSZ chrIniFile, PSZ chrApp , HWND hwnd);
+BOOL IniRestoreWindowClrs(PSZ chrIniFile, PSZ chrApp , HWND hwnd);
+BOOL HlpBuildMMProgIniFileName(PSZ chrProgname, PSZ chrBuffer, ULONG ulBufferSize);
+HMODULE queryResModuleHandle(PSZ chrExePath);
 void freeResHandle();
-BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
-ULONG messageBox( char* text, ULONG ulTextID , LONG lSizeText,
-                  char* title, ULONG ulTitleID, LONG lSizeTitle,
+BOOL getMessage(PSZ text,ULONG ulID, LONG lSizeText, HMODULE hResource,HWND hwnd);
+ULONG messageBox( PSZ text, ULONG ulTextID , LONG lSizeText,
+                  PSZ title, ULONG ulTitleID, LONG lSizeTitle,
                   HMODULE hResource, HWND hwnd, ULONG ulFlags);
 
@@ -90 +90 @@
 BOOL bHaveWindowPos=FALSE;
 
-char chrTargetName[CCHMAXPATH]={0};
-char chrSourceName[CCHMAXPATH]={0};
-char chrProcName[CCHMAXPATH]={0};
-char chrIniFile[CCHMAXPATH];
+UCHAR chrTargetName[CCHMAXPATH]={0};
+UCHAR chrSourceName[CCHMAXPATH]={0};
+UCHAR chrProcName[CCHMAXPATH]={0};
+UCHAR chrIniFile[CCHMAXPATH];
 
 int numArgs;
@@ -118 +118 @@
 void pmUsage();
 
-BOOL createTargetName(char *sourceName, char *chrExt)
+BOOL createTargetName(PSZ sourceName, PSZ chrExt)
 {
-  char *textPtr;
-
-  strcpy(chrTargetName, sourceName);
-  if((textPtr=strrchr(chrTargetName, '.'))!=NULLHANDLE)
+  PCHAR textPtr=NULL;
+
+  strcpy((PCHAR)chrTargetName, (PCHAR)sourceName);
+  if((textPtr=strrchr((PCHAR)chrTargetName, '.'))!=NULL)
     *textPtr=0;
   else
-    textPtr=chrTargetName;
+    textPtr=(PCHAR)chrTargetName;
   strcat(textPtr,".");
-  strcat(textPtr, chrExt);
+  strcat(textPtr, (PCHAR)chrExt);
 #if 0
         WinMessageBox( HWND_DESKTOP, HWND_DESKTOP, textPtr,
@@ -153 +153 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_AUDIO;
-    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;    
+    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -181 +181 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -199 +199 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -214 +214 @@
     for ( index = 0, sIdx=0; index <lNumIOProcs; index++ )
       {
-        char szName[CCHMAXPATH];
-
-        mmioGetFormatName(pmmFormatInfoArray, szName, &lBytesRead, 0L, 0L);        
+        UCHAR szName[CCHMAXPATH];
+
+        mmioGetFormatName(pmmFormatInfoArray, szName, &lBytesRead, 0L, 0L);
         /* Insert NULL string terminator */
-        *( szName + lBytesRead ) = (CHAR)NULL;
+        *( szName + lBytesRead ) = 0;
 
 #ifdef DEBUG
-        SysWriteToTrapLog("%d  IO-Proc: %s, %s\n", index, 
+        SysWriteToTrapLog("%d  IO-Proc: %s, %s\n", index,
                           pmmFormatInfoArray->szDefaultFormatExt,
                           szName);
@@ -231 +231 @@
             WinSendMsg(hwndDrop, LM_INSERTITEM,(MPARAM)LIT_END,
                        (MPARAM)szName);
-            
-            
+
+
             iPrivIOProc[sIdx]=index;
-            
+
 #ifdef DEBUG
             SysWriteToTrapLog("-- %d  %d, sIdx: %d %s\n", index, iPrivIOProc[sIdx], sIdx,
@@ -240 +240 @@
                               );
 #endif
-            
-            
+
+
             /* Set text field */
             if(bNoProcGiven) {
               WinSetWindowText(hwndDrop, szName);
-              createTargetName(chrSourceName, pmmFormatInfoArray->szDefaultFormatExt);
+              createTargetName(chrSourceName, (PSZ)pmmFormatInfoArray->szDefaultFormatExt);
               iIoProc=iPrivIOProc[sIdx];
               bNoProcGiven=FALSE;
             }
             else {
-              if(!stricmp(szName, chrProcName)) {
+              if(!stricmp((PCHAR)szName, (PCHAR)chrProcName)) {
                 WinSetWindowText(hwndDrop, szName);
                 /* Create target name */
-                createTargetName(chrSourceName, pmmFormatInfoArray->szDefaultFormatExt);
+                createTargetName(chrSourceName, (PSZ)pmmFormatInfoArray->szDefaultFormatExt);
                 iIoProc=iPrivIOProc[sIdx];
               }
@@ -262 +262 @@
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -268 +268 @@
 }
 
-BOOL queryAudioInfo(char *chrFile)
+BOOL queryAudioInfo(PSZ chrFile)
 {
   HMMIO hmmio;
@@ -275 +275 @@
   LONG lBytesRead=0;
   APIRET rc;
-  
+
   memset(&mmioinfo,0, sizeof(mmioinfo));
   mmioinfo.ulTranslate = MMIO_TRANSLATEHEADER;
@@ -321 +321 @@
 #endif
 
-void _Optlink convertThreadFunc (void *arg)
+void convertThreadFunc (void *arg)
 {
   HAB  hab;
@@ -337 +337 @@
       LONG lBytesWritten=0;
       ULONG rc;
-      PBYTE buffer;
+      PCHAR buffer=NULL;
 
       do {
@@ -349 +349 @@
         if((hmmio=mmioOpen(chrSourceName, &mmioinfo,MMIO_READ))==NULLHANDLE)
           {
-            char text[500];
-            snprintf(text, sizeof(text)-1,"mmioOpen error with file %s\n", chrSourceName);
-            WinMessageBox(hwnd, hwnd, "",
+            UCHAR text[500];
+            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s\n", chrSourceName);
+            WinMessageBox(hwnd, hwnd, (PSZ)"",
                           text,
                           0UL, MB_OK | MB_ICONEXCLAMATION|MB_MOVEABLE );
@@ -360 +360 @@
                            &lBytesRead, 0, 0);
         if(rc!=MMIO_SUCCESS) {
-          char text[500];
+          UCHAR text[500];
           mmioClose(hmmio, 0);
-          snprintf(text, sizeof(text)-1,"mmioGetHeader error!");
-          WinMessageBox(hwnd, hwnd, "",
+          snprintf((PCHAR)text, sizeof(text)-1,"mmioGetHeader error!");
+          WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
                         0UL, MB_OK | MB_ICONEXCLAMATION|MB_MOVEABLE );
@@ -380 +380 @@
         if((hmmioTarget=mmioOpen(chrTargetName, &mmioinfo, MMIO_WRITE|MMIO_CREATE))==NULLHANDLE)
           {
-            char chrError[CCHMAXPATH];
-            char text[500];
+            UCHAR chrError[64];
+            UCHAR text[CCHMAXPATH*2];
             rc=mmioGetLastError(hmmioTarget);
-            mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError));
-            snprintf(text, sizeof(text)-1,"mmioOpen error with file %s:\n%s\n%d", chrTargetName, chrError,mmioinfo.ulErrorRet);
+            mciGetErrorString(mmioinfo.ulErrorRet ,chrError, sizeof(chrError)-1);
+            snprintf((PCHAR)text, sizeof(text)-1,"mmioOpen error with file %s:\n%s\n%lu", chrTargetName, chrError,mmioinfo.ulErrorRet);
             mmioClose(hmmio,0);
-            WinMessageBox(hwnd, hwnd, "",
+            WinMessageBox(hwnd, hwnd, (PSZ)"",
                           text,
                           0UL, MB_OK | MB_ICONEXCLAMATION|MB_MOVEABLE );
@@ -394 +394 @@
         rc = mmioSetHeader(hmmioTarget, &mmAudioHeader,sizeof(MMAUDIOHEADER),
                            &lBytesWritten, 0, 0);
-        
+
         /* Get buffer */
-        if((buffer=(void*)malloc(CONVERTBUFFERSIZE))==NULLHANDLE) {
-          char text[500];
+        if((buffer=(PCHAR)malloc(CONVERTBUFFERSIZE))==NULLHANDLE) {
+          UCHAR text[500];
           mmioClose(hmmio, 0);
           mmioClose(hmmioTarget,0);
-          snprintf(text, sizeof(text)-1,"Can't get memory buffer!");
-          WinMessageBox(hwnd, hwnd, "",
+          snprintf((PCHAR)text, sizeof(text)-1,"Can't get memory buffer!");
+          WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
                         0UL, MB_OK | MB_ICONEXCLAMATION|MB_MOVEABLE );
-          
+
           break;
         }
@@ -421 +421 @@
         }while(rc!=0 && rc!=MMIO_ERROR && !bBreak/*&& lBytesWritten <1000000*/);
         if(rc==MMIO_ERROR) {
-          char text[500];
-          snprintf(text, sizeof(text)-1,"Error while reading audio data!");
-          WinMessageBox(hwnd, hwnd, "",
+          UCHAR text[500];
+          snprintf((PCHAR)text, sizeof(text)-1,"Error while reading audio data!");
+          WinMessageBox(hwnd, hwnd, (PSZ)"",
                         text,
                         0UL, MB_OK | MB_ICONEXCLAMATION|MB_MOVEABLE );
         }
         if(!bBreak) {
-          char chrCommand[CCHMAXPATH*2];
+          UCHAR chrCommand[CCHMAXPATH*2];
           WinSendMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTPERCENT), MPFROMLONG(100));
           /* Refresh details view */
-          HlpSendCommandToObject(chrTargetName, "CWAUDIOREFRESH=1");
-          sprintf(chrCommand,"CWAUDIOCOPYTAGTO=%s;", chrTargetName);
+          HlpSendCommandToObject(chrTargetName, (PSZ)"CWAUDIOREFRESH=1");
+          sprintf((PCHAR)chrCommand,"CWAUDIOCOPYTAGTO=%s;", chrTargetName);
           HlpSendCommandToObject(chrSourceName, chrCommand);
         }
@@ -443 +443 @@
       }
       while(TRUE);
-      WinSendMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTDONE), 0);      
+      WinSendMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTDONE), 0);
       WinDestroyMsgQueue(hmq);
     }
@@ -464 +464 @@
 MRESULT EXPENTRY decodeStatusDialogProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  char text[CCHMAXPATH*4 +10];
-  char title[CCHMAXPATH*4];
+  UCHAR text[CCHMAXPATH*4 +10];
+  UCHAR title[CCHMAXPATH*4];
   SWCNTRL swctl;
   PID pid;
@@ -471 +471 @@
 
   switch (msg)
-    {      
+    {
     case WM_INITDLG:
 
@@ -493 +493 @@
 
       WinSendMsg(WinWindowFromID(hwnd,IDST_CONVERTNAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)CCHMAXPATH),0);
-      
-      WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTCDBITS), "");
-      
+
+      WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTCDBITS), (PSZ)"");
+
       /* Filename */
       WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTNAME), chrSourceName);
-      
+
       /* Set dialog font to WarpSans for Warp 4 and above */
       if(SysQueryOSRelease()>=40) {
@@ -507 +507 @@
 
       /* Set percent bars to 0. */
-      WinSetWindowText(WinWindowFromID(hwnd,IDBAR_CONVERTPROGRESS),"0#0%");
+      WinSetWindowText(WinWindowFromID(hwnd,IDBAR_CONVERTPROGRESS),(PSZ)"0#0%");
 
       WinSendMsg(WinWindowFromID(hwnd,IDEF_CONVERTTARGETNAME), EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)CCHMAXPATH),0);
@@ -516 +516 @@
       /* Channels */
       getMessage(title, IDSTR_CONVERTCHANNELS, sizeof(title), RESSOURCEHANDLE, hwnd);
-      sprintf(text, title, sChannels);
+      sprintf((PCHAR)text, (PCHAR)title, sChannels);
       WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTCHANNELS),text);
 
       /* Samplerate */
       getMessage(title, IDSTR_CONVERTSAMPLERATE, sizeof(title), RESSOURCEHANDLE, hwnd); 
-      sprintf(text, title, iSampleRate);
+      sprintf((PCHAR)text, (PCHAR)title, iSampleRate);
       WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTSAMPLERATE),text);
 
       /* Playtime */
       getMessage(title, IDSTR_CONVERTPLAYTIME, sizeof(title), RESSOURCEHANDLE, hwnd);   
-      sprintf(text, title, lSec/60, lSec%60);
+      sprintf((PCHAR)text, (PCHAR)title, lSec/60, lSec%60);
       WinSetWindowText(WinWindowFromID(hwnd,IDST_CONVERTPLAYTIME),text);
 
@@ -551 +551 @@
             iPercent=0;
 
-          /* Update track percent bar value. The helper prog sends us the actual decoded %. */         
+          /* Update track percent bar value. The helper prog sends us the actual decoded %. */
           sprintf(text,"%d#%d%%", iPercent, iPercent);
           WinSetWindowText(WinWindowFromID(hwnd,IDBAR_CONVERTPROGRESS), text);
@@ -593 +593 @@
 
            createTargetName(chrSourceName, pMemFormatInfo[iIoProc].szDefaultFormatExt);
-           WinSetWindowText( WinWindowFromID(hwnd,IDEF_CONVERTTARGETNAME), chrTargetName );           
+           WinSetWindowText( WinWindowFromID(hwnd,IDEF_CONVERTTARGETNAME), chrTargetName );
          }
         }
@@ -613 +613 @@
         case IDPB_CONVERTBROWSE:
           {
-            char chrTitle[200];
+            UCHAR chrTitle[200];
             FILEDLG fd = { 0 };
             /* User pressed the browse button */
@@ -652 +652 @@
             ULONG ulDiskNum;
             char cLetter;
-            
+
             WinQueryWindowText( WinWindowFromID(hwnd,IDEF_CONVERTTARGETNAME), sizeof(chrTargetName), chrTargetName );
 
@@ -669 +669 @@
             if(lFreeSpace<lAudioSize) {
               /*
-                Text:   
-                Title: 
-                */       
+                Text:
+                Title:
+                */
               getMessage(title, IDSTR_CONVERTNOSPACETEXT,sizeof(title), RESSOURCEHANDLE, hwnd);
               sprintf(text,title,lAudioSize/1000000 );
@@ -681 +681 @@
             else {
               /* Start decoding an audio file */
-              WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTOK), FALSE);            
+              WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTOK), FALSE);
               WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTABORT), TRUE);
               convertAudioFile(hwnd);
             }
-            
+
             break;
           }
@@ -695 +695 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -726 +726 @@
   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-1) {/* Not the actual num of params */
         pmUsage();
@@ -740 +740 @@
           strcpy(chrProcName, "");
         }
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         //   RESSOURCEHANDLE=0;
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
@@ -751 +751 @@
             {
               /*
-                Text:   
-                Title:  "Installation problem"                       
-                */             
+                Text:
+                Title:  "Installation problem"
+                */
               messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                           title, IDSTR_INSTALLERRORTITLE , sizeof(title),
@@ -762 +762 @@
               DosBeep(100,600);
               return( 1 );
-            }   
+            }
         }
       }

trunk/classes/mm-progs/imageconverter/imgconv.c

@@ -23 +23 @@
  * 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/
@@ -37 +37 @@
 #define INCL_PM
 
+#define USE_OS2_TOOLKIT_HEADERS
 #include <os2.h>
 
@@ -46 +47 @@
 #include "os2me.h"
 #include "mmioos2.h"
+#include <mmio.h>
 #include "common.h"
 #include "mmres.h"
@@ -143 +145 @@
     SIZEL         ImageSize;
     ULONG         dwHeight, dwWidth;
-    SHORT          wBitCount;
     FOURCC        fccStorageSystem;
     ULONG         dwPadBytes;
     ULONG         dwRowBits;
     ULONG         ulReturnCode;
-    ULONG         dwReturnCode;
-    HBITMAP       hbReturnCode;
-    LONG          lReturnCode;
     FOURCC        fccIOProc;
     HDC           hdc;
@@ -212 +210 @@
 
 
-    dwReturnCode = mmioQueryHeaderLength ( hmmio,
+    ulReturnCode = mmioQueryHeaderLength ( hmmio,
                                          (PLONG)&ulImageHeaderLength,
                                            0L,
@@ -247 +245 @@
     dwHeight = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cy;
     dwWidth = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cx;
-    wBitCount = mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
     dwRowBits = dwWidth * mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
     dwNumRowBytes = dwRowBits >> 3;
@@ -288 +285 @@
         return(0L);
       }
-    
+
 
     // ***************************************************
@@ -294 +291 @@
     // the memory device context obtained above.
     // ***************************************************
-    
+
     ImageSize.cx = dwWidth;
     ImageSize.cy = dwHeight;
@@ -312 +309 @@
                        (ULONG) MB_OK | MB_MOVEABLE |
                        MB_ERROR );
-#endif   
+#endif
         DevCloseDC(hdc);
         DosFreeMem(pRowBuffer);
@@ -350 +347 @@
     // Select the bitmap into the memory device context.
     // ***************************************************
-    hbReturnCode = GpiSetBitmap ( hps,
+    ulReturnCode = GpiSetBitmap ( hps,
                                   hbm );
 
@@ -371 +368 @@
           *  it to work. Perhaps will get to it when time is available...
           */
-         lReturnCode = GpiSetBitmapBits ( hps,
+         ulReturnCode = GpiSetBitmapBits ( hps,
                                           (LONG) dwRowCount,
                                           (LONG) 1,
@@ -379 +376 @@
 
     /* Clean up */
-    hbReturnCode = GpiSetBitmap ( hps,
+    ulReturnCode = GpiSetBitmap ( hps,
                                   NULLHANDLE );
     ulReturnCode = mmioClose (hmmio, 0L);
@@ -396 +393 @@
                           PBITMAPINFOHEADER2 pBmpInfoHeader2,
                           HWND hwnd)
-                          //                          ULONG ulWidth, 
+                          //                          ULONG ulWidth,
                           //     ULONG ulHeight)
 {
   HBITMAP       hbmTarget;
   SIZEL         ImageSize;
-  HBITMAP       hbReturnCode;
   HDC           hdc;
   HPS           hps;
@@ -413 +409 @@
    */
   WinQueryWindowPos ( hwnd, &swp);
-  
+
   /* Image size */
-  
+
   ulHeight = bmpInfoHeader2.cy;
   ulWidth = bmpInfoHeader2.cx;
@@ -423 +419 @@
       aptl[0].x=0;
       aptl[1].x=aptl[0].x+ulWidth;
-      
+
       aptl[0].y=0;
       aptl[1].y=aptl[0].y+ulHeight;
@@ -429 +425 @@
   else {
     float fWidth, fHeight, fRes;
-    
+
     fWidth=(float)swp.cx/(float)ulWidth;
     fHeight=(float)swp.cy/(float)ulHeight;
     fRes=( fWidth>fHeight ? fHeight : fWidth);
-    
-    
+
+
     aptl[0].x=0;
     aptl[1].x=aptl[0].x+ulWidth*fRes;
-    
+
       aptl[0].y=0;
       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;
@@ -468 +464 @@
         return(0L);
       }
-    
+
     // ***************************************************
     // Create a memory presentation space that includes
@@ -486 +482 @@
 
     /* Now scale the bitmap */
-    memcpy(&bmpih2, pBmpInfoHeader2, sizeof(BITMAPINFOHEADER2));    
+    memcpy(&bmpih2, pBmpInfoHeader2, sizeof(BITMAPINFOHEADER2));
 
     bmpih2.cx=aptl[1].x-aptl[0].x;
@@ -509 +505 @@
 
     /* Blit it */
-    hbReturnCode = GpiSetBitmap ( hps, hbmTarget );
+    GpiSetBitmap ( hps, hbmTarget );
 
     GpiWCBitBlt(hps, hbm,4L, aptl, ROP_SRCCOPY, BBO_IGNORE);
 
-    hbReturnCode = GpiSetBitmap( hps, NULLHANDLE );
+    GpiSetBitmap( hps, NULLHANDLE );
     GpiDestroyPS(hps);
     DevCloseDC(hdc);
@@ -545 +541 @@
   strcat(textPtr,".");
   strcat(textPtr, chrExt);
-  
+
   return TRUE;
 }
@@ -564 +560 @@
             '\0',
             sizeof(MMFORMATINFO) );
-    
+
     mmFormatInfo.ulMediaType |= MMIO_MEDIATYPE_IMAGE;
-    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;    
+    mmFormatInfo.ulFlags|=MMIO_CANWRITETRANSLATED;
     ulReturnCode = mmioQueryFormatCount ( &mmFormatInfo,
                                           &lNumIOProcs,
                                           0,
                                           0 );
-    
+
     if( ulReturnCode != MMIO_SUCCESS )
       {
@@ -592 +588 @@
         return FALSE;
       }
-    
+
     /*
      * call mmioGetFormats to get info on the formats supported.
@@ -610 +606 @@
         return FALSE;
       }
-    
+
     if( lFormatsRead != lNumIOProcs )
       {
@@ -627 +623 @@
         char szName[CCHMAXPATH];
 
-        mmioGetFormatName(pmmFormatInfoArray, szName, &lBytesRead, 0L, 0L);        
+        mmioGetFormatName(pmmFormatInfoArray, szName, &lBytesRead, 0L, 0L);
         /* Insert NULL string terminator */
-        *( szName + lBytesRead ) = (CHAR)NULL;
+        *( szName + lBytesRead ) = 0;
 
 
@@ -643 +639 @@
 
 #ifdef DEBUG
-        HlpWriteToTrapLog("------ %d private idx: %d, IO-Proc: %s %s\n", index, sIdx, 
+        HlpWriteToTrapLog("------ %d private idx: %d, IO-Proc: %s %s\n", index, sIdx,
                           pmmFormatInfoArray->szDefaultFormatExt,
                           szName);
 #endif
-            
+
             iPrivIOProc[sIdx]=index;
 
@@ -669 +665 @@
         /*
          *  advance to next entry in mmFormatInfo array
-         */        
+         */
         pmmFormatInfoArray++;
       }
@@ -700 +696 @@
   ULONG         iIndex, iCount, iCount2;
 
-  MMFORMATINFO  mmFormatInfo;  
+  MMFORMATINFO  mmFormatInfo;
   FOURCC fccSourceIOProc;
   FOURCC        fccStorageSystem;
@@ -728 +724 @@
   mmioinfoSource.fccIOProc = fccSourceIOProc;
   mmioinfoSource.ulTranslate = MMIO_TRANSLATEHEADER | MMIO_TRANSLATEDATA;
-  
+
   hmmioSource = mmioOpen ((PSZ)pszSource, &mmioinfoSource,
                           MMIO_READ | MMIO_DENYWRITE
                           | MMIO_NOIDENTIFY);
-  
+
   if (!hmmioSource)
     return (FALSE);
-  
+
   /*******************************/
   /* Set up/open the TARGET file */
@@ -743 +739 @@
   mmioinfoTarget.fccIOProc = fccTargetIOProc;
   mmioinfoTarget.ulTranslate = MMIO_TRANSLATEHEADER | MMIO_TRANSLATEDATA;
-  
+
   hmmioTarget = mmioOpen ((PSZ)pszTarget,
                           &mmioinfoTarget,
                           MMIO_CREATE | MMIO_WRITE |
                           MMIO_DENYWRITE | MMIO_NOIDENTIFY);
-  
+
   if (!hmmioTarget)
     {
@@ -762 +758 @@
   rcSrcQueryCount = mmioSendMessage(hmmioSource, MMIOM_QUERYIMAGECOUNT, (LONG)&iCount, (LONG)0);
   if (rcSrcQueryCount) iCount = 1;
-  
+
   // find out if the target has multiple image support
   rcTrgQueryCount = mmioSendMessage(hmmioTarget, MMIOM_QUERYIMAGECOUNT, (LONG)&iCount2, (LONG)0);
-  
+
   for (iIndex=0; iIndex<iCount; iIndex++) { /* loop through known images */
 
     if (!rcSrcQueryCount && !rcTrgQueryCount) {  /* if Both support images */
-      
+
       /* Determine if the target can write arrays, and if not */
       /* then write the the default image from the source     */
 
       if (rcTrgSetImage && iIndex > 0) break;  /* Target Can't Write array */
-      
+
       /* Now, determine if the target can write arrays */
       rcTrgSetImage = mmioSendMessage (hmmioTarget, MMIOM_SETIMAGE, (LONG)iIndex, (LONG)0);
-      
+
       if (!rcTrgSetImage) mmioSendMessage (hmmioSource, MMIOM_SETIMAGE, (LONG)iIndex, (LONG)0);
-      
+
     } else if (!rcSrcQueryCount) {      /* Source does but target doesn't */
       /* Use the default image from source to copy to target */
@@ -806 +802 @@
                               (LONG)sizeof (MMIMAGEHEADER), (PLONG)&ulBytesRead,
                               0L, 0L);
-    
+
     if (rc != MMIO_SUCCESS)
       /* Header unavailable */
@@ -814 +810 @@
         return (FALSE);
       }
-    
+
 
     /*************************/
@@ -828 +824 @@
       }
 
-    
+
     /* Use the SAME data as came from the SOURCE FILE.  It must be
        compatible with the OS/2 bitmaps, etc.   */
@@ -834 +830 @@
                               (LONG)sizeof (MMIMAGEHEADER), (PLONG)&ulBytesRead,
                               0L, 0L);
-    
+
     if (rc != MMIO_SUCCESS)
       /* Header unavailable */
@@ -846 +842 @@
         HlpWriteToTrapLog("Target header set.\n");
 #endif
-    
+
     /* Determine the number of bytes required, per row */
     /*      PLANES MUST ALWAYS BE = 1 */
@@ -853 +849 @@
     dwRowBits = dwWidth * mmImgHdr.mmXDIBHeader.BMPInfoHeader2.cBitCount;
     dwNumRowBytes = dwRowBits >> 3;
-    
+
     /* Account for odd bits used in 1bpp or 4bpp images that are NOT on byte boundaries. */
     if (dwRowBits % 8)
       dwNumRowBytes++;
-    
+
     /* Ensure the row length in bytes accounts for byte padding.  All bitmap data rows
        must are aligned on LONG/4-BYTE boundaries.   The data FROM an IOProc
@@ -880 +876 @@
 
         if (ulBytesRead) {
-          LONG lWritten;
-          lWritten=mmioWrite (hmmioTarget, pRowBuffer, (ULONG)ulBytesRead);
+          mmioWrite (hmmioTarget, pRowBuffer, (ULONG)ulBytesRead);
 #ifdef DEBUG
         HlpWriteToTrapLog("ulBytesRead: %d, lWritten: %d.\n", ulBytesRead, lWritten);
@@ -898 +893 @@
   mmioClose (hmmioSource, 0L);
   DosFreeMem(pRowBuffer);
-  
+
   return(TRUE);
 }
 
-void _Optlink convertThreadFunc (void *arg)
+void convertThreadFunc (void *arg)
 {
   HAB  hab;
@@ -916 +911 @@
                 chrSourceName,
                 chrTargetName,  pMemFormatInfo[iIoProc].fccIOProc);
-      
-      
-
-      WinPostMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTDONE), 0);      
+
+
+
+      WinPostMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTDONE), 0);
       DosSleep(1000);
       WinDestroyMsgQueue(hmq);
@@ -944 +939 @@
     POINTL aptl[4];
     HPS    hps;
-    BOOL   bReturnCode;
     ULONG  ulHeight;
     ULONG  ulWidth;
@@ -954 +948 @@
      *  Get position of image frame
      */
-    bReturnCode = WinQueryWindowPos ( hwnd, &swp);
+    WinQueryWindowPos ( hwnd, &swp);
 
     /* Center image */
@@ -963 +957 @@
         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;
@@ -977 +971 @@
       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;
@@ -1004 +998 @@
     //       WinDrawBitmap(hps, hBitmap, NULLHANDLE, (PPOINTL)aptl, 0, 0, DBM_NORMAL/*|DBM_STRETCH*/);
 #endif
-    bReturnCode = WinEndPaint (hps);
+    WinEndPaint (hps);
 }
 
@@ -1011 +1005 @@
 
   switch (msg)
-    {      
+    {
     case WM_PAINT:
       {
@@ -1036 +1030 @@
 
   switch (msg)
-    {      
+    {
     case WM_INITDLG:
 #if 0
@@ -1047 +1041 @@
 
       WinSendMsg(WinWindowFromID(hwnd,IDST_IMGCONVERTNAME),EM_SETTEXTLIMIT,MPFROMSHORT((SHORT)CCHMAXPATH),0);
-      
+
       /* Filename */
       WinSetWindowText(WinWindowFromID(hwnd,IDST_IMGCONVERTNAME), chrSourceName);
-      
+
       /* Set dialog font to WarpSans for Warp 4 and above */
       if(SysQueryOSRelease()>=40) {
@@ -1112 +1106 @@
             iPercent=0;
 
-          /* Update track percent bar value. The helper prog sends us the actual decoded %. */         
+          /* Update track percent bar value. The helper prog sends us the actual decoded %. */
           sprintf(text,"%d#%d%%", iPercent, iPercent);
           WinSetWindowText(WinWindowFromID(hwnd,IDBAR_IMGCONVERTPROGRESS), text);
@@ -1149 +1143 @@
 
            createTargetName(chrSourceName, pMemFormatInfo[iIoProc].szDefaultFormatExt);
-           WinSetWindowText( WinWindowFromID(hwnd,IDEF_IMGCONVERTTARGETNAME), chrTargetName );           
+           WinSetWindowText( WinWindowFromID(hwnd,IDEF_IMGCONVERTTARGETNAME), chrTargetName );
          }
         }
@@ -1210 +1204 @@
             // ULONG ulDiskNum;
             // char cLetter;
-            
+
             /* Get target name */
-            WinQueryWindowText( WinWindowFromID(hwnd,IDEF_IMGCONVERTTARGETNAME), 
+            WinQueryWindowText( WinWindowFromID(hwnd,IDEF_IMGCONVERTTARGETNAME),
                                 sizeof(chrTargetName), chrTargetName );
 #if 0
@@ -1225 +1219 @@
              if(lFreeSpace<lAudioSize) {
                /*
-                 Text:   
-                 Title: 
-                 */       
+                 Text:
+                 Title:
+                 */
                getMessage(title, IDSTR_CONVERTNOSPACETEXT,sizeof(title), RESSOURCEHANDLE, hwnd);
                sprintf(text,title,lAudioSize/1000000 );
@@ -1237 +1231 @@
              else {
                /* Start decoding an audio file */
-               WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTOK), FALSE);            
+               WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTOK), FALSE);
                WinEnableWindow( WinWindowFromID(hwnd,IDPB_CONVERTABORT), TRUE);
                convertAudioFile(hwnd);
@@ -1244 +1238 @@
              /* Start converting image file */
              WinPostMsg(hwnd, WM_APPTERMINATENOTIFY, MPFROMLONG(MSG_CONVERTPERCENT), MPFROMLONG(0));
-             WinEnableWindow( WinWindowFromID(hwnd,IDPB_IMGCONVERTOK), FALSE);            
+             WinEnableWindow( WinWindowFromID(hwnd,IDPB_IMGCONVERTOK), FALSE);
              WinEnableWindow( WinWindowFromID(hwnd,IDPB_IMGCONVERTABORT), TRUE);
              convertImageFile(hwnd);
@@ -1256 +1250 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -1283 +1277 @@
   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-1) {/* Not the right num of params */
         pmUsage();
@@ -1297 +1291 @@
           strcpy(chrProcName, "");
         }
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         //   RESSOURCEHANDLE=0;
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
@@ -1304 +1298 @@
         /* Register the percent bar window class */
         percentRegisterBarClass();
-        
-        globalHab=WinQueryAnchorBlock(HWND_DESKTOP);        
+
+        globalHab=WinQueryAnchorBlock(HWND_DESKTOP);
         hBitmap=loadBitmap ( chrSourceName, &bmpInfoHeader2);
-        
-        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc, 
+
+        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc,
                        RESSOURCEHANDLE, IDDLG_IMGCONVERT, 0) == DID_ERROR )
           {
@@ -1314 +1308 @@
             char title[CCHMAXPATH];
             /*
-              Text:   
-              Title:  "Installation problem"                       
-              */             
+              Text:
+              Title:  "Installation problem"
+              */
             messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                         title, IDSTR_INSTALLERRORTITLE , sizeof(title),
@@ -1329 +1323 @@
             return( 1 );
           }
-        if(pMemFormatInfo)    
+        if(pMemFormatInfo)
           free(pMemFormatInfo);
         if(hBitmap)

trunk/classes/mm-progs/include/mmprogs_defaults.h

@@ -17 +17 @@
  * 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/
@@ -34 +34 @@
 /* Audio player */
 #define DEFAULT_VOLUME    75      /* Default volume for audio player (not volume object) */
-#define INI_MMPLAYER_APP      "mmplayer"     /* App name to use                       */
-#define INI_DISPLAY_KEY   "displaytype"  /* Key for storing which display to show */
-#define INI_VOLUME_KEY    "volume"       /* Key for storing the volume            */
+#define INI_MMPLAYER_APP      (PSZ)"mmplayer"     /* App name to use                       */
+#define INI_DISPLAY_KEY       (PSZ)"displaytype"  /* Key for storing which display to show */
+#define INI_VOLUME_KEY        (PSZ)"volume"       /* Key for storing the volume            */
 
 /* Image converter */
-#define INI_IMGCONV_APP        "imageconv"
+#define INI_IMGCONV_APP       (PSZ)"imageconv"
 
 /* Audio converter */
-#define INI_AUDIOCONV_APP        "audioconv"
+#define INI_AUDIOCONV_APP     (PSZ)"audioconv"
 
 /* Master volume */
-#define INI_VOLUME_APP        "volume"
+#define INI_VOLUME_APP        (PSZ)"volume"
 
 /* Volume for classes */
-#define INI_CLASSVOLUME_APP        "classvolume"
+#define INI_CLASSVOLUME_APP   (PSZ)"classvolume"
 
 /* For setting volume */
-#define SETUP_MMAUDIOVOLUME         "MMAUDIOVOLUME"
+#define SETUP_MMAUDIOVOLUME   (PSZ)"MMAUDIOVOLUME"

trunk/classes/mm-progs/makefile

@@ -7 +7 @@
 
 CC           = gcc
-LIB_DIR      = $d:/emx/lib 
-#CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
-CPPFLAGS     = -O -Wall -Zomf -Zcrtdll -s
+CPPFLAGS     = -O -Wno-pointer-sign -Wall -Zomf -Zcrtdll -s
 INC             =       ./include -I ../../classes/inc -I ../../common_functions/include
-DEFS         = 
-PROGS        =  
+DEFS         =
+PROGS        =
 ODIR            = .
 CPPDIR  = .
@@ -22 +20 @@
 
 $(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
-        gcc -c -Wall -o$@ -Zomf -I$(INC) $<             
+        gcc -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<           
 
 all:    $(LIBOBJS)
@@ -48 +46 @@
         -cd ./mmplayer && make cleaner
         -cd ./master_volume && make cleaner
-        -rm ./include/*.*~ 
+        -rm ./include/*.*~
 
         

trunk/classes/mm-progs/master_volume/makefile

@@ -17 +17 @@
 volume.exe:     volume.c $(OBJECTS) makefile def.tpl
         cmd /C $(TOOLDIR)\create_MMPROG_def.cmd volume.def
-        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -Zmt -lmmpm2.lib volume.def
+        $(CC) $(CPPFLAGS) -I$(INC) volume.c $(OBJECTS) -lmmpm2.lib volume.def
         rc -I $(INC) volume.rc volume.exe
 

trunk/classes/mm-progs/master_volume/volume.c

@@ -17 +17 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */          
+ */
 /*
  * 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/
@@ -35 +35 @@
 #define INCL_MMIOOS2
 #define INCL_MCIOS2
-#define INCL_SECONDARYWINDOW    
-#define INCL_GRAPHICBUTTON 
+#define INCL_SECONDARYWINDOW
+#define INCL_GRAPHICBUTTON
 #include <os2.h>
 #include <sw.h>
@@ -73 +73 @@
 BOOL bHaveWindowPos=FALSE;
 
-BOOL bMute=FALSE; 
+BOOL bMute=FALSE;
 HMODULE RESSOURCEHANDLE=0;
 int bTBVisible=0;
@@ -134 +134 @@
 
 /* Masteraudio does not support NOTIFY so use a thread to prevent PM freeze */
-MRESULT EXPENTRY volumeObjectProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+MRESULT EXPENTRY volumeObjectProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   switch(msg)
@@ -153 +153 @@
               ULONG mastervolume;              /* Set to master volumepercentage
                                                   percentage by this example      */
-              
+
               USHORT usDeviceID=0;
               MCI_MASTERAUDIO_PARMS masteraudioparms;
@@ -161 +161 @@
               memset(&openParms,0, sizeof(openParms));
               openParms.pszDeviceType="Masteraudio";
- 
+
               rc=mciSendCommand(0,       /* Device                          */
                              MCI_OPEN,                /* Master audio message            */
@@ -171 +171 @@
               mciGetErrorString(rc,chrCommand, sizeof(chrCommand));
               //sprintf(chrCommand, "%x", rc);
-              WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrCommand, "", 1234, MB_MOVEABLE);              
+              WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrCommand, "", 1234, MB_MOVEABLE);
               DosBeep(5000, 10);
               usDeviceID=openParms.usDeviceID;
@@ -178 +178 @@
               /* Get current system master
                  volume setting                  */
-              
+
               mciSendCommand(usDeviceID,       /* Device                          */
                              MCI_MASTERAUDIO,                /* Master audio message            */
@@ -188 +188 @@
               /* Get current system master
                  volume setting                  */
-              
+
               mciSendCommand(usDeviceID,       /* Device                          */
                              MCI_MASTERAUDIO,                /* Master audio message            */
@@ -195 +195 @@
                              (PVOID) &masteraudioparms,      /* Data structure                  */
                              0);                             /* User parm                       */
-              
+
               mastervolume = masteraudioparms.ulReturn;
                           DosBeep(500, 10);
@@ -228 +228 @@
 }
 
-void _Optlink volumeThreadFunc (void *arg)
+void volumeThreadFunc (void *arg)
 {
   HAB  hab;
@@ -238 +238 @@
     hmq=WinCreateMsgQueue(hab,0);
     if(hmq) {
-      
+
       if((hwndThread=WinCreateWindow(HWND_OBJECT, WC_STATIC, "", 0,0,0,0,0, NULLHANDLE,
                                      HWND_BOTTOM, 1, NULLHANDLE, NULLHANDLE))==NULLHANDLE) {
@@ -245 +245 @@
       }
       WinSubclassWindow(hwndThread,&volumeObjectProc);
-      /* Window created. */             
+      /* Window created. */
 
       while(WinGetMsg(hab,&qmsg,(HWND)NULL,0,0))
         WinDispatchMsg(hab,&qmsg);
       WinDestroyWindow(hwndThread);
-      
+
       WinDestroyMsgQueue(hmq);
     }
@@ -267 +267 @@
   if((hwndTitleBar=WinWindowFromID(hwnd, FID_TITLEBAR))==NULLHANDLE)
     return;
-      
+
   hwndPopup = WinLoadMenu(hwnd, RESSOURCEHANDLE, IDM_POPUP);
   if (hwndPopup == NULLHANDLE)
     return;
-  
+
   bVisible=WinIsWindowVisible(hwndTitleBar);
 
   if(!bVisible)
-    WinSendMsg(hwndPopup,MM_SETITEMATTR,MPFROM2SHORT(IDM_ITEMTITLEBAR,FALSE), 
+    WinSendMsg(hwndPopup,MM_SETITEMATTR,MPFROM2SHORT(IDM_ITEMTITLEBAR,FALSE),
                MPFROM2SHORT(MIA_CHECKED,MIA_CHECKED));
 
   WinQueryPointerPos(HWND_DESKTOP, &ptl) ;
   WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
-  WinPopupMenu(hwnd, hwnd, hwndPopup, 
+  WinPopupMenu(hwnd, hwnd, hwndPopup,
                ptl.x, ptl.y, IDM_ITEMEXIT, PU_HCONSTRAIN | PU_VCONSTRAIN |
                PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  );
@@ -296 +296 @@
       if(!WinQueryWindowPos(hwndTitleBar,&swp))
         return FALSE;
-      
+
       if(!WinQueryWindowPos(hwnd,&swpFrame))
         return FALSE;
-      
+
       /* Shrink or expand the frame */
       if(!bTBVisible) {
-        WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//-swp.cy, 
+        WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//-swp.cy,
                         swpFrame.cx, swpFrame.cy+swp.cy, SWP_SIZE|SWP_MOVE);
         bTBVisible=TRUE;
@@ -308 +308 @@
       else
         {
-          WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//+swp.cy, 
+          WinSetWindowPos(hwnd, NULLHANDLE, swpFrame.x, swpFrame.y,//+swp.cy,
                           swpFrame.cx, swpFrame.cy-swp.cy, SWP_SIZE|SWP_MOVE);
           bTBVisible=FALSE;
         }
     }
-  WinSendMsg(hwnd,WM_UPDATEFRAME,0,0);      
+  WinSendMsg(hwnd,WM_UPDATEFRAME,0,0);
   return TRUE;
 }
@@ -326 +326 @@
 
   switch (msg)
-    {      
+    {
     case WM_INITDLG:
       {
@@ -345 +345 @@
                     (MPARAM) 0L,
                     (MPARAM) 100L);
-        
+
         WinSendMsg( WinWindowFromID(hwnd, IDCS_VOLUME),
                     CSM_SETINCREMENT,
                     (MPARAM) 10L,
                     (MPARAM) 1L);
-        
-        
+
+
         WinSendMsg( WinWindowFromID(hwnd, IDCS_VOLUME),
                     CSM_SETVALUE,
                     (MPARAM) queryMasterVolume(),
                     (MPARAM) NULL);
-        
-        
+
+
         // getMessage(title, IDSTR_CONVERTCHANNELS, sizeof(title), RESSOURCEHANDLE, hwnd);
         /* Set dialog font to WarpSans for Warp 4 and above */
@@ -365 +365 @@
                           DEFAULT_DIALOG_FONT );
         }
-        
+
         hpProgramIcon =
           WinLoadPointer(
@@ -371 +371 @@
                          (HMODULE) NULL,              /* Resource is kept in .Exe file. */
                          ID_ICONVOLUME );                   /* Which icon to use.             */
-        
+
         WinSendMsg(
                    hwnd,                    /* Dialog window handle.                 */
@@ -399 +399 @@
                             PP_BACKGROUNDCOLOR,(ULONG)sizeof(rgb), &rgb);
           }
-        ulSize=sizeof(RGB);        
+        ulSize=sizeof(RGB);
         if(IniRestoreData(chrIniFile, INI_VOLUME_APP, INI_BTNFGCLR_KEY, &rgb, &ulSize))
           {
@@ -428 +428 @@
         /* Remove top frame controls if titlebar is hidden */
         SHORT countSwp;
-                
+
         countSwp = (int) WinDefDlgProc(hwnd, msg, mp1, mp2);
         if(countSwp) {
-          if(bTBVisible==0) { 
-            /* Hide frame controls */        
+          if(bTBVisible==0) {
+            /* Hide frame controls */
             /* countSWP:  number of standard framecontrols
                pswp:      Array of SWP describing the framecontrols.
@@ -439 +439 @@
             PSWP pswpTB=NULLHANDLE;
             PSWP pswp=(PSWP)mp1;
-            int y, cy;
+            int y;
 
             for (a = 0; a < countSwp; a++)
@@ -448 +448 @@
                     pswpTB=&pswp[a];
                     y=pswp[a].y;
-                    cy=pswp[a].cy;
                     //    DosBeep(500,600);
                     break;
@@ -485 +484 @@
     case WM_BUTTON1MOTIONSTART:
       /* Drag the window without titlebar */
-      WinSendMsg(hwnd, WM_TRACKFRAME, 
+      WinSendMsg(hwnd, WM_TRACKFRAME,
                  MPFROMSHORT(TF_MOVE   /*| TF_SETPOINTERPOS */), NULL) ;
       return (MRESULT) 0 ;
@@ -504 +503 @@
            {
              if (SHORT2FROMMP(mp1)==GBN_BUTTONDOWN) {
-               bMute=TRUE; 
+               bMute=TRUE;
                setMasterVolume(hwnd, 0);
              }
              else if (SHORT2FROMMP(mp1)==GBN_BUTTONUP) {
                SHORT sValue;
-               
+
                bMute=FALSE;
                WinSendMsg(WinWindowFromID(hwnd, IDCS_VOLUME),CSM_QUERYVALUE ,MPFROMP(&sValue) ,0);
@@ -524 +523 @@
         memset(&masteraudioparms,0, sizeof(masteraudioparms));
         /* Save master audio level */
-        mciSendCommand( 0,       
+        mciSendCommand( 0,
                        MCI_MASTERAUDIO,                /* Master audio message            */
                        MCI_WAIT |  MCI_MASTERVOL | MCI_SAVESETTING,
@@ -594 +593 @@
       bTBVisible=IniRestoreInt(chrIniFile, INI_VOLUME_APP, INI_TBVISIBLE_KEY, 1);
 
-      if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, 
+      if( WinDlgBox( HWND_DESKTOP, NULLHANDLE,
                      volumeDialogProc, RESSOURCEHANDLE, IDDLG_VOLUME, 0) == DID_ERROR )
         {
           /*
-            Text:   
-            Title:  "Installation problem"                       
+            Text:
+            Title:  "Installation problem"
             */
 #if 0
@@ -605 +604 @@
                       title, IDSTR_INSTALLERRORTITLE , sizeof(title),
                       RESSOURCEHANDLE, HWND_DESKTOP, MB_OK | MB_ICONEXCLAMATION | MB_MOVEABLE);
-#endif       
+#endif
           WinDestroyMsgQueue( hmq );
           WinTerminate( hab );
@@ -637 +636 @@
                   (MPARAM) NULL);
       while ( WinGetMsg( hab, (PQMSG) &qmsg, (HWND) NULL, 0, 0) )
-        WinDispatchMsg( hab, (PQMSG) &qmsg );  
+        WinDispatchMsg( hab, (PQMSG) &qmsg );
 #endif
       freeResHandle();

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);

trunk/classes/mm-progs/mmprog.inc

@@ -2 +2 @@
 
 CC              =        gcc
-CPPFLAGS        =        -O -Wall -Zomf -Zmt -s
+CPPFLAGS        =        -O -Wno-pointer-sign -Wall -Zomf -Zmt -s
 #CPPFLAGS       = -O -Zomf -Zcrtdll -Zmtd -s
 
 INC             = ../include -I ../../../classes/inc -I $(COMMONSRC)/include
 # Fixme GKY 4-15-23
-LIB_DIR         = $d:/emx/lib 
+LIB_DIR         = $d:/emx/lib
 TOOLDIR         =        .\..
 LIBDIR          =        ../lib
-DEFS            = 
-PROGS           =  
+DEFS            =
+PROGS           =
 ODIR            =
 CPPDIR          =
 
-$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
-        $(CC) -c -Wall -o$@ -Zomf -I$(INC) $<  
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c
+        $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
 
 %.obj:  %.c
-        $(CC) -c -Wall -o$@ -Zomf -I$(INC) $<  
+        $(CC) -c -Wno-pointer-sign -Wall -o$@ -Zomf -I$(INC) $<
 
 

trunk/classes/mm-progs/videoplayer/mmplayer.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/
@@ -55 +55 @@
 #include "sys_funcs.h"
 
-#ifndef OPEN_DEFAULT 
+#ifndef OPEN_DEFAULT
 /*  Open views for the wpOpen() method */
 
@@ -140 +140 @@
 
 /* Every folder has one running play thread to handle play commands */
-void _Optlink playThreadFunc (void *arg);
+void playThreadFunc (void *arg);
 void controlPlaying(HWND hwndDialog, ULONG ulAction, ULONG ulReserved);
 BOOL stopAudioFile(HWND hwndFrame);
@@ -216 +216 @@
   WinQueryPointerPos(HWND_DESKTOP, &ptl) ;
   WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
-  WinPopupMenu(hwnd, hwnd, hwndPopup, 
+  WinPopupMenu(hwnd, hwnd, hwndPopup,
                ptl.x, ptl.y, 0, PU_HCONSTRAIN | PU_VCONSTRAIN |
-               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  ); 
-  
+               PU_KEYBOARD | PU_MOUSEBUTTON1 | PU_MOUSEBUTTON2 | PU_NONE  );
+
 }
 
@@ -232 +232 @@
   hResource=BMP_RESSOURCEHANDLE; //_queryResModuleHandle();
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -332 +332 @@
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclSource.xLeft,ci.rclSource.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
-                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE); 
+                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE);
   oldPlayTimeProc=WinSubclassWindow(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), playTimeTextProc);
 
   /* Pos slider */
   ci=ciControls[CTRLIDX_POSSLIDER];//ciPosSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
                   ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE | SWP_SIZE);
-  
+
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
   /* Vol slider */
   ci=ciControls[CTRLIDX_VOLSLIDER];//ciVolSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
@@ -356 +356 @@
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
 }
@@ -375 +375 @@
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
     /* Problem with MCI. Clean up. The Timer will be stopped in the method */
-    stopAudioFile(hwndFrame); 
+    stopAudioFile(hwndFrame);
   }
   else {
     if(!stricmp(retMsg, "stopped")) {
       /* Audio file played. */
-      stopAudioFile(hwndFrame); 
+      stopAudioFile(hwndFrame);
     }
     showPlayTimeDisplay(hwndFrame, TRUE);/* Ensure display is visible */
@@ -396 +396 @@
       return usItems;
     }
-  
+
   return 0;
 }
@@ -402 +402 @@
 BOOL DrgVerifyTypeCW(PDRAGITEM pDragItem, char * chrType)
 {
-  /* DrgVerifyType() seems not to work when several types are in the list?? 
+  /* DrgVerifyType() seems not to work when several types are in the list??
      Dokumentation says, it works... */
   /* Only check for a single type for now */
@@ -472 +472 @@
     for(ulHash=0;*theString!='\0'; theString++)
       ulHash=*theString+37*ulHash;
-  
+
   return ulHash%HASHSIZE;
 }
@@ -543 +543 @@
 MRESULT handleDrag0ver(PDRAGINFO pdi, HWND hwnd)
 {
-  
+
   /* Only accept one file */
   if(DrgGetNumObjects(pdi)!=1) {
@@ -551 +551 @@
   if(DrgCheckForKnownType(pdi, hwnd))
     return MRFROM2SHORT(DOR_DROP, DO_COPY);
-  
-  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);  
+
+  return MRFROM2SHORT(DOR_NEVERDROP, DO_COPY);
 }
 
@@ -567 +567 @@
       char chrFile[CCHMAXPATH];
       PDRAGITEM pDragItem;
-      
+
       pDragItem=DrgQueryDragitemPtr(pdi, 0);
-      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile); 
-      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName); 
+      DrgQueryStrName(pDragItem->hstrSourceName,sizeof(chrFile), chrFile);
+      DrgQueryStrName(pDragItem->hstrContainerName,sizeof(chrSourceName), chrSourceName);
       strcat(chrSourceName, chrFile);
-      
+
       /* Start new file */
       controlPlaying(hwnd, PLAY_FIRST, 0);
@@ -613 +613 @@
              MPFROM2SHORT(SC_SIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Minimize from the system menu */
              MM_DELETEITEM,
              MPFROM2SHORT(SC_MINIMIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Maximize from the system menu */
              MM_DELETEITEM,
@@ -653 +653 @@
 
   switch (msg)
-    {      
+    {
     case DM_DRAGOVER:
       {
@@ -682 +682 @@
         swctl.fbJump=SWL_JUMPABLE;
         WinAddSwitchEntry(&swctl);
-        
+
         adjustDialogControlPos(hwnd);
-        
+
         /* Set volume slider*/
         WinSendMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERVOLUME),
@@ -690 +690 @@
                     MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
                     MPFROMLONG( ulVolume));
-        
+
         /* Subclass buttons for DnD */
         orgButtonProc=WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPLAY), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERPAUSE), buttonProc);
         WinSubclassWindow(WinWindowFromID(hwnd, IDPB_MMPLAYERSTOP), buttonProc);
-                
+
         FixSysMenu(hwnd);
 
@@ -701 +701 @@
         if(allBMPs[MAIN_BMP_IDX].hbm) {
           SWP swp;
-          
-          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);         
-          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE, 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME), 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME), 
+
+          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);
+          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLIENT), NULLHANDLE,
+                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME),
+                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME),
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy,
                           SWP_SIZE|SWP_MOVE);
           orgBgProc=WinSubclassWindow(WinWindowFromID(hwnd, ID_CLIENT), bgProc);
-          
+
           WinSetWindowPos(hwnd, NULLHANDLE, 0, 0,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx+WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME)*2,
@@ -741 +741 @@
       /*****************************************************/
     case WM_APPTERMINATENOTIFY:
-      
+
       switch(SHORT1FROMMP(mp1))
         {
@@ -754 +754 @@
           return MRFALSE;
         case NOTIFY_CONTEXT:
-          /* Show context menu. */            
+          /* Show context menu. */
           HlpContextMenu(hwnd, iWhichDisplay+ID_MENUITEMELAPSED, TRUE);
           return MRFALSE;
@@ -761 +761 @@
         }
       return MRFALSE;
-      
+
       /*****************************************************/
       /* The following two messages are for device sharing */
@@ -769 +769 @@
         char chrCommand[100];
         int iWavePriv;
-    
+
         iWavePriv=ulPid;
 
@@ -800 +800 @@
       /* SETPOSITIONADVICE does not work for some reason,  */
       /* so a timer is used. Yes, it's quit cumbersome...  */
-      /*****************************************************/  
+      /*****************************************************/
     case WM_TIMER:
       if(SHORT1FROMMP(mp1)==IDTIMER_PLAY) {
@@ -821 +821 @@
             /* Set slider position */
 
-            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR), 
+            WinPostMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERPOSBAR),
                         SLM_SETSLIDERINFO,
                         MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
@@ -908 +908 @@
         default:
           break;
-        }              
+        }
       break;
 
@@ -919 +919 @@
         char chrCommand[50];
         char retMsg[20];
-        
+
         switch(SHORT2FROMMP(mp1))
           {
@@ -949 +949 @@
                       static long lLastPos=0;
                       long lPos=LONGFROMMP(mp2);
-              
+
                       bPosDragging=TRUE;
                       lPos*=ulTotalLength/100;
@@ -973 +973 @@
                     {
                       ULONG ulValue;
-                      
+
                       ulValue=LONGFROMMP(mp2);
                       ulVolume=ulValue;
@@ -985 +985 @@
 
                       bPosDragging=FALSE;
-                      lPos*=1000;                      
+                      lPos*=1000;
                       lPos*=ulTotalLength/100;
                       lPos/=1000;// Use only full seconds
@@ -992 +992 @@
                       seekAudioFile(lPos);
                       /* restart timer */
-                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);  
+                      WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, IDTIMER_PLAY, PLAYTIMER_DELAY);
                       ulPos=lPos/1000;
                       break;
@@ -1009 +1009 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -1029 +1029 @@
                      ))==NULLHANDLE)
     return FALSE;
-  
+
   ulSize=sizeof(chrFileName);
-  
+
   if ((rc = DosOpen(chrFileName, &handle, &act,
                     0L, 0, OPEN_ACTION_OPEN_IF_EXISTS,
@@ -1095 +1095 @@
 BOOL writeVolumeToIni(char * iniFile, char* chrApp, char *chrKey, ULONG ulVolume)
 {
-  
+
   return IniSaveInt(iniFile, chrApp, chrKey, ulVolume);
 }
@@ -1145 +1145 @@
   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();
@@ -1164 +1164 @@
           strcpy(chrClassName, params[1]);
 
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
         /* Get data from INI file */
@@ -1176 +1176 @@
         WinRegisterClass(WinQueryAnchorBlock(HWND_DESKTOP), SLIDER_CLASS, privateSliderProc,0, SLADDBYTES);
 
-        _loadBmps();        
+        _loadBmps();
         DosGetInfoBlocks(&ptib, &ppib);
         ulPid=ppib->pib_ulpid;
@@ -1183 +1183 @@
         //DosBeep(5000, 400);
 
-        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc, 
+        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc,
                        RESSOURCEHANDLE, IDDLG_MMPLAYER, 0) == DID_ERROR )
           {
             /*
-              Text:   
-              Title:  "Installation problem"                       
-              */             
+              Text:
+              Title:  "Installation problem"
+              */
             messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                         title, IDSTR_INSTALLERRORTITLE , sizeof(title),

trunk/classes/mm-progs/volume/classvol.c

@@ -22 +22 @@
  * 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/
@@ -54 +54 @@
 //#include "cwaudioinc.h"
 
-#ifndef OPEN_DEFAULT 
+#ifndef OPEN_DEFAULT
 /*  Open views for the wpOpen() method */
       #define OPEN_UNKNOWN      -1
@@ -162 +162 @@
   hResource=BMP_RESSOURCEHANDLE; //_queryResModuleHandle();
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_MAIN, 0, 0);
@@ -265 +265 @@
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclSource.xLeft,ci.rclSource.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
-                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE); 
+                  ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE|SWP_SIZE);
   oldPlayTimeProc=WinSubclassWindow(WinWindowFromID(hwnd, IDST_MMPLAYERPLAYTIME), playTimeTextProc);
 
   /* Pos slider */
   ci=ciControls[CTRLIDX_POSSLIDER];//ciPosSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
                   ci.rclSource.xRight-ci.rclSource.xLeft,
                   ci.rclSource.yTop-ci.rclSource.yBottom, SWP_MOVE | SWP_SIZE);
-  
+
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 #endif
 
   /* Vol slider */
   ci=ciControls[CTRLIDX_VOLSLIDER];//ciVolSlider;
-  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10, 
+  WinCreateWindow(hwnd, SLIDER_CLASS, "", WS_VISIBLE | WS_TABSTOP, 0,0, 10, 10,
                   hwnd, HWND_TOP, ci.id, NULLHANDLE, NULLHANDLE);
   WinSetWindowPos(WinWindowFromID(hwnd, ci.id),HWND_TOP, ci.rclDest.xLeft, ci.rclDest.yBottom,
@@ -290 +290 @@
   WinSendMsg(WinWindowFromID(hwnd, ci.id),SLM_SETSLIDERINFO,
              MPFROM2SHORT(SMA_SLIDERARMDIMENSIONS,0),
-             MPFROM2SHORT( 9, 9)); 
+             MPFROM2SHORT( 9, 9));
 
 }
@@ -328 +328 @@
              MPFROM2SHORT(SC_SIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Minimize from the system menu */
              MM_DELETEITEM,
              MPFROM2SHORT(SC_MINIMIZE, TRUE),
              MPFROMP(NULL));
-  
+
   WinSendMsg(hwndMenu, /* Delete Maximize from the system menu */
              MM_DELETEITEM,
@@ -368 +368 @@
 
   switch (msg)
-    {      
+    {
     case WM_INITDLG:
       {
@@ -381 +381 @@
         swctl.fbJump=SWL_JUMPABLE;
         WinAddSwitchEntry(&swctl);
-        
+
         adjustDialogControlPos(hwnd);
-        
+
         /* Set volume slider*/
         WinSendMsg( WinWindowFromID(hwnd, IDSL_MMPLAYERVOLUME),
@@ -389 +389 @@
                     MPFROM2SHORT(SMA_SLIDERARMPOSITION,SMA_INCREMENTVALUE),
                     MPFROMLONG( ulVolume));
-                        
+
         FixSysMenu(hwnd);
 
@@ -397 +397 @@
           POINTL ptl;
 
-          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);         
-          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLASSVOLCLIENT), NULLHANDLE, 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME), 
-                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME), 
+          WinQueryWindowPos(WinWindowFromID(hwnd, FID_TITLEBAR), &swp);
+          WinSetWindowPos(WinWindowFromID(hwnd, ID_CLASSVOLCLIENT), NULLHANDLE,
+                          WinQuerySysValue(HWND_DESKTOP, SV_CXDLGFRAME),
+                          WinQuerySysValue(HWND_DESKTOP, SV_CYDLGFRAME),
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cx,
                           allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy,
                           SWP_SIZE|SWP_MOVE);
           orgBgProc=WinSubclassWindow(WinWindowFromID(hwnd, ID_CLASSVOLCLIENT), bgProc);
-          
+
           /* Get mouse position */
           WinQueryPointerPos(HWND_DESKTOP, &ptl);
@@ -459 +459 @@
         default:
           break;
-        }              
+        }
       break;
 
@@ -468 +468 @@
       {
         SWP swp;
-        
+
         switch(SHORT2FROMMP(mp1))
           {
@@ -492 +492 @@
 
                       ulVolume=ulValue;
-                      sprintf(command,"MMAUDIOVOLUME=%d", ulVolume);
+                      sprintf(command,"MMAUDIOVOLUME=%lu", ulVolume);
                       sendCommandToObject(chrSourceName, command);
                       break;
@@ -509 +509 @@
                     {
                       ULONG ulValue;
-                      
+
                       ulValue=LONGFROMMP(mp2);
                       ulVolume=ulValue;
@@ -529 +529 @@
       break;
     }/* switch */
-  
+
   return WinDefDlgProc( hwnd, msg, mp1, mp2);
 }
@@ -541 +541 @@
 BOOL writeVolumeToIni(char * iniFile,  ULONG ulVolume)
 {
-  
+
   return IniSaveInt(iniFile, INI_CLASSVOLUME_APP, INI_VOLUME_KEY, ulVolume);
 }
@@ -580 +580 @@
   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();
@@ -591 +591 @@
         //    ++chrPtrName;
         //SysWriteToTrapLog("Name: %s\n", chrSourceName);
-        /* Get our ressource dll */  
+        /* Get our ressource dll */
         RESSOURCEHANDLE=queryResModuleHandle(argv[0]);
         /* Get data from INI file */
@@ -604 +604 @@
         _loadBmps();
 
-        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc, 
+        if( WinDlgBox( HWND_DESKTOP, NULLHANDLE, decodeStatusDialogProc,
                        RESSOURCEHANDLE, IDDLG_CLASSVOLUME, 0) == DID_ERROR )
           {
             /*
-              Text:   
-              Title:  "Installation problem"                       
-              */             
+              Text:
+              Title:  "Installation problem"
+              */
             messageBox( text, IDSTR_CONVERTDIALOGERROR , sizeof(text),
                         title, IDSTR_INSTALLERRORTITLE , sizeof(title),