Changeset 133

Timestamp:

Nov 29, 2023, 5:59:34 PM (21 months ago)

Author:

gyoung

Message:

Merge Lar's 2.9 branch into the trunk

Location:

trunk

Files:

• classes/c/cwmm.DEF (deleted)
• classes/idl/idl_audio/cwaudio.c (deleted)
• classes/mm-progs/MMPlayer/makefile (modified) (1 diff)
• classes/mm-progs/audioconverter/makefile (modified) (1 diff)
• classes/mm-progs/imageconverter/makefile (modified) (1 diff)
• classes/mm-progs/master_volume/makefile (modified) (1 diff)
• classes/mm-progs/mmfind/makefile (modified) (2 diffs)
• classes/mm-progs/videoplayer/makefile (modified) (1 diff)
• classes/mm-progs/volume/makefile (modified) (1 diff)
• classes/res/de/makefile (modified) (3 diffs)
• classes/res/en/makefile (modified) (3 diffs)
• classes/res/es/makefile (modified) (3 diffs)
• classes/res/fr/makefile (modified) (3 diffs)
• classes/res/it/makefile (modified) (3 diffs)
• classes/res/nl/makefile (modified) (3 diffs)
• classes/res/tw/makefile (modified) (3 diffs)
• common_functions/makefile (modified) (1 diff)
• makefile (modified) (1 diff)
• mediafolder/ProgFolder/progFOLDER.DEF (modified) (1 diff)
• mediafolder/c/cddb/res/makefile (modified) (1 diff)
• mediafolder/c/helper/launchpad.cpp (modified) (44 diffs)
• mediafolder/c/m3ufolder/m3ufolderoverriddenwpmethods.cpp (modified) (41 diffs)
• mediafolder/c/mediafldr/mediafolder.cpp (modified) (51 diffs)
• mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp (modified) (12 diffs)
• mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp (modified) (52 diffs)
• mediafolder/include/m3ufolder.hh (modified) (3 diffs)
• mediafolder/include/mediafolder.hh (modified) (7 diffs)
• mediafolder/makefile (modified) (3 diffs)
• mediafolder/res/makefile (modified) (1 diff)
• nlv/de/classes/res/makefile (modified) (1 diff)
• stream_ioproc/source/makefile (modified) (1 diff)

trunk/classes/mm-progs/MMPlayer/makefile

@@ -25 +25 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/audioconverter/makefile

@@ -23 +23 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/imageconverter/makefile

@@ -21 +21 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/master_volume/makefile

@@ -23 +23 @@
         -rm *.exe
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/mmfind/makefile

@@ -12 +12 @@
 
 
-OBJECTS         =       image.obj        
+OBJECTS         =       image.obj       
 
 
@@ -27 +27 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/videoplayer/makefile

@@ -39 +39 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
+        -rm *.def
 
 cleaner:

trunk/classes/mm-progs/volume/makefile

@@ -26 +26 @@
         -rm *.dll
         -rm *.obj
-        -rm *.res
+        -rm *.RES
         -rm *.ini
         -rm $(LIBDIR)/*.obj
+        -rm *.def
 
 cleaner:

trunk/classes/res/de/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
+DEFS         =
 
 OBJDIR  =       ../dll
@@ -31 +31 @@
 
 #(OBJDIR)/mmres$(LANGUAGE).res: mmres$(LANGUAGE).rc $(OBJECTS)
-#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -43 +43 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/en/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ../dll
@@ -31 +31 @@
 
 #mmres$(LANGUAGE).res:  mmres$(LANGUAGE).rc $(OBJECTS)
-#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -40 +40 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/es/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ../dll
@@ -30 +30 @@
 
 #mmres$(LANGUAGE).res:  mmres$(LANGUAGE).rc $(OBJECTS)
-#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -39 +39 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/fr/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ../dll
@@ -30 +30 @@
 
 #mmres$(LANGUAGE).res:  mmres$(LANGUAGE).rc $(OBJECTS)
-#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -39 +39 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/it/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ../dll
@@ -21 +21 @@
                         cwaudio$(LANGUAGE).rc cwaudio$(LANGUAGE).dlg \
                         cwimage$(LANGUAGE).rc cwvideo$(LANGUAGE).rc \
-                        mmfind$(LANGUAGE).dlg mmfind$(LANGUAGE).rc 
+                        mmfind$(LANGUAGE).dlg mmfind$(LANGUAGE).rc
 
 all:    $(OBJDIR)/mmres$(LANGUAGE).dll
@@ -35 +35 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/nl/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
-PROGS        = 
+DEFS         =
+PROGS        =
 
 OBJDIR  =       ../dll
@@ -20 +20 @@
                         imageconv$(LANGUAGE).dlg imageconv$(LANGUAGE).rc \
                         cwaudio_nl.rc cwaudio_nl.dlg cwimage_nl.rc cwvideo_nl.rc \
-                        mmfind_nl.dlg mmfind_nl.rc 
+                        mmfind_nl.dlg mmfind_nl.rc
 
 all:    $(OBJDIR)/mmres$(LANGUAGE).dll
@@ -34 +34 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/classes/res/tw/makefile

@@ -9 +9 @@
 CPPFLAGS     = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+ $(VACDEBUG)
 INC     =       ../../inc
-DEFS         = 
+DEFS         =
 
 OBJDIR  =       ../dll
@@ -32 +32 @@
 
 #(OBJDIR)/mmres$(LANGUAGE).res: mmres$(LANGUAGE).rc $(OBJECTS)
-#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc 
+#               rc -D $(ECS) -i $(INC) -r mmres$(LANGUAGE).rc
 
 
@@ -44 +44 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj
 

trunk/common_functions/makefile

@@ -3 +3 @@
 #include ../make.inc
 
-CC           = gcc
+CC           = icc
 LIB_DIR      = D:/usr/lib 
-#CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
-CPPFLAGS     = -O -Zomf -Zcrtdll -s
+CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
+#CPPFLAGS     = -O -Zomf -Zcrtdll -s
 INC             = ../include
 DEFS         =

trunk/makefile

@@ -274 +274 @@
 bld:
         @build.cmd
-

trunk/mediafolder/ProgFolder/progFOLDER.DEF

@@ -18 +18 @@
 ; */
 
-LIBRARY PROGFLDR INITGLOBAL
+LIBRARY PROGFLDR INITINSTANCE TERMINSTANCE
 DESCRIPTION '$@#(c) Chris Wohlgemuth :V0.17 (25.06.2004) (PROGFLDR.DLL)#@Support folder class'
-PROTMODE
-CODE PRELOAD DISCARDABLE
-DATA SINGLE SHARED PRELOAD DISCARDABLE
+DATA MULTIPLE NONSHARED
 EXPORTS
         CWProgFolderClassData

trunk/mediafolder/c/cddb/res/makefile

@@ -84 +84 @@
         -rm *.obj
         -rm *.dll
-        -rm *.res
+        -rm *.RES
 
 cleaner:

trunk/mediafolder/c/helper/launchpad.cpp

@@ -18 +18 @@
  */
 
-#define INCL_WIN
-#define INCL_GPILCIDS
-#define INCL_GPIPRIMITIVES
-#define INCL_GPIBITMAPS
-
+#define INC_WIN
+#define INCL_PM
+#define INCL_GPI
 
 #include "mediafolder.hh"
 #include "launchpad.hh"
+#include "cwcdtrack.hh"
 
 #include <os2.h>
@@ -32 +31 @@
 
 #include "sys_funcs.h"
+SOMClass* somhlpGetSomClass(char* chrClassName);
 
 extern HWND hwndShadow;// The handle of the help window
@@ -57 +57 @@
 MRESULT EXPENTRY shadowProc(HWND hwnd, ULONG msg,MPARAM mp1,MPARAM mp2 );
 
+
+BOOL APIENTRY myDrgDeleteDraginfoStrHandles(PDRAGINFO pDragInfo)
+{
+   /* a replacement for DrgDeleteDraginfoStrHandles */
+   /* because that routine will fail if any one hstr is invalid */
+
+   ULONG i,ulItems;
+   PDRAGITEM pDragItem;
+
+   ulItems = DrgQueryDragitemCount(pDragInfo);
+   for (i=0;i<ulItems;i++)
+   {
+      pDragItem = DrgQueryDragitemPtr(pDragInfo,i);
+      DrgDeleteStrHandle(pDragItem->hstrType);
+      DrgDeleteStrHandle(pDragItem->hstrRMF);
+      DrgDeleteStrHandle(pDragItem->hstrContainerName);
+      DrgDeleteStrHandle(pDragItem->hstrSourceName);
+      DrgDeleteStrHandle(pDragItem->hstrTargetName);
+   }
+   return TRUE;
+}
+
+
 /******************************************************************************/
 /*  New button procedure which handles the context menu stuff for the objects */
@@ -75 +98 @@
   switch (msg)
     {
-#if 0
-    case WM_BEGINDRAG:
-      if(SHORT1FROMMP(mp2)||1) {
-        //  DosBeep(5000,130);
-        lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lpo) {
-          wpObject=lpo->wpObject;
-          if(somIsObj(wpObject)) {
-#if 0
-            DragItem.hwndItem=hwnd;
-            DragItem.ulItemID=(ULONG)wpObject;
-            DragItem.hstrType=DrgAddStrHandle("DRT_UNKNOWN");
-            DragItem.hstrRMF=DrgAddStrHandle("DRM_OBJECT");
-            DragItem.hstrContainerName=DrgAddStrHandle("E:\\CD-Brenner\\ADC_050\\!AUDIOCD_TOOLBAR!");
-            DragItem.hstrSourceName=DrgAddStrHandle("E:\\CD-Brenner\\ADC_050\\");
-#endif
-            wpObject->wpFormatDragItem(&DragItem);
-            //            DragItem.fsSupportedOps=DO_LINKABLE;
-            DragInfo=DrgAllocDraginfo(1);
-           
-            DrgSetDragitem(DragInfo, &DragItem,(ULONG)sizeof(DragItem),0);
-            memset(&DragImage, 0, sizeof(DragImage));
-            DragImage.cb=sizeof(DragImage);
-            DragImage.fl=DRG_ICON;
-            DragImage.hImage=wpObject->wpQueryIcon();
-            
-
-            if(DrgDrag(hwnd, DragInfo, &DragImage, 1, VK_ENDDRAG, NULL)) {
-              lpo->lpParent->lpRefreshLaunchPad();
-            }
-
-            /* Free DragInfo here!!!!!!!!!!! */
-            //DrgDeleteDraginfoStrHandles(pDragInfo);
-            // ????? DrgFreeDraginfo(DragInfo);
-            return (MRESULT)TRUE;
-          }/* somIsObj() */
-        }/* lpo */
-      }
-      break;
-
-    case DM_ENDCONVERSATION:
-    case DM_DRAGFILECOMPLETE:
-    case DM_DROPNOTIFY:
-    case DM_FILERENDERED:
-    case DM_RENDERCOMPLETE:
-      DosBeep(500,500);
-break;
-      return (MRESULT)FALSE;
-    case WM_ENDDRAG:
-      DosBeep(500,500);
-      return (MRESULT)TRUE;
-      break;
-#endif
     case WM_PAINT:
       lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
@@ -166 +136 @@
       {
         BOOL bReturn=FALSE;
-        
+
         TRY_LOUD(LP_DRAGOVER) {
-        lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lpo) {
-          wpObject=lpo->wpObject;
-          if(somIsObj(wpObject)) {
-            char chrClassName[10];
-            LONG lLength;
-            
-            pDragInfo=(PDRAGINFO) mp1;
-            hwndMenu=pDragInfo->hwndSource;
-            lLength=sizeof(chrClassName);
-            WinQueryClassName(hwndMenu, lLength, chrClassName);
-            if(strcmp(chrClassName,"#37"))
-              hwndMenu=NULL;/* Source isn't a container */
-            if(!bDrawn) {
-              HPS hps;
-              RECTL rectl;
-              SWP swp;
-
-              /* Draw the rect */
-              hps=DrgGetPS(hwnd);
-              WinQueryWindowPos(hwnd,&swp);
-              rectl.xLeft=1;
-              rectl.yBottom=1;
-              rectl.xRight=swp.cx-1;
-              rectl.yTop=swp.cy-1;
-              //WinDrawBorder(hps,&rectl, 3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);  
-              DrgReleasePS(hps);
-              //bDrawn=TRUE;
-            }
-            bReturn=TRUE;
-          }
-        }
+           lpo=(LPObject*)WinQueryWindowULong(hwnd,QWL_USER);
+           if(lpo) {
+             wpObject=lpo->wpObject;
+             if(somIsObj(wpObject)) {
+               char chrClassName[10];
+               LONG lLength;
+
+               pDragInfo=(PDRAGINFO) mp1;
+               hwndMenu=pDragInfo->hwndSource;
+               lLength=sizeof(chrClassName);
+               WinQueryClassName(hwndMenu, lLength, chrClassName);
+               if(strcmp(chrClassName,"#37"))
+                 hwndMenu=NULL;/* Source isn't a container */
+               if(!bDrawn) {
+                 HPS hps;
+                 RECTL rectl;
+                 SWP swp;
+
+                 /* Draw the rect */
+                 hps=DrgGetPS(hwnd);
+                 WinQueryWindowPos(hwnd,&swp);
+                 rectl.xLeft=1;
+                 rectl.yBottom=1;
+                 rectl.xRight=swp.cx-1;
+                 rectl.yTop=swp.cy-1;
+                 //WinDrawBorder(hps,&rectl, 3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);
+                 DrgReleasePS(hps);
+                 //bDrawn=TRUE;
+               }
+               bReturn=TRUE;
+             }
+           }
         }
         CATCH(LP_DRAGOVER)
