Module: wine Branch: master Commit: e654be2aeca93fb7c0da9079e7c58b718f2270ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=e654be2aeca93fb7c0da9079e7...
Author: Dmitry Timoshkov dmitry@baikal.ru Date: Tue Jan 28 11:54:24 2014 +0900
taskschd: Add some invalid parameters checks to ITaskFolder::DeleteFolder.
---
dlls/taskschd/folder.c | 2 ++ dlls/taskschd/tests/scheduler.c | 10 ++++++++++ 2 files changed, 12 insertions(+)
diff --git a/dlls/taskschd/folder.c b/dlls/taskschd/folder.c index 4eb7b8a..412ec5b 100644 --- a/dlls/taskschd/folder.c +++ b/dlls/taskschd/folder.c @@ -270,6 +270,8 @@ static HRESULT WINAPI TaskFolder_DeleteFolder(ITaskFolder *iface, BSTR name, LON
TRACE("%p,%s,%x\n", iface, debugstr_w(name), flags);
+ if (!name || !*name) return E_ACCESSDENIED; + if (flags) FIXME("unsupported flags %x\n", flags);
diff --git a/dlls/taskschd/tests/scheduler.c b/dlls/taskschd/tests/scheduler.c index 61e4a04..2d9beea 100644 --- a/dlls/taskschd/tests/scheduler.c +++ b/dlls/taskschd/tests/scheduler.c @@ -346,6 +346,16 @@ todo_wine hr = ITaskFolder_DeleteFolder(folder, Wine, 0); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "expected ERROR_FILE_NOT_FOUND, got %#x\n", hr);
+ hr = ITaskFolder_DeleteFolder(folder, NULL, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, empty, 0); + ok(hr == E_ACCESSDENIED || hr == E_INVALIDARG /* Vista */, "expected E_ACCESSDENIED, got %#x\n", hr); + + hr = ITaskFolder_DeleteFolder(folder, slash, 0); +todo_wine + ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr); + ITaskFolder_Release(folder); ITaskService_Release(service); }