fix: windows xp support

yapb · May 16, 2024 · d35f784 · d35f784
1 parent 9cac79a
commit d35f784
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/crlib/logger.h b/crlib/logger.h
@@ -73,10 +73,6 @@ class SimpleLogger final : public Singleton <SimpleLogger> {
       auto msg = strings.format (fmt, cr::forward <Args> (args)...);
 
       logToFile ("FATAL", msg);
-
-      if (printFun_) {
-         printFun_ (msg);
-      }
       plat.abort (msg);
    }
 

diff --git a/crlib/platform.h b/crlib/platform.h
@@ -296,17 +296,22 @@ struct Platform : public Singleton <Platform> {
    // helper platform-dependant functions
    template <typename U> bool isValidPtr (U *ptr) {
 #if defined(CR_WINDOWS)
+#if defined(CR_HAS_WINXP_SUPPORT)
+      if (IsBadCodePtr (reinterpret_cast <FARPROC> (ptr))) {
+         return false;
+      }
+#else
       MEMORY_BASIC_INFORMATION mbi {};
 
       if (VirtualQuery (reinterpret_cast <LPVOID> (ptr), &mbi, sizeof (mbi))) {
-         auto mask = PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY;
-         auto result = !(mbi.Protect & mask);
+         auto result = (mbi.Protect & PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY | PAGE_EXECUTE_READ | PAGE_EXECUTE_READWRITE | PAGE_EXECUTE_WRITECOPY);
 
          if (mbi.Protect & (PAGE_GUARD | PAGE_NOACCESS)) {
-            return !result;
+            result = false;
          }
-         return !result;
+         return result;
       }
+#endif
 #else
       (void) (ptr);
 #endif