Changeset 4 for trunk/mediafolder/c

Timestamp:

Jul 13, 2017, 5:17:57 AM (8 years ago)

Author:

stevenhl

Message:

Import modifications from cwmm-0_2_9-work-01_10_2006.zip dated 2006-08-27

Location:

trunk/mediafolder/c

Files:

• cddb/helper.c (modified) (1 diff)
• cddb/makefile (modified) (4 diffs)
• cddb/pmcddb.cc (modified) (3 diffs)
• cddb/res/makefile (modified) (2 diffs)
• cddb/res/pmcddb049.rc (modified) (1 diff)
• cddb/res/pmcddb088.DEF (added)
• cddb/res/pmcddb088.c (added)
• cddb/res/pmcddb088.dlg (added)
• cddb/res/pmcddb088.rc (added)
• cdfldr/cdfolder.cpp (modified) (2 diffs)
• cdfldr/cdfolderoverriddenwpmethods.cpp (modified) (9 diffs)
• createcd/createcd.c (modified) (8 diffs)
• mediafldr/mediadialogprocs.cpp (modified) (1 diff)
• mediafldr/mediafolderoverridenwpmethods.cpp (modified) (8 diffs)

trunk/mediafolder/c/cddb/helper.c

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2001/2002
+ * This file is (C) Chris Wohlgemuth 2001-2005
  */
 /*

trunk/mediafolder/c/cddb/makefile

@@ -1 +1 @@
 # Makefile for Audio-CD copy
 
-CC           = icc
-LIB_DIR      = $d:/emx/lib 
-#CPPFLAGS     = -Ge- /Gm+ -G4 -Gl  /O+ -Oc+ -Ol
+include ../../../make.inc
+
+CC           = gcc
 CPPFLAGS     = -O -Zomf -Zcrtdll -s
 #CPPFLAGSSTATIC     = -O -Zomf -Zsys -Zmt -s
@@ -9 +9 @@
 CPPFLAGSVAC  = /Ge- /Gm+ /G4 /Gl  /O+ /Oc+ /Ol- /Q+
 INC             = ../../include
+MOREINC         = $(COMMONSRC)/include
 DEFS         = 
 PROGS        =  
 ODIR            = .
 CPPDIR  = .
+LIBDIR          =       ./lib
 BINDIR          =       ../../dist/bin
 HELPERDIR       =       ..\helper
+OBJECTS         =       cddb.obj \
+                        cd.obj \
+                        helper.obj \
+                        cddbhelper.obj \
+                        message.obj
+LIBOBJECTS      = $(LIBDIR)/sys_funcs.obj
 
-CPPFILES        =
-OBJECTS =        cddb.obj cd.obj helper.obj cddbhelper.obj message.obj
 #printHelper.obj
 #all:    querycddb.exe cddbcls.obj
 
-all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll
+all:     pmcddb.exe pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll
 
-nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll
+nlv:    pmdb001.dll pmdb049.dll pmdb031.dll pmdb039.dll pmdb088.dll 
 
 pmdb001.dll:    ./res/pmcddb001.c ./res/pmcddb001.res
@@ -53 +59 @@
                 cd ./Res && make
 
+
+
+pmdb088.dll:    ./res/pmcddb088.c ./res/pmcddb088.res
+                -rm pmdb088.dll
+                cp ./res/pmcddb088.dll pmdb088.dll
+
+./res/pmcddb088.res:    ./res/pmcddb088.rc ./res/pmcddb088.dlg $(INC)/pmcddbres.h 
+                cd ./Res && make
+
+
+$(LIBDIR)/%.obj:        $(COMMONSRC)/%.c 
+        $(CC) -c -Wall -o$@ -Zomf -I$(INC) -I$(MOREINC) $< 
+
 cd.obj: cd.c
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
-#               cd ../. && cd helper && make
 
 helper.obj:     helper.c
@@ -63 +81 @@
                 gcc -c $< -I$(INC) -Zcrtdll -Zomf
 
-pmcddb.exe:     pmcddb.cc $(OBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
-        gcc $< $(CPPFLAGS) -I$(INC)   $(OBJECTS) $(CDDBOBJ)  -lsocket pmcddb.def
+pmcddb.exe:     pmcddb.cc $(OBJECTS) $(LIBOBJECTS) $(CDDBOBJ) $(INC)\cddb.h $(INC)\cddb.hh
+        $(CC) $< $(CPPFLAGS) -I$(INC) -I$(MOREINC) $(LIBOBJECTS) $(OBJECTS) $(CDDBOBJ)  -lsocket pmcddb.def
 
 cddb.obj:       cddb.cpp $(INC)\cddb.hh

trunk/mediafolder/c/cddb/pmcddb.cc

@@ -105 +105 @@
 HMODULE RESSOURCEHANDLE=0;
 
-char logName[CCHMAXPATH]="Cddb.log";
+char logName[CCHMAXPATH]=PMCDDB_LOGFILENAME;
+char logNameFullPath[CCHMAXPATH];
 
 #define QUERYCDDB_VERSION "0.1"
@@ -616 +617 @@
   /* argv[0]: progname
    * argv[1]: cd drive or /C for configuring
-   * argv[2]: REXX file
+   * argv[2]: REXX file. This file is used to parse the queried data file and
+   *          set all the info of the CD track objects.
+   *          When configuring argv[2] is the email address.
    * argv[3]: folder path
    */
 
   numArgs=argc;
