ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Don't test function directly when reporting GetLastError().

Browse Source
This commit is contained in:
André Hentschel 2010-12-29 19:41:27 +01:00 committed by Alexandre Julliard
parent 046bcb7c7e
commit f0b9d9fce6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/shell32/tests/shlfileop.c
View File

@ -820,6 +820,7 @@ static void test_copy(void)
DWORD retval; DWORD retval;
LPSTR ptr; LPSTR ptr;
BOOL on_nt4 = FALSE; BOOL on_nt4 = FALSE;
BOOL ret;
if (old_shell32) if (old_shell32)
{ {
@ -973,16 +974,16 @@ static void test_copy(void)
shfo.pTo = "test2.txt\0"; shfo.pTo = "test2.txt\0";
/* suppress the error-dialog in win9x here */ /* suppress the error-dialog in win9x here */
shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT; shfo.fFlags = FOF_NOERRORUI | FOF_NOCONFIRMATION | FOF_SILENT;
ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY), ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_READONLY);
"Failure to set file attributes (error %x)\n", GetLastError()); ok(ret, "Failure to set file attributes (error %x)\n", GetLastError());
retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE); retval = CopyFileA(shfo.pFrom, shfo.pTo, FALSE);
ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n"); ok(!retval && GetLastError() == ERROR_ACCESS_DENIED, "CopyFileA should have fail with ERROR_ACCESS_DENIED\n");
retval = SHFileOperationA(&shfo); retval = SHFileOperationA(&shfo);
/* Does not work on Win95, Win95B, NT4WS and NT4SRV */ /* Does not work on Win95, Win95B, NT4WS and NT4SRV */
ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval); ok(!retval || broken(retval == DE_OPCANCELLED), "SHFileOperationA failed to copy (error %x)\n", retval);
/* Set back normal attributes to make the file deletion succeed */ /* Set back normal attributes to make the file deletion succeed */
ok(SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL), ret = SetFileAttributesA(shfo.pTo, FILE_ATTRIBUTE_NORMAL);
"Failure to set file attributes (error %x)\n", GetLastError()); ok(ret, "Failure to set file attributes (error %x)\n", GetLastError());
shfo.fFlags = tmp_flags; shfo.fFlags = tmp_flags;
/* try to copy files to a file */ /* try to copy files to a file */