Changeset 52082 in vbox

Timestamp:

Jul 17, 2014 5:18:56 PM (10 years ago)

Author:

vboxsync

Message:

6813 - DisplayImpl using COM Wrappers

Location:

trunk/src/VBox/Main

Files:

• include/GuestImpl.h (modified) (5 diffs)
• src-client/ConsoleImpl.cpp (modified) (4 diffs)
• src-client/ConsoleImpl2.cpp (modified) (1 diff)
• src-client/GuestCtrlImpl.cpp (modified) (18 diffs)
• src-client/GuestDnDPrivate.cpp (modified) (2 diffs)
• src-client/GuestImpl.cpp (modified) (36 diffs)
• src-client/GuestSessionImpl.cpp (modified) (6 diffs)
• src-client/GuestSessionImplTasks.cpp (modified) (1 diff)
• src-client/VMMDevInterface.cpp (modified) (9 diffs)
• src-client/xpcom/module.cpp (modified) (1 diff)

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

@@ -18 +18 @@
 #define ____H_GUESTIMPL
 
+#include "GuestWrap.h"
 #include "VirtualBoxBase.h"
 #include <iprt/list.h>
@@ -50 +51 @@
 
 class ATL_NO_VTABLE Guest :
-    public VirtualBoxBase,
-    VBOX_SCRIPTABLE_IMPL(IGuest)
+    public GuestWrap
 {
 public:
-    VIRTUALBOXBASE_ADD_ERRORINFO_SUPPORT(Guest, IGuest)
-
-    DECLARE_NOT_AGGREGATABLE(Guest)
-
-    DECLARE_PROTECT_FINAL_CONSTRUCT()
-
-    BEGIN_COM_MAP(Guest)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IGuest)
-    END_COM_MAP()
 
     DECLARE_EMPTY_CTOR_DTOR (Guest)
 
-    HRESULT FinalConstruct(void);
-    void FinalRelease(void);
+    HRESULT FinalConstruct();
+    void FinalRelease();
 
     // Public initializer/uninitializer for internal purposes only.
-    HRESULT init (Console *aParent);
+    HRESULT init(Console *aParent);
     void uninit();
 
-    // IGuest properties.
-    STDMETHOD(COMGETTER(OSTypeId))(BSTR *aOSTypeId);
-    STDMETHOD(COMGETTER(AdditionsRunLevel))(AdditionsRunLevelType_T *aRunLevel);
-    STDMETHOD(COMGETTER(AdditionsVersion))(BSTR *a_pbstrAdditionsVersion);
-    STDMETHOD(COMGETTER(AdditionsRevision))(ULONG *a_puAdditionsRevision);
-    STDMETHOD(COMGETTER(DnDSource))(IGuestDnDSource ** aSource);
-    STDMETHOD(COMGETTER(DnDTarget))(IGuestDnDTarget ** aTarget);
-    STDMETHOD(COMGETTER(EventSource))(IEventSource ** aEventSource);
-    STDMETHOD(COMGETTER(Facilities))(ComSafeArrayOut(IAdditionsFacility *, aFacilities));
-    STDMETHOD(COMGETTER(Sessions))(ComSafeArrayOut(IGuestSession *, aSessions));
-    STDMETHOD(COMGETTER(MemoryBalloonSize)) (ULONG *aMemoryBalloonSize);
-    STDMETHOD(COMSETTER(MemoryBalloonSize)) (ULONG aMemoryBalloonSize);
-    STDMETHOD(COMGETTER(StatisticsUpdateInterval)) (ULONG *aUpdateInterval);
-    STDMETHOD(COMSETTER(StatisticsUpdateInterval)) (ULONG aUpdateInterval);
-    // IGuest methods.
-    STDMETHOD(GetFacilityStatus)(AdditionsFacilityType_T aType, LONG64 *aTimestamp, AdditionsFacilityStatus_T *aStatus);
-    STDMETHOD(GetAdditionsStatus)(AdditionsRunLevelType_T aLevel, BOOL *aActive);
-    STDMETHOD(SetCredentials)(IN_BSTR aUsername, IN_BSTR aPassword,
-                              IN_BSTR aDomain, BOOL aAllowInteractiveLogon);
-    // Guest control.
-    STDMETHOD(CreateSession)(IN_BSTR aUser, IN_BSTR aPassword, IN_BSTR aDomain, IN_BSTR aSessionName, IGuestSession **aGuestSession);
-    STDMETHOD(FindSession)(IN_BSTR aSessionName, ComSafeArrayOut(IGuestSession *, aSessions));
-    // Misc stuff
-    STDMETHOD(InternalGetStatistics)(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon, ULONG *aMemShared, ULONG *aMemCache,
-                                     ULONG *aPageTotal, ULONG *aMemAllocTotal, ULONG *aMemFreeTotal, ULONG *aMemBalloonTotal, ULONG *aMemSharedTotal);
-    STDMETHOD(UpdateGuestAdditions)(IN_BSTR aSource, ComSafeArrayIn(IN_BSTR, aArguments), ComSafeArrayIn(AdditionsUpdateFlag_T, aFlags), IProgress **aProgress);
 
 public:
@@ -106 +70 @@
 #ifdef VBOX_WITH_GUEST_CONTROL
     /** Static callback for handling guest control notifications. */
-    static DECLCALLBACK(int) notifyCtrlDispatcher(void *pvExtension, uint32_t u32Function, void *pvData, uint32_t cbData);
-    static DECLCALLBACK(void) staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
+    static DECLCALLBACK(int) i_notifyCtrlDispatcher(void *pvExtension, uint32_t u32Function, void *pvData, uint32_t cbData);
+    static DECLCALLBACK(void) i_staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick);
 #endif
     /** @}  */
@@ -114 +78 @@
     /** @name Public internal methods.
      * @{ */
-    void enableVMMStatistics(BOOL aEnable) { mCollectVMMStats = aEnable; };
-    void setAdditionsInfo(Bstr aInterfaceVersion, VBOXOSTYPE aOsType);
-    void setAdditionsInfo2(uint32_t a_uFullVersion, const char *a_pszName, uint32_t a_uRevision, uint32_t a_fFeatures);
-    bool facilityIsActive(VBoxGuestFacilityType enmFacility);
-    void facilityUpdate(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus, uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS);
-    ComObjPtr<Console> getConsole(void) { return mParent; }
-    void setAdditionsStatus(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus, uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS);
-    void onUserStateChange(Bstr aUser, Bstr aDomain, VBoxGuestUserState enmState, const uint8_t *puDetails, uint32_t cbDetails);
-    void setSupportedFeatures(uint32_t aCaps);
-    HRESULT setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
-    BOOL isPageFusionEnabled();
-    static HRESULT setErrorStatic(HRESULT aResultCode,
-                                  const Utf8Str &aText)
+    void i_enableVMMStatistics(BOOL aEnable) { mCollectVMMStats = aEnable; };
+    void i_setAdditionsInfo(com::Utf8Str aInterfaceVersion, VBOXOSTYPE aOsType);
+    void i_setAdditionsInfo2(uint32_t a_uFullVersion, const char *a_pszName, uint32_t a_uRevision, uint32_t a_fFeatures);
+    bool i_facilityIsActive(VBoxGuestFacilityType enmFacility);
+    void i_facilityUpdate(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
+                          uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS);
+    ComObjPtr<Console> i_getConsole(void) { return mParent; }
+    void i_setAdditionsStatus(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
+                              uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS);
+    void i_onUserStateChange(Bstr aUser, Bstr aDomain, VBoxGuestUserState enmState, const uint8_t *puDetails, uint32_t cbDetails);
+    void i_setSupportedFeatures(uint32_t aCaps);
+    HRESULT i_setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal);
+    BOOL i_isPageFusionEnabled();
+    static HRESULT i_setErrorStatic(HRESULT aResultCode, const Utf8Str &aText)
     {
         return setErrorInternal(aResultCode, getStaticClassIID(), getStaticComponentName(), aText, false, true);
     }
 #ifdef VBOX_WITH_GUEST_CONTROL
-    int         dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
-    uint32_t    getAdditionsVersion(void) { return mData.mAdditionsVersionFull; }
-    int         sessionRemove(GuestSession *pSession);
-    int         sessionCreate(const GuestSessionStartupInfo &ssInfo, const GuestCredentials &guestCreds, ComObjPtr<GuestSession> &pGuestSession);
-    inline bool sessionExists(uint32_t uSessionID);
+    int         i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb);
+    uint32_t    i_getAdditionsVersion(void) { return mData.mAdditionsVersionFull; }
+    int         i_sessionRemove(GuestSession *pSession);
+    int         i_sessionCreate(const GuestSessionStartupInfo &ssInfo, const GuestCredentials &guestCreds,
+                                ComObjPtr<GuestSession> &pGuestSession);
+    inline bool i_sessionExists(uint32_t uSessionID);
+
 #endif
     /** @}  */
 
 private:
+
+     // wrapped IGuest properties
+     HRESULT getOSTypeId(com::Utf8Str &aOSTypeId);
+     HRESULT getAdditionsRunLevel(AdditionsRunLevelType_T *aAdditionsRunLevel);
+     HRESULT getAdditionsVersion(com::Utf8Str &aAdditionsVersion);
+     HRESULT getAdditionsRevision(ULONG *aAdditionsRevision);
+     HRESULT getDnDSource(ComPtr<IGuestDnDSource> &aDnDSource);
+     HRESULT getDnDTarget(ComPtr<IGuestDnDTarget> &aDnDTarget);
+     HRESULT getEventSource(ComPtr<IEventSource> &aEventSource);
+     HRESULT getFacilities(std::vector<ComPtr<IAdditionsFacility> > &aFacilities);
+     HRESULT getSessions(std::vector<ComPtr<IGuestSession> > &aSessions);
+     HRESULT getMemoryBalloonSize(ULONG *aMemoryBalloonSize);
+     HRESULT setMemoryBalloonSize(ULONG aMemoryBalloonSize);
+     HRESULT getStatisticsUpdateInterval(ULONG *aStatisticsUpdateInterval);
+     HRESULT setStatisticsUpdateInterval(ULONG aStatisticsUpdateInterval);
+     HRESULT internalGetStatistics(ULONG *aCpuUser,
+                                   ULONG *aCpuKernel,
+                                   ULONG *aCpuIdle,
+                                   ULONG *aMemTotal,
+                                   ULONG *aMemFree,
+                                   ULONG *aMemBalloon,
+                                   ULONG *aMemShared,
+                                   ULONG *aMemCache,
+                                   ULONG *aPagedTotal,
+                                   ULONG *aMemAllocTotal,
+                                   ULONG *aMemFreeTotal,
+                                   ULONG *aMemBalloonTotal,
+                                   ULONG *aMemSharedTotal);
+     HRESULT getFacilityStatus(AdditionsFacilityType_T aFacility,
+                               LONG64 *aTimestamp,
+                               AdditionsFacilityStatus_T *aStatus);
+     HRESULT getAdditionsStatus(AdditionsRunLevelType_T aLevel,
+                                BOOL *aActive);
+     HRESULT setCredentials(const com::Utf8Str &aUserName,
+                            const com::Utf8Str &aPassword,
+                            const com::Utf8Str &aDomain,
+                            BOOL aAllowInteractiveLogon);
+
+     // wrapped IGuest methods
+     HRESULT createSession(const com::Utf8Str &aUser,
+                           const com::Utf8Str &aPassword,
+                           const com::Utf8Str &aDomain,
+                           const com::Utf8Str &aSessionName,
+                           ComPtr<IGuestSession> &aGuestSession);
+
+     HRESULT findSession(const com::Utf8Str &aSessionName,
+                         std::vector<ComPtr<IGuestSession> > &aSessions);
+     HRESULT updateGuestAdditions(const com::Utf8Str &aSource,
+                                  const std::vector<com::Utf8Str> &aArguments,
+                                  const std::vector<AdditionsUpdateFlag_T> &aFlags,
+                                  ComPtr<IProgress> &aProgress);
+
+
     /** @name Private internal methods.
      * @{ */
-    void updateStats(uint64_t iTick);
-    static int staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
-                                       STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser);
+    void i_updateStats(uint64_t iTick);
+    static int i_staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
+                                         STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser);
+
     /** @}  */
 
@@ -160 +181 @@
         { }
 
-        Bstr                        mOSTypeId;
+        Utf8Str                     mOSTypeId;
         FacilityMap                 mFacilityMap;
         AdditionsRunLevelType_T     mAdditionsRunLevel;
         uint32_t                    mAdditionsVersionFull;
-        Bstr                        mAdditionsVersionNew;
+        Utf8Str                     mAdditionsVersionNew;
         uint32_t                    mAdditionsRevision;
         uint32_t                    mAdditionsFeatures;
-        Bstr                        mInterfaceVersion;
+        Utf8Str                     mInterfaceVersion;
         GuestSessions               mGuestSessions;
         uint32_t                    mNextSessionID;

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

@@ -3260 +3260 @@
     ComObjPtr<IProgress> iProgress;
     MachineState_T machineState = MachineState_Null;
-    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aId.toString()).raw(), Bstr(aId.toString()).raw(), FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
+    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aId.toString()).raw(), Bstr(aId.toString()).raw(),
+                                          FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
     if (FAILED(rc)) return rc;
     iProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3280 +3281 @@
     ComObjPtr<IProgress> iProgress;
     MachineState_T machineState = MachineState_Null;
-    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aId.toString()).raw(), Bstr(aId.toString()).raw(), TRUE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
+    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aId.toString()).raw(), Bstr(aId.toString()).raw(),
+                                          TRUE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
     if (FAILED(rc)) return rc;
     iProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -3299 +3301 @@
     ComObjPtr<IProgress> iProgress;
     MachineState_T machineState = MachineState_Null;
-    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aStartId.toString()).raw(), Bstr(aEndId.toString()).raw(), FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
+    HRESULT rc = mControl->DeleteSnapshot((IConsole *)this, Bstr(aStartId.toString()).raw(), Bstr(aEndId.toString()).raw(),
+                                          FALSE /* fDeleteAllChildren */, &machineState, iProgress.asOutParam());
     if (FAILED(rc)) return rc;
     iProgress.queryInterfaceTo(aProgress.asOutParam());
@@ -5997 +6000 @@
 {
     if (mGuest)
-        mGuest->enableVMMStatistics(aEnable);
+        mGuest->i_enableVMMStatistics(aEnable);
 }
 

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

@@ -5674 +5674 @@
         HGCMSVCEXTHANDLE hDummy;
         rc = HGCMHostRegisterServiceExtension(&hDummy, "VBoxGuestControlSvc",
-                                              &Guest::notifyCtrlDispatcher,
+                                              &Guest::i_notifyCtrlDispatcher,
                                               pConsole->i_getGuest());
         if (RT_FAILURE(rc))

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2013 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -64 +64 @@
  */
 /* static */
-DECLCALLBACK(int) Guest::notifyCtrlDispatcher(void    *pvExtension,
-                                              uint32_t u32Function,
-                                              void    *pvData,
-                                              uint32_t cbData)
+DECLCALLBACK(int) Guest::i_notifyCtrlDispatcher(void    *pvExtension,
+                                                uint32_t u32Function,
+                                                void    *pvData,
+                                                uint32_t cbData)
 {
     using namespace guestControl;
@@ -107 +107 @@
 
     VBOXGUESTCTRLHOSTCBCTX ctxCb = { u32Function, uContextID };
-    rc = pGuest->dispatchToSession(&ctxCb, pSvcCb);
+    rc = pGuest->i_dispatchToSession(&ctxCb, pSvcCb);
 
     LogFlowFunc(("Returning rc=%Rrc\n", rc));
@@ -114 +114 @@
 #endif /* VBOX_WITH_GUEST_CONTROL */
 
-STDMETHODIMP Guest::UpdateGuestAdditions(IN_BSTR aSource, ComSafeArrayIn(IN_BSTR, aArguments),
-                                         ComSafeArrayIn(AdditionsUpdateFlag_T, aFlags), IProgress **aProgress)
+HRESULT Guest::updateGuestAdditions(const com::Utf8Str &aSource, const std::vector<com::Utf8Str> &aArguments,
+                                    const std::vector<AdditionsUpdateFlag_T> &aFlags, ComPtr<IProgress> &aProgress)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
     ReturnComNotImplemented();
 #else /* VBOX_WITH_GUEST_CONTROL */
-    CheckComArgStrNotEmptyOrNull(aSource);
-    CheckComArgOutPointerValid(aProgress);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     /* Validate flags. */
     uint32_t fFlags = AdditionsUpdateFlag_None;
-    if (aFlags)
-    {
-        com::SafeArray<AdditionsUpdateFlag_T> flags(ComSafeArrayInArg(aFlags));
-        for (size_t i = 0; i < flags.size(); i++)
-            fFlags |= flags[i];
-    }
-
-    if (fFlags)
-    {
-        if (!(fFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
-            return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aFlags);
-    }
+    if (aFlags.size())
+        for (size_t i = 0; i < aFlags.size(); ++i)
+            fFlags |= aFlags[i];
+
+    com::SafeArray<AdditionsUpdateFlag_T> aaFlags;
+    aaFlags.resize(aFlags.size());
+    for (size_t i = 0; i < aFlags.size(); ++i)
+        aaFlags[i] = aFlags[i];
+
+    if (fFlags && !(fFlags & AdditionsUpdateFlag_WaitForUpdateStartOnly))
+        return setError(E_INVALIDARG, tr("Unknown flags (%#x)"), aaFlags);
 
     int rc = VINF_SUCCESS;
 
     ProcessArguments aArgs;
-    if (aArguments)
+    aArgs.resize(0);
+
+    if (aArguments.size())
     {
         try
         {
-            com::SafeArray<IN_BSTR> arguments(ComSafeArrayInArg(aArguments));
-            for (size_t i = 0; i < arguments.size(); i++)
-                aArgs.push_back(Utf8Str(arguments[i]));
+            for (size_t i = 0; i < aArguments.size(); ++i)
+                aArgs.push_back(aArguments[i]);
         }
         catch(std::bad_alloc &)
@@ -172 +167 @@
     ComObjPtr<GuestSession> pSession;
     if (RT_SUCCESS(rc))
-        rc = sessionCreate(startupInfo, guestCreds, pSession);
+        rc = i_sessionCreate(startupInfo, guestCreds, pSession);
     if (RT_FAILURE(rc))
     {
@@ -206 +201 @@
                 ComObjPtr<Progress> pProgress;
                 SessionTaskUpdateAdditions *pTask = new SessionTaskUpdateAdditions(pSession /* GuestSession */,
-                                                                                   Utf8Str(aSource), aArgs, fFlags);
+                                                                                   aSource, aArgs, fFlags);
                 rc = pSession->i_startTaskAsync(tr("Updating Guest Additions"), pTask, pProgress);
                 if (RT_SUCCESS(rc))
                 {
                     /* Return progress to the caller. */
-                    hr = pProgress.queryInterfaceTo(aProgress);
+                    hr = pProgress.queryInterfaceTo(aProgress.asOutParam());
                 }
                 else
@@ -230 +225 @@
 /////////////////////////////////////////////////////////////////////////////
 
-int Guest::dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
+int Guest::i_dispatchToSession(PVBOXGUESTCTRLHOSTCBCTX pCtxCb, PVBOXGUESTCTRLHOSTCALLBACK pSvcCb)
 {
     LogFlowFunc(("pCtxCb=%p, pSvcCb=%p\n", pCtxCb, pSvcCb));
@@ -345 +340 @@
 }
 
-int Guest::sessionRemove(GuestSession *pSession)
+int Guest::i_sessionRemove(GuestSession *pSession)
 {
     AssertPtrReturn(pSession, VERR_INVALID_POINTER);
@@ -393 +388 @@
 }
 
-int Guest::sessionCreate(const GuestSessionStartupInfo &ssInfo,
-                         const GuestCredentials &guestCreds, ComObjPtr<GuestSession> &pGuestSession)
+int Guest::i_sessionCreate(const GuestSessionStartupInfo &ssInfo,
+                           const GuestCredentials &guestCreds, ComObjPtr<GuestSession> &pGuestSession)
 {
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
@@ -411 +406 @@
         {
             /* Is the context ID already used? */
-            if (!sessionExists(uNewSessionID))
+            if (!i_sessionExists(uNewSessionID))
             {
                 rc = VINF_SUCCESS;
@@ -474 +469 @@
 }
 
-inline bool Guest::sessionExists(uint32_t uSessionID)
+inline bool Guest::i_sessionExists(uint32_t uSessionID)
 {
     GuestSessions::const_iterator itSessions = mData.mGuestSessions.find(uSessionID);
@@ -482 +477 @@
 // implementation of public methods
 /////////////////////////////////////////////////////////////////////////////
-
-STDMETHODIMP Guest::CreateSession(IN_BSTR aUser, IN_BSTR aPassword, IN_BSTR aDomain,
-                                  IN_BSTR aSessionName, IGuestSession **aGuestSession)
+HRESULT Guest::createSession(const com::Utf8Str &aUser, const com::Utf8Str &aPassword, const com::Utf8Str &aDomain,
+                             const com::Utf8Str &aSessionName, ComPtr<IGuestSession> &aGuestSession)
+
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -493 +488 @@
 
     /* Do not allow anonymous sessions (with system rights) with public API. */
-    if (RT_UNLIKELY((aUser) == NULL || *(aUser) == '\0'))
+    if (RT_UNLIKELY(!aUser.length()))
         return setError(E_INVALIDARG, tr("No user name specified"));
-    if (RT_UNLIKELY((aPassword) == NULL)) /* Allow empty passwords. */
-        return setError(E_INVALIDARG, tr("No password specified"));
-    CheckComArgOutPointerValid(aGuestSession);
-    /* Rest is optional. */
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
     GuestSessionStartupInfo startupInfo;
@@ -512 +500 @@
 
     ComObjPtr<GuestSession> pSession;
-    int rc = sessionCreate(startupInfo, guestCreds, pSession);
+    int rc = i_sessionCreate(startupInfo, guestCreds, pSession);
     if (RT_SUCCESS(rc))
     {
         /* Return guest session to the caller. */
-        HRESULT hr2 = pSession.queryInterfaceTo(aGuestSession);
+        HRESULT hr2 = pSession.queryInterfaceTo(aGuestSession.asOutParam());
         if (FAILED(hr2))
             rc = VERR_COM_OBJECT_NOT_FOUND;
@@ -522 +510 @@
 
     if (RT_SUCCESS(rc))
-    {
         /* Start (fork) the session asynchronously
          * on the guest. */
         rc = pSession->i_startSessionAsync();
-    }
 
     HRESULT hr = S_OK;
@@ -552 +538 @@
 }
 
-STDMETHODIMP Guest::FindSession(IN_BSTR aSessionName, ComSafeArrayOut(IGuestSession *, aSessions))
+HRESULT Guest::findSession(const com::Utf8Str &aSessionName, std::vector<ComPtr<IGuestSession> > &aSessions)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -558 +544 @@
 #else /* VBOX_WITH_GUEST_CONTROL */
 
-    CheckComArgOutSafeArrayPointerValid(aSessions);
-
     LogFlowFuncEnter();
 
@@ -575 +559 @@
     }
 
-    LogFlowFunc(("Sessions with \"%ls\" = %RU32\n",
-                 aSessionName, listSessions.size()));
+    LogFlowFunc(("Sessions with \"%s\" = %RU32\n",
+                 aSessionName.c_str(), listSessions.size()));
 
     if (listSessions.size())
     {
-        SafeIfaceArray<IGuestSession> sessionIfacs(listSessions);
-        sessionIfacs.detachTo(ComSafeArrayOutArg(aSessions));
+        aSessions.resize(listSessions.size());
+        size_t i = 0;
+        for (std::list < ComObjPtr<GuestSession> >::const_iterator it = listSessions.begin(); it != listSessions.end(); ++it, ++i)
+            (*it).queryInterfaceTo(aSessions[i].asOutParam());
 
         return S_OK;
+
     }
 
     return setErrorNoLog(VBOX_E_OBJECT_NOT_FOUND,
-                         tr("Could not find sessions with name '%ls'"),
-                         aSessionName);
+                         tr("Could not find sessions with name '%s'"),
+                         aSessionName.c_str());
 #endif /* VBOX_WITH_GUEST_CONTROL */
 }

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

@@ -470 +470 @@
     /* For multi-monitor support we need to add shift values to the coordinates
      * (depending on the screen number). */
-    ComObjPtr<Console> pConsole = m_pGuest->getConsole();
+    ComObjPtr<Console> pConsole = m_pGuest->i_getConsole();
     ComPtr<IDisplay> pDisplay;
     HRESULT hr = pConsole->COMGETTER(Display)(pDisplay.asOutParam());
@@ -498 +498 @@
 {
     Assert(!m_pGuest.isNull());
-    ComObjPtr<Console> pConsole = m_pGuest->getConsole();
+    ComObjPtr<Console> pConsole = m_pGuest->i_getConsole();
 
     /* Forward the information to the VMM device. */

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

@@ -106 +106 @@
     mMagic = GUEST_MAGIC;
     int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */,
-                              &Guest::staticUpdateStats, this);
+                              &Guest::i_staticUpdateStats, this);
     AssertMsgRC(vrc, ("Failed to create guest statistics update timer (%Rrc)\n", vrc));
 
@@ -194 +194 @@
 
 /* static */
-DECLCALLBACK(void) Guest::staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick)
+DECLCALLBACK(void) Guest::i_staticUpdateStats(RTTIMERLR hTimerLR, void *pvUser, uint64_t iTick)
 {
     AssertReturnVoid(pvUser != NULL);
@@ -200 +200 @@
     Assert(guest->mMagic == GUEST_MAGIC);
     if (guest->mMagic == GUEST_MAGIC)
-        guest->updateStats(iTick);
+        guest->i_updateStats(iTick);
 
     NOREF(hTimerLR);
@@ -206 +206 @@
 
 /* static */
-int Guest::staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
-                                   STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser)
+int Guest::i_staticEnumStatsCallback(const char *pszName, STAMTYPE enmType, void *pvSample, STAMUNIT enmUnit,
+                                     STAMVISIBILITY enmVisiblity, const char *pszDesc, void *pvUser)
 {
     AssertLogRelMsgReturn(enmType == STAMTYPE_COUNTER, ("Unexpected sample type %d ('%s')\n", enmType, pszName), VINF_SUCCESS);
@@ -255 +255 @@
 }
 
-void Guest::updateStats(uint64_t iTick)
+void Guest::i_updateStats(uint64_t iTick)
 {
     uint64_t cbFreeTotal      = 0;
@@ -313 +313 @@
         uint64_t uTxPrev = mNetStatTx;
         mNetStatRx = mNetStatTx = 0;
-        rc = STAMR3Enum(ptrVM.rawUVM(), "/Public/Net/*/Bytes*", staticEnumStatsCallback, this);
+        rc = STAMR3Enum(ptrVM.rawUVM(), "/Public/Net/*/Bytes*", i_staticEnumStatsCallback, this);
         AssertRC(rc);
 
@@ -359 +359 @@
 /////////////////////////////////////////////////////////////////////////////
 
-STDMETHODIMP Guest::COMGETTER(OSTypeId)(BSTR *a_pbstrOSTypeId)
-{
-    CheckComArgOutPointerValid(a_pbstrOSTypeId);
-
-    AutoCaller autoCaller(this);
-    HRESULT hrc = autoCaller.rc();
-    if (SUCCEEDED(hrc))
-    {
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-        if (!mData.mInterfaceVersion.isEmpty())
-            mData.mOSTypeId.cloneTo(a_pbstrOSTypeId);
+HRESULT Guest::getOSTypeId(com::Utf8Str &aOSTypeId)
+{
+    HRESULT hrc = S_OK;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    if (!mData.mInterfaceVersion.isEmpty())
+        aOSTypeId = mData.mOSTypeId;
+    else
+    {
+        /* Redirect the call to IMachine if no additions are installed. */
+        ComPtr<IMachine> ptrMachine(mParent->i_machine());
+        alock.release();
+        BSTR bstr;
+        hrc = ptrMachine->COMGETTER(OSTypeId)(&bstr);
+        aOSTypeId = bstr;
+    }
+    return hrc;
+}
+
+HRESULT Guest::getAdditionsRunLevel(AdditionsRunLevelType_T *aAdditionsRunLevel)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aAdditionsRunLevel = mData.mAdditionsRunLevel;
+
+    return S_OK;
+}
+
+HRESULT Guest::getAdditionsVersion(com::Utf8Str &aAdditionsVersion)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    HRESULT hrc = S_OK;
+
+    /*
+     * Return the ReportGuestInfo2 version info if available.
+     */
+    if (   !mData.mAdditionsVersionNew.isEmpty()
+         || mData.mAdditionsRunLevel <= AdditionsRunLevelType_None)
+        aAdditionsVersion = mData.mAdditionsVersionNew;
+    else
+    {
+        /*
+         * If we're running older guest additions (< 3.2.0) try get it from
+         * the guest properties.  Detected switched around Version and
+         * Revision in early 3.1.x releases (see r57115).
+         */
+        ComPtr<IMachine> ptrMachine = mParent->i_machine();
+        alock.release(); /* No need to hold this during the IPC fun. */
+
+        Bstr bstr;
+        hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
+        if (   SUCCEEDED(hrc)
+            && !bstr.isEmpty())
+        {
+            Utf8Str str(bstr);
+            if (str.count('.') == 0)
+                hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Revision").raw(), bstr.asOutParam());
+            str = bstr;
+            if (str.count('.') != 2)
+                hrc = E_FAIL;
+        }
+
+        if (SUCCEEDED(hrc))
+            aAdditionsVersion = bstr;
         else
         {
-            /* Redirect the call to IMachine if no additions are installed. */
-            ComPtr<IMachine> ptrMachine(mParent->i_machine());
-            alock.release();
-            hrc = ptrMachine->COMGETTER(OSTypeId)(a_pbstrOSTypeId);
+            /* Returning 1.4 is better than nothing. */
+            alock.acquire();
+            aAdditionsVersion = mData.mInterfaceVersion;
+            hrc = S_OK;
         }
     }
@@ -381 +433 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(AdditionsRunLevel)(AdditionsRunLevelType_T *aRunLevel)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aRunLevel = mData.mAdditionsRunLevel;
-
-    return S_OK;
-}
-
-STDMETHODIMP Guest::COMGETTER(AdditionsVersion)(BSTR *a_pbstrAdditionsVersion)
-{
-    CheckComArgOutPointerValid(a_pbstrAdditionsVersion);
-
-    AutoCaller autoCaller(this);
-    HRESULT hrc = autoCaller.rc();
-    if (SUCCEEDED(hrc))
-    {
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
+HRESULT Guest::getAdditionsRevision(ULONG *aAdditionsRevision)
+{
+    HRESULT hrc = S_OK;
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    /*
+     * Return the ReportGuestInfo2 version info if available.
+     */
+    if (   !mData.mAdditionsVersionNew.isEmpty()
+        || mData.mAdditionsRunLevel <= AdditionsRunLevelType_None)
+        *aAdditionsRevision = mData.mAdditionsRevision;
+    else
+    {
         /*
-         * Return the ReportGuestInfo2 version info if available.
+         * If we're running older guest additions (< 3.2.0) try get it from
+         * the guest properties. Detected switched around Version and
+         * Revision in early 3.1.x releases (see r57115).
          */
-        if (   !mData.mAdditionsVersionNew.isEmpty()
-            || mData.mAdditionsRunLevel <= AdditionsRunLevelType_None)
-            mData.mAdditionsVersionNew.cloneTo(a_pbstrAdditionsVersion);
-        else
-        {
-            /*
-             * If we're running older guest additions (< 3.2.0) try get it from
-             * the guest properties.  Detected switched around Version and
-             * Revision in early 3.1.x releases (see r57115).
-             */
-            ComPtr<IMachine> ptrMachine = mParent->i_machine();
-            alock.release(); /* No need to hold this during the IPC fun. */
-
-            Bstr bstr;
-            hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
-            if (   SUCCEEDED(hrc)
-                && !bstr.isEmpty())
+        ComPtr<IMachine> ptrMachine = mParent->i_machine();
+        alock.release(); /* No need to hold this during the IPC fun. */
+
+        Bstr bstr;
+        hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Revision").raw(), bstr.asOutParam());
+        if (SUCCEEDED(hrc))
+        {
+            Utf8Str str(bstr);
+            uint32_t uRevision;
+            int vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
+            if (vrc != VINF_SUCCESS && str.count('.') == 2)
             {
-                Utf8Str str(bstr);
-                if (str.count('.') == 0)
-                    hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Revision").raw(), bstr.asOutParam());
-                str = bstr;
-                if (str.count('.') != 2)
-                    hrc = E_FAIL;
+                hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
+                if (SUCCEEDED(hrc))
+                {
+                    str = bstr;
+                    vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
+                }
             }
-
-            if (SUCCEEDED(hrc))
-                bstr.detachTo(a_pbstrAdditionsVersion);
+            if (vrc == VINF_SUCCESS)
+                *aAdditionsRevision = uRevision;
             else
-            {
-                /* Returning 1.4 is better than nothing. */
-                alock.acquire();
-                mData.mInterfaceVersion.cloneTo(a_pbstrAdditionsVersion);
-                hrc = S_OK;
-            }
+                hrc = VBOX_E_IPRT_ERROR;
+        }
+        if (FAILED(hrc))
+        {
+            /* Return 0 if we don't know. */
+            *aAdditionsRevision = 0;
+            hrc = S_OK;
         }
     }
@@ -446 +485 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(AdditionsRevision)(ULONG *a_puAdditionsRevision)
-{
-    CheckComArgOutPointerValid(a_puAdditionsRevision);
-
-    AutoCaller autoCaller(this);
-    HRESULT hrc = autoCaller.rc();
-    if (SUCCEEDED(hrc))
-    {
-        AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-        /*
-         * Return the ReportGuestInfo2 version info if available.
-         */
-        if (   !mData.mAdditionsVersionNew.isEmpty()
-            || mData.mAdditionsRunLevel <= AdditionsRunLevelType_None)
-            *a_puAdditionsRevision = mData.mAdditionsRevision;
-        else
-        {
-            /*
-             * If we're running older guest additions (< 3.2.0) try get it from
-             * the guest properties. Detected switched around Version and
-             * Revision in early 3.1.x releases (see r57115).
-             */
-            ComPtr<IMachine> ptrMachine = mParent->i_machine();
-            alock.release(); /* No need to hold this during the IPC fun. */
-
-            Bstr bstr;
-            hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Revision").raw(), bstr.asOutParam());
-            if (SUCCEEDED(hrc))
-            {
-                Utf8Str str(bstr);
-                uint32_t uRevision;
-                int vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
-                if (vrc != VINF_SUCCESS && str.count('.') == 2)
-                {
-                    hrc = ptrMachine->GetGuestPropertyValue(Bstr("/VirtualBox/GuestAdd/Version").raw(), bstr.asOutParam());
-                    if (SUCCEEDED(hrc))
-                    {
-                        str = bstr;
-                        vrc = RTStrToUInt32Full(str.c_str(), 0, &uRevision);
-                    }
-                }
-                if (vrc == VINF_SUCCESS)
-                    *a_puAdditionsRevision = uRevision;
-                else
-                    hrc = VBOX_E_IPRT_ERROR;
-            }
-            if (FAILED(hrc))
-            {
-                /* Return 0 if we don't know. */
-                *a_puAdditionsRevision = 0;
-                hrc = S_OK;
-            }
-        }
-    }
-    return hrc;
-}
-
-STDMETHODIMP Guest::COMGETTER(DnDSource)(IGuestDnDSource ** aSource)
+HRESULT Guest::getDnDSource(ComPtr<IGuestDnDSource> &aDnDSource)
 {
 #ifndef VBOX_WITH_DRAG_AND_DROP
@@ -511 +492 @@
     LogFlowThisFuncEnter();
 
-    CheckComArgOutPointerValid(aSource);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* No need to lock - lifetime constant. */
-    HRESULT hr = mDnDSource.queryInterfaceTo(aSource);
+    HRESULT hr = mDnDSource.queryInterfaceTo(aDnDSource.asOutParam());
 
     LogFlowFuncLeaveRC(hr);
@@ -524 +500 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(DnDTarget)(IGuestDnDTarget ** aTarget)
+HRESULT Guest::getDnDTarget(ComPtr<IGuestDnDTarget> &aDnDTarget)
 {
 #ifndef VBOX_WITH_DRAG_AND_DROP
@@ -531 +507 @@
     LogFlowThisFuncEnter();
 
-    CheckComArgOutPointerValid(aTarget);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* No need to lock - lifetime constant. */
-    HRESULT hr = mDnDTarget.queryInterfaceTo(aTarget);
+    HRESULT hr = mDnDTarget.queryInterfaceTo(aDnDTarget.asOutParam());
 
     LogFlowFuncLeaveRC(hr);
@@ -544 +515 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(EventSource)(IEventSource ** aEventSource)
+HRESULT Guest::getEventSource(ComPtr<IEventSource> &aEventSource)
 {
 #ifndef VBOX_WITH_GUEST_CONTROL
@@ -551 +522 @@
     LogFlowThisFuncEnter();
 
-    CheckComArgOutPointerValid(aEventSource);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
     /* No need to lock - lifetime constant. */
-    mEventSource.queryInterfaceTo(aEventSource);
+    mEventSource.queryInterfaceTo(aEventSource.asOutParam());
 
     LogFlowFuncLeaveRC(S_OK);
@@ -564 +530 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(Facilities)(ComSafeArrayOut(IAdditionsFacility *, aFacilities))
-{
-    CheckComArgOutSafeArrayPointerValid(aFacilities);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    SafeIfaceArray<IAdditionsFacility> fac(mData.mFacilityMap);
-    fac.detachTo(ComSafeArrayOutArg(aFacilities));
+HRESULT Guest::getFacilities(std::vector<ComPtr<IAdditionsFacility> > &aFacilities)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aFacilities.resize(mData.mFacilityMap.size());
+    size_t i = 0;
+    for (FacilityMapIter it = mData.mFacilityMap.begin(); it != mData.mFacilityMap.end(); ++it, ++i)
+        it->second.queryInterfaceTo(aFacilities[i].asOutParam());
 
     return S_OK;
 }
 
-STDMETHODIMP Guest::COMGETTER(Sessions)(ComSafeArrayOut(IGuestSession *, aSessions))
-{
-    CheckComArgOutSafeArrayPointerValid(aSessions);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    SafeIfaceArray<IGuestSession> collection(mData.mGuestSessions);
-    collection.detachTo(ComSafeArrayOutArg(aSessions));
+HRESULT Guest::getSessions(std::vector<ComPtr<IGuestSession> > &aSessions)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    aSessions.resize(mData.mGuestSessions.size());
+    size_t i = 0;
+    for (GuestSessions::iterator it = mData.mGuestSessions.begin(); it != mData.mGuestSessions.end(); ++it, ++i)
+        it->second.queryInterfaceTo(aSessions[i].asOutParam());
 
     return S_OK;
 }
 
-BOOL Guest::isPageFusionEnabled()
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return false;
-
+BOOL Guest::i_isPageFusionEnabled()
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -604 +561 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(MemoryBalloonSize)(ULONG *aMemoryBalloonSize)
-{
-    CheckComArgOutPointerValid(aMemoryBalloonSize);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Guest::getMemoryBalloonSize(ULONG *aMemoryBalloonSize)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -618 +570 @@
 }
 
-STDMETHODIMP Guest::COMSETTER(MemoryBalloonSize)(ULONG aMemoryBalloonSize)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Guest::setMemoryBalloonSize(ULONG aMemoryBalloonSize)
+{
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -647 +596 @@
 }
 
-STDMETHODIMP Guest::COMGETTER(StatisticsUpdateInterval)(ULONG *aUpdateInterval)
-{
-    CheckComArgOutPointerValid(aUpdateInterval);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    *aUpdateInterval = mStatUpdateInterval;
+HRESULT Guest::getStatisticsUpdateInterval(ULONG *aStatisticsUpdateInterval)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+    *aStatisticsUpdateInterval = mStatUpdateInterval;
     return S_OK;
 }
 
-STDMETHODIMP Guest::COMSETTER(StatisticsUpdateInterval)(ULONG aUpdateInterval)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Guest::setStatisticsUpdateInterval(ULONG aStatisticsUpdateInterval)
+{
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     if (mStatUpdateInterval)
-        if (aUpdateInterval == 0)
+        if (aStatisticsUpdateInterval == 0)
             RTTimerLRStop(mStatTimer);
         else
-            RTTimerLRChangeInterval(mStatTimer, aUpdateInterval);
-    else
-        if (aUpdateInterval != 0)
-        {
-            RTTimerLRChangeInterval(mStatTimer, aUpdateInterval);
+            RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval);
+    else
+        if (aStatisticsUpdateInterval != 0)
+        {
+            RTTimerLRChangeInterval(mStatTimer, aStatisticsUpdateInterval);
             RTTimerLRStart(mStatTimer, 0);
         }
-    mStatUpdateInterval = aUpdateInterval;
+    mStatUpdateInterval = aStatisticsUpdateInterval;
     /* forward the information to the VMM device */
     VMMDev *pVMMDev = mParent->i_getVMMDev();
@@ -688 +629 @@
         PPDMIVMMDEVPORT pVMMDevPort = pVMMDev->getVMMDevPort();
         if (pVMMDevPort)
-            pVMMDevPort->pfnSetStatisticsInterval(pVMMDevPort, aUpdateInterval);
+            pVMMDevPort->pfnSetStatisticsInterval(pVMMDevPort, aStatisticsUpdateInterval);
     }
 
@@ -694 +635 @@
 }
 
-STDMETHODIMP Guest::InternalGetStatistics(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
-                                          ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon,
-                                          ULONG *aMemShared, ULONG *aMemCache, ULONG *aPageTotal,
-                                          ULONG *aMemAllocTotal, ULONG *aMemFreeTotal,
-                                          ULONG *aMemBalloonTotal, ULONG *aMemSharedTotal)
-{
-    CheckComArgOutPointerValid(aCpuUser);
-    CheckComArgOutPointerValid(aCpuKernel);
-    CheckComArgOutPointerValid(aCpuIdle);
-    CheckComArgOutPointerValid(aMemTotal);
-    CheckComArgOutPointerValid(aMemFree);
-    CheckComArgOutPointerValid(aMemBalloon);
-    CheckComArgOutPointerValid(aMemShared);
-    CheckComArgOutPointerValid(aMemCache);
-    CheckComArgOutPointerValid(aPageTotal);
-    CheckComArgOutPointerValid(aMemAllocTotal);
-    CheckComArgOutPointerValid(aMemFreeTotal);
-    CheckComArgOutPointerValid(aMemBalloonTotal);
-    CheckComArgOutPointerValid(aMemSharedTotal);
-
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+
+HRESULT Guest::internalGetStatistics(ULONG *aCpuUser, ULONG *aCpuKernel, ULONG *aCpuIdle,
+                                     ULONG *aMemTotal, ULONG *aMemFree, ULONG *aMemBalloon,
+                                     ULONG *aMemShared, ULONG *aMemCache, ULONG *aPageTotal,
+                                     ULONG *aMemAllocTotal, ULONG *aMemFreeTotal,
+                                     ULONG *aMemBalloonTotal, ULONG *aMemSharedTotal)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -761 +686 @@
 }
 
-HRESULT Guest::setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal)
+HRESULT Guest::i_setStatistic(ULONG aCpuId, GUESTSTATTYPE enmType, ULONG aVal)
 {
     static ULONG indexToPerfMask[] =
@@ -795 +720 @@
  * @param   aTimestamp      Timestamp of last facility status update in ms (optional).
  */
-STDMETHODIMP Guest::GetFacilityStatus(AdditionsFacilityType_T aType, LONG64 *aTimestamp, AdditionsFacilityStatus_T *aStatus)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
-    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    CheckComArgNotNull(aStatus);
+HRESULT Guest::getFacilityStatus(AdditionsFacilityType_T aFacility, LONG64 *aTimestamp, AdditionsFacilityStatus_T *aStatus)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+
     /* Not checking for aTimestamp is intentional; it's optional. */
-
-    FacilityMapIterConst it = mData.mFacilityMap.find(aType);
+    FacilityMapIterConst it = mData.mFacilityMap.find(aFacility);
     if (it != mData.mFacilityMap.end())
     {
@@ -827 +747 @@
 }
 
-STDMETHODIMP Guest::GetAdditionsStatus(AdditionsRunLevelType_T aLevel, BOOL *aActive)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Guest::getAdditionsStatus(AdditionsRunLevelType_T aLevel, BOOL *aActive)
+{
     AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
 
@@ -857 +774 @@
     return rc;
 }
-
-STDMETHODIMP Guest::SetCredentials(IN_BSTR aUserName, IN_BSTR aPassword,
-                                   IN_BSTR aDomain, BOOL aAllowInteractiveLogon)
-{
-    AutoCaller autoCaller(this);
-    if (FAILED(autoCaller.rc())) return autoCaller.rc();
-
+HRESULT Guest::setCredentials(const com::Utf8Str &aUserName, const com::Utf8Str &aPassword,
+                              const com::Utf8Str &aDomain, BOOL aAllowInteractiveLogon)
+{
     /* Check for magic domain names which are used to pass encryption keys to the disk. */
     if (Utf8Str(aDomain) == "@@disk")
-        return mParent->i_setDiskEncryptionKeys(Utf8Str(aPassword));
+        return mParent->i_setDiskEncryptionKeys(aPassword);
     else if (Utf8Str(aDomain) == "@@mem")
     {
@@ -886 +799 @@
 
                 pVMMDevPort->pfnSetCredentials(pVMMDevPort,
-                                               Utf8Str(aUserName).c_str(),
-                                               Utf8Str(aPassword).c_str(),
-                                               Utf8Str(aDomain).c_str(),
+                                               aUserName.c_str(),
+                                               aPassword.c_str(),
+                                               aDomain.c_str(),
                                                u32Flags);
                 return S_OK;
@@ -910 +823 @@
  * @param aOsType
  */
-void Guest::setAdditionsInfo(Bstr aInterfaceVersion, VBOXOSTYPE aOsType)
+void Guest::i_setAdditionsInfo(com::Utf8Str aInterfaceVersion, VBOXOSTYPE aOsType)
 {
     RTTIMESPEC TimeSpecTS;
@@ -955 +868 @@
              * interface version.
              */
-            facilityUpdate(VBoxGuestFacilityType_Graphics, VBoxGuestFacilityStatus_Active,  0 /*fFlags*/, &TimeSpecTS);
+            i_facilityUpdate(VBoxGuestFacilityType_Graphics, VBoxGuestFacilityStatus_Active,  0 /*fFlags*/, &TimeSpecTS);
         }
     }
@@ -975 +888 @@
      * should come in pretty quickly after this update, normally.
      */
-    facilityUpdate(VBoxGuestFacilityType_Graphics,
-                   facilityIsActive(VBoxGuestFacilityType_VBoxGuestDriver)
-                   ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
-                   0 /*fFlags*/, &TimeSpecTS); /** @todo the timestamp isn't gonna be right here on saved state restore. */
+    i_facilityUpdate(VBoxGuestFacilityType_Graphics,
+                     i_facilityIsActive(VBoxGuestFacilityType_VBoxGuestDriver)
+                     ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
+                     0 /*fFlags*/, &TimeSpecTS); /** @todo the timestamp isn't gonna be right here on saved state restore. */
 
     /*
@@ -1007 +920 @@
  * @param   a_fFeatures             See VBoxGuestInfo2::additionsFeatures.
  */
-void Guest::setAdditionsInfo2(uint32_t a_uFullVersion, const char *a_pszName, uint32_t a_uRevision, uint32_t a_fFeatures)
-{
-    AutoCaller autoCaller(this);
-    AssertComRCReturnVoid(autoCaller.rc());
-
+void Guest::i_setAdditionsInfo2(uint32_t a_uFullVersion, const char *a_pszName, uint32_t a_uRevision, uint32_t a_fFeatures)
+{
     AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
 
     if (a_uFullVersion)
     {
-        mData.mAdditionsVersionNew  = BstrFmt(*a_pszName ? "%u.%u.%u_%s" : "%u.%u.%u",
+        mData.mAdditionsVersionNew  = Utf8Str(BstrFmt(*a_pszName ? "%u.%u.%u_%s" : "%u.%u.%u",
                                               VBOX_FULL_VERSION_GET_MAJOR(a_uFullVersion),
                                               VBOX_FULL_VERSION_GET_MINOR(a_uFullVersion),
                                               VBOX_FULL_VERSION_GET_BUILD(a_uFullVersion),
-                                              a_pszName);
+                                              a_pszName));
         mData.mAdditionsVersionFull = a_uFullVersion;
         mData.mAdditionsRevision    = a_uRevision;
@@ -1035 +945 @@
 }
 
-bool Guest::facilityIsActive(VBoxGuestFacilityType enmFacility)
+bool Guest::i_facilityIsActive(VBoxGuestFacilityType enmFacility)
 {
     Assert(enmFacility < INT32_MAX);
@@ -1047 +957 @@
 }
 
-void Guest::facilityUpdate(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
-                           uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS)
+void Guest::i_facilityUpdate(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
+                             uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS)
 {
     AssertReturnVoid(   a_enmFacility < VBoxGuestFacilityType_All
@@ -1089 +999 @@
  * @param   cbDetails           Size (in bytes) of state details. Pass 0 if not used.
  */
-void Guest::onUserStateChange(Bstr aUser, Bstr aDomain, VBoxGuestUserState enmState,
-                              const uint8_t *puDetails, uint32_t cbDetails)
+void Guest::i_onUserStateChange(Bstr aUser, Bstr aDomain, VBoxGuestUserState enmState,
+                                const uint8_t *puDetails, uint32_t cbDetails)
 {
     LogFlowThisFunc(("\n"));
@@ -1118 +1028 @@
  * @thread  The emulation thread.
  */
-void Guest::setAdditionsStatus(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
-                               uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS)
+void Guest::i_setAdditionsStatus(VBoxGuestFacilityType a_enmFacility, VBoxGuestFacilityStatus a_enmStatus,
+                                 uint32_t a_fFlags, PCRTTIMESPEC a_pTimeSpecTS)
 {
     Assert(   a_enmFacility > VBoxGuestFacilityType_Unknown
@@ -1134 +1044 @@
     if (a_enmFacility == VBoxGuestFacilityType_All)
         for (FacilityMapIter it = mData.mFacilityMap.begin(); it != mData.mFacilityMap.end(); ++it)
-            facilityUpdate((VBoxGuestFacilityType)it->first, a_enmStatus, a_fFlags, a_pTimeSpecTS);
+            i_facilityUpdate((VBoxGuestFacilityType)it->first, a_enmStatus, a_fFlags, a_pTimeSpecTS);
     else /* Update one facility only. */
-        facilityUpdate(a_enmFacility, a_enmStatus, a_fFlags, a_pTimeSpecTS);
+        i_facilityUpdate(a_enmFacility, a_enmStatus, a_fFlags, a_pTimeSpecTS);
 
     /*
      * Recalc the runlevel.
      */
-    if (facilityIsActive(VBoxGuestFacilityType_VBoxTrayClient))
+    if (i_facilityIsActive(VBoxGuestFacilityType_VBoxTrayClient))
         mData.mAdditionsRunLevel = AdditionsRunLevelType_Desktop;
-    else if (facilityIsActive(VBoxGuestFacilityType_VBoxService))
+    else if (i_facilityIsActive(VBoxGuestFacilityType_VBoxService))
         mData.mAdditionsRunLevel = AdditionsRunLevelType_Userland;
-    else if (facilityIsActive(VBoxGuestFacilityType_VBoxGuestDriver))
+    else if (i_facilityIsActive(VBoxGuestFacilityType_VBoxGuestDriver))
         mData.mAdditionsRunLevel = AdditionsRunLevelType_System;
     else
@@ -1156 +1066 @@
  * @param   fCaps       Guest capability bit mask (VMMDEV_GUEST_SUPPORTS_XXX).
  */
-void Guest::setSupportedFeatures(uint32_t aCaps)
+void Guest::i_setSupportedFeatures(uint32_t aCaps)
 {
     AutoCaller autoCaller(this);
@@ -1169 +1079 @@
     RTTimeNow(&TimeSpecTS);
 
-    facilityUpdate(VBoxGuestFacilityType_Seamless,
-                   aCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
-                   0 /*fFlags*/, &TimeSpecTS);
+    i_facilityUpdate(VBoxGuestFacilityType_Seamless,
+                     aCaps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
+                     0 /*fFlags*/, &TimeSpecTS);
     /** @todo Add VMMDEV_GUEST_SUPPORTS_GUEST_HOST_WINDOW_MAPPING */
-    facilityUpdate(VBoxGuestFacilityType_Graphics,
-                   aCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
-                   0 /*fFlags*/, &TimeSpecTS);
-}
-
+    i_facilityUpdate(VBoxGuestFacilityType_Graphics,
+                     aCaps & VMMDEV_GUEST_SUPPORTS_GRAPHICS ? VBoxGuestFacilityStatus_Active : VBoxGuestFacilityStatus_Inactive,
+                     0 /*fFlags*/, &TimeSpecTS);
+}
+

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

@@ -913 +913 @@
         return VERR_COM_UNEXPECTED;
 
-    Console *pConsole = mParent->getConsole();
+    Console *pConsole = mParent->i_getConsole();
     AssertPtr(pConsole);
 
@@ -1289 +1289 @@
         return VERR_COM_UNEXPECTED;
 
-    Console *pConsole = mParent->getConsole();
+    Console *pConsole = mParent->i_getConsole();
     AssertPtr(pConsole);
 
@@ -1929 +1929 @@
         return VERR_COM_UNEXPECTED;
 
-    rc = pProcess->init(mParent->getConsole() /* Console */, this /* Session */,
+    rc = pProcess->init(mParent->i_getConsole() /* Console */, this /* Session */,
                         uNewProcessID, procInfo);
     if (RT_FAILURE(rc))
@@ -2003 +2003 @@
 
 #ifndef VBOX_GUESTCTRL_TEST_CASE
-    ComObjPtr<Console> pConsole = mParent->getConsole();
+    ComObjPtr<Console> pConsole = mParent->i_getConsole();
     Assert(!pConsole.isNull());
 
@@ -2131 +2131 @@
     Assert(!pGuest.isNull());
 
-    uint32_t uVerAdditions = pGuest->getAdditionsVersion();
+    uint32_t uVerAdditions = pGuest->i_getAdditionsVersion();
     uint32_t uVBoxMajor    = VBOX_FULL_VERSION_GET_MAJOR(uVerAdditions);
     uint32_t uVBoxMinor    = VBOX_FULL_VERSION_GET_MINOR(uVerAdditions);
@@ -2391 +2391 @@
 
     /* Remove ourselves from the session list. */
-    int rc2 = mParent->sessionRemove(this);
+    int rc2 = mParent->i_sessionRemove(this);
     if (rc2 == VERR_NOT_FOUND) /* Not finding the session anymore isn't critical. */
         rc2 = VINF_SUCCESS;

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

@@ -76 +76 @@
                                        const Utf8Str &strPath, Utf8Str &strValue)
 {
-    ComObjPtr<Console> pConsole = pGuest->getConsole();
+    ComObjPtr<Console> pConsole = pGuest->i_getConsole();
     const ComPtr<IMachine> pMachine = pConsole->i_machine();
 

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

@@ -163 +163 @@
     AssertPtrReturnVoid(guest);
 
-    guest->setAdditionsStatus((VBoxGuestFacilityType)uFacility, (VBoxGuestFacilityStatus)uStatus, fFlags, pTimeSpecTS);
+    guest->i_setAdditionsStatus((VBoxGuestFacilityType)uFacility, (VBoxGuestFacilityStatus)uStatus, fFlags, pTimeSpecTS);
     pConsole->i_onAdditionsStateChange();
 }
@@ -185 +185 @@
     AssertPtrReturnVoid(pGuest);
 
-    pGuest->onUserStateChange(Bstr(pszUser), Bstr(pszDomain), (VBoxGuestUserState)uState,
-                              puDetails, cbDetails);
+    pGuest->i_onUserStateChange(Bstr(pszUser), Bstr(pszDomain), (VBoxGuestUserState)uState,
+                                puDetails, cbDetails);
 }
 
@@ -215 +215 @@
         char version[16];
         RTStrPrintf(version, sizeof(version), "%d", guestInfo->interfaceVersion);
-        guest->setAdditionsInfo(Bstr(version), guestInfo->osType);
+        guest->i_setAdditionsInfo(Bstr(version), guestInfo->osType);
 
         /*
@@ -232 +232 @@
          * or driver unload.
          */
-        guest->setAdditionsInfo(Bstr(), guestInfo->osType); /* Clear interface version + OS type. */
+        guest->i_setAdditionsInfo(Bstr(), guestInfo->osType); /* Clear interface version + OS type. */
         /** @todo Would be better if GuestImpl.cpp did all this in the above method call
          *        while holding down the. */
-        guest->setAdditionsInfo2(0, "", 0,  0); /* Clear Guest Additions version. */
+        guest->i_setAdditionsInfo2(0, "", 0,  0); /* Clear Guest Additions version. */
         RTTIMESPEC TimeSpecTS;
         RTTimeNow(&TimeSpecTS);
-        guest->setAdditionsStatus(VBoxGuestFacilityType_All, VBoxGuestFacilityStatus_Inactive, 0 /*fFlags*/, &TimeSpecTS);
+        guest->i_setAdditionsStatus(VBoxGuestFacilityType_All, VBoxGuestFacilityStatus_Inactive, 0 /*fFlags*/, &TimeSpecTS);
         pConsole->i_onAdditionsStateChange();
     }
@@ -258 +258 @@
 
     /* Just pass it on... */
-    pGuest->setAdditionsInfo2(uFullVersion, pszName, uRevision, fFeatures);
+    pGuest->i_setAdditionsInfo2(uFullVersion, pszName, uRevision, fFeatures);
 
     /*
@@ -289 +289 @@
      * Report our current capabilities (and assume none is active yet).
      */
-    pGuest->setSupportedFeatures(newCapabilities);
+    pGuest->i_setSupportedFeatures(newCapabilities);
 
     /*
@@ -540 +540 @@
     AssertPtrReturn(guest, VERR_GENERAL_FAILURE);
 
-    *pfPageFusionEnabled = !!guest->isPageFusionEnabled();
+    *pfPageFusionEnabled = !!guest->i_isPageFusionEnabled();
     return VINF_SUCCESS;
 }
@@ -564 +564 @@
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_IDLE)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUIDLE, pGuestStats->u32CpuLoad_Idle);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUIDLE, pGuestStats->u32CpuLoad_Idle);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_KERNEL)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUKERNEL, pGuestStats->u32CpuLoad_Kernel);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUKERNEL, pGuestStats->u32CpuLoad_Kernel);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_CPU_LOAD_USER)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUUSER, pGuestStats->u32CpuLoad_User);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_CPUUSER, pGuestStats->u32CpuLoad_User);
 
 
@@ -577 +577 @@
      *        preCollect().  I might be wrong ofc, this is convoluted code... */
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_TOTAL)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMTOTAL, pGuestStats->u32PhysMemTotal);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMTOTAL, pGuestStats->u32PhysMemTotal);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_AVAIL)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMFREE, pGuestStats->u32PhysMemAvail);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMFREE, pGuestStats->u32PhysMemAvail);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PHYS_MEM_BALLOON)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMBALLOON, pGuestStats->u32PhysMemBalloon);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMBALLOON, pGuestStats->u32PhysMemBalloon);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_MEM_SYSTEM_CACHE)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMCACHE, pGuestStats->u32MemSystemCache);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_MEMCACHE, pGuestStats->u32MemSystemCache);
 
     if (pGuestStats->u32StatCaps & VBOX_GUEST_STAT_PAGE_FILE_SIZE)
-        guest->setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_PAGETOTAL, pGuestStats->u32PageFileSize);
+        guest->i_setStatistic(pGuestStats->u32CpuId, GUESTSTATTYPE_PAGETOTAL, pGuestStats->u32PageFileSize);
 
     return VINF_SUCCESS;

trunk/src/VBox/Main/src-client/xpcom/module.cpp

@@ -66 +66 @@
 
 #ifndef VBOX_COM_INPROC_API_CLIENT
-NS_DECL_CLASSINFO(Guest)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Guest, IGuest)
 NS_DECL_CLASSINFO(Keyboard)
 NS_IMPL_THREADSAFE_ISUPPORTS1_CI(Keyboard, IKeyboard)