Changeset 280

Timestamp:

Dec 8, 2005, 8:44:15 AM (20 years ago)

Author:

root

Message:

Sanitize handle references
CollectorCnrWndProc: avoid excess writes to Status2 window
CollectorCnrWndProc: correct missing button window updates

File:

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

trunk/dll/collect.c

@@ -19 +19 @@
   06 Jun 05 SHL Indent -i2
   06 Jun 05 SHL Make savedSortFlags static to avoid referencing garbage
+  24 Oct 05 SHL Sanitize handle references
+  24 Oct 05 SHL CollectorCnrWndProc: avoid excess writes to Status2 window
+  10 Nov 05 SHL CollectorCnrWndProc: correct missing button window updates
 
 ***********************************************************************/
@@ -167 +170 @@
               CenterOverWindow(hwndButtonPopup);
               PaintRecessedWindow(hwnd,
-                                  (HPS) 0,
+                                  NULLHANDLE,
                                   FALSE,
                                   FALSE);
@@ -192 +195 @@
     if (hwndButtonPopup == (HWND) mp2)
     {
-      lastid = WinQueryWindowUShort((HWND) mp2,
-                                    QWS_ID);
+      lastid = WinQueryWindowUShort((HWND) mp2, QWS_ID);
       WinDestroyWindow(hwndButtonPopup);
       hwndButtonPopup = (HWND) 0;
@@ -206 +208 @@
       case DIR_SORT:
         PaintRecessedWindow(hwnd,
-                            (HPS) 0,
+                            NULLHANDLE,
                             TRUE,
                             FALSE);
@@ -295 +297 @@
       USHORT id;
 
-      id = WinQueryWindowUShort(hwnd,
-                                QWS_ID);
+      id = WinQueryWindowUShort(hwnd, QWS_ID);
       switch (id)
       {
@@ -313 +314 @@
       USHORT id, cmd = 0;
 
-      id = WinQueryWindowUShort(hwnd,
-                                QWS_ID);
+      id = WinQueryWindowUShort(hwnd, QWS_ID);
       switch (id)
       {
@@ -425 +425 @@
       RECTL rcl;
 
-      hps = WinBeginPaint(hwnd, (HPS) 0, NULL);
+      hps = WinBeginPaint(hwnd, NULLHANDLE, NULL);
       if (hps)
       {
@@ -489 +489 @@
                       SWP_SHOW | SWP_MOVE | SWP_SIZE);
     }
-    CommonTextPaint(hwnd, (HPS) 0);
+    CommonTextPaint(hwnd, NULLHANDLE);
     if (msg == UM_SIZE)
     {
@@ -998 +998 @@
 
       dcd -> stopflag = 1;
+      // Allow rescan logic to quiesce
       while (x++ < 10 && dcd -> amextracted)
         DosSleep(250L);
@@ -1005 +1006 @@
     }
     DosPostEventSem(CompactSem);
-    if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
-      WinSendMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID);
+    if (!PostMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID))
+      WinSendMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID);
     break;
   }
@@ -1217 +1218 @@
       if (dcd -> amextracted)
         WinSetWindowText(hwndStatus2,
-                         GetPString(IDS_INSEEKSCANTEXT));
+                         GetPString(IDS_INSEEKSCANTEXT));       // Say working
       WinSendMsg(hwnd,
                  UM_RESCAN,
@@ -1279 +1280 @@
         if (pci && (INT) pci != -1)
         {
+          BOOL fStatus2Used = FALSE;
           if (fSplitStatus && hwndStatus2)
           {
@@ -1317 +1319 @@
             }
             WinSetWindowText(hwndStatus2, s);
+            fStatus2Used = TRUE;
           }
           if (fMoreButtons)
@@ -1328 +1331 @@
             WinSetWindowText(hwndAttr, pci -> pszDispAttr);
           }
-          if (dcd -> amextracted && hwndStatus2)
-            WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));
+          if (dcd -> amextracted && hwndStatus2 && !fStatus2Used)
+            WinSetWindowText(hwndStatus2, GetPString(IDS_INSEEKSCANTEXT));      // Say working
         }
         else
@@ -1367 +1370 @@
     {
       dcd -> stopflag = 0;
-      dcd -> amextracted = FALSE;
+      dcd -> amextracted = FALSE;               // Say not scanning
       if (dcd -> namecanchange)
       {
@@ -1409 +1412 @@
         WinSendMsg(CollectorCnrMenu, MM_SETITEMATTR, MPFROM2SHORT(IDM_GREP, TRUE),
                    MPFROM2SHORT(MIA_DISABLED, 0));
-        dcd -> amextracted = FALSE;
+        dcd -> amextracted = FALSE;     // Use to indicate scan busy
         dcd -> stopflag = 0;
         memset(&cnri, 0, sizeof(CNRINFO));
@@ -1510 +1513 @@
       if (mp1 &&
           !IsFile((CHAR *) mp1))
-        OpenDirCnr((HWND) 0,
+        OpenDirCnr(HWND_DESKTOP,
                    hwndMain,
                    dcd -> hwndFrame,
@@ -1898 +1901 @@
       case DID_CANCEL:
         if (dcd -> amextracted)
-          dcd -> stopflag = 1;
+          dcd -> stopflag = 1;          // Request cancel
         break;
 
@@ -1948 +1951 @@
                         FM3ModHandle, GREP_FRAME, (PVOID) & hwnd))
           {
-            dcd -> amextracted = TRUE;
+            dcd -> amextracted = TRUE;  // Collector scan in progress
             WinSendMsg(CollectorCnrMenu, MM_SETITEMATTR,
                        MPFROM2SHORT(DID_CANCEL, TRUE),
@@ -1959 +1962 @@
         }
         else
-          DosBeep(50, 100);
+          DosBeep(50, 100);             // Complain about busy
         break;
 
@@ -2744 +2747 @@
             }
           }
-          else if (!dcd -> suspendview &&
-                   WinQueryActiveWindow(dcd -> hwndParent) ==
-                   dcd -> hwndFrame)
+          if (!dcd -> suspendview &&
+              WinQueryActiveWindow(dcd -> hwndParent) == dcd -> hwndFrame)
           {
             if (pre -> fEmphasisMask & CRA_CURSORED)
@@ -2850 +2852 @@
                   OpenObject(pci -> szFileName, Default, dcd -> hwndFrame);
                 else
-                  OpenDirCnr((HWND) 0,
+                  OpenDirCnr(HWND_DESKTOP,
                              hwndMain,
                              dcd -> hwndFrame,
@@ -2911 +2913 @@
 
   case UM_FOLDUP:
-    if (!PostMsg((HWND) 0, WM_QUIT, MPVOID, MPVOID))
+    if (!PostMsg(HWND_DESKTOP, WM_QUIT, MPVOID, MPVOID))
       DosExit(EXIT_PROCESS, 1);
     return 0;
@@ -2921 +2923 @@
       dcd -> stopflag = 1;
       if (dcd -> amextracted)
-        return 0;
+        return 0;               // Can not close yet
     }
     WinSendMsg(hwnd, WM_SAVEAPPLICATION, MPVOID, MPVOID);