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

[PATCH vkd3d 1/8] vkd3d: Do not ignore "src_box" in d3d12_command_list_CopyTextureRegion().
by Józef Kucia 19 Mar '19

19 Mar '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 3: Fix the offset derived from src_box->front. Version 2: Take the block height into account. --- libs/vkd3d/command.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 872504df760a..157d5275667a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2492,23 +2492,39 @@ static void vk_extent_3d_from_d3d12_miplevel(VkExtent3D *extent, extent->depth = d3d12_resource_desc_get_depth(resource_desc, miplevel_idx); } -static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *buffer_image_copy, +static void vk_buffer_image_copy_from_d3d12(VkBufferImageCopy *copy, const D3D12_PLACED_SUBRESOURCE_FOOTPRINT *footprint, unsigned int sub_resource_idx, const D3D12_RESOURCE_DESC *image_desc, const struct vkd3d_format *format, - unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) + const D3D12_BOX *src_box, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z) { - buffer_image_copy->bufferOffset = footprint->Offset; - buffer_image_copy->bufferRowLength = footprint->Footprint.RowPitch / + copy->bufferOffset = footprint->Offset; + if (src_box) + { + VkDeviceSize row_count = footprint->Footprint.Height / format->block_height; + copy->bufferOffset += src_box->left / format->block_width * format->byte_count * format->block_byte_count; + copy->bufferOffset += src_box->top / format->block_height * footprint->Footprint.RowPitch; + copy->bufferOffset += src_box->front * footprint->Footprint.RowPitch * row_count; + } + copy->bufferRowLength = footprint->Footprint.RowPitch / (format->byte_count * format->block_byte_count) * format->block_width; - buffer_image_copy->bufferImageHeight = 0; - vk_image_subresource_layers_from_d3d12(&buffer_image_copy->imageSubresource, + copy->bufferImageHeight = footprint->Footprint.Height; + vk_image_subresource_layers_from_d3d12(&copy->imageSubresource, format, sub_resource_idx, image_desc->MipLevels); - buffer_image_copy->imageOffset.x = dst_x; - buffer_image_copy->imageOffset.y = dst_y; - buffer_image_copy->imageOffset.z = dst_z; - buffer_image_copy->imageExtent.width = footprint->Footprint.Width; - buffer_image_copy->imageExtent.height = footprint->Footprint.Height; - buffer_image_copy->imageExtent.depth = footprint->Footprint.Depth; + copy->imageOffset.x = dst_x; + copy->imageOffset.y = dst_y; + copy->imageOffset.z = dst_z; + if (src_box) + { + copy->imageExtent.width = src_box->right - src_box->left; + copy->imageExtent.height = src_box->bottom - src_box->top; + copy->imageExtent.depth = src_box->back - src_box->front; + } + else + { + copy->imageExtent.width = footprint->Footprint.Width; + copy->imageExtent.height = footprint->Footprint.Height; + copy->imageExtent.depth = footprint->Footprint.Depth; + } } static void vk_image_copy_from_d3d12(VkImageCopy *image_copy, @@ -2709,7 +2725,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", dst_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &dst->u.PlacedFootprint, - src->u.SubresourceIndex, &src_resource->desc, dst_format, dst_x, dst_y, dst_z); + src->u.SubresourceIndex, &src_resource->desc, dst_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyImageToBuffer(list->vk_command_buffer, src_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, dst_resource->u.vk_buffer, 1, &buffer_image_copy)); @@ -2732,7 +2748,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_CopyTextureRegion(ID3D12Graphic FIXME("Depth-stencil format %#x not fully supported yet.\n", src_format->dxgi_format); vk_buffer_image_copy_from_d3d12(&buffer_image_copy, &src->u.PlacedFootprint, - dst->u.SubresourceIndex, &dst_resource->desc, src_format, dst_x, dst_y, dst_z); + dst->u.SubresourceIndex, &dst_resource->desc, src_format, src_box, dst_x, dst_y, dst_z); VK_CALL(vkCmdCopyBufferToImage(list->vk_command_buffer, src_resource->u.vk_buffer, dst_resource->u.vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &buffer_image_copy)); -- 2.19.2

3 3

[PATCH v2 2/2] msidb: Add support for wildcard table import.
by Erich E. Hoover 19 Mar '19

19 Mar '19

v2: allocate the path buffer dynamically and don't remove the extension from the import filename (no longer necessary).

2 1

[PATCH v2 1/2] msidb: Permit specifying tables to import by filename.
by Erich E. Hoover 19 Mar '19

19 Mar '19

v2: import_table() now takes the filename directly, avoiding copying the filename when it is passed instead of a table name.

2 1

[v2 PATCH 1/7] mfreadwrite: Subscribe to source events on reader creation.
by Nikolay Sivov 19 Mar '19

19 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 87 ++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index df8f89a9d0..86a92b0e6a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; + IMFAsyncCallback source_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -90,11 +91,88 @@ static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); } +static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyncCallback *iface, + DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + MediaEventType event_type; + IMFMediaSource *source; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + source = (IMFMediaSource *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaSource_EndGetEvent(source, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, + (IUnknown *)source); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl source_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_source_events_callback_AddRef, + source_reader_source_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_source_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -273,11 +351,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri srcreader *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); @@ -285,6 +364,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, + (IUnknown *)object->source))) + { + goto failed; + } + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 609510d427..5f664b354c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -48,7 +48,7 @@ static void init_functions(void) static void test_MFCreateSourceReaderFromByteStream(void) { static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *source; + IMFSourceReader *source = NULL; IMFAttributes *attributes; IMFByteStream *bytestream = NULL; IStream *stream = NULL; @@ -76,6 +76,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); +todo_wine ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if(stream) -- 2.20.1

1 6

[PATCH 1/7] mfreadwrite: Subscribe to source events on reader creation.
by Nikolay Sivov 19 Mar '19

19 Mar '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfreadwrite/main.c | 87 ++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/mfplat.c | 3 +- 2 files changed, 88 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index df8f89a9d0..86a92b0e6a 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; + IMFAsyncCallback source_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -90,11 +91,88 @@ static inline srcreader *impl_from_IMFSourceReader(IMFSourceReader *iface) return CONTAINING_RECORD(iface, srcreader, IMFSourceReader_iface); } +static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); } +static HRESULT WINAPI source_reader_source_events_callback_QueryInterface(IMFAsyncCallback *iface, + REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFAsyncCallback) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFAsyncCallback_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI source_reader_source_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_source_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyncCallback *iface, + DWORD *flags, DWORD *queue) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); + MediaEventType event_type; + IMFMediaSource *source; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + source = (IMFMediaSource *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaSource_EndGetEvent(source, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, + (IUnknown *)source); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl source_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_source_events_callback_AddRef, + source_reader_source_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_source_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -273,11 +351,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri srcreader *object; HRESULT hr; - object = heap_alloc(sizeof(*object)); + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; + object->source_events_callback.lpVtbl = &source_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source); @@ -285,6 +364,12 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri if (FAILED(hr = IMFMediaSource_CreatePresentationDescriptor(object->source, &object->descriptor))) goto failed; + if (FAILED(hr = IMFMediaSource_BeginGetEvent(object->source, &object->source_events_callback, + (IUnknown *)object->source))) + { + goto failed; + } + hr = IMFSourceReader_QueryInterface(&object->IMFSourceReader_iface, riid, out); failed: diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index 609510d427..5f664b354c 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -48,7 +48,7 @@ static void init_functions(void) static void test_MFCreateSourceReaderFromByteStream(void) { static const WCHAR audio[] = {'A','u','d','i','o',0}; - IMFSourceReader *source; + IMFSourceReader *source = NULL; IMFAttributes *attributes; IMFByteStream *bytestream = NULL; IStream *stream = NULL; @@ -76,6 +76,7 @@ static void test_MFCreateSourceReaderFromByteStream(void) ok(hr == S_OK, "got 0x%08x\n", hr); hr = MFCreateSourceReaderFromByteStream(bytestream, attributes, &source); +todo_wine ok(hr == S_OK || hr == MF_E_UNSUPPORTED_BYTESTREAM_TYPE, "got 0x%08x\n", hr); if(stream) -- 2.20.1

1 6

[PATCH v4 1/3] po: Update Sinhala translation.
by Isira Seneviratne 19 Mar '19

19 Mar '19

1 0

[PATCH v4 2/3] po: Update French translation.
by Isira Seneviratne 19 Mar '19

19 Mar '19

1 0

[PATCH v4 3/3] po: Update Tamil translation.
by Isira Seneviratne 19 Mar '19

19 Mar '19

1 0

[PATCH v3 3/3] po: Update Tamil translation.
by Isira Seneviratne 19 Mar '19

19 Mar '19

2 1

[PATCH v3 2/3] po: Update French translation.
by Isira Seneviratne 19 Mar '19

19 Mar '19

2 1