Changeset 787

Timestamp:

Aug 19, 2007, 11:02:37 PM (18 years ago)

Author:

Steven Levine

Message:

Rework UM_FILLSETUPLIST IDM_SAVEDIRCNRSTATE and ..._setups() logic for ticket# 109 and #31
Add GetMSecTimer()
Use GetMSecTimer in DbgMsg
Tweak notebook.ipf scanning page
Move more #pragma alloc_text statements to end of files for OpenWatcom
Delete obsoletes
Revert ExpandAll() ShowTreeRec() DosSleeps to 0 - DosSleep(1) was slowing down inner loops
Drop afFilesToGet - use FilesToGet directly
Optimze ShowTreeRec() collapse logic - was really slow

Location:

trunk/dll

Files:

• dircnrs.c (modified) (3 diffs)
• error.c (modified) (5 diffs)
• fm3dll.h (modified) (6 diffs)
• ipf/notebook.ipf (modified) (1 diff)
• mainwnd.c (modified) (35 diffs)
• misc.c (modified) (25 diffs)
• objcnr.c (modified) (2 diffs)
• seeall.c (modified) (17 diffs)
• select.c (modified) (23 diffs)
• treecnr.c (modified) (8 diffs)
• walkem.c (modified) (3 diffs)

trunk/dll/dircnrs.c

@@ -799 +799 @@
         if (strlen(dcd->previous) > strlen(dcd->directory) &&
             !strnicmp(dcd->directory, dcd->previous,
-                      strlen(dcd->directory))) {
-
-          PCNRITEM pci;
-
-          pci = FindCnrRecord(dcd->hwndCnr,
-                              dcd->previous, NULL, TRUE, FALSE, TRUE);
+                      strlen(dcd->directory)))
+        {
+          PCNRITEM pci = FindCnrRecord(dcd->hwndCnr,
+                                       dcd->previous,
+                                       NULL, TRUE, FALSE, TRUE);
           if (pci && (INT) pci != -1) {
-            /* make found item current (cursored) item */
+            // make found item current (cursored) item
             WinSendMsg(dcd->hwndCnr, CM_SETRECORDEMPHASIS, MPFROMP(pci),
                        MPFROM2SHORT(TRUE, CRA_CURSORED));
@@ -3250 +3249 @@
           else if (*dcd->directory)
             OpenObject(dcd->directory, Default, hwnd);
-        }
-        break;
-      }
+        } // CN_ENTER
+        break;
+      } // switch mp1
       break;
-    }
+    } // if dcd
     return 0;
 
@@ -3260 +3259 @@
     if (dcd && mp2) {
 
-      HWND ret;
-
-      ret = StartMLEEditor(dcd->hwndParent,
-                           (INT) mp1, (CHAR *) mp2, dcd->hwndFrame);
+      HWND ret = StartMLEEditor(dcd->hwndParent,
+                                (INT)mp1, (CHAR *)mp2, dcd->hwndFrame);
       if (mp2)
-        free((CHAR *) mp2);
+        free((CHAR *)mp2);
       return MRFROMLONG(ret);
     }

trunk/dll/error.c

@@ -25 +25 @@
   20 Apr 07 SHL Correct IDS_GENERR1TEXT formatting
   23 Apr 07 SHL Add Win_Error_NoMsgBox.  Rework others
+  14 Aug 07 SHL Add GetMSecTimer
+  14 Aug 07 SHL Use GetMSecTimer in DbgMsg
 
 ***********************************************************************/
@@ -42 +44 @@
 
 #pragma data_seg(DATA1)
-#pragma alloc_text(FMINPUT,Win_Error,Dos_Error,saymsg,showMsg)
+
+static PSZ pszSrcFile = __FILE__;
 
 static VOID formatWinError(PSZ pszBuf, UINT cBufBytes, HWND hwndErr, HWND hwndOwner,
@@ -55 +58 @@
 {
   va_list va;
+
+#if 1 // fixme to be selectable
+
+  static ULONG ul1stMSec;
+  // static ULONG ulLastMSec;
+
+  ULONG msec = GetMSecTimer();
+  ULONG delta;
+
+  if (!ul1stMSec) {
+    ul1stMSec = msec;
+    // ulLastMSec = msec;                       // Avoid big delta 1st time
+  }
+
+  delta = msec - ul1stMSec;
+  // ulLastMSec = msec;
+  fprintf(stderr, "%03lu.%03lu ", delta / 1000, delta % 1000);
+
+#endif
 
   // OK for source file name to be null
@@ -227 +249 @@
 } // formatWinError
 
+/**
+ * Return millisecond timer value
+ * Resolution is milliseconds, but accuracy will be less
+ * depending on systems settings
+ */
+
+ULONG GetMSecTimer(void)
+{
+  ULONG msec;
+
+  APIRET rc = DosQuerySysInfo(QSV_MS_COUNT, QSV_MS_COUNT,
+                              &msec, sizeof(msec));
+  if (rc) {
+    Dos_Error(MB_ENTER, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
+              "DosQuerySysInfo");
+    msec = 0;
+  }
+  return msec;
+}
+
 //== Runtime_Error: report runtime library error using passed message string ===
 
@@ -363 +405 @@
 
 } // Win_Error_NoMsgBox
+
+#pragma alloc_text(ERROR,Win_Error,Dos_Error,saymsg,showMsg,GetHiresTimeer)

trunk/dll/fm3dll.h

@@ -54 +54 @@
   23 Jul 07 SHL More CNRITEM updates (ticket#24)
   01 Aug 07 SHL More CNRITEM and ARCITEM updates (ticket#24)
+  14 Aug 07 SHL Add GetMSecTimer
+  14 Aug 07 SHL Delete obsoletes
+  16 Aug 07 SHL Update for ticket# 109 - status update
+  18 Aug 07 SHL Update for ticket# 31 - states length
 
 ***********************************************************************/
@@ -657 +661 @@
 INT Dos_Error2(ULONG mb_type, ULONG ulRC, HWND hwndOwner, PCSZ pszSrcFile,
                UINT uSrcLineNo, UINT idMsg);
+ULONG GetMSecTimer(void);
 VOID Runtime_Error(PCSZ pszSrcFile, UINT uSrcLineNo, PCSZ pszFmt, ...);
 VOID Runtime_Error2(PCSZ pszSrcFile, UINT uSrcLineNo, UINT idMsg);
@@ -718 +723 @@
                            CHAR * directory, CHAR * keyroot, DIRCNRDATA * dcd,
                            BOOL compare);
-VOID FreeMallocedMem(VOID * mem);
-VOID FcloseFile(FILE * fp);
 VOID SetConditionalCascade(HWND hwndMenu, USHORT id, USHORT def);
 VOID SetSortChecks(HWND hwndMenu, INT sortflags);
@@ -1028 +1031 @@
 VOID load_udirs(VOID);
 VOID save_udirs(VOID);
-BOOL add_udir(BOOL userdirs, CHAR * inpath);
-BOOL remove_udir(CHAR * path);
-BOOL remove_ldir(CHAR * path);
+BOOL add_udir(BOOL userdirs, PSZ inpath);
+BOOL remove_udir(PSZ path);
+BOOL remove_ldir(PSZ path);
+VOID fill_setups_list(VOID);
 VOID load_setups(VOID);
 VOID save_setups(VOID);
-BOOL add_setup(CHAR * name);
-BOOL remove_setup(CHAR * name);
-VOID FillPathListBox(HWND hwnd, HWND hwnddrive, HWND hwnddir, CHAR * path,
+INT add_setup(PSZ stateName);
+INT remove_setup(PSZ stateName);
+VOID FillPathListBox(HWND hwnd, HWND hwnddrive, HWND hwnddir, PSZ path,
                      BOOL nounwriteable);
 MRESULT EXPENTRY WalkDlgProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -1362 +1366 @@
   fNoTreeGap, fDummy, fVTreeOpensWPS, fUseQProcStat,
   fStartMinimized, fStartMaximized, fRemoteBug, fReminimize,
-  fDragndropDlg, fMinOnOpen, fUserComboBox, loadedsetups,
+  fDragndropDlg, fMinOnOpen, fUserComboBox,
   fQuickArcFind, fNoRemovableScan, fAutoView, fDataMin,
   fDataToFore, fDataShowDrives, fDataInclRemote,
@@ -1434 +1438 @@
 #pragma data_seg(GLOBAL3)
 #endif
-#define MAXNUMSETUPS  100
-DATADEF CHAR lastsetups[MAXNUMSETUPS][13];
-DATADEF INT lastsetup;
 DATADEF LONG standardcolors[16];
 

trunk/dll/ipf/notebook.ipf

@@ -323 +323 @@
 all expanded branches in the tree before switching because of one of the
 two above switch events.
+This option is will significantly slow down switching
+if you a large number of directories in the Drive Tree.
 :p.
 :hp6.Expand curr. after switch:ehp6. causes the Drive Tree to expand

trunk/dll/mainwnd.c

@@ -37 +37 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   07 Aug 07 SHL Use BldQuotedFileName
+  16 Aug 07 SHL Update IDM_SAVEDIRCNRSTATE logic for ticket# 109
+  18 Aug 07 SHL Rework UM_FILLSETUPLIST for new setups storage
+  19 Aug 07 SHL Move #pragma alloc_text to end of file for OpenWatcom
 
 ***********************************************************************/
@@ -43 +46 @@
 #define INCL_WIN
 // #define INCL_WINERRORS
-#define INCL_SHLERRORS
+#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
 #define INCL_WINHELP
 #define INCL_GPI
@@ -66 +69 @@
 
 static PSZ pszSrcFile = __FILE__;
-
-#pragma alloc_text(MISC8,SetToggleChecks,FindDirCnrByName,TopWindow)
-#pragma alloc_text(MISC8,TopWindowName,CountDirCnrs)
-#pragma alloc_text(MAINWND,AdjustSizeOfClient,FillClient,ChildButtonProc)
-#pragma alloc_text(MAINWND,ToolBackProc,StatusProc)
-#pragma alloc_text(MAINWND,MoveChildrenAwayFromTree,ArrangeIcons,NextChild)
-#pragma alloc_text(MAINWND,ChildFrameButtonProc)
-#pragma alloc_text(MAINWND2,CloseChildren,CountChildren,GetNextWindowPos)
-#pragma alloc_text(MAINWND2,CascadeChildren,TileChildren,ResizeChildren)
-#pragma alloc_text(MAINWND2,MinResChildren,MainFrameWndProc,MainWndProc)
-#pragma alloc_text(MAINWND2,DropDownListProc)
-#pragma alloc_text(MAINWND3,RestoreDirCnrState,SaveDirCnrState)
-#pragma alloc_text(MAINWND3,CloseDirCnrChildren,TransformSwp)
-#pragma alloc_text(MAINWND3,ResizeTools,BuildTools,CommandLineProc)
-#pragma alloc_text(MAINWND4,DriveProc,DriveBackProc,BuildDriveBarButtons,ResizeDrives)
-#pragma alloc_text(MAINWND4,LEDProc,IdealButtonProc)
-#pragma alloc_text(MAINWND5,MainWMOnce)
-#pragma alloc_text(MAINWND6,MainWMCommand)
-#pragma alloc_text(BUBBLE,MakeBubble,BubbleProc,BubbleHelp)
-#pragma alloc_text(MAINOBJ,MainObjectWndProc,MakeMainObjWin)
 
 static USHORT firsttool = 0;
@@ -160 +143 @@
         bd = 3L;
       *s = (CHAR) bd + '@';
-      WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPFROMLONG(1L));
+      WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPFROMLONG(1));
       if (!mp1) {
         s[3] = 0;
         WinSendMsg(hwndMain, UM_SETDIR, MPFROMP(s), MPVOID);
       }
