Changeset 70063 in vbox for trunk/src/VBox/HostServices/GuestProperties

Timestamp:

Dec 11, 2017 3:32:07 PM (7 years ago)

Author:

vboxsync

Message:

GuestPropertySvc.h: Working on making it usable from C (VBoxGuest, ++)

Location:

trunk/src/VBox/HostServices/GuestProperties

Files:

• service.cpp (modified) (8 diffs)
• testcase/tstGuestPropSvc.cpp (modified) (10 diffs)

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

@@ -1456 +1456 @@
         {
             /* The host wishes to set a block of properties */
-            case GUEST_PROP_FN_SET_PROPS_HOST:
+            case GUEST_PROP_FN_HOST_SET_PROPS:
                 LogFlowFunc(("SET_PROPS_HOST\n"));
                 rc = setPropertyBlock(cParms, paParms);
@@ -1462 +1462 @@
 
             /* The host wishes to read a configuration value */
-            case GUEST_PROP_FN_GET_PROP_HOST:
+            case GUEST_PROP_FN_HOST_GET_PROP:
                 LogFlowFunc(("GET_PROP_HOST\n"));
                 rc = getProperty(cParms, paParms);
@@ -1468 +1468 @@
 
             /* The host wishes to set a configuration value */
-            case GUEST_PROP_FN_SET_PROP_HOST:
+            case GUEST_PROP_FN_HOST_SET_PROP:
                 LogFlowFunc(("SET_PROP_HOST\n"));
                 rc = setProperty(cParms, paParms, false);
@@ -1474 +1474 @@
 
             /* The host wishes to set a configuration value */
-            case GUEST_PROP_FN_SET_PROP_VALUE_HOST:
+            case GUEST_PROP_FN_HOST_SET_PROP_VALUE:
                 LogFlowFunc(("SET_PROP_VALUE_HOST\n"));
                 rc = setProperty(cParms, paParms, false);
@@ -1480 +1480 @@
 
             /* The host wishes to remove a configuration value */
-            case GUEST_PROP_FN_DEL_PROP_HOST:
+            case GUEST_PROP_FN_HOST_DEL_PROP:
                 LogFlowFunc(("DEL_PROP_HOST\n"));
                 rc = delProperty(cParms, paParms, false);
@@ -1486 +1486 @@
 
             /* The host wishes to enumerate all properties */
-            case GUEST_PROP_FN_ENUM_PROPS_HOST:
+            case GUEST_PROP_FN_HOST_ENUM_PROPS:
                 LogFlowFunc(("ENUM_PROPS\n"));
                 rc = enumProps(cParms, paParms);
@@ -1492 +1492 @@
 
             /* The host wishes to set global flags for the service */
-            case GUEST_PROP_FN_SET_GLOBAL_FLAGS_HOST:
+            case GUEST_PROP_FN_HOST_SET_GLOBAL_FLAGS:
                 LogFlowFunc(("SET_GLOBAL_FLAGS_HOST\n"));
                 if (cParms == 1)
@@ -1505 +1505 @@
                 break;
 
-            case GUEST_PROP_FN_GET_DBGF_INFO_FN:
+            case GUEST_PROP_FN_HOST_GET_DBGF_INFO:
                 if (cParms != 2)
                     return VERR_INVALID_PARAMETER;

trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp

@@ -229 +229 @@
     aParms[2].setPointer((void *)g_au64TimestampBlock, 0);
     aParms[3].setPointer((void *)g_apcszFlagsBlock, 0);
-    RTTESTI_CHECK_RC(ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_SET_PROPS_HOST, 4, &aParms[0]), VINF_SUCCESS);
+    RTTESTI_CHECK_RC(ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_HOST_SET_PROPS, 4, &aParms[0]), VINF_SUCCESS);
 }
 
@@ -340 +340 @@
         aParms[1].setPointer((void *)abBuffer, g_aEnumStrings[i].cbBuffer - 1);
         memset(abBuffer, 0x55, sizeof(abBuffer));