-          {
-          } END_CATCH;
-          if(bReturn)
-            return wpObject->wpDragOver(hwndMenu,(PDRAGINFO) mp1);
-          break;
+        {
+        } END_CATCH;
+        if(bReturn)
+         return wpObject->wpDragOver(hwndMenu,(PDRAGINFO) mp1);
+        break;
       }
     case DM_DRAGLEAVE:
@@ -213 +183 @@
         SWP swp;
         HPS hps;
-        
+
         /* Remove target emphasis here */
         hps=DrgGetPS(hwnd);
@@ -221 +191 @@
         rectl.xRight=swp.cx-1;
         rectl.yTop=swp.cy-1;
-        // WinDrawBorder(hps,&rectl,3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);  
+        // WinDrawBorder(hps,&rectl,3, 3, 0, 0, DB_STANDARD|DB_PATINVERT);
         bDrawn=FALSE;
         DrgReleasePS(hps);
@@ -238 +208 @@
           if(lpo) {
             wpObject=lpo->wpObject;
-            if(somIsObj(wpObject)) { 
+            if(somIsObj(wpObject)) {
               pDragInfo=(PDRAGINFO) mp1;
               pDragItem=DrgQueryDragitemPtr(pDragInfo, 0);
@@ -264 +234 @@
         if(somIsObj(wpObject)) {
           if((SHORT)0x6d==SHORT1FROMMP(mp1)) {
-            /* Delete menu item */       
+            /* Delete menu item */
             if(wpObject->wpDelete(CONFIRM_DELETE|CONFIRM_DELETEFOLDER ) == OK_DELETE)
               lpo->lpParent->lpRemoveButton(lpo);
@@ -272 +242 @@
         }/* end of if(somIsObj(wpObject)) */
       }
-      }  
+      }
       CATCH(LP_COMMAND)
         {
@@ -288 +258 @@
 static MRESULT handleDragOver(HWND hwnd, MPARAM mp1, MPARAM mp2)
 {
-  MRESULT mResult;
   ULONG ulNumberOfObjects;
   PDRAGINFO pDragInfo;
@@ -294 +263 @@
   RECTL rectl;
   SWP swp;
-
-  mResult = MRFROM2SHORT( DOR_NODROPOP, DO_LINK);
-  
+  USHORT usIndicator=DOR_NEVERDROP,usOp=0;
+  WPObject *wpObject = NULL;
+
   /* Get access to the dragInfo */
   pDragInfo=(PDRAGINFO)mp1;
-  DrgAccessDraginfo(pDragInfo);
-  /* Get number of items */
-  ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);
-
-  if(ulNumberOfObjects>1) {
-    /* Free the draginfo */
-    DrgFreeDraginfo(pDragInfo);
-    return MRFROM2SHORT( DOR_NODROPOP, DO_LINK);
+  if (DrgAccessDraginfo(pDragInfo)) {
+      PDRAGITEM pDragItem = NULL;
+      SOMClass *cdTrackClass = NULL;
+
+        /* Get number of items */
+        ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);
+
+        if(ulNumberOfObjects>1) {
+         usIndicator = DOR_NODROP;
+         usOp = 0;
+         goto quit;
+        }
+
+      /* check if a WPS object was dropped, we do not accept anything else */
+      pDragItem = DrgQueryDragitemPtr(pDragInfo,0);
+      if (!DrgVerifyRMF(pDragItem,"DRM_OBJECT","DRF_OBJECT")) {
+         usIndicator = DOR_NEVERDROP;
+         usOp = 0;
+         goto quit;
+      } /* endif */
+
+      /*
+         refuse drop if WPS object pointer is not valid or if the object is
+         a descendant of MMCDTrack class (see Netlabs ticket #19)
+      */
+      wpObject = (WPObject *)OBJECT_FROM_PREC(pDragItem->ulItemID);
+      cdTrackClass = somhlpGetSomClass("MMCDTrack");
+      if (!somIsObj(wpObject) || wpObject->somIsA(cdTrackClass)) {
+         usIndicator = DOR_NEVERDROP;
+         usOp = 0;
+         goto quit;
+      } /* endif */
+
+        switch(pDragInfo->usOperation)
+       {
+       case DO_DEFAULT:
+       case DO_LINK:
+         if(!bDrawn) {
+           POINTL ptl;
+           launchPad * lp;
+
+           ptl.x=SHORT1FROMMP(mp2);
+           ptl.y=SHORT2FROMMP(mp2);
+           /* Pos in window coords */
+           WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
+
+           hps=DrgGetPS(hwnd);
+           WinQueryWindowPos(hwnd,&swp);
+
+           rectl.xLeft=swp.cx;//-swp.cy;
+
+           lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
+           if(lp) {
+             if(lp->lpQueryNumObjects()==0) {
+               rectl.xLeft=0;
+             }
+           }
+
+           rectl.yTop=swp.cy-1;
+           rectl.yBottom=1;
+           if(ptl.x<rectl.xLeft) {
+             int numB;
+
+             numB=(ptl.x-xButtonOffset)/(swp.cy+xButtonDelta);
+             rectl.xLeft=((ptl.x-numB*swp.cy) > swp.cy/2 ? numB+1: numB);
+             rectl.xLeft*=(swp.cy+xButtonDelta);
+             rectl.xLeft-=(xButtonDelta)-xButtonOffset+xButtonDelta;
+             rectl.xRight=rectl.xLeft+(xButtonDelta*2);
+           }
+           else {
+             rectl.xRight=swp.cx-1;
+           }
+           rclDrawn=rectl;
+           WinDrawBorder(hps,&rectl, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);
+           bDrawn=TRUE;
+
+           DrgReleasePS(hps);
+         }
+         usIndicator = DOR_DROP;
+         usOp = DO_LINK;
+         break;
+      default:
+         usIndicator = DOR_NODROPOP;
+         usOp = DO_LINK;
+         break;
+       }
+quit:
+     /* Free the draginfo */
+     DrgFreeDraginfo(pDragInfo);
   }
-
-  switch(pDragInfo->usOperation)
-    {
-    case DO_DEFAULT:
-    case DO_LINK:
-      if(!bDrawn) {
-        POINTL ptl;
-        launchPad * lp;
-        
-        ptl.x=SHORT1FROMMP(mp2);
-        ptl.y=SHORT2FROMMP(mp2);
-        /* Pos in window coords */
-        WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
-
-        hps=DrgGetPS(hwnd);
-        WinQueryWindowPos(hwnd,&swp);
-
-        rectl.xLeft=swp.cx;//-swp.cy;
-
-        lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
-        if(lp) {
-          if(lp->lpQueryNumObjects()==0) {
-            rectl.xLeft=0;
-          }
-        }
-        
-        rectl.yTop=swp.cy-1;    
-        rectl.yBottom=1;
-        if(ptl.x<rectl.xLeft) {
-          int numB;
-
-          numB=(ptl.x-xButtonOffset)/(swp.cy+xButtonDelta);
-          rectl.xLeft=((ptl.x-numB*swp.cy) > swp.cy/2 ? numB+1: numB);
-          rectl.xLeft*=(swp.cy+xButtonDelta);
-          rectl.xLeft-=(xButtonDelta)-xButtonOffset+xButtonDelta;
-          rectl.xRight=rectl.xLeft+(xButtonDelta*2);
-        }
-        else {
-          rectl.xRight=swp.cx-1;
-        }
-        rclDrawn=rectl;
-        WinDrawBorder(hps,&rectl, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);  
-        bDrawn=TRUE; 
-        
-        DrgReleasePS(hps);
-      }
-      mResult = MRFROM2SHORT( DOR_DROP, DO_LINK);
-      break;
-    default:
-      break;
-    }
-
-  /* Free the draginfo */
-  DrgFreeDraginfo(pDragInfo);
-
-  return mResult;
+  return MRFROM2SHORT(usIndicator,usOp);
 }
 
@@ -375 +370 @@
   /* Remove target emphasis here */
   hps=DrgGetPS(hwnd);
-  WinDrawBorder(hps,&rclDrawn, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);  
+  WinDrawBorder(hps,&rclDrawn, 2, 2, 0, 0, DB_STANDARD|DB_PATINVERT);
   DrgReleasePS(hps);
-  bDrawn=FALSE; 
+  bDrawn=FALSE;
   return (MRESULT) FALSE;
 }
 
 
-static MRESULT EXPENTRY launchPadWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+static MRESULT EXPENTRY launchPadWindowProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   WPFolder* thisPtr;
   launchPad * lp;
   LPObject *lpo;
-  static USHORT id=0;//Initialisation new in V1.00a 
+  static USHORT id=0;//Initialisation new in V1.00a
 
   switch(msg)
     {
-#if 0
-    case DM_ENDCONVERSATION:
-    case DM_DRAGFILECOMPLETE:
-    case DM_DROPNOTIFY:
-    case DM_FILERENDERED:
-    case DM_RENDERCOMPLETE:
-      DosBeep(500,500);
-break;
-      return (MRESULT)FALSE;
-    case WM_ENDDRAG:
-      DosBeep(500,500);
-      break;
-      return (MRESULT)TRUE;
-#endif
     case WM_PAINT:
       {
@@ -426 +407 @@
     case DM_DROP:
       {
-        ULONG ulCount;
-        ULONG ulNumberOfObjects;
-        PDRAGITEM pDragItem;
-        SOMClass *folderClass;
-        WPObject * wpObject;
-        PDRAGINFO pDragInfo;
-       
-        TRY_LOUD(LP_FRAMEDROP) { 
+        TRY_LOUD(LP_FRAMEDROP) {
           /* A new object dropped on the launchpad */
-          pDragInfo=(PDRAGINFO)mp1;
+          PDRAGINFO pDragInfo=(PDRAGINFO)mp1;
           if(DrgAccessDraginfo(pDragInfo)) {
-            /* Get number of items */
-            ulNumberOfObjects = DrgQueryDragitemCount( pDragInfo);           
-            if(ulNumberOfObjects>1){
-              /* Free the draginfo */
-              DrgDeleteDraginfoStrHandles(pDragInfo);
-              DrgFreeDraginfo(pDragInfo);
-            }
-            else { 
-              ulCount=0;
-              
-              pDragItem=DrgQueryDragitemPtr( pDragInfo, ulCount);
-              wpObject=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, ulCount)->ulItemID);
               lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
               if(lp) {
-                if(somIsObj(wpObject)) {
-  
+                  PDRAGITEM pDragItem=DrgQueryDragitemPtr( pDragInfo, 0);
+                  WPObject *wpObject=(WPObject*)OBJECT_FROM_PREC(pDragItem->ulItemID);
                   POINTL ptl;
                   int numB;
                   SWP swp;
-                  
+
                   WinQueryWindowPos(hwnd,&swp);
                   ptl.x=pDragInfo->xDrop;
@@ -467 +429 @@
                   /* Do a link */
                   lp->lpAddButton(wpObject, numB);
-                  handleDragLeave(hwnd, mp1, mp2);
-                }
               }
-              DrgDeleteDraginfoStrHandles(pDragInfo);
+              myDrgDeleteDraginfoStrHandles(pDragInfo);
               DrgFreeDraginfo(pDragInfo);
-            }
           }
           handleDragLeave(hwnd, mp1, mp2);
@@ -479 +438 @@
           {
           } END_CATCH;
-          
-          break;
+          return MRFROMLONG(0);
       }
     case DM_DRAGLEAVE:
@@ -496 +454 @@
       return (MRESULT)FALSE;
       /***********************************************/
-      /* Stuff for fly over help                     */ 
+      /* Stuff for fly over help                     */
     case WM_MOUSEMOVE:
       launchPad * lp;
@@ -506 +464 @@
         }
       }
-      
-#if 0
-      tempID=WinQueryWindowUShort(hwnd,QWS_ID);/*  get the id of the window under the pointer  */                       
-      if(id!=tempID) {  // New Button?  
-        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,tempID,(ULONG)iTBFlyOverDelay); // New timer for delay
-        id=tempID;  // Save ID 
-      }
-      else {
-        if(!hwndBubbleWindow)
-          WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,tempID,(ULONG)iTBFlyOverDelay); // New timer for delay   
-      }
-#endif
+
       if(!hwndBubbleWindow)
         WinStartTimer(WinQueryAnchorBlock(hwnd), hwnd, 2,(ULONG)iTBFlyOverDelay); // New timer for delay        
@@ -541 +488 @@
       HPS  hps;
       RECTL   rcl;
-  
+
       /*  we have to build a new information window  */
