Changeset 1915 for trunk/dll/comp.c

Timestamp:

Nov 1, 2025, 7:27:49 PM (44 hours ago)

Author:

Gregg Young

Message:

Improve readability of insert_filename (use 0,1,2 instead of FALSE, TRUE,2 for loadit). Fix it so pszIDrive is only set from lastfilename if filename is NULL.

File:

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

trunk/dll/comp.c

@@ -153 +153 @@
 #include "worker.h"                     // MOVEIT
 #include "rename.h"                     // RenameProc
+#include "eas.h"                        // GetLargeEASize
 
 #ifdef PMPRINTF
@@ -216 +217 @@
                     pffb->ftimeLastWrite.minutes,
                     pffb->ftimeLastWrite.twosecs,
-                    pffb->attrFile,
-                    pffb->cbList > 4 ? pffb->cbList / 2 : 0);
+                    pffb->attrFile,
+                    pffb->cbList == 65535 ? GetLargeEASize(pffb->achName) : CBLIST_TO_EASIZE(pffb->cbList));
           }
           // Skip . and ..
@@ -1839 +1840 @@
                                       p = strchr(p, ',');
                                       if (p) {
-                                        p++;
-                                        fb4.cbList = atol(p) * 2;
+                                        p++;
+                                        //Since cbList is a ulong and will always be even the fact they can exceed
+                                        //65535 doesn't matter. 31 Oct 25 GKY
+                                        fb4.cbList = atol(p) * 2;
                                         if (fForceUpper)
                                           strupr(str + 1);
@@ -2426 +2429 @@
 
         strcpy(fullname, PCSZ_STARDOTPMD);
-        if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
+        if (insert_filename(HWND_DESKTOP, fullname, 1, FALSE) &&
             *fullname && !strchr(fullname, '*') && !strchr(fullname, '?'))
           strcpy(cmp->rightlist, fullname);
@@ -3219 +3222 @@
 
         strcpy(fullname, PCSZ_STARDOTPMD);
-        if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
+        if (insert_filename(HWND_DESKTOP, fullname, 1, FALSE) &&
             *fullname && !strchr(fullname, '*') && !strchr(fullname, '?')) {
           strcpy(cmp->rightlist, fullname);
@@ -3287 +3290 @@
 
             strcpy(fullname, PCSZ_STARDOTPMD);
-            if (insert_filename(HWND_DESKTOP, fullname, TRUE, FALSE) &&
+            if (insert_filename(HWND_DESKTOP, fullname, 1, FALSE) &&
                 *fullname && !strchr(fullname, '*') && !strchr(fullname, '?'))
               strcpy(cmp->rightlist, fullname);