-
 
   for(a=0;a<argc;a++)
@@ -632 +634 @@
     *chrPtr=0;
   strncpy(chrInstallDir, chrBinDir, sizeof(chrInstallDir)-1);
-  /*  if((chrPtr=strrchr(chrInstallDir, '\\'))!=NULLHANDLE)
-   *chrPtr=0;*/
 
   if(numArgs<3) {

trunk/mediafolder/c/cddb/res/makefile

@@ -13 +13 @@
 
 CPPFILES        =
-all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll
+all:     pmcddb001.dll pmcddb049.dll pmcddb031.dll pmcddb039.dll pmcddb088.dll
 
 
@@ -50 +50 @@
                 rc  -i $(INC) -r pmcddb039.rc 
 
+pmcddb088.dll:  pmcddb088.c pmcddb088.res
+                gcc -Zdll -Zomf -Zno-rte -I$(INC) pmcddb088.c pmcddb088.def
+                rc pmcddb088.res pmcddb088.dll
+
+pmcddb088.res:  pmcddb088.rc pmcddb039.dlg $(INC)\pmcddbres.h 
+                rc  -i $(INC) -r pmcddb088.rc 
+
 clean:
         -rm *.obj

trunk/mediafolder/c/cddb/res/pmcddb049.rc

@@ -35 +35 @@
 IDSTR_PMCDDBTITLE         "FreeDB Abfrage"  
 
-IDSTR_USAGE               "Email-Adresse mit folgender Option festlegen:  /C <email address> "
+IDSTR_USAGE               "Email-Adresse mit folgender Option festlegen:  /C <Email-Adresse> "
 IDSTR_SETUPERROR         "Der Username oder der Host wurden nicht festgelegt. Pmcddb.exe mit Parameter /C starten, um die Adresse festzulegen."
 END
 
 RCINCLUDE "pmcddb049.dlg"
-

trunk/mediafolder/c/cdfldr/cdfolder.cpp

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2002
+ * This file is (C) Chris Wohlgemuth 2002-2005
  * 
  * It's part of the Media-Folder distribution
@@ -73 +73 @@
           //        if(a==1)
           //        WinMessageBox(HWND_DESKTOP,HWND_DESKTOP, chrSetup, "", 12324, MB_MOVEABLE);
-          sprintf(chrTitle,"Track %d",a);
+          sprintf(chrTitle,"Track %02d",a);
           WinCreateObject("MMCDTrack", chrTitle, chrSetup, chrTarget, CO_REPLACEIFEXISTS);
         }

trunk/mediafolder/c/cdfldr/cdfolderoverriddenwpmethods.cpp

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 2002-2003
+ * This file is (C) Chris Wohlgemuth 2002-2005
  * 
  * It's part of the Media-Folder distribution
