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

[PATCH 1/5] d3drm: Add viewport to the device before setting viewport parameters.
by Matteo Bruni 20 Apr '18

20 Apr '18

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3drm/viewport.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 37c70c8db20..5c0e24bc429 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -339,6 +339,9 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 if (FAILED(hr = IDirect3D_CreateViewport(d3d1, &viewport->d3d_viewport, NULL))) goto cleanup; + if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport))) + goto cleanup; + vp.dwSize = sizeof(vp); vp.dwWidth = width; vp.dwHeight = height; @@ -355,9 +358,6 @@ static HRESULT WINAPI d3drm_viewport2_Init(IDirect3DRMViewport2 *iface, IDirect3 if (FAILED(hr = IDirect3DViewport_SetViewport(viewport->d3d_viewport, &vp))) goto cleanup; - if (FAILED(hr = IDirect3DDevice_AddViewport(d3d_device, viewport->d3d_viewport))) - goto cleanup; - if (FAILED(hr = IDirect3DRMFrame3_QueryInterface(camera, &IID_IDirect3DRMFrame, (void **)&viewport->camera))) goto cleanup; -- 2.13.6

3 9

[PATCH 1/6] msi: Make MsiViewClose() RPC-compatible.
by Zebediah Figura 20 Apr '18

20 Apr '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/msiquery.c | 16 ++++++++++++++-- dlls/msi/tests/custom.c | 3 +++ dlls/msi/winemsi.idl | 1 + 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/msi/msiquery.c b/dlls/msi/msiquery.c index 6eddf7a..682881e 100644 --- a/dlls/msi/msiquery.c +++ b/dlls/msi/msiquery.c @@ -440,8 +440,15 @@ UINT WINAPI MsiViewClose(MSIHANDLE hView) TRACE("%d\n", hView ); query = msihandle2msiinfo( hView, MSIHANDLETYPE_VIEW ); - if( !query ) - return ERROR_INVALID_HANDLE; + if (!query) + { + MSIHANDLE remote; + + if (!(remote = msi_get_remote(hView))) + return ERROR_INVALID_HANDLE; + + return remote_ViewClose(remote); + } ret = MSI_ViewClose( query ); msiobj_release( &query->hdr ); @@ -1055,6 +1062,11 @@ MSICONDITION WINAPI MsiDatabaseIsTablePersistentW( return r; } +UINT __cdecl remote_ViewClose(MSIHANDLE view) +{ + return MsiViewClose(view); +} + UINT __cdecl remote_ViewExecute(MSIHANDLE view, struct wire_record *remote_rec) { MSIHANDLE rec = 0; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 479cb93..3d7ebb9 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -316,6 +316,9 @@ static void test_db(MSIHANDLE hinst) ok(hinst, r == ERROR_NO_MORE_ITEMS, "got %u\n", r); ok(hinst, !rec2, "got %u\n", rec2); + r = MsiViewClose(view); + ok(hinst, !r, "got %u\n", r); + r = MsiCloseHandle(view); ok(hinst, !r, "got %u\n", r); diff --git a/dlls/msi/winemsi.idl b/dlls/msi/winemsi.idl index b892f34..74b5923 100644 --- a/dlls/msi/winemsi.idl +++ b/dlls/msi/winemsi.idl @@ -56,6 +56,7 @@ struct wire_record { ] interface IWineMsiRemote { + UINT remote_ViewClose( [in] MSIHANDLE view ); UINT remote_ViewExecute( [in] MSIHANDLE view, [in, unique] struct wire_record *record ); UINT remote_ViewFetch( [in] MSIHANDLE view, [out] struct wire_record **record ); -- 2.7.4

3 16

[PATCH 9/9] mstask: Implement IPersistFile::Save().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 287 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 279 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 19bd919ec1..d64860a817 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -31,6 +31,25 @@ WINE_DEFAULT_DEBUG_CHANNEL(mstask); +typedef struct +{ + USHORT product_version; + USHORT file_version; + UUID uuid; + USHORT name_size_offset; + USHORT trigger_offset; + USHORT error_retry_count; + USHORT error_retry_interval; + USHORT idle_deadline; + USHORT idle_wait; + UINT priority; + UINT maximum_runtime; + UINT exit_code; + HRESULT status; + UINT flags; + SYSTEMTIME last_runtime; +} FIXDLEN_DATA; + typedef struct { ITask ITask_iface; @@ -731,17 +750,270 @@ static HRESULT WINAPI MSTASK_IPersistFile_Load( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_IPersistFile_Save( - IPersistFile* iface, - LPCOLESTR pszFileName, - BOOL fRemember) +static BOOL write_signature(HANDLE hfile) { - FIXME("(%p, %p, %d): stub\n", iface, pszFileName, fRemember); - WARN("Returning S_OK but not writing to disk: %s %d\n", - debugstr_w(pszFileName), fRemember); + struct + { + USHORT SignatureVersion; + USHORT ClientVersion; + BYTE md5[64]; + } signature; + DWORD size; + + signature.SignatureVersion = 0x0001; + signature.ClientVersion = 0x0001; + memset(&signature.md5, 0, sizeof(signature.md5)); + + return WriteFile(hfile, &signature, sizeof(signature), &size, NULL); +} + +static BOOL write_reserved_data(HANDLE hfile) +{ + static const struct + { + USHORT size; + BYTE data[8]; + } user = { 8, { 0xff,0x0f,0x1d,0,0,0,0,0 } }; + DWORD size; + + return WriteFile(hfile, &user, sizeof(user), &size, NULL); +} + +static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size) +{ + DWORD size; + + if (!WriteFile(hfile, &data_size, sizeof(data_size), &size, NULL)) + return FALSE; + + if (!data_size) return TRUE; + + return WriteFile(hfile, data, data_size, &size, NULL); +} + +static HRESULT write_triggers(ITask *task, HANDLE hfile) +{ + WORD count, i; + DWORD size; + HRESULT hr; + + hr = ITask_GetTriggerCount(task, &count); + if (hr != S_OK) return hr; + + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + + for (i = 0; i < count; i++) + { + ITaskTrigger *trigger; + TASK_TRIGGER task_trigger; + + hr = ITask_GetTrigger(task, i, &trigger); + if (hr != S_OK) return hr; + + hr = ITaskTrigger_GetTrigger(trigger, &task_trigger); + ITaskTrigger_Release(trigger); + if (hr != S_OK) return hr; + + if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL)) + return HRESULT_FROM_WIN32(GetLastError()); + } + return S_OK; } +static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str) +{ + USHORT count; + DWORD size; + + count = str ? (lstrlenW(str) + 1) : 0; + if (!WriteFile(hfile, &count, sizeof(count), &size, NULL)) + return FALSE; + + if (!str) return TRUE; + + count *= sizeof(WCHAR); + return WriteFile(hfile, str, count, &size, NULL); +} + +static HRESULT WINAPI MSTASK_IPersistFile_Save(IPersistFile *iface, LPCOLESTR 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; + WORD word, user_data_size = 0; + HANDLE hfile; + DWORD size, ver, disposition; + TaskImpl *This = impl_from_IPersistFile(iface); + 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); + + disposition = name ? CREATE_NEW : OPEN_ALWAYS; + + if (!name) + { + 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; + ITask_GetCreator(task, &creator); + if (!creator) creator = authorW; + ITask_GetApplicationName(task, &appname); + ITask_GetParameters(task, &params); + ITask_GetWorkingDirectory(task, &workdir); + ITask_GetWorkItemData(task, &user_data_size, &user_data); + + ver = GetVersion(); + fixed.product_version = MAKEWORD(ver >> 8, ver); + fixed.file_version = 0x0001; + CoCreateGuid(&fixed.uuid); + fixed.name_size_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset = sizeof(fixed) + sizeof(USHORT); /* FIXDLEN_DATA + Instance Count */ + fixed.trigger_offset += sizeof(USHORT); /* Application Name */ + if (appname) + fixed.trigger_offset += (lstrlenW(appname) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Parameters */ + if (params) + fixed.trigger_offset += (lstrlenW(params) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Working Directory */ + if (workdir) + fixed.trigger_offset += (lstrlenW(workdir) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Author */ + if (creator) + fixed.trigger_offset += (lstrlenW(creator) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT); /* Comment */ + if (comment) + fixed.trigger_offset += (lstrlenW(comment) + 1) * sizeof(WCHAR); + fixed.trigger_offset += sizeof(USHORT) + user_data_size; /* User Data */ + fixed.trigger_offset += 10; /* Reserved Data */ + + fixed.error_retry_count = 0; + fixed.error_retry_interval = 0; + fixed.idle_wait = This->idle_minutes; + fixed.idle_deadline = This->deadline_minutes; + fixed.priority = This->priority; + fixed.maximum_runtime = This->maxRunTime; + fixed.exit_code = 0; + fixed.status = SCHED_S_TASK_HAS_NOT_RUN; + fixed.flags = 0; + memset(&fixed.last_runtime, 0, sizeof(fixed.last_runtime)); + + hfile = CreateFileW(task_name, GENERIC_WRITE, 0, NULL, disposition, 0, 0); + if (hfile == INVALID_HANDLE_VALUE) + return HRESULT_FROM_WIN32(GetLastError()); + + if (!WriteFile(hfile, &fixed, sizeof(fixed), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Instance Count */ + word = 0; + if (!WriteFile(hfile, &word, sizeof(word), &size, NULL)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Application Name */ + if (!write_unicode_string(hfile, appname)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Parameters */ + if (!write_unicode_string(hfile, params)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Working Directory */ + if (!write_unicode_string(hfile, workdir)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Author */ + if (!write_unicode_string(hfile, creator)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + /* Comment */ + if (!write_unicode_string(hfile, comment)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* User Data */ + if (!write_user_data(hfile, user_data, user_data_size)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Reserved Data */ + if (!write_reserved_data(hfile)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Trigegrs */ + if (!write_triggers(hfile, task)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + /* Signature */ + if (!write_signature(hfile)) + { + hr = HRESULT_FROM_WIN32(GetLastError()); + goto failed; + } + + hr = S_OK; + +failed: + CoTaskMemFree(appname); + CoTaskMemFree(params); + CoTaskMemFree(workdir); + if (creator != authorW) + CoTaskMemFree(creator); + if (comment != commentW) + CoTaskMemFree(comment); + CoTaskMemFree(user_data); + + CloseHandle(hfile); + if (hr != S_OK) + DeleteFileW(name); + else if (remember) + { + HeapFree(GetProcessHeap(), 0, This->task_name); + This->task_name = heap_strdupW(name); + } + return hr; +} + static HRESULT WINAPI MSTASK_IPersistFile_SaveCompleted( IPersistFile* iface, LPCOLESTR pszFileName) @@ -758,7 +1030,6 @@ static HRESULT WINAPI MSTASK_IPersistFile_GetCurFile( return E_NOTIMPL; } - static const ITaskVtbl MSTASK_ITaskVtbl = { MSTASK_ITask_QueryInterface, -- 2.16.3

2 3

[PATCH 8/9] mstask: Implement better stub for ITask::GetMostRecentRunTime().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index ed0ef65625..19bd919ec1 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -225,12 +225,12 @@ static HRESULT WINAPI MSTASK_ITask_EditWorkItem( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime( - ITask* iface, - SYSTEMTIME *pstLastRun) +static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime(ITask *iface, SYSTEMTIME *st) { - FIXME("(%p, %p): stub\n", iface, pstLastRun); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, st); + + memset(st, 0, sizeof(*st)); + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 6184604467..6e3c997c10 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -503,6 +503,7 @@ static void test_task_state(void) HRESULT hr, status; DWORD flags, val; WORD val1, val2; + SYSTEMTIME st; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -573,6 +574,19 @@ static void test_task_state(void) ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); ok(val == 0, "got %#x\n", val); + if (0) /* crashes under Windows */ + hr = ITask_GetMostRecentRunTime(test_task, NULL); + + memset(&st, 0xff, sizeof(st)); + hr = ITask_GetMostRecentRunTime(test_task, &st); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(st.wYear == 0, "got %u\n", st.wYear); + ok(st.wMonth == 0, "got %u\n", st.wMonth); + ok(st.wDay == 0, "got %u\n", st.wDay); + ok(st.wHour == 0, "got %u\n", st.wHour); + ok(st.wMinute == 0, "got %u\n", st.wMinute); + ok(st.wSecond == 0, "got %u\n", st.wSecond); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 7/9] mstask: Implement better stub for ITask::GetExitCode().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 10 +++++----- dlls/mstask/tests/task.c | 8 ++++++++ 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 27f476699b..ed0ef65625 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -243,12 +243,12 @@ static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) return S_OK; } -static HRESULT WINAPI MSTASK_ITask_GetExitCode( - ITask* iface, - DWORD *pdwExitCode) +static HRESULT WINAPI MSTASK_ITask_GetExitCode(ITask *iface, DWORD *exit_code) { - FIXME("(%p, %p): stub\n", iface, pdwExitCode); - return E_NOTIMPL; + FIXME("(%p, %p): stub\n", iface, exit_code); + + *exit_code = 0; + return SCHED_S_TASK_HAS_NOT_RUN; } static HRESULT WINAPI MSTASK_ITask_SetComment(ITask *iface, LPCWSTR comment) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 5952b53692..6184604467 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -565,6 +565,14 @@ static void test_task_state(void) ok(hr == S_OK, "got %#x\n", hr); ok(val == NORMAL_PRIORITY_CLASS, "got %#x\n", val); + if (0) /* crashes under Windows */ + hr = ITask_GetExitCode(test_task, NULL); + + val = 0xdeadbeef; + hr = ITask_GetExitCode(test_task, &val); + ok(hr == SCHED_S_TASK_HAS_NOT_RUN, "got %#x\n", hr); + ok(val == 0, "got %#x\n", val); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 6/9] mstask: Implement ITask::GetPriority().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 15 +++++++++------ dlls/mstask/tests/task.c | 10 +++++++++- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c2cd14ee10..27f476699b 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -41,7 +41,7 @@ typedef struct LPWSTR task_name; HRESULT status; WORD idle_minutes, deadline_minutes; - DWORD maxRunTime; + DWORD priority, maxRunTime; LPWSTR accountName; } TaskImpl; @@ -626,12 +626,14 @@ static HRESULT WINAPI MSTASK_ITask_SetPriority( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetPriority( - ITask* iface, - DWORD *pdwPriority) +static HRESULT WINAPI MSTASK_ITask_GetPriority(ITask *iface, DWORD *priority) { - FIXME("(%p, %p): stub\n", iface, pdwPriority); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, priority); + + *priority = This->priority; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_SetTaskFlags( @@ -845,6 +847,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->status = SCHED_S_TASK_NOT_SCHEDULED; This->idle_minutes = 10; This->deadline_minutes = 60; + This->priority = NORMAL_PRIORITY_CLASS; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 55e491366f..5952b53692 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -501,7 +501,7 @@ static void test_task_state(void) { BOOL setup; HRESULT hr, status; - DWORD flags; + DWORD flags, val; WORD val1, val2; setup = setup_task(); @@ -557,6 +557,14 @@ static void test_task_state(void) ok(val1 == 10, "got %u\n", val1); ok(val2 == 60, "got %u\n", val2); + if (0) /* crashes under Windows */ + hr = ITask_GetPriority(test_task, NULL); + + val = 0xdeadbeef; + hr = ITask_GetPriority(test_task, &val); + ok(hr == S_OK, "got %#x\n", hr); + ok(val == NORMAL_PRIORITY_CLASS, "got %#x\n", val); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 5/9] mstask: Implement ITask::GetIdleWait().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 17 +++++++++++------ dlls/mstask/tests/task.c | 12 +++++++++++- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 3f68afb497..c2cd14ee10 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -40,6 +40,7 @@ typedef struct IExecAction *action; LPWSTR task_name; HRESULT status; + WORD idle_minutes, deadline_minutes; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -190,13 +191,15 @@ static HRESULT WINAPI MSTASK_ITask_SetIdleWait( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetIdleWait( - ITask* iface, - WORD *pwIdleMinutes, - WORD *pwDeadlineMinutes) +static HRESULT WINAPI MSTASK_ITask_GetIdleWait(ITask *iface, WORD *idle_minutes, WORD *deadline_minutes) { - FIXME("(%p, %p, %p): stub\n", iface, pwIdleMinutes, pwDeadlineMinutes); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p, %p): stub\n", iface, idle_minutes, deadline_minutes); + + *idle_minutes = This->idle_minutes; + *deadline_minutes = This->deadline_minutes; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_Run( @@ -840,6 +843,8 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->task = taskdef; This->task_name = heap_strdupW(task_name); This->status = SCHED_S_TASK_NOT_SCHEDULED; + This->idle_minutes = 10; + This->deadline_minutes = 60; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 5256424e31..55e491366f 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -502,7 +502,7 @@ static void test_task_state(void) BOOL setup; HRESULT hr, status; DWORD flags; - WORD val1; + WORD val1, val2; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -547,6 +547,16 @@ static void test_task_state(void) hr = ITask_GetErrorRetryInterval(test_task, &val1); ok(hr == E_NOTIMPL, "got %#x\n", hr); + if (0) /* crashes under Windows */ + hr = ITask_GetIdleWait(test_task, NULL, NULL); + + val1 = 0xdead; + val2 = 0xbeef; + hr = ITask_GetIdleWait(test_task, &val1, &val2); + ok(hr == S_OK, "got %#x\n", hr); + ok(val1 == 10, "got %u\n", val1); + ok(val2 == 60, "got %u\n", val2); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 4/9] mstask: ITask::GetErrorRetryInterval() is not implemented.
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 6 ++---- dlls/mstask/tests/task.c | 6 ++++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index 26cefcdc9f..3f68afb497 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -400,11 +400,9 @@ static HRESULT WINAPI MSTASK_ITask_SetErrorRetryInterval( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval( - ITask* iface, - WORD *pwRetryInterval) +static HRESULT WINAPI MSTASK_ITask_GetErrorRetryInterval(ITask *iface, WORD *interval) { - FIXME("(%p, %p): stub\n", iface, pwRetryInterval); + TRACE("(%p, %p)\n", iface, interval); return E_NOTIMPL; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 3739db0692..5256424e31 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -541,6 +541,12 @@ static void test_task_state(void) hr = ITask_GetErrorRetryCount(test_task, &val1); ok(hr == E_NOTIMPL, "got %#x\n", hr); + if (0) /* crashes under Windows */ + hr = ITask_GetErrorRetryInterval(test_task, NULL); + + hr = ITask_GetErrorRetryInterval(test_task, &val1); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 3/9] mstask: ITask::GetErrorRetryCount() is not implemented.
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 6 ++---- dlls/mstask/tests/task.c | 7 +++++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index d144f98ee3..26cefcdc9f 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -386,11 +386,9 @@ static HRESULT WINAPI MSTASK_ITask_SetErrorRetryCount( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetErrorRetryCount( - ITask* iface, - WORD *pwRetryCount) +static HRESULT WINAPI MSTASK_ITask_GetErrorRetryCount(ITask *iface, WORD *count) { - FIXME("(%p, %p): stub\n", iface, pwRetryCount); + TRACE("(%p, %p)\n", iface, count); return E_NOTIMPL; } diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index cc855beb66..3739db0692 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -502,6 +502,7 @@ static void test_task_state(void) BOOL setup; HRESULT hr, status; DWORD flags; + WORD val1; setup = setup_task(); ok(setup, "Failed to setup test_task\n"); @@ -534,6 +535,12 @@ static void test_task_state(void) hr = ITask_GetStatus(test_task, &status); ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + if (0) /* crashes under Windows */ + hr = ITask_GetErrorRetryCount(test_task, NULL); + + hr = ITask_GetErrorRetryCount(test_task, &val1); + ok(hr == E_NOTIMPL, "got %#x\n", hr); + cleanup_task(); } -- 2.16.3

1 0

[PATCH 2/9] mstask: Implement ITask::GetStatus().
by Dmitry Timoshkov 20 Apr '18

20 Apr '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/mstask/task.c | 14 +++++++++----- dlls/mstask/tests/task.c | 14 +++++++++++--- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c index c4e9f84a3f..d144f98ee3 100644 --- a/dlls/mstask/task.c +++ b/dlls/mstask/task.c @@ -39,6 +39,7 @@ typedef struct ITaskDefinition *task; IExecAction *action; LPWSTR task_name; + HRESULT status; DWORD maxRunTime; LPWSTR accountName; } TaskImpl; @@ -229,12 +230,14 @@ static HRESULT WINAPI MSTASK_ITask_GetMostRecentRunTime( return E_NOTIMPL; } -static HRESULT WINAPI MSTASK_ITask_GetStatus( - ITask* iface, - HRESULT *phrStatus) +static HRESULT WINAPI MSTASK_ITask_GetStatus(ITask *iface, HRESULT *status) { - FIXME("(%p, %p): stub\n", iface, phrStatus); - return E_NOTIMPL; + TaskImpl *This = impl_from_ITask(iface); + + TRACE("(%p, %p)\n", iface, status); + + *status = This->status; + return S_OK; } static HRESULT WINAPI MSTASK_ITask_GetExitCode( @@ -840,6 +843,7 @@ HRESULT TaskConstructor(ITaskService *service, const WCHAR *task_name, ITask **t This->ref = 1; This->task = taskdef; This->task_name = heap_strdupW(task_name); + This->status = SCHED_S_TASK_NOT_SCHEDULED; This->accountName = NULL; /* Default time is 3 days = 259200000 ms */ diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index 956aa0bbd0..cc855beb66 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.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 @@ -496,10 +497,10 @@ static void test_SetAccountInformation_GetAccountInformation(void) return; } -static void test_GetFlags(void) +static void test_task_state(void) { BOOL setup; - HRESULT hr; + HRESULT hr, status; DWORD flags; setup = setup_task(); @@ -526,6 +527,13 @@ static void test_GetFlags(void) ok(hr == S_OK, "GetTaskFlags error %#x\n", hr); ok(flags == 0, "got %#x\n", flags); + if (0) /* crashes under Windows */ + hr = ITask_GetStatus(test_task, NULL); + + status = 0xdeadbeef; + hr = ITask_GetStatus(test_task, &status); + ok(status == SCHED_S_TASK_NOT_SCHEDULED, "got %#x\n", status); + cleanup_task(); } @@ -538,6 +546,6 @@ START_TEST(task) test_SetComment_GetComment(); test_SetMaxRunTime_GetMaxRunTime(); test_SetAccountInformation_GetAccountInformation(); - test_GetFlags(); + test_task_state(); CoUninitialize(); } -- 2.16.3

1 0