-      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMLONG(1L), MPFROMLONG(1L));
+      PostMsg(MainObjectHwnd, UM_RESTORE, MPFROMLONG(1), MPFROMLONG(1));
     }
     return 0;
@@ -2654 +2637 @@
  */
 
+#define STATE_NAME_MAX_BYTES    256
+
 BOOL SaveDirCnrState(HWND hwndClient, PSZ pszStateName)
 {
@@ -2659 +2644 @@
   HWND hwndChild, hwndDir, hwndC;
   ULONG numsaves = 0, flWindowAttr;
-  CHAR szPrefix[20];
-  CHAR s[80];
+  CHAR szPrefix[STATE_NAME_MAX_BYTES + 1];
+  CHAR szKey[STATE_NAME_MAX_BYTES + 80];
   CHAR szDir[CCHMAXPATH];
   SWP swp;
@@ -2689 +2674 @@
            if (driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN)
              continue;
-            sprintf(s, "%sDirCnrPos.%lu", szPrefix, numsaves);
-            PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & swp,
+            sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, numsaves);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp,
                                 sizeof(SWP));
             dcd =
               WinQueryWindowPtr(WinWindowFromID(hwndC, DIR_CNR), QWL_USER);
             if (dcd) {
-              sprintf(s, "%sDirCnrSort.%lu", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & dcd->sortFlags,
+              sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->sortFlags,
                                   sizeof(INT));
-              sprintf(s, "%sDirCnrFilter.%lu", szPrefix, numsaves);
-              PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & dcd->mask,
+              sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, numsaves);
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & dcd->mask,
                                   sizeof(MASK));
-              sprintf(s, "%sDirCnrView.%lu", szPrefix, numsaves);
+              sprintf(szKey, "%sDirCnrView.%lu", szPrefix, numsaves);
               flWindowAttr = dcd->flWindowAttr;
               if (!fLeaveTree && (flWindowAttr & CV_TREE)) {
@@ -2718 +2703 @@
                   flWindowAttr |= CV_NAME;
               }
-              PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & flWindowAttr,
+              PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & flWindowAttr,
                                   sizeof(ULONG));
             }
-            sprintf(s, "%sDirCnrDir.%lu", szPrefix, numsaves++);
-            PrfWriteProfileString(fmprof, FM3Str, s, szDir);
+            sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
+            PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
             fSaved = TRUE;
           }
@@ -2733 +2718 @@
   if (fSaved) {
     if (WinQueryWindowPos(hwndTree, &swp)) {
-      sprintf(s, "%sLastTreePos", szPrefix);
-      PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & swp, sizeof(SWP));
-    }
-    sprintf(s, "%sNumDirsLastTime", szPrefix);
-    PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & numsaves, sizeof(ULONG));
+      sprintf(szKey, "%sLastTreePos", szPrefix);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, sizeof(SWP));
+    }
+    sprintf(szKey, "%sNumDirsLastTime", szPrefix);
+    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & numsaves, sizeof(ULONG));
     WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swp);
-    sprintf(s, "%sMySizeLastTime", szPrefix);
-    PrfWriteProfileData(fmprof, FM3Str, s, (PVOID) & swp, sizeof(SWP));
+    sprintf(szKey, "%sMySizeLastTime", szPrefix);
+    PrfWriteProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, sizeof(SWP));
   }
 
@@ -2789 +2774 @@
 static BOOL RestoreDirCnrState(HWND hwndClient, PSZ pszStateName, BOOL noview)
 {
-  CHAR s[80];
+  CHAR szKey[STATE_NAME_MAX_BYTES + 80];
   CHAR szDir[CCHMAXPATH];
-  CHAR szPrefix[20];
+  CHAR szPrefix[STATE_NAME_MAX_BYTES + 2];
   HWND hwndDir, hwndC;
   SWP swp, swpO, swpN;
@@ -2810 +2795 @@
 
   size = sizeof(SWP);
-  sprintf(s, "%sMySizeLastTime", szPrefix);
+  sprintf(szKey, "%sMySizeLastTime", szPrefix);
   if (!PrfQueryProfileData(fmprof,
                            FM3Str,
-                           s,
+                           szKey,
                            (PVOID) & swpO,
                            &size) ||
@@ -2821 +2806 @@
   }
   if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-    PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+    PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
   WinQueryWindowPos(WinQueryWindow(hwndClient, QW_PARENT), &swpN);
   if (swpN.fl & (SWP_MINIMIZE | SWP_HIDE))
@@ -2828 +2813 @@
   ytrans = ((double)swpO.cy * 100.0) / (double)swpN.cy;
   size = sizeof(SWP);
-  sprintf(s, "%sLastTreePos", szPrefix);
-  if (PrfQueryProfileData(fmprof, FM3Str, s, (PVOID) & swp, &size)) {
+  sprintf(szKey, "%sLastTreePos", szPrefix);
+  if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, &size)) {
     if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-      PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
     swp.hwnd = hwndTree;
     TransformSwp(&swp, xtrans, ytrans);
@@ -2859 +2844 @@
   }
   size = sizeof(ULONG);
