Francois Gouget : shell32/tests: Fix some expected FindExecutable()
error codes.
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Apr 3 06:48:30 CDT 2007
Module: wine
Branch: master
Commit: 95ddcc3bae41a12df53d71d03547bf337291a0d1
URL: http://source.winehq.org/git/wine.git/?a=commit;h=95ddcc3bae41a12df53d71d03547bf337291a0d1
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Mon Apr 2 19:24:40 2007 +0200
shell32/tests: Fix some expected FindExecutable() error codes.
Add comments indicating which Windows version returns a given error code.
---
dlls/shell32/tests/shlexec.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c
index 4375a9a..cb814d2 100644
--- a/dlls/shell32/tests/shlexec.c
+++ b/dlls/shell32/tests/shlexec.c
@@ -697,12 +697,12 @@ static void test_find_executable(void)
strcpy(command, "your word");
rc=(int)FindExecutableA(NULL, NULL, command);
- ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc);
+ ok(rc == SE_ERR_FNF || rc > 32 /* nt4 */, "FindExecutable(NULL) returned %d\n", rc);
ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command);
strcpy(command, "your word");
rc=(int)FindExecutableA(tmpdir, NULL, command);
- todo_wine ok(rc == SE_ERR_FNF || rc > 32, "FindExecutable(NULL) returned %d\n", rc);
+ ok(rc == SE_ERR_NOASSOC /* >= win2000 */ || rc > 32 /* win98, nt4 */, "FindExecutable(NULL) returned %d\n", rc);
ok(strcmp(command, "your word") != 0, "FindExecutable(NULL) returned command=[%s]\n", command);
sprintf(filename, "%s\\test file.sfe", tmpdir);
@@ -723,7 +723,7 @@ static void test_find_executable(void)
sprintf(filename, "%s\\test file.shl", tmpdir);
rc=(int)FindExecutableA(filename, NULL, command);
- ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc);
+ ok(rc == SE_ERR_FNF /* NT4 */ || rc > 32, "FindExecutable(%s) returned %d\n", filename, rc);
sprintf(filename, "%s\\test file.shlfoo", tmpdir);
rc=(int)FindExecutableA(filename, NULL, command);
More information about the wine-cvs
mailing list