Dmitry Timoshkov : advapi32/tests: Fix test failures under Windows 2000 and some XP versions.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov <dmitry(a)baikal.ru>
Date:   Fri Feb 14 21:19:09 2014 +0900

advapi32/tests: Fix test failures under Windows 2000 and some XP versions.

---

 dlls/advapi32/tests/security.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index e2e9cd5..f993c08 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -4978,6 +4978,7 @@ static void test_filemap_security(void)
         {
             if (!mapping)
             {
+                /* NT4 and win2k don't support EXEC on file mappings */
                 if (prot_map[i].prot == PAGE_EXECUTE_READ || prot_map[i].prot == PAGE_EXECUTE_READWRITE || prot_map[i].prot == PAGE_EXECUTE_WRITECOPY)
                 {
                     win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n");
@@ -5001,6 +5002,14 @@ static void test_filemap_security(void)
 
     SetLastError(0xdeadbeef);
     mapping = CreateFileMappingW(file, NULL, PAGE_EXECUTE_READWRITE, 0, 4096, NULL);
+    if (!mapping)
+    {
+        /* NT4 and win2k don't support EXEC on file mappings */
+        win_skip("CreateFileMapping doesn't support PAGE_EXECUTE protection\n");
+        CloseHandle(file);
+        DeleteFileA(file_name);
+        return;
+    }
     ok(mapping != 0, "CreateFileMapping error %d\n", GetLastError());
 
     access = get_obj_access(mapping);