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

Henri Verbeet : wined3d: Only insert read barriers for WINED3D_MAP_READ maps in adapter_vk_map_bo_address().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: cb8fe656b6f74f3685102d13eecd36b19073925b URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb8fe656b6f74f3685102d13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:08 2020 +0430 wined3d: Only insert read barriers for WINED3D_MAP_READ maps in adapter_vk_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 85dfa6c987..a5900b29e5 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -506,23 +506,26 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_info = context_vk->vk_info; device_vk = wined3d_device_vk(context->device); - if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + if (map_flags & WINED3D_MAP_READ) { - ERR("Failed to get command buffer.\n"); - return NULL; - } + if (!(vk_command_buffer = wined3d_context_vk_get_command_buffer(context_vk))) + { + ERR("Failed to get command buffer.\n"); + return NULL; + } - vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; - vk_barrier.pNext = NULL; - vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); - vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; - vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; - vk_barrier.buffer = bo->vk_buffer; - vk_barrier.offset = (uintptr_t)data->addr; - vk_barrier.size = size; - VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, - VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + vk_barrier.sType = VK_STRUCTURE_TYPE_BUFFER_MEMORY_BARRIER; + vk_barrier.pNext = NULL; + vk_barrier.srcAccessMask = vk_access_mask_from_bind_flags(bind_flags); + vk_barrier.dstAccessMask = VK_ACCESS_HOST_READ_BIT; + vk_barrier.srcQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED; + vk_barrier.buffer = bo->vk_buffer; + vk_barrier.offset = (uintptr_t)data->addr; + vk_barrier.size = size; + VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, + VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + } wined3d_context_vk_submit_command_buffer(context_vk); wined3d_context_vk_wait_command_buffer(context_vk, context_vk->current_command_buffer.id - 1);

1 0

