Changeset 73173 in vbox

Timestamp:

Jul 17, 2018 11:47:51 AM (6 years ago)

Author:

vboxsync

Message:

bugref:9152. Fixed several issues in the code.

Location:

trunk/src/VBox/Main

Files:

• include/CloudClientImpl.h (modified) (3 diffs)
• include/CloudUserProfileListImpl.h (modified) (1 diff)
• src-server/CloudClientImpl.cpp (modified) (3 diffs)
• src-server/CloudUserProfileListImpl.cpp (modified) (7 diffs)
• src-server/CloudUserProfileManagerImpl.cpp (modified) (1 diff)

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

@@ -32 +32 @@
 public:
     DECLARE_EMPTY_CTOR_DTOR(CloudClient)
-    explicit CloudClient(CloudProviderId_T aCloudProvider);
+//  explicit CloudClient(CloudProviderId_T aCloudProvider);
 
     HRESULT FinalConstruct();
@@ -44 +44 @@
     void uninit();
 
-private:
+protected:
     ComPtr<VirtualBox> const mParent;       /**< Strong reference to the parent object (VirtualBox/IMachine). */
-    ComPtr<Machine> mMachine;               /**< Strong reference to the machine object (Machine/IMachine). */
     CloudProviderId_T mCloudProvider;
     std::map <Utf8Str, Utf8Str> userProfile;
@@ -71 +70 @@
                                       const std::vector<com::Utf8Str> &aValues);
 };
+
 #endif // !____H_CLOUDCLIENTIMPL
 /* vi: set tabstop=4 shiftwidth=4 expandtab: */

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

@@ -98 +98 @@
     HRESULT readProfiles(const Utf8Str &strConfigPath);
 
-    HRESULT createProfile(const com::Utf8Str &aProfileName,
+private:
+    HRESULT i_createProfile(const com::Utf8Str &aProfileName,
                           const std::map <Utf8Str, Utf8Str> &aProfile);
-    HRESULT updateProfile(const com::Utf8Str &aProfileName,
+    HRESULT i_updateProfile(const com::Utf8Str &aProfileName,
                           const std::map <Utf8Str, Utf8Str> &aProfile);
-    HRESULT getProfileProperties(const com::Utf8Str &aName,
+    HRESULT i_getProfileProperties(const com::Utf8Str &aName,
                                  std::map <Utf8Str, Utf8Str> &aProfileName);
 private:

trunk/src/VBox/Main/src-server/CloudClientImpl.cpp

@@ -51 +51 @@
 }
 
-CloudClient::CloudClient(CloudProviderId_T aCloudProvider)
-    : mParent(NULL)
-{
-    LogRel(("CloudClient::CloudClient(CloudProviderId_T %d)\n", mCloudProvider));
-    mCloudProvider = aCloudProvider;
-}
+//CloudClient::CloudClient(CloudProviderId_T aCloudProvider)
+//    : mParent(NULL)
+//{
+//    LogRel(("CloudClient::CloudClient(CloudProviderId_T %d)\n", mCloudProvider));
+//    mCloudProvider = aCloudProvider;
+//}
 
 HRESULT CloudClient::FinalConstruct()
@@ -79 +79 @@
 
     unconst(mParent) = NULL;
-    mMachine.setNull();
 }
 
@@ -245 +244 @@
     return hrc;
 }
-

trunk/src/VBox/Main/src-server/CloudUserProfileListImpl.cpp

@@ -236 +236 @@
 void CloudUserProfileList::uninit()
 {
-
+    /* Enclose the state transition Ready->InUninit->NotReady */
+    AutoUninitSpan autoUninitSpan(this);
+    if (autoUninitSpan.uninitDone())
+        return;
+
+    unconst(mParent) = NULL;
 }
 
 HRESULT CloudUserProfileList::init(VirtualBox *aParent)
 {
+    /* Enclose the state transition NotReady->InInit->Ready */
+    AutoInitSpan autoInitSpan(this);
+    AssertReturn(autoInitSpan.isOk(), E_FAIL);
+
     unconst(mParent) = aParent;
 
+    autoInitSpan.setSucceeded();
     return S_OK;
 }
@@ -360 +370 @@
                                               ComPtr<ICloudClient> &aCloudClient)
 {
+    HRESULT hrc = S_OK;
     CloudProviderId_T providerId;
-    HRESULT hrc = getProvider(&providerId);
+    hrc = getProvider(&providerId);
 
     ComObjPtr<CloudClient> ptrCloudClient;
@@ -472 +483 @@
     {
         std::map <Utf8Str, Utf8Str> profile;
-        hrc = getProfileProperties(aProfileName, profile);
+        hrc = i_getProfileProperties(aProfileName, profile);
         if (SUCCEEDED(hrc))
         {
@@ -482 +493 @@
                 aReturnNames.push_back(cit->first);
                 aReturnValues.push_back(cit->second);
+                ++cit;
             }
         }
@@ -511 +523 @@
 
 
-HRESULT OCIUserProfileList::createProfile(const com::Utf8Str &aProfileName,
-                                          const std::map <Utf8Str, Utf8Str> &aProfile)
+HRESULT OCIUserProfileList::i_createProfile(const com::Utf8Str &aProfileName,
+                                           const std::map <Utf8Str, Utf8Str> &aProfile)
 {
     HRESULT hrc = S_OK;
@@ -521 +533 @@
 }
 
-HRESULT OCIUserProfileList::updateProfile(const com::Utf8Str &aProfileName,
-                                          const std::map <Utf8Str, Utf8Str> &aProfile)
+HRESULT OCIUserProfileList::i_updateProfile(const com::Utf8Str &aProfileName,
+                                           const std::map <Utf8Str, Utf8Str> &aProfile)
 {
     HRESULT hrc = S_OK;
@@ -533 +545 @@
 }
 
-HRESULT OCIUserProfileList::getProfileProperties(const com::Utf8Str &aProfileName,
-                                                 std::map <Utf8Str, Utf8Str> &aProfile)
+HRESULT OCIUserProfileList::i_getProfileProperties(const com::Utf8Str &aProfileName,
+                                                  std::map <Utf8Str, Utf8Str> &aProfile)
 {
     HRESULT hrc = S_OK;

trunk/src/VBox/Main/src-server/CloudUserProfileManagerImpl.cpp

@@ -128 +128 @@
                 if (SUCCEEDED(hrc))
                 {
-                    Utf8Str strConfigPath = mParent->i_homeDir();
+                    char szHomeDir[RTPATH_MAX];
+                    int vrc = RTPathUserHome(szHomeDir, sizeof(szHomeDir));
+                    Utf8Str strConfigPath(szHomeDir);
                     strConfigPath.append(RTPATH_SLASH_STR)
                                  .append(".oci")