Changeset 789

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

Location:

trunk/dll

Files:

• fm3dll.h (modified) (3 diffs)
• init.c (modified) (3 diffs)
• mainwnd.c (modified) (10 diffs)
• notebook.c (modified) (5 diffs)
• walkem.c (modified) (2 diffs)

trunk/dll/fm3dll.h

@@ -58 +58 @@
   16 Aug 07 SHL Update for ticket# 109 - status update
   18 Aug 07 SHL Update for ticket# 31 - states length
+  19 Aug 07 SHL Move FILESTOGET_MIN/MAX here
+  19 Aug 07 SHL Update SaveDirCnrState return
 
 ***********************************************************************/
@@ -764 +766 @@
 MRESULT EXPENTRY DriveProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 MRESULT EXPENTRY BubbleProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
-BOOL SaveDirCnrState(HWND hwndClient, CHAR * name);
+INT SaveDirCnrState(HWND hwndClient, CHAR * name);
 MRESULT EXPENTRY LEDProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
 MRESULT EXPENTRY StatusProc(HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2);
@@ -1421 +1423 @@
 DATADEF INT butxsize, butysize;
 DATADEF FILE *LogFileHandle;
+
+#define FILESTOGET_MIN  256
+#define FILESTOGET_MAX  4096
+
 DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL;
 DATADEF long prnwidth, prnlength, prntmargin, prnbmargin, prnlmargin,

trunk/dll/init.c

@@ -30 +30 @@
   13 Aug 07 SHL Move #pragma alloc_text to end for OpenWatcom compat
   18 Aug 07 JBS Added code to read Details* keys from the INI file (Ticket 118)
+  19 Aug 07 SHL Ensure FilesToGet in valid range
 
 ***********************************************************************/
@@ -912 +913 @@
     fShowTarget = fDrivebarHelp = fCheckMM = TRUE;
   ulCnrType = CCS_EXTENDSEL;
-  FilesToGet = 10240;
+  FilesToGet = FILESTOGET_MIN;
   AutoviewHeight = 48;
   strcpy(printer, "PRN");
@@ -1271 +1272 @@
                       &size);
   size = sizeof(ULONG);
-  PrfQueryProfileData(fmprof, appname, "FilesToGet", (PVOID) & FilesToGet,
-                      &size);
+  PrfQueryProfileData(fmprof, appname, "FilesToGet", (PVOID)&FilesToGet,
+                      &size);
+  if (FilesToGet < FILESTOGET_MIN)
+    FilesToGet = FILESTOGET_MIN;
+  else if (FilesToGet > FILESTOGET_MAX)
+    FilesToGet = FILESTOGET_MAX;
   size = sizeof(BOOL);
   PrfQueryProfileData(fmprof, FM3Str, "AutoView", (PVOID) & fAutoView, &size);

trunk/dll/mainwnd.c

@@ -40 +40 @@
   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
+  19 Aug 07 SHL Rework SaveDirCnrState to return better error info
 
 ***********************************************************************/
@@ -2633 +2634 @@
  * @param hwndClient Client window handle
  * @param pszStateName State name to save, NULL to save global state
- * @returns TRUE if one or more directory container windows were saved
+ * @returns Number of directory container windows that were saved or -1 if error
  * @seealso RestoreDirCnrState
  */
@@ -2639 +2640 @@
 #define STATE_NAME_MAX_BYTES    256
 
-BOOL SaveDirCnrState(HWND hwndClient, PSZ pszStateName)
+INT SaveDirCnrState(HWND hwndClient, PSZ pszStateName)
 {
   HENUM henum;
@@ -2648 +2649 @@
   CHAR szDir[CCHMAXPATH];
   SWP swp;
-  BOOL fSaved = FALSE;
+  INT nSaved = 0;
   DIRCNRDATA *dcd;
 
@@ -2656 +2657 @@
     if (strlen(pszStateName) > sizeof(szPrefix) - 2) {
       Runtime_Error(pszSrcFile, __LINE__, "SaveDirCnrState");
-      return fSaved;;
+      return -1;
     }
     sprintf(szPrefix, "%s.", pszStateName);
@@ -2708 +2709 @@
             sprintf(szKey, "%sDirCnrDir.%lu", szPrefix, numsaves++);
             PrfWriteProfileString(fmprof, FM3Str, szKey, szDir);
-            fSaved = TRUE;
+            nSaved++;
           }
         }
@@ -2716 +2717 @@
   WinEndEnumWindows(henum);
 
-  if (fSaved) {
+  if (nSaved) {
     if (WinQueryWindowPos(hwndTree, &swp)) {
       sprintf(szKey, "%sLastTreePos", szPrefix);
@@ -2728 +2729 @@
   }
 
-  return fSaved;
+  return nSaved;
 }
 
@@ -4174 +4175 @@
         if (SHORT1FROMMP(mp1) == IDM_SAVEDIRCNRSTATE) {
           // Save
-          if (SaveDirCnrState(hwnd, szStateName)) {
+          INT nSaved = SaveDirCnrState(hwnd, szStateName);
+          if (nSaved > 0) {
             INT ret = add_setup(szStateName);
             if (ret == 0) {
@@ -4189 +4191 @@
           }
           else {
-            saymsg(MB_ENTER | MB_ICONASTERISK, hwnd,
+            saymsg(MB_ENTER | MB_ICONASTERISK,
+                   hwnd,
                    GetPString(IDS_WARNINGTEXT),
-                   "\"%s\" state save failed", szStateName);    // 15 Apr 07 SHL failed
+                   nSaved == 0 ?
+                     "Nothing to save" :
+                     "State data save failed");
             WinSetWindowText(hwndStatelist, GetPString(IDS_STATETEXT));
           }

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);
       }

trunk/dll/walkem.c

@@ -19 +19 @@
   20 Apr 07 SHL Avoid spurious add_udir error reports
   16 Aug 07 SHL Update add_setups for ticket# 109
+  19 Aug 07 SHL Correct load_setups error reporting
 
 ***********************************************************************/
@@ -171 +172 @@
     ERRORID eid = WinGetLastError((HAB)0);
     if ((eid & 0xffff) != PMERR_NOT_IN_IDX) {
-      Runtime_Error(pszSrcFile, __LINE__, "PrfQueryProfileSize returned %u", eid);
-      return;
-    }
+      // Get error info back
+      PrfQueryProfileSize(fmprof, FM3Str, pszLastSetups, &ulDataBytes);
+      Win_Error(HWND_DESKTOP, HWND_DESKTOP, pszSrcFile, __LINE__, "PrfQueryProfileSize");
+    }
+    else
+      fSetupsLoaded = TRUE;             // Nothing saved
+    return;
   }