June 2020 - Wine-commits - list.winehq.org

Aaro Altonen : msado15: Add IConnectionPoint stub to _Connection.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: a8b647d8f89e6927bc1591d505eb63eb5ebfe860 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a8b647d8f89e6927bc1591d5… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:17 2020 +0300 msado15: Add IConnectionPoint stub to _Connection. Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 99 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index 8ed39a3a51..be201cb90b 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -32,6 +32,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(msado15); +struct connection; + +struct connection_point +{ + IConnectionPoint IConnectionPoint_iface; + struct connection *conn; + const IID *riid; +}; + struct connection { _Connection Connection_iface; @@ -41,6 +50,7 @@ struct connection ObjectStateEnum state; LONG timeout; WCHAR *datasource; + struct connection_point cp_connev; }; static inline struct connection *impl_from_Connection( _Connection *iface ) @@ -58,6 +68,11 @@ static inline struct connection *impl_from_IConnectionPointContainer( IConnectio return CONTAINING_RECORD( iface, struct connection, IConnectionPointContainer_iface ); } +static inline struct connection_point *impl_from_IConnectionPoint( IConnectionPoint *iface ) +{ + return CONTAINING_RECORD( iface, struct connection_point, IConnectionPoint_iface ); +} + static ULONG WINAPI connection_AddRef( _Connection *iface ) { struct connection *connection = impl_from_Connection( iface ); @@ -453,6 +468,86 @@ static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = connpointcontainer_FindConnectionPoint }; +static HRESULT WINAPI connpoint_QueryInterface( IConnectionPoint *iface, REFIID riid, void **obj ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + + if (IsEqualGUID( &IID_IUnknown, riid ) || IsEqualGUID( &IID_IConnectionPoint, riid )) + { + *obj = &connpoint->IConnectionPoint_iface; + } + else + { + FIXME( "interface %s not implemented\n", debugstr_guid( riid ) ); + return E_NOINTERFACE; + } + + connection_AddRef( &connpoint->conn->Connection_iface ); + return S_OK; +} + +static ULONG WINAPI connpoint_AddRef( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_AddRef( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static ULONG WINAPI connpoint_Release( IConnectionPoint *iface ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + return IConnectionPointContainer_Release( &connpoint->conn->IConnectionPointContainer_iface ); +} + +static HRESULT WINAPI connpoint_GetConnectionInterface( IConnectionPoint *iface, IID *iid ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, iid ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_GetConnectionPointContainer( IConnectionPoint *iface, + IConnectionPointContainer **container ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, container ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Advise( IConnectionPoint *iface, IUnknown *unk_sink, + DWORD *cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p, %p\n", connpoint, unk_sink, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_Unadvise( IConnectionPoint *iface, DWORD cookie ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %d\n", connpoint, cookie ); + return E_NOTIMPL; +} + +static HRESULT WINAPI connpoint_EnumConnections( IConnectionPoint *iface, + IEnumConnections **points ) +{ + struct connection_point *connpoint = impl_from_IConnectionPoint( iface ); + FIXME( "%p, %p\n", connpoint, points ); + return E_NOTIMPL; +} + +static const IConnectionPointVtbl connpoint_vtbl = +{ + connpoint_QueryInterface, + connpoint_AddRef, + connpoint_Release, + connpoint_GetConnectionInterface, + connpoint_GetConnectionPointContainer, + connpoint_Advise, + connpoint_Unadvise, + connpoint_EnumConnections +}; + HRESULT Connection_create( void **obj ) { struct connection *connection; @@ -466,6 +561,10 @@ HRESULT Connection_create( void **obj ) connection->timeout = 30; connection->datasource = NULL; + connection->cp_connev.conn = connection; + connection->cp_connev.riid = &DIID_ConnectionEvents; + connection->cp_connev.IConnectionPoint_iface.lpVtbl = &connpoint_vtbl; + *obj = &connection->Connection_iface; TRACE( "returning iface %p\n", *obj ); return S_OK;

1 0

Aaro Altonen : msado15: Implement IConnectionPointContainer_FindConnectionPoint.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: a1222a3595c8eafaef7df95b3804fa2205ac3c84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a1222a3595c8eafaef7df95b… Author: Aaro Altonen <a.altonen(a)hotmail.com> Date: Mon Jun 1 14:42:18 2020 +0300 msado15: Implement IConnectionPointContainer_FindConnectionPoint. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49303 Signed-off-by: Aaro Altonen <a.altonen(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msado15/connection.c | 17 +++++++++++++++-- dlls/msado15/tests/msado15.c | 27 +++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/msado15/connection.c b/dlls/msado15/connection.c index be201cb90b..9e8c05522e 100644 --- a/dlls/msado15/connection.c +++ b/dlls/msado15/connection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "ocidl.h" #include "objbase.h" +#include "olectl.h" #include "msado15_backcompat.h" #include "wine/debug.h" @@ -455,8 +456,20 @@ static HRESULT WINAPI connpointcontainer_FindConnectionPoint( IConnectionPointCo REFIID riid, IConnectionPoint **point ) { struct connection *connection = impl_from_IConnectionPointContainer( iface ); - FIXME( "%p, %s, %p\n", connection, debugstr_guid( riid ), point ); - return E_NOTIMPL; + + TRACE( "%p, %s %p\n", connection, debugstr_guid( riid ), point ); + + if (!point) return E_POINTER; + + if (IsEqualIID( riid, connection->cp_connev.riid )) + { + *point = &connection->cp_connev.IConnectionPoint_iface; + IConnectionPoint_AddRef( *point ); + return S_OK; + } + + FIXME( "unsupported connection point %s\n", debugstr_guid( riid ) ); + return CONNECT_E_NOCONNECTION; } static const struct IConnectionPointContainerVtbl connpointcontainer_vtbl = diff --git a/dlls/msado15/tests/msado15.c b/dlls/msado15/tests/msado15.c index 349363b7c5..a8d2afdd41 100644 --- a/dlls/msado15/tests/msado15.c +++ b/dlls/msado15/tests/msado15.c @@ -20,6 +20,7 @@ #define COBJMACROS #include <initguid.h> #include <oledb.h> +#include <olectl.h> #include <msado15_backcompat.h> #include "wine/test.h" @@ -805,10 +806,36 @@ static void test_Command(void) _Command_Release( command ); } +static void test_ConnectionPoint(void) +{ + HRESULT hr; + ULONG refs; + IConnectionPoint *point; + IConnectionPointContainer *pointcontainer; + + hr = CoCreateInstance( &CLSID_Connection, NULL, CLSCTX_INPROC_SERVER, + &IID_IConnectionPointContainer, (void**)&pointcontainer ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, NULL ); + ok( hr == E_POINTER, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_RecordsetEvents, &point ); + ok( hr == CONNECT_E_NOCONNECTION, "got %08x\n", hr ); + + hr = IConnectionPointContainer_FindConnectionPoint( pointcontainer, &DIID_ConnectionEvents, &point ); + ok( hr == S_OK, "got %08x\n", hr ); + + refs = IConnectionPoint_Release( point ); + ok( refs == 1, "got %u", refs ); + + IConnectionPointContainer_Release( pointcontainer ); +} + START_TEST(msado15) { CoInitialize( NULL ); test_Connection(); + test_ConnectionPoint(); test_Fields(); test_Recordset(); test_Stream();

1 0

Ziqing Hui : windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 0d263f9fdaac21e51844376da5cfa054ee7fc520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d263f9fdaac21e51844376d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:58:52 2020 +0800 windowscodecs: Check NULL parameters for DdsFrameDecode_GetSize(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 2 ++ dlls/windowscodecs/tests/ddsformat.c | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 20017788a0..9446c7e8e6 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -301,6 +301,8 @@ static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, { DdsFrameDecode *This = impl_from_IWICBitmapFrameDecode(iface); + if (!puiWidth || !puiHeight) return E_INVALIDARG; + *puiWidth = This->width; *puiHeight = This->height; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index c7f56307d7..be7bb0a0e6 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -382,6 +382,12 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, NULL); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, &height); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, NULL); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_GetSize(frame_decode, &width, &height); ok (hr == S_OK, "%d: GetSize failed for frame %d, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end;

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: febf29ba9d1590042631c408c786e2c4823fe3f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=febf29ba9d1590042631c408… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:07 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetFormatInfo(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 55 +++++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index be7bb0a0e6..32ea1e2774 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -192,6 +192,26 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES return hr; } +static UINT get_bytes_per_block(DXGI_FORMAT format) +{ + switch(format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_TYPELESS: + case DXGI_FORMAT_BC1_UNORM_SRGB: + return 8; + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_TYPELESS: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_TYPELESS: + case DXGI_FORMAT_BC3_UNORM_SRGB: + return 16; + default: + return 0; + } +} + static void test_dds_decoder_initialize(void) { static BYTE test_dds_bad_magic[sizeof(test_dds_image)]; @@ -367,21 +387,28 @@ static void test_dds_decoder_image_parameters(void) } } -static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, - UINT frame_count, int i, int frame_index) +static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBitmapFrameDecode *frame_decode, + UINT frame_count, int i, int frame_index) { HRESULT hr; WICDdsParameters params; - IWICDdsDecoder *dds_decoder; + IWICDdsDecoder *dds_decoder = NULL; + IWICDdsFrameDecode *dds_frame = NULL; UINT width, height ,expected_width, expected_height, slice_index, depth; + WICDdsFormatInfo format_info; hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); ok(hr == S_OK, "%d: QueryInterface failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + hr = IWICBitmapFrameDecode_QueryInterface(frame_decode, &IID_IWICDdsFrameDecode, (void **)&dds_frame); + ok(hr == S_OK, "%d: [frame %d] QueryInterface failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; hr = IWICDdsDecoder_GetParameters(dds_decoder, &params); ok (hr == S_OK, "%d: GetParameters failed, hr=%x\n", i, hr); if (hr != S_OK) goto end; + /* frame size tests */ + hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, NULL); ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICBitmapFrameDecode_GetSize(frame_decode, NULL, &height); @@ -406,8 +433,28 @@ static void test_dds_decoder_frame_size(IWICBitmapDecoder *decoder, IWICBitmapFr ok (width == expected_width, "%d: Expected width %d for frame %d, got %d\n", i, expected_width, frame_index, width); ok (height == expected_height, "%d: Expected height %d for frame %d, got %d\n", i, expected_height, frame_index, height); + /* frame format information tests */ + + hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); + todo_wine ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; + + ok (format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat, + "%d: [frame %d] Expected DXGI format 0x%x, got 0x%x\n", + i, frame_index, test_data[i].expected_parameters.DxgiFormat, format_info.DxgiFormat); + ok (format_info.BytesPerBlock == get_bytes_per_block(format_info.DxgiFormat), + "%d: [frame %d] Expected bytes per block %d, got %d\n", + i, frame_index, get_bytes_per_block(format_info.DxgiFormat), format_info.BytesPerBlock); + ok (format_info.BlockWidth == 4 || format_info.BlockWidth == 1, + "%d: [frame %d] Got unexpected block width %d\n", i, frame_index, format_info.BlockWidth); + ok (format_info.BlockHeight == 4 || format_info.BlockHeight == 1, + "%d: [frame %d] Got unexpected block height %d\n", i, frame_index, format_info.BlockHeight); + end: if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); + if (dds_frame) IWICDdsFrameDecode_Release(dds_frame); } static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) @@ -430,7 +477,7 @@ static void test_dds_decoder_frame(IWICBitmapDecoder *decoder, int i) continue; } - test_dds_decoder_frame_size(decoder, frame_decode, frame_count, i, j); + test_dds_decoder_frame_properties(decoder, frame_decode, frame_count, i, j); } }

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 2e39b43c5dce00472c32a226fe06c12944da3539 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e39b43c5dce00472c32a226… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:19 2020 +0800 windowscodecs: Implement DdsFrameDecode_Dds_GetFormatInfo(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 59 +++++++++++++++++++++++++++++++----- dlls/windowscodecs/tests/ddsformat.c | 4 +-- 2 files changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 9446c7e8e6..7b0817e738 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -105,6 +105,15 @@ typedef struct dds_info { WICDdsAlphaMode alpha_mode; } dds_info; +typedef struct dds_frame_info { + UINT width; + UINT height; + DXGI_FORMAT format; + UINT bytes_per_block; + UINT block_width; + UINT block_height; +} dds_frame_info; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; IWICDdsDecoder IWICDdsDecoder_iface; @@ -121,8 +130,7 @@ typedef struct DdsFrameDecode { IWICBitmapFrameDecode IWICBitmapFrameDecode_iface; IWICDdsFrameDecode IWICDdsFrameDecode_iface; LONG ref; - UINT width; - UINT height; + dds_frame_info info; } DdsFrameDecode; static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *, UINT, UINT, UINT, IWICBitmapFrameDecode **); @@ -231,6 +239,27 @@ static void get_dds_info(dds_info* info, DDS_HEADER *header, DDS_HEADER_DXT10 *h } } +static UINT get_bytes_per_block(DXGI_FORMAT format) +{ + switch(format) + { + case DXGI_FORMAT_BC1_UNORM: + case DXGI_FORMAT_BC1_TYPELESS: + case DXGI_FORMAT_BC1_UNORM_SRGB: + return 8; + case DXGI_FORMAT_BC2_UNORM: + case DXGI_FORMAT_BC2_TYPELESS: + case DXGI_FORMAT_BC2_UNORM_SRGB: + case DXGI_FORMAT_BC3_UNORM: + case DXGI_FORMAT_BC3_TYPELESS: + case DXGI_FORMAT_BC3_UNORM_SRGB: + return 16; + default: + WARN("DXGI format 0x%x is not supported in DDS decoder\n", format); + return 0; + } +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -303,8 +332,8 @@ static HRESULT WINAPI DdsFrameDecode_GetSize(IWICBitmapFrameDecode *iface, if (!puiWidth || !puiHeight) return E_INVALIDARG; - *puiWidth = This->width; - *puiHeight = This->height; + *puiWidth = This->info.width; + *puiHeight = This->info.height; TRACE("(%p) -> (%d,%d)\n", iface, *puiWidth, *puiHeight); @@ -411,9 +440,19 @@ static HRESULT WINAPI DdsFrameDecode_Dds_GetSizeInBlocks(IWICDdsFrameDecode *ifa static HRESULT WINAPI DdsFrameDecode_Dds_GetFormatInfo(IWICDdsFrameDecode *iface, WICDdsFormatInfo *formatInfo) { - FIXME("(%p,%p): stub.\n", iface, formatInfo); + DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); - return E_NOTIMPL; + if (!formatInfo) return E_INVALIDARG; + + formatInfo->DxgiFormat = This->info.format; + formatInfo->BytesPerBlock = This->info.bytes_per_block; + formatInfo->BlockWidth = This->info.block_width; + formatInfo->BlockHeight = This->info.block_height; + + TRACE("(%p,%p) -> (0x%x,%d,%d,%d)\n", iface, formatInfo, + formatInfo->DxgiFormat, formatInfo->BytesPerBlock, formatInfo->BlockWidth, formatInfo->BlockHeight); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_Dds_CopyBlocks(IWICDdsFrameDecode *iface, @@ -794,8 +833,12 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, hr = DdsFrameDecode_CreateInstance(&frame_decode); if (hr != S_OK) goto end; - frame_decode->width = width; - frame_decode->height = height; + frame_decode->info.width = width; + frame_decode->info.height = height; + frame_decode->info.format = This->info.format; + frame_decode->info.bytes_per_block = get_bytes_per_block(This->info.format); + frame_decode->info.block_width = 4; + frame_decode->info.block_height = 4; *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; hr = S_OK; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 32ea1e2774..7d001e6338 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -436,9 +436,9 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi /* frame format information tests */ hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetFormatInfo(dds_frame, &format_info); - todo_wine ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: [frame %d] GetFormatInfo failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; ok (format_info.DxgiFormat == test_data[i].expected_parameters.DxgiFormat,

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 81da1f6b5daf2454018689ee51b511ff6d83db43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=81da1f6b5daf2454018689ee… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:32 2020 +0800 windowscodecs/tests: Add tests for DdsFrameDecode_Dds_GetSizeInBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 7d001e6338..d1f9b40ff2 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -395,6 +395,7 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi IWICDdsDecoder *dds_decoder = NULL; IWICDdsFrameDecode *dds_frame = NULL; UINT width, height ,expected_width, expected_height, slice_index, depth; + UINT width_in_blocks, height_in_blocks, expected_width_in_blocks, expected_height_in_blocks; WICDdsFormatInfo format_info; hr = IWICBitmapDecoder_QueryInterface(decoder, &IID_IWICDdsDecoder, (void **)&dds_decoder); @@ -452,6 +453,25 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi ok (format_info.BlockHeight == 4 || format_info.BlockHeight == 1, "%d: [frame %d] Got unexpected block height %d\n", i, frame_index, format_info.BlockHeight); + /* size in blocks tests */ + + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, &height_in_blocks); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, NULL); + todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); + todo_wine ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); + if (hr != S_OK) goto end; + + expected_width_in_blocks = (expected_width + format_info.BlockWidth - 1) / format_info.BlockWidth; + expected_height_in_blocks = (expected_height + format_info.BlockHeight - 1) / format_info.BlockHeight; + ok (width_in_blocks == expected_width_in_blocks, + "%d: [frame %d] Expected width in blocks %d, got %d\n", i, frame_index, expected_width_in_blocks, width_in_blocks); + ok (height_in_blocks == expected_height_in_blocks, + "%d: [frame %d] Expected height in blocks %d, got %d\n", i, frame_index, expected_height_in_blocks, height_in_blocks); + end: if (dds_decoder) IWICDdsDecoder_Release(dds_decoder); if (dds_frame) IWICDdsFrameDecode_Release(dds_frame);

1 0

Ziqing Hui : windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: a31cadae42293a4c0da7553d4a00533c8c63c437 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a31cadae42293a4c0da7553d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Mon Jun 1 12:59:48 2020 +0800 windowscodecs: Implement DdsFrameDecode_Dds_GetSizeInBlocks(). Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 15 +++++++++++++-- dlls/windowscodecs/tests/ddsformat.c | 8 ++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 7b0817e738..ce6cb9794c 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -112,6 +112,8 @@ typedef struct dds_frame_info { UINT bytes_per_block; UINT block_width; UINT block_height; + UINT width_in_blocks; + UINT height_in_blocks; } dds_frame_info; typedef struct DdsDecoder { @@ -432,9 +434,16 @@ static ULONG WINAPI DdsFrameDecode_Dds_Release(IWICDdsFrameDecode *iface) static HRESULT WINAPI DdsFrameDecode_Dds_GetSizeInBlocks(IWICDdsFrameDecode *iface, UINT *widthInBlocks, UINT *heightInBlocks) { - FIXME("(%p,%p,%p): stub.\n", iface, widthInBlocks, heightInBlocks); + DdsFrameDecode *This = impl_from_IWICDdsFrameDecode(iface); - return E_NOTIMPL; + if (!widthInBlocks || !heightInBlocks) return E_INVALIDARG; + + *widthInBlocks = This->info.width_in_blocks; + *heightInBlocks = This->info.height_in_blocks; + + TRACE("(%p,%p,%p) -> (%d,%d)\n", iface, widthInBlocks, heightInBlocks, *widthInBlocks, *heightInBlocks); + + return S_OK; } static HRESULT WINAPI DdsFrameDecode_Dds_GetFormatInfo(IWICDdsFrameDecode *iface, @@ -839,6 +848,8 @@ static HRESULT WINAPI DdsDecoder_Dds_GetFrame(IWICDdsDecoder *iface, frame_decode->info.bytes_per_block = get_bytes_per_block(This->info.format); frame_decode->info.block_width = 4; frame_decode->info.block_height = 4; + frame_decode->info.width_in_blocks = (width + frame_decode->info.block_width - 1) / frame_decode->info.block_width; + frame_decode->info.height_in_blocks = (width + frame_decode->info.block_height - 1) / frame_decode->info.block_height; *bitmapFrame = &frame_decode->IWICBitmapFrameDecode_iface; hr = S_OK; diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index d1f9b40ff2..9b14bed52c 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -456,13 +456,13 @@ static void test_dds_decoder_frame_properties(IWICBitmapDecoder *decoder, IWICBi /* size in blocks tests */ hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, NULL, &height_in_blocks); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, NULL); - todo_wine ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); + ok (hr == E_INVALIDARG, "%d: [frame %d] Got unexpected hr %x\n", i, frame_index, hr); hr = IWICDdsFrameDecode_GetSizeInBlocks(dds_frame, &width_in_blocks, &height_in_blocks); - todo_wine ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); + ok (hr == S_OK, "%d: [frame %d] GetSizeInBlocks failed, hr=%x\n", i, frame_index, hr); if (hr != S_OK) goto end; expected_width_in_blocks = (expected_width + format_info.BlockWidth - 1) / format_info.BlockWidth;

1 0

Ken Thomases : winemac: Fix a string format warning for tick counts in update_clipboard().
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 1216453225bf7eb4cb653c37b5e3aeee51857880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1216453225bf7eb4cb653c37… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Jun 1 11:31:52 2020 -0500 winemac: Fix a string format warning for tick counts in update_clipboard(). Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index cf5d56b1f1..65fb3cc8ec 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -1783,7 +1783,7 @@ static void update_clipboard(void) static BOOL updating; TRACE("is_clipboard_owner %d last_clipboard_update %llu now %llu\n", - is_clipboard_owner, last_clipboard_update, GetTickCount64()); + is_clipboard_owner, (unsigned long long)last_clipboard_update, (unsigned long long)GetTickCount64()); if (updating) return; updating = TRUE;

