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

trunk/dll/killproc.c

@@ -31 +31 @@
   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.
 
 ***********************************************************************/
@@ -127 +129 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                    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((PVOID) & pbh, USHRT_MAX + 4096,
+                    PAG_COMMIT | PAG_READ | PAG_WRITE, pszSrcFile, __LINE__)) {
     rc = DosQProcStatus((ULONG *)pbh, USHRT_MAX);
     if (!rc) {
@@ -196 +194 @@
 
   WinSendDlgItemMsg(hwnd, KILL_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
-  rc = xDosAllocMem((PVOID) & pbh, USHRT_MAX + 4096,
-                    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((PVOID) & pbh, USHRT_MAX + 4096,
+                    PAG_COMMIT | PAG_READ | PAG_WRITE, pszSrcFile, __LINE__)) {
     rc = DosQuerySysState(QS_PROCESS | QS_MTE, 0, 0, 0, pbh, USHRT_MAX);
     if (!rc) {