Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@ -38,7 +38,9 @@ namespace System.Security.AccessControl
public abstract class NativeObjectSecurity : CommonObjectSecurity
{
ExceptionFromErrorCode exception_from_error_code;
#if WIN_PLATFORM
ResourceType resource_type;
#endif
protected internal delegate Exception ExceptionFromErrorCode (int errorCode,
string name, SafeHandle handle,
@ -47,7 +49,9 @@ namespace System.Security.AccessControl
internal NativeObjectSecurity (CommonSecurityDescriptor securityDescriptor, ResourceType resourceType)
: base (securityDescriptor)
{
#if WIN_PLATFORM
resource_type = resourceType;
#endif
}
protected NativeObjectSecurity (bool isContainer,
@ -63,7 +67,9 @@ namespace System.Security.AccessControl
: base (isContainer)
{
exception_from_error_code = exceptionFromErrorCode;
#if WIN_PLATFORM
resource_type = resourceType;
#endif
}
protected NativeObjectSecurity (bool isContainer,
@ -129,12 +135,7 @@ namespace System.Security.AccessControl
{
Persist (name, includeSections, null);
}
internal void Persist (SafeHandle handle)
{
PersistModifications (handle);
}
internal void PersistModifications (SafeHandle handle)
{
WriteLock();
@ -208,7 +209,7 @@ namespace System.Security.AccessControl
internal virtual int InternalGet (SafeHandle handle,
AccessControlSections includeSections)
{
#if MOBILE
#if !WIN_PLATFORM
throw new PlatformNotSupportedException ();
#else
if (Environment.OSVersion.Platform != PlatformID.Win32NT)
@ -228,7 +229,7 @@ namespace System.Security.AccessControl
internal virtual int InternalGet (string name,
AccessControlSections includeSections)
{
#if MOBILE
#if !WIN_PLATFORM
throw new PlatformNotSupportedException ();
#else
if (Environment.OSVersion.Platform != PlatformID.Win32NT)
@ -245,7 +246,7 @@ namespace System.Security.AccessControl
#endif
}
#if MOBILE
#if !WIN_PLATFORM
internal virtual int InternalSet (SafeHandle handle, AccessControlSections includeSections)
{
throw new PlatformNotSupportedException ();
@ -416,12 +417,14 @@ namespace System.Security.AccessControl
[return: MarshalAs (UnmanagedType.Bool)]
static extern bool IsValidSecurityDescriptor (IntPtr descriptor);
/*
struct SecurityDescriptor
{
public byte Revision, Size;
public ushort ControlFlags;
public IntPtr Owner, Group, Sacl, Dacl;
}
*/
#endregion
#endif
}