- Fix new msvc compilation issues in win32k due to the fact some files weren't being compiled eariler.

- Add Process access types to NDK and hide them from DDK.

svn path=/trunk/; revision=20769
This commit is contained in:
Alex Ionescu 2006-01-10 22:25:21 +00:00
parent 538917d0fb
commit 1ab1aaf9f2
3 changed files with 28 additions and 6 deletions

View file

@ -107,7 +107,25 @@ extern NTSYSAPI POBJECT_TYPE PsProcessType;
#define PROCESS_PRIORITY_NORMAL 8 #define PROCESS_PRIORITY_NORMAL 8
#define PROCESS_PRIORITY_NORMAL_FOREGROUND 9 #define PROCESS_PRIORITY_NORMAL_FOREGROUND 9
#if 0 //
// Process Access Types
//
#ifndef NTOS_MODE_USER
#define PROCESS_TERMINATE 0x0001
#define PROCESS_CREATE_THREAD 0x0002
#define PROCESS_SET_SESSIONID 0x0004
#define PROCESS_VM_OPERATION 0x0008
#define PROCESS_VM_READ 0x0010
#define PROCESS_VM_WRITE 0x0020
#define PROCESS_CREATE_PROCESS 0x0080
#define PROCESS_SET_QUOTA 0x0100
#define PROCESS_SET_INFORMATION 0x0200
#define PROCESS_QUERY_INFORMATION 0x0400
#define PROCESS_SUSPEND_RESUME 0x0800
#define PROCESS_QUERY_LIMITED_INFORMATION 0x1000
#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xFFFF)
// //
// Job Access Types // Job Access Types
// //

View file

@ -2940,6 +2940,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView)
PWINDOW_OBJECT WndShell; PWINDOW_OBJECT WndShell;
DECLARE_RETURN(BOOL); DECLARE_RETURN(BOOL);
USER_REFERENCE_ENTRY Ref; USER_REFERENCE_ENTRY Ref;
NTSTATUS Status;
DPRINT("Enter NtUserSetShellWindowEx\n"); DPRINT("Enter NtUserSetShellWindowEx\n");
UserEnterExclusive(); UserEnterExclusive();
@ -2949,7 +2950,7 @@ NtUserSetShellWindowEx(HWND hwndShell, HWND hwndListView)
RETURN(FALSE); RETURN(FALSE);
} }
NTSTATUS Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation, Status = IntValidateWindowStationHandle(PsGetCurrentProcess()->Win32WindowStation,
KernelMode, KernelMode,
0, 0,
&WinStaObject); &WinStaObject);
@ -4407,11 +4408,11 @@ DWORD STDCALL
NtUserDereferenceWndProcHandle(WNDPROC wpHandle, WndProcHandle *Data) NtUserDereferenceWndProcHandle(WNDPROC wpHandle, WndProcHandle *Data)
{ {
DECLARE_RETURN(DWORD); DECLARE_RETURN(DWORD);
WndProcHandle Entry;
DPRINT("Enter NtUserDereferenceWndProcHandle\n"); DPRINT("Enter NtUserDereferenceWndProcHandle\n");
UserEnterShared(); UserEnterShared();
WndProcHandle Entry;
if (((DWORD)wpHandle & 0xFFFF0000) == 0xFFFF0000) if (((DWORD)wpHandle & 0xFFFF0000) == 0xFFFF0000)
{ {
Entry = WndProcHandlesArray[(DWORD)wpHandle & 0x0000FFFF]; Entry = WndProcHandlesArray[(DWORD)wpHandle & 0x0000FFFF];

View file

@ -435,19 +435,22 @@ typedef DWORD FLONG;
#define MAILSLOT_NO_MESSAGE ((DWORD)-1) #define MAILSLOT_NO_MESSAGE ((DWORD)-1)
#define MAILSLOT_WAIT_FOREVER ((DWORD)-1) #define MAILSLOT_WAIT_FOREVER ((DWORD)-1)
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
#ifndef __NTDDK_H
#define PROCESS_TERMINATE 1 #define PROCESS_TERMINATE 1
#define PROCESS_CREATE_THREAD 2 #define PROCESS_CREATE_THREAD 2
#define PROCESS_SET_SESSIONID 4 #define PROCESS_SET_SESSIONID 4
#define PROCESS_VM_OPERATION 8 #define PROCESS_VM_OPERATION 8
#define PROCESS_VM_READ 16 #define PROCESS_VM_READ 16
#define PROCESS_VM_WRITE 32 #define PROCESS_VM_WRITE 32
#define PROCESS_DUP_HANDLE 64
#define PROCESS_CREATE_PROCESS 128 #define PROCESS_CREATE_PROCESS 128
#define PROCESS_SET_QUOTA 256 #define PROCESS_SET_QUOTA 256
#define PROCESS_SET_INFORMATION 512 #define PROCESS_SET_INFORMATION 512
#define PROCESS_QUERY_INFORMATION 1024 #define PROCESS_QUERY_INFORMATION 1024
#define PROCESS_SUSPEND_RESUME 2048 #define PROCESS_SUSPEND_RESUME 2048
#define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF) #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0xFFF)
#endif
#define PROCESS_DUP_HANDLE 64
#define THREAD_TERMINATE 1 #define THREAD_TERMINATE 1
#define THREAD_SUSPEND_RESUME 2 #define THREAD_SUSPEND_RESUME 2
#define THREAD_GET_CONTEXT 8 #define THREAD_GET_CONTEXT 8
@ -3197,6 +3200,8 @@ typedef union _FILE_SEGMENT_ELEMENT {
#define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT 9 #define JOB_OBJECT_MSG_PROCESS_MEMORY_LIMIT 9
#define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10 #define JOB_OBJECT_MSG_JOB_MEMORY_LIMIT 10
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
#ifndef __NTDDK_H
#define JOB_OBJECT_ASSIGN_PROCESS 1 #define JOB_OBJECT_ASSIGN_PROCESS 1
#define JOB_OBJECT_SET_ATTRIBUTES 2 #define JOB_OBJECT_SET_ATTRIBUTES 2
#define JOB_OBJECT_QUERY 4 #define JOB_OBJECT_QUERY 4
@ -3204,8 +3209,6 @@ typedef union _FILE_SEGMENT_ELEMENT {
#define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 16 #define JOB_OBJECT_SET_SECURITY_ATTRIBUTES 16
#define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31) #define JOB_OBJECT_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|31)
/* FIXME: Oh how I wish, I wish the w32api DDK wouldn't include winnt.h... */
#ifndef __NTDDK_H
typedef enum _JOBOBJECTINFOCLASS { typedef enum _JOBOBJECTINFOCLASS {
JobObjectBasicAccountingInformation = 1, JobObjectBasicAccountingInformation = 1,
JobObjectBasicLimitInformation, JobObjectBasicLimitInformation,