June 2016 - Wine-Commits - list.winehq.org

Józef Kucia : d3d11/tests: Add test for invalid DSV descriptions.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 8f01ae6cd78bab9a83412ffe1e36a32a4fff5f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f01ae6cd78bab9a83412ffe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:40 2016 +0200 d3d11/tests: Add test for invalid DSV descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 139 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f01ae6cd78bab9a83412…

1 0

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_RENDER_TARGET_VIEW_DESC.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 215d9299a463e3512a2cf1c9bcdb4fe95b9e4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215d9299a463e3512a2cf1c9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:39 2016 +0200 d3d11: Validate "ViewDimension" field in D3D11_RENDER_TARGET_VIEW_DESC. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/view.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2210394..c5263ef 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -211,7 +211,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 ID3D11Resource_GetType(resource, &dimension); - switch(dimension) + switch (dimension) { case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { @@ -323,7 +323,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; @@ -332,14 +332,46 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour ID3D11Resource_GetType(resource, &dimension); switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + if (desc->ViewDimension != D3D11_RTV_DIMENSION_BUFFER) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + return S_OK; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1D + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1DARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + + FIXME("Unhandled 1D texture resource.\n"); + return S_OK; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { const struct d3d_texture2d *texture; + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2D + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DARRAY + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMS + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -351,10 +383,16 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour { const struct d3d_texture3d *texture; + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE3D) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -363,7 +401,8 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour } default: - return; + ERR("Unhandled resource dimension %#x.\n", dimension); + return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -395,6 +434,8 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour default: break; } + + return S_OK; } static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) @@ -1425,14 +1466,15 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st if (!desc) { - if (FAILED(hr = set_rtdesc_from_resource(&view->desc, resource))) - return hr; + hr = set_rtdesc_from_resource(&view->desc, resource); } else { view->desc = *desc; - normalize_rtv_desc(&view->desc, resource); + hr = normalize_rtv_desc(&view->desc, resource); } + if (FAILED(hr)) + return hr; wined3d_mutex_lock(); if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource)))

1 0

Józef Kucia : d3d11/tests: Add test for invalid SRV descriptions.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 87717cf42c0506ba050951e5bba7c3ffb0071951 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87717cf42c0506ba050951e5b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:34 2016 +0200 d3d11/tests: Add test for invalid SRV descriptions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 301 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 253 insertions(+), 48 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87717cf42c0506ba05095…

1 0

Vincent Povirk : gdiplus: Add support for reading png cHRM chunks.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: bf4a2ba26405aacddd93a1cef16d0eda331f3c7b URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4a2ba26405aacddd93a1cef… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:41 2016 -0500 gdiplus: Add support for reading png cHRM chunks. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/image.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index d1a5593..1681099 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -3483,7 +3483,7 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI { "Source", PropertyTagEquipModel }, { "Comment", PropertyTagExifUserComment }, }; - BOOL seen_gamma=FALSE; + BOOL seen_gamma=FALSE, seen_whitepoint=FALSE, seen_chrm=FALSE; hr = IWICBitmapDecoder_GetFrame(decoder, active_frame, &frame); if (hr != S_OK) return; @@ -3552,6 +3552,57 @@ static void png_metadata_reader(GpBitmap *bitmap, IWICBitmapDecoder *decoder, UI } } } + else if (SUCCEEDED(hr) && IsEqualGUID(&GUID_MetadataFormatChunkcHRM, &format)) + { + PropertyItem* item; + + if (!seen_whitepoint) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 4); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 4; + item->type = PropertyTagTypeRational; + item->id = PropertyTagWhitePoint; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 0); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 1); + rational[3] = 100000; + add_property(bitmap, item); + seen_whitepoint = TRUE; + GdipFree(item); + } + } + if (!seen_chrm) + { + item = GdipAlloc(sizeof(PropertyItem) + sizeof(ULONG) * 12); + if (item) + { + ULONG *rational; + item->length = sizeof(ULONG) * 12; + item->type = PropertyTagTypeRational; + item->id = PropertyTagPrimaryChromaticities; + rational = item->value = item + 1; + rational[0] = get_ulong_by_index(reader, 2); + rational[1] = 100000; + rational[2] = get_ulong_by_index(reader, 3); + rational[3] = 100000; + rational[4] = get_ulong_by_index(reader, 4); + rational[5] = 100000; + rational[6] = get_ulong_by_index(reader, 5); + rational[7] = 100000; + rational[8] = get_ulong_by_index(reader, 6); + rational[9] = 100000; + rational[10] = get_ulong_by_index(reader, 7); + rational[11] = 100000; + add_property(bitmap, item); + seen_chrm = TRUE; + GdipFree(item); + } + } + } IWICMetadataReader_Release(reader); }

