Changeset 1447 for trunk/dll/errutil.c

Timestamp:

Jul 23, 2009, 11:16:05 PM (16 years ago)

Author:

Gregg Young

Message:

Add an reposition semaphore releases for Tree scan code to avoid hangs; Bypass DosGetMessage for HIMEM builds.

File:

• trunk/dll/errutil.c (modified) (4 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)
 
 ***********************************************************************/
@@ -120 +121 @@
   ULONG action;                         // Error action
   ULONG Locus;                          // Error location
+#ifndef HIMEM
   ULONG ulMsgLen;
   CHAR *pszMsgStart;
   CHAR *psz;
+#endif
   va_list va;
 
@@ -153 +156 @@
           GetPString(IDS_ERRCLASS1TEXT + (Class - 1)),
           GetPString(IDS_ERRACTION1TEXT + (action - 1)),
-          GetPString(IDS_ERRLOCUS1TEXT + (Locus - 1)));
+          GetPString(IDS_ERRLOCUS1TEXT + (Locus - 1)));
+#ifndef HIMEM
   pszMsgStart = szMsg + strlen(szMsg) + 1;
   // 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, "OSO001.MSG", &ulMsgLen)
       || !DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC,
                         "OSO001H.MSG", &ulMsgLen)) {
@@ -185 +188 @@
     }
   }
+#endif
 
   return showMsg(mb_type | MB_ICONEXCLAMATION, hwndOwner, GetPString(IDS_DOSERR2TEXT),