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

Timestamp:

Jul 22, 2008 8:12:42 AM (17 years ago)

Author:

vboxsync

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

33575

Message:

Guest properties: initial commit of new interface

File:

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

trunk/src/VBox/Main/MachineImpl.cpp

@@ -74 +74 @@
 #include <VBox/err.h>
 #include <VBox/param.h>
-#ifdef VBOX_WITH_INFO_SVC
-# include <VBox/HostServices/VBoxInfoSvc.h>
+#ifdef VBOX_WITH_GUEST_PROPS
+# include <VBox/HostServices/GuestPropertySvc.h>
 #endif
 
@@ -2689 +2689 @@
 }
 
-STDMETHODIMP Machine::GetGuestProperty (INPTR BSTR aKey, BSTR *aValue)
-{
-#if !defined (VBOX_WITH_INFO_SVC)
+STDMETHODIMP Machine::GetGuestProperty (INPTR BSTR aKey, BSTR *aValue, ULONG64 *aTimestamp, BSTR *aFlags)
+{
+    if (!VALID_PTR (aKey))
+        return E_INVALIDARG;
+    if (!VALID_PTR (aValue))
+        return E_POINTER;
+    if (!VALID_PTR (aTimestamp))
+        return E_POINTER;
+    if (!VALID_PTR (aFlags))
+        return E_POINTER;
+    *aTimestamp = 0;
+    Bstr().cloneTo(aFlags);
+    return GetGuestPropertyValue (aKey, aValue);
+}
+
+STDMETHODIMP Machine::GetGuestPropertyValue (INPTR BSTR aKey, BSTR *aValue)
+{
+#if !defined (VBOX_WITH_GUEST_PROPS)
     return E_NOTIMPL;
 #else
@@ -2704 +2719 @@
     AutoReadLock alock (this);
 
-    using namespace svcInfo;
+    using namespace guestProp;
     HRESULT rc = E_FAIL;
 
@@ -2753 +2768 @@
     }
     return rc;
-#endif /* else !defined (VBOX_WITH_INFO_SVC) */
-}
-
-STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue)
-{
-#if !defined (VBOX_WITH_INFO_SVC)
+#endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
+}
+
+STDMETHODIMP Machine::GetGuestPropertyTimestamp (INPTR BSTR aKey, ULONG64 *aTimestamp)
+{
+    return E_NOTIMPL;
+}
+
+STDMETHODIMP Machine::SetGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue, INPTR BSTR aFlags)
+{
+    if (!VALID_PTR (aKey))
+        return E_INVALIDARG;
+    if ((aValue != NULL) && !VALID_PTR (aValue))
+        return E_INVALIDARG;
+    if ((aFlags != NULL) && !VALID_PTR (aFlags))
+        return E_INVALIDARG;
+    return SetGuestPropertyValue (aKey, aValue);
+}
+
+STDMETHODIMP Machine::SetGuestPropertyValue (INPTR BSTR aKey, INPTR BSTR aValue)
+{
+#if !defined (VBOX_WITH_GUEST_PROPS)
     return E_NOTIMPL;
 #else
@@ -2772 +2803 @@
     AutoWriteLock alock (this);
 
-    using namespace svcInfo;
+    using namespace guestProp;
     HRESULT rc = E_FAIL;
 
@@ -2822 +2853 @@
     }
     return rc;
-#endif /* else !defined (VBOX_WITH_INFO_SVC) */
+#endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
+}
+
+STDMETHODIMP Machine::EnumerateGuestProperties (INPTR BSTR aPattern, ComSafeArrayOut(BSTR, aKeys), ComSafeArrayOut(BSTR, aValues), ComSafeArrayOut(ULONG64, aTimestamps), ComSafeArrayOut(BSTR, aFlags))
+{
+    return E_NOTIMPL;
 }