Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats.

README.md

@@ -38,10 +38,11 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugfixes and features included in the next upcoming release [8]:**
+**Bugfixes and features included in the next upcoming release [9]:**
 
 * Add implementation for CreateThreadpool ([Wine Bug #35192](https://bugs.winehq.org/show_bug.cgi?id=35192))
 * Call DriverUnload function when unloading a device driver.
+* Fix arguments for OSMesaMakeCurrent when using 16 bit formats
 * Fix check for end_frame in RtlUnwindEx on x86_64. ([Wine Bug #34254](https://bugs.winehq.org/show_bug.cgi?id=34254))
 * Fix mouse jittering in Planetside 2 ([Wine Bug #32913](https://bugs.winehq.org/show_bug.cgi?id=32913))
 * Implement additional stubs for vcomp dlls ([Wine Bug #31640](https://bugs.winehq.org/show_bug.cgi?id=31640))

debian/changelog

@@ -5,6 +5,7 @@ wine-staging (1.7.36) UNRELEASED; urgency=low
   * Added patch to implement additional stubs for vcomp dlls.
   * Added patchset to implement Vista+ threadpool functions for work / timers.
   * Added patch to fix crash in Jedi Knight: Dark Forces II when winmm is set to native.
+  * Added patch to fix arguments for OSMesaMakeCurrent when using 16 bit formats.
  -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 25 Jan 2015 05:58:36 +0100
 
 wine-staging (1.7.35) unstable; urgency=low

patches/gdi32-OSMesaMakeCurrent/0001-gdi32-Fix-arguments-for-OSMesaMakeCurrent-when-using.patch

@@ -0,0 +1,38 @@
+From 8593f7d027c48153b038895e8bc0b8fca88fd666 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
+Date: Tue, 3 Feb 2015 11:07:38 +0100
+Subject: gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats.
+
+---
+ dlls/gdi32/dibdrv/opengl.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/dlls/gdi32/dibdrv/opengl.c b/dlls/gdi32/dibdrv/opengl.c
+index 28a03f4..a25da208 100644
+--- a/dlls/gdi32/dibdrv/opengl.c
++++ b/dlls/gdi32/dibdrv/opengl.c
+@@ -251,6 +251,7 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
+     HBITMAP bitmap;
+     BITMAPOBJ *bmp;
+     dib_info dib;
++    GLenum type;
+     BOOL ret = FALSE;
+ 
+     if (!context)
+@@ -281,7 +282,12 @@ static BOOL dibdrv_wglMakeCurrent( HDC hdc, struct wgl_context *context )
+ 
+         TRACE( "context %p bits %p size %ux%u\n", context, bits, width, height );
+ 
+-        ret = pOSMesaMakeCurrent( context->context, bits, GL_UNSIGNED_BYTE, width, height );
++        if (pixel_formats[context->format - 1].mesa == OSMESA_RGB_565)
++            type = GL_UNSIGNED_SHORT_5_6_5;
++        else
++            type = GL_UNSIGNED_BYTE;
++
++        ret = pOSMesaMakeCurrent( context->context, bits, type, width, height );
+         if (ret)
+         {
+             pOSMesaPixelStore( OSMESA_ROW_LENGTH, abs( dib.stride ) * 8 / dib.bit_count );
+-- 
+2.2.2
+

patches/gdi32-OSMesaMakeCurrent/definition

@@ -0,0 +1 @@
+Fixes: Fix arguments for OSMesaMakeCurrent when using 16 bit formats

patches/patchinstall.sh

@@ -91,6 +91,7 @@ patch_enable_all ()
 	enable_fonts_Missing_Fonts="$1"
 	enable_gdi32_MaxPixelFormats="$1"
 	enable_gdi32_MultiMonitor="$1"
+	enable_gdi32_OSMesaMakeCurrent="$1"
 	enable_gdiplus_GdipCreateRegionRgnData="$1"
 	enable_imagehlp_BindImageEx="$1"
 	enable_imm32_Cross_Thread_Access="$1"
@@ -296,6 +297,9 @@ patch_enable ()
 		gdi32-MultiMonitor)
 			enable_gdi32_MultiMonitor="$2"
 			;;
+		gdi32-OSMesaMakeCurrent)
+			enable_gdi32_OSMesaMakeCurrent="$2"
+			;;
 		gdiplus-GdipCreateRegionRgnData)
 			enable_gdiplus_GdipCreateRegionRgnData="$2"
 			;;
@@ -1516,6 +1520,18 @@ if test "$enable_gdi32_MultiMonitor" -eq 1; then
 	) >> "$patchlist"
 fi
 
+# Patchset gdi32-OSMesaMakeCurrent
+# |
+# | Modified files:
+# |   *	dlls/gdi32/dibdrv/opengl.c
+# |
+if test "$enable_gdi32_OSMesaMakeCurrent" -eq 1; then
+	patch_apply gdi32-OSMesaMakeCurrent/0001-gdi32-Fix-arguments-for-OSMesaMakeCurrent-when-using.patch
+	(
+		echo '+    { "Michael Müller", "gdi32: Fix arguments for OSMesaMakeCurrent when using 16 bit formats.", 1 },';
+	) >> "$patchlist"
+fi
+
 # Patchset gdiplus-GdipCreateRegionRgnData
 # |
 # | This patchset fixes the following Wine bugs: