April 2020 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Implement raw blits in the Vulkan GPU blitter.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 6601bc3443462b5abb215b62e36008ab49ae688e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6601bc3443462b5abb215b62… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 02:39:25 2020 +0430 wined3d: Implement raw blits in the Vulkan GPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 183 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 183 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 407c1078c4..3e9c350aa9 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5760,13 +5760,93 @@ static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_dev clear_rects, draw_rect, flags, colour, depth, stencil); } +static bool vk_blitter_blit_supported(enum wined3d_blit_op op, const struct wined3d_context *context, + const struct wined3d_resource *src_resource, const RECT *src_rect, + const struct wined3d_resource *dst_resource, const RECT *dst_rect) +{ + const struct wined3d_format *src_format = src_resource->format; + const struct wined3d_format *dst_format = dst_resource->format; + + if (!(dst_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + TRACE("Destination resource does not have GPU access.\n"); + return false; + } + + if (!(src_resource->access & WINED3D_RESOURCE_ACCESS_GPU)) + { + TRACE("Source resource does not have GPU access.\n"); + return false; + } + + if (dst_format->id != src_format->id) + { + if (!is_identity_fixup(dst_format->color_fixup)) + { + TRACE("Destination fixups are not supported.\n"); + return false; + } + + if (!is_identity_fixup(src_format->color_fixup)) + { + TRACE("Source fixups are not supported.\n"); + return false; + } + + if (op != WINED3D_BLIT_OP_RAW_BLIT + && wined3d_format_vk(src_format)->vk_format != wined3d_format_vk(dst_format)->vk_format) + { + TRACE("Format conversion not supported.\n"); + return false; + } + } + + if (wined3d_resource_get_sample_count(dst_resource) > 1) + { + TRACE("Multi-sample destination resource not supported.\n"); + return false; + } + + if (wined3d_resource_get_sample_count(src_resource) > 1) + { + TRACE("Multi-sample source resource not supported.\n"); + return false; + } + + if (op == WINED3D_BLIT_OP_RAW_BLIT) + return true; + + if (op != WINED3D_BLIT_OP_COLOR_BLIT) + { + TRACE("Unsupported blit operation %#x.\n", op); + return false; + } + + if ((src_rect->right - src_rect->left != dst_rect->right - dst_rect->left) + || (src_rect->bottom - src_rect->top != dst_rect->bottom - dst_rect->top)) + { + TRACE("Scaling not supported.\n"); + return false; + } + + return true; +} + static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) { + struct wined3d_texture_vk *src_texture_vk = wined3d_texture_vk(src_texture); + struct wined3d_texture_vk *dst_texture_vk = wined3d_texture_vk(dst_texture); + struct wined3d_context_vk *context_vk = wined3d_context_vk(context); + const struct wined3d_vk_info *vk_info = context_vk->vk_info; + unsigned int src_level, src_layer, dst_level, dst_layer; + VkImageAspectFlags src_aspect, dst_aspect; + VkCommandBuffer vk_command_buffer; struct wined3d_blitter *next; + VkImageCopy region; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", @@ -5774,6 +5854,109 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); + if (!vk_blitter_blit_supported(op, context, &src_texture->resource, src_rect, &dst_texture->resource, dst_rect)) + goto next; + + src_aspect = vk_aspect_mask_from_format(src_texture_vk->t.resource.format); + dst_aspect = vk_aspect_mask_from_format(dst_texture_vk->t.resource.format); + if ((src_aspect | dst_aspect) & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)) + { + TRACE("Depth/stencil blits not supported.\n"); + goto next; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_layer = src_sub_resource_idx / src_texture->level_count; + + dst_level = dst_sub_resource_idx % dst_texture->level_count; + dst_layer = dst_sub_resource_idx / dst_texture->level_count; + + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) + ERR("Failed to load the source sub-resource.\n"); + + if (texture2d_is_full_rect(dst_texture, dst_level, dst_rect)) + { + if (!wined3d_texture_prepare_location(dst_texture, + dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Failed to prepare the destination sub-resource.\n"); + goto next; + } + } + else + { + if (!wined3d_texture_load_location(dst_texture, + dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Failed to load the destination sub-resource.\n"); + goto next; + } + } + + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + goto next; + } + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_READ_BIT, + src_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + src_texture_vk->vk_image, src_aspect); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_TRANSFER_BIT, + vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), + VK_ACCESS_TRANSFER_WRITE_BIT, + dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, + dst_texture_vk->vk_image, dst_aspect); + + region.srcSubresource.aspectMask = src_aspect; + region.srcSubresource.mipLevel = src_level; + region.srcSubresource.baseArrayLayer = src_layer; + region.srcSubresource.layerCount = 1; + region.srcOffset.x = src_rect->left; + region.srcOffset.y = src_rect->top; + region.srcOffset.z = 0; + region.dstSubresource.aspectMask = dst_aspect; + region.dstSubresource.mipLevel = dst_level; + region.dstSubresource.baseArrayLayer = dst_layer; + region.dstSubresource.layerCount = 1; + region.dstOffset.x = dst_rect->left; + region.dstOffset.y = dst_rect->top; + region.dstOffset.z = 0; + region.extent.width = src_rect->right - src_rect->left; + region.extent.height = src_rect->bottom - src_rect->top; + region.extent.depth = 1; + + VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dst_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_TRANSFER_WRITE_BIT, + vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), + VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout, + dst_texture_vk->vk_image, dst_aspect); + wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, + VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_ACCESS_TRANSFER_READ_BIT, + vk_access_mask_from_bind_flags(src_texture_vk->t.resource.bind_flags), + VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, + src_texture_vk->vk_image, src_aspect); + + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, dst_location)) + ERR("Failed to load the destination sub-resource into %s.\n", wined3d_debug_location(dst_location)); + + wined3d_context_vk_reference_texture(context_vk, src_texture_vk); + wined3d_context_vk_reference_texture(context_vk, dst_texture_vk); + + return dst_location | WINED3D_LOCATION_TEXTURE_RGB; + +next: if (!(next = blitter->next)) { ERR("No blitter to handle blit op %#x.\n", op);

1 0

Gabriel Ivăncescu : qedit: Store the filename instead of querying the filter for it.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 2e6f5e6784442fa0aabe12f1c8192fd6c492b0fe URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e6f5e6784442fa0aabe12f1… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 23 14:45:44 2020 -0500 qedit: Store the filename instead of querying the filter for it. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 35 ++++++++++++++++------------------- dlls/qedit/tests/mediadet.c | 4 ++-- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 22df05647e..d63825c629 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -41,6 +41,7 @@ typedef struct MediaDetImpl { IGraphBuilder *graph; IBaseFilter *source; IBaseFilter *splitter; + WCHAR *filename; LONG num_streams; LONG cur_stream; IPin *cur_pin; @@ -66,6 +67,9 @@ static void MD_cleanup(MediaDetImpl *This) This->splitter = NULL; if (This->graph) IGraphBuilder_Release(This->graph); This->graph = NULL; + if (This->filename) + free(This->filename); + This->filename = NULL; This->num_streams = -1; This->cur_stream = 0; } @@ -525,9 +529,6 @@ static HRESULT WINAPI MediaDet_get_StreamLength(IMediaDet* iface, double *pVal) static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); - IFileSourceFilter *file; - LPOLESTR name; - HRESULT hr; TRACE("(%p)\n", This); @@ -537,35 +538,24 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) *pVal = NULL; /* MSDN says it should return E_FAIL if no file is open, but tests show otherwise. */ - if (!This->source) + if (!This->filename) return S_OK; - hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, - (void **) &file); - if (FAILED(hr)) - return hr; - - hr = IFileSourceFilter_GetCurFile(file, &name, NULL); - IFileSourceFilter_Release(file); - if (FAILED(hr)) - return hr; - - *pVal = SysAllocString(name); - CoTaskMemFree(name); + *pVal = SysAllocString(This->filename); if (!*pVal) return E_OUTOFMEMORY; return S_OK; } -static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) +static HRESULT WINAPI MediaDet_put_Filename(IMediaDet *iface, BSTR filename) { MediaDetImpl *This = impl_from_IMediaDet(iface); IGraphBuilder *gb; IBaseFilter *bf; HRESULT hr; - TRACE("(%p)->(%s)\n", This, debugstr_w(newVal)); + TRACE("detector %p, filename %s.\n", This, debugstr_w(filename)); if (This->graph) { @@ -578,12 +568,19 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) if (FAILED(hr)) return hr; - if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, newVal, L"Source", &bf))) + if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, filename, L"Source", &bf))) { IGraphBuilder_Release(gb); return hr; } + if (!(This->filename = wcsdup(filename))) + { + IBaseFilter_Release(bf); + IGraphBuilder_Release(gb); + return E_OUTOFMEMORY; + } + This->graph = gb; This->source = bf; hr = find_splitter(This); diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 6decda8557..32861476dd 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -636,7 +636,7 @@ static void test_put_filter(void) filename = (BSTR)0xdeadbeef; hr = IMediaDet_get_Filename(detector, &filename); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); ok(!filename, "Got filename %s.\n", debugstr_w(filename)); ref = IMediaDet_Release(detector); @@ -666,7 +666,7 @@ static void test_put_filter(void) filename = (BSTR)0xdeadbeef; hr = IMediaDet_get_Filename(detector, &filename); ok(hr == S_OK, "Got hr %#x.\n", hr); - todo_wine ok(!filename, "Got filename %s.\n", debugstr_w(filename)); + ok(!filename, "Got filename %s.\n", debugstr_w(filename)); count = 0xdeadbeef; hr = IMediaDet_get_OutputStreams(detector, &count);

