Added patch to fix regression caused by blacklisting supported OpenGL extensions.

README.md

@@ -39,9 +39,10 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 -----------------------------------
 
-**Bug fixes and features included in the next upcoming release [1]:**
+**Bug fixes and features included in the next upcoming release [2]:**
 
 * Calculate msvcrt exponential math operations with higher precision ([Wine Bug #37149](https://bugs.winehq.org/show_bug.cgi?id=37149))
+* Fix regression caused by blacklisting supported OpenGL extensions ([Wine Bug #38264](https://bugs.winehq.org/show_bug.cgi?id=38264))
 
 
 **Bug fixes and features in Wine Staging 1.7.40 [220]:**

debian/changelog

@@ -4,6 +4,7 @@ wine-staging (1.7.41) UNRELEASED; urgency=low
   * Added patch with stub for setupapi.SetupDiSetDeviceInstallParamsW.
   * Added first part of patchset containing various improvements for LsaLookupSids.
   * Added patch to calculate msvcrt exponential math operations with higher precision.
+  * Added patch to fix regression caused by blacklisting supported OpenGL extensions.
   * Added tests for RtlIpv6AddressToString and RtlIpv6AddressToStringEx.
   * Removed patches to fix invalid memory access in get_registry_locale_info (accepted upstream).
   * Removed patches to avoid repeated FIXMEs in PsLookupProcessByProcessId stub (accepted upstream).

patches/opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch

@@ -0,0 +1,29 @@
+From 8981a08726f04d4c0f8360dc469b532724199d62 Mon Sep 17 00:00:00 2001
+From: Sebastian Lackner <sebastian@fds-team.de>
+Date: Fri, 10 Apr 2015 08:17:22 +0200
+Subject: Revert "opengl32: Return a NULL pointer for functions requiring
+ unsupported or disabled extensions."
+
+This reverts commit bfd4836867d6d90eaeae6ccbc02e37678b59b8f1.
+---
+ dlls/opengl32/wgl.c | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c
+index 9482c75..1903807 100644
+--- a/dlls/opengl32/wgl.c
++++ b/dlls/opengl32/wgl.c
+@@ -875,10 +875,7 @@ PROC WINAPI wglGetProcAddress( LPCSTR name )
+         void *driver_func = funcs->wgl.p_wglGetProcAddress( name );
+ 
+         if (!is_extension_supported(ext_ret->extension))
+-        {
+             WARN("Extension %s required for %s not supported\n", ext_ret->extension, name);
+-            return NULL;
+-        }
+ 
+         if (driver_func == NULL)
+         {
+-- 
+2.3.5
+

patches/opengl32-Revert_Disable_Ext/definition

@@ -0,0 +1 @@
+Fixes: [38264] Fix regression caused by blacklisting supported OpenGL extensions

patches/patchinstall.sh

@@ -167,6 +167,7 @@ patch_enable_all ()
 	enable_nvcuvid_CUDA_Video_Support="$1"
 	enable_nvencodeapi_Video_Encoder="$1"
 	enable_ole32_CoWaitForMultipleHandles="$1"
+	enable_opengl32_Revert_Disable_Ext="$1"
 	enable_quartz_MediaSeeking_Positions="$1"
 	enable_regedit_String_Termination="$1"
 	enable_riched20_IText_Interface="$1"
@@ -568,6 +569,9 @@ patch_enable ()
 		ole32-CoWaitForMultipleHandles)
 			enable_ole32_CoWaitForMultipleHandles="$2"
 			;;
+		opengl32-Revert_Disable_Ext)
+			enable_opengl32_Revert_Disable_Ext="$2"
+			;;
 		quartz-MediaSeeking_Positions)
 			enable_quartz_MediaSeeking_Positions="$2"
 			;;
@@ -3666,6 +3670,21 @@ if test "$enable_ole32_CoWaitForMultipleHandles" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset opengl32-Revert_Disable_Ext
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#38264] Fix regression caused by blacklisting supported OpenGL extensions
+# |
+# | Modified files:
+# |   *	dlls/opengl32/wgl.c
+# |
+if test "$enable_opengl32_Revert_Disable_Ext" -eq 1; then
+	patch_apply opengl32-Revert_Disable_Ext/0001-Revert-opengl32-Return-a-NULL-pointer-for-functions-.patch
+	(
+		echo '+    { "Sebastian Lackner", "Revert \"opengl32: Return a NULL pointer for functions requiring unsupported or disabled extensions.\".", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset quartz-MediaSeeking_Positions
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3863,21 +3882,6 @@ if test "$enable_server_CreateProcess_ACLs" -eq 1; then
 	) >> "$patchlist"
 fi
 
-# Patchset server-OpenProcess
-# |
-# | This patchset fixes the following Wine bugs:
-# |   *	[#37087] Return an error when trying to open a terminated process
-# |
-# | Modified files:
-# |   *	server/process.c, server/process.h
-# |
-if test "$enable_server_OpenProcess" -eq 1; then
-	patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch
-	(
-		echo '+    { "Michael Müller", "server: Return error when opening a terminating process.", 3 },';
-	) >> "$patchlist"
-fi
-
 # Patchset server-Misc_ACL
 # |
 # | This patchset fixes the following Wine bugs:
@@ -3895,6 +3899,21 @@ if test "$enable_server_Misc_ACL" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset server-OpenProcess
+# |
+# | This patchset fixes the following Wine bugs:
+# |   *	[#37087] Return an error when trying to open a terminated process
+# |
+# | Modified files:
+# |   *	server/process.c, server/process.h
+# |
+if test "$enable_server_OpenProcess" -eq 1; then
+	patch_apply server-OpenProcess/0001-server-Return-error-when-opening-a-terminating-proce.patch
+	(
+		echo '+    { "Michael Müller", "server: Return error when opening a terminating process.", 3 },';
+	) >> "$patchlist"
+fi
+
 # Patchset server-JobObjects
 # |
 # | Modified files: