Changeset 47817 in vbox

Timestamp:

Aug 16, 2013 3:30:15 PM (12 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

88078

Message:

GuestCtrl: Update for IGuestFile; some renaming.

Location:

trunk

Files:

• include/VBox/HostServices/GuestControlSvc.h (modified) (1 diff)
• include/VBox/VBoxGuestLib.h (modified) (2 diffs)
• src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp (modified) (4 diffs)
• src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp (modified) (27 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (3 diffs)
• src/VBox/Main/include/GuestCtrlImplPrivate.h (modified) (1 diff)
• src/VBox/Main/include/GuestFileImpl.h (modified) (4 diffs)
• src/VBox/Main/include/GuestProcessImpl.h (modified) (1 diff)
• src/VBox/Main/include/GuestSessionImpl.h (modified) (1 diff)
• src/VBox/Main/src-client/GuestFileImpl.cpp (modified) (25 diffs)
• src/VBox/Main/src-client/GuestProcessImpl.cpp (modified) (7 diffs)
• src/VBox/Main/src-client/GuestSessionImpl.cpp (modified) (7 diffs)

trunk/include/VBox/HostServices/GuestControlSvc.h

@@ -710 +710 @@
     /** UInt32: Context ID. */
     HGCMFunctionParameter context;
-    /** String: File to open. */
+    /** File to open. */
     HGCMFunctionParameter filename;
-    /** String: Open mode. */
+    /** Open mode. */
     HGCMFunctionParameter openmode;
-    /** String: Disposition. */
+    /** Disposition mode. */
     HGCMFunctionParameter disposition;
+    /** Sharing mode. */
+    HGCMFunctionParameter sharing;
     /** UInt32: Creation mode. */
     HGCMFunctionParameter creationmode;

trunk/include/VBox/VBoxGuestLib.h

@@ -626 +626 @@
 VBGLR3DECL(int) VbglR3GuestCtrlProcGetWaitFor(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puPID, uint32_t *puWaitFlags, uint32_t *puTimeoutMS);
 /* Guest native file handling. */
-VBGLR3DECL(int) VbglR3GuestCtrlFileGetOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszFileName, uint32_t cbFileName, char *pszOpenMode, uint32_t cbOpenMode, char *pszDisposition, uint32_t cbDisposition, uint32_t *puCreationMode, uint64_t *puOffset);
+VBGLR3DECL(int) VbglR3GuestCtrlFileGetOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, char *pszFileName, uint32_t cbFileName, char *pszOpenMode, uint32_t cbOpenMode, char *pszDisposition, uint32_t cbDisposition, char *pszSharing, uint32_t cbSharing, uint32_t *puCreationMode, uint64_t *puOffset);
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle);
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t *puHandle, uint32_t *puToRead);
@@ -637 +637 @@
 VBGLR3DECL(int) VbglR3GuestCtrlFileCbOpen(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, uint32_t uFileHandle);
 VBGLR3DECL(int) VbglR3GuestCtrlFileCbClose(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc);
+VBGLR3DECL(int) VbglR3GuestCtrlFileCbError(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc);
 VBGLR3DECL(int) VbglR3GuestCtrlFileCbRead(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, void *pvData, uint32_t cbData);
 VBGLR3DECL(int) VbglR3GuestCtrlFileCbWrite(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc, uint32_t uWritten);

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

@@ -532 +532 @@
  ** @todo Docs!
  */
