wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_texture().
by Alexandre Julliard 24 Apr '20

24 Apr '20

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

Henri Verbeet : wined3d: Introduce wined3d_context_vk_reference_bo().
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 036d0d29a60304564e18aacdfee729ac4a692fad URL: https://source.winehq.org/git/wine.git/?a=commit;h=036d0d29a60304564e18aacd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 24 02:39:22 2020 +0430 wined3d: Introduce wined3d_context_vk_reference_bo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_vk.c | 6 +++--- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 5 +++++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index efb1ae8ba2..9fd5c35d4b 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -855,7 +855,7 @@ static void *adapter_vk_map_bo_address(struct wined3d_context *context, VK_CALL(vkInvalidateMappedMemoryRanges(device_vk->vk_device, 1, &range)); } - bo->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_bo(context_vk, bo); } if (bo->command_buffer_id == context_vk->current_command_buffer.id) @@ -971,8 +971,8 @@ static void adapter_vk_copy_bo_address(struct wined3d_context *context, VK_CALL(vkCmdPipelineBarrier(vk_command_buffer, VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, 0, NULL, 2, vk_barrier, 0, NULL)); - src_bo->command_buffer_id = context_vk->current_command_buffer.id; - dst_bo->command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_bo(context_vk, src_bo); + wined3d_context_vk_reference_bo(context_vk, dst_bo); return; } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index aacc965ffc..6b833cc4ec 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4625,7 +4625,7 @@ static void wined3d_texture_vk_upload_data(struct wined3d_context *context, 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; - staging_bo.command_buffer_id = context_vk->current_command_buffer.id; + wined3d_context_vk_reference_bo(context_vk, &staging_bo); wined3d_context_vk_destroy_bo(context_vk, &staging_bo); } @@ -4758,7 +4758,7 @@ static void wined3d_texture_vk_download_data(struct wined3d_context *context, src_texture_vk->vk_image, aspect_mask); src_texture_vk->command_buffer_id = context_vk->current_command_buffer.id; - staging_bo.command_buffer_id = context_vk->current_command_buffer.id; + 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); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bd42e3f18b..c4957d9bbc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -5483,6 +5483,11 @@ static inline void wined3d_context_copy_bo_address(struct wined3d_context *conte context->device->adapter->adapter_ops->adapter_copy_bo_address(context, dst, src, size); } +static inline void wined3d_context_vk_reference_bo(struct wined3d_context_vk *context_vk, struct wined3d_bo_vk *bo) +{ + bo->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

Gabriel Ivăncescu : qedit: Remove the splitter from the graph if it failed to connect.
by Alexandre Julliard 24 Apr '20

24 Apr '20

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

Gabriel Ivăncescu : qedit: Store the filename instead of querying the filter for it.
by Alexandre Julliard 24 Apr '20

24 Apr '20

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

Zebediah Figura : qedit/tests: Add some tests for IMediaDet::put_Filter().
by Alexandre Julliard 24 Apr '20

24 Apr '20

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

Gabriel Ivăncescu : qedit: Implement IMediaDet::put_Filter().
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 8c157d86150c52a10d8b5ada11d652a7ca1065ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c157d86150c52a10d8b5ada… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 23 14:45:42 2020 -0500 qedit: Implement IMediaDet::put_Filter(). 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 | 47 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 43 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 49d9bc36c0..22df05647e 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -309,11 +309,50 @@ static HRESULT WINAPI MediaDet_get_Filter(IMediaDet *iface, IUnknown **filter) return S_OK; } -static HRESULT WINAPI MediaDet_put_Filter(IMediaDet* iface, IUnknown *newVal) +static HRESULT WINAPI MediaDet_put_Filter(IMediaDet *iface, IUnknown *unk) { - MediaDetImpl *This = impl_from_IMediaDet(iface); - FIXME("(%p)->(%p): not implemented!\n", This, newVal); - return E_NOTIMPL; + MediaDetImpl *detector = impl_from_IMediaDet(iface); + IGraphBuilder *graph; + IBaseFilter *filter; + HRESULT hr; + + TRACE("detector %p, unk %p.\n", detector, unk); + + if (!unk) + return E_POINTER; + + if (FAILED(hr = IUnknown_QueryInterface(unk, &IID_IBaseFilter, (void **)&filter))) + { + WARN("Object does not expose IBaseFilter.\n"); + return hr; + } + + if (detector->graph) + MD_cleanup(detector); + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterGraph, NULL, + CLSCTX_INPROC_SERVER, &IID_IGraphBuilder, (void **)&graph))) + { + IBaseFilter_Release(filter); + return hr; + } + + if (FAILED(hr = IGraphBuilder_AddFilter(graph, filter, L"Source"))) + { + IGraphBuilder_Release(graph); + IBaseFilter_Release(filter); + return hr; + } + + detector->graph = graph; + detector->source = filter; + if (FAILED(find_splitter(detector))) + { + detector->splitter = detector->source; + IBaseFilter_AddRef(detector->splitter); + } + + return IMediaDet_put_CurrentStream(&detector->IMediaDet_iface, 0); } static HRESULT WINAPI MediaDet_get_OutputStreams(IMediaDet* iface, LONG *pVal)

1 0

Gabriel Ivăncescu : qedit: Move GetSplitter up and rename it.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 2ba32469f28d0eac1fc58e29ea50a8e78e95a241 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba32469f28d0eac1fc58e29… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 23 14:45:41 2020 -0500 qedit: Move GetSplitter up and rename 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 | 229 ++++++++++++++++++++++++++------------------------ 1 file changed, 119 insertions(+), 110 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 059465d3d7..49d9bc36c0 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -99,6 +99,124 @@ static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) return hr; } +static HRESULT find_splitter(MediaDetImpl *detector) +{ + IPin *source_pin, *splitter_pin; + IFileSourceFilter *file_source; + IEnumMoniker *enum_moniker; + IFilterMapper2 *mapper; + IBaseFilter *splitter; + IEnumPins *enum_pins; + LPOLESTR filename; + AM_MEDIA_TYPE mt; + IMoniker *mon; + GUID type[2]; + VARIANT var; + HRESULT hr; + GUID clsid; + + if (FAILED(hr = IBaseFilter_QueryInterface(detector->source, + &IID_IFileSourceFilter, (void **)&file_source))) + { + ERR("Failed to get file source interface.\n"); + return hr; + } + + hr = IFileSourceFilter_GetCurFile(file_source, &filename, &mt); + IFileSourceFilter_Release(file_source); + CoTaskMemFree(filename); + if (FAILED(hr)) + { + ERR("Failed to get current file, hr %#x.\n", hr); + return hr; + } + type[0] = mt.majortype; + type[1] = mt.subtype; + FreeMediaType(&mt); + + if (FAILED(hr = IBaseFilter_EnumPins(detector->source, &enum_pins))) + { + ERR("Failed to enumerate source pins, hr %#x.\n", hr); + return hr; + } + hr = IEnumPins_Next(enum_pins, 1, &source_pin, NULL); + IEnumPins_Release(enum_pins); + if (FAILED(hr)) + { + ERR("Failed to get source pin, hr %#x.\n", hr); + return hr; + } + + if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, + CLSCTX_INPROC_SERVER, &IID_IFilterMapper2, (void **)&mapper))) + { + IPin_Release(source_pin); + return hr; + } + + hr = IFilterMapper2_EnumMatchingFilters(mapper, &enum_moniker, 0, TRUE, + MERIT_UNLIKELY, FALSE, 1, type, NULL, NULL, FALSE, TRUE, 0, NULL, NULL, NULL); + IFilterMapper2_Release(mapper); + if (FAILED(hr)) + { + IPin_Release(source_pin); + return hr; + } + + hr = E_NOINTERFACE; + while (IEnumMoniker_Next(enum_moniker, 1, &mon, NULL) == S_OK) + { + hr = get_filter_info(mon, &clsid, &var); + IMoniker_Release(mon); + if (FAILED(hr)) + continue; + + hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, + &IID_IBaseFilter, (void **)&splitter); + if (FAILED(hr)) + { + VariantClear(&var); + continue; + } + + hr = IGraphBuilder_AddFilter(detector->graph, splitter, V_BSTR(&var)); + VariantClear(&var); + if (FAILED(hr)) + { + IBaseFilter_Release(splitter); + continue; + } + + hr = IBaseFilter_EnumPins(splitter, &enum_pins); + if (FAILED(hr)) + { + IBaseFilter_Release(splitter); + continue; + } + hr = IEnumPins_Next(enum_pins, 1, &splitter_pin, NULL); + IEnumPins_Release(enum_pins); + if (FAILED(hr)) + { + IBaseFilter_Release(splitter); + continue; + } + + hr = IPin_Connect(source_pin, splitter_pin, NULL); + IPin_Release(splitter_pin); + if (SUCCEEDED(hr)) + { + detector->splitter = splitter; + break; + } + + IBaseFilter_Release(splitter); + } + + IEnumMoniker_Release(enum_moniker); + IPin_Release(source_pin); + return hr; +} + /* MediaDet inner IUnknown */ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { @@ -401,115 +519,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) return S_OK; } -static HRESULT GetSplitter(MediaDetImpl *This) -{ - IFileSourceFilter *file; - LPOLESTR name; - AM_MEDIA_TYPE mt; - GUID type[2]; - IFilterMapper2 *map; - IEnumMoniker *filters; - IMoniker *mon; - VARIANT var; - GUID clsid; - IBaseFilter *splitter; - IEnumPins *pins; - IPin *source_pin, *splitter_pin; - HRESULT hr; - - hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, - &IID_IFilterMapper2, (void **) &map); - if (FAILED(hr)) - return hr; - - hr = IBaseFilter_QueryInterface(This->source, &IID_IFileSourceFilter, - (void **) &file); - if (FAILED(hr)) - { - IFilterMapper2_Release(map); - return hr; - } - - hr = IFileSourceFilter_GetCurFile(file, &name, &mt); - IFileSourceFilter_Release(file); - CoTaskMemFree(name); - if (FAILED(hr)) - { - IFilterMapper2_Release(map); - return hr; - } - type[0] = mt.majortype; - type[1] = mt.subtype; - CoTaskMemFree(mt.pbFormat); - - hr = IFilterMapper2_EnumMatchingFilters(map, &filters, 0, TRUE, - MERIT_UNLIKELY, FALSE, 1, type, - NULL, NULL, FALSE, TRUE, - 0, NULL, NULL, NULL); - IFilterMapper2_Release(map); - if (FAILED(hr)) - return hr; - - hr = E_NOINTERFACE; - while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) - { - hr = get_filter_info(mon, &clsid, &var); - IMoniker_Release(mon); - if (FAILED(hr)) - continue; - - hr = CoCreateInstance(&clsid, NULL, CLSCTX_INPROC_SERVER, - &IID_IBaseFilter, (void **) &splitter); - if (FAILED(hr)) - { - VariantClear(&var); - continue; - } - - hr = IGraphBuilder_AddFilter(This->graph, splitter, V_BSTR(&var)); - VariantClear(&var); - This->splitter = splitter; - if (FAILED(hr)) - goto retry; - - hr = IBaseFilter_EnumPins(This->source, &pins); - if (FAILED(hr)) - goto retry; - IEnumPins_Next(pins, 1, &source_pin, NULL); - IEnumPins_Release(pins); - - hr = IBaseFilter_EnumPins(splitter, &pins); - if (FAILED(hr)) - { - IPin_Release(source_pin); - goto retry; - } - if (IEnumPins_Next(pins, 1, &splitter_pin, NULL) != S_OK) - { - IEnumPins_Release(pins); - IPin_Release(source_pin); - goto retry; - } - IEnumPins_Release(pins); - - hr = IPin_Connect(source_pin, splitter_pin, NULL); - IPin_Release(source_pin); - IPin_Release(splitter_pin); - if (SUCCEEDED(hr)) - break; - -retry: - IBaseFilter_Release(splitter); - This->splitter = NULL; - } - - IEnumMoniker_Release(filters); - if (FAILED(hr)) - return hr; - - return S_OK; -} - static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { MediaDetImpl *This = impl_from_IMediaDet(iface); @@ -538,7 +547,7 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) This->graph = gb; This->source = bf; - hr = GetSplitter(This); + hr = find_splitter(This); if (FAILED(hr)) return hr;

