Changeset 95804 in vbox

Timestamp:

Jul 25, 2022 12:29:26 PM (3 years ago)

Author:

vboxsync

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

152526

Message:

IPRT/alloc-win.cpp: Define USE_VIRTUAL_ALLOC in IPRT_NO_CRT mode; added missing USE_VIRTUAL_ALLOC variants of the exec allocator. bugref:10261

File:

• trunk/src/VBox/Runtime/r3/win/alloc-win.cpp (modified) (4 diffs)

trunk/src/VBox/Runtime/r3/win/alloc-win.cpp

@@ -29 +29 @@
 *   Header Files                                                                                                                 *
 *********************************************************************************************************************************/
-/*#define USE_VIRTUAL_ALLOC*/
+#ifdef IPRT_NO_CRT
+# define USE_VIRTUAL_ALLOC
+#endif
 #define LOG_GROUP RTLOGGROUP_MEM
 #include <iprt/win/windows.h>
@@ -52 +54 @@
      */
     AssertMsg(cb, ("Allocating ZERO bytes is really not a good idea! Good luck with the next assertion!\n"));
+#ifdef USE_VIRTUAL_ALLOC
+    cb = RT_ALIGN_Z(cb, PAGE_SIZE);
+    void *pv = VirtualAlloc(NULL, cb, MEM_COMMIT, PAGE_EXECUTE_READWRITE);
+    AssertMsg(pv, ("VirtualAlloc(%zx) failed!!!\n", cb));
+#else
     cb = RT_ALIGN_Z(cb, 32);
     void *pv = malloc(cb);
@@ -69 +76 @@
         }
     }
+#endif
     return pv;
 }
@@ -78 +86 @@
 
     if (pv)
+#ifdef USE_VIRTUAL_ALLOC
+        if (!VirtualFree(pv, 0, MEM_RELEASE))
+            AssertMsgFailed(("pv=%p lasterr=%d\n", pv, GetLastError()));
+#else
         free(pv);
+#endif
 }