Merge pull request #1201 from crisdut/fix-win-mono-dependencies

[mono.git] / mcs / class / corlib / System.IO / FileLoadException.cs

diff --git a/mcs/class/corlib/System.IO/FileLoadException.cs b/mcs/class/corlib/System.IO/FileLoadException.cs
old mode 100755 (executable)
new mode 100644 (file)
index 8db1cd2..e978bac
--- a/mcs/class/corlib/System.IO/FileLoadException.cs
+++ b/mcs/class/corlib/System.IO/FileLoadException.cs
@@ -6,19 +6,44 @@
 //   Duncan Mak (duncan@ximian.com)
 //
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
+// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
 using System.Globalization;
-using System.IO;
 using System.Runtime.Serialization;
+using System.Security;
+using System.Security.Permissions;
+using System.Text;
+using System.Runtime.InteropServices;
 
 namespace System.IO {
+
        [Serializable]
+       [ComVisible (true)]
        public class FileLoadException : IOException {
 
                // Fields
+               const int Result = unchecked ((int)0x80070002);
                string msg;
-               Exception inner;
                string fileName;
                string fusionLog;
                
@@ -26,18 +51,21 @@ namespace System.IO {
                public FileLoadException ()
                        : base (Locale.GetText ("I/O Error"))
                {
+                       HResult = Result;
                        msg = Locale.GetText ("I/O Error");
                }
 
                public FileLoadException (string message)
                        : base (message)
                {
+                       HResult = Result;
                        msg = message;
                }
 
                public FileLoadException (string message, string fileName)
                        : base (message)
                {
+                       HResult = Result;
                        this.msg = message;
                        this.fileName = fileName;
                }               
@@ -45,16 +73,16 @@ namespace System.IO {
                public FileLoadException (string message, Exception inner)
                        : base (message, inner)
                {
+                       HResult = Result;
                        msg = message;
-                       this.inner = inner;
                }
 
                public FileLoadException (string message, string fileName, Exception inner)
                        : base (message, inner)
                {
+                       HResult = Result;
                        this.msg = message;
                        this.fileName = fileName;
-                       this.inner = inner;
                }
 
                protected FileLoadException (SerializationInfo info, StreamingContext context)
@@ -64,14 +92,8 @@ namespace System.IO {
                }
 
                // Properties
-               public override string Message
-               {
-                       get {
-                               if (fileName != null)
-                                       return Locale.GetText (msg + ": " + fileName);
-                               else
-                                       return msg;
-                       }
+               public override string Message {
+                       get { return msg; }
                }
 
                public string FileName
@@ -79,8 +101,11 @@ namespace System.IO {
                        get { return fileName; }
                }
                
-               public string FusionLog
-               {
+               public string FusionLog {
+                       // note: MS runtime throws a SecurityException when the Exception is created
+                       // but a FileLoadException once the exception as been thrown. Mono always
+                       // throw a SecurityException in both case (anyway fusionLog is currently empty)
+                       [SecurityPermission (SecurityAction.Demand, ControlEvidence=true, ControlPolicy=true)]
                        get { return fusionLog; }
                }
 
@@ -92,11 +117,23 @@ namespace System.IO {
                        info.AddValue ("FileLoad_FusionLog", fusionLog);
                }
 
-               [MonoTODO]
                public override string ToString ()
                {
-                       return "System.IO.FileLoadException: " + Message;
+                       StringBuilder sb = new StringBuilder (GetType ().FullName);
+                       sb.AppendFormat (": {0}", msg);
+
+                       if (fileName != null)
+                               sb.AppendFormat (" : {0}", fileName);
+
+                       if (this.InnerException != null)
+                               sb.AppendFormat (" ----> {0}", InnerException);
+
+                       if (this.StackTrace != null) {
+                               sb.Append (Environment.NewLine);
+                               sb.Append (StackTrace);
+                       }
+
+                       return sb.ToString ();
                }
-               
        }
 }