-      if(hwndBubbleWindow){// if(){...} new in V1.00a 
+      if(hwndBubbleWindow){// if(){...} new in V1.00a
         WinDestroyWindow(hwndBubbleWindow);/*  close the bubblewindow  */
         hwndBubbleWindow=NULL;
@@ -551 +498 @@
       WinMapWindowPoints(HWND_DESKTOP,hwnd,&ptl,1);
       WinQueryWindowRect(hwnd,&rclWork);                                
-      if(!hwndBubbleWindow 
+      if(!hwndBubbleWindow
          && WinPtInRect(WinQueryAnchorBlock(hwnd),&rclWork,&ptl)
          && bTBFlyOverEnabled) {
-        
+
         static HWND hwndBubbleClient;
         ULONG style=FCF_BORDER|FCF_NOBYTEALIGN;
         char winText[255] = {0};
-        
+
         /* Get window text for size calculating */
             lp=(launchPad*)WinQueryWindowULong(hwnd,QWL_USER);
@@ -567 +514 @@
 
         ulWinTextLen=(LONG)strlen(winText); // Query text length
-        
+
         /* Delete 'Returns' in object title */
         char *pBuchst;
@@ -579 +526 @@
           pRest=pBuchst;
         }
-        
+
         /* Create help window */
         hwndBubbleWindow=WinCreateStdWindow(HWND_DESKTOP,
@@ -612 +559 @@
         GpiQueryTextBox(hps,ulWinTextLen,winText,TXTBOX_COUNT,aptlPoints);
         WinEndPaint(hps);
-        
+
         /* Set colors */
         WinSetPresParam(hwndBubbleClient,
@@ -620 +567 @@
                         PP_FOREGROUNDCOLOR,sizeof(rgbTBFlyForeground) ,
                         &rgbTBFlyForeground );
-        
+
         /* Calculate bubble positon and show bubble */
         WinQueryPointerPos(HWND_DESKTOP,&ptl);//Query pointer position in the desktop window
         WinQueryWindowRect(HWND_DESKTOP,&rcl);//Query desktop size
-        aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+7+xVal+ptl.x 
-          > rcl.xRight 
-          ? deltaX=-aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x-xVal-xVal-7 
+        aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+7+xVal+ptl.x
+          > rcl.xRight
+          ? deltaX=-aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x-xVal-xVal-7
               : deltaX=0 ;
-        
-        aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2+yVal+ptl.y 
-          > rcl.yTop 
+
+        aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2+yVal+ptl.y
+          > rcl.yTop
           ? deltaY=-aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y-2*yVal-7
               : deltaY=0 ;              
         WinSetWindowPos(hwndBubbleWindow,
                         HWND_TOP,
-                        ptl.x+xVal+deltaX,ptl.y+yVal+deltaY,  
+                        ptl.x+xVal+deltaX,ptl.y+yVal+deltaY,
                         aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+8,
                         aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2,
@@ -643 +590 @@
                         hwndBubbleWindow,
                         ptl.x+xVal+deltaX+5
-                        ,ptl.y+yVal+deltaY-5,  
+                        ,ptl.y+yVal+deltaY-5,
                         aptlPoints[TXTBOX_BOTTOMRIGHT].x-aptlPoints[TXTBOX_BOTTOMLEFT].x+8,
                         aptlPoints[TXTBOX_TOPLEFT].y-aptlPoints[TXTBOX_BOTTOMLEFT].y+2,
                         SWP_ZORDER|SWP_SIZE|SWP_MOVE|SWP_SHOW);
-        
+
         /* Set bubble text */
         WinSetWindowText(hwndBubbleClient,winText);
-        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,1,35); 
+        WinStartTimer(WinQueryAnchorBlock(hwnd),hwnd,1,35);
       } // end if(!hwndBubbleWindow)
       break;
@@ -666 +613 @@
             WinQueryWindowRect(hwnd, &rclWork);
             if(!WinPtInRect(WinQueryAnchorBlock(hwnd),&rclWork,&ptl))
-              { // Window has changed                            
+              { // Window has changed                           
                 WinStopTimer(WinQueryAnchorBlock(hwnd), hwnd, 1);  // stop the running timer
-                if(hwndBubbleWindow) 
+                if(hwndBubbleWindow)
                   WinDestroyWindow(hwndBubbleWindow);/*  close the bubblewindow  */
                 hwndBubbleWindow=0;
@@ -694 +641 @@
       break;
     default:
-      break;    
+      break;
     }
   return pfnwpOldLPProc(hwnd, msg, mp1, mp2);
@@ -701 +648 @@
 void LPList::lplRefreshAllPads()
 {
-  
+
 }
 
@@ -711 +658 @@
 LPObject::~LPObject(void)
 {
-#if 0
-  if(hPtr) {
-    if(!WinDestroyPointer(hPtr))
-      DosBeep(100,200);
-  }
-#endif
 }
 
@@ -766 +707 @@
   if(hwndLaunchPad)
     WinDestroyWindow(hwndLaunchPad);
-    
+
   /* Remove this pad from the list of pads */
   lplTemp=lplAllLPads;
@@ -844 +785 @@
       }
     }
-  
+
   lpBuildObjectList(chrConfigID);
 
@@ -859 +800 @@
   /* Refresh all launchpads */
   LPList *lplTemp;
-  
+
   //lplTemp=lplAllLPads;
   lplTemp=*lpList;
@@ -902 +843 @@
       }
   }
-  
-  lpSaveObjectList();   
+
+  lpSaveObjectList();
   lpRefreshLaunchPad();
 
@@ -967 +908 @@
         if((lpoTempNew=new LPObject(wpTempObject->wpQueryIcon()))!=NULL) {
           ULONG ulRC;
-          
+
           lpoTempNew->wpObject=wpTempObject;
           lpoTempNew->wpObject->wpLockObject();
@@ -1017 +958 @@
       if(!SysCheckFileExists(chrConfigTarget))
         return FALSE; /* No install dir defined */
-      
+
       sprintf(chrPath,"OBJECTID=%s",chrConfigID);
       if((hObject2=WinCreateObject("WPFolder", chrConfigID, chrPath,chrConfigTarget,CO_FAILIFEXISTS))==NULLHANDLE)
         return FALSE; /* Can't create new toolbar folder */
     }
-  
+
   /* Get toolbar folder */
   if(somIsObj(wpParentFolder)) {
@@ -1038 +979 @@
   wpFolder->wpQueryRealName(chrPath, &ulBufferSize, TRUE);
   strcat(chrPath,"\\objects.ini");/* Ini-File containing the hobjects */
-  
-  //  WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrPath, "~launchPad", 123, MB_OK| MB_MOVEABLE);  
+
+  //  WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrPath, "~launchPad", 123, MB_OK| MB_MOVEABLE);
   do{
     /* Open the ini-file */
     if((hIni=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),chrPath))==NULLHANDLE)
-      break; 
+      break;
 
     if((memPtr=(char*)malloc(ulNumObjects*sizeof(HOBJECT)))==NULL)
       break;
-    
+
 
     hObject=(HOBJECT*)memPtr;
@@ -1064 +1005 @@
 
     free(hObject);
-    
+
     PrfCloseProfile(hIni);
     return TRUE;
@@ -1083 +1024 @@
   WPObject* wpObject;
 
-  char chrText[200];  
+  char chrText[200];
   ULONG ul;
 
@@ -1113 +1054 @@
   wpFolder->wpQueryRealName(chrPath, &ulBufferSize, TRUE);
   strcat(chrPath,"\\objects.ini");/* Ini-File containing the hobjects */
-  
+
   do{
     /* Open the ini-file */
     if((hIni=PrfOpenProfile(WinQueryAnchorBlock(HWND_DESKTOP),chrPath))==NULLHANDLE)
-      break; 
- 
+      break;
+
     if(!PrfQueryProfileSize(hIni,"objects","handles", &ulBufferSize))
       break;
@@ -1127 +1068 @@
     if((memPtr=(char*)malloc(ulBufferSize))==NULL)
       break;
-    
-    ulNumObjects=ulBufferSize/sizeof(HOBJECT);    
+
+    ulNumObjects=ulBufferSize/sizeof(HOBJECT);
 
     if(!PrfQueryProfileData(hIni,"objects","handles", memPtr, &ulBufferSize)){
@@ -1149 +1090 @@
             strncpy(lpoTemp->chrName, wpTempObject->wpQueryTitle(),sizeof(lpoTemp->chrName));
             lpoTemp->lpParent=this;
-            
+
             lpoTemp->lpoNext=lpoObjectList;
             lpoObjectList=lpoTemp;
@@ -1158 +1099 @@
         }
       }/* for */
-    
+
     free(hObjectArray);
-    
+
     PrfCloseProfile(hIni);
     return TRUE;
@@ -1249 +1190 @@
   for(a=ulNumObjects;a>0 && lpoTemp; a--)
     {
-      /* Create Buttons */ 
+      /* Create Buttons */
       if((hwndTemp=WinCreateWindow(hwndLaunchPad, WC_BUTTON, lpoTemp->chrName, WS_VISIBLE, xButtonOffset+(a-1)*(swp.cy+xButtonDelta), 1, swp.cy-2, swp.cy-2,
                                    hwndLaunchPad, HWND_TOP, a*100,
@@ -1276 +1217 @@
       lpoTemp=lpoTemp->lpoNext;
     }
-  return TRUE;  
-}
-
-
-
+  return TRUE;
+}
+

trunk/mediafolder/c/m3ufolder/m3ufolderoverriddenwpmethods.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 2002-2003
- * 
+ *
  * It's part of the Media-Folder distribution
  */
@@ -33 +33 @@
 extern ULONG ulQWL_LEFTCTRLHWND;
 
-#if 0 
-/* For calling the method in the MMAudio class. Linking to the DLL would require the
-   new audio classes. By dynamically querying the method the media folder works without
-   installing the audio classes. */  
-typedef ULONG   SOMLINK somTP_MMCDTrack_cwmmQueryTrackInfo(MMCDTrack *somSelf,
-                char** chrString,
-                ULONG ulSize,
-                int iWhich);
-typedef somTP_MMCDTrack_cwmmQueryTrackInfo *somTD_MMCDTrack_cwmmQueryTrackInfo;
-extern somTD_MMCDTrack_cwmmQueryTrackInfo methodPtrCDTrack;
-#endif
-
 extern LOADEDBITMAP allBMPs[];
 extern PFNWP pfnwpGenericFrame;
@@ -70 +58 @@
 //void HlpWriteToTrapLog(const char* chrFormat, ...);
 
-#if 0
-void _Optlink rexxThreadFunc (void *arg)
-{
-  HAB  hab;
-  HMQ  hmq;
-  QMSG qmsg;
-  CWM3UFolder *thisPtr;
-  HWND hwnd;
-#if 0
-  char chrFileName[CCHMAXPATH];
-  char chrFolderName[CCHMAXPATH];
-  char chrRexxScript[CCHMAXPATH];
-#endif
-  char *chrFileName;
-  char *chrFolderName;
-  char *chrRexxScript;
-  ULONG ulSize;
-
-  thisPtr=(CWM3UFolder*)arg;   
-  if(!somIsObj(thisPtr))
-    return;
-
-  if(!somIsObj(thisPtr->wpObjM3UFile))
-    return;
-
-  chrFileName=thisPtr->wpAllocMem( CCHMAXPATH*3+10 , &ulSize);
-  if(!chrFileName)
-    return;
-  
-  chrFolderName=chrFileName+CCHMAXPATH+1;
-  chrRexxScript=chrFolderName+CCHMAXPATH+1;
-
-  ulSize=CCHMAXPATH;
-  if(!((WPFileSystem*)thisPtr->wpObjM3UFile)->wpQueryRealName(chrFileName, &ulSize, TRUE))
-    return;
-  
-  ulSize=CCHMAXPATH;
-  if(!thisPtr->wpQueryRealName(chrFolderName, &ulSize, TRUE))
-    return;
-
-  hab=WinInitialize(0);
-  if(hab) {
-    hmq=WinCreateMsgQueue(hab,0);
-    if(hmq) {      
-      RXSTRING arg[2];                    /* argument string for REXX  */
-      RXSTRING rexxretval;                /* return value from REXX    */
-      APIRET   rc;                        /* return code from REXX     */
-      SHORT    rexxrc = 0;                /* return code from function */
-      
-      
-      sprintf(chrRexxScript,"%s%s",  chrInstallDir,RX_INSERT_PLAYLISTTRACKS);
-      //HlpWriteToTrapLog("chrRexxScript: %s\n", chrRexxScript);
-      /* 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*/
-      
-      MAKERXSTRING(arg[0], chrFileName, strlen(chrFileName));/* create input argument     */
-      MAKERXSTRING(arg[1], chrFolderName, strlen(chrFolderName));/* create input argument     */              
-      
-      TRY_LOUD(RX_START) {
-        /* Here we call the interpreter.  We don't really need to use    */
-        /* all the casts in this call; they just help illustrate         */
-        /* the data types used.                                          */
-        rc=RexxStart((LONG)       2,             /* number of arguments   */
-                     (PRXSTRING)  &arg,          /* array of arguments    */
-                     (PSZ)        chrRexxScript,/* name of REXX file     */
-                     //   (PSZ)        "H:\\cwmm\\mediafolder\\beep.cmd",/* name of REXX file     */
-                     (PRXSTRING)  0,             /* No INSTORE used       */
-                     (PSZ)        "CWRXX",         /* Command env. name     */
-                     (LONG)       RXSUBROUTINE,  /* Code for how invoked  */
-                     (PRXSYSEXIT) 0,             /* No EXITs on this call */
-                     (PSHORT)     &rexxrc,       /* Rexx program output   */
-                     (PRXSTRING)  &rexxretval ); /* Rexx program output   */
-        
-        if(rc) {
-          sprintf(chrFileName,"Error in the Rexx skript %s\n\n Get more information with 'help REX%04d'.\n", 
-                  "", rc*-1);
-          WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrFileName, "", 1234, MB_OK|MB_MOVEABLE|MB_ERROR);
-        }
-        DosFreeMem(rexxretval.strptr);          /* Release storage given to us by REXX.  */      
-      }
-      CATCH(RX_START)
-        {}END_CATCH;
-               
-        WinDestroyMsgQueue(hmq);
-    }
-    WinTerminate(hab);
-  }
-  thisPtr->fContentsChanged=FALSE;
-  thisPtr->wpFreeMem((PBYTE)chrFileName); 
-}
-
-BOOL CWM3UFolder::wpSetup(PSZ pSetupString)
-{
-  /**************************************************
-   *                                                *
-   *                                                *
-   **************************************************/
-  char buffer[25];
-  ULONG bufferSize;
-
-  /* Set object window HWND */
-  bufferSize=sizeof(buffer);
-  if(wpScanSetupString(pSetupString, "M3UOBJECTWINDOW", buffer,&bufferSize))
-    {
-      hwndObject=atol(buffer);
-    }
-
-  /* Set object pointer to M3U-File */
-  bufferSize=sizeof(buffer);
-  if(wpScanSetupString(pSetupString, "M3UOBJECTHANDLE", buffer,&bufferSize))
-    {
-      WPObject *wpObject;
-
-      wpObjM3UFile=NULLHANDLE;
-      wpObject=(WPObject*)atol(buffer);
-      if(somIsObj(wpObject))
-        wpObjM3UFile=wpObject;
-    }
-
-
-  /* FIXME: Use immediate parent here !!!! */
-  return CWMediaFolder::wpSetup(pSetupString);
-}
-#endif
-
 /*****************************************************/
 /*                                                   */
