Changeset 13179 in vbox for trunk

Timestamp:

Oct 10, 2008 2:45:34 PM (16 years ago)

Author:

vboxsync

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

37709

Message:

HostServices/GuestProperties: only notify Main from HGCM if the guest changed properties, not if Main changed them itself

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (11 diffs)

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

@@ -214 +214 @@
     int getPropValue(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int getProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool notify);
+    int delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool notify);
     int enumProps(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     void notifyHost(const char *pszProperty);
@@ -446 +446 @@
  * @thread  HGCM
  */
-int Service::setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int Service::setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool notify)
 {
     int rc = VINF_SUCCESS;
@@ -524 +524 @@
     if (RT_SUCCESS(rc))
     {
-        notifyHost(pszName);
+        if (notify)
+            notifyHost(pszName);
         Log2(("Set string %s, rc=%Rrc, value=%s\n", pszName, rc, pszValue));
     }
@@ -541 +542 @@
  * @thread  HGCM
  */
-int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool notify)
 {
     int rc = VINF_SUCCESS;
@@ -559 +560 @@
     {
         CFGMR3RemoveValue(mpValueNode, pszName);
-        notifyHost(pszName);
+        if (notify)
+            notifyHost(pszName);
     }
     LogFlowThisFunc(("rc = %Rrc\n", rc));
@@ -879 +881 @@
         case SET_PROP:
             LogFlowFunc(("SET_PROP\n"));
-            rc = setProperty(cParms, paParms);
+            rc = setProperty(cParms, paParms, true);
             break;
 
@@ -885 +887 @@
         case SET_PROP_VALUE:
             LogFlowFunc(("SET_PROP_VALUE\n"));
-            rc = setProperty(cParms, paParms);
+            rc = setProperty(cParms, paParms, true);
             break;
 
@@ -891 +893 @@
         case DEL_PROP:
             LogFlowFunc(("DEL_PROP\n"));
-            rc = delProperty(cParms, paParms);
+            rc = delProperty(cParms, paParms, true);
             break;
 
@@ -972 +974 @@
         case SET_PROP_HOST:
             LogFlowFunc(("SET_PROP_HOST\n"));
-            rc = setProperty(cParms, paParms);
+            rc = setProperty(cParms, paParms, false);
             break;
 
@@ -978 +980 @@
         case SET_PROP_VALUE_HOST:
             LogFlowFunc(("SET_PROP_VALUE_HOST\n"));
-            rc = setProperty(cParms, paParms);
+            rc = setProperty(cParms, paParms, false);
             break;
 
@@ -984 +986 @@
         case DEL_PROP_HOST:
             LogFlowFunc(("DEL_PROP_HOST\n"));
-            rc = delProperty(cParms, paParms);
+            rc = delProperty(cParms, paParms, false);
             break;