Changeset 751 for trunk/dll/dirsize.c

Timestamp:

Aug 3, 2007, 1:05:48 AM (18 years ago)

Author:

Steven Levine

Message:

Sync rest of code with CNRITEM mods
Sync code with ARCITEM mods
Get compare dialog working
Still some issues with status display
Still some issues with directory sizes tree display
Heap check diagnostic code mostly enabled

File:

• trunk/dll/dirsize.c (modified) (20 diffs)

trunk/dll/dirsize.c

@@ -85 +85 @@
 {
   CHAR maskstr[CCHMAXPATH];
+  CHAR szBuf[CCHMAXPATH];
   CHAR *pEndMask;
   register char *p;
@@ -113 +114 @@
 
   hdir = HDIR_CREATE;
-  nm = 1L;
+  nm = 1;
   memset(pffb, 0, sizeof(FILEFINDBUF4));
   DosError(FERR_DISABLEHARDERR);
@@ -135 +136 @@
       return FALSE;
     }
-    pci = WinSendMsg(hwndCnr, CM_ALLOCRECORD, MPFROMLONG(EXTRA_RECORD_BYTES2),
-                     MPFROMLONG(1L));
+    pci = WinSendMsg(hwndCnr, CM_ALLOCRECORD, MPFROMLONG(EXTRA_RECORD_BYTES),
+                     MPFROMLONG(1));
     if (!pci) {
       free(pffb);
@@ -148 +149 @@
       DosError(FERR_DISABLEHARDERR);
     pci->rc.hptrIcon = hptrDir;
-    *pci->szDispAttr = 0;
     pci->attrFile = 0;
-    pci->pszSubject = xstrdup(NullStr, pszSrcFile, __LINE__);
+    pci->pszDispAttr = NullStr;
+    pci->pszSubject = NullStr;
   }
   else {
@@ -163 +164 @@
 
   if (strlen(pszFileName) < 4 || top)
-   pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
+    pci->pszFileName = xstrdup(pszFileName, pszSrcFile, __LINE__);
   else {
     p = strrchr(pszFileName, '\\');
@@ -170 +171 @@
     else
       p++;                              // After last backslash
-    // Handle quoted names?
+    // Handle quoted names
+    // fixme to understand this - why lose path prefix?
     sp = strchr(pszFileName, ' ') != NULL ? "\"" : NullStr;
-    pci->pszFileName = xmalloc(CCHMAXPATH, pszSrcFile, __LINE__);       // fixme to optimize alloc
-    pp = pci->pszFileName;
-    if (*sp) {
-      *pp = *sp;                        // Need quotes
-      pp++;
-      *pp = 0;
-    }
+    pp = szBuf;
+    if (*sp)
+      *pp++ = *sp;                      // Need quotes
     strcpy(pp, p);
     if (*sp)
       strcat(pp, sp);
-  }
-  pci->pszLongname = pci->pszFileName;
-  pci->rc.pszIcon = pci->pszLongname;
+    pci->pszFileName = xstrdup(szBuf, pszSrcFile, __LINE__);
+  }
+  // fixme to know why - it appears to be indirectly saving length, but why?
+  pci->pszDisplayName = pci->pszFileName + strlen(pci->pszFileName);
+  pci->pszLongname = pci->pszFileName;          // fixme to be sure?
+  pci->rc.pszIcon = pci->pszFileName;
   pci->rc.flRecordAttr |= CRA_RECORDREADONLY;
   if (fForceUpper)
@@ -196 +197 @@
   ri.pRecordParent = (PRECORDCORE) pciParent;
   ri.zOrder = (USHORT) CMA_TOP;
-  ri.cRecordsInsert = 1L;
+  ri.cRecordsInsert = 1;
   ri.fInvalidateRecord = TRUE;
   if (!WinSendMsg(hwndCnr, CM_INSERTRECORD, MPFROMP(pci), MPFROMP(&ri))) {
@@ -203 +204 @@
   }
   hdir = HDIR_CREATE;
