Changeset 155

Timestamp:

May 26, 2005, 4:17:45 AM (20 years ago)

Author:

root

Message:

Use ULONGLONG and CommaFmtULL
Rework for FillInRecordFromFFB

File:

• trunk/dll/collect.c (modified) (19 diffs)

trunk/dll/collect.c ¶

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2003, 2005 Steven H.Levine
+  Copyright (c) 2003, 2005 Steven H. Levine
 
   15 Oct 02 MK Baseline
@@ -14 +14 @@
   23 May 05 SHL Use QWL_USER
   24 May 05 SHL Rework Win_Error usage
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
+  25 May 05 SHL Rework for FillInRecordFromFFB
 
 ***********************************************************************/
@@ -21 +23 @@
 #define INCL_GPI
 #define INCL_DOSERRORS
-
+#define INCL_LONGLONG
 #include <os2.h>
+
 #include <stdarg.h>
 #include <stdio.h>
@@ -31 +34 @@
 #include <share.h>
 #include <limits.h>
+
 #include "fm3dll.h"
 #include "fm3dlg.h"
@@ -53 +57 @@
 MRESULT EXPENTRY CollectorTextProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
 {
+  LONGLONG ullBytes;
+
   static BOOL   emphasized      = FALSE;
   static HWND   hwndButtonPopup = (HWND)0;
@@ -588 +594 @@
         RECORDINSERT ri;
         ULONG        ulMaxFiles;
-        ULONG        totalbytes;
+        ULONGLONG    ullTotalBytes;
         CHAR         fullname[CCHMAXPATH];
 
@@ -629 +635 @@
                 priority_normal();
                 *fb4.achName = 0;
-                totalbytes = FillInRecordFromFFB(dcd->hwndCnr,pci,
-                                                 fullname,
-                                                 &fb4,FALSE,
-                                                 dcd);
-                if (totalbytes != -1) {
-                  dcd->totalbytes += totalbytes;
-                  if (dcd->totalbytes == -1)
-                    dcd->totalbytes--;          // fixme for real someday
-                }
+                ullTotalBytes = FillInRecordFromFFB(dcd->hwndCnr,
+                                                    pci,
+                                                    fullname,
+                                                    &fb4,
+                                                    FALSE,
+                                                    dcd);
+                dcd->ullTotalBytes += ullTotalBytes;
                 pciP = pci;
                 pci = (PCNRITEM)pci->rc.preccNextRecord;
@@ -733 +737 @@
                                MPFROMLONG(EXTRA_RECORD_BYTES),
                                MPFROMLONG(1L));
-              if(pci) {
-                dcd->totalbytes += FillInRecordFromFSA(dcd->hwndCnr,pci,
+              if (pci)
+              {
+                dcd->ullTotalBytes += FillInRecordFromFSA(dcd->hwndCnr,pci,
                                                        fullname,
                                                        &fs4,FALSE,dcd);
@@ -954 +959 @@
 
 
-MRESULT EXPENTRY CollectorCnrWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY CollectorCnrWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd,QWL_USER);
   INT         tempsortFlags;
@@ -1000 +1005 @@
           case '\n':
             dcd->lasttime = 0;
-            *dcd->comnam = 0;
+            *dcd->szCommonName = 0;
             break;
           default:
             thistime = WinQueryMsgTime(WinQueryAnchorBlock(hwnd));
             if(thistime > dcd->lasttime + 1250)
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
             dcd->lasttime = thistime;
-            if(SHORT1FROMMP(mp2) == ' ' && !dcd->comnam)
+            if(SHORT1FROMMP(mp2) == ' ' && !dcd->szCommonName)
               break;
 KbdRetry:
-            len = strlen(dcd->comnam);
+            len = strlen(dcd->szCommonName);
             if(len >= CCHMAXPATH - 1) {
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
               len = 0;
             }
-            dcd->comnam[len] = toupper(SHORT1FROMMP(mp2));
-            dcd->comnam[len + 1] = 0;
+            dcd->szCommonName[len] = toupper(SHORT1FROMMP(mp2));
+            dcd->szCommonName[len + 1] = 0;
             memset(&srch,0,sizeof(SEARCHSTRING));
             srch.cb = (ULONG)sizeof(SEARCHSTRING);
-            srch.pszSearch = (PSZ)dcd->comnam;
+            srch.pszSearch = (PSZ)dcd->szCommonName;
             srch.fsPrefix = TRUE;
             srch.fsCaseSensitive = FALSE;
@@ -1030 +1035 @@
 
               /* make found item current item */
-              if(!stricmp(pci->pszFileName,dcd->comnam))
+              if(!stricmp(pci->pszFileName,dcd->szCommonName))
                 attrib |= CRA_SELECTED;
               WinSendMsg(hwnd,CM_SETRECORDEMPHASIS,MPFROMP(pci),
@@ -1040 +1045 @@
             else {
               if(SHORT1FROMMP(mp2) == ' ') {
-                dcd->comnam[len] = 0;
+                dcd->szCommonName[len] = 0;
                 break;
               }
-              *dcd->comnam = 0;
+              *dcd->szCommonName = 0;
               dcd->lasttime = 0;
               if(len)           // retry as first letter if no match
@@ -1166 +1171 @@
         dcd->totalfiles = cnri.cRecords;
         commafmt(tf,sizeof(tf),dcd->totalfiles);
-        if(dcd->totalbytes > 1024)
-          commafmt(tb,sizeof(tb),dcd->totalbytes / 1024L);
-        else
-          commafmt(tb,sizeof(tb),dcd->totalbytes);
-        sprintf(s,"%s / %s%s",tf,tb,(dcd->totalbytes > 1024) ? "k" : "b");
+        CommaFmtULL(tb,sizeof(tb),dcd->ullTotalBytes,' ');
+        sprintf(s,"%s / %s",tf,tb);
         WinSetDlgItemText(dcd->hwndClient,DIR_TOTALS,s);
+
         commafmt(tf,sizeof(tf),dcd->selectedfiles);
-        if(dcd->selectedbytes > 1024)
-          commafmt(tb,sizeof(tb),dcd->selectedbytes / 1024L);
-        else
-          commafmt(tb,sizeof(tb),dcd->selectedbytes);
-        sprintf(s,"%s / %s%s",tf,tb,(dcd->selectedbytes > 1024) ? "k" : "b");
+        CommaFmtULL(tb,sizeof(tb),dcd->selectedbytes,' ');
+        sprintf(s,"%s / %s",tf,tb);
         WinSetDlgItemText(dcd->hwndClient,DIR_SELECTED,s);
+
         if(hwndStatus &&
            dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent)) {
@@ -1222 +1223 @@
                   p = pci->pszFileName;
               }
-              commafmt(tb,sizeof(tb),pci->cbFile + pci->easize);
+              CommaFmtULL(tb,sizeof(tb),pci->cbFile + pci->easize,' ');
               if(!fMoreButtons)
-                sprintf(s," %sb  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+              {
+                sprintf(s," %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                         tb,pci->date.year,pci->date.month,
                         pci->date.day,pci->time.hours,pci->time.minutes,
                         pci->time.seconds,pci->pszDispAttr,p);
-              else {
-                *tf = 0;
+              }
+              else
+              {
                 if(pci->cbFile + pci->easize > 1024)
-                  commafmt(tf,sizeof(tf),
-                           (pci->cbFile + pci->easize) / 1024);
+                  CommaFmtULL(tf,sizeof(tf),pci->cbFile + pci->easize, 'K');
+                else
+                  *tf = 0;
                 sprintf(s,GetPString(IDS_STATUSSIZETEXT),
                         tb,
-                        (*tf) ? " (" : NullStr,
+                        *tf ? " (" : NullStr,
                         tf,
-                        (*tf) ? "k)" : NullStr);
+                        *tf ? ")" : NullStr);
               }
               WinSetWindowText(hwndStatus2,s);
@@ -1755 +1759 @@
             dcd->suspendview = 1;
             RemoveAll(hwnd,
-                      &dcd->totalbytes,
+                      &dcd->ullTotalBytes,
                       &dcd->totalfiles);
             dcd->suspendview = 0;
@@ -1778 +1782 @@
                            MPVOID,
                            MPFROM2SHORT(0,CMA_FREE | CMA_INVALIDATE));
-                dcd->totalbytes = dcd->selectedbytes = dcd->selectedfiles =
+                dcd->ullTotalBytes = dcd->selectedbytes = dcd->selectedfiles =
                   dcd->totalfiles = 0L;
                 PostMsg(hwnd,
@@ -2569 +2573 @@
                   dcd->selectedfiles--;
                 }
-                if(!dcd->suspendview) {
+                if(!dcd->suspendview)
+                {
                   commafmt(tf,sizeof(tf),dcd->selectedfiles);
-                  if(dcd->selectedbytes > 1024)
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes / 1024L);
-                  else
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes);
-                  sprintf(s,"%s / %s%s",tf,tb,
-                          (dcd->selectedbytes > 1024) ? "k" : "b");
+                  CommaFmtULL(tb,sizeof(tb),dcd->selectedbytes,' ');
+                  sprintf(s,"%s / %s",tf,tb);
                   WinSetDlgItemText(dcd->hwndClient,DIR_SELECTED,s);
                 }
@@ -2599 +2600 @@
                           p = pci->pszFileName;
                       }
-                      commafmt(tb,sizeof(tb),pci->cbFile + pci->easize);
+                      CommaFmtULL(tb,sizeof(tb),pci->cbFile + pci->easize,' ');
                       if(!fMoreButtons)
-                        sprintf(s," %sb  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
+                        sprintf(s," %s  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                                 tb,pci->date.year,
                                 pci->date.month,pci->date.day,pci->time.hours,
                                 pci->time.minutes,pci->time.seconds,
                                 pci->pszDispAttr,p);
-                      else {
-                        *tf = 0;
-                        if(pci->cbFile + pci->easize > 1024)
-                          commafmt(tf,sizeof(tf),
-                                   (pci->cbFile + pci->easize) / 1024);
+                      else
+                      {
+                        if (pci->cbFile + pci->easize > 1024)
+                          CommaFmtULL(tf,sizeof(tf),pci->cbFile + pci->easize, ' ');
+                        else
+                          *tf = 0;
                         sprintf(s,GetPString(IDS_STATUSSIZETEXT),
                                 tb,
-                                (*tf) ? " (" : NullStr,
+                                *tf ? " (" : NullStr,
                                 tf,
-                                (*tf) ? "k)" : NullStr);
+                                *tf ? ")" : NullStr);
                       }
                       WinSetWindowText(hwndStatus2,s);
@@ -2778 +2780 @@
 
 
-HWND StartCollector (HWND hwndParent,INT flags) {
-
+HWND StartCollector (HWND hwndParent,INT flags)
+{
   HWND          hwndFrame = (HWND)0,hwndClient;
   ULONG         FrameFlags = FCF_TITLEBAR   | FCF_SYSMENU     |