commit 636cfc53890d0545ac9631fee0d182a468ef9a93
author Alexandre Julliard <julliard@winehq.org> Sat Aug 03 19:13:55 2002 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Aug 03 19:13:55 2002 +0000
tree 8c5c48297cb30c5f8061dedd7cade3f0dd034876
parent 00b088bc254aabe3012cd3cfcad198ad8c5a5193

Set user address space limit to 0xc0000000.

memory/virtual.c

diff --git a/memory/virtual.c b/memory/virtual.c
index 1cd8913..7751f97 100644
--- a/memory/virtual.c
+++ b/memory/virtual.c
@@ -110,6 +110,8 @@
 #endif  /* __i386__ */
 #define granularity_mask 0xffff  /* Allocation granularity (usually 64k) */
 
+#define ADDRESS_SPACE_LIMIT  ((void *)0xc0000000)  /* top of the user address space */
+
 #define ROUND_ADDR(addr,mask) \
    ((void *)((UINT_PTR)(addr) & ~(mask)))
 
@@ -998,9 +1000,12 @@
         else
             base = ROUND_ADDR( addr, page_mask );
         size = (((UINT_PTR)addr + size + page_mask) & ~page_mask) - (UINT_PTR)base;
-        if ((base <= (char *)granularity_mask) || (base + size < base))
+
+        /* disallow low 64k, wrap-around and kernel space */
+        if ((base <= (char *)granularity_mask) ||
+            (base + size < base) ||
+            (base + size > (char *)ADDRESS_SPACE_LIMIT))
         {
-            /* disallow low 64k and wrap-around */
             SetLastError( ERROR_INVALID_PARAMETER );
             return NULL;
         }
@@ -1287,7 +1292,7 @@
     char *base, *alloc_base = 0;
     UINT size = 0;
 
-    if (addr >= (void*)0xc0000000) return 0;
+    if (addr >= ADDRESS_SPACE_LIMIT) return 0;
 
     base = ROUND_ADDR( addr, page_mask );
 
@@ -1299,7 +1304,7 @@
     {
         if (!view)
         {
-            size = (char *)0xffff0000 - alloc_base;
+            size = (char *)ADDRESS_SPACE_LIMIT - alloc_base;
             break;
         }
         if ((char *)view->base > base)