Changeset 133 for trunk/mediafolder/c/mediafldr

Timestamp:

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

Author:

gyoung

Message:

Merge Lar's 2.9 branch into the trunk

Location:

trunk/mediafolder/c/mediafldr

Files:

• mediafolder.cpp (modified) (51 diffs)
• mediafolderoverridenwpclsmethods.cpp (modified) (12 diffs)
• mediafolderoverridenwpmethods.cpp (modified) (52 diffs)

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