Changeset 1627 for trunk/dll/eas.c

Timestamp:

Aug 26, 2011, 11:48:06 PM (14 years ago)

Author:

Gregg Young

Message:

Add a low mem version of xDosAlloc* wrappers; move error checking into all the xDosAlloc* wrappers. Ticket 471

File:

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

trunk/dll/eas.c

@@ -26 +26 @@
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
   23 Oct 10 GKY Added button to allow opening of a new file's eas from the EA dialog.
+  26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
+                xDosAlloc* wrappers.
 
 ***********************************************************************/
@@ -200 +202 @@
             ULONG ealen;
             CHAR *eaval;
-            APIRET rc;
 
             ealen = sizeof(FEA2LIST) + strlen(s) + 64;
-            rc = xDosAllocMem((PPVOID) & pfealist, ealen + 1,
+            if (!xDosAllocMem((PPVOID) & pfealist, ealen + 1,
                               PAG_COMMIT | PAG_READ | PAG_WRITE,
-                              pszSrcFile, __LINE__);
-            if (rc)
-              Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-                        GetPString(IDS_OUTOFMEMORY));
-            else {
+                              pszSrcFile, __LINE__)) {
               memset(pfealist, 0, ealen + 1);
               pfealist->cbList = ealen;
@@ -1108 +1105 @@
   }
 
-  rc = xDosAllocMem((PPVOID) & pfealist, ealen,
-                    PAG_COMMIT | PAG_READ | PAG_WRITE, pszSrcFile, __LINE__);
-  if (rc)
-    Dos_Error(MB_CANCEL, rc, HWND_DESKTOP, pszSrcFile, __LINE__,
-              GetPString(IDS_OUTOFMEMORY));
-  else {
+  if (!xDosAllocMem((PPVOID) & pfealist, ealen,
+                    PAG_COMMIT | PAG_READ | PAG_WRITE, pszSrcFile, __LINE__)) {
     memset(pfealist, 0, ealen);
     pfealist->list[0].oNextEntryOffset = 0;