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

trunk/dll/datamin.c

@@ -35 +35 @@
                 one or more miniapp but not to FM/2
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast CHAR CONSTANT * as CHAR *.
+  26 Aug 11 GKY Add a low mem version of xDosAlloc* wrappers; move error checking into all the
+                xDosAlloc* wrappers.
 
 ***********************************************************************/
@@ -853 +855 @@
         MODINFO *pmi;
         ULONG numprocs = 0, numthreads = 0;
-        APIRET rc;
-
-        rc = xDosAllocMem((PVOID)&pbh, USHRT_MAX + 4096,
+
+        if (!xDosAllocMem((PVOID)&pbh, USHRT_MAX + 4096,
                           PAG_COMMIT | PAG_READ | PAG_WRITE,
-                          pszSrcFile, __LINE__);
-        if (rc)
-          Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
-                    GetPString(IDS_OUTOFMEMORY));
-        else {
+                          pszSrcFile, __LINE__)) {
           if (DosQProcStatus((ULONG *)pbh, USHRT_MAX))
             noqproc = TRUE;
@@ -893 +890 @@
         QSLREC *pmi;
         ULONG numprocs = 0, numthreads = 0;
-        APIRET rc;
-
-        rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
+
+        if (!xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
                           PAG_COMMIT | PAG_READ | PAG_WRITE,
-                          pszSrcFile, __LINE__);
-        if (rc)
-          Dos_Error(MB_CANCEL, rc, hwnd, pszSrcFile, __LINE__,
-                    GetPString(IDS_OUTOFMEMORY));
-        else { //2 Sep 07 GKY 0x05 = process & Mod data only
+                          pszSrcFile, __LINE__)) {
+          //2 Sep 07 GKY 0x05 = process & Mod data only
           if (DosQuerySysState(QS_PROCESS | QS_MTE, 0, 0, 0, pbh, USHRT_MAX))
             noqproc = TRUE;