-VBGLR3DECL(int) VbglR3GuestCtrlProcGetInput(PVBGLR3GUESTCTRLCMDCTX pCtx,
+VBGLR3DECL(int) VbglR3GuestCtrlProcGetInput(PVBGLR3GUESTCTRLCMDCTX  pCtx,
                                             uint32_t  *puPID,       uint32_t *puFlags,
                                             void      *pvData,      uint32_t  cbData,
@@ -579 +579 @@
 
 VBGLR3DECL(int) VbglR3GuestCtrlFileGetOpen(PVBGLR3GUESTCTRLCMDCTX      pCtx,
-                                           char     *pszFileName,       uint32_t cbFileName,
-                                           char     *pszOpenMode,       uint32_t cbOpenMode,
-                                           char     *pszDisposition,    uint32_t cbDisposition,
+                                           char     *pszFileName,      uint32_t cbFileName,
+                                           char     *pszAccess,        uint32_t cbAccess,
+                                           char     *pszDisposition,   uint32_t cbDisposition,
+                                           char     *pszSharing,       uint32_t cbSharing,
                                            uint32_t *puCreationMode,
                                            uint64_t *puOffset)
 {
     AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
-    AssertReturn(pCtx->uNumParms == 6, VERR_INVALID_PARAMETER);
+    AssertReturn(pCtx->uNumParms == 7, VERR_INVALID_PARAMETER);
 
     AssertPtrReturn(pszFileName, VERR_INVALID_POINTER);
     AssertReturn(cbFileName, VERR_INVALID_PARAMETER);
-    AssertPtrReturn(pszOpenMode, VERR_INVALID_POINTER);
-    AssertReturn(cbOpenMode, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszAccess, VERR_INVALID_POINTER);
+    AssertReturn(cbAccess, VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszDisposition, VERR_INVALID_POINTER);
     AssertReturn(cbDisposition, VERR_INVALID_PARAMETER);
+    AssertPtrReturn(pszSharing, VERR_INVALID_POINTER);
+    AssertReturn(cbSharing, VERR_INVALID_PARAMETER);
     AssertPtrReturn(puCreationMode, VERR_INVALID_POINTER);
     AssertPtrReturn(puOffset, VERR_INVALID_POINTER);
@@ -606 +609 @@
     VbglHGCMParmUInt32Set(&Msg.context, 0);
     VbglHGCMParmPtrSet(&Msg.filename, pszFileName, cbFileName);
-    VbglHGCMParmPtrSet(&Msg.openmode, pszOpenMode, cbOpenMode);
+    VbglHGCMParmPtrSet(&Msg.openmode, pszAccess, cbAccess);
     VbglHGCMParmPtrSet(&Msg.disposition, pszDisposition, cbDisposition);
+    VbglHGCMParmPtrSet(&Msg.sharing, pszSharing, cbSharing);
     VbglHGCMParmUInt32Set(&Msg.creationmode, 0);
     VbglHGCMParmUInt64Set(&Msg.offset, 0);
@@ -1038 +1042 @@
 
 
+VBGLR3DECL(int) VbglR3GuestCtrlFileCbError(PVBGLR3GUESTCTRLCMDCTX pCtx, uint32_t uRc)
+{
+    AssertPtrReturn(pCtx, VERR_INVALID_POINTER);
+
+    HGCMReplyFileNotify Msg;
+
+    Msg.hdr.result      = VERR_WRONG_ORDER;
+    Msg.hdr.u32ClientID = pCtx->uClientID;
+    Msg.hdr.u32Function = GUEST_FILE_NOTIFY;
+    Msg.hdr.cParms      = 3;
+
+    VbglHGCMParmUInt32Set(&Msg.context, pCtx->uContextID);
+    VbglHGCMParmUInt32Set(&Msg.type, GUEST_FILE_NOTIFYTYPE_ERROR);
+    VbglHGCMParmUInt32Set(&Msg.rc, uRc);
+
+    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+    if (RT_SUCCESS(rc))
+    {
+        int rc2 = Msg.hdr.result;
+        if (RT_FAILURE(rc2))
+            rc = rc2;
+    }
+    return rc;
+}
+
+
 VBGLR3DECL(int) VbglR3GuestCtrlFileCbRead(PVBGLR3GUESTCTRLCMDCTX pCtx,
                                           uint32_t uRc,

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -225 +225 @@
         if (RT_SUCCESS(rc))
         {
-#ifdef DEBUG
-            VBoxServiceVerbose(3, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
-#endif
+            VBoxServiceVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
+
             /* Set number of parameters for current host context. */
             ctxHost.uNumParms = cParms;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlSession.cpp

@@ -103 +103 @@
 
 
+/** @todo No locking done yet! */
 static PVBOXSERVICECTRLFILE gstcntlSessionFileGetLocked(const PVBOXSERVICECTRLSESSION pSession,
                                                         uint32_t uHandle)
@@ -127 +128 @@
 
     char szFile[RTPATH_MAX];
-    char szOpenMode[64];
+    char szAccess[64];
     char szDisposition[64];
+    char szSharing[64];
     uint32_t uCreationMode = 0;
     uint64_t uOffset = 0;
-
     uint32_t uHandle = 0;
+
     int rc = VbglR3GuestCtrlFileGetOpen(pHostCtx,
                                         /* File to open. */
                                         szFile, sizeof(szFile),
                                         /* Open mode. */
-                                        szOpenMode, sizeof(szOpenMode),
+                                        szAccess, sizeof(szAccess),
                                         /* Disposition. */
                                         szDisposition, sizeof(szDisposition),
+                                        /* Sharing. */
+                                        szSharing, sizeof(szSharing),
                                         /* Creation mode. */
                                         &uCreationMode,
                                         /* Offset. */
                                         &uOffset);
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "[File %s]: szAccess=%s, szDisposition=%s, szSharing=%s, rc=%Rrc\n",
+                       szFile, szAccess, szDisposition, szSharing, rc);
+#endif
     if (RT_SUCCESS(rc))
     {
@@ -149 +157 @@
         if (pFile)
         {
-            if (!RTStrPrintf(pFile->szName, sizeof(pFile->szName), "%s", szFile))
-                rc = VERR_BUFFER_OVERFLOW;
+            if (!strlen(szFile))
+                rc = VERR_INVALID_PARAMETER;
+
+            if (   RT_SUCCESS(rc)
+                && !RTStrPrintf(pFile->szName, sizeof(pFile->szName), "%s", szFile))
+                rc = VERR_NO_MEMORY;
 
             if (RT_SUCCESS(rc))
             {
-                uint64_t fFlags = RTFILE_O_OPEN_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_WRITE; /** @todo Modes! */
-                rc = RTFileOpen(&pFile->hFile, pFile->szName, fFlags);
+                uint64_t fFlags;
+                rc = RTFileModeToFlagsEx(szAccess, szDisposition,
+                                         NULL /* pszSharing, not used yet */, &fFlags);
+                VBoxServiceVerbose(4, "[File %s]: Opening flags=0x%x, rc=%Rrc\n", pFile->szName, fFlags, rc);
+                if (RT_SUCCESS(rc))
+                    rc = RTFileOpen(&pFile->hFile, pFile->szName, fFlags);
                 if (   RT_SUCCESS(rc)
                     && uOffset)
@@ -165 +181 @@
                                            pFile->szName, uOffset, rc);
                 }
-                else
+                else if (RT_FAILURE(rc))
                     VBoxServiceVerbose(3, "[File %s]: Opening failed; rc=%Rrc\n",
                                        pFile->szName, rc);
@@ -196 +212 @@
     }
 
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Opening file \"%s\" (open mode=\"%s\", disposition=\"%s\", creation mode=0x%x returned rc=%Rrc\n",
+                       szFile, szAccess, szDisposition, uCreationMode, rc);
+#endif
     return rc;
 }
@@ -206 +226 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uHandle;
-
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     int rc = VbglR3GuestCtrlFileGetClose(pHostCtx, &uHandle /* File handle to close */);
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLFILE pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -227 +248 @@
     }
 
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Closing file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -238 +263 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint32_t cbToRead;
-
     int rc = VbglR3GuestCtrlFileGetRead(pHostCtx, &uHandle, &cbToRead);
     if (RT_SUCCESS(rc))
@@ -279 +305 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Reading file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -290 +321 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint32_t cbToRead; int64_t iOffset;
 
     int rc = VbglR3GuestCtrlFileGetReadAt(pHostCtx,
-                                          &uHandle, &cbToRead, (uint64_t*)&iOffset);
+                                          &uHandle, &cbToRead, (uint64_t *)&iOffset);
     if (RT_SUCCESS(rc))
     {
@@ -300 +333 @@
         size_t cbRead = 0;
 
-        PVBOXSERVICECTRLFILE pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -332 +365 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Reading file \"%s\" at offset (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -345 +383 @@
     AssertPtrReturn(cbScratchBuf, VERR_INVALID_PARAMETER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint32_t cbToWrite;
 
@@ -354 +394 @@
     {
         size_t cbWritten = 0;
-        PVBOXSERVICECTRLFILE pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -369 +409 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Writing file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -382 +427 @@
     AssertPtrReturn(cbScratchBuf, VERR_INVALID_PARAMETER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint32_t cbToWrite; int64_t iOffset;
 
     int rc = VbglR3GuestCtrlFileGetWriteAt(pHostCtx, &uHandle,
                                            pvScratchBuf, cbScratchBuf,
-                                           &cbToWrite, (uint64_t*)&iOffset);
+                                           &cbToWrite, (uint64_t *)&iOffset);
     if (RT_SUCCESS(rc))
     {
@@ -407 +454 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Writing file \"%s\" at offset (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -417 +469 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint32_t uSeekMethod;
     uint64_t uOffset; /* Will be converted to int64_t. */
@@ -427 +481 @@
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLFILE pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -464 +518 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Seeking file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -474 +533 @@
     AssertPtrReturn(pHostCtx, VERR_INVALID_POINTER);
 
-    uint32_t uHandle;
+    PVBOXSERVICECTRLFILE pFile = NULL;
+
+    uint32_t uHandle = 0;
     uint64_t uOffsetActual = 0;
 
@@ -480 +541 @@
     if (RT_SUCCESS(rc))
     {
-        PVBOXSERVICECTRLFILE pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
+        pFile = gstcntlSessionFileGetLocked(pSession, uHandle);
         if (pFile)
         {
@@ -495 +556 @@
             rc = rc2;
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(4, "Telling file \"%s\" (handle=%RU32) returned rc=%Rrc\n",
+                       pFile ? pFile->szName : "<Not found>", uHandle, rc);
+#endif
     return rc;
 }
@@ -659 +725 @@
         {
             fPendingClose = true;
-#ifdef DEBUG_andy
+#ifdef DEBUG
             VBoxServiceVerbose(4, "Got last process input block for PID=%RU32 (%RU32 bytes) ...\n",
                                uPID, cbSize);
@@ -679 +745 @@
     }
 
-
-#ifdef DEBUG_andy
+#ifdef DEBUG
     VBoxServiceVerbose(4, "Setting input for PID=%RU32 resulted in rc=%Rrc\n",
                        uPID, rc);
@@ -905 +970 @@
             break;
     }
+
+    if (RT_FAILURE(rc))
+        VBoxServiceError("Error while handling message (uMsg=%RU32, cParms=%RU32), rc=%Rrc\n",
+                         uMsg, pHostCtx->uNumParms, rc);
 
     return rc;
@@ -1169 +1238 @@
             if (RT_SUCCESS(rc))
             {
-#ifdef DEBUG
-                VBoxServiceVerbose(3, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
-#endif
+                VBoxServiceVerbose(4, "Msg=%RU32 (%RU32 parms) retrieved\n", uMsg, cParms);
+
                 /* Set number of parameters for current host context. */
                 ctxHost.uNumParms = cParms;

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -10138 +10138 @@
   <interface
     name="IGuestSession" extends="$unknown"
-    uuid="1afeabbd-0c0b-458c-8026-04464892ae12"
+    uuid="5b28703c-07b6-4fcb-afba-ac199b309752"
     wsmap="managed"
     >
@@ -10625 +10625 @@
       <param name="disposition" type="wstring" dir="in">
         <desc>The file disposition.</desc>
+      </param>
+      <param name="creationMode" type="unsigned long" dir="in">
+        <desc>The file creation mode.</desc>
+      </param>
+      <param name="file" type="IGuestFile" dir="return">
+        <desc><link to="IGuestFile"/> object representing the opened file.</desc>
+      </param>
+    </method>
+
+    <method name="fileOpenEx">
+      <desc>
+        Opens a file and creates a <link to="IGuestFile"/> object that
+        can be used for further operations, extended version.
+
+        <result name="VBOX_E_OBJECT_NOT_FOUND">
+          File to open was not found.
+        </result>
+        <result name="VBOX_E_IPRT_ERROR">
+          Error while opening the file.
+        </result>
+      </desc>
+      <param name="path" type="wstring" dir="in">
+        <desc>Full path to file to open.</desc>
+      </param>
+      <param name="openMode" type="wstring" dir="in">
+        <desc>The file open mode.</desc>
+      </param>
+      <param name="disposition" type="wstring" dir="in">
+        <desc>The file disposition.</desc>
+      </param>
+      <param name="sharingMode" type="wstring" dir="in">
+        <desc>The file sharing mode on the guest.</desc>
       </param>
       <param name="creationMode" type="unsigned long" dir="in">
@@ -20909 +20941 @@
     </attribute>
     <!-- Note: No events for reads/writes for performance reasons.
-               See dedidcated events IGuestFileReadEvent and
+               See dedicated events IGuestFileReadEvent and
                IGuestFileWriteEvent. -->
 

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

@@ -116 +116 @@
     /** The file's disposition mode. */
     Utf8Str                 mDisposition;
+    /** The file's sharing mode.
+     **@todo Not implemented yet.*/
+    Utf8Str                 mSharingMode;
     /** Octal creation mode. */
     uint32_t                mCreationMode;
     /** The initial offset on open. */
-    int64_t                 mInitialOffset;
+    uint64_t                mInitialOffset;
 };
 

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

@@ -82 +82 @@
     int             callbackDispatcher(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
     int             closeFile(int *pGuestRc);
-    static uint32_t getDispositionFromString(const Utf8Str &strDisposition);
     EventSource    *getEventSource(void) { return mEventSource; }
-    static uint32_t getOpenModeFromString(const Utf8Str &strOpenMode);
     static Utf8Str  guestErrorToString(int guestRc);
     int             onFileNotify(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
     int             onGuestDisconnected(PVBOXGUESTCTRLHOSTCBCTX pCbCtx, PVBOXGUESTCTRLHOSTCALLBACK pSvcCbData);
-    int             openFile(int *pGuestRc);
+    int             openFile(uint32_t uTimeoutMS, int *pGuestRc);
     int             readData(uint32_t uSize, uint32_t uTimeoutMS, void* pvData, uint32_t cbData, uint32_t* pcbRead);
     int             readDataAt(uint64_t uOffset, uint32_t uSize, uint32_t uTimeoutMS, void* pvData, size_t cbData, size_t* pcbRead);
@@ -96 +94 @@
     int             waitForOffsetChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, uint64_t *puOffset);
     int             waitForRead(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead);
-    int             waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, FileStatus_T *pFileStatus);
+    int             waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, FileStatus_T *pFileStatus, int *pGuestRc);
     int             waitForWrite(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, uint32_t *pcbWritten);
     int             writeData(uint32_t uTimeoutMS, void *pvData, uint32_t cbData, uint32_t *pcbWritten);
@@ -104 +102 @@
 private:
 
-    /** The internal console object. */
-    Console                *mConsole;
-    /** The associate session this file belongs to. */
-    GuestSession           *mSession;
     /** This can safely be used without holding any locks.
      * An AutoCaller suffices to prevent it being destroy while in use and
@@ -123 +117 @@
         /** The current file status. */
         FileStatus_T            mStatus;
+        /** The last returned process status
+         *  returned from the guest side. */
+        int                     mLastError;
         /** The file's current offset. */
         uint64_t                mOffCurrent;

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

@@ -128 +128 @@
         /** The last returned process status
          *  returned from the guest side. */
-        int                      mRC;
+        int                      mLastError;
     } mData;
 };

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

@@ -303 +303 @@
     STDMETHOD(FileExists)(IN_BSTR aPath, BOOL *aExists);
     STDMETHOD(FileRemove)(IN_BSTR aPath);
-    STDMETHOD(FileOpen)(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile);
+    STDMETHOD(FileOpen)(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, ULONG aCreationMode, IGuestFile **aFile);
+    STDMETHOD(FileOpenEx)(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, IN_BSTR aSharingMode, ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile);
     STDMETHOD(FileQueryInfo)(IN_BSTR aPath, IGuestFsObjInfo **aInfo);
     STDMETHOD(FileQuerySize)(IN_BSTR aPath, LONG64 *aSize);

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

@@ -153 +153 @@
     if (RT_SUCCESS(vrc))
     {
-        mData.mID = 0;
+        mSession = pSession;
+
+        mData.mID = uFileID;
         mData.mInitialSize = 0;
         mData.mStatus = FileStatus_Undefined;
+        mData.mOpenInfo = openInfo;
 
         unconst(mEventSource).createObject();
@@ -273 +276 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aDisposition = getDispositionFromString(mData.mOpenInfo.mDisposition);
+    uint32_t uDisposition = 0;
+    /** @todo Fix me! */
+    *aDisposition = uDisposition;
 
     return S_OK;
@@ -363 +368 @@
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
-    *aOpenMode = getOpenModeFromString(mData.mOpenInfo.mOpenMode);
+    uint32_t uOpenMode = 0;
+    /** @todo Fix me! */
+    *aOpenMode = uOpenMode;
 
     return S_OK;
@@ -398 +405 @@
     AssertPtrReturn(pSvcCb, VERR_INVALID_POINTER);
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
     int vrc;
     switch (pCbCtx->uFunction)
@@ -454 +459 @@
     if (RT_SUCCESS(vrc))
         vrc = waitForStatusChange(pEvent, 30 * 1000 /* Timeout in ms */,
-                                  NULL /* FileStatus */);
+                                  NULL /* FileStatus */, pGuestRc);
     unregisterWaitEvent(pEvent);
 
     LogFlowFuncLeaveRC(vrc);
     return vrc;
-}
-
-/* static */
-uint32_t GuestFile::getDispositionFromString(const Utf8Str &strDisposition)
-{
-    return 0; /** @todo Implement me! */
-}
-
-/* static */
-uint32_t GuestFile::getOpenModeFromString(const Utf8Str &strOpenMode)
-{
-    uint32_t uOpenMode = 0;
-
-    const char *pc = strOpenMode.c_str();
-    while (*pc != '\0')
-    {
-        switch (*pc++)
-        {
-            case 'r':
-                uOpenMode |= RTFILE_O_READ;
-                break;
-
-            case 'w':
-                uOpenMode |= RTFILE_O_WRITE;
-                break;
-
-            default:
-                /* Silently skip unknown values. */
-                break;
-        }
-    }
-
-    return uOpenMode;
 }
 
@@ -543 +515 @@
     AssertPtrReturn(pSvcCbData, VERR_INVALID_POINTER);
 
+    LogFlowThisFuncEnter();
+
     if (pSvcCbData->mParms < 3)
         return VERR_INVALID_PARAMETER;
@@ -548 +522 @@
     int vrc = VINF_SUCCESS;
 
-    int idx = 0; /* Current parameter index. */
+    int idx = 1; /* Current parameter index. */
     CALLBACKDATA_FILE_NOTIFY dataCb;
     /* pSvcCb->mpaParms[0] always contains the context ID. */
@@ -554 +528 @@
     pSvcCbData->mpaParms[idx++].getUInt32(&dataCb.rc);
 
+    FileStatus_T fileStatus = FileStatus_Undefined;
     int guestRc = (int)dataCb.rc; /* uint32_t vs. int. */
 
+    LogFlowFunc(("uType=%RU32, guestRc=%Rrc\n",
+                 dataCb.uType, guestRc));
+
+    if (RT_FAILURE(guestRc))
+    {
+        int rc2 = setFileStatus(FileStatus_Error, guestRc);
+        AssertRC(rc2);
+
+        return VINF_SUCCESS; /* Report to the guest. */
+    }
+
     switch (dataCb.uType)
     {
         case GUEST_FILE_NOTIFYTYPE_ERROR:
         {
-            AssertMsg(mData.mStatus != FileStatus_Error, ("File status already set to error\n"));
-
             int rc2 = setFileStatus(FileStatus_Error, guestRc);
             AssertRC(rc2);
@@ -573 +557 @@
                 pSvcCbData->mpaParms[idx++].getUInt32(&dataCb.u.open.uHandle);
 
-                AssertMsg(mData.mID == 0, ("File ID already set to %RU32\n", mData.mID));
-                mData.mID = dataCb.u.open.uHandle;
-                AssertMsg(mData.mID == VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID),
-                          ("File ID %RU32 does not match context ID %RU32\n", mData.mID,
-                           VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID)));
+                {
+                    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+                    AssertMsg(mData.mID == VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID),
+                              ("File ID %RU32 does not match context ID %RU32\n", mData.mID,
+                               VBOX_GUESTCTRL_CONTEXTID_GET_OBJECT(pCbCtx->uContextID)));
+                }
 
                 /* Set the process status. */
@@ -599 +584 @@
 
         case GUEST_FILE_NOTIFYTYPE_READ:
+        {
             if (pSvcCbData->mParms == 4)
             {
@@ -606 +592 @@
                 if (cbRead)
                 {
+                    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
                     mData.mOffCurrent += cbRead;
+
+                    alock.release();
 
                     com::SafeArray<BYTE> data((size_t)cbRead);
                     data.initFrom((BYTE*)dataCb.u.read.pvData, cbRead);
+
                     fireGuestFileReadEvent(mEventSource, mSession, this, mData.mOffCurrent,
                                            cbRead, ComSafeArrayAsInParam(data));
@@ -617 +608 @@
                 vrc = VERR_NOT_SUPPORTED;
             break;
+        }
 
         case GUEST_FILE_NOTIFYTYPE_WRITE:
+        {
             if (pSvcCbData->mParms == 4)
             {
                 pSvcCbData->mpaParms[idx++].getUInt32(&dataCb.u.write.cbWritten);
 
+                AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
                 mData.mOffCurrent += dataCb.u.write.cbWritten;
+                uint64_t uOffCurrent = mData.mOffCurrent;
+
+                alock.release();
 
                 if (dataCb.u.write.cbWritten)
-                    fireGuestFileWriteEvent(mEventSource, mSession, this, mData.mOffCurrent,
+                    fireGuestFileWriteEvent(mEventSource, mSession, this, uOffCurrent,
                                             dataCb.u.write.cbWritten);
             }
@@ -632 +630 @@
                 vrc = VERR_NOT_SUPPORTED;
             break;
+        }
 
         case GUEST_FILE_NOTIFYTYPE_SEEK:
+        {
             if (pSvcCbData->mParms == 4)
             {
                 pSvcCbData->mpaParms[idx++].getUInt64(&dataCb.u.seek.uOffActual);
 
+                AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
                 mData.mOffCurrent = dataCb.u.seek.uOffActual;
+                uint64_t uOffCurrent = mData.mOffCurrent;
+
+                alock.release();
 
                 if (dataCb.u.seek.uOffActual)
                     fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
-                                                    mData.mOffCurrent, 0 /* Processed */);
+                                                    uOffCurrent, 0 /* Processed */);
             }
             else
                 vrc = VERR_NOT_SUPPORTED;
             break;
+        }
 
         case GUEST_FILE_NOTIFYTYPE_TELL:
+        {
             if (pSvcCbData->mParms == 4)
             {
                 pSvcCbData->mpaParms[idx++].getUInt64(&dataCb.u.tell.uOffActual);
 
+                AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
                 if (mData.mOffCurrent != dataCb.u.tell.uOffActual)
                 {
                     mData.mOffCurrent = dataCb.u.tell.uOffActual;
+                    uint64_t uOffCurrent = mData.mOffCurrent;
+
+                    alock.release();
 
                     fireGuestFileOffsetChangedEvent(mEventSource, mSession, this,
-                                                    mData.mOffCurrent, 0 /* Processed */);
+                                                    uOffCurrent, 0 /* Processed */);
                 }
             }
@@ -664 +676 @@
                 vrc = VERR_NOT_SUPPORTED;
             break;
+        }
 
         default:
@@ -670 +683 @@
     }
 
