Huw Davies : shlwapi/tests: Fix failing tests on Vista and Win 2008.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Wed Jun 10 13:10:50 2015 +0100

shlwapi/tests: Fix failing tests on Vista and Win 2008.

SHMapHandle fails with a variety of errors on these platforms.

---

dlls/shlwapi/tests/ordinal.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c
index 9225219..17edf65 100644
--- a/dlls/shlwapi/tests/ordinal.c
+++ b/dlls/shlwapi/tests/ordinal.c
@@ -548,10 +548,10 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)
     hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0);

/* It seems like Windows Vista/2008 uses a different internal implementation
-     * for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */
-    ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE),
+     * for shared memory, and calling SHMapHandle fails. */
+    ok(hmem2 != NULL || broken(hmem2 == NULL),
        "SHMapHandle failed: %u\n", GetLastError());
-    if (hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE)
+    if (hmem2 == NULL)
     {
         win_skip("Subprocess failed to map shared memory, skipping test\n");
         return;