1 0

Gabriel Ivăncescu : qedit: Move GetFilterInfo up and rename it.
by Alexandre Julliard 24 Apr '20

24 Apr '20

Module: wine Branch: master Commit: 2bc334a0fdde992acc850f5ac21274612ced7935 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2bc334a0fdde992acc850f5a… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Thu Apr 23 14:45:40 2020 -0500 qedit: Move GetFilterInfo up and rename 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 | 65 ++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 35 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 0b64e18983..059465d3d7 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -70,6 +70,35 @@ static void MD_cleanup(MediaDetImpl *This) This->cur_stream = 0; } +static HRESULT get_filter_info(IMoniker *moniker, GUID *clsid, VARIANT *var) +{ + IPropertyBag *prop_bag; + HRESULT hr; + + if (FAILED(hr = IMoniker_BindToStorage(moniker, NULL, NULL, &IID_IPropertyBag, (void **)&prop_bag))) + { + ERR("Failed to get property bag, hr %#x.\n", hr); + return hr; + } + + VariantInit(var); + V_VT(var) = VT_BSTR; + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"CLSID", var, NULL))) + { + ERR("Failed to get CLSID, hr %#x.\n", hr); + IPropertyBag_Release(prop_bag); + return hr; + } + CLSIDFromString(V_BSTR(var), clsid); + VariantClear(var); + + if (FAILED(hr = IPropertyBag_Read(prop_bag, L"FriendlyName", var, NULL))) + ERR("Failed to get name, hr %#x.\n", hr); + + IPropertyBag_Release(prop_bag); + return hr; +} + /* MediaDet inner IUnknown */ static HRESULT WINAPI MediaDet_inner_QueryInterface(IUnknown *iface, REFIID riid, void **ppv) { @@ -372,40 +401,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) return S_OK; } -/* From quartz, 2008/04/07 */ -static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) -{ - IPropertyBag *pPropBagCat = NULL; - HRESULT hr; - - VariantInit(pvar); - V_VT(pvar) = VT_BSTR; - - hr = IMoniker_BindToStorage(pMoniker, NULL, NULL, &IID_IPropertyBag, - (LPVOID *) &pPropBagCat); - - if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, L"CLSID", pvar, NULL); - - if (SUCCEEDED(hr)) - { - hr = CLSIDFromString(V_BSTR(pvar), pclsid); - VariantClear(pvar); - V_VT(pvar) = VT_BSTR; - } - - if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", pvar, NULL); - - if (SUCCEEDED(hr)) - TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); - - if (pPropBagCat) - IPropertyBag_Release(pPropBagCat); - - return hr; -} - static HRESULT GetSplitter(MediaDetImpl *This) { IFileSourceFilter *file; @@ -458,7 +453,7 @@ static HRESULT GetSplitter(MediaDetImpl *This) hr = E_NOINTERFACE; while (IEnumMoniker_Next(filters, 1, &mon, NULL) == S_OK) { - hr = GetFilterInfo(mon, &clsid, &var); + hr = get_filter_info(mon, &clsid, &var); IMoniker_Release(mon); if (FAILED(hr)) continue;

1 0

Jacek Caban : debug.h: Use GNU style variadic macros on MSVC clang target.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: 28bc1bb463eb4075c6a113ba5c279a0506c6daea URL: https://source.winehq.org/git/wine.git/?a=commit;h=28bc1bb463eb4075c6a113ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 16:20:36 2020 +0200 debug.h: Use GNU style variadic macros on MSVC clang target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wine/debug.h b/include/wine/debug.h index 2a63f4351d..912d61a90a 100644 --- a/include/wine/debug.h +++ b/include/wine/debug.h @@ -77,7 +77,7 @@ struct __wine_debug_channel #define __WINE_IS_DEBUG_ON(dbcl,dbch) \ (__WINE_GET_DEBUGGING##dbcl(dbch) && (__wine_dbg_get_channel_flags(dbch) & (1 << __WINE_DBCL##dbcl))) -#ifdef __GNUC__ +#if defined(__GNUC__) || defined(__clang__) #define __WINE_DPRINTF(dbcl,dbch) \ do { if(__WINE_GET_DEBUGGING(dbcl,(dbch))) { \

1 0

Jacek Caban : winnt.h: Use the same C_ASSERT version on all compilers.
by Alexandre Julliard 23 Apr '20

23 Apr '20

Module: wine Branch: master Commit: b1aba79b8b31fe5b070d168014096aa6e8a00178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b1aba79b8b31fe5b070d1680… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Apr 23 15:48:53 2020 +0200 winnt.h: Use the same C_ASSERT version on all compilers. It works on MSCV as well. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index 057f178845..c90e9052de 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -388,11 +388,7 @@ extern "C" { /* Compile time assertion */ -#if defined(_MSC_VER) -# define C_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1] -#else -# define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) -#endif +#define C_ASSERT(e) extern void __C_ASSERT__(int [(e)?1:-1]) /* Eliminate Microsoft C/C++ compiler warning 4715 */ #if defined(_MSC_VER) && (_MSC_VER > 1200)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2020