April 2019 - Wine-commits - list.winehq.org

Nikolay Sivov : mfreadwrite: Handle MENewStream event.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 8be164c92127bb32af921f9e6696ba444a2ac25a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8be164c92127bb32af921f9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:09 2019 +0300 mfreadwrite: Handle MENewStream event. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/Makefile.in | 2 +- dlls/mfreadwrite/main.c | 142 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 3 deletions(-) diff --git a/dlls/mfreadwrite/Makefile.in b/dlls/mfreadwrite/Makefile.in index edc7ebd..ce8a4d4 100644 --- a/dlls/mfreadwrite/Makefile.in +++ b/dlls/mfreadwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = mfreadwrite.dll IMPORTLIB = mfreadwrite -IMPORTS = mfuuid uuid mfplat +IMPORTS = mfuuid uuid mfplat ole32 C_SRCS = \ main.c diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e41bdf6..e6ddce0 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -74,6 +74,7 @@ HRESULT WINAPI DllUnregisterServer(void) struct media_stream { + IMFMediaStream *stream; IMFMediaType *current; DWORD id; }; @@ -82,6 +83,7 @@ typedef struct source_reader { IMFSourceReader IMFSourceReader_iface; IMFAsyncCallback source_events_callback; + IMFAsyncCallback stream_events_callback; LONG refcount; IMFMediaSource *source; IMFPresentationDescriptor *descriptor; @@ -110,6 +112,11 @@ static struct source_reader *impl_from_source_callback_IMFAsyncCallback(IMFAsync return CONTAINING_RECORD(iface, struct source_reader, source_events_callback); } +static struct source_reader *impl_from_stream_callback_IMFAsyncCallback(IMFAsyncCallback *iface) +{ + return CONTAINING_RECORD(iface, struct source_reader, stream_events_callback); +} + static inline struct sink_writer *impl_from_IMFSinkWriter(IMFSinkWriter *iface) { return CONTAINING_RECORD(iface, struct sink_writer, IMFSinkWriter_iface); @@ -151,6 +158,77 @@ static HRESULT WINAPI source_reader_source_events_callback_GetParameters(IMFAsyn return E_NOTIMPL; } +static HRESULT source_reader_new_stream_handler(struct source_reader *reader, IMFMediaEvent *event) +{ + IMFStreamDescriptor *sd; + IMFMediaStream *stream; + PROPVARIANT value; + unsigned int i; + DWORD id = 0; + HRESULT hr; + + PropVariantInit(&value); + if (FAILED(hr = IMFMediaEvent_GetValue(event, &value))) + { + WARN("Failed to get event value, hr %#x.\n", hr); + return hr; + } + + if (value.vt != VT_UNKNOWN || !value.u.punkVal) + { + WARN("Unexpected value type %d.\n", value.vt); + PropVariantClear(&value); + return E_UNEXPECTED; + } + + hr = IUnknown_QueryInterface(value.u.punkVal, &IID_IMFMediaStream, (void **)&stream); + PropVariantClear(&value); + if (FAILED(hr)) + { + WARN("Unexpected object type.\n"); + return hr; + } + + TRACE("Got new stream %p.\n", stream); + + if (SUCCEEDED(hr = IMFMediaStream_GetStreamDescriptor(stream, &sd))) + { + hr = IMFStreamDescriptor_GetStreamIdentifier(sd, &id); + IMFStreamDescriptor_Release(sd); + } + + if (FAILED(hr)) + { + WARN("Unidentified stream %p, hr %#x.\n", stream, hr); + IMFMediaStream_Release(stream); + return hr; + } + + for (i = 0; i < reader->stream_count; ++i) + { + if (id == reader->streams[i].id) + { + if (!InterlockedCompareExchangePointer((void **)&reader->streams[i].stream, stream, NULL)) + { + IMFMediaStream_AddRef(reader->streams[i].stream); + if (FAILED(hr = IMFMediaStream_BeginGetEvent(stream, &reader->stream_events_callback, + (IUnknown *)stream))) + { + WARN("Failed to subscribe to stream events, hr %#x.\n", hr); + } + } + break; + } + } + + if (i == reader->stream_count) + WARN("Stream with id %#x was not present in presentation descriptor.\n", id); + + IMFMediaStream_Release(stream); + + return hr; +} + static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) { struct source_reader *reader = impl_from_source_callback_IMFAsyncCallback(iface); @@ -170,10 +248,21 @@ static HRESULT WINAPI source_reader_source_events_callback_Invoke(IMFAsyncCallba TRACE("Got event %u.\n", event_type); + switch (event_type) + { + case MENewStream: + hr = source_reader_new_stream_handler(reader, event); + break; + default: + ; + } + + if (FAILED(hr)) + WARN("Failed while handling %d event, hr %#x.\n", event_type, hr); + IMFMediaEvent_Release(event); - IMFMediaSource_BeginGetEvent(source, &reader->source_events_callback, - (IUnknown *)source); + IMFMediaSource_BeginGetEvent(source, iface, (IUnknown *)source); return S_OK; } @@ -187,6 +276,52 @@ static const IMFAsyncCallbackVtbl source_events_callback_vtbl = source_reader_source_events_callback_Invoke, }; +static ULONG WINAPI source_reader_stream_events_callback_AddRef(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); + return IMFSourceReader_AddRef(&reader->IMFSourceReader_iface); +} + +static ULONG WINAPI source_reader_stream_events_callback_Release(IMFAsyncCallback *iface) +{ + struct source_reader *reader = impl_from_stream_callback_IMFAsyncCallback(iface); + return IMFSourceReader_Release(&reader->IMFSourceReader_iface); +} + +static HRESULT WINAPI source_reader_stream_events_callback_Invoke(IMFAsyncCallback *iface, IMFAsyncResult *result) +{ + MediaEventType event_type; + IMFMediaStream *stream; + IMFMediaEvent *event; + HRESULT hr; + + TRACE("%p, %p.\n", iface, result); + + stream = (IMFMediaStream *)IMFAsyncResult_GetStateNoAddRef(result); + + if (FAILED(hr = IMFMediaStream_EndGetEvent(stream, result, &event))) + return hr; + + IMFMediaEvent_GetType(event, &event_type); + + TRACE("Got event %u.\n", event_type); + + IMFMediaEvent_Release(event); + + IMFMediaStream_BeginGetEvent(stream, iface, (IUnknown *)stream); + + return S_OK; +} + +static const IMFAsyncCallbackVtbl stream_events_callback_vtbl = +{ + source_reader_source_events_callback_QueryInterface, + source_reader_stream_events_callback_AddRef, + source_reader_stream_events_callback_Release, + source_reader_source_events_callback_GetParameters, + source_reader_stream_events_callback_Invoke, +}; + static HRESULT WINAPI src_reader_QueryInterface(IMFSourceReader *iface, REFIID riid, void **out) { srcreader *This = impl_from_IMFSourceReader(iface); @@ -239,6 +374,8 @@ static ULONG WINAPI src_reader_Release(IMFSourceReader *iface) for (i = 0; i < reader->stream_count; ++i) { + if (reader->streams[i].stream) + IMFMediaStream_Release(reader->streams[i].stream); if (reader->streams[i].current) IMFMediaType_Release(reader->streams[i].current); } @@ -614,6 +751,7 @@ static HRESULT create_source_reader_from_source(IMFMediaSource *source, IMFAttri object->IMFSourceReader_iface.lpVtbl = &srcreader_vtbl; object->source_events_callback.lpVtbl = &source_events_callback_vtbl; + object->stream_events_callback.lpVtbl = &stream_events_callback_vtbl; object->refcount = 1; object->source = source; IMFMediaSource_AddRef(object->source);

1 0

Nikolay Sivov : mfreadwrite/tests: Add some tests for source reader.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 1d2567e03ac67bb476d33074cb95e696132043c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d2567e03ac67bb476d33074… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:10 2019 +0300 mfreadwrite/tests: Add some tests for source reader. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/tests/Makefile.in | 2 + dlls/mfreadwrite/tests/mfplat.c | 273 ++++++++++++++++++++++++++++++++++++- dlls/mfreadwrite/tests/resource.rc | 22 +++ dlls/mfreadwrite/tests/test.wav | Bin 0 -> 4488 bytes 4 files changed, 293 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1d2567e03ac67bb476d3…

1 0

Nikolay Sivov : mfreadwrite: Set url hint for WAVE audio streams.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 23b9b1ceb637f7b8011322403a9312bbdd59e7d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23b9b1ceb637f7b801132240… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 9 13:45:11 2019 +0300 mfreadwrite: Set url hint for WAVE audio streams. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfreadwrite/main.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/mfreadwrite/main.c b/dlls/mfreadwrite/main.c index e6ddce0..fd9062f 100644 --- a/dlls/mfreadwrite/main.c +++ b/dlls/mfreadwrite/main.c @@ -839,23 +839,28 @@ failed: static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) { static const UINT8 asfmagic[] = {0x30,0x26,0xb2,0x75,0x8e,0x66,0xcf,0x11,0xa6,0xd9,0x00,0xaa,0x00,0x62,0xce,0x6c}; + static const UINT8 wavmagic[] = { 'R', 'I', 'F', 'F',0x00,0x00,0x00,0x00, 'W', 'A', 'V', 'E', 'f', 'm', 't', ' '}; + static const UINT8 wavmask[] = {0xff,0xff,0xff,0xff,0x00,0x00,0x00,0x00,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff}; static const WCHAR asfW[] = {'.','a','s','f',0}; + static const WCHAR wavW[] = {'.','w','a','v',0}; static const struct stream_content_url_hint { const UINT8 *magic; UINT32 magic_len; const WCHAR *url; + const UINT8 *mask; } url_hints[] = { { asfmagic, sizeof(asfmagic), asfW }, + { wavmagic, sizeof(wavmagic), wavW, wavmask }, }; + UINT8 buffer[4 * sizeof(unsigned int)]; IMFAttributes *attributes; UINT32 length = 0; - UINT8 buffer[16]; + unsigned int i, j; DWORD caps = 0; QWORD position; - unsigned int i; HRESULT hr; *url = NULL; @@ -888,6 +893,15 @@ static HRESULT bytestream_get_url_hint(IMFByteStream *stream, WCHAR const **url) for (i = 0; i < ARRAY_SIZE(url_hints); ++i) { + if (url_hints[i].mask) + { + unsigned int *mask = (unsigned int *)url_hints[i].mask; + unsigned int *data = (unsigned int *)buffer; + + for (j = 0; j < sizeof(buffer) / sizeof(unsigned int); ++j) + data[j] &= mask[j]; + + } if (!memcmp(buffer, url_hints[i].magic, min(url_hints[i].magic_len, length))) { *url = url_hints[i].url;

1 0

Piotr Caban : d3dx9: Don't use strcasecmp.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 5c5a8ae23ff7fe9c103de4e3dfce06bf1b8778c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c5a8ae23ff7fe9c103de4e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:47 2019 +0200 d3dx9: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 269f75e..a4bce69 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -25,6 +25,7 @@ #include "d3dx9_private.h" #include "d3dcompiler.h" +#include "winternl.h" /* Constants for special INT/FLOAT conversation */ #define INT_FLOAT_MULTI 255.0f @@ -2024,7 +2025,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!strcasecmp(temp_param->semantic, semantic)) + if (!_strnicmp(temp_param->semantic, semantic, -1)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param); @@ -2047,7 +2048,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, continue; } - if (!strcasecmp(temp_param->semantic, semantic)) + if (!_strnicmp(temp_param->semantic, semantic, -1)) { TRACE("Returning parameter %p\n", temp_param); return get_parameter_handle(temp_param);

1 0

Piotr Caban : d3dcompiler: Don't use strcasecmp.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 1b56d13da3f180a2e383deb02e646cec88163ab2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1b56d13da3f180a2e383deb0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Apr 9 18:48:21 2019 +0200 d3dcompiler: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/reflection.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3dcompiler_43/reflection.c b/dlls/d3dcompiler_43/reflection.c index d10d0b1..24190f6 100644 --- a/dlls/d3dcompiler_43/reflection.c +++ b/dlls/d3dcompiler_43/reflection.c @@ -23,6 +23,7 @@ #include "initguid.h" #include "d3dcompiler_private.h" +#include "winternl.h" WINE_DEFAULT_DEBUG_CHANNEL(d3dcompiler); @@ -1627,10 +1628,14 @@ static HRESULT d3dcompiler_parse_signature(struct d3dcompiler_shader_signature * if (d[i].Register == 0xffffffff) { - if (!strcasecmp(d[i].SemanticName, "sv_depth")) d[i].SystemValueType = D3D_NAME_DEPTH; - if (!strcasecmp(d[i].SemanticName, "sv_coverage")) d[i].SystemValueType = D3D_NAME_COVERAGE; - if (!strcasecmp(d[i].SemanticName, "sv_depthgreaterequal")) d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; - if (!strcasecmp(d[i].SemanticName, "sv_depthlessequal")) d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; + if (!_strnicmp(d[i].SemanticName, "sv_depth", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH; + else if (!_strnicmp(d[i].SemanticName, "sv_coverage", -1)) + d[i].SystemValueType = D3D_NAME_COVERAGE; + else if (!_strnicmp(d[i].SemanticName, "sv_depthgreaterequal", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH_GREATER_EQUAL; + else if (!_strnicmp(d[i].SemanticName, "sv_depthlessequal", -1)) + d[i].SystemValueType = D3D_NAME_DEPTH_LESS_EQUAL; } else {

1 0

Paul Gofman : wined3d: Use ARB_shader_bit_encoding for storing local constants when available.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 5ed7a61de7e72ecf4cf6ef76d4044f32640b93cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ed7a61de7e72ecf4cf6ef76… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Apr 8 20:41:50 2019 +0300 wined3d: Use ARB_shader_bit_encoding for storing local constants when available. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c41158..ce4c0d8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -420,7 +420,8 @@ static void shader_glsl_add_version_declaration(struct wined3d_string_buffer *bu shader_addline(buffer, "#version %u\n", shader_glsl_get_version(gl_info)); } -static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) +static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values, + const struct wined3d_gl_info *gl_info) { char str[4][17]; @@ -428,7 +429,17 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co wined3d_ftoa(values[1], str[1]); wined3d_ftoa(values[2], str[2]); wined3d_ftoa(values[3], str[3]); - shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); + + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + { + const unsigned int *uint_values = (const unsigned int *)values; + + shader_addline(buffer, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))\n" + " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], + uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); + } + else + shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); } static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, @@ -2785,7 +2796,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont LIST_FOR_EACH_ENTRY(lconst, &shader->constantsF, struct wined3d_shader_lconst, entry) { shader_addline(buffer, "const vec4 %s_lc%u = ", prefix, lconst->idx); - shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value); + shader_glsl_append_imm_vec4(buffer, (const float *)lconst->value, gl_info); shader_addline(buffer, ";\n"); } } @@ -7957,10 +7968,10 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context if (args->srgb_correction) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); shader_addline(buffer, ";\n"); } if (reg_maps->vpos || reg_maps->usesdsy) @@ -9814,10 +9825,10 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * if (settings->sRGB_write) { shader_addline(buffer, "const vec4 srgb_const0 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const0, gl_info); shader_addline(buffer, ";\n"); shader_addline(buffer, "const vec4 srgb_const1 = "); - shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1); + shader_glsl_append_imm_vec4(buffer, wined3d_srgb_const1, gl_info); shader_addline(buffer, ";\n"); }

1 0

Piotr Caban : gdi32: Don't use strcasecmp.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 541c8d271e8f493a648b637d0d4aae16c27d05fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=541c8d271e8f493a648b637d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 8 14:30:23 2019 +0200 gdi32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 3e4a876..352a866 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -2875,7 +2875,7 @@ static void load_fontconfig_fonts(void) len = strlen( file ); if(len < 4) continue; ext = &file[ len - 3 ]; - if(strcasecmp(ext, "pfa") && strcasecmp(ext, "pfb")) + if(_strnicmp(ext, "pfa", -1) && _strnicmp(ext, "pfb", -1)) AddFontToList(file, NULL, 0, ADDFONT_EXTERNAL_FONT | ADDFONT_ADD_TO_CACHE | ADDFONT_AA_FLAGS(aa_flags) ); }

1 0

Zebediah Figura : devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: e0da0b777a293059c32a7c846dff16ef0738b2de URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0da0b777a293059c32a7c84… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Apr 5 19:41:13 2019 -0500 devenum: Return S_FALSE from CreateClassEnumerator() if no devices exist. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46316 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 18 +++++++++++++++++- dlls/devenum/tests/devenum.c | 6 ++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8a3160c..65c1ccd 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -862,7 +862,23 @@ static HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( else if (IsEqualGUID(class, &CLSID_VideoInputDeviceCategory)) register_avicap_devices(); - return create_EnumMoniker(class, out); + if (SUCCEEDED(hr = create_EnumMoniker(class, out))) + { + IMoniker *mon; + hr = IEnumMoniker_Next(*out, 1, &mon, NULL); + if (hr == S_OK) + { + IMoniker_Release(mon); + IEnumMoniker_Reset(*out); + } + else + { + IEnumMoniker_Release(*out); + *out = NULL; + } + } + + return hr; } /********************************************************************** diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 9fcfdcf..945bc67 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -69,6 +69,7 @@ static void test_devenum(IBindCtx *bind_ctx) WCHAR *displayname; VARIANT var; HRESULT hr; + int count; hr = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, &IID_ICreateDevEnum, (LPVOID*)&create_devenum); @@ -105,6 +106,8 @@ static void test_devenum(IBindCtx *bind_ctx) if (hr == S_OK) { + count = 0; + while (IEnumMoniker_Next(enum_moniker, 1, &moniker, NULL) == S_OK) { hr = IMoniker_GetDisplayName(moniker, NULL, NULL, &displayname); @@ -136,8 +139,11 @@ static void test_devenum(IBindCtx *bind_ctx) CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); + count++; } IEnumMoniker_Release(enum_moniker); + + ok(count > 0, "CreateClassEnumerator() returned S_OK but no devices were enumerated.\n"); } }

1 0

Zebediah Figura : qcap/tests: Add some tests for AVI compressor pin interfaces.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 71239f31ad2a640b79aa594fc42a4cdbb6b9fd2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=71239f31ad2a640b79aa594f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:33 2019 -0500 qcap/tests: Add some tests for AVI compressor pin interfaces. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 5c60846..2d2d4c7 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -54,6 +54,8 @@ static ULONG get_refcount(void *iface) static void test_interfaces(IBaseFilter *filter) { + IPin *pin; + check_interface(filter, &IID_IBaseFilter, TRUE); check_interface(filter, &IID_IMediaFilter, TRUE); check_interface(filter, &IID_IPersist, TRUE); @@ -71,6 +73,29 @@ static void test_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IQualProp, FALSE); check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); + + IBaseFilter_FindPin(filter, sink_id, &pin); + + check_interface(pin, &IID_IMemInputPin, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IMediaPosition, FALSE); + check_interface(pin, &IID_IMediaSeeking, FALSE); + + IPin_Release(pin); + IBaseFilter_FindPin(filter, source_id, &pin); + + todo_wine check_interface(pin, &IID_IMediaPosition, TRUE); + todo_wine check_interface(pin, &IID_IMediaSeeking, TRUE); + check_interface(pin, &IID_IPin, TRUE); + todo_wine check_interface(pin, &IID_IQualityControl, TRUE); + check_interface(pin, &IID_IUnknown, TRUE); + + check_interface(pin, &IID_IAsyncReader, FALSE); + + IPin_Release(pin); } static void test_enum_pins(IBaseFilter *filter)

1 0

Zebediah Figura : qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor.
by Alexandre Julliard 09 Apr '19

09 Apr '19

Module: wine Branch: master Commit: 5f32efcf19a1b3650ee8b3bff0b4b772771ea0cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f32efcf19a1b3650ee8b3bf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Apr 8 18:02:34 2019 -0500 qcap/tests: Add some tests for IPersistPropertyBag on the AVI compressor. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/tests/avico.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/tests/avico.c b/dlls/qcap/tests/avico.c index 2d2d4c7..0ee2e1b 100644 --- a/dlls/qcap/tests/avico.c +++ b/dlls/qcap/tests/avico.c @@ -330,6 +330,89 @@ static LRESULT CALLBACK driver_proc(DWORD_PTR id, HDRVR driver, UINT msg, return 0; } +static HRESULT WINAPI property_bag_QueryInterface(IPropertyBag *iface, REFIID iid, void **out) +{ + ok(0, "Unexpected call (iid %s).\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI property_bag_AddRef(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 2; +} + +static ULONG WINAPI property_bag_Release(IPropertyBag *iface) +{ + ok(0, "Unexpected call.\n"); + return 1; +} + +static const WCHAR fcchandlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static BSTR ppb_handler; +static unsigned int ppb_got_read; + +static HRESULT WINAPI property_bag_Read(IPropertyBag *iface, const WCHAR *name, VARIANT *var, IErrorLog *log) +{ + ok(!lstrcmpW(name, fcchandlerW), "Got unexpected name %s.\n", wine_dbgstr_w(name)); + todo_wine ok(V_VT(var) == VT_BSTR, "Got unexpected type %u.\n", V_VT(var)); + ok(!log, "Got unexpected error log %p.\n", log); + V_BSTR(var) = SysAllocString(ppb_handler); + ppb_got_read++; + return S_OK; +} + +static HRESULT WINAPI property_bag_Write(IPropertyBag *iface, const WCHAR *name, VARIANT *var) +{ + ok(0, "Unexpected call (name %s).\n", wine_dbgstr_w(name)); + return E_FAIL; +} + +static const IPropertyBagVtbl property_bag_vtbl = +{ + property_bag_QueryInterface, + property_bag_AddRef, + property_bag_Release, + property_bag_Read, + property_bag_Write, +}; + +static void test_property_bag(IMoniker *mon) +{ + IPropertyBag property_bag = {&property_bag_vtbl}; + IPropertyBag *devenum_bag; + IPersistPropertyBag *ppb; + VARIANT var; + HRESULT hr; + ULONG ref; + + hr = IMoniker_BindToStorage(mon, NULL, NULL, &IID_IPropertyBag, (void **)&devenum_bag); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + VariantInit(&var); + hr = IPropertyBag_Read(devenum_bag, fcchandlerW, &var, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ppb_handler = V_BSTR(&var); + + hr = CoCreateInstance(&CLSID_AVICo, NULL, CLSCTX_INPROC_SERVER, + &IID_IPersistPropertyBag, (void **)&ppb); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPersistPropertyBag_InitNew(ppb); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ppb_got_read = 0; + hr = IPersistPropertyBag_Load(ppb, &property_bag, NULL); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(ppb_got_read == 1, "Got %u calls to Read().\n", ppb_got_read); + + ref = IPersistPropertyBag_Release(ppb); + ok(!ref, "Got unexpected refcount %d.\n", ref); + + VariantClear(&var); + IPropertyBag_Release(devenum_bag); +} + START_TEST(avico) { static const WCHAR test_display_name[] = {'@','d','e','v','i','c','e',':', @@ -373,8 +456,11 @@ START_TEST(avico) ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); } - CoTaskMemFree(name); + if (!memcmp(name, test_display_name, 11 * sizeof(WCHAR))) + test_property_bag(mon); + + CoTaskMemFree(name); IMoniker_Release(mon); }

1 0