Changeset 70058 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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

119600

Message:

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

Location:

trunk/src/VBox/Main

Files:

• src-client/ConsoleImpl.cpp (modified) (7 diffs)
• src-client/ConsoleImpl2.cpp (modified) (7 diffs)
• src-server/MachineImpl.cpp (modified) (11 diffs)

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

@@ -1766 +1766 @@
      * changes to the object state.
      */
-    PHOSTCALLBACKDATA   pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms);
-    AssertReturn(sizeof(HOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
-    AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER);
+    PGUESTPROPHOSTCALLBACKDATA pCBData = reinterpret_cast<PGUESTPROPHOSTCALLBACKDATA>(pvParms);
+    AssertReturn(sizeof(GUESTPROPHOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER);
+    AssertReturn(pCBData->u32Magic == GUESTPROPHOSTCALLBACKDATA_MAGIC, VERR_INVALID_PARAMETER);
     LogFlow(("Console::doGuestPropNotification: pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n",
              pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags));
@@ -1839 +1839 @@
         parm[2].u.uint32 = 0;
 
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", ENUM_PROPS_HOST, 3,
-                                      &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_ENUM_PROPS_HOST, 3, &parm[0]);
         Utf8Buf.jolt();
         if (parm[2].type != VBOX_HGCM_SVC_PARM_32BIT)
@@ -5941 +5940 @@
     {
         VBOXHGCMSVCPARM parm[4];
-        char szBuffer[MAX_VALUE_LEN + MAX_FLAGS_LEN];
+        char szBuffer[GUEST_PROP_MAX_VALUE_LEN + GUEST_PROP_MAX_FLAGS_LEN];
 
         parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -5957 +5956 @@
         parm[3].u.uint32 = 0;
 
-        int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GET_PROP_HOST,
+        int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_GET_PROP_HOST,
                                           4, &parm[0]);
         /* The returned string should never be able to be greater than our buffer */
@@ -6028 +6027 @@
     if (aFlags.isEmpty())
     {
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", SET_PROP_VALUE_HOST,
-                                    2, &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_VALUE_HOST, 2, &parm[0]);
     }
     else
@@ -6037 +6035 @@
         parm[2].u.pointer.size = (uint32_t)aFlags.length() + 1; /* The + 1 is the null terminator */
 
-        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", SET_PROP_HOST,
-                                      3, &parm[0]);
+        vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_HOST, 3, &parm[0]);
     }
 
@@ -6073 +6070 @@
     parm[0].u.pointer.size = (uint32_t)aName.length() + 1; /* The + 1 is the null terminator */
 
-    int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", DEL_PROP_HOST,
-                                      1, &parm[0]);
+    int vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_DEL_PROP_HOST, 1, &parm[0]);
 
     HRESULT hrc = S_OK;

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

@@ -5906 +5906 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS
+
 /**
  * Set an array of guest properties
@@ -5930 +5931 @@
     parms[3].u.pointer.size = 0;  /* We don't actually care. */
 
-    pVMMDev->hgcmHostCall("VBoxGuestPropSvc",
-                          guestProp::SET_PROPS_HOST,
-                          4,
-                          &parms[0]);
+    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROPS_HOST, 4, &parms[0]);
 }
 
@@ -5958 +5956 @@
     parms[2].u.pointer.addr = (void *)pszFlags;
     parms[2].u.pointer.size = (uint32_t)strlen(pszFlags) + 1;
-    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", guestProp::SET_PROP_HOST, 3,
-                          &parms[0]);
+    pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_PROP_HOST, 3, &parms[0]);
 }
 
@@ -5969 +5966 @@
  * @param   eFlags  the flags to set
  */
-int configSetGlobalPropertyFlags(VMMDev * const pVMMDev,
-                                 guestProp::ePropFlags eFlags)
+int configSetGlobalPropertyFlags(VMMDev * const pVMMDev, uint32_t fFlags)
 {
     VBOXHGCMSVCPARM paParm;
-    paParm.setUInt32(eFlags);
-    int rc = pVMMDev->hgcmHostCall("VBoxGuestPropSvc",
-                                   guestProp::SET_GLOBAL_FLAGS_HOST, 1,
-                                   &paParm);
+    paParm.setUInt32(fFlags);
+    int rc = pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_SET_GLOBAL_FLAGS_HOST, 1, &paParm);
     if (RT_FAILURE(rc))
     {
-        char szFlags[guestProp::MAX_FLAGS_LEN];
-        if (RT_FAILURE(writeFlags(eFlags, szFlags)))
+        char szFlags[GUEST_PROP_MAX_FLAGS_LEN];
+        if (RT_FAILURE(GuestPropWriteFlags(fFlags, szFlags)))
             Log(("Failed to set the global flags.\n"));
         else
@@ -5987 +5981 @@
     return rc;
 }
+
 #endif /* VBOX_WITH_GUEST_PROPS */
 
@@ -6020 +6015 @@
         {
             VBOXHGCMSVCPARM Params[2];
-            int rc2 = pConsole->m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", guestProp::GET_DBGF_INFO_FN, 2, &Params[0]);
+            int rc2 = pConsole->m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", GUEST_PROP_FN_GET_DBGF_INFO_FN, 2, &Params[0]);
             if (RT_SUCCESS(rc2))
             {
@@ -6134 +6129 @@
 
 #ifdef VBOX_WITH_GUEST_PROPS_RDONLY_GUEST
-        rc = configSetGlobalPropertyFlags(pConsole->m_pVMMDev,
-                                          guestProp::RDONLYGUEST);
+        rc = configSetGlobalPropertyFlags(pConsole->m_pVMMDev, guestProp::RDONLYGUEST);
         AssertRCReturn(rc, rc);
 #endif

trunk/src/VBox/Main/src-server/MachineImpl.cpp

@@ -5654 +5654 @@
     if (it != mHWData->mGuestProperties.end())
     {
-        char szFlags[MAX_FLAGS_LEN + 1];
+        char szFlags[GUEST_PROP_MAX_FLAGS_LEN + 1];
         aValue = it->second.strValue;
         *aTimestamp = it->second.mTimestamp;
-        writeFlags(it->second.mFlags, szFlags);
+        GuestPropWriteFlags(it->second.mFlags, szFlags);
         aFlags = Utf8Str(szFlags);
     }
@@ -5752 +5752 @@
     try
     {
-        uint32_t fFlags = NILFLAG;
-        if (aFlags.length() && RT_FAILURE(validateFlags(aFlags.c_str(), &fFlags)))
+        uint32_t fFlags = GUEST_PROP_F_NILFLAG;
+        if (aFlags.length() && RT_FAILURE(GuestPropValidateFlags(aFlags.c_str(), &fFlags)))
             return setError(E_INVALIDARG, tr("Invalid guest property flag values: '%s'"), aFlags.c_str());
 
@@ -5774 +5774 @@
         else
         {
-            if (it->second.mFlags & (RDONLYHOST))
+            if (it->second.mFlags & (GUEST_PROP_F_RDONLYHOST))
             {
                 rc = setError(E_ACCESSDENIED, tr("The property '%s' cannot be changed by the host"), aName.c_str());
@@ -5936 +5936 @@
     aFlags.resize(cEntries);
 
-    char szFlags[MAX_FLAGS_LEN + 1];
+    char szFlags[GUEST_PROP_MAX_FLAGS_LEN + 1];
     size_t i = 0;
     for (HWData::GuestPropertyMap::const_iterator
@@ -5946 +5946 @@
         aValues[i] = it->second.strValue;
         aTimestamps[i] = it->second.mTimestamp;
-        writeFlags(it->second.mFlags, szFlags);
+        GuestPropWriteFlags(it->second.mFlags, szFlags);
         aFlags[i] = Utf8Str(szFlags);
     }
@@ -9158 +9158 @@
         {
             const settings::GuestProperty &prop = *it;
-            uint32_t fFlags = guestProp::NILFLAG;
-            guestProp::validateFlags(prop.strFlags.c_str(), &fFlags);
+            uint32_t fFlags = GUEST_PROP_F_NILFLAG;
+            GuestPropValidateFlags(prop.strFlags.c_str(), &fFlags);
             if (   fSkipTransientGuestProperties
-                && (   fFlags & guestProp::TRANSIENT
-                    || fFlags & guestProp::TRANSRESET))
+                && (   fFlags & GUEST_PROP_F_TRANSIENT
+                    || fFlags & GUEST_PROP_F_TRANSRESET))
             {
                 it = llGuestProperties.erase(it);
@@ -10454 +10454 @@
                     || mData->mMachineState == MachineState_Aborted
                     || mData->mMachineState == MachineState_Teleported)
-                && (   property.mFlags & guestProp::TRANSIENT
-                    || property.mFlags & guestProp::TRANSRESET))
+                && (property.mFlags & (GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_TRANSRESET)))
                 continue;
-            settings::GuestProperty prop;
+            settings::GuestProperty prop; /// @todo r=bird: some excellent variable name choices here: 'prop' and 'property'; No 'const' clue either.
             prop.strName = it->first;
             prop.strValue = property.strValue;
             prop.timestamp = property.mTimestamp;
-            char szFlags[guestProp::MAX_FLAGS_LEN + 1];
-            guestProp::writeFlags(property.mFlags, szFlags);
+            char szFlags[GUEST_PROP_MAX_FLAGS_LEN + 1];
+            GuestPropWriteFlags(property.mFlags, szFlags);
             prop.strFlags = szFlags;
 
@@ -13541 +13540 @@
          ++it, ++i)
     {
-        char szFlags[MAX_FLAGS_LEN + 1];
+        char szFlags[GUEST_PROP_MAX_FLAGS_LEN + 1];
         aNames[i] = it->first;
         aValues[i] = it->second.strValue;
@@ -13549 +13548 @@
         if (it->second.mFlags)
         {
-            writeFlags(it->second.mFlags, szFlags);
+            GuestPropWriteFlags(it->second.mFlags, szFlags);
             aFlags[i] = szFlags;
         }
@@ -13576 +13575 @@
          * Convert input up front.
          */
-        uint32_t fFlags = NILFLAG;
+        uint32_t fFlags = GUEST_PROP_F_NILFLAG;
         if (aFlags.length())
         {
-            int vrc = validateFlags(aFlags.c_str(), &fFlags);
+            int vrc = GuestPropValidateFlags(aFlags.c_str(), &fFlags);
             AssertRCReturn(vrc, E_INVALIDARG);
         }
@@ -14803 +14802 @@
         {
             uint32_t fFlags = it->second.mFlags;
-            if (   fFlags & guestProp::TRANSIENT
-                || fFlags & guestProp::TRANSRESET)
+            if (fFlags & (GUEST_PROP_F_TRANSIENT | GUEST_PROP_F_TRANSRESET))
             {
                 /* iterator where we need to continue after the erase call