[ros-diffs] [tkreuzer] 35628: 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

[tkreuzer at svn.reactos.org]

Author: tkreuzer
Date: Mon Aug 25 09:51:22 2008
New Revision: 35628

URL: http://svn.reactos.org/svn/reactos?rev=35628&view=rev
Log:
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

Modified:
    trunk/reactos/include/ddk/ntifs.h
    trunk/reactos/include/ndk/ketypes.h
    trunk/reactos/include/ndk/ldrtypes.h

Modified: trunk/reactos/include/ddk/ntifs.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntifs.h?rev=35628&r1=35627&r2=35628&view=diff
==============================================================================
--- trunk/reactos/include/ddk/ntifs.h [iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntifs.h [iso-8859-1] Mon Aug 25 09:51:22 2008
@@ -787,10 +787,10 @@
     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,

Modified: trunk/reactos/include/ndk/ketypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ketypes.h?rev=35628&r1=35627&r2=35628&view=diff
==============================================================================
--- trunk/reactos/include/ndk/ketypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/ketypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008
@@ -558,7 +558,7 @@
 typedef struct _KDPC_DATA
 {
     LIST_ENTRY DpcListHead;
-    ULONG DpcLock;
+    ULONG_PTR DpcLock;
     volatile ULONG DpcQueueDepth;
     ULONG DpcCount;
 } KDPC_DATA, *PKDPC_DATA;

Modified: trunk/reactos/include/ndk/ldrtypes.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/ldrtypes.h?rev=35628&r1=35627&r2=35628&view=diff
==============================================================================
--- trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] (original)
+++ trunk/reactos/include/ndk/ldrtypes.h [iso-8859-1] Mon Aug 25 09:51:22 2008
@@ -138,8 +138,8 @@
 //
 typedef struct _LDR_RESOURCE_INFO
 {
-    ULONG Type;
-    ULONG Name;
+    ULONG_PTR Type;
+    ULONG_PTR Name;
     ULONG Language;
 } LDR_RESOURCE_INFO, *PLDR_RESOURCE_INFO;