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

[PATCH v2 8/8] mfplat: Implement IMFattributes::GetCount().
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/main.c | 10 +++++++--- dlls/mfplat/tests/mfplat.c | 27 +++++++++++++++++---------- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 25c075781b..6ada39a1c9 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -919,12 +919,16 @@ static HRESULT WINAPI mfattributes_GetCount(IMFAttributes *iface, UINT32 *items) { mfattributes *This = impl_from_IMFAttributes(iface); - FIXME("%p, %p\n", This, items); + TRACE("(%p, %p)\n", This, items); + + EnterCriticalSection(&This->lock); if(items) - *items = 0; + *items = This->count; - return E_NOTIMPL; + LeaveCriticalSection(&This->lock); + + 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 4564f410d3..51c6a2abec 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -409,28 +409,30 @@ static void test_MFCreateMediaEvent(void) IMFMediaEvent_Release(mediaevent); } +#define CHECK_COUNT(obj,expected) _check_count(obj, expected, __LINE__) +static void _check_count(IMFAttributes* obj, ULONG expected, int line) +{ + UINT32 count = 9999; + HRESULT hr; + hr = IMFAttributes_GetCount(obj, &count); + ok_(__FILE__,line)(hr == S_OK, "IMFAttributes_GetCount failed: 0x%08x.\n", hr); + ok_(__FILE__,line)(count == expected, "got %d, expected %d.\n", count, expected); +} + static void test_MFCreateAttributes(void) { IMFAttributes *attributes; HRESULT hr; - UINT32 count; UINT32 uint32_value; UINT64 uint64_value; 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_COUNT(attributes, 0); hr = IMFAttributes_SetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 123); ok(hr == S_OK, "IMFAttributes_SetUINT32 failed: 0x%08x.\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_COUNT(attributes, 1); uint32_value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); @@ -444,6 +446,7 @@ static void test_MFCreateAttributes(void) hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 1); hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); @@ -786,8 +789,10 @@ static void test_IMFAttributes_item(void) hr = IMFAttributes_SetItem(attributes, &DUMMY_GUID3, &propvar); ok(hr == S_OK, "IMFAttributes_SetItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 3); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_GetItemByIndex(attributes, 0, &key, &ret_propvar); ok(hr == S_OK, "IMFAttributes_GetItemByIndex failed: 0x%08x.\n", hr); ok(!PropVariantCompareEx(&propvar, &ret_propvar, 0, 0), "got wrong property.\n"); @@ -801,8 +806,10 @@ static void test_IMFAttributes_item(void) 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)); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_DeleteItem(attributes, &DUMMY_GUID2); ok(hr == S_OK, "IMFAttributes_DeleteItem failed: 0x%08x.\n", hr); + CHECK_COUNT(attributes, 2); hr = IMFAttributes_GetItemByIndex(attributes, 2, &key, &ret_propvar); ok(hr == E_INVALIDARG, "IMFAttributes_GetItemByIndex should fail: 0x%08x.\n", hr); -- 2.20.1

2 1

[PATCH] comctl32/tests: Remove redundant assignment.
by Andrey Gusev 04 Jan '19

04 Jan '19

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/comctl32/tests/imagelist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c index 3bb7902a13..86d0fabf9e 100644 --- a/dlls/comctl32/tests/imagelist.c +++ b/dlls/comctl32/tests/imagelist.c @@ -918,7 +918,6 @@ static void check_ilhead_data(const ILHEAD *ilh, INT cx, INT cy, INT cur, INT ma } else { - grow = (WORD)(grow + 3) & ~3; ok(ilh->cMaxImage == max, "wrong cMaxImage %d (expected %d)\n", ilh->cMaxImage, max); ok(ilh->cGrow == grow_aligned, "Unexpected cGrow %d, expected %d\n", ilh->cGrow, grow_aligned); } -- 2.20.1

1 0

