Changeset 756

Timestamp:

Aug 4, 2007, 1:33:52 AM (18 years ago)

Author:

Gregg Young

Message:

Cleanup for ticket 138 & 24

Location:

trunk/dll

Files:

• comp.c (modified) (1 diff)
• filldir.c (modified) (3 diffs)
• fm3res.dlg (modified) (3 diffs)
• grep.c (modified) (1 diff)
• init.c (modified) (1 diff)
• ipf/notebook.ipf (modified) (1 diff)
• misc.c (modified) (7 diffs)
• notebook.c (modified) (2 diffs)
• objcnr.c (modified) (2 diffs)
• seeall.c (modified) (1 diff)

trunk/dll/comp.c

@@ -27 +27 @@
   01 Aug 07 SHL Rework to sync with CNRITEM mods
   01 Aug 07 SHL Rework to remove vast amount of duplicate code
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/

trunk/dll/filldir.c

@@ -34 +34 @@
   29 Jul 07 SHL Add CNRITEM free and remove support (ticket#24)
   02 Aug 07 SHL Add FileAttrToString
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/
@@ -263 +264 @@
 
   /* load the object's Subject, if required */
-  pci->pszSubject = NULL;
+  pci->pszSubject = NullStr;
   if (pffb->cbList > 4L &&
       dcd && fLoadSubject &&
@@ -480 +481 @@
 
   /* load the object's Subject, if required */
-  pci->pszSubject = NULL;
+  pci->pszSubject = NullStr;
   if (pfsa4->cbList > 4L &&
       dcd &&

trunk/dll/fm3res.dlg

@@ -27 +27 @@
   15 Jun 07 SHL Update for OpenWatcom
   19 Jun 07 SHL Update ABT_FRAME to include netlabs URL and built with OpenWatcom
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/
@@ -994 +995 @@
 DLGTEMPLATE ABT_FRAME LOADONCALL MOVEABLE DISCARDABLE
 BEGIN
-    DIALOG  "About FM/2", ABT_FRAME, 40, -15, 188, 152, NOT FS_DLGBORDER | 
+    DIALOG  "About FM/2", ABT_FRAME, 40, -15, 188, 152, NOT FS_DLGBORDER |
             FS_BORDER | FS_MOUSEALIGN | WS_VISIBLE, FCF_TITLEBAR
     BEGIN
@@ -1001 +1002 @@
         ICON            COLR_GREEN, ABT_STICK1, 57, 133, 21, 16
         ICON            COLR_DARKRED, ABT_STICK2, 101, 133, 21, 16
-        CTEXT           "FM/2 (File Manager/2)", ABT_PROGNAME, 10, 112, 164, 
+        CTEXT           "FM/2 (File Manager/2)", ABT_PROGNAME, 10, 112, 164,
                         8, DT_VCENTER
-        CTEXT           "Copyright ž 1993-98", -1, 10, 104, 164, 8, 
+        CTEXT           "Copyright ž 1993-98", -1, 10, 104, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "M. Kimes (Barebones Software)", -1, 10, 96, 164, 8, 
+        CTEXT           "M. Kimes (Barebones Software)", -1, 10, 96, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "All rights reserved", -1, 10, 88, 164, 8, 
+        CTEXT           "All rights reserved", -1, 10, 88, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Copyright ž 1998, 2007", -1, 10, 80, 164, 8, 
+        CTEXT           "Copyright ž 1998, 2007", -1, 10, 80, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "Steven Levine and Associates, Inc.", -1, 10, 72, 
+        CTEXT           "Steven Levine and Associates, Inc.", -1, 10, 72,
                         164, 8, DT_VCENTER | NOT WS_GROUP
-        CTEXT           "All rights reserved", -1, 10, 64, 164, 8, 
+        CTEXT           "All rights reserved", -1, 10, 64, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
         DEFPUSHBUTTON   "", ABT_VERSION, 6, 4, 176, 14, WS_GROUP
                         PRESPARAMS PP_FOREGROUNDCOLOR, 0x00300000L
-        CTEXT           "Built with OpenWatcom", -1, 12, 39, 164, 8, 
+        CTEXT           "Built with OpenWatcom", -1, 12, 39, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "http://www.openwatcom.org", -1, 11, 30, 164, 8, 
+        CTEXT           "http://www.openwatcom.org", -1, 11, 30, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
-        CTEXT           "http://svn.netlabs.org/fm2", -1, 11, 53, 164, 8, 
+        CTEXT           "http://svn.netlabs.org/fm2", -1, 11, 53, 164, 8,
                         DT_VCENTER | NOT WS_GROUP
     END

trunk/dll/grep.c

@@ -19 +19 @@
   19 Oct 06 SHL Correct . and .. detect
   03 Nov 06 SHL Count thread usage
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/

trunk/dll/init.c

@@ -26 +26 @@
   23 Jun 07 GKY Fix WORPLACE_PROCESS enviroment check logic
   28 Jun 07 SHL Rework WORKPLACE_PROCESS check to match reality
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/

trunk/dll/ipf/notebook.ipf

@@ -716 +716 @@
 memory, boosting this may be a good idea. On the other hand, if you are
 extremely limited in memory (less than 16 megs), reducing this might be
-the thing to do. The range is 16 to 2048, with 128 the default.
+the thing to do. The range is 2048 to 102400, with 10240 the default.
 
 

trunk/dll/misc.c

@@ -27 +27 @@
   23 Jul 07 SHL Sync with CNRITEM updates (ticket#24)
   31 Jul 07 SHL Clean up and report errors (ticket#24)
+  03 Aug 07 GKY Direct editting fixed (ticket#24)
 
 ***********************************************************************/
@@ -661 +662 @@
           !IsRoot(pci->pszFileName) &&
           !(pci->flags & RECFLAGS_ENV) && !(pci->flags & RECFLAGS_UNDERENV)) {
-        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName)) {
+        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName)) {
           PostMsg(hwnd, UM_FIXEDITNAME, MPFROMP(pci->pszFileName), MPVOID);
         }
@@ -695 +696 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(szSubject), szSubject);
           szSubject[retlen + 1] = 0;
-          chop_at_crnl(szSubject);
-          bstrip(szSubject);
+          //chop_at_crnl(szSubject);
+          bstrip(szSubject);
+          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, szSubject);
           len = strlen(szSubject);
@@ -746 +748 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
           longname[retlen + 1] = 0;
-          chop_at_crnl(longname);
+          //chop_at_crnl(longname);
+          pci->pszLongname = xrealloc(pci->pszLongname, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, longname);
-          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(longname), pszSrcFile, __LINE__);
+          pci->pszFileName = xrealloc(pci->pszFileName, retlen + 1, pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
-        else {
-          pci->pszFileName = pci->pszDisplayName;
-          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
-          pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+        else {
+          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
               strchr(szData, '*') || IsRoot(pci->pszFileName))
@@ -769 +770 @@
                 return FALSE;
             if (DosQueryPathInfo(pci->pszFileName,
-                                 FIL_QUERYFULLNAME, szData, sizeof(szData)))
-              strcpy(szData, pci->pszFileName);
+                                 FIL_QUERYFULLNAME, szData, sizeof(szData))){
+              pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
+              strcpy(szData, pci->pszFileName);
+            }
             WinSetWindowText(hwndMLE, szData);
             if (strcmp(szData, testname)) {
@@ -815 +818 @@
                    MPFROMP(&pci),
                    MPFROM2SHORT(1, CMA_ERASE | CMA_TEXTCHANGED));
