Changeset 1627 for trunk/dll/systemf.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/systemf.c (modified) (4 diffs)

trunk/dll/systemf.c

@@ -37 +37 @@
   20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
                 by temp file creation failures.
+  26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
+                xDosAlloc* wrappers.
 
 ***********************************************************************/
@@ -768 +770 @@
     hwnd = HWND_DESKTOP;
 
-  rc = DosAllocMem((PVOID)&pszPgm,
-                   MaxComLineStrg,
-                   PAG_COMMIT | PAG_READ | PAG_WRITE);
-  if (rc) {
-    Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
-    return -1;
-  }
-
+  if (xDosAllocMemLow((PVOID)&pszPgm,
+                       MaxComLineStrg,
+                       PAG_COMMIT | PAG_READ | PAG_WRITE,
+                       pszSrcFile,__LINE__))
+    return -1; //already complained
   *szSavedir = 0;
 
@@ -816 +815 @@
       temp = *p;
       if (temp) {
-        rc = DosAllocMem((PVOID)&pszArgs,
-                         MaxComLineStrg * 2,
-                         PAG_COMMIT | PAG_READ | PAG_WRITE);
-        if (rc)
-          Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+        if (xDosAllocMemLow((PVOID)&pszArgs, MaxComLineStrg * 2,
+                             PAG_COMMIT | PAG_READ | PAG_WRITE,
+                            pszSrcFile, __LINE__)) {
+          DosFreeMem(pszPgm);
+          return -1;   //already complained
+        }
       }
       else
@@ -958 +958 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MaxComLineStrg * 2,
-                       PAG_COMMIT | PAG_READ | PAG_WRITE);
-      if (rc) {
-        Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,GetPString(IDS_OUTOFMEMORY));
+      if (xDosAllocMemLow((PVOID) &pszArgs, MaxComLineStrg * 2,
+                           PAG_COMMIT | PAG_READ | PAG_WRITE,
+                           pszSrcFile, __LINE__)) {
         DosFreeMem(pszPgm);
-        return -1;
+        return -1;   //already complained
       }
       *pszArgs = 0;