Changeset 1778 for trunk/dll/mainwnd2.c

Timestamp:

Jun 27, 2014, 12:30:54 AM (11 years ago)

Author:

Steven Levine

Message:

Rework dircnrs.c DirObjWndProc UM_RESCAN to avoid hanging FM/2 Lite when
drive tree hidden. Also speeds up startup if Switch Tree on directory change
not enabled.

File:

• trunk/dll/mainwnd2.c (modified) (4 diffs)

trunk/dll/mainwnd2.c

@@ -436 +436 @@
 {
   PERSON1DATA *pd;
+  BOOL yes;
 
   SetShiftState();
@@ -584 +585 @@
     WinSendMsg(hwnd, UM_SETUP2, MPFROMLONG(1), MPVOID);
     if (hwndTree) {
+      // Hide
       WinShowWindow(hwndTree, FALSE);
       PostMsg(hwndTree, WM_CLOSE, MPVOID, MPVOID);
-      hwndTree = (HWND) 0;
+      hwndTree = NULLHANDLE;
     }
     else {
-
+      // Create tree window if needed and make visible
       ULONG size = sizeof(ULONG);
-
       hwndTree = StartTreeCnr(hwnd, 3);
-      PrfQueryProfileData(fmprof,
-                          realappname,
-                          "FM/4 TreeWidth", (PVOID) & TreeWidth, &size);
+      PrfQueryProfileData(fmprof, realappname,
+                          "FM/4 TreeWidth", (PVOID)&TreeWidth, &size);
       TreeWidth = max(TreeWidth, 80);
     }
-    {
-      BOOL dummy = (hwndTree != (HWND) 0);
-
-      PrfWriteProfileData(fmprof,
-                          realappname,
-                          "FM/4 TreeUp", (PVOID) & dummy, sizeof(dummy));
-    }
+    yes = hwndTree != NULLHANDLE;
+    PrfWriteProfileData(fmprof, realappname,
+                        "FM/4 TreeUp", (PVOID)&yes, sizeof(yes));
     PostMsg(hwnd, UM_SIZE, MPVOID, MPVOID);
     break;
@@ -793 +789 @@
   ULONG which;
   ULONG size;
+  BOOL yes;
 
   switch (msg) {
@@ -861 +858 @@
     if (pd) {
       CHAR s[CCHMAXPATH];
-      BOOL dummy = TRUE;
-
+      yes = TRUE;
       size = sizeof(BOOL);
-      PrfQueryProfileData(fmprof, realappname, "FM/4 TreeUp",
-                          (PVOID) &dummy, &size);
-      if (dummy) {
-        size = sizeof(ULONG);
+      PrfQueryProfileData(fmprof, realappname,
+                          "FM/4 TreeUp", (PVOID)&yes, &size);
+      if (yes) {
         hwndTree = StartTreeCnr(hwnd, 3);
+        size = sizeof(TreeWidth);
         PrfQueryProfileData(fmprof, realappname, "FM/4 TreeWidth",
-                            (PVOID) &TreeWidth, &size);
+                            (PVOID)&TreeWidth, &size);
         TreeWidth = max(TreeWidth, 80);
       }
       size = sizeof(BOOL);
-      if (PrfQueryProfileData(fmprof, appname, "Toolbar", &dummy, &size) &&
-          size && !dummy)
+      if (PrfQueryProfileData(fmprof, appname, "Toolbar", &yes, &size) &&
+          size &&
+          !yes)
+      {
         WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_TOOLBAR, 0), MPVOID);
+      }
 
       size = sizeof(s);