Changeset 1450 for trunk/dll/errutil.c

Timestamp:

Jul 28, 2009, 12:23:55 AM (16 years ago)

Author:

Gregg Young

Message:

Add a PCSZ srting for error messages; prevent error popup for locked text file on directory scan (scan works as expected anyway); Pass file names on stack which is in low mem for DosGetMessage.

File:

• trunk/dll/errutil.c (modified) (3 diffs)

trunk/dll/errutil.c

@@ -119 +119 @@
 {
   CHAR szMsg[4096];
-  CHAR *szMsgFile, *szMsgFileH;
+  CHAR szMsgFile[20], szMsgFileH[20];
   ULONG Class;                          // Error class
   ULONG action;                         // Error action
@@ -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);
@@ -169 +164 @@
       || !DosGetMessage(NULL, 0L, (PCHAR) pszMsgStart + 1, 1024, ulRC,
                         szMsgFileH, &ulMsgLen)) {
-    DosFreeMem(szMsgFile);
-    DosFreeMem(szMsgFileH);
     // Got message
     pszMsgStart[ulMsgLen + 1] = 0;      // Terminate