Changeset 165

Timestamp:

May 26, 2005, 4:43:02 AM (20 years ago)

Author:

root

Message:

Rework for FillInRecordFromFFB
Add CommaFmtULL CommaFmtUL

File:

• trunk/dll/fm3dll.h (modified) (9 diffs)

trunk/dll/fm3dll.h

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2005 Steven H.Levine
+  Copyright (c) 2001, 2005 Steven H. Levine
 
   12 Feb 03 SHL Add CBLIST_TO_EASIZE
@@ -16 +16 @@
   23 May 05 SHL Split datamin to datamin.h
   24 May 05 SHL Rework Win_Error usage
+  25 May 05 SHL Require VAC 3.65
+  25 May 05 SHL Rename comnam to szCommonName
+  25 May 05 SHL Rework for FillInRecordFromFFB
+  25 May 05 SHL Add CommaFmtULL CommaFmtUL
 
 ***********************************************************************/
+
+#if __IBMC__ != 430
+#error VAC365 required for long long support
+#endif
+
+#if !defined(_LONG_LONG)
+#error Long long support not enabled
+#endif
 
 #ifdef DEFINE_GLOBALS
@@ -334 +346 @@
   MINIRECORDCORE rc;                  /* Base information */
   HWND           hwndCnr;             /* The container holding this record */
-  PSZ            pszFileName;         /* Pointer to file name */
-  CHAR           szFileName[CCHMAXPATH]; /* File name */
-  CHAR           subject[40];         /* subject string */
-  CHAR          *pszSubject;          /* pointer to subject string */
-  CHAR          *pszDispAttr;         /* Pointer to attrib string */
+  PSZ            pszFileName;         // Points to szFileName  - required by CFA_STRING
+  CHAR           szFileName[CCHMAXPATH]; // Path name - fixme to rename
+  CHAR           szSubject[40];       /* Subject string */
+  CHAR          *pszSubject;          // Points szSubject - required by CFA_STRING
+  CHAR          *pszDispAttr;         // Points to szDispAttr - required by CFA_STRING
   CDATE          date;                /* Last write date of file */
   CTIME          time;                /* Last write time of file */
@@ -346 +358 @@
   CTIME          crtime;              /* Creation time of file */
   CHAR           szDispAttr[6];       /* Attrib string for details display */
-  CHAR          *pszLongname;
-  ULONG          cbFile;              /* File size */
-  ULONG          easize;              /* Size of EAs */
+  CHAR          *pszLongname;         // Points to szLongName - required by CFA_STRING
+  ULONGLONG      cbFile;              /* File size */
+  ULONGLONG      easize;              // Size of EAs - dirsize uses this - hack cough
   ULONG          attrFile;            /* Attributes of this file */
   ULONG          flags;
-  CHAR           Longname[1];
+  CHAR           szLongname[1];       // Holds .LONGNAME EA or root flag
 } CNRITEM, *PCNRITEM;
 
@@ -450 +462 @@
   CHAR      font[CCHMAXPATH];
   MASK      mask;
-  ULONG     totalbytes,selectedbytes,selectedfiles,totalfiles;
+  ULONGLONG ullTotalBytes;
+  ULONGLONG selectedbytes;
+  ULONG     selectedfiles;
+  ULONG     totalfiles;
   BOOL      cnremphasized;
   BOOL      dontclose;
@@ -472 +487 @@
   USHORT    shiftstate;
   USHORT    suspendview;
-  CHAR      comnam[CCHMAXPATH];
+  CHAR      szCommonName[CCHMAXPATH];
   ULONG     lasttime;
   BOOL      arcfilled;
@@ -527 +542 @@
 
 /* filldir.c */
-ULONG FillDirCnr   (HWND hwndCnr,CHAR *directory,DIRCNRDATA *dcd);
-ULONG FillTreeCnr  (HWND hwndCnr,HWND hwndParent);
-ULONG ProcessDirectory (const HWND hwndCnr, const PCNRITEM pciParent,
-                        const CHAR *szDirBase, const BOOL filestoo,
-                        const BOOL recurse,const BOOL partial,
-                        CHAR *stopflag,DIRCNRDATA *dcd,ULONG *foundany);
-ULONG FillInRecordFromFFB (HWND hwndCnr,PCNRITEM pci, const PSZ pszDirectory,
-                           const PFILEFINDBUF4 pffb,const BOOL partial,
-                           DIRCNRDATA *dcd);
-ULONG FillInRecordFromFSA (HWND hwndCnr,PCNRITEM pci,const PSZ pszFileName,
-                                   const PFILESTATUS4 pfsa4,
-                                   const BOOL partial,DIRCNRDATA *dcd);
-
+VOID FillDirCnr(HWND hwndCnr,CHAR *pszDirectory,DIRCNRDATA *pdcd,
+                PULONGLONG pullBytes);
+VOID FillTreeCnr(HWND hwndCnr,HWND hwndParent);
+VOID ProcessDirectory(const HWND hwndCnr, const PCNRITEM pciParent,
+                      const CHAR *szDirBase, const BOOL filestoo,
+                      const BOOL recurse,const BOOL partial,
+                      CHAR *stopflag,DIRCNRDATA *pdcd,
+                      PULONG pullTotalFiles,
+                      PULONGLONG pullTotalBytes);
+ULONGLONG FillInRecordFromFFB(HWND hwndCnr,PCNRITEM pci, const PSZ pszDirectory,
+                              const PFILEFINDBUF4 pffb,const BOOL partial,
+                              DIRCNRDATA *pdcd);
+ULONGLONG FillInRecordFromFSA (HWND hwndCnr,PCNRITEM pci,const PSZ pszFileName,
+                               const PFILESTATUS4 pfsa4,
+                               const BOOL partial,DIRCNRDATA *pdcd);
 
 /* flesh.c */
@@ -855 +872 @@
 VOID Deselect (HWND hwndCnr);
 VOID HideAll (HWND hwndCnr);
-VOID RemoveAll (HWND hwndCnr,ULONG *totalbytes,ULONG *totalfiles);
+VOID RemoveAll (HWND hwndCnr,ULONGLONG *ullTotalBytes,ULONG *totalfiles);
 VOID MarkAll (HWND hwndCnr,BOOL quitit,BOOL target,BOOL source);
 VOID SetMask (CHAR *str,MASK *mask);
@@ -1075 +1092 @@
 
 /* commafmt.c */
-size_t commafmt(char *buf,int bufsize,long N);
+size_t commafmt(PSZ pszBuf,UINT cBufSize,LONG lNumber);
+size_t CommaFmtUL(char *pszBuf,UINT cBufSize,ULONG ullNumber,
+                  CHAR chPreferred);
+size_t CommaFmtULL(char *pszBuf,UINT cBufSize,ULONGLONG ullNumber,
+                   CHAR chPreferred);
 
 /* autoview.c */