-  nm = 1L;
+  nm = 1;
   rc = DosFindFirst(maskstr, &hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
@@ -216 +217 @@
       priority_normal();
       //printf("Found %lu\n",nm);
-      for (x = 0L; x < nm; x++) {
+      for (x = 0; x < nm; x++) {
         pffbFile = (FILEFINDBUF4 *) fb;
         //printf("%s\n",pffbFile->achName);
@@ -247 +248 @@
       if (*pchStopFlag)
         break;
-      DosSleep(0L);
-      nm = 1L;                          /* FilesToGet */
+      DosSleep(1);
+      nm = 1;                           /* FilesToGet */
       rc = DosFindNext(hdir, pffb, sizeof(FILEFINDBUF4), &nm);
     }                                   // while more found
@@ -276 +277 @@
 
     float fltPct = 0.0;
+    USHORT c;
     CHAR szCurDir[80];
     CHAR szSubDir[80];
@@ -301 +303 @@
         }
         // Need unique buffer 23 Jul 07 SHL
-        pci->pszLongname = xmalloc(2, pszSrcFile, __LINE__);
+        pci->pszLongname = xmalloc(2, pszSrcFile, __LINE__);
         pci->pszLongname[0] = 0;                // Make null string
         pci->pszLongname[1] = 1;                // Flag root - hack cough
@@ -323 +325 @@
     CommaFmtULL(szSubDir, sizeof(szSubDir), pci->easize, 'K');
     CommaFmtULL(szAllDir, sizeof(szAllDir), pci->cbFile + pci->easize, 'K');
-    pci->pszFileName = xrealloc(pci->pszFileName, strlen(pci->pszFileName) + 100,
+    c = pci->pszDisplayName - pci->pszFileName;
+    pci->pszFileName = xrealloc(pci->pszFileName,
+                                CCHMAXPATH,
                                 pszSrcFile,
                                 __LINE__);      // 23 Jul 07 SHL
-    sprintf(pci->pszFileName + strlen(pci->pszFileName),
+    sprintf(pci->pszFileName + c,
             "  %s + %s = %s (%.02lf%%%s)\r%s",
             szCurDir,
             szSubDir,
             szAllDir,
-            fltPct, isroot ? GetPString(IDS_OFDRIVETEXT) : NullStr, szBar);
+            fltPct,
+            isroot ? GetPString(IDS_OFDRIVETEXT) : NullStr,
+            szBar);
+    pci->pszFileName = xrealloc(pci->pszFileName,
+                                strlen(pci->pszFileName) + 1,
+                                pszSrcFile,
+                                __LINE__);      // 23 Jul 07 SHL
+    pci->pszDisplayName = pci->pszFileName + c;
     WinSendMsg(hwndCnr,
                CM_INVALIDATERECORD, MPFROMP(&pci), MPFROM2SHORT(1, 0));
@@ -377 +388 @@
                                                CMA_ITEMORDER));
       while (pci && (INT) pci != -1) {
-        DosSleep(0L);
+        DosSleep(1);
         PrintToFile(hwndCnr, indent + 1, pci, fp);
         pci = (PCNRITEM) WinSendMsg(hwndCnr, CM_QUERYRECORD, MPFROMP(pci),
@@ -462 +473 @@
       dirsize->pszFileName = pState->szDirName;
       dirsize->hwndCnr = WinWindowFromID(hwnd, DSZ_CNR);
-      if (_beginthread(FillCnrThread, NULL, 122880L * 5L, (PVOID) dirsize) ==
+      if (_beginthread(FillCnrThread, NULL, 122880L * 5, (PVOID)dirsize) ==
           -1) {
         Runtime_Error(pszSrcFile, __LINE__,
@@ -489 +500 @@
                         MPFROMP(&cnri), MPFROMLONG(sizeof(CNRINFO)));
       cnri.cyLineSpacing = 0;
-      cnri.cxTreeIndent = 12L;
+      cnri.cxTreeIndent = 12;
       cnri.flWindowAttr = CV_TREE | CV_FLOW | CA_TREELINE | CA_OWNERDRAW;
       WinSendDlgItemMsg(hwnd, DSZ_CNR, CM_SETCNRINFO, MPFROMP(&cnri),
@@ -760 +771 @@
             memset(szTemp, 0, sizeof(szTemp));
             strncpy(szTemp, pci->pszFileName,
-                    pci->pszFileName - pci->pszFileName);
+                    pci->pszDisplayName - pci->pszFileName);
             strrev(szTemp);
             if (*szFileName && *szTemp != '\\')
@@ -771 +782 @@
           strrev(szFileName);
           if (!fVTreeOpensWPS)
-            OpenDirCnr((HWND) 0,
-                       (hwndMain) ? hwndMain : HWND_DESKTOP,
-                       hwnd, FALSE, szFileName);
+            OpenDirCnr((HWND)0,
+                       hwndMain ? hwndMain : HWND_DESKTOP,
+                       hwnd,
+                       FALSE,
+                       szFileName);
           else {
 
@@ -908 +921 @@
     if (pState)
       pState->chStopFlag = (BYTE)0xff;
-    DosSleep(1L);
+    DosSleep(1);
     break;
 
@@ -917 +930 @@
       if (pState->hptr)
         WinDestroyPointer(pState->hptr);
-      DosSleep(33L);
+      DosSleep(33);
       free(pState);                     // Let's hope no one is still looking
     }