@@ -57 +57 @@
 extern void showPlayTimeDisplay(CWMediaFolder *thisPtr, BOOL bShow);
 void setPlayTimeText2(CWMediaFolder *thisPtr, char * theText);
-void HlpWriteToTrapLog(const char* chrFormat, ...);
+
 /* Get the HWND of the play control dialog. This Dialog is on top of
    the top frame control. */
@@ -344 +344 @@
     }
   case PLAY_NEXT:
+  case PLAY_NEXT_CDFLDR:
     if(iWave==0)
       return cwPlayAudioFile(hwndFrame, PLAY_FIRST);/* Not yet playing */
@@ -450 +451 @@
   }/* switch */
 
-  if(!getMessage(chrCommand, IDSTR_STARTINGTRACK, sizeof(chrCommand), queryResModuleHandle(),  hwndFrame))
-    sprintf(chrCommand, "Starting track...");
-  setPlayTimeText2(this, chrCommand);
+  //  if(ulWhich!=PLAY_NEXT_CDFLDR) {
+    if(!getMessage(chrCommand, IDSTR_STARTINGTRACK, sizeof(chrCommand), queryResModuleHandle(),  hwndFrame))
+      sprintf(chrCommand, "Starting track...");
+    setPlayTimeText2(this, chrCommand);
+    // }
 
   strncpy(chrDevice,"CDAUDIO", sizeof(chrDevice));
@@ -519 +522 @@
   }/*   if( ...|| !mrcPlaying) */
 
-  if(iPrevTrack+1==iTime2) {
+  if(iPrevTrack+1==iTime2 && ulWhich!=PLAY_NEXT_CDFLDR) {
     /* Previous track ended, now playing the next. Or user pressed 'Next' while playing */
     if(ulPos*1000 < ulTotalLength) {
@@ -539 +542 @@
         return 0;
       }
-      //  HlpWriteToTrapLog("\n2\n");
-    }
-  }
-
-  //  HlpWriteToTrapLog("About to get length...\n");
+    }
+  }
 
   /* Get length in ms */
@@ -552 +552 @@
   }
 
-  // HlpWriteToTrapLog("iTime2: %d\n", iTime2);
-
   sprintf(chrCommand,"%d:%02d  %d:%02d  -%d:%02d", iTime2/60, iTime2%60,
           0, 0,
           iTime2/60, iTime2%60);
 
-  //  HlpWriteToTrapLog("chrCommand: %s\n", chrCommand);
   
   //  WinSetWindowText(WinWindowFromID(hwndTop, IDST_PLAYTIME), chrCommand);
@@ -658 +655 @@
   int iCurrentTrack;
 
+  //SysWriteToTrapLog("\n%s:\n", __FUNCTION__);
+
   sprintf(chrCommand,"STATUS wave%d MODE WAIT", iWave);
   rc = mciSendString(chrCommand, retMsg, sizeof(retMsg), 0, 0);
@@ -688 +687 @@
   else {
     iCurrentTrack=atoi(retMsg);
+    //SysWriteToTrapLog(" iWave: %d. iPrevTrack: %d, iCurrentrack: %d\n", iWave, iPrevTrack, iCurrentTrack);
     /* Timeout. Check if track is still playing */
     if(iCurrentTrack==iPrevTrack+1) {
       /* Audio file played. Start next */
-      cwPlayAudioFile(hwndFrame, PLAY_NEXT); 
-    }
-  }
-}
-
-
-
-
-
-
-
-
-
+      //SysWriteToTrapLog(" iWave: %d. iPrevTrack: %d, iCurrentrack: %d, startinb next (%d)\n", iWave, iPrevTrack, iCurrentTrack, __LINE__);
+      cwPlayAudioFile(hwndFrame, PLAY_NEXT_CDFLDR); 
+    }
+  }
+}
+
+
+

trunk/mediafolder/c/createcd/createcd.c

@@ -1 +1 @@
 /*
- * This file is (C) Chris Wohlgemuth 1999-2002
+ * This file is (C) Chris Wohlgemuth 1999-2005
  */
 /*
@@ -29 +29 @@
 #include <string.h>
 #include "mediafolderinc.h"
+#include "mediafolderres.h"
+/* #include "sys_funcs.h" */
 
 #define  LVM_IS_HARDDISK  0  
@@ -92 +94 @@
 PFNVIR pfnvirGet_Volume_Information=NULLHANDLE;
 
-BOOL loadLVMFuncs(void)
+size_t strlcpy(char *dst, const char *src, size_t siz);
+
+/*
+  FIXME:
+
+  Use the function from the \common_funcs directory instead. 
+ */
+static BOOL getMessage(char* text,ULONG ulID, LONG lSizeText, HMODULE hResource)
+{
+  char* pOffset;
+  char* ptr;
+  int id=0;
+
+  text[0]='\0';
+
+  // printf("resource: %x, %d %d\n", hResource, ulID, (ulID/16)+1, 
+  // DosGetResource(hResource, RT_STRING, (ulID/16)+1, (PVOID)&pOffset));
+
+  if(DosGetResource(hResource, RT_STRING, (ulID/16)+1, (PVOID)&pOffset)!=NO_ERROR)
+    return FALSE;
+
+  ptr=pOffset;
+
+  //printf("\ngot resource...\n");
+
+  /* Parsing... */
+  id=ulID%16;
+
+  //printf("id: %d\n", id);
+  pOffset+=sizeof(USHORT); /* Skip codepage */
+
+  for(;id > 0;id--)
+    {
+      //printf("id: %d, length: %d %s\n", id, *pOffset, pOffset+1);
+      pOffset+=*pOffset+1;
+    }
+  //printf("length: %d %s\n",  *pOffset, pOffset+1);
+  strlcpy(text, pOffset+1, lSizeText);
+
+  if(*pOffset!=1){
+    DosFreeResource(ptr);
+  return TRUE;
+  }  
+  DosFreeResource(ptr);
+/* Length=1 means dummy entry filled by system */
+  return FALSE;
+}
+
+#if 0
+#pragma import(DosQueryModFromEIP,,"DOSCALL1",360)
+ APIRET APIENTRY DosQueryModFromEIP ( HMODULE *phMod, ULONG *pObjNum, ULONG BuffLen, PCHAR pBuff, ULONG *pOffset, PVOID Address ) ; 
+#endif
+
+/* This function returns the module handle of our ressource dll */
+static HMODULE queryResModuleHandle(void)
+{
+  char path[CCHMAXPATH];  
+  char buf[CCHMAXPATH];
+  char* found;
+  APIRET rc;
+  HMODULE RESSOURCEHANDLE;
+  HMODULE hmod;
+  PTIB   ptib = NULL;
+  PPIB   ppib = NULL;
+  
+  
+  // printf("rc=%d\n",DosQueryModFromEIP( &hmod, &ul, sizeof(path), path, 
+  //                  &off, (PVOID)queryResModuleHandle ) ); 
+  if(NO_ERROR==DosGetInfoBlocks(&ptib, &ppib))
+    DosQueryModuleName (ppib->pib_hmte,         /* Module handle to query     */
+                        sizeof(path),           /* Maximum length of result   */
+                        path);
+  
+  //printf("%s %x\n",path, hmod);
+
+  /* Get the language code of our system and load the  
+     resource DLL with the right language */
+  do 
+    {
+      static char chrLang[]="en_EN";
+      PSZ pszLang="";
+      char *chrPtr;
+        
+      /* Get Language var */
+      if(NO_ERROR!=DosScanEnv("LANG", &pszLang)) {
+        pszLang=chrLang;
+      }        
+      /* Skip leading spaces */
+      chrPtr=pszLang;
+      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((found=strrchr(path, '\\'))!=NULLHANDLE)
+        *found=0;
+
+      /* Extract the first two chars and build DLL name */                
+      sprintf(buf, RESDLLNAME, chrPtr[0], chrPtr[1]);
+      strcat(path,buf);
+        
+      rc=DosLoadModule(buf,sizeof(buf),path, &RESSOURCEHANDLE);
+      if(rc==NO_ERROR)
+        break;
+                
+      /* NLS DLL not found. Try to load default */
+      found=strrchr(path,'\\');
+      if(!found)
+        break;
+        
+      *found=0;
+      sprintf(buf, DEFRESDLLNAME);
+      strcat(path,buf);
+        
+      rc=DosLoadModule(buf,sizeof(buf),path, &RESSOURCEHANDLE);
+      if(rc!=NO_ERROR) {
+        RESSOURCEHANDLE=NULLHANDLE;
+      }
+      else {
+        //  printf("Ressource DLL loaded.\n");
+      }
+      break;
+    }while(TRUE);
+  
+  return RESSOURCEHANDLE;
+}
+
+ 
+static BOOL loadLVMFuncs(void)
 {
   char chrErrorObject[CCHMAXPATH]={0};
@@ -173 +305 @@
 }
 
