Changeset 86876 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Nov 12, 2020 4:38:00 PM (4 years ago)

Author:

vboxsync

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

141332

Message:

Guest Additions/VbglR3: Condensed / removed duplicate guest property code by adding VbglR3GuestPropExist() + VbglR3GuestPropReadEx().

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga-x11.cpp

@@ -681 +681 @@
 
 /**
- * An abbreviated copy of the VGSvcReadProp from VBoxServiceUtils.cpp
- */
-static int readGuestProperty(uint32_t u32ClientId, const char *pszPropName)
-{
-    AssertPtrReturn(pszPropName, VERR_INVALID_POINTER);
-
-    uint32_t    cbBuf = _1K;
-    void       *pvBuf = NULL;
-    int         rc    = VINF_SUCCESS;  /* MSC can't figure out the loop */
-
-    for (unsigned cTries = 0; cTries < 10; cTries++)
-    {
-        /*
-         * (Re-)Allocate the buffer and try read the property.
-         */
-        RTMemFree(pvBuf);
-        pvBuf = RTMemAlloc(cbBuf);
-        if (!pvBuf)
-        {
-            VBClLogError("Guest Property: Failed to allocate %zu bytes\n", cbBuf);
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-        char    *pszValue;
-        char    *pszFlags;
-        uint64_t uTimestamp;
-        rc = VbglR3GuestPropRead(u32ClientId, pszPropName, pvBuf, cbBuf, &pszValue, &uTimestamp, &pszFlags, NULL);
-        if (RT_FAILURE(rc))
-        {
-            if (rc == VERR_BUFFER_OVERFLOW)
-            {
-                /* try again with a bigger buffer. */
-                cbBuf *= 2;
-                continue;
-            }
-            else
-                break;
-        }
-        else
-            break;
-    }
-
-    if (pvBuf)
-        RTMemFree(pvBuf);
-    return rc;
-}
-
-/**
  * We start VBoxDRMClient from VBoxService in case  some guest property is set.
  * We check the same guest property here and dont start this service in case
@@ -735 +687 @@
 static bool checkDRMClient(void)
 {
-   uint32_t uGuestPropSvcClientID;
-   int rc = VbglR3GuestPropConnect(&uGuestPropSvcClientID);
-   if (RT_FAILURE(rc))
-       return false;
-   rc = readGuestProperty(uGuestPropSvcClientID, "/VirtualBox/GuestAdd/DRMResize" /*pszPropName*/);
-   if (RT_FAILURE(rc))
-       return false;
-   return true;
+    bool fStartClient = false;
+
+    uint32_t idClient;
+    int rc = VbglR3GuestPropConnect(&idClient);
+    if (RT_SUCCESS(rc))
+    {
+        fStartClient = VbglR3GuestPropExist(idClient, "/VirtualBox/GuestAdd/DRMResize" /*pszPropName*/);
+        VbglR3GuestPropDisconnect(idClient);
+    }
+
+    return fStartClient;
 }