taskschd: Do not return ERROR_* constant in HRESULT function.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

taskschd: Do not return ERROR_* constant in HRESULT function.
e16b9f75 · Sebastian Lackner · Alexandre Julliard · a549245d · e16b9f75 · e16b9f75
Commit e16b9f75 authored Sep 13, 2016 by Sebastian Lackner Committed by Alexandre Julliard Sep 14, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 3 deletions

folder.c dlls/taskschd/folder.c +1 -1

scheduler.c dlls/taskschd/tests/scheduler.c +0 -2

No files found.
--- a/dlls/taskschd/folder.c
+++ b/dlls/taskschd/folder.c
@@ -417,7 +417,7 @@ HRESULT TaskFolder_create(const WCHAR *parent, const WCHAR *path, ITaskFolder **
    if (path)
    {
        int len = strlenW(path);
-        if (len && path[len - 1] == '\\') return ERROR_INVALID_NAME;
+        if (len && path[len - 1] == '\\') return HRESULT_FROM_WIN32(ERROR_INVALID_NAME);
    }

    folder_path = get_full_path(parent, path);

--- a/dlls/taskschd/tests/scheduler.c
+++ b/dlls/taskschd/tests/scheduler.c
@@ -217,7 +217,6 @@ todo_wine
    ok(hr == HRESULT_FROM_WIN32(ERROR_ALREADY_EXISTS), "expected ERROR_ALREADY_EXISTS, got %#x\n", hr);

    hr = ITaskFolder_CreateFolder(folder, Wine_Folder1_, v_null, &subfolder);
-todo_wine
    ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr);

    hr = ITaskFolder_CreateFolder(folder, Wine, v_null, &subfolder);
@@ -297,7 +296,6 @@ todo_wine
    SysFreeString(bstr);

    hr = ITaskFolder_GetFolder(subfolder, bslash, &subfolder2);
-todo_wine
    ok(hr == HRESULT_FROM_WIN32(ERROR_INVALID_NAME), "expected ERROR_INVALID_NAME, got %#x\n", hr);

    hr = ITaskFolder_GetFolder(subfolder, NULL, &subfolder2);