1 0

Vincent Povirk : windowscodecs: Implement png cHRM metadata reader.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 2e16630a61c1ac581ba2a2ee84f20aa2c7d0f9bd URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e16630a61c1ac581ba2a2ee8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:40 2016 -0500 windowscodecs: Implement png cHRM metadata reader. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/clsfactory.c | 1 + dlls/windowscodecs/pngformat.c | 78 +++++++++++++++++++++++++++ dlls/windowscodecs/regsvr.c | 25 +++++++++ dlls/windowscodecs/tests/metadata.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 1 + dlls/windowscodecs/windowscodecs_wincodec.idl | 7 +++ 6 files changed, 113 insertions(+), 1 deletion(-) diff --git a/dlls/windowscodecs/clsfactory.c b/dlls/windowscodecs/clsfactory.c index d4c524a..77eeedc 100644 --- a/dlls/windowscodecs/clsfactory.c +++ b/dlls/windowscodecs/clsfactory.c @@ -59,6 +59,7 @@ static const classinfo wic_classes[] = { {&CLSID_WineTgaDecoder, TgaDecoder_CreateInstance}, {&CLSID_WICUnknownMetadataReader, UnknownMetadataReader_CreateInstance}, {&CLSID_WICIfdMetadataReader, IfdMetadataReader_CreateInstance}, + {&CLSID_WICPngChrmMetadataReader, PngChrmReader_CreateInstance}, {&CLSID_WICPngGamaMetadataReader, PngGamaReader_CreateInstance}, {&CLSID_WICPngTextMetadataReader, PngTextReader_CreateInstance}, {&CLSID_WICLSDMetadataReader, LSDReader_CreateInstance}, diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index 3eb4d0e..bb2aef9 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -220,6 +220,84 @@ HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) return MetadataReader_Create(&GamaReader_Vtbl, iid, ppv); } +static HRESULT LoadChrmMetadata(IStream *stream, const GUID *preferred_vendor, + DWORD persist_options, MetadataItem **items, DWORD *item_count) +{ + HRESULT hr; + BYTE type[4]; + BYTE *data; + ULONG data_size; + static const WCHAR names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + LPWSTR dyn_names[8] = {0}; + MetadataItem *result; + int i; + + hr = read_png_chunk(stream, type, &data, &data_size); + if (FAILED(hr)) return hr; + + if (data_size < 32) + { + HeapFree(GetProcessHeap(), 0, data); + return E_FAIL; + } + + result = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MetadataItem)*8); + for (i=0; i<8; i++) + { + dyn_names[i] = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR)*(lstrlenW(names[i])+1)); + if (!dyn_names[i]) break; + } + if (!result || i < 8) + { + HeapFree(GetProcessHeap(), 0, result); + for (i=0; i<8; i++) + HeapFree(GetProcessHeap(), 0, dyn_names[i]); + HeapFree(GetProcessHeap(), 0, data); + return E_OUTOFMEMORY; + } + + for (i=0; i<8; i++) + { + PropVariantInit(&result[i].schema); + + PropVariantInit(&result[i].id); + result[i].id.vt = VT_LPWSTR; + result[i].id.u.pwszVal = dyn_names[i]; + lstrcpyW(dyn_names[i], names[i]); + + PropVariantInit(&result[i].value); + result[i].value.vt = VT_UI4; + result[i].value.u.ulVal = read_ulong_be(&data[i*4]); + } + + *items = result; + *item_count = 8; + + HeapFree(GetProcessHeap(), 0, data); + + return S_OK; +} + +static const MetadataHandlerVtbl ChrmReader_Vtbl = { + 0, + &CLSID_WICPngChrmMetadataReader, + LoadChrmMetadata +}; + +HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) +{ + return MetadataReader_Create(&ChrmReader_Vtbl, iid, ppv); +} + #ifdef SONAME_LIBPNG static void *libpng_handle; diff --git a/dlls/windowscodecs/regsvr.c b/dlls/windowscodecs/regsvr.c index 9c4062e..ff499e5 100644 --- a/dlls/windowscodecs/regsvr.c +++ b/dlls/windowscodecs/regsvr.c @@ -1515,6 +1515,21 @@ static const struct reader_containers pnggama_containers[] = { { NULL } /* list terminator */ }; +static const BYTE cHRM[] = "cHRM"; + +static const struct metadata_pattern pngchrm_metadata_pattern[] = { + { 4, 4, cHRM, mask_all, 4 }, + { 0 } +}; + +static const struct reader_containers pngchrm_containers[] = { + { + &GUID_ContainerFormatPng, + pngchrm_metadata_pattern + }, + { NULL } /* list terminator */ +}; + static const struct metadata_pattern lsd_metadata_patterns[] = { { 0, 6, gif87a_magic, mask_all, 0 }, { 0, 6, gif89a_magic, mask_all, 0 }, @@ -1610,6 +1625,16 @@ static struct regsvr_metadatareader const metadatareader_list[] = { 1, 1, 0, ifd_containers }, + { &CLSID_WICPngChrmMetadataReader, + "The Wine Project", + "Chunk cHRM Reader", + "1.0.0.0", + "1.0.0.0", + &GUID_VendorMicrosoft, + &GUID_MetadataFormatChunkcHRM, + 0, 0, 0, + pngchrm_containers + }, { &CLSID_WICPngGamaMetadataReader, "The Wine Project", "Chunk gAMA Reader", diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index c44cf9f..3912209 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -495,7 +495,7 @@ static void test_metadata_cHRM(void) hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, &IID_IWICMetadataReader, (void**)&reader); - todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); + ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); if (FAILED(hr)) return; load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); diff --git a/dlls/windowscodecs/wincodecs_private.h b/dlls/windowscodecs/wincodecs_private.h index f54403c..a8af0d6 100644 --- a/dlls/windowscodecs/wincodecs_private.h +++ b/dlls/windowscodecs/wincodecs_private.h @@ -154,6 +154,7 @@ extern HRESULT MetadataReader_Create(const MetadataHandlerVtbl *vtable, REFIID i extern HRESULT UnknownMetadataReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT IfdMetadataReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; +extern HRESULT PngChrmReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngGamaReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT PngTextReader_CreateInstance(REFIID iid, void** ppv) DECLSPEC_HIDDEN; extern HRESULT LSDReader_CreateInstance(REFIID iid, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/windowscodecs/windowscodecs_wincodec.idl b/dlls/windowscodecs/windowscodecs_wincodec.idl index 089bb39..fd7ff01 100644 --- a/dlls/windowscodecs/windowscodecs_wincodec.idl +++ b/dlls/windowscodecs/windowscodecs_wincodec.idl @@ -140,6 +140,13 @@ coclass WICUnknownMetadataReader { interface IWICMetadataReader; } coclass WICIfdMetadataReader { interface IWICIfdMetadataReader; } [ + helpstring("WIC Png cHRM Metadata Reader"), + threading(both), + uuid(f90b5f36-367b-402a-9dd1-bc0fd59d8f62) +] +coclass WICPngChrmMetadataReader { interface IWICMetadataReader; } + +[ helpstring("WIC Png gAMA Metadata Reader"), threading(both), uuid(3692ca39-e082-4350-9e1f-3704cb083cd5)