-int main(void)
+int main(int argc, char** argv)
 {
   CARDINAL32 error;
   int iNumCD;
   char cFirst;
-  char setup[100];
-  char name[100];
-  char id[40];
+  char setup[512];
+  char name[256];
+  char id[100];
+  char nameTemplate[256];
   int a;
+  HMODULE hmodRes=NULLHANDLE;
 
   if(!CDQueryCDDrives(&iNumCD, &cFirst))
     exit(1);
+
+  hmodRes=queryResModuleHandle();
+
+  if(!getMessage(nameTemplate, /* IDSTR_LAUNCHPADFLYOVER */ IDSTR_CDFOLDERNAME, sizeof(nameTemplate), hmodRes))
+    strncpy(nameTemplate, "CD-Audio player^Drive %c:", sizeof(nameTemplate));
 
   if(!loadLVMFuncs()) {
@@ -190 +329 @@
       int b;
       /* Build folder name */
-      sprintf(name, "CD-Audio^Drive %c:", cFirst+a);
+      sprintf(name, nameTemplate, cFirst+a);
       /* Build object ID */
       sprintf(id, CDFLDR_ID, cFirst+a);
@@ -231 +370 @@
 
               /* Build folder name */
-              sprintf(name, "CD-Audio^Drive %c:", vir.Current_Drive_Letter);
+              sprintf(name, nameTemplate, vir.Current_Drive_Letter);
               /* Build object ID */
               sprintf(id, CDFLDR_ID, vir.Current_Drive_Letter);
@@ -242 +381 @@
                 if(WinCreateObject(CDFLDR_CLASSNAME, name, setup, CDFLDR_LOCATION, CO_UPDATEIFEXISTS))
                   break;
-
                 //      printf("Found:  %s, %s\n", name, setup);
                 DosSleep(5000);
@@ -255 +393 @@
     DosFreeModule(hMod);
   } /* else */
+  if(hmodRes)
+    DosFreeModule(hmodRes);
   return (0);
 }
 
 
+/********************************************************************/
+/*      $OpenBSD: strlcpy.c,v 1.8 2003/06/17 21:56:24 millert Exp $     */
+
+/*
+ * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+
+/*
+ * Copy src to string dst of size siz.  At most siz-1 characters
+ * will be copied.  Always NUL terminates (unless siz == 0).
+ * Returns strlen(src); if retval >= siz, truncation occurred.
+ */
+static size_t
+strlcpy(char *dst, const char *src, size_t siz)
+{
+        register char *d = dst;
+        register const char *s = src;
+        register size_t n = siz;
+
+        /* Copy as many bytes as will fit */
+        if (n != 0 && --n != 0) {
+                do {
+                        if ((*d++ = *s++) == 0)
+                                break;
+                } while (--n != 0);
+        }
+
+        /* Not enough room in dst, add NUL and traverse rest of src */
+        if (n == 0) {
+                if (siz != 0)
+                        *d = '\0';              /* NUL-terminate dst */
+                while (*s++)
+                        ;
+        }
+
+        return(s - src - 1);    /* count does not include NUL */
+}
+

trunk/mediafolder/c/mediafldr/mediadialogprocs.cpp

@@ -405 +405 @@
         thisPtr->usLastSelMenuItem=SHORT1FROMMP(mp1);
       break;
