Changeset 10005 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Jun 27, 2008 9:33:35 PM (17 years ago)

Author:

vboxsync

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

32462

Message:

Additions/common: handle the guest property delete request

File:

• trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibInfoSvc.cpp

@@ -86 +86 @@
  * @param   u32ClientId     The client id returned by VbglR3InvsSvcConnect().
  * @param   pszKey          The registry key to save to.
- * @param   pszValue        The value to save.
+ * @param   pszValue        The value to store.  If this is NULL then the key
+ *                          will be removed.
  */
 VBGLR3DECL(int) VbglR3InfoSvcWriteKey(uint32_t u32ClientId, char *pszKey, char *pszValue)
 {
-    SetConfigKey Msg;
+    int rc;
 
-    Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
-    Msg.hdr.u32ClientID = u32ClientId;
-    Msg.hdr.u32Function = SET_CONFIG_KEY;
-    Msg.hdr.cParms = 2;
-    VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
-    VbglHGCMParmPtrSet(&Msg.value, pszValue, strlen(pszValue) + 1);
+    if (pszValue != NULL)
+    {
+        SetConfigKey Msg;
 
-    int rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
+        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32Function = SET_CONFIG_KEY;
+        Msg.hdr.cParms = 2;
+        VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
+        VbglHGCMParmPtrSet(&Msg.value, pszValue, strlen(pszValue) + 1);
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            rc = Msg.hdr.result;
+    }
+    else
+    {
+        DelConfigKey Msg;
+
+        Msg.hdr.result = (uint32_t)VERR_WRONG_ORDER;  /** @todo drop the cast when the result type has been fixed! */
+        Msg.hdr.u32ClientID = u32ClientId;
+        Msg.hdr.u32Function = DEL_CONFIG_KEY;
+        Msg.hdr.cParms = 1;
+        VbglHGCMParmPtrSet(&Msg.key, pszKey, strlen(pszKey) + 1);
+        rc = vbglR3DoIOCtl(VBOXGUEST_IOCTL_HGCM_CALL(sizeof(Msg)), &Msg, sizeof(Msg));
+        if (RT_SUCCESS(rc))
+            rc = Msg.hdr.result;
+    }
     return rc;
 }