March 2015 - Wine-Commits - list.winehq.org

Huw Davies : ole32/tests: Add tests for loading a dib 'CONTENTS' stream.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: f57e08995a188fd8535a54252ec7537f737138dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f57e08995a188fd8535a54252… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:42 2015 +0000 ole32/tests: Add tests for loading a dib 'CONTENTS' stream. --- dlls/ole32/tests/ole2.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 114 insertions(+) diff --git a/dlls/ole32/tests/ole2.c b/dlls/ole32/tests/ole2.c index 05e8c4f..0c27bd1 100644 --- a/dlls/ole32/tests/ole2.c +++ b/dlls/ole32/tests/ole2.c @@ -31,6 +31,11 @@ #include "wine/test.h" +#include "initguid.h" + +DEFINE_GUID(CLSID_Picture_Metafile,0x315,0,0,0xc0,0,0,0,0,0,0,0x46); +DEFINE_GUID(CLSID_Picture_Dib,0x316,0,0,0xc0,0,0,0,0,0,0,0x46); + #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) #define DEFINE_EXPECT(func) \ @@ -1680,6 +1685,113 @@ static void test_data_cache(void) IStorage_Release(pStorage); } + +static const WCHAR CONTENTS[] = {'C','O','N','T','E','N','T','S',0}; + +/* 2 x 1 x 32 bpp dib. PelsPerMeter = 200x400 */ +static BYTE dib[] = +{ + 0x42, 0x4d, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x36, 0x00, 0x00, 0x00, 0x28, 0x00, + + 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x20, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc8, 0x00, + 0x00, 0x00, 0x90, 0x01, 0x00, 0x00, 0x00, 0x00, + + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, 0xff +}; + +static IStorage *create_storage( int num ) +{ + IStorage *stg; + IStream *stm; + HRESULT hr; + ULONG written; + + hr = StgCreateDocfile( NULL, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE | STGM_DELETEONRELEASE, 0, &stg ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_SetClass( stg, &CLSID_Picture_Dib ); + ok( hr == S_OK, "got %08x\n", hr); + hr = IStorage_CreateStream( stg, CONTENTS, STGM_READWRITE | STGM_SHARE_EXCLUSIVE | STGM_CREATE, 0, 0, &stm ); + ok( hr == S_OK, "got %08x\n", hr); + if (num == 1) /* Set biXPelsPerMeter = 0 */ + { + dib[0x26] = 0; + dib[0x27] = 0; + } + hr = IStream_Write( stm, dib, sizeof(dib), &written ); + ok( hr == S_OK, "got %08x\n", hr); + IStream_Release( stm ); + return stg; +} + +static void test_data_cache_dib_contents_stream(int num) +{ + HRESULT hr; + IUnknown *unk; + IPersistStorage *persist; + IDataObject *data; + IViewObject2 *view; + IStorage *stg; + FORMATETC fmt = {CF_DIB, NULL, DVASPECT_CONTENT, -1, TYMED_HGLOBAL }; + STGMEDIUM med; + CLSID cls; + SIZEL sz; + + hr = CreateDataCache( NULL, &CLSID_Picture_Metafile, &IID_IUnknown, (void *)&unk ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IPersistStorage, (void *)&persist ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IDataObject, (void *)&data ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + hr = IUnknown_QueryInterface( unk, &IID_IViewObject2, (void *)&view ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + + stg = create_storage( num ); + + hr = IPersistStorage_Load( persist, stg ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + IStorage_Release( stg ); + + hr = IPersistStorage_GetClassID( persist, &cls ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + ok( IsEqualCLSID( &cls, &CLSID_Picture_Dib ), "class id mismatch\n" ); + + hr = IDataObject_GetData( data, &fmt, &med ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (SUCCEEDED(hr)) + { + ok( med.tymed == TYMED_HGLOBAL, "got %x\n", med.tymed ); + ReleaseStgMedium( &med ); + } + + hr = IViewObject2_GetExtent( view, DVASPECT_CONTENT, -1, NULL, &sz ); + ok( SUCCEEDED(hr), "got %08x\n", hr ); + if (num == 0) + { + ok( sz.cx == 1000, "got %d\n", sz.cx ); + ok( sz.cy == 250, "got %d\n", sz.cy ); + } + else + { + HDC hdc = GetDC( 0 ); + LONG x = 2 * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + LONG y = 1 * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + ok( sz.cx == x, "got %d %d\n", sz.cx, x ); + ok( sz.cy == y, "got %d %d\n", sz.cy, y ); + + ReleaseDC( 0, hdc ); + } + + IViewObject2_Release( view ); + IDataObject_Release( data ); + IPersistStorage_Release( persist ); + IUnknown_Release( unk ); +} + static void test_default_handler(void) { HRESULT hr; @@ -2385,6 +2497,8 @@ START_TEST(ole2) ok_ole_success(hr, "CoRevokeClassObject"); test_data_cache(); + test_data_cache_dib_contents_stream( 0 ); + test_data_cache_dib_contents_stream( 1 ); test_default_handler(); test_runnable(); test_OleRun();

