Changeset 79294 in vbox

Timestamp:

Jun 23, 2019 4:09:31 PM (6 years ago)

Author:

vboxsync

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

131503

Message:

Main/Guest::init: Better error and object status handling - DnD should *NOT* hide event source creation trouble!

File:

• trunk/src/VBox/Main/src-client/GuestImpl.cpp (modified) (3 diffs)

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

@@ -80 +80 @@
     unconst(mParent) = aParent;
 
-    /* Confirm a successful initialization when it's the case */
-    autoInitSpan.setSucceeded();
-
-    ULONG aMemoryBalloonSize;
+    ULONG aMemoryBalloonSize = 0;
     HRESULT hr = mParent->i_machine()->COMGETTER(MemoryBalloonSize)(&aMemoryBalloonSize);
-    if (hr == S_OK) /** @todo r=andy SUCCEEDED? */
+    if (SUCCEEDED(hr))
         mMemoryBalloonSize = aMemoryBalloonSize;
     else
         mMemoryBalloonSize = 0; /* Default is no ballooning */
 
-    BOOL fPageFusionEnabled;
+    BOOL fPageFusionEnabled = FALSE;
     hr = mParent->i_machine()->COMGETTER(PageFusionEnabled)(&fPageFusionEnabled);
-    if (hr == S_OK) /** @todo r=andy SUCCEEDED? */
+    if (SUCCEEDED(hr))
         mfPageFusionEnabled = fPageFusionEnabled;
     else
@@ -113 +110 @@
     int vrc = RTTimerLRCreate(&mStatTimer, 1000 /* ms */,
                               &Guest::i_staticUpdateStats, this);
-    AssertMsgRC(vrc, ("Failed to create guest statistics update timer (%Rrc)\n", vrc));
+    AssertMsgRC(vrc, ("Failed to create guest statistics update timer (%Rrc) - ignored\n", vrc));
 
     hr = unconst(mEventSource).createObject();
@@ -122 +119 @@
 
 #ifdef VBOX_WITH_DRAG_AND_DROP
-    try
-    {
-        GuestDnD::createInstance(this /* pGuest */);
-        hr = unconst(mDnDSource).createObject();
-        if (SUCCEEDED(hr))
-            hr = mDnDSource->init(this /* pGuest */);
-        if (SUCCEEDED(hr))
-        {
-            hr = unconst(mDnDTarget).createObject();
+    if (SUCCEEDED(hr))
+    {
+        try
+        {
+            GuestDnD::createInstance(this /* pGuest */);
+            hr = unconst(mDnDSource).createObject();
             if (SUCCEEDED(hr))
-                hr = mDnDTarget->init(this /* pGuest */);
-        }
-
-        LogFlowFunc(("Drag and drop initializied with hr=%Rhrc\n", hr));
-    }
-    catch (std::bad_alloc &)
-    {
-        hr = E_OUTOFMEMORY;
+                hr = mDnDSource->init(this /* pGuest */);
+            if (SUCCEEDED(hr))
+            {
+                hr = unconst(mDnDTarget).createObject();
+                if (SUCCEEDED(hr))
+                    hr = mDnDTarget->init(this /* pGuest */);
+            }
+
+            LogFlowFunc(("Drag and drop initializied with hr=%Rhrc\n", hr));
+        }
+        catch (std::bad_alloc &)
+        {
+            hr = E_OUTOFMEMORY;
+        }
     }
 #endif
+
+    /* Confirm a successful initialization when it's the case: */
+    if (SUCCEEDED(hr))
+        autoInitSpan.setSucceeded();
+    else
+        autoInitSpan.setFailed();
 
     LogFlowFunc(("hr=%Rhrc\n", hr));