Changeset 150

Timestamp:

May 26, 2005, 3:58:27 AM (20 years ago)

Author:

root

Message:

Comments

File:

• trunk/dll/dircnrs.c (modified) (18 diffs)

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H.Levine
+  Copyright (c) 2001, 2005 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -13 +13 @@
   23 May 05 SHL Use QWL_USER
   24 May 05 SHL Rework Win_Error usage
+  25 May 05 SHL Use ULONGLONG and CommaFmtULL
 
 ***********************************************************************/
@@ -20 +21 @@
 #define INCL_GPI
 #define INCL_DOSERRORS
+#define INCL_LONGLONG
 
 #include <os2.h>
@@ -630 +632 @@
 
 
-MRESULT EXPENTRY DirObjWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY DirObjWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   DIRCNRDATA *dcd;
 
@@ -699 +701 @@
 
         FSALLOCATE fsa;
-        CHAR       s[CCHMAXPATH * 2],tf[81],tb[81],fbytes[81];
+        CHAR       s[CCHMAXPATH * 2],tf[81],tb[81],szBuf[81];
 
         DosError(FERR_DISABLEHARDERR);
         if(!DosQueryFSInfo(toupper(*dcd->directory) - '@',
            FSIL_ALLOC,&fsa,sizeof(FSALLOCATE))) {
-          strcpy(fbytes,"  {");
-          commafmt(fbytes + 3,sizeof(fbytes) - 5,
-                   (ULONG)(((float)fsa.cUnitAvail *
-                     (fsa.cSectorUnit * fsa.cbSector)) / 1024L));
-          strcat(fbytes,GetPString(IDS_KFREETEXT));
-          strcat(fbytes,"}");
+          strcpy(szBuf,"  {");
+          CommaFmtULL(szBuf + 3,sizeof(szBuf) - 5,
+                      (ULONGLONG)fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector),
+                      'K');
+          strcat(szBuf,GetPString(IDS_KFREETEXT));
+          strcat(szBuf,"}");
         }
         else
-          *fbytes = 0;
+          *szBuf = 0;
         commafmt(tf,sizeof(tf),dcd->totalfiles);
-        commafmt(tb,sizeof(tb),dcd->totalbytes);
+        CommaFmtULL(tb,sizeof(tb),dcd->ullTotalBytes,' ');
         if(!fMoreButtons)
           sprintf(s," [%s / %sb]%s%s%s%s %s",tf,tb,
-                  fbytes,
+                  szBuf,
                   (*dcd->mask.szMask || dcd->mask.antiattr ||
                    dcd->mask.attrFile != ALLATTRS) ? "  (" : NullStr,
@@ -728 +730 @@
                   dcd->directory);
         else
-          sprintf(s," [%s / %sb]%s %s",tf,tb,fbytes,
+          sprintf(s," [%s / %sb]%s %s",tf,tb,szBuf,
                   dcd->directory);
         if(dcd->hwndFrame == WinQueryActiveWindow(dcd->hwndParent))
@@ -810 +812 @@
                                dcd->directory,
                                dcd);
-        dcd->totalbytes = dcd->totalfiles =
+        dcd->ullTotalBytes = dcd->totalfiles =
           dcd->selectedfiles = dcd->selectedbytes = 0;
         WinSetDlgItemText(dcd->hwndClient,
@@ -844 +846 @@
         }
         dcd->firsttree = FALSE;
