Changeset 104 for trunk/classes/mm-progs/volume/classvol.c

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/volume/classvol.c (modified) (19 diffs)

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