Changeset 751 for trunk/dll/fm3dll.h


Ignore:
Timestamp:
Aug 2, 2007, 11:05:48 PM (13 years ago)
Author:
Steven Levine
Message:

Sync rest of code with CNRITEM mods
Sync code with ARCITEM mods
Get compare dialog working
Still some issues with status display
Still some issues with directory sizes tree display
Heap check diagnostic code mostly enabled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/fm3dll.h

    r748 r751  
    5353  22 Jul 07 GKY Update CNRITEM to optimize RAM usage
    5454  23 Jul 07 SHL More CNRITEM updates (ticket#24)
     55  01 Aug 07 SHL More CNRITEM and ARCITEM updates (ticket#24)
    5556
    5657***********************************************************************/
     
    155156#define CONTAINER_COLUMNS       13      /* Number of columns in details view */
    156157#define RGBFROMPARTS(r,g,b)     (((r) * 65536) + ((g) * 256) + (b))
    157 #define EXTRA_RECORD_BYTES2     (sizeof(CNRITEM) - sizeof(MINIRECORDCORE))
    158 #define EXTRA_RECORD_BYTES      (EXTRA_RECORD_BYTES2 + (CCHMAXPATHCOMP - 1))
     158
     159#define EXTRA_RECORD_BYTES      (sizeof(CNRITEM) - sizeof(MINIRECORDCORE))
    159160#define EXTRA_ARCRECORD_BYTES   (sizeof(ARCITEM) - sizeof(MINIRECORDCORE))
     161
    160162#define ALLATTRS                (FILE_NORMAL | FILE_DIRECTORY | FILE_ARCHIVED |\
    161163                                 FILE_HIDDEN | FILE_READONLY | FILE_SYSTEM)
     
    407409  MINIRECORDCORE rc;            /* Base information */
    408410  HWND hwndCnr;                 /* The container holding this record */
    409   PSZ pszFileName;              // Points to buffer holding full pathname
     411  PSZ pszFileName;              // Points to buffer holding full pathname or NullStr
    410412  PSZ pszDisplayName;           // Points to displayable part of path name  - used by CFA_STRING
    411   //CHAR szFileName[CCHMAXPATH];        // Path name - fixme to rename to szPathName?
    412   //CHAR szSubject[40];         /* Subject string */
    413   CHAR *pszSubject;             // Points subject buffer - used by fm/2 and by CFA_STRING
     413  CHAR *pszSubject;             // Points subject buffer or Nullstr - used by fm/2 and by CFA_STRING
    414414  CHAR *pszDispAttr;            // Points to szDispAttr - required by CFA_STRING
    415415  CDATE date;                   /* Last write date of file */
     
    419419  CDATE crdate;                 /* Creation date of file */
    420420  CTIME crtime;                 /* Creation time of file */
    421   CHAR szDispAttr[6];           /* Attrib string for details display */
    422421  CHAR *pszLongname;            // Points to long name buffer - used by code and by CFA_STRING
    423422  ULONGLONG cbFile;             /* File size */
     
    425424  ULONG attrFile;               /* Attributes of this file */
    426425  ULONG flags;
    427   //CHAR szLongname[1];         // Holds .LONGNAME EA or root flag
    428426}
    429427CNRITEM, *PCNRITEM;
     
    433431  MINIRECORDCORE rc;            // Base information
    434432  HWND hwndCnr;                 /* Container holding this record */
    435   PSZ pszFileName;              // Pointer to full path name
     433  PSZ pszFileName;              // Points to full path name or NullStr
    436434  PSZ pszDisplayName;           // Points to displayable part of path name  - used by CFA_STRING
    437   // CHAR szFileName[CCHMAXPATH];       // File name
    438435  CHAR szDate[40];              // File's assembled date
    439436  PSZ pszDate;                  // Pointer to date
     
    626623/* filldir.c */
    627624VOID EmptyCnr(HWND hwnd);
     625const PSZ FileAttrToString(ULONG fileAttr);
    628626VOID FillDirCnr(HWND hwndCnr, CHAR *pszDirectory, DIRCNRDATA *pdcd,
    629627                PULONGLONG pullBytes);
     
    641639                              const PSZ pszFileName, const PFILESTATUS4 pfsa4,
    642640                              const BOOL partial, DIRCNRDATA *pdcd);
    643 VOID FreeCnrItem(HWND hwnd, PCNRITEM pci);
     641INT FreeCnrItem(HWND hwnd, PCNRITEM pci);
     642VOID FreeCnrItemList(HWND hwnd, PCNRITEM pciFirst);
    644643VOID FreeCnrItemData(PCNRITEM pci);
    645 VOID RemoveCnrItems(HWND hwnd, PCNRITEM pci, USHORT usCnt, USHORT usFlags);
     644INT RemoveCnrItems(HWND hwnd, PCNRITEM pci, USHORT usCnt, USHORT usFlags);
    646645
    647646/* flesh.c */
Note: See TracChangeset for help on using the changeset viewer.