Changeset 83533 in vbox for trunk/src

Timestamp:

Apr 3, 2020 2:31:58 PM (5 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Fixed file open ex flags checks in GuestSession::[i_]fileOpenEx() and removed unused GuestFileOpenInfo struct in IGuestSession::fileOpenEx(). bugref:9320

File:

• trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (6 diffs)

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

@@ -1497 +1497 @@
     uint32_t fOpenEx = 0;
     for (size_t i = 0; i < aFlags.size(); i++)
-        fOpenEx = aFlags[i];
+        fOpenEx |= aFlags[i];
     if (fOpenEx)
         return VERR_INVALID_PARAMETER; /* FileOpenExFlag not implemented yet. */
@@ -3772 +3772 @@
     LogFlowThisFuncEnter();
 
-    GuestFileOpenInfo openInfo;
-    openInfo.mFilename = aPath;
-    openInfo.mCreationMode = aCreationMode;
-
     /* Validate aAccessMode. */
     switch (aAccessMode)
@@ -3784 +3780 @@
             RT_FALL_THRU();
         case FileAccessMode_ReadWrite:
-            openInfo.mAccessMode = aAccessMode;
             break;
         case FileAccessMode_AppendOnly:
@@ -3808 +3803 @@
             RT_FALL_THRU();
         case FileOpenAction_AppendOrCreate:
-            openInfo.mOpenAction = aOpenAction;
             break;
         default:
@@ -3818 +3812 @@
     {
         case FileSharingMode_All:
-            openInfo.mSharingMode = aSharingMode;
             break;
         case FileSharingMode_Read:
@@ -3835 +3828 @@
     uint32_t fOpenEx = 0;
     for (size_t i = 0; i < aFlags.size(); i++)
-        fOpenEx = aFlags[i];
+        fOpenEx |= aFlags[i];
     if (fOpenEx)
         return setError(E_INVALIDARG, tr("Unsupported FileOpenExFlag value(s) in aFlags (%#x)"), fOpenEx);
-    openInfo.mfOpenEx = fOpenEx;
 
     ComObjPtr <GuestFile> pFile;