Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 23:25:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

merge 34702 and 34987 from ros-amd64-bringup branch:

Browse source 
- convert LDR_RESOURCE_INFO members from ULONG to ULONG_PTR
- fix SECURITY_DESCRIPTOR_RELATIVE and KDPC_DATA

svn path=/trunk/; revision=35628
This commit is contained in:
Timo Kreuzer 2008-08-25 14:51:22 +00:00
parent 8dbbc041c3
commit 6805ef1936
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
reactos/include/ddk/ntifs.h
View file

@ -787,10 +787,10 @@ typedef struct _SECURITY_DESCRIPTOR_RELATIVE {
BYTE Revision; BYTE Revision;
BYTE Sbz1; BYTE Sbz1;
SECURITY_DESCRIPTOR_CONTROL Control; SECURITY_DESCRIPTOR_CONTROL Control;
DWORD Owner; DWORD_PTR Owner;
DWORD Group; DWORD_PTR Group;
DWORD Sacl; DWORD_PTR Sacl;
DWORD Dacl; DWORD_PTR Dacl;
} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE; } SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE;
typedef enum _TOKEN_INFORMATION_CLASS { typedef enum _TOKEN_INFORMATION_CLASS {
TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner, TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,

2
reactos/include/ndk/ketypes.h
View file

@ -558,7 +558,7 @@ typedef enum _PROCESSOR_CACHE_TYPE
typedef struct _KDPC_DATA typedef struct _KDPC_DATA
{ {
LIST_ENTRY DpcListHead; LIST_ENTRY DpcListHead;
ULONG DpcLock; ULONG_PTR DpcLock;
volatile ULONG DpcQueueDepth; volatile ULONG DpcQueueDepth;
ULONG DpcCount; ULONG DpcCount;
} KDPC_DATA, *PKDPC_DATA; } KDPC_DATA, *PKDPC_DATA;

4
reactos/include/ndk/ldrtypes.h
View file

@ -138,8 +138,8 @@ typedef struct _LOAD_IMPORTS
// //
typedef struct _LDR_RESOURCE_INFO typedef struct _LDR_RESOURCE_INFO
{ {
ULONG Type; ULONG_PTR Type;
ULONG Name; ULONG_PTR Name;
ULONG Language; ULONG Language;
} LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO; } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;