Dmitry Timoshkov : taskschd: Delay creation of ITaskSettings until it' s required.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry at baikal.ru>
Date:   Wed Feb 19 12:12:59 2014 +0900

taskschd: Delay creation of ITaskSettings until it's required.

---

 dlls/taskschd/task.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c
index 0c96748..fbf4ae1 100644
--- a/dlls/taskschd/task.c
+++ b/dlls/taskschd/task.c
@@ -966,11 +966,18 @@ static HRESULT WINAPI TaskDefinition_put_Triggers(ITaskDefinition *iface, ITrigg
 static HRESULT WINAPI TaskDefinition_get_Settings(ITaskDefinition *iface, ITaskSettings **settings)
 {
     TaskDefinition *taskdef = impl_from_ITaskDefinition(iface);
+    HRESULT hr;
 
     TRACE("%p,%p\n", iface, settings);
 
     if (!settings) return E_POINTER;
 
+    if (!taskdef->taskset)
+    {
+        hr = TaskSettings_create(&taskdef->taskset);
+        if (hr != S_OK) return hr;
+    }
+
     ITaskSettings_AddRef(taskdef->taskset);
     *settings = taskdef->taskset;
 
@@ -985,7 +992,8 @@ static HRESULT WINAPI TaskDefinition_put_Settings(ITaskDefinition *iface, ITaskS
 
     if (!settings) return E_POINTER;
 
-    ITaskSettings_Release(taskdef->taskset);
+    if (taskdef->taskset)
+        ITaskSettings_Release(taskdef->taskset);
 
     ITaskSettings_AddRef(settings);
     taskdef->taskset = settings;
@@ -1524,7 +1532,6 @@ static const ITaskDefinitionVtbl TaskDefinition_vtbl =
 
 HRESULT TaskDefinition_create(ITaskDefinition **obj)
 {
-    HRESULT hr;
     TaskDefinition *taskdef;
 
     taskdef = heap_alloc_zero(sizeof(*taskdef));
@@ -1532,13 +1539,6 @@ HRESULT TaskDefinition_create(ITaskDefinition **obj)
 
     taskdef->ITaskDefinition_iface.lpVtbl = &TaskDefinition_vtbl;
     taskdef->ref = 1;
-    hr = TaskSettings_create(&taskdef->taskset);
-    if (hr != S_OK)
-    {
-        ITaskDefinition_Release(&taskdef->ITaskDefinition_iface);
-        return hr;
-    }
-
     *obj = &taskdef->ITaskDefinition_iface;
 
     TRACE("created %p\n", *obj);