Changeset 13165 in vbox for trunk/src/VBox/Main/MachineImpl.cpp

Timestamp:

Oct 10, 2008 11:27:30 AM (16 years ago)

Author:

vboxsync

Message:

Main: use the HGCM guest property change notification interface and do some clean ups

File:

• trunk/src/VBox/Main/MachineImpl.cpp (modified) (4 diffs)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -8926 +8926 @@
     LogFlowThisFunc (("\n"));
 
+#ifdef VBOX_WITH_GUEST_PROPS
     AutoCaller autoCaller (this);
     AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
@@ -8957 +8958 @@
     mHWData->mPropertyServiceActive = true;
     return S_OK;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
 }
 
@@ -8965 +8969 @@
 {
     LogFlowThisFunc (("\n"));
+
+#ifdef VBOX_WITH_GUEST_PROPS
     AutoCaller autoCaller (this);
     AssertComRCReturn (autoCaller.rc(), autoCaller.rc());
@@ -9006 +9012 @@
     mData->mRegistered = TRUE;
     return S_OK;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
+}
+
+STDMETHODIMP SessionMachine::PushGuestProperty (INPTR BSTR aName, INPTR BSTR aValue,
+                                                ULONG64 aTimestamp, INPTR BSTR aFlags)
+{
+    LogFlowThisFunc (("\n"));
+
+#ifdef VBOX_WITH_GUEST_PROPS
+    if (!VALID_PTR(aName))
+        return E_INVALIDARG;
+    if ((aValue != NULL) && (!VALID_PTR(aValue) || !VALID_PTR(aFlags)))
+        return E_INVALIDARG;  /* aValue can be NULL to indicate deletion */
+
+    AutoCaller autoCaller (this);
+    CheckComRCReturnRC (autoCaller.rc());
+
+    AutoWriteLock alock (this);
+
+    HRESULT rc = checkStateDependency (MutableStateDep);
+    CheckComRCReturnRC (rc);
+
+    mHWData.backup();
+    for (HWData::GuestPropertyList::iterator iter = mHWData->mGuestProperties.begin();
+         iter != mHWData->mGuestProperties.end(); ++iter)
+        if (aName == iter->mName)
+        {
+            mHWData->mGuestProperties.erase(iter);
+            break;
+        }
+    if (aValue != NULL)
+    {
+        HWData::GuestProperty property = { aName, aValue, aTimestamp, aFlags };
+        mHWData->mGuestProperties.push_back(property);
+    }
+
+    /* send a callback notification if appropriate */
+    alock.leave();
+    // doGuestPropertyCallback(aName, aValue, aFlags);
+
+    return S_OK;
+#else
+    return VERR_NOT_IMPLEMENTED;
+#endif
 }