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

[PATCH 7/7] mstask/tests: Add more tests for ITaskScheduler::AddWorkItem().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task_scheduler.c | 98 ++++++++++++++++++++++++++++---------- 1 file changed, 74 insertions(+), 24 deletions(-) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 8482972e9b..8b93b56dce 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -273,7 +273,7 @@ static void test_save_task_curfile(ITask *task) IPersistFile_Release(pfile); } -static WCHAR *get_task_curfile(ITask *task) +static WCHAR *get_task_curfile(ITask *task, BOOL should_exist, BOOL is_dirty, int line) { HRESULT hr; IPersistFile *pfile; @@ -281,18 +281,28 @@ static WCHAR *get_task_curfile(ITask *task) CLSID clsid; hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); - ok(hr == S_OK, "QueryInterface error %#x\n", hr); + ok_(__FILE__, line)(hr == S_OK, "QueryInterface error %#x\n", hr); + + hr = IPersistFile_IsDirty(pfile); + ok_(__FILE__, line)(hr == is_dirty ? S_OK : S_FALSE, "got %#x\n", hr); + curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); - ok(hr == S_OK, "GetCurFile error %#x\n", hr); - ok(curfile && curfile[0] , "curfile should not be NULL\n"); + ok_(__FILE__, line)(hr == S_OK, "GetCurFile error %#x\n", hr); + ok_(__FILE__, line)(curfile && curfile[0] , "curfile should not be NULL\n"); + + hr = IPersistFile_Load(pfile, curfile, STGM_READ); + if (should_exist) + ok_(__FILE__, line)(hr == S_OK, "Load error %#x\n", hr); + else + ok_(__FILE__, line)(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); if (0) /* crashes under Windows */ hr = IPersistFile_GetClassID(pfile, NULL); hr = IPersistFile_GetClassID(pfile, &clsid); - ok(hr == S_OK, "GetClassID error %#x\n", hr); - ok(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); + ok_(__FILE__, line)(hr == S_OK, "GetClassID error %#x\n", hr); + ok_(__FILE__, line)(IsEqualCLSID(&clsid, &CLSID_CTask), "got %s\n", wine_dbgstr_guid(&clsid)); IPersistFile_Release(pfile); @@ -301,16 +311,30 @@ static WCHAR *get_task_curfile(ITask *task) static void test_task_storage(void) { - static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k',0 }; - static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','.','j','o','b',0 }; - WCHAR task_full_name[MAX_PATH]; + static const WCHAR Task1[] = { 'w','i','n','e','t','a','s','k','1',0 }; + static const WCHAR Task2[] = { 'w','i','n','e','t','a','s','k','2',0 }; + static const WCHAR Task3[] = { 'w','i','n','e','t','a','s','k','3',0 }; + static const WCHAR Task1_ext[] = { 'w','i','n','e','t','a','s','k','.','e','x','t',0 }; + static const WCHAR Task1_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','1','.','j','o','b',0 }; + static const WCHAR Task2_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','2','.','j','o','b',0 }; + static const WCHAR Task3_job[] = { '\\','T','a','s','k','s','\\','w','i','n','e','t','a','s','k','3','.','j','o','b',0 }; + WCHAR task1_full_name[MAX_PATH], task2_full_name[MAX_PATH], task3_full_name[MAX_PATH]; HRESULT hr; ITaskScheduler *scheduler; ITask *task, *task2; WCHAR *curfile, *curfile2; - GetWindowsDirectoryW(task_full_name, MAX_PATH); - lstrcatW(task_full_name, Task1_job); + GetWindowsDirectoryW(task1_full_name, MAX_PATH); + lstrcatW(task1_full_name, Task1_job); + GetWindowsDirectoryW(task2_full_name, MAX_PATH); + lstrcatW(task2_full_name, Task2_job); + GetWindowsDirectoryW(task3_full_name, MAX_PATH); + lstrcatW(task3_full_name, Task3_job); + + /* cleanup after previous runs */ + DeleteFileW(task1_full_name); + DeleteFileW(task2_full_name); + DeleteFileW(task3_full_name); hr = CoCreateInstance(&CLSID_CTaskScheduler, NULL, CLSCTX_INPROC_SERVER, &IID_ITaskScheduler, (void **)&scheduler); if (hr != S_OK) @@ -319,41 +343,66 @@ static void test_task_storage(void) return; } + hr = ITaskScheduler_NewWorkItem(scheduler, Task1_ext, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); + ok(hr == E_INVALIDARG, "wrong error %#x\n", hr); + hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "NewWorkItem error %#x\n", hr); - curfile = get_task_curfile(task); + curfile = get_task_curfile(task, FALSE, FALSE, __LINE__); ok(!file_exists(curfile), "curfile should not exist\n"); - ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITask_SetComment(task, Task1); + ok(hr == S_OK, "got %#x\n", hr); + + curfile2 = get_task_curfile(task, FALSE, TRUE, __LINE__); + ok(!file_exists(curfile2), "curfile should not exist\n"); + ok(!lstrcmpW(curfile2, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + CoTaskMemFree(curfile2); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); ok(hr == S_OK, "NewWorkItem error %#x\n", hr); ok(task2 != task, "tasks should not be equal\n"); - curfile2 = get_task_curfile(task); + curfile2 = get_task_curfile(task2, FALSE, FALSE, __LINE__); ok(!file_exists(curfile2), "curfile2 should not exist\n"); - ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + ok(!lstrcmpW(curfile2, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); CoTaskMemFree(curfile); CoTaskMemFree(curfile2); + ITask_Release(task2); task2 = (ITask *)0xdeadbeef; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task2); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "wrong error %#x\n", hr); ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); - hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + hr = ITaskScheduler_AddWorkItem(scheduler, Task2, (IScheduledWorkItem *)task); ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task2_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); - curfile = get_task_curfile(task); + hr = ITaskScheduler_AddWorkItem(scheduler, Task3, (IScheduledWorkItem *)task); + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task3_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); + + hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); + ok(hr == S_OK, "AddWorkItem error %#x\n", hr); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile should exist\n"); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); - curfile = get_task_curfile(task); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); ok(file_exists(curfile), "curfile should exist\n"); + CoTaskMemFree(curfile); ITask_Release(task); task = NULL; @@ -361,16 +410,17 @@ static void test_task_storage(void) ok(hr == S_OK, "Activate error %#x\n", hr); ok(task != NULL, "task should not be set to NULL\n"); - curfile2 = get_task_curfile(task); - ok(file_exists(curfile2), "curfile2 should exist\n"); - ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); + curfile = get_task_curfile(task, TRUE, FALSE, __LINE__); + ok(file_exists(curfile), "curfile2 should exist\n"); + ok(!lstrcmpW(curfile, task1_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); - CoTaskMemFree(curfile2); + CoTaskMemFree(curfile); test_save_task_curfile(task); - DeleteFileW(curfile); - CoTaskMemFree(curfile); + DeleteFileW(task1_full_name); + DeleteFileW(task2_full_name); + DeleteFileW(task3_full_name); ITask_Release(task); ITaskScheduler_Release(scheduler); -- 2.16.3