1 0

Huw Davies : ole32: A cache entry should hold the stream its data is from, not the top-level storage.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: a4e3668f3f4c554d1d7db079c3fffb98bc964afe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4e3668f3f4c554d1d7db079c… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:34 2015 +0000 ole32: A cache entry should hold the stream its data is from, not the top-level storage. --- dlls/ole32/datacache.c | 92 +++++++++++++++----------------------------------- 1 file changed, 27 insertions(+), 65 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d9754a3..d13230d 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -98,11 +98,11 @@ typedef struct DataCacheEntry /* cached data */ STGMEDIUM stgmedium; /* - * This storage pointer is set through a call to + * This stream pointer is set through a call to * IPersistStorage_Load. This is where the visual * representation of the object is stored. */ - IStorage *storage; + IStream *stream; /* connection ID */ DWORD id; /* dirty flag */ @@ -218,8 +218,8 @@ static const char * debugstr_formatetc(const FORMATETC *formatetc) static void DataCacheEntry_Destroy(DataCache *cache, DataCacheEntry *cache_entry) { list_remove(&cache_entry->entry); - if (cache_entry->storage) - IStorage_Release(cache_entry->storage); + if (cache_entry->stream) + IStream_Release(cache_entry->stream); HeapFree(GetProcessHeap(), 0, cache_entry->fmtetc.ptd); ReleaseStgMedium(&cache_entry->stgmedium); if(cache_entry->sink_id) @@ -314,7 +314,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->data_cf = 0; (*cache_entry)->stgmedium.tymed = TYMED_NULL; (*cache_entry)->stgmedium.pUnkForRelease = NULL; - (*cache_entry)->storage = NULL; + (*cache_entry)->stream = NULL; (*cache_entry)->id = This->last_cache_id++; (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; @@ -477,63 +477,25 @@ static HRESULT write_clipformat(IStream *stream, CLIPFORMAT clipformat) */ static HRESULT DataCacheEntry_OpenPresStream(DataCacheEntry *cache_entry, IStream **ppStm) { - STATSTG elem; - IEnumSTATSTG *pEnum; HRESULT hr; + LARGE_INTEGER offset; - if (!ppStm) return E_POINTER; - - hr = IStorage_EnumElements(cache_entry->storage, 0, NULL, 0, &pEnum); - if (FAILED(hr)) return hr; - - while ((hr = IEnumSTATSTG_Next(pEnum, 1, &elem, NULL)) == S_OK) + if (cache_entry->stream) { - if (DataCache_IsPresentationStream(&elem)) - { - IStream *pStm; - - hr = IStorage_OpenStream(cache_entry->storage, elem.pwcsName, - NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, - &pStm); - if (SUCCEEDED(hr)) - { - PresentationDataHeader header; - ULONG actual_read; - CLIPFORMAT clipformat; - - hr = read_clipformat(pStm, &clipformat); - - if (hr == S_OK) - hr = IStream_Read(pStm, &header, sizeof(header), &actual_read); + /* Rewind the stream before returning it. */ + offset.QuadPart = 0; - /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ - if (hr == S_OK && actual_read == sizeof(header) - && header.dvAspect == cache_entry->fmtetc.dwAspect) - { - /* Rewind the stream before returning it. */ - LARGE_INTEGER offset; - offset.u.LowPart = 0; - offset.u.HighPart = 0; - IStream_Seek(pStm, offset, STREAM_SEEK_SET, NULL); - - *ppStm = pStm; - - CoTaskMemFree(elem.pwcsName); - IEnumSTATSTG_Release(pEnum); - - return S_OK; - } - - IStream_Release(pStm); - } - } - - CoTaskMemFree(elem.pwcsName); + hr = IStream_Seek( cache_entry->stream, offset, STREAM_SEEK_SET, NULL ); + if (SUCCEEDED( hr )) + { + *ppStm = cache_entry->stream; + IStream_AddRef( cache_entry->stream ); + } } + else + hr = OLE_E_BLANK; - IEnumSTATSTG_Release(pEnum); - - return (hr == S_FALSE ? OLE_E_BLANK : hr); + return hr; } /************************************************************************ @@ -841,7 +803,7 @@ static HRESULT DataCacheEntry_SetData(DataCacheEntry *cache_entry, static HRESULT DataCacheEntry_GetData(DataCacheEntry *cache_entry, STGMEDIUM *stgmedium) { - if (stgmedium->tymed == TYMED_NULL && cache_entry->storage) + if (stgmedium->tymed == TYMED_NULL && cache_entry->stream) { HRESULT hr = DataCacheEntry_LoadData(cache_entry); if (FAILED(hr)) @@ -861,10 +823,10 @@ static inline HRESULT DataCacheEntry_DiscardData(DataCacheEntry *cache_entry) static inline void DataCacheEntry_HandsOffStorage(DataCacheEntry *cache_entry) { - if (cache_entry->storage) + if (cache_entry->stream) { - IStorage_Release(cache_entry->storage); - cache_entry->storage = NULL; + IStream_Release(cache_entry->stream); + cache_entry->stream = NULL; } } @@ -1320,9 +1282,9 @@ static HRESULT WINAPI DataCache_Load( if (SUCCEEDED(hr)) { DataCacheEntry_DiscardData(cache_entry); - if (cache_entry->storage) IStorage_Release(cache_entry->storage); - cache_entry->storage = pStg; - IStorage_AddRef(pStg); + if (cache_entry->stream) IStream_Release(cache_entry->stream); + cache_entry->stream = pStm; + IStream_AddRef(pStm); cache_entry->dirty = FALSE; } } @@ -1542,7 +1504,7 @@ static HRESULT WINAPI DataCache_Draw( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->storage) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) { hres = DataCacheEntry_LoadData(cache_entry); if (FAILED(hres)) @@ -1784,7 +1746,7 @@ static HRESULT WINAPI DataCache_GetExtent( continue; /* if the data hasn't been loaded yet, do it now */ - if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->storage) + if ((cache_entry->stgmedium.tymed == TYMED_NULL) && cache_entry->stream) { hres = DataCacheEntry_LoadData(cache_entry); if (FAILED(hres))

1 0

Huw Davies : ole32: Split the data loading into a couple of helpers.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: d864387aaa5cfc93eba39824fb22e574e7df6773 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d864387aaa5cfc93eba39824f… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:35 2015 +0000 ole32: Split the data loading into a couple of helpers. --- dlls/ole32/datacache.c | 157 +++++++++++++++++++++++++++---------------------- 1 file changed, 88 insertions(+), 69 deletions(-) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index d13230d..53defc1 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -88,6 +88,12 @@ typedef struct PresentationDataHeader DWORD dwSize; } PresentationDataHeader; +enum stream_type +{ + no_stream, + pres_stream, +}; + typedef struct DataCacheEntry { struct list entry; @@ -103,6 +109,7 @@ typedef struct DataCacheEntry * representation of the object is stored. */ IStream *stream; + enum stream_type stream_type; /* connection ID */ DWORD id; /* dirty flag */ @@ -315,6 +322,7 @@ static HRESULT DataCache_CreateEntry(DataCache *This, const FORMATETC *formatetc (*cache_entry)->stgmedium.tymed = TYMED_NULL; (*cache_entry)->stgmedium.pUnkForRelease = NULL; (*cache_entry)->stream = NULL; + (*cache_entry)->stream_type = no_stream; (*cache_entry)->id = This->last_cache_id++; (*cache_entry)->dirty = TRUE; (*cache_entry)->stream_number = -1; @@ -1214,6 +1222,78 @@ static HRESULT WINAPI DataCache_InitNew( return S_OK; } + +static HRESULT add_cache_entry( DataCache *This, const FORMATETC *fmt, IStream *stm, + enum stream_type type ) +{ + DataCacheEntry *cache_entry; + HRESULT hr = S_OK; + + TRACE( "loading entry with formatetc: %s\n", debugstr_formatetc( fmt ) ); + + cache_entry = DataCache_GetEntryForFormatEtc( This, fmt ); + if (!cache_entry) + hr = DataCache_CreateEntry( This, fmt, &cache_entry ); + if (SUCCEEDED( hr )) + { + DataCacheEntry_DiscardData( cache_entry ); + if (cache_entry->stream) IStream_Release( cache_entry->stream ); + cache_entry->stream = stm; + IStream_AddRef( stm ); + cache_entry->stream_type = type; + cache_entry->dirty = FALSE; + } + return hr; +} + +static HRESULT parse_pres_streams( DataCache *This, IStorage *stg ) +{ + HRESULT hr; + IEnumSTATSTG *stat_enum; + STATSTG stat; + IStream *stm; + PresentationDataHeader header; + ULONG actual_read; + CLIPFORMAT clipformat; + FORMATETC fmtetc; + + hr = IStorage_EnumElements( stg, 0, NULL, 0, &stat_enum ); + if (FAILED( hr )) return hr; + + while ((hr = IEnumSTATSTG_Next( stat_enum, 1, &stat, NULL )) == S_OK) + { + if (DataCache_IsPresentationStream( &stat )) + { + hr = IStorage_OpenStream( stg, stat.pwcsName, NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, + 0, &stm ); + if (SUCCEEDED( hr )) + { + hr = read_clipformat( stm, &clipformat ); + + if (hr == S_OK) + hr = IStream_Read( stm, &header, sizeof(header), &actual_read ); + + if (hr == S_OK && actual_read == sizeof(header)) + { + fmtetc.cfFormat = clipformat; + fmtetc.ptd = NULL; /* FIXME */ + fmtetc.dwAspect = header.dvAspect; + fmtetc.lindex = header.lindex; + fmtetc.tymed = header.tymed; + + add_cache_entry( This, &fmtetc, stm, pres_stream ); + } + IStream_Release( stm ); + } + } + CoTaskMemFree( stat.pwcsName ); + } + IEnumSTATSTG_Release( stat_enum ); + + return S_OK; +} + + /************************************************************************ * DataCache_Load (IPersistStorage) * @@ -1222,86 +1302,25 @@ static HRESULT WINAPI DataCache_InitNew( * and it will load the presentation information when the * IDataObject_GetData or IViewObject2_Draw methods are called. */ -static HRESULT WINAPI DataCache_Load( - IPersistStorage* iface, - IStorage* pStg) +static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *pStg ) { DataCache *This = impl_from_IPersistStorage(iface); - STATSTG elem; - IEnumSTATSTG *pEnum; HRESULT hr; TRACE("(%p, %p)\n", iface, pStg); - if (This->presentationStorage != NULL) - IStorage_Release(This->presentationStorage); - - This->presentationStorage = pStg; + IPersistStorage_HandsOffStorage( iface ); - hr = IStorage_EnumElements(pStg, 0, NULL, 0, &pEnum); - if (FAILED(hr)) return hr; + hr = parse_pres_streams( This, pStg ); - while ((hr = IEnumSTATSTG_Next(pEnum, 1, &elem, NULL)) == S_OK) + if (SUCCEEDED( hr )) { - if (DataCache_IsPresentationStream(&elem)) - { - IStream *pStm; - - hr = IStorage_OpenStream(This->presentationStorage, elem.pwcsName, - NULL, STGM_READ | STGM_SHARE_EXCLUSIVE, 0, - &pStm); - if (SUCCEEDED(hr)) - { - PresentationDataHeader header; - ULONG actual_read; - CLIPFORMAT clipformat; - - hr = read_clipformat(pStm, &clipformat); - - if (hr == S_OK) - hr = IStream_Read(pStm, &header, sizeof(header), - &actual_read); - - /* can't use SUCCEEDED(hr): S_FALSE counts as an error */ - if (hr == S_OK && actual_read == sizeof(header)) - { - DataCacheEntry *cache_entry; - FORMATETC fmtetc; - - fmtetc.cfFormat = clipformat; - fmtetc.ptd = NULL; /* FIXME */ - fmtetc.dwAspect = header.dvAspect; - fmtetc.lindex = header.lindex; - fmtetc.tymed = header.tymed; - - TRACE("loading entry with formatetc: %s\n", debugstr_formatetc(&fmtetc)); - - cache_entry = DataCache_GetEntryForFormatEtc(This, &fmtetc); - if (!cache_entry) - hr = DataCache_CreateEntry(This, &fmtetc, &cache_entry); - if (SUCCEEDED(hr)) - { - DataCacheEntry_DiscardData(cache_entry); - if (cache_entry->stream) IStream_Release(cache_entry->stream); - cache_entry->stream = pStm; - IStream_AddRef(pStm); - cache_entry->dirty = FALSE; - } - } - - IStream_Release(pStm); - } - } - - CoTaskMemFree(elem.pwcsName); + This->dirty = FALSE; + This->presentationStorage = pStg; + IStorage_AddRef( This->presentationStorage ); } - This->dirty = FALSE; - - IEnumSTATSTG_Release(pEnum); - - IStorage_AddRef(This->presentationStorage); - return S_OK; + return hr; } /************************************************************************

1 0

Zheng Chen : msvcrt: Correct atan/exp/tanh errno setting.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: e95dbb3b747dcd92b614578b3ca4b1c2dbfdaece URL: http://source.winehq.org/git/wine.git/?a=commit;h=e95dbb3b747dcd92b614578b3… Author: Zheng Chen <chanchengcc(a)gmail.com> Date: Tue Mar 24 18:09:50 2015 +0800 msvcrt: Correct atan/exp/tanh errno setting. --- dlls/msvcrt/math.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index acac35d..73f01aa 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -363,7 +363,7 @@ double CDECL MSVCRT_asin( double x ) */ double CDECL MSVCRT_atan( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return atan(x); } @@ -399,7 +399,7 @@ double CDECL MSVCRT_cosh( double x ) */ double CDECL MSVCRT_exp( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return exp(x); } @@ -484,7 +484,7 @@ double CDECL MSVCRT_tan( double x ) */ double CDECL MSVCRT_tanh( double x ) { - if (!isfinite(x)) *MSVCRT__errno() = MSVCRT_EDOM; + if (isnan(x)) *MSVCRT__errno() = MSVCRT_EDOM; return tanh(x); }

1 0

Huw Davies : ole32: Add support for retrieving extents of dib format.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: e410f273cd8c352e6a0b5e0f08c7ce786dc5cbfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=e410f273cd8c352e6a0b5e0f0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 25 08:37:39 2015 +0000 ole32: Add support for retrieving extents of dib format. --- dlls/ole32/datacache.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index 36c02dd..ff15d91 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1846,6 +1846,41 @@ static HRESULT WINAPI DataCache_GetExtent( return S_OK; } + case CF_DIB: + { + BITMAPFILEHEADER *file_head; + BITMAPINFOHEADER *info; + LONG x_pels_m, y_pels_m; + + + if ((cache_entry->stgmedium.tymed != TYMED_HGLOBAL) || + !((file_head = GlobalLock( cache_entry->stgmedium.u.hGlobal )))) + continue; + + info = (BITMAPINFOHEADER *)(file_head + 1); + + x_pels_m = info->biXPelsPerMeter; + y_pels_m = info->biYPelsPerMeter; + + /* Size in units of 0.01mm (ie. MM_HIMETRIC) */ + if (x_pels_m != 0 && y_pels_m != 0) + { + lpsizel->cx = info->biWidth * 100000 / x_pels_m; + lpsizel->cy = info->biHeight * 100000 / y_pels_m; + } + else + { + HDC hdc = GetDC( 0 ); + lpsizel->cx = info->biWidth * 2540 / GetDeviceCaps( hdc, LOGPIXELSX ); + lpsizel->cy = info->biHeight * 2540 / GetDeviceCaps( hdc, LOGPIXELSY ); + + ReleaseDC( 0, hdc ); + } + + GlobalUnlock( cache_entry->stgmedium.u.hGlobal ); + + return S_OK; + } } }

