server: Add PROCESS_QUERY_LIMITED_INFORMATION to GENERIC_EXECUTE access mapping…

server: Add PROCESS_QUERY_LIMITED_INFORMATION to GENERIC_EXECUTE access mapping and appropriately change PROCESS_ALL_ACCESS.

server: Add PROCESS_QUERY_LIMITED_INFORMATION to GENERIC_EXECUTE access mapping…
a0b08adb · Dmitry Timoshkov · Alexandre Julliard · 53847fd6 · a0b08adb · a0b08adb
Commit a0b08adb authored Feb 06, 2014 by Dmitry Timoshkov Committed by Alexandre Julliard Feb 06, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

security.c dlls/advapi32/tests/security.c +0 -1

winnt.h include/winnt.h +1 -1

process.c server/process.c +1 -1

No files found.
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -5061,7 +5061,6 @@ static void test_process_access(void)
               "%d: expected %#x, got %#x\n", i, map[i].mapped, access);
            break;
        case GENERIC_EXECUTE:
-todo_wine
            ok(access == map[i].mapped || access == (map[i].mapped | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE) /* Vista+ */,
               "%d: expected %#x, got %#x\n", i, map[i].mapped, access);
            break;

--- a/include/winnt.h
+++ b/include/winnt.h
@@ -4542,7 +4542,7 @@ typedef enum tagSID_NAME_USE {
 #define PROCESS_QUERY_INFORMATION  0x0400
 #define PROCESS_SUSPEND_RESUME     0x0800
 #define PROCESS_QUERY_LIMITED_INFORMATION 0x1000
-#define PROCESS_ALL_ACCESS         (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xfff)
+#define PROCESS_ALL_ACCESS         (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xffff)
 #define THREAD_TERMINATE           0x0001
 #define THREAD_SUSPEND_RESUME      0x0002

--- a/server/process.c
+++ b/server/process.c
@@ -451,7 +451,7 @@ static unsigned int process_map_access( struct object *obj, unsigned int access 
    if (access & GENERIC_READ)    access |= STANDARD_RIGHTS_READ | PROCESS_QUERY_INFORMATION | PROCESS_VM_READ;
    if (access & GENERIC_WRITE)   access |= STANDARD_RIGHTS_WRITE | PROCESS_SET_QUOTA | PROCESS_SET_INFORMATION | PROCESS_SUSPEND_RESUME |
                                            PROCESS_VM_WRITE | PROCESS_DUP_HANDLE | PROCESS_CREATE_PROCESS | PROCESS_CREATE_THREAD | PROCESS_VM_OPERATION;
-    if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_TERMINATE;
+    if (access & GENERIC_EXECUTE) access |= STANDARD_RIGHTS_EXECUTE | SYNCHRONIZE | PROCESS_QUERY_LIMITED_INFORMATION | PROCESS_TERMINATE;
    if (access & GENERIC_ALL)     access |= PROCESS_ALL_ACCESS;
    return access & ~(GENERIC_READ | GENERIC_WRITE | GENERIC_EXECUTE | GENERIC_ALL);
 }