March 2019 - Wine-commits - list.winehq.org

Jactry Zeng : mfplat: Add support for integer attribute values.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: c127fab80e2c47d531d29d7e286dd6455450a727 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c127fab80e2c47d531d29d7e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:11 2019 +0300 mfplat: Add support for integer attribute values. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 71 +++++++++++++++++++++++++++++++++++------ dlls/mfplat/tests/mfplat.c | 35 +++++++++++++++----- dlls/mfreadwrite/tests/mfplat.c | 2 +- 4 files changed, 91 insertions(+), 19 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index e64e405..eb9b26f 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 mfuuid +IMPORTS = advapi32 ole32 mfuuid propsys C_SRCS = \ buffer.c \ diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c339f23..4b4f262 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -20,6 +20,7 @@ #include <string.h> #define COBJMACROS +#define NONAMELESSUNION #include "windef.h" #include "winbase.h" @@ -35,6 +36,7 @@ #include "mfplat_private.h" #include "mfreadwrite.h" +#include "propvarutil.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -659,6 +661,29 @@ static struct attribute *attributes_find_item(struct attributes *attributes, REF return NULL; } +static HRESULT attributes_get_item(struct attributes *attributes, const GUID *key, PROPVARIANT *value) +{ + struct attribute *attribute; + HRESULT hr; + + EnterCriticalSection(&attributes->cs); + + attribute = attributes_find_item(attributes, key, NULL); + if (attribute) + { + if (attribute->value.vt == value->vt) + hr = PropVariantCopy(value, &attribute->value); + else + hr = MF_E_INVALIDTYPE; + } + else + hr = MF_E_ATTRIBUTENOTFOUND; + + LeaveCriticalSection(&attributes->cs); + + return hr; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { struct attributes *attributes = impl_from_IMFAttributes(iface); @@ -705,16 +730,34 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToUInt32(&attrval, value); + return hr; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToUInt64(&attrval, value); + return hr; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -873,16 +916,26 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { - FIXME("%p, %s, %d.\n", iface, debugstr_attr(key), value); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %d.\n", iface, debugstr_attr(key), value); + + attrval.vt = VT_UI4; + attrval.u.ulVal = value; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { - FIXME("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), wine_dbgstr_longlong(value)); + + attrval.vt = VT_UI8; + attrval.u.uhVal.QuadPart = value; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) @@ -3481,7 +3534,7 @@ static HRESULT WINAPI eventqueue_QueueEventParamUnk(IMFMediaEventQueue *iface, M TRACE("%p, %d, %s, %#x, %p.\n", iface, event_type, debugstr_guid(extended_type), status, unk); value.vt = VT_UNKNOWN; - value.punkVal = unk; + value.u.punkVal = unk; if (FAILED(hr = MFCreateMediaEvent(event_type, extended_type, status, &value, &event))) return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 273aa26..b51e5e2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -359,25 +359,21 @@ todo_wine ok(compressed, "Unexpected value %d.\n", compressed); hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 0); -todo_wine ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); compressed = FALSE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); -todo_wine ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(compressed, "Unexpected value %d.\n", compressed); hr = IMFMediaType_SetUINT32(mediatype, &MF_MT_ALL_SAMPLES_INDEPENDENT, 1); -todo_wine ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); compressed = TRUE; hr = IMFMediaType_IsCompressedFormat(mediatype, &compressed); -todo_wine { ok(hr == S_OK, "Failed to get media type property, hr %#x.\n", hr); ok(!compressed, "Unexpected value %d.\n", compressed); -} + hr = IMFMediaType_SetGUID(mediatype, &MF_MT_MAJOR_TYPE, &MFMediaType_Video); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); @@ -502,7 +498,8 @@ static void test_MFCreateAttributes(void) { PROPVARIANT propvar, ret_propvar; IMFAttributes *attributes; - UINT32 count; + UINT32 count, value; + UINT64 value64; HRESULT hr; GUID key; @@ -514,13 +511,35 @@ static void test_MFCreateAttributes(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(count == 0, "got %d\n", count); - hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); + ok(hr == S_OK, "Failed to set UINT32 value, hr %#x.\n", hr); hr = IMFAttributes_GetCount(attributes, &count); todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(count == 1, "got %d\n", count); + value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value); + ok(hr == S_OK, "Failed to get UINT32 value, hr %#x.\n", hr); + ok(value == 123, "Unexpected value %u, expected: 123.\n", value); + + value64 = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value64); + ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + ok(value64 == 0xdeadbeef, "Unexpected value.\n"); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "Failed to set UINT64 value, hr %#x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value64); + ok(hr == S_OK, "Failed to get UINT64 value, hr %#x.\n", hr); + ok(value64 == 65536, "Unexpected value.\n"); + + value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value); + ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + ok(value == 0xdeadbeef, "Unexpected value.\n"); + IMFAttributes_Release(attributes); hr = MFCreateAttributes(&attributes, 0); diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 58533cc..1767433 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -67,7 +67,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = CreateStreamOnHGlobal(NULL, TRUE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr);

1 0

Jactry Zeng : mfplat: Implement IMFAttributes::GetCount().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: e8a9cd2e06910eee8af494c746dad6ae47e0c0ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e8a9cd2e06910eee8af494c7… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:12 2019 +0300 mfplat: Implement IMFAttributes::GetCount(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 11 ++++++----- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++---------- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 4b4f262..7bb09d6 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -993,14 +993,15 @@ static HRESULT WINAPI mfattributes_UnlockStore(IMFAttributes *iface) static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { - mfattributes *This = impl_from_IMFAttributes(iface); + struct attributes *attributes = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("%p, %p.\n", iface, items); - if(items) - *items = 0; + EnterCriticalSection(&attributes->cs); + *items = attributes->count; + LeaveCriticalSection(&attributes->cs); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 index, GUID *key, PROPVARIANT *value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index b51e5e2..361584f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -494,29 +494,31 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_ATTR_COUNT(obj, expected) check_attr_count(obj, expected, __LINE__) +static void check_attr_count(IMFAttributes* obj, UINT32 expected, int line) +{ + UINT32 count = expected + 1; + HRESULT hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__, line)(hr == S_OK, "Failed to get attributes count, hr %#x.\n", hr); + ok_(__FILE__, line)(count == expected, "Unexpected count %u, expected %u.\n", count, expected); +} + static void test_MFCreateAttributes(void) { PROPVARIANT propvar, ret_propvar; IMFAttributes *attributes; - UINT32 count, value; UINT64 value64; + UINT32 value; HRESULT hr; GUID key; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); - count = 88; - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - ok(count == 0, "got %d\n", count); - + CHECK_ATTR_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "Failed to set UINT32 value, hr %#x.\n", hr); - - hr = IMFAttributes_GetCount(attributes, &count); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); - todo_wine ok(count == 1, "got %d\n", count); + CHECK_ATTR_COUNT(attributes, 1); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value); @@ -530,6 +532,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "Failed to set UINT64 value, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &value64); ok(hr == S_OK, "Failed to get UINT64 value, hr %#x.\n", hr); @@ -557,6 +560,7 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to get item, hr %#x.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Unexpected item value.\n"); PropVariantClear(&ret_propvar); + CHECK_ATTR_COUNT(attributes, 1); PropVariantInit(&ret_propvar); ret_propvar.vt = MF_ATTRIBUTE_STRING; @@ -581,6 +585,7 @@ static void test_MFCreateAttributes(void) ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "Unexpected item value.\n"); PropVariantClear(&ret_propvar); PropVariantClear(&propvar); + CHECK_ATTR_COUNT(attributes, 1); PropVariantInit(&propvar); propvar.vt = VT_I4; @@ -604,9 +609,11 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "Failed to delete item, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 2); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 2); hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID3, &ret_propvar); ok(hr == S_OK, "Failed to get item, hr %#x.\n", hr);

1 0

Jactry Zeng : mfplat: Implement IMFAttributes::{SetDouble, GetDouble}.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 535ec306a4c3d45520108f6e88db13d6dc8a49e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=535ec306a4c3d45520108f6e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:13 2019 +0300 mfplat: Implement IMFAttributes::{SetDouble, GetDouble}. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 22 ++++++++++++++++++---- dlls/mfplat/tests/mfplat.c | 10 ++++++++++ 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 7bb09d6..6fb917e 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -762,9 +762,18 @@ static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), value); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), value); + + PropVariantInit(&attrval); + attrval.vt = VT_R8; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToDouble(&attrval, value); + return hr; } static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GUID *value) @@ -940,9 +949,14 @@ static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) { - FIXME("%p, %s, %f.\n", iface, debugstr_attr(key), value); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %f.\n", iface, debugstr_attr(key), value); + + attrval.vt = VT_R8; + attrval.u.dblVal = value; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, REFGUID value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 361584f..e6a3f4b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -507,6 +507,7 @@ static void test_MFCreateAttributes(void) { PROPVARIANT propvar, ret_propvar; IMFAttributes *attributes; + double double_value; UINT64 value64; UINT32 value; HRESULT hr; @@ -639,6 +640,15 @@ static void test_MFCreateAttributes(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); PropVariantClear(&ret_propvar); + hr = IMFAttributes_SetDouble(attributes, &GUID_NULL, 22.0); + ok(hr == S_OK, "Failed to set double value, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 3); + + double_value = 0xdeadbeef; + hr = IMFAttributes_GetDouble(attributes, &GUID_NULL, &double_value); + ok(hr == S_OK, "Failed to get double value, hr %#x.\n", hr); + ok(double_value == 22.0, "Unexpected value: %f, expected: 22.0.\n", double_value); + IMFAttributes_Release(attributes); }

1 0

Jactry Zeng : mfplat: Add support for string attributes.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: e00bfc4c91b8649c1a11f465c1944d6e489ed3db URL: https://source.winehq.org/git/wine.git/?a=commit;h=e00bfc4c91b8649c1a11f465… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:14 2019 +0300 mfplat: Add support for string attributes. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 63 ++++++++++++++++++++++++++++++++++------- dlls/mfplat/tests/mfplat.c | 44 ++++++++++++++++++++++++++-- dlls/mfreadwrite/tests/mfplat.c | 2 +- 3 files changed, 95 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 6fb917e..d73076b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -785,25 +785,61 @@ static HRESULT WINAPI mfattributes_GetGUID(IMFAttributes *iface, REFGUID key, GU static HRESULT WINAPI mfattributes_GetStringLength(IMFAttributes *iface, REFGUID key, UINT32 *length) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), length); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), length); + + PropVariantInit(&attrval); + attrval.vt = VT_LPWSTR; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr) && length) + *length = lstrlenW(attrval.u.pwszVal); + PropVariantClear(&attrval); + + return hr; } static HRESULT WINAPI mfattributes_GetString(IMFAttributes *iface, REFGUID key, WCHAR *value, - UINT32 size, UINT32 *length) + UINT32 size, UINT32 *length) { - FIXME("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), value, size, length); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p, %d, %p.\n", iface, debugstr_attr(key), value, size, length); + + PropVariantInit(&attrval); + attrval.vt = VT_LPWSTR; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + hr = PropVariantToString(&attrval, value, size); + if (SUCCEEDED(hr) && length) + *length = lstrlenW(value); + PropVariantClear(&attrval); + + return hr; } -static HRESULT WINAPI mfattributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, - WCHAR **value, UINT32 *length) +static HRESULT WINAPI mfattributes_GetAllocatedString(IMFAttributes *iface, REFGUID key, WCHAR **value, UINT32 *length) { - FIXME("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %p, %p.\n", iface, debugstr_attr(key), value, length); + + PropVariantInit(&attrval); + attrval.vt = VT_LPWSTR; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + { + *value = attrval.u.pwszVal; + *length = lstrlenW(*value); + } + + return hr; } static HRESULT WINAPI mfattributes_GetBlobSize(IMFAttributes *iface, REFGUID key, UINT32 *size) @@ -968,9 +1004,14 @@ static HRESULT WINAPI mfattributes_SetGUID(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_SetString(IMFAttributes *iface, REFGUID key, const WCHAR *value) { - FIXME("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %s.\n", iface, debugstr_attr(key), debugstr_w(value)); + + attrval.vt = VT_LPWSTR; + attrval.u.pwszVal = (WCHAR *)value; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, const UINT8 *buf, UINT32 size) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index e6a3f4b..3fda11d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -44,6 +44,7 @@ DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23, #include "mferror.h" #include "mfreadwrite.h" #include "propvarutil.h" +#include "strsafe.h" #include "wine/test.h" @@ -285,7 +286,7 @@ static void test_source_resolver(void) (void **)&attributes); ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, file_type); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); IMFAttributes_Release(attributes); hr = IMFSourceResolver_CreateObjectFromByteStream( @@ -505,11 +506,14 @@ static void check_attr_count(IMFAttributes* obj, UINT32 expected, int line) static void test_MFCreateAttributes(void) { + static const WCHAR stringW[] = {'W','i','n','e',0}; PROPVARIANT propvar, ret_propvar; + UINT32 value, string_length; IMFAttributes *attributes; double double_value; + WCHAR bufferW[256]; UINT64 value64; - UINT32 value; + WCHAR *string; HRESULT hr; GUID key; @@ -649,6 +653,42 @@ static void test_MFCreateAttributes(void) ok(hr == S_OK, "Failed to get double value, hr %#x.\n", hr); ok(double_value == 22.0, "Unexpected value: %f, expected: 22.0.\n", double_value); + hr = IMFAttributes_SetString(attributes, &DUMMY_GUID1, stringW); + ok(hr == S_OK, "Failed to set string attribute, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 3); + + hr = IMFAttributes_GetStringLength(attributes, &DUMMY_GUID1, &string_length); + ok(hr == S_OK, "Failed to get string length, hr %#x.\n", hr); + ok(string_length == lstrlenW(stringW), "Unexpected length %u.\n", string_length); + + string_length = 0xdeadbeef; + hr = IMFAttributes_GetAllocatedString(attributes, &DUMMY_GUID1, &string, &string_length); + ok(hr == S_OK, "Failed to get allocated string, hr %#x.\n", hr); + ok(!lstrcmpW(string, stringW), "Unexpected string %s.\n", wine_dbgstr_w(string)); + ok(string_length == lstrlenW(stringW), "Unexpected length %u.\n", string_length); + CoTaskMemFree(string); + + string_length = 0xdeadbeef; + hr = IMFAttributes_GetString(attributes, &DUMMY_GUID1, bufferW, ARRAY_SIZE(bufferW), &string_length); + ok(hr == S_OK, "Failed to get string value, hr %#x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "Unexpected string %s.\n", wine_dbgstr_w(bufferW)); + ok(string_length == lstrlenW(stringW), "Unexpected length %u.\n", string_length); + memset(bufferW, 0, sizeof(bufferW)); + + hr = IMFAttributes_GetString(attributes, &DUMMY_GUID1, bufferW, ARRAY_SIZE(bufferW), NULL); + ok(hr == S_OK, "Failed to get string value, hr %#x.\n", hr); + ok(!lstrcmpW(bufferW, stringW), "Unexpected string %s.\n", wine_dbgstr_w(bufferW)); + memset(bufferW, 0, sizeof(bufferW)); + + hr = IMFAttributes_GetString(attributes, &DUMMY_GUID1, bufferW, 1, NULL); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); + ok(!bufferW[0], "Unexpected string %s.\n", wine_dbgstr_w(bufferW)); + + string_length = 0xdeadbeef; + hr = IMFAttributes_GetStringLength(attributes, &GUID_NULL, &string_length); + ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + ok(string_length == 0xdeadbeef, "Unexpected length %u.\n", string_length); + IMFAttributes_Release(attributes); } diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 1767433..609510d 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -64,7 +64,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = IMFAttributes_SetString(attributes, &MF_READWRITE_MMCSS_CLASS_AUDIO, audio); - todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); + ok(hr == S_OK, "Failed to set string value, hr %#x.\n", hr); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_MMCSS_PRIORITY_AUDIO, 0); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr);

1 0

Jactry Zeng : mfplat: Implement IMFAttributes::{SetUnknown, GetUnknown}.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 57ac2649f86e25ca7761e235d3719ae5b55708c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57ac2649f86e25ca7761e235… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:15 2019 +0300 mfplat: Implement IMFAttributes::{SetUnknown, GetUnknown}. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 25 ++++++++++++++++++++----- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index d73076b..31bed33 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -671,7 +671,7 @@ static HRESULT attributes_get_item(struct attributes *attributes, const GUID *ke attribute = attributes_find_item(attributes, key, NULL); if (attribute) { - if (attribute->value.vt == value->vt) + if (attribute->value.vt == value->vt && !(value->vt == VT_UNKNOWN && !attribute->value.u.punkVal)) hr = PropVariantCopy(value, &attribute->value); else hr = MF_E_INVALIDTYPE; @@ -866,9 +866,19 @@ static HRESULT WINAPI mfattributes_GetAllocatedBlob(IMFAttributes *iface, REFGUI static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, REFIID riid, void **ppv) { - FIXME("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), ppv); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hr; - return E_NOTIMPL; + TRACE("%p, %s, %s, %p.\n", iface, debugstr_attr(key), debugstr_guid(riid), ppv); + + PropVariantInit(&attrval); + attrval.vt = VT_UNKNOWN; + hr = attributes_get_item(attributes, key, &attrval); + if (SUCCEEDED(hr)) + hr = IUnknown_QueryInterface(attrval.u.punkVal, riid, ppv); + PropVariantClear(&attrval); + return hr; } static HRESULT attributes_set_item(struct attributes *attributes, REFGUID key, REFPROPVARIANT value) @@ -1023,9 +1033,14 @@ static HRESULT WINAPI mfattributes_SetBlob(IMFAttributes *iface, REFGUID key, co static HRESULT WINAPI mfattributes_SetUnknown(IMFAttributes *iface, REFGUID key, IUnknown *unknown) { - FIXME("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + struct attributes *attributes = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - return E_NOTIMPL; + TRACE("%p, %s, %p.\n", iface, debugstr_attr(key), unknown); + + attrval.vt = VT_UNKNOWN; + attrval.u.punkVal = unknown; + return attributes_set_item(attributes, key, &attrval); } static HRESULT WINAPI mfattributes_LockStore(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fda11d..5579e02 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -511,6 +511,7 @@ static void test_MFCreateAttributes(void) UINT32 value, string_length; IMFAttributes *attributes; double double_value; + IUnknown *unk_value; WCHAR bufferW[256]; UINT64 value64; WCHAR *string; @@ -689,6 +690,30 @@ static void test_MFCreateAttributes(void) ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); ok(string_length == 0xdeadbeef, "Unexpected length %u.\n", string_length); + /* VT_UNKNOWN */ + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_GUID2, (IUnknown *)attributes); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 4); + + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IUnknown, (void **)&unk_value); + ok(hr == S_OK, "Failed to get value, hr %#x.\n", hr); + IUnknown_Release(unk_value); + + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IMFAttributes, (void **)&unk_value); + ok(hr == S_OK, "Failed to get value, hr %#x.\n", hr); + IUnknown_Release(unk_value); + + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_GUID2, &IID_IStream, (void **)&unk_value); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IMFAttributes_SetUnknown(attributes, &DUMMY_CLSID, NULL); + ok(hr == S_OK, "Failed to set value, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 5); + + unk_value = NULL; + hr = IMFAttributes_GetUnknown(attributes, &DUMMY_CLSID, &IID_IUnknown, (void **)&unk_value); + ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + IMFAttributes_Release(attributes); }

1 0

Jactry Zeng : mfplat: Implement IMFAttributes::DeleteAllItems().
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 20ab5230f6835a66f9ae004b6f22f368dbb41f4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=20ab5230f6835a66f9ae004b… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Thu Mar 14 11:03:16 2019 +0300 mfplat: Implement IMFAttributes::DeleteAllItems(). Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 18 +++++++++++++++--- dlls/mfplat/tests/mfplat.c | 4 ++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 31bed33..5a37eba 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -962,11 +962,23 @@ static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) { - mfattributes *This = impl_from_IMFAttributes(iface); + struct attributes *attributes = impl_from_IMFAttributes(iface); - FIXME("%p\n", This); + TRACE("%p.\n", iface); - return E_NOTIMPL; + EnterCriticalSection(&attributes->cs); + + while (attributes->count) + { + PropVariantClear(&attributes->attributes[--attributes->count].value); + } + heap_free(attributes->attributes); + attributes->attributes = NULL; + attributes->capacity = 0; + + LeaveCriticalSection(&attributes->cs); + + return S_OK; } static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5579e02..a999b9b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -714,6 +714,10 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_GetUnknown(attributes, &DUMMY_CLSID, &IID_IUnknown, (void **)&unk_value); ok(hr == MF_E_INVALIDTYPE, "Unexpected hr %#x.\n", hr); + hr = IMFAttributes_DeleteAllItems(attributes); + ok(hr == S_OK, "Failed to delete items, hr %#x.\n", hr); + CHECK_ATTR_COUNT(attributes, 0); + IMFAttributes_Release(attributes); }

1 0

Francois Gouget : dbghelp: Spelling fixes in a couple of comments.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: ab71398eb09d24f9f99b6266cb3005faea7a448f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab71398eb09d24f9f99b6266… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:40:53 2019 +0100 dbghelp: Spelling fixes in a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 96a1f87..f59e322 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -850,7 +850,7 @@ static void symt_get_length(struct module* module, const struct symt* symt, ULON *size = 0x1000; /* arbitrary value */ } -/* neede by symt_find_nearest */ +/* needed by symt_find_nearest */ static int symt_get_best_at(struct module* module, int idx_sorttab) { ULONG64 ref_addr; @@ -870,7 +870,7 @@ static int symt_get_best_at(struct module* module, int idx_sorttab) !cmp_sorttab_addr(module, idx_sorttab + 1, ref_addr)) idx_sorttab++; } - /* if no better symbol fond restore original */ + /* if no better symbol was found restore the original */ if (module->addr_sorttab[idx_sorttab]->symt.tag == SymTagPublicSymbol) idx_sorttab = idx_sorttab_orig; }

1 0

Francois Gouget : windowscodecs: Spelling fixes in a comment.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 603bd85a09b96c2330ab7829b5546bc3083bcae0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=603bd85a09b96c2330ab7829… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:39:56 2019 +0100 windowscodecs: Spelling fixes in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/palette.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/windowscodecs/palette.c b/dlls/windowscodecs/palette.c index 1c1e858..f99cbe0 100644 --- a/dlls/windowscodecs/palette.c +++ b/dlls/windowscodecs/palette.c @@ -669,8 +669,8 @@ static HRESULT WINAPI PaletteImpl_InitializeFromBitmap(IWICPalette *palette, hr = IWICBitmapSource_GetPixelFormat(source, &format); if (hr != S_OK) return hr; - /* For interoperability with gdiplus where PixelFormat24bppRGB actully stored - * as BGR (and there is no a corresponding RGB format) we have to use 24bppBGR + /* For interoperability with gdiplus where PixelFormat24bppRGB is actually stored + * as BGR (and there is no corresponding RGB format), we have to use 24bppBGR * to avoid format conversions. */ if (!IsEqualGUID(&format, &GUID_WICPixelFormat24bppBGR))

1 0

Francois Gouget : vbscript/tests: A spelling fix in a comment.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: c05a2ae4a753e5f408b473bf5bf076fa743af5e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c05a2ae4a753e5f408b473bf… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:40:30 2019 +0100 vbscript/tests: A spelling fix in a comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vbscript/tests/lang.vbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 9f1d24c..afd7c24 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1366,7 +1366,7 @@ end sub call test_identifiers() sub test_dotIdentifiers - ' test keywords that can also be an indentifier after a dot + ' test keywords that can also be an identifier after a dot ' Call ok(testObj.rem = 10, "testObj.rem = " & testObj.rem & " expected 10") Call ok(testObj.true = 10, "testObj.true = " & testObj.true & " expected 10") Call ok(testObj.false = 10, "testObj.false = " & testObj.false & " expected 10")

1 0

Francois Gouget : setupapi/tests: Add a trailing '\n' to a couple of ok() calls.
by Alexandre Julliard 14 Mar '19

14 Mar '19

Module: wine Branch: master Commit: 9f2baf1dd49590a0f8dada5a050719b7e2be697c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f2baf1dd49590a0f8dada5a… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu Mar 14 02:41:29 2019 +0100 setupapi/tests: Add a trailing '\n' to a couple of ok() calls. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 0f27783..004a956 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -63,13 +63,13 @@ static void test_create_device_list_ex(void) "Got unexpected error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, NULL, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); set = SetupDiCreateDeviceInfoListExW(NULL, NULL, empty, NULL); - ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.", GetLastError()); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); ret = SetupDiDestroyDeviceInfoList(set); ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError());

1 0