[INCLUDE]

- sam.idl: Rename GROUP_ATTRIBUTE_INFORMATION to SAMPR_GROUP_ATTRIBUTE_INFORMATION in order to avoid confilcts with new types in ntsam.h.
- ntsam.h: Add missing group specific structures.

svn path=/trunk/; revision=60727

diff --git a/reactos/include/ddk/ntsam.h b/reactos/include/ddk/ntsam.h
index 5f27283..63d8fcf 100644 (file)
--- a/reactos/include/ddk/ntsam.h
+++ b/reactos/include/ddk/ntsam.h
@@ -440,6 +440,29 @@ typedef enum _GROUP_INFORMATION_CLASS
     GroupReplicationInformation
 } GROUP_INFORMATION_CLASS;
 
+typedef struct _GROUP_GENERAL_INFORMATION
+{
+    UNICODE_STRING Name;
+    ULONG Attributes;
+    ULONG MemberCount;
+    UNICODE_STRING AdminComment;
+} GROUP_GENERAL_INFORMATION, *PGROUP_GENERAL_INFORMATION;
+
+typedef struct _GROUP_NAME_INFORMATION
+{
+    UNICODE_STRING Name;
+} GROUP_NAME_INFORMATION, *PGROUP_NAME_INFORMATION;
+
+typedef struct _GROUP_ATTRIBUTE_INFORMATION
+{
+    ULONG Attributes;
+} GROUP_ATTRIBUTE_INFORMATION, *PGROUP_ATTRIBUTE_INFORMATION;
+
+typedef struct GROUP_ADM_COMMENT_INFORMATION
+{
+    UNICODE_STRING AdminComment;
+} GROUP_ADM_COMMENT_INFORMATION, *PGROUP_ADM_COMMENT_INFORMATION;
+
 typedef struct _GROUP_MEMBERSHIP
 {
     ULONG RelativeId;

diff --git a/reactos/include/reactos/idl/sam.idl b/reactos/include/reactos/idl/sam.idl
index e9434ad..7111d7f 100644 (file)
--- a/reactos/include/reactos/idl/sam.idl
+++ b/reactos/include/reactos/idl/sam.idl
@@ -366,10 +366,10 @@ typedef [switch_type(DOMAIN_DISPLAY_INFORMATION)] union _SAMPR_DISPLAY_INFO_BUFF
     [case(DomainDisplayOemGroup)] SAMPR_DOMAIN_DISPLAY_OEM_GROUP_BUFFER OemGroupInformation;
 } SAMPR_DISPLAY_INFO_BUFFER, *PSAMPR_DISPLAY_INFO_BUFFER;
 
-typedef struct _GROUP_ATTRIBUTE_INFORMATION
+typedef struct _SAMPR_GROUP_ATTRIBUTE_INFORMATION
 {
     unsigned long Attributes;
-} GROUP_ATTRIBUTE_INFORMATION, *PGROUP_ATTRIBUTE_INFORMATION;
+} SAMPR_GROUP_ATTRIBUTE_INFORMATION, *PSAMPR_GROUP_ATTRIBUTE_INFORMATION;
 
 typedef struct _SAMPR_GROUP_GENERAL_INFORMATION
 {
@@ -404,7 +404,7 @@ typedef [switch_type(GROUP_INFORMATION_CLASS)] union _SAMPR_GROUP_INFO_BUFFER
 {
     [case(GroupGeneralInformation)] SAMPR_GROUP_GENERAL_INFORMATION General;
     [case(GroupNameInformation)] SAMPR_GROUP_NAME_INFORMATION Name;
-    [case(GroupAttributeInformation)] GROUP_ATTRIBUTE_INFORMATION Attribute;
+    [case(GroupAttributeInformation)] SAMPR_GROUP_ATTRIBUTE_INFORMATION Attribute;
     [case(GroupAdminCommentInformation)] SAMPR_GROUP_ADM_COMMENT_INFORMATION AdminComment;
     [case(GroupReplicationInformation)] SAMPR_GROUP_GENERAL_INFORMATION DoNotUse;
 } SAMPR_GROUP_INFO_BUFFER, *PSAMPR_GROUP_INFO_BUFFER;