Commit 9327e476 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

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

SHMapHandle fails with a variety of errors on these platforms.
parent 795845ff
...@@ -548,10 +548,10 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem) ...@@ -548,10 +548,10 @@ static void test_alloc_shared_remote(DWORD procid, HANDLE hmem)
hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0); hmem2 = pSHMapHandle(hmem, procid, GetCurrentProcessId(), 0, 0);
/* It seems like Windows Vista/2008 uses a different internal implementation /* It seems like Windows Vista/2008 uses a different internal implementation
* for shared memory, and calling SHMapHandle fails with ERROR_INVALID_HANDLE. */ * for shared memory, and calling SHMapHandle fails. */
ok(hmem2 != NULL || broken(hmem2 == NULL && GetLastError() == ERROR_INVALID_HANDLE), ok(hmem2 != NULL || broken(hmem2 == NULL),
"SHMapHandle failed: %u\n", GetLastError()); "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"); win_skip("Subprocess failed to map shared memory, skipping test\n");
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment