diff --git a/dlls/taskschd/task.c b/dlls/taskschd/task.c index 3a3b5e1821c..334fa3f5cfb 100644 --- a/dlls/taskschd/task.c +++ b/dlls/taskschd/task.c @@ -728,15 +728,14 @@ static HRESULT WINAPI RegistrationInfo_get_URI(IRegistrationInfo *iface, BSTR *u static HRESULT WINAPI RegistrationInfo_put_URI(IRegistrationInfo *iface, BSTR uri) { registration_info *reginfo = impl_from_IRegistrationInfo(iface); + WCHAR *str = NULL; TRACE("%p,%s\n", iface, debugstr_w(uri)); - if (!uri) return E_INVALIDARG; - + if (uri && !(str = heap_strdupW(uri))) return E_OUTOFMEMORY; heap_free(reginfo->uri); - reginfo->uri = heap_strdupW(uri); - /* FIXME: update XML on the server side */ - return reginfo->uri ? S_OK : E_OUTOFMEMORY; + reginfo->uri = str; + return S_OK; } static HRESULT WINAPI RegistrationInfo_get_SecurityDescriptor(IRegistrationInfo *iface, VARIANT *sddl) @@ -3336,6 +3335,12 @@ static HRESULT read_registration_info(IXmlReader *reader, IRegistrationInfo *inf if (hr == S_OK) IRegistrationInfo_put_Documentation(info, value); } + else if (!lstrcmpW(name, URI)) + { + hr = read_text_value(reader, &value); + if (hr == S_OK) + IRegistrationInfo_put_URI(info, value); + } else FIXME("unhandled RegistrationInfo element %s\n", debugstr_w(name)); diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index b499f0b32bd..cb17eafee7a 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -1428,6 +1428,7 @@ static void test_TaskDefinition(void) " 1.0\n" " 2018-04-02T11:22:33\n" " doc\n" + " uri\n" " \n" " \n" " false\n" @@ -1511,6 +1512,7 @@ static void test_TaskDefinition(void) static const WCHAR versionW[] = { '1','.','0',0 }; static const WCHAR dateW[] = { '2','0','1','8','-','0','4','-','0','2','T','1','1',':','2','2',':','3','3',0 }; static const WCHAR docW[] = { 'd','o','c',0 }; + static const WCHAR uriW[] = { 'u','r','i',0 }; static WCHAR Task1[] = { '"','T','a','s','k','1','"',0 }; static struct settings def_settings = { { 0 }, { 'P','T','7','2','H',0 }, { 0 }, 0, 7, TASK_INSTANCES_IGNORE_NEW, TASK_COMPATIBILITY_V2, VARIANT_TRUE, VARIANT_TRUE, @@ -1661,9 +1663,17 @@ todo_wine ok(hr == S_OK, "get_Documentation error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_URI(reginfo, &bstr); + ok(hr == S_OK, "get_URI error %#x\n", hr); + ok(!lstrcmpW(bstr, uriW), "expected %s, got %s\n", wine_dbgstr_w(uriW), wine_dbgstr_w(bstr)); + SysFreeString(bstr); + hr = IRegistrationInfo_put_URI(reginfo, NULL); + ok(hr == S_OK, "put_URI error %#x\n", hr); + bstr = (BSTR)0xdeadbeef; hr = IRegistrationInfo_get_URI(reginfo, &bstr); ok(hr == S_OK, "get_URI error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr)); + hr = IRegistrationInfo_get_Source(reginfo, &bstr); ok(hr == S_OK, "get_Source error %#x\n", hr); ok(!bstr, "expected NULL, got %s\n", wine_dbgstr_w(bstr));