Changeset 70058 in vbox for trunk/src/VBox/Additions/common/VBoxGuest

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/Additions/common/VBoxGuest

Files:

• VBoxGuest.cpp (modified) (1 diff)
• lib/VBoxGuestR3LibGuestProp.cpp (modified) (9 diffs)
• lib/VBoxGuestR3LibVideo.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -1325 +1325 @@
                          */
                         uint32_t fFlags = 0;
-                        rc = guestProp::validateFlags(apszFields[3], &fFlags);
+                        rc = GuestPropValidateFlags(apszFields[3], &fFlags);
                         if (RT_SUCCESS(rc))
                         {
-                            if (fFlags & guestProp::RDONLYGUEST)
+                            if (fFlags & GUEST_PROP_F_RDONLYGUEST)
                             {
                                 apszFields[0] += sizeof(g_szzPattern) - 2;

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibGuestProp.cpp

@@ -165 +165 @@
     {
         SetProperty Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, SET_PROP_VALUE, 3);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_SET_PROP_VALUE, 3);
         VbglHGCMParmPtrSetString(&Msg.name,  pszName);
         VbglHGCMParmPtrSetString(&Msg.value, pszValue);
@@ -174 +174 @@
     {
         DelProperty Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, DEL_PROP, 1);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_DEL_PROP, 1);
         VbglHGCMParmPtrSetString(&Msg.name, pszName);
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -202 +202 @@
     {
         SetPropertyValue Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, SET_PROP_VALUE, 2);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_SET_PROP_VALUE, 2);
         VbglHGCMParmPtrSetString(&Msg.name, pszName);
         VbglHGCMParmPtrSetString(&Msg.value, pszValue);
@@ -210 +210 @@
     {
         DelProperty Msg;
-        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, DEL_PROP, 1);
+        VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_DEL_PROP, 1);
         VbglHGCMParmPtrSetString(&Msg.name, pszName);
         rc = VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -298 +298 @@
      */
     GetProperty Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GET_PROP, 4);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_GET_PROP, 4);
     VbglHGCMParmPtrSetString(&Msg.name, pszName);
     VbglHGCMParmPtrSet(&Msg.buffer, pvBuf, cbBuf);
@@ -387 +387 @@
     char       *pszValue = NULL;
     void       *pvBuf    = NULL;
-    uint32_t    cchBuf   = MAX_VALUE_LEN;
+    uint32_t    cbBuf    = GUEST_PROP_MAX_VALUE_LEN;
     int         rc       = VERR_BUFFER_OVERFLOW;
     for (unsigned i = 0; i < 10 && rc == VERR_BUFFER_OVERFLOW; ++i)
     {
         /* We leave a bit of space here in case the maximum value is raised. */
-        cchBuf += 1024;
-        void *pvTmpBuf = RTMemRealloc(pvBuf, cchBuf);
+        cbBuf += 1024;
+        void *pvTmpBuf = RTMemRealloc(pvBuf, cbBuf);
         if (pvTmpBuf)
         {
             pvBuf = pvTmpBuf;
-            rc = VbglR3GuestPropRead(idClient, pszName, pvBuf, cchBuf,
-                                     &pszValue, NULL, NULL, &cchBuf);
+            rc = VbglR3GuestPropRead(idClient, pszName, pvBuf, cbBuf, &pszValue, NULL, NULL, &cbBuf);
         }
         else
@@ -494 +493 @@
 {
     EnumProperties Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, ENUM_PROPS, 3);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_ENUM_PROPS, 3);
 
     /* Get the length of the patterns array... */
@@ -759 +758 @@
 
     DelProperty Msg;
-    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, DEL_PROP, 1);
+    VBGL_HGCM_HDR_INIT(&Msg.hdr, idClient, GUEST_PROP_FN_DEL_PROP, 1);
     VbglHGCMParmPtrSetString(&Msg.name, pszName);
     return VbglR3HGCMCall(&Msg.hdr, sizeof(Msg));
@@ -861 +860 @@
      */
     GetNotification Msg;
-    VBGL_HGCM_HDR_INIT_TIMED(&Msg.hdr, idClient, GET_NOTIFICATION, 4, cMillies);
+    VBGL_HGCM_HDR_INIT_TIMED(&Msg.hdr, idClient, GUEST_PROP_FN_GET_NOTIFICATION, 4, cMillies);
 
     VbglHGCMParmPtrSetString(&Msg.patterns, pszPatterns);

trunk/src/VBox/Additions/common/VBoxGuest/lib/VBoxGuestR3LibVideo.cpp

@@ -385 +385 @@
         {
             int rc2;
-            char szModeName[MAX_NAME_LEN];
-            char szModeParms[MAX_VALUE_LEN];
+            char szModeName[GUEST_PROP_MAX_NAME_LEN];
+            char szModeParms[GUEST_PROP_MAX_VALUE_LEN];
             RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX "%u", idScreen);
             RTStrPrintf(szModeParms, sizeof(szModeParms), "%ux%ux%u,%ux%u,%u", cx, cy, cBits, x, y, (unsigned) fEnabled);
@@ -471 +471 @@
          * something is wrong with the data stored in the property. */
         char szModeParms[1024];
-        char szModeName[MAX_NAME_LEN]; /** @todo add a VbglR3GuestPropReadValueF/FV that does the RTStrPrintf for you. */
+        char szModeName[GUEST_PROP_MAX_NAME_LEN]; /** @todo add a VbglR3GuestPropReadValueF/FV that does the RTStrPrintf for you. */
         RTStrPrintf(szModeName, sizeof(szModeName), VIDEO_PROP_PREFIX "%u", idScreen);
         rc = VbglR3GuestPropReadValue(idClient, szModeName, szModeParms, sizeof(szModeParms), NULL);