Alexandre Julliard : mstask/tests: Fix test failures on XP.

[Alexandre Julliard]

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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Sep 17 16:23:08 2008 +0200

mstask/tests: Fix test failures on XP.

---

 dlls/mstask/tests/task.c |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c
index 88a4fdf..328dd76 100644
--- a/dlls/mstask/tests/task.c
+++ b/dlls/mstask/tests/task.c
@@ -164,9 +164,13 @@ static void test_SetApplicationName_GetApplicationName(void)
     ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres);
     if (hres == S_OK)
     {
-        full_name = path_resolve_name(notepad);
-        ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n",
-                dbgstr_w(stored_name), dbgstr_w(full_name));
+        full_name = path_resolve_name(notepad_exe);  /* XP SP1 appends .exe */
+        if (lstrcmpiW(stored_name, full_name) != 0)
+        {
+            full_name = path_resolve_name(notepad);
+            ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n",
+               dbgstr_w(stored_name), dbgstr_w(full_name));
+        }
         CoTaskMemFree(stored_name);
     }
 
@@ -467,7 +471,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
             "Failed setting dummy account with no password: %08x\n", hres);
     hres = ITask_GetAccountInformation(test_task, &account_name);
     ok(hres == S_OK ||
-       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)),
+       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) ||
+              hres == SCHED_E_CANNOT_OPEN_TASK),
        "GetAccountInformation failed: %08x\n", hres);
     if (hres == S_OK)
     {
@@ -485,7 +490,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
             "Failed setting dummy account with password: %08x\n", hres);
     hres = ITask_GetAccountInformation(test_task, &account_name);
     ok(hres == S_OK ||
-       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)),
+       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) ||
+              hres == SCHED_E_CANNOT_OPEN_TASK),
        "GetAccountInformation failed: %08x\n", hres);
     if (hres == S_OK)
     {
@@ -500,7 +506,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
     ok(hres == S_OK, "Failed setting system account: %08x\n", hres);
     hres = ITask_GetAccountInformation(test_task, &account_name);
     ok(hres == S_OK ||
-       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND)),
+       broken(hres == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND) ||
+              hres == SCHED_E_CANNOT_OPEN_TASK),
        "GetAccountInformation failed: %08x\n", hres);
     if (hres == S_OK)
     {