January 2019 - Wine-Devel - list.winehq.org

[PATCH v2 6/8] mfplat: Implement IMFAttributes::GetItemByIndex().
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 16 ++++++++++++++-- dlls/mfplat/tests/mfplat.c | 15 +++++++++------ 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index f897325502..06a49b237f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -903,9 +903,21 @@ static HRESULT WINAPI mfattributes_GetItemByIndex(IMFAttributes *iface, UINT32 i { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %d, %p, %p\n", This, index, key, value); + TRACE("(%p, %d, %p, %p)\n", This, index, key, value); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + if(index >= This->count) + { + LeaveCriticalSection(&This->lock); + return E_INVALIDARG; + } + *key = This->attributes[This->count - index - 1]->key; + PropVariantCopy(value, &This->attributes[This->count - index - 1]->value); + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_CopyAllItems(IMFAttributes *iface, IMFAttributes *dest) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 5dcb641486..7f7f413096 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -765,21 +765,24 @@ static void test_IMFAttributes_item(void) hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); PropVariantClear(&ret_propvar); PropVariantClear(&propvar); propvar.vt = MF_ATTRIBUTE_UINT64; U(propvar).uhVal.QuadPart = 65536; hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); - todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); - todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); - todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + hr = IMFAttributes_GetItemByIndex(attributes, 2, &key, &ret_propvar); + ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex should fail: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1

[PATCH v2 5/8] mfplat: Implement IMFAttributes::DeleteItem().
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 21 +++++++++++++++++++-- dlls/mfplat/tests/mfplat.c | 5 ++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 2877e9a929..f897325502 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -774,10 +774,27 @@ static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, RE static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) { mfattributes *This = impl_from_IMFAttributes(iface); + struct mfattribute *attribute = NULL; + int index = 0; - FIXME("%p, %s\n", This, debugstr_guid(key)); + TRACE("(%p, %s)\n", This, debugstr_guid(key)); - return E_NOTIMPL; + EnterCriticalSection(&This->lock); + + index = mfattributes_finditem(This, key, &attribute); + if(attribute) + { + PropVariantClear(&attribute->value); + heap_free(attribute); + + This->count--; + for(; index < This->count; index++) + This->attributes[index] = This->attributes[index + 1]; + } + + LeaveCriticalSection(&This->lock); + + return S_OK; } static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 13c1d3cb2f..5dcb641486 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -763,7 +763,7 @@ static void test_IMFAttributes_item(void) ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); - todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); @@ -777,6 +777,9 @@ static void test_IMFAttributes_item(void) todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1

