November 2017 - Wine-devel - list.winehq.org

[PATCH 1/5] wevtapi: Add EvtOpenChannelEnum stub.
by Alex Henrie 28 Nov '17

28 Nov '17

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- Needed by FullEventLogView, http://www.nirsoft.net/utils/full_event_log_view.html --- dlls/wevtapi/main.c | 6 ++++++ dlls/wevtapi/wevtapi.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wevtapi/main.c b/dlls/wevtapi/main.c index 0b88165aba..aa23c77f8a 100644 --- a/dlls/wevtapi/main.c +++ b/dlls/wevtapi/main.c @@ -74,6 +74,12 @@ EVT_HANDLE WINAPI EvtSubscribe(EVT_HANDLE Session, HANDLE SignalEvent, LPCWSTR C return NULL; } +EVT_HANDLE WINAPI EvtOpenChannelEnum(EVT_HANDLE session, DWORD flags) +{ + FIXME("(%p %u) stub\n", session, flags); + return NULL; +} + EVT_HANDLE WINAPI EvtOpenChannelConfig(EVT_HANDLE Session, LPCWSTR ChannelPath, DWORD Flags) { FIXME("(%p %s %u) stub\n", Session, debugstr_w(ChannelPath), Flags); diff --git a/dlls/wevtapi/wevtapi.spec b/dlls/wevtapi/wevtapi.spec index 328b0dbcd9..149fe255ad 100644 --- a/dlls/wevtapi/wevtapi.spec +++ b/dlls/wevtapi/wevtapi.spec @@ -30,7 +30,7 @@ @ stub EvtNextEventMetadata @ stub EvtNextPublisherId @ stdcall EvtOpenChannelConfig(ptr wstr long) -@ stub EvtOpenChannelEnum +@ stdcall EvtOpenChannelEnum(ptr long) @ stub EvtOpenEventMetadataEnum @ stub EvtOpenLog @ stub EvtOpenPublisherEnum -- 2.15.0

1 4

[PATCH] kernel32/tests: Silence noisy debug traces.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/tests/pipe.c | 132 ++++++++++++++++++++++----------------------- 1 file changed, 66 insertions(+), 66 deletions(-)

1 0

[PATCH] server: Use default_fd_signaled for named pipe client.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/named_pipe.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)

1 0

[PATCH 2/2] mshtml: Return S_OK in IHTMLStyle2::put_behavior.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH 1/2] mshtml: Added support for default removeEventListener capture argument.
by Jacek Caban 28 Nov '17

28 Nov '17

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/events.js | 8 ++++++++ 2 files changed, 30 insertions(+)

1 0

[PATCH] mshtml/tests: Test return values in more places (Coverity)
by Nikolay Sivov 28 Nov '17

28 Nov '17

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mshtml/tests/dom.c | 6 ++++-- dlls/mshtml/tests/events.c | 7 +++++-- dlls/mshtml/tests/script.c | 13 +++++++++---- dlls/mshtml/tests/style.c | 7 +++++-- 4 files changed, 23 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 48262bbc83..5128d2ff26 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -7742,7 +7742,8 @@ static void doc_write(IHTMLDocument2 *doc, BOOL ln, const char *text) dim.lLbound = 0; dim.cElements = 1; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&var); + hres = SafeArrayAccessData(sa, (void**)&var); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(var) = VT_BSTR; V_BSTR(var) = a2bstr(text); SafeArrayUnaccessData(sa); @@ -7764,7 +7765,8 @@ static void doc_complex_write(IHTMLDocument2 *doc) HRESULT hres; sa = SafeArrayCreate(VT_VARIANT, 1, &dim); - SafeArrayAccessData(sa, (void**)&args); + hres = SafeArrayAccessData(sa, (void**)&args); + ok(hres == S_OK, "Failed to access array data: %08x\n", hres); V_VT(args) = VT_BSTR; V_BSTR(args) = a2bstr("<body i4val=\""); diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 4f577459c9..bc8e045434 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -3129,6 +3129,7 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3138,9 +3139,11 @@ static void doc_load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index 243c10c07a..b07cce1f3d 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -1259,6 +1259,7 @@ static void load_string(IHTMLDocument2 *doc, const char *str) { IPersistStreamInit *init; IStream *stream; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -1266,9 +1267,11 @@ static void load_string(IHTMLDocument2 *doc, const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); @@ -2325,7 +2328,8 @@ static void test_script_run(void) V_VT(&var) = VT_BSTR; V_BSTR(&var) = NULL; - dispex_propput(document, id, 0, &var, NULL); + hres = dispex_propput(document, id, 0, &var, NULL); + ok(hres == S_OK, "dispex_propput failed: %08x\n", hres); VariantInit(&var); memset(&dp, 0, sizeof(dp)); @@ -2823,7 +2827,8 @@ static void report_data(ProtocolHandler *This) IServiceProvider_Release(service_provider); ok(hres == S_OK, "Could not get IHttpNegotiate interface: %08x\n", hres); - IUri_GetDisplayUri(This->uri, &url); + hres = IUri_GetDisplayUri(This->uri, &url); + ok(hres == S_OK, "Failed to get display uri: %08x\n", hres); hres = IHttpNegotiate_BeginningTransaction(http_negotiate, url, emptyW, 0, &addl_headers); ok(hres == S_OK, "BeginningTransaction failed: %08x\n", hres); SysFreeString(url); diff --git a/dlls/mshtml/tests/style.c b/dlls/mshtml/tests/style.c index 7fc04a485e..73c074e729 100644 --- a/dlls/mshtml/tests/style.c +++ b/dlls/mshtml/tests/style.c @@ -3144,6 +3144,7 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) IPersistStreamInit *init; IStream *stream; IHTMLDocument2 *doc; + HRESULT hres; HGLOBAL mem; SIZE_T len; @@ -3155,9 +3156,11 @@ static IHTMLDocument2 *create_doc_with_string(const char *str) len = strlen(str); mem = GlobalAlloc(0, len); memcpy(mem, str, len); - CreateStreamOnHGlobal(mem, TRUE, &stream); + hres = CreateStreamOnHGlobal(mem, TRUE, &stream); + ok(hres == S_OK, "Failed to create a stream, hr %#x.\n", hres); - IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + hres = IHTMLDocument2_QueryInterface(doc, &IID_IPersistStreamInit, (void**)&init); + ok(hres == S_OK, "Failed to get IPersistStreamInit, hr %#x.\n", hres); IPersistStreamInit_Load(init, stream); IPersistStreamInit_Release(init); -- 2.15.0

2 1

[PATCH 7/7] taskschd: Implement ITaskSettings_put_Enabled.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 7d0d8fa3b7..7c5dca36df 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1165,8 +1165,13 @@ static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOO static HRESULT WINAPI TaskSettings_put_Enabled(ITaskSettings *iface, VARIANT_BOOL enabled) { - FIXME("%p,%d: stub\n", iface, enabled); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, enabled); + + taskset->enabled = enabled ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_DeleteExpiredTaskAfter(ITaskSettings *iface, BSTR *delay) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index f710219e98..fe54bff809 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1132,6 +1132,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_Enabled(set, test->enabled); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->delete_expired_task_after[0]) + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); + else + hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1141,12 +1147,6 @@ todo_wine return; } - if (!test->delete_expired_task_after[0]) - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); - else - hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, test->delete_expired_task_after); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Priority(set, test->priority); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 6/7] taskschd: Implement ITaskSettings_put_ExecutionTimeLimit.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 10 +++++++++- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 188944fe7e..7d0d8fa3b7 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1138,8 +1138,16 @@ static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_ExecutionTimeLimit(ITaskSettings *iface, BSTR limit) { + TaskSettings *taskset = impl_from_ITaskSettings(iface); + WCHAR *str = NULL; + TRACE("%p,%s\n", iface, debugstr_w(limit)); - return E_NOTIMPL; + + if (limit && !(str = heap_strdupW(limit))) return E_OUTOFMEMORY; + heap_free(taskset->execution_time_limit); + taskset->execution_time_limit = str; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_Enabled(ITaskSettings *iface, VARIANT_BOOL *enabled) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 9e3e3811c4..f710219e98 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1129,6 +1129,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_Enabled(set, test->enabled); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1138,9 +1141,6 @@ todo_wine return; } - hr = ITaskSettings_put_Enabled(set, test->enabled); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->delete_expired_task_after[0]) hr = ITaskSettings_put_DeleteExpiredTaskAfter(set, NULL); else -- 2.11.0

1 0

[PATCH 5/7] taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 12 ++++++------ 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 0903526866..188944fe7e 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1107,8 +1107,13 @@ static HRESULT WINAPI TaskSettings_get_RunOnlyIfNetworkAvailable(ITaskSettings * static HRESULT WINAPI TaskSettings_put_RunOnlyIfNetworkAvailable(ITaskSettings *iface, VARIANT_BOOL run) { - FIXME("%p,%d: stub\n", iface, run); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, run); + + taskset->run_only_if_network_available = run ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_ExecutionTimeLimit(ITaskSettings *iface, BSTR *limit) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 8a9099384c..9e3e3811c4 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1123,6 +1123,12 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + if (!test->execution_time_limit[0]) + hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); + else + hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1132,12 +1138,6 @@ todo_wine return; } - if (!test->execution_time_limit[0]) - hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); - else - hr = ITaskSettings_put_ExecutionTimeLimit(set, test->execution_time_limit); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - hr = ITaskSettings_put_Enabled(set, test->enabled); ok(hr == S_OK, "expected S_OK, got %#x\n", hr); -- 2.11.0

1 0

[PATCH 4/7] taskschd: Implement ITaskSettings_put_StartWhenAvailable.
by Hans Leidekker 28 Nov '17

28 Nov '17

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/taskschd/task.c | 9 +++++++-- dlls/taskschd/tests/scheduler.c | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 508b23384e..0903526866 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1071,8 +1071,13 @@ static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL start) { - FIXME("%p,%d: stub\n", iface, start); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, start); + + taskset->start_when_available = start ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_XmlText(ITaskSettings *iface, BSTR *xml) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index ab061d543d..8a9099384c 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1120,6 +1120,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1129,9 +1132,6 @@ todo_wine return; } - hr = ITaskSettings_put_RunOnlyIfNetworkAvailable(set, test->run_only_if_network_available); - ok(hr == S_OK, "expected S_OK, got %#x\n", hr); - if (!test->execution_time_limit[0]) hr = ITaskSettings_put_ExecutionTimeLimit(set, NULL); else -- 2.11.0

1 0