merge from Phase I

Smurf-IV · Mar 23, 2011 · 7e9946f · 7e9946f
1 parent 08caabe
commit 7e9946f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/LiquesceFaçade/Utils.cs b/LiquesceFaçade/Utils.cs
@@ -1,4 +1,5 @@
 using System;
+using System.IO;
 using System.Net.Sockets;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
@@ -48,13 +49,22 @@ The caller does not have the required permission.
 System.NotSupportedException: path is in an invalid format. 
 
 System.Security.SecurityException: The caller does not have the required permission. 
-*/         if ( ex.InnerException is SocketException)
+*/         
+         if ( ex.InnerException is SocketException)
          {
             return -((SocketException) ex.InnerException).ErrorCode;
          }
          else
          {
             int HrForException = Marshal.GetHRForException(ex);
+            if (ex is IOException)
+            {
+               switch (HrForException)
+               {
+                  case -2147024784:
+                     return Dokan.ERROR_DISK_FULL;
+               }
+            }
             return (HiWord(HrForException) == 0x8007) ? -LoWord(HrForException) : Dokan.ERROR_EXCEPTION_IN_SERVICE;
          }
       }

diff --git a/ThirdParty/DokanNet/Dokan.cs b/ThirdParty/DokanNet/Dokan.cs
@@ -24,13 +24,15 @@ public static class Dokan
 
 // ReSharper disable InconsistentNaming
 #pragma warning disable 169
-      #region File Operation Errors (From WinError.h)
+      #region File Operation Errors 
+      // From WinError.h -> http://msdn.microsoft.com/en-us/library/ms819773.aspx
       public const int ERROR_FILE_NOT_FOUND = -2;  // MessageText: The system cannot find the file specified.
       public const int ERROR_PATH_NOT_FOUND = -3;  // MessageText: The system cannot find the path specified.
       public const int ERROR_ACCESS_DENIED = -5;   // MessageText: Access is denied.
       public const int ERROR_SHARING_VIOLATION = -32;
-      public const int ERROR_INVALID_NAME = -123;
       public const int ERROR_FILE_EXISTS = -80;
+      public const int ERROR_DISK_FULL = -112;     // There is not enough space on the disk.
+      public const int ERROR_INVALID_NAME = -123;
       public const int ERROR_DIR_NOT_EMPTY = -145; // MessageText: The directory is not empty.
       public const int ERROR_ALREADY_EXISTS = -183;// MessageText: Cannot create a file when that file already exists.
       public const int ERROR_EXCEPTION_IN_SERVICE = -1064;//  An exception occurred in the service when handling thecontrol request.