June 2020 - Wine-devel - list.winehq.org

[PATCH 1/2] directmanipulation: Register the DirectManipulationManager and DirectManipulationSharedManager classes.
by Vijay Kiran Kamuju 13 Jun '20

13 Jun '20

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2] winegstreamer: Prevent hanging when loading a short MP3 file.
by Akihiro Sagawa 13 Jun '20

13 Jun '20

In v2, fix the test failures in test_media_types(), quartz:mpegcplit. Zebediah, thanks for the review and inspecting quartz:filtergraph test failures. --- If Info tag[1] isn't present in the MP3 file, GStreamer trys to read some more frames from the file to estimate a duration. Then, it sends a duration-changed message to winegstreamer. However, it seems not to send the message if the file is too short to estimate the duration, e.g. 0.5 seconds. Winegstreamer gets stuck in this case. This patch removes Info tag from dlls/quartz/tests/test.mp3 and fixes the above issue by watching pad's EOS events. [1] http://gabriel.mp3-tech.org/mp3infotag.html Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 8 ++++---- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mp3 | Bin 2349 -> 2157 bytes dlls/winegstreamer/gstdemux.c | 13 ++++++++++--- 4 files changed, 15 insertions(+), 8 deletions(-)

1 0

[PATCH] include: Correct the name of WAVEBANKMINIWAVEFORMAT.
by Zebediah Figura 12 Jun '20

12 Jun '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/xact3wb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index c68d7a30fad..81b1518930d 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -138,7 +138,7 @@ typedef struct WAVEBANKDATA DWORD dwEntryMetaDataElementSize; DWORD dwEntryNameElementSize; DWORD dwAlignment; - WAVEBANKMINIFORMAT CompactFormat; + WAVEBANKMINIWAVEFORMAT CompactFormat; FILETIME BuildTime; } WAVEBANKDATA, *LPWAVEBANKDATA; typedef const WAVEBANKDATA *LPCWAVEBANKDATA; -- 2.27.0

2 1

[PATCH 1/3] quartz/vmr9: Trace the arguments to IVMRWindowlessControl9::SetVideoPosition().
by Zebediah Figura 12 Jun '20

12 Jun '20

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4ea3b483a75..776d927f2ab 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1679,20 +1679,21 @@ static HRESULT WINAPI VMR9WindowlessControl_GetMaxIdealVideoSize(IVMRWindowlessC return E_NOTIMPL; } -static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, const RECT *source, const RECT *dest) +static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, + const RECT *src, const RECT *dst) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, source, dest); + TRACE("filter %p, src %s, dst %s.\n", filter, wine_dbgstr_rect(src), wine_dbgstr_rect(dst)); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.csFilter); - if (source) - This->window.src = *source; - if (dest) - This->window.dst = *dest; + if (src) + filter->window.src = *src; + if (dst) + filter->window.dst = *dst; - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } -- 2.27.0

2 3

[PATCH v2 1/3] ntdll/tests: Add tests for LdrGetDllFullName
by Alex Henrie 12 Jun '20

12 Jun '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Documented at https://github.com/hfiref0x/NtCall64/blob/master/Source/NtCall64/ntos.h#L58… --- dlls/ntdll/tests/Makefile.in | 2 +- dlls/ntdll/tests/rtl.c | 64 ++++++++++++++++++++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in index ed15c51339..c7683c1522 100644 --- a/dlls/ntdll/tests/Makefile.in +++ b/dlls/ntdll/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = ntdll.dll -IMPORTS = user32 advapi32 +IMPORTS = user32 advapi32 shlwapi C_SRCS = \ atom.c \ diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index 7a62670ea0..3588e00681 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -27,6 +27,7 @@ #include "in6addr.h" #include "inaddr.h" #include "ip2string.h" +#include "shlwapi.h" #ifndef __WINE_WINTERNL_H @@ -80,6 +81,7 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *); static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *); static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG); static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *); +static NTSTATUS (WINAPI *pLdrGetDllFullName)(HMODULE, PUNICODE_STRING); static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **); static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *); @@ -120,6 +122,7 @@ static void InitFunctionPtrs(void) pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread"); pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx"); pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules"); + pLdrGetDllFullName = (void *)GetProcAddress(hntdll, "LdrGetDllFullName"); pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification"); pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification"); } @@ -3483,6 +3486,66 @@ static void test_LdrRegisterDllNotification(void) pLdrUnregisterDllNotification(cookie); } +static void test_LdrGetDllFullName(void) +{ + static const WCHAR ntdll_dll[] = {'n','t','d','l','l','.','d','l','l',0}; + static const WCHAR dot_exe[] = {'.','e','x','e',0}; + HMODULE ntdll = GetModuleHandleA("ntdll.dll"); + WCHAR ntdll_path[MAX_PATH], path_buffer[MAX_PATH]; + UNICODE_STRING path = {0, 0, path_buffer}; + WCHAR expected_terminator; + const WCHAR *extension; + NTSTATUS status; + + if (!pLdrGetDllFullName) + { + skip("LdrGetDllFullName not available\n"); + return; + } + + if (0) /* crashes on Windows */ + pLdrGetDllFullName(ntdll, NULL); + + memset(path_buffer, 0x23, sizeof(path_buffer)); + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(path.Length == 0, "Expected length 0, got %d\n", path.Length); + ok(path_buffer[0] == 0x2323, "Expected 0x2323, got 0x%x\n", path_buffer[0]); + + GetSystemDirectoryW(ntdll_path, ARRAY_SIZE(ntdll_path)); + path.MaximumLength = 5; /* odd numbers produce partially copied characters */ + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_BUFFER_TOO_SMALL, "Expected STATUS_BUFFER_TOO_SMALL, got %08x\n", status); + ok(path.Length == path.MaximumLength, + "Expected length %d, got %d\n", path.MaximumLength, path.Length); + expected_terminator = 0x2300 | (ntdll_path[path.MaximumLength / sizeof(WCHAR)] & 0xFF); + ok(path_buffer[path.MaximumLength / sizeof(WCHAR)] == expected_terminator, + "Expected 0x%x, got 0x%x\n", expected_terminator, path_buffer[path.MaximumLength / 2]); + path_buffer[path.MaximumLength / sizeof(WCHAR)] = 0; + ntdll_path[path.MaximumLength / sizeof(WCHAR)] = 0; + ok(lstrcmpW(path_buffer, ntdll_path) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(ntdll_path), wine_dbgstr_w(path_buffer)); + + GetSystemDirectoryW(ntdll_path, ARRAY_SIZE(ntdll_path)); + PathAppendW(ntdll_path, ntdll_dll); + path.MaximumLength = sizeof(path_buffer); + + status = pLdrGetDllFullName(NULL, &path); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + extension = PathFindExtensionW(path_buffer); + ok(lstrcmpW(extension, dot_exe) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(dot_exe), wine_dbgstr_w(extension)); + + status = pLdrGetDllFullName(ntdll, &path); + ok(status == STATUS_SUCCESS, "Expected STATUS_SUCCESS, got %08x\n", status); + ok(path.Length == lstrlenW(ntdll_path) * sizeof(WCHAR), "Expected length %d, got %d\n", + lstrlenW(ntdll_path) * sizeof(WCHAR), path.Length); + ok(lstrcmpiW(path_buffer, ntdll_path) == 0, "Expected %s, got %s\n", + wine_dbgstr_w(ntdll_path), wine_dbgstr_w(path_buffer)); +} + START_TEST(rtl) { InitFunctionPtrs(); @@ -3523,4 +3586,5 @@ START_TEST(rtl) test_LdrEnumerateLoadedModules(); test_RtlMakeSelfRelativeSD(); test_LdrRegisterDllNotification(); + test_LdrGetDllFullName(); } -- 2.27.0

3 4

UTF-8 character to stdio fails
by Pauli 12 Jun '20

12 Jun '20

