André Hentschel : shell32/tests: Don' t test function directly when reporting GetLastError().
Alexandre Julliard
julliard at winehq.org
Thu Dec 30 10:49:56 CST 2010
Module: wine
Branch: master
Commit: f0b9d9fce611d0a1552fbe64d374774784e8417c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b9d9fce611d0a1552fbe64d374774784e8417c
Author: André Hentschel <nerv at dawncrow.de>
Date: Wed Dec 29 19:41:27 2010 +0100
shell32/tests: Don't test function directly when reporting GetLastError().
---
dlls/shell32/tests/shlfileop.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c
index a58b4fd..810a745 100644
--- a/dlls/shell32/tests/shlfileop.c
+++ b/dlls/shell32/tests/shlfileop.c
@@ -820,6 +820,7 @@ static void test_copy(void)
DWORD retval;
LPSTR ptr;
BOOL on_nt4 = FALSE;
+ BOOL ret;
if (old_shell32)
{
@@ -973,16 +974,16 @@ static void test_copy(void)
shfo.pTo = "test2.txt\0";
/* suppress the error-dialog in win9x here */
shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT;
- ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY),
- "Failure to set file attributes (error %x)\n", GetLastError());
+ ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY);
+ ok(ret, "Failure to set file attributes (error %x)\n", GetLastError());
retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE);
ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n");
retval = SHFileOperationA(&shfo);
/* Does not work on Win95, Win95B, NT4WS and NT4SRV */
ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval);
/* Set back normal attributes to make the file deletion succeed */
- ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL),
- "Failure to set file attributes (error %x)\n", GetLastError());
+ ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL);
+ ok(ret, "Failure to set file attributes (error %x)\n", GetLastError());
shfo.fFlags = tmp_flags;
/* try to copy files to a file */
More information about the wine-cvs
mailing list