From 79ef408cd76d41c4d3ecfb0ac9f5534c8ea46503 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Mon, 29 Aug 2011 15:26:50 +0200
Subject: [PATCH] gdi32: Add a helper function to initialize DIB info from a
 bitmap object.

---
 dlls/gdi32/dibdrv/bitblt.c | 10 ++--------
 dlls/gdi32/dibdrv/dc.c     | 10 ++++++++--
 dlls/gdi32/dibdrv/dibdrv.h |  1 +
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c
index 646aaf0dc93..563cb0af0b3 100644
--- a/dlls/gdi32/dibdrv/bitblt.c
+++ b/dlls/gdi32/dibdrv/bitblt.c
@@ -621,10 +621,7 @@ DWORD dibdrv_GetImage( PHYSDEV dev, HBITMAP hbitmap, BITMAPINFO *info,
         BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP );
 
         if (!bmp) return ERROR_INVALID_HANDLE;
-        assert(bmp->dib);
-
-        if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields,
-                            bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 ))
+        if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 ))
         {
             ret = ERROR_BAD_FORMAT;
             goto done;
@@ -722,10 +719,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HBITMAP hbitmap, HRGN clip, BITMAPINFO *info
         BITMAPOBJ *bmp = GDI_GetObjPtr( hbitmap, OBJ_BITMAP );
 
         if (!bmp) return ERROR_INVALID_HANDLE;
-        assert(bmp->dib);
-
-        if (!init_dib_info( &stand_alone, &bmp->dib->dsBmih, bmp->dib->dsBitfields,
-                            bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, 0 ))
+        if (!init_dib_info_from_bitmapobj( &stand_alone, bmp, 0 ))
         {
             ret = ERROR_BAD_FORMAT;
             goto done;
diff --git a/dlls/gdi32/dibdrv/dc.c b/dlls/gdi32/dibdrv/dc.c
index 234f827996e..245e7c73601 100644
--- a/dlls/gdi32/dibdrv/dc.c
+++ b/dlls/gdi32/dibdrv/dc.c
@@ -211,6 +211,13 @@ BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *
     return init_dib_info( dib, &info->bmiHeader, bitfields, colors ? colorptr : NULL, colors, bits, flags );
 }
 
+BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags)
+{
+    assert(bmp->dib);
+    return init_dib_info( dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields,
+                          bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, flags );
+}
+
 static void clear_dib_info(dib_info *dib)
 {
     dib->color_table = NULL;
@@ -368,8 +375,7 @@ static HBITMAP dibdrv_SelectBitmap( PHYSDEV dev, HBITMAP bitmap )
     clear_dib_info(&pdev->brush_dib);
     pdev->brush_and_bits = pdev->brush_xor_bits = NULL;
 
-    if(!init_dib_info(&pdev->dib, &bmp->dib->dsBmih, bmp->dib->dsBitfields,
-                      bmp->color_table, bmp->nb_colors, bmp->dib->dsBm.bmBits, private_color_table))
+    if(!init_dib_info_from_bitmapobj(&pdev->dib, bmp, private_color_table))
         pdev->defer |= DEFER_FORMAT;
 
     GDI_ReleaseObj( bitmap );
diff --git a/dlls/gdi32/dibdrv/dibdrv.h b/dlls/gdi32/dibdrv/dibdrv.h
index 2e555e30a74..23a59ee0458 100644
--- a/dlls/gdi32/dibdrv/dibdrv.h
+++ b/dlls/gdi32/dibdrv/dibdrv.h
@@ -80,6 +80,7 @@ extern BOOL init_dib_info(dib_info *dib, const BITMAPINFOHEADER *bi, const DWORD
 extern BOOL init_dib_info_from_packed(dib_info *dib, const BITMAPINFOHEADER *bi, WORD usage, HPALETTE pal) DECLSPEC_HIDDEN;
 extern BOOL init_dib_info_from_bitmapinfo(dib_info *dib, const BITMAPINFO *info, void *bits,
                                           enum dib_info_flags flags) DECLSPEC_HIDDEN;
+extern BOOL init_dib_info_from_bitmapobj(dib_info *dib, BITMAPOBJ *bmp, enum dib_info_flags flags) DECLSPEC_HIDDEN;
 extern void free_dib_info(dib_info *dib) DECLSPEC_HIDDEN;
 extern void free_pattern_brush(dibdrv_physdev *pdev) DECLSPEC_HIDDEN;
 extern void copy_dib_color_info(dib_info *dst, const dib_info *src) DECLSPEC_HIDDEN;
-- 
2.11.4.GIT