I had earlier wine outputting utf-8 if output codepage was set to utf-8. Something changed making output garbage. I don't know why it stopped working but only varriable which I currently suspect is a wine upgrade from 5.7 to 5.10. (version inbetween had dll loading issues) First issue which I noticed was that stdout was unbuffered which made printf and puts output each character with separated WriteFile call. As output included multibyte characters they were converted incorrectly. I decided to try to set stdout to buffered mode because that seemed like easiest way to make wine write complete characters using WriteFile. I just added a call to setvbuf into wmain. wmain is just wrapper to main which expects utf-8 encoded arguments. wmain also check console output page and disables utf-8 output if not CP_UTF8. When I tested the buffered output I had mixed results. Characters rendedred correctly in wineconsole cmd. Too bad output was still grabage because same output was written multiple times. After reading wine debug log I figured that issue was around WriteFile call from MSVCRT__write. stdout has WX_TEXT set leading to path which assumes WriteFile sets BytesWritten to actual number of bytes. But kernel32.WriteFile does mb to wc conversion (correctly) but it then writes number of wide characters written. While I was writing following tests I noticed that kernelbase.WriteFile would return correct number of bytes. kernelbase.WriteFile appears to produce correct results to gnome-terminal. But I don't know if output would look correct in Windows. Did I find a wine bug? Is it a Windows feature? I can't test in real windows as I don't have reliable access to a Windows machine. Tests are demostrations where I think the potential bug might be. Calling setvbuf on stdout later in aplication results to unspecified behavior. This makes dlls/msvcrt/tests/file.c unreliable test. --- dlls/kernel32/tests/file.c | 13 +++++++++++++ dlls/msvcrt/tests/file.c | 15 +++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 7001baa173..b4836179c2 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -34,6 +34,7 @@ #include "winternl.h" #include "winnls.h" #include "fileapi.h" +#include "wincon.h" #undef DeleteFile /* needed for FILE_DISPOSITION_INFO */ @@ -5732,6 +5733,17 @@ static void test_move_file(void) SetCurrentDirectoryA( cwd ); } +static void test_multibyte_write(void) +{ + const char test[4] = {0xe2,0x99,0xa0,0}; + DWORD written = -1; + HANDLE sout = GetStdHandle(STD_OUTPUT_HANDLE); + SetConsoleOutputCP(CP_UTF8); + ok(WriteFile(sout, test, sizeof(test) - 1, &written, NULL) == TRUE, + "Expected successful write\n"); + ok(written == sizeof(test) - 1, "written = %d expected %d", written, sizeof(test) - 1); +} + START_TEST(file) { char temp_path[MAX_PATH]; @@ -5808,4 +5820,5 @@ START_TEST(file) test_ReOpenFile(); test_hard_link(); test_move_file(); + test_multibyte_write(); } diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 61f6ffe373..3d751298f9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -36,6 +36,8 @@ #include <errno.h> #include <locale.h> +#include <wincon.h> + #define MSVCRT_FD_BLOCK_SIZE 32 typedef struct { HANDLE handle; @@ -2608,6 +2610,18 @@ static void test_lseek(void) DeleteFileA("_creat.tst"); } +static void test_multibyte_output(void) +{ + const char test[4] = {0xe2,0x99,0xa0,0}; + SetConsoleOutputCP(CP_UTF8); + ok(setvbuf(stdout, NULL, _IOLBF, BUFSIZ) == 0, "expected buffer set\n"); + errno = 0xdeadbeef; + ok(puts(test) >= 0, "Expected successful write\n"); + ok(errno == 0xdeadbeef, "errno = %d\n", errno); + ok(fflush(stdout) == 0, "Expected successful flush\n"); + ok(errno == 0xdeadbeef, "flush -> errno = %d\n", errno); +} + START_TEST(file) { int arg_c; @@ -2680,6 +2694,7 @@ START_TEST(file) test_close(); test__creat(); test_lseek(); + test_multibyte_output(); /* Wait for the (_P_NOWAIT) spawned processes to finish to make sure the report * file contains lines in the correct order -- 2.20.1

3 3

[PATCH rebase v2 3/3] quartz/filtergraph: Always sort filter list before use.
by Anton Baskanov 12 Jun '20

12 Jun '20