1 0

Jinhui Chen : winex11.drv: Fix row-resize/col-resize mapping to X cursor.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 366ed5495c33e1a8b1c60a8445093f70eae34a38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=366ed5495c33e1a8b1c60a844… Author: Jinhui Chen <chenjh_06(a)hotmail.com> Date: Wed Mar 25 10:36:08 2015 +0300 winex11.drv: Fix row-resize/col-resize mapping to X cursor. --- dlls/winex11.drv/mouse.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 5f5bdeb..0858f2e 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -815,10 +815,10 @@ static const struct system_cursors comctl32_cursors[] = { 102, "move" }, { 104, "copy" }, { 105, "left_ptr" }, - { 106, "row-resize" }, - { 107, "row-resize" }, + { 106, "col-resize" }, + { 107, "col-resize" }, { 108, "hand2" }, - { 135, "col-resize" }, + { 135, "row-resize" }, { 0 } }; @@ -876,7 +876,7 @@ static const struct cursor_font_fallback fallbacks[] = { "circle", XC_circle }, { "clock", XC_clock }, { "coffee_mug", XC_coffee_mug }, - { "col-resize", XC_sb_v_double_arrow }, + { "col-resize", XC_sb_h_double_arrow }, { "cross", XC_cross }, { "cross_reverse", XC_cross_reverse }, { "crosshair", XC_crosshair }, @@ -913,7 +913,7 @@ static const struct cursor_font_fallback fallbacks[] = { "right_side", XC_right_side }, { "right_tee", XC_right_tee }, { "rightbutton", XC_rightbutton }, - { "row-resize", XC_sb_h_double_arrow }, + { "row-resize", XC_sb_v_double_arrow }, { "rtl_logo", XC_rtl_logo }, { "sailboat", XC_sailboat }, { "sb_down_arrow", XC_sb_down_arrow },