-        dcd->totalbytes = FillDirCnr(dcd->hwndCnr,
-                                     dcd->directory,
-                                     dcd);
+        // fixme to check errors
+        FillDirCnr(dcd->hwndCnr,
+                   dcd->directory,
+                   dcd,
+                   &dcd->ullTotalBytes);
         PostMsg(dcd->hwndCnr,
                 UM_RESCAN,
@@ -1258 +1262 @@
           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;
@@ -1288 +1292 @@
 
               /* 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),
@@ -1298 +1302 @@
             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
@@ -1505 +1509 @@
         dcd->totalfiles = cnri.cRecords;
         commafmt(tb,sizeof(tb),dcd->totalfiles);
-        if(dcd->totalbytes < 1024)
-          commafmt(tf,sizeof(tf),dcd->totalbytes);
-        else
-          commafmt(tf,sizeof(tf),dcd->totalbytes / 1024L);
-        sprintf(s,"%s / %s%s",tb,tf,(dcd->totalbytes < 1024) ? "b" : "k");
+        CommaFmtULL(tf,sizeof(tf),dcd->ullTotalBytes,'K');
+        sprintf(s,"%s / %s",tb,tf);
         WinSetDlgItemText(dcd->hwndClient,DIR_TOTALS,s);
         commafmt(tb,sizeof(tb),dcd->selectedfiles);
-        if(dcd->selectedbytes < 1024)
-          commafmt(tf,sizeof(tf),dcd->selectedbytes);
-        else
-          commafmt(tf,sizeof(tf),dcd->selectedbytes / 1024L);
-        sprintf(s,"%s / %s%s",tb,tf,(dcd->selectedbytes < 1024) ? "b" : "k");
+        CommaFmtULL(tf,sizeof(tf),dcd->selectedbytes,'K');
+        sprintf(s,"%s / %s",tb,tf);
         WinSetDlgItemText(dcd->hwndClient,DIR_SELECTED,s);
         if(hwndStatus &&
@@ -1531 +1529 @@
                              MPFROMLONG(CMA_FIRST),
                              MPFROMSHORT(CRA_CURSORED));
-            if(pci && (INT)pci != -1) {
-              if(fSplitStatus &&
-                 hwndStatus2) {
-                commafmt(tb,sizeof(tb),pci->cbFile + pci->easize);
+            if(pci && (INT)pci != -1)
+            {
+              if(fSplitStatus && hwndStatus2)
+              {
+                CommaFmtULL(tb,sizeof(tb),pci->cbFile + pci->easize,' ');
                 if(!fMoreButtons)
                   sprintf(s,
@@ -1549 +1548 @@
                 else {
                   *tf = 0;
-                  if(pci->cbFile + pci->easize > 1024)
-                    commafmt(tf,sizeof(tf),
-                             (pci->cbFile + pci->easize) / 1024);
+                  if (pci->cbFile + pci->easize > 1024)
+                  {
+                    CommaFmtULL(tf,sizeof(tf),
+                                pci->cbFile + pci->easize,'K');
+                  }
                   sprintf(s,
                           GetPString(IDS_STATUSSIZETEXT),
                           tb,
-                          (*tf) ? " (" : NullStr,
+                          *tf ? " (" : NullStr,
                           tf,
-                          (*tf) ? "k)" : NullStr);
+                          *tf ? ")" : NullStr);
                 }
                 WinSetWindowText(hwndStatus2,s);
@@ -3439 +3440 @@
               PNOTIFYRECORDEMPHASIS pre = mp2;
               PCNRITEM              pci;
-              CHAR                  s[CCHMAXPATHCOMP + 91],tb[81],tf[81],
-                                    *tbk;
+              CHAR                  s[CCHMAXPATHCOMP + 91],tb[81],tf[81];
 
               pci = (PCNRITEM)((pre) ? pre->pRecord : NULL);
@@ -3467 +3467 @@
                   dcd->selectedfiles--;
                 }
-                if(!dcd->suspendview) {
+                if(!dcd->suspendview)
+                {
                   commafmt(tf,sizeof(tf),dcd->selectedfiles);
-                  if(dcd->selectedbytes > 1024) {
-                    tbk = "k";
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes / 1024L);
-                  }
-                  else {
-                    tbk = "b";
-                    commafmt(tb,sizeof(tb),dcd->selectedbytes);
-                  }
-                  sprintf(s,"%s / %s%s",tf,tb,tbk);
+                  CommaFmtULL(tb,sizeof(tb),dcd->selectedbytes,'K');
+                  sprintf(s,"%s / %s",tf,tb);
                   WinSetDlgItemText(dcd->hwndClient,DIR_SELECTED,s);
                 }
@@ -3500 +3494 @@
                 if(pre->fEmphasisMask & CRA_CURSORED) {
                   if(pci->rc.flRecordAttr & CRA_CURSORED) {
-                    if(fSplitStatus && hwndStatus2) {
-                      commafmt(tb,sizeof(tb),pci->cbFile + pci->easize);
+                    if(fSplitStatus && hwndStatus2)
+                    {
+                      CommaFmtULL(tb,sizeof(tb),pci->cbFile + pci->easize,' ');
                       if(!fMoreButtons)
+                      {
                         sprintf(s," %sb  %04u/%02u/%02u %02u:%02u:%02u  [%s]  %s",
                                 tb,pci->date.year,
@@ -3508 +3504 @@
                                 pci->time.minutes,pci->time.seconds,
                                 pci->pszDispAttr,pci->pszFileName);
+                      }
                       else {
                         *tf = 0;
                         if(pci->cbFile + pci->easize > 1024)
-                          commafmt(tf,sizeof(tf),
-                                   (pci->cbFile + pci->easize) / 1024);
+                        {
+                          CommaFmtULL(tf,sizeof(tf),
+                                      pci->cbFile + pci->easize,'K');
+                        }
                         sprintf(s,GetPString(IDS_STATUSSIZETEXT),
                                 tb,
-                                (*tf) ? " (" : NullStr,
+                                *tf ? " (" : NullStr,
                                 tf,
-                                (*tf) ? "k)" : NullStr);
+                                *tf ? ")" : NullStr);
                       }
                       WinSetWindowText(hwndStatus2,s);