Changeset 94184 in vbox for trunk/src/VBox/HostServices

Timestamp:

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

Author:

vboxsync

Message:

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

File:

• trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp (modified) (7 diffs)

trunk/src/VBox/HostServices/GuestProperties/VBoxGuestPropSvc.cpp

@@ -425 +425 @@
     int getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int getOldNotificationInternal(const char *pszPattern, uint64_t nsTimestamp, Property *pProp);
-    int getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &prop);
+    int getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &prop, bool fWasDeleted);
     int doNotifications(const char *pszProperty, uint64_t nsTimestamp);
     int notifyHost(const char *pszName, const char *pszValue, uint64_t nsTimestamp, const char *pszFlags);
@@ -1040 +1040 @@
 
 /** Helper query used by getNotification */
-int Service::getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &rProp)
+int Service::getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property const &rProp, bool fWasDeleted)
 {
     AssertReturn(cParms == 4, VERR_INVALID_PARAMETER); /* Basic sanity checking. */
@@ -1051 +1051 @@
     {
         char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
+        char szWasDeleted[2] = { fWasDeleted ? '1' : '0', '\0' };
+
         rc = GuestPropWriteFlags(rProp.mFlags, szFlags);
         if (RT_SUCCESS(rc))
@@ -1059 +1061 @@
             size_t const cbName   = rProp.mName.length() + 1;
             size_t const cbValue  = rProp.mValue.length() + 1;
-            size_t const cbNeeded = cbName + cbValue + cbFlags;
+            size_t const cbWasDeleted  = strlen(szWasDeleted) + 1;
+            size_t const cbNeeded = cbName + cbValue + cbFlags + cbWasDeleted;
             HGCMSvcSetU32(&paParms[3], (uint32_t)cbNeeded);
             if (cbNeeded <= cbBuf)
             {
+                /* Buffer layout: Name\0Value\0Flags\0fWasDeleted\0. */
                 memcpy(pchBuf, rProp.mName.c_str(), cbName);
                 pchBuf += cbName;
@@ -1068 +1072 @@
                 pchBuf += cbValue;
                 memcpy(pchBuf, szFlags, cbFlags);
+                pchBuf += cbFlags;
+                memcpy(pchBuf, szWasDeleted, cbWasDeleted);
             }
             else
@@ -1185 +1191 @@
             else
             {
-                int rc2 = getNotificationWriteOut(cParms, paParms, prop);
+                int rc2 = getNotificationWriteOut(cParms, paParms, prop, !getPropertyInternal(prop.mName.c_str()));
                 if (RT_FAILURE(rc2))
                     rc = rc2;
@@ -1252 +1258 @@
             if (prop.Matches(pszPatterns))
             {
-                int rc2 = getNotificationWriteOut(it->mParmsCnt, it->mParms, prop);
+                int rc2 = getNotificationWriteOut(it->mParmsCnt, it->mParms, prop, !pProp);
                 if (RT_SUCCESS(rc2))
                     rc2 = it->mRc;