1 0

Michael Stefaniuc : taskschd/tests: Test the correct return value.
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 39f1184ee12bc12c27b6a56b4a5598a802eb9de7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39f1184ee12bc12c27b6a56b4… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 25 11:47:31 2015 +0100 taskschd/tests: Test the correct return value. --- dlls/taskschd/tests/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 5e906ce..9a745b8 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -345,7 +345,7 @@ todo_wine hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1_Folder2, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); - ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); + hr = ITaskFolder_DeleteFolder(folder, Wine_Folder1+1, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr); hr = ITaskFolder_DeleteFolder(folder, Wine+1, 0); ok(hr == S_OK, "DeleteFolder error %#x\n", hr);

1 0

Henri Verbeet : d2d1: Implement d2d_state_block_SetTextRenderingParams().
by Alexandre Julliard March 25, 2015

March 25, 2015

Module: wine Branch: master Commit: 29af90be0c42f73ac57caa0f712a2557981ac00a URL: http://source.winehq.org/git/wine.git/?a=commit;h=29af90be0c42f73ac57caa0f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 25 10:05:29 2015 +0100 d2d1: Implement d2d_state_block_SetTextRenderingParams(). --- dlls/d2d1/state_block.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/d2d1/state_block.c b/dlls/d2d1/state_block.c index 62458fb..978c7df 100644 --- a/dlls/d2d1/state_block.c +++ b/dlls/d2d1/state_block.c @@ -96,7 +96,15 @@ static void STDMETHODCALLTYPE d2d_state_block_SetDescription(ID2D1DrawingStateBl static void STDMETHODCALLTYPE d2d_state_block_SetTextRenderingParams(ID2D1DrawingStateBlock *iface, IDWriteRenderingParams *text_rendering_params) { - FIXME("iface %p, text_rendering_params %p stub!\n", iface, text_rendering_params); + struct d2d_state_block *state_block = impl_from_ID2D1DrawingStateBlock(iface); + + TRACE("iface %p, text_rendering_params %p.\n", iface, text_rendering_params); + + if (text_rendering_params) + IDWriteRenderingParams_AddRef(text_rendering_params); + if (state_block->text_rendering_params) + IDWriteRenderingParams_Release(state_block->text_rendering_params); + state_block->text_rendering_params = text_rendering_params; } static void STDMETHODCALLTYPE d2d_state_block_GetTextRenderingParams(ID2D1DrawingStateBlock *iface,