1 0

Gijs Vermeulen : winemac: Cast buffer to const WCHAR* in insert_clipboard_format.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 3c86adab766e3bc7c91da088c2dd6bc41a917055 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3c86adab766e3bc7c91da088… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jun 1 11:31:53 2020 -0500 winemac: Cast buffer to const WCHAR* in insert_clipboard_format. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/clipboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winemac.drv/clipboard.c b/dlls/winemac.drv/clipboard.c index 65fb3cc8ec..9c00930705 100644 --- a/dlls/winemac.drv/clipboard.c +++ b/dlls/winemac.drv/clipboard.c @@ -288,7 +288,7 @@ static WINE_CLIPFORMAT *insert_clipboard_format(UINT id, CFStringRef type) } format->type = CFStringCreateWithFormat(NULL, NULL, CFSTR("%@%S"), - registered_name_type_prefix, buffer); + registered_name_type_prefix, (const WCHAR*)buffer); } list_add_tail(&format_list, &format->entry);

1 0

Anton Baskanov : amstream: Allow AMAudioStream and AMDirectDrawStream to be created by CoCreateInstance.
by Alexandre Julliard 01 Jun '20

01 Jun '20

Module: wine Branch: master Commit: 7d07142b1f2664ef6cd0939ddc8a40894f97d702 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d07142b1f2664ef6cd0939d… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu May 28 02:05:51 2020 +0700 amstream: Allow AMAudioStream and AMDirectDrawStream to be created by CoCreateInstance. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/amstream_classes.idl | 7 +++++++ dlls/amstream/main.c | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/amstream/amstream_classes.idl b/dlls/amstream/amstream_classes.idl index e6bda830b4..2251bf734e 100644 --- a/dlls/amstream/amstream_classes.idl +++ b/dlls/amstream/amstream_classes.idl @@ -34,6 +34,13 @@ coclass MediaStreamFilter { interface IMediaStreamFilter; } ] coclass AMDirectDrawStream { interface IAMMultiMediaStream; } +[ + helpstring("AuStream Class"), + threading(both), + uuid(8496e040-af4c-11d0-8212-00c04fc32c45) +] +coclass AMAudioStream { interface IAMMediaStream; } + [ helpstring("MMStream Class"), threading(both), diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index c718f42448..c581e516bd 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -74,7 +74,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_AMMultiMediaStream, multimedia_stream_create }, - { &CLSID_AMDirectDrawStream, multimedia_stream_create }, + { &CLSID_AMDirectDrawStream, ddraw_stream_create }, + { &CLSID_AMAudioStream, audio_stream_create }, { &CLSID_AMAudioData, AMAudioData_create }, { &CLSID_MediaStreamFilter, filter_create } };

1 0