wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Jacek Caban : mshtml: Return S_OK in IHTMLStyle2::put_behavior.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: a0561068e3987e08d80d492de17e505d5934d75b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0561068e3987e08d80d492de… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:31:33 2017 +0100 mshtml: Return S_OK in IHTMLStyle2::put_behavior. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 12ce92b..fcec264 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -3256,7 +3256,7 @@ static HRESULT WINAPI HTMLStyle2_put_behavior(IHTMLStyle2 *iface, BSTR v) { HTMLStyle *This = impl_from_IHTMLStyle2(iface); FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI HTMLStyle2_get_behavior(IHTMLStyle2 *iface, BSTR *p)

1 0

Jacek Caban : mshtml: Added support for default removeEventListener capture argument.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: ed62ae5faa5d60330731100cb49aefc18b694238 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed62ae5faa5d60330731100cb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 28 17:31:27 2017 +0100 mshtml: Added support for default removeEventListener capture argument. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 22 ++++++++++++++++++++++ dlls/mshtml/tests/events.js | 8 ++++++++ 2 files changed, 30 insertions(+) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index d93a43e..0b9a36b 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2188,6 +2188,27 @@ HRESULT IEventTarget_addEventListener_hook(DispatchEx *dispex, LCID lcid, WORD f return S_FALSE; /* fallback to default */ } +HRESULT IEventTarget_removeEventListener_hook(DispatchEx *dispex, LCID lcid, WORD flags, + DISPPARAMS *dp, VARIANT *res, EXCEPINFO *ei, IServiceProvider *caller) +{ + /* If only two arguments were given, implicitly set capture to false */ + if((flags & DISPATCH_METHOD) && dp->cArgs == 2 && !dp->cNamedArgs) { + VARIANT args[3]; + DISPPARAMS new_dp = {args, NULL, 3, 0}; + V_VT(args) = VT_BOOL; + V_BOOL(args) = VARIANT_FALSE; + args[1] = dp->rgvarg[0]; + args[2] = dp->rgvarg[1]; + + TRACE("implicit capture\n"); + + return IDispatchEx_InvokeEx(&dispex->IDispatchEx_iface, DISPID_IEVENTTARGET_REMOVEEVENTLISTENER, + lcid, flags, &new_dp, res, ei, caller); + } + + return S_FALSE; /* fallback to default */ +} + static const IEventTargetVtbl EventTargetVtbl = { EventTarget_QueryInterface, EventTarget_AddRef, @@ -2238,6 +2259,7 @@ void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t comp { static const dispex_hook_t IEventTarget_hooks[] = { {DISPID_IEVENTTARGET_ADDEVENTLISTENER, IEventTarget_addEventListener_hook}, + {DISPID_IEVENTTARGET_REMOVEEVENTLISTENER, IEventTarget_removeEventListener_hook}, {DISPID_UNKNOWN} }; diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index d613c9d..9ec3db7 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -183,6 +183,14 @@ function test_add_remove_listener() { div.removeEventListener("click", listener, false); + /* test implicit capture removeEventListener argument */ + div.addEventListener("click", listener, false); + div.removeEventListener("click", listener); + + calls = ""; + div.click(); + ok(calls === "", "calls = " + calls); + next_test(); }

1 0

Nikolay Sivov : mshtml/tests: Test return values in more places (Coverity) .
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: f6d58e69e182da420d16c2822dc49270e13102d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6d58e69e182da420d16c2822… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 28 14:18:15 2017 +0300 mshtml/tests: Test return values in more places (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 48262bb..5128d2f 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 4f57745..bc8e045 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 243c10c..b07cce1 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 7fc04a4..73c074e 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);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_Enabled.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 196a97740e2ca0a001ab97f85d48be937426d6b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=196a97740e2ca0a001ab97f85… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:22:00 2017 +0100 taskschd: Implement ITaskSettings_put_Enabled. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 7d0d8fa..7c5dca3 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 f710219..fe54bff 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);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_ExecutionTimeLimit.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 64c08e68c03862ec5773cbde2584567a78199f8e URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c08e68c03862ec5773cbde2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:59 2017 +0100 taskschd: Implement ITaskSettings_put_ExecutionTimeLimit. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 188944f..7d0d8fa 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 9e3e381..f710219 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

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: ee12d7c917098a5c4b2d7306c27fef575986ce85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee12d7c917098a5c4b2d7306c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:58 2017 +0100 taskschd: Implement ITaskSettings_put_RunOnlyIfNetworkAvailable. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0903526..188944f 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 8a90993..9e3e381 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);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_StartWhenAvailable.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 62dd24af4ab930d227cfab2bf5125d3c99fd52e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62dd24af4ab930d227cfab2bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:57 2017 +0100 taskschd: Implement ITaskSettings_put_StartWhenAvailable. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 508b233..0903526 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 ab061d5..8a90993 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

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_AllowHardTerminate.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: a883a26f0ffae10b9f0b571cc37c3db90d8abae8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a883a26f0ffae10b9f0b571cc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:56 2017 +0100 taskschd: Implement ITaskSettings_put_AllowHardTerminate. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 0419ed0..508b233 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1047,8 +1047,13 @@ static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, static HRESULT WINAPI TaskSettings_put_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL allow) { - FIXME("%p,%d: stub\n", iface, allow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, allow); + + taskset->allow_hard_terminate = allow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_StartWhenAvailable(ITaskSettings *iface, VARIANT_BOOL *start) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 4d038e1..ab061d5 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1117,6 +1117,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_StartWhenAvailable(set, test->start_when_available); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1126,9 +1129,6 @@ todo_wine return; } - 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); ok(hr == S_OK, "expected S_OK, got %#x\n", hr);

1 0

Hans Leidekker : taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: 2032eedfa65cc00e15d6b829c777570052282582 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2032eedfa65cc00e15d6b829c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:55 2017 +0100 taskschd: Implement ITaskSettings_put_DisallowStartIfOnBatteries. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 70340be..0419ed0 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -1023,8 +1023,13 @@ static HRESULT WINAPI TaskSettings_get_DisallowStartIfOnBatteries(ITaskSettings static HRESULT WINAPI TaskSettings_put_DisallowStartIfOnBatteries(ITaskSettings *iface, VARIANT_BOOL disallow) { - FIXME("%p,%d: stub\n", iface, disallow); - return E_NOTIMPL; + TaskSettings *taskset = impl_from_ITaskSettings(iface); + + TRACE("%p,%d\n", iface, disallow); + + taskset->disallow_start_if_on_batteries = disallow ? TRUE : FALSE; + + return S_OK; } static HRESULT WINAPI TaskSettings_get_AllowHardTerminate(ITaskSettings *iface, VARIANT_BOOL *allow) diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index e2f85b1..4d038e1 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1114,6 +1114,9 @@ static void change_settings(ITaskDefinition *taskdef, struct settings *test) ok(hr == S_OK, "expected S_OK, got %#x\n", hr); hr = ITaskSettings_put_DisallowStartIfOnBatteries(set, test->disallow_start_if_on_batteries); + ok(hr == S_OK, "expected S_OK, got %#x\n", hr); + + hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); todo_wine ok(hr == S_OK, "expected S_OK, got %#x\n", hr); /* FIXME: Remove once implemented */ @@ -1123,9 +1126,6 @@ todo_wine return; } - hr = ITaskSettings_put_AllowHardTerminate(set, test->allow_hard_terminate); - 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);

1 0

Hans Leidekker : taskschd: Use heap_strdupW to allocate the interval in TaskSettings_put_RestartInterval.
by Alexandre Julliard 28 Nov '17

28 Nov '17

Module: wine Branch: master Commit: eb87ede3fed95129606951b5370a619bb2500585 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb87ede3fed95129606951b53… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 28 15:21:54 2017 +0100 taskschd: Use heap_strdupW to allocate the interval in TaskSettings_put_RestartInterval. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/taskschd/task.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index e417c05..70340be 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -925,12 +925,12 @@ static HRESULT WINAPI TaskSettings_get_RestartInterval(ITaskSettings *iface, BST static HRESULT WINAPI TaskSettings_put_RestartInterval(ITaskSettings *iface, BSTR interval) { TaskSettings *taskset = impl_from_ITaskSettings(iface); - BSTR str = NULL; + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(interval)); - if (interval && !(str = SysAllocString(interval))) return E_OUTOFMEMORY; - SysFreeString(taskset->restart_interval); + if (interval && !(str = heap_strdupW(interval))) return E_OUTOFMEMORY; + heap_free(taskset->restart_interval); taskset->restart_interval = str; return S_OK;

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

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 November 2017