Changeset 737
Legend:
- Unmodified
- Added
- Removed
-
trunk/dll/filldir.c
r731 r737 31 31 20 Mar 07 GKY Increase extention check to 4 letters for icon selections 32 32 23 Jun 07 GKY Fixed ram disk without a directory not appearing on states drive list 33 23 Jul 07 SHL Sync with CNRITEM updates (ticket#24) 33 34 34 35 ***********************************************************************/ … … 168 169 const PFILEFINDBUF4 pffb, 169 170 const BOOL partial, 170 DIRCNRDATA * 171 DIRCNRDATA *dcd) 171 172 { 172 173 /* fill in a container record from a FILEFINDBUF4 structure */ … … 180 181 pci->hwndCnr = hwndCnr; 181 182 182 // 23 Jul 07 SHL fixme to optimize183 pci->pszFileName = xstrdup(pszDirectory, pszSrcFile, __LINE__);184 183 /* note that we cheat below, and accept the full pathname in pszDirectory 185 184 if !*pffb->achName. This speeds up and simplifies processing elsewhere … … 341 340 } 342 341 343 / * decide where to point for the container's title text */342 // Tell container what part of pathname to display 344 343 if (partial) { 345 344 p = strrchr(pci->pszFileName, '\\'); … … 360 359 else 361 360 p = pci->pszFileName; 361 pci->pszDisplayName = p; 362 362 363 /* now fill the darned thing in... */ 363 // fixme to have secondary pointer that points to real buffer 23 Jul 07 SHL364 pci->pszFileName = p;365 364 pci->date.day = pffb->fdateLastWrite.day; 366 365 pci->date.month = pffb->fdateLastWrite.month; … … 565 564 } 566 565 566 // Tell container what part of pathname to display 567 567 if (partial) { 568 568 p = strrchr(pci->pszFileName, '\\'); … … 582 582 else 583 583 p = pci->pszFileName; 584 pci->pszFileName = p; 584 pci->pszDisplayName = p; 585 585 586 pci->date.day = pfsa4->fdateLastWrite.day; 586 587 pci->date.month = pfsa4->fdateLastWrite.month; … … 638 639 } // FillInRecordFromFSA 639 640 640 VOID ProcessDirectory(const HWND hwndCnr, const PCNRITEM pciParent, const CHAR * szDirBase, const BOOL filestoo, const BOOL recurse, const BOOL partial, CHAR * stopflag, DIRCNRDATA * dcd, // Optional 641 ULONG * pulTotalFiles, // Optional 641 VOID ProcessDirectory(const HWND hwndCnr, 642 const PCNRITEM pciParent, 643 const CHAR *szDirBase, 644 const BOOL filestoo, 645 const BOOL recurse, 646 const BOOL partial, 647 CHAR *stopflag, 648 DIRCNRDATA *dcd, // Optional 649 ULONG *pulTotalFiles, // Optional 642 650 PULONGLONG pullTotalBytes) // Optional 643 651 { … … 958 966 (PCNRITEM) NULL, 959 967 pszDirectory, 960 TRUE, 961 FALSE, 962 TRUE, 963 dcd ? &dcd->stopflag : NULL, dcd, NULL, pullTotalBytes); 968 TRUE, // filestoo 969 FALSE, // recurse 970 TRUE, // partial 971 dcd ? &dcd->stopflag : NULL, 972 dcd, 973 NULL, 974 pullTotalBytes); 964 975 DosPostEventSem(CompactSem); 965 976 -
trunk/dll/fm3dll.h
r730 r737 51 51 16 Jun 07 GKY Add CheckPmDrgLimit including IsFm2Window as part of work around PM drag limit 52 52 16 Jun 07 SHL Update more for OpenWatcom 53 22 Jul 07 GKY Update CNRITEM to optimize RAM usage 54 23 Jul 07 SHL More CNRITEM updates (ticket#24) 53 55 54 56 ***********************************************************************/ … … 405 407 MINIRECORDCORE rc; /* Base information */ 406 408 HWND hwndCnr; /* The container holding this record */ 407 PSZ pszFileName; // Points to szFileName - required by CFA_STRING 409 PSZ pszFileName; // Points to buffer holding full pathname 410 PSZ pszDisplayName; // Points to displayable part of path name - used by CFA_STRING 408 411 //CHAR szFileName[CCHMAXPATH]; // Path name - fixme to rename to szPathName? 409 412 //CHAR szSubject[40]; /* Subject string */ 410 CHAR *pszSubject; // Points s zSubject - required by CFA_STRING413 CHAR *pszSubject; // Points subject buffer - used by fm/2 and by CFA_STRING 411 414 CHAR *pszDispAttr; // Points to szDispAttr - required by CFA_STRING 412 415 CDATE date; /* Last write date of file */ … … 417 420 CTIME crtime; /* Creation time of file */ 418 421 CHAR szDispAttr[6]; /* Attrib string for details display */ 419 CHAR *pszLongname; // Points to szLongName - required by CFA_STRING422 CHAR *pszLongname; // Points to long name buffer - used by code and by CFA_STRING 420 423 ULONGLONG cbFile; /* File size */ 421 424 ULONGLONG easize; // Size of EAs - dirsize uses this - hack cough -
trunk/dll/misc.c
r733 r737 25 25 10 Jun 07 GKY Add IsFm2Window as part of work around PM drag limit 26 26 05 Jul 07 GKY Fix menu removals for WORKPLACE_PROCESS=YES 27 23 Jul 07 SHL Sync with CNRITEM updates (ticket#24) 27 28 28 29 ***********************************************************************/ … … 491 492 492 493 // Fill in column information for the file name. Note that we are 493 // using the pszFileName variable rather than szFileName. We do this 494 // because the container needs a pointer to the file name. If we used 495 // szFileName (a character array, not a pointer), the container would 496 // take the first 4 bytes of szFileName and think it was a pointer, 497 // which of course it is not. Later in the FillInRecord* functions we set 498 // pszFileName to point to szFileName. 494 // using the pszDisplayName variable rather than pszFileName. We do this 495 // because the container does not always display the full path file name. 499 496 500 497 pfi = pfi->pNextFieldInfo; … … 502 499 pfi->flTitle = CFA_CENTER; 503 500 pfi->pTitleData = GetPString(IDS_FILENAME); 504 pfi->offStruct = FIELDOFFSET(CNRITEM, psz FileName);501 pfi->offStruct = FIELDOFFSET(CNRITEM, pszDisplayName); 505 502 506 503 // Fill in column information for the longname.
Note:
See TracChangeset
for help on using the changeset viewer.