Some applications (e.g. Earth 2150) call IPin::Connect directly instead of IFilterGraph::ConnectDirect. Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/filtergraph.c | 48 +++++++++++++-------------------- dlls/quartz/tests/filtergraph.c | 11 +++++--- 2 files changed, 27 insertions(+), 32 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0d0ccc2b62..fa20d98981 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -151,7 +151,7 @@ typedef struct _ITF_CACHE_ENTRY { struct filter { - struct list entry, sorted_entry; + struct list entry; IBaseFilter *filter; IMediaSeeking *seeking; WCHAR *name; @@ -187,17 +187,7 @@ typedef struct _IFilterGraphImpl { LONG ref; IUnknown *punkFilterMapper2; - /* We keep two lists of filters, one unsorted and one topologically sorted. - * The former is necessary for functions like IGraphBuilder::Connect() and - * IGraphBuilder::Render() that iterate through the filter list but may - * add to it while doing so; the latter is for functions like - * IMediaControl::Run() that should propagate messages to all filters - * (including unconnected ones) but must do so in topological order from - * sinks to sources. We can easily guarantee that the loop in Connect() will - * touch each filter exactly once so long as we aren't reordering it, but - * using the sorted filters list there would be hard. This seems to be the - * easiest and clearest solution. */ - struct list filters, sorted_filters; + struct list filters; unsigned int name_index; IReferenceClock *refClock; @@ -686,7 +676,6 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter_AddRef(entry->filter = filter); list_add_head(&graph->filters, &entry->entry); - list_add_head(&graph->sorted_filters, &entry->sorted_entry); entry->sorting = FALSE; entry->seeking = NULL; ++graph->version; @@ -768,7 +757,6 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte if (entry->seeking) IMediaSeeking_Release(entry->seeking); list_remove(&entry->entry); - list_remove(&entry->sorted_entry); CoTaskMemFree(entry->name); heap_free(entry); This->version++; @@ -897,7 +885,7 @@ static struct filter *find_sorted_filter(IFilterGraphImpl *graph, IBaseFilter *i { struct filter *filter; - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { if (filter->filter == iface) return filter; @@ -941,21 +929,21 @@ static void sort_filter_recurse(IFilterGraphImpl *graph, struct filter *filter, filter->sorting = FALSE; - list_remove(&filter->sorted_entry); - list_add_head(sorted, &filter->sorted_entry); + list_remove(&filter->entry); + list_add_head(sorted, &filter->entry); } static void sort_filters(IFilterGraphImpl *graph) { struct list sorted = LIST_INIT(sorted), *cursor; - while ((cursor = list_head(&graph->sorted_filters))) + while ((cursor = list_head(&graph->filters))) { - struct filter *filter = LIST_ENTRY(cursor, struct filter, sorted_entry); + struct filter *filter = LIST_ENTRY(cursor, struct filter, entry); sort_filter_recurse(graph, filter, &sorted); } - list_move_tail(&graph->sorted_filters, &sorted); + list_move_tail(&graph->filters, &sorted); } /* NOTE: despite the implication, it doesn't matter which @@ -1008,9 +996,6 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi } } - if (SUCCEEDED(hr)) - sort_filters(This); - return hr; } @@ -5138,9 +5123,11 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) return S_OK; } + sort_filters(graph); + if (graph->state == State_Running) { - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Pause(filter->filter); if (hr == S_OK) @@ -5148,7 +5135,7 @@ static HRESULT WINAPI MediaFilter_Stop(IMediaFilter *iface) } } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Stop(filter->filter); if (hr == S_OK) @@ -5194,6 +5181,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) return S_OK; } + sort_filters(graph); update_render_count(graph); if (graph->defaultclock && !graph->refClock) @@ -5207,7 +5195,7 @@ static HRESULT WINAPI MediaFilter_Pause(IMediaFilter *iface) graph->current_pos += graph->stream_elapsed; } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Pause(filter->filter); if (hr == S_OK) @@ -5238,6 +5226,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) } graph->EcCompleteCount = 0; + sort_filters(graph); update_render_count(graph); if (graph->defaultclock && !graph->refClock) @@ -5251,7 +5240,7 @@ static HRESULT WINAPI MediaFilter_Run(IMediaFilter *iface, REFERENCE_TIME start) stream_start += 500000; } - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { filter_hr = IBaseFilter_Run(filter->filter, stream_start); if (hr == S_OK) @@ -5278,9 +5267,11 @@ static HRESULT WINAPI MediaFilter_GetState(IMediaFilter *iface, DWORD timeout, F EnterCriticalSection(&graph->cs); + sort_filters(graph); + *state = graph->state; - LIST_FOR_EACH_ENTRY(filter, &graph->sorted_filters, struct filter, sorted_entry) + LIST_FOR_EACH_ENTRY(filter, &graph->filters, struct filter, entry) { FILTER_STATE filter_state; int wait; @@ -5753,7 +5744,6 @@ static HRESULT filter_graph_common_create(IUnknown *outer, IUnknown **out, BOOL fimpl->IVideoFrameStep_iface.lpVtbl = &VideoFrameStep_vtbl; fimpl->ref = 1; list_init(&fimpl->filters); - list_init(&fimpl->sorted_filters); fimpl->name_index = 1; fimpl->refClock = NULL; fimpl->hEventCompletion = CreateEventW(0, TRUE, FALSE, 0); diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 50c2402c32..4f4abeac9b 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -3166,7 +3166,9 @@ static void test_filter_state(void) IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); IFilterGraph2_AddFilter(graph, &dummy.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + /* Using IPin::Connect instead of IFilterGraph2::ConnectDirect to show that */ + /* FilterGraph does not rely on ::ConnectDirect to track filter connections. */ + IPin_Connect(&source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); check_filter_state(graph, State_Stopped); @@ -3241,9 +3243,12 @@ static void test_filter_state(void) IFilterGraph2_QueryInterface(graph, &IID_IMediaFilter, (void **)&filter); IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); - IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + /* Add the filters in reverse order this time. */ IFilterGraph2_AddFilter(graph, &sink.IBaseFilter_iface, NULL); - IFilterGraph2_ConnectDirect(graph, &source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); + IFilterGraph2_AddFilter(graph, &source.IBaseFilter_iface, NULL); + /* Using IPin::Connect instead of IFilterGraph2::ConnectDirect to show that */ + /* FilterGraph does not rely on ::ConnectDirect to track filter connections. */ + IPin_Connect(&source_pin.IPin_iface, &sink_pin.IPin_iface, NULL); hr = IMediaFilter_Pause(filter); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.17.1

2 1

[PATCH resend 01/13] msscript.ocx: Move parse_script_text up.
by Gabriel Ivăncescu 12 Jun '20

12 Jun '20

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- So it's near the other helpers and will be needed for later patches in the series. dlls/msscript.ocx/msscript.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index c4c6485..6d098cd 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -237,6 +237,20 @@ static HRESULT start_script(struct ScriptControl *control) return hr; } +static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) +{ + EXCEPINFO excepinfo; + HRESULT hr; + + hr = start_script(control); + if (FAILED(hr)) return hr; + + hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, + NULL, NULL, 0, 1, flag, res, &excepinfo); + /* FIXME: more error handling */ + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -1008,20 +1022,6 @@ static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) return set_script_state(This->host, SCRIPTSTATE_INITIALIZED); } -static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD flag, VARIANT *res) -{ - EXCEPINFO excepinfo; - HRESULT hr; - - hr = start_script(control); - if (FAILED(hr)) return hr; - - hr = IActiveScriptParse_ParseScriptText(control->host->parse, script_text, NULL, - NULL, NULL, 0, 1, flag, res, &excepinfo); - /* FIXME: more error handling */ - return hr; -} - static HRESULT WINAPI ScriptControl_AddCode(IScriptControl *iface, BSTR code) { ScriptControl *This = impl_from_IScriptControl(iface); -- 2.21.0

2 23

[PATCH 6/6] msscript: Parse script host object instead of control to parse_script_text.
by Jacek Caban 12 Jun '20

12 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/msscript.c | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-)

1 0

[PATCH 5/6] msscript/tests: Add more script state tests.
by Jacek Caban 12 Jun '20

12 Jun '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/msscript.ocx/tests/msscript.c | 189 +++++++++++++++++++++++++++-- 1 file changed, 180 insertions(+), 9 deletions(-)

1 0