1 0

Henri Verbeet : wined3d: Handle MSAA resolves in the Vulkan blitter.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 01f640556fe30e11a10d3ea75715c4a7bfa75748 URL: https://source.winehq.org/git/wine.git/?a=commit;h=01f640556fe30e11a10d3ea7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 02:39:26 2020 +0430 wined3d: Handle MSAA resolves in the Vulkan blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 81 +++++++++++++++++++++++++++++++++----------------- 1 file changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3e9c350aa9..1e6452a09d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5807,12 +5807,6 @@ static bool vk_blitter_blit_supported(enum wined3d_blit_op op, const struct wine return false; } - if (wined3d_resource_get_sample_count(src_resource) > 1) - { - TRACE("Multi-sample source resource not supported.\n"); - return false; - } - if (op == WINED3D_BLIT_OP_RAW_BLIT) return true; @@ -5846,7 +5840,7 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ VkImageAspectFlags src_aspect, dst_aspect; VkCommandBuffer vk_command_buffer; struct wined3d_blitter *next; - VkImageCopy region; + bool resolve = false; TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", @@ -5865,6 +5859,9 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ goto next; } + if (wined3d_resource_get_sample_count(&src_texture_vk->t.resource) > 1) + resolve = true; + src_level = src_sub_resource_idx % src_texture->level_count; src_layer = src_sub_resource_idx / src_texture->level_count; @@ -5912,26 +5909,56 @@ static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_ dst_texture_vk->layout, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->vk_image, dst_aspect); - region.srcSubresource.aspectMask = src_aspect; - region.srcSubresource.mipLevel = src_level; - region.srcSubresource.baseArrayLayer = src_layer; - region.srcSubresource.layerCount = 1; - region.srcOffset.x = src_rect->left; - region.srcOffset.y = src_rect->top; - region.srcOffset.z = 0; - region.dstSubresource.aspectMask = dst_aspect; - region.dstSubresource.mipLevel = dst_level; - region.dstSubresource.baseArrayLayer = dst_layer; - region.dstSubresource.layerCount = 1; - region.dstOffset.x = dst_rect->left; - region.dstOffset.y = dst_rect->top; - region.dstOffset.z = 0; - region.extent.width = src_rect->right - src_rect->left; - region.extent.height = src_rect->bottom - src_rect->top; - region.extent.depth = 1; - - VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, - dst_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + if (resolve) + { + VkImageResolve region; + + region.srcSubresource.aspectMask = src_aspect; + region.srcSubresource.mipLevel = src_level; + region.srcSubresource.baseArrayLayer = src_layer; + region.srcSubresource.layerCount = 1; + region.srcOffset.x = src_rect->left; + region.srcOffset.y = src_rect->top; + region.srcOffset.z = 0; + region.dstSubresource.aspectMask = dst_aspect; + region.dstSubresource.mipLevel = dst_level; + region.dstSubresource.baseArrayLayer = dst_layer; + region.dstSubresource.layerCount = 1; + region.dstOffset.x = dst_rect->left; + region.dstOffset.y = dst_rect->top; + region.dstOffset.z = 0; + region.extent.width = src_rect->right - src_rect->left; + region.extent.height = src_rect->bottom - src_rect->top; + region.extent.depth = 1; + + VK_CALL(vkCmdResolveImage(vk_command_buffer, src_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dst_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + } + else + { + VkImageCopy region; + + region.srcSubresource.aspectMask = src_aspect; + region.srcSubresource.mipLevel = src_level; + region.srcSubresource.baseArrayLayer = src_layer; + region.srcSubresource.layerCount = 1; + region.srcOffset.x = src_rect->left; + region.srcOffset.y = src_rect->top; + region.srcOffset.z = 0; + region.dstSubresource.aspectMask = dst_aspect; + region.dstSubresource.mipLevel = dst_level; + region.dstSubresource.baseArrayLayer = dst_layer; + region.dstSubresource.layerCount = 1; + region.dstOffset.x = dst_rect->left; + region.dstOffset.y = dst_rect->top; + region.dstOffset.z = 0; + region.extent.width = src_rect->right - src_rect->left; + region.extent.height = src_rect->bottom - src_rect->top; + region.extent.depth = 1; + + VK_CALL(vkCmdCopyImage(vk_command_buffer, src_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, + dst_texture_vk->vk_image, VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, 1, &region)); + } wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT,

1 0

Zebediah Figura : include: Rename the other In*OrderModuleList fields to In*OrderLinks for consistency.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: ea753c384e1040c578a7692c3f003b4380ec283d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea753c384e1040c578a7692c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 20:17:34 2020 -0500 include: Rename the other In*OrderModuleList fields to In*OrderLinks for consistency. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 6 +++--- dlls/kernel32/tests/loader.c | 2 +- dlls/kernel32/toolhelp.c | 4 ++-- dlls/ntdll/loader.c | 42 +++++++++++++++++++++--------------------- include/winternl.h | 4 ++-- programs/winedbg/symbol.c | 4 ++-- 6 files changed, 31 insertions(+), 31 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea753c384e1040c578a7…

1 0

Gabriel Ivăncescu : qedit: Remove the splitter from the graph if it failed to connect.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 4d94e773fc0ca95526df3270c9899439c13a54fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d94e773fc0ca95526df3270… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 23 14:45:45 2020 -0500 qedit: Remove the splitter from the graph if it failed to connect. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/mediadet.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d63825c629..eb7a51928b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -193,17 +193,12 @@ static HRESULT find_splitter(MediaDetImpl *detector) hr = IBaseFilter_EnumPins(splitter, &enum_pins); if (FAILED(hr)) - { - IBaseFilter_Release(splitter); - continue; - } + goto next; + hr = IEnumPins_Next(enum_pins, 1, &splitter_pin, NULL); IEnumPins_Release(enum_pins); if (FAILED(hr)) - { - IBaseFilter_Release(splitter); - continue; - } + goto next; hr = IPin_Connect(source_pin, splitter_pin, NULL); IPin_Release(splitter_pin); @@ -213,6 +208,8 @@ static HRESULT find_splitter(MediaDetImpl *detector) break; } +next: + IGraphBuilder_RemoveFilter(detector->graph, splitter); IBaseFilter_Release(splitter); }

