2005-03-17 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* MonoIO.cs:
	* MonoIOError.cs: handle ERROR_LOCK_VIOLATION.

svn path=/trunk/mcs/; revision=41962

diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
index 536b7f0393a305fc2e3807742c0c3eeca68f255e..43a8c83096b25ec38ddbe96c71fdab796ad45fbc 100644 (file)
--- a/mcs/class/corlib/System.IO/ChangeLog
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-17 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * MonoIO.cs:
+       * MonoIOError.cs: handle ERROR_LOCK_VIOLATION.
+
 2005-03-15  Sebastien Pouliot  <sebastien@ximian.com>
 
        * FileStream.cs: Anonymize part of the path when exceptions are throw

diff --git a/mcs/class/corlib/System.IO/MonoIO.cs b/mcs/class/corlib/System.IO/MonoIO.cs
index 687c7fee56564219c6cac3d4f85f43277bf68da7..5f7994e9ce2f2db07749d495987443b24fdabaed 100644 (file)
--- a/mcs/class/corlib/System.IO/MonoIO.cs
+++ b/mcs/class/corlib/System.IO/MonoIO.cs
@@ -97,6 +97,10 @@ namespace System.IO
                                message = String.Format ("Sharing violation on path {0}", path);
                                return new IOException (message);
                                
+                       case MonoIOError.ERROR_LOCK_VIOLATION:
+                               message = String.Format ("Lock violation on path {0}", path);
+                               return new IOException (message);
+                               
                        default:
                                message = String.Format ("Win32 IO returned {0}. Path: {1}", error, path);
                                return new IOException (message);

diff --git a/mcs/class/corlib/System.IO/MonoIOError.cs b/mcs/class/corlib/System.IO/MonoIOError.cs
index dd722d548a5a04ec7a120ac64d0f108bbae5e18e..12f8395ef70b3fcaae9aba9ae6af6924795706ec 100644 (file)
--- a/mcs/class/corlib/System.IO/MonoIOError.cs
+++ b/mcs/class/corlib/System.IO/MonoIOError.cs
@@ -68,8 +68,8 @@ namespace System.IO
                ERROR_READ_FAULT = 30,\r
                ERROR_GEN_FAILURE = 31,\r*/
                ERROR_SHARING_VIOLATION = 32,
-       /*      ERROR_LOCK_VIOLATION = 33,\r
-               ERROR_WRONG_DISK = 34,\r
+               ERROR_LOCK_VIOLATION = 33,\r
+       /*      ERROR_WRONG_DISK = 34,\r
                ERROR_SHARING_BUFFER_EXCEEDED = 36,\r
                ERROR_HANDLE_EOF = 38,\r
                ERROR_HANDLE_DISK_FULL = 39,\r