From 54e477588c9e607b7453aa388bbb14e0915c0a43 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 13 Oct 1999 16:16:23 +0000
Subject: [PATCH] Backed out previous change (breaks with metafiles).

---
 objects/dib.c | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/objects/dib.c b/objects/dib.c
index 17efa78ac69..9fbb0cee543 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -135,39 +135,33 @@ INT WINAPI StretchDIBits(HDC hdc, INT xDst, INT yDst, INT widthDst,
                        const BITMAPINFO *info, UINT wUsage, DWORD dwRop )
 {
     DC *dc = DC_GetDCPtr( hdc );
-
     if(!dc) return FALSE;
 
-    if (widthDst == widthSrc && heightDst == heightSrc && dwRop == SRCCOPY) {
-       return SetDIBitsToDevice( hdc, xDst, yDst, widthDst, heightDst, 
-				 xSrc, ySrc, 0, info->bmiHeader.biHeight,
-				 bits, info, 0/*FIXME coloruse*/ );
-    }
-
     if(dc->funcs->pStretchDIBits)
     	   return dc->funcs->pStretchDIBits(dc, xDst, yDst, widthDst, 
 					    heightDst, xSrc, ySrc, widthSrc,
 					    heightSrc, bits, info, wUsage,
 					    dwRop);
     else { /* use StretchBlt32 */
-       HBITMAP hBitmap, hOldBitmap;
-       HDC hdcMem;
-       
-       hBitmap = CreateDIBitmap( hdc, &info->bmiHeader, CBM_INIT,
-				 bits, info, wUsage );
-       hdcMem = CreateCompatibleDC( hdc );
-       hOldBitmap = SelectObject( hdcMem, hBitmap );
-       /* Origin for DIBitmap is bottom left ! */
-       StretchBlt( hdc, xDst, yDst, widthDst, heightDst,
-		   hdcMem, xSrc, info->bmiHeader.biHeight - heightSrc - ySrc, 
-		   widthSrc, heightSrc, dwRop );
-       SelectObject( hdcMem, hOldBitmap );
-       DeleteDC( hdcMem );
-       DeleteObject( hBitmap );
+        HBITMAP hBitmap, hOldBitmap;
+	HDC hdcMem;
+    
+	hBitmap = CreateDIBitmap( hdc, &info->bmiHeader, CBM_INIT,
+				    bits, info, wUsage );
+	hdcMem = CreateCompatibleDC( hdc );
+	hOldBitmap = SelectObject( hdcMem, hBitmap );
+        /* Origin for DIBitmap is bottom left ! */
+        StretchBlt( hdc, xDst, yDst, widthDst, heightDst,
+                      hdcMem, xSrc, info->bmiHeader.biHeight - heightSrc - ySrc, 
+                      widthSrc, heightSrc, dwRop );
+	SelectObject( hdcMem, hOldBitmap );
+	DeleteDC( hdcMem );
+	DeleteObject( hBitmap );
+	return heightSrc;
     }
-    return heightSrc;
 }
 
+
 /***********************************************************************
  *           SetDIBits16    (GDI.440)
  */
-- 
GitLab