Index: /trunk/src/VBox/Main/Makefile.kmk =================================================================== --- /trunk/src/VBox/Main/Makefile.kmk (revision 50873) +++ /trunk/src/VBox/Main/Makefile.kmk (revision 50874) @@ -729,5 +729,5 @@ VBoxC_SOURCES += \ src-client/AudioSnifferInterface.cpp -endif +endif VBoxC_SOURCES.win = \ src-client/win/dllmain.cpp \ @@ -841,5 +841,6 @@ LIBRARIES += VBoxCOM VBoxCOM_TEMPLATE = VBoxMainLib -VBoxCOM_INTERMEDIATES = $(VBOX_MAIN_PREREQS) +VBoxCOM_INTERMEDIATES = $(VBOX_MAIN_PREREQS) \ + $(VBOX_MAIN_APIWRAPPER_GEN_HDRS) VBoxCOM_SOURCES = \ glue/com.cpp \ @@ -851,5 +852,5 @@ glue/ErrorInfo.cpp \ glue/errorprint.cpp -VBoxCOM_INCS += \ +VBoxCOM_INCS += $(VBOX_MAIN_APIWRAPPER_INCS) \ include ifeq ($(KBUILD_TARGET),win) Index: /trunk/src/VBox/Main/include/GuestFileImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestFileImpl.h (revision 50873) +++ /trunk/src/VBox/Main/include/GuestFileImpl.h (revision 50874) @@ -62,5 +62,6 @@ int i_openFile(uint32_t uTimeoutMS, int *pGuestRc); int i_readData(uint32_t uSize, uint32_t uTimeoutMS, void* pvData, uint32_t cbData, uint32_t* pcbRead); - int i_readDataAt(uint64_t uOffset, uint32_t uSize, uint32_t uTimeoutMS, void* pvData, size_t cbData, size_t* pcbRead); + int i_readDataAt(uint64_t uOffset, uint32_t uSize, uint32_t uTimeoutMS, + void* pvData, size_t cbData, size_t* pcbRead); int i_seekAt(int64_t iOffset, GUEST_FILE_SEEKTYPE eSeekType, uint32_t uTimeoutMS, uint64_t *puOffset); static HRESULT i_setErrorExternal(VirtualBoxBase *pInterface, int guestRc); Index: /trunk/src/VBox/Main/include/GuestProcessImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestProcessImpl.h (revision 50873) +++ /trunk/src/VBox/Main/include/GuestProcessImpl.h (revision 50874) @@ -52,17 +52,25 @@ static Utf8Str i_guestErrorToString(int guestRc); int i_onRemove(void); - int i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, size_t cbData, uint32_t *pcbRead, int *pGuestRc); + int i_readData(uint32_t uHandle, uint32_t uSize, uint32_t uTimeoutMS, void *pvData, + size_t cbData, uint32_t *pcbRead, int *pGuestRc); static HRESULT i_setErrorExternal(VirtualBoxBase *pInterface, int guestRc); int i_startProcess(uint32_t uTimeoutMS, int *pGuestRc); int i_startProcessAsync(void); int i_terminateProcess(uint32_t uTimeoutMS, int *pGuestRc); - static ProcessWaitResult_T i_waitFlagsToResultEx(uint32_t fWaitFlags, ProcessStatus_T oldStatus, ProcessStatus_T newStatus, uint32_t uProcFlags, uint32_t uProtocol); + static ProcessWaitResult_T i_waitFlagsToResultEx(uint32_t fWaitFlags, ProcessStatus_T oldStatus, + ProcessStatus_T newStatus, uint32_t uProcFlags, + uint32_t uProtocol); ProcessWaitResult_T i_waitFlagsToResult(uint32_t fWaitFlags); int i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, ProcessWaitResult_T &waitResult, int *pGuestRc); - int i_waitForInputNotify(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, ProcessInputStatus_T *pInputStatus, uint32_t *pcbProcessed); - int i_waitForOutput(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, void* pvData, size_t cbData, uint32_t *pcbRead); - int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, ProcessStatus_T *pProcessStatus, int *pGuestRc); - static bool i_waitResultImpliesEx(ProcessWaitResult_T waitResult, ProcessStatus_T procStatus, uint32_t uProcFlags, uint32_t uProtocol); - int i_writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc); + int i_waitForInputNotify(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, + ProcessInputStatus_T *pInputStatus, uint32_t *pcbProcessed); + int i_waitForOutput(GuestWaitEvent *pEvent, uint32_t uHandle, uint32_t uTimeoutMS, + void* pvData, size_t cbData, uint32_t *pcbRead); + int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t uTimeoutMS, + ProcessStatus_T *pProcessStatus, int *pGuestRc); + static bool i_waitResultImpliesEx(ProcessWaitResult_T waitResult, ProcessStatus_T procStatus, + uint32_t uProcFlags, uint32_t uProtocol); + int i_writeData(uint32_t uHandle, uint32_t uFlags, void *pvData, size_t cbData, + uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc); /** @} */ @@ -182,6 +190,6 @@ static int i_run(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, int *pGuestRc); - static int i_runEx(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, GuestCtrlStreamObjects *pStrmOutObjects, - uint32_t cStrmOutObjects, int *pGuestRc); + static int i_runEx(GuestSession *pGuestSession, const GuestProcessStartupInfo &startupInfo, + GuestCtrlStreamObjects *pStrmOutObjects, uint32_t cStrmOutObjects, int *pGuestRc); int i_terminatedOk(LONG *pExitCode); Index: /trunk/src/VBox/Main/include/GuestSessionImpl.h =================================================================== --- /trunk/src/VBox/Main/include/GuestSessionImpl.h (revision 50873) +++ /trunk/src/VBox/Main/include/GuestSessionImpl.h (revision 50874) @@ -395,6 +395,8 @@ int i_directoryRemoveInternal(const Utf8Str &strPath, uint32_t uFlags, int *pGuestRc); int i_directoryCreateInternal(const Utf8Str &strPath, uint32_t uMode, uint32_t uFlags, int *pGuestRc); - int i_objectCreateTempInternal(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, Utf8Str &strName, int *pGuestRc); - int i_directoryOpenInternal(const GuestDirectoryOpenInfo &openInfo, ComObjPtr &pDirectory, int *pGuestRc); + int i_objectCreateTempInternal(const Utf8Str &strTemplate, const Utf8Str &strPath, bool fDirectory, + Utf8Str &strName, int *pGuestRc); + int i_directoryOpenInternal(const GuestDirectoryOpenInfo &openInfo, + ComObjPtr &pDirectory, int *pGuestRc); int i_directoryQueryInfoInternal(const Utf8Str &strPath, GuestFsObjData &objData, int *pGuestRc); int i_dispatchToDirectory(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb); @@ -425,5 +427,6 @@ Guest *i_getParent(void) { return mParent; } uint32_t i_getProtocolVersion(void) { return mData.mProtocolVersion; } - int i_pathRenameInternal(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, int *pGuestRc); + int i_pathRenameInternal(const Utf8Str &strSource, const Utf8Str &strDest, uint32_t uFlags, + int *pGuestRc); int i_processRemoveFromList(GuestProcess *pProcess); int i_processCreateExInteral(GuestProcessStartupInfo &procInfo, ComObjPtr &pProgress); @@ -434,8 +437,10 @@ int i_setSessionStatus(GuestSessionStatus_T sessionStatus, int sessionRc); int i_signalWaiters(GuestSessionWaitResult_T enmWaitResult, int rc /*= VINF_SUCCESS */); - int i_startTaskAsync(const Utf8Str &strTaskDesc, GuestSessionTask *pTask, ComObjPtr &pProgress); + int i_startTaskAsync(const Utf8Str &strTaskDesc, GuestSessionTask *pTask, + ComObjPtr &pProgress); int i_queryInfo(void); int i_waitFor(uint32_t fWaitFlags, ULONG uTimeoutMS, GuestSessionWaitResult_T &waitResult, int *pGuestRc); - int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t fWaitFlags, uint32_t uTimeoutMS, GuestSessionStatus_T *pSessionStatus, int *pGuestRc); + int i_waitForStatusChange(GuestWaitEvent *pEvent, uint32_t fWaitFlags, uint32_t uTimeoutMS, + GuestSessionStatus_T *pSessionStatus, int *pGuestRc); /** @} */ Index: /trunk/src/VBox/Main/include/ProgressImpl.h =================================================================== --- /trunk/src/VBox/Main/include/ProgressImpl.h (revision 50873) +++ /trunk/src/VBox/Main/include/ProgressImpl.h (revision 50874) @@ -20,4 +20,5 @@ #define ____H_PROGRESSIMPL +#include "ProgressWrap.h" #include "VirtualBoxBase.h" @@ -30,6 +31,5 @@ */ class ATL_NO_VTABLE Progress : - public VirtualBoxBase, - VBOX_SCRIPTABLE_IMPL(IProgress) + public ProgressWrap { protected: @@ -37,6 +37,5 @@ DECLARE_EMPTY_CTOR_DTOR (Progress) - - void checkForAutomaticTimeout(void); + void i_checkForAutomaticTimeout(void); #if !defined (VBOX_COM_INPROC) @@ -48,5 +47,5 @@ const Guid mId; - const Bstr mDescription; + const com::Utf8Str mDescription; uint64_t m_ullTimestamp; // progress object creation timestamp, for ETA computation @@ -63,11 +62,14 @@ ComPtr mErrorInfo; - ULONG m_cOperations; // number of operations (so that progress dialog can display something like 1/3) + ULONG m_cOperations; // number of operations (so that progress dialog can + // display something like 1/3) ULONG m_ulTotalOperationsWeight; // sum of weights of all operations, given to constructor ULONG m_ulOperationsCompletedWeight; // summed-up weight of operations that have been completed; initially 0 - ULONG m_ulCurrentOperation; // operations counter, incremented with each setNextOperation() - Bstr m_bstrOperationDescription; // name of current operation; initially from constructor, changed with setNextOperation() + ULONG m_ulCurrentOperation; // operations counter, incremented with + // each setNextOperation() + com::Utf8Str m_operationDescription; // name of current operation; initially + // from constructor, changed with setNextOperation() ULONG m_ulCurrentOperationWeight; // weight of current operation, given to setNextOperation() ULONG m_ulOperationPercent; // percentage of current operation, set with setCurrentOperationProgress() @@ -75,13 +77,5 @@ public: - VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(Progress, IProgress) - DECLARE_NOT_AGGREGATABLE (Progress) - - DECLARE_PROTECT_FINAL_CONSTRUCT() - - BEGIN_COM_MAP (Progress) - VBOX_DEFAULT_INTERFACE_ENTRIES (IProgress) - END_COM_MAP() HRESULT FinalConstruct(); @@ -105,5 +99,5 @@ #endif IUnknown *aInitiator, - CBSTR aDescription, + Utf8Str aDescription, BOOL aCancelable, OUT_GUID aId = NULL) @@ -118,5 +112,5 @@ 1, // cOperations 1, // ulTotalOperationsWeight - aDescription, // bstrFirstOperationDescription + aDescription, // aFirstOperationDescription 1, // ulFirstOperationWeight aId); @@ -140,7 +134,7 @@ #endif IUnknown *aInitiator, - CBSTR aDescription, BOOL aCancelable, + Utf8Str aDescription, BOOL aCancelable, ULONG cOperations, - CBSTR bstrFirstOperationDescription, + Utf8Str aFirstOperationDescription, OUT_GUID aId = NULL) { @@ -154,5 +148,5 @@ cOperations, // cOperations cOperations, // ulTotalOperationsWeight = cOperations - bstrFirstOperationDescription, // bstrFirstOperationDescription + aFirstOperationDescription, // aFirstOperationDescription 1, // ulFirstOperationWeight: weigh them all the same aId); @@ -164,9 +158,9 @@ #endif IUnknown *aInitiator, - CBSTR aDescription, + Utf8Str aDescription, BOOL aCancelable, ULONG cOperations, ULONG ulTotalOperationsWeight, - CBSTR bstrFirstOperationDescription, + Utf8Str aFirstOperationDescription, ULONG ulFirstOperationWeight, OUT_GUID aId = NULL); @@ -174,5 +168,5 @@ HRESULT init(BOOL aCancelable, ULONG aOperationCount, - CBSTR aOperationDescription); + Utf8Str aOperationDescription); // initializer/uninitializer for internal purposes only @@ -182,5 +176,5 @@ #endif IUnknown *aInitiator, - CBSTR aDescription, OUT_GUID aId = NULL); + Utf8Str aDescription, OUT_GUID aId = NULL); HRESULT init(AutoInitSpan &aAutoInitSpan); void init(AutoUninitSpan &aAutoUninitSpan); @@ -188,63 +182,61 @@ void uninit(AutoUninitSpan &aAutoUninitSpan); - // IProgress methods - STDMETHOD(WaitForCompletion)(LONG aTimeout); - STDMETHOD(WaitForOperationCompletion)(ULONG aOperation, LONG aTimeout); - STDMETHOD(WaitForAsyncProgressCompletion)(IProgress *pProgressAsync); - STDMETHOD(Cancel)(); - - STDMETHOD(SetCurrentOperationProgress)(ULONG aPercent); - STDMETHOD(SetNextOperation)(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight); // public methods only for internal purposes - - HRESULT setResultCode(HRESULT aResultCode); - - HRESULT notifyComplete(HRESULT aResultCode); - HRESULT notifyComplete(HRESULT aResultCode, - const GUID &aIID, - const char *pcszComponent, - const char *aText, - ...); - HRESULT notifyCompleteV(HRESULT aResultCode, - const GUID &aIID, - const char *pcszComponent, - const char *aText, - va_list va); - bool notifyPointOfNoReturn(void); - - // IProgress properties - STDMETHOD(COMGETTER(Id)) (BSTR *aId); - STDMETHOD(COMGETTER(Description)) (BSTR *aDescription); - STDMETHOD(COMGETTER(Initiator)) (IUnknown **aInitiator); - - // IProgress properties - STDMETHOD(COMGETTER(Cancelable)) (BOOL *aCancelable); - STDMETHOD(COMGETTER(Percent)) (ULONG *aPercent); - STDMETHOD(COMGETTER(TimeRemaining)) (LONG *aTimeRemaining); - STDMETHOD(COMGETTER(Completed)) (BOOL *aCompleted); - STDMETHOD(COMGETTER(Canceled)) (BOOL *aCanceled); - STDMETHOD(COMGETTER(ResultCode)) (LONG *aResultCode); - STDMETHOD(COMGETTER(ErrorInfo)) (IVirtualBoxErrorInfo **aErrorInfo); - STDMETHOD(COMGETTER(OperationCount)) (ULONG *aOperationCount); - STDMETHOD(COMGETTER(Operation)) (ULONG *aOperation); - STDMETHOD(COMGETTER(OperationDescription)) (BSTR *aOperationDescription); - STDMETHOD(COMGETTER(OperationPercent)) (ULONG *aOperationPercent); - STDMETHOD(COMGETTER(OperationWeight)) (ULONG *aOperationWeight); - STDMETHOD(COMSETTER(Timeout)) (ULONG aTimeout); - STDMETHOD(COMGETTER(Timeout)) (ULONG *aTimeout); + HRESULT i_setResultCode(HRESULT aResultCode); + + HRESULT i_notifyComplete(HRESULT aResultCode); + HRESULT i_notifyComplete(HRESULT aResultCode, + const GUID &aIID, + const char *pcszComponent, + const char *aText, + ...); + HRESULT i_notifyCompleteV(HRESULT aResultCode, + const GUID &aIID, + const char *pcszComponent, + const char *aText, + va_list va); + bool i_notifyPointOfNoReturn(void); // public methods only for internal purposes - - bool setCancelCallback(void (*pfnCallback)(void *), void *pvUser); - + bool i_setCancelCallback(void (*pfnCallback)(void *), void *pvUser); // unsafe inline public methods for internal purposes only (ensure there is // a caller and a read lock before calling them!) - BOOL getCompleted() const { return mCompleted; } - HRESULT getResultCode() const { return mResultCode; } - double calcTotalPercent(); + BOOL i_getCompleted() const { return mCompleted; } + HRESULT i_getResultCode() const { return mResultCode; } + double i_calcTotalPercent(); private: + + // Wrapped IProgress Data + HRESULT getId(com::Guid &aId); + HRESULT getDescription(com::Utf8Str &aDescription); + HRESULT getInitiator(ComPtr &aInitiator); + HRESULT getCancelable(BOOL *aCancelable); + HRESULT getPercent(ULONG *aPercent); + HRESULT getTimeRemaining(LONG *aTimeRemaining); + HRESULT getCompleted(BOOL *aCompleted); + HRESULT getCanceled(BOOL *aCanceled); + HRESULT getResultCode(LONG *aResultCode); + HRESULT getErrorInfo(ComPtr &aErrorInfo); + HRESULT getOperationCount(ULONG *aOperationCount); + HRESULT getOperation(ULONG *aOperation); + HRESULT getOperationDescription(com::Utf8Str &aOperationDescription); + HRESULT getOperationPercent(ULONG *aOperationPercent); + HRESULT getOperationWeight(ULONG *aOperationWeight); + HRESULT getTimeout(ULONG *aTimeout); + HRESULT setTimeout(ULONG aTimeout); + HRESULT setCurrentOperationProgress(ULONG aPercent); + HRESULT setNextOperation(const com::Utf8Str &aNextOperationDescription, + ULONG aNextOperationsWeight); + + // Wrapped Iprogress methods + HRESULT waitForCompletion(LONG aTimeout); + HRESULT waitForOperationCompletion(ULONG aOperation, + LONG aTimeout); + HRESULT waitForAsyncProgressCompletion(const ComPtr &aPProgressAsync); + HRESULT cancel(); + RTSEMEVENTMULTI mCompletedSem; Index: /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-all/ExtPackManagerImpl.cpp (revision 50874) @@ -234,5 +234,6 @@ * @param a_pVirtualBox Pointer to the VirtualBox object. */ -HRESULT ExtPackFile::initWithFile(const char *a_pszFile, const char *a_pszDigest, ExtPackManager *a_pExtPackMgr, VirtualBox *a_pVirtualBox) +HRESULT ExtPackFile::initWithFile(const char *a_pszFile, const char *a_pszDigest, ExtPackManager *a_pExtPackMgr, + VirtualBox *a_pVirtualBox) { AutoInitSpan autoInitSpan(this); @@ -313,6 +314,10 @@ * dropped. */ if (!strSavedName.equalsIgnoreCase(m->Desc.strName)) - return initFailed(tr("Extension pack name mismatch between the downloaded file and the XML inside it (xml='%s' file='%s')"), - m->Desc.strName.c_str(), strSavedName.c_str()); + { + Utf8Str str; + str = "Extension pack name mismatch between the downloaded file"; + str += "and the XML inside it (xml='%s' file='%s')"; + return initFailed(tr(str.c_str()), m->Desc.strName.c_str(), strSavedName.c_str()); + } m->fUsable = true; @@ -530,10 +535,12 @@ strPreferredLocale.c_str(), strPreferredLanguage.c_str(), strFormat.c_str()); else if (strPreferredLocale.isNotEmpty()) - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s", strPreferredLocale.c_str(), strFormat.c_str()); + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s", + strPreferredLocale.c_str(), strFormat.c_str()); else if (strPreferredLanguage.isNotEmpty()) - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str()); + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", + strPreferredLocale.c_str(), strFormat.c_str()); else - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s", strFormat.c_str()); - + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s", + strFormat.c_str()); /* * Lock the extension pack. We need a write lock here as there must not be @@ -1254,9 +1261,12 @@ { if (RTFS_IS_SYMLINK(m->ObjInfoExtPack.Attr.fMode)) - m->strWhyUnusable.printf(tr("'%s' is a symbolic link, this is not allowed"), m->strExtPackPath.c_str(), vrc); + m->strWhyUnusable.printf(tr("'%s' is a symbolic link, this is not allowed"), + m->strExtPackPath.c_str(), vrc); else if (RTFS_IS_FILE(m->ObjInfoExtPack.Attr.fMode)) - m->strWhyUnusable.printf(tr("'%s' is a symbolic file, not a directory"), m->strExtPackPath.c_str(), vrc); + m->strWhyUnusable.printf(tr("'%s' is a symbolic file, not a directory"), + m->strExtPackPath.c_str(), vrc); else - m->strWhyUnusable.printf(tr("'%s' is not a directory (fMode=%#x)"), m->strExtPackPath.c_str(), m->ObjInfoExtPack.Attr.fMode); + m->strWhyUnusable.printf(tr("'%s' is not a directory (fMode=%#x)"), + m->strExtPackPath.c_str(), m->ObjInfoExtPack.Attr.fMode); return; } @@ -1813,9 +1823,12 @@ strPreferredLocale.c_str(), strPreferredLanguage.c_str(), strFormat.c_str()); else if (strPreferredLocale.isNotEmpty()) - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s", strPreferredLocale.c_str(), strFormat.c_str()); + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-%s.%s", + strPreferredLocale.c_str(), strFormat.c_str()); else if (strPreferredLanguage.isNotEmpty()) - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", strPreferredLocale.c_str(), strFormat.c_str()); + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX "-_%s.%s", + strPreferredLocale.c_str(), strFormat.c_str()); else - RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s", strFormat.c_str()); + RTStrPrintf(szName, sizeof(szName), VBOX_EXTPACK_LICENSE_NAME_PREFIX ".%s", + strFormat.c_str()); /* @@ -2662,5 +2675,5 @@ PEXTPACKINSTALLJOB pJob = (PEXTPACKINSTALLJOB)pvJob; HRESULT hrc = pJob->ptrExtPackMgr->doInstall(pJob->ptrExtPackFile, pJob->fReplace, &pJob->strDisplayInfo); - pJob->ptrProgress->notifyComplete(hrc); + pJob->ptrProgress->i_notifyComplete(hrc); delete pJob; @@ -2793,5 +2806,5 @@ PEXTPACKUNINSTALLJOB pJob = (PEXTPACKUNINSTALLJOB)pvJob; HRESULT hrc = pJob->ptrExtPackMgr->doUninstall(&pJob->strName, pJob->fForcedRemoval, &pJob->strDisplayInfo); - pJob->ptrProgress->notifyComplete(hrc); + pJob->ptrProgress->i_notifyComplete(hrc); delete pJob; @@ -3094,5 +3107,6 @@ hrc = pExtPack->getVrdpLibraryName(a_pstrVrdeLibrary); else - hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No extension pack by the name '%s' was found"), a_pstrExtPack->c_str()); + hrc = setError(VBOX_E_OBJECT_NOT_FOUND, tr("No extension pack by the name '%s' was found"), + a_pstrExtPack->c_str()); } @@ -3109,5 +3123,6 @@ * @param a_pstrVrdeLibrary Where to return the path. */ -HRESULT ExtPackManager::getLibraryPathForExtPack(const char *a_pszModuleName, Utf8Str const *a_pstrExtPack, Utf8Str *a_pstrLibrary) +HRESULT ExtPackManager::getLibraryPathForExtPack(const char *a_pszModuleName, Utf8Str const *a_pstrExtPack, + Utf8Str *a_pstrLibrary) { AutoCaller autoCaller(this); Index: /trunk/src/VBox/Main/src-all/ProgressImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-all/ProgressImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-all/ProgressImpl.cpp (revision 50874) @@ -58,36 +58,21 @@ ///////////////////////////////////////////////////////////////////////////// -STDMETHODIMP Progress::COMGETTER(Id)(BSTR *aId) -{ - CheckComArgOutPointerValid(aId); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getId(com::Guid &aId) +{ /* mId is constant during life time, no need to lock */ - mId.toUtf16().cloneTo(aId); - - return S_OK; -} - -STDMETHODIMP Progress::COMGETTER(Description)(BSTR *aDescription) -{ - CheckComArgOutPointerValid(aDescription); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - + aId = mId; + + return S_OK; +} + +HRESULT Progress::getDescription(com::Utf8Str &aDescription) +{ /* mDescription is constant during life time, no need to lock */ - mDescription.cloneTo(aDescription); - - return S_OK; -} - -STDMETHODIMP Progress::COMGETTER(Initiator)(IUnknown **aInitiator) -{ - CheckComArgOutPointerValid(aInitiator); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); + aDescription = mDescription; + + return S_OK; +} +HRESULT Progress::getInitiator(ComPtr &aInitiator) +{ /* mInitiator/mParent are constant during life time, no need to lock */ @@ -95,12 +80,12 @@ #if !defined(VBOX_COM_INPROC) if (mInitiator) - mInitiator.queryInterfaceTo(aInitiator); + mInitiator.queryInterfaceTo(aInitiator.asOutParam()); else { ComObjPtr pVirtualBox(mParent); - pVirtualBox.queryInterfaceTo(aInitiator); + pVirtualBox.queryInterfaceTo(aInitiator.asOutParam()); } #else - mInitiator.queryInterfaceTo(aInitiator); + mInitiator.queryInterfaceTo(aInitiator.asOutParam()); #endif @@ -108,10 +93,6 @@ } -STDMETHODIMP Progress::COMGETTER(Cancelable)(BOOL *aCancelable) -{ - CheckComArgOutPointerValid(aCancelable); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); +HRESULT Progress::getCancelable(BOOL *aCancelable) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -131,5 +112,5 @@ * @return fractional percentage as a double value. */ -double Progress::calcTotalPercent() +double Progress::i_calcTotalPercent() { // avoid division by zero @@ -137,6 +118,7 @@ return 0; - double dPercent = ( (double)m_ulOperationsCompletedWeight // weight of operations that have been completed - + ((double)m_ulOperationPercent * (double)m_ulCurrentOperationWeight / (double)100) // plus partial weight of the current operation + double dPercent = ( (double)m_ulOperationsCompletedWeight // weight of operations that have been completed + + ((double)m_ulOperationPercent * + (double)m_ulCurrentOperationWeight / (double)100) // plus partial weight of the current operation ) * (double)100 / (double)m_ulTotalOperationsWeight; @@ -149,5 +131,5 @@ * The caller should hold the object write lock. */ -void Progress::checkForAutomaticTimeout(void) +void Progress::i_checkForAutomaticTimeout(void) { if ( m_cMsTimeout @@ -159,12 +141,6 @@ } - -STDMETHODIMP Progress::COMGETTER(TimeRemaining)(LONG *aTimeRemaining) -{ - CheckComArgOutPointerValid(aTimeRemaining); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getTimeRemaining(LONG *aTimeRemaining) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -173,5 +149,5 @@ else { - double dPercentDone = calcTotalPercent(); + double dPercentDone = i_calcTotalPercent(); if (dPercentDone < 1) *aTimeRemaining = -1; // unreliable, or avoid division by 0 below @@ -183,6 +159,7 @@ uint64_t ullTimeRemaining = ullTimeTotal - ullTimeElapsed; -// Log(("Progress::GetTimeRemaining: dPercentDone %RI32, ullTimeNow = %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n", -// (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining)); +// Log(("Progress::GetTimeRemaining: dPercentDone %RI32, ullTimeNow = +// %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n", +// (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining)); *aTimeRemaining = (LONG)(ullTimeRemaining / 1000); @@ -193,12 +170,7 @@ } -STDMETHODIMP Progress::COMGETTER(Percent)(ULONG *aPercent) -{ - CheckComArgOutPointerValid(aPercent); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - - checkForAutomaticTimeout(); +HRESULT Progress::getPercent(ULONG *aPercent) +{ + i_checkForAutomaticTimeout(); /* checkForAutomaticTimeout requires a write lock. */ @@ -209,5 +181,5 @@ else { - ULONG ulPercent = (ULONG)calcTotalPercent(); + ULONG ulPercent = (ULONG)i_calcTotalPercent(); // do not report 100% until we're really really done with everything as the Qt GUI dismisses progress dialogs in that case if ( ulPercent == 100 @@ -221,16 +193,11 @@ } - checkForAutomaticTimeout(); - - return S_OK; -} - -STDMETHODIMP Progress::COMGETTER(Completed)(BOOL *aCompleted) -{ - CheckComArgOutPointerValid(aCompleted); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - + i_checkForAutomaticTimeout(); + + return S_OK; +} + +HRESULT Progress::getCompleted(BOOL *aCompleted) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -240,11 +207,6 @@ } -STDMETHODIMP Progress::COMGETTER(Canceled)(BOOL *aCanceled) -{ - CheckComArgOutPointerValid(aCanceled); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getCanceled(BOOL *aCanceled) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -254,11 +216,6 @@ } -STDMETHODIMP Progress::COMGETTER(ResultCode)(LONG *aResultCode) -{ - CheckComArgOutPointerValid(aResultCode); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getResultCode(LONG *aResultCode) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -272,11 +229,6 @@ } -STDMETHODIMP Progress::COMGETTER(ErrorInfo)(IVirtualBoxErrorInfo **aErrorInfo) -{ - CheckComArgOutPointerValid(aErrorInfo); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getErrorInfo(ComPtr &aErrorInfo) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -285,16 +237,11 @@ tr("Error info is not available, operation is still in progress")); - mErrorInfo.queryInterfaceTo(aErrorInfo); - - return S_OK; -} - -STDMETHODIMP Progress::COMGETTER(OperationCount)(ULONG *aOperationCount) -{ - CheckComArgOutPointerValid(aOperationCount); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - + mErrorInfo.queryInterfaceTo(aErrorInfo.asOutParam()); + + return S_OK; +} + +HRESULT Progress::getOperationCount(ULONG *aOperationCount) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -304,11 +251,6 @@ } -STDMETHODIMP Progress::COMGETTER(Operation)(ULONG *aOperation) -{ - CheckComArgOutPointerValid(aOperation); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getOperation(ULONG *aOperation) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -318,25 +260,16 @@ } -STDMETHODIMP Progress::COMGETTER(OperationDescription)(BSTR *aOperationDescription) -{ - CheckComArgOutPointerValid(aOperationDescription); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); +HRESULT Progress::getOperationDescription(com::Utf8Str &aOperationDescription) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); - m_bstrOperationDescription.cloneTo(aOperationDescription); - - return S_OK; -} - -STDMETHODIMP Progress::COMGETTER(OperationPercent)(ULONG *aOperationPercent) -{ - CheckComArgOutPointerValid(aOperationPercent); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - + aOperationDescription = m_operationDescription; + + return S_OK; +} + +HRESULT Progress::getOperationPercent(ULONG *aOperationPercent) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -349,11 +282,6 @@ } -STDMETHODIMP Progress::COMGETTER(OperationWeight)(ULONG *aOperationWeight) -{ - CheckComArgOutPointerValid(aOperationWeight); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getOperationWeight(ULONG *aOperationWeight) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -363,9 +291,6 @@ } -STDMETHODIMP Progress::COMSETTER(Timeout)(ULONG aTimeout) -{ - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::setTimeout(ULONG aTimeout) +{ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -379,11 +304,6 @@ } -STDMETHODIMP Progress::COMGETTER(Timeout)(ULONG *aTimeout) -{ - CheckComArgOutPointerValid(aTimeout); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::getTimeout(ULONG *aTimeout) +{ AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -406,5 +326,5 @@ * @param pvUser The callback argument. */ -bool Progress::setCancelCallback(void (*pfnCallback)(void *), void *pvUser) +bool Progress::i_setCancelCallback(void (*pfnCallback)(void *), void *pvUser) { AutoCaller autoCaller(this); @@ -413,5 +333,5 @@ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); - checkForAutomaticTimeout(); + i_checkForAutomaticTimeout(); if (mCanceled) return false; @@ -516,20 +436,20 @@ #endif IUnknown *aInitiator, - CBSTR aDescription, + Utf8Str aDescription, BOOL aCancelable, ULONG cOperations, ULONG ulTotalOperationsWeight, - CBSTR bstrFirstOperationDescription, + Utf8Str aFirstOperationDescription, ULONG ulFirstOperationWeight, OUT_GUID aId /* = NULL */) { - LogFlowThisFunc(("aDescription=\"%ls\", cOperations=%d, ulTotalOperationsWeight=%d, bstrFirstOperationDescription=\"%ls\", ulFirstOperationWeight=%d\n", - aDescription, + Utf8Str str = "aDescription=\"%s\", cOperations=%d, ulTotalOperationsWeight=%d, "; + LogFlowThisFunc((str.c_str(), + aDescription.c_str(), cOperations, ulTotalOperationsWeight, - bstrFirstOperationDescription, + aFirstOperationDescription.c_str(), ulFirstOperationWeight)); - AssertReturn(bstrFirstOperationDescription, E_INVALIDARG); AssertReturn(ulTotalOperationsWeight >= 1, E_INVALIDARG); @@ -552,6 +472,4 @@ #endif - AssertReturn(aDescription, E_INVALIDARG); - #if !defined(VBOX_COM_INPROC) /* share parent weakly */ @@ -597,5 +515,5 @@ m_ulOperationsCompletedWeight = 0; m_ulCurrentOperation = 0; - m_bstrOperationDescription = bstrFirstOperationDescription; + m_operationDescription = aFirstOperationDescription; m_ulCurrentOperationWeight = ulFirstOperationWeight; m_ulOperationPercent = 0; @@ -630,7 +548,7 @@ HRESULT Progress::init(BOOL aCancelable, ULONG aOperationCount, - CBSTR aOperationDescription) -{ - LogFlowThisFunc(("aOperationDescription=\"%ls\"\n", aOperationDescription)); + Utf8Str aOperationDescription) +{ + LogFlowThisFunc(("aOperationDescription=\"%s\"\n", aOperationDescription.c_str())); /* Enclose the state transition NotReady->InInit->Ready */ @@ -652,5 +570,5 @@ m_ulOperationsCompletedWeight = 0; m_ulCurrentOperation = 0; - m_bstrOperationDescription = aOperationDescription; + m_operationDescription = aOperationDescription; m_ulCurrentOperationWeight = 1; m_ulOperationPercent = 0; @@ -686,6 +604,6 @@ if (mWaitersCount > 0) { - LogFlow(("WARNING: There are still %d threads waiting for '%ls' completion!\n", - mWaitersCount, mDescription.raw())); + LogFlow(("WARNING: There are still %d threads waiting for '%s' completion!\n", + mWaitersCount, mDescription.c_str())); RTSemEventMultiSignal(mCompletedSem); } @@ -722,11 +640,8 @@ * calling this method will definitely freeze event processing. */ -STDMETHODIMP Progress::WaitForCompletion(LONG aTimeout) +HRESULT Progress::waitForCompletion(LONG aTimeout) { LogFlowThisFuncEnter(); LogFlowThisFunc(("aTimeout=%d\n", aTimeout)); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -781,11 +696,9 @@ * calling this method will definitely freeze event processing. */ -STDMETHODIMP Progress::WaitForOperationCompletion(ULONG aOperation, LONG aTimeout) +HRESULT Progress::waitForOperationCompletion(ULONG aOperation, LONG aTimeout) + { LogFlowThisFuncEnter(); LogFlowThisFunc(("aOperation=%d, aTimeout=%d\n", aOperation, aTimeout)); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -839,12 +752,7 @@ } -STDMETHODIMP Progress::WaitForAsyncProgressCompletion(IProgress *pProgressAsync) +HRESULT Progress::waitForAsyncProgressCompletion(const ComPtr &aPProgressAsync) { LogFlowThisFuncEnter(); - - CheckComArgNotNull(pProgressAsync); - - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); /* Note: we don't lock here, cause we just using public methods. */ @@ -858,8 +766,8 @@ ULONG cOp = 0; /* Is the async process cancelable? */ - rc = pProgressAsync->COMGETTER(Cancelable)(&fCancelable); + rc = aPProgressAsync->COMGETTER(Cancelable)(&fCancelable); if (FAILED(rc)) return rc; /* Loop as long as the sync process isn't completed. */ - while (SUCCEEDED(pProgressAsync->COMGETTER(Completed(&fCompleted)))) + while (SUCCEEDED(aPProgressAsync->COMGETTER(Completed(&fCompleted)))) { /* We can forward any cancel request to the async process only when @@ -871,5 +779,5 @@ if (fCanceled) { - rc = pProgressAsync->Cancel(); + rc = aPProgressAsync->Cancel(); if (FAILED(rc)) return rc; } @@ -888,5 +796,5 @@ for (;;) { - rc = pProgressAsync->COMGETTER(Operation(&curOp)); + rc = aPProgressAsync->COMGETTER(Operation(&curOp)); if (FAILED(rc)) return rc; if (cOp != curOp) @@ -894,7 +802,7 @@ Bstr bstr; ULONG currentWeight; - rc = pProgressAsync->COMGETTER(OperationDescription(bstr.asOutParam())); + rc = aPProgressAsync->COMGETTER(OperationDescription(bstr.asOutParam())); if (FAILED(rc)) return rc; - rc = pProgressAsync->COMGETTER(OperationWeight(¤tWeight)); + rc = aPProgressAsync->COMGETTER(OperationWeight(¤tWeight)); if (FAILED(rc)) return rc; rc = SetNextOperation(bstr.raw(), currentWeight); @@ -906,5 +814,5 @@ } - rc = pProgressAsync->COMGETTER(OperationPercent(¤tPercent)); + rc = aPProgressAsync->COMGETTER(OperationPercent(¤tPercent)); if (FAILED(rc)) return rc; if (currentPercent != prevPercent) @@ -919,5 +827,5 @@ /* Make sure the loop is not too tight */ - rc = pProgressAsync->WaitForCompletion(100); + rc = aPProgressAsync->WaitForCompletion(100); if (FAILED(rc)) return rc; } @@ -928,9 +836,6 @@ } -STDMETHODIMP Progress::Cancel() -{ - AutoCaller autoCaller(this); - if (FAILED(autoCaller.rc())) return autoCaller.rc(); - +HRESULT Progress::cancel() +{ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -959,14 +864,11 @@ * (in range [0, 100]). */ -STDMETHODIMP Progress::SetCurrentOperationProgress(ULONG aPercent) -{ - AutoCaller autoCaller(this); - AssertComRCReturnRC(autoCaller.rc()); - +HRESULT Progress::setCurrentOperationProgress(ULONG aPercent) +{ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); AssertMsgReturn(aPercent <= 100, ("%u\n", aPercent), E_INVALIDARG); - checkForAutomaticTimeout(); + i_checkForAutomaticTimeout(); if (mCancelable && mCanceled) { @@ -989,11 +891,7 @@ * @note The current operation must not be the last one. */ -STDMETHODIMP Progress::SetNextOperation(IN_BSTR bstrNextOperationDescription, ULONG ulNextOperationsWeight) -{ - AssertReturn(bstrNextOperationDescription, E_INVALIDARG); - - AutoCaller autoCaller(this); - AssertComRCReturnRC(autoCaller.rc()); - +HRESULT Progress::setNextOperation(const com::Utf8Str &aNextOperationDescription, ULONG aNextOperationsWeight) + +{ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -1006,10 +904,13 @@ m_ulOperationsCompletedWeight += m_ulCurrentOperationWeight; - m_bstrOperationDescription = bstrNextOperationDescription; - m_ulCurrentOperationWeight = ulNextOperationsWeight; + m_operationDescription = aNextOperationDescription; + m_ulCurrentOperationWeight = aNextOperationsWeight; m_ulOperationPercent = 0; - Log(("Progress::setNextOperation(%ls): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d, m_ulOperationsCompletedWeight is now %d\n", - m_bstrOperationDescription.raw(), ulNextOperationsWeight, m_ulCurrentOperation, m_ulOperationsCompletedWeight)); + Utf8Str str; + str = "Progress::setNextOperation(%s): ulNextOperationsWeight = %d; m_ulCurrentOperation is now %d,"; + str += "m_ulOperationsCompletedWeight is now %d\n"; + Log((str.c_str(), m_operationDescription.c_str(), aNextOperationsWeight, m_ulCurrentOperation, + m_ulOperationsCompletedWeight)); /* wake up all waiting threads */ @@ -1031,9 +932,6 @@ * @param aResultCode */ -HRESULT Progress::setResultCode(HRESULT aResultCode) -{ - AutoCaller autoCaller(this); - AssertComRCReturnRC(autoCaller.rc()); - +HRESULT Progress::i_setResultCode(HRESULT aResultCode) +{ AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -1102,5 +1000,5 @@ * @param aResultCode Operation result code. */ -HRESULT Progress::notifyComplete(HRESULT aResultCode) +HRESULT Progress::i_notifyComplete(HRESULT aResultCode) { AutoCaller autoCaller(this); @@ -1116,5 +1014,5 @@ aResultCode = E_FAIL; - HRESULT rc = setResultCode(aResultCode); + HRESULT rc = i_setResultCode(aResultCode); mCompleted = TRUE; @@ -1142,13 +1040,13 @@ * Wrapper around Progress:notifyCompleteV. */ -HRESULT Progress::notifyComplete(HRESULT aResultCode, - const GUID &aIID, - const char *pcszComponent, - const char *aText, - ...) +HRESULT Progress::i_notifyComplete(HRESULT aResultCode, + const GUID &aIID, + const char *pcszComponent, + const char *aText, + ...) { va_list va; va_start(va, aText); - HRESULT hrc = notifyCompleteV(aResultCode, aIID, pcszComponent, aText, va); + HRESULT hrc = i_notifyCompleteV(aResultCode, aIID, pcszComponent, aText, va); va_end(va); return hrc; @@ -1168,9 +1066,9 @@ * @param va List of arguments for the format string. */ -HRESULT Progress::notifyCompleteV(HRESULT aResultCode, - const GUID &aIID, - const char *pcszComponent, - const char *aText, - va_list va) +HRESULT Progress::i_notifyCompleteV(HRESULT aResultCode, + const GUID &aIID, + const char *pcszComponent, + const char *aText, + va_list va) { Utf8Str text(aText, va); @@ -1227,5 +1125,5 @@ * invalid state */ -bool Progress::notifyPointOfNoReturn(void) +bool Progress::i_notifyPointOfNoReturn(void) { AutoCaller autoCaller(this); Index: /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (revision 50874) @@ -3534,5 +3534,5 @@ // private methods ///////////////////////////////////////////////////////////////////////////// - + /** * Suspend the VM before we do any medium or network attachment change. @@ -6908,5 +6908,5 @@ /* The progress object will fetch the current error info */ if (!pPowerupProgress.isNull()) - pPowerupProgress->notifyComplete(rc); + pPowerupProgress->i_notifyComplete(rc); /* Save the error info across the IPC below. Can't be done before the @@ -9176,5 +9176,5 @@ rc = pMachine->COMGETTER(FaultTolerancePassword)(bstrPassword.asOutParam()); } - if (task->mProgress->setCancelCallback(faultToleranceProgressCancelCallback, pConsole->mpUVM)) + if (task->mProgress->i_setCancelCallback(faultToleranceProgressCancelCallback, pConsole->mpUVM)) { if (SUCCEEDED(rc)) @@ -9198,5 +9198,5 @@ AssertLogRelRC(vrc); } - task->mProgress->setCancelCallback(NULL, NULL); + task->mProgress->i_setCancelCallback(NULL, NULL); } else @@ -9316,10 +9316,10 @@ { /* Notify the progress object of the success */ - task->mProgress->notifyComplete(S_OK); + task->mProgress->i_notifyComplete(S_OK); } else { /* The progress object will fetch the current error info */ - task->mProgress->notifyComplete(rc); + task->mProgress->i_notifyComplete(rc); LogRel(("Power up failed (vrc=%Rrc, rc=%Rhrc (%#08X))\n", vrc, rc, rc)); } @@ -9518,5 +9518,5 @@ Utf8Str strSavedStateFile(pTask->bstrSavedStateFile); - pTask->mProgress->setCancelCallback(takesnapshotProgressCancelCallback, ptrVM.rawUVM()); + pTask->mProgress->i_setCancelCallback(takesnapshotProgressCancelCallback, ptrVM.rawUVM()); alock.release(); @@ -9534,10 +9534,10 @@ strSavedStateFile.c_str(), vrc); - pTask->mProgress->setCancelCallback(NULL, NULL); + pTask->mProgress->i_setCancelCallback(NULL, NULL); } else LogRel(("Console: skipped saving state as part of online snapshot\n")); - if (!pTask->mProgress->notifyPointOfNoReturn()) + if (!pTask->mProgress->i_notifyPointOfNoReturn()) throw setErrorStatic(E_FAIL, tr("Canceled")); that->mptrCancelableProgress.setNull(); @@ -9638,5 +9638,5 @@ if (FAILED(rc)) /* Must come before calling setMachineState. */ - pTask->mProgress->notifyComplete(rc); + pTask->mProgress->i_notifyComplete(rc); /* @@ -9669,5 +9669,5 @@ { rc = setErrorStatic(VBOX_E_VM_ERROR, tr("Could not resume the machine execution (%Rrc)"), vrc); - pTask->mProgress->notifyComplete(rc); + pTask->mProgress->i_notifyComplete(rc); if (that->mMachineState == MachineState_Saving) that->setMachineStateLocally(MachineState_Paused); @@ -9746,5 +9746,5 @@ if (SUCCEEDED(rc)) /* The failure cases are handled above. */ - pTask->mProgress->notifyComplete(rc); + pTask->mProgress->i_notifyComplete(rc); delete pTask; Index: /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp (revision 50874) @@ -712,5 +712,5 @@ * We're at the point of no return. */ - if (!pState->mptrProgress->notifyPointOfNoReturn()) + if (!pState->mptrProgress->i_notifyPointOfNoReturn()) { teleporterSrcSubmitCommand(pState, "cancel", false /*fWaitForAck*/); @@ -784,8 +784,8 @@ complete things here on failure instead of right before cleanup. */ if (FAILED(hrc)) - pState->mptrProgress->notifyComplete(hrc); + pState->mptrProgress->i_notifyComplete(hrc); /* We can no longer be canceled (success), or it doesn't matter any longer (failure). */ - pState->mptrProgress->setCancelCallback(NULL, NULL); + pState->mptrProgress->i_setCancelCallback(NULL, NULL); /* @@ -819,5 +819,5 @@ pState->mptrConsole->mVMIsAlreadyPoweringOff = false; - pState->mptrProgress->notifyComplete(hrc); + pState->mptrProgress->i_notifyComplete(hrc); } else @@ -991,5 +991,5 @@ void *pvUser = static_cast(static_cast(pState)); - ptrProgress->setCancelCallback(teleporterProgressCancelCallback, pvUser); + ptrProgress->i_setCancelCallback(teleporterProgressCancelCallback, pvUser); int vrc = RTThreadCreate(NULL, Console::teleporterSrcThreadWrapper, (void *)pState, 0 /*cbStack*/, @@ -1011,5 +1011,5 @@ else { - ptrProgress->setCancelCallback(NULL, NULL); + ptrProgress->i_setCancelCallback(NULL, NULL); delete pState; hrc = setError(E_FAIL, tr("RTThreadCreate -> %Rrc"), vrc); @@ -1115,5 +1115,5 @@ void *pvUser = static_cast(static_cast(&theState)); - if (pProgress->setCancelCallback(teleporterProgressCancelCallback, pvUser)) + if (pProgress->i_setCancelCallback(teleporterProgressCancelCallback, pvUser)) { LogRel(("Teleporter: Waiting for incoming VM...\n")); @@ -1122,5 +1122,5 @@ { vrc = RTTcpServerListen(hServer, Console::teleporterTrgServeConnection, &theState); - pProgress->setCancelCallback(NULL, NULL); + pProgress->i_setCancelCallback(NULL, NULL); if (vrc == VERR_TCP_SERVER_STOP) @@ -1410,5 +1410,5 @@ * make it possible to recover from some VMR3Resume failures. */ - if ( pState->mptrProgress->notifyPointOfNoReturn() + if ( pState->mptrProgress->i_notifyPointOfNoReturn() && pState->mfLockedMedia) { Index: /trunk/src/VBox/Main/src-client/GuestDnDImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestDnDImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/GuestDnDImpl.cpp (revision 50874) @@ -395,5 +395,5 @@ m_pvData = NULL; } - m_cbData = 0; + m_cbData = 0; m_cbDataCurrent = 0; m_cbDataTotal = 0; @@ -435,8 +435,8 @@ if (uState == DragAndDropSvc::DND_PROGRESS_ERROR) { - hr = m_progress->notifyComplete(VBOX_E_IPRT_ERROR, - COM_IIDOF(IGuest), - m_parent->getComponentName(), - DnDGuestResponse::errorToString(m_parent, rcOp).c_str()); + hr = m_progress->i_notifyComplete(VBOX_E_IPRT_ERROR, + COM_IIDOF(IGuest), + m_parent->getComponentName(), + DnDGuestResponse::errorToString(m_parent, rcOp).c_str()); reset(); } @@ -455,5 +455,5 @@ if ( uState == DragAndDropSvc::DND_PROGRESS_COMPLETE || uPercentage >= 100) - hr = m_progress->notifyComplete(S_OK); + hr = m_progress->i_notifyComplete(S_OK); } } @@ -518,5 +518,5 @@ } -int DnDGuestResponse::writeToFile(const char *pszPath, size_t cbPath, +int DnDGuestResponse::writeToFile(const char *pszPath, size_t cbPath, void *pvData, size_t cbData, uint32_t fMode) { @@ -525,5 +525,5 @@ * keeps those file pointers around, or extend the * actual protocol for explicit open calls. - * + * * For now we only keep one file open at a time, so if * a client does alternating writes to different files @@ -532,5 +532,5 @@ int rc; if ( m_hFile == NIL_RTFILE - || m_strFile != pszPath) + || m_strFile != pszPath) { char *pszFile = RTPathJoinA(m_strDropDir.c_str(), pszPath); @@ -540,9 +540,9 @@ /** @todo Respect fMode! */ rc = RTFileOpen(&hFile, pszFile, - RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE + RTFILE_O_OPEN_CREATE | RTFILE_O_DENY_WRITE | RTFILE_O_WRITE | RTFILE_O_APPEND); if (RT_SUCCESS(rc)) { - LogFlowFunc(("Opening \"%s\" (fMode=0x%x) for writing ...\n", + LogFlowFunc(("Opening \"%s\" (fMode=0x%x) for writing ...\n", pszFile, fMode)); @@ -955,5 +955,5 @@ *pResultAction = d->toMainAction(pResp->defAction()); - LogFlowFunc(("resFormat=%s, resAction=%RU32\n", + LogFlowFunc(("resFormat=%s, resAction=%RU32\n", pResp->format().c_str(), pResp->defAction())); Index: /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/GuestProcessImpl.cpp (revision 50874) @@ -487,6 +487,8 @@ if (RT_UNLIKELY(mData.mPID != uPID)) { - LogFlowFunc(("Stale guest process (PID=%RU32) sent data to a newly started process (pProcesS=%p, PID=%RU32, status=%RU32)\n", - uPID, this, mData.mPID, mData.mStatus)); + Utf8Str str; + str = "Stale guest process (PID=%RU32) sent data to newly started"; + str += " process (pProcesS=%p, PID=%RU32, status=%RU32)\n"; + LogFlowFunc((str.c_str(), uPID, this, mData.mPID, mData.mStatus)); rc = VERR_NOT_FOUND; } @@ -1378,5 +1380,7 @@ { waitResult = ProcessWaitResult_Error; - AssertMsg(RT_FAILURE(mData.mLastError), ("No error rc (%Rrc) set when guest process indicated an error\n", mData.mLastError)); + Utf8Str str; + str = "No error rc (%Rrc) set when guest process indicated an error\n"; + AssertMsg(RT_FAILURE(mData.mLastError), (str.c_str(), mData.mLastError)); if (pGuestRc) *pGuestRc = mData.mLastError; /* Return last set error. */ @@ -1662,6 +1666,7 @@ void *pvData, size_t cbData, uint32_t uTimeoutMS, uint32_t *puWritten, int *pGuestRc) { - LogFlowThisFunc(("uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, pGuestRc=%p\n", - mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, pGuestRc)); + Utf8Str str; + str = "uPID=%RU32, uHandle=%RU32, uFlags=%RU32, pvData=%p, cbData=%RU32, uTimeoutMS=%RU32, puWritten=%p, pGuestRc=%p\n"; + LogFlowThisFunc((str.c_str(), mData.mPID, uHandle, uFlags, pvData, cbData, uTimeoutMS, puWritten, pGuestRc)); /* All is optional. There can be 0 byte writes. */ @@ -1877,6 +1882,6 @@ } -HRESULT GuestProcess::waitForArray(const std::vector &aWaitFor, ULONG aTimeoutMS, ProcessWaitResult_T *aReason) - +HRESULT GuestProcess::waitForArray(const std::vector &aWaitFor, + ULONG aTimeoutMS, ProcessWaitResult_T *aReason) { #ifndef VBOX_WITH_GUEST_CONTROL Index: /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp (revision 50874) @@ -2156,7 +2156,10 @@ if ( mData.mProtocolVersion < 2 && s_gctrlLegacyWarning++ < 3) /** @todo Find a bit nicer text. */ - LogRel((tr("Warning: Guest Additions are older (%ld.%ld) than host capabilities for guest control, please upgrade them. Using protocol version %ld now\n"), - uVBoxMajor, uVBoxMinor, mData.mProtocolVersion)); - + { + Utf8Str str; + str = "Warning: Guest Additions are older (%ld.%ld) than host"; + str += " capabilities for guest control, please upgrade them. Using protocol version %ld now\n"; + LogRel((tr(str.c_str()), uVBoxMajor, uVBoxMinor, mData.mProtocolVersion)); + } return VINF_SUCCESS; } @@ -2413,5 +2416,7 @@ } -HRESULT GuestSession::copyFrom(const com::Utf8Str &aSource, const com::Utf8Str &aDest, const std::vector &aFlags, ComPtr &aProgress) +HRESULT GuestSession::copyFrom(const com::Utf8Str &aSource, const com::Utf8Str &aDest, + const std::vector &aFlags, + ComPtr &aProgress) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2442,6 +2447,6 @@ SessionTaskCopyFrom *pTask = new SessionTaskCopyFrom(this /* GuestSession */, aSource, aDest, fFlags); - int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from guest to \"%s\" on the host"), aSource.c_str(), aDest.c_str()), - pTask, pProgress); + int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from guest to \"%s\" on the host"), aSource.c_str(), + aDest.c_str()), pTask, pProgress); if (RT_SUCCESS(rc)) /* Return progress to the caller. */ @@ -2460,5 +2465,6 @@ } -HRESULT GuestSession::copyTo(const com::Utf8Str &aSource, const com::Utf8Str &aDest, const std::vector &aFlags, ComPtr &aProgress) +HRESULT GuestSession::copyTo(const com::Utf8Str &aSource, const com::Utf8Str &aDest, const std::vector &aFlags, + ComPtr &aProgress) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2490,6 +2496,6 @@ aSource, aDest, fFlags); AssertPtrReturn(pTask, E_OUTOFMEMORY); - int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from host to \"%s\" on the guest"), aSource.c_str(), aDest.c_str()), - pTask, pProgress); + int rc = i_startTaskAsync(Utf8StrFmt(tr("Copying \"%s\" from host to \"%s\" on the guest"), aSource.c_str(), + aDest.c_str()), pTask, pProgress); if (RT_SUCCESS(rc)) { @@ -2563,5 +2569,6 @@ } -HRESULT GuestSession::directoryCreateTemp(const com::Utf8Str &aTemplateName, ULONG aMode, const com::Utf8Str &aPath, BOOL aSecure, com::Utf8Str &aDirectory) +HRESULT GuestSession::directoryCreateTemp(const com::Utf8Str &aTemplateName, ULONG aMode, const com::Utf8Str &aPath, + BOOL aSecure, com::Utf8Str &aDirectory) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2635,5 +2642,6 @@ } -HRESULT GuestSession::directoryOpen(const com::Utf8Str &aPath, const com::Utf8Str &aFilter, const std::vector &aFlags, ComPtr &aDirectory) +HRESULT GuestSession::directoryOpen(const com::Utf8Str &aPath, const com::Utf8Str &aFilter, + const std::vector &aFlags, ComPtr &aDirectory) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2793,5 +2801,6 @@ } -HRESULT GuestSession::directoryRemoveRecursive(const com::Utf8Str &aPath, const std::vector &aFlags, ComPtr &aProgress) +HRESULT GuestSession::directoryRemoveRecursive(const com::Utf8Str &aPath, const std::vector &aFlags, + ComPtr &aProgress) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -2820,5 +2829,5 @@ * the progress object right now. */ /** @todo Implement progress reporting on guest directory deletion! */ - hr = pProgress->notifyComplete(S_OK); + hr = pProgress->i_notifyComplete(S_OK); if (FAILED(hr)) return hr; @@ -2988,5 +2997,6 @@ } -HRESULT GuestSession::fileCreateTemp(const com::Utf8Str &aTemplateName, ULONG aMode, const com::Utf8Str &aPath, BOOL aSecure, ComPtr &aFile) +HRESULT GuestSession::fileCreateTemp(const com::Utf8Str &aTemplateName, ULONG aMode, const com::Utf8Str &aPath, BOOL aSecure, + ComPtr &aFile) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3073,5 +3083,6 @@ } -HRESULT GuestSession::fileOpen(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, ULONG aCreationMode, ComPtr &aFile) +HRESULT GuestSession::fileOpen(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, + ULONG aCreationMode, ComPtr &aFile) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3087,5 +3098,7 @@ } -HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, const com::Utf8Str &aSharingMode, ULONG aCreationMode, LONG64 aOffset, ComPtr &aFile) +HRESULT GuestSession::fileOpenEx(const com::Utf8Str &aPath, const com::Utf8Str &aOpenMode, const com::Utf8Str &aDisposition, + const com::Utf8Str &aSharingMode, ULONG aCreationMode, LONG64 aOffset, + ComPtr &aFile) { @@ -3240,5 +3253,6 @@ } -HRESULT GuestSession::fileRename(const com::Utf8Str &aSource, const com::Utf8Str &aDest, const std::vector &aFlags) +HRESULT GuestSession::fileRename(const com::Utf8Str &aSource, const com::Utf8Str &aDest, + const std::vector &aFlags) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3298,5 +3312,8 @@ } -HRESULT GuestSession::processCreate(const com::Utf8Str &aCommand, const std::vector &aArguments, const std::vector &aEnvironment, const std::vector &aFlags, ULONG aTimeoutMS, ComPtr &aGuestProcess) +HRESULT GuestSession::processCreate(const com::Utf8Str &aCommand, const std::vector &aArguments, + const std::vector &aEnvironment, + const std::vector &aFlags, + ULONG aTimeoutMS, ComPtr &aGuestProcess) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3307,9 +3324,14 @@ std::vector affinityIgnored; - return processCreateEx(aCommand, aArguments, aEnvironment, aFlags, aTimeoutMS, ProcessPriority_Default, affinityIgnored, aGuestProcess); -#endif /* VBOX_WITH_GUEST_CONTROL */ -} - -HRESULT GuestSession::processCreateEx(const com::Utf8Str &aCommand, const std::vector &aArguments, const std::vector &aEnvironment, const std::vector &aFlags, ULONG aTimeoutMS, ProcessPriority_T aPriority, const std::vector &aAffinity, ComPtr &aGuestProcess) + return processCreateEx(aCommand, aArguments, aEnvironment, aFlags, aTimeoutMS, ProcessPriority_Default, + affinityIgnored, aGuestProcess); +#endif /* VBOX_WITH_GUEST_CONTROL */ +} + +HRESULT GuestSession::processCreateEx(const com::Utf8Str &aCommand, const std::vector &aArguments, + const std::vector &aEnvironment, + const std::vector &aFlags, ULONG aTimeoutMS, + ProcessPriority_T aPriority, const std::vector &aAffinity, + ComPtr &aGuestProcess) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3450,5 +3472,6 @@ } -HRESULT GuestSession::symlinkRead(const com::Utf8Str &aSymlink, const std::vector &aFlags, com::Utf8Str &aTarget) +HRESULT GuestSession::symlinkRead(const com::Utf8Str &aSymlink, const std::vector &aFlags, + com::Utf8Str &aTarget) { #ifndef VBOX_WITH_GUEST_CONTROL @@ -3527,5 +3550,6 @@ } -HRESULT GuestSession::waitForArray(const std::vector &aWaitFor, ULONG aTimeoutMS, GuestSessionWaitResult_T *aReason) +HRESULT GuestSession::waitForArray(const std::vector &aWaitFor, ULONG aTimeoutMS, + GuestSessionWaitResult_T *aReason) { #ifndef VBOX_WITH_GUEST_CONTROL Index: /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (revision 50874) @@ -128,5 +128,5 @@ && !fCompleted) { - HRESULT hr = mProgress->notifyComplete(S_OK); + HRESULT hr = mProgress->i_notifyComplete(S_OK); if (FAILED(hr)) return VERR_COM_UNEXPECTED; /** @todo Find a better rc. */ @@ -151,8 +151,8 @@ && !fCompleted) { - HRESULT hr2 = mProgress->notifyComplete(hr, - COM_IIDOF(IGuestSession), - GuestSession::getStaticComponentName(), - strMsg.c_str()); + HRESULT hr2 = mProgress->i_notifyComplete(hr, + COM_IIDOF(IGuestSession), + GuestSession::getStaticComponentName(), + strMsg.c_str()); if (FAILED(hr2)) return hr2; Index: /trunk/src/VBox/Main/src-client/xpcom/module.cpp =================================================================== --- /trunk/src/VBox/Main/src-client/xpcom/module.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-client/xpcom/module.cpp (revision 50874) @@ -74,6 +74,4 @@ NS_DECL_CLASSINFO(MachineDebugger) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(MachineDebugger, IMachineDebugger) -NS_DECL_CLASSINFO(Progress) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Progress, IProgress) NS_DECL_CLASSINFO(RemoteUSBDevice) NS_IMPL_THREADSAFE_ISUPPORTS2_CI(RemoteUSBDevice, IHostUSBDevice, IUSBDevice) Index: /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/ApplianceImpl.cpp (revision 50874) @@ -140,5 +140,5 @@ { ovf::CIMOSType_CIMOS_FreeBSD_64, VBOXOSTYPE_FreeBSD_x64 }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS }, - { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this + { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS_x64 }, // there is no CIM 64-bit type for this { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS106 }, { ovf::CIMOSType_CIMOS_MACOS, VBOXOSTYPE_MacOS106_x64 }, @@ -189,5 +189,6 @@ // { ovf::CIMOSType_CIMOS_VMwareESXi = 104, // we can't run ESX in a VM { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7 }, - { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no CIM 64-bit type for this + { ovf::CIMOSType_CIMOS_Windows7, VBOXOSTYPE_Win7_x64 }, // there is no + // CIM 64-bit type for this { ovf::CIMOSType_CIMOS_CentOS, VBOXOSTYPE_RedHat }, { ovf::CIMOSType_CIMOS_CentOS_64, VBOXOSTYPE_RedHat_x64 }, @@ -815,6 +816,6 @@ /** @todo: Maybe too cost-intensive; try to find a lighter way */ while ( RTPathExists(tmpName) - || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, FALSE /* fForceNewUuid */, &harddisk) != VBOX_E_OBJECT_NOT_FOUND - ) + || mVirtualBox->OpenMedium(Bstr(tmpName).raw(), DeviceType_HardDisk, AccessMode_ReadWrite, + FALSE /* fForceNewUuid */, &harddisk) != VBOX_E_OBJECT_NOT_FOUND) { RTStrFree(tmpName); @@ -888,5 +889,6 @@ ++cOperations; // another one for creating the manifest - m->ulWeightForManifestOperation = (ULONG)((double)m->ulTotalDisksMB * .1 / 100); // use .5% of the progress for the manifest + m->ulWeightForManifestOperation = (ULONG)((double)m->ulTotalDisksMB * .1 / 100); // use .5% of the + // progress for the manifest ulTotalOperationsWeight += m->ulWeightForManifestOperation; } @@ -916,5 +918,8 @@ if (m->ulTotalDisksMB) { - m->ulWeightForXmlOperation = (ULONG)((double)m->ulTotalDisksMB * 1 / 100); // use 1% of the progress for OVF file upload (we didn't know the size at this point) + m->ulWeightForXmlOperation = (ULONG)((double)m->ulTotalDisksMB * 1 / 100); // use 1% of the progress + // for OVF file upload + // (we didn't know the + // size at this point) ulTotalOperationsWeight = m->ulTotalDisksMB + m->ulWeightForXmlOperation; } @@ -925,5 +930,7 @@ m->ulWeightForXmlOperation = 1; } - ULONG ulOVFCreationWeight = (ULONG)((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the creation of the OVF & the disks */ + ULONG ulOVFCreationWeight = (ULONG)((double)ulTotalOperationsWeight * 50.0 / 100.0); /* Use 50% for the + creation of the OVF + & the disks */ ulTotalOperationsWeight += ulOVFCreationWeight; break; @@ -931,6 +938,8 @@ } - Log(("Setting up progress object: ulTotalMB = %d, cDisks = %d, => cOperations = %d, ulTotalOperationsWeight = %d, m->ulWeightForXmlOperation = %d\n", - m->ulTotalDisksMB, m->cDisks, cOperations, ulTotalOperationsWeight, m->ulWeightForXmlOperation)); + Utf8Str str; + str = "Setting up progress object: ulTotalMB = %d, cDisks = %d, => cOperations = %d,"; + str += "ulTotalOperationsWeight = %d, m->ulWeightForXmlOperation = %d\n"; + Log((str.c_str(), m->ulTotalDisksMB, m->cDisks, cOperations, ulTotalOperationsWeight, m->ulWeightForXmlOperation)); rc = pProgress->init(mVirtualBox, static_cast(this), @@ -1172,5 +1181,5 @@ if (!task->pProgress.isNull()) - task->pProgress->notifyComplete(taskrc); + task->pProgress->i_notifyComplete(taskrc); LogFlowFuncLeave(); Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp (revision 50874) @@ -5662,5 +5662,5 @@ HRESULT rc = pTask->pMachine->deleteTaskWorker(*pTask); - pTask->pProgress->notifyComplete(rc); + pTask->pProgress->i_notifyComplete(rc); delete pTask; @@ -8394,5 +8394,5 @@ if (!mData->mSession.mProgress.isNull()) { - mData->mSession.mProgress->notifyComplete(rc); + mData->mSession.mProgress->i_notifyComplete(rc); mData->mSession.mProgress.setNull(); } @@ -13122,10 +13122,10 @@ { if (aReason == Uninit::Normal) - mData->mSession.mProgress->notifyComplete(S_OK); + mData->mSession.mProgress->i_notifyComplete(S_OK); else - mData->mSession.mProgress->notifyComplete(E_FAIL, - COM_IIDOF(ISession), - getComponentName(), - tr("The VM session was aborted")); + mData->mSession.mProgress->i_notifyComplete(E_FAIL, + COM_IIDOF(ISession), + getComponentName(), + tr("The VM session was aborted")); mData->mSession.mProgress.setNull(); } @@ -13312,5 +13312,5 @@ if (mData->mSession.mProgress) { - mData->mSession.mProgress->notifyComplete((HRESULT)iResult); + mData->mSession.mProgress->i_notifyComplete((HRESULT)iResult); mData->mSession.mProgress.setNull(); } @@ -13396,15 +13396,15 @@ Assert(mConsoleTaskData.mProgress); if (SUCCEEDED(iResult)) - mConsoleTaskData.mProgress->notifyComplete(S_OK); + mConsoleTaskData.mProgress->i_notifyComplete(S_OK); else { Utf8Str strErrMsg(aErrMsg); if (strErrMsg.length()) - mConsoleTaskData.mProgress->notifyComplete(iResult, - COM_IIDOF(ISession), - getComponentName(), - strErrMsg.c_str()); + mConsoleTaskData.mProgress->i_notifyComplete(iResult, + COM_IIDOF(ISession), + getComponentName(), + strErrMsg.c_str()); else - mConsoleTaskData.mProgress->notifyComplete(iResult); + mConsoleTaskData.mProgress->i_notifyComplete(iResult); } @@ -13601,8 +13601,8 @@ /* finalize the progress, someone might wait if a frontend * closes the session before powering on the VM. */ - mData->mSession.mProgress->notifyComplete(E_FAIL, - COM_IIDOF(ISession), - getComponentName(), - tr("The VM session was closed before any attempt to power it on")); + mData->mSession.mProgress->i_notifyComplete(E_FAIL, + COM_IIDOF(ISession), + getComponentName(), + tr("The VM session was closed before any attempt to power it on")); mData->mSession.mProgress.setNull(); } @@ -14644,14 +14644,14 @@ Assert(mConsoleTaskData.mProgress); if (SUCCEEDED(aRc)) - mConsoleTaskData.mProgress->notifyComplete(S_OK); + mConsoleTaskData.mProgress->i_notifyComplete(S_OK); else { if (aErrMsg.length()) - mConsoleTaskData.mProgress->notifyComplete(aRc, - COM_IIDOF(ISession), - getComponentName(), - aErrMsg.c_str()); + mConsoleTaskData.mProgress->i_notifyComplete(aRc, + COM_IIDOF(ISession), + getComponentName(), + aErrMsg.c_str()); else - mConsoleTaskData.mProgress->notifyComplete(aRc); + mConsoleTaskData.mProgress->i_notifyComplete(aRc); } Index: /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/MachineImplCloneVM.cpp (revision 50874) @@ -62,5 +62,6 @@ struct MachineCloneVMPrivate { - MachineCloneVMPrivate(MachineCloneVM *a_q, ComObjPtr &a_pSrcMachine, ComObjPtr &a_pTrgMachine, CloneMode_T a_mode, const RTCList &opts) + MachineCloneVMPrivate(MachineCloneVM *a_q, ComObjPtr &a_pSrcMachine, ComObjPtr &a_pTrgMachine, + CloneMode_T a_mode, const RTCList &opts) : q_ptr(a_q) , p(a_pSrcMachine) @@ -90,5 +91,5 @@ HRESULT rc = pTask->q_ptr->run(); - pTask->pProgress->notifyComplete(rc); + pTask->pProgress->i_notifyComplete(rc); pTask->q_ptr->destroy(); @@ -104,7 +105,10 @@ inline HRESULT addSaveState(const ComObjPtr &machine, ULONG &uCount, ULONG &uTotalWeight); inline HRESULT queryBaseName(const ComPtr &pMedium, Utf8Str &strBaseName) const; - HRESULT queryMediasForMachineState(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight); - HRESULT queryMediasForMachineAndChildStates(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight); - HRESULT queryMediasForAllStates(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight); + HRESULT queryMediasForMachineState(const RTCList > &machineList, + bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight); + HRESULT queryMediasForMachineAndChildStates(const RTCList > &machineList, + bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight); + HRESULT queryMediasForAllStates(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, + ULONG &uTotalWeight); /* MachineCloneVM::run helper: */ @@ -115,5 +119,7 @@ void updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const; void updateStateFile(settings::SnapshotsList &snl, const Guid &id, const Utf8Str &strFile) const; - HRESULT createDifferencingMedium(const ComObjPtr &pMachine, const ComObjPtr &pParent, const Utf8Str &strSnapshotFolder, RTCList > &newMedia, ComObjPtr *ppDiff) const; + HRESULT createDifferencingMedium(const ComObjPtr &pMachine, const ComObjPtr &pParent, + const Utf8Str &strSnapshotFolder, RTCList > &newMedia, + ComObjPtr *ppDiff) const; static int copyStateFileProgress(unsigned uPercentage, void *pvUser); @@ -134,6 +140,7 @@ }; -HRESULT MachineCloneVMPrivate::createMachineList(const ComPtr &pSnapshot, RTCList< ComObjPtr > &machineList) const -{ +HRESULT MachineCloneVMPrivate::createMachineList(const ComPtr &pSnapshot, + RTCList< ComObjPtr > &machineList) const + { HRESULT rc = S_OK; Bstr name; @@ -158,5 +165,6 @@ } -void MachineCloneVMPrivate::updateProgressStats(MEDIUMTASKCHAIN &mtc, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) const +void MachineCloneVMPrivate::updateProgressStats(MEDIUMTASKCHAIN &mtc, bool fAttachLinked, + ULONG &uCount, ULONG &uTotalWeight) const { if (fAttachLinked) @@ -205,5 +213,6 @@ int vrc = RTFileQuerySize(sst.strSaveStateFile.c_str(), &cbSize); if (RT_FAILURE(vrc)) - return p->setError(VBOX_E_IPRT_ERROR, p->tr("Could not query file size of '%s' (%Rrc)"), sst.strSaveStateFile.c_str(), vrc); + return p->setError(VBOX_E_IPRT_ERROR, p->tr("Could not query file size of '%s' (%Rrc)"), + sst.strSaveStateFile.c_str(), vrc); /* same rule as above: count both the data which needs to * be read and written */ @@ -228,5 +237,6 @@ } -HRESULT MachineCloneVMPrivate::queryMediasForMachineState(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) +HRESULT MachineCloneVMPrivate::queryMediasForMachineState(const RTCList > &machineList, + bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) { /* This mode is pretty straightforward. We didn't need to know about any @@ -306,5 +316,6 @@ } -HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) +HRESULT MachineCloneVMPrivate::queryMediasForMachineAndChildStates(const RTCList > &machineList, + bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) { /* This is basically a three step approach. First select all medias @@ -468,5 +479,6 @@ } -HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList > &machineList, bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) +HRESULT MachineCloneVMPrivate::queryMediasForAllStates(const RTCList > &machineList, + bool fAttachLinked, ULONG &uCount, ULONG &uTotalWeight) { /* In this case we create a exact copy of the original VM. This means just @@ -597,5 +609,6 @@ } -void MachineCloneVMPrivate::updateStorageLists(settings::StorageControllersList &sc, const Bstr &bstrOldId, const Bstr &bstrNewId) const +void MachineCloneVMPrivate::updateStorageLists(settings::StorageControllersList &sc, + const Bstr &bstrOldId, const Bstr &bstrNewId) const { settings::StorageControllersList::iterator it3; @@ -619,5 +632,6 @@ } -void MachineCloneVMPrivate::updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, const Bstr &bstrNewId) const +void MachineCloneVMPrivate::updateSnapshotStorageLists(settings::SnapshotsList &sl, const Bstr &bstrOldId, + const Bstr &bstrNewId) const { settings::SnapshotsList::iterator it; @@ -644,5 +658,7 @@ } -HRESULT MachineCloneVMPrivate::createDifferencingMedium(const ComObjPtr &pMachine, const ComObjPtr &pParent, const Utf8Str &strSnapshotFolder, RTCList > &newMedia, ComObjPtr *ppDiff) const +HRESULT MachineCloneVMPrivate::createDifferencingMedium(const ComObjPtr &pMachine, const ComObjPtr &pParent, + const Utf8Str &strSnapshotFolder, RTCList > &newMedia, + ComObjPtr *ppDiff) const { HRESULT rc = S_OK; @@ -716,6 +732,7 @@ ///////////////////////////////////////////////////////////////////////////// -MachineCloneVM::MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, const RTCList &opts) - : d_ptr(new MachineCloneVMPrivate(this, pSrcMachine, pTrgMachine, mode, opts)) +MachineCloneVM::MachineCloneVM(ComObjPtr pSrcMachine, ComObjPtr pTrgMachine, CloneMode_T mode, + const RTCList &opts) : + d_ptr(new MachineCloneVMPrivate(this, pSrcMachine, pTrgMachine, mode, opts)) { } @@ -881,7 +898,13 @@ switch (d->mode) { - case CloneMode_MachineState: d->queryMediasForMachineState(machineList, fAttachLinked, uCount, uTotalWeight); break; - case CloneMode_MachineAndChildStates: d->queryMediasForMachineAndChildStates(machineList, fAttachLinked, uCount, uTotalWeight); break; - case CloneMode_AllStates: d->queryMediasForAllStates(machineList, fAttachLinked, uCount, uTotalWeight); break; + case CloneMode_MachineState: d->queryMediasForMachineState(machineList, fAttachLinked, + uCount, uTotalWeight); + break; + case CloneMode_MachineAndChildStates: d->queryMediasForMachineAndChildStates(machineList, fAttachLinked, + uCount, uTotalWeight); + break; + case CloneMode_AllStates: d->queryMediasForAllStates(machineList, fAttachLinked, uCount, + uTotalWeight); + break; } @@ -1013,5 +1036,6 @@ if (FAILED(rc)) throw rc; /* The absolute name of the snapshot folder. */ - strTrgSnapshotFolder = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, trgMCF.machineUserData.strSnapshotFolder.c_str()); + strTrgSnapshotFolder = Utf8StrFmt("%s%c%s", strTrgMachineFolder.c_str(), RTPATH_DELIMITER, + trgMCF.machineUserData.strSnapshotFolder.c_str()); /* Should we rename the disk names. */ @@ -1041,5 +1065,6 @@ if (FAILED(rc)) throw rc; - rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Cloning Disk '%ls' ..."), bstrSrcName.raw()).raw(), mt.uWeight); + rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Cloning Disk '%ls' ..."), bstrSrcName.raw()).raw(), + mt.uWeight); if (FAILED(rc)) throw rc; @@ -1142,5 +1167,6 @@ * template: "new name-disk1.vdi". */ if (strSrcTest == strOldVMName) - strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), RTPathSuffix(Utf8Str(bstrSrcName).c_str())); + strNewName = Utf8StrFmt("%s%s", trgMCF.machineUserData.strName.c_str(), + RTPathSuffix(Utf8Str(bstrSrcName).c_str())); else if ( strSrcTest.startsWith("{") && strSrcTest.endsWith("}")) @@ -1150,5 +1176,6 @@ Guid temp_guid(strSrcTest); if (temp_guid.isValid() && !temp_guid.isZero()) - strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), RTPathSuffix(strNewName.c_str())); + strNewName = Utf8StrFmt("%s%s", newId.toStringCurly().c_str(), + RTPathSuffix(strNewName.c_str())); } else @@ -1322,5 +1349,6 @@ if (RT_FAILURE(vrc)) throw p->setError(VBOX_E_IPRT_ERROR, - p->tr("Could not create snapshots folder '%s' (%Rrc)"), strTrgSnapshotFolder.c_str(), vrc); + p->tr("Could not create snapshots folder '%s' (%Rrc)"), + strTrgSnapshotFolder.c_str(), vrc); } /* Clone all save state files. */ @@ -1328,16 +1356,20 @@ { SAVESTATETASK sst = d->llSaveStateFiles.at(i); - const Utf8Str &strTrgSaveState = Utf8StrFmt("%s%c%s", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, RTPathFilename(sst.strSaveStateFile.c_str())); + const Utf8Str &strTrgSaveState = Utf8StrFmt("%s%c%s", strTrgSnapshotFolder.c_str(), RTPATH_DELIMITER, + RTPathFilename(sst.strSaveStateFile.c_str())); /* Move to next sub-operation. */ - rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Copy save state file '%s' ..."), RTPathFilename(sst.strSaveStateFile.c_str())).raw(), sst.uWeight); + rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Copy save state file '%s' ..."), + RTPathFilename(sst.strSaveStateFile.c_str())).raw(), sst.uWeight); if (FAILED(rc)) throw rc; /* Copy the file only if it was not copied already. */ if (!newFiles.contains(strTrgSaveState.c_str())) { - int vrc = RTFileCopyEx(sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), 0, MachineCloneVMPrivate::copyStateFileProgress, &d->pProgress); + int vrc = RTFileCopyEx(sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), 0, + MachineCloneVMPrivate::copyStateFileProgress, &d->pProgress); if (RT_FAILURE(vrc)) throw p->setError(VBOX_E_IPRT_ERROR, - p->tr("Could not copy state file '%s' to '%s' (%Rrc)"), sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), vrc); + p->tr("Could not copy state file '%s' to '%s' (%Rrc)"), + sst.strSaveStateFile.c_str(), strTrgSaveState.c_str(), vrc); newFiles.append(strTrgSaveState); } @@ -1351,5 +1383,6 @@ { - rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Create Machine Clone '%s' ..."), trgMCF.machineUserData.strName.c_str()).raw(), 1); + rc = d->pProgress->SetNextOperation(BstrFmt(p->tr("Create Machine Clone '%s' ..."), + trgMCF.machineUserData.strName.c_str()).raw(), 1); if (FAILED(rc)) throw rc; /* After modifying the new machine config, we can copy the stuff Index: /trunk/src/VBox/Main/src-server/MediumImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/MediumImpl.cpp (revision 50874) @@ -682,8 +682,6 @@ /* complete the progress if run asynchronously */ if (pTask->isAsync()) - { if (!pTask->mProgress.isNull()) - pTask->mProgress->notifyComplete(rc); - } + pTask->mProgress->i_notifyComplete(rc); /* pTask is no longer needed, delete it. */ Index: /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/ProgressProxyImpl.cpp (revision 50874) @@ -158,5 +158,5 @@ HRESULT hrc = S_OK; if (!mCompleted) - hrc = Progress::notifyComplete(aResultCode); + hrc = Progress::i_notifyComplete(aResultCode); return hrc; } @@ -178,5 +178,5 @@ va_list va; va_start(va, aText); - hrc = Progress::notifyCompleteV(aResultCode, aIID, pcszComponent, aText, va); + hrc = Progress::i_notifyCompleteV(aResultCode, aIID, pcszComponent, aText, va); va_end(va); } @@ -376,16 +376,16 @@ Utf8Str strText(bstrText); LogFlowThisFunc(("Got ErrorInfo(%s); hrcResult=%Rhrc\n", strText.c_str(), hrcResult)); - Progress::notifyComplete((HRESULT)hrcResult, - Guid(bstrIID).ref(), - Utf8Str(bstrComponent).c_str(), - "%s", strText.c_str()); + Progress::i_notifyComplete((HRESULT)hrcResult, + Guid(bstrIID).ref(), + Utf8Str(bstrComponent).c_str(), + "%s", strText.c_str()); } else { LogFlowThisFunc(("ErrorInfo failed with hrc=%Rhrc; hrcResult=%Rhrc\n", hrc, hrcResult)); - Progress::notifyComplete((HRESULT)hrcResult, - COM_IIDOF(IProgress), - "ProgressProxy", - tr("No error info")); + Progress::i_notifyComplete((HRESULT)hrcResult, + COM_IIDOF(IProgress), + "ProgressProxy", + tr("No error info")); } } @@ -467,5 +467,6 @@ double rdPercent = ((double)uPct / 100 * muOtherProgressWeight + muOtherProgressStartWeight) / m_ulTotalOperationsWeight * 100; - *aPercent = RT_MIN((ULONG)rdPercent, 99); /* mptrOtherProgress is cleared when its completed, so we can never return 100%. */ + *aPercent = RT_MIN((ULONG)rdPercent, 99); /* mptrOtherProgress is cleared when its completed, + so we can never return 100%. */ } } Index: /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp (revision 50874) @@ -1422,6 +1422,9 @@ && mData->mCurrentSnapshot->i_getDepth() >= SETTINGS_SNAPSHOT_DEPTH_MAX) { + Utf8Str str; + str = "Cannot take another snapshot for machine '%s', because it exceeds the maximum"; + str += "snapshot depth limit. Please delete some earlier snapshot which you no longer need"; return setError(VBOX_E_INVALID_OBJECT_STATE, - tr("Cannot take another snapshot for machine '%s', because it exceeds the maximum snapshot depth limit. Please delete some earlier snapshot which you no longer need"), + tr(str.c_str()), mUserData->s.strName.c_str()); } @@ -1731,5 +1734,6 @@ ++ulTotalWeight; // assume one MB weight for each differencing hard disk to manage Assert(pAttach->i_getMedium()); - LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, pAttach->i_getMedium()->i_getName().c_str())); + LogFlowThisFunc(("op %d: considering hard disk attachment %s\n", ulOpCount, + pAttach->i_getMedium()->i_getName().c_str())); } } @@ -1800,8 +1804,8 @@ /* we might have been uninitialized because the session was accidentally * closed by the client, so don't assert */ - aTask.pProgress->notifyComplete(E_FAIL, - COM_IIDOF(IMachine), - getComponentName(), - tr("The session has been accidentally closed")); + aTask.pProgress->i_notifyComplete(E_FAIL, + COM_IIDOF(IMachine), + getComponentName(), + tr("The session has been accidentally closed")); LogFlowThisFuncLeave(); @@ -2036,5 +2040,5 @@ /* set the result (this will try to fetch current error info on failure) */ - aTask.pProgress->notifyComplete(rc); + aTask.pProgress->i_notifyComplete(rc); if (SUCCEEDED(rc)) @@ -2110,18 +2114,27 @@ AutoWriteLock snapshotLock(pSnapshot COMMA_LOCKVAL_SRC_POS); + Utf8Str str; size_t childrenCount = pSnapshot->i_getChildrenCount(); if (childrenCount > 1) + { + str = "Snapshot '%s' of the machine '%s' cannot be deleted, because it has %d child snapshots,"; + str += "which is more than the one snapshot allowed for deletion"; return setError(VBOX_E_INVALID_OBJECT_STATE, - tr("Snapshot '%s' of the machine '%s' cannot be deleted, because it has %d child snapshots, which is more than the one snapshot allowed for deletion"), + tr(str.c_str()), pSnapshot->i_getName().c_str(), mUserData->s.strName.c_str(), childrenCount); + } if (pSnapshot == mData->mCurrentSnapshot && childrenCount >= 1) + { + str = "Snapshot '%s' of the machine '%s' cannot be deleted, because it is the current"; + str += "snapshot and has one child snapshot"; return setError(VBOX_E_INVALID_OBJECT_STATE, - tr("Snapshot '%s' of the machine '%s' cannot be deleted, because it is the current snapshot and has one child snapshot"), + tr(str.c_str()), pSnapshot->i_getName().c_str(), mUserData->s.strName.c_str()); + } /* If the snapshot being deleted is the current one, ensure current @@ -2340,8 +2353,8 @@ /* we might have been uninitialized because the session was accidentally * closed by the client, so don't assert */ - aTask.pProgress->notifyComplete(E_FAIL, - COM_IIDOF(IMachine), - getComponentName(), - tr("The session has been accidentally closed")); + aTask.pProgress->i_notifyComplete(E_FAIL, + COM_IIDOF(IMachine), + getComponentName(), + tr("The session has been accidentally closed")); LogFlowThisFuncLeave(); return; @@ -2906,5 +2919,5 @@ // report the result (this will try to fetch current error info on failure) - aTask.pProgress->notifyComplete(rc); + aTask.pProgress->i_notifyComplete(rc); if (SUCCEEDED(rc)) Index: /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/VFSExplorerImpl.cpp (revision 50874) @@ -78,5 +78,6 @@ * @return */ -HRESULT VFSExplorer::init(VFSType_T aType, Utf8Str aFilePath, Utf8Str aHostname, Utf8Str aUsername, Utf8Str aPassword, VirtualBox *aVirtualBox) +HRESULT VFSExplorer::init(VFSType_T aType, Utf8Str aFilePath, Utf8Str aHostname, Utf8Str aUsername, + Utf8Str aPassword, VirtualBox *aVirtualBox) { /* Enclose the state transition NotReady->InInit->Ready */ @@ -312,5 +313,7 @@ if ( name != "." && name != "..") - fileList.push_back(VFSExplorer::Data::DirEntry(name, i_RTToVFSFileType(entry.Info.Attr.fMode), entry.Info.cbObject, entry.Info.Attr.fMode & (RTFS_UNIX_IRWXU | RTFS_UNIX_IRWXG | RTFS_UNIX_IRWXO))); + fileList.push_back(VFSExplorer::Data::DirEntry(name, i_RTToVFSFileType(entry.Info.Attr.fMode), + entry.Info.cbObject, + entry.Info.Attr.fMode & (RTFS_UNIX_IRWXU | RTFS_UNIX_IRWXG | RTFS_UNIX_IRWXO))); } } @@ -339,5 +342,5 @@ if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); + aTask->progress->i_notifyComplete(rc); LogFlowFunc(("rc=%Rhrc\n", rc)); @@ -386,5 +389,5 @@ if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); + aTask->progress->i_notifyComplete(rc); LogFlowFunc(("rc=%Rhrc\n", rc)); @@ -428,5 +431,6 @@ { /* Set always read/write permissions of the current logged in user. */ - fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, VFSFileType_Directory, 0, RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR)); + fileList.push_back(VFSExplorer::Data::DirEntry(pBuckets->pszName, VFSFileType_Directory, + 0, RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR)); pBuckets = pBuckets->pNext; } @@ -445,5 +449,6 @@ Utf8Str name(pKeys->pszName); /* Set always read/write permissions of the current logged in user. */ - fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, VFSFileType_File, pKeys->cbFile, RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR)); + fileList.push_back(VFSExplorer::Data::DirEntry(pKeys->pszName, VFSFileType_File, pKeys->cbFile, + RTFS_UNIX_IRUSR | RTFS_UNIX_IWUSR)); pKeys = pKeys->pNext; } @@ -466,5 +471,5 @@ if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); + aTask->progress->i_notifyComplete(rc); LogFlowFunc(("rc=%Rhrc\n", rc)); @@ -520,5 +525,5 @@ if (!aTask->progress.isNull()) - aTask->progress->notifyComplete(rc); + aTask->progress->i_notifyComplete(rc); LogFlowFunc(("rc=%Rhrc\n", rc)); Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp (revision 50874) @@ -2560,5 +2560,5 @@ } - d->progress->notifyComplete(rc); + d->progress->i_notifyComplete(rc); LogFlowFuncLeave(); Index: /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/generic/NetIf-generic.cpp (revision 50874) @@ -157,5 +157,6 @@ } -int NetIfEnableStaticIpConfigV6(VirtualBox * /* vBox */, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address, IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength) +int NetIfEnableStaticIpConfigV6(VirtualBox * /* vBox */, HostNetworkInterface * pIf, IN_BSTR aOldIPV6Address, + IN_BSTR aIPV6Address, ULONG aIPV6MaskPrefixLength) { char szAddress[5*8 + 1 + 5 + 1]; @@ -205,8 +206,8 @@ if (RT_FAILURE(rc)) { - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "Failed to get program path, rc=%Rrc\n", rc); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "Failed to get program path, rc=%Rrc\n", rc); return rc; } @@ -235,8 +236,8 @@ if (!strncmp(VBOXNETADPCTL_NAME ":", szBuf, sizeof(VBOXNETADPCTL_NAME))) { - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "%s", szBuf); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "%s", szBuf); pclose(fp); return E_FAIL; @@ -254,8 +255,9 @@ if (RT_FAILURE(rc)) { - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "Failed to get config info for %s (as reported by '" VBOXNETADPCTL_NAME " add')\n", szBuf); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "Failed to get config info for %s (as reported by '" + VBOXNETADPCTL_NAME " add')\n", szBuf); } else @@ -273,8 +275,8 @@ if ((rc = pclose(fp)) != 0) { - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d)", rc); rc = VERR_INTERNAL_ERROR; } @@ -284,13 +286,14 @@ /* Failed to add an interface */ rc = VERR_PERMISSION_DENIED; - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "Failed to execute '" VBOXNETADPCTL_NAME " add' (exit status: %d). Check permissions!", rc); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "Failed to execute '" VBOXNETADPCTL_NAME + " add' (exit status: %d). Check permissions!", rc); pclose(fp); } } if (RT_SUCCESS(rc)) - progress->notifyComplete(rc); + progress->i_notifyComplete(rc); else hrc = E_FAIL; @@ -337,15 +340,15 @@ rc = NetIfAdpCtl(Utf8Str(ifname).c_str(), "remove", NULL, NULL); if (RT_FAILURE(rc)) - progress->notifyComplete(E_FAIL, - COM_IIDOF(IHostNetworkInterface), - HostNetworkInterface::getStaticComponentName(), - "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc); + progress->i_notifyComplete(E_FAIL, + COM_IIDOF(IHostNetworkInterface), + HostNetworkInterface::getStaticComponentName(), + "Failed to execute '" VBOXNETADPCTL_NAME "' (exit status: %d)", rc); else - progress->notifyComplete(S_OK); + progress->i_notifyComplete(S_OK); } } else { - progress->notifyComplete(hr); + progress->i_notifyComplete(hr); rc = VERR_INTERNAL_ERROR; } Index: /trunk/src/VBox/Main/src-server/xpcom/server.cpp =================================================================== --- /trunk/src/VBox/Main/src-server/xpcom/server.cpp (revision 50873) +++ /trunk/src/VBox/Main/src-server/xpcom/server.cpp (revision 50874) @@ -114,7 +114,4 @@ NS_IMPL_THREADSAFE_ISUPPORTS1_CI(SnapshotMachine, IMachine) -NS_DECL_CLASSINFO(Progress) -NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Progress, IProgress) - NS_DECL_CLASSINFO(ProgressProxy) NS_IMPL_THREADSAFE_ISUPPORTS1_CI(ProgressProxy, IProgress)