Commit 7c5f411e authored by Roy Shea's avatar Roy Shea Committed by Alexandre Julliard

mstask: Implemented CreateTrigger.

parent 5915b497
...@@ -94,8 +94,8 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger( ...@@ -94,8 +94,8 @@ static HRESULT WINAPI MSTASK_ITask_CreateTrigger(
WORD *piNewTrigger, WORD *piNewTrigger,
ITaskTrigger **ppTrigger) ITaskTrigger **ppTrigger)
{ {
FIXME("(%p, %p, %p): stub\n", iface, piNewTrigger, ppTrigger); TRACE("(%p, %p, %p)\n", iface, piNewTrigger, ppTrigger);
return E_NOTIMPL; return TaskTriggerConstructor((LPVOID *)ppTrigger);
} }
static HRESULT WINAPI MSTASK_ITask_DeleteTrigger( static HRESULT WINAPI MSTASK_ITask_DeleteTrigger(
......
...@@ -218,7 +218,7 @@ static void test_CreateTrigger(void) ...@@ -218,7 +218,7 @@ static void test_CreateTrigger(void)
} }
hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger); hres = ITask_CreateTrigger(test_task, &trigger_index, &test_trigger);
todo_wine ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres); ok(hres == S_OK, "Failed to create trigger: 0x%08x\n", hres);
if (hres != S_OK) if (hres != S_OK)
{ {
cleanup_task(); cleanup_task();
......
...@@ -66,7 +66,7 @@ static void cleanup_trigger(void) ...@@ -66,7 +66,7 @@ static void cleanup_trigger(void)
static BOOL compare_trigger_state(TASK_TRIGGER found_state, static BOOL compare_trigger_state(TASK_TRIGGER found_state,
TASK_TRIGGER expected_state) TASK_TRIGGER expected_state)
{ {
todo_wine ok(found_state.cbTriggerSize == expected_state.cbTriggerSize, ok(found_state.cbTriggerSize == expected_state.cbTriggerSize,
"cbTriggerSize: Found %d but expected %d\n", "cbTriggerSize: Found %d but expected %d\n",
found_state.cbTriggerSize, expected_state.cbTriggerSize); found_state.cbTriggerSize, expected_state.cbTriggerSize);
...@@ -162,7 +162,7 @@ static void test_SetTrigger_GetTrigger(void) ...@@ -162,7 +162,7 @@ static void test_SetTrigger_GetTrigger(void)
SYSTEMTIME time; SYSTEMTIME time;
setup = setup_trigger(); setup = setup_trigger();
todo_wine ok(setup, "Failed to setup test_task\n"); ok(setup, "Failed to setup test_task\n");
if (!setup) if (!setup)
{ {
skip("Failed to create task. Skipping tests.\n"); skip("Failed to create task. Skipping tests.\n");
...@@ -182,8 +182,7 @@ static void test_SetTrigger_GetTrigger(void) ...@@ -182,8 +182,7 @@ static void test_SetTrigger_GetTrigger(void)
trigger_state.cbTriggerSize = sizeof(trigger_state); trigger_state.cbTriggerSize = sizeof(trigger_state);
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
todo_wine ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres); todo_wine ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres);
todo_wine ok(compare_trigger_state(trigger_state, empty_trigger_state), compare_trigger_state(trigger_state, empty_trigger_state);
"Invalid state\n");
/* Test setting basic empty trigger */ /* Test setting basic empty trigger */
hres = ITaskTrigger_SetTrigger(test_trigger, &empty_trigger_state); hres = ITaskTrigger_SetTrigger(test_trigger, &empty_trigger_state);
...@@ -192,8 +191,7 @@ static void test_SetTrigger_GetTrigger(void) ...@@ -192,8 +191,7 @@ static void test_SetTrigger_GetTrigger(void)
trigger_state.cbTriggerSize = sizeof(trigger_state); trigger_state.cbTriggerSize = sizeof(trigger_state);
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
todo_wine ok(hres == S_OK, "Failed to GetTrigger\n"); todo_wine ok(hres == S_OK, "Failed to GetTrigger\n");
todo_wine ok(compare_trigger_state(trigger_state, empty_trigger_state), compare_trigger_state(trigger_state, empty_trigger_state);
"Invalid state\n");
/* Test setting basic non-empty trigger */ /* Test setting basic non-empty trigger */
hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state); hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state);
...@@ -202,8 +200,7 @@ static void test_SetTrigger_GetTrigger(void) ...@@ -202,8 +200,7 @@ static void test_SetTrigger_GetTrigger(void)
trigger_state.cbTriggerSize = sizeof(trigger_state); trigger_state.cbTriggerSize = sizeof(trigger_state);
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
todo_wine ok(hres == S_OK, "Failed to GetTrigger\n"); todo_wine ok(hres == S_OK, "Failed to GetTrigger\n");
todo_wine ok(compare_trigger_state(trigger_state, normal_trigger_state), compare_trigger_state(trigger_state, normal_trigger_state);
"Invalid state\n");
/* The following tests modify the normal_trigger_state structure /* The following tests modify the normal_trigger_state structure
* before each test, and return the normal_trigger_state structure * before each test, and return the normal_trigger_state structure
...@@ -331,10 +328,10 @@ static void test_SetTrigger_GetTrigger(void) ...@@ -331,10 +328,10 @@ static void test_SetTrigger_GetTrigger(void)
memset(&trigger_state, 0xcf, sizeof(trigger_state)); memset(&trigger_state, 0xcf, sizeof(trigger_state));
trigger_state.cbTriggerSize = sizeof(trigger_state); trigger_state.cbTriggerSize = sizeof(trigger_state);
hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state); hres = ITaskTrigger_GetTrigger(test_trigger, &trigger_state);
todo_wine ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf, ok(trigger_state.Type.Weekly.WeeksInterval == 0xcfcf,
"Expected WeeksInterval set remain untouched: %d\n", "Expected WeeksInterval set remain untouched: %d\n",
trigger_state.Type.Weekly.WeeksInterval); trigger_state.Type.Weekly.WeeksInterval);
todo_wine ok(trigger_state.Type.Weekly.rgfDaysOfTheWeek == 0xcfcf, ok(trigger_state.Type.Weekly.rgfDaysOfTheWeek == 0xcfcf,
"Expected WeeksInterval set remain untouched: %d\n", "Expected WeeksInterval set remain untouched: %d\n",
trigger_state.Type.Weekly.rgfDaysOfTheWeek); trigger_state.Type.Weekly.rgfDaysOfTheWeek);
normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY; normal_trigger_state.TriggerType = TASK_TIME_TRIGGER_DAILY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment