mirror of
https://github.com/reactos/reactos.git
synced 2025-08-02 09:46:21 +00:00
merge 34702 and 34987 from ros-amd64-bringup branch:
- 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:
parent
8dbbc041c3
commit
6805ef1936
3 changed files with 7 additions and 7 deletions
|
@ -787,10 +787,10 @@ typedef struct _SECURITY_DESCRIPTOR_RELATIVE {
|
|||
BYTE Revision;
|
||||
BYTE Sbz1;
|
||||
SECURITY_DESCRIPTOR_CONTROL Control;
|
||||
DWORD Owner;
|
||||
DWORD Group;
|
||||
DWORD Sacl;
|
||||
DWORD Dacl;
|
||||
DWORD_PTR Owner;
|
||||
DWORD_PTR Group;
|
||||
DWORD_PTR Sacl;
|
||||
DWORD_PTR Dacl;
|
||||
} SECURITY_DESCRIPTOR_RELATIVE, *PISECURITY_DESCRIPTOR_RELATIVE;
|
||||
typedef enum _TOKEN_INFORMATION_CLASS {
|
||||
TokenUser=1,TokenGroups,TokenPrivileges,TokenOwner,
|
||||
|
|
|
@ -558,7 +558,7 @@ typedef enum _PROCESSOR_CACHE_TYPE
|
|||
typedef struct _KDPC_DATA
|
||||
{
|
||||
LIST_ENTRY DpcListHead;
|
||||
ULONG DpcLock;
|
||||
ULONG_PTR DpcLock;
|
||||
volatile ULONG DpcQueueDepth;
|
||||
ULONG DpcCount;
|
||||
} KDPC_DATA, *PKDPC_DATA;
|
||||
|
|
|
@ -138,8 +138,8 @@ typedef struct _LOAD_IMPORTS
|
|||
//
|
||||
typedef struct _LDR_RESOURCE_INFO
|
||||
{
|
||||
ULONG Type;
|
||||
ULONG Name;
|
||||
ULONG_PTR Type;
|
||||
ULONG_PTR Name;
|
||||
ULONG Language;
|
||||
} LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue