Changeset 1449

Timestamp:

Jul 26, 2009, 10:00:52 PM (16 years ago)

Author:

Gregg Young

Message:

Fix failure of containers to update when Tree container isn't open in FM2 lite; get DosGetMessage to work in HIMEM builds (Ticket 389, 390)

Location:

trunk/dll

Files:

• errutil.c (modified) (5 diffs)
• worker.c (modified) (3 diffs)

trunk/dll/errutil.c

@@ -33 +33 @@
   07 Feb 09 GKY Allow user to turn off alert and/or error beeps in settings notebook.
   08 Mar 09 GKY Remove Dos_Error2 (unused) and Runtime_Error2 (no advantage over using Runtime_Error)
-  23 Jul 09 GKY Bypass DosGetMessage for HIMEM builds (it traps)
+  23 Jul 09 GKY Add low mem buffers for the msg file name so DosGetMessage
+                works in HIMEM builds
 
 ***********************************************************************/
@@ -118 +119 @@
 {
   CHAR szMsg[4096];
+  CHAR *szMsgFile, *szMsgFileH;
   ULONG Class;                          // Error class
   ULONG action;                         // Error action
-  ULONG Locus;                          // Error location
-#ifndef HIMEM
+  ULONG Locus;                          // Error location
   ULONG ulMsgLen;
   CHAR *pszMsgStart;
   CHAR *psz;
-#endif
   va_list va;
 
@@ -131 +131 @@
     return MBID_ENTER;                  // Should not have been called
 
+  //Allocate low memory for DosGetMessage (16 bit)
+  DosAllocMem((PVOID) &szMsgFile, CCHMAXPATH,
+               PAG_COMMIT | PAG_READ | PAG_WRITE);
+  DosAllocMem((PVOID) &szMsgFileH, CCHMAXPATH,
+               PAG_COMMIT | PAG_READ | PAG_WRITE);
   // Format caller's message
   va_start(va, pszFmt);
@@ -157 +162 @@
           GetPString(IDS_ERRACTION1TEXT + (action - 1)),
           GetPString(IDS_ERRLOCUS1TEXT + (Locus - 1)));
-#ifndef HIMEM
   pszMsgStart = szMsg + strlen(szMsg) + 1;
+  strcpy(szMsgFile, "OSO001.MSG");
+  strcpy(szMsgFileH, "OSO001H.MSG");
   // Get message leaving space for NL separator
-  if (!DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC, "OSO001.MSG", &ulMsgLen)
+  if (!DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC, szMsgFile, &ulMsgLen)
       || !DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC,
-                        "OSO001H.MSG", &ulMsgLen)) {
+                        szMsgFileH, &ulMsgLen)) {
+    DosFreeMem(szMsgFile);
+    DosFreeMem(szMsgFileH);
     // Got message
     pszMsgStart[ulMsgLen + 1] = 0;      // Terminate
@@ -188 +196 @@
     }
   }
-#endif
 
   return showMsg(mb_type | MB_ICONEXCLAMATION, hwndOwner, GetPString(IDS_DOSERR2TEXT),

trunk/dll/worker.c

@@ -42 +42 @@
   08 Mar 09 GKY Additional strings move to PCSZs
   28 Jun 09 GKY Added AddBackslashToPath() to remove repeatative code.
+  26 Jul 09 GKY Fix failure of containers to update when Tree container isn't open in FM2 lite
 
 ***********************************************************************/
@@ -957 +958 @@
                                 GetPString(IDS_TOTEXT), newname);
                       }
-                      if ((driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) &&
+                      if (!hwndTree ||
+                          ((driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) &&
                           AddToList(wk->li->list[x],
-                                    &files, &numfiles, &numalloc))
+                                    &files, &numfiles, &numalloc)))
                         Broadcast(hab2,
                                   wk->hwndCnr,
                                   UM_UPDATERECORD,
                                   MPFROMP(wk->li->list[x]), MPVOID);
-                      if ((driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) &&
+                      if (!hwndTree ||
+                          (driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED) &&
                           AddToList(newname, &files, &numfiles, &numalloc))
                         Broadcast(hab2,
@@ -1073 +1076 @@
 
           if (files) {
-            if (driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED)
+            if (!hwndTree || (driveflags[*wk->li->targetpath - 'A'] & DRIVE_RSCANNED))
               Broadcast(hab2,
                         wk->hwndCnr,