1 0

[PATCH 6/7] mstask: Implement ITaskScheduler::AddWorkItem().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 29 +++++++++++++++++++++++------ dlls/mstask/tests/task_scheduler.c | 8 -------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index dd6eaf6b38..c890cb6472 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -331,13 +331,30 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_NewWorkItem( return TaskConstructor(This->service, task_name, (ITask **)task); } -static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem( - ITaskScheduler* iface, - LPCWSTR pwszTaskName, - IScheduledWorkItem *pWorkItem) +static HRESULT WINAPI MSTASK_ITaskScheduler_AddWorkItem(ITaskScheduler *iface, LPCWSTR name, IScheduledWorkItem *item) { - FIXME("%p, %s, %p: stub\n", iface, debugstr_w(pwszTaskName), pWorkItem); - return E_NOTIMPL; + static const WCHAR tasksW[] = { '\\','T','a','s','k','s','\\',0 }; + static const WCHAR jobW[] = { '.','j','o','b',0 }; + WCHAR task_name[MAX_PATH]; + IPersistFile *pfile; + HRESULT hr; + + TRACE("%p, %s, %p\n", iface, debugstr_w(name), item); + + if (strchrW(name, '.')) return E_INVALIDARG; + + GetWindowsDirectoryW(task_name, MAX_PATH); + lstrcatW(task_name, tasksW); + lstrcatW(task_name, name); + lstrcatW(task_name, jobW); + + hr = IScheduledWorkItem_QueryInterface(item, &IID_IPersistFile, (void **)&pfile); + if (hr == S_OK) + { + hr = IPersistFile_Save(pfile, task_name, TRUE); + IPersistFile_Release(pfile); + } + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_IsOfType( diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index fbee5ecb66..8482972e9b 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -343,30 +343,23 @@ static void test_task_storage(void) ok(task2 == (ITask *)0xdeadbeef, "task should not be set to NULL\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); -todo_wine ok(hr == S_OK, "AddWorkItem error %#x\n", hr); curfile = get_task_curfile(task); -todo_wine ok(file_exists(curfile), "curfile should exist\n"); hr = ITaskScheduler_AddWorkItem(scheduler, Task1, (IScheduledWorkItem *)task); -todo_wine ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_EXISTS), "wrong error %#x\n", hr); curfile = get_task_curfile(task); -todo_wine ok(file_exists(curfile), "curfile should exist\n"); ITask_Release(task); task = NULL; hr = ITaskScheduler_Activate(scheduler, Task1, &IID_ITask, (IUnknown **)&task); -todo_wine ok(hr == S_OK, "Activate error %#x\n", hr); -todo_wine ok(task != NULL, "task should not be set to NULL\n"); - if (task == NULL) goto fail; curfile2 = get_task_curfile(task); ok(file_exists(curfile2), "curfile2 should exist\n"); @@ -380,7 +373,6 @@ todo_wine CoTaskMemFree(curfile); ITask_Release(task); -fail: ITaskScheduler_Release(scheduler); } -- 2.16.3

1 0

[PATCH 5/7] mstask: Implement ITaskScheduler::Activate().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task_scheduler.c | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task_scheduler.c b/dlls/mstask/task_scheduler.c index 6e17a57908..dd6eaf6b38 100644 --- a/dlls/mstask/task_scheduler.c +++ b/dlls/mstask/task_scheduler.c @@ -268,16 +268,38 @@ static HRESULT WINAPI MSTASK_ITaskScheduler_Enum( return create_task_enum(tasks); } -static HRESULT WINAPI MSTASK_ITaskScheduler_Activate( - ITaskScheduler* iface, - LPCWSTR pwszName, - REFIID riid, - IUnknown **ppunk) +static HRESULT WINAPI MSTASK_ITaskScheduler_Activate(ITaskScheduler *iface, + LPCWSTR task_name, REFIID riid, IUnknown **unknown) { - TRACE("%p, %s, %s, %p: stub\n", iface, debugstr_w(pwszName), - debugstr_guid(riid), ppunk); - FIXME("Partial stub always returning ERROR_FILE_NOT_FOUND\n"); - return HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND); + ITask *task; + IPersistFile *pfile; + HRESULT hr; + + TRACE("%p, %s, %s, %p\n", iface, debugstr_w(task_name), debugstr_guid(riid), unknown); + + hr = ITaskScheduler_NewWorkItem(iface, task_name, &CLSID_CTask, riid, (IUnknown **)&task); + if (hr != S_OK) return hr; + + hr = ITask_QueryInterface(task, &IID_IPersistFile, (void **)&pfile); + if (hr == S_OK) + { + WCHAR *curfile; + + hr = IPersistFile_GetCurFile(pfile, &curfile); + if (hr == S_OK) + { + hr = IPersistFile_Load(pfile, curfile, STGM_READ | STGM_SHARE_DENY_WRITE); + CoTaskMemFree(curfile); + } + + IPersistFile_Release(pfile); + } + + if (hr == S_OK) + *unknown = (IUnknown *)task; + else + ITask_Release(task); + return hr; } static HRESULT WINAPI MSTASK_ITaskScheduler_Delete( -- 2.16.3

1 0

[PATCH 4/7] mstask: Return S_OK from ITask::SetFlags().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 58e5c0e156..bfac8204b3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -479,7 +479,7 @@ static HRESULT WINAPI MSTASK_ITask_SetFlags( DWORD dwFlags) { FIXME("(%p, 0x%08x): stub\n", iface, dwFlags); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetFlags(ITask *iface, DWORD *flags) -- 2.16.3

1 0

[PATCH 3/7] mstask: Implement IPersistFile::Load().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 289 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 283 insertions(+), 6 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index a7fe199a3c..58e5c0e156 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -787,13 +787,290 @@ static HRESULT WINAPI MSTASK_IPersistFile_IsDirty( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_Load( - IPersistFile* iface, - LPCOLESTR pszFileName, - DWORD dwMode) +static DWORD load_unicode_strings(ITask *task, BYTE *data, DWORD limit) { - FIXME("(%p, %p, 0x%08x): stub\n", iface, pszFileName, dwMode); - return E_NOTIMPL; + DWORD i, data_size = 0; + USHORT len; + + for (i = 0; i < 5; i++) + { + if (limit < sizeof(USHORT)) + { + TRACE("invalid string %u offset\n", i); + break; + } + + len = *(USHORT *)data; + data += sizeof(USHORT); + data_size += sizeof(USHORT); + limit -= sizeof(USHORT); + if (limit < len * sizeof(WCHAR)) + { + TRACE("invalid string %u size\n", i); + break; + } + + TRACE("string %u: %s\n", i, wine_dbgstr_wn((const WCHAR *)data, len)); + + switch (i) + { + case 0: + ITask_SetApplicationName(task, (const WCHAR *)data); + break; + case 1: + ITask_SetParameters(task, (const WCHAR *)data); + break; + case 2: + ITask_SetWorkingDirectory(task, (const WCHAR *)data); + break; + case 3: + ITask_SetCreator(task, (const WCHAR *)data); + break; + case 4: + ITask_SetComment(task, (const WCHAR *)data); + break; + default: + break; + } + + data += len * sizeof(WCHAR); + data_size += len * sizeof(WCHAR); + } + + return data_size; +} + +static HRESULT load_job_data(TaskImpl *This, BYTE *data, DWORD size) +{ + ITask *task = &This->ITask_iface; + HRESULT hr; + const FIXDLEN_DATA *fixed; + const SYSTEMTIME *st; + DWORD unicode_strings_size, data_size, triggers_size; + USHORT instance_count, trigger_count, i; + const USHORT *signature; + TASK_TRIGGER *task_trigger; + + if (size < sizeof(*fixed)) + { + TRACE("no space for FIXDLEN_DATA\n"); + return SCHED_E_INVALID_TASK; + } + + fixed = (const FIXDLEN_DATA *)data; + + TRACE("product_version %04x\n", fixed->product_version); + TRACE("file_version %04x\n", fixed->file_version); + TRACE("uuid %s\n", wine_dbgstr_guid(&fixed->uuid)); + + if (fixed->file_version != 0x0001) + return SCHED_E_INVALID_TASK; + + TRACE("name_size_offset %04x\n", fixed->name_size_offset); + TRACE("trigger_offset %04x\n", fixed->trigger_offset); + TRACE("error_retry_count %u\n", fixed->error_retry_count); + TRACE("error_retry_interval %u\n", fixed->error_retry_interval); + TRACE("idle_deadline %u\n", fixed->idle_deadline); + This->deadline_minutes = fixed->idle_deadline; + TRACE("idle_wait %u\n", fixed->idle_wait); + This->idle_minutes = fixed->idle_wait; + TRACE("priority %08x\n", fixed->priority); + This->priority = fixed->priority; + TRACE("maximum_runtime %u\n", fixed->maximum_runtime); + This->maxRunTime = fixed->maximum_runtime; + TRACE("exit_code %#x\n", fixed->exit_code); + TRACE("status %08x\n", fixed->status); + TRACE("flags %08x\n", fixed->flags); + st = &fixed->last_runtime; + TRACE("last_runtime %d/%d/%d wday %d %d:%d:%d.%03d\n", + st->wDay, st->wMonth, st->wYear, st->wDayOfWeek, + st->wHour, st->wMinute, st->wSecond, st->wMilliseconds); + + /* Instance Count */ + if (size < sizeof(*fixed) + sizeof(USHORT)) + { + TRACE("no space for instance count\n"); + return SCHED_E_INVALID_TASK; + } + + instance_count = *(const USHORT *)(data + sizeof(*fixed)); + TRACE("instance count %u\n", instance_count); + + if (fixed->name_size_offset + sizeof(USHORT) < size) + unicode_strings_size = load_unicode_strings(task, data + fixed->name_size_offset, size - fixed->name_size_offset); + else + { + TRACE("invalid name_size_offset\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("unicode strings end at %#x\n", fixed->name_size_offset + unicode_strings_size); + + if (size < fixed->trigger_offset + sizeof(USHORT)) + { + TRACE("no space for triggers count\n"); + return SCHED_E_INVALID_TASK; + } + trigger_count = *(const USHORT *)(data + fixed->trigger_offset); + TRACE("trigger_count %u\n", trigger_count); + triggers_size = size - fixed->trigger_offset - sizeof(USHORT); + TRACE("triggers_size %u\n", triggers_size); + task_trigger = (TASK_TRIGGER *)(data + fixed->trigger_offset + sizeof(USHORT)); + + data += fixed->name_size_offset + unicode_strings_size; + size -= fixed->name_size_offset + unicode_strings_size; + + /* User Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for user data size\n"); + return SCHED_E_INVALID_TASK; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for user data\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("User Data size %#x\n", data_size); + ITask_SetWorkItemData(task, data_size, data + sizeof(USHORT)); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Reserved Data */ + if (size < sizeof(USHORT)) + { + TRACE("no space for reserved data size\n"); + return SCHED_E_INVALID_TASK; + } + + data_size = *(const USHORT *)data; + if (size < sizeof(USHORT) + data_size) + { + TRACE("no space for reserved data\n"); + return SCHED_E_INVALID_TASK; + } + TRACE("Reserved Data size %#x\n", data_size); + + size -= sizeof(USHORT) + data_size; + data += sizeof(USHORT) + data_size; + + /* Trigger Data */ + TRACE("trigger_offset %04x, triggers end at %04x\n", fixed->trigger_offset, + (DWORD)(fixed->trigger_offset + sizeof(USHORT) + trigger_count * sizeof(TASK_TRIGGER))); + + This->trigger_count = *(const USHORT *)data; + TRACE("trigger_count %u\n", trigger_count); + task_trigger = (TASK_TRIGGER *)(data + sizeof(USHORT)); + + if (This->trigger_count * sizeof(TASK_TRIGGER) > triggers_size) + { + TRACE("no space for triggers data\n"); + return SCHED_E_INVALID_TASK; + } + + for (i = 0; i < This->trigger_count; i++) + { + ITaskTrigger *trigger; + WORD idx; + + hr = ITask_CreateTrigger(task, &idx, &trigger); + if (hr != S_OK) return hr; + + hr = ITaskTrigger_SetTrigger(trigger, &task_trigger[i]); + ITaskTrigger_Release(trigger); + if (hr != S_OK) + { + ITask_DeleteTrigger(task, idx); + return hr; + } + } + + size -= sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); + data += sizeof(USHORT) + This->trigger_count * sizeof(TASK_TRIGGER); + + if (size < 2 * sizeof(USHORT) + 64) + { + TRACE("no space for signature\n"); + return S_OK; /* signature is optional */ + } + + signature = (const USHORT *)data; + TRACE("signature version %04x, client version %04x\n", signature[0], signature[1]); + + return S_OK; +} + +static HRESULT WINAPI MSTASK_IPersistFile_Load(IPersistFile *iface, LPCOLESTR file_name, DWORD mode) +{ + TaskImpl *This = impl_from_IPersistFile(iface); + HRESULT hr; + HANDLE file, mapping; + DWORD access, sharing, size; + void *data; + + TRACE("(%p, %s, 0x%08x)\n", iface, debugstr_w(file_name), mode); + + switch (mode & 0x000f) + { + default: + case STGM_READ: + access = GENERIC_READ; + break; + case STGM_WRITE: + case STGM_READWRITE: + access = GENERIC_READ | GENERIC_WRITE; + break; + } + + switch (mode & 0x00f0) + { + default: + case STGM_SHARE_DENY_NONE: + sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; + break; + case STGM_SHARE_DENY_READ: + sharing = FILE_SHARE_WRITE; + break; + case STGM_SHARE_DENY_WRITE: + sharing = FILE_SHARE_READ; + break; + case STGM_SHARE_EXCLUSIVE: + sharing = 0; + break; + } + + file = CreateFileW(file_name, access, sharing, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) + { + TRACE("Failed to open %s, error %u\n", debugstr_w(file_name), GetLastError()); + return HRESULT_FROM_WIN32(GetLastError()); + } + + size = GetFileSize(file, NULL); + + mapping = CreateFileMappingW(file, NULL, PAGE_READONLY, 0, 0, 0); + if (!mapping) + { + TRACE("Failed to create file mapping %s, error %u\n", debugstr_w(file_name), GetLastError()); + CloseHandle(file); + return HRESULT_FROM_WIN32(GetLastError()); + } + + data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + if (data) + { + hr = load_job_data(This, data, size); + UnmapViewOfFile(data); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + + CloseHandle(mapping); + CloseHandle(file); + + return hr; } static BOOL write_signature(HANDLE hfile) -- 2.16.3

1 0

[PATCH 2/7] mstask: Implement IPersistFile::GetCurFile().
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 ++++++++++----- dlls/mstask/tests/task_scheduler.c | 4 ---- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 8c9d479d55..a7fe199a3c 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -1069,12 +1069,17 @@ static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile( - IPersistFile* iface, - LPOLESTR *ppszFileName) +static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile(IPersistFile *iface, LPOLESTR *file_name) { - FIXME("(%p, %p): stub\n", iface, ppszFileName); - return E_NOTIMPL; + TaskImpl *This = impl_from_IPersistFile(iface); + + TRACE("(%p, %p)\n", iface, file_name); + + *file_name = CoTaskMemAlloc((strlenW(This->task_name) + 1) * sizeof(WCHAR)); + if (!*file_name) return E_OUTOFMEMORY; + + strcpyW(*file_name, This->task_name); + return S_OK; } static const ITaskVtbl MSTASK_ITaskVtbl = diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index ddbb66068f..fbee5ecb66 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -284,9 +284,7 @@ static WCHAR *get_task_curfile(ITask *task) ok(hr == S_OK, "QueryInterface error %#x\n", hr); curfile = NULL; hr = IPersistFile_GetCurFile(pfile, &curfile); -todo_wine ok(hr == S_OK, "GetCurFile error %#x\n", hr); -todo_wine ok(curfile && curfile[0] , "curfile should not be NULL\n"); if (0) /* crashes under Windows */ @@ -326,7 +324,6 @@ static void test_task_storage(void) curfile = get_task_curfile(task); ok(!file_exists(curfile), "curfile should not exist\n"); -todo_wine ok(!lstrcmpW(curfile, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile)); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task2); @@ -335,7 +332,6 @@ todo_wine curfile2 = get_task_curfile(task); ok(!file_exists(curfile2), "curfile2 should not exist\n"); -todo_wine ok(!lstrcmpW(curfile2, task_full_name), "name is wrong %s\n", wine_dbgstr_w(curfile2)); CoTaskMemFree(curfile); -- 2.16.3

1 0

[PATCH 1/7] mstask/tests: Also test the ITask::GetStatus() return value.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/tests/task.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6e3c997c10..6837782f2a 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -534,6 +534,7 @@ static void test_task_state(void) status = 0xdeadbeef; hr = ITask_GetStatus(test_task, &status); + ok(hr == S_OK, "GetStatus error %#x\n", hr); ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); if (0) /* crashes under Windows */ -- 2.16.3

1 0

[PATCH 2/2] schedsvc: Fix NetrJobDel return value in case of invalid job id.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 4 ++-- dlls/schedsvc/tests/atsvcapi.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 2010245fc6..e7e59a4c0a 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -589,7 +589,7 @@ DWORD __cdecl NetrJobAdd(ATSVC_HANDLE server_name, AT_INFO *info, DWORD *jobid) DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jobid) { - DWORD jobid, ret = ERROR_FILE_NOT_FOUND; + DWORD jobid, ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%u\n", debugstr_w(server_name), min_jobid, max_jobid); @@ -602,7 +602,7 @@ DWORD __cdecl NetrJobDel(ATSVC_HANDLE server_name, DWORD min_jobid, DWORD max_jo if (!job) { TRACE("job %u not found\n", jobid); - ret = ERROR_FILE_NOT_FOUND; + ret = APE_AT_ID_NOT_FOUND; break; } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 367c6dabc1..66f237ecab 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -108,6 +108,9 @@ START_TEST(atsvcapi) ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + ret = NetrJobDel(server_name, 0xdeadbeef, 0xdeadbeef); + ok(ret == APE_AT_ID_NOT_FOUND, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++) -- 2.16.3

1 0

[PATCH 1/2] schedsvc: Fix NetrJobGetInfo return value in case of invalid job id.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/schedsvc/atsvc.c | 3 ++- dlls/schedsvc/tests/atsvcapi.c | 8 +++++--- include/wine/atsvc.idl | 2 ++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 83e7dcadbc..2010245fc6 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -686,7 +686,7 @@ DWORD __cdecl NetrJobEnum(ATSVC_HANDLE server_name, AT_ENUM_CONTAINER *container DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **info) { struct job_t *job; - DWORD ret = ERROR_SUCCESS; + DWORD ret = APE_AT_ID_NOT_FOUND; TRACE("%s,%u,%p\n", debugstr_w(server_name), jobid, info); @@ -706,6 +706,7 @@ DWORD __cdecl NetrJobGetInfo(ATSVC_HANDLE server_name, DWORD jobid, AT_INFO **in info_ret->Flags = job->info.Flags; info_ret->Command = heap_strdupW(job->info.Command); *info = info_ret; + ret = ERROR_SUCCESS; } } diff --git a/dlls/schedsvc/tests/atsvcapi.c b/dlls/schedsvc/tests/atsvcapi.c index 2226480a35..367c6dabc1 100644 --- a/dlls/schedsvc/tests/atsvcapi.c +++ b/dlls/schedsvc/tests/atsvcapi.c @@ -58,7 +58,7 @@ START_TEST(atsvcapi) WCHAR server_name[MAX_COMPUTERNAME_LENGTH + 1]; PTOP_LEVEL_EXCEPTION_FILTER old_exception_filter; AT_ENUM_CONTAINER container; - AT_INFO info; + AT_INFO info, *info2; DWORD ret, i, total, start_index, jobid, try, try_count; BOOL found; @@ -104,6 +104,10 @@ START_TEST(atsvcapi) test_failures = 1; test_skipped = 0; + info2 = NULL; + ret = NetrJobGetInfo(server_name, 0xdeadbeef, &info2); + ok(ret == APE_AT_ID_NOT_FOUND || broken(1) /* vista and w2008 return rubbish here */, "wrong error %u\n", ret); + try_count = 5; for (try = 1; try <= try_count; try++) @@ -127,8 +131,6 @@ START_TEST(atsvcapi) for (i = 0; i < container.EntriesRead; i++) { - AT_INFO *info2; - trace("%u: jobid %u, command %s\n", i, container.Buffer[i].JobId, wine_dbgstr_w(container.Buffer[i].Command)); if (container.Buffer[i].JobId == jobid || diff --git a/include/wine/atsvc.idl b/include/wine/atsvc.idl index c1fce98074..5c723ed679 100644 --- a/include/wine/atsvc.idl +++ b/include/wine/atsvc.idl @@ -29,6 +29,8 @@ import "ocidl.idl"; ] interface atsvc { + const DWORD APE_AT_ID_NOT_FOUND = 0x00000ede; + typedef [handle] const WCHAR *ATSVC_HANDLE; typedef struct _AT_ENUM -- 2.16.3

1 0

[PATCH] sspicli: Add forwards to secur32.
by Dmitry Timoshkov 25 Apr '18

25 Apr '18

In Windows this is another way around, but that requires moving a lot of code from secur32 to sspicli. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/sspicli/sspicli.spec | 98 +++++++++++++++++++++++------------------------ tools/make_specfiles | 4 ++ 2 files changed, 53 insertions(+), 49 deletions(-) diff --git a/dlls/sspicli/sspicli.spec b/dlls/sspicli/sspicli.spec index e18d359a4b..38e166e9f0 100644 --- a/dlls/sspicli/sspicli.spec +++ b/dlls/sspicli/sspicli.spec @@ -1,61 +1,61 @@ -@ stub AcceptSecurityContext -@ stub AcquireCredentialsHandleA -@ stub AcquireCredentialsHandleW -@ stub AddCredentialsA -@ stub AddCredentialsW -@ stub AddSecurityPackageA -@ stub AddSecurityPackageW -@ stub ApplyControlToken +@ stdcall AcceptSecurityContext(ptr ptr ptr long long ptr ptr ptr ptr) secur32.AcceptSecurityContext +@ stdcall AcquireCredentialsHandleA(str str long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleA +@ stdcall AcquireCredentialsHandleW(wstr wstr long ptr ptr ptr ptr ptr ptr) secur32.AcquireCredentialsHandleW +@ stdcall AddCredentialsA(ptr str str long ptr ptr ptr ptr) secur32.AddCredentialsA +@ stdcall AddCredentialsW(ptr wstr wstr long ptr ptr ptr ptr) secur32.AddCredentialsW +@ stdcall AddSecurityPackageA(str ptr) secur32.AddSecurityPackageA +@ stdcall AddSecurityPackageW(wstr ptr) secur32.AddSecurityPackageW +@ stdcall ApplyControlToken(ptr ptr) secur32.ApplyControlToken @ stub ChangeAccountPasswordA @ stub ChangeAccountPasswordW -@ stub CompleteAuthToken +@ stdcall CompleteAuthToken(ptr ptr) secur32.CompleteAuthToken @ stub CredMarshalTargetInfo @ stub CredUnmarshalTargetInfo -@ stub DecryptMessage -@ stub DeleteSecurityContext +@ stdcall DecryptMessage(ptr ptr long ptr) secur32.DecryptMessage +@ stdcall DeleteSecurityContext(ptr) secur32.DeleteSecurityContext @ stub DeleteSecurityPackageA @ stub DeleteSecurityPackageW -@ stub EncryptMessage -@ stub EnumerateSecurityPackagesA -@ stub EnumerateSecurityPackagesW -@ stub ExportSecurityContext -@ stub FreeContextBuffer -@ stub FreeCredentialsHandle +@ stdcall EncryptMessage(ptr long ptr long) secur32.EncryptMessage +@ stdcall EnumerateSecurityPackagesA(ptr ptr) secur32.EnumerateSecurityPackagesA +@ stdcall EnumerateSecurityPackagesW(ptr ptr) secur32.EnumerateSecurityPackagesW +@ stdcall ExportSecurityContext(ptr long ptr ptr) secur32.ExportSecurityContext +@ stdcall FreeContextBuffer(ptr) secur32.FreeContextBuffer +@ stdcall FreeCredentialsHandle(ptr) secur32.FreeCredentialsHandle @ stub GetSecurityUserInfo -@ stub GetUserNameExA -@ stub GetUserNameExW -@ stub ImpersonateSecurityContext -@ stub ImportSecurityContextA -@ stub ImportSecurityContextW -@ stub InitializeSecurityContextA -@ stub InitializeSecurityContextW -@ stub InitSecurityInterfaceA -@ stub InitSecurityInterfaceW +@ stdcall GetUserNameExA(long ptr ptr) secur32.GetUserNameExA +@ stdcall GetUserNameExW(long ptr ptr) secur32.GetUserNameExW +@ stdcall ImpersonateSecurityContext(ptr) secur32.ImpersonateSecurityContext +@ stdcall ImportSecurityContextA(str ptr ptr ptr) secur32.ImportSecurityContextA +@ stdcall ImportSecurityContextW(wstr ptr ptr ptr) secur32.ImportSecurityContextW +@ stdcall InitializeSecurityContextA(ptr ptr str long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextA +@ stdcall InitializeSecurityContextW(ptr ptr wstr long long long ptr long ptr ptr ptr ptr) secur32.InitializeSecurityContextW +@ stdcall InitSecurityInterfaceA() secur32.InitSecurityInterfaceA +@ stdcall InitSecurityInterfaceW() secur32.InitSecurityInterfaceW @ stub LogonUserExExW -@ stub LsaCallAuthenticationPackage -@ stub LsaConnectUntrusted -@ stub LsaDeregisterLogonProcess -@ stub LsaEnumerateLogonSessions -@ stub LsaFreeReturnBuffer -@ stub LsaGetLogonSessionData -@ stub LsaLogonUser -@ stub LsaLookupAuthenticationPackage -@ stub LsaRegisterLogonProcess +@ stdcall LsaCallAuthenticationPackage(long long ptr long ptr ptr ptr) secur32.LsaCallAuthenticationPackage +@ stdcall LsaConnectUntrusted(ptr) secur32.LsaConnectUntrusted +@ stdcall LsaDeregisterLogonProcess(long) secur32.LsaDeregisterLogonProcess +@ stdcall LsaEnumerateLogonSessions(ptr ptr) secur32.LsaEnumerateLogonSessions +@ stdcall LsaFreeReturnBuffer(ptr) secur32.LsaFreeReturnBuffer +@ stdcall LsaGetLogonSessionData(ptr ptr) secur32.LsaGetLogonSessionData +@ stdcall LsaLogonUser(ptr ptr long long ptr long ptr ptr ptr ptr ptr ptr ptr ptr) secur32.LsaLogonUser +@ stdcall LsaLookupAuthenticationPackage(ptr ptr ptr) secur32.LsaLookupAuthenticationPackage +@ stdcall LsaRegisterLogonProcess(ptr ptr ptr) secur32.LsaRegisterLogonProcess @ stub LsaRegisterPolicyChangeNotification @ stub LsaUnregisterPolicyChangeNotification -@ stub MakeSignature -@ stub QueryContextAttributesA +@ stdcall MakeSignature(ptr long ptr long) secur32.MakeSignature +@ stdcall QueryContextAttributesA(ptr long ptr) secur32.QueryContextAttributesA @ stub QueryContextAttributesExA @ stub QueryContextAttributesExW -@ stub QueryContextAttributesW -@ stub QueryCredentialsAttributesA +@ stdcall QueryContextAttributesW(ptr long ptr) secur32.QueryContextAttributesW +@ stdcall QueryCredentialsAttributesA(ptr long ptr) secur32.QueryCredentialsAttributesA @ stub QueryCredentialsAttributesExA @ stub QueryCredentialsAttributesExW -@ stub QueryCredentialsAttributesW -@ stub QuerySecurityContextToken -@ stub QuerySecurityPackageInfoA -@ stub QuerySecurityPackageInfoW -@ stub RevertSecurityContext +@ stdcall QueryCredentialsAttributesW(ptr long ptr) secur32.QueryCredentialsAttributesW +@ stdcall QuerySecurityContextToken(ptr ptr) secur32.QuerySecurityContextToken +@ stdcall QuerySecurityPackageInfoA(str ptr) secur32.QuerySecurityPackageInfoA +@ stdcall QuerySecurityPackageInfoW(wstr ptr) secur32.QuerySecurityPackageInfoW +@ stdcall RevertSecurityContext(ptr) secur32.RevertSecurityContext @ stub SaslAcceptSecurityContext @ stub SaslEnumerateProfilesA @ stub SaslEnumerateProfilesW @@ -67,7 +67,7 @@ @ stub SaslInitializeSecurityContextA @ stub SaslInitializeSecurityContextW @ stub SaslSetContextOption -@ stub SealMessage +@ stdcall SealMessage(ptr long ptr long) secur32.SealMessage @ stub SecCacheSspiPackages @ stub SecDeleteUserModeContext @ stub SeciAllocateAndSetCallFlags @@ -75,8 +75,8 @@ @ stub SeciFreeCallContext @ stub SeciIsProtectedUser @ stub SecInitUserModeContext -@ stub SetContextAttributesA -@ stub SetContextAttributesW +@ stdcall SetContextAttributesA(ptr long ptr long) secur32.SetContextAttributesA +@ stdcall SetContextAttributesW(ptr long ptr long) secur32.SetContextAttributesW @ stub SetCredentialsAttributesA @ stub SetCredentialsAttributesW @ stub SspiCompareAuthIdentities @@ -100,5 +100,5 @@ @ stub SspiUnmarshalAuthIdentityInternal @ stub SspiValidateAuthIdentity @ stdcall SspiZeroAuthIdentity(ptr) -@ stub UnsealMessage -@ stub VerifySignature +@ stdcall UnsealMessage(ptr ptr long ptr) secur32.UnsealMessage +@ stdcall VerifySignature(ptr ptr long ptr) secur32.VerifySignature diff --git a/tools/make_specfiles b/tools/make_specfiles index 44023aa98c..6fe79f6cb7 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -329,6 +329,10 @@ my @dll_groups = "oleacc", "ext-ms-win-oleacc-l1-1-0", ], + [ + "secur32", + "sspicli", + ], [ "shell32", "api-ms-win-downlevel-shell32-l1-1-0", -- 2.16.3

1 0