From d40233a44800458e568b829dad88715d0f3de231 Mon Sep 17 00:00:00 2001 From: Paul Vriens Date: Sat, 23 Jun 2007 16:44:36 +0200 Subject: [PATCH] kernel32/tests: Don't crash (on Vista). --- dlls/kernel32/tests/loader.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c index cb232994bef..8d2c7aab34f 100644 --- a/dlls/kernel32/tests/loader.c +++ b/dlls/kernel32/tests/loader.c @@ -328,6 +328,13 @@ START_TEST(loader) ok(hlib != 0, "%d: LoadLibrary error %d\n", i, GetLastError()); + /* No point in crashing. Test crashes on Vista with some of the given files */ + if (hlib == 0) + { + skip("Failed to load dll number %d\n", i); + goto endloop; + } + SetLastError(0xdeadbeef); ok(VirtualQuery(hlib, &info, sizeof(info)) == sizeof(info), "%d: VirtualQuery error %d\n", i, GetLastError()); @@ -467,6 +474,7 @@ START_TEST(loader) i, td[i].error, GetLastError()); } +endloop: SetLastError(0xdeadbeef); ok(DeleteFile(dll_name), "DeleteFile error %d\n", GetLastError()); }