Changeset 71785 in vbox for trunk/src/VBox

Timestamp:

Apr 9, 2018 4:00:47 PM (7 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Implemented GuestSession::fileOpenEx().

Location:

trunk/src/VBox/Main

Files:

• include/GuestSessionImpl.h (modified) (1 diff)
• src-client/GuestSessionImpl.cpp (modified) (5 diffs)

trunk/src/VBox/Main/include/GuestSessionImpl.h

@@ -261 +261 @@
     int                     i_fileUnregister(GuestFile *pFile);
     int                     i_fileRemove(const Utf8Str &strPath, int *pGuestRc);
+    int                     i_fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction,
+                                         FileSharingMode_T aSharingMode, ULONG aCreationMode,
+                                         const std::vector<FileOpenExFlag_T> &aFlags,
+                                         ComObjPtr<GuestFile> &pFile, int *prcGuest);
     int                     i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pGuestRc);
     int                     i_fileQueryInfo(const Utf8Str &strPath, bool fFollowSymlinks, GuestFsObjData &objData, int *pGuestRc);

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -1248 +1248 @@
 }
 
-int GuestSession::i_fileOpen(const GuestFileOpenInfo &openInfo,
-                             ComObjPtr<GuestFile> &pFile, int *prcGuest)
-{
-    LogFlowThisFunc(("strFile=%s, enmAccessMode=%d (%s) enmOpenAction=%d (%s) uCreationMode=%RU32 mfOpenEx=%RU32\n",
-                     openInfo.mFileName.c_str(), openInfo.mAccessMode, openInfo.mpszAccessMode,
-                     openInfo.mOpenAction, openInfo.mpszOpenAction, openInfo.mCreationMode, openInfo.mfOpenEx));
+int GuestSession::i_fileOpenEx(const com::Utf8Str &aPath, FileAccessMode_T aAccessMode, FileOpenAction_T aOpenAction,
+                               FileSharingMode_T aSharingMode, ULONG aCreationMode, const std::vector<FileOpenExFlag_T> &aFlags,
+                               ComObjPtr<GuestFile> &pFile, int *prcGuest)
+{
+    GuestFileOpenInfo openInfo;
+    RT_ZERO(openInfo);
+
+    openInfo.mFileName     = aPath;
+    openInfo.mCreationMode = aCreationMode;
+    openInfo.mAccessMode   = aAccessMode;
+    openInfo.mOpenAction   = aOpenAction;
+    openInfo.mSharingMode  = aSharingMode;
+
+    /* Combine and validate flags. */
+    uint32_t fOpenEx = 0;
+    for (size_t i = 0; i < aFlags.size(); i++)
+        fOpenEx = aFlags[i];
+    if (fOpenEx)
+        return VERR_INVALID_PARAMETER; /* FileOpenExFlag not implemented yet. */
+    openInfo.mfOpenEx = fOpenEx;
+
+    return i_fileOpen(openInfo, pFile, prcGuest);
+}
+
+int GuestSession::i_fileOpen(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *prcGuest)
+{
+    LogFlowThisFunc(("strFile=%s, enmAccessMode=0x%x, enmOpenAction=0x%x, uCreationMode=%RU32, mfOpenEx=%RU32\n",
+                     openInfo.mFileName.c_str(), openInfo.mAccessMode, openInfo.mOpenAction, openInfo.mCreationMode,
+                     openInfo.mfOpenEx));
 
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -3427 +3450 @@
     openInfo.mCreationMode = aCreationMode;
 
-    /* convert + validate aAccessMode to the old format. */
-    openInfo.mAccessMode = aAccessMode;
+    /* Validate aAccessMode. */
     switch (aAccessMode)
     {
-        case (FileAccessMode_T)FileAccessMode_ReadOnly:  openInfo.mpszAccessMode = "r"; break;
-        case (FileAccessMode_T)FileAccessMode_WriteOnly: openInfo.mpszAccessMode = "w"; break;
-        case (FileAccessMode_T)FileAccessMode_ReadWrite: openInfo.mpszAccessMode = "r+"; break;
+        case (FileAccessMode_T)FileAccessMode_ReadOnly:
+            RT_FALL_THRU();
+        case (FileAccessMode_T)FileAccessMode_WriteOnly:
+            RT_FALL_THRU();
+        case (FileAccessMode_T)FileAccessMode_ReadWrite:
+            openInfo.mAccessMode = aAccessMode;
+            break;
         case (FileAccessMode_T)FileAccessMode_AppendOnly:
             RT_FALL_THRU();
@@ -3442 +3468 @@
     }
 
-    /* convert + validate aOpenAction to the old format. */
-    openInfo.mOpenAction = aOpenAction;
+    /* Validate aOpenAction to the old format. */
     switch (aOpenAction)
     {
-        case (FileOpenAction_T)FileOpenAction_OpenExisting:          openInfo.mpszOpenAction = "oe"; break;
-        case (FileOpenAction_T)FileOpenAction_OpenOrCreate:          openInfo.mpszOpenAction = "oc"; break;
-        case (FileOpenAction_T)FileOpenAction_CreateNew:             openInfo.mpszOpenAction = "ce"; break;
-        case (FileOpenAction_T)FileOpenAction_CreateOrReplace:       openInfo.mpszOpenAction = "ca"; break;
-        case (FileOpenAction_T)FileOpenAction_OpenExistingTruncated: openInfo.mpszOpenAction = "ot"; break;
+        case (FileOpenAction_T)FileOpenAction_OpenExisting:
+            RT_FALL_THRU();
+        case (FileOpenAction_T)FileOpenAction_OpenOrCreate:
+            RT_FALL_THRU();
+        case (FileOpenAction_T)FileOpenAction_CreateNew:
+            RT_FALL_THRU();
+        case (FileOpenAction_T)FileOpenAction_CreateOrReplace:
+            RT_FALL_THRU();
+        case (FileOpenAction_T)FileOpenAction_OpenExistingTruncated:
+            RT_FALL_THRU();
         case (FileOpenAction_T)FileOpenAction_AppendOrCreate:
-            openInfo.mpszOpenAction = "oa"; /** @todo get rid of this one and implement AppendOnly/AppendRead. */
+            openInfo.mOpenAction = aOpenAction;
             break;
         default:
@@ -3458 +3488 @@
     }
 
-    /* validate aSharingMode */
-    openInfo.mSharingMode = aSharingMode;
+    /* Validate aSharingMode. */
     switch (aSharingMode)
     {
-        case (FileSharingMode_T)FileSharingMode_All: /* OK */ break;
+        case (FileSharingMode_T)FileSharingMode_All:
+            openInfo.mSharingMode = aSharingMode;
+            break;
         case (FileSharingMode_T)FileSharingMode_Read:
         case (FileSharingMode_T)FileSharingMode_Write:
@@ -3485 +3516 @@
     ComObjPtr <GuestFile> pFile;
     int rcGuest;
-    int vrc = i_fileOpen(openInfo, pFile, &rcGuest);
+    int vrc = i_fileOpenEx(aPath, aAccessMode, aOpenAction, aSharingMode, aCreationMode, aFlags, pFile, &rcGuest);
     if (RT_SUCCESS(vrc))
         /* Return directory object to the caller. */