-        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
+        if (pfi && pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
           PostMsg(hwnd, UM_SORTRECORD, MPVOID, MPVOID);
       }
@@ -821 +824 @@
         USHORT cmd = 0;
 
-        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszFileName))
+        if (!pfi || pfi->offStruct == FIELDOFFSET(CNRITEM, pszDisplayName))
           cmd = IDM_SORTSMARTNAME;
         else if (pfi->offStruct == FIELDOFFSET(CNRITEM, cbFile))

trunk/dll/notebook.c

@@ -15 +15 @@
   17 Jul 06 SHL Use Runtime_Error
   15 Aug 06 SHL Rework SetMask args
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/
@@ -223 +224 @@
   case WM_INITDLG:
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_SETTEXTLIMIT,
-                      MPFROMSHORT(2048), MPVOID);
+                      MPFROMSHORT(8), MPVOID);
     WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_OVERRIDESETLIMITS,
-                      MPFROMLONG(102400), MPFROMLONG(2048));
+                      MPFROMLONG(102400), MPFROMLONG(2048));
     PostMsg(hwnd, UM_UNDO, MPVOID, MPVOID);
     break;

trunk/dll/objcnr.c

@@ -16 +16 @@
   22 Mar 07 GKY Use QWL_USER
   01 Aug 07 SHL Rework to sync with CNRITEM mods
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/
@@ -109 +110 @@
       p = strrchr(pciP->pszFileName, '\\');
       if (!p)
-        pciP->pszFileName = pciP->pszFileName;
+        pciP->pszDisplayName = pciP->pszFileName;
       else if (*(p + 1))
         p++;

trunk/dll/seeall.c

@@ -22 +22 @@
   03 Nov 06 SHL Count thread usage
   30 Mar 07 GKY Remove GetPString for window class names
+  03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
 
 ***********************************************************************/