-    LogFlowThisFunc(("strName=%s, uType=%RU32, guestRc=%Rrc\n",
-                     mData.mOpenInfo.mFileName.c_str(), dataCb.uType, dataCb.rc));
-
-    if (RT_SUCCESS(vrc))
-    {
-        /* Nothing to do here yet. */
-    }
-    else if (vrc == VERR_NOT_SUPPORTED)
-    {
-        /* Also let the callback know. */
-        guestRc = VERR_NOT_SUPPORTED;
-    }
+    LogFlowThisFunc(("uType=%RU32, guestRc=%Rrc\n",
+                     dataCb.uType, dataCb.rc));
 
     LogFlowFuncLeaveRC(vrc);
@@ -692 +695 @@
     AssertPtrReturn(pSvcCbData, VERR_INVALID_POINTER);
 
-    LogFlowThisFunc(("strFile=%s\n",
-                     mData.mOpenInfo.mFileName.c_str()));
-
     int vrc = setFileStatus(FileStatus_Down, VINF_SUCCESS);
 
@@ -701 +701 @@
 }
 
-int GuestFile::openFile(int *pGuestRc)
-{
-    LogFlowThisFunc(("strFile=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%RU32\n",
+int GuestFile::openFile(uint32_t uTimeoutMS, int *pGuestRc)
+{
+    LogFlowThisFuncEnter();
+
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    LogFlowThisFunc(("strFile=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%RU32, uOffset=%RU64\n",
                      mData.mOpenInfo.mFileName.c_str(), mData.mOpenInfo.mOpenMode.c_str(),
-                     mData.mOpenInfo.mDisposition.c_str(), mData.mOpenInfo.mCreationMode));
+                     mData.mOpenInfo.mDisposition.c_str(), mData.mOpenInfo.mCreationMode, mData.mOpenInfo.mInitialOffset));
     int vrc;
 
@@ -734 +738 @@
     paParms[i++].setPointer((void*)mData.mOpenInfo.mDisposition.c_str(),
                             (ULONG)mData.mOpenInfo.mDisposition.length() + 1);
+    paParms[i++].setPointer((void*)mData.mOpenInfo.mSharingMode.c_str(),
+                            (ULONG)mData.mOpenInfo.mSharingMode.length() + 1);
     paParms[i++].setUInt32(mData.mOpenInfo.mCreationMode);
     paParms[i++].setUInt64(mData.mOpenInfo.mInitialOffset);
 
+    alock.release(); /* Drop read lock before sending. */
+
     vrc = sendCommand(HOST_FILE_OPEN, i, paParms);
     if (RT_SUCCESS(vrc))
-        vrc = waitForStatusChange(pEvent, 30 * 1000 /* Timeout in ms */,
-                                  NULL /* FileStatus */);
+        vrc = waitForStatusChange(pEvent, uTimeoutMS,
+                                  NULL /* FileStatus */, pGuestRc);
 
     unregisterWaitEvent(pEvent);
@@ -903 +911 @@
 }
 
-/* Does not do locking; caller is responsible for that! */
 int GuestFile::setFileStatus(FileStatus_T fileStatus, int fileRc)
 {
+    LogFlowThisFuncEnter();
+
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     LogFlowThisFunc(("oldStatus=%ld, newStatus=%ld, fileRc=%Rrc\n",
                      mData.mStatus, fileStatus, fileRc));
@@ -920 +931 @@
     if (mData.mStatus != fileStatus)
     {
-        mData.mStatus = fileStatus;
+        mData.mStatus    = fileStatus;
+        mData.mLastError = fileRc;
 
         ComObjPtr<VirtualBoxErrorInfo> errorInfo;
@@ -927 +939 @@
         if (RT_FAILURE(fileRc))
         {
-            int rc2 = errorInfo->initEx(VBOX_E_IPRT_ERROR, fileRc,
-                                        COM_IIDOF(IGuestFile), getComponentName(),
-                                        guestErrorToString(fileRc));
-            AssertRC(rc2);
-        }
+            hr = errorInfo->initEx(VBOX_E_IPRT_ERROR, fileRc,
+                                   COM_IIDOF(IGuestFile), getComponentName(),
+                                   guestErrorToString(fileRc));
+            ComAssertComRC(hr);
+        }
+
+        /* Copy over necessary data before releasing lock again. */
+        FileStatus_T fileStatus = mData.mStatus;
+
+        alock.release(); /* Release lock before firing off event. */
 
         fireGuestFileStateChangedEvent(mEventSource, mSession,
-                                       this, mData.mStatus, errorInfo);
+                                       this, fileStatus, errorInfo);
     }
 
