aclui.h (5.2.3790.3959-Windows 5.0) | | aclui.h (6.0.6001.18000-Windows 6.0) |
| | |
skipping to change at line 95 | | skipping to change at line 95 |
#define SI_PAGE_TITLE 0x00000800L | | #define SI_PAGE_TITLE 0x00000800L |
#define SI_SERVER_IS_DC 0x00001000L | | #define SI_SERVER_IS_DC 0x00001000L |
#define SI_RESET_DACL_TREE 0x00004000L | | #define SI_RESET_DACL_TREE 0x00004000L |
#define SI_RESET_SACL_TREE 0x00008000L | | #define SI_RESET_SACL_TREE 0x00008000L |
#define SI_OBJECT_GUID 0x00010000L | | #define SI_OBJECT_GUID 0x00010000L |
#define SI_EDIT_EFFECTIVE 0x00020000L | | #define SI_EDIT_EFFECTIVE 0x00020000L |
#define SI_RESET_DACL 0x00040000L | | #define SI_RESET_DACL 0x00040000L |
#define SI_RESET_SACL 0x00080000L | | #define SI_RESET_SACL 0x00080000L |
#define SI_RESET_OWNER 0x00100000L | | #define SI_RESET_OWNER 0x00100000L |
#define SI_NO_ADDITIONAL_PERMISSION 0x00200000L | | #define SI_NO_ADDITIONAL_PERMISSION 0x00200000L |
|
| | #define SI_VIEW_ONLY 0x00400000L |
| | #define SI_PERMS_ELEVATION_REQUIRED 0x01000000L |
| | #define SI_AUDITS_ELEVATION_REQUIRED 0x02000000L |
| | #define SI_OWNER_ELEVATION_REQUIRED 0x04000000L |
#define SI_MAY_WRITE 0x10000000L //not sure if user can write per
mission | | #define SI_MAY_WRITE 0x10000000L //not sure if user can write per
mission |
| | |
#define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) | | #define SI_EDIT_ALL (SI_EDIT_PERMS | SI_EDIT_OWNER | SI_EDIT_AUDITS) |
| | |
typedef struct _SI_ACCESS | | typedef struct _SI_ACCESS |
{ | | { |
const GUID *pguid; | | const GUID *pguid; |
ACCESS_MASK mask; | | ACCESS_MASK mask; |
LPCWSTR pszName; // may be resource ID | | LPCWSTR pszName; // may be resource ID |
DWORD dwFlags; | | DWORD dwFlags; |
| | |
skipping to change at line 132 | | skipping to change at line 136 |
// SI_INHERIT_TYPE flags are a combination of INHERIT_ONLY_ACE, | | // SI_INHERIT_TYPE flags are a combination of INHERIT_ONLY_ACE, |
// CONTAINER_INHERIT_ACE, and OBJECT_INHERIT_ACE. | | // CONTAINER_INHERIT_ACE, and OBJECT_INHERIT_ACE. |
| | |
typedef enum _SI_PAGE_TYPE | | typedef enum _SI_PAGE_TYPE |
{ | | { |
SI_PAGE_PERM=0, | | SI_PAGE_PERM=0, |
SI_PAGE_ADVPERM, | | SI_PAGE_ADVPERM, |
SI_PAGE_AUDIT, | | SI_PAGE_AUDIT, |
SI_PAGE_OWNER, | | SI_PAGE_OWNER, |
SI_PAGE_EFFECTIVE, | | SI_PAGE_EFFECTIVE, |
|
| | SI_PAGE_TAKEOWNERSHIP, |
} SI_PAGE_TYPE; | | } SI_PAGE_TYPE; |
| | |
// Message to PropertySheetPageCallback (in addition to | | // Message to PropertySheetPageCallback (in addition to |
// PSPCB_CREATE and PSPCB_RELEASE) | | // PSPCB_CREATE and PSPCB_RELEASE) |
|
#define PSPCB_SI_INITDIALOG (WM_USER + 1) | | #define PSPCB_SI_INITDIALOG (WM_USER + 1) |
| | |
#undef INTERFACE | | #undef INTERFACE |
#define INTERFACE ISecurityInformation | | #define INTERFACE ISecurityInformation |
|
DECLARE_INTERFACE_(ISecurityInformation, IUnknown) | | DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965FC360-16FF-11d0-91CB-
00AA00BBB723") |
{ | | { |
// *** IUnknown methods *** | | // *** IUnknown methods *** |
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; |
STDMETHOD_(ULONG,AddRef) (THIS) PURE; | | STDMETHOD_(ULONG,AddRef) (THIS) PURE; |
STDMETHOD_(ULONG,Release) (THIS) PURE; | | STDMETHOD_(ULONG,Release) (THIS) PURE; |
| | |
// *** ISecurityInformation methods *** | | // *** ISecurityInformation methods *** |
STDMETHOD(GetObjectInformation) (THIS_ PSI_OBJECT_INFO pObjectInfo ) PURE; | | STDMETHOD(GetObjectInformation) (THIS_ PSI_OBJECT_INFO pObjectInfo ) PURE; |
STDMETHOD(GetSecurity) (THIS_ SECURITY_INFORMATION RequestedInformation, | | STDMETHOD(GetSecurity) (THIS_ SECURITY_INFORMATION RequestedInformation, |
PSECURITY_DESCRIPTOR *ppSecurityDescriptor, | | PSECURITY_DESCRIPTOR *ppSecurityDescriptor, |
| | |
skipping to change at line 170 | | skipping to change at line 175 |
UCHAR *pAceFlags, | | UCHAR *pAceFlags, |
ACCESS_MASK *pMask) PURE; | | ACCESS_MASK *pMask) PURE; |
STDMETHOD(GetInheritTypes) (THIS_ PSI_INHERIT_TYPE *ppInheritTypes, | | STDMETHOD(GetInheritTypes) (THIS_ PSI_INHERIT_TYPE *ppInheritTypes, |
ULONG *pcInheritTypes ) PURE; | | ULONG *pcInheritTypes ) PURE; |
STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYP
E uPage ) PURE; | | STDMETHOD(PropertySheetPageCallback)(THIS_ HWND hwnd, UINT uMsg, SI_PAGE_TYP
E uPage ) PURE; |
}; | | }; |
typedef ISecurityInformation *LPSECURITYINFO; | | typedef ISecurityInformation *LPSECURITYINFO; |
| | |
#undef INTERFACE | | #undef INTERFACE |
#define INTERFACE ISecurityInformation2 | | #define INTERFACE ISecurityInformation2 |
|
DECLARE_INTERFACE_(ISecurityInformation2, IUnknown) | | DECLARE_INTERFACE_IID_(ISecurityInformation2, IUnknown, "c3ccfdb4-6f88-11d2-a3ce
-00c04fb1782a") |
{ | | { |
// *** IUnknown methods *** | | // *** IUnknown methods *** |
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; |
STDMETHOD_(ULONG,AddRef) (THIS) PURE; | | STDMETHOD_(ULONG,AddRef) (THIS) PURE; |
STDMETHOD_(ULONG,Release) (THIS) PURE; | | STDMETHOD_(ULONG,Release) (THIS) PURE; |
| | |
// *** ISecurityInformation2 methods *** | | // *** ISecurityInformation2 methods *** |
STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ IN PACL pDacl) PURE; | | STDMETHOD_(BOOL,IsDaclCanonical) (THIS_ IN PACL pDacl) PURE; |
STDMETHOD(LookupSids) (THIS_ IN ULONG cSids, IN PSID *rgpSids, OUT LPDATAOBJ
ECT *ppdo) PURE; | | STDMETHOD(LookupSids) (THIS_ IN ULONG cSids, IN PSID *rgpSids, OUT LPDATAOBJ
ECT *ppdo) PURE; |
}; | | }; |
| | |
skipping to change at line 202 | | skipping to change at line 207 |
PWSTR pwzUPN; // Optional, may be NULL | | PWSTR pwzUPN; // Optional, may be NULL |
} SID_INFO, *PSID_INFO; | | } SID_INFO, *PSID_INFO; |
typedef struct _SID_INFO_LIST | | typedef struct _SID_INFO_LIST |
{ | | { |
ULONG cItems; | | ULONG cItems; |
SID_INFO aSidInfo[ANYSIZE_ARRAY]; | | SID_INFO aSidInfo[ANYSIZE_ARRAY]; |
} SID_INFO_LIST, *PSID_INFO_LIST; | | } SID_INFO_LIST, *PSID_INFO_LIST; |
| | |
#undef INTERFACE | | #undef INTERFACE |
#define INTERFACE IEffectivePermission | | #define INTERFACE IEffectivePermission |
|
DECLARE_INTERFACE_(IEffectivePermission, IUnknown) | | DECLARE_INTERFACE_IID_(IEffectivePermission, IUnknown, "3853DC76-9F35-407c-88A1-
D19344365FBC") |
{ | | { |
// *** IUnknown methods *** | | // *** IUnknown methods *** |
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; |
STDMETHOD_(ULONG,AddRef) (THIS) PURE; | | STDMETHOD_(ULONG,AddRef) (THIS) PURE; |
STDMETHOD_(ULONG,Release) (THIS) PURE; | | STDMETHOD_(ULONG,Release) (THIS) PURE; |
| | |
// *** ISecurityInformation methods *** | | // *** ISecurityInformation methods *** |
STDMETHOD(GetEffectivePermission) ( THIS_ const GUID* pguidObjectType, | | STDMETHOD(GetEffectivePermission) ( THIS_ const GUID* pguidObjectType, |
PSID pUserSid, | | PSID pUserSid, |
LPCWSTR pszServerName, | | LPCWSTR pszServerName, |
PSECURITY_DESCRIPTOR pSD, | | PSECURITY_DESCRIPTOR pSD, |
POBJECT_TYPE_LIST *ppObjectTypeList, | | POBJECT_TYPE_LIST *ppObjectTypeList, |
ULONG *pcObjectTypeListLength, | | ULONG *pcObjectTypeListLength, |
PACCESS_MASK *ppGrantedAccessList, | | PACCESS_MASK *ppGrantedAccessList, |
ULONG *pcGrantedAccessListLength) PURE; | | ULONG *pcGrantedAccessListLength) PURE; |
}; | | }; |
typedef IEffectivePermission *LPEFFECTIVEPERMISSION; | | typedef IEffectivePermission *LPEFFECTIVEPERMISSION; |
| | |
#undef INTERFACE | | #undef INTERFACE |
#define INTERFACE ISecurityObjectTypeInfo | | #define INTERFACE ISecurityObjectTypeInfo |
|
DECLARE_INTERFACE_(ISecurityObjectTypeInfo, IUnknown) | | DECLARE_INTERFACE_IID_(ISecurityObjectTypeInfo, IUnknown, "FC3066EB-79EF-444b-91
11-D18A75EBF2FA") |
{ | | { |
// *** IUnknown methods *** | | // *** IUnknown methods *** |
STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; | | STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; |
STDMETHOD_(ULONG,AddRef) (THIS) PURE; | | STDMETHOD_(ULONG,AddRef) (THIS) PURE; |
STDMETHOD_(ULONG,Release) (THIS) PURE; | | STDMETHOD_(ULONG,Release) (THIS) PURE; |
| | |
// *** ISecurityInformation methods *** | | // *** ISecurityInformation methods *** |
STDMETHOD(GetInheritSource)(SECURITY_INFORMATION si, | | STDMETHOD(GetInheritSource)(SECURITY_INFORMATION si, |
PACL pACL, | | PACL pACL, |
PINHERITED_FROM *ppInheritArray) PURE; | | PINHERITED_FROM *ppInheritArray) PURE; |
}; | | }; |
typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; | | typedef ISecurityObjectTypeInfo *LPSecurityObjectTypeInfo; |
| | |
|
| | // Support for separation or read-only ACL viewer and elevated ACL editor |
| | #undef INTERFACE |
| | #define INTERFACE ISecurityInformation3 |
| | DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "E2CDC9CC-31BD-4f8f-8C8B |
| | -B641AF516A1A") |
| | { |
| | // *** IUnknown methods *** |
| | STDMETHOD(QueryInterface) (THIS_ REFIID riid, LPVOID * ppvObj) PURE; |
| | STDMETHOD_(ULONG,AddRef) (THIS) PURE; |
| | STDMETHOD_(ULONG,Release) (THIS) PURE; |
| | |
| | // *** ISecurityInformation3 methods *** |
| | STDMETHOD(GetFullResourceName) (THIS_ OUT LPWSTR *ppszResourceName) PURE; |
| | STDMETHOD(OpenElevatedEditor) (THIS_ IN HWND hWnd, IN SI_PAGE_TYPE uPage) PU |
| | RE; |
| | }; |
| | typedef ISecurityInformation3 *LPSECURITYINFO3; |
| | |
// {965FC360-16FF-11d0-91CB-00AA00BBB723} | | // {965FC360-16FF-11d0-91CB-00AA00BBB723} |
EXTERN_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x
0, 0xaa, 0x0, 0xbb, 0xb7, 0x23); | | EXTERN_GUID(IID_ISecurityInformation, 0x965fc360, 0x16ff, 0x11d0, 0x91, 0xcb, 0x
0, 0xaa, 0x0, 0xbb, 0xb7, 0x23); |
// {c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a} | | // {c3ccfdb4-6f88-11d2-a3ce-00c04fb1782a} |
EXTERN_GUID(IID_ISecurityInformation2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0xa3, 0xce, 0
x0, 0xc0, 0x4f, 0xb1, 0x78, 0x2a); | | EXTERN_GUID(IID_ISecurityInformation2, 0xc3ccfdb4, 0x6f88, 0x11d2, 0xa3, 0xce, 0
x0, 0xc0, 0x4f, 0xb1, 0x78, 0x2a); |
// {3853DC76-9F35-407c-88A1-D19344365FBC} | | // {3853DC76-9F35-407c-88A1-D19344365FBC} |
EXTERN_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x88, 0xa1, 0x
d1, 0x93, 0x44, 0x36, 0x5f, 0xbc); | | EXTERN_GUID(IID_IEffectivePermission, 0x3853dc76, 0x9f35, 0x407c, 0x88, 0xa1, 0x
d1, 0x93, 0x44, 0x36, 0x5f, 0xbc); |
// {FC3066EB-79EF-444b-9111-D18A75EBF2FA} | | // {FC3066EB-79EF-444b-9111-D18A75EBF2FA} |
EXTERN_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x91, 0x11,
0xd1, 0x8a, 0x75, 0xeb, 0xf2, 0xfa); | | EXTERN_GUID(IID_ISecurityObjectTypeInfo, 0xfc3066eb, 0x79ef, 0x444b, 0x91, 0x11,
0xd1, 0x8a, 0x75, 0xeb, 0xf2, 0xfa); |
|
| | // {E2CDC9CC-31BD-4f8f-8C8B-B641AF516A1A} |
| | EXTERN_GUID(IID_ISecurityInformation3, 0xe2cdc9cc, 0x31bd, 0x4f8f, 0x8c, 0x8b, 0 |
| | xb6, 0x41, 0xaf, 0x51, 0x6a, 0x1a); |
| | |
|
HPROPSHEETPAGE ACLUIAPI CreateSecurityPage( LPSECURITYINFO psi ); | | HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(__in LPSECURITYINFO psi ); |
BOOL ACLUIAPI EditSecurity( HWND hwndOwner, LPSECURITYINFO psi ); | | BOOL ACLUIAPI EditSecurity(__in HWND hwndOwner, |
| | __in LPSECURITYINFO psi ); |
| | HRESULT ACLUIAPI EditSecurityAdvanced(__in HWND hwndOwner, |
| | __in LPSECURITYINFO psi, |
| | __in SI_PAGE_TYPE uSIPage ); |
| | |
#ifdef __cplusplus | | #ifdef __cplusplus |
} | | } |
#endif /* __cplusplus */ | | #endif /* __cplusplus */ |
| | |
#endif /* _ACLUI_H_ */ | | #endif /* _ACLUI_H_ */ |
| | |
End of changes. 10 change blocks. |
7 lines changed or deleted | | 37 lines changed or added |
|