[patch] The patch

wow_patch_0.9.16.diff (text/plain), 2.72 KB, created by Andrew Riedi on 2006-07-06 16:22:38 UTC

diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
index 2dd59a8..9e25698 100644
--- a/dlls/opengl32/wgl.c
+++ b/dlls/opengl32/wgl.c
@@ -590,7 +590,6 @@ BOOL WINAPI wglMakeCurrent(HDC hdc,
       if(ret && type == OBJ_MEMDC)
       {
           ctx->do_escape = TRUE;
-          glDrawBuffer(GL_FRONT_LEFT);
       }
   }
   LEAVE_GL();
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 2fe6c9d..327a612 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -607,7 +607,7 @@ XVisualInfo *X11DRV_setup_opengl_visual(
 {
     XVisualInfo *visual = NULL;
     /* In order to support OpenGL or D3D, we require a double-buffered visual and stencil buffer support, */
-    int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 24, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None};
+    int dblBuf[] = {GLX_RGBA,GLX_DEPTH_SIZE, 32, GLX_STENCIL_SIZE, 8, GLX_ALPHA_SIZE, 8, GLX_DOUBLEBUFFER, None};
     if (!has_opengl()) return NULL;
 
     wine_tsx11_lock();
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index 16bf302..18f4c1c 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -183,7 +183,26 @@ static int try_mmap_fixed (void *addr, s
 
 #endif  /* (__svr4__ || __NetBSD__) && !MAP_TRYFIXED */
 
+static void *get_anon_mmap_null_address(size_t size)
+{
+    static int got_override = 0;
+    static void *low_alloc_ptr = NULL;
+    void * current_low_alloc_ptr;
+
+    if (!got_override)
+    {
+            low_alloc_ptr = (void*)0x10000000;
+            got_override = 1;
+    }
+ 
+    current_low_alloc_ptr = low_alloc_ptr;
+
+    if (low_alloc_ptr)
+        low_alloc_ptr += size;
 
+    return current_low_alloc_ptr;
+   }
+ 
 /***********************************************************************
  *		wine_anon_mmap
  *
@@ -213,6 +232,8 @@ #elif defined(__svr4__) || defined(__Net
             return start;
 #endif
     }
+     if ((start == NULL) && !(flags & MAP_FIXED))
+	     start = get_anon_mmap_null_address(size);
     return mmap( start, size, prot, flags, get_fdzero(), 0 );
 }
 
diff --git a/loader/preloader.c b/loader/preloader.c
index 274d858..29d61bb 100644
--- a/loader/preloader.c
+++ b/loader/preloader.c
@@ -109,8 +109,8 @@ #endif
 static struct wine_preload_info preload_info[] =
 {
     { (void *)0x00000000, 0x00110000 },  /* DOS area */
-    { (void *)0x7ffe0000, 0x01020000 },  /* shared user data + shared heap */
-    { (void *)0x00110000, 0x1fef0000 },  /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */
+    { (void *)0x80000000, 0x01000000 },  /* shared user data + shared heap */
+    { (void *)0x10000000, 0x00f00000 },  /* PE exe range (may be set with WINEPRELOADRESERVE), defaults to 512mb */
     { 0, 0 }                             /* end of list */
 };