Changeset 104 for trunk/classes/mm-progs/MMPlayer/customprocs.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/MMPlayer/customprocs.c (modified) (23 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,