@@ -203 +64 @@
 /*                                                   */
 /*****************************************************/
-MRESULT EXPENTRY m3uFldrContainerProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+MRESULT EXPENTRY m3uFldrContainerProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   CWMediaFolder* thisPtr;
@@ -272 +133 @@
 /*                                                                          */
 /****************************************************************************/
-MRESULT EXPENTRY m3uTopCtrlDialogProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
-{
-    
+MRESULT EXPENTRY m3uTopCtrlDialogProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
+{
+
   switch(msg)
     {
@@ -284 +145 @@
         ULONG ulStyle;
         SWP swp;
-        
+
         WinSetWindowULong(hwnd,QWL_USER,(ULONG)PVOIDFROMMP(mp2));//Save object ptr.
         WinQueryWindowPos(WinQueryWindow(hwnd,QW_PARENT),&swp);
@@ -299 +160 @@
       WinSetFocus(HWND_DESKTOP, WinWindowFromID(WinQueryWindow(hwnd,QW_PARENT),FID_CLIENT));
       return WinSendMsg(WinWindowFromID(WinQueryWindow(hwnd,QW_PARENT),FID_CLIENT),msg,mp1,mp2);
-      
+
       /*****************************************************/
       /* Paint the background.                             */
@@ -321 +182 @@
           ptl.x=lTemp*rclSource.xRight;
           lTemp=rcl.yBottom/rclSource.yTop;
-          lTemp*=rclSource.yTop;   
+          lTemp*=rclSource.yTop;
           while(ptl.x<rcl.xRight) {
             ptl.y=lTemp;
             while(ptl.y<rcl.yTop) {/* y direction */
               WinDrawBitmap(hps, allBMPs[CTRLIDX_BOTTOM].hbm,
-                            &rclSource, 
+                            &rclSource,
                             (PPOINTL)&ptl,
                             0, 0,
@@ -332 +193 @@
               ptl.y+=allBMPs[CTRLIDX_BOTTOM].bmpInfoHdr.cy;
             };
-            ptl.x+=allBMPs[CTRLIDX_BOTTOM].bmpInfoHdr.cx; 
+            ptl.x+=allBMPs[CTRLIDX_BOTTOM].bmpInfoHdr.cx;
           };
           WinEndPaint(hps);
@@ -351 +212 @@
         rclSource.xRight=allBMPs[CTRLIDX_TOPLEFT].bmpInfoHdr.cx;
         WinDrawBitmap(hps, allBMPs[CTRLIDX_TOPLEFT].hbm,
-                      &rclSource, 
+                      &rclSource,
                       (PPOINTL)&rclSave,
                       0, 0,
@@ -364 +225 @@
         rclSource.xRight=allBMPs[CTRLIDX_TOPRIGHT].bmpInfoHdr.cx;
         WinDrawBitmap(hps, allBMPs[CTRLIDX_TOPRIGHT].hbm,
-                      &rclSource, 
+                      &rclSource,
                       (PPOINTL)&rclSave,
                       0, 0,
@@ -386 +247 @@
  *                                                          *
 ************************************************************/
-MRESULT EXPENTRY m3uFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2) 
+MRESULT EXPENTRY m3uFrameProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
   CWM3UFolder* thisPtr;
@@ -419 +280 @@
 #endif
               case 0x2d1: /* View menu */
-                /* Remove change to Tree from menubar menu */ 
+                /* Remove change to Tree from menubar menu */
                 WinSendMsg(HWNDFROMMP(mp2),MM_REMOVEITEM,MPFROM2SHORT(717,TRUE),0);
                 /* Icon view */
@@ -462 +323 @@
           case ID_MENUITEMEXIT:
             WinPostMsg(hwnd, WM_CLOSE, 0, 0);
-            return MRFALSE; 
+            return MRFALSE;
           case ID_MENUITEMSAVE:
             {
@@ -472 +333 @@
                   }
                 }
-              return MRFALSE; 
+              return MRFALSE;
             }
           default:
-            if(SHORT1FROMMP(mp1)>=FIRSTUSERITEM) { 
+            if(SHORT1FROMMP(mp1)>=FIRSTUSERITEM) {
               BOOL bHandled=FALSE;
-              
+
               TRY_LOUD(AF_MENU) {
 #if 0
@@ -484 +345 @@
                     thisPtr=(CWMediaFolder*) WinQueryWindowULong(hwndDialog,QWL_USER);
                     if(somIsObj(thisPtr)) {
-                      
+
                       CWMenuFolder * wpFolder;  
                       HOBJECT hObject;
@@ -490 +351 @@
                       somTD_CWMenuFolder_mfCheckSkriptMenuItems methodPtr;
                       M_WPObject *m_wpObject;
-                      
+
                       if(!bHandled)
                         bHandled=thisPtr->cwCheckUserMenuItems(USERMENUFOLDER_MEDIAFOLDER , SHORT1FROMMP(mp1));
@@ -557 +418 @@
 
   /* Reregister wpFolder window class on first opening */
-  /* We need this private code to have some private 
+  /* We need this private code to have some private
      window words */
   if(!g_fRegisteredWindowClass)
     {
       CLASSINFO ci;
-      
+
       if(WinQueryClassInfo(WinQueryAnchorBlock(HWND_DESKTOP),
                            (PSZ)"wpFolder window",
@@ -589 +450 @@
   /* Skip media folder. Because of this skip we had to register the window words here (see above).
      It's not asured a Mediafolder was already opended. Normaly the window words are added in
-     wpOpen() of the Mediafolder. 
+     wpOpen() of the Mediafolder.
      FIXME: This only works if CWProgFolder->CWMediaFolder->CWM3UFolder is the class hierarchy */
   hwnd=CWProgFolder::wpOpen(hwndCnr, ulView, ulParam);
 
   /* Only subclass folder frames, not settings notebooks */
-  if(ulView!=OPEN_SETTINGS){    
+  if(ulView!=OPEN_SETTINGS){
     if(!hResource) {
       errorResource();
@@ -604 +465 @@
       ULONG ulErr;
 
-      /* Remove the title added by XWP */
-      WinSetWindowText(hwnd, wpObjM3UFile->wpQueryTitle());
+          if (somIsObj(wpObjM3UFile)) {
+         /* Remove the title added by XWP */
+         WinSetWindowText(hwnd, wpObjM3UFile->wpQueryTitle());
+      }
       if(!getMessage(text, IDSTR_PLAYLISTVIEWTITLE, sizeof(text), queryResModuleHandle(), HWND_DESKTOP))
         sprintf(text, "Playlist Editor");
@@ -624 +487 @@
         /* Menu bar found */
 
-        /* Remove folder item from menubar menu */ 
+        /* Remove folder item from menubar menu */
         WinSendMsg( myFrameCtrlHWND, MM_REMOVEITEM, MPFROM2SHORT(0x2cf,TRUE),0);
 
@@ -633 +496 @@
         mi.afStyle=MIS_TEXT|MIS_SUBMENU;
         mi.id=ID_MENUFILE;
-        mi.afAttribute=NULL;                
+        mi.afAttribute=NULL;
         mi.hwndSubMenu=hwndMenu;
         mi.hItem=NULL;
@@ -640 +503 @@
         getMessage(text, IDSTR_MENUFILE,sizeof(text), hResource, hwnd);
         WinSendMsg(myFrameCtrlHWND,MM_INSERTITEM,MPFROMP(&mi),
-                   (MPARAM)text); 
+                   (MPARAM)text);
 
         /* Insert skript and user menu item if necessary */
@@ -675 +538 @@
             iItemCount=(int)WinSendMsg(myFrameCtrlHWND,MM_QUERYITEMCOUNT,(MPARAM)0,
                                        (MPARAM)0);
-            
+
             /* Fill the MENUITEM structure */
             mi.iPosition=iItemCount-1;
             mi.afStyle=MIS_TEXT|MIS_SUBMENU;
             mi.id=ID_MBMENUSKRIPTS;
-            mi.afAttribute=NULL;                
+            mi.afAttribute=NULL;
             mi.hwndSubMenu=hwndMenu;
             mi.hItem=NULL;
@@ -687 +550 @@
             getMessage(text, IDSTR_MENUSKRIPTS,sizeof(text), hResource, hwnd);
             WinSendMsg(myFrameCtrlHWND,MM_INSERTITEM,MPFROMP(&mi),
-                       (MPARAM)text); 
+                       (MPARAM)text);
           }/* end of if(hwndMenu) */
         }
@@ -700 +563 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd, m3uTopCtrlDialogProc,hResource,IDDLG_TOPFRAME ,this);
-      /* Save the HWND in the instance data */    
+      /* Save the HWND in the instance data */
       //      hwndTop=myFrameCtrlHWND;
-      /* Save the HWND in the Window words */    
-      WinSetWindowULong( hwnd, ulQWL_TOPCTRLHWND, myFrameCtrlHWND);  
-    
+      /* Save the HWND in the Window words */
+      WinSetWindowULong( hwnd, ulQWL_TOPCTRLHWND, myFrameCtrlHWND);
+
       if(myFrameCtrlHWND){
         /* Query the size of the dialog */
@@ -712 +575 @@
         //        sizel.cy=rectl.yTop-rectl.yBottom;
         sizel.cy=12;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_TOP means put it at the top of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -722 +585 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,leftCtrlDialogProc,hResource,IDDLG_LEFTFRAME ,this);
-      /* Save the HWND in the instance data */    
+      /* Save the HWND in the instance data */
       //    hwndLeft=myFrameCtrlHWND;
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_LEFTCTRLHWND, myFrameCtrlHWND);
-        
-    
+
+
       if(myFrameCtrlHWND){
         /* Query the size of the dialog */
@@ -734 +597 @@
         sizel.cx=allBMPs[CTRLIDX_TOPRIGHT].bmpInfoHdr.cx-1-7-2;//rectl.xRight-rectl.xLeft;
         //  sizel.cx=rectl.xRight-rectl.xLeft;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_RIGHT means put it at the RIGHT of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -744 +607 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,rightCtrlDialogProc,hResource,IDDLG_FRAMERIGHT ,this);
-      /* Save the HWND in the instance data */    
+      /* Save the HWND in the instance data */
       //      hwndRight=myFrameCtrlHWND;
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_RIGHTCTRLHWND, myFrameCtrlHWND);
-     
+
       if(myFrameCtrlHWND){
         CNRINFO cnrInfo;
-        HWND hwndContainer; 
+        HWND hwndContainer;
         PVIEWITEM pView;
 
@@ -758 +621 @@
         /* It's the right dialog so we need the width but not the height. */
         sizel.cx=allBMPs[CTRLIDX_TOPRIGHT].bmpInfoHdr.cx-1-7-2;// rectl.xRight-rectl.xLeft;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_RIGHT means put it at the RIGHT of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
         cwAddFrameCtl(hwnd, myFrameCtrlHWND, sizel, FCTL_RIGHT, FCTL_POSABOVE|FCTL_POSBELOW);
-        
+
         //        hwndContainer=WinWindowFromID(myFrameCtrlHWND, IDCNR_PLAYLIST);
         //  WinSendMsg(hwndContainer,CM_QUERYCNRINFO, MPFROMP(&cnrInfo),
@@ -772 +635 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,bottomCtrlDialogProc,hResource,IDDLG_BOTTOMFRAME ,this);
-      /* Save the HWND in the instance data */    
-      hwndBottom=myFrameCtrlHWND;            
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the instance data */
+      hwndBottom=myFrameCtrlHWND;
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_BOTTOMCTRLHWND, myFrameCtrlHWND);
 
@@ -783 +646 @@
         sizel.cy=rectl.yTop-rectl.yBottom-2;
         //    sizel.cy=allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_TOP means put it at the top of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -810 +673 @@
         SysWriteToTrapLog("\nTrap occured in %s, file: %s above line %d.\n",
                           __FUNCTION__, __FILE__, __LINE__);
-        
-      } END_CATCH;    
+
+      } END_CATCH;
 
       /* Make sure on open the container is visible */
@@ -825 +688 @@
   fContentsChanged=TRUE;
   return CWMediaFolder::wpDeleteFromContent(Object);
-}
-
-MRESULT CWM3UFolder::wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem)
-{
-  return CWMediaFolder::wpDrop(hwndCnr, pDragInfo, pDragItem);
 }
 
@@ -847 +705 @@
     return;
 
-  thisPtr=(CWM3UFolder*)parms->thisPtr;   
+  thisPtr=(CWM3UFolder*)parms->thisPtr;
   if(!somIsObj(thisPtr))
     return;
@@ -862 +720 @@
     hmq=WinCreateMsgQueue(hab,0);
     if(hmq) {
-      FILE* fStream;      
+      FILE* fStream;
 
       if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), parms->hwndCnr))
@@ -894 +752 @@
                     else
                       break;/* Error */
-                                        
+
                     /* Get the name of the audio file */
                     ulSize=sizeof(chrFileName);
@@ -906 +764 @@
                   break;
                 }/* for() */
-            }/* fopen() */   
+            }/* fopen() */
           fclose(fStream);
         }
@@ -918 +776 @@
     /* Close and destroy the folder if requested */
     WinPostMsg(parms->hwndFrame, WM_CLOSE, 0, 0);
-    if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), thisPtr->hwndObject)) 
+    if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), thisPtr->hwndObject))
       WinPostMsg(thisPtr->hwndObject, WM_APPTERMINATENOTIFY, 0, 0);
   }
@@ -968 +826 @@
                            title, IDSTR_CLOSETITLE, sizeof(title),
                            queryResModuleHandle(),
