April 2018 - Wine-Devel - list.winehq.org

[PATCH 7/7] [v2] wsdapi: Add MetadataVersion to Hello message.
by Owen Rudge April 24, 2018

April 24, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 7 +++++++ dlls/wsdapi/tests/discovery.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)

2 1

[PATCH 6/7] [v2] wsdapi/tests: Add tests for Scopes and XAddrs lists.
by Owen Rudge April 24, 2018

April 24, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/tests/discovery.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-)

2 1

[PATCH 5/7] [v2] wsdapi: Build and write Scopes and XAddrs lists for Hello message.
by Owen Rudge April 24, 2018

April 24, 2018

Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> --- dlls/wsdapi/soap.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+)

3 3

[PATCH 10/10] mstask/tests: Add some tests for trigger management.
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_trigger.c | 82 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c index 0a68a19f43..a1b5597fff 100644 --- a/dlls/mstask/tests/task_trigger.c +++ b/dlls/mstask/tests/task_trigger.c @@ -2,6 +2,7 @@ * Test suite for Task interface * * Copyright (C) 2008 Google (Roy Shea) + * Copyright (C) 2018 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -35,10 +36,6 @@ static BOOL setup_trigger(void) HRESULT hres; const WCHAR task_name[] = {'T','e','s','t','i','n','g', 0}; - hres = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, - &IID_ITaskScheduler, (void **) &test_task_scheduler); - if(hres != S_OK) - return FALSE; hres = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, &IID_ITask, (IUnknown**)&test_task); if(hres != S_OK) @@ -60,7 +57,6 @@ static void cleanup_trigger(void) { ITaskTrigger_Release(test_trigger); ITask_Release(test_task); - ITaskScheduler_Release(test_task_scheduler); } static BOOL compare_trigger_state(TASK_TRIGGER found_state, @@ -376,10 +372,86 @@ static void test_SetTrigger_GetTrigger(void) return; } +static void test_task_trigger(void) +{ + static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 }; + HRESULT hr; + ITask *task; + ITaskTrigger *trigger, *trigger2; + WORD count, idx; + DWORD ref; + + hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask, + &IID_ITask, (IUnknown **)&task); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + hr = ITask_GetTrigger(task, 0, &trigger); + ok(hr == SCHED_E_TRIGGER_NOT_FOUND, "got %#x\n", hr); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); + + hr = ITask_GetTrigger(task, 0, &trigger2); + ok(hr == S_OK, "got %#x\n", hr); + ok(trigger != trigger2, "%p != %p\n", trigger, trigger2); + + ref = ITaskTrigger_Release(trigger2); + ok(ref == 0, "got %u\n", ref); + + ref = ITaskTrigger_Release(trigger); + ok(ref == 0, "got %u\n", ref); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 1, "got %u\n", count); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + idx = 0xdead; + hr = ITask_CreateTrigger(task, &idx, &trigger); + ok(hr == S_OK, "got %#x\n", hr); + ok(idx == 0, "got %u\n", idx); + + hr = ITask_DeleteTrigger(task, 0); + ok(hr == S_OK, "got %#x\n", hr); + + count = 0xdead; + hr = ITask_GetTriggerCount(task, &count); + ok(hr == S_OK, "got %#x\n", hr); + ok(count == 0, "got %u\n", count); + + ref = ITaskTrigger_Release(trigger); + ok(ref == 0, "got %u\n", ref); + + ref = ITask_Release(task); + ok(ref == 0, "got %u\n", ref); +} START_TEST(task_trigger) { + HRESULT hr; + CoInitialize(NULL); + + hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, + &IID_ITaskScheduler, (void **)&test_task_scheduler); + ok(hr == S_OK, "error creating TaskScheduler instance %#x\n", hr); + test_SetTrigger_GetTrigger(); + test_task_trigger(); + + ITaskScheduler_Release(test_task_scheduler); CoUninitialize(); } -- 2.16.3

1 0

[PATCH 09/10] mstask: Implement ITask::GetTrigger().
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 2525a1a33a..8c9d479d55 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -198,13 +198,24 @@ static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetTrigger( - ITask* iface, - WORD iTrigger, - ITaskTrigger **ppTrigger) +static HRESULT WINAPI MSTASK_ITask_GetTrigger(ITask *iface, WORD idx, ITaskTrigger **trigger) { - FIXME("(%p, %d, %p): stub\n", iface, iTrigger, ppTrigger); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + HRESULT hr; + + TRACE("(%p, %u, %p)\n", iface, idx, trigger); + + if (idx >= This->trigger_count) + return SCHED_E_TRIGGER_NOT_FOUND; + + hr = TaskTriggerConstructor((void **)trigger); + if (hr != S_OK) return hr; + + hr = ITaskTrigger_SetTrigger(*trigger, &This->trigger[idx]); + if (hr != S_OK) + ITaskTrigger_Release(*trigger); + + return hr; } static HRESULT WINAPI MSTASK_ITask_GetTriggerString( -- 2.16.3

1 0

[PATCH 08/10] mstask: Implement ITask::DeleteTrigger().
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 199049d620..2525a1a33a 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -171,12 +171,21 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskT return hr; } -static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( - ITask* iface, - WORD iTrigger) +static HRESULT WINAPI MSTASK_ITask_DeleteTrigger(ITask *iface, WORD idx) { - FIXME("(%p, %d): stub\n", iface, iTrigger); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %u)\n", iface, idx); + + if (idx >= This->trigger_count) + return SCHED_E_TRIGGER_NOT_FOUND; + + This->trigger_count--; + memmove(&This->trigger[idx], &This->trigger[idx + 1], (This->trigger_count - idx) * sizeof(This->trigger[0])); + /* this shouldn't fail in practice since we're shrinking the memory block */ + This->trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * This->trigger_count); + + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) -- 2.16.3

1 0

[PATCH 07/10] mstask: Implement ITask::CreateTrigger().
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 36 ++++++++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index cf417273f4..199049d620 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -63,6 +63,7 @@ typedef struct DWORD priority, maxRunTime; LPWSTR accountName; DWORD trigger_count; + TASK_TRIGGER *trigger; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -83,6 +84,7 @@ static void TaskDestructor(TaskImpl *This) ITaskDefinition_Release(This->task); HeapFree(GetProcessHeap(), 0, This->task_name); HeapFree(GetProcessHeap(), 0, This->accountName); + HeapFree(GetProcessHeap(), 0, This->trigger); HeapFree(GetProcessHeap(), 0, This); InterlockedDecrement(&dll_ref); } @@ -139,13 +141,34 @@ static ULONG WINAPI MSTASK_ITask_Release( return ref; } -static HRESULT WINAPI MSTASK_ITask_CreateTrigger( - ITask* iface, - WORD *piNewTrigger, - ITaskTrigger **ppTrigger) +static HRESULT WINAPI MSTASK_ITask_CreateTrigger(ITask *iface, WORD *idx, ITaskTrigger **task_trigger) { - TRACE("(%p, %p, %p)\n", iface, piNewTrigger, ppTrigger); - return TaskTriggerConstructor((LPVOID *)ppTrigger); + TaskImpl *This = impl_from_ITask(iface); + TASK_TRIGGER *new_trigger; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", iface, idx, task_trigger); + + hr = TaskTriggerConstructor((void **)task_trigger); + if (hr != S_OK) return hr; + + if (This->trigger) + new_trigger = heap_realloc(This->trigger, sizeof(This->trigger[0]) * (This->trigger_count + 1)); + else + new_trigger = heap_alloc(sizeof(This->trigger[0])); + if (!new_trigger) + { + ITaskTrigger_Release(*task_trigger); + return E_OUTOFMEMORY; + } + + This->trigger = new_trigger; + + hr = ITaskTrigger_GetTrigger(*task_trigger, &This->trigger[This->trigger_count]); + if (hr == S_OK) + *idx = This->trigger_count++; + + return hr; } static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( @@ -1135,6 +1158,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->priority = NORMAL_PRIORITY_CLASS; This->accountName = NULL; This->trigger_count = 0; + This->trigger = NULL; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; -- 2.16.3

1 0

[PATCH 06/10] mstask: Implement ITask::GetTriggerCount().
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index f74d439162..cf417273f4 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -62,6 +62,7 @@ typedef struct WORD idle_minutes, deadline_minutes; DWORD priority, maxRunTime; LPWSTR accountName; + DWORD trigger_count; } TaskImpl; static inline TaskImpl *impl_from_ITask(ITask *iface) @@ -155,12 +156,14 @@ static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetTriggerCount( - ITask* iface, - WORD *plCount) +static HRESULT WINAPI MSTASK_ITask_GetTriggerCount(ITask *iface, WORD *count) { - FIXME("(%p, %p): stub\n", iface, plCount); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, count); + + *count = This->trigger_count; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetTrigger( @@ -1131,6 +1134,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) This->deadline_minutes = 60; This->priority = NORMAL_PRIORITY_CLASS; This->accountName = NULL; + This->trigger_count = 0; /* Default time is 3 days = 259200000 ms */ This->maxRunTime = 259200000; -- 2.16.3

1 0

[PATCH 05/10] mstask: Fix saving the triggers.
by Dmitry Timoshkov April 24, 2018

April 24, 2018

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58ff601eac..f74d439162 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -980,12 +980,10 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR ta goto failed; } - /* Trigegrs */ - if (!write_triggers(hfile, task)) - { - hr = HRESULT_FROM_WIN32(GetLastError()); + /* Triggers */ + hr = write_triggers(task, hfile); + if (hr != S_OK) goto failed; - } /* Signature */ if (!write_signature(hfile)) -- 2.16.3

1 0

[PATCH 04/10] mstask: Initialize task file name in the task constructor.
by Dmitry Timoshkov April 24, 2018

April 24, 2018

IPersistFile::Save() receives full path name. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index e390aa6e30..58ff601eac 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -850,10 +850,8 @@ static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) return WriteFile(hfile, str, count, &size, NULL); } -static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR name, BOOL remember) +static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR task_name, BOOL remember) { - static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; - static const WCHAR jobW[] = { '.','j','o','b',0 }; static WCHAR authorW[] = { 'W','i','n','e',0 }; static WCHAR commentW[] = { 'C','r','e','a','t','e','d',' ','b','y',' ','W','i','n','e',0 }; FIXDLEN_DATA fixed; @@ -864,25 +862,17 @@ static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR na ITask *task = &This->ITask_iface; LPWSTR appname = NULL, params = NULL, workdir = NULL, creator = NULL, comment = NULL; BYTE *user_data = NULL; - WCHAR task_name[MAX_PATH]; HRESULT hr; - TRACE("(%p, %s, %d)\n", iface, debugstr_w(name), remember); + TRACE("(%p, %s, %d)\n", iface, debugstr_w(task_name), remember); - disposition = name ? CREATE_NEW : OPEN_ALWAYS; + disposition = task_name ? CREATE_NEW : OPEN_ALWAYS; - if (!name) + if (!task_name) { - name = This->task_name; + task_name = This->task_name; remember = FALSE; } - else if (strchrW(name, '.')) - return E_INVALIDARG; - - GetWindowsDirectoryW(task_name, MAX_PATH); - lstrcatW(task_name, tasksW); - lstrcatW(task_name, name); - lstrcatW(task_name, jobW); ITask_GetComment(task, &comment); if (!comment) comment = commentW; @@ -1018,11 +1008,11 @@ failed: CloseHandle(hfile); if (hr != S_OK) - DeleteFileW(name); + DeleteFileW(task_name); else if (remember) { HeapFree(GetProcessHeap(), 0, This->task_name); - This->task_name = heap_strdupW(name); + This->task_name = heap_strdupW(task_name); } return hr; } @@ -1104,14 +1094,24 @@ static const IPersistFileVtbl MSTASK_IPersistFileVtbl = MSTASK_IPersistFile_GetCurFile }; -HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **task) +HRESULT TaskConstructor(ITaskService *service, const WCHAR *name, ITask **task) { + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; TaskImpl *This; + WCHAR task_name[MAX_PATH]; ITaskDefinition *taskdef; IActionCollection *actions; HRESULT hr; - TRACE("(%s, %p)\n", debugstr_w(task_name), task); + TRACE("(%s, %p)\n", debugstr_w(name), task); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); hr = ITaskService_NewTask(service, 0, &taskdef); if (hr != S_OK) return hr; -- 2.16.3

1 0