Changeset 789 for trunk/dll/notebook.c

Timestamp:

Aug 20, 2007, 1:39:25 AM (18 years ago)

Author:

Steven Levine

Message:

Rework SaveDirCnrState to return better error info
Make FILESTOGET_MIN/MAX to avoid hardcoded numbers
Ensure FilesToGet in valid range on init
Correct load_setups error reporting

File:

• trunk/dll/notebook.c (modified) (5 diffs)

trunk/dll/notebook.c

@@ -17 +17 @@
   03 Aug 07 GKY Enlarged and made setable everywhere Findbuf (speed file loading)
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
-  13 Aug 07 SHL Rework FileToGet min/max to match how DosFindFirst/Next works
+  13 Aug 07 SHL Rework FilesToGet min/max to match how DosFindFirst/Next works
+  19 Aug 07 SHL Sync with SaveDirCnrState mods
 
 ***********************************************************************/
@@ -32 +33 @@
 #include "fm3dlg.h"
 #include "fm3str.h"
-
-#define FILESTOGET_MIN  256
-#define FILESTOGET_MAX  4096
 
 #pragma data_seg(DATA2)
@@ -314 +312 @@
                         &fForceLower, sizeof(BOOL));
     {
-      ULONG temp = 0;
-
       WinSendDlgItemMsg(hwnd, CFGS_FILESTOGET, SPBM_QUERYVALUE,
-                        MPFROMP(&temp), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
-      if (temp < FILESTOGET_MIN)
-        temp = FILESTOGET_MIN;
-      else if (temp > FILESTOGET_MAX)
-        temp = FILESTOGET_MAX;
-      FilesToGet = temp;
+                        MPFROMP(&FilesToGet), MPFROM2SHORT(0, SPBQ_DONOTUPDATE));
+      if (FilesToGet < FILESTOGET_MIN)
+        FilesToGet = FILESTOGET_MIN;
+      else if (FilesToGet > FILESTOGET_MAX)
+        FilesToGet = FILESTOGET_MAX;
       PrfWriteProfileData(fmprof,
                           appname, "FilesToGet", &FilesToGet, sizeof(ULONG));
@@ -1105 +1100 @@
         fSyncUpdates = dummy;
         if (hwndMain && !strcmp(realappname, FM3Str)) {
-          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT))) {
-            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+          if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+            PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
             PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
           }
@@ -2642 +2637 @@
                         &detailsattr, sizeof(BOOL));
     if (hwndMain) {
-      if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT))) {
-        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2L));
+      if (SaveDirCnrState(hwndMain, GetPString(IDS_FM2TEMPTEXT)) > 0) {
+        PostMsg(MainObjectHwnd, UM_RESTORE, MPVOID, MPFROMLONG(2));
         PostMsg(hwndMain, UM_RESTORE, MPVOID, MPVOID);
       }