1 0

Vincent Povirk : windowscodecs: Add test for png cHRM metadata.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 9b27a178a941a2c1fdd60fa4cb6c25ae18933884 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b27a178a941a2c1fdd60fa4c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Jun 15 12:43:39 2016 -0500 windowscodecs: Add test for png cHRM metadata. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/metadata.c | 72 +++++++++++++++++++++++++++++++++++++ include/wincodecsdk.idl | 2 ++ 2 files changed, 74 insertions(+) diff --git a/dlls/windowscodecs/tests/metadata.c b/dlls/windowscodecs/tests/metadata.c index aa096f0..c44cf9f 100644 --- a/dlls/windowscodecs/tests/metadata.c +++ b/dlls/windowscodecs/tests/metadata.c @@ -144,6 +144,16 @@ static const char metadata_gAMA[] = { 0xff,0xff,0xff,0xff /* chunk CRC */ }; +static const char metadata_cHRM[] = { + 0,0,0,32, /* chunk length */ + 'c','H','R','M', /* chunk type */ + 0,0,122,38, 0,0,128,132, /* white point */ + 0,0,250,0, 0,0,128,232, /* red */ + 0,0,117,48, 0,0,234,96, /* green */ + 0,0,58,152, 0,0,23,112, /* blue */ + 0xff,0xff,0xff,0xff /* chunk CRC */ +}; + static const char pngimage[285] = { 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x00,0x00,0x00,0x01,0x00,0x00,0x00,0x01,0x08,0x02,0x00,0x00,0x00,0x90,0x77,0x53, @@ -457,6 +467,67 @@ static void test_metadata_gAMA(void) IWICMetadataReader_Release(reader); } +static void test_metadata_cHRM(void) +{ + HRESULT hr; + IWICMetadataReader *reader; + PROPVARIANT schema, id, value; + ULONG count; + GUID format; + int i; + static const WCHAR expected_names[8][12] = { + {'W','h','i','t','e','P','o','i','n','t','X',0}, + {'W','h','i','t','e','P','o','i','n','t','Y',0}, + {'R','e','d','X',0}, + {'R','e','d','Y',0}, + {'G','r','e','e','n','X',0}, + {'G','r','e','e','n','Y',0}, + {'B','l','u','e','X',0}, + {'B','l','u','e','Y',0}, + }; + static const ULONG expected_vals[8] = { + 31270,32900, 64000,33000, 30000,60000, 15000,6000 + }; + + PropVariantInit(&schema); + PropVariantInit(&id); + PropVariantInit(&value); + + hr = CoCreateInstance(&CLSID_WICPngChrmMetadataReader, NULL, CLSCTX_INPROC_SERVER, + &IID_IWICMetadataReader, (void**)&reader); + todo_wine ok(hr == S_OK || broken(hr == REGDB_E_CLASSNOTREG) /*winxp*/, "CoCreateInstance failed, hr=%x\n", hr); + if (FAILED(hr)) return; + + load_stream((IUnknown*)reader, metadata_cHRM, sizeof(metadata_cHRM), WICPersistOptionsDefault); + + hr = IWICMetadataReader_GetMetadataFormat(reader, &format); + ok(hr == S_OK, "GetMetadataFormat failed, hr=%x\n", hr); + ok(IsEqualGUID(&format, &GUID_MetadataFormatChunkcHRM), "unexpected format %s\n", wine_dbgstr_guid(&format)); + + hr = IWICMetadataReader_GetCount(reader, &count); + ok(hr == S_OK, "GetCount failed, hr=%x\n", hr); + ok(count == 8, "unexpected count %i\n", count); + + for (i=0; i<8; i++) + { + hr = IWICMetadataReader_GetValueByIndex(reader, i, &schema, &id, &value); + ok(hr == S_OK, "GetValue failed, hr=%x\n", hr); + + ok(schema.vt == VT_EMPTY, "unexpected vt: %i\n", schema.vt); + PropVariantClear(&schema); + + ok(id.vt == VT_LPWSTR, "unexpected vt: %i\n", id.vt); + ok(!lstrcmpW(U(id).pwszVal, expected_names[i]), "got %s, expected %s\n", wine_dbgstr_w(U(id).pwszVal), wine_dbgstr_w(expected_names[i])); + PropVariantClear(&id); + + ok(value.vt == VT_UI4, "unexpected vt: %i\n", value.vt); + ok(U(value).ulVal == expected_vals[i], "got %u, expected %u\n", U(value).ulVal, expected_vals[i]); + PropVariantClear(&value); + } + + IWICMetadataReader_Release(reader); +} + static inline USHORT ushort_bswap(USHORT s) { return (s >> 8) | (s << 8); @@ -1896,6 +1967,7 @@ START_TEST(metadata) test_metadata_unknown(); test_metadata_tEXt(); test_metadata_gAMA(); + test_metadata_cHRM(); test_metadata_IFD(); test_metadata_Exif(); test_create_reader(); diff --git a/include/wincodecsdk.idl b/include/wincodecsdk.idl index 7fc07b8..9ce3f30 100644 --- a/include/wincodecsdk.idl +++ b/include/wincodecsdk.idl @@ -37,6 +37,7 @@ typedef enum WICMetadataCreationOptions { } WICMetadataCreationOptions; cpp_quote("DEFINE_GUID(GUID_MetadataFormatUnknown, 0xa45e592f,0x9078,0x4a7c,0xad,0xb5,0x4e,0xdc,0x4f,0xd6,0x1b,0x1f);") +cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkcHRM, 0x9db3655b,0x2842,0x44b3,0x80,0x67,0x12,0xe9,0xb3,0x75,0x55,0x6a);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunkgAMA, 0xf00935a5,0x1d5d,0x4cd1,0x81,0xb2,0x93,0x24,0xd7,0xec,0xa7,0x81);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktEXt, 0x568d8936,0xc0a9,0x4923,0x90,0x5d,0xdf,0x2b,0x38,0x23,0x8f,0xbc);") cpp_quote("DEFINE_GUID(GUID_MetadataFormatChunktIME, 0x6b00ae2d,0xe24b,0x460a,0x98,0xb6,0x87,0x8b,0xd0,0x30,0x72,0xfd);") @@ -52,6 +53,7 @@ cpp_quote("DEFINE_GUID(GUID_MetadataFormatGifComment, 0xc4b6e0e0,0xcfb4,0x4ad3,0 cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataReader, 0x699745c2,0x5066,0x4b82,0xa8,0xe3,0xd4,0x04,0x78,0xdb,0xec,0x8c);") cpp_quote("DEFINE_GUID(CLSID_WICUnknownMetadataWriter, 0xa09cca86,0x27ba,0x4f39,0x90,0x53,0x12,0x1f,0xa4,0xdc,0x08,0xfc);") +cpp_quote("DEFINE_GUID(CLSID_WICPngChrmMetadataReader, 0xf90b5f36,0x367b,0x402a,0x9d,0xd1,0xbc,0x0f,0xd5,0x9d,0x8f,0x62);") cpp_quote("DEFINE_GUID(CLSID_WICPngGamaMetadataReader, 0x3692ca39,0xe082,0x4350,0x9e,0x1f,0x37,0x04,0xcb,0x08,0x3c,0xd5);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataReader, 0x4b59afcc,0xb8c3,0x408a,0xb6,0x70,0x89,0xe5,0xfa,0xb6,0xfd,0xa7);") cpp_quote("DEFINE_GUID(CLSID_WICPngTextMetadataWriter, 0xb5ebafb9,0x253e,0x4a72,0xa7,0x44,0x07,0x62,0xd2,0x68,0x56,0x83);")

1 0

David Lawrie : winejoystick.drv: Remove ignore axis input type.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 9dcfb97515b894d229a707c8374fd0391379e6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcfb97515b894d229a707c83… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:51 2016 -0700 winejoystick.drv: Remove ignore axis input type. In case Sim page Throttle, Brake, etc ... are type Axis not Misc, no longer ignoring Axis type. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 4a89a45..ad82dd7 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -417,10 +417,6 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } case kIOHIDElementTypeInput_Axis: - { - TRACE("kIOHIDElementTypeInput_Axis; ignoring\n"); - break; - } case kIOHIDElementTypeInput_Misc: { uint32_t usage = IOHIDElementGetUsage( child ); @@ -432,7 +428,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll { case kHIDUsage_GD_Hatswitch: { - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n"); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_Hatswitch\n"); if (joystick->hatswitch) TRACE(" ignoring additional hatswitch\n"); else @@ -447,7 +443,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll case kHIDUsage_GD_Rz: { int axis = axis_for_usage_GD(usage); - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis); if (axis < 0 || joystick->axes[axis].element) TRACE(" ignoring\n"); else @@ -468,10 +464,10 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll while(axis < 3 && joystick->axes[possible_axes[axis]].element) axis++; if (axis == 3) - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage); else { - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]); joystick->axes[possible_axes[axis]].element = (IOHIDElementRef)CFRetain(child); joystick->axes[possible_axes[axis]].min_value = IOHIDElementGetLogicalMin(child); joystick->axes[possible_axes[axis]].max_value = IOHIDElementGetLogicalMax(child); @@ -479,7 +475,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled GD Page usage %d\n", usage); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled GD Page usage %d\n", usage); break; } break; @@ -495,7 +491,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll case kHIDUsage_Sim_Brake: { int axis = axis_for_usage_Sim(usage); - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis); if (axis < 0 || joystick->axes[axis].element) TRACE(" ignoring\n"); else @@ -507,13 +503,13 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled Sim Page usage %d\n", usage); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Sim Page usage %d\n", usage); break; } break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled Usage Page %d\n", usage_page); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Usage Page %d\n", usage_page); break; } break;

