Dmitry Timoshkov : mstask: Improve ITask::GetNextRunTime() stub.
Alexandre Julliard
julliard at winehq.org
Thu Apr 26 16:18:17 CDT 2018
Module: wine
Branch: master
Commit: 8d7d858d2bad9b0db103887661c2a275006fd9eb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d7d858d2bad9b0db103887661c2a275006fd9eb
Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date: Thu Apr 26 17:17:31 2018 +0800
mstask: Improve ITask::GetNextRunTime() stub.
Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mstask/task.c | 10 +++++-----
dlls/mstask/tests/task_trigger.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c
index 5f1dc1d..8672104 100644
--- a/dlls/mstask/task.c
+++ b/dlls/mstask/task.c
@@ -240,12 +240,12 @@ static HRESULT WINAPI MSTASK_ITask_GetRunTimes(
return E_NOTIMPL;
}
-static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(
- ITask* iface,
- SYSTEMTIME *pstNextRun)
+static HRESULT WINAPI MSTASK_ITask_GetNextRunTime(ITask *iface, SYSTEMTIME *st)
{
- FIXME("(%p, %p): stub\n", iface, pstNextRun);
- return E_NOTIMPL;
+ FIXME("(%p, %p): stub\n", iface, st);
+
+ memset(st, 0, sizeof(*st));
+ return SCHED_S_TASK_NO_VALID_TRIGGERS;
}
static HRESULT WINAPI MSTASK_ITask_SetIdleWait(
diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c
index a1b5597..ab081a7 100644
--- a/dlls/mstask/tests/task_trigger.c
+++ b/dlls/mstask/tests/task_trigger.c
@@ -439,6 +439,44 @@ static void test_task_trigger(void)
ok(ref == 0, "got %u\n", ref);
}
+static void test_GetNextRunTime(void)
+{
+ static const WCHAR task_name[] = { 'T','e','s','t','i','n','g',0 };
+ static const SYSTEMTIME st_empty;
+ HRESULT hr;
+ ITask *task;
+ ITaskTrigger *trigger;
+ WORD idx;
+ SYSTEMTIME st;
+
+ hr = ITaskScheduler_NewWorkItem(test_task_scheduler, task_name, &CLSID_CTask,
+ &IID_ITask, (IUnknown **)&task);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ if (0) /* crashes under Windows */
+ hr = ITask_GetNextRunTime(task, NULL);
+
+ memset(&st, 0xff, sizeof(st));
+ hr = ITask_GetNextRunTime(task, &st);
+ ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr);
+ ok(!memcmp(&st, &st_empty, sizeof(st)), "got %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);
+
+ hr = ITask_CreateTrigger(task, &idx, &trigger);
+ ok(hr == S_OK, "got %#x\n", hr);
+
+ memset(&st, 0xff, sizeof(st));
+ hr = ITask_GetNextRunTime(task, &st);
+ ok(hr == SCHED_S_TASK_NO_VALID_TRIGGERS, "got %#x\n", hr);
+ ok(!memcmp(&st, &st_empty, sizeof(st)), "got %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);
+
+ ITaskTrigger_Release(trigger);
+ ITask_Release(task);
+}
+
START_TEST(task_trigger)
{
HRESULT hr;
@@ -451,6 +489,7 @@ START_TEST(task_trigger)
test_SetTrigger_GetTrigger();
test_task_trigger();
+ test_GetNextRunTime();
ITaskScheduler_Release(test_task_scheduler);
CoUninitialize();
More information about the wine-cvs
mailing list