[patch] the wow-patch

wow.new.patch (text/plain), 3.10 KB, created by Matthias Nagel on 2006-03-27 12:18:22 UTC

--- wine/libs/wine/mmap.c.orig	2006-01-27 04:58:28.000000000 -0900
+++ wine/libs/wine/mmap.c	2006-01-27 05:00:46.000000000 -0900
@@ -164,7 +164,26 @@
 
 #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
  *
@@ -212,6 +231,8 @@
             return start;
 #endif
     }
+     if ((start == NULL) && !(flags & MAP_FIXED))
+	     start = get_anon_mmap_null_address(size);
     return mmap( start, size, prot, flags, fdzero, 0 );
 #else
     return (void *)-1;
--- wine/dlls/x11drv/opengl.c.orig	2006-01-27 04:58:26.000000000 -0900
+++ wine/dlls/x11drv/opengl.c	2006-01-27 05:00:46.000000000 -0900
@@ -199,6 +199,12 @@
     dump_PIXELFORMATDESCRIPTOR((const PIXELFORMATDESCRIPTOR *) ppfd);
   }
 
+  if (ppfd->dwFlags & PFD_DRAW_TO_BITMAP) {
+    ERR("Flag not supported !\n");
+    /* Should SetError here... */
+    return 0;
+  }
+
   /* Now, build the request to GLX */
   
   if (ppfd->iPixelType == PFD_TYPE_COLORINDEX) {
--- wine/dlls/opengl32/wgl.c.orig	2006-01-27 04:58:22.000000000 -0900
+++ wine/dlls/opengl32/wgl.c	2006-01-27 05:00:46.000000000 -0900
@@ -129,11 +129,11 @@
 }
 
 
-/* retrieve the GLX drawable to use on a given DC */
+/* retrieve the X drawable to use on a given DC */
 inline static Drawable get_drawable( HDC hdc )
 {
-    GLXDrawable drawable;
-    enum x11drv_escape_codes escape = X11DRV_GET_GLX_DRAWABLE;
+    Drawable drawable;
+    enum x11drv_escape_codes escape = X11DRV_GET_DRAWABLE;
 
     if (!ExtEscape( hdc, X11DRV_ESCAPE, sizeof(escape), (LPCSTR)&escape,
                     sizeof(drawable), (LPSTR)&drawable )) drawable = 0;
@@ -546,8 +546,6 @@
       }
       TRACE(" make current for dis %p, drawable %p, ctx %p\n", ctx->display, (void*) drawable, ctx->ctx);
       ret = glXMakeCurrent(ctx->display, drawable, ctx->ctx);
-      if(ret && type == OBJ_MEMDC)
-          glDrawBuffer(GL_FRONT_LEFT);
   }
   LEAVE_GL();
   TRACE(" returning %s\n", (ret ? "True" : "False"));
--- wine/loader/preloader.c.orig	2006-01-27 04:58:29.000000000 -0900
+++ wine/loader/preloader.c	2006-01-27 05:00:46.000000000 -0900
@@ -109,8 +109,8 @@
 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 */
 };