Add patch to alter wglShareLists behavior when passing an used context.

README.md

@@ -35,9 +35,10 @@ Wine. All those differences are also documented on the
 Included bugfixes and improvements
 ==================================
 
-**Bugfixes and features included in the next upcoming release [6]:**
+**Bugfixes and features included in the next upcoming release [7]:**
 
 * Correctly treat '.' when checking for empty directories ([Wine Bug #26272](http://bugs.winehq.org/show_bug.cgi?id=26272))
+* Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](http://bugs.winehq.org/show_bug.cgi?id=11436))
 * Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](http://bugs.winehq.org/show_bug.cgi?id=30155))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](http://bugs.winehq.org/show_bug.cgi?id=35652))
 * Support for FIND_FIRST_EX_CASE_SENSITIVE flag in FindFirstFileExW

patches/Makefile

@@ -80,6 +80,7 @@ PATCHLIST := \
 	winex11-Limited_Resolutions.ok \
 	winex11-Window_Groups.ok \
 	winex11-XEMBED.ok \
+	winex11-wglShareLists.ok \
 	wpcap-Dynamic_Linking.ok \
 	ws2_32-Connect_Time.ok \
 	ws2_32-TransmitFile.ok \
@@ -1341,6 +1342,24 @@ winex11-XEMBED.ok:
 		echo '+    { "winex11-XEMBED", "Sebastian Lackner", "Enable/disable windows when they are (un)mapped by foreign applications." },'; \
 	) > winex11-XEMBED.ok
 
+# Patchset winex11-wglShareLists
+# |
+# | Included patches:
+# |   *	Only warn about used contexts in wglShareLists. [by Michael Müller]
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#11436] Do not fail when a used context is passed to wglShareLists
+# |
+# | Modified files:
+# |   *	dlls/winex11.drv/opengl.c
+# |
+.INTERMEDIATE: winex11-wglShareLists.ok
+winex11-wglShareLists.ok:
+	$(call APPLY_FILE,winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch)
+	@( \
+		echo '+    { "winex11-wglShareLists", "Michael Müller", "Only warn about used contexts in wglShareLists." },'; \
+	) > winex11-wglShareLists.ok
+
 # Patchset wpcap-Dynamic_Linking
 # |
 # | Included patches:

patches/winex11-wglShareLists/0001-winex11.drv-Only-warn-about-used-contexts-in-wglShar.patch

@@ -0,0 +1,39 @@
+From 010ac80315ceb39ec7ff8656cb09c5bc794b7564 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Sun, 28 Sep 2014 21:20:52 +0200
+Subject: winex11.drv: Only warn about used contexts in wglShareLists.
+
+---
+ dlls/winex11.drv/opengl.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
+index 71af3db..375aa5e 100644
+--- a/dlls/winex11.drv/opengl.c
++++ b/dlls/winex11.drv/opengl.c
+@@ -1927,18 +1927,16 @@ static BOOL glxdrv_wglShareLists(struct wgl_context *org, struct wgl_context *de
+      * current or when it hasn't shared display lists before.
+      */
+ 
+-    if((org->has_been_current && dest->has_been_current) || dest->has_been_current)
+-    {
+-        ERR("Could not share display lists, one of the contexts has been current already !\n");
+-        return FALSE;
+-    }
+-    else if(dest->sharing)
++    if(dest->sharing)
+     {
+         ERR("Could not share display lists because hglrc2 has already shared lists before\n");
+         return FALSE;
+     }
+     else
+     {
++        if(dest->has_been_current)
++            ERR("Recreating OpenGL context to share display lists, although the context has been current!\n");
++
+         describeContext(org);
+         describeContext(dest);
+ 
+-- 
+1.9.1
+

patches/winex11-wglShareLists/definition

@@ -0,0 +1,4 @@
+Author: Michael Müller
+Subject: Only warn about used contexts in wglShareLists.
+Revision: 1
+Fixes: [11436] Do not fail when a used context is passed to wglShareLists