[PATCH vkd3d 5/7] vkd3d: Implement private data for resources.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 6 ++++++ 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 3fb3c1e8209d..8b628a6bcbba 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -706,6 +706,7 @@ static ULONG d3d12_resource_decref(struct d3d12_resource *resource) if (!refcount) { + vkd3d_private_store_destroy(&resource->private_store); d3d12_resource_destroy(resource, resource->device); vkd3d_free(resource); } @@ -781,25 +782,31 @@ static ULONG STDMETHODCALLTYPE d3d12_resource_Release(ID3D12Resource *iface) static HRESULT STDMETHODCALLTYPE d3d12_resource_GetPrivateData(ID3D12Resource *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&resource->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateData(ID3D12Resource *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&resource->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetPrivateDataInterface(ID3D12Resource *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_resource *resource = impl_from_ID3D12Resource(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&resource->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_resource_SetName(ID3D12Resource *iface, const WCHAR *name) @@ -1172,6 +1179,8 @@ static HRESULT d3d12_resource_init(struct d3d12_resource *resource, struct d3d12 resource->heap = NULL; resource->heap_offset = 0; + vkd3d_private_store_init(&resource->private_store); + resource->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -1350,6 +1359,7 @@ HRESULT vkd3d_create_image_resource(ID3D12Device *device, object->present_state = D3D12_RESOURCE_STATE_COMMON; object->device = d3d12_device; ID3D12Device_AddRef(&d3d12_device->ID3D12Device_iface); + vkd3d_private_store_init(&object->private_store); TRACE("Created resource %p.\n", object); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a7c23f9fd4e9..76a7a367b8e4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -295,6 +295,8 @@ struct d3d12_resource D3D12_RESOURCE_STATES present_state; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; static inline bool d3d12_resource_is_buffer(const struct d3d12_resource *resource) diff --git a/tests/d3d12.c b/tests/d3d12.c index a8cad289841f..8dd25aa1ae23 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2590,6 +2590,7 @@ static void test_private_data(void) &IID_ID3D12Fence, &IID_ID3D12Heap, &IID_ID3D12PipelineState, + &IID_ID3D12Resource, &IID_ID3D12RootSignature, }; @@ -2673,6 +2674,11 @@ static void test_private_data(void) root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); ID3D12RootSignature_Release(root_signature); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Resource)) + { + vkd3d_test_set_context("resource"); + unknown = (IUnknown *)create_readback_buffer(device, 512); + } else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) { vkd3d_test_set_context("root signature"); -- 2.19.2

2 1

[PATCH vkd3d 3/7] vkd3d: Implement private data for pipeline states.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 24 ++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 10 ++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index f0b61ec057d1..ee91c725f75d 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1136,6 +1136,8 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState struct d3d12_device *device = state->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&state->private_store); + if (d3d12_pipeline_state_is_graphics(state)) d3d12_pipeline_state_destroy_graphics(state, device); else if (d3d12_pipeline_state_is_compute(state)) @@ -1159,25 +1161,31 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_GetPrivateData(ID3D12PipelineState *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateData(ID3D12PipelineState *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&state->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetPrivateDataInterface(ID3D12PipelineState *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&state->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_pipeline_state_SetName(ID3D12PipelineState *iface, const WCHAR *name) @@ -1508,6 +1516,8 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st return hresult_from_vk_result(vr); } + vkd3d_private_store_init(&state->private_store); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_COMPUTE; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); @@ -2349,6 +2359,8 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s list_init(&graphics->compiled_pipelines); + vkd3d_private_store_init(&state->private_store); + state->vk_bind_point = VK_PIPELINE_BIND_POINT_GRAPHICS; state->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 14f95bfa5d4a..d4ebb5e62fc6 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -620,6 +620,8 @@ struct d3d12_pipeline_state uint8_t uav_counter_mask; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; static inline bool d3d12_pipeline_state_is_compute(const struct d3d12_pipeline_state *state) diff --git a/tests/d3d12.c b/tests/d3d12.c index 61b00e60ab4e..67df4d932e0e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,6 +2562,7 @@ static void test_private_data(void) D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; + ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; IUnknown *test_object; @@ -2586,6 +2587,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12PipelineState, &IID_ID3D12RootSignature, }; @@ -2650,6 +2652,14 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12PipelineState)) + { + vkd3d_test_set_context("pipeline state"); + root_signature = create_empty_root_signature(device, 0); + unknown = (IUnknown *)create_pipeline_state(device, + root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); + ID3D12RootSignature_Release(root_signature); + } else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) { vkd3d_test_set_context("root signature"); -- 2.19.2

2 1

[PATCH vkd3d 7/7] vkd3d: Implement private data for query heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 ++++++++++++ 3 files changed, 30 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 1b2e82d689cf..ffce926e476a 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2630,6 +2630,8 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&heap->private_store); + VK_CALL(vkDestroyQueryPool(device->vk_device, heap->vk_query_pool, NULL)); vkd3d_free(heap); @@ -2643,25 +2645,31 @@ static ULONG STDMETHODCALLTYPE d3d12_query_heap_Release(ID3D12QueryHeap *iface) static HRESULT STDMETHODCALLTYPE d3d12_query_heap_GetPrivateData(ID3D12QueryHeap *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetPrivateData(ID3D12QueryHeap *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetPrivateDataInterface(ID3D12QueryHeap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_query_heap *heap = impl_from_ID3D12QueryHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_query_heap_SetName(ID3D12QueryHeap *iface, const WCHAR *name) @@ -2774,6 +2782,8 @@ HRESULT d3d12_query_heap_create(struct d3d12_device *device, const D3D12_QUERY_H return hresult_from_vk_result(vr); } + vkd3d_private_store_init(&object->private_store); + ID3D12Device_AddRef(&device->ID3D12Device_iface); TRACE("Created query heap %p.\n", object); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index afb0e9c26811..c0c15b245902 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -467,6 +467,8 @@ struct d3d12_query_heap struct d3d12_device *device; + struct vkd3d_private_store private_store; + uint64_t availability_mask[]; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 45faf0764d97..b8563b32e91e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2562,6 +2562,7 @@ static void test_private_data(void) D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; + D3D12_QUERY_HEAP_DESC query_heap_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; @@ -2592,6 +2593,7 @@ static void test_private_data(void) &IID_ID3D12Fence, &IID_ID3D12Heap, &IID_ID3D12PipelineState, + &IID_ID3D12QueryHeap, &IID_ID3D12Resource, &IID_ID3D12RootSignature, }; @@ -2687,6 +2689,16 @@ static void test_private_data(void) root_signature, DXGI_FORMAT_R8G8B8A8_UNORM, NULL, NULL, NULL); ID3D12RootSignature_Release(root_signature); } + else if (IsEqualGUID(tests[i], &IID_ID3D12QueryHeap)) + { + vkd3d_test_set_context("query heap"); + query_heap_desc.Type = D3D12_QUERY_HEAP_TYPE_OCCLUSION; + query_heap_desc.Count = 8; + query_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateQueryHeap(device, &query_heap_desc, + &IID_ID3D12QueryHeap, (void **)&unknown); + ok(hr == S_OK, "Failed to create query heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Resource)) { vkd3d_test_set_context("resource"); -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d: Implement private data for descriptor heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 13 +++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 8b628a6bcbba..1b2e82d689cf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2373,6 +2373,8 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea struct d3d12_device *device = heap->device; unsigned int i; + vkd3d_private_store_destroy(&heap->private_store); + switch (heap->desc.Type) { case D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV: @@ -2424,25 +2426,31 @@ static ULONG STDMETHODCALLTYPE d3d12_descriptor_heap_Release(ID3D12DescriptorHea static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_GetPrivateData(ID3D12DescriptorHeap *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetPrivateData(ID3D12DescriptorHeap *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetPrivateDataInterface(ID3D12DescriptorHeap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_descriptor_heap *heap = impl_from_ID3D12DescriptorHeap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_descriptor_heap_SetName(ID3D12DescriptorHeap *iface, const WCHAR *name) @@ -2526,6 +2534,8 @@ static void d3d12_descriptor_heap_init(struct d3d12_descriptor_heap *descriptor_ descriptor_heap->desc = *desc; + vkd3d_private_store_init(&descriptor_heap->private_store); + descriptor_heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 76a7a367b8e4..afb0e9c26811 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -449,6 +449,8 @@ struct d3d12_descriptor_heap struct d3d12_device *device; + struct vkd3d_private_store private_store; + BYTE descriptors[]; }; diff --git a/tests/d3d12.c b/tests/d3d12.c index 8dd25aa1ae23..45faf0764d97 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2560,6 +2560,7 @@ static void test_create_fence(void) static void test_private_data(void) { D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; + D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ID3D12RootSignature *root_signature; @@ -2586,6 +2587,7 @@ static void test_private_data(void) &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, &IID_ID3D12CommandSignature, + &IID_ID3D12DescriptorHeap, &IID_ID3D12Device, &IID_ID3D12Fence, &IID_ID3D12Heap, @@ -2643,6 +2645,17 @@ static void test_private_data(void) NULL, &IID_ID3D12CommandSignature, (void **)&unknown); ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12DescriptorHeap)) + { + vkd3d_test_set_context("descriptor heap"); + descriptor_heap_desc.Type = D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV; + descriptor_heap_desc.NumDescriptors = 16; + descriptor_heap_desc.Flags = D3D12_DESCRIPTOR_HEAP_FLAG_NONE; + descriptor_heap_desc.NodeMask = 0; + hr = ID3D12Device_CreateDescriptorHeap(device, &descriptor_heap_desc, + &IID_ID3D12DescriptorHeap, (void **)&unknown); + ok(hr == S_OK, "Failed to create descriptor heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) { vkd3d_test_set_context("device"); -- 2.19.2

2 1

[PATCH vkd3d 4/7] vkd3d: Implement private data for heaps.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/resource.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 13 +++++++++++++ 3 files changed, 31 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a0c53d385e19..3fb3c1e8209d 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -144,6 +144,8 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) struct d3d12_device *device = heap->device; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + vkd3d_private_store_destroy(&heap->private_store); + VK_CALL(vkFreeMemory(device->vk_device, heap->vk_memory, NULL)); pthread_mutex_destroy(&heap->mutex); @@ -159,25 +161,31 @@ static ULONG STDMETHODCALLTYPE d3d12_heap_Release(ID3D12Heap *iface) static HRESULT STDMETHODCALLTYPE d3d12_heap_GetPrivateData(ID3D12Heap *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateData(ID3D12Heap *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&heap->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetPrivateDataInterface(ID3D12Heap *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_heap *heap = impl_from_ID3D12Heap(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&heap->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_heap_SetName(ID3D12Heap *iface, const WCHAR *name) @@ -378,6 +386,8 @@ static HRESULT d3d12_heap_init(struct d3d12_heap *heap, return hr; } + vkd3d_private_store_init(&heap->private_store); + heap->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index d4ebb5e62fc6..a7c23f9fd4e9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -253,6 +253,8 @@ struct d3d12_heap uint32_t vk_memory_type; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_heap_create(struct d3d12_device *device, diff --git a/tests/d3d12.c b/tests/d3d12.c index 67df4d932e0e..a8cad289841f 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2565,6 +2565,7 @@ static void test_private_data(void) ID3D12RootSignature *root_signature; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; + D3D12_HEAP_DESC heap_desc; IUnknown *test_object; ID3D12Device *device; ID3D12Object *object; @@ -2587,6 +2588,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12Heap, &IID_ID3D12PipelineState, &IID_ID3D12RootSignature, }; @@ -2652,6 +2654,17 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12Heap)) + { + vkd3d_test_set_context("heap"); + heap_desc.SizeInBytes = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = 0; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_NON_RT_DS_TEXTURES; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&unknown); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12PipelineState)) { vkd3d_test_set_context("pipeline state"); -- 2.19.2

2 1

[PATCH vkd3d 2/7] vkd3d: Implement private data for root signatures.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 21 +++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 12 +++++++++--- 3 files changed, 26 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b2f177c9798d..f0b61ec057d1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -107,6 +107,7 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature if (!refcount) { struct d3d12_device *device = root_signature->device; + vkd3d_private_store_destroy(&root_signature->private_store); d3d12_root_signature_cleanup(root_signature, device); vkd3d_free(root_signature); ID3D12Device_Release(&device->ID3D12Device_iface); @@ -118,25 +119,31 @@ static ULONG STDMETHODCALLTYPE d3d12_root_signature_Release(ID3D12RootSignature static HRESULT STDMETHODCALLTYPE d3d12_root_signature_GetPrivateData(ID3D12RootSignature *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&root_signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetPrivateData(ID3D12RootSignature *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&root_signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetPrivateDataInterface(ID3D12RootSignature *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_root_signature *root_signature = impl_from_ID3D12RootSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&root_signature->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_root_signature_SetName(ID3D12RootSignature *iface, const WCHAR *name) @@ -992,6 +999,8 @@ static HRESULT d3d12_root_signature_init(struct d3d12_root_signature *root_signa &root_signature->vk_pipeline_layout))) goto fail; + vkd3d_private_store_init(&root_signature->private_store); + root_signature->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index eef7d904f686..14f95bfa5d4a 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -559,6 +559,8 @@ struct d3d12_root_signature VkSampler *static_samplers; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_root_signature_create(struct d3d12_device *device, const void *bytecode, diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e381cb4810d..61b00e60ab4e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2586,6 +2586,7 @@ static void test_private_data(void) &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, + &IID_ID3D12RootSignature, }; if (!(device = create_device())) @@ -2598,14 +2599,14 @@ static void test_private_data(void) { if (IsEqualGUID(tests[i], &IID_ID3D12CommandAllocator)) { - vkd3d_test_set_context("allocator"); + vkd3d_test_set_context("command allocator"); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandList)) { - vkd3d_test_set_context("list"); + vkd3d_test_set_context("command list"); hr = ID3D12Device_CreateCommandAllocator(device, D3D12_COMMAND_LIST_TYPE_DIRECT, &IID_ID3D12CommandAllocator, (void **)&allocator); ok(hr == S_OK, "Failed to create command allocator, hr %#x.\n", hr); @@ -2616,7 +2617,7 @@ static void test_private_data(void) } else if (IsEqualGUID(tests[i], &IID_ID3D12CommandQueue)) { - vkd3d_test_set_context("queue"); + vkd3d_test_set_context("command queue"); queue_desc.Type = D3D12_COMMAND_LIST_TYPE_DIRECT; queue_desc.Priority = D3D12_COMMAND_QUEUE_PRIORITY_NORMAL; queue_desc.Flags = D3D12_COMMAND_QUEUE_FLAG_NONE; @@ -2649,6 +2650,11 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create fence, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12RootSignature)) + { + vkd3d_test_set_context("root signature"); + unknown = (IUnknown *)create_empty_root_signature(device, 0); + } else { unknown = NULL; -- 2.19.2

2 1

[PATCH vkd3d 1/7] vkd3d: Implement private data for command signatures.
by Józef Kucia 04 Jan '19

04 Jan '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 22 ++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 2 ++ tests/d3d12.c | 15 +++++++++++++++ 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 8708aaf98285..4bf11d4b9997 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4811,6 +4811,8 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSign { struct d3d12_device *device = signature->device; + vkd3d_private_store_destroy(&signature->private_store); + vkd3d_free((void *)signature->desc.pArgumentDescs); vkd3d_free(signature); @@ -4823,25 +4825,31 @@ static ULONG STDMETHODCALLTYPE d3d12_command_signature_Release(ID3D12CommandSign static HRESULT STDMETHODCALLTYPE d3d12_command_signature_GetPrivateData(ID3D12CommandSignature *iface, REFGUID guid, UINT *data_size, void *data) { - FIXME("iface %p, guid %s, data_size %p, data %p stub!", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_get_private_data(&signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateData(ID3D12CommandSignature *iface, REFGUID guid, UINT data_size, const void *data) { - FIXME("iface %p, guid %s, data_size %u, data %p stub!\n", iface, debugstr_guid(guid), data_size, data); + struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return vkd3d_set_private_data(&signature->private_store, guid, data_size, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetPrivateDataInterface(ID3D12CommandSignature *iface, REFGUID guid, const IUnknown *data) { - FIXME("iface %p, guid %s, data %p stub!\n", iface, debugstr_guid(guid), data); + struct d3d12_command_signature *signature = impl_from_ID3D12CommandSignature(iface); - return E_NOTIMPL; + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return vkd3d_set_private_data_interface(&signature->private_store, guid, data); } static HRESULT STDMETHODCALLTYPE d3d12_command_signature_SetName(ID3D12CommandSignature *iface, const WCHAR *name) @@ -4926,6 +4934,8 @@ HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_ memcpy((void *)object->desc.pArgumentDescs, desc->pArgumentDescs, desc->NumArgumentDescs * sizeof(*desc->pArgumentDescs)); + vkd3d_private_store_init(&object->private_store); + object->device = device; ID3D12Device_AddRef(&device->ID3D12Device_iface); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4e2650804bfa..eef7d904f686 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -815,6 +815,8 @@ struct d3d12_command_signature D3D12_COMMAND_SIGNATURE_DESC desc; struct d3d12_device *device; + + struct vkd3d_private_store private_store; }; HRESULT d3d12_command_signature_create(struct d3d12_device *device, const D3D12_COMMAND_SIGNATURE_DESC *desc, diff --git a/tests/d3d12.c b/tests/d3d12.c index 534fd93c01b5..9e381cb4810d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2559,6 +2559,8 @@ static void test_create_fence(void) static void test_private_data(void) { + D3D12_COMMAND_SIGNATURE_DESC command_signature_desc; + D3D12_INDIRECT_ARGUMENT_DESC argument_desc; D3D12_COMMAND_QUEUE_DESC queue_desc; ULONG refcount, expected_refcount; ID3D12CommandAllocator *allocator; @@ -2581,6 +2583,7 @@ static void test_private_data(void) &IID_ID3D12CommandAllocator, &IID_ID3D12CommandList, &IID_ID3D12CommandQueue, + &IID_ID3D12CommandSignature, &IID_ID3D12Device, &IID_ID3D12Fence, }; @@ -2622,6 +2625,18 @@ static void test_private_data(void) &IID_IUnknown, (void **)&unknown); ok(hr == S_OK, "Failed to create command queue, hr %#x.\n", hr); } + else if (IsEqualGUID(tests[i], &IID_ID3D12CommandSignature)) + { + vkd3d_test_set_context("command signature"); + argument_desc.Type = D3D12_INDIRECT_ARGUMENT_TYPE_DRAW; + command_signature_desc.ByteStride = sizeof(D3D12_DRAW_ARGUMENTS); + command_signature_desc.NumArgumentDescs = 1; + command_signature_desc.pArgumentDescs = &argument_desc; + command_signature_desc.NodeMask = 0; + hr = ID3D12Device_CreateCommandSignature(device, &command_signature_desc, + NULL, &IID_ID3D12CommandSignature, (void **)&unknown); + ok(hr == S_OK, "Failed to create command signature, hr %#x.\n", hr); + } else if (IsEqualGUID(tests[i], &IID_ID3D12Device)) { vkd3d_test_set_context("device"); -- 2.19.2

2 1

[PATCH v2 7/8] mfplat: Implement IMFattributes::{SetUINT32,SetUINT64,GetUINT32,GetUINT64}.
by Jactry Zeng 04 Jan '19

04 Jan '19

Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> --- dlls/mfplat/Makefile.in | 2 +- dlls/mfplat/main.c | 50 +++++++++++++++++++++++++++++--------- dlls/mfplat/tests/mfplat.c | 28 +++++++++++++++++++-- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/dlls/mfplat/Makefile.in b/dlls/mfplat/Makefile.in index 76843f5f25..9a4e41c430 100644 --- a/dlls/mfplat/Makefile.in +++ b/dlls/mfplat/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfplat.dll IMPORTLIB = mfplat -IMPORTS = advapi32 ole32 +IMPORTS = advapi32 ole32 propsys C_SRCS = \ main.c diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 06a49b237f..25c075781b 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -31,6 +31,7 @@ #include "mfapi.h" #include "mfidl.h" #include "mferror.h" +#include "propvarutil.h" #include "wine/heap.h" #include "wine/debug.h" @@ -536,7 +537,7 @@ static int mfattributes_finditem(mfattributes *object, REFGUID key, struct mfatt return index; } -static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value) +static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIANT *value, BOOL verify_type) { HRESULT hres; struct mfattribute *attribute = NULL; @@ -547,7 +548,12 @@ static HRESULT mfattributes_getitem(mfattributes *object, REFGUID key, PROPVARIA if(!attribute) hres = MF_E_ATTRIBUTENOTFOUND; else - hres = PropVariantCopy(value, &attribute->value); + { + if(verify_type && (attribute->value.vt != value->vt)) + hres = MF_E_INVALIDTYPE; + else + hres = PropVariantCopy(value, &attribute->value); + } LeaveCriticalSection(&object->lock); @@ -560,7 +566,7 @@ static HRESULT WINAPI mfattributes_GetItem(IMFAttributes *iface, REFGUID key, PR TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return mfattributes_getitem(This, key, value); + return mfattributes_getitem(This, key, value, FALSE); } static HRESULT WINAPI mfattributes_GetItemType(IMFAttributes *iface, REFGUID key, MF_ATTRIBUTE_TYPE *type) @@ -594,19 +600,33 @@ static HRESULT WINAPI mfattributes_Compare(IMFAttributes *iface, IMFAttributes * static HRESULT WINAPI mfattributes_GetUINT32(IMFAttributes *iface, REFGUID key, UINT32 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt32(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetUINT64(IMFAttributes *iface, REFGUID key, UINT64 *value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; + HRESULT hres; - FIXME("%p, %s, %p\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %p)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + hres = mfattributes_getitem(This, key, &attrval, TRUE); + if(SUCCEEDED(hres)) + hres = PropVariantToUInt64(&attrval, value); + return hres; } static HRESULT WINAPI mfattributes_GetDouble(IMFAttributes *iface, REFGUID key, double *value) @@ -809,19 +829,27 @@ static HRESULT WINAPI mfattributes_DeleteAllItems(IMFAttributes *iface) static HRESULT WINAPI mfattributes_SetUINT32(IMFAttributes *iface, REFGUID key, UINT32 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %d\n", This, debugstr_guid(key), value); + TRACE("(%p, %s, %d)\n", This, debugstr_guid(key), value); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI4; + attrval.ulVal = value; + return mfattributes_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetUINT64(IMFAttributes *iface, REFGUID key, UINT64 value) { mfattributes *This = impl_from_IMFAttributes(iface); + PROPVARIANT attrval; - FIXME("%p, %s, %s\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); + FIXME("(%p, %s, %s)\n", This, debugstr_guid(key), wine_dbgstr_longlong(value)); - return E_NOTIMPL; + PropVariantInit(&attrval); + attrval.vt = VT_UI8; + attrval.uhVal.QuadPart = value; + return mfattributes_setitem(This, key, &attrval); } static HRESULT WINAPI mfattributes_SetDouble(IMFAttributes *iface, REFGUID key, double value) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 7f7f413096..4564f410d3 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -414,6 +414,8 @@ static void test_MFCreateAttributes(void) IMFAttributes *attributes; HRESULT hr; UINT32 count; + UINT32 uint32_value; + UINT64 uint64_value; hr = MFCreateAttributes( &attributes, 3 ); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -423,13 +425,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, "IMFAttributes_SetUINT32 failed: 0x%08x.\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); + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == S_OK, "IMFAttributes_GetUINT32 failed: 0x%08x.\n", hr); + ok(uint32_value == 123, "got wrong value: %d, expected: 123.\n", uint32_value); + + uint64_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT64 should fail: 0x%08x.\n", hr); + ok(uint64_value == 0xdeadbeef, "got wrong value: %lld, expected: 0xdeadbeef.\n", uint64_value); + + hr = IMFAttributes_SetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, 65536); + ok(hr == S_OK, "IMFAttributes_SetUINT64 failed: 0x%08x.\n", hr); + + hr = IMFAttributes_GetUINT64(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint64_value); + ok(hr == S_OK, "IMFAttributes_GetUINT64 failed: 0x%08x.\n", hr); + ok(uint64_value == 65536, "got wrong value: %lld, expected: 65536.\n", uint64_value); + + uint32_value = 0xdeadbeef; + hr = IMFAttributes_GetUINT32(attributes, &MF_READWRITE_ENABLE_HARDWARE_TRANSFORMS, &uint32_value); + ok(hr == MF_E_INVALIDTYPE, "IMFAttributes_GetUINT32 should fail: 0x%08x.\n", hr); + ok(uint32_value == 0xdeadbeef, "got wrong value: %d, expected: 0xdeadbeef.\n", uint32_value); + IMFAttributes_Release(attributes); } -- 2.20.1

2 1