-  sprintf(s, "%sNumDirsLastTime", szPrefix);
+  sprintf(szKey, "%sNumDirsLastTime", szPrefix);
   if (PrfQueryProfileData(fmprof,
-                          FM3Str, s, (PVOID) & numsaves, &size) && numsaves) {
+                          FM3Str, szKey, (PVOID) & numsaves, &size) && numsaves) {
     if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-      PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+      PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
     for (x = 0; x < numsaves; x++) {
-      sprintf(s, "%sDirCnrPos.%lu", szPrefix, x);
+      sprintf(szKey, "%sDirCnrPos.%lu", szPrefix, x);
       size = sizeof(SWP);
-      if (PrfQueryProfileData(fmprof, FM3Str, s, (PVOID) & swp, &size)) {
+      if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) & swp, &size)) {
         if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-          PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
-        sprintf(s, "%sDirCnrDir.%lu", szPrefix, x);
+          PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
+        sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, x);
         size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, FM3Str, s, (PVOID) szDir, &size)) {
+        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
           if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-            PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
           if (driveflags[toupper(*szDir) - 'A'] & DRIVE_NOPRESCAN) {
-            PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+            PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
             continue;
           }
           hwndDir = (HWND) WinSendMsg(hwndClient,
                                       UM_SETDIR,
-                                      MPFROMP(szDir), MPFROMLONG(1L));
+                                      MPFROMP(szDir), MPFROMLONG(1));
           if (hwndDir) {
             hwndC = WinWindowFromID(hwndDir, FID_CLIENT);
@@ -2889 +2874 @@
               if (dcd) {
                 size = sizeof(INT);
-                sprintf(s, "%sDirCnrSort.%lu", szPrefix, x);
+                sprintf(szKey, "%sDirCnrSort.%lu", szPrefix, x);
                 if (PrfQueryProfileData(fmprof,
                                         FM3Str,
-                                        s,
+                                        szKey,
                                         (PVOID) & dcd->sortFlags,
                                         &size) && size == sizeof(INT)) {
@@ -2899 +2884 @@
                 }
                 if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-                  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
                 size = sizeof(MASK);
-                sprintf(s, "%sDirCnrFilter.%lu", szPrefix, x);
+                sprintf(szKey, "%sDirCnrFilter.%lu", szPrefix, x);
                 if (PrfQueryProfileData(fmprof,
                                         FM3Str,
-                                        s,
+                                        szKey,
                                         (PVOID) & dcd->mask, &size) && size) {
                   if (*dcd->mask.szMask)
@@ -2912 +2897 @@
                 *(dcd->mask.prompt) = 0;
                 if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-                  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
                 size = sizeof(ULONG);
-                sprintf(s, "%sDirCnrView.%lu", szPrefix, x);
+                sprintf(szKey, "%sDirCnrView.%lu", szPrefix, x);
                 if (!noview) {
                   if (PrfQueryProfileData(fmprof,
                                           FM3Str,
-                                          s,
+                                          szKey,
                                           (PVOID) & dcd->flWindowAttr,
                                           &size) && size == sizeof(ULONG)) {
@@ -2939 +2924 @@
                 }
                 if (!pszStateName || !strcmp(pszStateName, GetPString(IDS_FM2TEMPTEXT)))
-                  PrfWriteProfileData(fmprof, FM3Str, s, NULL, 0L);
+                  PrfWriteProfileData(fmprof, FM3Str, szKey, NULL, 0L);
               }
             }
@@ -3013 +2998 @@
     ulCnt = *ulCntR;
     ulNumMinChildren = *ulNumMinChildrenR;
-    if (ulCnt == (ULONG) - 1L) {
+    if (ulCnt == (ULONG) - 1) {
       ulCnt = CountChildren(hwndClient, &ulNumMinChildren);
       /* return these values to the caller for later use */
@@ -3121 +3106 @@
   }
   if (!fTileBackwards) {
-    ulNumCols = ulSquare - 1L;
+    ulNumCols = ulSquare - 1;
     ulNumRows = ulChildCnt / ulNumCols;
   }
   else {
-    ulNumRows = ulSquare - 1L;
+    ulNumRows = ulSquare - 1;
     ulNumCols = ulChildCnt / ulNumRows;
   }
@@ -3205 +3190 @@
                                  QWS_YRESTORE,
                                  (USHORT) (Rectl.yTop -
-                                           (ulHeight * (ulCurRow + 1L))));
+                                           (ulHeight * (ulCurRow + 1))));
               WinSetWindowUShort(hwndChild, QWS_CXRESTORE, (USHORT) ulWidth);
               WinSetWindowUShort(hwndChild, QWS_CYRESTORE, (USHORT) ulHeight);
@@ -3213 +3198 @@
                               HWND_TOP,
                               (ulWidth * ulCurCol) + Rectl.xLeft,
-                              Rectl.yTop - (ulHeight * (ulCurRow + 1L)),
+                              Rectl.yTop - (ulHeight * (ulCurRow + 1)),
                               ulWidth,
                               ulHeight,
@@ -4180 +4165 @@
   case IDM_DELETEDIRCNRSTATE:
     {
-      CHAR szStateName[14];
+      CHAR szStateName[STATE_NAME_MAX_BYTES + 1];
 
       *szStateName = 0;
-      WinQueryWindowText(hwndStatelist, 13, szStateName);
+      WinQueryWindowText(hwndStatelist, STATE_NAME_MAX_BYTES, szStateName);
       bstrip(szStateName);
       // Ignore request if blank or attempting to using illegal name
@@ -4190 +4175 @@
           // Save
           if (SaveDirCnrState(hwnd, szStateName)) {
-            if (add_setup(szStateName)) {
+            INT ret = add_setup(szStateName);
+            if (ret == 0) {
               WinSendMsg(hwndStatelist, LM_INSERTITEM,
                          MPFROM2SHORT(LIT_SORTASCENDING, 0), MPFROMP(szStateName));
               save_setups();
             }
-            else {
+            else if (ret != 1) {
               saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                      GetPString(IDS_WARNINGTEXT),
-                     GetPString(IDS_EXISTSASATEXT), szStateName, "state name");
+                     "\"%s\" state name add failed", szStateName);      // 15 Apr 07 SHL failed
               WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
             }
@@ -4212 +4198 @@
           // Delete
           ULONG numsaves = 0, size, x;
-          CHAR s[80];
-
-          if (remove_setup(szStateName))
+          CHAR s[STATE_NAME_MAX_BYTES + 80];
+
+          INT ret = remove_setup(szStateName);
+          if (ret == 1)
             save_setups();
           sprintf(s, "%s.NumDirsLastTime", szStateName);
           size = sizeof(ULONG);
-          if (!PrfQueryProfileData
-              (fmprof, FM3Str, s, (PVOID) & numsaves, &size)) {
+          if (!PrfQueryProfileData(fmprof,
+                                   FM3Str,
+                                   s,
+                                   (PVOID)&numsaves,
+                                   &size)) {
             saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
                    GetPString(IDS_WARNINGTEXT),
@@ -4565 +4555 @@
                          MPFROMP(pci->pszFileName),
                          (SHORT1FROMMP(mp1) == IDM_AUTOVIEW) ?
-                         MPVOID : MPFROMLONG(1L));
+                         MPVOID : MPFROMLONG(1));
           }
         }
@@ -5063 +5053 @@
                EM_SETTEXTLIMIT, MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndStatelist, CBID_EDIT),
-               EM_SETTEXTLIMIT, MPFROM2SHORT(13, 0), MPVOID);
+               EM_SETTEXTLIMIT, MPFROM2SHORT(STATE_NAME_MAX_BYTES, 0), MPVOID);
     WinSendMsg(WinWindowFromID(hwndDrivelist, CBID_EDIT),
                EM_SETREADONLY, MPFROM2SHORT(TRUE, 0), MPVOID);
@@ -5454 +5444 @@
 
   case UM_FILLSETUPLIST:
-    WinSendMsg(hwndStatelist, LM_DELETEALL, MPVOID, MPVOID);
-    if (fUserComboBox) {
-      INT x;
-
-      if (!loadedsetups)
-        load_setups();
-      for (x = 0; x < MAXNUMSETUPS; x++) {
-        if (*lastsetups[x])
-          WinSendMsg(hwndStatelist, LM_INSERTITEM,
-                     MPFROM2SHORT(LIT_SORTASCENDING, 0),
-                     MPFROMP(lastsetups[x]));
-      }
-      WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
-    }
+    fill_setups_list();
     return 0;
 
@@ -5483 +5460 @@
       DosError(FERR_DISABLEHARDERR);
       hDir = HDIR_CREATE;
