Changeset 981

Timestamp:

Feb 25, 2008, 1:25:14 AM (17 years ago)

Author:

John Small

Message:

Changes to fix problems with default presparams introduced as part
of tickets 150 and 230.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (3 diffs)
• mainwnd.c (modified) (6 diffs)

trunk/dll/dircnrs.c

@@ -1428 +1428 @@
         CNRINFO cnri;
 
-        RestorePresParams(hwnd, "DirCnr");
         memset(&cnri, 0, sizeof(CNRINFO));
         cnri.cb = sizeof(CNRINFO);
@@ -1510 +1509 @@
   case UM_SETUP2:
     if (dcd)
-    {
       AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
-    }
-    else {
+    else
       PostMsg(hwnd, WM_CLOSE, MPVOID, MPVOID);
-      return 0;
-    }
     return 0;
 
@@ -3469 +3464 @@
         }
         else {
+          RestorePresParams(dcd->hwndCnr, "DirCnr");
           WinSetWindowPtr(dcd->hwndCnr, QWL_USER, (PVOID) dcd);
           dcd->oldproc = WinSubclassWindow(dcd->hwndCnr,

trunk/dll/mainwnd.c

@@ -2959 +2959 @@
   CHAR szDir[CCHMAXPATH];
   CHAR szPrefix[STATE_NAME_MAX_BYTES + 2];
-  HWND hwndDir, hwndC;
+  HWND hwndDir, hwndC, hwndPPSave = NULLHANDLE;
   SWP swp, swpO, swpN;
   ULONG size, numsaves = 0, x;
@@ -2981 +2981 @@
   // If restoring shutdown state bypass no-prescan drives
   fIsShutDownState = strcmp(pszStateName, GetPString(IDS_SHUTDOWNSTATE)) == 0;
-  // Delete saved state if restored saved state or internally saved state
-  fDeleteState = /* fIsShutDownState || */
-                 strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
+  // Delete saved state if internally saved state
+  fDeleteState = strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)) == 0;
 
   size = sizeof(SWP);
@@ -3214 +3213 @@
               PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
           }
-//        sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
-//        RestorePresParams(hwndClient, szKey);
-//        SavePresParams(hwndClient, "DirCnr");
           hwndDir = (HWND) WinSendMsg(hwndClient,
                                       UM_SETDIR,
@@ -3224 +3220 @@
             if (hwndC) {
               HWND hwndCnr = WinWindowFromID(hwndC, DIR_CNR);
+              if (!hwndPPSave) {
+                hwndPPSave = WinCreateWindow(hwndCnr,         // Create a window (used to save default presparams)
+                                             WC_CONTAINER,
+                                             NULL,
+                                             CCS_AUTOPOSITION | CCS_MINIICONS |
+                                             CCS_MINIRECORDCORE | ulCnrType |
+                                             WS_VISIBLE,
+                                             0,
+                                             0,
+                                             0,
+                                             0,
+                                             hwndCnr,
+                                             HWND_TOP, (ULONG) -1, NULL, NULL);
+                CopyPresParams(hwndPPSave, hwndC);
+                RestorePresParams(hwndPPSave, "DirCnr");
+              }
               sprintf(szKey, "%sDirCnr.%lu", szPrefix, x);
               RestorePresParams(hwndCnr, szKey);
@@ -3292 +3304 @@
                 if (fDeleteState)
                   PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
-                if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
-                  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
+                if (!PostMsg(hwndCnr, UM_SETUP2, NULL, NULL))
+                  WinSendMsg(hwndCnr, UM_SETUP2, NULL, NULL);
               }
             }
@@ -3325 +3337 @@
       }
     } // for
+    if (hwndPPSave) {
+       SavePresParams(hwndPPSave, "DirCnr");
+       WinDestroyWindow(hwndPPSave);
+    }
   }
   return fRestored;