January 2019 - Wine-Commits

Józef Kucia : vkd3d: Implement private data for descriptor heaps.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: c9bd123bd0036ddaec16d7afd9f507077de00dce URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9bd123bd0036ddaec16d7a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:17 2019 +0100 vkd3d: Implement private data for descriptor heaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8b628a6..1b2e82d 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 76a7a36..afb0e9c 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 8dd25aa..45faf07 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");

1 0

Józef Kucia : vkd3d: Implement private data for heaps.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: e9520af19fa52428c229febae966cf55f9410c04 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e9520af19fa52428c229feb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:15 2019 +0100 vkd3d: Implement private data for heaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 a0c53d3..3fb3c1e 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 d4ebb5e..a7c23f9 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 67df4d9..a8cad28 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");

1 0

Józef Kucia : vkd3d: Implement private data for pipeline states.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: b8fce1ac36a16521d25e15a69ab6823e933ad61a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b8fce1ac36a16521d25e15a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:14 2019 +0100 vkd3d: Implement private data for pipeline states. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f0b61ec..ee91c72 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 14f95bf..d4ebb5e 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 61b00e6..67df4d9 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");

1 0

Józef Kucia : vkd3d: Implement private data for root signatures.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: 751d79a68fbddaf65dfe7ae2e089a48741802570 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=751d79a68fbddaf65dfe7ae… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:13 2019 +0100 vkd3d: Implement private data for root signatures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 b2f177c..f0b61ec 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 eef7d90..14f95bf 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 9e381cb..61b00e6 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;

1 0

Józef Kucia : vkd3d: Implement private data for command signatures.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: 223e89a6e56e78db1951aabff0c75cd5a7abdd99 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=223e89a6e56e78db1951aab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:12 2019 +0100 vkd3d: Implement private data for command signatures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 8708aaf..4bf11d4 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 4e26508..eef7d90 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 534fd93..9e381cb 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");

1 0

Józef Kucia : vkd3d: Implement private data for query heaps.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: e13fb138cd4b61207e5042003fc731c205e8f335 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e13fb138cd4b61207e50420… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:18 2019 +0100 vkd3d: Implement private data for query heaps. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 1b2e82d..ffce926 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 afb0e9c..c0c15b2 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 45faf07..b8563b3 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");

1 0

Józef Kucia : vkd3d: Implement private data for resources.
by Alexandre Julliard Jan. 4, 2019

Jan. 4, 2019

Module: vkd3d Branch: master Commit: 781d856ce364afc2ff823de18b8dd39fbc7782c5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=781d856ce364afc2ff823de… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 4 14:34:16 2019 +0100 vkd3d: Implement private data for resources. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 3fb3c1e..8b628a6 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 a7c23f9..76a7a36 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 a8cad28..8dd25aa 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");

1 0

Ken Thomases : winemac: Fix implementation of the AllowVerticalSync registry setting.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: wine Branch: master Commit: 40c5184a90a6e14f3e49dd60daaba636308b7f83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40c5184a90a6e14f3e49dd60… Author: Ken Thomases <ken(a)codeweavers.com> Date: Thu Jan 3 11:08:31 2019 -0600 winemac: Fix implementation of the AllowVerticalSync registry setting. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index d83a4ce..c3c2bee 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1539,8 +1539,7 @@ static BOOL create_context(struct wgl_context *context, CGLContextObj share, uns } context->major = major; - if (allow_vsync) - InterlockedExchange(&context->update_swap_interval, TRUE); + InterlockedExchange(&context->update_swap_interval, TRUE); TRACE("created context %p/%p/%p\n", context, context->context, context->cglcontext); @@ -1742,7 +1741,9 @@ static void sync_swap_interval(struct wgl_context *context) { int interval; - if (context->draw_hwnd) + if (!allow_vsync) + interval = 0; + else if (context->draw_hwnd) { struct macdrv_win_data *data = get_win_data(context->draw_hwnd); if (data) @@ -3478,7 +3479,7 @@ static int macdrv_wglGetSwapIntervalEXT(void) release_win_data(data); if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE)) - set_swap_interval(context, value); + set_swap_interval(context, allow_vsync ? value : 0); } else { @@ -3543,8 +3544,8 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return FALSE; } - if (allow_vsync && (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || hwnd != context->draw_hwnd)) - set_swap_interval(context, data->swap_interval); + if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || hwnd != context->draw_hwnd) + set_swap_interval(context, allow_vsync ? data->swap_interval : 0); context->draw_hwnd = hwnd; context->draw_view = data->client_cocoa_view; @@ -3569,8 +3570,7 @@ static BOOL macdrv_wglMakeContextCurrentARB(HDC draw_hdc, HDC read_hdc, struct w return FALSE; } - if (allow_vsync && - (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer)) + if (InterlockedCompareExchange(&context->update_swap_interval, FALSE, TRUE) || pbuffer != context->draw_pbuffer) set_swap_interval(context, 0); } else @@ -4115,6 +4115,9 @@ static BOOL macdrv_wglSwapIntervalEXT(int interval) else /* pbuffer */ interval = 0; + if (!allow_vsync) + interval = 0; + InterlockedExchange(&context->update_swap_interval, FALSE); if (!set_swap_interval(context, interval)) {

1 0

Daniel Ansorregui : d3d9/tests: Fix a typo in an undef.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: wine Branch: master Commit: 14035b6d388accdc8070e7c3d338c8256bfbc81b URL: https://source.winehq.org/git/wine.git/?a=commit;h=14035b6d388accdc8070e7c3… Author: Daniel Ansorregui <mailszeros(a)gmail.com> Date: Tue Jan 1 13:43:07 2019 +0000 d3d9/tests: Fix a typo in an undef. Signed-off-by: Daniel Ansorregui <mailszeros(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 392369a..195b730 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -3236,8 +3236,8 @@ static void texbem_test(void) 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, 0x000000ff, }; +#undef tex #undef tex1 -#undef tex2 #undef origin hr = IDirect3DTexture9_LockRect(texture2, 0, &locked_rect, NULL, 0);

1 0

Huw Davies : comctl32/tests: Move the cursor over the treeview to avoid random mouse move messages.
by Alexandre Julliard Jan. 3, 2019

Jan. 3, 2019

Module: wine Branch: master Commit: 76a9f965fd1c465c81dd8e1f8ba57c700ca60338 URL: https://source.winehq.org/git/wine.git/?a=commit;h=76a9f965fd1c465c81dd8e1f… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jan 3 11:03:31 2019 +0000 comctl32/tests: Move the cursor over the treeview to avoid random mouse move messages. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45719 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/treeview.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/treeview.c b/dlls/comctl32/tests/treeview.c index c60aa8a..8ba7f54 100644 --- a/dlls/comctl32/tests/treeview.c +++ b/dlls/comctl32/tests/treeview.c @@ -2809,7 +2809,7 @@ static void test_right_click(void) HTREEITEM selected; RECT rc; LRESULT result; - POINT pt; + POINT pt, orig_pos; hTree = create_treeview_control(0); fill_tree(hTree); @@ -2828,6 +2828,8 @@ static void test_right_click(void) pt.x = (rc.left + rc.right) / 2; pt.y = (rc.top + rc.bottom) / 2; ClientToScreen(hMainWnd, &pt); + GetCursorPos(&orig_pos); + SetCursorPos(pt.x, pt.y); flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -2843,6 +2845,7 @@ static void test_right_click(void) selected = (HTREEITEM)SendMessageA(hTree, TVM_GETNEXTITEM, TVGN_CARET, 0); ok(selected == hChild, "child item should still be selected\n"); + SetCursorPos(orig_pos.x, orig_pos.y); DestroyWindow(hTree); }

1 0