1 files changed, 18 insertions, 3 deletions
diff --git a/CPP/Windows/MemoryLock.cpp b/CPP/Windows/MemoryLock.cpp
index 3cd82e5..d1b3bcc 100644
--- a/CPP/Windows/MemoryLock.cpp
+++ b/CPP/Windows/MemoryLock.cpp
@@ -2,6 +2,8 @@
 
 #include "StdAfx.h"
 
+#include "../../C/CpuArch.h"
+
 #include "MemoryLock.h"
 
 namespace NWindows {
@@ -75,6 +77,9 @@ typedef void (WINAPI * Func_RtlGetVersion) (OSVERSIONINFOEXW *);
   We suppose that Window 10 works incorrectly with "Large Pages" at:
     - Windows 10 1703 (15063)
     - Windows 10 1709 (16299)
+
+    - Windows 10 1809 (17763) on some CPUs that have no 1 GB page support.
+         We need more information about that new BUG in Windows.
 */
 
 unsigned Get_LargePages_RiskLevel()
@@ -87,9 +92,19 @@ unsigned Get_LargePages_RiskLevel()
   if (!func)
     return 0;
   func(&vi);
-  return (vi.dwPlatformId == VER_PLATFORM_WIN32_NT
-      && vi.dwMajorVersion + vi.dwMinorVersion == 10
-      && vi.dwBuildNumber <= 16299) ? 1 : 0;
+  if (vi.dwPlatformId != VER_PLATFORM_WIN32_NT)
+    return 0;
+  if (vi.dwMajorVersion + vi.dwMinorVersion != 10)
+    return 0;
+  if (vi.dwBuildNumber <= 16299)
+    return 1;
+
+  #ifdef MY_CPU_X86_OR_AMD64
+  if (!CPU_IsSupported_PageGB())
+    return 1;
+  #endif
+
+  return 0;
 }
 
 #endif