[PATCH v2 4/8] mfplat: Implement IMFAttributes::{SetItem,GetItem}.
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 158 ++++++++++++++++++++++++++++++++-- dlls/mfplat/tests/Makefile.in | 2 +- dlls/mfplat/tests/mfplat.c | 88 +++++++++++++++++++ 3 files changed, 242 insertions(+), 6 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index c7c346512f..2877e9a929 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -35,6 +35,7 @@ #include "wine/heap.h" #include "wine/debug.h" #include "wine/unicode.h" +#include "wine/list.h" WINE_DEFAULT_DEBUG_CHANNEL(mfplat); @@ -448,10 +449,20 @@ HRESULT WINAPI MFCopyImage(BYTE *dest, LONG deststride, const BYTE *src, LONG sr return E_NOTIMPL; } +struct mfattribute +{ + GUID key; + PROPVARIANT value; +}; + typedef struct _mfattributes { IMFAttributes IMFAttributes_iface; LONG ref; + CRITICAL_SECTION lock; + struct mfattribute **attributes; + int count; + int allocated; } mfattributes; static inline mfattributes *impl_from_IMFAttributes(IMFAttributes *iface) @@ -491,6 +502,8 @@ static ULONG WINAPI mfattributes_AddRef(IMFAttributes *iface) return ref; } +static void free_attribute_object(mfattributes *object); + static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) { mfattributes *This = impl_from_IMFAttributes(iface); @@ -500,19 +513,54 @@ static ULONG WINAPI mfattributes_Release(IMFAttributes *iface) if (!ref) { + free_attribute_object(This); HeapFree(GetProcessHeap(), 0, This); } return ref; } +static int mfattributes_finditem(mfattributes *object, REFGUID key, struct mfattribute **attribute) +{ + int index; + + *attribute = NULL; + for(index = 0; index < object->count; index++) + { + if(IsEqualGUID(key, &object->attributes[index]->key)) + { + *attribute = object->attributes[index]; + break; + } + } + return index; +} + +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value) +{ + HRESULT hres; + struct mfattribute *attribute = NULL; + + EnterCriticalSection(&object->lock); + + mfattributes_finditem(object, key, &attribute); + if(!attribute) + hres = MF_E_ATTRIBUTENOTFOUND; + else + hres = PropVariantCopy(value, &attribute->value); + + LeaveCriticalSection(&object->lock); + + return hres; +} + static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PROPVARIANT *value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + return mfattributes_getitem(This, key, value); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -645,13 +693,82 @@ static HRESULT WINAPI mfattributes_GetUnknown(IMFAttributes *iface, REFGUID key, return E_NOTIMPL; } -static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT Value) +static HRESULT mfattributes_setitem(mfattributes *object, REFGUID key, REFPROPVARIANT value) +{ + struct mfattribute *new_attribute = NULL; + int index; + + EnterCriticalSection(&object->lock); + + index = mfattributes_finditem(object, key, &new_attribute); + + if(!new_attribute) + { + if(index == object->allocated) + { + object->allocated *= 2; + object->attributes = heap_realloc(object->attributes, sizeof(struct mfattribute *) * object->allocated); + if(!object->attributes) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + } + + new_attribute = heap_alloc(sizeof(struct mfattribute)); + if(!new_attribute) + { + LeaveCriticalSection(&object->lock); + return E_OUTOFMEMORY; + } + new_attribute->key = *key; + + object->attributes[index] = new_attribute; + object->count++; + } + else + PropVariantClear(&new_attribute->value); + + PropVariantCopy(&new_attribute->value, value); + + LeaveCriticalSection(&object->lock); + + return S_OK; + } + +static BOOL is_type_valid(DWORD type) +{ + switch(type) + { + case MF_ATTRIBUTE_UINT32: + case MF_ATTRIBUTE_UINT64: + case MF_ATTRIBUTE_DOUBLE: + case MF_ATTRIBUTE_GUID: + case MF_ATTRIBUTE_STRING: + case MF_ATTRIBUTE_BLOB: + case MF_ATTRIBUTE_IUNKNOWN: + return TRUE; + default: + return FALSE; + } +} + +static HRESULT WINAPI mfattributes_SetItem(IMFAttributes *iface, REFGUID key, REFPROPVARIANT value) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %s, %p\n", This, debugstr_guid(key), Value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + if(!is_type_valid(value->vt)) + { + PROPVARIANT empty_value; + + PropVariantClear(&empty_value); + mfattributes_setitem(This, key, &empty_value); + return MF_E_INVALIDTYPE; + } + else + return mfattributes_setitem(This, key, value); } static HRESULT WINAPI mfattributes_DeleteItem(IMFAttributes *iface, REFGUID key) @@ -824,6 +941,31 @@ static void init_attribute_object(mfattributes *object, UINT32 size) { object->ref = 1; object->IMFAttributes_iface.lpVtbl = &mfattributes_vtbl; + InitializeCriticalSection(&object->lock); + object->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": IMFAttributes.lock"); + if(!size) + size = 3; + object->attributes = heap_alloc_zero(sizeof(struct mfattribute*) * size); + object->count = 0; + object->allocated = size; +} + +static void free_attribute_object(mfattributes *object) +{ + int i; + + EnterCriticalSection(&object->lock); + + for(i = 0; i < object->count; i++) + { + PropVariantClear(&object->attributes[i]->value); + heap_free(object->attributes[i]); + } + + LeaveCriticalSection(&object->lock); + + object->lock.DebugInfo->Spare[0] = 0; + DeleteCriticalSection(&object->lock); } /*********************************************************************** @@ -901,6 +1043,7 @@ static ULONG WINAPI mfbytestream_Release(IMFByteStream *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -1368,6 +1511,7 @@ static ULONG WINAPI mfpresentationdescriptor_Release(IMFPresentationDescriptor * if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2064,6 +2208,7 @@ static ULONG WINAPI mediatype_Release(IMFMediaType *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2426,6 +2571,7 @@ static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) if (!ref) { + free_attribute_object(&This->attributes); HeapFree(GetProcessHeap(), 0, This); } @@ -2940,6 +3086,7 @@ static ULONG WINAPI mfdescriptor_Release(IMFStreamDescriptor *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } @@ -3437,6 +3584,7 @@ static ULONG WINAPI mfsample_Release(IMFSample *iface) if (!ref) { + free_attribute_object(&This->attributes); heap_free(This); } diff --git a/dlls/mfplat/tests/Makefile.in b/dlls/mfplat/tests/Makefile.in index 07cf328ad2..e80a3b7cfc 100644 --- a/dlls/mfplat/tests/Makefile.in +++ b/dlls/mfplat/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = mfplat.dll -IMPORTS = ole32 mfplat +IMPORTS = ole32 mfplat propsys C_SRCS = \ mfplat.c diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 3fa59f4816..13c1d3cb2f 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -33,6 +33,7 @@ #include "mfidl.h" #include "mferror.h" #include "mfreadwrite.h" +#include "propvarutil.h" #include "wine/test.h" @@ -51,6 +52,7 @@ DEFINE_GUID(MFT_CATEGORY_OTHER, 0x90175d57,0xb7ea,0x4901,0xae,0xb3,0x93,0x3a,0x8 DEFINE_GUID(DUMMY_CLSID, 0x12345678,0x1234,0x1234,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19); DEFINE_GUID(DUMMY_GUID1, 0x12345678,0x1234,0x1234,0x21,0x21,0x21,0x21,0x21,0x21,0x21,0x21); DEFINE_GUID(DUMMY_GUID2, 0x12345678,0x1234,0x1234,0x22,0x22,0x22,0x22,0x22,0x22,0x22,0x22); +DEFINE_GUID(DUMMY_GUID3, 0x12345678,0x1234,0x1234,0x23,0x23,0x23,0x23,0x23,0x23,0x23,0x23); static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; @@ -693,6 +695,91 @@ static void test_MFSample(void) IMFSample_Release(sample); } +static void test_IMFAttributes_item(void) +{ + IMFAttributes *attributes; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + GUID key; + + hr = MFCreateAttributes(&attributes, 0); + ok(hr == S_OK, "MFCreateAttributes failed: 0x%08x.\n", hr); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_STRING; + U(ret_propvar).pwszVal = NULL; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID1, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).ulVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID1, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID2, &propvar); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_SetItem should failed: 0x%08x.\n", hr); + PropVariantInit(&ret_propvar); + ret_propvar.vt = MF_ATTRIBUTE_UINT32; + U(ret_propvar).lVal = 0xdeadbeef; + hr = IMFAttributes_GetItem(attributes, &DUMMY_GUID2, &ret_propvar); + ok(hr == S_OK, "IMFAttributes_GetItem failed: 0x%08x.\n", hr); + PropVariantClear(&propvar); + ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT32; + U(propvar).ulVal = 123; + hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); + ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + + hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); + todo_wine ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID3), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + PropVariantClear(&ret_propvar); + PropVariantClear(&propvar); + propvar.vt = MF_ATTRIBUTE_UINT64; + U(propvar).uhVal.QuadPart = 65536; + hr = IMFAttributes_GetItemByIndex(attributes, 1, &key, &ret_propvar); + todo_wine ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); + todo_wine ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); + todo_wine ok(IsEqualIID(&key, &DUMMY_GUID1), "got wrong key: %s.\n", wine_dbgstr_guid(&key)); + + IMFAttributes_Release(attributes); +} + START_TEST(mfplat) { CoInitialize(NULL); @@ -708,6 +795,7 @@ START_TEST(mfplat) test_MFCreateMFByteStreamOnStream(); test_MFCreateMemoryBuffer(); test_source_resolver(); + test_IMFAttributes_item(); CoUninitialize(); } -- 2.20.1

