Changeset 917 for trunk/dll/comp.c

Timestamp:

Jan 11, 2008, 10:41:56 PM (18 years ago)

Author:

Steven Levine

Message:

Correct/enhance settings notebook navigation, ticket #188 (Steven)
Reopen settings notebook to last selected page unless overridden, ticket #188 (Steven)
More Compare Directory overflow tweaks (Steven)

File:

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

trunk/dll/comp.c

@@ -878 +878 @@
       FILELIST **filesl = NULL;
       FILELIST **filesr = NULL;
-      UINT numfilesl = 0;
-      UINT numfilesr = 0;
+      // UINT numfilesl = 0;            // 08 Jan 08 SHL fixme
+      // UINT numfilesr = 0;
       UINT numallocl = 0;
       UINT numallocr = 0;
@@ -914 +914 @@
       RemoveCnrItems(hwndRight, NULL, 0, CMA_FREE | CMA_INVALIDATE);
       RemoveCnrItems(hwndLeft, NULL, 0, CMA_FREE | CMA_INVALIDATE);
-      cmp->cmp->totalleft = cmp->cmp->totalright = 0;
+      cmp->cmp->totalleft = 0;
+      cmp->cmp->totalright = 0;
 
       // Build list of all files in left directory
@@ -923 +924 @@
       FillDirList(cmp->leftdir, lenl, cmp->includesubdirs,
                   &filesl, &cmp->cmp->totalleft, &numallocl);
-      numfilesl = cmp->cmp->totalleft;
+      // numfilesl = cmp->cmp->totalleft;       // 08 Jan 08 SHL fixme
 
       if (filesl)
-        qsort(filesl, numfilesl, sizeof(CHAR *), CompNames);
+        qsort(filesl, cmp->cmp->totalleft, sizeof(CHAR *), CompNames);
 
       // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread sorted filesl");
@@ -938 +939 @@
         FillDirList(cmp->rightdir, lenr, cmp->includesubdirs,
                     &filesr, &cmp->cmp->totalright, &numallocr);
-        numfilesr = cmp->cmp->totalright;
+        // numfilesr = cmp->cmp->totalright;
       }
       else {
@@ -1052 +1053 @@
                                                           &fb4,
                                                           &filesr,
-                                                          &numfilesr,
+                                                          &cmp->cmp->totalright,
                                                           &numallocr))
                                           break;
@@ -1075 +1076 @@
 
       if (filesr)
-        qsort(filesr, numfilesr, sizeof(CHAR *), CompNames);
+        qsort(filesr, cmp->cmp->totalright, sizeof(CHAR *), CompNames);
 
       // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread sorted filesr");
@@ -1178 +1179 @@
             // File appears on left side
             filesSeenL++;
+            cmp->cmp->totalleft = filesSeenL;
             BldFullPathName(szBuf, cmp->leftdir, filesl[l]->fname);
-            //sprintf(szBuf, "%s%s%s", cmp->leftdir,
-            //        (cmp->leftdir[strlen(cmp->leftdir) - 1] == '\\') ?
-            //        NullStr : "\\", filesl[l]->fname);
             pcil->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
             pcil->pszDisplayName = pcil->pszFileName + lenl;
@@ -1217 +1216 @@
             // File appears on right side
             filesSeenR++;
+            cmp->cmp->totalright = filesSeenR;
             BldFullPathName(szBuf, cmp->rightdir, filesr[r]->fname);
-            //sprintf(szBuf, "%s%s%s", cmp->rightdir,
-            //        (cmp->rightdir[strlen(cmp->rightdir) - 1] == '\\') ?
-            //        NullStr : "\\", filesr[r]->fname);
             pcir->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);   // 31 Jul 07 SHL
             pcir->pszDisplayName = pcir->pszFileName + lenr;
@@ -1374 +1371 @@
           pcir = (PCNRITEM) pcir->rc.preccNextRecord;
 
-          // Show running totals every 2 seconds
-          cmp->cmp->totalleft = filesSeenL;
-          cmp->cmp->totalright = filesSeenR;
-
         } // while filling left or right
 
@@ -1404 +1397 @@
             }
           }
-          // Reduce counts to match what is in container
-          if (numfilesl > filesSeenL)
-            numfilesl = filesSeenL;
-          if (numfilesr > filesSeenR)
-            numfilesr = filesSeenR;
+          // Reduce count to match what is in containers
           recsNeeded = recsGotten;
         } // if insufficient resources
-
 
         if (filesl)
@@ -1435 +1423 @@
           Win_Error(hwndLeft, cmp->hwnd, pszSrcFile, __LINE__, "CM_INSERTRECORD");
           FreeCnrItemList(hwndLeft, pcilFirst);
-          numfilesl = 0;
+          // numfilesl = 0;             // 08 Jan 08 SHL fixme
+          cmp->cmp->totalleft = 0;
         }
 
@@ -1452 +1441 @@
           RemoveCnrItems(hwndLeft, NULL, 0, CMA_FREE | CMA_INVALIDATE);
           FreeCnrItemList(hwndRight, pcirFirst);
-          numfilesr = 0;
-        }
-
-        cmp->cmp->totalleft = numfilesl;
-        cmp->cmp->totalright = numfilesr;
+          // numfilesr = 0;
+          cmp->cmp->totalright = 0;
+        }
 
         // DbgMsg(pszSrcFile, __LINE__, "FillCnrsThread filled");