feat: add option to disable VirtualAlloc2

Curve · Dec 25, 2023 · b8abe1c · b8abe1c
1 parent 107b4ef
commit b8abe1c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,8 +5,9 @@ project(lime LANGUAGES CXX VERSION 2.3)
 # Library options
 # --------------------------------------------------------------------------------------------------------
 
-option(lime_tests               "Build tests"                                        OFF)
-option(lime_static_entrypoint   "Use platform independent entrypoint implementation" OFF)
+option(lime_tests               "Build tests"                                         OFF)
+option(lime_no_alloc2           "Disables VirtualAlloc2 (may fix issues with wine)"   OFF)
+option(lime_static_entrypoint   "Use platform independent entrypoint implementation"  OFF)
 
 # --------------------------------------------------------------------------------------------------------
 # CMake options
@@ -107,13 +108,17 @@ endif()
 target_sources(${PROJECT_NAME} PRIVATE ${src})
 
 # --------------------------------------------------------------------------------------------------------
-# Setup cross-platform entrypoint
+# Setup compile definitions
 # --------------------------------------------------------------------------------------------------------
 
 if (lime_static_entrypoint)
   target_compile_definitions(${PROJECT_NAME} PUBLIC LIME_STATIC_ENTRYPOINT)
 endif()
 
+if (lime_no_alloc2)
+  target_compile_definitions(${PROJECT_NAME} PUBLIC LIME_DISABLE_ALLOC2)
+endif()
+
 # --------------------------------------------------------------------------------------------------------
 # Setup tests
 # --------------------------------------------------------------------------------------------------------

diff --git a/src/page.win.cpp b/src/page.win.cpp
@@ -217,6 +217,9 @@ namespace lime
     std::shared_ptr<page> page::allocate<alloc_policy::nearby>(std::uintptr_t where, std::size_t size,
                                                                protection protection)
     {
+#ifdef LIME_DISABLE_ALLOC2
+        return nullptr;
+#else
         MEM_EXTENDED_PARAMETER param{};
         MEM_ADDRESS_REQUIREMENTS requirements{};
 
@@ -253,5 +256,6 @@ namespace lime
         }
 
         return impl::from(alloc, size, protection);
+#endif
     }
 } // namespace lime