-      ulSearchCount = 1L;
+      ulSearchCount = 1;
       if (!DosFindFirst("*.TLS", &hDir, FILE_READONLY | FILE_ARCHIVED,
                         &findbuf, sizeof(FILEFINDBUF3),
@@ -5543 +5520 @@
           DosError(FERR_DISABLEHARDERR);
           hDir = HDIR_CREATE;
-          ulSearchCount = 1L;
+          ulSearchCount = 1;
           if (!IsRoot(info->path))
             rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
@@ -5585 +5562 @@
           DosError(FERR_DISABLEHARDERR);
           hDir = HDIR_CREATE;
-          ulSearchCount = 1L;
+          ulSearchCount = 1;
           if (!IsRoot(info->path))
             rc = DosFindFirst(info->path, &hDir, FILE_DIRECTORY |
@@ -5670 +5647 @@
                                         SHORT1FROMMP(mp1));
           CHAR path[CCHMAXPATH];
+          ULONG ul;
+
+          switch (SHORT1FROMMP(mp1)) {
+          case MAIN_USERLIST:
+            ul = CCHMAXPATH;
+            break;
+          case MAIN_SETUPLIST:
+            ul = STATE_NAME_MAX_BYTES;
+            break;
+          default:
+            ul = 13;                    // fixme to not be hardcoded
+          }
 
           SetShiftState();
-          WinQueryWindowText(WinWindowFromID(hwndUL, CBID_EDIT),
-                             ((SHORT1FROMMP(mp1) == MAIN_USERLIST) ?
-                              CCHMAXPATH : 13), path);
+          WinQueryWindowText(WinWindowFromID(hwndUL, CBID_EDIT), ul, path);
           bstrip(path);
           if (*path) {
@@ -5720 +5707 @@
             else if (SHORT1FROMMP(mp1) == MAIN_SETUPLIST) {
 
-              CHAR s[80];
+              CHAR szKey[80];
               ULONG size, numsaves = 0;
 
               SetShiftState();
               size = sizeof(ULONG);
-              sprintf(s, "%s.NumDirsLastTime", path);   // path is state name
-              if (!PrfQueryProfileData
-                  (fmprof, FM3Str, s, (PVOID) & numsaves, &size))
+              sprintf(szKey, "%s.NumDirsLastTime", path);       // path is state name
+              if (!PrfQueryProfileData(fmprof,
+                                       FM3Str,
+                                       szKey,
+                                       (PVOID)&numsaves,
+                                       &size))
               {
                 if ((WinGetLastError(WinQueryAnchorBlock(hwnd)) & 0xffff) == PMERR_NOT_IN_IDX) {
@@ -5751 +5741 @@
                     if ((shiftstate & KC_SHIFT) != 0 || fAutoTile)
                       PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID,
-                              MPFROMLONG(1L));
+                              MPFROMLONG(1));
                   }
                   else {
@@ -5854 +5844 @@
   return WinDefWindowProc(hwnd, msg, mp1, mp2);
 }
+
+#pragma alloc_text(MISC8,SetToggleChecks,FindDirCnrByName,TopWindow)
+#pragma alloc_text(MISC8,TopWindowName,CountDirCnrs)
+#pragma alloc_text(MAINWND,AdjustSizeOfClient,FillClient,ChildButtonProc)
+#pragma alloc_text(MAINWND,ToolBackProc,StatusProc)
+#pragma alloc_text(MAINWND,MoveChildrenAwayFromTree,ArrangeIcons,NextChild)
+#pragma alloc_text(MAINWND,ChildFrameButtonProc)
+#pragma alloc_text(MAINWND2,CloseChildren,CountChildren,GetNextWindowPos)
+#pragma alloc_text(MAINWND2,CascadeChildren,TileChildren,ResizeChildren)
+#pragma alloc_text(MAINWND2,MinResChildren,MainFrameWndProc,MainWndProc)
+#pragma alloc_text(MAINWND2,DropDownListProc)
+#pragma alloc_text(MAINWND3,RestoreDirCnrState,SaveDirCnrState)
+#pragma alloc_text(MAINWND3,CloseDirCnrChildren,TransformSwp)
+#pragma alloc_text(MAINWND3,ResizeTools,BuildTools,CommandLineProc)
+#pragma alloc_text(MAINWND4,DriveProc,DriveBackProc,BuildDriveBarButtons,ResizeDrives)
+#pragma alloc_text(MAINWND4,LEDProc,IdealButtonProc)
+#pragma alloc_text(MAINWND5,MainWMOnce)
+#pragma alloc_text(MAINWND6,MainWMCommand)
+#pragma alloc_text(BUBBLE,MakeBubble,BubbleProc,BubbleHelp)
+#pragma alloc_text(MAINOBJ,MainObjectWndProc,MakeMainObjWin)
+

trunk/dll/misc.c

@@ -31 +31 @@
   06 Aug 07 GKY Increase Subject EA to 1024
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
-
+  14 Aug 07 SHL Delete obsoletes
+  14 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
 
 ***********************************************************************/
@@ -56 +57 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(MAINWND5,SetSysMenu)
-#pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow,IsFm2Window)
-#pragma alloc_text(MISC1,FixSwitchList,FindDirCnr,CurrentRecord,SetShiftState,AddToListboxBottom)
-#pragma alloc_text(CNR_MISC1,AdjustCnrColVis,AdjustCnrColsForFSType)
-#pragma alloc_text(CNR_MISC1,AdjustCnrColsForPref,SetCnrCols)
-#pragma alloc_text(CNR_MISC2,CnrDirectEdit,OpenEdit)
-#pragma alloc_text(MISC2,SetMenuCheck,disable_menuitem,SetSortChecks)
-#pragma alloc_text(MISC2,SetDetailsSwitches,SetViewMenu)
-#pragma alloc_text(MISC3,SetupCommandMenu,AdjustDetailsSwitches)
-#pragma alloc_text(MISC3,ViewHelp,GetCmdSpec)
-#pragma alloc_text(MISC3,ExecFile,SetConditionalCascade,LoadDetailsSwitches)
-#pragma alloc_text(MISC3,FreeMallocedMem,FcloseFile)
-#pragma alloc_text(MISC4,PortholeInit,CheckMenu,Broadcast,SetupWinList,SwitchCommand)
-#pragma alloc_text(MISC6,DrawTargetEmphasis,EmphasizeButton)
-#pragma alloc_text(MISC_LIBPATH,LoadLibPath)
-#pragma alloc_text(MISC_SAY,SayView,SaySort,SayFilter)
-
 #ifndef BEGIN_LIBPATH
 #define BEGIN_LIBPATH            1
@@ -135 +119 @@
     ptl.y = 1;
     GpiMove(hps, &ptl);
-    GpiSetColor(hps, ((on) ? CLR_BLACK : CLR_PALEGRAY));
+    GpiSetColor(hps, on ? CLR_BLACK : CLR_PALEGRAY);
     ptl.x = swp.cx - 2;
     ptl.y = swp.cy - 2;
@@ -150 +134 @@
 
   if (hps) {
-    BoxWindow(hwnd, hps, ((on) ? CLR_BLACK : CLR_PALEGRAY));
+    BoxWindow(hwnd, hps, on ? CLR_BLACK : CLR_PALEGRAY);
     DrgReleasePS(hps);
   }
@@ -214 +198 @@
         do {
           GpiQueryTextBox(hps, strlen(p), p, TXTBOX_COUNT, aptl);
-          if (aptl[TXTBOX_TOPRIGHT].x > (rcl.xRight - ((p != s) ? len : 0)))
+          if (aptl[TXTBOX_TOPRIGHT].x > (rcl.xRight - (p != s ? len : 0)))
             p++;
           else
@@ -410 +394 @@
     hasLongNames = FALSE;
   }
-  pBool = (dcd) ? &dcd->detailsladate : &detailsladate;
-  AdjustCnrColVis(hwndCnr, GetPString(IDS_LADATE),
-                  (*pBool) ? hasAccessDT : FALSE, FALSE);
-  pBool = (dcd) ? &dcd->detailslatime : &detailslatime;
-  AdjustCnrColVis(hwndCnr, GetPString(IDS_LATIME),
-                  (*pBool) ? hasAccessDT : FALSE, FALSE);
-  pBool = (dcd) ? &dcd->detailscrdate : &detailscrdate;
-  AdjustCnrColVis(hwndCnr, GetPString(IDS_CRDATE),
-                  (*pBool) ? hasCreateDT : FALSE, FALSE);
-  pBool = (dcd) ? &dcd->detailscrtime : &detailscrtime;
-  AdjustCnrColVis(hwndCnr, GetPString(IDS_CRTIME),
-                  (*pBool) ? hasCreateDT : FALSE, FALSE);
-  pBool = (dcd) ? &dcd->detailslongname : &detailslongname;
-  AdjustCnrColVis(hwndCnr, GetPString(IDS_LNAME),
-                  (*pBool) ? hasLongNames : FALSE, FALSE);
+  pBool = dcd ? &dcd->detailsladate : &detailsladate;
+  AdjustCnrColVis(hwndCnr,
+                  GetPString(IDS_LADATE),
+                  *pBool ? hasAccessDT : FALSE,
+                  FALSE);
+  pBool = dcd ? &dcd->detailslatime : &detailslatime;
+  AdjustCnrColVis(hwndCnr,
+                  GetPString(IDS_LATIME),
+                  *pBool ? hasAccessDT : FALSE,
+                  FALSE);
+  pBool = dcd ? &dcd->detailscrdate : &detailscrdate;
+  AdjustCnrColVis(hwndCnr,
+                  GetPString(IDS_CRDATE),
+                  *pBool ? hasCreateDT : FALSE,
+                  FALSE);
+  pBool = dcd ? &dcd->detailscrtime : &detailscrtime;
+  AdjustCnrColVis(hwndCnr,
+                  GetPString(IDS_CRTIME),
+                  *pBool ? hasCreateDT : FALSE,
+                  FALSE);
+  pBool = dcd ? &dcd->detailslongname : &detailslongname;
+  AdjustCnrColVis(hwndCnr,
+                  GetPString(IDS_LNAME),
+                  *pBool ? hasLongNames : FALSE,
+                  FALSE);
   WinSendMsg(hwndCnr, CM_INVALIDATEDETAILFIELDINFO, MPVOID, MPVOID);
 }
@@ -532 +526 @@
       pfi->flData |= CFA_FIREADONLY;
     pfi->flTitle = CFA_CENTER | CFA_FITITLEREADONLY;
-    pfi->pTitleData = (isCompCnr) ? GetPString(IDS_STATUS) :
-      GetPString(IDS_SUBJ);
+    pfi->pTitleData = isCompCnr ? GetPString(IDS_STATUS) :
+                                  GetPString(IDS_SUBJ);
     pfi->offStruct = FIELDOFFSET(CNRITEM, pszSubject);
 
@@ -701 +695 @@
           szSubject[retlen + 1] = 0;
           //chop_at_crnl(szSubject);
-          bstrip(szSubject);
-          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
+          bstrip(szSubject);
+          pci->pszSubject = xrealloc(pci->pszSubject, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, szSubject);
           len = strlen(szSubject);
@@ -752 +746 @@
           retlen = WinQueryWindowText(hwndMLE, sizeof(longname), longname);
           longname[retlen + 1] = 0;
-          //chop_at_crnl(longname);
-          pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
+          //chop_at_crnl(longname);
+          pci->pszLongName = xrealloc(pci->pszLongName, retlen + 1, pszSrcFile, __LINE__);
           WinSetWindowText(hwndMLE, longname);
           pci->pszFileName = xrealloc(pci->pszFileName, retlen + 1, pszSrcFile, __LINE__);
           return (MRESULT) WriteLongName(pci->pszFileName, longname);
         }
-        else {
-          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
+        else {
+          WinQueryWindowText(hwndMLE, sizeof(szData), szData);
           if (strchr(szData, '?') ||
               strchr(szData, '*') || IsRoot(pci->pszFileName))
@@ -774 +768 @@
                 return FALSE;
             if (DosQueryPathInfo(pci->pszFileName,
-                                 FIL_QUERYFULLNAME, szData, sizeof(szData))){
-              pci->pszFileName = xrealloc(pci->pszFileName, sizeof(szData), pszSrcFile, __LINE__);
-              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)) {
@@ -859 +853 @@
 {
   if (toggle) {
-    *bool = (*bool) ? FALSE : TRUE;
+    *bool = *bool ? FALSE : TRUE;
     if (savename && *savename)
       PrfWriteProfileData(fmprof, appname, savename, bool, sizeof(BOOL));
@@ -943 +937 @@
     lastflags = ex.flags;
     return runemf2(ex.flags, hwnd, path,
-                   (*ex.environment) ? ex.environment : NULL, "%s", cl) != -1;
+                   *ex.environment ? ex.environment : NULL,
+                   "%s", cl) != -1;
   }
   else if (ret != 0)
@@ -1045 +1040 @@
   }
   if (bool)
-    *bool = (*bool) ? FALSE : TRUE;
+    *bool = *bool ? FALSE : TRUE;
   if (*s && bool)
     PrfWriteProfileData(fmprof, appname, s, bool, sizeof(BOOL));
@@ -1118 +1113 @@
 }
 
-VOID FreeMallocedMem(VOID * mem)
-{
-  /* for use by apps that don't use the DLLs runtime library */
-  free(mem);
-}
-
 VOID FcloseFile(FILE * fp)
 {
@@ -1167 +1156 @@
                 "%s%s%s",
                 info->title,
-                (x < 20) ? "\tCtrl + " : NullStr,
-                (x < 20 && x > 9) ? "Shift + " : NullStr);
+                x < 20 ? "\tCtrl + " : NullStr,
+                x < 20 && x > 9 ? "Shift + " : NullStr);
         if (x < 20)
           sprintf(&s[strlen(s)], "%d",
-                  (((x % 10) + 1) == 10) ? 0 : (x % 10) + 1);
+                  ((x % 10) + 1) == 10 ? 0 : (x % 10) + 1);
         mi.id = IDM_COMMANDSTART + x;
