Changeset 790 for trunk/dll/comp.c

Timestamp:

Aug 20, 2007, 6:54:43 PM (18 years ago)

Author:

Steven Levine

Message:

Correct remaining pcil/pcir typos (we hope)
Revert to DosSleep(0)
Use GetMSecTimer for timing

File:

• trunk/dll/comp.c (modified) (5 diffs)

trunk/dll/comp.c

@@ -33 +33 @@
   13 Aug 07 SHL Sync code with other FilesToGet usage
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
+  20 Aug 07 SHL Correct remaining pcil/pcir typos (we hope)
+  20 Aug 07 SHL Revert to DosSleep(0)
+  20 Aug 07 SHL Use GetMSecTimer for timing
 
 ***********************************************************************/
@@ -841 +844 @@
   HMQ hmq;
   BOOL notified = FALSE;
+
+  ULONG lastMSec = GetMSecTimer();
+  ULONG ul;
 
   HWND hwndLeft, hwndRight;
@@ -1194 +1200 @@
             pcir->crtime.minutes = filesr[r]->crtime.minutes;
             pcir->crtime.hours = filesr[r]->crtime.hours;
-            if (~pcil->rc.flRecordAttr & CRA_FILTERED &&
+            // Bypass check if already filtered on left side
+            if (~pcir->rc.flRecordAttr & CRA_FILTERED &&
                 *cmp->dcd.mask.szMask) {
               if (!Filter((PMINIRECORDCORE)pcir, (PVOID)&cmp->dcd.mask)) {
@@ -1302 +1309 @@
             pcil->pszSubject = NullStr;
           if (!pcir->pszSubject)
-            pcil->pszSubject = NullStr;
+            pcir->pszSubject = NullStr;
 
           if (!pcil->pszDispAttr)
             pcil->pszDispAttr = NullStr;
           if (!pcir->pszDispAttr)
-            pcil->pszDispAttr = NullStr;
-
-          // fixme to be time based - every 2 sec should be OK
+            pcir->pszDispAttr = NullStr;
+
+#if 0                                   // 20 Aug 07 SHL fixme to be gone
           if (!(cntr % 500))
             DosSleep(1);
           else if (!(cntr % 50))
-            DosSleep(1);
-
+            DosSleep(0);
           cntr++;
+#else
+          if ((cntr++ % 500) == 0) {
+            ul = GetMSecTimer();
+            if (ul - lastMSec >= 1000) {
+              lastMSec = ul;
+              DosSleep(1);
+            }
+          }
+#endif
 
           pcil = (PCNRITEM) pcil->rc.preccNextRecord;
@@ -2440 +2455 @@
               TileChildren(cmp->hwndParent, TRUE);
             }
-            DosSleep(32); // 05 Aug 07 GKY 64
+            DosSleep(32);               // 05 Aug 07 GKY 64
             PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(COMP_COLLECT, 0), MPVOID);
             break;