2 1

[PATCH v2 3/8] propsys/tests: Add tests of IPropertyStore interface.
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/tests/propstore.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index a24d3e762b..e87787e947 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -34,6 +34,7 @@ #include "initguid.h" DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +DEFINE_GUID(DUMMY_GUID1, 0x12345678, 0x1234,0x1234, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19); #define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) static void _expect_ref(IUnknown *obj, ULONG ref, int line) @@ -299,6 +300,64 @@ static void test_PSCreateMemoryPropertyStore(void) IPropertyStoreCache_Release(propstorecache); } +static void test_propertystore(void) +{ + IPropertyStore *propstore; + HRESULT hr; + PROPVARIANT propvar, ret_propvar; + PROPERTYKEY propkey; + DWORD count = 0; + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(!count, "got wrong property count: %d, expected 0.\n", count); + + PropVariantInit(&propvar); + propvar.vt = VT_I4; + U(propvar).lVal = 123; + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + ret_propvar.vt = VT_I4; + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_I4, "got wrong property type: %x.\n", ret_propvar.vt); + ok(U(ret_propvar).lVal == 123, "got wrong value: %d, expected 123.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + PropVariantInit(&propvar); + propkey.fmtid = DUMMY_GUID1; + propkey.pid = PID_FIRST_USABLE; + hr = IPropertyStore_SetValue(propstore, &propkey, &propvar); + ok(hr == S_OK, "IPropertyStore_SetValue failed: 0x%08x.\n", hr); + hr = IPropertyStore_Commit(propstore); + ok(hr == S_OK, "IPropertyStore_Commit failed: 0x%08x.\n", hr); + hr = IPropertyStore_GetCount(propstore, &count); + ok(hr == S_OK, "IPropertyStore_GetCount failed: 0x%08x.\n", hr); + ok(count == 1, "got wrong property count: %d, expected 1.\n", count); + PropVariantInit(&ret_propvar); + hr = IPropertyStore_GetValue(propstore, &propkey, &ret_propvar); + ok(hr == S_OK, "IPropertyStore_GetValue failed: 0x%08x.\n", hr); + ok(ret_propvar.vt == VT_EMPTY, "got wrong property type: %x.\n", ret_propvar.vt); + ok(!U(ret_propvar).lVal, "got wrong value: %d, expected 0.\n", U(ret_propvar).lVal); + PropVariantClear(&propvar); + PropVariantClear(&ret_propvar); + + IPropertyStore_Release(propstore); +} + START_TEST(propstore) { CoInitialize(NULL); @@ -306,6 +365,7 @@ START_TEST(propstore) test_inmemorystore(); test_persistserialized(); test_PSCreateMemoryPropertyStore(); + test_propertystore(); CoUninitialize(); } -- 2.20.1

