Changeset 856

Timestamp:

Nov 4, 2007, 6:01:11 PM (17 years ago)

Author:

Gregg Young

Message:

Use CommaFmtULL to display large file sizes (Ticket 41). Remove autoset of to no large file support.

Location:

trunk/dll

Files:

• filldir.c (modified) (3 diffs)
• fm3dll.h (modified) (2 diffs)
• init.c (modified) (1 diff)
• misc.c (modified) (2 diffs)

trunk/dll/filldir.c ¶

@@ -39 +39 @@
   13 Aug 07 SHL Sync code with other FilesToGet usage and optimize
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
+  04 Nov 07 GKY Use commaFmtULL to display large file sizes
 
 ***********************************************************************/
@@ -424 +425 @@
   pci->pszDisplayName = p;
 
+  //comma format the file size for large file support
+  if(!fNoLargeFileSupport){
+  CHAR szBuf[30];
+    CommaFmtULL(szBuf, sizeof(szBuf), pffb->cbFile, ' ');
+    pci->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
+  }
+
   // now fill the darned thing in...
   pci->date.day = pffb->fdateLastWrite.day;
@@ -637 +645 @@
   pci->pszDisplayName = p;
 
+  //comma format the file size for large file support
+
+  if(!fNoLargeFileSupport){
+    CHAR szBuf[30];
+    CommaFmtULL(szBuf, sizeof(szBuf), pfsa4->cbFile, ' ');
+    pci->pszFmtFileSize = xstrdup(szBuf, pszSrcFile, __LINE__);
+  }
   pci->date.day = pfsa4->fdateLastWrite.day;
   pci->date.month = pfsa4->fdateLastWrite.month;

trunk/dll/fm3dll.h ¶

@@ -62 +62 @@
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the right to the left pane
   01 Sep 07 GKY Add xDosSetPathInfo to fix case where FS3 buffer crosses 64k boundary
+  04 Nov 07 GKY Add pszFmtFileSize to CNRITEM to display large file sizes
 
 ***********************************************************************/
@@ -429 +430 @@
   CTIME crtime;                 /* Creation time of file */
   CHAR *pszLongName;            // Points to long name buffer - used by code and by CFA_STRING
+  CHAR *pszFmtFileSize;         // Comma formatted file size for large file support
   ULONGLONG cbFile;             /* File size */
   ULONGLONG easize;             // Size of EAs - dirsize uses this - hack cough

trunk/dll/init.c ¶

@@ -924 +924 @@
     fSaveMiniCmds = fUserComboBox = fFM2Deletes = fConfirmTarget =
     fShowTarget = fDrivebarHelp = fCheckMM = TRUE;
-#if 1 // 06 Oct 07 SHL fixme to be gone after wrapper testing finished
+#if 0 // 06 Oct 07 SHL fixme to be gone after wrapper testing finished
     fNoLargeFileSupport = TRUE;
 #endif

trunk/dll/misc.c ¶

@@ -503 +503 @@
 
     pfi = pfi->pNextFieldInfo;
+
     pfi->flData = CFA_STRING | CFA_LEFT | CFA_SEPARATOR;
     pfi->flTitle = CFA_LEFT;
@@ -552 +553 @@
     // Fill in column information for the file size
 
-    pfi = pfi->pNextFieldInfo;
-    pfi->flData = CFA_ULONG | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
-    pfi->flTitle = CFA_CENTER;
-    pfi->pTitleData = GetPString(IDS_SIZE);
-    pfi->offStruct = FIELDOFFSET(CNRITEM, cbFile);
+    if(fNoLargeFileSupport) {
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_ULONG | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
+      pfi->flTitle = CFA_CENTER;
+      pfi->pTitleData = GetPString(IDS_SIZE);
+      pfi->offStruct = FIELDOFFSET(CNRITEM, cbFile);
+    }
+    else {
+      pfi = pfi->pNextFieldInfo;
+      pfi->flData = CFA_STRING | CFA_RIGHT | CFA_SEPARATOR | CFA_FIREADONLY;
+      pfi->flTitle = CFA_CENTER;
+      pfi->pTitleData = GetPString(IDS_SIZE);
+      pfi->offStruct = FIELDOFFSET(CNRITEM, pszFmtFileSize);
+    }
 
     // Fill in the column information for the file's ea size