Changeset 756


Ignore:
Timestamp:
Aug 3, 2007, 11:33:52 PM (13 years ago)
Author:
Gregg Young
Message:

Cleanup for ticket 138 & 24

Location:
trunk/dll
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/dll/comp.c

    r752 r756  
    2727  01 Aug 07 SHL Rework to sync with CNRITEM mods
    2828  01 Aug 07 SHL Rework to remove vast amount of duplicate code
     29  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    2930
    3031***********************************************************************/
  • trunk/dll/filldir.c

    r752 r756  
    3434  29 Jul 07 SHL Add CNRITEM free and remove support (ticket#24)
    3535  02 Aug 07 SHL Add FileAttrToString
     36  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    3637
    3738***********************************************************************/
     
    263264
    264265  /* load the object's Subject, if required */
    265   pci->pszSubject = NULL;
     266  pci->pszSubject = NullStr;
    266267  if (pffb->cbList > 4L &&
    267268      dcd && fLoadSubject &&
     
    480481
    481482  /* load the object's Subject, if required */
    482   pci->pszSubject = NULL;
     483  pci->pszSubject = NullStr;
    483484  if (pfsa4->cbList > 4L &&
    484485      dcd &&
  • trunk/dll/fm3res.dlg

    r752 r756  
    2727  15 Jun 07 SHL Update for OpenWatcom
    2828  19 Jun 07 SHL Update ABT_FRAME to include netlabs URL and built with OpenWatcom
     29  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    2930
    3031***********************************************************************/
     
    994995DLGTEMPLATE ABT_FRAME LOADONCALL MOVEABLE DISCARDABLE
    995996BEGIN
    996     DIALOG  "About FM/2", ABT_FRAME, 40, -15, 188, 152, NOT FS_DLGBORDER | 
     997    DIALOG  "About FM/2", ABT_FRAME, 40, -15, 188, 152, NOT FS_DLGBORDER |
    997998            FS_BORDER | FS_MOUSEALIGN | WS_VISIBLE, FCF_TITLEBAR
    998999    BEGIN
     
    10011002        ICON            COLR_GREEN, ABT_STICK1, 57, 133, 21, 16
    10021003        ICON            COLR_DARKRED, ABT_STICK2, 101, 133, 21, 16
    1003         CTEXT           "FM/2 (File Manager/2)", ABT_PROGNAME, 10, 112, 164, 
     1004        CTEXT           "FM/2 (File Manager/2)", ABT_PROGNAME, 10, 112, 164,
    10041005                        8, DT_VCENTER
    1005         CTEXT           "Copyright ž 1993-98", -1, 10, 104, 164, 8, 
     1006        CTEXT           "Copyright ž 1993-98", -1, 10, 104, 164, 8,
    10061007                        DT_VCENTER | NOT WS_GROUP
    1007         CTEXT           "M. Kimes (Barebones Software)", -1, 10, 96, 164, 8, 
     1008        CTEXT           "M. Kimes (Barebones Software)", -1, 10, 96, 164, 8,
    10081009                        DT_VCENTER | NOT WS_GROUP
    1009         CTEXT           "All rights reserved", -1, 10, 88, 164, 8, 
     1010        CTEXT           "All rights reserved", -1, 10, 88, 164, 8,
    10101011                        DT_VCENTER | NOT WS_GROUP
    1011         CTEXT           "Copyright ž 1998, 2007", -1, 10, 80, 164, 8, 
     1012        CTEXT           "Copyright ž 1998, 2007", -1, 10, 80, 164, 8,
    10121013                        DT_VCENTER | NOT WS_GROUP
    1013         CTEXT           "Steven Levine and Associates, Inc.", -1, 10, 72, 
     1014        CTEXT           "Steven Levine and Associates, Inc.", -1, 10, 72,
    10141015                        164, 8, DT_VCENTER | NOT WS_GROUP
    1015         CTEXT           "All rights reserved", -1, 10, 64, 164, 8, 
     1016        CTEXT           "All rights reserved", -1, 10, 64, 164, 8,
    10161017                        DT_VCENTER | NOT WS_GROUP
    10171018        DEFPUSHBUTTON   "", ABT_VERSION, 6, 4, 176, 14, WS_GROUP
    10181019                        PRESPARAMS PP_FOREGROUNDCOLOR, 0x00300000L
    1019         CTEXT           "Built with OpenWatcom", -1, 12, 39, 164, 8, 
     1020        CTEXT           "Built with OpenWatcom", -1, 12, 39, 164, 8,
    10201021                        DT_VCENTER | NOT WS_GROUP
    1021         CTEXT           "http://www.openwatcom.org", -1, 11, 30, 164, 8, 
     1022        CTEXT           "http://www.openwatcom.org", -1, 11, 30, 164, 8,
    10221023                        DT_VCENTER | NOT WS_GROUP
    1023         CTEXT           "http://svn.netlabs.org/fm2", -1, 11, 53, 164, 8, 
     1024        CTEXT           "http://svn.netlabs.org/fm2", -1, 11, 53, 164, 8,
    10241025                        DT_VCENTER | NOT WS_GROUP
    10251026    END
  • trunk/dll/grep.c

    r752 r756  
    1919  19 Oct 06 SHL Correct . and .. detect
    2020  03 Nov 06 SHL Count thread usage
     21  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    2122
    2223***********************************************************************/
  • trunk/dll/init.c

    r752 r756  
    2626  23 Jun 07 GKY Fix WORPLACE_PROCESS enviroment check logic
    2727  28 Jun 07 SHL Rework WORKPLACE_PROCESS check to match reality
     28  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    2829
    2930***********************************************************************/
  • trunk/dll/ipf/notebook.ipf

    r572 r756  
    716716memory, boosting this may be a good idea. On the other hand, if you are
    717717extremely limited in memory (less than 16 megs), reducing this might be
    718 the thing to do. The range is 16 to 2048, with 128 the default.
     718the thing to do. The range is 2048 to 102400, with 10240 the default.
    719719
    720720
  • trunk/dll/misc.c

    r751 r756  
    2727  23 Jul 07 SHL Sync with CNRITEM updates (ticket#24)
    2828  31 Jul 07 SHL Clean up and report errors (ticket#24)
     29  03 Aug 07 GKY Direct editting fixed (ticket#24)
    2930
    3031***********************************************************************/
     
    661662          !IsRoot(pci->pszFileName) &&
    662663          !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
    663         if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName)) {
     664        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName)) {
    664665          PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
    665666        }
     
    695696          retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
    696697          szSubject[retlen + 1] = 0;
    697           chop_at_crnl(szSubject);
    698           bstrip(szSubject);
     698          //chop_at_crnl(szSubject);
     699          bstrip(szSubject);
     700          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
    699701          WinSetWindowText(hwndMLE, szSubject);
    700702          len = strlen(szSubject);
     
    746748          retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
    747749          longname[retlen + 1] = 0;
    748           chop_at_crnl(longname);
     750          //chop_at_crnl(longname);
     751          pci->pszLongname = xrealloc(pci->pszLongname, retlen + 1, pszSrcFile, __LINE__);
    749752          WinSetWindowText(hwndMLE, longname);
    750           pci->pszFileName = xrealloc(pci->pszFileName, sizeof(longname), pszSrcFile, __LINE__);
     753          pci->pszFileName = xrealloc(pci->pszFileName, retlen + 1, pszSrcFile, __LINE__);
    751754          return (MRESULT) WriteLongName(pci->pszFileName, longname);
    752755        }
    753         else {
    754           pci->pszFileName = pci->pszDisplayName;
    755           WinQueryWindowText(hwndMLE, sizeof(szData), szData);
    756           pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
     756        else {
     757          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
    757758          if (strchr(szData, '?') ||
    758759              strchr(szData, '*') || IsRoot(pci->pszFileName))
     
    769770                return FALSE;
    770771            if (DosQueryPathInfo(pci->pszFileName,
    771                                  FIL_QUERYFULLNAME, szData, sizeof(szData)))
    772               strcpy(szData, pci->pszFileName);
     772                                 FIL_QUERYFULLNAME, szData, sizeof(szData))){
     773              pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
     774              strcpy(szData, pci->pszFileName);
     775            }
    773776            WinSetWindowText(hwndMLE, szData);
    774777            if (strcmp(szData, testname)) {
     
    815818                   MPFROMP(&pci),
    816819                   MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
    817         if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
     820        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
    818821          PostMsg(hwnd, UM_SORTRECORD, MPVOID, MPVOID);
    819822      }
     
    821824        USHORT cmd = 0;
    822825
    823         if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
     826        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
    824827          cmd = IDM_SORTSMARTNAME;
    825828        else if (pfi->offStruct == FIELDOFFSET(CNRITEM, cbFile))
  • trunk/dll/notebook.c

    r752 r756  
    1515  17 Jul 06 SHL Use Runtime_Error
    1616  15 Aug 06 SHL Rework SetMask args
     17  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    1718
    1819***********************************************************************/
     
    223224  case WM_INITDLG:
    224225    WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETTEXTLIMIT,
    225                       MPFROMSHORT(2048), MPVOID);
     226                      MPFROMSHORT(8), MPVOID);
    226227    WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_OVERRIDESETLIMITS,
    227                       MPFROMLONG(102400), MPFROMLONG(2048));
     228                      MPFROMLONG(102400), MPFROMLONG(2048));
    228229    PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
    229230    break;
  • trunk/dll/objcnr.c

    r752 r756  
    1616  22 Mar 07 GKY Use QWL_USER
    1717  01 Aug 07 SHL Rework to sync with CNRITEM mods
     18  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    1819
    1920***********************************************************************/
     
    109110      p = strrchr(pciP->pszFileName, '\\');
    110111      if (!p)
    111         pciP->pszFileName = pciP->pszFileName;
     112        pciP->pszDisplayName = pciP->pszFileName;
    112113      else if (*(p + 1))
    113114        p++;
  • trunk/dll/seeall.c

    r752 r756  
    2222  03 Nov 06 SHL Count thread usage
    2323  30 Mar 07 GKY Remove GetPString for window class names
     24  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
    2425
    2526***********************************************************************/
Note: See TracChangeset for help on using the changeset viewer.