Vincent Povirk : gdiplus: Use the software method to draw HBITMAP-less bitmaps.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2a345f36e3548a91611f0ed219a3024983128dba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=2a345f36e3548a91611f0ed219...

Author: Vincent Povirk 
Date:   Mon Aug 16 14:53:07 2010 -0500

gdiplus: Use the software method to draw HBITMAP-less bitmaps.

---

dlls/gdiplus/graphics.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index e748477..8850110 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2046,7 +2046,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
             return GenericError;
         }
     }
-    else if (image->type == ImageTypeBitmap && ((GpBitmap*)image)->hbitmap)
+    else if (image->type == ImageTypeBitmap)
     {
         GpBitmap* bitmap = (GpBitmap*)image;
         int use_software=0;
@@ -2060,6 +2060,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image

if (imageAttributes ||
             (graphics->image && graphics->image->type == ImageTypeBitmap) ||
+            !((GpBitmap*)image)->hbitmap ||
             ptf[1].Y != ptf[0].Y || ptf[2].X != ptf[0].X)
             use_software = 1;