@@ -1013 +1030 @@
 }
 
-int GuestFile::waitForStatusChange(GuestWaitEvent *pEvent,
-                                   uint32_t uTimeoutMS, FileStatus_T *pFileStatus)
+int GuestFile::waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS,
+                                   FileStatus_T *pFileStatus, int *pGuestRc)
 {
     AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
+    /* pFileStatus is optional. */
 
     VBoxEventType_T evtType;
@@ -1028 +1046 @@
         Assert(!pFileEvent.isNull());
 
-        HRESULT hr = pFileEvent->COMGETTER(Status)(pFileStatus);
+        HRESULT hr;
+        if (pFileStatus)
+        {
+            hr = pFileEvent->COMGETTER(Status)(pFileStatus);
+            ComAssertComRC(hr);
+        }
+
+        ComPtr<IVirtualBoxErrorInfo> errorInfo;
+        hr = pFileEvent->COMGETTER(Error)(errorInfo.asOutParam());
         ComAssertComRC(hr);
+
+        LONG lGuestRc;
+        hr = errorInfo->COMGETTER(ResultDetail)(&lGuestRc);
+        ComAssertComRC(hr);
+
+        LogFlowThisFunc(("resultDetail=%RI32 (rc=%Rrc)\n",
+                         lGuestRc, lGuestRc));
+
+        if (RT_FAILURE((int)lGuestRc))
+            vrc = VERR_GSTCTL_GUEST_ERROR;
+
+        if (pGuestRc)
+            *pGuestRc = (int)lGuestRc;
     }
 
@@ -1197 +1236 @@
         rc = rc2;
 
-    /*
-     * Release autocaller before calling uninit.
-     */
-    autoCaller.release();
-
-    uninit();
-
-    LogFlowFuncLeaveRC(rc);
     if (RT_FAILURE(rc))
     {
@@ -1214 +1245 @@
     }
 
+    LogFlowThisFunc(("Returning rc=%Rrc\n", rc));
     return S_OK;
 #endif /* VBOX_WITH_GUEST_CONTROL */

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

@@ -239 +239 @@
         mData.mExitCode = 0;
         mData.mPID = 0;
-        mData.mRC = VINF_SUCCESS;
+        mData.mLastError = VINF_SUCCESS;
         mData.mStatus = ProcessStatus_Undefined;
         /* Everything else will be set by the actual starting routine. */
@@ -967 +967 @@
         /* Do not allow overwriting an already set error. If this happens
          * this means we forgot some error checking/locking somewhere. */
-        AssertMsg(RT_SUCCESS(mData.mRC), ("Guest rc already set (to %Rrc)\n", mData.mRC));
+        AssertMsg(RT_SUCCESS(mData.mLastError), ("Guest rc already set (to %Rrc)\n", mData.mLastError));
     }
     else
@@ -976 +976 @@
     if (mData.mStatus != procStatus) /* Was there a process status change? */
     {
-        mData.mStatus = procStatus;
-        mData.mRC     = procRc;
+        mData.mStatus    = procStatus;
+        mData.mLastError = procRc;
 
         ComObjPtr<VirtualBoxErrorInfo> errorInfo;
         HRESULT hr = errorInfo.createObject();
         ComAssertComRC(hr);
-        if (RT_FAILURE(mData.mRC))
-        {
-            int rc2 = errorInfo->initEx(VBOX_E_IPRT_ERROR, mData.mRC,
-                                        COM_IIDOF(IGuestProcess), getComponentName(),
-                                        guestErrorToString(mData.mRC));
-            AssertRC(rc2);
+        if (RT_FAILURE(mData.mLastError))
+        {
+            hr = errorInfo->initEx(VBOX_E_IPRT_ERROR, mData.mLastError,
+                                   COM_IIDOF(IGuestProcess), getComponentName(),
+                                   guestErrorToString(mData.mLastError));
+            ComAssertComRC(hr);
         }
 
         /* Copy over necessary data before releasing lock again. */
         uint32_t uPID =  mData.mPID;
-        ProcessStatus_T uStatus = mData.mStatus;
+        ProcessStatus_T procStatus = mData.mStatus;
         /** @todo Also handle mSession? */
 
@@ -998 +998 @@
 
         fireGuestProcessStateChangedEvent(mEventSource, mSession, this,
-                                          uPID, uStatus, errorInfo);
+                                          uPID, procStatus, errorInfo);
 #if 0
         /*
@@ -1408 +1408 @@
 
     LogFlowThisFunc(("fWaitFlags=0x%x, uTimeoutMS=%RU32, procStatus=%RU32, procRc=%Rrc, pGuestRc=%p\n",
-                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mRC, pGuestRc));
+                     fWaitFlags, uTimeoutMS, mData.mStatus, mData.mLastError, pGuestRc));
 
     /* Did some error occur before? Then skip waiting and return. */
@@ -1414 +1414 @@
     {
         waitResult = ProcessWaitResult_Error;
-        AssertMsg(RT_FAILURE(mData.mRC), ("No error rc (%Rrc) set when guest process indicated an error\n", mData.mRC));
+        AssertMsg(RT_FAILURE(mData.mLastError), ("No error rc (%Rrc) set when guest process indicated an error\n", mData.mLastError));
         if (pGuestRc)
-            *pGuestRc = mData.mRC; /* Return last set error. */
+            *pGuestRc = mData.mLastError; /* Return last set error. */
         return VERR_GSTCTL_GUEST_ERROR;
     }
@@ -1427 +1427 @@
     {
         if (pGuestRc)
-            *pGuestRc = mData.mRC; /* Return last set error (if any). */
-        return RT_SUCCESS(mData.mRC) ? VINF_SUCCESS : VERR_GSTCTL_GUEST_ERROR;
+            *pGuestRc = mData.mLastError; /* Return last set error (if any). */
+        return RT_SUCCESS(mData.mLastError) ? VINF_SUCCESS : VERR_GSTCTL_GUEST_ERROR;
     }
 

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

@@ -1005 +1005 @@
                              Utf8Str(strName).c_str(), mData.mSession.mID, mData.mFiles.size() - 1, mData.mNumObjects - 1));
 
-            itFiles->second->Release();
+            pFile->cancelWaitEvents();
+            pFile->Release();
 
             mData.mFiles.erase(itFiles);
@@ -1054 +1055 @@
 int GuestSession::fileOpenInternal(const GuestFileOpenInfo &openInfo, ComObjPtr<GuestFile> &pFile, int *pGuestRc)
 {
-    LogFlowThisFunc(("strPath=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%x, iOffset=%RI64\n",
+    LogFlowThisFunc(("strPath=%s, strOpenMode=%s, strDisposition=%s, uCreationMode=%x, uOffset=%RU64\n",
                      openInfo.mFileName.c_str(), openInfo.mOpenMode.c_str(), openInfo.mDisposition.c_str(),
                      openInfo.mCreationMode, openInfo.mInitialOffset));
@@ -1111 +1112 @@
         return rc;
 
-    int guestRc;
-    rc = pFile->openFile(&guestRc);
+    /*
+     * Since this is a synchronous guest call we have to
+     * register the file object first, releasing the session's
+     * lock and then proceed with the actual opening command
+     * -- otherwise the file's opening callback would hang
+     * because the session's lock still is in place.
+     */
+    try
+    {
+        /* Add the created file to our vector. */
+        mData.mFiles[uNewFileID] = pFile;
+        mData.mNumObjects++;
+        Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
+
+        LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %ld files, %ld objects)\n",
+                     openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
+
+        alock.release(); /* Release lock before firing off event. */
+
+        fireGuestFileRegisteredEvent(mEventSource, this, pFile,
+                                     true /* Registered */);
+    }
+    catch (std::bad_alloc &)
+    {
+        rc = VERR_NO_MEMORY;
+    }
+
     if (RT_SUCCESS(rc))
     {
-        try
-        {
-            /* Add the created file to our vector. */
-            mData.mFiles[uNewFileID] = pFile;
-            mData.mNumObjects++;
-            Assert(mData.mNumObjects <= VBOX_GUESTCTRL_MAX_OBJECTS);
-
-            LogFlowFunc(("Added new guest file \"%s\" (Session: %RU32) (now total %ld files, %ld objects)\n",
-                         openInfo.mFileName.c_str(), mData.mSession.mID, mData.mFiles.size(), mData.mNumObjects));
-
-            alock.release(); /* Release lock before firing off event. */
-
-            fireGuestFileRegisteredEvent(mEventSource, this, pFile,
-                                         true /* Registered */);
-            if (pGuestRc)
-                *pGuestRc = guestRc;
-        }
-        catch (std::bad_alloc &)
-        {
-            rc = VERR_NO_MEMORY;
+        int guestRc;
+        rc = pFile->openFile(30 * 1000 /* 30s timeout */, &guestRc);
+        if (   rc == VERR_GSTCTL_GUEST_ERROR
+            && pGuestRc)
+        {
+            *pGuestRc = guestRc;
         }
     }
@@ -2728 +2740 @@
 }
 
-STDMETHODIMP GuestSession::FileOpen(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile)
+STDMETHODIMP GuestSession::FileOpen(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, ULONG aCreationMode, IGuestFile **aFile)
+{
+#ifndef VBOX_WITH_GUEST_CONTROL
+    ReturnComNotImplemented();
+#else
+    LogFlowThisFuncEnter();
+
+    Bstr strSharingMode = ""; /* Sharing mode is ignored. */
+
+    return FileOpenEx(aPath, aOpenMode, aDisposition, strSharingMode.raw(), aCreationMode,
+                      0 /* aOffset */, aFile);
+#endif /* VBOX_WITH_GUEST_CONTROL */
+}
+
+STDMETHODIMP GuestSession::FileOpenEx(IN_BSTR aPath, IN_BSTR aOpenMode, IN_BSTR aDisposition, IN_BSTR aSharingMode,
+                                      ULONG aCreationMode, LONG64 aOffset, IGuestFile **aFile)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -2741 +2768 @@
     if (RT_UNLIKELY((aDisposition) == NULL || *(aDisposition) == '\0'))
         return setError(E_INVALIDARG, tr("No disposition mode specified"));
+    /* aSharingMode is optional. */
 
     CheckComArgOutPointerValid(aFile);
@@ -2750 +2778 @@
     if (FAILED(hr))
         return hr;
-
-    /** @todo Validate open mode. */
-    /** @todo Validate disposition mode. */
 
     /** @todo Validate creation mode. */
@@ -2761 +2786 @@
     openInfo.mOpenMode = Utf8Str(aOpenMode);
     openInfo.mDisposition = Utf8Str(aDisposition);
+    openInfo.mSharingMode = Utf8Str(aSharingMode);
     openInfo.mCreationMode = aCreationMode;
     openInfo.mInitialOffset = aOffset;
 
+    uint64_t uFlagsIgnored;
+    int vrc = RTFileModeToFlagsEx(openInfo.mOpenMode.c_str(),
+                                  openInfo.mDisposition.c_str(),
+                                  openInfo.mSharingMode.c_str(),
+                                  &uFlagsIgnored);
+    if (RT_FAILURE(vrc))
+        return setError(E_INVALIDARG, tr("Invalid open mode / disposition / sharing mode specified"));
+
     ComObjPtr <GuestFile> pFile; int guestRc;
-    int vrc = fileOpenInternal(openInfo, pFile, &guestRc);
+    vrc = fileOpenInternal(openInfo, pFile, &guestRc);
     if (RT_SUCCESS(vrc))
     {