Dmitry Timoshkov : oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 25fd436db01d39b1a3feea0a878e70780b1ce5ef
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=25fd436db01d39b1a3feea0a87...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Thu May 17 18:30:07 2012 +0900

oleaut32: OleCreatePictureIndirect should set loadtime_format for a bitmap.

---

 dlls/oleaut32/olepicture.c |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index a00d463..395afa9 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -68,6 +68,12 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(olepicture);
 
+#define BITMAP_FORMAT_BMP   0x4d42 /* "BM" */
+#define BITMAP_FORMAT_JPEG  0xd8ff
+#define BITMAP_FORMAT_GIF   0x4947
+#define BITMAP_FORMAT_PNG   0x5089
+#define BITMAP_FORMAT_APM   0xcdd7
+
 #include "pshpack1.h"
 
 /* Header for Aldus Placable Metafiles - a standard metafile follows */
@@ -212,6 +218,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This)
   This->origWidth = bm.bmWidth;
   This->origHeight = bm.bmHeight;
 
+  TRACE("width %d, height %d, bpp %d\n", bm.bmWidth, bm.bmHeight, bm.bmBitsPixel);
+
   /* The width and height are stored in HIMETRIC units (0.01 mm),
      so we take our pixel width divide by pixels per inch and
      multiply by 25.4 * 100 */
@@ -222,6 +230,8 @@ static void OLEPictureImpl_SetBitmap(OLEPictureImpl *This)
   This->himetricHeight = ypixels_to_himetric(bm.bmHeight, hdcRef);
   This->stock_bitmap = GetCurrentObject( hdcRef, OBJ_BITMAP );
 
+  This->loadtime_format = BITMAP_FORMAT_BMP;
+
   DeleteDC(hdcRef);
 }
 
@@ -1322,17 +1332,6 @@ static HRESULT OLEPictureImpl_LoadAPM(OLEPictureImpl *This,
 }
 
 /************************************************************************
- * BITMAP FORMAT FLAGS -
- *   Flags that differentiate between different types of bitmaps.
- */
-
-#define BITMAP_FORMAT_BMP   0x4d42 /* "BM" */
-#define BITMAP_FORMAT_JPEG  0xd8ff
-#define BITMAP_FORMAT_GIF   0x4947
-#define BITMAP_FORMAT_PNG   0x5089
-#define BITMAP_FORMAT_APM   0xcdd7
-
-/************************************************************************
  * OLEPictureImpl_IPersistStream_Load (IUnknown)
  *
  * Loads the binary data from the IStream. Starts at current position.