Jeff Smith : gdiplus: Use internal function to add bezier points for curve.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: fd15bd22c49aa22e47d0edfd12d2e4a23f21d5a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd15bd22c49aa22e47d0edfd… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:12 2020 -0500 gdiplus: Use internal function to add bezier points for curve. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index ba977f970a..79e231bf1b 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -424,7 +424,7 @@ GpStatus WINGDIPAPI GdipAddPathClosedCurve2(GpPath *path, GDIPCONST GpPointF *po pt[len_pt-1].X = pt[0].X; pt[len_pt-1].Y = pt[0].Y; - stat = GdipAddPathBeziers(path, pt, len_pt); + stat = extend_current_figure(path, pt, len_pt, PathPointTypeBezier); /* close figure */ if(stat == Ok){ @@ -532,7 +532,7 @@ GpStatus WINGDIPAPI GdipAddPathCurve2(GpPath *path, GDIPCONST GpPointF *points, pt[len_pt-1].X = points[count-1].X; pt[len_pt-1].Y = points[count-1].Y; - stat = GdipAddPathBeziers(path, pt, len_pt); + stat = extend_current_figure(path, pt, len_pt, PathPointTypeBezier); heap_free(pt);

1 0

Henri Verbeet : wined3d: Move Vulkan specific context functions to context_vk.c.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 77f72dc386dcb5f340f22a8e90ed75102a3904ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f72dc386dcb5f340f22a8e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:07 2020 +0430 wined3d: Move Vulkan specific context functions to context_vk.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 1 + dlls/wined3d/context.c | 279 +------------------------------------ dlls/wined3d/context_vk.c | 307 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 310 insertions(+), 278 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=77f72dc386dcb5f340f2…

1 0

Henri Verbeet : wined3d: Flush non-coherent memory ranges in adapter_vk_unmap_bo_address().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 7d066631de51dfa5531f1d9441abf94521119226 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d066631de51dfa5531f1d94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:10 2020 +0430 wined3d: Flush non-coherent memory ranges in adapter_vk_unmap_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a015963ee6..1773f26ae7 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -556,13 +556,30 @@ static void adapter_vk_unmap_bo_address(struct wined3d_context *context, const s { const struct wined3d_vk_info *vk_info; struct wined3d_device_vk *device_vk; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; + unsigned int i; if (!(bo = (struct wined3d_bo_vk *)data->buffer_object)) return; vk_info = wined3d_context_vk(context)->vk_info; device_vk = wined3d_device_vk(context->device); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + + for (i = 0; i < range_count; ++i) + { + range.offset = ranges[i].offset; + range.size = ranges[i].size; + VK_CALL(vkFlushMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } + } + VK_CALL(vkUnmapMemory(device_vk->vk_device, bo->vk_memory)); }

1 0

Henri Verbeet : wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 85f9f51df88661a513eaa474cd4941a62ef991db URL: https://source.winehq.org/git/wine.git/?a=commit;h=85f9f51df88661a513eaa474… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:11 2020 +0430 wined3d: Do not request coherent memory in wined3d_buffer_vk_create_buffer_object(). We may get coherent memory anyway, but we don't require it. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 47aca9218d..2e2ae23921 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1589,9 +1589,8 @@ static BOOL wined3d_buffer_vk_create_buffer_object(struct wined3d_buffer_vk *buf usage |= VK_BUFFER_USAGE_INDIRECT_BUFFER_BIT; if (bind_flags & (WINED3D_BIND_STREAM_OUTPUT | WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL)) FIXME("Ignoring some bind flags %#x.\n", bind_flags); - memory_type = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT - | VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; + memory_type = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT + | VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT; if (!(wined3d_context_vk_create_bo(context_vk, resource->size, usage, memory_type, &buffer_vk->bo))) { WARN("Failed to create Vulkan buffer.\n");

1 0

Jeff Smith : gdiplus: Reuse point when calling GdipAddPathBeziers on open figure.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: a7e6cb4a257540e01aca1d160ca10890eaca9ceb URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7e6cb4a257540e01aca1d16… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Wed Apr 15 15:07:08 2020 -0500 gdiplus: Reuse point when calling GdipAddPathBeziers on open figure. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48877 Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphicspath.c | 20 +------------------- dlls/gdiplus/tests/graphicspath.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dlls/gdiplus/graphicspath.c b/dlls/gdiplus/graphicspath.c index 547f172d98..2729455567 100644 --- a/dlls/gdiplus/graphicspath.c +++ b/dlls/gdiplus/graphicspath.c @@ -322,30 +322,12 @@ GpStatus WINGDIPAPI GdipAddPathBezierI(GpPath *path, INT x1, INT y1, INT x2, GpStatus WINGDIPAPI GdipAddPathBeziers(GpPath *path, GDIPCONST GpPointF *points, INT count) { - INT i, old_count; - TRACE("(%p, %p, %d)\n", path, points, count); if(!path || !points || ((count - 1) % 3)) return InvalidParameter; - if(!lengthen_path(path, count)) - return OutOfMemory; - - old_count = path->pathdata.Count; - - for(i = 0; i < count; i++){ - path->pathdata.Points[old_count + i].X = points[i].X; - path->pathdata.Points[old_count + i].Y = points[i].Y; - path->pathdata.Types[old_count + i] = PathPointTypeBezier; - } - - path->pathdata.Types[old_count] = - (path->newfigure ? PathPointTypeStart : PathPointTypeLine); - path->newfigure = FALSE; - path->pathdata.Count += count; - - return Ok; + return extend_current_figure(path, points, count, PathPointTypeBezier); } GpStatus WINGDIPAPI GdipAddPathBeziersI(GpPath *path, GDIPCONST GpPoint *points, diff --git a/dlls/gdiplus/tests/graphicspath.c b/dlls/gdiplus/tests/graphicspath.c index d85cf68dfc..d19c7836fb 100644 --- a/dlls/gdiplus/tests/graphicspath.c +++ b/dlls/gdiplus/tests/graphicspath.c @@ -365,6 +365,28 @@ static void test_bezier(void) GdipDeletePath(path); } +static void test_beziers(void) +{ + GpStatus status; + GpPath* path; + PointF bezier_points1[] = {{10.0,10.0}, {20.0,10.0}, {20.0,20.0}, {30.0,20.0}}; + PointF bezier_points2[] = {{30.0,20.0}, {40.0,20.0}, {40.0,30.0}, {50.0,30.0}}; + PointF bezier_points3[] = {{50.0,10.0}, {60.0,10.0}, {60.0,20.0}, {70.0,20.0}}; + + GdipCreatePath(FillModeAlternate, &path); + + status = GdipAddPathBeziers(path, bezier_points1, 4); + expect(Ok, status); + status = GdipAddPathBeziers(path, bezier_points2, 4); + expect(Ok, status); + status = GdipAddPathBeziers(path, bezier_points3, 4); + expect(Ok, status); + + ok_path(path, bezier_path, ARRAY_SIZE(bezier_path), FALSE); + + GdipDeletePath(path); +} + static path_test_t arc_path[] = { {600.0, 450.0, PathPointTypeStart, 0, 0}, /*0*/ {600.0, 643.3, PathPointTypeBezier, 0, 0}, /*1*/ @@ -1818,6 +1840,7 @@ START_TEST(graphicspath) test_createpath2(); test_line2(); test_bezier(); + test_beziers(); test_arc(); test_worldbounds(); test_pathpath();

1 0

Ziqing Hui : windowscodecs/tests: Add tests for DdsDecoder_Initialize().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: e167f90eca9909a3f87f6d4d62cad3c0db58ba32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e167f90eca9909a3f87f6d4d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 16 17:43:00 2020 +0800 windowscodecs/tests: Add tests for DdsDecoder_Initialize(). 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/tests/ddsformat.c | 75 ++++++++++++++++++++++++++++++++---- 1 file changed, 68 insertions(+), 7 deletions(-) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 6df303d8ff..6abee4dea5 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -59,7 +59,7 @@ fail: return NULL; } -static IWICBitmapDecoder *create_decoder(IWICStream *stream) +static IWICBitmapDecoder *create_decoder(void) { HRESULT hr; IWICBitmapDecoder *decoder = NULL; @@ -77,27 +77,88 @@ static IWICBitmapDecoder *create_decoder(IWICStream *stream) ok(SUCCEEDED(hr), "GetContainerFormat failed, hr=%x\n", hr); ok(IsEqualGUID(&guidresult, &GUID_ContainerFormatDds), "Unexpected container format\n"); + return decoder; +} + +static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRESULT expected, int index) +{ + HRESULT hr; + hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); - todo_wine ok(hr == S_OK, "Decoder Initialize failed, hr=%x\n", hr); - if (hr != S_OK) { - IWICBitmapDecoder_Release(decoder); - return NULL; + if (index == -1) { + todo_wine ok(SUCCEEDED(hr), "Decoder Initialize failed, hr=%x\n", hr); + } else { + todo_wine ok(hr == expected, "%d: Expected hr=%x, got %x\n", index, expected, hr); } + return hr; +} - return decoder; +static void test_dds_decoder_initialize(void) +{ + static BYTE test_dds_bad_magic[sizeof(test_dds_image)]; + static BYTE test_dds_bad_header[sizeof(test_dds_image)]; + static BYTE byte = 0; + static DWORD dword = 0; + static BYTE qword1[8] = { 0 }; + static BYTE qword2[8] = "DDS "; + + static struct test_data { + void *data; + UINT size; + HRESULT expected; + } test_data[] = { + { test_dds_image, sizeof(test_dds_image), S_OK }, + { test_dds_bad_magic, sizeof(test_dds_bad_magic), WINCODEC_ERR_UNKNOWNIMAGEFORMAT }, + { test_dds_bad_header, sizeof(test_dds_bad_header), WINCODEC_ERR_BADHEADER }, + { &byte, sizeof(byte), WINCODEC_ERR_STREAMREAD }, + { &dword, sizeof(dword), WINCODEC_ERR_UNKNOWNIMAGEFORMAT }, + { &qword1, sizeof(qword1), WINCODEC_ERR_UNKNOWNIMAGEFORMAT }, + { &qword2, sizeof(qword2), WINCODEC_ERR_STREAMREAD }, + }; + + int i; + + memcpy(test_dds_bad_magic, test_dds_image, sizeof(test_dds_image)); + memcpy(test_dds_bad_header, test_dds_image, sizeof(test_dds_image)); + test_dds_bad_magic[0] = 0; + test_dds_bad_header[4] = 0; + + for (i = 0; i < ARRAY_SIZE(test_data); i++) + { + IWICStream *stream = NULL; + IWICBitmapDecoder *decoder = NULL; + + stream = create_stream(test_data[i].data, test_data[i].size); + if (!stream) goto next; + + decoder = create_decoder(); + if (!decoder) goto next; + + init_decoder(decoder, stream, test_data[i].expected, i); + + next: + if (decoder) IWICBitmapDecoder_Release(decoder); + if (stream) IWICStream_Release(stream); + } } static void test_dds_decoder(void) { + HRESULT hr; IWICStream *stream = NULL; IWICBitmapDecoder *decoder = NULL; stream = create_stream(test_dds_image, sizeof(test_dds_image)); if (!stream) goto end; - decoder = create_decoder(stream); + decoder = create_decoder(); if (!decoder) goto end; + hr = init_decoder(decoder, stream, S_OK, -1); + if (FAILED(hr)) goto end; + + test_dds_decoder_initialize(); + end: if (decoder) IWICBitmapDecoder_Release(decoder); if (stream) IWICStream_Release(stream);

1 0

Ziqing Hui : windowscodecs: Implement DdsDecoder_Initialize().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 8467b61a3e55eff0bbad08898fd723ead805b895 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8467b61a3e55eff0bbad0889… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Apr 16 17:43:18 2020 +0800 windowscodecs: Implement DdsDecoder_Initialize(). 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 | 81 +++++++++++++++++++++++++++++++++++- dlls/windowscodecs/tests/ddsformat.c | 4 +- 2 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/windowscodecs/ddsformat.c b/dlls/windowscodecs/ddsformat.c index 67680e9a0a..ac832e2116 100644 --- a/dlls/windowscodecs/ddsformat.c +++ b/dlls/windowscodecs/ddsformat.c @@ -33,12 +33,43 @@ WINE_DEFAULT_DEBUG_CHANNEL(wincodecs); +#define DDS_MAGIC 0x20534444 + +typedef struct { + DWORD size; + DWORD flags; + DWORD fourCC; + DWORD rgbBitCount; + DWORD rBitMask; + DWORD gBitMask; + DWORD bBitMask; + DWORD aBitMask; +} DDS_PIXELFORMAT; + +typedef struct { + DWORD size; + DWORD flags; + DWORD height; + DWORD width; + DWORD pitchOrLinearSize; + DWORD depth; + DWORD mipMapCount; + DWORD reserved1[11]; + DDS_PIXELFORMAT ddspf; + DWORD caps; + DWORD caps2; + DWORD caps3; + DWORD caps4; + DWORD reserved2; +} DDS_HEADER; + typedef struct DdsDecoder { IWICBitmapDecoder IWICBitmapDecoder_iface; LONG ref; BOOL initialized; IStream *stream; CRITICAL_SECTION lock; + DDS_HEADER header; } DdsDecoder; static inline DdsDecoder *impl_from_IWICBitmapDecoder(IWICBitmapDecoder *iface) @@ -108,9 +139,55 @@ static HRESULT WINAPI DdsDecoder_QueryCapability(IWICBitmapDecoder *iface, IStre static HRESULT WINAPI DdsDecoder_Initialize(IWICBitmapDecoder *iface, IStream *pIStream, WICDecodeOptions cacheOptions) { - FIXME("(%p,%p,%x): stub.\n", iface, pIStream, cacheOptions); + DdsDecoder *This = impl_from_IWICBitmapDecoder(iface); + HRESULT hr; + LARGE_INTEGER seek; + DWORD magic; + ULONG bytesread; - return E_NOTIMPL; + TRACE("(%p,%p,%x)\n", iface, pIStream, cacheOptions); + + EnterCriticalSection(&This->lock); + + if (This->initialized) { + hr = WINCODEC_ERR_WRONGSTATE; + goto end; + } + + seek.QuadPart = 0; + hr = IStream_Seek(pIStream, seek, SEEK_SET, NULL); + if (FAILED(hr)) goto end; + + hr = IStream_Read(pIStream, &magic, sizeof(magic), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(magic)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + if (magic != DDS_MAGIC) { + hr = WINCODEC_ERR_UNKNOWNIMAGEFORMAT; + goto end; + } + + hr = IStream_Read(pIStream, &This->header, sizeof(This->header), &bytesread); + if (FAILED(hr)) goto end; + if (bytesread != sizeof(This->header)) { + hr = WINCODEC_ERR_STREAMREAD; + goto end; + } + if (This->header.size != sizeof(This->header)) { + hr = WINCODEC_ERR_BADHEADER; + goto end; + } + + This->initialized = TRUE; + This->stream = pIStream; + IStream_AddRef(pIStream); + +end: + LeaveCriticalSection(&This->lock); + + return hr; } static HRESULT WINAPI DdsDecoder_GetContainerFormat(IWICBitmapDecoder *iface, diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index 6abee4dea5..8569d0e291 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -86,9 +86,9 @@ static HRESULT init_decoder(IWICBitmapDecoder *decoder, IWICStream *stream, HRES hr = IWICBitmapDecoder_Initialize(decoder, (IStream*)stream, WICDecodeMetadataCacheOnDemand); if (index == -1) { - todo_wine ok(SUCCEEDED(hr), "Decoder Initialize failed, hr=%x\n", hr); + ok(SUCCEEDED(hr), "Decoder Initialize failed, hr=%x\n", hr); } else { - todo_wine ok(hr == expected, "%d: Expected hr=%x, got %x\n", index, expected, hr); + ok(hr == expected, "%d: Expected hr=%x, got %x\n", index, expected, hr); } return hr; }

1 0

Nikolay Sivov : mf: Validate new current type set for sample grabber.
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 169d6b00bc438ac0cd7162146440c35ad75567c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=169d6b00bc438ac0cd716214… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 16 14:51:57 2020 +0300 mf: Validate new current type set for sample grabber. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/samplegrabber.c | 24 ++++++++++++++---------- dlls/mf/tests/mf.c | 31 ++++++++++++++++++++++++++++--- 2 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/mf/samplegrabber.c b/dlls/mf/samplegrabber.c index 205298501d..062e8ea173 100644 --- a/dlls/mf/samplegrabber.c +++ b/dlls/mf/samplegrabber.c @@ -599,15 +599,11 @@ static ULONG WINAPI sample_grabber_stream_type_handler_Release(IMFMediaTypeHandl return IMFStreamSink_Release(&stream->IMFStreamSink_iface); } -static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, - IMFMediaType *in_type, IMFMediaType **out_type) +static HRESULT sample_grabber_stream_is_media_type_supported(struct sample_grabber_stream *stream, IMFMediaType *in_type) { - struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); const DWORD supported_flags = MF_MEDIATYPE_EQUAL_MAJOR_TYPES | MF_MEDIATYPE_EQUAL_FORMAT_TYPES; DWORD flags; - TRACE("%p, %p, %p.\n", iface, in_type, out_type); - if (!stream->sink) return MF_E_STREAMSINK_REMOVED; @@ -620,6 +616,16 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IM return (flags & supported_flags) == supported_flags ? S_OK : MF_E_INVALIDMEDIATYPE; } +static HRESULT WINAPI sample_grabber_stream_type_handler_IsMediaTypeSupported(IMFMediaTypeHandler *iface, + IMFMediaType *in_type, IMFMediaType **out_type) +{ + struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + + TRACE("%p, %p, %p.\n", iface, in_type, out_type); + + return sample_grabber_stream_is_media_type_supported(stream, in_type); +} + static HRESULT WINAPI sample_grabber_stream_type_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { TRACE("%p, %p.\n", iface, count); @@ -647,14 +653,12 @@ static HRESULT WINAPI sample_grabber_stream_type_handler_SetCurrentMediaType(IMF IMFMediaType *media_type) { struct sample_grabber_stream *stream = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr; TRACE("%p, %p.\n", iface, media_type); - if (!media_type) - return E_POINTER; - - if (!stream->sink) - return MF_E_STREAMSINK_REMOVED; + if (FAILED(hr = sample_grabber_stream_is_media_type_supported(stream, media_type))) + return hr; IMFMediaType_Release(stream->sink->media_type); stream->sink->media_type = media_type; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dd6c935b8c..8933ea717c 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2000,14 +2000,20 @@ static void test_sample_grabber(void) hr = MFCreateSampleGrabberSinkActivate(NULL, &grabber_callback, &activate); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); - hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); - ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); - hr = IMFMediaType_SetGUID(media_type, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); hr = IMFMediaType_SetGUID(media_type, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + EXPECT_REF(media_type, 1); + hr = MFCreateSampleGrabberSinkActivate(media_type, &grabber_callback, &activate); + ok(hr == S_OK, "Failed to create grabber activate, hr %#x.\n", hr); + EXPECT_REF(media_type, 2); + + hr = IMFActivate_GetCount(activate, &count); + ok(hr == S_OK, "Failed to get attribute count, hr %#x.\n", hr); + ok(!count, "Unexpected count %u.\n", count); + hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); ok(hr == S_OK, "Failed to activate object, hr %#x.\n", hr); @@ -2136,11 +2142,27 @@ static void test_sample_grabber(void) hr = MFCreateMediaType(&media_type2); ok(hr == S_OK, "Failed to create media type, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_MAJOR_TYPE, &MFMediaType_Audio); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_Float); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetGUID(media_type2, &MF_MT_SUBTYPE, &MFAudioFormat_PCM); ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(media_type2, &MF_MT_AUDIO_SAMPLES_PER_SECOND, 44100); + ok(hr == S_OK, "Failed to set attribute, hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, media_type2); ok(hr == S_OK, "Failed to get current type, hr %#x.\n", hr); IMFMediaType_Release(media_type); @@ -2242,6 +2264,9 @@ static void test_sample_grabber(void) hr = IMFMediaTypeHandler_IsMediaTypeSupported(handler, NULL, NULL); ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_SetCurrentMediaType(handler, NULL); + ok(hr == MF_E_STREAMSINK_REMOVED, "Unexpected hr %#x.\n", hr); + hr = IMFMediaTypeHandler_GetMediaTypeCount(handler, &count); ok(hr == S_OK, "Failed to get type count, hr %#x.\n", hr);

1 0

Henri Verbeet : wined3d: Invalidate non-coherent memory before reading from it in adapter_vk_map_bo_address().
by Alexandre Julliard April 16, 2020

April 16, 2020

Module: wine Branch: master Commit: 66f714431a9fd5e85c28aae9b66f1d3ebcbee809 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66f714431a9fd5e85c28aae9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 16 21:17:09 2020 +0430 wined3d: Invalidate non-coherent memory before reading from it in adapter_vk_map_bo_address(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 11 +++++++++++ dlls/wined3d/context_vk.c | 8 ++++++-- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index a5900b29e5..a015963ee6 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -496,6 +496,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, struct wined3d_device_vk *device_vk; VkCommandBuffer vk_command_buffer; VkBufferMemoryBarrier vk_barrier; + VkMappedMemoryRange range; struct wined3d_bo_vk *bo; void *map_ptr; VkResult vr; @@ -525,6 +526,16 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, vk_barrier.size = size; VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, VK_PIPELINE_STAGE_HOST_BIT, 0, 0, NULL, 1, &vk_barrier, 0, NULL)); + + if (!(bo->memory_type & VK_MEMORY_PROPERTY_HOST_COHERENT_BIT)) + { + range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE; + range.pNext = NULL; + range.memory = bo->vk_memory; + range.offset = (uintptr_t)data->addr; + range.size = size; + VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); + } } wined3d_context_vk_submit_command_buffer(context_vk); diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index 84e701543f..b0e65231f2 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -38,6 +38,7 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic struct wined3d_adapter_vk *adapter_vk; VkMemoryAllocateInfo allocate_info; VkBufferCreateInfo create_info; + unsigned int memory_type_idx; VkResult vr; adapter_vk = wined3d_adapter_vk(device_vk->d.adapter); @@ -62,14 +63,15 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic allocate_info.sType = VK_STRUCTURE_TYPE_MEMORY_ALLOCATE_INFO; allocate_info.pNext = NULL; allocate_info.allocationSize = memory_requirements.size; - allocate_info.memoryTypeIndex = wined3d_adapter_vk_get_memory_type_index(adapter_vk, + memory_type_idx = wined3d_adapter_vk_get_memory_type_index(adapter_vk, memory_requirements.memoryTypeBits, memory_type); - if (allocate_info.memoryTypeIndex == ~0u) + if (memory_type_idx == ~0u) { ERR("Failed to find suitable memory type.\n"); VK_CALL(vkDestroyBuffer(device_vk->vk_device, bo->vk_buffer, NULL)); return FALSE; } + allocate_info.memoryTypeIndex = memory_type_idx; if ((vr = VK_CALL(vkAllocateMemory(device_vk->vk_device, &allocate_info, NULL, &bo->vk_memory))) < 0) { ERR("Failed to allocate buffer memory, vr %s.\n", wined3d_debug_vkresult(vr)); @@ -85,6 +87,8 @@ BOOL wined3d_context_vk_create_bo(struct wined3d_context_vk *context_vk, VkDevic return FALSE; } + bo->memory_type = adapter_vk->memory_properties.memoryTypes[memory_type_idx].propertyFlags; + return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2fde81e64..55243050b0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1521,6 +1521,8 @@ struct wined3d_bo_vk { VkBuffer vk_buffer; VkDeviceMemory vk_memory; + + VkMemoryPropertyFlags memory_type; }; struct wined3d_bo_address

1 0