ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

taskschd: Add a check for the task namespace.

This commit is contained in:
Dmitry Timoshkov 2014-02-25 12:22:25 +09:00 committed by Alexandre Julliard
parent 1c778d91bd
commit d2fc6b3145
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/taskschd/task.c
View File

@ -1990,6 +1990,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef
ITaskSettings *taskset; ITaskSettings *taskset;
const WCHAR *name; const WCHAR *name;
const WCHAR *value; const WCHAR *value;
BOOL xmlns_ok = FALSE;
TRACE("\n"); TRACE("\n");
@ -2028,7 +2029,11 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef
else if (!lstrcmpW(name, xmlns)) else if (!lstrcmpW(name, xmlns))
{ {
if (lstrcmpW(value, task_ns)) if (lstrcmpW(value, task_ns))
{
FIXME("unknown namespace %s\n", debugstr_w(value)); FIXME("unknown namespace %s\n", debugstr_w(value));
break;
}
xmlns_ok = TRUE;
} }
else else
FIXME("unhandled Task attribute %s\n", debugstr_w(name)); FIXME("unhandled Task attribute %s\n", debugstr_w(name));
@ -2037,7 +2042,7 @@ static HRESULT read_task_attributes(IXmlReader *reader, ITaskDefinition *taskdef
} }
ITaskSettings_Release(taskset); ITaskSettings_Release(taskset);
return S_OK; return xmlns_ok ? S_OK : SCHED_E_NAMESPACE;
} }
static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef) static HRESULT read_task(IXmlReader *reader, ITaskDefinition *taskdef)

1
dlls/taskschd/tests/scheduler.c
View File

@ -1223,7 +1223,6 @@ static void test_TaskDefinition(void)
MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); MultiByteToWideChar(CP_ACP, 0, xml2, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0]));
hr = ITaskDefinition_put_XmlText(taskdef, xmlW); hr = ITaskDefinition_put_XmlText(taskdef, xmlW);
todo_wine
ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr); ok(hr == SCHED_E_NAMESPACE, "expected SCHED_E_NAMESPACE, got %#x\n", hr);
MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0])); MultiByteToWideChar(CP_ACP, 0, xml3, -1, xmlW, sizeof(xmlW)/sizeof(xmlW[0]));