Changeset 32707 in vbox for trunk/src/VBox/Runtime/r0drv/os2

Timestamp:

Sep 23, 2010 10:15:08 AM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

66136

Message:

IPRT: Added RTMemAllocEx[Tag] and RTMemFreeEx, only implemented in ring-0 only.

File:

• trunk/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp (modified) (1 diff)

trunk/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp

@@ -41 +41 @@
 
 
-PRTMEMHDR rtR0MemAlloc(size_t cb, uint32_t fFlags)
+int rtR0MemAllocEx(size_t cb, uint32_t fFlags, PRTMEMHDR *ppHdr)
 {
-    AssertReturn(!(fFlags & RTMEMHDR_FLAG_ANY_CTX), NULL);
+    if (fFlags & RTMEMHDR_FLAG_ANY_CTX)
+        return VERR_NOT_SUPPORTED;
 
     void *pv = NULL;
     APIRET rc = KernVMAlloc(cb + sizeof(RTMEMHDR), VMDHA_FIXED, &pv, (void **)-1, NULL);
-    if (!rc)
-    {
-        PRTMEMHDR pHdr = (PRTMEMHDR)pv;
-        pHdr->u32Magic   = RTMEMHDR_MAGIC;
-        pHdr->fFlags     = fFlags;
-        pHdr->cb         = cb;
-        pHdr->cbReq      = cb;
-        return pHdr;
-    }
-    return NULL;
+    if (RT_UNLIKELY(rc != NO_ERROR))
+        return RTErrConvertFromOS2(rc);
+
+    PRTMEMHDR   pHdr = (PRTMEMHDR)pv;
+    pHdr->u32Magic   = RTMEMHDR_MAGIC;
+    pHdr->fFlags     = fFlags;
+    pHdr->cb         = cb;
+    pHdr->cbReq      = cb;
+    *ppHdr = pHdr;
+    return VINF_SUCCESS;
 }