Alexandre Julliard : kernel32/tests: Fix the mailslot tests on Vista.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Mon Nov 17 23:36:47 2008 +0100

kernel32/tests: Fix the mailslot tests on Vista.

---

dlls/kernel32/tests/mailslot.c |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/dlls/kernel32/tests/mailslot.c b/dlls/kernel32/tests/mailslot.c
index 995f144..04c89e1 100644
--- a/dlls/kernel32/tests/mailslot.c
+++ b/dlls/kernel32/tests/mailslot.c
@@ -90,9 +90,9 @@ static int mailslot_test(void)
     /* now try and openthe client, but with the wrong sharing mode */
     hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
                              0, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter == INVALID_HANDLE_VALUE, "bad sharing mode\n");
-    ok( GetLastError() == ERROR_SHARING_VIOLATION,
+    ok( hWriter != INVALID_HANDLE_VALUE /* vista */ || GetLastError() == ERROR_SHARING_VIOLATION,
             "error should be ERROR_SHARING_VIOLATION\n");
+    if (hWriter != INVALID_HANDLE_VALUE) CloseHandle( hWriter );

/* now open the client with the correct sharing mode */
     hWriter = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
@@ -139,17 +139,20 @@ static int mailslot_test(void)
     /* now try open another writer... should fail */
     hWriter2 = CreateFile(szmspath, GENERIC_READ|GENERIC_WRITE,
                      FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter2 == INVALID_HANDLE_VALUE, "two writers\n");
+    /* succeeds on vista, don't test */
+    if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 );

/* now try open another as a reader ... also fails */
     hWriter2 = CreateFile(szmspath, GENERIC_READ,
                      FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter2 == INVALID_HANDLE_VALUE, "writer + reader\n");
+    /* succeeds on vista, don't test */
+    if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 );

/* now try open another as a writer ... still fails */
     hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
                      FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter2 == INVALID_HANDLE_VALUE, "writer\n");
+    /* succeeds on vista, don't test */
+    if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 );

/* now open another one */
     hSlot2 = CreateMailslot( szmspath, 0, 0, NULL );
@@ -172,7 +175,8 @@ static int mailslot_test(void)
      */
     hWriter2 = CreateFile(szmspath, GENERIC_WRITE,
                      FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, NULL);
-    ok( hWriter2 == INVALID_HANDLE_VALUE, "greedy writer succeeded\n");
+    /* succeeds on vista, don't test */
+    if (hWriter2 != INVALID_HANDLE_VALUE) CloseHandle( hWriter2 );

/* now try open another as a writer ... and share with the first */
     hWriter2 = CreateFile(szmspath, GENERIC_WRITE,