Skip to content

W
wine-cw
Commit 0e894c34 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

mstask/tests: Fix test failures on XP.

parent 343d2420
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
dlls/mstask/tests/task.c
View file @ 0e894c34
...@@ -164,9 +164,13 @@ static void test_SetApplicationName_GetApplicationName(void) ...@@ -164,9 +164,13 @@ static void test_SetApplicationName_GetApplicationName(void)
ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres); ok(hres == S_OK, "GetApplicationName failed: %08x\n", hres);
if (hres == S_OK) if (hres == S_OK)
{ {
full_name = path_resolve_name(notepad_exe); /* XP SP1 appends .exe */
if (lstrcmpiW(stored_name, full_name) != 0)
{
full_name = path_resolve_name(notepad); full_name = path_resolve_name(notepad);
ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n", ok(!lstrcmpiW(stored_name, full_name), "Got %s, expected %s\n",
dbgstr_w(stored_name), dbgstr_w(full_name)); dbgstr_w(stored_name), dbgstr_w(full_name));
}
CoTaskMemFree(stored_name); CoTaskMemFree(stored_name);
} }
...@@ -467,7 +471,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) ...@@ -467,7 +471,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
"Failed setting dummy account with no password: %08x\n", hres); "Failed setting dummy account with no password: %08x\n", hres);
hres = ITask_GetAccountInformation(test_task, &account_name); hres = ITask_GetAccountInformation(test_task, &account_name);
ok(hres == S_OK || 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); "GetAccountInformation failed: %08x\n", hres);
if (hres == S_OK) if (hres == S_OK)
{ {
...@@ -485,7 +490,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) ...@@ -485,7 +490,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
"Failed setting dummy account with password: %08x\n", hres); "Failed setting dummy account with password: %08x\n", hres);
hres = ITask_GetAccountInformation(test_task, &account_name); hres = ITask_GetAccountInformation(test_task, &account_name);
ok(hres == S_OK || 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); "GetAccountInformation failed: %08x\n", hres);
if (hres == S_OK) if (hres == S_OK)
{ {
...@@ -500,7 +506,8 @@ static void test_SetAccountInformation_GetAccountInformation(void) ...@@ -500,7 +506,8 @@ static void test_SetAccountInformation_GetAccountInformation(void)
ok(hres == S_OK, "Failed setting system account: %08x\n", hres); ok(hres == S_OK, "Failed setting system account: %08x\n", hres);
hres = ITask_GetAccountInformation(test_task, &account_name); hres = ITask_GetAccountInformation(test_task, &account_name);
ok(hres == S_OK || 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); "GetAccountInformation failed: %08x\n", hres);
if (hres == S_OK) if (hres == S_OK)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment