Changeset 70063 in vbox

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

Files:

• include/VBox/HostServices/GuestPropertySvc.h (modified) (1 diff)
• src/VBox/HostServices/GuestProperties/service.cpp (modified) (8 diffs)
• src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (10 diffs)
• src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (5 diffs)
• src/VBox/Main/src-client/ConsoleImpl2.cpp (modified) (4 diffs)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -222 +222 @@
  * parameters.  These are, in order, name, value, timestamp, flags.  Strings are
  * stored as pointers to mutable utf8 data.  All parameters must be supplied. */
-#define GUEST_PROP_FN_SET_PROPS_HOST        1
+#define GUEST_PROP_FN_HOST_SET_PROPS        1
 /** Get the value attached to a guest property.
  * The parameter format matches that of GET_PROP. */
-#define GUEST_PROP_FN_GET_PROP_HOST         2
+#define GUEST_PROP_FN_HOST_GET_PROP         2
 /** Set the value attached to a guest property.
  * The parameter format matches that of SET_PROP. */
-#define GUEST_PROP_FN_SET_PROP_HOST         3
+#define GUEST_PROP_FN_HOST_SET_PROP         3
 /** Set the value attached to a guest property.
  * The parameter format matches that of SET_PROP_VALUE. */
-#define GUEST_PROP_FN_SET_PROP_VALUE_HOST   4
+#define GUEST_PROP_FN_HOST_SET_PROP_VALUE   4
 /** Remove a guest property.
  * The parameter format matches that of DEL_PROP. */
-#define GUEST_PROP_FN_DEL_PROP_HOST         5
+#define GUEST_PROP_FN_HOST_DEL_PROP         5
 /** Enumerate guest properties.
  * The parameter format matches that of ENUM_PROPS. */
-#define GUEST_PROP_FN_ENUM_PROPS_HOST       6
+#define GUEST_PROP_FN_HOST_ENUM_PROPS       6
 /** Set global flags for the service.
  * Currently RDONLYGUEST is supported.  Takes one 32-bit unsigned integer
  * parameter for the flags. */
-#define GUEST_PROP_FN_SET_GLOBAL_FLAGS_HOST 7
+#define GUEST_PROP_FN_HOST_SET_GLOBAL_FLAGS 7
 /** Return the pointer to a debug info function enumerating all guest
  * properties. */
-#define GUEST_PROP_FN_GET_DBGF_INFO_FN      8
+#define GUEST_PROP_FN_HOST_GET_DBGF_INFO    8
 /** @} */
 

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;

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -1834 +1834 @@
         parm[2].u.uint32 = 0;
 
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_ENUM_PROPS_HOST, 3, &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_ENUM_PROPS, 3, &parm[0]);
         Utf8Buf.jolt();
         if (parm[2].type != VBOX_HGCM_SVC_PARM_32BIT)
@@ -5949 +5949 @@
         parm[3].u.uint32 = 0;
 
-        int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_GET_PROP_HOST,
+        int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_GET_PROP,
                                           4, &parm[0]);
         /* The returned string should never be able to be greater than our buffer */
@@ -6018 +6018 @@
     if (aFlags.isEmpty())
     {
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_VALUE_HOST, 2, &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_SET_PROP_VALUE, 2, &parm[0]);
     }
     else
@@ -6026 +6026 @@
         parm[2].u.pointer.size = (uint32_t)aFlags.length() + 1; /* The + 1 is the null terminator */
 
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_HOST, 3, &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_SET_PROP, 3, &parm[0]);
     }
 
@@ -6058 +6058 @@
     parm[0].u.pointer.size = (uint32_t)aName.length() + 1; /* The + 1 is the null terminator */
 
-    int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_DEL_PROP_HOST, 1, &parm[0]);
+    int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_DEL_PROP, 1, &parm[0]);
 
     HRESULT hrc = S_OK;

trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp

@@ -5931 +5931 @@
     parms[3].u.pointer.size = 0;  /* We don't actually care. */
 
-    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROPS_HOST, 4, &parms[0]);
+    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_SET_PROPS, 4, &parms[0]);
 }
 
@@ -5956 +5956 @@
     parms[2].u.pointer.addr = (void *)pszFlags;
     parms[2].u.pointer.size = (uint32_t)strlen(pszFlags) + 1;
-    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_HOST, 3, &parms[0]);
+    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_SET_PROP, 3, &parms[0]);
 }
 
@@ -5970 +5970 @@
     VBOXHGCMSVCPARM paParm;
     paParm.setUInt32(fFlags);
-    int rc = pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_GLOBAL_FLAGS_HOST, 1, &paParm);
+    int rc = pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_SET_GLOBAL_FLAGS, 1, &paParm);
     if (RT_FAILURE(rc))
     {
@@ -6015 +6015 @@
         {
             VBOXHGCMSVCPARM Params[2];
-            int rc2 = pConsole->m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_GET_DBGF_INFO_FN, 2, &Params[0]);
+            int rc2 = pConsole->m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_HOST_GET_DBGF_INFO, 2, &Params[0]);
             if (RT_SUCCESS(rc2))
             {
                 PFNDBGFHANDLEREXT pfnHandler = (PFNDBGFHANDLEREXT)(uintptr_t)Params[0].u.pointer.addr;
-                void *pService = (void*)Params[1].u.pointer.addr;
-                DBGFR3InfoRegisterExternal(pUVM, "guestprops", "Display the guest properties", pfnHandler, pService);
+                void *pvService = Params[1].u.pointer.addr;
+                DBGFR3InfoRegisterExternal(pUVM, "guestprops", "Display the guest properties", pfnHandler, pvService);
             }
         }