Dmitry Timoshkov : kernel32: Skip the PE loader test under a Win9x platform .

Alexandre Julliard julliard at wine.codeweavers.com
Fri Dec 1 06:29:32 CST 2006


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

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Fri Dec  1 18:09:56 2006 +0800

kernel32: Skip the PE loader test under a Win9x platform.

---

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

diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
index 7a0bb98..50dbfb8 100644
--- a/dlls/kernel32/tests/loader.c
+++ b/dlls/kernel32/tests/loader.c
@@ -321,7 +321,7 @@ todo_wine {
             ok(FreeLibrary(hlib), "FreeLibrary error %d\n", GetLastError());
         }
         else
-        {
+        {   /* LoadLibrary has failed */
             if (hlib) /* remove completely once Wine is fixed */
             {
                 todo_wine ok(!hlib, "%d: LoadLibrary should fail\n", i);
@@ -332,6 +332,13 @@ todo_wine {
 
             ok(!hlib, "%d: LoadLibrary should fail\n", i);
 
+            if (GetLastError() == ERROR_GEN_FAILURE) /* Win9x, broken behaviour */
+            {
+                trace("skipping the loader test on Win9x\n");
+                DeleteFile(dll_name);
+                return;
+            }
+
             ok(td[i].error == GetLastError(), "%d: expected error %d, got %d\n",
                i, td[i].error, GetLastError());
         }




More information about the wine-cvs mailing list