Changeset 197 for trunk/dll

Timestamp:

Jun 8, 2005, 7:52:46 AM (20 years ago)

Author:

root

Message:

Make savedSortFlags static to avoid referencing garbage

File:

• trunk/dll/collect.c (modified) (15 diffs)

trunk/dll/collect.c

@@ -18 +18 @@
   05 Jun 05 SHL Use QWL_USER
   06 Jun 05 SHL Indent -i2
+  06 Jun 05 SHL Make savedSortFlags static to avoid referencing garbage
 
 ***********************************************************************/
@@ -57 +58 @@
 MRESULT EXPENTRY CollectorTextProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
 {
-  LONGLONG ullBytes;
+  DIRCNRDATA *dcd;
 
   static BOOL emphasized = FALSE;
@@ -83 +84 @@
           POINTL ptl = {0, 0};
           SWP swp;
-          DIRCNRDATA *dcd;
 
           if (hwndButtonPopup)
@@ -510 +510 @@
                                      MPARAM mp2)
 {
+  ULONG size;
   DIRCNRDATA *dcd;
 
@@ -631 +632 @@
                        GetPString(IDS_COLLECTINGTEXT));
       for (x = 0; li -> list[x]; x++)
+      {
         ;
+      }
       ulMaxFiles = x;
       if (ulMaxFiles)
@@ -828 +831 @@
         {
           CHAR filename[CCHMAXPATH], *p, *pp;
-          ULONG size;
 
           strcpy(filename, "*.LST");
@@ -1013 +1015 @@
 {
   DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd, QWL_USER);
-  INT tempsortFlags;
+  ULONG size;
+
+  static INT savedSortFlags;
 
   switch (msg)
@@ -1079 +1083 @@
         dcd -> szCommonName[len + 1] = 0;
         memset(&srch, 0, sizeof(SEARCHSTRING));
-        srch.cb = (ULONG) sizeof(SEARCHSTRING);
-        srch.pszSearch = (PSZ) dcd -> szCommonName;
+        srch.cb = sizeof(SEARCHSTRING);
+        srch.pszSearch = dcd -> szCommonName;
         srch.fsPrefix = TRUE;
         srch.fsCaseSensitive = FALSE;
@@ -1421 +1425 @@
 
         {
-          ULONG size = sizeof(ULONG);
-
+          size = sizeof(ULONG);
           PrfQueryProfileData(fmprof, appname, "CollectorflWindowAttr",
                               (PVOID) & cnri.flWindowAttr, &size);
@@ -1450 +1453 @@
         SetCnrCols(hwnd, FALSE);
         AdjustCnrColsForPref(hwnd, NULL, dcd, FALSE);
-        {                               /* fix splitbar for collector container */
-          ULONG size;
-
+
+        /* fix splitbar for collector container */
+        cnri.xVertSplitbar = DIR_SPLITBAR_OFFSET - 32;
+        size = sizeof(LONG);
+        PrfQueryProfileData(fmprof, appname, "CollectorCnrSplitBar",
+                            &cnri.xVertSplitbar, &size);
+        if (cnri.xVertSplitbar <= 0)
           cnri.xVertSplitbar = DIR_SPLITBAR_OFFSET - 32;
-          size = sizeof(LONG);
-          PrfQueryProfileData(fmprof, appname, "CollectorCnrSplitBar",
-                              &cnri.xVertSplitbar, &size);
-          if (cnri.xVertSplitbar <= 0)
-            cnri.xVertSplitbar = DIR_SPLITBAR_OFFSET - 32;
-          WinSendMsg(hwnd, CM_SETCNRINFO, MPFROMP(&cnri),
-                     MPFROMLONG(CMA_XVERTSPLITBAR));
-        }
+        WinSendMsg(hwnd, CM_SETCNRINFO, MPFROMP(&cnri),
+                   MPFROMLONG(CMA_XVERTSPLITBAR));
+
         if (_beginthread(MakeObjWin, NULL, 245760, (PVOID) dcd) == -1)
         {
@@ -1695 +1697 @@
         {
           CHAR filename[CCHMAXPATH], *p, *pp;
-          ULONG size;
 
           strcpy(filename, "*.LST");
@@ -1757 +1758 @@
       case IDM_SORTCRDATE:
       case IDM_SORTSUBJECT:
-        tempsortFlags = CollectorsortFlags;
+        savedSortFlags = CollectorsortFlags;
         CollectorsortFlags &= (SORT_REVERSE | SORT_DIRSFIRST | SORT_DIRSLAST);
       case IDM_SORTDIRSFIRST:
@@ -1771 +1772 @@
           break;
         case IDM_SORTSMARTNAME:
-          if (!(tempsortFlags & SORT_FILENAME))
+          if (~savedSortFlags & SORT_FILENAME)
             CollectorsortFlags |= SORT_FILENAME;
           break;
@@ -1990 +1991 @@
                         FM3ModHandle, MSK_FRAME, MPFROMP(&dcd -> mask)))
           {
-            PrfWriteProfileData(fmprof, appname, "CollectorFilter", &dcd -> mask,
-                                sizeof(MASK));
+            size = sizeof(MASK);
+            PrfWriteProfileData(fmprof, appname, "CollectorFilter",
+                                &dcd -> mask, size);
             dcd -> suspendview = 1;
             WinSendMsg(hwnd, CM_FILTER, MPFROMP(Filter), MPFROMP(&dcd -> mask));
@@ -2955 +2957 @@
 HWND StartCollector(HWND hwndParent, INT flags)
 {
-  HWND hwndFrame = (HWND) 0, hwndClient;
+  HWND hwndFrame = (HWND) 0;
+  HWND hwndClient;
   ULONG FrameFlags = FCF_TITLEBAR | FCF_SYSMENU |
-  FCF_SIZEBORDER | FCF_MINMAX |
-  FCF_ICON | FCF_NOBYTEALIGN |
-  FCF_ACCELTABLE;
+                     FCF_SIZEBORDER | FCF_MINMAX |
+                     FCF_ICON | FCF_NOBYTEALIGN |
+                     FCF_ACCELTABLE;
   USHORT id;
+  DIRCNRDATA *dcd;
+
   static USHORT idinc = 0;
-  DIRCNRDATA *dcd;
 
   if (ParentIsDesktop(hwndParent, hwndParent))