Changeset 76430 in vbox for trunk/src/VBox/Additions

Timestamp:

Dec 23, 2018 10:43:51 PM (6 years ago)

Author:

vboxsync

Message:

VBox/shflsvc.h: Use errcore.h rather than err.h. bugref:9344

Location:

trunk/src/VBox/Additions/WINNT/SharedFolders/driver

Files:

• info.c (modified) (1 diff)
• path.c (modified) (3 diffs)
• vbsfhlp.c (modified) (3 diffs)

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.c

@@ -22 +22 @@
 #include <iprt/err.h>
 
+
 /** Macro for copying a SHFLSTRING file name into a FILE_DIRECTORY_INFORMATION structure. */
 #define INIT_FILE_NAME(obj, str) \

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- *
- * VirtualBox Windows Guest Shared Folders
- *
- * File System Driver path related routines
+ * VirtualBox Windows Guest Shared Folders - Path related routines.
  */
 
@@ -20 +17 @@
 
 #include "vbsf.h"
-
-static UNICODE_STRING UnicodeBackslash = { 2, 4, L"\\" };
+#include <iprt/err.h>
+
+
+static UNICODE_STRING g_UnicodeBackslash = { 2, 4, L"\\" };
 
 static NTSTATUS vbsfProcessCreate(PRX_CONTEXT RxContext,
@@ -499 +498 @@
         {
             Log(("VBOXSF: MRxCreate: Empty name -> Only backslash used\n"));
-            RemainingName = &UnicodeBackslash;
+            RemainingName = &g_UnicodeBackslash;
         }
     }

trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsfhlp.c

@@ -20 +20 @@
 
 #include "vbsfhlp.h"
+#include <iprt/err.h>
 
 #ifdef DEBUG
@@ -72 +73 @@
         FileAttributes |= FILE_ATTRIBUTE_ENCRYPTED;
     if (fMode & RTFS_DOS_NT_NORMAL)
-    {
         FileAttributes |= FILE_ATTRIBUTE_NORMAL;
-    }
     return FileAttributes;
 }
@@ -153 +152 @@
     switch (vboxRC)
     {
-    case VINF_SUCCESS:
-        Status = STATUS_SUCCESS;
-        break;
-
-    case VERR_ACCESS_DENIED:
-        Status = STATUS_ACCESS_DENIED;
-        break;
-
-    case VERR_NO_MORE_FILES:
-        Status = STATUS_NO_MORE_FILES;
-        break;
-
-    case VERR_PATH_NOT_FOUND:
-        Status = STATUS_OBJECT_PATH_NOT_FOUND;
-        break;
-
-    case VERR_FILE_NOT_FOUND:
-        Status = STATUS_OBJECT_NAME_NOT_FOUND;
-        break;
-
-    case VERR_DIR_NOT_EMPTY:
-        Status = STATUS_DIRECTORY_NOT_EMPTY;
-        break;
-
-    case VERR_SHARING_VIOLATION:
-        Status = STATUS_SHARING_VIOLATION;
-        break;
-
-    case VERR_FILE_LOCK_VIOLATION:
-        Status = STATUS_FILE_LOCK_CONFLICT;
-        break;
-
-    case VERR_FILE_LOCK_FAILED:
-        Status = STATUS_LOCK_NOT_GRANTED;
-        break;
-
-    case VINF_BUFFER_OVERFLOW:
-        Status = STATUS_BUFFER_OVERFLOW;
-        break;
-
-    case VERR_EOF:
-    case VINF_EOF:
-        Status = STATUS_END_OF_FILE;
-        break;
-
-    case VERR_READ_ERROR:
-    case VERR_WRITE_ERROR:
-    case VERR_FILE_IO_ERROR:
-        Status = STATUS_UNEXPECTED_IO_ERROR;
-        break;
-
-    case VERR_WRITE_PROTECT:
-        Status = STATUS_MEDIA_WRITE_PROTECTED;
-        break;
-
-    case VERR_ALREADY_EXISTS:
-        Status = STATUS_OBJECT_NAME_COLLISION;
-        break;
-
-    case VERR_NOT_A_DIRECTORY:
-        Status = STATUS_NOT_A_DIRECTORY;
-        break;
-
-    case VERR_SEEK:
-        Status = STATUS_INVALID_PARAMETER;
-        break;
-
-    case VERR_INVALID_PARAMETER:
-        Status = STATUS_INVALID_PARAMETER;
-        break;
-
-    case VERR_NOT_SUPPORTED:
-        Status = STATUS_NOT_SUPPORTED;
-        break;
-
-    default:
-        /** @todo error handling */
-        Status = STATUS_INVALID_PARAMETER;
-        Log(("Unexpected vbox error %Rrc\n",
-             vboxRC));
-        break;
+        case VINF_SUCCESS:
+            Status = STATUS_SUCCESS;
+            break;
+
+        case VERR_ACCESS_DENIED:
+            Status = STATUS_ACCESS_DENIED;
+            break;
+
+        case VERR_NO_MORE_FILES:
+            Status = STATUS_NO_MORE_FILES;
+            break;
+
+        case VERR_PATH_NOT_FOUND:
+            Status = STATUS_OBJECT_PATH_NOT_FOUND;
+            break;
+
+        case VERR_FILE_NOT_FOUND:
+            Status = STATUS_OBJECT_NAME_NOT_FOUND;
+            break;
+
+        case VERR_DIR_NOT_EMPTY:
+            Status = STATUS_DIRECTORY_NOT_EMPTY;
+            break;
+
+        case VERR_SHARING_VIOLATION:
+            Status = STATUS_SHARING_VIOLATION;
+            break;
+
+        case VERR_FILE_LOCK_VIOLATION:
+            Status = STATUS_FILE_LOCK_CONFLICT;
+            break;
+
+        case VERR_FILE_LOCK_FAILED:
+            Status = STATUS_LOCK_NOT_GRANTED;
+            break;
+
+        case VINF_BUFFER_OVERFLOW:
+            Status = STATUS_BUFFER_OVERFLOW;
+            break;
+
+        case VERR_EOF:
+        case VINF_EOF:
+            Status = STATUS_END_OF_FILE;
+            break;
+
+        case VERR_READ_ERROR:
+        case VERR_WRITE_ERROR:
+        case VERR_FILE_IO_ERROR:
+            Status = STATUS_UNEXPECTED_IO_ERROR;
+            break;
+
+        case VERR_WRITE_PROTECT:
+            Status = STATUS_MEDIA_WRITE_PROTECTED;
+            break;
+
+        case VERR_ALREADY_EXISTS:
+            Status = STATUS_OBJECT_NAME_COLLISION;
+            break;
+
+        case VERR_NOT_A_DIRECTORY:
+            Status = STATUS_NOT_A_DIRECTORY;
+            break;
+
+        case VERR_SEEK:
+            Status = STATUS_INVALID_PARAMETER;
+            break;
+
+        case VERR_INVALID_PARAMETER:
+            Status = STATUS_INVALID_PARAMETER;
+            break;
+
+        case VERR_NOT_SUPPORTED:
+            Status = STATUS_NOT_SUPPORTED;
+            break;
+
+        default:
+            /** @todo error handling */
+            Status = STATUS_INVALID_PARAMETER;
+            Log(("Unexpected vbox error %Rrc\n",
+                 vboxRC));
+            break;
     }
     return Status;