Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp =================================================================== --- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 42809) +++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp (revision 42810) @@ -807,8 +807,4 @@ } -#ifdef DEBUG - if (fVerbose) - RTPrintf("rc=%Rrc, waitResult=%ld\n", rc, waitResult); -#endif switch (waitResult) { @@ -838,7 +834,14 @@ fCompleted = true; break; - case ProcessWaitResult_Any: - fReadStdOut = fReadStdErr = true; - break; + case ProcessWaitResult_WaitFlagNotSupported: + { + /* The guest does not support waiting for stdout/err, so + * yield to reduce the CPU load due to busy waiting. */ + RTThreadYield(); /* Optional, don't check rc. */ + + /* Try both, stdout + stderr. */ + fReadStdOut = fReadStdErr = true; + break; + } default: /* Ignore all other results, let the timeout expire */; Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 42809) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 42810) @@ -639,4 +639,5 @@ ifdef VBOX_WITH_GUEST_CONTROL VBoxC_SOURCES += \ + src-client/GuestSessionImplTasks.cpp \ src-client/GuestCtrlPrivate.cpp \ src-client/GuestCtrlImplTasks.cpp \ Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl =================================================================== --- /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 42809) +++ /trunk/src/VBox/Main/idl/VirtualBox.xidl (revision 42810) @@ -9035,5 +9035,5 @@ @@ -9088,5 +9088,5 @@ Data on stderr became available for reading. - + A waiting flag specified in the call Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 42809) +++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 42810) @@ -1283,6 +1283,6 @@ || (fWaitFlags & ProcessWaitForFlag_StdErr)) { - /* Use _Any because we don't know what to tell the caller. */ - waitRes.mResult = ProcessWaitResult_Any; + /* Use _WaitFlagNotSupported because we don't know what to tell the caller. */ + waitRes.mResult = ProcessWaitResult_WaitFlagNotSupported; } } @@ -1384,12 +1384,10 @@ vrc = waitFor(ProcessWaitForFlag_Start, uTimeoutMS, waitRes); if ( RT_FAILURE(vrc) - || ( waitRes.mResult == ProcessWaitResult_Start - && waitRes.mResult == ProcessWaitResult_Any - ) - ) + || waitRes.mResult == ProcessWaitResult_Start) { if (RT_SUCCESS(vrc)) vrc = waitRes.mRC; } + /** @todo More error handling needed. */ } Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 42809) +++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 42810) @@ -63,1016 +63,4 @@ BaseFinalRelease(); LogFlowThisFuncLeave(); -} - -// session task classes -///////////////////////////////////////////////////////////////////////////// - -GuestSessionTask::GuestSessionTask(GuestSession *pSession) -{ - mSession = pSession; -} - -GuestSessionTask::~GuestSessionTask(void) -{ -} - -int GuestSessionTask::setProgress(ULONG uPercent) -{ - if (mProgress.isNull()) /* Progress is optional. */ - return VINF_SUCCESS; - - BOOL fCanceled; - if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) - && fCanceled) - return VERR_CANCELLED; - BOOL fCompleted; - if ( SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) - && !fCompleted) - return VINF_SUCCESS; - HRESULT hr = mProgress->SetCurrentOperationProgress(uPercent); - if (FAILED(hr)) - return VERR_COM_UNEXPECTED; - - return VINF_SUCCESS; -} - -int GuestSessionTask::setProgressSuccess(void) -{ - if (mProgress.isNull()) /* Progress is optional. */ - return VINF_SUCCESS; - - BOOL fCanceled; - BOOL fCompleted; - if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) - && !fCanceled - && SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) - && !fCompleted) - { - HRESULT hr = mProgress->notifyComplete(S_OK); - if (FAILED(hr)) - return VERR_COM_UNEXPECTED; /** @todo Find a better rc. */ - } - - return VINF_SUCCESS; -} - -HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg) -{ - if (mProgress.isNull()) /* Progress is optional. */ - return hr; /* Return original rc. */ - - BOOL fCanceled; - BOOL fCompleted; - if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) - && !fCanceled - && SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) - && !fCompleted) - { - HRESULT hr2 = mProgress->notifyComplete(hr, - COM_IIDOF(IGuestSession), - GuestSession::getStaticComponentName(), - strMsg.c_str()); - if (FAILED(hr2)) - return hr2; - } - return hr; /* Return original rc. */ -} - -SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession, - const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags) - : mSource(strSource), - mDest(strDest), - mSourceFile(NULL), - mSourceOffset(0), - mSourceSize(0), - GuestSessionTask(pSession) -{ - mCopyFileFlags = uFlags; -} - -/** @todo Merge this and the above call and let the above call do the open/close file handling so that the - * inner code only has to deal with file handles. No time now ... */ -SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession, - PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize, - const Utf8Str &strDest, uint32_t uFlags) - : GuestSessionTask(pSession) -{ - mSourceFile = pSourceFile; - mSourceOffset = cbSourceOffset; - mSourceSize = cbSourceSize; - mDest = strDest; - mCopyFileFlags = uFlags; -} - -SessionTaskCopyTo::~SessionTaskCopyTo(void) -{ - -} - -int SessionTaskCopyTo::Run(void) -{ - LogFlowThisFuncEnter(); - - ComObjPtr pSession = mSession; - Assert(!pSession.isNull()); - - AutoCaller autoCaller(pSession); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - - if (mCopyFileFlags) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Copy flags (%#x) not implemented yet"), - mCopyFileFlags)); - return VERR_INVALID_PARAMETER; - } - - int rc; - - RTFILE fileLocal; - PRTFILE pFile = &fileLocal; - - if (!mSourceFile) - { - /* Does our source file exist? */ - if (!RTFileExists(mSource.c_str())) - { - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Source file \"%s\" does not exist or is not a file"), - mSource.c_str())); - } - else - { - rc = RTFileOpen(pFile, mSource.c_str(), - RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE); - if (RT_FAILURE(rc)) - { - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Could not open source file \"%s\" for reading: %Rrc"), - mSource.c_str(), rc)); - } - else - { - rc = RTFileGetSize(*pFile, &mSourceSize); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Could not query file size of \"%s\": %Rrc"), - mSource.c_str(), rc)); - } - } - } - } - else - { - pFile = mSourceFile; - /* Size + offset are optional. */ - } - - GuestProcessStartupInfo procInfo; - procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the guest to \"%s\" (%RU64 bytes)"), - mSource.c_str(), mDest.c_str(), mSourceSize); - procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT); - procInfo.mFlags = ProcessCreateFlag_Hidden; - - /* Set arguments.*/ - procInfo.mArguments.push_back(Utf8StrFmt("--output=%s", mDest.c_str())); /** @todo Do we need path conversion? */ - - /* Startup process. */ - ComObjPtr pProcess; - rc = pSession->processCreateExInteral(procInfo, pProcess); - if (RT_SUCCESS(rc)) - rc = pProcess->startProcess(); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc)); - } - else - { - GuestProcessWaitResult waitRes; - BYTE byBuf[_64K]; - - BOOL fCanceled = FALSE; - uint64_t cbWrittenTotal = 0; - uint64_t cbToRead = mSourceSize; - - for (;;) - { - rc = pProcess->waitFor(ProcessWaitForFlag_StdIn, - 30 * 1000 /* Timeout */, waitRes); - if ( RT_FAILURE(rc) - || ( waitRes.mResult != ProcessWaitResult_StdIn - && waitRes.mResult != ProcessWaitResult_Any)) - { - break; - } - - size_t cbRead = 0; - if (mSourceSize) /* If we have nothing to write, take a shortcut. */ - { - /** @todo Not very efficient, but works for now. */ - rc = RTFileSeek(*pFile, mSourceOffset + cbWrittenTotal, - RTFILE_SEEK_BEGIN, NULL /* poffActual */); - if (RT_SUCCESS(rc)) - { - rc = RTFileRead(*pFile, (uint8_t*)byBuf, - RT_MIN(cbToRead, sizeof(byBuf)), &cbRead); - /* - * Some other error occured? There might be a chance that RTFileRead - * could not resolve/map the native error code to an IPRT code, so just - * print a generic error. - */ - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Could not read from file \"%s\" (%Rrc)"), - mSource.c_str(), rc)); - break; - } - } - else - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Seeking file \"%s\" offset %RU64 failed: %Rrc"), - mSource.c_str(), cbWrittenTotal, rc)); - break; - } - } - - uint32_t fFlags = ProcessInputFlag_None; - - /* Did we reach the end of the content we want to transfer (last chunk)? */ - if ( (cbRead < sizeof(byBuf)) - /* Did we reach the last block which is exactly _64K? */ - || (cbToRead - cbRead == 0) - /* ... or does the user want to cancel? */ - || ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) - && fCanceled) - ) - { - fFlags |= ProcessInputFlag_EndOfFile; - } - - uint32_t cbWritten; - Assert(sizeof(byBuf) >= cbRead); - rc = pProcess->writeData(0 /* StdIn */, fFlags, - byBuf, cbRead, - 30 * 1000 /* Timeout */, &cbWritten); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"), - mDest.c_str(), cbWrittenTotal, rc)); - break; - } - - LogFlowThisFunc(("cbWritten=%RU32, cbToRead=%RU64, cbWrittenTotal=%RU64, cbFileSize=%RU64\n", - cbWritten, cbToRead - cbWritten, cbWrittenTotal + cbWritten, mSourceSize)); - - /* Only subtract bytes reported written by the guest. */ - Assert(cbToRead >= cbWritten); - cbToRead -= cbWritten; - - /* Update total bytes written to the guest. */ - cbWrittenTotal += cbWritten; - Assert(cbWrittenTotal <= mSourceSize); - - /* Did the user cancel the operation above? */ - if (fCanceled) - break; - - /* Update the progress. - * Watch out for division by zero. */ - mSourceSize > 0 - ? rc = setProgress((ULONG)(cbWrittenTotal * 100 / mSourceSize)) - : rc = setProgress(100); - if (RT_FAILURE(rc)) - break; - - /* End of file reached? */ - if (!cbToRead) - break; - } /* for */ - - if ( !fCanceled - || RT_SUCCESS(rc)) - { - /* - * Even if we succeeded until here make sure to check whether we really transfered - * everything. - */ - if ( mSourceSize > 0 - && cbWrittenTotal == 0) - { - /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write - * to the destination -> access denied. */ - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""), - mSource.c_str(), mDest.c_str())); - } - else if (cbWrittenTotal < mSourceSize) - { - /* If we did not copy all let the user know. */ - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"), - mSource.c_str(), cbWrittenTotal, mSourceSize)); - } - else - { - rc = pProcess->waitFor(ProcessWaitForFlag_Terminate, - 30 * 1000 /* Timeout */, waitRes); - if ( RT_FAILURE(rc) - || waitRes.mResult != ProcessWaitResult_Terminate) - { - if (RT_FAILURE(rc)) - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed: %Rrc"), - mSource.c_str(), rc)); - else - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed with wait result %ld"), - mSource.c_str(), waitRes.mResult)); - } - - if (RT_SUCCESS(rc)) - { - ProcessStatus_T procStatus; - LONG exitCode; - if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) - && procStatus != ProcessStatus_TerminatedNormally) - || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) - && exitCode != 0) - ) - { - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %ld"), - mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */ - } - } - - if (RT_SUCCESS(rc)) - rc = setProgressSuccess(); - } - } - - pProcess->close(); - } /* processCreateExInteral */ - - if (!mSourceFile) /* Only close locally opened files. */ - RTFileClose(*pFile); - - LogFlowFuncLeaveRC(rc); - return rc; -} - -int SessionTaskCopyTo::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) -{ - LogFlowThisFunc(("strDesc=%s, strSource=%s, strDest=%s, mCopyFileFlags=%x\n", - strDesc.c_str(), mSource.c_str(), mDest.c_str(), mCopyFileFlags)); - - mDesc = strDesc; - mProgress = pProgress; - - int rc = RTThreadCreate(NULL, SessionTaskCopyTo::taskThread, this, - 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, - "gctlCpyTo"); - LogFlowFuncLeaveRC(rc); - return rc; -} - -/* static */ -int SessionTaskCopyTo::taskThread(RTTHREAD Thread, void *pvUser) -{ - std::auto_ptr task(static_cast(pvUser)); - AssertReturn(task.get(), VERR_GENERAL_FAILURE); - - LogFlowFunc(("pTask=%p\n", task.get())); - return task->Run(); -} - -SessionTaskCopyFrom::SessionTaskCopyFrom(GuestSession *pSession, - const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags) - : GuestSessionTask(pSession) -{ - mSource = strSource; - mDest = strDest; - mFlags = uFlags; -} - -SessionTaskCopyFrom::~SessionTaskCopyFrom(void) -{ - -} - -int SessionTaskCopyFrom::Run(void) -{ - LogFlowThisFuncEnter(); - - ComObjPtr pSession = mSession; - Assert(!pSession.isNull()); - - AutoCaller autoCaller(pSession); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - - /* - * Note: There will be races between querying file size + reading the guest file's - * content because we currently *do not* lock down the guest file when doing the - * actual operations. - ** @todo Implement guest file locking! - */ - GuestFsObjData objData; - int rc = pSession->fileQueryInfoInternal(Utf8Str(mSource), objData); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"), - mSource.c_str(), rc)); - } - else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */ - { - rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str())); - } - - if (RT_SUCCESS(rc)) - { - RTFILE fileDest; - rc = RTFileOpen(&fileDest, mDest.c_str(), - RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */ - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Error opening destination file \"%s\": %Rrc"), - mDest.c_str(), rc)); - } - else - { - GuestProcessStartupInfo procInfo; - procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"), - mSource.c_str(), mDest.c_str(), objData.mObjectSize); - procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT); - procInfo.mFlags = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut; - - /* Set arguments.*/ - procInfo.mArguments.push_back(mSource); /* Which file to output? */ - - /* Startup process. */ - ComObjPtr pProcess; - rc = pSession->processCreateExInteral(procInfo, pProcess); - if (RT_SUCCESS(rc)) - rc = pProcess->startProcess(); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Unable to start guest process for copying data from guest to host: %Rrc"), rc)); - } - else - { - GuestProcessWaitResult waitRes; - BYTE byBuf[_64K]; - - BOOL fCanceled = FALSE; - uint64_t cbWrittenTotal = 0; - uint64_t cbToRead = objData.mObjectSize; - - for (;;) - { - rc = pProcess->waitFor(ProcessWaitForFlag_StdOut, - 30 * 1000 /* Timeout */, waitRes); - if ( waitRes.mResult == ProcessWaitResult_StdOut - || waitRes.mResult == ProcessWaitResult_Any) - { - size_t cbRead; - rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf), - 30 * 1000 /* Timeout */, byBuf, sizeof(byBuf), - &cbRead); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Reading from file \"%s\" (offset %RU64) failed: %Rrc"), - mSource.c_str(), cbWrittenTotal, rc)); - break; - } - - if (cbRead) - { - rc = RTFileWrite(fileDest, byBuf, cbRead, NULL /* No partial writes */); - if (RT_FAILURE(rc)) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Error writing to file \"%s\" (%RU64 bytes left): %Rrc"), - mDest.c_str(), cbToRead, rc)); - break; - } - - /* Only subtract bytes reported written by the guest. */ - Assert(cbToRead >= cbRead); - cbToRead -= cbRead; - - /* Update total bytes written to the guest. */ - cbWrittenTotal += cbRead; - Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize); - - /* Did the user cancel the operation above? */ - if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) - && fCanceled) - break; - - rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0))); - if (RT_FAILURE(rc)) - break; - } - } - else if ( RT_FAILURE(rc) - || waitRes.mResult == ProcessWaitResult_Terminate - || waitRes.mResult == ProcessWaitResult_Error - || waitRes.mResult == ProcessWaitResult_Timeout) - { - if (RT_FAILURE(waitRes.mRC)) - rc = waitRes.mRC; - break; - } - } /* for */ - - LogFlowThisFunc(("rc=%Rrc, cbWrittenTotal=%RU64, cbSize=%RI64, cbToRead=%RU64\n", - rc, cbWrittenTotal, objData.mObjectSize, cbToRead)); - - if ( !fCanceled - || RT_SUCCESS(rc)) - { - /* - * Even if we succeeded until here make sure to check whether we really transfered - * everything. - */ - if ( objData.mObjectSize > 0 - && cbWrittenTotal == 0) - { - /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write - * to the destination -> access denied. */ - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""), - mSource.c_str(), mDest.c_str())); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - else if (cbWrittenTotal < (uint64_t)objData.mObjectSize) - { - /* If we did not copy all let the user know. */ - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RI64 bytes transfered)"), - mSource.c_str(), cbWrittenTotal, objData.mObjectSize)); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - else - { - ProcessStatus_T procStatus; - LONG exitCode; - if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) - && procStatus != ProcessStatus_TerminatedNormally) - || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) - && exitCode != 0) - ) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %d"), - mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */ - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - else /* Yay, success! */ - rc = setProgressSuccess(); - } - } - - pProcess->close(); - } - - RTFileClose(fileDest); - } - } - - LogFlowFuncLeaveRC(rc); - return rc; -} - -int SessionTaskCopyFrom::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) -{ - LogFlowThisFunc(("strDesc=%s, strSource=%s, strDest=%s, uFlags=%x\n", - strDesc.c_str(), mSource.c_str(), mDest.c_str(), mFlags)); - - mDesc = strDesc; - mProgress = pProgress; - - int rc = RTThreadCreate(NULL, SessionTaskCopyFrom::taskThread, this, - 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, - "gctlCpyFrom"); - LogFlowFuncLeaveRC(rc); - return rc; -} - -/* static */ -int SessionTaskCopyFrom::taskThread(RTTHREAD Thread, void *pvUser) -{ - std::auto_ptr task(static_cast(pvUser)); - AssertReturn(task.get(), VERR_GENERAL_FAILURE); - - LogFlowFunc(("pTask=%p\n", task.get())); - return task->Run(); -} - -SessionTaskUpdateAdditions::SessionTaskUpdateAdditions(GuestSession *pSession, - const Utf8Str &strSource, uint32_t uFlags) - : GuestSessionTask(pSession) -{ - mSource = strSource; - mFlags = uFlags; -} - -SessionTaskUpdateAdditions::~SessionTaskUpdateAdditions(void) -{ - -} - -int SessionTaskUpdateAdditions::copyFileToGuest(GuestSession *pSession, PRTISOFSFILE pISO, - Utf8Str const &strFileSource, const Utf8Str &strFileDest, - bool fOptional, uint32_t *pcbSize) -{ - AssertPtrReturn(pSession, VERR_INVALID_POINTER); - AssertPtrReturn(pISO, VERR_INVALID_POINTER); - /* pcbSize is optional. */ - - uint32_t cbOffset; - size_t cbSize; - - int rc = RTIsoFsGetFileInfo(pISO, strFileSource.c_str(), &cbOffset, &cbSize); - if (RT_FAILURE(rc)) - { - if (fOptional) - return VINF_SUCCESS; - - return rc; - } - - Assert(cbOffset); - Assert(cbSize); - rc = RTFileSeek(pISO->file, cbOffset, RTFILE_SEEK_BEGIN, NULL); - - /* Copy over the Guest Additions file to the guest. */ - if (RT_SUCCESS(rc)) - { - LogRel(("Copying Guest Additions installer file \"%s\" to \"%s\" on guest ...\n", - strFileSource.c_str(), strFileDest.c_str())); - - if (RT_SUCCESS(rc)) - { - SessionTaskCopyTo *pTask = new SessionTaskCopyTo(pSession /* GuestSession */, - &pISO->file, cbOffset, cbSize, - strFileDest, CopyFileFlag_None); - AssertPtrReturn(pTask, VERR_NO_MEMORY); - - ComObjPtr pProgressCopyTo; - rc = pSession->startTaskAsync(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer file \"%s\" to \"%s\" on guest"), - mSource.c_str(), strFileDest.c_str()), - pTask, pProgressCopyTo); - if (RT_SUCCESS(rc)) - { - BOOL fCanceled = FALSE; - HRESULT hr = pProgressCopyTo->WaitForCompletion(-1); - if ( SUCCEEDED(pProgressCopyTo->COMGETTER(Canceled)(&fCanceled)) - && fCanceled) - { - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - else if (FAILED(hr)) - { - Assert(FAILED(hr)); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - } - } - } - - /** @todo Note: Since there is no file locking involved at the moment, there can be modifications - * between finished copying, the verification and the actual execution. */ - - /* Determine where the installer image ended up and if it has the correct size. */ - if (RT_SUCCESS(rc)) - { - LogRel(("Verifying Guest Additions installer file \"%s\" ...\n", strFileDest.c_str())); - - GuestFsObjData objData; - int64_t cbSizeOnGuest; - rc = pSession->fileQuerySizeInternal(strFileDest, &cbSizeOnGuest); -#ifdef VBOX_SERVICE_ENVARG_BUG - if (RT_FAILURE(rc)) - { - /* Ugly hack: Because older Guest Additions have problems with environment variable - expansion in parameters we have to check an alternative location on Windows. - So check for "%TEMP%\" being "C:\\Windows\\system32\\EMP" actually. */ - if (strFileDest.startsWith("%TEMP%\\", RTCString::CaseSensitive)) - { - Utf8Str strFileDestBug = "C:\\Windows\\system32\\EMP" + strFileDest.substr(sizeof("%TEMP%\\") - sizeof(char)); - rc = pSession->fileQuerySizeInternal(strFileDestBug, &cbSizeOnGuest); - } - } -#endif - if ( RT_SUCCESS(rc) - && cbSize == (uint64_t)cbSizeOnGuest) - { - LogRel(("Guest Additions installer file \"%s\" successfully verified\n", - strFileDest.c_str())); - } - else - { - if (RT_SUCCESS(rc)) /* Size does not match. */ - rc = VERR_BROKEN_PIPE; /** @todo FInd a better error. */ - } - - if (RT_SUCCESS(rc)) - { - if (pcbSize) - *pcbSize = cbSizeOnGuest; - } - } - - return rc; -} - -int SessionTaskUpdateAdditions::runFile(GuestSession *pSession, GuestProcessStartupInfo &procInfo) -{ - AssertPtrReturn(pSession, VERR_INVALID_POINTER); - -#ifdef VBOX_SERVICE_ENVARG_BUG - GuestFsObjData objData; - int rc = pSession->fileQueryInfoInternal(procInfo.mCommand, objData); - if (RT_FAILURE(rc)) - procInfo.mCommand = "C:\\Windows\\system32\\EMP" + procInfo.mCommand.substr(sizeof("%TEMP%\\") - sizeof(char)); -#endif - - ComObjPtr pProcess; - rc = pSession->processCreateExInteral(procInfo, pProcess); - if (RT_SUCCESS(rc)) - rc = pProcess->startProcess(); - - if (RT_SUCCESS(rc)) - { - LogRel(("Running %s ...\n", procInfo.mName.c_str())); - - GuestProcessWaitResult waitRes; - rc = pProcess->waitFor(ProcessWaitForFlag_Terminate, - 10 * 60 * 1000 /* 10 mins Timeout */, waitRes); - if (waitRes.mResult == ProcessWaitResult_Terminate) - { - ProcessStatus_T procStatus; - LONG exitCode; - if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) - && procStatus != ProcessStatus_TerminatedNormally) - || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) - && exitCode != 0) - ) - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Running %s failed with status %ld, exit code %ld"), - procInfo.mName.c_str(), procStatus, exitCode)); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - else /* Yay, success! */ - { - LogRel(("%s successfully completed\n", procInfo.mName.c_str())); - } - } - else - { - if (RT_FAILURE(rc)) - setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Error while waiting running %s: %Rrc"), - procInfo.mName.c_str(), rc)); - else - { - setProgressErrorMsg(VBOX_E_IPRT_ERROR, pProcess->errorMsg()); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - } - } - - if (!pProcess.isNull()) - pProcess->close(); - - return rc; -} - -int SessionTaskUpdateAdditions::Run(void) -{ - LogFlowThisFuncEnter(); - - ComObjPtr pSession = mSession; - Assert(!pSession.isNull()); - - AutoCaller autoCaller(pSession); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - - int rc = setProgress(10); - if (RT_FAILURE(rc)) - return rc; - - HRESULT hr = S_OK; - - LogRel(("Automatic update of Guest Additions started, using \"%s\"\n", mSource.c_str())); - - /* - * Determine guest OS type and the required installer image. - * At the moment only Windows guests are supported. - */ - Utf8Str strInstallerImage; - - ComObjPtr pGuest(mSession->getParent()); - Bstr osTypeId; - if ( SUCCEEDED(pGuest->COMGETTER(OSTypeId(osTypeId.asOutParam()))) - && !osTypeId.isEmpty()) - { - Utf8Str osTypeIdUtf8(osTypeId); /* Needed for .contains(). */ - if ( osTypeIdUtf8.contains("Microsoft", Utf8Str::CaseInsensitive) - || osTypeIdUtf8.contains("Windows", Utf8Str::CaseInsensitive)) - { - if (osTypeIdUtf8.contains("64", Utf8Str::CaseInsensitive)) - strInstallerImage = "VBOXWINDOWSADDITIONS_AMD64.EXE"; - else - strInstallerImage = "VBOXWINDOWSADDITIONS_X86.EXE"; - /* Since the installers are located in the root directory, - * no further path processing needs to be done (yet). */ - } - else /* Everything else is not supported (yet). */ - { - hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Detected guest OS (%s) does not support automatic Guest Additions updating, please update manually"), - osTypeIdUtf8.c_str())); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - } - else - { - hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Could not detected guest OS type/version, please update manually"))); - rc = VERR_GENERAL_FAILURE; /* Fudge. */ - } - - RTISOFSFILE iso; - if (RT_SUCCESS(rc)) - { - Assert(!strInstallerImage.isEmpty()); - - /* - * Try to open the .ISO file and locate the specified installer. - */ - rc = RTIsoFsOpen(&iso, mSource.c_str()); - if (RT_FAILURE(rc)) - { - hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Unable to open Guest Additions .ISO file \"%s\": %Rrc"), - mSource.c_str(), rc)); - } - else - { - rc = setProgress(5); - - /** @todo Add support for non-Windows as well! */ - Utf8Str strInstallerDest = "%TEMP%\\VBoxWindowsAdditions.exe"; - bool fInstallCertificates = false; - - if (RT_SUCCESS(rc)) - { - /* - * Copy over main installer to the guest. - */ - rc = copyFileToGuest(pSession, &iso, strInstallerImage, strInstallerDest, - false /* File is not optional */, NULL /* cbSize */); - if (RT_SUCCESS(rc)) - rc = setProgress(20); - - /* - * Install needed certificates for the WHQL crap. - ** @todo Only for Windows! - */ - if (RT_SUCCESS(rc)) - { - rc = copyFileToGuest(pSession, &iso, "CERT/ORACLE_VBOX.CER", "%TEMP%\\oracle-vbox.cer", - true /* File is optional */, NULL /* cbSize */); - if (RT_SUCCESS(rc)) - { - rc = setProgress(30); - if (RT_SUCCESS(rc)) - { - rc = copyFileToGuest(pSession, &iso, "CERT/VBOXCERTUTIL.EXE", "%TEMP%\\VBoxCertUtil.exe", - true /* File is optional */, NULL /* cbSize */); - if (RT_SUCCESS(rc)) - { - fInstallCertificates = true; - rc = setProgress(40); - } - else - hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Error while copying certificate installation tool to the guest: %Rrc"), rc)); - } - } - else - hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, - Utf8StrFmt(GuestSession::tr("Error while copying certificate to the guest: %Rrc"), rc)); - } - } - - /* - * Run VBoxCertUtil.exe to install the Oracle certificate. - */ - if ( RT_SUCCESS(rc) - && fInstallCertificates) - { - LogRel(("Installing certificates on the guest ...\n")); - - GuestProcessStartupInfo procInfo; - procInfo.mName = Utf8StrFmt(GuestSession::tr("VirtualBox Guest Additions Certificate Utility")); - procInfo.mCommand = Utf8Str("%TEMP%\\VBoxCertUtil.exe"); - procInfo.mFlags = ProcessCreateFlag_Hidden; - - /* Construct arguments. */ - /** @todo Remove hardcoded paths. */ - procInfo.mArguments.push_back(Utf8Str("add-trusted-publisher")); - /* Ugly hack: Because older Guest Additions have problems with environment variable - expansion in parameters we have to check an alternative location on Windows. - So check for "%TEMP%\VBoxWindowsAdditions.exe" in a screwed up way. */ -#ifdef VBOX_SERVICE_ENVARG_BUG - GuestFsObjData objData; - rc = pSession->fileQueryInfoInternal("%TEMP%\\oracle-vbox.cer", objData); - if (RT_SUCCESS(rc)) -#endif - procInfo.mArguments.push_back(Utf8Str("%TEMP%\\oracle-vbox.cer")); -#ifdef VBOX_SERVICE_ENVARG_BUG - else - procInfo.mArguments.push_back(Utf8Str("C:\\Windows\\system32\\EMPoracle-vbox.cer")); -#endif - /* Overwrite rc in any case. */ - rc = runFile(pSession, procInfo); - } - - if (RT_SUCCESS(rc)) - rc = setProgress(60); - - if (RT_SUCCESS(rc)) - { - LogRel(("Updating Guest Additions ...\n")); - - GuestProcessStartupInfo procInfo; - procInfo.mName = Utf8StrFmt(GuestSession::tr("VirtualBox Guest Additions Setup")); - procInfo.mCommand = Utf8Str(strInstallerDest); - procInfo.mFlags = ProcessCreateFlag_Hidden; - /* If the caller does not want to wait for out guest update process to end, - * complete the progress object now so that the caller can do other work. */ - if (mFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly) - procInfo.mFlags |= ProcessCreateFlag_WaitForProcessStartOnly; - - /* Construct arguments. */ - procInfo.mArguments.push_back(Utf8Str("/S")); /* We want to install in silent mode. */ - procInfo.mArguments.push_back(Utf8Str("/l")); /* ... and logging enabled. */ - /* Don't quit VBoxService during upgrade because it still is used for this - * piece of code we're in right now (that is, here!) ... */ - procInfo.mArguments.push_back(Utf8Str("/no_vboxservice_exit")); - /* Tell the installer to report its current installation status - * using a running VBoxTray instance via balloon messages in the - * Windows taskbar. */ - procInfo.mArguments.push_back(Utf8Str("/post_installstatus")); - - rc = runFile(pSession, procInfo); - if (RT_SUCCESS(rc)) - hr = setProgressSuccess(); - } - RTIsoFsClose(&iso); - } - } - - LogFlowFuncLeaveRC(rc); - return rc; -} - -int SessionTaskUpdateAdditions::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) -{ - LogFlowThisFunc(("strDesc=%s, strSource=%s, uFlags=%x\n", - strDesc.c_str(), mSource.c_str(), mFlags)); - - mDesc = strDesc; - mProgress = pProgress; - - int rc = RTThreadCreate(NULL, SessionTaskUpdateAdditions::taskThread, this, - 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, - "gctlUpGA"); - LogFlowFuncLeaveRC(rc); - return rc; -} - -/* static */ -int SessionTaskUpdateAdditions::taskThread(RTTHREAD Thread, void *pvUser) -{ - std::auto_ptr task(static_cast(pvUser)); - AssertReturn(task.get(), VERR_GENERAL_FAILURE); - - LogFlowFunc(("pTask=%p\n", task.get())); - return task->Run(); } Index: /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 42810) +++ /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 42810) @@ -0,0 +1,1066 @@ + +/* $Id$ */ +/** @file + * VirtualBox Main - XXX. + */ + +/* + * Copyright (C) 2012 Oracle Corporation + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "GuestImpl.h" +#include "GuestSessionImpl.h" +#include "GuestCtrlImplPrivate.h" + +#include "Global.h" +#include "AutoCaller.h" +#include "ProgressImpl.h" + +#include /* For auto_ptr. */ + +#include +#include /* For CopyTo/From. */ + + +/* + * If the following define is enabled the Guest Additions update code also + * checks for locations which were not supposed to happen due to not resolving + * environment variables in VBoxService toolbox arguments. So a file copied + * to "%TEMP%\foo.exe" became "C:\Windows\EMPfoo.exe". + */ +#define VBOX_SERVICE_ENVARG_BUG + +// session task classes +///////////////////////////////////////////////////////////////////////////// + +GuestSessionTask::GuestSessionTask(GuestSession *pSession) +{ + mSession = pSession; +} + +GuestSessionTask::~GuestSessionTask(void) +{ +} + +int GuestSessionTask::setProgress(ULONG uPercent) +{ + if (mProgress.isNull()) /* Progress is optional. */ + return VINF_SUCCESS; + + BOOL fCanceled; + if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) + && fCanceled) + return VERR_CANCELLED; + BOOL fCompleted; + if ( SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) + && !fCompleted) + return VINF_SUCCESS; + HRESULT hr = mProgress->SetCurrentOperationProgress(uPercent); + if (FAILED(hr)) + return VERR_COM_UNEXPECTED; + + return VINF_SUCCESS; +} + +int GuestSessionTask::setProgressSuccess(void) +{ + if (mProgress.isNull()) /* Progress is optional. */ + return VINF_SUCCESS; + + BOOL fCanceled; + BOOL fCompleted; + if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) + && !fCanceled + && SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) + && !fCompleted) + { + HRESULT hr = mProgress->notifyComplete(S_OK); + if (FAILED(hr)) + return VERR_COM_UNEXPECTED; /** @todo Find a better rc. */ + } + + return VINF_SUCCESS; +} + +HRESULT GuestSessionTask::setProgressErrorMsg(HRESULT hr, const Utf8Str &strMsg) +{ + if (mProgress.isNull()) /* Progress is optional. */ + return hr; /* Return original rc. */ + + BOOL fCanceled; + BOOL fCompleted; + if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) + && !fCanceled + && SUCCEEDED(mProgress->COMGETTER(Completed(&fCompleted))) + && !fCompleted) + { + HRESULT hr2 = mProgress->notifyComplete(hr, + COM_IIDOF(IGuestSession), + GuestSession::getStaticComponentName(), + strMsg.c_str()); + if (FAILED(hr2)) + return hr2; + } + return hr; /* Return original rc. */ +} + +SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession, + const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags) + : mSource(strSource), + mDest(strDest), + mSourceFile(NULL), + mSourceOffset(0), + mSourceSize(0), + GuestSessionTask(pSession) +{ + mCopyFileFlags = uFlags; +} + +/** @todo Merge this and the above call and let the above call do the open/close file handling so that the + * inner code only has to deal with file handles. No time now ... */ +SessionTaskCopyTo::SessionTaskCopyTo(GuestSession *pSession, + PRTFILE pSourceFile, size_t cbSourceOffset, uint64_t cbSourceSize, + const Utf8Str &strDest, uint32_t uFlags) + : GuestSessionTask(pSession) +{ + mSourceFile = pSourceFile; + mSourceOffset = cbSourceOffset; + mSourceSize = cbSourceSize; + mDest = strDest; + mCopyFileFlags = uFlags; +} + +SessionTaskCopyTo::~SessionTaskCopyTo(void) +{ + +} + +int SessionTaskCopyTo::Run(void) +{ + LogFlowThisFuncEnter(); + + ComObjPtr pSession = mSession; + Assert(!pSession.isNull()); + + AutoCaller autoCaller(pSession); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + if (mCopyFileFlags) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Copy flags (%#x) not implemented yet"), + mCopyFileFlags)); + return VERR_INVALID_PARAMETER; + } + + int rc; + + RTFILE fileLocal; + PRTFILE pFile = &fileLocal; + + if (!mSourceFile) + { + /* Does our source file exist? */ + if (!RTFileExists(mSource.c_str())) + { + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Source file \"%s\" does not exist or is not a file"), + mSource.c_str())); + } + else + { + rc = RTFileOpen(pFile, mSource.c_str(), + RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE); + if (RT_FAILURE(rc)) + { + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Could not open source file \"%s\" for reading: %Rrc"), + mSource.c_str(), rc)); + } + else + { + rc = RTFileGetSize(*pFile, &mSourceSize); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Could not query file size of \"%s\": %Rrc"), + mSource.c_str(), rc)); + } + } + } + } + else + { + pFile = mSourceFile; + /* Size + offset are optional. */ + } + + GuestProcessStartupInfo procInfo; + procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" to the guest to \"%s\" (%RU64 bytes)"), + mSource.c_str(), mDest.c_str(), mSourceSize); + procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT); + procInfo.mFlags = ProcessCreateFlag_Hidden; + + /* Set arguments.*/ + procInfo.mArguments.push_back(Utf8StrFmt("--output=%s", mDest.c_str())); /** @todo Do we need path conversion? */ + + /* Startup process. */ + ComObjPtr pProcess; + rc = pSession->processCreateExInteral(procInfo, pProcess); + if (RT_SUCCESS(rc)) + rc = pProcess->startProcess(); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Unable to start guest process: %Rrc"), rc)); + } + else + { + GuestProcessWaitResult waitRes; + BYTE byBuf[_64K]; + + BOOL fCanceled = FALSE; + uint64_t cbWrittenTotal = 0; + uint64_t cbToRead = mSourceSize; + + for (;;) + { + rc = pProcess->waitFor(ProcessWaitForFlag_StdIn, + 30 * 1000 /* Timeout */, waitRes); + if ( RT_FAILURE(rc) + || ( waitRes.mResult != ProcessWaitResult_StdIn + && waitRes.mResult != ProcessWaitResult_WaitFlagNotSupported)) + { + break; + } + + /* If the guest does not support waiting for stdin, we now yield in + * order to reduce the CPU load due to busy waiting. */ + if (waitRes.mResult == ProcessWaitResult_WaitFlagNotSupported) + RTThreadYield(); /* Optional, don't check rc. */ + + size_t cbRead = 0; + if (mSourceSize) /* If we have nothing to write, take a shortcut. */ + { + /** @todo Not very efficient, but works for now. */ + rc = RTFileSeek(*pFile, mSourceOffset + cbWrittenTotal, + RTFILE_SEEK_BEGIN, NULL /* poffActual */); + if (RT_SUCCESS(rc)) + { + rc = RTFileRead(*pFile, (uint8_t*)byBuf, + RT_MIN(cbToRead, sizeof(byBuf)), &cbRead); + /* + * Some other error occured? There might be a chance that RTFileRead + * could not resolve/map the native error code to an IPRT code, so just + * print a generic error. + */ + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Could not read from file \"%s\" (%Rrc)"), + mSource.c_str(), rc)); + break; + } + } + else + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Seeking file \"%s\" offset %RU64 failed: %Rrc"), + mSource.c_str(), cbWrittenTotal, rc)); + break; + } + } + + uint32_t fFlags = ProcessInputFlag_None; + + /* Did we reach the end of the content we want to transfer (last chunk)? */ + if ( (cbRead < sizeof(byBuf)) + /* Did we reach the last block which is exactly _64K? */ + || (cbToRead - cbRead == 0) + /* ... or does the user want to cancel? */ + || ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) + && fCanceled) + ) + { + fFlags |= ProcessInputFlag_EndOfFile; + } + + uint32_t cbWritten; + Assert(sizeof(byBuf) >= cbRead); + rc = pProcess->writeData(0 /* StdIn */, fFlags, + byBuf, cbRead, + 30 * 1000 /* Timeout */, &cbWritten); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Writing to file \"%s\" (offset %RU64) failed: %Rrc"), + mDest.c_str(), cbWrittenTotal, rc)); + break; + } + + LogFlowThisFunc(("cbWritten=%RU32, cbToRead=%RU64, cbWrittenTotal=%RU64, cbFileSize=%RU64\n", + cbWritten, cbToRead - cbWritten, cbWrittenTotal + cbWritten, mSourceSize)); + + /* Only subtract bytes reported written by the guest. */ + Assert(cbToRead >= cbWritten); + cbToRead -= cbWritten; + + /* Update total bytes written to the guest. */ + cbWrittenTotal += cbWritten; + Assert(cbWrittenTotal <= mSourceSize); + + /* Did the user cancel the operation above? */ + if (fCanceled) + break; + + /* Update the progress. + * Watch out for division by zero. */ + mSourceSize > 0 + ? rc = setProgress((ULONG)(cbWrittenTotal * 100 / mSourceSize)) + : rc = setProgress(100); + if (RT_FAILURE(rc)) + break; + + /* End of file reached? */ + if (!cbToRead) + break; + } /* for */ + + if ( !fCanceled + || RT_SUCCESS(rc)) + { + /* + * Even if we succeeded until here make sure to check whether we really transfered + * everything. + */ + if ( mSourceSize > 0 + && cbWrittenTotal == 0) + { + /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write + * to the destination -> access denied. */ + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""), + mSource.c_str(), mDest.c_str())); + } + else if (cbWrittenTotal < mSourceSize) + { + /* If we did not copy all let the user know. */ + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RU64 bytes transfered)"), + mSource.c_str(), cbWrittenTotal, mSourceSize)); + } + else + { + rc = pProcess->waitFor(ProcessWaitForFlag_Terminate, + 30 * 1000 /* Timeout */, waitRes); + if ( RT_FAILURE(rc) + || waitRes.mResult != ProcessWaitResult_Terminate) + { + if (RT_FAILURE(rc)) + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed: %Rrc"), + mSource.c_str(), rc)); + else + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed with wait result %ld"), + mSource.c_str(), waitRes.mResult)); + } + + if (RT_SUCCESS(rc)) + { + ProcessStatus_T procStatus; + LONG exitCode; + if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) + && procStatus != ProcessStatus_TerminatedNormally) + || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) + && exitCode != 0) + ) + { + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %ld"), + mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */ + } + } + + if (RT_SUCCESS(rc)) + rc = setProgressSuccess(); + } + } + + pProcess->close(); + } /* processCreateExInteral */ + + if (!mSourceFile) /* Only close locally opened files. */ + RTFileClose(*pFile); + + LogFlowFuncLeaveRC(rc); + return rc; +} + +int SessionTaskCopyTo::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) +{ + LogFlowThisFunc(("strDesc=%s, strSource=%s, strDest=%s, mCopyFileFlags=%x\n", + strDesc.c_str(), mSource.c_str(), mDest.c_str(), mCopyFileFlags)); + + mDesc = strDesc; + mProgress = pProgress; + + int rc = RTThreadCreate(NULL, SessionTaskCopyTo::taskThread, this, + 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, + "gctlCpyTo"); + LogFlowFuncLeaveRC(rc); + return rc; +} + +/* static */ +int SessionTaskCopyTo::taskThread(RTTHREAD Thread, void *pvUser) +{ + std::auto_ptr task(static_cast(pvUser)); + AssertReturn(task.get(), VERR_GENERAL_FAILURE); + + LogFlowFunc(("pTask=%p\n", task.get())); + return task->Run(); +} + +SessionTaskCopyFrom::SessionTaskCopyFrom(GuestSession *pSession, + const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags) + : GuestSessionTask(pSession) +{ + mSource = strSource; + mDest = strDest; + mFlags = uFlags; +} + +SessionTaskCopyFrom::~SessionTaskCopyFrom(void) +{ + +} + +int SessionTaskCopyFrom::Run(void) +{ + LogFlowThisFuncEnter(); + + ComObjPtr pSession = mSession; + Assert(!pSession.isNull()); + + AutoCaller autoCaller(pSession); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + /* + * Note: There will be races between querying file size + reading the guest file's + * content because we currently *do not* lock down the guest file when doing the + * actual operations. + ** @todo Implement guest file locking! + */ + GuestFsObjData objData; + int rc = pSession->fileQueryInfoInternal(Utf8Str(mSource), objData); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Querying guest file information for \"%s\" failed: %Rrc"), + mSource.c_str(), rc)); + } + else if (objData.mType != FsObjType_File) /* Only single files are supported at the moment. */ + { + rc = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Object \"%s\" on the guest is not a file"), mSource.c_str())); + } + + if (RT_SUCCESS(rc)) + { + RTFILE fileDest; + rc = RTFileOpen(&fileDest, mDest.c_str(), + RTFILE_O_WRITE | RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE); /** @todo Use the correct open modes! */ + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Error opening destination file \"%s\": %Rrc"), + mDest.c_str(), rc)); + } + else + { + GuestProcessStartupInfo procInfo; + procInfo.mName = Utf8StrFmt(GuestSession::tr("Copying file \"%s\" from guest to the host to \"%s\" (%RI64 bytes)"), + mSource.c_str(), mDest.c_str(), objData.mObjectSize); + procInfo.mCommand = Utf8Str(VBOXSERVICE_TOOL_CAT); + procInfo.mFlags = ProcessCreateFlag_Hidden | ProcessCreateFlag_WaitForStdOut; + + /* Set arguments.*/ + procInfo.mArguments.push_back(mSource); /* Which file to output? */ + + /* Startup process. */ + ComObjPtr pProcess; + rc = pSession->processCreateExInteral(procInfo, pProcess); + if (RT_SUCCESS(rc)) + rc = pProcess->startProcess(); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Unable to start guest process for copying data from guest to host: %Rrc"), rc)); + } + else + { + GuestProcessWaitResult waitRes; + BYTE byBuf[_64K]; + + BOOL fCanceled = FALSE; + uint64_t cbWrittenTotal = 0; + uint64_t cbToRead = objData.mObjectSize; + + for (;;) + { + rc = pProcess->waitFor(ProcessWaitForFlag_StdOut, + 30 * 1000 /* Timeout */, waitRes); + if ( waitRes.mResult == ProcessWaitResult_StdOut + || waitRes.mResult == ProcessWaitResult_WaitFlagNotSupported) + { + /* If the guest does not support waiting for stdin, we now yield in + * order to reduce the CPU load due to busy waiting. */ + if (waitRes.mResult == ProcessWaitResult_WaitFlagNotSupported) + RTThreadYield(); /* Optional, don't check rc. */ + + size_t cbRead; + rc = pProcess->readData(OUTPUT_HANDLE_ID_STDOUT, sizeof(byBuf), + 30 * 1000 /* Timeout */, byBuf, sizeof(byBuf), + &cbRead); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Reading from file \"%s\" (offset %RU64) failed: %Rrc"), + mSource.c_str(), cbWrittenTotal, rc)); + break; + } + + if (cbRead) + { + rc = RTFileWrite(fileDest, byBuf, cbRead, NULL /* No partial writes */); + if (RT_FAILURE(rc)) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Error writing to file \"%s\" (%RU64 bytes left): %Rrc"), + mDest.c_str(), cbToRead, rc)); + break; + } + + /* Only subtract bytes reported written by the guest. */ + Assert(cbToRead >= cbRead); + cbToRead -= cbRead; + + /* Update total bytes written to the guest. */ + cbWrittenTotal += cbRead; + Assert(cbWrittenTotal <= (uint64_t)objData.mObjectSize); + + /* Did the user cancel the operation above? */ + if ( SUCCEEDED(mProgress->COMGETTER(Canceled(&fCanceled))) + && fCanceled) + break; + + rc = setProgress((ULONG)(cbWrittenTotal / ((uint64_t)objData.mObjectSize / 100.0))); + if (RT_FAILURE(rc)) + break; + } + } + else if ( RT_FAILURE(rc) + || waitRes.mResult == ProcessWaitResult_Terminate + || waitRes.mResult == ProcessWaitResult_Error + || waitRes.mResult == ProcessWaitResult_Timeout) + { + if (RT_FAILURE(waitRes.mRC)) + rc = waitRes.mRC; + break; + } + } /* for */ + + LogFlowThisFunc(("rc=%Rrc, cbWrittenTotal=%RU64, cbSize=%RI64, cbToRead=%RU64\n", + rc, cbWrittenTotal, objData.mObjectSize, cbToRead)); + + if ( !fCanceled + || RT_SUCCESS(rc)) + { + /* + * Even if we succeeded until here make sure to check whether we really transfered + * everything. + */ + if ( objData.mObjectSize > 0 + && cbWrittenTotal == 0) + { + /* If nothing was transfered but the file size was > 0 then "vbox_cat" wasn't able to write + * to the destination -> access denied. */ + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Access denied when copying file \"%s\" to \"%s\""), + mSource.c_str(), mDest.c_str())); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + else if (cbWrittenTotal < (uint64_t)objData.mObjectSize) + { + /* If we did not copy all let the user know. */ + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RI64 bytes transfered)"), + mSource.c_str(), cbWrittenTotal, objData.mObjectSize)); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + else + { + ProcessStatus_T procStatus; + LONG exitCode; + if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) + && procStatus != ProcessStatus_TerminatedNormally) + || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) + && exitCode != 0) + ) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %d"), + mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */ + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + else /* Yay, success! */ + rc = setProgressSuccess(); + } + } + + pProcess->close(); + } + + RTFileClose(fileDest); + } + } + + LogFlowFuncLeaveRC(rc); + return rc; +} + +int SessionTaskCopyFrom::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) +{ + LogFlowThisFunc(("strDesc=%s, strSource=%s, strDest=%s, uFlags=%x\n", + strDesc.c_str(), mSource.c_str(), mDest.c_str(), mFlags)); + + mDesc = strDesc; + mProgress = pProgress; + + int rc = RTThreadCreate(NULL, SessionTaskCopyFrom::taskThread, this, + 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, + "gctlCpyFrom"); + LogFlowFuncLeaveRC(rc); + return rc; +} + +/* static */ +int SessionTaskCopyFrom::taskThread(RTTHREAD Thread, void *pvUser) +{ + std::auto_ptr task(static_cast(pvUser)); + AssertReturn(task.get(), VERR_GENERAL_FAILURE); + + LogFlowFunc(("pTask=%p\n", task.get())); + return task->Run(); +} + +SessionTaskUpdateAdditions::SessionTaskUpdateAdditions(GuestSession *pSession, + const Utf8Str &strSource, uint32_t uFlags) + : GuestSessionTask(pSession) +{ + mSource = strSource; + mFlags = uFlags; +} + +SessionTaskUpdateAdditions::~SessionTaskUpdateAdditions(void) +{ + +} + +int SessionTaskUpdateAdditions::copyFileToGuest(GuestSession *pSession, PRTISOFSFILE pISO, + Utf8Str const &strFileSource, const Utf8Str &strFileDest, + bool fOptional, uint32_t *pcbSize) +{ + AssertPtrReturn(pSession, VERR_INVALID_POINTER); + AssertPtrReturn(pISO, VERR_INVALID_POINTER); + /* pcbSize is optional. */ + + uint32_t cbOffset; + size_t cbSize; + + int rc = RTIsoFsGetFileInfo(pISO, strFileSource.c_str(), &cbOffset, &cbSize); + if (RT_FAILURE(rc)) + { + if (fOptional) + return VINF_SUCCESS; + + return rc; + } + + Assert(cbOffset); + Assert(cbSize); + rc = RTFileSeek(pISO->file, cbOffset, RTFILE_SEEK_BEGIN, NULL); + + /* Copy over the Guest Additions file to the guest. */ + if (RT_SUCCESS(rc)) + { + LogRel(("Copying Guest Additions installer file \"%s\" to \"%s\" on guest ...\n", + strFileSource.c_str(), strFileDest.c_str())); + + if (RT_SUCCESS(rc)) + { + SessionTaskCopyTo *pTask = new SessionTaskCopyTo(pSession /* GuestSession */, + &pISO->file, cbOffset, cbSize, + strFileDest, CopyFileFlag_None); + AssertPtrReturn(pTask, VERR_NO_MEMORY); + + ComObjPtr pProgressCopyTo; + rc = pSession->startTaskAsync(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer file \"%s\" to \"%s\" on guest"), + mSource.c_str(), strFileDest.c_str()), + pTask, pProgressCopyTo); + if (RT_SUCCESS(rc)) + { + BOOL fCanceled = FALSE; + HRESULT hr = pProgressCopyTo->WaitForCompletion(-1); + if ( SUCCEEDED(pProgressCopyTo->COMGETTER(Canceled)(&fCanceled)) + && fCanceled) + { + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + else if (FAILED(hr)) + { + Assert(FAILED(hr)); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + } + } + } + + /** @todo Note: Since there is no file locking involved at the moment, there can be modifications + * between finished copying, the verification and the actual execution. */ + + /* Determine where the installer image ended up and if it has the correct size. */ + if (RT_SUCCESS(rc)) + { + LogRel(("Verifying Guest Additions installer file \"%s\" ...\n", strFileDest.c_str())); + + GuestFsObjData objData; + int64_t cbSizeOnGuest; + rc = pSession->fileQuerySizeInternal(strFileDest, &cbSizeOnGuest); +#ifdef VBOX_SERVICE_ENVARG_BUG + if (RT_FAILURE(rc)) + { + /* Ugly hack: Because older Guest Additions have problems with environment variable + expansion in parameters we have to check an alternative location on Windows. + So check for "%TEMP%\" being "C:\\Windows\\system32\\EMP" actually. */ + if (strFileDest.startsWith("%TEMP%\\", RTCString::CaseSensitive)) + { + Utf8Str strFileDestBug = "C:\\Windows\\system32\\EMP" + strFileDest.substr(sizeof("%TEMP%\\") - sizeof(char)); + rc = pSession->fileQuerySizeInternal(strFileDestBug, &cbSizeOnGuest); + } + } +#endif + if ( RT_SUCCESS(rc) + && cbSize == (uint64_t)cbSizeOnGuest) + { + LogRel(("Guest Additions installer file \"%s\" successfully verified\n", + strFileDest.c_str())); + } + else + { + if (RT_SUCCESS(rc)) /* Size does not match. */ + rc = VERR_BROKEN_PIPE; /** @todo FInd a better error. */ + } + + if (RT_SUCCESS(rc)) + { + if (pcbSize) + *pcbSize = cbSizeOnGuest; + } + } + + return rc; +} + +int SessionTaskUpdateAdditions::runFile(GuestSession *pSession, GuestProcessStartupInfo &procInfo) +{ + AssertPtrReturn(pSession, VERR_INVALID_POINTER); + +#ifdef VBOX_SERVICE_ENVARG_BUG + GuestFsObjData objData; + int rc = pSession->fileQueryInfoInternal(procInfo.mCommand, objData); + if (RT_FAILURE(rc)) + procInfo.mCommand = "C:\\Windows\\system32\\EMP" + procInfo.mCommand.substr(sizeof("%TEMP%\\") - sizeof(char)); +#endif + + ComObjPtr pProcess; + rc = pSession->processCreateExInteral(procInfo, pProcess); + if (RT_SUCCESS(rc)) + rc = pProcess->startProcess(); + + if (RT_SUCCESS(rc)) + { + LogRel(("Running %s ...\n", procInfo.mName.c_str())); + + GuestProcessWaitResult waitRes; + rc = pProcess->waitFor(ProcessWaitForFlag_Terminate, + 10 * 60 * 1000 /* 10 mins Timeout */, waitRes); + if (waitRes.mResult == ProcessWaitResult_Terminate) + { + ProcessStatus_T procStatus; + LONG exitCode; + if ( ( SUCCEEDED(pProcess->COMGETTER(Status(&procStatus))) + && procStatus != ProcessStatus_TerminatedNormally) + || ( SUCCEEDED(pProcess->COMGETTER(ExitCode(&exitCode))) + && exitCode != 0) + ) + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Running %s failed with status %ld, exit code %ld"), + procInfo.mName.c_str(), procStatus, exitCode)); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + else /* Yay, success! */ + { + LogRel(("%s successfully completed\n", procInfo.mName.c_str())); + } + } + else + { + if (RT_FAILURE(rc)) + setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Error while waiting running %s: %Rrc"), + procInfo.mName.c_str(), rc)); + else + { + setProgressErrorMsg(VBOX_E_IPRT_ERROR, pProcess->errorMsg()); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + } + } + + if (!pProcess.isNull()) + pProcess->close(); + + return rc; +} + +int SessionTaskUpdateAdditions::Run(void) +{ + LogFlowThisFuncEnter(); + + ComObjPtr pSession = mSession; + Assert(!pSession.isNull()); + + AutoCaller autoCaller(pSession); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + int rc = setProgress(10); + if (RT_FAILURE(rc)) + return rc; + + HRESULT hr = S_OK; + + LogRel(("Automatic update of Guest Additions started, using \"%s\"\n", mSource.c_str())); + + /* + * Determine guest OS type and the required installer image. + * At the moment only Windows guests are supported. + */ + Utf8Str strInstallerImage; + + ComObjPtr pGuest(mSession->getParent()); + Bstr osTypeId; + if ( SUCCEEDED(pGuest->COMGETTER(OSTypeId(osTypeId.asOutParam()))) + && !osTypeId.isEmpty()) + { + Utf8Str osTypeIdUtf8(osTypeId); /* Needed for .contains(). */ + if ( osTypeIdUtf8.contains("Microsoft", Utf8Str::CaseInsensitive) + || osTypeIdUtf8.contains("Windows", Utf8Str::CaseInsensitive)) + { + if (osTypeIdUtf8.contains("64", Utf8Str::CaseInsensitive)) + strInstallerImage = "VBOXWINDOWSADDITIONS_AMD64.EXE"; + else + strInstallerImage = "VBOXWINDOWSADDITIONS_X86.EXE"; + /* Since the installers are located in the root directory, + * no further path processing needs to be done (yet). */ + } + else /* Everything else is not supported (yet). */ + { + hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Detected guest OS (%s) does not support automatic Guest Additions updating, please update manually"), + osTypeIdUtf8.c_str())); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + } + else + { + hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Could not detected guest OS type/version, please update manually"))); + rc = VERR_GENERAL_FAILURE; /* Fudge. */ + } + + RTISOFSFILE iso; + if (RT_SUCCESS(rc)) + { + Assert(!strInstallerImage.isEmpty()); + + /* + * Try to open the .ISO file and locate the specified installer. + */ + rc = RTIsoFsOpen(&iso, mSource.c_str()); + if (RT_FAILURE(rc)) + { + hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Unable to open Guest Additions .ISO file \"%s\": %Rrc"), + mSource.c_str(), rc)); + } + else + { + rc = setProgress(5); + + /** @todo Add support for non-Windows as well! */ + Utf8Str strInstallerDest = "%TEMP%\\VBoxWindowsAdditions.exe"; + bool fInstallCertificates = false; + + if (RT_SUCCESS(rc)) + { + /* + * Copy over main installer to the guest. + */ + rc = copyFileToGuest(pSession, &iso, strInstallerImage, strInstallerDest, + false /* File is not optional */, NULL /* cbSize */); + if (RT_SUCCESS(rc)) + rc = setProgress(20); + + /* + * Install needed certificates for the WHQL crap. + ** @todo Only for Windows! + */ + if (RT_SUCCESS(rc)) + { + rc = copyFileToGuest(pSession, &iso, "CERT/ORACLE_VBOX.CER", "%TEMP%\\oracle-vbox.cer", + true /* File is optional */, NULL /* cbSize */); + if (RT_SUCCESS(rc)) + { + rc = setProgress(30); + if (RT_SUCCESS(rc)) + { + rc = copyFileToGuest(pSession, &iso, "CERT/VBOXCERTUTIL.EXE", "%TEMP%\\VBoxCertUtil.exe", + true /* File is optional */, NULL /* cbSize */); + if (RT_SUCCESS(rc)) + { + fInstallCertificates = true; + rc = setProgress(40); + } + else + hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Error while copying certificate installation tool to the guest: %Rrc"), rc)); + } + } + else + hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, + Utf8StrFmt(GuestSession::tr("Error while copying certificate to the guest: %Rrc"), rc)); + } + } + + /* + * Run VBoxCertUtil.exe to install the Oracle certificate. + */ + if ( RT_SUCCESS(rc) + && fInstallCertificates) + { + LogRel(("Installing certificates on the guest ...\n")); + + GuestProcessStartupInfo procInfo; + procInfo.mName = Utf8StrFmt(GuestSession::tr("VirtualBox Guest Additions Certificate Utility")); + procInfo.mCommand = Utf8Str("%TEMP%\\VBoxCertUtil.exe"); + procInfo.mFlags = ProcessCreateFlag_Hidden; + + /* Construct arguments. */ + /** @todo Remove hardcoded paths. */ + procInfo.mArguments.push_back(Utf8Str("add-trusted-publisher")); + /* Ugly hack: Because older Guest Additions have problems with environment variable + expansion in parameters we have to check an alternative location on Windows. + So check for "%TEMP%\VBoxWindowsAdditions.exe" in a screwed up way. */ +#ifdef VBOX_SERVICE_ENVARG_BUG + GuestFsObjData objData; + rc = pSession->fileQueryInfoInternal("%TEMP%\\oracle-vbox.cer", objData); + if (RT_SUCCESS(rc)) +#endif + procInfo.mArguments.push_back(Utf8Str("%TEMP%\\oracle-vbox.cer")); +#ifdef VBOX_SERVICE_ENVARG_BUG + else + procInfo.mArguments.push_back(Utf8Str("C:\\Windows\\system32\\EMPoracle-vbox.cer")); +#endif + /* Overwrite rc in any case. */ + rc = runFile(pSession, procInfo); + } + + if (RT_SUCCESS(rc)) + rc = setProgress(60); + + if (RT_SUCCESS(rc)) + { + LogRel(("Updating Guest Additions ...\n")); + + GuestProcessStartupInfo procInfo; + procInfo.mName = Utf8StrFmt(GuestSession::tr("VirtualBox Guest Additions Setup")); + procInfo.mCommand = Utf8Str(strInstallerDest); + procInfo.mFlags = ProcessCreateFlag_Hidden; + /* If the caller does not want to wait for out guest update process to end, + * complete the progress object now so that the caller can do other work. */ + if (mFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly) + procInfo.mFlags |= ProcessCreateFlag_WaitForProcessStartOnly; + + /* Construct arguments. */ + procInfo.mArguments.push_back(Utf8Str("/S")); /* We want to install in silent mode. */ + procInfo.mArguments.push_back(Utf8Str("/l")); /* ... and logging enabled. */ + /* Don't quit VBoxService during upgrade because it still is used for this + * piece of code we're in right now (that is, here!) ... */ + procInfo.mArguments.push_back(Utf8Str("/no_vboxservice_exit")); + /* Tell the installer to report its current installation status + * using a running VBoxTray instance via balloon messages in the + * Windows taskbar. */ + procInfo.mArguments.push_back(Utf8Str("/post_installstatus")); + + rc = runFile(pSession, procInfo); + if (RT_SUCCESS(rc)) + hr = setProgressSuccess(); + } + RTIsoFsClose(&iso); + } + } + + LogFlowFuncLeaveRC(rc); + return rc; +} + +int SessionTaskUpdateAdditions::RunAsync(const Utf8Str &strDesc, ComObjPtr &pProgress) +{ + LogFlowThisFunc(("strDesc=%s, strSource=%s, uFlags=%x\n", + strDesc.c_str(), mSource.c_str(), mFlags)); + + mDesc = strDesc; + mProgress = pProgress; + + int rc = RTThreadCreate(NULL, SessionTaskUpdateAdditions::taskThread, this, + 0, RTTHREADTYPE_MAIN_HEAVY_WORKER, 0, + "gctlUpGA"); + LogFlowFuncLeaveRC(rc); + return rc; +} + +/* static */ +int SessionTaskUpdateAdditions::taskThread(RTTHREAD Thread, void *pvUser) +{ + std::auto_ptr task(static_cast(pvUser)); + AssertReturn(task.get(), VERR_GENERAL_FAILURE); + + LogFlowFunc(("pTask=%p\n", task.get())); + return task->Run(); +} +