-                           HWND_DESKTOP, 
+                           HWND_DESKTOP,
                            MB_YESNOCANCEL|MB_MOVEABLE|MB_ICONQUESTION))==MBID_CANCEL)
       return FALSE;

trunk/mediafolder/c/mediafldr/mediafolder.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 2002
- * 
+ *
  * It's part of the Media-Folder distribution
  */
@@ -69 +69 @@
   switch(ulAction)
     {
-    case PLAY_FIRST:  
+    case PLAY_FIRST:
       /* Send a message to the object window created by the folder play thread */
       WinPostMsg(thisPtr->mfData->hwndPlayObject,WM_APPTERMINATENOTIFY, 0,MPFROMLONG(PLAY_FIRST));
@@ -146 +146 @@
               thisPtr->cwSeekAudioFile(LONGFROMMP(mp1));
               /* restart timer */
-              //    WinStartTimer(WinQueryAnchorBlock(hwnd), WinWindowFromID(hwndFrame), IDTIMER_PLAY, PLAYTIMER_DELAY);  
+              //    WinStartTimer(WinQueryAnchorBlock(hwnd), WinWindowFromID(hwndFrame), IDTIMER_PLAY, PLAYTIMER_DELAY);
               thisPtr->ulPos=LONGFROMMP(mp1)/1000;
             }
@@ -192 +192 @@
       if(hwnd) {
         thisPtr->mfData->hwndPlayObject=hwnd;
+        WinSetWindowULong(hwnd, QWL_USER,(ULONG)tPt);
         WinSubclassWindow(hwnd,&playObjectProc);
-        WinSetWindowULong(hwnd, QWL_USER,(ULONG)tPt);
         /* Window created. */
         while(WinGetMsg(hab,&qmsg,(HWND)NULL,0,0))
@@ -225 +225 @@
     return;
 
-  thisPtr=(CWMediaFolder*)threadParms->thisPtr;   
+  thisPtr=(CWMediaFolder*)threadParms->thisPtr;
 
   if(!somIsObj(thisPtr))
@@ -247 +247 @@
   if(!((WPFileSystem*)thisPtr->wpObjM3UFile)->wpQueryRealName(chrFileName, &ulSize, TRUE))
     return;
-  
+
   /* Get name of folder */
   ulSize=CCHMAXPATH;
@@ -256 +256 @@
   if(hab) {
     hmq=WinCreateMsgQueue(hab,0);
-    if(hmq) {      
+    if(hmq) {
       RXSTRING arg[2];                    /* argument string for REXX  */
       RXSTRING rexxretval;                /* return value from REXX    */
@@ -266 +266 @@
       /* We could provide a buffer for the interpreter to use instead. */
       rexxretval.strlength = 0L;          /* initialize return to empty*/
-      
+
       MAKERXSTRING(arg[0], chrFileName, strlen(chrFileName));/* create input argument     */
-      MAKERXSTRING(arg[1], chrFolderName, strlen(chrFolderName));/* create input argument     */              
-      
+      MAKERXSTRING(arg[1], chrFolderName, strlen(chrFolderName));/* create input argument     */
+
       TRY_LOUD(RX_START) {
         /* Here we call the interpreter.  We don't really need to use    */
@@ -285 +285 @@
                      (PSHORT)     &rexxrc,       /* Rexx program output   */
                      (PRXSTRING)  &rexxretval ); /* Rexx program output   */
-        
+
         if(rc) {
-          sprintf(chrFileName,"Error in the Rexx skript %s\n\n Get more information with 'help REX%04d'.\n", 
+          sprintf(chrFileName,"Error in the Rexx skript %s\n\n Get more information with 'help REX%04d'.\n",
                   "", rc*-1);
           WinMessageBox(HWND_DESKTOP, HWND_DESKTOP, chrFileName, "", 1234, MB_OK|MB_MOVEABLE|MB_ERROR);
         }
-        DosFreeMem(rexxretval.strptr);          /* Release storage given to us by REXX.  */      
+        DosFreeMem(rexxretval.strptr);          /* Release storage given to us by REXX.  */
       }
       CATCH(RX_START)
         {}END_CATCH;
-               
+
         WinDestroyMsgQueue(hmq);
     }
@@ -301 +301 @@
   }
   //  thisPtr->fContentsChanged=FALSE;
-  thisPtr->wpFreeMem((PBYTE)chrFileName); 
+  thisPtr->wpFreeMem((PBYTE)chrFileName);
   thisPtr->wpFreeMem((PBYTE)threadParms);
 }
@@ -372 +372 @@
 
         WinSetWindowPos(hwndFrame, NULLHANDLE, swp2.x, swp2.y, swp2.cx,swp2.cy,SWP_SIZE|SWP_MOVE);
-        /* 
+        /*
            By changing the to contents view we trick the WPS to show the 'Details view' menu item in
            the view menu of the folders system menu. In that sub menu the WPS always inserts all known
@@ -379 +379 @@
            The system knows nothing about the 'compact view' and all the handling is done by us.
            As a side effect the folder position information for the details
-           view isn't changed when the folder is closed in 'Compact view'. 
+           view isn't changed when the folder is closed in 'Compact view'.
            */
         wpMenuItemSelected(hwndFrame, 0x2cc);
@@ -419 +419 @@
                             ",", chrBuf, sizeof(chrBuf));
       chrBuf[sizeof(chrBuf)-1]=0;
