Changeset 897 for trunk/dll/info.c

Timestamp:

Dec 31, 2007, 12:34:00 AM (18 years ago)

Author:

Gregg Young

Message:

Use CommaFmtULL for additional file, EA etc sizes display; Modify/Create TestFDates & TestCDates for comparing/sorting files or CNRITEMS by date/time.

File:

• trunk/dll/info.c (modified) (3 diffs)

trunk/dll/info.c

@@ -23 +23 @@
   25 Aug 07 SHL IconProc: do not use freed memory - random bad things happen
   27 Sep 07 SHL Correct ULONGLONG size formatting
+  30 Dec 07 GKY Use CommaFmtULL
 
 ***********************************************************************/
@@ -624 +625 @@
     if (pfs && *pfs->szFileName) {
       CHAR s[97];
+      CHAR szCmmaFmtFileSize[81], szCmmaFmtEASize[81];
+      CHAR szCmmaFmtFileEASize[81], szCmmaFmtFileEASizeK[81];
       FILEFINDBUF4L fs;
       HDIR hdir = HDIR_CREATE;
@@ -693 +696 @@
           WinSetDlgItemText(hwnd, FLE_LASTACCESS, s);
         }
-        // 27 Sep 07 SHL fixme to use CommaFmtULL
-        // 27 Sep 07 SHL fixme to not format numbers in IDS_SIZEINCLEASTEXT
+        CommaFmtULL(szCmmaFmtFileSize,
+                    sizeof(szCmmaFmtFileSize), fs.cbFile, ' ');
+        CommaFmtULL(szCmmaFmtEASize,
+                    sizeof(szCmmaFmtEASize), CBLIST_TO_EASIZE(fs.cbList), ' ');
+        CommaFmtULL(szCmmaFmtFileEASize,
+                    sizeof(szCmmaFmtFileEASize),
+                    fs.cbFile + CBLIST_TO_EASIZE(fs.cbList),
+                    ' ');
+        CommaFmtULL(szCmmaFmtFileEASizeK,
+                    sizeof(szCmmaFmtFileEASizeK),
+                    fs.cbFile + CBLIST_TO_EASIZE(fs.cbList),
+                    'K');
         sprintf(s,
                 GetPString(IDS_SIZEINCLEASTEXT),
-                fs.cbFile,
-                CBLIST_TO_EASIZE(fs.cbList),
-                fs.cbFile + CBLIST_TO_EASIZE(fs.cbList),
-                (ULONG)((fs.cbFile + CBLIST_TO_EASIZE(fs.cbList)) / 1024));
+                szCmmaFmtFileSize,
+                szCmmaFmtEASize,
+                szCmmaFmtFileEASize,
+                szCmmaFmtFileEASizeK);
         WinSetDlgItemText(hwnd, FLE_SIZES, s);
-        // 27 Sep 07 SHL fixme to use CommaFmtULL
-        sprintf(s, "%llub", fs.cbFileAlloc - fs.cbFile);
+        CommaFmtULL(szCmmaFmtFileSize,
+                    sizeof(szCmmaFmtFileSize), fs.cbFileAlloc - fs.cbFile, ' ');
+        sprintf(s, "%s", szCmmaFmtFileSize);
         WinSetDlgItemText(hwnd, FLE_SLACK, s);
         WinCheckButton(hwnd,