儲存庫 vbox 的更動 18128

時間撮記:

2009-3-23 上午09:39:23 (16 年 以前)

作者:

vboxsync

訊息:

IPRT, Shared Folders: Implemented file attributes access flags for RTFileOpen on Windows host (xTracker #3739).

位置:

trunk

檔案:

• include/iprt/file.h (修改) (2 筆差異)
• src/VBox/HostServices/SharedFolders/vbsf.cpp (修改) (1 筆差異)
• src/VBox/Runtime/r3/win/fileio-win.cpp (修改) (1 筆差異)

trunk/include/iprt/file.h

@@ -122 +122 @@
  */
 #define RTFILE_O_WRITE_THROUGH      0x00008000
+
+/** File attributes access, *CREATE* only.
+ * @remark  This might not be implemented on all platforms,
+ *          and will be ignored on those.
+ */
+/** Attributes can be read if the file is being opened
+ * with read access, and can be written with write access.
+ */
+#define RTFILE_O_ACCESS_ATTR_DEFAULT 0x00000000
+/** Attributes can be read. */
+#define RTFILE_O_ACCESS_ATTR_READ   0x00010000
+/** Attributes can be written. */
+#define RTFILE_O_ACCESS_ATTR_WRITE  0x00020000
+/** Attributes can be both read & written. */
+#define RTFILE_O_ACCESS_ATTR_READWRITE 0x00030000
+/** The file attributes access mask. */
+#define RTFILE_O_ACCESS_ATTR_MASK   0x00030000
+
 /** Unix file mode mask for use when creating files. */
 #define RTFILE_O_CREATE_MODE_MASK   0x1ff00000
@@ -132 +150 @@
  * @remark  This doesn't validate the access mode properly.
  */
-#define RTFILE_O_VALID_MASK          0x1ff0FB73
+#define RTFILE_O_VALID_MASK          0x1ff3FB73
 
 /** @} */

trunk/src/VBox/HostServices/SharedFolders/vbsf.cpp

@@ -553 +553 @@
             fOpen |= RTFILE_O_READWRITE;
             Log(("FLAG: SHFL_CF_ACCESS_READWRITE\n"));
+            break;
+        }
+    }
+
+    switch (BIT_FLAG(fShflFlags, SHFL_CF_ACCESS_MASK_ATTR))
+    {
+        default:
+        case SHFL_CF_ACCESS_ATTR_NONE:
+        {
+            fOpen |= RTFILE_O_ACCESS_ATTR_DEFAULT;
+            Log(("FLAG: SHFL_CF_ACCESS_ATTR_NONE\n"));
+            break;
+        }
+
+        case SHFL_CF_ACCESS_ATTR_READ:
+        {
+            fOpen |= RTFILE_O_ACCESS_ATTR_READ;
+            Log(("FLAG: SHFL_CF_ACCESS_ATTR_READ\n"));
+            break;
+        }
+
+        case SHFL_CF_ACCESS_ATTR_WRITE:
+        {
+            fOpen |= RTFILE_O_ACCESS_ATTR_WRITE;
+            Log(("FLAG: SHFL_CF_ACCESS_ATTR_WRITE\n"));
+            break;
+        }
+
+        case SHFL_CF_ACCESS_ATTR_READWRITE:
+        {
+            fOpen |= RTFILE_O_ACCESS_ATTR_READWRITE;
+            Log(("FLAG: SHFL_CF_ACCESS_ATTR_READWRITE\n"));
             break;
         }

trunk/src/VBox/Runtime/r3/win/fileio-win.cpp

@@ -209 +209 @@
             return VERR_INVALID_PARAMETER;
     }
+
     /* RTFileSetMode needs following rights as well. */
-    dwDesiredAccess |= FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE;
+    switch (fOpen & RTFILE_O_ACCESS_ATTR_MASK)
+    {
+        case RTFILE_O_ACCESS_ATTR_READ:      dwDesiredAccess |= FILE_READ_ATTRIBUTES | SYNCHRONIZE; break;
+        case RTFILE_O_ACCESS_ATTR_WRITE:     dwDesiredAccess |= FILE_WRITE_ATTRIBUTES | SYNCHRONIZE; break;
+        case RTFILE_O_ACCESS_ATTR_READWRITE: dwDesiredAccess |= FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE; break;
+        default:
+            /* Attributes access is the same as the file access. */
+            switch (fOpen & RTFILE_O_ACCESS_MASK)
+            {
+                case RTFILE_O_READ:      dwDesiredAccess |= FILE_READ_ATTRIBUTES | SYNCHRONIZE; break;
+                case RTFILE_O_WRITE:     dwDesiredAccess |= FILE_WRITE_ATTRIBUTES | SYNCHRONIZE; break;
+                case RTFILE_O_READWRITE: dwDesiredAccess |= FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | SYNCHRONIZE; break;
+                default:
+                    AssertMsgFailed(("Impossible fOpen=%#x\n", fOpen));
+                    return VERR_INVALID_PARAMETER;
+            }
+    }
 
     DWORD dwShareMode;