1 0

[PATCH v2 2/8] propsys: Implement PSCreateMemoryPropertyStore().
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/propsys/propsys.spec | 2 +- dlls/propsys/propsys_main.c | 7 +++++ dlls/propsys/tests/propstore.c | 51 ++++++++++++++++++++++++++++++++++ include/propsys.idl | 1 + 4 files changed, 60 insertions(+), 1 deletion(-) diff --git a/dlls/propsys/propsys.spec b/dlls/propsys/propsys.spec index bbc71654a8..19c5a24c92 100644 --- a/dlls/propsys/propsys.spec +++ b/dlls/propsys/propsys.spec @@ -65,7 +65,7 @@ @ stub PSCoerceToCanonicalValue @ stub PSCreateAdapterFromPropertyStore @ stub PSCreateDelayedMultiplexPropertyStore -@ stub PSCreateMemoryPropertyStore +@ stdcall PSCreateMemoryPropertyStore(ptr ptr) @ stub PSCreateMultiplexPropertyStore @ stub PSCreatePropertyChangeArray @ stub PSCreatePropertyStoreFromObject diff --git a/dlls/propsys/propsys_main.c b/dlls/propsys/propsys_main.c index 1dbaee433f..65d157d0cc 100644 --- a/dlls/propsys/propsys_main.c +++ b/dlls/propsys/propsys_main.c @@ -509,3 +509,10 @@ HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR pszString, PROPERTYKEY *pkey) return S_OK; } + +HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID riid, void **ppv) +{ + TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); + + return PropertyStore_CreateInstance(NULL, riid, ppv); +} diff --git a/dlls/propsys/tests/propstore.c b/dlls/propsys/tests/propstore.c index 3fe8613a8b..a24d3e762b 100644 --- a/dlls/propsys/tests/propstore.c +++ b/dlls/propsys/tests/propstore.c @@ -35,6 +35,15 @@ DEFINE_GUID(PKEY_WineTest, 0x7b317433, 0xdfa3, 0x4c44, 0xad, 0x3e, 0x2f, 0x80, 0x4b, 0x90, 0xdb, 0xf4); +#define EXPECT_REF(obj,ref) _expect_ref((IUnknown *)obj, ref, __LINE__) +static void _expect_ref(IUnknown *obj, ULONG ref, int line) +{ + ULONG rc; + IUnknown_AddRef(obj); + rc = IUnknown_Release(obj); + ok_(__FILE__,line)(rc == ref, "expected refcount %d, got %d\n", ref, rc); +} + static void test_inmemorystore(void) { IPropertyStoreCache *propcache; @@ -249,12 +258,54 @@ static void test_persistserialized(void) IPersistSerializedPropStorage_Release(serialized); } +static void test_PSCreateMemoryPropertyStore(void) +{ + IPropertyStore *propstore, *propstore1; + IPersistSerializedPropStorage *serialized; + IPropertyStoreCache *propstorecache; + HRESULT hr; + + /* PSCreateMemoryPropertyStore(&IID_IPropertyStore, NULL); crashes */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore != NULL, "got %p.\n", propstore); + EXPECT_REF(propstore, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPersistSerializedPropStorage, (void **)&serialized); + todo_wine ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + todo_wine ok(serialized != NULL, "got %p.\n", serialized); + EXPECT_REF(propstore, 1); + /* EXPECT_REF(serialized, 1); */ + /* IPersistSerializedPropStorage_Release(serialized); */ + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStoreCache, (void **)&propstorecache); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstorecache != NULL, "got %p.\n", propstore); + ok(propstorecache != (IPropertyStoreCache *)propstore, "pointer are equal: %p, %p.\n", propstorecache, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstorecache, 1); + + hr = PSCreateMemoryPropertyStore(&IID_IPropertyStore, (void **)&propstore1); + ok(hr == S_OK, "PSCreateMemoryPropertyStore failed: 0x%08x.\n", hr); + ok(propstore1 != NULL, "got %p.\n", propstore); + ok(propstore1 != propstore, "pointer are equal: %p, %p.\n", propstore1, propstore); + EXPECT_REF(propstore, 1); + EXPECT_REF(propstore1, 1); + EXPECT_REF(propstorecache, 1); + + IPropertyStore_Release(propstore1); + IPropertyStore_Release(propstore); + IPropertyStoreCache_Release(propstorecache); +} + START_TEST(propstore) { CoInitialize(NULL); test_inmemorystore(); test_persistserialized(); + test_PSCreateMemoryPropertyStore(); CoUninitialize(); } diff --git a/include/propsys.idl b/include/propsys.idl index 04d3fbf8a1..bdd67fa6a5 100644 --- a/include/propsys.idl +++ b/include/propsys.idl @@ -799,6 +799,7 @@ cpp_quote("#define PKEY_PIDSTR_MAX 10") cpp_quote("#define GUIDSTRING_MAX 39") cpp_quote("#define PKEYSTR_MAX (GUIDSTRING_MAX + 1 + PKEY_PIDSTR_MAX)") +cpp_quote("HRESULT WINAPI PSCreateMemoryPropertyStore(REFIID,void **);") cpp_quote("HRESULT WINAPI PSStringFromPropertyKey(REFPROPERTYKEY,LPWSTR,UINT);") cpp_quote("HRESULT WINAPI PSPropertyKeyFromString(LPCWSTR,PROPERTYKEY*);") cpp_quote("HRESULT WINAPI PSGetPropertyDescription(REFPROPERTYKEY,REFIID,void **);") -- 2.20.1

