Changeset 1060

Timestamp:

07/08/08 22:09:33 (7 weeks ago)

Author:

jbs

Message:

Ticket 242: Ensure that obsolete INI keys are deleted when re-saving
a directory container state with fewer open windows than those in the
previous state.

Files:

• trunk/dll/mainwnd.c (modified) (6 diffs)

trunk/dll/mainwnd.c

@@ -96 +96 @@
 static BOOL CloseDirCnrChildren(HWND hwndClient);
 static BOOL RestoreDirCnrState(HWND hwndClient, PSZ pszStateName, BOOL noview);
+static VOID DeletePresParams(PSZ pszKeyroot);
 
 static MRESULT EXPENTRY MainObjectWndProc(HWND hwnd, ULONG msg, MPARAM mp1,
@@ -2793 +2794 @@
   HWND hwndChild, hwndDir, hwndC;
   ULONG numsaves = 0, flWindowAttr;
+  ULONG previous_numsaves, ulTemp = sizeof(ULONG);
   CHAR szPrefix[STATE_NAME_MAX_BYTES + 1];
   CHAR szKey[STATE_NAME_MAX_BYTES + 80];
   CHAR szDir[CCHMAXPATH];
   SWP swp;
-  INT nSaved = 0;
   DIRCNRDATA *dcd;
   BOOL fIsShutDownState;
@@ -2901 +2902 @@
             sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
             PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
-            nSaved++;
           }
         }
@@ -2909 +2909 @@
   WinEndEnumWindows(henum);
 
-  if (nSaved) {
-    if (WinQueryWindowPos(hwndTree, &swp)) {
-      sprintf(szKey, "%sLastTreePos", szPrefix);
-      PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, sizeof(SWP));
-    }
-    sprintf(szKey, "%sNumDirsLastTime", szPrefix);
+  sprintf(szKey, "%sNumDirsLastTime", szPrefix);
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp))
+    for (ulTemp = numsaves; ulTemp < previous_numsaves; ulTemp++) {
+      sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(SWP));
+      sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(INT));
+      sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(MASK));
+      sprintf(szKey, "%sDirCnrView.%lu", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(ULONG));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsLongname", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsSubject", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsSize", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsEA", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsAttr", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsIcon", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsLWDate", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsLWTime", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsLADate", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsLATime", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsCRDate", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnr.%lu.DetailsCRTime", szPrefix, ulTemp);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, sizeof(BOOL));
+      sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, ulTemp);
+      PrfWriteProfileString(fmprof, FM3Str, szKey, NULL);
+      sprintf(szKey, "%sDirCnr.%lu.", szPrefix, ulTemp);
+      DeletePresParams(szKey);
+    }
+  sprintf(szKey, "%sNumDirsLastTime", szPrefix);
+  if (numsaves) {
     PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & numsaves, sizeof(ULONG));
     WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swp);
     sprintf(szKey, "%sMySizeLastTime", szPrefix);
     PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, sizeof(SWP));
+    if (WinQueryWindowPos(hwndTree, &swp)) {
+      sprintf(szKey, "%sLastTreePos", szPrefix);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, sizeof(SWP));
+    }
   }
   else if (fIsShutDownState) {
-    sprintf(szKey, "%sNumDirsLastTime", szPrefix);
     PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & numsaves, sizeof(ULONG));
   }
 
-  return nSaved;
+  return numsaves;
 }
 
@@ -3012 +3051 @@
     WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swpO);
   }
-  // If restoring saved shutdown state or internally saved state, forget info
+  // If restoring internally saved state, forget info
   if (fDeleteState)
     PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
@@ -6367 +6406 @@
 }
 
+VOID DeletePresParams(CHAR * pchKeyroot)
+// This code assumes that pchKeyroot points to a buffer large enough to
+// hold the full INI key: The state name.dircnr-number.PPName. The
+// PPNames are listed below.
+{
+  PSZ apszPPNames[] =
+  {
+    "Backgroundcolor",
+    "Foregroundcolor",
+    "Hilitebackgroundcolor",
+    "Hiliteforegroundcolor",
+    "Bordercolor",
+    "Fontnamesize"
+  };
+
+  ULONG ulSize, ulArraySize = sizeof(apszPPNames) / sizeof(PSZ), x;
+  CHAR * eos = pchKeyroot + strlen(pchKeyroot);
+
+  for (x = 0; x < ulArraySize; x++)
+  {
+    strcpy(eos, apszPPNames[x]);
+    if (PrfQueryProfileSize(fmprof, appname, pchKeyroot, &ulSize) && ulSize)
+    {
+      PrfWriteProfileData(fmprof, appname, pchKeyroot, NULL, ulSize);
+    }
+  }
+}
+
 #pragma alloc_text(MISC8,SetToggleChecks,FindDirCnrByName,TopWindow)
 #pragma alloc_text(MISC8,TopWindowName,CountDirCnrs)