Changeset 1410

Timestamp:

Mar 29, 2009, 5:43:09 PM (17 years ago)

Author:

Gregg Young

Message:

Add code to delete old style ini keys when a state is deleted.

Location:

trunk/dll

Files:

• mainwnd.c (modified) (5 diffs)
• misc.c (modified) (4 diffs)
• misc.h (modified) (1 diff)

trunk/dll/mainwnd.c

@@ -84 +84 @@
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
   19 Mar 09 GKY Moved DeletePresParams to presparam.c
+  28 Mar 09 GKY Add RemoveOldCnrSwitches to remove pre 3.16 style ini keys;
+                add State.version key for check
 
 ***********************************************************************/
@@ -2945 +2947 @@
     sprintf(szKey, "%sTargetDir", szPrefix);
     PrfWriteProfileString(fmprof, FM3Str, szKey, targetdir);
+    sprintf(szKey, "%sVersion", szPrefix);
+    PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
   }
 
@@ -3011 +3015 @@
 
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
-  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp))
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) &previous_numsaves, &ulTemp)) {
+    ULONG size = 0;
+
+    sprintf(szKey, "%sVersion", szPrefix);
+    PrfQueryProfileSize(fmprof, FM3Str, szKey, &size);
+    if (!size && fSaveState) {
+      for (ulTemp = 0; ulTemp < previous_numsaves; ulTemp++)
+        RemoveOldCnrSwitches(szPrefix, ulTemp);
+       sprintf(szKey, "%sVersion", szPrefix);
+       PrfWriteProfileString(fmprof, FM3Str, szKey, "3.16");
+      }
     for (ulTemp = numsaves; ulTemp < previous_numsaves; ulTemp++) {
       sprintf(szKeyBase, "%sDirCnr.%lu", szPrefix, ulTemp);
       RemoveCnrSwitches(szKeyBase, NULL);
     }
+  }
   sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   if (numsaves) {
@@ -3199 +3214 @@
               driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
             RemoveCnrSwitches(szKeyBase, NULL);
+            RemoveOldCnrSwitches(szPrefix, x);
             continue;
           }
@@ -4625 +4641 @@
                 sprintf(szKeyBase, "%s.DirCnr.%lu", szStateName, x);
                 RemoveCnrSwitches(szKeyBase, szStateName);
+                size = 0;
+                sprintf(szKey, "%sVersion", szStateName);
+                if (PrfQueryProfileSize(fmprof, FM3Str, szKey, &size) && size)
+                  RemoveOldCnrSwitches(szStateName, x);
               }
             }

trunk/dll/misc.c

@@ -58 +58 @@
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
   08 Mar 09 GKY Removed variable aurguments from docopyf and unlinkf (not used)
+  28 Mar 09 GKY Add RemoveOldCnrSwitches to remove pre 3.16 style ini keys;
+                add State.version key for check
 
 ***********************************************************************/
@@ -1487 +1489 @@
   strcpy(eos, "DetailsLATime");
   PrfWriteProfileData(fmprof, appname, s, NULL, 0);
+
+#ifdef NEVER
+  // activate this code if we ever allow setting of subject location/length per container GKY 3-28-09
   strcpy(eos, "SubjectInLeftPane");
   PrfWriteProfileData(fmprof, appname, s, NULL, 0);
@@ -1493 +1498 @@
   strcpy(eos, "SubjectDisplayWidth");
   PrfWriteProfileData(fmprof, appname, s, NULL, 0);
+#endif
+
   strcpy(eos, "Pos");;
   PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0);
@@ -1517 +1524 @@
   }
 
+}
+
+/**
+ * Removes the pre 3.16 style ini entries when a state is deleted
+ */
+VOID RemoveOldCnrSwitches(PCSZ szPrefix, ULONG ulTemp)
+{
+  CHAR szKey[STATE_NAME_MAX_BYTES + 80];
+
+  sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, ulTemp);
+  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, ulTemp);
+  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, ulTemp);
+  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  sprintf(szKey, "%sDirCnrView.%lu", szPrefix, ulTemp);
+  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0);
+  sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, ulTemp);
+  PrfWriteProfileString(fmprof, FM3Str, szKey, NULL);
+  sprintf(szKey, "%sDirCnr.%lu.", szPrefix, ulTemp);
 }
 

trunk/dll/misc.h

@@ -55 +55 @@
 VOID WriteDetailsSwitches(PCSZ keyroot, DETAILS_SETTINGS *pds, BOOL state);
 VOID RemoveCnrSwitches(PCSZ keyroot, PCSZ statename);
+VOID RemoveOldCnrSwitches(PCSZ szPrefix, ULONG ulTemp);
 VOID LoadLibPath(PSZ str, LONG len);
 VOID OpenEdit(HWND hwnd);