ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ole32: Add support for loading wmf from contents streams to data cache. 

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>
This commit is contained in:
Sergio Gómez Del Real 2018-04-11 11:45:16 -05:00 committed by Alexandre Julliard
parent a1a99f014c
commit 0792209187
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dlls/ole32/datacache.c
View File

@ -570,6 +570,17 @@ static HRESULT synthesize_emf( HMETAFILEPICT data, STGMEDIUM *med )
GlobalUnlock( data ); GlobalUnlock( data );
return hr; return hr;
} }
#include <pshpack2.h>
struct meta_placeable
{
DWORD key;
WORD hwmf;
WORD bounding_box[4];
WORD inch;
DWORD reserved;
WORD checksum;
};
#include <poppack.h>
static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm ) static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm )
{ {
@ -583,25 +594,26 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm )
CLIPFORMAT clipformat; CLIPFORMAT clipformat;
static const LARGE_INTEGER offset_zero; static const LARGE_INTEGER offset_zero;
ULONG read; ULONG read;
struct meta_placeable mf_place;
if (cache_entry->load_stream_num == STREAM_NUMBER_CONTENTS)
{
FIXME( "Unimplemented for CONTENTS stream\n" );
return E_FAIL;
}
hr = IStream_Stat( stm, &stat, STATFLAG_NONAME ); hr = IStream_Stat( stm, &stat, STATFLAG_NONAME );
if (FAILED( hr )) return hr; if (FAILED( hr )) return hr;
if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS)
{
hr = read_clipformat( stm, &clipformat ); hr = read_clipformat( stm, &clipformat );
if (FAILED( hr )) return hr; if (hr != S_OK) return hr;
hr = IStream_Read( stm, &header, sizeof(header), &read ); hr = IStream_Read( stm, &header, sizeof(header), &read );
if (hr != S_OK || read != sizeof(header)) return E_FAIL; if (hr != S_OK) return hr;
}
else
{
hr = IStream_Read( stm, &mf_place, sizeof(mf_place), &read );
if (hr != S_OK) return hr;
}
hr = IStream_Seek( stm, offset_zero, STREAM_SEEK_CUR, &current_pos ); hr = IStream_Seek( stm, offset_zero, STREAM_SEEK_CUR, &current_pos );
if (FAILED( hr )) return hr; if (FAILED( hr )) return hr;
stat.cbSize.QuadPart -= current_pos.QuadPart; stat.cbSize.QuadPart -= current_pos.QuadPart;
hmfpict = GlobalAlloc( GMEM_MOVEABLE, sizeof(METAFILEPICT) ); hmfpict = GlobalAlloc( GMEM_MOVEABLE, sizeof(METAFILEPICT) );
@ -616,14 +628,23 @@ static HRESULT load_mf_pict( DataCacheEntry *cache_entry, IStream *stm )
} }
hr = IStream_Read( stm, bits, stat.cbSize.u.LowPart, &read ); hr = IStream_Read( stm, bits, stat.cbSize.u.LowPart, &read );
if (hr != S_OK || read != stat.cbSize.u.LowPart) hr = E_FAIL;
if (SUCCEEDED( hr )) if (SUCCEEDED( hr ))
{ {
/* FIXME: get this from the stream */
mfpict->mm = MM_ANISOTROPIC; mfpict->mm = MM_ANISOTROPIC;
/* FIXME: get this from the stream */
if (cache_entry->load_stream_num != STREAM_NUMBER_CONTENTS)
{
mfpict->xExt = header.dwObjectExtentX; mfpict->xExt = header.dwObjectExtentX;
mfpict->yExt = header.dwObjectExtentY; mfpict->yExt = header.dwObjectExtentY;
}
else
{
mfpict->xExt = ((mf_place.bounding_box[2] - mf_place.bounding_box[0])
* 2540) / mf_place.inch;
mfpict->yExt = ((mf_place.bounding_box[3] - mf_place.bounding_box[1])
* 2540) / mf_place.inch;
}
mfpict->hMF = SetMetaFileBitsEx( stat.cbSize.u.LowPart, bits ); mfpict->hMF = SetMetaFileBitsEx( stat.cbSize.u.LowPart, bits );
if (!mfpict->hMF) if (!mfpict->hMF)
hr = E_FAIL; hr = E_FAIL;
@ -912,18 +933,6 @@ end:
return hr; return hr;
} }
#include <pshpack2.h>
struct meta_placeable
{
DWORD key;
WORD hwmf;
WORD bounding_box[4];
WORD inch;
DWORD reserved;
WORD checksum;
};
#include <poppack.h>
static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream) static HRESULT save_mfpict(DataCacheEntry *entry, BOOL contents, IStream *stream)
{ {
HRESULT hr = S_OK; HRESULT hr = S_OK;