-        int rc2 = ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_ENUM_PROPS_HOST, 3, aParms);
+        int rc2 = ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_HOST_ENUM_PROPS, 3, aParms);
         if (rc2 == VERR_BUFFER_OVERFLOW)
         {
@@ -356 +356 @@
         aParms[1].setPointer((void *)abBuffer, g_aEnumStrings[i].cbBuffer);
         memset(abBuffer, 0x55, sizeof(abBuffer));
-        rc2 = ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_ENUM_PROPS_HOST, 3, aParms);
+        rc2 = ptable->pfnHostCall(ptable->pvService, GUEST_PROP_FN_HOST_ENUM_PROPS, 3, aParms);
         if (rc2 == VINF_SUCCESS)
         {
@@ -401 +401 @@
     {
         if (useSetProp)
-            command = GUEST_PROP_FN_SET_PROP_HOST;
+            command = GUEST_PROP_FN_HOST_SET_PROP;
         else
-            command = GUEST_PROP_FN_SET_PROP_VALUE_HOST;
+            command = GUEST_PROP_FN_HOST_SET_PROP_VALUE;
     }
     else if (useSetProp)
@@ -498 +498 @@
     int command = GUEST_PROP_FN_DEL_PROP;
     if (isHost)
-        command = GUEST_PROP_FN_DEL_PROP_HOST;
+        command = GUEST_PROP_FN_HOST_DEL_PROP;
     VBOXHGCMSVCPARM aParms[1];
     aParms[0].setString(pcszName);
@@ -604 +604 @@
         memset(szBuffer, 0x55, sizeof(szBuffer));
         aParms[1].setPointer(szBuffer, sizeof(szBuffer));
-        int rc2 = pTable->pfnHostCall(pTable->pvService, GUEST_PROP_FN_GET_PROP_HOST, 4, aParms);
+        int rc2 = pTable->pfnHostCall(pTable->pvService, GUEST_PROP_FN_HOST_GET_PROP, 4, aParms);
 
         if (s_aGetProperties[i].exists && RT_FAILURE(rc2))
@@ -824 +824 @@
     VBOXHGCMSVCPARM paParm;
     paParm.setUInt32(fFlags);
-    int rc = pTable->pfnHostCall(pTable->pvService, GUEST_PROP_FN_SET_GLOBAL_FLAGS_HOST, 1, &paParm);
+    int rc = pTable->pfnHostCall(pTable->pvService, GUEST_PROP_FN_HOST_SET_GLOBAL_FLAGS, 1, &paParm);
     if (RT_FAILURE(rc))
     {
@@ -1009 +1009 @@
             aParms[0].setString(s_szProp);
             aParms[1].setPointer(pvBuf, cbBuf);
-            svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_GET_PROP_HOST, RT_ELEMENTS(aParms), aParms);
+            svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_HOST_GET_PROP, RT_ELEMENTS(aParms), aParms);
 
             RTTestGuardedFree(g_hTest, pvBuf);
@@ -1045 +1045 @@
             aParms[0].setString("*");
             aParms[1].setPointer(pvBuf, cbBuf);
-            svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_ENUM_PROPS_HOST, RT_ELEMENTS(aParms), aParms);
+            svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_HOST_ENUM_PROPS, RT_ELEMENTS(aParms), aParms);
 
             RTTestGuardedFree(g_hTest, pvBuf);
@@ -1114 +1114 @@
             aParms[0].setPointer(szProp, (uint32_t)cchProp + 1);
             aParms[1].setPointer(szBuffer, sizeof(szBuffer));
-            RTTESTI_CHECK_RC_BREAK(svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_GET_PROP_HOST, 4, aParms), VINF_SUCCESS);
+            RTTESTI_CHECK_RC_BREAK(svcTable.pfnHostCall(svcTable.pvService, GUEST_PROP_FN_HOST_GET_PROP, 4, aParms), VINF_SUCCESS);
         }
         cNsElapsed = RTTimeNanoTS() - cNsElapsed;