Changeset 1582 for trunk/src

Timestamp:

Oct 12, 2004, 12:56:56 AM (21 years ago)

Author:

bird

Message:

Fixed two fork related bugs.

Location:

trunk/src/emx/src/lib/sys

Files:

• DosAllocMemEx.c (modified) (4 diffs, 1 prop)
• DosEx.c (modified) (1 diff, 1 prop)
• libcfork.c (modified) (3 diffs, 1 prop)

trunk/src/emx/src/lib/sys/DosAllocMemEx.c

@@ -45 +45 @@
 *******************************************************************************/
 static int allocAtAddress(void *pvReq, ULONG cbReq, ULONG fReq);
+
+
+
+
 
 
@@ -82 +86 @@
      */
     FS_SAVE_LOAD();
+
+
+
+
+
+
+
+
+
     if (flFlags & OBJ_LOCATION)
         rc = allocAtAddress(*ppv, cb, flFlags & ~(OBJ_LOCATION | OBJ_FORK));
     else
         rc = DosAllocMem(ppv, cb, flFlags & ~(OBJ_FORK));
+
+
+
+
     if (rc)
     {
@@ -193 +210 @@
             }
 
-            rc = DosAllocMem(pvNew, cbReq, fReq);
+            rc = DosAllocMem(pvNew, cbReq, fReq);
             if (rc || (char *)pvNew > (char *)pvReq)
                 break; /* we failed! */
@@ -222 +239 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/src/emx/src/lib/sys/DosEx.c

@@ -976 +976 @@
 {
     int rc;
-    rc = DosAllocMemEx(&pEntry->u.MemAlloc.pv, pEntry->u.MemAlloc.cb, pEntry->u.MemAlloc.flFlags);
-    LIBC_ASSERTM(!rc, "DosAllocMemEx(={%p},%#lx,%#lx) -> rc=%d\n",
+    rc = DosAllocMemEx(&pEntry->u.MemAlloc.pv, pEntry->u.MemAlloc.cb,