Headers diff for aclui.dll between 6.0.6001.18000-Windows 6.0 and 6.1.7600.16385-Windows 7.0 versions



 aclui.h (6.0.6001.18000-Windows 6.0)   aclui.h (6.1.7600.16385-Windows 7.0) 
//+-------------------------------------------------------------------------- /*+--------------------------------------------------------------------------
//
// Microsoft Windows Microsoft Windows
// Copyright (c) Microsoft Corporation. All rights reserved. Copyright (c) Microsoft Corporation. All rights reserved.
//
// File: aclui.h File: aclui.h
//
// Contents: Definitions and prototypes for the ACLUI.DLL Contents: Definitions and prototypes for the ACLUI.DLL
//
//--------------------------------------------------------------------------- ---------------------------------------------------------------------------*/
#ifndef _ACLUI_H_ #ifndef _ACLUI_H_
#define _ACLUI_H_ #define _ACLUI_H_
#if _MSC_VER > 1000 #if _MSC_VER > 1000
#pragma once #pragma once
#endif #endif
#include <objbase.h> #include <objbase.h>
#include <commctrl.h> // for HPROPSHEETPAGE #include <commctrl.h> /* for HPROPSHEETPAGE */
#include <accctrl.h> // for SE_OBJECT_TYPE #include <accctrl.h> /* for SE_OBJECT_TYPE */
#if (_MSC_VER >= 800)
#if (_MSC_VER >= 1200)
#pragma warning(push)
#endif
#pragma warning(disable:4001) /* nonstandard extension : single line comment */
#endif
#if !defined(_ACLUI_) #if !defined(_ACLUI_)
#define ACLUIAPI DECLSPEC_IMPORT WINAPI #define ACLUIAPI DECLSPEC_IMPORT WINAPI
#else #else
#define ACLUIAPI WINAPI #define ACLUIAPI WINAPI
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif /* __cplusplus */ #endif /* __cplusplus */
skipping to change at line 95 skipping to change at line 102
#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
#if (NTDDI_VERSION >= NTDDI_VISTA)
#define SI_VIEW_ONLY 0x00400000L #define SI_VIEW_ONLY 0x00400000L
#define SI_PERMS_ELEVATION_REQUIRED 0x01000000L #define SI_PERMS_ELEVATION_REQUIRED 0x01000000L
#define SI_AUDITS_ELEVATION_REQUIRED 0x02000000L #define SI_AUDITS_ELEVATION_REQUIRED 0x02000000L
#define SI_OWNER_ELEVATION_REQUIRED 0x04000000L #define SI_OWNER_ELEVATION_REQUIRED 0x04000000L
#endif // (NTDDI_VERSION >= NTDDI_VISTA)
#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 136 skipping to change at line 145
// 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,
#if (NTDDI_VERSION >= NTDDI_VISTA)
SI_PAGE_TAKEOWNERSHIP, SI_PAGE_TAKEOWNERSHIP,
#endif // (NTDDI_VERSION >= NTDDI_VISTA)
} 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_IID_(ISecurityInformation, IUnknown, "965FC360-16FF-11d0-91CB- 00AA00BBB723") DECLARE_INTERFACE_IID_(ISecurityInformation, IUnknown, "965FC360-16FF-11d0-91CB- 00AA00BBB723")
{ {
skipping to change at line 242 skipping to change at line 253
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;
#if (NTDDI_VERSION >= NTDDI_VISTA)
// Support for separation or read-only ACL viewer and elevated ACL editor // Support for separation or read-only ACL viewer and elevated ACL editor
#undef INTERFACE #undef INTERFACE
#define INTERFACE ISecurityInformation3 #define INTERFACE ISecurityInformation3
DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "E2CDC9CC-31BD-4f8f-8C8B -B641AF516A1A") DECLARE_INTERFACE_IID_(ISecurityInformation3, IUnknown, "E2CDC9CC-31BD-4f8f-8C8B -B641AF516A1A")
{ {
// *** 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;
// *** ISecurityInformation3 methods *** // *** ISecurityInformation3 methods ***
STDMETHOD(GetFullResourceName) (THIS_ OUT LPWSTR *ppszResourceName) PURE; STDMETHOD(GetFullResourceName) (THIS_ __out LPWSTR *ppszResourceName) PURE;
STDMETHOD(OpenElevatedEditor) (THIS_ IN HWND hWnd, IN SI_PAGE_TYPE uPage) PU RE; STDMETHOD(OpenElevatedEditor) (THIS_ IN HWND hWnd, IN SI_PAGE_TYPE uPage) PU RE;
}; };
typedef ISecurityInformation3 *LPSECURITYINFO3; typedef ISecurityInformation3 *LPSECURITYINFO3;
#endif // (NTDDI_VERSION >= NTDDI_VISTA)
// {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);
#if (NTDDI_VERSION >= NTDDI_VISTA)
// {E2CDC9CC-31BD-4f8f-8C8B-B641AF516A1A} // {E2CDC9CC-31BD-4f8f-8C8B-B641AF516A1A}
EXTERN_GUID(IID_ISecurityInformation3, 0xe2cdc9cc, 0x31bd, 0x4f8f, 0x8c, 0x8b, 0 xb6, 0x41, 0xaf, 0x51, 0x6a, 0x1a); EXTERN_GUID(IID_ISecurityInformation3, 0xe2cdc9cc, 0x31bd, 0x4f8f, 0x8c, 0x8b, 0 xb6, 0x41, 0xaf, 0x51, 0x6a, 0x1a);
#endif // (NTDDI_VERSION >= NTDDI_VISTA)
HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(__in LPSECURITYINFO psi ); HPROPSHEETPAGE ACLUIAPI CreateSecurityPage(__in LPSECURITYINFO psi );
BOOL ACLUIAPI EditSecurity(__in HWND hwndOwner, BOOL ACLUIAPI EditSecurity(__in HWND hwndOwner,
__in LPSECURITYINFO psi ); __in LPSECURITYINFO psi );
#if (NTDDI_VERSION >= NTDDI_VISTA)
HRESULT ACLUIAPI EditSecurityAdvanced(__in HWND hwndOwner, HRESULT ACLUIAPI EditSecurityAdvanced(__in HWND hwndOwner,
__in LPSECURITYINFO psi, __in LPSECURITYINFO psi,
__in SI_PAGE_TYPE uSIPage ); __in SI_PAGE_TYPE uSIPage );
#endif // (NTDDI_VERSION >= NTDDI_VISTA)
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#if (_MSC_VER >= 800)
#if (_MSC_VER >= 1200)
#pragma warning(pop)
#else
#pragma warning(default:4001)
#endif
#endif
#endif /* _ACLUI_H_ */ #endif /* _ACLUI_H_ */
 End of changes. 14 change blocks. 
13 lines changed or deleted 39 lines changed or added

This html diff was produced by rfcdiff 1.41.