1 0

Stefan Dösinger : wined3d: Avoid constant collision in atifs.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 3c2d0b983a9ac96bfb2ae01b30bd2e5a3e41bdc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c2d0b983a9ac96bfb2ae01b3… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Mar 23 18:59:10 2015 +0100 wined3d: Avoid constant collision in atifs. --- dlls/wined3d/ati_fragment_shader.c | 151 ++++++++++++++++++++++++++++--------- 1 file changed, 115 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3c2d0b983a9ac96bfb2ae…

1 0

Francois Gouget : storage.dll16: Remove an unneeded NONAMELESSSTRUCT directive.
by Alexandre Julliard March 24, 2015

March 24, 2015

Module: wine Branch: master Commit: 890153e8c0a8c2570b4ad8b76fc4159ad5cde39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=890153e8c0a8c2570b4ad8b76… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Mar 24 11:40:41 2015 +0100 storage.dll16: Remove an unneeded NONAMELESSSTRUCT directive. --- dlls/storage.dll16/storage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/storage.dll16/storage.c b/dlls/storage.dll16/storage.c index 4807bcd..dcaff5c 100644 --- a/dlls/storage.dll16/storage.c +++ b/dlls/storage.dll16/storage.c @@ -33,7 +33,7 @@ #endif #define NONAMELESSUNION -#define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winternl.h"

1 0