WoW Players --> "Targeting" patch for Wine 0.9.13 here

[Phil Costin <philcostin@xxxxxxxxxxx>]

Not for mainline inclusion,

See attached

Regards,
Phil C

diff --git a/dlls/x11drv/opengl.c b/dlls/x11drv/opengl.c
index d0a3053..6d5ce8a 100644
--- a/dlls/x11drv/opengl.c
+++ b/dlls/x11drv/opengl.c
@@ -200,6 +200,12 @@ int X11DRV_ChoosePixelFormat(X11DRV_PDEV
     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) {
diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c
index 76fb7ff..25ab648 100644
--- a/libs/wine/mmap.c
+++ b/libs/wine/mmap.c
@@ -183,6 +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 +233,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 3439517..ca1b920 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 */
 };
 

_______________________________________________
wine-users mailing list
wine-users@xxxxxxxxxx
http://www.winehq.org/mailman/listinfo/wine-users