-      
+
       if(mfData->ulTotalTime<=3600) {
         getMessage( text, IDSTR_STATUSTIME1, sizeof(text), queryResModuleHandle(), HWND_DESKTOP);
@@ -432 +432 @@
         sprintf(time, text, mfData->ulTotalTime/(3600*24),
                 (mfData->ulTotalTime%(3600*24))/3600,  (mfData->ulTotalTime%3600)/60, mfData->ulTotalTime%60);
-      }      
+      }
       if(mfData->ulSize<=0xffffffff) {
         getMessage( text2, IDSTR_STATUSTIME4, sizeof(text2), queryResModuleHandle(),HWND_DESKTOP);
-        sprintf(text, text2, 
+        sprintf(text, text2,
                 mfData->ulNumTracks, mfData->ulSize/1000000 ,chrBuf, (mfData->ulSize%1000000)/1000,
                 chrBuf,  mfData->ulSize%1000,
@@ -488 +488 @@
   getMessage(pageName, IDSTRSETTING_TOOLBAR, sizeof(pageName), queryResModuleHandle(), hwndNotebook);
   pageinfo.pszName = pageName;
-  
+
   //Insert the page into the settings notebook
   return wpInsertSettingsPage(hwndNotebook,&pageinfo);
@@ -497 +497 @@
   PMINIRECORDCORE mrc;
   WPObject * contentObject;
-  
+
   /* See if we have an audio file played with doubleclick */
   mrc=(PMINIRECORDCORE)WinSendMsg(hwndContainer,CM_QUERYRECORDEMPHASIS,MPFROMLONG(CMA_FIRST),
@@ -551 +551 @@
   /* Get new ID for wave device */
   if(cwRequestMutex(hmtxFileName, 100000)==ERROR_TIMEOUT)
-    return FALSE;  
+    return FALSE;
 
   iWaveDev++;
@@ -565 +565 @@
       WPObject *wpObject;
       PMINIRECORDCORE pmrc;
-      
+
 #if 0
       /* There's already a file playing using doubleclick */
-      if(mmGetOtherPlayingAudioFile( this, hwndContainer, &wpObject, &pmrc)) 
+      if(mmGetOtherPlayingAudioFile( this, hwndContainer, &wpObject, &pmrc))
         return 0;
 #endif
@@ -605 +605 @@
         else
           return 0;/* Error */
-        
-        if( contentObject->somIsA(cwAudioClass) || 
+
+        if( contentObject->somIsA(cwAudioClass) ||
            /*contentObject->somIsA(mmAudioClass) ||*/
            contentObject->somIsA(mmMIDIClass)) {
@@ -643 +643 @@
                                     MPFROM2SHORT(CMA_NEXT,CMA_ITEMORDER));
 
-    if((int)mrc==-1) { 
+    if((int)mrc==-1) {
       /* Wrong parameter -> user deleted the shadow. */
       /* Stop wave, remove in use emphasis. */
@@ -650 +650 @@
     }
     //  HlpWriteToTrapLog("Next mrc is %x\n", mrc);
- 
+
     notFound=TRUE;
-    while(notFound && mrc && (int)mrc!=-1){ 
+    while(notFound && mrc && (int)mrc!=-1){
       contentObject=(WPObject*)OBJECT_FROM_PREC(mrc);//Get object
       if(somIsObj(contentObject)) {
@@ -664 +664 @@
       else
         return 0;/* Error */
-      
+
       if(contentObject->somIsA(cwAudioClass) ||
          /* contentObject->somIsA(mmAudioClass) || */
@@ -701 +701 @@
         /* Select the object */
         WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(pmrc),
-                   MPFROM2SHORT(TRUE, CRA_SELECTED));  
+                   MPFROM2SHORT(TRUE, CRA_SELECTED));
 
         return cwPlayAudioFile(hwndFrame, PLAY_FIRST);/* Not yet playing, so start the first one. */
@@ -709 +709 @@
         return cwPlayAudioFile(hwndFrame, PLAY_FIRST);/* Not yet playing, so start the first one. */
     }
- 
+
     /* Check the current time. If we are at the very beginning of the track skip to the previous track
        otherwise skip to the beginning of the current track. */
@@ -727 +727 @@
     /* Find an audio file */
     notFound=TRUE;
-    while(notFound && mrc && (int)mrc!=-1){ 
+    while(notFound && mrc && (int)mrc!=-1){
       contentObject=(WPObject*)OBJECT_FROM_PREC(mrc);//Get object
       if(somIsObj(contentObject)) {
@@ -741 +741 @@
 
       /* Check if it's an audio file thus playable */
-      if(contentObject->somIsA(cwAudioClass) || 
+      if(contentObject->somIsA(cwAudioClass) ||
          /*   contentObject->somIsA(mmAudioClass) || */
          contentObject->somIsA(mmMIDIClass)) {
@@ -755 +755 @@
     if(!mrc)
       return 0;
-    
+
     break;
   default:
@@ -771 +771 @@
   else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
-  
+
   chrDevice[sizeof(chrDevice)-1]=0;
 
   hwndNotify=playControlDialogFromFrameHWND(hwndFrame);//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);
 
-  /* Start audio file */  
+  /* Start audio file */
   sprintf(chrCommand,"open \"%s\"  type %s alias wave%d SHAREABLE wait",name, chrDevice, iWavePriv);
   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwndNotify, 0);
@@ -789 +789 @@
     rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     return 0;
-  }      
+  }
 
   sprintf(chrCommand,"SETPOSITIONADVISE wave%d ON EVERY 1000 notify", iWavePriv);
@@ -829 +829 @@
   }
 
-  /* Start pos timer. SET MCIPOSITIONADVICE fails when seeking in the wave. 
+  /* Start pos timer. SET MCIPOSITIONADVICE fails when seeking in the wave.
      Don't know why. */
 
-  //WinStartTimer(WinQueryAnchorBlock(hwndFrame), WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE), IDTIMER_PLAY, PLAYTIMER_DELAY);  
+  //WinStartTimer(WinQueryAnchorBlock(hwndFrame), WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE), IDTIMER_PLAY, PLAYTIMER_DELAY);
   WinStartTimer(WinQueryAnchorBlock(hwndFrame), playControlDialogFromFrameHWND(hwndFrame), IDTIMER_PLAY, PLAYTIMER_DELAY);
 
@@ -849 +849 @@
   /* Select the object */
   WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(mrc),
-             MPFROM2SHORT(TRUE, CRA_SELECTED));  
+             MPFROM2SHORT(TRUE, CRA_SELECTED));
 
   iWave=iWavePriv;
@@ -872 +872 @@
   BOOL bFound=FALSE;
 
-  /** Get a random number in the appropriate range                    */  
+  /** Get a random number in the appropriate range                    */
   DosGetDateTime((PDATETIME)&DT);      /* Get the time               */
   seed = DT.hours*60 + DT.minutes;     /* convert to hundreths       */
@@ -885 +885 @@
 
 #ifdef RANDOM_DEBUG
-    HlpWriteToTrapLog("\n     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);  
+    HlpWriteToTrapLog("\n     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);
 #endif
     /* Get a random number in the appropriate range */
@@ -891 +891 @@
       mfData->pRandomArray[zufall]=1;
 #ifdef RANDOM_DEBUG
-      HlpWriteToTrapLog("2     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);  
+      HlpWriteToTrapLog("2     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);
 #endif
       return zufall;
@@ -900 +900 @@
     if (zufall == start && !bFound) {
 #ifdef RANDOM_DEBUG
-      HlpWriteToTrapLog("Error     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);  
+      HlpWriteToTrapLog("Error     Zufall: %d       %d\n", zufall, mfData->pRandomArray[zufall]);
 #endif
       return -1;
@@ -944 +944 @@
   /* Check if we currently play the last track. */
   if((mfData->iNumPlayed>=mfData->iNumToPlay) && mfData->pRandomArray) {
-    cwStopAudioFile(hwndFrame);/* Reset playing vars and remove in use emphasis */        
+    cwStopAudioFile(hwndFrame);/* Reset playing vars and remove in use emphasis */
     if(!(ulFlags&FLAG_REPEAT))
       return 0;
@@ -959 +959 @@
   /* Get new ID for wave device */
   if(cwRequestMutex(hmtxFileName, 100000)==ERROR_TIMEOUT)
-    return FALSE;  
+    return FALSE;
   iWaveDev++;
   if(iWaveDev==1000)
@@ -1009 +1009 @@
   /* Find an audio file */
   notFound=TRUE;
-  while(notFound){ 
+  while(notFound){
     /* Find track to play */
     if((iTrack=_getRandomTrack(mfData))==-1) {
@@ -1022 +1022 @@
   HlpWriteToTrapLog("%s: _getRandomTrack returned: %d.\n", __FUNCTION__, iTrack);
 #endif
-    
+
     for(a=0,mrc=(PMINIRECORDCORE)WinSendMsg(hwndContainer,CM_QUERYRECORD,NULL,
                                             MPFROM2SHORT(CMA_FIRST,CMA_ITEMORDER));
@@ -1039 +1039 @@
 #endif
 
-    if(!mrc) 
+    if(!mrc)
       {
 #ifdef RANDOM_DEBUG
@@ -1053 +1053 @@
 
     /* Check if it's an audio file thus playable */
-    if(contentObject->somIsA(cwAudioClass) || 
+    if(contentObject->somIsA(cwAudioClass) ||
        /*       contentObject->somIsA(mmAudioClass) ||*/
        contentObject->somIsA(mmMIDIClass)) {
@@ -1083 +1083 @@
   else /*if(contentObject->somIsA(cwAudioClass) || contentObject->somIsA(mmAudioClass))*/
     strncpy(chrDevice,"WAVEAUDIO", sizeof(chrDevice));
-  
+
   chrDevice[sizeof(chrDevice)-1]=0;
 
   hwndNotify=playControlDialogFromFrameHWND(hwndFrame);//WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE);
 
-  /* Start audio file */  
+  /* Start audio file */
   sprintf(chrCommand,"open \"%s\"  type %s alias wave%d SHAREABLE wait",name, chrDevice, iWavePriv);
   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), hwndNotify, 0);
@@ -1100 +1100 @@
     rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
     return 0;
-  }      
+  }
 
   sprintf(chrCommand,"SETPOSITIONADVISE wave%d ON EVERY 1000 notify", iWavePriv);
@@ -1140 +1140 @@
     return 0;
   }
-  /* Start pos timer. SET MCIPOSITIONADVICE fails when seeking in the wave. 
+  /* Start pos timer. SET MCIPOSITIONADVICE fails when seeking in the wave.
      Don't know why. */
-  //  WinStartTimer(WinQueryAnchorBlock(hwndFrame), WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE), IDTIMER_PLAY, PLAYTIMER_DELAY);  
-  WinStartTimer(WinQueryAnchorBlock(hwndFrame), playControlDialogFromFrameHWND(hwndFrame), IDTIMER_PLAY, PLAYTIMER_DELAY);  
+  //  WinStartTimer(WinQueryAnchorBlock(hwndFrame), WinWindowFromID(hwndTop, IDDLG_TOPMIDDLE), IDTIMER_PLAY, PLAYTIMER_DELAY);
+  WinStartTimer(WinQueryAnchorBlock(hwndFrame), playControlDialogFromFrameHWND(hwndFrame), IDTIMER_PLAY, PLAYTIMER_DELAY);
 
   /* Set emphasis by adding the object to the inuse list */
@@ -1158 +1158 @@
   /* Select the object */
   WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(mrc),
-             MPFROM2SHORT(TRUE, CRA_SELECTED));  
+             MPFROM2SHORT(TRUE, CRA_SELECTED));
 
   iWave=iWavePriv;
@@ -1187 +1187 @@
         mfData->iNumPlayed=0;
       }
-      
+
       sprintf(chrCommand,"stop wave%d wait", iWave);
       rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-      
+
       sprintf(chrCommand,"close wave%d wait", iWave);
       rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
-      
+
       _resetDisplay(this);
         //_resetDisplay(topControlFromFrameHWND(hwndFrame));
@@ -1207 +1207 @@
               myViewItem.bIsInUseList=FALSE;
         };
-      
+
       //HlpWriteToTrapLog("\n1 line %d.\n");
-      
+
       /* Deselect the object */
       if(WinIsWindow(WinQueryAnchorBlock(hwndFrame), hwndContainer))
         WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(mrcPlaying),
-                   MPFROM2SHORT(FALSE, CRA_SELECTED));  
-      
+                   MPFROM2SHORT(FALSE, CRA_SELECTED));
+
       iWave=0;
       currentObject=NULLHANDLE;
@@ -1234 +1234 @@
 #endif
           WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(mrc),
-                     MPFROM2SHORT(FALSE, CRA_SELECTED));        
+                     MPFROM2SHORT(FALSE, CRA_SELECTED));
         }
 #if 0
@@ -1258 +1258 @@
                   ulPos=0;
                   WinSendMsg(hwndContainer,CM_SETRECORDEMPHASIS, MPFROMP(mrc),
-                             MPFROM2SHORT(FALSE, CRA_SELECTED));  
+                             MPFROM2SHORT(FALSE, CRA_SELECTED));
 
                 };
@@ -1273 +1273 @@
                         __FUNCTION__, __FILE__, __LINE__);
     } END_CATCH;
-    
+
     return TRUE;
 }
@@ -1323 +1323 @@
   if((rc & 0x0000ffff)!=MCIERR_SUCCESS) {
     /* Problem with MCI. Clean up. The Timer will be stopped in the method */
-    cwStopAudioFile(hwndFrame); 
+    cwStopAudioFile(hwndFrame);
   }
   else {
     if(!stricmp(retMsg, "stopped")) {
       /* Audio file played. Start next */
-      cwPlayAudioFile(hwndFrame, PLAY_NEXT); 
+      cwPlayAudioFile(hwndFrame, PLAY_NEXT);
     }
     showPlayTimeDisplay(this, TRUE);/* Ensure display is visible */

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpclsmethods.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 1999-2003
- * 
+ *
  * It's part of the Audio/Data-CD-Creator distribution
  */
@@ -132 +132 @@
 
   hps=WinGetPS(HWND_DESKTOP);
-  
+
   /* The main BMP */
   allBMPs[MAIN_BMP_IDX].hbm=GpiLoadBitmap(hps, hResource, IDBMP_TOPMIDDLE, 0, 0);
@@ -352 +352 @@
           if(DosQueryModuleHandle(pathname,&hmod)) {
             pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-              ->wpModuleForClass("CWAudioShadow");           
+              ->wpModuleForClass("CWAudioShadow");
             if(DosQueryModuleHandle(pathname,&hmod)) {
               pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                ->wpModuleForClass("M_CWCDFolder");           
+                ->wpModuleForClass("M_CWCDFolder");
               if(DosQueryModuleHandle(pathname,&hmod)) {
                 pathname=((WPClassManager*)SOMClassMgrObject)  //Query Pathname of class file
-                  ->wpModuleForClass("CWCDFolder");           
+                  ->wpModuleForClass("CWCDFolder");
                 if(DosQueryModuleHandle(pathname,&hmod)) {
                   hmod=0;
@@ -378 +378 @@
         if((found=strrchr(chrInstallDir,'\\'))!=NULLHANDLE)
           *found=0;
-        
+
         /* Save the dir for config files. */
         //strcpy( chrConfigDir, chrInstallDir);
@@ -393 +393 @@
 
   if(!hmod) {
-    char path[CCHMAXPATH];  
+    char path[CCHMAXPATH];
     char buf[CCHMAXPATH];
     char* found;
     APIRET rc;
-    
-    /* Get the language code of our system and load the  
+
+    /* Get the language code of our system and load the
        resource DLL with the right language */
     do {
@@ -404 +404 @@
       PCSZ pszLang=chrLang;
       char *chrPtr;
-      
+
       /* Get Language var */
       if(NO_ERROR!=DosScanEnv("LANG", &pszLang))
@@ -419 +419 @@
       while(*chrPtr==' ')
         chrPtr++;
-      
+
       /* Check if value seems to be valid. The var must be something like xx_XX thus length is 5 */
       if(strlen(chrPtr)<5)
         break;
-      
+
       if(DosQueryModuleName(queryModuleHandle("M_CWMediaFolder"),sizeof(path),path)!=NO_ERROR)
         break;
-      
+
       found=strrchr(path,'\\');
       if(!found)
         break;
       *found=0;
-      
-      /* Extract the first two chars */                
+
+      /* Extract the first two chars */
       sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]);
       strcat(path,buf);
@@ -438 +438 @@
       if(DosLoadModule(buf,sizeof(buf),path, &hmod)==NO_ERROR)
         break;
-      
+
       /* NLS DLL not found. Try to load default */
       found=strrchr(path,'\\');
       if(!found)
         break;
-      
+
       *found=0;
       sprintf(buf, DEFRESDLLNAME);
@@ -534 +534 @@
   ULONG ulInfoLen=0;
   APIRET rc;
-  char path[CCHMAXPATH];  
+  char path[CCHMAXPATH];
   char* found;
   char buf[CCHMAXPATH];
@@ -574 +574 @@
   /* We don't want an automatic template because we create it during
      installation because we need one with an ID so we can create a shadow
-     without problems. So we return CLSSTYLE_DONTTEMPLATE. 
+     without problems. So we return CLSSTYLE_DONTTEMPLATE.
      Another way would be an override of wpclsCreateDefaultTemplate()
      but this works, too, and we have to override this method anyway. We must
@@ -591 +591 @@
   if(PrfQueryProfileInt(HINI_USERPROFILE, APPKEY_CWMM, MFLDR_NO_TEMPLATE_SHADOW, 0))
     return;
- 
+
   if(!WinQueryObject(ID_MEDIALDRTMPL_SHADOW))
     {
@@ -778 +778 @@
 
     return rc;
-#endif    
-
-}
-
-
-
-
-
-
-
-
-
-
+#endif
+
+}
+
+
+
+
+
+
+
+
+
+

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp

@@ -1 +1 @@
 /*
  * This file is (C) Chris Wohlgemuth 2002
- * 
+ *
  * It's part of the Media-Folder distribution
  */
@@ -36 +36 @@
 /* For calling the method in the CWAudio class. Linking to the DLL would require the
    new audio classes. By dynamically querying the method the media folder works without
-   installing the audio classes. */  
+   installing the audio classes. */
 #include "cwmmquerytrackinfo.h"
 
@@ -144 +144 @@
         while(!(thisPtr->wpQueryFldrFlags() & FOI_POPULATEDWITHALL))
           DosSleep(300);
-        
+
         hwndContainer=WinWindowFromID(tPt->hwndFrame, FID_CLIENT);
         WinSendMsg(hwndContainer,CM_QUERYCNRINFO, MPFROMP(&cnrInfo),
                    MPFROMLONG(sizeof(cnrInfo)));
-        
+
         /* Get class object of MMAudio. We need it so we can check if a file is an audio file. */
         if(somIsObj(cwAudioClass)) {
@@ -234 +234 @@
   char time[200];
   ULONG ulSecs;
-  
+
   if(!methodPtr)
     somhlpQueryCWAudioMethodPtr(this);
-  
+
   if(methodPtr){
     if((fsObject=(WPFileSystem*)cwGetFileSystemObject(Object))!=NULLHANDLE){/* Filesystem object or NULL */
@@ -248 +248 @@
       }
     }
-  }  
+  }
   return CWProgFolder::wpDeleteFromContent(Object);
 }
@@ -265 +265 @@
 
   /* Reregister wpFolder window class on first opening */
-  /* We need this private code to have some private 
+  /* We need this private code to have some private
      window words */
   if(!g_fRegisteredWindowClass)
     {
       CLASSINFO ci;
-      
+
       if(WinQueryClassInfo(WinQueryAnchorBlock(HWND_DESKTOP),
                            (PSZ)"wpFolder window",
@@ -299 +299 @@
     return NULLHANDLE;
 
-#if 0    
+#if 0
   for(pViewItem=wpFindViewItem(VIEW_ANY, NULLHANDLE); pViewItem; pViewItem=wpFindViewItem(VIEW_ANY, pViewItem))
     iItemCount+=1;
@@ -318 +318 @@
     }
 
-    /* Save this ptr */ 
+    /* Save this ptr */
     WinSetWindowULong( hwnd, ulQWP_THISPTR, (ULONG)this); /* Moved from outside the if clause */
 
@@ -338 +338 @@
         ulFlags|=FLAG_ALREADYSIZED;
       }
-      
+
       /* Build new menu entries. */
       myFrameCtrlHWND=WinWindowFromID(hwnd,FID_MENU);//Get menu hwnd
@@ -388 +388 @@
             iItemCount=(int)WinSendMsg(myFrameCtrlHWND,MM_QUERYITEMCOUNT,(MPARAM)0,
                                        (MPARAM)0);
-            
+
             /* Fill the MENUITEM structure */
             mi.iPosition=iItemCount-1;
             mi.afStyle=MIS_TEXT|MIS_SUBMENU;
             mi.id=ID_MBMENUSKRIPTS;
-            mi.afAttribute=NULL;                
+            mi.afAttribute=NULL;
             mi.hwndSubMenu=hwndMenu;
             mi.hItem=NULL;
@@ -400 +400 @@
             getMessage(text, IDSTR_MENUSKRIPTS,sizeof(text), hResource, hwnd);
             WinSendMsg(myFrameCtrlHWND,MM_INSERTITEM,MPFROMP(&mi),
-                       (MPARAM)text); 
+                       (MPARAM)text);
           }/* end of if(hwndMenu) */
         }
@@ -422 +422 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,topCtrlDialogProc,hResource,IDDLG_TOPFRAME ,this);
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_TOPCTRLHWND, myFrameCtrlHWND);
 
