Paul Vriens : kernel32/tests: Don't crash (on Vista).

Alexandre Julliard julliard at wine.codeweavers.com
Mon Jun 25 07:28:27 CDT 2007


Module: wine
Branch: master
Commit: d40233a44800458e568b829dad88715d0f3de231
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d40233a44800458e568b829dad88715d0f3de231

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Sat Jun 23 16:44:36 2007 +0200

kernel32/tests: Don't crash (on Vista).

---

 dlls/kernel32/tests/loader.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index cb23299..8d2c7aa 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());
     }




More information about the wine-cvs mailing list