ole32: Correctly save the dib format if its data has not been set.

Signed-off-by: Sergio Gómez Del Real <sdelreal@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ole32: Correctly save the dib format if its data has not been set.
179daf67 · Sergio Gómez Del Real · Alexandre Julliard · dfb09f48 · 179daf67
Commit 179daf67 authored Dec 14, 2017 by Sergio Gómez Del Real Committed by Alexandre Julliard Dec 14, 2017
Show whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

datacache.c dlls/ole32/datacache.c +8 -2

No files found.
--- a/dlls/ole32/datacache.c
+++ b/dlls/ole32/datacache.c
@@ -792,8 +792,14 @@ static void init_stream_header(DataCacheEntry *entry, PresentationDataHeader *he
 static HRESULT save_dib(DataCacheEntry *entry, BOOL contents, IStream *stream)
 {
    HRESULT hr = S_OK;
-    int data_size = GlobalSize(entry->stgmedium.u.hGlobal);
+    int data_size = 0;
-    BITMAPINFO *bmi = GlobalLock(entry->stgmedium.u.hGlobal);
+    BITMAPINFO *bmi = NULL;
+    if (entry->stgmedium.tymed != TYMED_NULL)
+    {
+        data_size = GlobalSize(entry->stgmedium.u.hGlobal);
+        bmi = GlobalLock(entry->stgmedium.u.hGlobal);
+    }
    if (!contents)
    {