Dmitry Timoshkov : mstask: Save a task with at least 1 trigger to follow the .job file spec.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 66d8e7f6a96a230fd44d094cbea82c512726965e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=66d8e7f6a96a230fd44d094cb...

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Tue Apr 24 16:13:24 2018 +0800

mstask: Save a task with at least 1 trigger to follow the .job file spec.

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/mstask/task.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/dlls/mstask/task.c b/dlls/mstask/task.c
index d64860a..e390aa6 100644
--- a/dlls/mstask/task.c
+++ b/dlls/mstask/task.c
@@ -793,9 +793,10 @@ static BOOL write_user_data(HANDLE hfile, BYTE *data, WORD data_size)
 
 static HRESULT write_triggers(ITask *task, HANDLE hfile)
 {
-    WORD count, i;
+    WORD count, i, idx = 0xffff;
     DWORD size;
     HRESULT hr;
+    ITaskTrigger *trigger;
 
     hr = ITask_GetTriggerCount(task, &count);
     if (hr != S_OK) return hr;
@@ -803,9 +804,18 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile)
     if (!WriteFile(hfile, &count, sizeof(count), &size, NULL))
         return HRESULT_FROM_WIN32(GetLastError());
 
+    /* Windows saves a .job with at least 1 trigger */
+    if (!count)
+    {
+        hr = ITask_CreateTrigger(task, &idx, &trigger);
+        if (hr != S_OK) return hr;
+        ITaskTrigger_Release(trigger);
+
+        count = 1;
+    }
+
     for (i = 0; i < count; i++)
     {
-        ITaskTrigger *trigger;
         TASK_TRIGGER task_trigger;
 
         hr = ITask_GetTrigger(task, i, &trigger);
@@ -813,13 +823,16 @@ static HRESULT write_triggers(ITask *task, HANDLE hfile)
 
         hr = ITaskTrigger_GetTrigger(trigger, &task_trigger);
         ITaskTrigger_Release(trigger);
-        if (hr != S_OK) return hr;
+        if (hr != S_OK) break;
 
         if (!WriteFile(hfile, &task_trigger, sizeof(task_trigger), &size, NULL))
             return HRESULT_FROM_WIN32(GetLastError());
     }
 
-    return S_OK;
+    if (idx != 0xffff)
+        ITask_DeleteTrigger(task, idx);
+
+    return hr;
 }
 
 static BOOL write_unicode_string(HANDLE hfile, const WCHAR *str)