wine-commits September 2019

wine-commits@winehq.org

2 participants
629 discussions

Vijay Kiran Kamuju : msvcrt: Implement %R format for strftime.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 20810377ed6353cc59c4b73149f132178657de80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20810377ed6353cc59c4b731… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Sep 30 16:52:14 2019 +0200 msvcrt: Implement %R format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 10 ++++++++++ dlls/ucrtbase/tests/misc.c | 8 ++++++++ 3 files changed, 23 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index fea7ca19db..faf1a6dcb4 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%R", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%T", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4aaa89ac0e..c72b3ed21e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1189,6 +1189,16 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f time_data->str.names.am : time_data->str.names.pm)) return 0; break; +#if _MSVCR_VER>=140 + case 'R': + if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) + return 0; + if(ret < max) + str[ret++] = ':'; + if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) + return 0; + break; +#endif case 'S': if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index bb0c2e3a0a..02ea1297bb 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,14 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%R", &epoch); + ok(retA == 5, "expected 5, got %d\n", (int)retA); + ok(!strcmp(bufA, "00:00"), "got %s\n", bufA); + + retA = p_strftime(bufA, sizeof(bufA), "%#R", &epoch); + ok(retA == 3, "expected 3, got %d\n", (int)retA); + ok(!strcmp(bufA, "0:0"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%T", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "00:00:00"), "got %s\n", bufA);

1 0

Piotr Caban : msvcrt: Don't write past buffer in strftime.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 30913ff564191d86d2d1d7ee5de359054fd30fff URL: https://source.winehq.org/git/wine.git/?a=commit;h=30913ff564191d86d2d1d7ee… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 16:52:07 2019 +0200 msvcrt: Don't write past buffer in strftime. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/time.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index b7d11e0543..4aaa89ac0e 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1197,10 +1197,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f case 'T': if(!strftime_int(str, &ret, max, mstm->tm_hour, alternate ? 0 : 2, 0, 23)) return 0; - str[ret++] = ':'; + if(ret < max) + str[ret++] = ':'; if(!strftime_int(str, &ret, max, mstm->tm_min, alternate ? 0 : 2, 0, 59)) return 0; - str[ret++] = ':'; + if(ret < max) + str[ret++] = ':'; if(!strftime_int(str, &ret, max, mstm->tm_sec, alternate ? 0 : 2, 0, 59)) return 0; break;

1 0

Jacek Caban : scrrun: Add support for TristateUseDefault text stream format.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: b22236d1b158bfeef4fe57e7df0bf4b87c0673dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=b22236d1b158bfeef4fe57e7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 30 16:33:49 2019 +0200 scrrun: Add support for TristateUseDefault text stream format. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/scrrun/filesystem.c | 62 +++++++++++++-------- dlls/scrrun/tests/filesystem.c | 121 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 159 insertions(+), 24 deletions(-) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 1713d5bb28..3c0ee0821e 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -689,7 +689,7 @@ static const ITextStreamVtbl textstreamvtbl = { textstream_Close }; -static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, BOOL unicode, ITextStream **ret) +static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMode mode, Tristate format, ITextStream **ret) { struct textstream *stream; DWORD access = 0; @@ -704,7 +704,7 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod access = GENERIC_WRITE; break; case ForAppending: - access = FILE_APPEND_DATA; + access = GENERIC_READ | GENERIC_WRITE; break; default: return E_INVALIDARG; @@ -716,7 +716,6 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod stream->ITextStream_iface.lpVtbl = &textstreamvtbl; stream->ref = 1; stream->mode = mode; - stream->unicode = unicode; stream->first_read = TRUE; stream->file = CreateFileW(filename, access, 0, NULL, disposition, FILE_ATTRIBUTE_NORMAL, NULL); @@ -732,14 +731,39 @@ static HRESULT create_textstream(const WCHAR *filename, DWORD disposition, IOMod else stream->size.QuadPart = 0; - /* Write Unicode BOM */ - if (unicode && mode == ForWriting && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { - DWORD written = 0; - BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); - if (!ret || written != sizeof(utf16bom)) { - ITextStream_Release(&stream->ITextStream_iface); - return create_error(GetLastError()); + if (mode == ForWriting) + { + stream->unicode = format == TristateTrue; + /* Write Unicode BOM */ + if (stream->unicode && (disposition == CREATE_ALWAYS || disposition == CREATE_NEW)) { + DWORD written = 0; + BOOL ret = WriteFile(stream->file, &utf16bom, sizeof(utf16bom), &written, NULL); + if (!ret || written != sizeof(utf16bom)) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + } + } + else + { + if (format == TristateUseDefault) + { + BYTE buf[64]; + DWORD read; + BOOL ret; + + ret = ReadFile(stream->file, buf, sizeof(buf), &read, NULL); + if (!ret) { + ITextStream_Release(&stream->ITextStream_iface); + return create_error(GetLastError()); + } + + stream->unicode = IsTextUnicode(buf, read, NULL); + if (mode == ForReading) SetFilePointer(stream->file, 0, 0, FILE_BEGIN); } + else stream->unicode = format != TristateFalse; + + if (mode == ForAppending) SetFilePointer(stream->file, 0, 0, FILE_END); } init_classinfo(&CLSID_TextStream, (IUnknown *)&stream->ITextStream_iface, &stream->classinfo); @@ -2811,12 +2835,7 @@ static HRESULT WINAPI file_OpenAsTextStream(IFile *iface, IOMode mode, Tristate TRACE("(%p)->(%d %d %p)\n", This, mode, format, stream); - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(This->path, OPEN_EXISTING, mode, format == TristateTrue, stream); + return create_textstream(This->path, OPEN_EXISTING, mode, format, stream); } static const IFileVtbl file_vtbl = { @@ -3851,7 +3870,7 @@ static HRESULT WINAPI filesys_CreateTextFile(IFileSystem3 *iface, BSTR filename, TRACE("%p %s %d %d %p\n", iface, debugstr_w(filename), overwrite, unicode, stream); disposition = overwrite == VARIANT_TRUE ? CREATE_ALWAYS : CREATE_NEW; - return create_textstream(filename, disposition, ForWriting, !!unicode, stream); + return create_textstream(filename, disposition, ForWriting, unicode ? TristateTrue : TristateFalse, stream); } static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, @@ -3861,14 +3880,9 @@ static HRESULT WINAPI filesys_OpenTextFile(IFileSystem3 *iface, BSTR filename, DWORD disposition; TRACE("(%p)->(%s %d %d %d %p)\n", iface, debugstr_w(filename), mode, create, format, stream); - disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; - if (format == TristateUseDefault) { - FIXME("default format not handled, defaulting to unicode\n"); - format = TristateTrue; - } - - return create_textstream(filename, disposition, mode, format == TristateTrue, stream); + disposition = create == VARIANT_TRUE ? OPEN_ALWAYS : OPEN_EXISTING; + return create_textstream(filename, disposition, mode, format, stream); } static HRESULT WINAPI filesys_GetStandardStream(IFileSystem3 *iface, diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index 566f6f922b..ed49856921 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -1887,6 +1887,127 @@ todo_wine SysFreeString(str); ITextStream_Release(stream); + /* default read will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcpyW(buffW, nameW); + lstrcatW(buffW, crlfW); + lstrcatW(buffW, secondlineW); + lstrcatW(buffW, crlfW); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateTrue, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + lstrcatW(buffW, L"123"); + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(buffW, str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"123"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with default stream */ + hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + str = SysAllocString(L"test"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got 0x%08x\n", hr); + SysFreeString(str); + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + + /* default append will use Unicode */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForAppending, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"123"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = NULL; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!lstrcmpW(L"test123", str), "got %s\n", wine_dbgstr_w(str)); + SysFreeString(str); + + ITextStream_Release(stream); + + /* default write will use ASCII as well */ + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForWriting, VARIANT_FALSE, TristateUseDefault, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = SysAllocString(L"test string"); + hr = ITextStream_Write(stream, str); + ok(hr == S_OK, "got %08x\n", hr); + SysFreeString(str); + + ITextStream_Release(stream); + + hr = IFileSystem3_OpenTextFile(fs3, nameW, ForReading, VARIANT_FALSE, TristateFalse, &stream); + ok(hr == S_OK, "got 0x%08x\n", hr); + + str = (void*)0xdeadbeef; + hr = ITextStream_Read(stream, 500, &str); + ok(hr == S_FALSE, "got 0x%08x\n", hr); + ok(!wcscmp(str, L"test string"), "got %s\n", wine_dbgstr_w(str)); + + ITextStream_Release(stream); + /* ASCII file, read with Unicode stream */ /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream);

1 0

Zebediah Figura : winegstreamer: Initialize COM on the callback dispatcher thread.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: f65cb89cbcaf2fddd9d8e79113528f6cea8dc86b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f65cb89cbcaf2fddd9d8e791… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Sep 30 08:53:52 2019 -0500 winegstreamer: Initialize COM on the callback dispatcher thread. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47822 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 1 - dlls/winegstreamer/gstdemux.c | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index d7ae766f11..c781a52857 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,7 +760,6 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) HRESULT hr; hr = IFilterGraph2_RenderFile(graph, filename, NULL); -todo_wine ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); if (SUCCEEDED(hr)) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index cee90d195b..66b7114c52 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -2273,6 +2273,8 @@ static DWORD WINAPI dispatch_thread(void *user) { struct cb_data *cbdata; + CoInitializeEx(NULL, COINIT_MULTITHREADED); + pthread_mutex_lock(&cb_list_lock); while(1){ @@ -2288,6 +2290,8 @@ static DWORD WINAPI dispatch_thread(void *user) pthread_mutex_unlock(&cb_list_lock); + CoUninitialize(); + return 0; }

1 0

Piotr Caban : msvcrt: Fix _putws implementation.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 3577f06f719e854513d1015f33aa78c506ad3f32 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3577f06f719e854513d1015f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Sep 30 15:22:15 2019 +0200 msvcrt: Fix _putws implementation. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47615 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/file.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 18d69b7205..9075b432ff 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -4840,19 +4840,14 @@ int CDECL MSVCRT_puts(const char *s) */ int CDECL MSVCRT__putws(const MSVCRT_wchar_t *s) { - static const MSVCRT_wchar_t nl = '\n'; - MSVCRT_size_t len = strlenW(s); int ret; MSVCRT__lock_file(MSVCRT_stdout); - if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) { - MSVCRT__unlock_file(MSVCRT_stdout); - return MSVCRT_EOF; - } - - ret = MSVCRT__fwrite_nolock(&nl,sizeof(nl),1,MSVCRT_stdout) == 1 ? 0 : MSVCRT_EOF; + ret = MSVCRT_fputws(s, MSVCRT_stdout); + if(ret >= 0) + ret = MSVCRT__fputwc_nolock('\n', MSVCRT_stdout); MSVCRT__unlock_file(MSVCRT_stdout); - return ret; + return ret >= 0 ? 0 : MSVCRT_WEOF; } /*********************************************************************

1 0

Gabriel Ivăncescu : msscript.ocx: Implement IScriptControl::Run.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 5a67b266c0837b80e02b3dd42e990907ca671c2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a67b266c0837b80e02b3dd4… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 30 15:43:26 2019 +0300 msscript.ocx: Implement IScriptControl::Run. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 100 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 89 insertions(+), 11 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 9cb8282aa2..c4c6485980 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -20,12 +20,14 @@ #include "windows.h" #include "initguid.h" +#include "dispex.h" #include "ole2.h" #include "olectl.h" #include "objsafe.h" #include "activscp.h" #include "rpcproxy.h" #include "msscript.h" +DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); #include "wine/debug.h" #include "wine/heap.h" @@ -71,6 +73,7 @@ typedef struct ScriptHost { IActiveScript *script; IActiveScriptParse *parse; + IDispatch *script_dispatch; SCRIPTSTATE script_state; CLSID clsid; @@ -200,6 +203,17 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT get_script_dispatch(struct ScriptControl *control, IDispatch **disp) +{ + if (!control->host->script_dispatch) + { + HRESULT hr = IActiveScript_GetScriptDispatch(control->host->script, NULL, &control->host->script_dispatch); + if (FAILED(hr)) return hr; + } + *disp = control->host->script_dispatch; + return S_OK; +} + static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) { HRESULT hr; @@ -210,6 +224,19 @@ static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) return hr; } +static HRESULT start_script(struct ScriptControl *control) +{ + HRESULT hr = S_OK; + + if (!control->host || control->state != Initialized) + return E_FAIL; + + if (control->host->script_state != SCRIPTSTATE_STARTED) + hr = set_script_state(control->host, SCRIPTSTATE_STARTED); + + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -316,7 +343,10 @@ static void release_script_engine(ScriptHost *host) if (host->parse) IActiveScriptParse_Release(host->parse); + if (host->script_dispatch) + IDispatch_Release(host->script_dispatch); + host->script_dispatch = NULL; host->parse = NULL; host->script = NULL; @@ -539,6 +569,7 @@ static HRESULT init_script_host(const CLSID *clsid, ScriptHost **ret) host->ref = 1; host->script = NULL; host->parse = NULL; + host->script_dispatch = NULL; host->clsid = *clsid; list_init(&host->named_items); @@ -982,15 +1013,8 @@ static HRESULT parse_script_text(ScriptControl *control, BSTR script_text, DWORD EXCEPINFO excepinfo; HRESULT hr; - if (!control->host || control->state != Initialized) - return E_FAIL; - - if (control->host->script_state != SCRIPTSTATE_STARTED) - { - hr = set_script_state(control->host, SCRIPTSTATE_STARTED); - if (FAILED(hr)) - return 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); @@ -1032,8 +1056,62 @@ static HRESULT WINAPI ScriptControl_ExecuteStatement(IScriptControl *iface, BSTR static HRESULT WINAPI ScriptControl_Run(IScriptControl *iface, BSTR procedure_name, SAFEARRAY **parameters, VARIANT *res) { ScriptControl *This = impl_from_IScriptControl(iface); - FIXME("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); - return E_NOTIMPL; + IDispatchEx *dispex; + IDispatch *disp; + SAFEARRAY *sa; + DISPPARAMS dp; + DISPID dispid; + HRESULT hr; + UINT i; + + TRACE("(%p)->(%s %p %p)\n", This, debugstr_w(procedure_name), parameters, res); + + if (!parameters || !res) return E_POINTER; + if (!(sa = *parameters)) return E_POINTER; + + V_VT(res) = VT_EMPTY; + if (sa->cDims == 0) return DISP_E_BADINDEX; + if (!(sa->fFeatures & FADF_VARIANT)) return DISP_E_BADVARTYPE; + + hr = start_script(This); + if (FAILED(hr)) return hr; + + hr = get_script_dispatch(This, &disp); + if (FAILED(hr)) return hr; + + hr = IDispatch_GetIDsOfNames(disp, &IID_NULL, &procedure_name, 1, LOCALE_USER_DEFAULT, &dispid); + if (FAILED(hr)) return hr; + + dp.cArgs = sa->rgsabound[0].cElements; + dp.rgdispidNamedArgs = NULL; + dp.cNamedArgs = 0; + dp.rgvarg = heap_alloc(dp.cArgs * sizeof(*dp.rgvarg)); + if (!dp.rgvarg) return E_OUTOFMEMORY; + + hr = SafeArrayLock(sa); + if (SUCCEEDED(hr)) + { + /* The DISPPARAMS are stored in reverse order */ + for (i = 0; i < dp.cArgs; i++) + dp.rgvarg[i] = *(VARIANT*)((char*)(sa->pvData) + (dp.cArgs - i - 1) * sa->cbElements); + SafeArrayUnlock(sa); + + hr = IDispatch_QueryInterface(disp, &IID_IDispatchEx, (void**)&dispex); + if (FAILED(hr)) + { + hr = IDispatch_Invoke(disp, dispid, &IID_NULL, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + } + else + { + hr = IDispatchEx_InvokeEx(dispex, dispid, LOCALE_USER_DEFAULT, + DISPATCH_METHOD, &dp, res, NULL, NULL); + IDispatchEx_Release(dispex); + } + } + heap_free(dp.rgvarg); + + return hr; } static const IScriptControlVtbl ScriptControlVtbl = {

1 0

Gabriel Ivăncescu : msscript.ocx: Move set_script_state to the top.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: e076f84ccc31337e0978171e6c8c6af3d62640e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e076f84ccc31337e0978171e… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Sep 30 15:43:25 2019 +0300 msscript.ocx: Move set_script_state to the top. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msscript.ocx/msscript.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/msscript.ocx/msscript.c b/dlls/msscript.ocx/msscript.c index 816a99dd6c..9cb8282aa2 100644 --- a/dlls/msscript.ocx/msscript.c +++ b/dlls/msscript.ocx/msscript.c @@ -200,6 +200,16 @@ static struct named_item *host_get_named_item(ScriptHost *host, const WCHAR *nam return NULL; } +static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) +{ + HRESULT hr; + + hr = IActiveScript_SetScriptState(host->script, state); + if (SUCCEEDED(hr)) + host->script_state = state; + return hr; +} + static inline ScriptControl *impl_from_IScriptControl(IScriptControl *iface) { return CONTAINING_RECORD(iface, ScriptControl, IScriptControl_iface); @@ -954,16 +964,6 @@ static HRESULT WINAPI ScriptControl_AddObject(IScriptControl *iface, BSTR name, return hr; } -static HRESULT set_script_state(ScriptHost *host, SCRIPTSTATE state) -{ - HRESULT hr; - - hr = IActiveScript_SetScriptState(host->script, state); - if (SUCCEEDED(hr)) - host->script_state = state; - return hr; -} - static HRESULT WINAPI ScriptControl_Reset(IScriptControl *iface) { ScriptControl *This = impl_from_IScriptControl(iface);

1 0

Piotr Caban : kernel32: Don't use uninitialized ofs->szPathName in OpenFile.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 392648dda225c06955cbc9d57e12bb3f00d9e7bf URL: https://source.winehq.org/git/wine.git/?a=commit;h=392648dda225c06955cbc9d5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Sep 27 20:00:32 2019 +0200 kernel32: Don't use uninitialized ofs->szPathName in OpenFile. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 2b6a13fc0d..bdf429cc05 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1166,6 +1166,7 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) HANDLE handle; FILETIME filetime; WORD filedatetime[2]; + DWORD len; if (!ofs) return HFILE_ERROR; @@ -1201,7 +1202,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) /* the watcom 10.6 IDE relies on a valid path returned in ofs->szPathName Are there any cases where getting the path here is wrong? Uwe Bonnes 1997 Apr 2 */ - if (!GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL )) goto error; + len = GetFullPathNameA( name, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); + goto error; + } /* OF_PARSE simply fills the structure */ @@ -1224,8 +1231,13 @@ HFILE WINAPI OpenFile( LPCSTR name, OFSTRUCT *ofs, UINT mode ) { /* Now look for the file */ - if (!SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL )) + len = SearchPathA( NULL, name, NULL, sizeof(ofs->szPathName), ofs->szPathName, NULL ); + if (!len) goto error; + if (len >= sizeof(ofs->szPathName)) + { + SetLastError(ERROR_INVALID_DATA); goto error; + } TRACE("found %s\n", debugstr_a(ofs->szPathName) );

1 0

Zebediah Figura : quartz/tests: Add tests for sample presentation time for the video renderer.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 78f6d6715320724735b9fbb0160498637806569e URL: https://source.winehq.org/git/wine.git/?a=commit;h=78f6d6715320724735b9fbb0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:29 2019 -0500 quartz/tests: Add tests for sample presentation time for the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 88 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index a3ca8038bc..3919b419e1 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -663,11 +663,11 @@ static DWORD WINAPI frame_thread(void *arg) return hr; } -static HANDLE send_frame(IMemInputPin *sink) +static HANDLE send_frame_time(IMemInputPin *sink, REFERENCE_TIME start_time, unsigned char color) { struct frame_thread_params *params = heap_alloc(sizeof(*params)); - REFERENCE_TIME start_time, end_time; IMemAllocator *allocator; + REFERENCE_TIME end_time; IMediaSample *sample; HANDLE thread; HRESULT hr; @@ -681,12 +681,12 @@ static HANDLE send_frame(IMemInputPin *sink) hr = IMediaSample_GetPointer(sample, &data); ok(hr == S_OK, "Got hr %#x.\n", hr); - memset(data, 0x55, 32 * 16 * 2); + memset(data, color, 32 * 16 * 2); hr = IMediaSample_SetActualDataLength(sample, 32 * 16 * 2); ok(hr == S_OK, "Got hr %#x.\n", hr); - start_time = 0; + start_time *= 10000000; end_time = start_time + 10000000; hr = IMediaSample_SetTime(sample, &start_time, &end_time); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -699,6 +699,11 @@ static HANDLE send_frame(IMemInputPin *sink) return thread; } +static HANDLE send_frame(IMemInputPin *sink) +{ + return send_frame_time(sink, 0, 0x55); /* purple */ +} + static HRESULT join_thread_(int line, HANDLE thread) { DWORD ret; @@ -912,6 +917,80 @@ static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_sample_time(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1, 0x11); /* dark blue */ + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* Sample time is relative to the time passed to Run(). Thus a sample + * stamped at or earlier than 1s will now be displayed immediately, because + * that time has already passed. + * One may manually verify that all of the frames in this function are + * rendered, including (by adding a Sleep() after sending the frame) the + * dark and light green frames. Thus the video renderer does not attempt to + * drop any frames that it considers late. This remains true if the frames + * are marked as discontinuous. */ + + hr = join_thread(send_frame_time(input, 1, 0x22)); /* dark green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, 0, 0x33)); /* light green */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame_time(input, -2, 0x44)); /* dark red */ + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 2, 0x66); /* orange */ + ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); /* white */ + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame_time(input, 1000000, 0xff); + ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -1017,6 +1096,7 @@ static void test_connect_pin(void) test_filter_state(input, graph); test_flushing(pin, input, graph); + test_sample_time(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Zebediah Figura : quartz/tests: Add some tests for flushing on the video renderer.
by Alexandre Julliard 30 Sep '19

30 Sep '19

Module: wine Branch: master Commit: 0867dd77b63b91086f046d52b4d5e6758a8e963a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0867dd77b63b91086f046d52… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Sep 29 19:03:28 2019 -0500 quartz/tests: Add some tests for flushing on the video renderer. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 63 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 4e948a9120..a3ca8038bc 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -850,6 +850,68 @@ static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) IMediaControl_Release(control); } +static void test_flushing(IPin *pin, IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HANDLE thread; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + thread = send_frame(input); + hr = join_thread(thread); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* We dropped the sample we were holding, so now we need a new one... */ + + hr = IMediaControl_GetState(control, 0, &state); + todo_wine ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + thread = send_frame(input); + todo_wine ok(WaitForSingleObject(thread, 100) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + + hr = IMediaControl_Run(control); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = join_thread(thread); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IPin_BeginFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + todo_wine ok(hr == E_FAIL, "Got hr %#x.\n", hr); + + hr = IPin_EndFlush(pin); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = join_thread(send_frame(input)); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { VIDEOINFOHEADER vih = @@ -954,6 +1016,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); test_filter_state(input, graph); + test_flushing(pin, input, graph); hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr);

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 September 2019