-        mi.afAttribute = (((info->flags & ONCE) != 0) ?
-                          MIA_CHECKED : 0) |
-          (((info->flags & PROMPT) != 0) ? MIA_FRAMED : 0);
+        mi.afAttribute = (info->flags & ONCE ? MIA_CHECKED : 0) |
+                         (info->flags & PROMPT ? MIA_FRAMED : 0);
         mi.afStyle = MIS_TEXT;
         if (!(x % 24) && x && info->next)
@@ -1378 +1366 @@
 PMINIRECORDCORE CurrentRecord(HWND hwndCnr)
 {
-  SHORT attrib = (fSelectedAlways) ? CRA_SELECTED : CRA_CURSORED;
+  SHORT attrib = fSelectedAlways ? CRA_SELECTED : CRA_CURSORED;
   PMINIRECORDCORE pmi;
 
@@ -1390 +1378 @@
       break;
   }
-  return ((INT) pmi == -1) ? NULL : pmi;
+  return ((INT)pmi == -1) ? NULL : pmi;
 }
 
@@ -1482 +1470 @@
       list[0] = filename;
       list[1] = NULL;
-      ExecOnList(hwnd, viewer, WINDOWED | SEPARATE |
-                 ((fViewChild) ? CHILD : 0), NULL, list, NULL);
+      ExecOnList(hwnd, viewer,
+                 WINDOWED | SEPARATE | (fViewChild ? CHILD : 0),
+                 NULL, list, NULL);
       return;
     }
@@ -1608 +1597 @@
       SetConditionalCascade(DirMenu, IDM_EDITSUBMENU, IDM_ATTRS);
       SetConditionalCascade(DirMenu, IDM_DELETESUBMENU,
-                            (fDefaultDeletePerm) ? IDM_PERMDELETE :
-                            IDM_DELETE);
+                            fDefaultDeletePerm ? IDM_PERMDELETE : IDM_DELETE);
       SetConditionalCascade(DirMenu, IDM_MISCSUBMENU, IDM_SIZES);
       SetConditionalCascade(DirMenu, IDM_OPENSUBMENU, IDM_OPENWINDOW);
@@ -1653 +1641 @@
       SetConditionalCascade(FileMenu, IDM_COLLECTMENU, IDM_COLLECT);
       SetConditionalCascade(FileMenu, IDM_DELETESUBMENU,
-                            (fDefaultDeletePerm) ? IDM_PERMDELETE :
-                            IDM_DELETE);
+                            fDefaultDeletePerm ? IDM_PERMDELETE : IDM_DELETE);
       SetConditionalCascade(FileMenu, IDM_OPENSUBMENU, IDM_OPENDEFAULT);
       SetConditionalCascade(FileMenu, IDM_OBJECTSUBMENU, IDM_SHADOW);
@@ -1699 +1686 @@
       SetConditionalCascade(CollectorFileMenu, IDM_EDITSUBMENU, IDM_EDIT);
       SetConditionalCascade(CollectorFileMenu, IDM_DELETESUBMENU,
-                            (fDefaultDeletePerm) ? IDM_PERMDELETE :
-                            IDM_DELETE);
+                            fDefaultDeletePerm ? IDM_PERMDELETE : IDM_DELETE);
       SetConditionalCascade(CollectorFileMenu, IDM_OPENSUBMENU,
                             IDM_OPENDEFAULT);
@@ -1722 +1708 @@
       SetConditionalCascade(CollectorDirMenu, IDM_EDITSUBMENU, IDM_ATTRS);
       SetConditionalCascade(CollectorDirMenu, IDM_DELETESUBMENU,
-                            (fDefaultDeletePerm) ? IDM_PERMDELETE :
-                            IDM_DELETE);
+                            fDefaultDeletePerm ? IDM_PERMDELETE : IDM_DELETE);
       SetConditionalCascade(CollectorDirMenu, IDM_MISCSUBMENU, IDM_SIZES);
       SetConditionalCascade(CollectorDirMenu, IDM_OPENSUBMENU,
@@ -1895 +1880 @@
   if (s) {
     sprintf(s, "S:%s%s",
-            (sortflags & SORT_REVERSE) ? "^" : NullStr,
-            (sortflags & SORT_FIRSTEXTENSION) ? GetPString(IDS_FIRSTX) :
-            (sortflags & SORT_LASTEXTENSION) ? GetPString(IDS_LASTX) :
-            (sortflags & SORT_SIZE) ? "Size" :
-            (sortflags & SORT_EASIZE) ? (archive ==
-                                         0) ? GetPString(IDS_EASIZE) :
-            GetPString(IDS_CSIZE) : (sortflags & SORT_LWDATE) ? (archive
-                                                                 ==
-                                                                 0) ?
-            GetPString(IDS_LWDATE) : GetPString(IDS_DATE) : (sortflags &
-                                                             SORT_LADATE)
-            ? GetPString(IDS_LADATE) : (sortflags & SORT_CRDATE) ?
-            GetPString(IDS_CRDATE) : (sortflags & SORT_PATHNAME) ?
-            GetPString(IDS_PATH) : (sortflags & SORT_NOSORT) ?
-            GetPString(IDS_NONE) : (sortflags & SORT_SUBJECT) ?
-            GetPString(IDS_SUBJ) : GetPString(IDS_NAME));
+            sortflags & SORT_REVERSE ? "^" : NullStr,
+            (sortflags & SORT_FIRSTEXTENSION) ?
+              GetPString(IDS_FIRSTX) : (sortflags & SORT_LASTEXTENSION) ?
+                GetPString(IDS_LASTX) : (sortflags & SORT_SIZE) ?
+                  "Size" : (sortflags & SORT_EASIZE) ?
+                    (archive == 0) ?
+                      GetPString(IDS_EASIZE) : GetPString(IDS_CSIZE) :
+                    (sortflags & SORT_LWDATE) ?
+                      (archive == 0) ?
+                        GetPString(IDS_LWDATE) : GetPString(IDS_DATE) :
+                        (sortflags & SORT_LADATE) ?
+                          GetPString(IDS_LADATE) : (sortflags & SORT_CRDATE) ?
+                            GetPString(IDS_CRDATE) :
+                            (sortflags & SORT_PATHNAME) ?
+                              GetPString(IDS_PATH) : (sortflags & SORT_NOSORT) ?
+                                GetPString(IDS_NONE) : (sortflags & SORT_SUBJECT) ?
+                                  GetPString(IDS_SUBJ) : GetPString(IDS_NAME));
     WinSetWindowText(hwnd, s);
     free(s);
@@ -2049 +2035 @@
     register INT i;
 
-    hwndTopFrame = (hwndTop) ? WinQueryWindow(hwndTop, QW_PARENT) : (HWND) 0;
+    hwndTopFrame = hwndTop ? WinQueryWindow(hwndTop, QW_PARENT) : (HWND)0;
     /* Get the switch list information */
     x = 0;
@@ -2169 +2155 @@
   return ret;
 }
+
+#pragma alloc_text(MAINWND5,SetSysMenu)
+#pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow,IsFm2Window)
+#pragma alloc_text(MISC1,FixSwitchList,FindDirCnr,CurrentRecord,SetShiftState,AddToListboxBottom)
+#pragma alloc_text(CNR_MISC1,AdjustCnrColVis,AdjustCnrColsForFSType)
+#pragma alloc_text(CNR_MISC1,AdjustCnrColsForPref,SetCnrCols)
+#pragma alloc_text(CNR_MISC2,CnrDirectEdit,OpenEdit)
+#pragma alloc_text(MISC2,SetMenuCheck,disable_menuitem,SetSortChecks)
+#pragma alloc_text(MISC2,SetDetailsSwitches,SetViewMenu)
+#pragma alloc_text(MISC3,SetupCommandMenu,AdjustDetailsSwitches)
+#pragma alloc_text(MISC3,ViewHelp,GetCmdSpec)
+#pragma alloc_text(MISC3,ExecFile,SetConditionalCascade,LoadDetailsSwitches)
+#pragma alloc_text(MISC4,PortholeInit,CheckMenu,Broadcast,SetupWinList,SwitchCommand)
+#pragma alloc_text(MISC6,DrawTargetEmphasis,EmphasizeButton)
+#pragma alloc_text(MISC_LIBPATH,LoadLibPath)
+#pragma alloc_text(MISC_SAY,SayView,SaySort,SayFilter)
+

trunk/dll/objcnr.c

@@ -20 +20 @@
   13 Aug 07 SHL Avoid realloc - not needed; sanitize code
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
+  14 Aug 07 SHL Revert ProcessDir DosSleep to 0
 
 ***********************************************************************/
@@ -185 +186 @@
         pffbFile = (PFILEFINDBUF3)((PBYTE)pffbFile + pffbFile->oNextEntryOffset);
       } // for
-      DosSleep(1);
+      DosSleep(0);                      // Let's others at same priority get some work done
       if (*stopflag)
         break;

trunk/dll/seeall.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2006 Steven H. Levine
+  Copyright (c) 2001, 2007 Steven H. Levine
 
   16 Oct 02 SHL Handle large partitions
@@ -27 +27 @@
   13 Aug 07 SHL Sync code with other FilesToGet usage
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
+  14 Aug 07 SHL Revert to DosSleep(0) to speed up inner loops
+  14 Aug 07 SHL Drop afFilesToGet
 
 ***********************************************************************/
@@ -108 +110 @@
   ULONG affiles;
   ULONG afalloc;
-  ULONG afFilesToGet;
   ULONG longest;
   ULONG longestw;
@@ -433 +434 @@
                          FM3ModHandle,
                          ASEL_FRAME, (PVOID) & ad.info) || !ad.info) {
-            /* we blew it */
+            // we blew it
             FreeList(list);
             break;
@@ -441 +442 @@
               !ad.info->createwdirs &&
               !ad.info->movewdirs && !ad.info->createrecurse) {
+            // 14 Aug 07 SHL fixme to tell user why we failed
             FreeList(list);
             break;
@@ -448 +450 @@
             break;
           }
-          /* build the sucker */
+          // Build archiver command line
           strcpy(szBuffer, ad.command);
           strcat(szBuffer, " ");
@@ -489 +491 @@
                       HWND_DESKTOP, NULL, NULL,
                       "%s", szBuffer);
-              DosSleep(1);
+              DosSleep(1);              // Let archiver get started
               *p = 0;
             }
             strcat(szBuffer, " ");
-          }
+          } // while
           AddToList(ad.arcname, &files, &numfiles, &numalloc);
         }
@@ -1062 +1064 @@
         sprintf(message,
                 GetPString(IDS_OPSCOMPLETETEXT),
-                (SHORT1FROMMP(mp1) == IDM_MOVE) ?
-                GetPString(IDS_MOVETEXT) :
-                (SHORT1FROMMP(mp1) == IDM_COPY) ?
-                GetPString(IDS_COPYTEXT) :
-                (SHORT1FROMMP(mp1) == IDM_WPSMOVE) ?
-                GetPString(IDS_WPSMOVETEXT) :
-                (SHORT1FROMMP(mp1) == IDM_WPSCOPY) ?
-                GetPString(IDS_WPSCOPYTEXT) :
-                GetPString(IDS_RENAMETEXT),
+                SHORT1FROMMP(mp1) == IDM_MOVE ?
+                  GetPString(IDS_MOVETEXT) :
+                  SHORT1FROMMP(mp1) == IDM_COPY ?
+                    GetPString(IDS_COPYTEXT) :
+                    SHORT1FROMMP(mp1) == IDM_WPSMOVE ?
+                      GetPString(IDS_WPSMOVETEXT) :
+                      SHORT1FROMMP(mp1) == IDM_WPSCOPY ?
+                        GetPString(IDS_WPSCOPYTEXT) :
+                        GetPString(IDS_RENAMETEXT),
                 &"s"[x == 1],
-                (SHORT1FROMMP(mp1) == IDM_MOVE ||
-                 SHORT1FROMMP(mp1) == IDM_COPY ||
-                 SHORT1FROMMP(mp1) == IDM_WPSMOVE ||
-                 SHORT1FROMMP(mp1) == IDM_WPSCOPY) ?
-                GetPString(IDS_TOTEXT) :
-                NullStr,
-                (SHORT1FROMMP(mp1) == IDM_MOVE ||
-                 SHORT1FROMMP(mp1) == IDM_COPY ||
-                 SHORT1FROMMP(mp1) == IDM_WPSMOVE ||
-                 SHORT1FROMMP(mp1) == IDM_WPSCOPY) ?
-                path :
-                NullStr,
-                (x != 1) ? GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
+                SHORT1FROMMP(mp1) == IDM_MOVE ||
+                SHORT1FROMMP(mp1) == IDM_COPY ||
+                SHORT1FROMMP(mp1) == IDM_WPSMOVE ||
+                SHORT1FROMMP(mp1) == IDM_WPSCOPY ?
+                  GetPString(IDS_TOTEXT) : NullStr,
+                SHORT1FROMMP(mp1) == IDM_MOVE ||
+                SHORT1FROMMP(mp1) == IDM_COPY ||
+                SHORT1FROMMP(mp1) == IDM_WPSMOVE ||
+                SHORT1FROMMP(mp1) == IDM_WPSCOPY ?
+                  path : NullStr,
+                x != 1 ? GetPString(IDS_ARETEXT) : GetPString(IDS_ISTEXT));
         WinSetWindowText(WinWindowFromID(hwndFrame, SEEALL_STATUS), message);
         if (toupper(*path) < 'C')
           DosBeep(1000, 25);
-        DosSleep(16);//05 Aug 07 GKY 33
+        DosSleep(16);                   // 05 Aug 07 GKY 33
         break;
 
@@ -1623 +1623 @@
 }
 
-VOID FindDupes(VOID * args)
+VOID FindDupesThread(VOID * args)
 {
   register ULONG x, z;
@@ -1654 +1654 @@
               }
               for (z = 0; z < ad->affiles && !ad->stopflag; z++) {
-                if (x != z
-                    && !(ad->afhead[z].flags & (AF_DUPE | AF_FILTERED))) {
+                if (x != z &&
+                    !(ad->afhead[z].flags & (AF_DUPE | AF_FILTERED)))
+                {
                   if (ad->dupeflags & DP_SIZES) {
                     if (ad->afhead[x].cbFile != ad->afhead[z].cbFile)
@@ -1713 +1714 @@
                         goto SkipNonDupe;
                     }
-                    DosSleep(1);
+                    DosSleep(0);
                   }
                   ad->afhead[x].flags |= AF_DUPE;
@@ -1720 +1721 @@
                   ;
                 }
-              }
-              DosSleep(1);
-            }
-          }
+              } // for
+              DosSleep(0);
+            }
+          } // for
           for (x = 0; x < ad->affiles && !ad->stopflag; x++) {
             if (!(ad->afhead[x].flags & AF_DUPE))
@@ -1735 +1736 @@
     PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
     DosReleaseMutexSem(ad->hmtxScan);
-  }                                     // if got sem
+  } // if got sem
   if (hmq2) {
     PostMsg(hwnd, UM_CONTAINER_FILLED, MPVOID, MPVOID);
@@ -1898 +1899 @@
     return;
 
-  ulFindMax = ad->afFilesToGet;
+  ulFindMax = FilesToGet;
   if (fRemoteBug && isalpha(*pathname) && pathname[1] == ':' &&
       pathname[2] == '\\' &&
@@ -2025 +2026 @@
         WinCancelShutdown(hmq2, TRUE);
         IncrThreadUsage();
-        ad->afFilesToGet = FilesToGet;
         if (!*ad->szFindPath) {
           DosError(FERR_DISABLEHARDERR);
@@ -3835 +3835 @@
                                             MPFROM2SHORT(pAD->dupeflags, 0));
         if (pAD->dupeflags) {
-          if (_beginthread(FindDupes, NULL, 65536, (PVOID) hwnd) == -1)
+          if (_beginthread(FindDupesThread, NULL, 65536, (PVOID) hwnd) == -1)
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_COULDNTSTARTTHREADTEXT));
@@ -4294 +4294 @@
 #pragma alloc_text(SEEALL,UpdateList,CollectList,ReSort,Mark)
 #pragma alloc_text(SEEALL,BuildAList,RemoveDeleted,SeeFrameWndProc,FilterList)
-#pragma alloc_text(SEEALL2,SeeObjWndProc,MakeSeeObjWinThread,FindDupes,DupeDlgProc)
+#pragma alloc_text(SEEALL2,SeeObjWndProc,MakeSeeObjWinThread,FindDupesThread,DupeDlgProc)
 #pragma alloc_text(SEEALL3,FreeAllFilesList,DoADir,FindAllThread,AFDrvsWndProc)
 #pragma alloc_text(SEEALL3,StartSeeAll)

trunk/dll/select.c

@@ -25 +25 @@
                not use pszFileName since CNRITEM_EXISTS set implies
                pszFileName not null
+  14 Aug 07 SHL Revert ExpandAll DosSleep to 0
 
 ***********************************************************************/
@@ -251 +252 @@
               else
                 break;
-            }
+            } // while
             fclose(inputFile);
           }
@@ -354 +355 @@
               else
                 break;
-            }
+            } // while
             fclose(inputFile);
           }
@@ -545 +546 @@
                                 MPFROM2SHORT(CMA_FIRSTCHILD, CMA_ITEMORDER));
     if (pci)
-      DosSleep(1);
+      DosSleep(0);
     while (pci && (INT)pci != -1) {
       ExpandAll(hwndCnr, expand, pci);
@@ -552 +553 @@
     }
   }
-  DosSleep(1);
+  DosSleep(0);
 }
 
@@ -638 +639 @@
                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (!(x % 500))
-      DosSleep(1L);
+      DosSleep(1);
     // else if (!(x % 50))
-    //  DosSleep(0L);
+    //  DosSleep(0);
   } // while
 
@@ -668 +669 @@
                                    MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
     if (!(x % 500))
-      DosSleep(1L);
+      DosSleep(1);
     // else if (!(x % 50))
-    //  DosSleep(0L);
+    //  DosSleep(0);
   } // while
 
@@ -737 +738 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     } // for
   } // if reset
@@ -760 +761 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     } // for
     break;
@@ -780 +781 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -866 +867 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     } // for
     break;
@@ -884 +885 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -906 +907 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -927 +928 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -948 +949 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -969 +970 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -990 +991 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1008 +1009 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1029 +1030 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1050 +1051 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1071 +1072 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1092 +1093 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;
@@ -1113 +1114 @@
       }
       if (!(x % 500))
-        DosSleep(1L);
+        DosSleep(1);
       // else if (!(x % 50))
-      //        DosSleep(0L);
+      //        DosSleep(0);
     }
     break;

trunk/dll/treecnr.c

@@ -19 +19 @@
   15 Aug 06 SHL Rework SetMask args
   31 Aug 06 JS  Add more partitioning menu items
-  22 OCT 06 GKY Add NDFS32 support
+  22 Oct 06 GKY Add NDFS32 support
   29 Dec 06 GKY Fixed menu gray out for remote drives (added variable "remote")
   29 Dec 06 GKY Enabled edit of drive flags on "not ready" drives
@@ -36 +36 @@
   02 Aug 07 SHL Sync with CNRITEM mods
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
+  14 Aug 07 SHL Revert ShowTreeRec DosSleep to 0
+  14 Aug 07 SHL Optimze ShowTreeRec collapse - was really slow
 
 ***********************************************************************/
@@ -143 +145 @@
 }
 
-VOID ShowTreeRec(HWND hwndCnr, CHAR * dirname, BOOL collapsefirst,
+VOID ShowTreeRec(HWND hwndCnr,
+                 CHAR *dirname,
+                 BOOL collapsefirst,
                  BOOL maketop)
 {
@@ -153 +157 @@
   CHAR szDir[CCHMAXPATH], *p;
 
-  /* is it already the current record? */
+  // already positioned to requested record?
   pci = WinSendMsg(hwndCnr,
                    CM_QUERYRECORDEMPHASIS,
                    MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
   if (pci && (INT) pci != -1 && !stricmp(pci->pszFileName, dirname)) {
-    quickbail = TRUE;
-    goto MakeTop;                       /* skip lookup bullsh*t */
+    // DbgMsg(pszSrcFile, __LINE__, "already at %s collapse %u maketop %u", dirname, collapsefirst, maketop);   // 14 Aug 07 SHL fixme
+    quickbail = TRUE;                   // Bypass repositioning
+    goto MakeTop;
   }
   WinEnableWindowUpdate(hwndCnr, FALSE);
+  DbgMsg(pszSrcFile, __LINE__, "finding %s collapse %u maketop %u", dirname, collapsefirst, maketop);   // 14 Aug 07 SHL fixme
   pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
   if (!pci || (INT) pci == -1) {
@@ -168 +174 @@
     szDir[2] = '\\';
     szDir[3] = 0;
-    p = szDir + 3;
+    p = szDir + 3;                      // Point after root backslash
     for (;;) {
       pciP = FindCnrRecord(hwndCnr, szDir, NULL, TRUE, FALSE, TRUE);
       if (pciP && (INT) pciP != -1) {
         if (!stricmp(dirname, pciP->pszFileName))
-          break;
-        if (!(pciP->rc.flRecordAttr & CRA_EXPANDED))
+          break;                        // Found it
+        if (~pciP->rc.flRecordAttr & CRA_EXPANDED)
           WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciP), MPVOID);
         strcpy(szDir, dirname);
         if (p - szDir >= strlen(szDir))
-          break;
+          break;                        // Not root dir
         p = strchr(p, '\\');
         if (p) {
-          *p = 0;
+          *p = 0;                       // fixme?
           p++;
         }
@@ -189 +195 @@
       else
         break;
-      DosSleep(1);
-    }
+      DosSleep(0);
+    } // for
     pci = FindCnrRecord(hwndCnr, dirname, NULL, TRUE, FALSE, TRUE);
   }
+  DbgMsg(pszSrcFile, __LINE__, "found");        // 14 Aug 07 SHL fixme
   if (pci && (INT) pci != -1) {
-    if (!(pci->rc.flRecordAttr & CRA_CURSORED)) {
+    if (~pci->rc.flRecordAttr & CRA_CURSORED) {
       if (collapsefirst) {
-        /* collapse top level of all branches */
+        DbgMsg(pszSrcFile, __LINE__, "collapsing");     // 14 Aug 07 SHL fixme
         pciP = WinSendMsg(hwndCnr,
                           CM_QUERYRECORD,
                           MPVOID, MPFROM2SHORT(CMA_FIRST, CMA_ITEMORDER));
         while (pciP && (INT) pciP != -1) {
-          if (toupper(*pciP->pszFileName) == toupper(*dirname))
-            /* collapse all levels if branch is our drive */
-            ExpandAll(hwndCnr, FALSE, pciP);
-          else if (pciP->rc.flRecordAttr & CRA_EXPANDED)
+#if 1
+          if (pciP->rc.flRecordAttr & CRA_EXPANDED) {
+            // collapse top level of all branches
             WinSendMsg(hwndCnr, CM_COLLAPSETREE, MPFROMP(pciP), MPVOID);
+          }
+#else // fixme to be gone
+          if (toupper(*pciP->pszFileName) == toupper(*dirname)) {
+            // collapse all levels if branch is our drive
+            if (pciP->rc.flRecordAttr & CRA_EXPANDED)
+              ExpandAll(hwndCnr, FALSE, pciP);
+          }
+          else if (pciP->rc.flRecordAttr & CRA_EXPANDED) {
+            // collapse top level of all branches
+            WinSendMsg(hwndCnr, CM_COLLAPSETREE, MPFROMP(pciP), MPVOID);
+          }
+#endif
           pciP = WinSendMsg(hwndCnr,
                             CM_QUERYRECORD,
                             MPFROMP(pciP),
                             MPFROM2SHORT(CMA_NEXT, CMA_ITEMORDER));
-        }
+        } // while
       }
       /* expand all parent branches */
+      DbgMsg(pszSrcFile, __LINE__, "expanding parents");        // 14 Aug 07 SHL fixme
       pciToSelect = pci;
       for (;;) {
@@ -226 +245 @@
         else
           break;
-        DosSleep(1);
-      }
+        DosSleep(1);                    // Let GUI update
+      } // for
     }
     /* make record visible */
   MakeTop:
+    DbgMsg(pszSrcFile, __LINE__, "moving into view");   // 14 Aug 07 SHL fixme
     pciToSelect = pci;
     if (pciToSelect && (INT) pciToSelect != -1) {
-      if (fTopDir || maketop)
+      if (fTopDir || maketop) {
         ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
-      if (fSwitchTreeExpand && !(pciToSelect->rc.flRecordAttr & CRA_EXPANDED))
+      }
+      if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED) {
+        DbgMsg(pszSrcFile, __LINE__, "expanding current");      // 14 Aug 07 SHL fixme
         WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
-      if (quickbail) {
-        WinEnableWindowUpdate(hwndCnr, TRUE);
-        return;
-      }
-      WinSendMsg(hwndCnr,
-                 CM_SETRECORDEMPHASIS,
-                 MPFROMP(pciToSelect),
-                 MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED));
+        DbgMsg(pszSrcFile, __LINE__, "expanded");       // 14 Aug 07 SHL fixme
+      }
+      if (!quickbail) {
+        WinSendMsg(hwndCnr,
+                   CM_SETRECORDEMPHASIS,
+                   MPFROMP(pciToSelect),
+                   MPFROM2SHORT(TRUE, CRA_SELECTED | CRA_CURSORED));
+      }
     }
   }
+  DbgMsg(pszSrcFile, __LINE__, "done"); // 14 Aug 07 SHL fixme
   WinEnableWindowUpdate(hwndCnr, TRUE);
+  DosSleep(1);                  // Let GUI update
 }
 
@@ -517 +541 @@
 
   case UM_SHOWME:
+    // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME mp1 %p mp2 %p", mp1, mp2);       // 14 Aug 07 SHL fixme
     if (mp1) {
       dcd = INSTDATA(hwnd);
+      // DbgMsg(pszSrcFile, __LINE__, "UM_SHOWME dcd %p", dcd); // 14 Aug 07 SHL fixme
       if (dcd) {
         BOOL tempsusp, tempfollow, temptop;

trunk/dll/walkem.c

@@ -18 +18 @@
   22 Mar 07 GKY Use QWL_USER
   20 Apr 07 SHL Avoid spurious add_udir error reports
+  16 Aug 07 SHL Update add_setups for ticket# 109
 
 ***********************************************************************/
@@ -24 +25 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
+#define INCL_SHLERRORS                  // PMERR_NOT_IN_IDX
 #include <os2.h>
 
@@ -62 +64 @@
 static ULONG WalkFontSize = sizeof(WalkFont);
 
+/**
+ * States names management
+ */
+
+static BOOL fSetupsLoaded;
+static LINKDIRS *pFirstSetup;
+static const PSZ pszLastSetups = "LastSetups";
+// // 18 Aug 07 SHL fixme to stop supporting old style 1 year from now?
+static const ULONG ulOldSetupsBytes = 100 * 13; // Prior to 3.0.7
+
+/**
+ * Fill States drop down list with known state names
+ */
+
+VOID fill_setups_list(VOID)
+{
+  WinSendMsg(hwndStatelist, LM_DELETEALL, MPVOID, MPVOID);
+  if (fUserComboBox) {
+    LINKDIRS *pld;
+    load_setups();
+    for (pld = pFirstSetup; pld; pld = pld->next) {
+      // DbgMsg(pszSrcFile, __LINE__, "Inserted %s", pld->path);
+      WinSendMsg(hwndStatelist,
+                 LM_INSERTITEM,
+                 MPFROM2SHORT(LIT_SORTASCENDING, 0),
+                 MPFROMP(pld->path));
+    }
+    WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
+  }
+}
+
+/**
+ * Lookup setup and do requested action
+ * @param - action, Support old/new style storage method
+ * @return 1 if found and action OK, 0 if not found and action OK, -1 if error during action
+ */
+
+#define LS_FIND         0
+#define LS_ADD          1
+#define LS_DELETE       2
+
+static INT lookup_setup(PSZ name, UINT action)
+{
+  LINKDIRS *pld;
+  LINKDIRS *pldLast = NULL;
+
+  if (!name || !*name) {
+    Runtime_Error(pszSrcFile, __LINE__, "no data");
+    return -1;
+  }
+
+  load_setups();
+
+  for (pld = pFirstSetup; pld; pld = pld->next) {
+    if (!stricmp(pld->path, name)) {
+      if (action == LS_DELETE) {
+        if (pldLast)
+          pldLast->next = pld->next;
+        else
+          pFirstSetup = pld->next;
+        xfree(pld->path);
+        xfree(pld);
+      }
+      return 1;                         // Found or added
+    }
+    pldLast = pld;                      // In case deleting
+  } // for
+
+  // Not found
+  if (action == LS_ADD) {
+    pld = xmalloc(sizeof(LINKDIRS), pszSrcFile, __LINE__);
+    if (!pld)
+      return -1;
+    pld->path = xstrdup(name, pszSrcFile, __LINE__);
+    if (!pld->path) {
+      xfree(pld);
+      return -1;
+    }
+    // Insert at front of list - drop down will sort
+    pld->next = pFirstSetup;
+    pFirstSetup = pld;
+    return 0;
+  }
+
+  return FALSE;                         // Not found
+}
+
+/**
+ * Load state names from ini
+ * Support old/new style storage method
+ */
+
 VOID load_setups(VOID)
 {
-  ULONG len = sizeof(lastsetups);
-
-  memset(lastsetups, 0, len);
-  PrfQueryProfileData(fmprof, FM3Str, "LastSetups", lastsetups, &len);
-  len = sizeof(INT);
-  lastsetup = 0;
-  PrfQueryProfileData(fmprof, FM3Str, "LastSetup", &lastsetup, &len);
-  loadedsetups = TRUE;
+  ULONG ulDataBytes;
+  ULONG l;
+  PSZ pszBuf;
+  PSZ psz;
+  LINKDIRS *pld;
+
+  if (fSetupsLoaded)
+    return;
+
+  if (!PrfQueryProfileSize(fmprof, FM3Str, pszLastSetups, &ulDataBytes)) {
+    // fixme to use generic hab
+    ERRORID eid = WinGetLastError((HAB)0);
+    if ((eid & 0xffff) != PMERR_NOT_IN_IDX) {
+      Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileSize returned %u", eid);
+      return;
+    }
+  }
+
+  if (ulDataBytes == 0) {
+    Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileSize reported 0 bytes");
+    return;
+  }
+
+  pszBuf = xmalloc(ulDataBytes + 1, pszSrcFile, __LINE__);      // One extra for end marker
+  if (!pszBuf)
+    return;
+  l = ulDataBytes;
+  if (!PrfQueryProfileData(fmprof, FM3Str, pszLastSetups, pszBuf, &l)) {
+    Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "PrfQueryProfileData");
+    xfree(pszBuf);
+    return;
+  }
+
+  if (ulDataBytes != l) {
+    Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileData reported %u expected %u", l, ulDataBytes);
+    xfree(pszBuf);
+    return;
+  }
+
+  *(pszBuf + ulDataBytes) = 0;                  // Insert end marker
+
+  psz = pszBuf;
+  if (!*psz && ulDataBytes == ulOldSetupsBytes)
+    psz += 13;                  // Rarely used 1st fixed width entry prior to 3.0.7
+
+  while (*psz) {
+    pld = xmalloc(sizeof(LINKDIRS), pszSrcFile, __LINE__);
+    if (!pld) {
+      xfree(pszBuf);
+      return;
+    }
+    pld->path = xstrdup(psz, pszSrcFile, __LINE__);
+    if (!pld->path) {
+      xfree(pszBuf);
+      xfree(pld);
+      return;
+    }
+
+    // Insert at front of list - drop down will sort
+    pld->next = pFirstSetup;
+    pFirstSetup = pld;
+    // DbgMsg(pszSrcFile, __LINE__, "Inserted %s", pld->path);
+
+    if (ulDataBytes == ulOldSetupsBytes)
+      psz += 13;                        // Buffers fixed width prior to 3.0.7
+    else
+      psz += strlen(psz) + 1;
+  } // while
+
+  xfree(pszBuf);
+
+  fSetupsLoaded = TRUE;
 }
 
 VOID save_setups(VOID)
 {
-  if (!loadedsetups)
+  ULONG ulBufBytes;
+  ULONG ulFillBytes;
+  ULONG l;
+  PSZ pszBuf;
+  PSZ psz;
+  LINKDIRS *pld;
+
+  if (!fSetupsLoaded)
     return;
-  PrfWriteProfileData(fmprof,
-                      FM3Str,
-                      "LastSetups", lastsetups, (ULONG) sizeof(lastsetups));
-  PrfWriteProfileData(fmprof,
-                      FM3Str, "LastSetup", &lastsetup, (ULONG) sizeof(INT));
-}
-
-BOOL add_setup(CHAR * name)
-{
-  INT x;
-
-  if (!name || !*name)
-    return FALSE;
-  if (!loadedsetups)
-    load_setups();
-  for (x = 0; x < MAXNUMSETUPS; x++) {
-    if (!stricmp(lastsetups[x], name))
-      return FALSE;
-  }
-  lastsetup++;
-  if (lastsetup >= MAXNUMSETUPS)
-    lastsetup = 0;
-  strcpy(lastsetups[lastsetup], name);
-  return TRUE;
-}
-
-BOOL remove_setup(CHAR * name)
-{
-  INT x, y;
-
-  if (!name || !*name)
-    return FALSE;
-  if (!loadedsetups)
-    load_setups();
-  for (x = 0; x < MAXNUMSETUPS; x++) {
-    if (!stricmp(lastsetups[x], name)) {
-      *lastsetups[x] = 0;
-      for (y = x + 1; y < MAXNUMSETUPS; y++)
-        strcpy(lastsetups[y - 1], lastsetups[y]);
-      *lastsetups[MAXNUMSETUPS - 1] = 0;
-      if (lastsetup >= x)
-        lastsetup--;
-      return TRUE;
-    }
-  }
-  return FALSE;
+
+  ulBufBytes = 0;
+  for (pld = pFirstSetup; pld; pld = pld->next) {
+    ulBufBytes += strlen(pld->path) + 1;
+  } // for
+
+  if (!ulBufBytes)
+    pszBuf = NULL;
+  else {
+    // Ensure different than size prior to 3.0.7
+    ulFillBytes = ulBufBytes == ulOldSetupsBytes ? 1 : 0;
+    pszBuf = xmalloc(ulBufBytes + ulFillBytes, pszSrcFile, __LINE__);
+    if (!pszBuf)
+      return;
+
+    psz = pszBuf;
+    for (pld = pFirstSetup; pld; pld = pld->next) {
+      l = strlen(pld->path) + 1;
+      memcpy(psz, pld->path, l);
+      psz += l;
+    } // for
+    if (ulFillBytes)
+      *psz = 0;
+  }
+
+  if (!PrfWriteProfileData(fmprof,
+                           FM3Str,
+                            pszLastSetups, pszBuf, ulBufBytes)) {
+    // Win_Error(pszSrcFile, __LINE__, HWND_DESKTOP, HWND_DESKTOP, "PrfWriteProfileData");
+    ERRORID eid = WinGetLastError((HAB)0);
+    if ((eid & 0xffff) != PMERR_NOT_IN_IDX)
+      Runtime_Error(pszSrcFile, __LINE__, "PrfWriteProfileData returned %u", eid);
+  }
+
+  // Delete obsolete INI entry
+  PrfWriteProfileData(fmprof, FM3Str, "LastSetup", NULL, 0);
+}
+
+/**
+ * Add named state to setups list
+ * @return same as lookup_setup
+ */
+
+INT add_setup(PSZ name)
+{
+  return lookup_setup(name, LS_ADD);
+}
+
+/**
+ * Delete named state from setups list
+ * @return same as lookup_setup
+ */
+
+INT remove_setup(PSZ name)
+{
+  return lookup_setup(name, LS_DELETE);
 }