Changeset 10007 in vbox for trunk

Timestamp:

Jun 27, 2008 9:42:47 PM (17 years ago)

Author:

vboxsync

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

32464

Message:

Main (guest properties): support the delete property request

Location:

trunk/src/VBox/Main

Files:

• ConsoleImpl.cpp (modified) (2 diffs)
• MachineImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/ConsoleImpl.cpp

@@ -2537 +2537 @@
     VBOXHGCMSVCPARM parm[2];
     Utf8Str Utf8Key = aKey;
-    Utf8Str Utf8Value = aValue;
+    int rc = VINF_SUCCESS;
 
     parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -2544 +2544 @@
     /* The + 1 is the null terminator */
     parm[0].u.pointer.size = Utf8Key.length() + 1;
-    parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
-    /* To save doing a const cast, we use the mutableRaw() member. */
-    parm[1].u.pointer.addr = Utf8Value.mutableRaw();
-    if (parm[1].u.pointer.addr != NULL)
+    if (aValue != NULL)
+    {
+        Utf8Str Utf8Value = aValue;
+        parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
+        /* To save doing a const cast, we use the mutableRaw() member. */
+        parm[1].u.pointer.addr = Utf8Value.mutableRaw();
         /* The + 1 is the null terminator */
         parm[1].u.pointer.size = Utf8Value.length() + 1;
+        rc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", SET_CONFIG_KEY_HOST, 2, &parm[0]);
+    }
     else
-        parm[1].u.pointer.size = 0;
-    int rc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", SET_CONFIG_KEY_HOST, 2, &parm[0]);
+        rc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", DEL_CONFIG_KEY_HOST, 1, &parm[0]);
     if (RT_SUCCESS(rc))
         hrc = S_OK;

trunk/src/VBox/Main/MachineImpl.cpp

@@ -2701 +2701 @@
     using namespace svcInfo;
 
+    if (NULL == aKey)
+        return setError (E_INVALIDARG, tr ("Called with a NULL key argument"));
     HRESULT hrc = E_FAIL;
     AutoWriteLock alock (this);
@@ -2769 +2771 @@
     using namespace svcInfo;
 
+    if (NULL == aKey)
+        return setError (E_INVALIDARG, tr ("Called with a NULL key argument"));
     HRESULT hrc = E_FAIL;
     AutoWriteLock alock (this);