Changeset 1478

Timestamp:

Nov 15, 2009, 11:23:09 PM (16 years ago)

Author:

Gregg Young

Message:

Fix trap on rescan following change of label/drive type or environment on SMP; Ticket 408

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• notebook.c (modified) (2 diffs)

trunk/dll/filldir.c

@@ -82 +82 @@
   13 Oct 09 SHL Avoid szDriver overflow in FillTreeCnr
   13 Oct 09 SHL Restore missing drives in drive drop-down listbox; optimize updates
+  15 Nov 09 GKY Avoid szBuf overflow in FillTreeCnr
+  15 Nov 09 GKY Optimize some check code
 
 ***********************************************************************/
@@ -715 +717 @@
   ULONG flags;
   CHAR *p;
-  CHAR szBuf[80];
+  CHAR szBuf[CCHMAXPATH];
 
   // fill in a container record from a FILESTATUS4L structure
@@ -1350 +1352 @@
             }
           }
-          if (stricmp(volser.volumelabel, NullStr) != 0 && fShowDriveLabelInTree)
+          if (fShowDriveLabelInTree && stricmp(volser.volumelabel, NullStr) != 0)
             strcpy(szFSType, volser.volumelabel);
           pci->rc.flRecordAttr |= CRA_RECORDREADONLY;

trunk/dll/notebook.c

@@ -50 +50 @@
   08 Mar 09 GKY Add WriteDetailsSwitches and use LoadDetailsSwitches to replace in line code
   06 Jun 09 GKY Add option to show file system type or drive label in tree
+  15 Nov 09 GKY Change rescan following label/type change to WinSendMsg to avoid trap on SMP
 
 ***********************************************************************/
@@ -1474 +1475 @@
         }
         if (hwndTree && (fShowEnvChanged || (fShowEnv && fTreeEnvVarListChanged) ||
-                        fShowSysTypeLabelChanged)) {
+                         fShowSysTypeLabelChanged)) {
           PCNRITEM pci = WinSendMsg(WinWindowFromID
                                     (WinWindowFromID(hwndTree, FID_CLIENT),
-                                     TREE_CNR), CM_QUERYRECORDEMPHASIS,
+                                    TREE_CNR), CM_QUERYRECORDEMPHASIS,
                                     MPFROMLONG(CMA_FIRST),
                                     MPFROMSHORT(CRA_SELECTED));
-          PostMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
-                                  TREE_CNR), WM_COMMAND,
-                                  MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
+          WinSendMsg(WinWindowFromID(WinWindowFromID(hwndTree, FID_CLIENT),
+                                     TREE_CNR), WM_COMMAND,
+                     MPFROM2SHORT(IDM_RESCAN, 0), MPVOID);
           pszTemp = xstrdup(pci->pszFileName, pszSrcFile, __LINE__);
           if (pszTemp) {