Changeset 4 for trunk/mediafolder/c/mediafldr

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/mediafldr

Files:

• mediadialogprocs.cpp (modified) (1 diff)
• mediafolderoverridenwpmethods.cpp (modified) (8 diffs)

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();
 }
 
+
+
+
+