Commit in reactos on MAIN
include/accctrl.h+331.2 -> 1.3
w32api/include/accctrl.h+601.1 -> 1.2
+93
2 modified files
added some missing definitions

reactos/include
accctrl.h 1.2 -> 1.3
diff -u -r1.2 -r1.3
--- accctrl.h	17 Jun 2004 09:06:21 -0000	1.2
+++ accctrl.h	10 Jul 2004 23:23:06 -0000	1.3
@@ -44,6 +44,39 @@
     SE_REGISTRY_WOW64_32KEY
 } SE_OBJECT_TYPE;
 
+typedef struct _SI_OBJECT_INFO
+{
+    DWORD     dwFlags;
+    HINSTANCE hInstance;
+    LPWSTR    pszServerName;
+    LPWSTR    pszObjectName;
+    LPWSTR    pszPageTitle;
+    GUID      guidObjectType;
+} SI_OBJECT_INFO, *PSI_OBJECT_INFO;
+
+typedef struct _SI_ACCESS
+{
+    const GUID  *pguid;
+    ACCESS_MASK mask;
+    LPCWSTR     pszName;
+    DWORD       dwFlags;
+} SI_ACCESS, *PSI_ACCESS;
+
+typedef struct _SI_INHERIT_TYPE
+{
+    const GUID *pguid;
+    ULONG      dwFlags;
+    LPCWSTR    pszName;
+} SI_INHERIT_TYPE, *PSI_INHERIT_TYPE;
+
+typedef enum _SI_PAGE_TYPE
+{
+    SI_PAGE_PERM = 0, 
+    SI_PAGE_ADVPERM, 
+    SI_PAGE_AUDIT, 
+    SI_PAGE_OWNER
+} SI_PAGE_TYPE;
+
 typedef enum _TRUSTEE_TYPE
 {
     TRUSTEE_IS_UNKNOWN,

reactos/w32api/include
accctrl.h 1.1 -> 1.2
diff -u -r1.1 -r1.2
--- accctrl.h	21 Feb 2004 09:20:34 -0000	1.1
+++ accctrl.h	10 Jul 2004 23:23:06 -0000	1.2
@@ -102,6 +102,36 @@
 #define INHERITED_PARENT          0x10000000
 #define INHERITED_GRANDPARENT     0x20000000
 
+#define SI_EDIT_PERMS	0x00000000
+#define SI_EDIT_OWNER	0x00000001
+#define SI_EDIT_AUDITS	0x00000002
+#define SI_CONTAINER	0x00000004
+#define SI_READONLY	0x00000008
+#define SI_ADVANCED	0x00000010
+#define SI_RESET	0x00000020
+#define SI_OWNER_READONLY	0x00000040
+#define SI_EDIT_PROPERTIES	0x00000080
+#define SI_OWNER_RECURSE	0x00000100
+#define SI_NO_ACL_PROTECT	0x00000200
+#define SI_NO_TREE_APPLY	0x00000400
+#define SI_PAGE_TITLE	0x00000800
+#define SI_SERVER_IS_DC	0x00001000
+#define SI_RESET_DACL_TREE	0x00004000
+#define SI_RESET_SACL_TREE	0x00008000
+#define SI_OBJECT_GUID	0x00010000
+#define SI_EDIT_EFFECTIVE	0x00020000
+#define SI_RESET_DACL	0x00040000
+#define SI_RESET_SACL	0x00080000
+#define SI_RESET_OWNER	0x00100000
+#define SI_NO_ADDITIONAL_PERMISSION	0x00200000
+#define SI_MAY_WRITE	0x10000000
+#define SI_EDIT_ALL	(SI_EDIT_OWNER |SI_EDIT_PERMS | SI_EDIT_AUDITS)
+
+#define SI_ACCESS_SPECIFIC	0x00010000
+#define SI_ACCESS_GENERAL	0x00020000
+#define SI_ACCESS_CONTAINER	0x00040000
+#define SI_ACCESS_PROPERTY	0x00080000
+
 typedef ULONG INHERIT_FLAGS, *PINHERIT_FLAGS;
 typedef ULONG ACCESS_RIGHTS, *PACCESS_RIGHTS;
 
@@ -287,6 +317,36 @@
 } INHERITED_FROMW, *PINHERITED_FROMW;
 #endif /* (_WIN32_WINNT >= 0x0501) */
 
+typedef struct _SI_OBJECT_INFO
+{
+    DWORD     dwFlags;
+    HINSTANCE hInstance;
+    LPWSTR    pszServerName;
+    LPWSTR    pszObjectName;
+    LPWSTR    pszPageTitle;
+    GUID      guidObjectType;
+} SI_OBJECT_INFO, *PSI_OBJECT_INFO;
+typedef struct _SI_ACCESS
+{
+    const GUID  *pguid;
+    ACCESS_MASK mask;
+    LPCWSTR     pszName;
+    DWORD       dwFlags;
+} SI_ACCESS, *PSI_ACCESS;
+typedef struct _SI_INHERIT_TYPE
+{
+    const GUID *pguid;
+    ULONG      dwFlags;
+    LPCWSTR    pszName;
+} SI_INHERIT_TYPE, *PSI_INHERIT_TYPE;
+typedef enum _SI_PAGE_TYPE
+{
+    SI_PAGE_PERM     = 0, 
+    SI_PAGE_ADVPERM, 
+    SI_PAGE_AUDIT, 
+    SI_PAGE_OWNER
+} SI_PAGE_TYPE;
+
 #ifdef UNICODE
 #define ACCCTRL_DEFAULT_PROVIDER ACCCTRL_DEFAULT_PROVIDERW
 typedef TRUSTEE_W TRUSTEE_, *PTRUSTEE_;
CVSspam 0.2.8