[ekohl] 60727: [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 speci...

Author: ekohl
Date: Mon Oct 21 09:13:14 2013
New Revision: 60727

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

Modified:
    trunk/reactos/include/ddk/ntsam.h
    trunk/reactos/include/reactos/idl/sam.idl

Modified: trunk/reactos/include/ddk/ntsam.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntsam.h?rev=60…
==============================================================================
--- trunk/reactos/include/ddk/ntsam.h	[iso-8859-1] (original)
+++ trunk/reactos/include/ddk/ntsam.h	[iso-8859-1] Mon Oct 21 09:13:14 2013
@@ -439,6 +439,29 @@
     GroupAdminCommentInformation,
     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
 {

Modified: trunk/reactos/include/reactos/idl/sam.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/idl/sam.id…
==============================================================================
--- trunk/reactos/include/reactos/idl/sam.idl	[iso-8859-1] (original)
+++ trunk/reactos/include/reactos/idl/sam.idl	[iso-8859-1] Mon Oct 21 09:13:14 2013
@@ -366,10 +366,10 @@
     [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 @@
 {
     [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;