Changeset 94184 in vbox for trunk/src/VBox/Additions/common/VBoxControl

Timestamp:

Mar 11, 2022 6:24:17 PM (3 years ago)

Author:

vboxsync

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

150440

Message:

Main: Guest Properties: notify lesteners that property was deleted (additional fixes in r150441, r150442, r150443, r150445), bugref:10185.

Location:

trunk/src/VBox/Additions/common/VBoxControl

Files:

• VBoxControl.cpp (modified) (3 diffs)
• testcase/tstVBoxControl.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp ¶

@@ -1515 +1515 @@
     uint64_t u64TimestampOut = 0;
     char *pszFlags = NULL;
+    bool fWasDeleted = false;
     /* The buffer for storing the data and its initial size.  We leave a bit
      * of space here in case the maximum values are raised. */
@@ -1538 +1539 @@
                                      u64TimestampIn, u32Timeout,
                                      &pszName, &pszValue, &u64TimestampOut,
-                                     &pszFlags, &cbBuf);
+                                     &pszFlags, &cbBuf, &fWasDeleted);
         }
         if (VERR_BUFFER_OVERFLOW == rc)
@@ -1562 +1563 @@
     else if (RT_SUCCESS(rc))
     {
-        RTPrintf("Name: %s\n", pszName);
-        RTPrintf("Value: %s\n", pszValue);
-        RTPrintf("Timestamp: %lld ns\n", u64TimestampOut);
-        RTPrintf("Flags: %s\n", pszFlags);
+        if (fWasDeleted)
+        {
+            RTPrintf("Property %s was deleted\n", pszName);
+        }
+        else
+        {
+            RTPrintf("Name: %s\n", pszName);
+            RTPrintf("Value: %s\n", pszValue);
+            RTPrintf("Timestamp: %lld ns\n", u64TimestampOut);
+            RTPrintf("Flags: %s\n", pszFlags);
+        }
     }
 

trunk/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp ¶

@@ -177 +177 @@
                                         uint64_t *pu64Timestamp,
                                         char **ppszFlags,
-                                        uint32_t *pcbBufActual)
+                                        uint32_t *pcbBufActual,
+                                        bool *pfWasDeleted)
 {
     RT_NOREF2(pvBuf, cbBuf);
@@ -201 +202 @@
     if (pcbBufActual)
         *pcbBufActual = 256;
+    if (pfWasDeleted)
+        *pfWasDeleted = false;
     return VINF_SUCCESS;
 }