+    case WM_TIMER:
+      /* The user didn't click any button on the message box asking for closing the
+         folder. Now the system forces the closing so automatic shutdown may finally
+         succeed. */
+      if(SHORT1FROMMP(mp1)==MFLDR_MBOX_TIMER_ID) {
+        WinStopTimer(WinQueryAnchorBlock(HWND_DESKTOP), hwnd, MFLDR_MBOX_TIMER_ID);
+        WinPostMsg(hwnd, WM_CLOSE, 0, 0);
+      }
+      return MRFALSE;
     default:
       break;

trunk/mediafolder/c/mediafldr/mediafolderoverridenwpmethods.cpp

@@ -311 +311 @@
   hwnd=CWProgFolder::wpOpen(hwndCnr, ulView, ulParam);
 
-  /* Save this ptr */
-  //  WinSetWindowULong( hwnd, ulQWP_THISPTR, (ULONG)this);
-    
   /* Only subclass folder frames, not settings notebooks */
   if(ulView!=OPEN_SETTINGS){
@@ -409 +406 @@
       }/* menu hwnd */
 
-      //#if 0      
       /* Subclass container for tabbing */
       myFrameCtrlHWND=WinWindowFromID(hwnd,FID_CLIENT);//Get container hwnd
@@ -419 +415 @@
       }
 
-      //#endif
       /* Now add the framecontrols */
 
@@ -1352 +1347 @@
 
   /* Check if we currently play a song */
-  if(iWave) {
+  if(iWave && !(ulPrivFlags & MFLDR_SHOWING_MBOX)) {
+    LONG lDelay;
+
+#if 0
     PVIEWITEM pViewItem;
     int a=0;
-
-#if 0
     /* Check if we close a settings view or a folder view. */
     for(pViewItem=wpFindViewItem(VIEW_ANY, NULLHANDLE); pViewItem; pViewItem=wpFindViewItem(VIEW_ANY, pViewItem))
@@ -1370 +1366 @@
       hwndOwner=hwndFrame;
 
+    /* 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)) 
+       < MFLDR_MBOX_MIN_TIMER_DELAY)
+      lDelay=MFLDR_MBOX_MIN_TIMER_DELAY;
+
+    WinStartTimer(WinQueryAnchorBlock(HWND_DESKTOP), hwndFrame, MFLDR_MBOX_TIMER_ID, lDelay);
+    ulPrivFlags|= MFLDR_SHOWING_MBOX;
+    /* Ask user if he really wants to stop playing and close the folder */
     if(messageBox( text, IDSTR_CLOSETEXT, sizeof(text),
                    title, IDSTR_CLOSETITLE, sizeof(title),
-                   queryResModuleHandle(), hwndOwner, MB_YESNO|MB_MOVEABLE|MB_ICONQUESTION)==MBID_NO)
+                   queryResModuleHandle(), hwndOwner, MB_YESNO|MB_MOVEABLE|MB_ICONQUESTION)==MBID_NO) {
+      WinStopTimer(WinQueryAnchorBlock(HWND_DESKTOP), hwndFrame, MFLDR_MBOX_TIMER_ID);
+      ulPrivFlags&= ~MFLDR_SHOWING_MBOX;
       return FALSE;
+    }
   }
   cwStopAudioFile(hwndFrame);  
@@ -1384 +1392 @@
   }
 
-  ulPrivFlags&= ~MFLDR_VIEW_COMPACT;
+  ulPrivFlags&= ~(MFLDR_VIEW_COMPACT|MFLDR_SHOWING_MBOX);
   hwndMFldrFrame=NULL;
   wpSaveDeferred();
@@ -1393 +1401 @@
 {
   ULONG ulErr;
+  /*
+    FIXME:
+    This init call of the parent should be changed to allow replacement of
+    CWProgFolder.
+    */
   CWProgFolder::wpInitData();
   /* Get storage for private data. */
@@ -1399 +1412 @@
 
   ulPrivFlags=0;
-
 }
 
 void  CWMediaFolder::wpUnInitData()
 {
-  wpFreeMem((PBYTE)mfData);
+  if(mfData)
+    wpFreeMem((PBYTE)mfData);
+
+  /*
+    FIXME:
+    This uninit call of the parent should be changed to allow replacement of
+    CWProgFolder.
+    */
   CWProgFolder::wpUnInitData();
 }
 
+
+
+
+