Module: wine Branch: master Commit: 2c20270d24143d31be5d30ba750d5add6eea336d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c20270d24143d31be5d30ba75...
Author: André Hentschel nerv@dawncrow.de Date: Thu Dec 30 20:18:16 2010 +0100
shell32/tests: Don't test function directly when reporting GetLastError().
---
dlls/shell32/tests/shlfolder.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 0bf2ec7..990ec0c 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -2061,6 +2061,7 @@ static void test_LocalizedNames(void) DWORD res; HANDLE file; STRRET strret; + BOOL ret;
static const char desktopini_contents1[] = "[.ShellClassInfo]\r\n" @@ -2080,10 +2081,10 @@ static void test_LocalizedNames(void) file = CreateFileA(".\testfolder\desktop.ini", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); ok(file != INVALID_HANDLE_VALUE, "CreateFileA failed %i\n", GetLastError()); - ok(WriteFile(file, desktopini_contents1, strlen(desktopini_contents1), &res, NULL) && - WriteFile(file, resourcefile, strlen(resourcefile), &res, NULL) && - WriteFile(file, desktopini_contents2, strlen(desktopini_contents2), &res, NULL), - "WriteFile failed %i\n", GetLastError()); + ret = WriteFile(file, desktopini_contents1, strlen(desktopini_contents1), &res, NULL) && + WriteFile(file, resourcefile, strlen(resourcefile), &res, NULL) && + WriteFile(file, desktopini_contents2, strlen(desktopini_contents2), &res, NULL); + ok(ret, "WriteFile failed %i\n", GetLastError()); CloseHandle(file);
/* get IShellFolder for parent */