Changeset 923 for trunk/dll/misc.c

Timestamp:

Jan 15, 2008, 1:41:54 AM (18 years ago)

Author:

John Small

Message:

Updated for ticket 150: fixed/improved save and restore of the state
of directory containers when FM/2 is closed and re-opened.

File:

• trunk/dll/misc.c (modified) (3 diffs)

trunk/dll/misc.c

@@ -1001 +1001 @@
                            DIRCNRDATA * dcd, BOOL compare)
 {
-  CHAR s[CCHMAXPATH], *eos = s;
+// JBS  CHAR s[CCHMAXPATH], *eos = s;
   BOOL *bool = NULL;
 
-  *s = 0;
-  if (keyroot) {
-    strcpy(s, keyroot);
-    strcat(s, ".");
-    eos = &s[strlen(s)];
-  }
+// JBS  *s = 0;
+// JBS  if (keyroot) {
+// JBS    strcpy(s, keyroot);
+// JBS    strcat(s, ".");
+// JBS    eos = &s[strlen(s)];
+// JBS  }
   switch (cmd) {
   case IDM_SHOWLNAMES:
     bool = dcd ? &dcd->detailslongname : &detailslongname;
-    strcpy(eos, "DetailsLongname");
+// JBS    strcpy(eos, "DetailsLongname");
     break;
   case IDM_SHOWSUBJECT:
     bool = dcd ? &dcd->detailssubject : &detailssubject;
-    strcpy(eos, "DetailsSubject");
+// JBS    strcpy(eos, "DetailsSubject");
     break;
   case IDM_SHOWEAS:
     bool = dcd ? &dcd->detailsea : &detailsea;
-    strcpy(eos, "DetailsEA");
+// JBS    strcpy(eos, "DetailsEA");
     break;
   case IDM_SHOWSIZE:
     bool = dcd ? &dcd->detailssize : &detailssize;
-    strcpy(eos, "DetailsSize");
+// JBS    strcpy(eos, "DetailsSize");
     break;
   case IDM_SHOWICON:
     bool = dcd ? &dcd->detailsicon : &detailsicon;
-    strcpy(eos, "DetailsIcon");
+// JBS    strcpy(eos, "DetailsIcon");
     break;
   case IDM_SHOWLWDATE:
     bool = dcd ? &dcd->detailslwdate : &detailslwdate;
-    strcpy(eos, "DetailsLWDate");
+// JBS    strcpy(eos, "DetailsLWDate");
     break;
   case IDM_SHOWLWTIME:
     bool = dcd ? &dcd->detailslwtime : &detailslwtime;
-    strcpy(eos, "DetailsLWTime");
+// JBS    strcpy(eos, "DetailsLWTime");
     break;
   case IDM_SHOWLADATE:
     bool = dcd ? &dcd->detailsladate : &detailsladate;
-    strcpy(eos, "DetailsLADate");
+// JBS    strcpy(eos, "DetailsLADate");
     break;
   case IDM_SHOWLATIME:
     bool = dcd ? &dcd->detailslatime : &detailslatime;
-    strcpy(eos, "DetailsLATime");
+// JBS    strcpy(eos, "DetailsLATime");
     break;
   case IDM_SHOWCRDATE:
     bool = dcd ? &dcd->detailscrdate : &detailscrdate;
-    strcpy(eos, "DetailsCRDate");
+// JBS    strcpy(eos, "DetailsCRDate");
     break;
   case IDM_SHOWCRTIME:
     bool = dcd ? &dcd->detailscrtime : &detailscrtime;
-    strcpy(eos, "DetailsCRTime");
+// JBS    strcpy(eos, "DetailsCRTime");
     break;
   case IDM_SHOWATTR:
     bool = dcd ? &dcd->detailsattr : &detailsattr;
-    strcpy(eos, "DetailsAttr");
+// JBS    strcpy(eos, "DetailsAttr");
     break;
   default:
@@ -1066 +1066 @@
   if (bool)
     *bool = *bool ? FALSE : TRUE;
-  if (*s && bool)
-    PrfWriteProfileData(fmprof, appname, s, bool, sizeof(BOOL));
+// JBS  if (*s && bool)
+// JBS    PrfWriteProfileData(fmprof, appname, s, bool, sizeof(BOOL));
   if (hwnd)
     AdjustCnrColsForPref(hwnd, directory, dcd, compare);
@@ -1214 +1214 @@
   BOOL *bool;
 
-  *s = 0;
-  if (keyroot) {
+// JBS - No calls to LoadDetailsSwitches have a NULL keyroot.
+//  *s = 0;
+//  if (keyroot) {
     strcpy(s, keyroot);
     strcat(s, ".");
     eos = &s[strlen(s)];
-  }
+//  }
   strcpy(eos, "DetailsLongname");
   if (dcd)