May 2020 - Wine-commits - list.winehq.org

Nikolay Sivov : comctl32/syslink: Use wide string literals.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 1141a7df28acc5b5a86af110ef68932eeb823a58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1141a7df28acc5b5a86af110… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:03 2020 +0300 comctl32/syslink: Use wide string literals. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/syslink.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/syslink.c b/dlls/comctl32/syslink.c index 78d0fd0986..802a8803e8 100644 --- a/dlls/comctl32/syslink.c +++ b/dlls/comctl32/syslink.c @@ -165,10 +165,6 @@ static VOID SYSLINK_ClearDoc (SYSLINK_INFO *infoPtr) */ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { - static const WCHAR SL_LINKOPEN[] = { '<','a' }; - static const WCHAR SL_HREF[] = { 'h','r','e','f','=','\"' }; - static const WCHAR SL_ID[] = { 'i','d','=','\"' }; - static const WCHAR SL_LINKCLOSE[] = { '<','/','a','>' }; LPCWSTR current, textstart = NULL, linktext = NULL, firsttag = NULL; int taglen = 0, textlen = 0, linklen = 0, docitems = 0; PDOC_ITEM Last = NULL; @@ -182,7 +178,7 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) { if(*current == '<') { - if(!wcsnicmp(current, SL_LINKOPEN, ARRAY_SIZE(SL_LINKOPEN)) && (CurrentType == slText)) + if(!wcsnicmp(current, L"<a", 2) && (CurrentType == slText)) { BOOL ValidParam = FALSE, ValidLink = FALSE; @@ -210,14 +206,14 @@ static UINT SYSLINK_ParseText (SYSLINK_INFO *infoPtr, LPCWSTR Text) CheckParameter: /* compare the current position with all known parameters */ - if(!wcsnicmp(tmp, SL_HREF, ARRAY_SIZE(SL_HREF))) + if(!wcsnicmp(tmp, L"href=\"", 6)) { taglen += 6; ValidParam = TRUE; CurrentParameter = &lpUrl; CurrentParameterLen = &lenUrl; } - else if(!wcsnicmp(tmp, SL_ID, ARRAY_SIZE(SL_ID))) + else if(!wcsnicmp(tmp, L"id=\"", 4)) { taglen += 4; ValidParam = TRUE; @@ -291,7 +287,7 @@ CheckParameter: } } } - else if(!wcsnicmp(current, SL_LINKCLOSE, ARRAY_SIZE(SL_LINKCLOSE)) && (CurrentType == slLink) && firsttag) + else if (!wcsnicmp(current, L"</a>", 4) && (CurrentType == slLink) && firsttag) { /* there's a <a...> tag opened, first add the previous text, if present */ if(textstart != NULL && textlen > 0 && firsttag > textstart)

1 0

Nikolay Sivov : comctl32/datetime: Use designated initializers for constants.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 0c4f7c2554fffd3d09de8146d5482fd957df61cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c4f7c2554fffd3d09de8146… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri May 1 18:42:04 2020 +0300 comctl32/datetime: Use designated initializers for constants. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/datetime.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 2ce3da591f..7b7ac8a86a 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -130,8 +130,8 @@ static const WCHAR allowedformatchars[] = {'d', 'h', 'H', 'm', 'M', 's', 't', 'y static const int maxrepetition [] = {4,2,2,2,4,2,2,4,-1}; /* valid date limits */ -static const SYSTEMTIME max_allowed_date = { /* wYear */ 9999, /* wMonth */ 12, /* wDayOfWeek */ 0, /* wDay */ 31 }; -static const SYSTEMTIME min_allowed_date = { /* wYear */ 1752, /* wMonth */ 9, /* wDayOfWeek */ 0, /* wDay */ 14 }; +static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDayOfWeek = 0, .wDay = 31 }; +static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDayOfWeek = 0, .wDay = 14 }; static DWORD DATETIME_GetSystemTime (const DATETIME_INFO *infoPtr, SYSTEMTIME *systime)

1 0

Gijs Vermeulen : wineqtdecoder: Do not use wide string literals to fix warning.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 49f85ecbc4e6faafc1d63db0927aa4ef6d0f1a12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49f85ecbc4e6faafc1d63db0… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:22 2020 +0200 wineqtdecoder: Do not use wide string literals to fix warning. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtvdecoder.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtvdecoder.c b/dlls/wineqtdecoder/qtvdecoder.c index 031b08e1de..a86cd432c2 100644 --- a/dlls/wineqtdecoder/qtvdecoder.c +++ b/dlls/wineqtdecoder/qtvdecoder.c @@ -602,6 +602,8 @@ static const struct strmbase_filter_ops filter_ops = HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) { + static const WCHAR inW[] = { 'I','n',0 }; + static const WCHAR outW[] = { 'O','u','t',0 }; QTVDecoderImpl *object; HRESULT hr; ISeekingPassThru *passthrough; @@ -614,9 +616,9 @@ HRESULT video_decoder_create(IUnknown *outer, IUnknown **out) InitializeCriticalSection(&object->stream_cs); object->stream_cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": QTVDecoderImpl.stream_cs"); - strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); + strmbase_sink_init(&object->sink, &object->filter, inW, &sink_ops, NULL); - strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops); + strmbase_source_init(&object->source, &object->filter, outW, &source_ops); if (FAILED(hr = CoCreateInstance(&CLSID_SeekingPassThru, (IUnknown *)&object->source.pin.IPin_iface, CLSCTX_INPROC_SERVER,

1 0

Zebediah Figura : qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: fc45c96383698aeec790848716a4f746eb4144cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc45c96383698aeec7908487… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 1 12:45:04 2020 -0500 qcap/filewriter: Propagate file I/O failure in file_writer_sink_receive(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/filewriter.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 5e63facf7b..af148d4aa1 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -85,7 +85,11 @@ static HRESULT WINAPI file_writer_sink_receive(struct strmbase_sink *iface, IMed offset.QuadPart = start; if (!SetFilePointerEx(filter->file, offset, NULL, FILE_BEGIN) || !WriteFile(filter->file, data, stop - start, &size, NULL)) + { ERR("Failed to write file, error %u.\n", GetLastError()); + return HRESULT_FROM_WIN32(hr); + } + if (size != stop - start) ERR("Short write, %u/%u.\n", size, (DWORD)(stop - start));

1 0

Gijs Vermeulen : ntdll: Remove unused function fast_wait_cv().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: d8ec1fb894bd8838ad93f244fadb2ee67a61b2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d8ec1fb894bd8838ad93f244… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:24 2020 +0200 ntdll: Remove unused function fast_wait_cv(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/sync.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c index fbfb8f893e..2aed1c78e7 100644 --- a/dlls/ntdll/sync.c +++ b/dlls/ntdll/sync.c @@ -2306,11 +2306,6 @@ static NTSTATUS fast_sleep_cs_cv( RTL_CONDITION_VARIABLE *variable, return STATUS_NOT_IMPLEMENTED; } -static NTSTATUS fast_wait_cv( RTL_CONDITION_VARIABLE *variable, int val, const LARGE_INTEGER *timeout ) -{ - return STATUS_NOT_IMPLEMENTED; -} - static NTSTATUS fast_wake_cv( RTL_CONDITION_VARIABLE *variable, int count ) { return STATUS_NOT_IMPLEMENTED;

1 0

Gijs Vermeulen : kernel32: Remove unused functions is_executable() and get_table_entry().
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: e7abfe953394fdb36ce95e588b6ce1988d833736 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7abfe953394fdb36ce95e58… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri May 1 19:36:25 2020 +0200 kernel32: Remove unused functions is_executable() and get_table_entry(). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 5 ----- dlls/kernel32/path.c | 11 ----------- 2 files changed, 16 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index ac04e85946..52c24b275d 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -62,11 +62,6 @@ extern BOOL WINAPI Internal_EnumTimeFormats( TIMEFMT_ENUMPROCW proc, LCID lcid, extern BOOL WINAPI Internal_EnumUILanguages( UILANGUAGE_ENUMPROCW proc, DWORD flags, LONG_PTR param, BOOL unicode ); -static inline unsigned short get_table_entry( const unsigned short *table, WCHAR ch ) -{ - return table[table[table[ch >> 8] + ((ch >> 4) & 0x0f)] + (ch & 0xf)]; -} - /*********************************************************************** * get_lcid_codepage * diff --git a/dlls/kernel32/path.c b/dlls/kernel32/path.c index 93759592c4..54dbf5a4f6 100644 --- a/dlls/kernel32/path.c +++ b/dlls/kernel32/path.c @@ -43,17 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(file); #define MAX_PATHNAME_LEN 1024 -/* check if a file name is for an executable file (.exe or .com) */ -static inline BOOL is_executable( const WCHAR *name ) -{ - static const WCHAR exeW[] = {'.','e','x','e',0}; - static const WCHAR comW[] = {'.','c','o','m',0}; - int len = strlenW(name); - - if (len < 4) return FALSE; - return (!strcmpiW( name + len - 4, exeW ) || !strcmpiW( name + len - 4, comW )); -} - /*********************************************************************** * copy_filename_WtoA *

1 0

Alistair Leslie-Hughes : dmime: Parse lyric track data.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: d1f858e03da732c621504f90e349d5170ca3336e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d1f858e03da732c621504f90… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Apr 30 16:41:16 2020 +1000 dmime: Parse lyric track data. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/lyricstrack.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 49f44f52a3..b45041ca81 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -37,6 +37,11 @@ static inline IDirectMusicLyricsTrack *impl_from_IDirectMusicTrack8(IDirectMusic return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, IDirectMusicTrack8_iface); } +static inline IDirectMusicLyricsTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicLyricsTrack, dmobj.IPersistStream_iface); +} + static HRESULT WINAPI lyrics_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, void **ret_iface) { @@ -236,10 +241,94 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { lyrics_track_Join }; +static HRESULT parse_lyrics_track_events(IDirectMusicLyricsTrack *This, IStream *stream, + struct chunk_entry *lyric) +{ + struct chunk_entry chunk = {.parent = lyric}; + HRESULT hr; + DMUS_IO_LYRICSTRACK_EVENTHEADER header; + WCHAR name[256]; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) { + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENT_LIST) { + struct chunk_entry child = {.parent = &chunk}; + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTHEADER_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &header, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_IO_LYRICSTRACK_EVENTHEADER\n"); + TRACE(" - dwFlags 0x%08x\n", header.dwFlags); + TRACE(" - dwTimingFlags 0x%08x\n", header.dwTimingFlags); + TRACE(" - lTimeLogical %d\n", header.lTimeLogical); + TRACE(" - lTimePhysical %d\n", header.lTimePhysical); + + if (FAILED(hr = stream_next_chunk(stream, &child))) + return hr; + + if (child.id != DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK) + return DMUS_E_UNSUPPORTED_STREAM; + + if (FAILED(hr = stream_chunk_get_data(stream, &child, &name, child.size))) { + WARN("Failed to read data of %s\n", debugstr_chunk(&child)); + return hr; + } + + TRACE("Found DMUS_FOURCC_LYRICSTRACKEVENTTEXT_CHUNK\n"); + TRACE(" - name %s\n", debugstr_w(name)); + } + } + + return SUCCEEDED(hr) ? S_OK : hr; +} + +static HRESULT parse_lyricstrack_list(IDirectMusicLyricsTrack *This, IStream *stream, struct chunk_entry *lyric) +{ + HRESULT hr; + struct chunk_entry chunk = {.parent = lyric}; + + TRACE("Parsing segment form in %p: %s\n", stream, debugstr_chunk(lyric)); + + if (FAILED(hr = stream_next_chunk(stream, &chunk))) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACKEVENTS_LIST) + hr = parse_lyrics_track_events(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return SUCCEEDED(hr) ? S_OK : hr; +} + static HRESULT WINAPI lyrics_IPersistStream_Load(IPersistStream *iface, IStream *stream) { - FIXME(": Loading not implemented yet\n"); - return S_OK; + IDirectMusicLyricsTrack *This = impl_from_IPersistStream(iface); + HRESULT hr; + struct chunk_entry chunk = {0}; + + TRACE("%p, %p\n", This, stream); + + if (!stream) + return E_POINTER; + + if ((hr = stream_get_chunk(stream, &chunk) != S_OK)) + return hr; + + if (chunk.id == FOURCC_LIST && chunk.type == DMUS_FOURCC_LYRICSTRACK_LIST) + hr = parse_lyricstrack_list(This, stream, &chunk); + else + hr = DMUS_E_UNSUPPORTED_STREAM; + + return hr; } static const IPersistStreamVtbl persiststream_vtbl = {

1 0

Zebediah Figura : quartz/tests: Fix a copy-paste error.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 40a115eb1440cedf24a860cf1865f572a0f69ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=40a115eb1440cedf24a860cf… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:43 2020 -0500 quartz/tests: Fix a copy-paste error. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 367d7df568..d8c2ee8b4a 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -378,12 +378,12 @@ static void test_aggregation(void) ULONG ref; filter = (IBaseFilter *)0xdeadbeef; - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (void **)&filter); ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); ok(!filter, "Got interface %p.\n", filter); - hr = CoCreateInstance(&CLSID_VideoMixingRenderer, &test_outer, CLSCTX_INPROC_SERVER, + hr = CoCreateInstance(&CLSID_VideoMixingRenderer9, &test_outer, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(outer_ref == 1, "Got unexpected refcount %d.\n", outer_ref);

1 0

Zebediah Figura : quartz/tests: Add more tests for mixing mode.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 122998ab156595d7abde9bd2a272a5350b209ae1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=122998ab156595d7abde9bd2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:44 2020 -0500 quartz/tests: Add more tests for mixing mode. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index d8c2ee8b4a..9485d055f0 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -2896,6 +2896,93 @@ out: DestroyWindow(window); } +static void test_mixing_mode(void) +{ + IVMRWindowlessControl9 *windowless_control; + IVMRMixerControl9 *mixer_control; + IVMRFilterConfig9 *config; + DWORD stream_count = 0; + IBaseFilter *filter; + unsigned int i; + HWND window; + HRESULT hr; + ULONG ref; + + static const VMR9Mode modes[] = + { + 0, + VMR9Mode_Windowed, + VMR9Mode_Windowless, + VMR9Mode_Renderless, + }; + + for (i = 0; i < ARRAY_SIZE(modes); ++i) + { + filter = create_vmr9(modes[i]); + IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + ok(hr == E_NOINTERFACE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == VFW_E_VMR_NOT_IN_MIXER_MODE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 1); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + IVMRMixerControl9_Release(mixer_control); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 1, "Got %u streams.\n", stream_count); + + IVMRFilterConfig9_Release(config); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + } + + filter = create_vmr9(VMR9Mode_Windowless); + IBaseFilter_QueryInterface(filter, &IID_IVMRFilterConfig9, (void **)&config); + IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + + window = CreateWindowA("static", "quartz_test", WS_OVERLAPPEDWINDOW, 0, 0, 640, 480, 0, 0, 0, 0); + ok(!!window, "Failed to create a window.\n"); + hr = IVMRWindowlessControl9_SetVideoClippingWindow(windowless_control, window); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + + hr = IBaseFilter_QueryInterface(filter, &IID_IVMRMixerControl9, (void **)&mixer_control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + if (hr == S_OK) + IVMRMixerControl9_Release(mixer_control); + + hr = IVMRFilterConfig9_SetNumberOfStreams(config, 2); + todo_wine ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IVMRFilterConfig9_GetNumberOfStreams(config, &stream_count); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + todo_wine ok(stream_count == 4, "Got %u streams.\n", stream_count); + + IVMRWindowlessControl9_Release(windowless_control); + IVMRFilterConfig9_Release(config); + ref = IBaseFilter_Release(filter); + ok(!ref, "Got outstanding refcount %d.\n", ref); + DestroyWindow(window); +} + START_TEST(vmr9) { IBaseFilter *filter; @@ -2925,6 +3012,7 @@ START_TEST(vmr9) test_video_window(); test_allocate_surface_helper(); test_renderless_formats(); + test_mixing_mode(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/tests: Add some tests for sample presentation time on the VMR9.
by Alexandre Julliard 01 May '20

01 May '20

Module: wine Branch: master Commit: 3cad37a64b90c31db0d0b71cb49e46d760b0a90d URL: https://source.winehq.org/git/wine.git/?a=commit;h=3cad37a64b90c31db0d0b71c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Apr 30 21:51:45 2020 -0500 quartz/tests: Add some tests for sample presentation time on the VMR9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/vmr9.c | 154 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 111 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3cad37a64b90c31db0d0…

1 0