Merge pull request #439 from mono-soc-2012/garyb/iconfix

[mono.git] / mcs / class / corlib / System.Threading / Mutex.cs

diff --git a/mcs/class/corlib/System.Threading/Mutex.cs b/mcs/class/corlib/System.Threading/Mutex.cs
index 2f6e412c401c22a6b952480b842c9c4010876fa9..61f27f00c8008b20b4db298e9bec763c103c341d 100644 (file)
--- a/mcs/class/corlib/System.Threading/Mutex.cs
+++ b/mcs/class/corlib/System.Threading/Mutex.cs
@@ -31,12 +31,16 @@
 using System.Runtime.CompilerServices;
 using System.Security.Permissions;
 
-#if NET_2_0
 using System.Runtime.ConstrainedExecution;
+using System.IO;
+using System.Runtime.InteropServices;
+#if !NET_2_1
+using System.Security.AccessControl;
 #endif
 
 namespace System.Threading
 {
+       [ComVisible (true)]
        public sealed class Mutex : WaitHandle 
        {
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
@@ -46,14 +50,26 @@ namespace System.Threading
                                                         out bool created);
 
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
-               private static extern void ReleaseMutex_internal(IntPtr handle);
+               private static extern bool ReleaseMutex_internal(IntPtr handle);
 
+#if !NET_2_1
+               [MethodImplAttribute (MethodImplOptions.InternalCall)]
+               private static extern IntPtr OpenMutex_internal (string name, MutexRights rights, out MonoIOError error);
+               
+               private Mutex (IntPtr handle)
+               {
+                       Handle = handle;
+               }
+#endif
+               
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
                public Mutex() {
                        bool created;
                        
                        Handle=CreateMutex_internal(false, null, out created);
                }
                
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
                public Mutex(bool initiallyOwned) {
                        bool created;
                        
@@ -61,6 +77,7 @@ namespace System.Threading
                                                    out created);
                }
 
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                public Mutex (bool initiallyOwned, string name)
                {
@@ -68,17 +85,79 @@ namespace System.Threading
                        Handle = CreateMutex_internal (initiallyOwned, name, out created);
                }
 
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
                [SecurityPermission (SecurityAction.LinkDemand, UnmanagedCode = true)]
                public Mutex (bool initiallyOwned, string name, out bool createdNew)
                {
                        Handle = CreateMutex_internal (initiallyOwned, name, out createdNew);
                }
 
-#if NET_2_0
+#if !NET_2_1
+               [MonoTODO ("Use MutexSecurity in CreateMutex_internal")]
+               [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
+               public Mutex (bool initiallyOwned, string name, out bool createdNew, MutexSecurity mutexSecurity)
+               {
+                       Handle = CreateMutex_internal (initiallyOwned, name, out createdNew);
+               }
+
+               public MutexSecurity GetAccessControl ()
+               {
+                       return new MutexSecurity (SafeWaitHandle,
+                                                 AccessControlSections.Owner |
+                                                 AccessControlSections.Group |
+                                                 AccessControlSections.Access);
+               }
+
+               public static Mutex OpenExisting (string name)
+               {
+                       return(OpenExisting (name, MutexRights.Synchronize |
+                                            MutexRights.Modify));
+               }
+               
+               public static Mutex OpenExisting (string name,
+                                                 MutexRights rights)
+               {
+                       if (name == null) {
+                               throw new ArgumentNullException ("name");
+                       }
+                       if ((name.Length == 0) ||
+                           (name.Length > 260)) {
+                               throw new ArgumentException ("name", Locale.GetText ("Invalid length [1-260]."));
+                       }
+                       
+                       MonoIOError error;
+                       IntPtr handle = OpenMutex_internal (name, rights,
+                                                           out error);
+                       if (handle == (IntPtr)null) {
+                               if (error == MonoIOError.ERROR_FILE_NOT_FOUND) {
+                                       throw new WaitHandleCannotBeOpenedException (Locale.GetText ("Named Mutex handle does not exist: ") + name);
+                               } else if (error == MonoIOError.ERROR_ACCESS_DENIED) {
+                                       throw new UnauthorizedAccessException ();
+                               } else {
+                                       throw new IOException (Locale.GetText ("Win32 IO error: ") +  error.ToString ());
+                               }
+                       }
+                       
+                       return(new Mutex (handle));
+               }
+#endif
+
                [ReliabilityContractAttribute (Consistency.WillNotCorruptState, Cer.MayFail)]
-#endif 
                public void ReleaseMutex() {
-                       ReleaseMutex_internal(Handle);
+                       bool success = ReleaseMutex_internal(Handle);
+                       if (!success) {
+                               throw new ApplicationException ("Mutex is not owned");
+                       }
                }
+
+#if !NET_2_1
+               public void SetAccessControl (MutexSecurity mutexSecurity)
+               {
+                       if (null == mutexSecurity)
+                               throw new ArgumentNullException ("mutexSecurity");
+                               
+                       mutexSecurity.PersistModifications (SafeWaitHandle);
+               }
+#endif
        }
 }