1 0

Henri Verbeet : wined3d: Introduce a Vulkan GPU blitter.
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: d6ef8b0700d296e3ba192ab1c16a0cde471f7bbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6ef8b0700d296e3ba192ab1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 02:39:24 2020 +0430 wined3d: Introduce a Vulkan GPU blitter. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 1 + dlls/wined3d/texture.c | 80 ++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 82 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 9fd5c35d4b..16a23a5fec 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -675,6 +675,7 @@ static HRESULT adapter_vk_init_3d(struct wined3d_device *device) wined3d_context_vk_cleanup(context_vk); return E_FAIL; } + wined3d_vk_blitter_create(&device_vk->d.blitter); wined3d_device_create_default_samplers(device, &context_vk->c); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7a219a9521..407c1078c4 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -5725,3 +5725,83 @@ void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wine blitter->next = *next; *next = blitter; } + +static void vk_blitter_destroy(struct wined3d_blitter *blitter, struct wined3d_context *context) +{ + struct wined3d_blitter *next; + + TRACE("blitter %p, context %p.\n", blitter, context); + + if ((next = blitter->next)) + next->ops->blitter_destroy(next, context); + + heap_free(blitter); +} + +static void vk_blitter_clear(struct wined3d_blitter *blitter, struct wined3d_device *device, + unsigned int rt_count, const struct wined3d_fb_state *fb, unsigned int rect_count, const RECT *clear_rects, + const RECT *draw_rect, DWORD flags, const struct wined3d_color *colour, float depth, DWORD stencil) +{ + struct wined3d_blitter *next; + + TRACE("blitter %p, device %p, rt_count %u, fb %p, rect_count %u, clear_rects %p, " + "draw_rect %s, flags %#x, colour %s, depth %.8e, stencil %#x.\n", + blitter, device, rt_count, fb, rect_count, clear_rects, + wine_dbgstr_rect(draw_rect), flags, debug_color(colour), depth, stencil); + + if (!(next = blitter->next)) + { + ERR("No blitter to handle clear.\n"); + return; + } + + TRACE("Forwarding to blitter %p.\n", next); + next->ops->blitter_clear(next, device, rt_count, fb, rect_count, + clear_rects, draw_rect, flags, colour, depth, stencil); +} + +static DWORD vk_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit_op op, + struct wined3d_context *context, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, + DWORD src_location, const RECT *src_rect, struct wined3d_texture *dst_texture, + unsigned int dst_sub_resource_idx, DWORD dst_location, const RECT *dst_rect, + const struct wined3d_color_key *colour_key, enum wined3d_texture_filter_type filter) +{ + struct wined3d_blitter *next; + + TRACE("blitter %p, op %#x, context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_rect %s, " + "dst_texture %p, dst_sub_resource_idx %u, dst_location %s, dst_rect %s, colour_key %p, filter %s.\n", + blitter, op, context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + wine_dbgstr_rect(src_rect), dst_texture, dst_sub_resource_idx, wined3d_debug_location(dst_location), + wine_dbgstr_rect(dst_rect), colour_key, debug_d3dtexturefiltertype(filter)); + + if (!(next = blitter->next)) + { + ERR("No blitter to handle blit op %#x.\n", op); + return dst_location; + } + + TRACE("Forwarding to blitter %p.\n", next); + return next->ops->blitter_blit(next, op, context, src_texture, src_sub_resource_idx, src_location, + src_rect, dst_texture, dst_sub_resource_idx, dst_location, dst_rect, colour_key, filter); +} + +static const struct wined3d_blitter_ops vk_blitter_ops = +{ + .blitter_destroy = vk_blitter_destroy, + .blitter_clear = vk_blitter_clear, + .blitter_blit = vk_blitter_blit, +}; + +void wined3d_vk_blitter_create(struct wined3d_blitter **next) +{ + struct wined3d_blitter *blitter; + + if (!(blitter = heap_alloc(sizeof(*blitter)))) + return; + + TRACE("Created blitter %p.\n", blitter); + + blitter->ops = &vk_blitter_ops; + blitter->next = *next; + *next = blitter; +} diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 22e1f5160b..9ced75711f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2436,6 +2436,7 @@ struct wined3d_blitter *wined3d_glsl_blitter_create(struct wined3d_blitter **nex const struct wined3d_device *device) DECLSPEC_HIDDEN; void wined3d_raw_blitter_create(struct wined3d_blitter **next, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +void wined3d_vk_blitter_create(struct wined3d_blitter **next) DECLSPEC_HIDDEN; BOOL wined3d_clip_blit(const RECT *clip_rect, RECT *clipped, RECT *other) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_texture().
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 0aee4d9a8800d25227a86c37cbfe0fde9e362fe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0aee4d9a8800d25227a86c37… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 02:39:23 2020 +0430 wined3d: Introduce wined3d_context_vk_reference_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- dlls/wined3d/wined3d_private.h | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 6b833cc4ec..7a219a9521 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4624,7 +4624,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, vk_access_mask_from_bind_flags(dst_texture_vk->t.resource.bind_flags), VK_IMAGE_LAYOUT_TRANSFER_DST_OPTIMAL, dst_texture_vk->layout, dst_texture_vk->vk_image, aspect_mask); - dst_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_texture(context_vk, dst_texture_vk); wined3d_context_vk_reference_bo(context_vk, &staging_bo); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } @@ -4757,7 +4757,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, VK_IMAGE_LAYOUT_TRANSFER_SRC_OPTIMAL, src_texture_vk->layout, src_texture_vk->vk_image, aspect_mask); - src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_texture(context_vk, src_texture_vk); wined3d_context_vk_reference_bo(context_vk, &staging_bo); wined3d_context_vk_submit_command_buffer(context_vk, 0, NULL, NULL, 0, NULL); wined3d_context_vk_wait_command_buffer(context_vk, src_texture_vk->command_buffer_id); @@ -4977,7 +4977,7 @@ static BOOL wined3d_texture_vk_prepare_texture(struct wined3d_texture_vk *textur return FALSE; } - texture_vk->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_texture(context_vk, texture_vk); wined3d_context_vk_image_barrier(context_vk, vk_command_buffer, VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT, VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT, 0, 0, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c4957d9bbc..22e1f5160b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5488,6 +5488,12 @@ static inline void wined3d_context_vk_reference_bo(struct wined3d_context_vk *co bo->command_buffer_id = context_vk->current_command_buffer.id; } +static inline void wined3d_context_vk_reference_texture(struct wined3d_context_vk *context_vk, + struct wined3d_texture_vk *texture_vk) +{ + texture_vk->command_buffer_id = context_vk->current_command_buffer.id; +} + static inline BOOL wined3d_dsv_srv_conflict(const struct wined3d_rendertarget_view *dsv, const struct wined3d_format *srv_format) {

1 0

Zebediah Figura : qedit/tests: Add some tests for IMediaDet::put_Filter().
by Alexandre Julliard April 24, 2020

April 24, 2020

Module: wine Branch: master Commit: 186c67b1840d6d9d05f4d084553bdae6b52444a0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=186c67b1840d6d9d05f4d084… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 23 14:45:43 2020 -0500 qedit/tests: Add some tests for IMediaDet::put_Filter(). Based on a patch by Gabriel Ivăncescu. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/tests/mediadet.c | 212 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 209 insertions(+), 3 deletions(-) diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index ea10f5783e..6decda8557 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -24,6 +24,7 @@ #include "ole2.h" #include "vfwmsgs.h" #include "uuids.h" +#include "wine/strmbase.h" #include "wine/test.h" #include "qedit.h" #include "control.h" @@ -130,6 +131,89 @@ static void test_aggregation(void) ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref); } +struct testfilter +{ + struct strmbase_filter filter; + struct strmbase_source source; +}; + +static inline struct testfilter *impl_from_strmbase_filter(struct strmbase_filter *iface) +{ + return CONTAINING_RECORD(iface, struct testfilter, filter); +} + +static struct strmbase_pin *testfilter_get_pin(struct strmbase_filter *iface, unsigned int index) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + return index ? NULL : &filter->source.pin; +} + +static void testfilter_destroy(struct strmbase_filter *iface) +{ + struct testfilter *filter = impl_from_strmbase_filter(iface); + + strmbase_source_cleanup(&filter->source); + strmbase_filter_cleanup(&filter->filter); +} + +static const struct strmbase_filter_ops testfilter_ops = +{ + .filter_get_pin = testfilter_get_pin, + .filter_destroy = testfilter_destroy, +}; + +static HRESULT testsource_get_media_type(struct strmbase_pin *iface, unsigned int index, AM_MEDIA_TYPE *mt) +{ + static const VIDEOINFOHEADER source_format = + { + .bmiHeader.biSize = sizeof(BITMAPINFOHEADER), + .bmiHeader.biWidth = 640, + .bmiHeader.biHeight = 480, + .bmiHeader.biPlanes = 1, + .bmiHeader.biBitCount = 24, + .bmiHeader.biCompression = BI_RGB, + .bmiHeader.biSizeImage = 640 * 480 * 3 + }; + + if (index) + return S_FALSE; + + mt->majortype = MEDIATYPE_Video; + mt->subtype = MEDIASUBTYPE_RGB24; + mt->bFixedSizeSamples = TRUE; + mt->bTemporalCompression = FALSE; + mt->lSampleSize = source_format.bmiHeader.biSizeImage; + mt->formattype = FORMAT_VideoInfo; + mt->pUnk = NULL; + mt->cbFormat = sizeof(source_format); + mt->pbFormat = CoTaskMemAlloc(mt->cbFormat); + memcpy(mt->pbFormat, &source_format, mt->cbFormat); + return S_OK; +} + +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) +{ + return S_OK; +} + +static const struct strmbase_source_ops testsource_ops = +{ + .base.pin_get_media_type = testsource_get_media_type, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, +}; + +static void testfilter_init(struct testfilter *filter) +{ + static const GUID clsid = {0xabacab}; + + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, NULL, &clsid, &testfilter_ops); + strmbase_source_init(&filter->source, &filter->filter, L"", &testsource_ops); +} + static WCHAR test_avi_filename[MAX_PATH]; static WCHAR test_sound_avi_filename[MAX_PATH]; @@ -369,8 +453,6 @@ static void test_mediadet(void) hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); - DeleteFileW(test_avi_filename); - /* test_sound.avi has one video stream and one audio stream. */ hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, &IID_IMediaDet, (LPVOID*)&pM); @@ -479,8 +561,125 @@ static void test_mediadet(void) hr = IMediaDet_Release(pM); ok(hr == 0, "IMediaDet_Release returned: %x\n", hr); +} + +static void test_put_filter(void) +{ + struct testfilter testfilter, testfilter2; + IFilterGraph *graph; + IBaseFilter *filter; + IMediaDet *detector; + LONG index, count; + AM_MEDIA_TYPE mt; + IUnknown *unk; + BSTR filename; + HRESULT hr; + ULONG ref; + + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (void **)&detector); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaDet_put_Filter(detector, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_Filter(detector, NULL); + ok(hr == E_POINTER, "Got hr %#x.\n", hr); + + testfilter_init(&testfilter); + hr = IMediaDet_put_Filter(detector, &testfilter.filter.IUnknown_inner); + ok(hr == S_OK, "Got hr %#x.\n", hr); - DeleteFileW(test_sound_avi_filename); + hr = IMediaDet_get_Filter(detector, &unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!unk, "Expected a non-NULL interface.\n"); + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter == &testfilter.filter.IBaseFilter_iface, "Expected the same filter.\n"); + IBaseFilter_Release(filter); + IUnknown_Release(unk); + + ok(!wcscmp(testfilter.filter.name, L"Source"), "Got name %s.\n", + debugstr_w(testfilter.filter.name)); + graph = testfilter.filter.graph; + IFilterGraph_AddRef(graph); + + testfilter_init(&testfilter2); + hr = IMediaDet_put_Filter(detector, &testfilter2.filter.IUnknown_inner); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaDet_get_Filter(detector, &unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!!unk, "Expected a non-NULL interface.\n"); + hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(filter == &testfilter2.filter.IBaseFilter_iface, "Expected the same filter.\n"); + IBaseFilter_Release(filter); + IUnknown_Release(unk); + + ok(testfilter2.filter.graph != graph, "Expected a different graph.\n"); + + ref = IFilterGraph_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testfilter.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + count = 0xdeadbeef; + hr = IMediaDet_get_OutputStreams(detector, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 1, "Got %d streams.\n", count); + + index = 0xdeadbeef; + hr = IMediaDet_get_CurrentStream(detector, &index); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(index == 0, "Got stream %d.\n", index); + + filename = (BSTR)0xdeadbeef; + hr = IMediaDet_get_Filename(detector, &filename); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!filename, "Got filename %s.\n", debugstr_w(filename)); + + ref = IMediaDet_Release(detector); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ref = IBaseFilter_Release(&testfilter2.filter.IBaseFilter_iface); + ok(!ref, "Got outstanding refcount %d.\n", ref); + + hr = CoCreateInstance(&CLSID_MediaDet, NULL, CLSCTX_INPROC_SERVER, + &IID_IMediaDet, (void **)&detector); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + filename = SysAllocString(test_sound_avi_filename); + hr = IMediaDet_put_Filename(detector, filename); + ok(hr == S_OK, "Got hr %#x.\n", hr); + SysFreeString(filename); + + hr = IMediaDet_get_StreamMediaType(detector, &mt); + ok(hr == S_OK, "Got hr %#x.\n", hr); + FreeMediaType(&mt); + + hr = IMediaDet_get_Filter(detector, &unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaDet_put_Filter(detector, unk); + ok(hr == S_OK, "Got hr %#x.\n", hr); + IUnknown_Release(unk); + + filename = (BSTR)0xdeadbeef; + hr = IMediaDet_get_Filename(detector, &filename); + ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(!filename, "Got filename %s.\n", debugstr_w(filename)); + + count = 0xdeadbeef; + hr = IMediaDet_get_OutputStreams(detector, &count); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(count == 2, "Got %d streams.\n", count); + + index = 0xdeadbeef; + hr = IMediaDet_get_CurrentStream(detector, &index); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(index == 0, "Got stream %d.\n", index); + + ref = IMediaDet_Release(detector); + ok(!ref, "Got outstanding refcount %d.\n", ref); } static HRESULT WINAPI ms_QueryInterface(IMediaSample *iface, REFIID riid, @@ -737,6 +936,7 @@ START_TEST(mediadet) { IMediaDet *detector; HRESULT hr; + BOOL ret; if (!init_tests()) { @@ -757,8 +957,14 @@ START_TEST(mediadet) test_aggregation(); test_mediadet(); + test_put_filter(); test_samplegrabber(); test_COM_sg_enumpins(); + ret = DeleteFileW(test_avi_filename); + todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + ret = DeleteFileW(test_sound_avi_filename); + todo_wine ok(ret, "Failed to delete file, error %u.\n", GetLastError()); + CoUninitialize(); }

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_GetFrameCount().
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: 79664eb1cf37d1e9b888941ea4f90dd220882a28 URL: https://source.winehq.org/git/wine.git/?a=commit;h=79664eb1cf37d1e9b888941e… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 23 17:29:49 2020 +0800 windowscodecs: Implement DdsDecoder_GetFrameCount(). The added tests code is to test the return value of DdsDecoder_GetFrameCount() when decoder is not initialized or parameter is NULL. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/ddsformat.c | 40 ++++++++++++++++++++++++++++++++---- dlls/windowscodecs/tests/ddsformat.c | 11 +++++++--- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 04914ead3a..19d5dd5a3f 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -94,6 +94,12 @@ typedef struct DdsDecoder { DDS_HEADER_DXT10 header_dxt10; } DdsDecoder; +static inline BOOL has_extended_header(DDS_HEADER *header) +{ + return (header->ddspf.flags & DDPF_FOURCC) && + (header->ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')); +} + static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) { return CONTAINING_RECORD(iface, DdsDecoder, IWICBitmapDecoder_iface); @@ -202,8 +208,7 @@ static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p goto end; } - if (This->header.ddspf.flags & DDPF_FOURCC && - This->header.ddspf.fourCC == MAKEFOURCC('D', 'X', '1', '0')) { + if (has_extended_header(&This->header)) { hr = IStream_Read(pIStream, &This->header_dxt10, sizeof(This->header_dxt10), &bytesread); if (FAILED(hr)) goto end; if (bytesread != sizeof(This->header_dxt10)) { @@ -285,9 +290,36 @@ static HRESULT WINAPI DdsDecoder_GetThumbnail(IWICBitmapDecoder *iface, static HRESULT WINAPI DdsDecoder_GetFrameCount(IWICBitmapDecoder *iface, UINT *pCount) { - FIXME("(%p) <-- %d: stub.\n", iface, *pCount); + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + UINT arraySize = 1, mipMapCount = 1, depth = 1; + int i; - return E_NOTIMPL; + if (!pCount) return E_INVALIDARG; + if (!This->initialized) return WINCODEC_ERR_WRONGSTATE; + + EnterCriticalSection(&This->lock); + + if (This->header.mipMapCount) mipMapCount = This->header.mipMapCount; + if (This->header.depth) depth = This->header.depth; + if (has_extended_header(&This->header) && This->header_dxt10.arraySize) arraySize = This->header_dxt10.arraySize; + + if (depth == 1) { + *pCount = arraySize * mipMapCount; + } else { + *pCount = 0; + for (i = 0; i < mipMapCount; i++) + { + *pCount += depth; + if (depth > 1) depth /= 2; + } + *pCount *= arraySize; + } + + LeaveCriticalSection(&This->lock); + + TRACE("(%p) <-- %d\n", iface, *pCount); + + return S_OK; } static HRESULT WINAPI DdsDecoder_GetFrame(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 99f19eb175..e548ee9655 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -304,17 +304,22 @@ static void test_dds_decoder_frame_count(void) decoder = create_decoder(); if (!decoder) goto next; + hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); + ok (hr == WINCODEC_ERR_WRONGSTATE, "%d: Expected hr=WINCODEC_ERR_WRONGSTATE, got %x\n", i, hr); + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=E_INVALIDARG, got %x\n", i, hr); + hr = init_decoder(decoder, stream, S_OK, -1); if (hr != S_OK) goto next; - todo_wine { hr = IWICBitmapDecoder_GetFrameCount(decoder, &frame_count); - ok (hr == S_OK, "GetFrameCount failed, hr=%x\n", hr); + ok (hr == S_OK, "%d: GetFrameCount failed, hr=%x\n", i, hr); if (hr == S_OK) { ok (frame_count == test_data[i].expected, "%d: expected frame count %d, got %d\n", i, test_data[i].expected, frame_count); } - }; + hr = IWICBitmapDecoder_GetFrameCount(decoder, NULL); + ok (hr == E_INVALIDARG, "%d: Expected hr=S_OK, got %x\n", i, hr); next: if (decoder) IWICBitmapDecoder_Release(decoder);

1 0

Alexandre Julliard : opengl32: Make wgl driver entry points WINAPI.
by Alexandre Julliard April 23, 2020

April 23, 2020

Module: wine Branch: master Commit: b0e2d046fc69cc4a4c5aefe383793950b44a1a7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b0e2d046fc69cc4a4c5aefe3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 23 13:33:20 2020 +0200 opengl32: Make wgl driver entry points WINAPI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/opengl.c | 20 ++++++++++---------- dlls/opengl32/make_opengl | 14 +++++++------- dlls/opengl32/opengl_norm.c | 20 ++++++++++---------- dlls/wineandroid.drv/opengl.c | 20 ++++++++++---------- dlls/winemac.drv/opengl.c | 20 ++++++++++---------- dlls/winex11.drv/opengl.c | 22 +++++++++++----------- include/wine/wgl_driver.h | 22 +++++++++++----------- 7 files changed, 69 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b0e2d046fc69cc4a4c5a…

1 0