1 0

Jacek Caban : jscript: Allow Function.apply() to be called on non-jscript objects.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: db6b86cbbd725bb42d2124c24a00bfa68451853a URL: http://source.winehq.org/git/wine.git/?a=commit;h=db6b86cbbd725bb42d2124c24… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 18:37:13 2016 +0200 jscript: Allow Function.apply() to be called on non-jscript objects. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/function.c | 18 +++++++++++++++--- dlls/jscript/tests/run.c | 23 +++++++++++++++++++---- 2 files changed, 34 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 1e8d563..6817aa7 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -426,7 +426,7 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un TRACE("\n"); - if(!(function = function_this(jsthis))) + if(!(function = function_this(jsthis)) && (jsthis->flags & VDISP_JSDISP)) return throw_type_error(ctx, JS_E_FUNCTION_EXPECTED, NULL); if(argc) { @@ -458,8 +458,20 @@ static HRESULT Function_apply(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, un } } - if(SUCCEEDED(hres)) - hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + if(SUCCEEDED(hres)) { + if(function) { + hres = call_function(ctx, function, this_obj, cnt, args, (flags & DISPATCH_JSCRIPT_CALLEREXECSSOURCE) != 0, r); + }else { + jsval_t res; + hres = disp_call_value(ctx, jsthis->u.disp, this_obj, DISPATCH_METHOD, cnt, args, &res); + if(SUCCEEDED(hres)) { + if(r) + *r = res; + else + jsval_release(res); + } + } + } if(this_obj) IDispatch_Release(this_obj); diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 85f7e1c..0101f15 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -483,11 +483,15 @@ static HRESULT WINAPI dispexFunc_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc ok(pdp->cArgs == 2, "cArgs = %d\n", pdp->cArgs); ok(pdp->cNamedArgs == 1, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(pei != NULL, "pei == NULL\n"); ok(V_VT(pdp->rgvarg+1) == VT_BOOL, "V_VT(pdp->rgvarg+1) = %d\n", V_VT(pdp->rgvarg+1)); - ok(!V_BOOL(pdp->rgvarg+1), "V_BOOL(pdp->rgvarg+1) = %x\n", V_BOOL(pdp->rgvarg+1)); + + if(V_BOOL(pdp->rgvarg+1)) + /* NOTE: If called by Function.apply(), native doesn't set DISPATCH_PROPERTYGET flag. */ + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(V_VT(pdp->rgvarg) == VT_DISPATCH, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); ok(V_DISPATCH(pdp->rgvarg) != NULL, "V_DISPATCH(pdp->rgvarg) == NULL\n"); @@ -567,12 +571,15 @@ static HRESULT WINAPI pureDisp_Invoke(IDispatchEx *iface, DISPID dispIdMember, R ok(pdp->cArgs == 1, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); ok(res != NULL, "res == NULL\n"); - ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); ok(ei != NULL, "ei == NULL\n"); ok(puArgErr != NULL, "puArgErr == NULL\n"); ok(V_VT(pdp->rgvarg) == VT_BOOL, "V_VT(pdp->rgvarg) = %d\n", V_VT(pdp->rgvarg)); - ok(!V_BOOL(pdp->rgvarg), "V_BOOL(pdp->rgvarg) = %x\n", V_BOOL(pdp->rgvarg)); + + if(V_BOOL(pdp->rgvarg)) + todo_wine ok(wFlags == DISPATCH_METHOD, "wFlags = %x\n", wFlags); + else + ok(wFlags == (DISPATCH_PROPERTYGET|DISPATCH_METHOD), "wFlags = %x\n", wFlags); if(res) V_VT(res) = VT_NULL; @@ -2501,6 +2508,14 @@ static BOOL run_tests(void) parse_script_a("var t = {func: dispexFunc}; t = t.func(false);"); CHECK_CALLED(dispexfunc_value); + SET_EXPECT(dispexfunc_value); + parse_script_a("Function.prototype.apply.call(dispexFunc, testObj, [true]);"); + CHECK_CALLED(dispexfunc_value); + + SET_EXPECT(puredisp_value); + parse_script_a("Function.prototype.apply.call(pureDisp, testObj, [true]);"); + CHECK_CALLED(puredisp_value); + parse_script_a("(function reportSuccess() {})()"); parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");");

1 0

David Lawrie : winejoystick.drv: Fix Ry/Rx -> U/V axes mapping.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 5ea6200fc8c2ed69f9fac2095a2b7aa816ad0fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea6200fc8c2ed69f9fac2095… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:48 2016 -0700 winejoystick.drv: Fix Ry/Rx -> U/V axes mapping. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index a58c9cf..42046a4 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -9,6 +9,7 @@ * Copyright 2002 David Hagood * Copyright 2009 CodeWeavers, Aric Stewart * Copyright 2015 Ken Thomases for CodeWeavers Inc. + * Copyright 2016 David Lawrie * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -94,12 +95,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); enum { - AXIS_X, - AXIS_Y, - AXIS_Z, - AXIS_RX, - AXIS_RY, - AXIS_RZ, + AXIS_X, /* Winmm X */ + AXIS_Y, /* Winmm Y */ + AXIS_Z, /* Winmm Z */ + AXIS_RX, /* Winmm V */ + AXIS_RY, /* Winmm U */ + AXIS_RZ, /* Winmm R */ NUM_AXES }; @@ -617,8 +618,8 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR device_id, JOYCAPSW* caps, DWORD size) switch (i) { case AXIS_Z: caps->wCaps |= JOYCAPS_HASZ; break; - case AXIS_RX: caps->wCaps |= JOYCAPS_HASU; break; - case AXIS_RY: caps->wCaps |= JOYCAPS_HASV; break; + case AXIS_RX: caps->wCaps |= JOYCAPS_HASV; break; + case AXIS_RY: caps->wCaps |= JOYCAPS_HASU; break; case AXIS_RZ: caps->wCaps |= JOYCAPS_HASR; break; } } @@ -664,8 +665,8 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) { JOY_RETURNX, FIELD_OFFSET(JOYINFOEX, dwXpos) }, { JOY_RETURNY, FIELD_OFFSET(JOYINFOEX, dwYpos) }, { JOY_RETURNZ, FIELD_OFFSET(JOYINFOEX, dwZpos) }, - { JOY_RETURNU, FIELD_OFFSET(JOYINFOEX, dwUpos) }, { JOY_RETURNV, FIELD_OFFSET(JOYINFOEX, dwVpos) }, + { JOY_RETURNU, FIELD_OFFSET(JOYINFOEX, dwUpos) }, { JOY_RETURNR, FIELD_OFFSET(JOYINFOEX, dwRpos) }, };

1 0

Andrew Eikum : dsound: Capture all available data on each period callback.
by Alexandre Julliard June 16, 2016

June 16, 2016

Module: wine Branch: master Commit: 7300f1b75d048eea00cbc2a5000da0fb7d4c4172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7300f1b75d048eea00cbc2a50… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 08:44:42 2016 -0500 dsound: Capture all available data on each period callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/capture.c | 82 +++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 412b59e..30870ae 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -876,11 +876,6 @@ static ULONG DirectSoundCaptureDevice_Release( static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) { - HRESULT hr; - UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; - DWORD flags; - BYTE *buf; - if(!device->capture_buffer || device->state == STATE_STOPPED) return S_FALSE; @@ -892,45 +887,54 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) if(device->state == STATE_STARTING) device->state = STATE_CAPTURING; - hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, - &flags, NULL, NULL); - if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); - return hr; - } + while(1){ + HRESULT hr; + UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; + DWORD flags; + BYTE *buf; + + hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, + &flags, NULL, NULL); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + return hr; + } + if(hr == AUDCLNT_S_BUFFER_EMPTY) + break; - packet_bytes = packet_frames * device->pwfx->nBlockAlign; - if(packet_bytes > device->buflen){ - TRACE("audio glitch: dsound buffer too small for data\n"); - skip_bytes = packet_bytes - device->buflen; - packet_bytes = device->buflen; - } + packet_bytes = packet_frames * device->pwfx->nBlockAlign; + if(packet_bytes > device->buflen){ + TRACE("audio glitch: dsound buffer too small for data\n"); + skip_bytes = packet_bytes - device->buflen; + packet_bytes = device->buflen; + } - avail_bytes = device->buflen - device->write_pos_bytes; - if(avail_bytes > packet_bytes) - avail_bytes = packet_bytes; - - memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); - capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); - - packet_bytes -= avail_bytes; - if(packet_bytes > 0){ - if(device->capture_buffer->flags & DSCBSTART_LOOPING){ - memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); - capture_CheckNotify(device->capture_buffer, 0, packet_bytes); - }else{ - device->state = STATE_STOPPED; - capture_CheckNotify(device->capture_buffer, 0, 0); + avail_bytes = device->buflen - device->write_pos_bytes; + if(avail_bytes > packet_bytes) + avail_bytes = packet_bytes; + + memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); + capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); + + packet_bytes -= avail_bytes; + if(packet_bytes > 0){ + if(device->capture_buffer->flags & DSCBSTART_LOOPING){ + memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); + capture_CheckNotify(device->capture_buffer, 0, packet_bytes); + }else{ + device->state = STATE_STOPPED; + capture_CheckNotify(device->capture_buffer, 0, 0); + } } - } - device->write_pos_bytes += avail_bytes + packet_bytes; - device->write_pos_bytes %= device->buflen; + device->write_pos_bytes += avail_bytes + packet_bytes; + device->write_pos_bytes %= device->buflen; - hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); - if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); - return hr; + hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); + if(FAILED(hr)){ + WARN("ReleaseBuffer failed: %08x\n", hr); + return hr; + } } return S_OK;

1 0