1 0

[PATCH v2 1/8] ole32/tests: Test PropVariantCopy() with VT_UNKNOWN.
by Jactry Zeng Jan. 4, 2019

Jan. 4, 2019

This series superseded patch 156218~156226. And it seems that patch will lose randomly when sending too much patches at a time. So I split it into a smaller series. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/ole32/tests/propvariant.c | 58 ++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8c9f79e8d6 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define COBJMACROS + #include "windows.h" #include "wtypes.h" #include "ddeml.h" @@ -298,10 +300,55 @@ static void test_validtypes(void) } } +struct unk_impl +{ + IUnknown IUnknown_iface; + LONG ref; +}; + +static inline struct unk_impl *impl_from_IUnknown(IUnknown *iface) +{ + return CONTAINING_RECORD(iface, struct unk_impl, IUnknown_iface); +} + +static HRESULT WINAPI unk_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_QueryInterface()\n"); + *ppv = &This->IUnknown_iface; + IUnknown_AddRef(iface); + return S_OK; +} + +static ULONG WINAPI unk_AddRef(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_AddRef()\n"); + return InterlockedIncrement(&This->ref); +} + +static ULONG WINAPI unk_Release(IUnknown *iface) +{ + struct unk_impl *This = impl_from_IUnknown(iface); + if(winetest_debug > 1) + trace("Call to unk_Release()\n"); + return InterlockedDecrement(&This->ref); +} + +static const IUnknownVtbl unk_vtbl = +{ + unk_QueryInterface, + unk_AddRef, + unk_Release +}; + static void test_copy(void) { static char szTestString[] = "Test String"; static WCHAR wszTestString[] = {'T','e','s','t',' ','S','t','r','i','n','g',0}; + struct unk_impl unk_obj = {{&unk_vtbl}, 1}; PROPVARIANT propvarSrc; PROPVARIANT propvarDst; HRESULT hr; @@ -334,6 +381,17 @@ static void test_copy(void) hr = PropVariantClear(&propvarDst); ok(hr == S_OK, "PropVariantClear(...VT_LPSTR...) failed\n"); memset(&propvarSrc, 0, sizeof(propvarSrc)); + + propvarSrc.vt = VT_UNKNOWN; + U(propvarSrc).punkVal = &unk_obj.IUnknown_iface; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == S_OK, "PropVariantCopy(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(U(propvarDst).punkVal == &unk_obj.IUnknown_iface, "Got wrong IUnknown pointer\n"); + ok(unk_obj.ref == 2, "got wrong refcount: %d.\n", unk_obj.ref); + hr = PropVariantClear(&propvarDst); + ok(hr == S_OK, "PropVariantClear(...VT_UNKNOWN...) failed: 0x%08x.\n", hr); + ok(unk_obj.ref == 1, "got wrong refcount: %d.\n", unk_obj.ref); + memset(&propvarSrc, 0, sizeof(propvarSrc)); } struct _PMemoryAllocator_vtable { -- 2.20.1

1 0

[PATCH] shell32/tests: Move the cursor away from the dropdown listbox.
by Huw Davies Jan. 4, 2019

Jan. 4, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46275 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/shell32/tests/autocomplete.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/shell32/tests/autocomplete.c b/dlls/shell32/tests/autocomplete.c index 0da164b464..4f81214b02 100644 --- a/dlls/shell32/tests/autocomplete.c +++ b/dlls/shell32/tests/autocomplete.c @@ -799,6 +799,8 @@ START_TEST(autocomplete) HRESULT r; MSG msg; IAutoComplete* ac; + RECT win_rect; + POINT orig_pos; r = CoInitialize(NULL); ok(r == S_OK, "CoInitialize failed (0x%08x). Tests aborted.\n", r); @@ -809,6 +811,11 @@ START_TEST(autocomplete) ok(hMainWnd != NULL, "Failed to create parent window. Tests aborted.\n"); if (!hMainWnd) return; + /* Move the cursor away from the dropdown listbox */ + GetWindowRect(hMainWnd, &win_rect); + GetCursorPos(&orig_pos); + SetCursorPos(win_rect.left, win_rect.top); + test_invalid_init(); ac = test_init(); if (!ac) @@ -826,6 +833,7 @@ START_TEST(autocomplete) IAutoComplete_Release(ac); cleanup: + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hEdit); DestroyWindow(hMainWnd); -- 2.18.0

1 0

[PATCH] po: Update Sinhala translation
by Isira Seneviratne Jan. 4, 2019

Jan. 4, 2019

1 0

[PATCH v3] systray: Hide systray for fullscreen games
by Hamish Claxton Jan. 4, 2019

