Changeset 762 for trunk/dll/select.c

Timestamp:

Aug 5, 2007, 1:19:21 AM (18 years ago)

Author:

Steven Levine

Message:

Use two pass logic to free CNRITEMs and ARCITEMs
Rename pszLongname to pszLongName
More compare directories rework
Make directory sizes item draw placement deterministic - how did it ever work?

File:

• trunk/dll/select.c (modified) (9 diffs)

trunk/dll/select.c

@@ -21 +21 @@
   14 Jun 07 SHL SelectAll: make odd expression go away
   02 Aug 07 SHL Sync with CNRITEM mods
+  04 Aug 07 SHL Use Runtime_Error
 
 ***********************************************************************/
@@ -574 +575 @@
 #pragma alloc_text(SELECT4,FreeCnrs,SpecialSelect2,CompSSNames,CompSSNamesB)
 
+/**
+ * Do select actions for compare directories containers
+ *
+ */
+
 VOID SpecialSelect(HWND hwndCnrS, HWND hwndCnrD, INT action, BOOL reset)
 {
@@ -582 +588 @@
 
 
-  if (!hwndCnrS || !hwndCnrD)
+  if (!hwndCnrS || !hwndCnrD) {
+    Runtime_Error(pszSrcFile, __LINE__, "hwndCnrS %p hwndCnrD %p", hwndCnrS, hwndCnrD);
     return;
+  }
 
   memset(&cnri, 0, sizeof(CNRINFO));
@@ -596 +604 @@
   numS = (INT) cnri.cRecords;
   if (!numD || numS != numD) {
-    saymsg(MB_ENTER,
-           HWND_DESKTOP,
-           DEBUG_STRING, "numD (%lu) != numS (%lu)", numD, numS);
+    Runtime_Error(pszSrcFile, __LINE__, "numD %u != numS %u", numD, numS);
     return;
   }
@@ -630 +636 @@
                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (!(x % 500))
-      DosSleep(1L);
+      DosSleep(1);
     else if (!(x % 50))
       DosSleep(1);
-  }
+  } // while
+
   if (numD != x) {
     if (!slow) {
@@ -641 +648 @@
     free(pciDa);
     free(pciSa);
-    saymsg(MB_ENTER,
-           HWND_DESKTOP, DEBUG_STRING, "numD (%lu) != x (%lu)", numD, x);
+    Runtime_Error(pszSrcFile, __LINE__, "numD %u != x %lu", numD, x);
     return;
   }
@@ -660 +666 @@
                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (!(x % 500))
-      DosSleep(1L);
+      DosSleep(1);
     else if (!(x % 50))
       DosSleep(1);
-  }
+  } // while
+
   if (numS != x) {
     if (!slow) {
@@ -725 +732 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       else if (!(x % 50))
         DosSleep(1);
@@ -1186 +1193 @@
   DosPostEventSem(CompactSem);
 }
+
+/**
+ * Do select actions for single container
+ *
+ */
 
 VOID SpecialSelect2(HWND hwndParent, INT action)