[PATCH v4 5/5] win32u: Fix garbled 24-bit bitmap rendering

[Zowie van Dillen]

From: Zowie van Dillen

---
 dlls/win32u/opengl.c | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/dlls/win32u/opengl.c b/dlls/win32u/opengl.c
index 760873ef824..15bd98fb763 100644
--- a/dlls/win32u/opengl.c
+++ b/dlls/win32u/opengl.c
@@ -1371,11 +1371,16 @@ static BOOL flush_memory_dc( struct wgl_context *context, HDC hdc, BOOL write, v

free( temp_image );
             }
-            else
+            else if (info->bmiHeader.biBitCount == 24 || info->bmiHeader.biBitCount == 32)
             {
                 /* Normal case: 24 bpp or 32 bpp bitmap. */
-                if (write) funcs->p_glDrawPixels( width, height, GL_BGRA, GL_UNSIGNED_BYTE, bits.ptr );
-                else funcs->p_glReadPixels( 0, 0, width, height, GL_BGRA, GL_UNSIGNED_BYTE, bits.ptr );
+                UINT format = (info->bmiHeader.biBitCount == 24 ? GL_BGR : GL_BGRA);
+                if (write) funcs->p_glDrawPixels( width, height, format, GL_UNSIGNED_BYTE, bits.ptr );
+                else funcs->p_glReadPixels( 0, 0, width, height, format, GL_UNSIGNED_BYTE, bits.ptr );
+            }
+            else
+            {
+                WARN( "Unsupported bpp: %d", info->bmiHeader.biBitCount );
             }
         }
         GDI_ReleaseObj( dc->hBitmap );