Jan. 4, 2019

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Furthermore it also handles borderless fullscreen modes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- v3: Rewritten - properly checks the foreground window. Also now supports fullscreen borderless modes. programs/explorer/systray.c | 68 +++++++++++++++++++++++++++++++++++-- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..0d727a7302 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -99,7 +99,7 @@ static unsigned int alloc_displayed; static unsigned int nb_displayed; static struct icon **displayed; /* array of currently displayed icons */ -static BOOL hide_systray, enable_shell; +static BOOL systray_hidden, hide_systray, enable_shell; static int icon_cx, icon_cy, tray_width, tray_height; static int start_button_width, taskbar_button_width; static WCHAR start_label[50]; @@ -107,6 +107,9 @@ static WCHAR start_label[50]; static struct icon *balloon_icon; static HWND balloon_window; +/* Fullscreen checking */ +static BOOL fullscreen; + #define MIN_DISPLAYED 8 #define ICON_BORDER 2 @@ -780,7 +783,13 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + /* Show the systray if the foreground window is not fullscreen */ + else if ( !fullscreen ) { + do_show_systray(); + systray_hidden = FALSE; + InvalidateRect( tray_window, NULL, TRUE ); /* Force a redraw of the systray */ + SendMessageW( GetDesktopWindow(), WM_PARENTNOTIFY, 0, 0 ); /* Notify desktop of update */ + } break; case WM_TIMER: @@ -879,6 +888,60 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l return 0; } +/* + Check if a window is fullscreen, accounting for a maximum + difference of two pixels on width and height for borderless + fullscreen modes +*/ +static BOOL is_window_fullscreen( HWND window ) +{ + int width_delta, height_delta; + RECT window_rect, desktop_rect; + + if ( window == GetShellWindow() + || window == GetDesktopWindow() + || window == tray_window ) return FALSE; + + GetWindowRect( window, &window_rect ); + GetWindowRect( GetDesktopWindow(), &desktop_rect ); + + width_delta = window_rect.right - desktop_rect.right; + height_delta = window_rect.bottom - desktop_rect.bottom; + + return ( width_delta >= 0 + && width_delta <= 2 + && height_delta >= 0 + && height_delta <= 2 ); +} + +/* Handle systray visibilty */ +void handle_systray( void ) +{ + /* Check if fullscreen and the foreground window is not fullscreen */ + if ( fullscreen && !is_window_fullscreen( GetForegroundWindow() ) ) + fullscreen = FALSE; + + /* Check if not fullscreen and the foreground window is fullscreen */ + else if ( !fullscreen && is_window_fullscreen( GetForegroundWindow() ) ) + fullscreen = TRUE; + + /* Hide the systray */ + if ( ( hide_systray || ( !nb_displayed && !enable_shell ) + || fullscreen ) && !systray_hidden ) + { + do_hide_systray(); + systray_hidden = TRUE; + } + + /* Show the systray */ + else if ( !fullscreen && systray_hidden ) + { + do_show_systray(); + systray_hidden = FALSE; + InvalidateRect( tray_window, NULL, TRUE ); /* Force a redraw of the systray */ + } +} + /* notification posted to the desktop window */ void handle_parent_notify( HWND hwnd, WPARAM wp ) { @@ -893,6 +956,7 @@ void handle_parent_notify( HWND hwnd, WPARAM wp ) break; } sync_taskbar_buttons(); + handle_systray(); } /* this function creates the listener window */ -- 2.20.1

1 0

[PATCH v2] systray: Hide systray for fullscreen games
by Hamish Claxton Jan. 4, 2019

Jan. 4, 2019

This patch fixes a bug where if using the Wine virtual desktop, changing resolutions in a fullscreen game would cause the systray to be drawn over the game window. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40828 Signed-off-by: Hamish Claxton <hamishclaxton(a)gmail.com> --- v2: Properly do the resolution checks programs/explorer/systray.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index 3d36f74e16..893a9dadda 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -780,7 +780,11 @@ static LRESULT WINAPI tray_wndproc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM l case WM_DISPLAYCHANGE: if (hide_systray || (!nb_displayed && !enable_shell)) do_hide_systray(); - else do_show_systray(); + else { + if ( !( GetSystemMetrics( SM_CXFULLSCREEN ) >= GetSystemMetrics( SM_CXSCREEN ) + && GetSystemMetrics( SM_CYFULLSCREEN ) >= GetSystemMetrics( SM_CYSCREEN ) ) ) + do_show_systray(); + } break; case WM_TIMER: -- 2.20.1

4 5