Michael Stefaniuc : mstask: Actually run a test and fix the expected behaviour.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f70181113f72bc2ed02d1cb6117a2a958d3a04e5
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f70181113f72bc2ed02d1cb611...

Author: Michael Stefaniuc 
Date:   Wed May 16 11:28:37 2012 +0200

mstask: Actually run a test and fix the expected behaviour.

---

dlls/mstask/task_trigger.c       |    2 --
 dlls/mstask/tests/task_trigger.c |    3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/dlls/mstask/task_trigger.c b/dlls/mstask/task_trigger.c
index 307a605..448cf08 100644
--- a/dlls/mstask/task_trigger.c
+++ b/dlls/mstask/task_trigger.c
@@ -138,8 +138,6 @@ static HRESULT WINAPI MSTASK_ITaskTrigger_SetTrigger(
     if (pTrigger->MinutesDuration <= pTrigger->MinutesInterval &&
             pTrigger->MinutesInterval > 0)
         return E_INVALIDARG;
-    if (pTrigger->MinutesDuration > 0 && pTrigger->MinutesInterval == 0)
-        return E_INVALIDARG;
     tmp_trigger_cond.MinutesDuration = pTrigger->MinutesDuration;
     tmp_trigger_cond.MinutesInterval = pTrigger->MinutesInterval;

diff --git a/dlls/mstask/tests/task_trigger.c b/dlls/mstask/tests/task_trigger.c
index c64e1c5..0b64211 100644
--- a/dlls/mstask/tests/task_trigger.c
+++ b/dlls/mstask/tests/task_trigger.c
@@ -303,7 +303,8 @@ static void test_SetTrigger_GetTrigger(void)
     ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres);
     normal_trigger_state.MinutesDuration = 5;
     normal_trigger_state.MinutesInterval = 0;
-    ok(hres == E_INVALIDARG, "Expected E_INVALIDARG: 0x%08x\n", hres);
+    hres = ITaskTrigger_SetTrigger(test_trigger, &normal_trigger_state);
+    ok(hres == S_OK, "Failed to set trigger: 0x%08x\n", hres);
     normal_trigger_state.MinutesDuration = 0;
     normal_trigger_state.MinutesInterval = 0;