@@ -431 +431 @@
            is always the width of the folder. */
         sizel.cy=allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_TOP means put it at the top of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -442 +442 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,leftCtrlDialogProc,hResource,IDDLG_LEFTFRAME ,this);
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_LEFTCTRLHWND, myFrameCtrlHWND);
-            
+
       if(myFrameCtrlHWND){
         /* Query the size of the dialog */
@@ -450 +450 @@
         /* It's the right dialog so we need the width but not the height. */
         sizel.cx=allBMPs[CTRLIDX_TOPRIGHT].bmpInfoHdr.cx-1-7-2;//rectl.xRight-rectl.xLeft;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_RIGHT means put it at the RIGHT of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -460 +460 @@
          the procedure saves this pointer for later use. */
       myFrameCtrlHWND=WinLoadDlg(hwnd,hwnd,rightCtrlDialogProc,hResource,IDDLG_FRAMERIGHT ,this);
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_RIGHTCTRLHWND, myFrameCtrlHWND);
 
       if(myFrameCtrlHWND){
         CNRINFO cnrInfo;
-        HWND hwndContainer; 
+        HWND hwndContainer;
         PVIEWITEM pView;
 
@@ -472 +472 @@
         /* It's the right dialog so we need the width but not the height. */
         sizel.cx=allBMPs[CTRLIDX_TOPRIGHT].bmpInfoHdr.cx-1-7-2;// rectl.xRight-rectl.xLeft;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_RIGHT means put it at the RIGHT of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
         cwAddFrameCtl(hwnd, myFrameCtrlHWND, sizel, FCTL_RIGHT, FCTL_POSABOVE|FCTL_POSBELOW);
-        
+
         hwndContainer=WinWindowFromID(myFrameCtrlHWND, IDCNR_PLAYLIST);
         WinSendMsg(hwndContainer,CM_QUERYCNRINFO, MPFROMP(&cnrInfo),
@@ -489 +489 @@
       /* Save the HWND in the instance data */
       hwndBottom=myFrameCtrlHWND;
-      /* Save the HWND in the Window words */    
+      /* Save the HWND in the Window words */
       WinSetWindowULong( hwnd, ulQWL_BOTTOMCTRLHWND, myFrameCtrlHWND);
-   
+
       if(hwndBottom){
         /* Query the size of the dialog */
@@ -498 +498 @@
         sizel.cy=rectl.yTop-rectl.yBottom-2;
         //    sizel.cy=allBMPs[MAIN_BMP_IDX].bmpInfoHdr.cy;
-        /* Call a method of CWProgFolder to add the dialog as a framecontrol. 
+        /* Call a method of CWProgFolder to add the dialog as a framecontrol.
            FCTL_TOP means put it at the top of the folder.
            After calling cwUpdateFrame(hwnd) it will be visible */
@@ -526 +526 @@
         SysWriteToTrapLog("\nTrap occured in %s, file: %s above line %d.\n",
                           __FUNCTION__, __FILE__, __LINE__);
-        
+
       } END_CATCH;
   }
@@ -543 +543 @@
   QMSG qmsg;
   CWMediaFolder *thisPtr;
-  
+
   thisPtr=(CWMediaFolder*)arg;    //Pointer auf CWMediaFolder-Object
   hab=WinInitialize(0);
@@ -575 +575 @@
   bufferSize=sizeof(buffer);
   if(!wpScanSetupString(pSetupString, MEDIAFLDR_VOLUME, buffer,&bufferSize))
-    { 
+    {
       ulVolume=70;
       /* Set position of slider bar */
@@ -593 +593 @@
   if(!wpScanSetupString(pSetupString,"ICONVIEWPOS",buffer,&bufferSize))
     wpSetup( "ICONVIEWPOS=20,10,60,75");/* Fill in defaults */
-  
+
   /* Set folder details- and sortclass to CWAudioShadow so track infos are shown */
   bufferSize=sizeof(buffer);
   if(!wpScanSetupString(pSetupString,"DETAILSCLASS",buffer,&bufferSize))
     wpSetup("DETAILSCLASS=CWAudioShadow");/* Fill in defaults */
-  
+
   bufferSize=sizeof(buffer);
   if(!wpScanSetupString(pSetupString,"SORTCLASS",buffer,&bufferSize))
     wpSetup("SORTCLASS=CWAudioShadow");/* Fill in defaults */
-  
+
   /* This works only on Warp 4 and above */
   bufferSize=sizeof(buffer);
@@ -608 +608 @@
     /* This works only on Warp 4 and above */
     wpSetup("DETAILSTODISPLAY=0,1,4,12,13,14,15,16,17,18,19,20,21");/* Fill in defaults */
-  
+
   /* This works only on Warp 4 and above */
   bufferSize=sizeof(buffer);
@@ -614 +614 @@
     /* This works only on Warp 4 and above */
     wpSetup("SORTBYATTR=6,24,25,26,27,28,29,30,31,32,33");/* Fill in defaults */
-  
+
   return rcParent;
 }
@@ -621 +621 @@
 {
   PVIEWITEM pViewItem;
-  
+
   /* Check if we close a settings view or a folder view. */
   pViewItem=thisPtr->wpFindViewItem(VIEW_DETAILS|VIEW_CONTENTS, NULLHANDLE);
@@ -664 +664 @@
   bufferSize=sizeof(buffer);
   if(wpScanSetupString(pSetupString, MEDIAFLDR_STOP, buffer,&bufferSize))
-    { 
+    {
       HWND hwndFrame=_findOpenMediaFldrViewHWND(this);
       if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), hwndFrame))
@@ -671 +671 @@
   bufferSize=sizeof(buffer);
   if(wpScanSetupString(pSetupString, MEDIAFLDR_NEXT, buffer,&bufferSize))
-    { 
+    {
       HWND hwndFrame=_findOpenMediaFldrViewHWND(this);
       if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), hwndFrame))
@@ -678 +678 @@
   bufferSize=sizeof(buffer);
   if(wpScanSetupString(pSetupString, MEDIAFLDR_PREV, buffer,&bufferSize))
-    { 
+    {
       HWND hwndFrame=_findOpenMediaFldrViewHWND(this);
       if(WinIsWindow(WinQueryAnchorBlock(HWND_DESKTOP), hwndFrame))
@@ -687 +687 @@
   bufferSize=sizeof(buffer);
   if(wpScanSetupString(pSetupString, MEDIAFLDR_VOLUME, buffer,&bufferSize))
-    { 
+    {
       ulVolume=atol(buffer);
       if(ulVolume<0)
@@ -699 +699 @@
   bufferSize=sizeof(buffer);
   if(wpScanSetupString(pSetupString, MEDIAFLDR_REPEAT, buffer,&bufferSize))
-    { 
+    {
       switch(atol(buffer))
         {
@@ -779 +779 @@
 ULONG CWMediaFolder::wpAddFolderView1Page(HWND hwndNotebook)
 {
-  /* 
+  /*
      Removing this page also means removing the XWorkplace
      view page. It would be possible to call the XWP method
@@ -836 +836 @@
     }
   /*
-    
+
     Climb up the list of parents to make sure we call the right
     method if the parent was replaced. Otherwise we may skip a replacement class
@@ -848 +848 @@
                             1,
                             __ClassObject->
-                            somGetMethodToken(mySomId))                    
-        )(this, hwndNotebook, ppageinfo);  
+                            somGetMethodToken(mySomId))
+        )(this, hwndNotebook, ppageinfo);
     SOMFree(mySomId);
     return rc;
   }
-  else 
+  else
     return CWProgFolder::wpInsertSettingsPage(hwndNotebook, ppageinfo);
 }
@@ -886 +886 @@
       ulPrivFlags&= ~MFLDR_VIEW_COMPACT;
       return rcParent;
-    case ID_MENUVIEWCOMPACT: /* Compact view */ 
+    case ID_MENUVIEWCOMPACT: /* Compact view */
       if(cwShrinkFolderToCompact(hwndFrame)) {
         /* Mark that we are in compact view. May be removed later when 'Compact'
@@ -950 +950 @@
                             1,
                             __ClassObject->
-                            somGetMethodToken(mySomId))                    
-        )(this, ulFlags, hwndCnr, fMultiSelect);  
+                            somGetMethodToken(mySomId))
+        )(this, ulFlags, hwndCnr, fMultiSelect);
     SOMFree(mySomId);
     return rc & ~( CTXT_TREE | CTXT_ICON);
   }
-  else 
+  else
     return CWProgFolder::wpFilterPopupMenu( ulFlags, hwndCnr, fMultiSelect) & ~( CTXT_TREE | CTXT_ICON);
 }
@@ -970 +970 @@
                               1,
                               __ClassObject->
-                              somGetMethodToken(mySomId))                  
-          )(this, ulView,pReserved);  
+                              somGetMethodToken(mySomId))
+          )(this, ulView,pReserved);
       SOMFree(mySomId);
     }
-    else 
+    else
       rc=CWProgFolder::wpRefresh(ulView, pReserved);
 
@@ -993 +993 @@
                               1,
                               __ClassObject->
-                              somGetMethodToken(mySomId))                    
-          )(this,hwndNotebook);  
+                              somGetMethodToken(mySomId))
+          )(this,hwndNotebook);
       SOMFree(mySomId);
     }
-    else 
+    else
       rc=CWProgFolder::wpAddSettingsPages(hwndNotebook);
-    
+
     if(!queryResModuleHandle()) {
       errorResource();
@@ -1011 +1011 @@
 {
   WPObject *wpObject;
-  WPFileSystem *wpFSObject;
-  ULONG ulNum;
-  ULONG a;
-  MRESULT mr;
-  SOMClass *mmAudioClass=somhlpQueryMMAudioClass();
-  SOMClass *mmMIDIClass=somhlpGetSomClass("MMMIDI");
-  SOMClass *cwAudioClass=somhlpGetSomClass("CWAudioShadow");
-
-
-  mr=MRFROM2SHORT( DOR_DROP, DO_LINK);
-  ulNum=DrgQueryDragitemCount(pDragInfo);/* Num items */
-
-  if(pDragInfo->usOperation!=DO_DEFAULT && pDragInfo->usOperation!=DO_LINK)
-    //    return MRFROM2SHORT( DOR_NEVERDROP, DO_MOVE);/* It's not an audio object */
-    {
-      /* Only CWAudioShadows may be copied or moved */
-      for(a=0;a<ulNum && SHORT1FROMMR(mr)!=DOR_NEVERDROP; a++)
-        {
-          /* Check every object dragged */
-          wpObject=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, a)->ulItemID);
-          if(!wpObject->somIsA(cwAudioClass))
-            {
-              return MRFROM2SHORT( DOR_NEVERDROP, DO_MOVE);/* It's not an audio object */
-            }
-        }
-      return MRFROM2SHORT( DOR_DROP, DO_MOVE);/*  */
-      return MRFROM2SHORT( DOR_DROP, pDragInfo->usOperation);/*  */
-    }
-
-
-  for(a=0;a<ulNum && SHORT1FROMMR(mr)!=DOR_NEVERDROP; a++)
-    {
-      /* Check every object dragged */
-      wpObject=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, a)->ulItemID);
-      /* Get the filesystem object in case it's a shadow */
-      wpFSObject=(WPFileSystem*)cwGetFileSystemObject(wpObject);
-      if(!somIsObj(wpFSObject))
-        return MRFROM2SHORT( DOR_NEVERDROP, DO_MOVE);/* It's not an object */
-      if(!wpFSObject->somIsA(cwAudioClass) && !wpFSObject->somIsA(mmAudioClass) && !wpFSObject->somIsA(mmMIDIClass))
-        return MRFROM2SHORT( DOR_NEVERDROP, DO_MOVE);/* It's not an audio object */
-    }
-  /* The following is necessary because for some reason hwndCnr and pDragInfo->hwndSource
-     are equal when the dragged object resides in the same folder as the target and the target
-     isn't opened yet. Without this check the dragged object would be moved not linked. */
-  if(this->wpQueryFolder()==wpObject->wpQueryFolder())
-      return MRFROM2SHORT(DOR_DROP,DO_LINK);
-  /* Do not create shadows if the source is the current container */
-  if(hwndCnr==pDragInfo->hwndSource)
-    return MRFROM2SHORT( DOR_DROP, DO_MOVE);
-
-  return mr;
+  USHORT usIndicator=DOR_DROP,usOp=DO_LINK;
+  SOMClass *mmAudioClass = somhlpGetSomClass("MMAudio");
+  SOMClass *cdTrackClass = somhlpGetSomClass("MMCDTrack");
+
+  if (DrgAccessDraginfo(pDragInfo)) {
+     ULONG ulNum=DrgQueryDragitemCount(pDragInfo);/* Num items */
+     ULONG a=0;
+
+     for(a=0;a<ulNum; a++)
+       {
+         PDRAGITEM pDragItem = DrgQueryDragitemPtr(pDragInfo,a);
+         if (!DrgVerifyRMF(pDragItem,"DRM_OBJECT","DRF_OBJECT")) {
+            usIndicator = DOR_NEVERDROP;
+            usOp = 0;
+            goto quit;
+         } /* endif */
+         /* Check every object dragged */
+         wpObject=(WPObject*)OBJECT_FROM_PREC(pDragItem->ulItemID);
+         if (!somIsObj(wpObject) || !wpObject->somIsA(mmAudioClass) || wpObject->somIsA(cdTrackClass)) {
+            usIndicator = DOR_NEVERDROP;
+            usOp = 0;
+            goto quit;
+         } /* endif */
+#if 0
+         if (somIsObj(wpObject) && this->wpQueryFolder() == wpObject->wpQueryFolder()) {
+            usIndicator = DOR_DROP;
+            usOp = DO_LINK;
+         } /* endif */
+#endif
+       }
+     /* Do not create shadows if the source is the current container */
+     if(hwndCnr==pDragInfo->hwndSource) {
+        usIndicator = DOR_DROP;
+        usOp = DO_MOVE;
+     }
+
+quit:
+     DrgFreeDraginfo(pDragInfo);
+  } /* endif */
+
+  return MRFROM2SHORT(usIndicator,usOp);
 }
 
@@ -1078 +1068 @@
     return;
   thisPtr=(CWMediaFolder*)threadParams->thisPtr;    //Pointer auf CWMediaFolder-Object
-  
+
   if(!somIsObj(thisPtr))
     return;
-  
+
   if(thisPtr->mfData)
     thisPtr->mfData->bProcessing=TRUE;
-  
+
   hab=WinInitialize(0);
   if(hab) {
@@ -1097 +1087 @@
       /* Needed for specifying the drop point */
       POINTL ptl;
-      PMINIRECORDCORE pmrc; 
+      PMINIRECORDCORE pmrc;
       CNRINFO cnrInfo;
       int ID;
@@ -1109 +1099 @@
         hwndSource=threadParams->hwndSource;
         ulNumObjects=threadParams->ulNumObjects;
-        
+
         if((mySomId=somIdFromString(SHADOW_CLASS_NAME))!=NULLHANDLE) {
           WPFileSystem *wpFSObject;
@@ -1121 +1111 @@
               ptl.x=threadParams->ptl.x;
               ptl.y=threadParams->ptl.y;
-              
+
               /* Map to CNR */
               WinMapWindowPoints(HWND_DESKTOP, hwndCnr,&ptl, 1);
-              ptl.y+=10;          
+              ptl.y+=10;
               /* Window below the mouse ptr. We need it to check if we are over the column title area. */
               ID=WinQueryWindowUShort(WinWindowFromPoint(hwndCnr,&ptl, TRUE),QWS_ID);
               ptl.y-=10;
-              
+
               /* Find the record near the drop point */
               qRecRcl.cb=sizeof(qRecRcl);
@@ -1138 +1128 @@
               pmrc=(PMINIRECORDCORE)WinSendMsg(hwndCnr, CM_QUERYRECORDFROMRECT,MPFROMLONG(CMA_FIRST),
                                                MPFROMP(&qRecRcl));
-              WinSendMsg(hwndCnr, CM_QUERYCNRINFO, MPFROMP(&cnrInfo), MPFROMSHORT(sizeof(cnrInfo)));        
+              WinSendMsg(hwndCnr, CM_QUERYCNRINFO, MPFROMP(&cnrInfo), MPFROMSHORT(sizeof(cnrInfo)));
             }/*if(hwndSource!=hwndCnr)*/
-            
-            /* For all dropped objects */ 
+
+            /* For all dropped objects */
             for(ulCount=0; ulCount<ulNumObjects; ulCount++) {
               if(ulCount%10)/* Redraw window every 10 objects */
@@ -1147 +1137 @@
               else
                 WinEnableWindowUpdate(hwndCnr, TRUE);
-              
+
               wpObject=(WPObject*) threadParams->wpObject[ulCount];
               /* Get the filesystem object in case it's a shadow */
@@ -1161 +1151 @@
                       /* Detailsview */
                       RECORDINSERT recInsert;
-                      
+
                       recInsert.cb=sizeof(recInsert);
                       recInsert.pRecordParent=NULL;
@@ -1167 +1157 @@
                       recInsert.zOrder=CMA_TOP;
                       recInsert.cRecordsInsert=1;
-                      
+
                       //     WinEnableWindowUpdate(hwndCnr, FALSE);
                       /* Create the shadow */
@@ -1212 +1202 @@
                             __FUNCTION__, __FILE__, __LINE__);
         } END_CATCH;
-        
+
         WinDestroyMsgQueue(hmq);
     }
@@ -1219 +1209 @@
   if(thisPtr->mfData)
     thisPtr->mfData->bProcessing=FALSE;
-  
+
   thisPtr->wpFreeMem((PBYTE)threadParams);
 }
@@ -1227 +1217 @@
 MRESULT CWMediaFolder::wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem)
 {
-  WPObject *wpObject;
-  somId mySomId;
-  M_WPObject *mAudioObject;
-  SOMClass*  scCWShadowClass;
-  ULONG ulCount;
-  ULONG ulNumObjects=DrgQueryDragitemCount(pDragInfo);
-
-  /* Needed for specifying the drop point */
-  POINTL ptl;
-  PMINIRECORDCORE pmrc; 
-  CNRINFO cnrInfo;
-  int ID;
- 
-  /* The objects are already checked by the wpDragOver() method. */
-  TRY_LOUD(MEDIAFLDR_DROP) {
-    PDROPTHREADPARAMS pThreadParams;
-    ULONG ulErr;
-    WPObject* wpObj;
-    
-    /* DROPTHREADPARAMS already contains one WPObject var so only memory for ulNumObjects-1 must be added to the end */
-    pThreadParams=(PDROPTHREADPARAMS)wpAllocMem(sizeof(DROPTHREADPARAMS)+(ulNumObjects-1)*sizeof(WPObject*), &ulErr);
-    pThreadParams->hwndCnr=hwndCnr;
-    pThreadParams->hwndSource=pDragInfo->hwndSource;
-    pThreadParams->ulNumObjects=DrgQueryDragitemCount(pDragInfo);
-    pThreadParams->thisPtr=this;
-    pThreadParams->ptl.x=pDragInfo->xDrop;
-    pThreadParams->ptl.y=pDragInfo->yDrop;
-              
-    /* For all dropped objects */ 
-    for(ulCount=0;ulCount<ulNumObjects ; ulCount++) {
-      pThreadParams->wpObject[ulCount]=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, ulCount)->ulItemID);
-    }
-    _beginthread(dropThreadFunc,NULL,8192*16,(void*)pThreadParams); //Fehlerbehandlung fehlt
+  if (DrgAccessDraginfo(pDragInfo)) {
+    /* The objects are already checked by the wpDragOver() method. */
+    TRY_LOUD(MEDIAFLDR_DROP) {
+       PDROPTHREADPARAMS pThreadParams;
+       ULONG ulErr;
+       ULONG ulCount;
+       ULONG ulNumObjects=DrgQueryDragitemCount(pDragInfo);
+
+       /* DROPTHREADPARAMS already contains one WPObject var so only memory for ulNumObjects-1 must be added to the end */
+       pThreadParams=(PDROPTHREADPARAMS)wpAllocMem(sizeof(DROPTHREADPARAMS)+(ulNumObjects-1)*sizeof(WPObject*), &ulErr);
+       pThreadParams->hwndCnr=hwndCnr;
+       pThreadParams->hwndSource=pDragInfo->hwndSource;
+       pThreadParams->ulNumObjects=ulNumObjects;
+       pThreadParams->thisPtr=this;
+       pThreadParams->ptl.x=pDragInfo->xDrop;
+       pThreadParams->ptl.y=pDragInfo->yDrop;
+
+       /* For all dropped objects */
+       for(ulCount=0;ulCount<ulNumObjects ; ulCount++) {
+         pThreadParams->wpObject[ulCount]=(WPObject*)OBJECT_FROM_PREC(DrgQueryDragitemPtr( pDragInfo, ulCount)->ulItemID);
+       }
+       _beginthread(dropThreadFunc,NULL,8192*16,(void*)pThreadParams); //Fehlerbehandlung fehlt
+    }
+    CATCH(MEDIAFLDR_DROP)
+    {
+       SysWriteToTrapLog("\nTrap occured in %s, file: %s, around line %d.\n",
+                         __FUNCTION__, __FILE__, __LINE__);
+    } END_CATCH;
+    DrgFreeDraginfo(pDragInfo);
   }
-  CATCH(MEDIAFLDR_DROP)
-    {
-      SysWriteToTrapLog("\nTrap occured in %s, file: %s, around line %d.\n",
-                        __FUNCTION__, __FILE__, __LINE__);
-    } END_CATCH;
-    
-  DrgFreeDraginfo(pDragInfo);
-  return (MRESULT)RC_DROP_DROPCOMPLETE;
+  return MRFROMLONG(RC_DROP_DROPCOMPLETE);
 }
 
@@ -1368 +1347 @@
     /* Start a timer which will cause the folder to close automatically after some time even
        if the user doesn't click any button. Get the timeout from the INI file if available. */
-    if((lDelay=PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", MFLDR_TIMER_DELAY_KEY, MFLDR_MBOX_TIMER_DELAY)) 
+    if((lDelay=PrfQueryProfileInt(HINI_USERPROFILE, "CWMM", MFLDR_TIMER_DELAY_KEY, MFLDR_MBOX_TIMER_DELAY))
        < MFLDR_MBOX_MIN_TIMER_DELAY)
       lDelay=MFLDR_MBOX_MIN_TIMER_DELAY;
@@ -1383 +1362 @@
     }
   }
-  cwStopAudioFile(hwndFrame);  
+  cwStopAudioFile(hwndFrame);
   /* Stop the playing thread */
   WinPostMsg(mfData->hwndPlayObject, WM_QUIT, 0, 0);

trunk/mediafolder/include/m3ufolder.hh

@@ -28 +28 @@
   HWND hwndFrame;
   BOOL fSaveOnly;
-}M3UTHREADPARMS; 
+}M3UTHREADPARMS;
 
 #pragma SOMAsDefault(on)
@@ -48 +48 @@
   virtual BOOL wpclsQueryDefaultHelp(PULONG HelpPanelId,PSZ HelpLibrary);
   virtual BOOL wpclsCreateDefaultTemplates(WPObject * wpObject);
-  /*  
+  /*
   virtual void wpclsUnInitData();
 
@@ -76 +76 @@
   virtual ULONG wpFilterPopupMenu(ULONG ulFlags, HWND hwndCnr, BOOL fMultiSelect);
   virtual BOOL wpModifyPopupMenu(HWND hwndMenu, HWND hwndCnr, ULONG ulPosition);
-  virtual MRESULT wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem);  
 #if 0
   virtual BOOL wpRestoreState(ULONG ulReserved);

trunk/mediafolder/include/mediafolder.hh

@@ -84 +84 @@
   USEITEM useItem;
   VIEWITEM viewItem;
-}MYVIEWITEM; 
+}MYVIEWITEM;
 
 typedef struct
@@ -115 +115 @@
   WPObject* thisPtr;
   char chrRexxScript[CCHMAXPATH];
-}INSERTTRACKPARMS; 
+}INSERTTRACKPARMS;
 
 typedef  struct _MEDIAFLDRDATA
@@ -129 +129 @@
   int iNumPlayed;     /* # of random played tracks */
   int iNumToPlay;
-  HWND hwndPlayObject;/* Object window which handles the play commands so the WPS is not blocked. */  
+  HWND hwndPlayObject;/* Object window which handles the play commands so the WPS is not blocked. */
 }MEDIAFLDRDATA;
 typedef   MEDIAFLDRDATA*   PMEDIAFLDRDATA;
@@ -203 +203 @@
 #pragma SOMCallstyle(oidl)
 private:
-  /* 
+  /*
      Added with V0.2.8 (07.09.2003)
 
@@ -209 +209 @@
 
      Tells the folder:
-     MFLDR_CURACTION_ADDFOLDERVIEW3: currently processing the wpAddFolderView3Page() 
+     MFLDR_CURACTION_ADDFOLDERVIEW3: currently processing the wpAddFolderView3Page()
      MFLDR_VIEW_COMPACT:             folder is in compact view
 
@@ -222 +222 @@
   WPObject* currentObject; /* Currently playing object */
   PMINIRECORDCORE mrcPlaying;
-  MYVIEWITEM myViewItem; 
+  MYVIEWITEM myViewItem;
 
   HWND hwndTopMiddle;/* */
@@ -262 +262 @@
   virtual BOOL    wpSaveState();
   virtual MRESULT wpDragOver(HWND hwndCnr,PDRAGINFO pDragInfo);
-  virtual MRESULT wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem);  
+  virtual MRESULT wpDrop(HWND hwndCnr,PDRAGINFO pDragInfo,PDRAGITEM pDragItem);
   virtual BOOL    wpAddSettingsPages(HWND hwndNotebook);
   virtual ULONG   wpInsertSettingsPage(HWND hwndNotebook, PPAGEINFO ppageinfo);

trunk/mediafolder/makefile

@@ -12 +12 @@
 
 CMNINC  =       $(COMMONSRC)/include
+CLSINC    =   $(COMMONSRC)/../classes/include
 
 HELPERDIR       =       ./c/helper
@@ -25 +26 @@
 #
 #######################################
-COMPILE =       $(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(CMNINC) /Fo$@ $<
+COMPILE =       $(CC) $(CPPFLAGS) /C+ -I$(INC) -I$(CMNINC) -I$(CLSINC) /Fo$@ $<
 
 #######################################
@@ -163 +164 @@
 #######################################
 $(INC)/cwaudio.hh: ../classes/idl/idl_audio/cwaudio.idl
-        sc -shh -S 64000  -I $(IDLDIR)/idl_mm  -dinclude -m noqualifytypes $<
+        sc -shh -S 100000  -I $(IDLDIR)/idl_mm  -dinclude -m noqualifytypes -musexhpass $<
 
 $(INC)/cwcdtrack.hh: ../classes/idl/idl_audio/cwcdtrack.idl
-        sc -shh -S 64000  -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes $<
+        sc -shh -S 100000  -I $(IDLDIR)/idl_audio -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes -musexhpass $<
 
 $(INC)/cwmmdataf.hh:    ../classes/idl/idl_mm/cwmmdataf.idl
-        sc -shh -S 64000  -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes $<
+        sc -shh -S 100000  -I $(IDLDIR)/idl_mm -dinclude -m noqualifytypes -musexhpass $<
 
 

trunk/mediafolder/res/makefile

@@ -56 +56 @@
 clean:
         -cd $(OBJDIR) && rm *
-        -rm *.res
+        -rm *.RES
 
 cleaner:

trunk/nlv/de/classes/res/makefile

@@ -35 +35 @@
         -rm *.*~
         -rm *.flc
-        -rm *.res
+        -rm *.RES
         -rm *.obj

trunk/stream_ioproc/source/makefile

@@ -97 +97 @@
         -rm *.obj
         -rm *.dll
-        -rm *.res
+        -rm *.RES
         -rm *.*~
         -rm *.map