Changeset 13759

Timestamp:

11/03/08 17:13:04 (2 months ago)

Author:

vboxsync

Message:

Guest Properties (HostServices? and Main): major clean up of the guest property service

Files:

• trunk/include/VBox/HostServices/GuestPropertySvc.h (modified) (4 diffs)
• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (26 diffs)
• trunk/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk (modified) (1 diff)
• trunk/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp (modified) (6 diffs)
• trunk/src/VBox/Main/ConsoleImpl.cpp (modified) (5 diffs)
• trunk/src/VBox/Main/ConsoleImpl2.cpp (modified) (4 diffs)
• trunk/src/VBox/Main/MachineImpl.cpp (modified) (2 diffs)
• trunk/src/VBox/Main/include/ConsoleImpl.h (modified) (1 diff)

trunk/include/VBox/HostServices/GuestPropertySvc.h

@@ -148 +148 @@
-                break;
-        if (RT_ELEMENTS(flagList) == i)
-INVALID_PARAMETE
+PARSE_ERRO
-        else
-        {
@@ -157 +157 @@
-            if (',' == *pcszNext)
-                ++pcszNext;
+            else if (*pcszNext != '\0')
+                rc = VERR_PARSE_ERROR;
-            while (' ' == *pcszNext)
-                ++pcszNext;
@@ -189 +191 @@
-        for (; i < RT_ELEMENTS(flagList); ++i)
-        {
-Flags & flagList[i]
+lagList[i] == (fFlags & flagList[i])
-            {
-                strcpy(pszNext, flagName(flagList[i]));
@@ -213 +215 @@
-enum eHostFn
-{
-
-
+
+
+
+
+
+
+
-    /**
-     * Get the value attached to a guest property

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

@@ -47 +47 @@
-
-#include <memory>  /* for auto_ptr */
+#include <string>
+#include <list>
-
-#include <iprt/err.h>
@@ -59 +61 @@
-#include <VBox/log.h>
-
-#include <VBox/cfgm.h>
-
-/*******************************************************************************
-*   Internal functions                                                         *
@@ -77 +77 @@
-}
-
+/** Extract a constant pointer value from an HGCM parameter structure */
+static int VBoxHGCMParmPtrConstGet (VBOXHGCMSVCPARM *pParm, const void **ppv, uint32_t *pcb)
+{
+    if (pParm->type == VBOX_HGCM_SVC_PARM_PTR)
+    {
+        *ppv = pParm->u.pointer.addr;
+        *pcb = pParm->u.pointer.size;
+        return VINF_SUCCESS;
+    }
+
+    return VERR_INVALID_PARAMETER;
+}
+
-/** Set a uint32_t value to an HGCM parameter structure */
-static void VBoxHGCMParmUInt32Set (VBOXHGCMSVCPARM *pParm, uint32_t u32)
@@ -84 +97 @@
-}
-
-
-/** Set a uint64_t value to an HGCM parameter structure */
-static void VBoxHGCMParmUInt64Set (VBOXHGCMSVCPARM *pParm, uint64_t u64)
@@ -90 +102 @@
-    pParm->type = VBOX_HGCM_SVC_PARM_64BIT;
-    pParm->u.uint64 = u64;
+}
+
+/** Set a pointer value to an HGCM parameter structure */
+static void VBoxHGCMParmPtrSet (VBOXHGCMSVCPARM *pParm, void *pv, uint32_t cb)
+{
+    pParm->type = VBOX_HGCM_SVC_PARM_PTR;
+    pParm->u.pointer.addr = pv;
+    pParm->u.pointer.size = cb;
-}
-
@@ -104 +124 @@
-    /** HGCM helper functions. */
-    PVBOXHGCMSVCHELPERS mpHelpers;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /** @todo we should have classes for thread and request handler thread */
-    /** Queue of outstanding property change notifications */
@@ -125 +165 @@
-public:
-    explicit Service(PVBOXHGCMSVCHELPERS pHelpers)
-
-
+
-          mpvHostData(NULL)
-    {
-        int rc = RTReqCreateQueue(&mReqQueue);
-
-
+
+
+
+
+
+
-        if (RT_FAILURE(rc))
-            throw rc;
@@ -210 +253 @@
-    static DECLCALLBACK(int) reqThreadFn(RTTHREAD ThreadSelf, void *pvUser);
-    int validateName(const char *pszName, uint32_t cbName);
-
-getPropValue
+onst c
+setPropertyBlock
-    int getProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest);
@@ -286 +329 @@
- * @thread  HGCM
- */
-
+onst c
-{
-    LogFlowFunc(("cbValue=%d\n", cbValue));
@@ -305 +348 @@
-}
-
+/**
+ * Set a block of properties in the property registry, checking the validity
+ * of the arguments passed.
+ *
+ * @returns iprt status value
+ * @param   cParms  the number of HGCM parameters supplied
+ * @param   paParms the array of HGCM parameters
+ * @thread  HGCM
+ */
+int Service::setPropertyBlock(uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+{
+    char **ppNames, **ppValues, **ppFlags;
+    uint64_t *pTimestamps;
+    uint32_t cbDummy;
+    int rc = VINF_SUCCESS;
+
+    /*
+     * Get and validate the parameters
+     */
+    if (   (cParms != 4)
+        || RT_FAILURE(VBoxHGCMParmPtrGet (&paParms[0], (void **) &ppNames, &cbDummy))
+        || RT_FAILURE(VBoxHGCMParmPtrGet (&paParms[1], (void **) &ppValues, &cbDummy))
+        || RT_FAILURE(VBoxHGCMParmPtrGet (&paParms[2], (void **) &pTimestamps, &cbDummy))
+        || RT_FAILURE(VBoxHGCMParmPtrGet (&paParms[3], (void **) &ppFlags, &cbDummy))
+        )
+        rc = VERR_INVALID_PARAMETER;
+
+    /*
+     * Add the properties to the end of the list.  If we succeed then we
+     * will remove duplicates afterwards.
+     */
+    /* Remember the last property before we started adding, for rollback or
+     * cleanup. */
+    PropertyList::iterator itEnd = mProperties.end();
+    if (!mProperties.empty())
+        --itEnd;
+    try
+    {
+        for (unsigned i = 0; RT_SUCCESS(rc) && ppNames[i] != NULL; ++i)
+        {
+            uint32_t fFlags;
+            if (   !VALID_PTR(ppNames[i])
+                || !VALID_PTR(ppValues[i])
+                || !VALID_PTR(ppFlags[i])
+              )
+                rc = VERR_INVALID_POINTER;
+            if (RT_SUCCESS(rc))
+                rc = validateFlags(ppFlags[i], &fFlags);
+            if (RT_SUCCESS(rc))
+                mProperties.push_back(Property(ppNames[i], ppValues[i],
+                                               pTimestamps[i], fFlags));
+        }
+    }
+    catch (std::bad_alloc)
+    {
+        rc = VERR_NO_MEMORY;
+    }
+
+    /*
+     * If all went well then remove the duplicate elements.
+     */
+    if (RT_SUCCESS(rc) && itEnd != mProperties.end())
+    {
+        ++itEnd;
+        for (unsigned i = 0; ppNames[i] != NULL; ++i)
+        {
+            bool found = false;
+            for (PropertyList::iterator it = mProperties.begin();
+                !found && it != itEnd; ++it)
+                if (it->mName.compare(ppNames[i]) == 0)
+                {
+                    found = true;
+                    mProperties.erase(it);
+                }
+        }
+    }
+
+    /*
+     * If something went wrong then rollback.  This is possible because we
+     * haven't deleted anything yet.
+     */
+    if (RT_FAILURE(rc))
+    {
+        if (itEnd != mProperties.end())
+            ++itEnd;
+        mProperties.erase(itEnd, mProperties.end());
+    }
+    return rc;
+}
-
-/**
@@ -318 +450 @@
- * @thread  HGCM
- */
-Value
+erty
-{
-    int rc = VINF_SUCCESS;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    uint32_t cchName, cchBuf;
-Value, cch
+
-    char szFlags[MAX_FLAGS_LEN];
-    uint32_t fFlags;
@@ -380 +464 @@
-     */
-    LogFlowThisFunc(("\n"));
-    AssertReturn(VALID_PTR(mpValueNode), VERR_WRONG_ORDER);  /* a.k.a. VERR_NOT_INITIALIZED */
-    if (   (cParms != 4)  /* Hardcoded value as the next lines depend on it. */
-        || (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)    /* name */
@@ -387 +470 @@
-        rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-Get(&paParms[0], (void **) &p
+ConstGet(&paParms[0], (const void **) &pc
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[1], (void **) &pchBuf, &cchBuf);
-    if (RT_SUCCESS(rc))
-
+c
-
-    /*
@@ -398 +481 @@
-
-    /* Get the value size */
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (RT_SUCCESS(rc))
-        cchFlags = strlen(szFlags);
@@ -410 +499 @@
-    if (RT_SUCCESS(rc))
-    {
-cchValue
+it->mValue.size() + 1
-        VBoxHGCMParmUInt32Set(&paParms[3], cchBufActual);
-    }
-    if (RT_SUCCESS(rc) && (cchBufActual > cchBuf))
-        rc = VERR_BUFFER_OVERFLOW;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-
-    /*
@@ -431 +517 @@
-     */
-    if (RT_SUCCESS(rc))
-
-
-
-
-
+
+
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
-    return rc;
-}
-
-
-/**
- * Set a value in the property registry by name, checking the validity
+ * of the arguments passed.
+ *
+ * @returns iprt status value
+ * @param   cParms  the number of HGCM parameters supplied
+ * @param   paParms the array of HGCM parameters
+ * @param   isGuest is this call coming from the guest (or the host)?
+ * @throws  std::bad_alloc  if an out of memory condition occurs
+ * @thread  HGCM
+ */
+int Service::setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest)
+{
+    int rc = VINF_SUCCESS;
+    const char *pcszName, *pcszValue, *pcszFlags = NULL;
+    uint32_t cchName, cchValue, cchFlags = 0;
+    uint32_t fFlags = NILFLAG;
+
+    LogFlowThisFunc(("\n"));
+    /*
+     * First of all, make sure that we won't exceed the maximum number of properties.
+     */
+    if (mProperties.size() >= MAX_PROPS)
+        rc = VERR_TOO_MUCH_DATA;
+
+    /*
+     * General parameter correctness checking.
+     */
+    if (   RT_SUCCESS(rc)
+        && (   (cParms < 2) || (cParms > 3)  /* Hardcoded value as the next lines depend on it. */
+            || RT_FAILURE(VBoxHGCMParmPtrConstGet(&paParms[0],
+                   (const void **) &pcszName, &cchName)) /* name */
+            || RT_FAILURE(VBoxHGCMParmPtrConstGet(&paParms[1],
+                   (const void **) &pcszValue, &cchValue)) /* value */
+            || (   (3 == cParms)
+                && RT_FAILURE(VBoxHGCMParmPtrConstGet(&paParms[2],
+                       (const void **) &pcszFlags, &cchFlags)) /* flags */
+               )
+           )
+       )
+        rc = VERR_INVALID_PARAMETER;
+
+    /*
+     * Check the values passed in the parameters for correctness.
+     */
+    if (RT_SUCCESS(rc))
+        rc = validateName(pcszName, cchName);
+    if (RT_SUCCESS(rc))
+        rc = validateValue(pcszValue, cchValue);
+    if ((3 == cParms) && RT_SUCCESS(rc))
+        rc = RTStrValidateEncodingEx(pcszFlags, cchFlags,
+                                     RTSTR_VALIDATE_ENCODING_ZERO_TERMINATED);
+    if ((3 == cParms) && RT_SUCCESS(rc))
+        rc = validateFlags(pcszFlags, &fFlags);
+
+    /*
+     * If the property already exists, check its flags to see if we are allowed
+     * to change it.
+     */
+    PropertyList::iterator it;
+    bool found = false;
+    if (RT_SUCCESS(rc))
+        for (it = mProperties.begin(); it != mProperties.end(); ++it)
+            if (it->mName.compare(pcszName) == 0)
+            {
+                found = true;
+                break;
+            }
+    if (RT_SUCCESS(rc) && found)
+        if (   (isGuest && (it->mFlags & RDONLYGUEST))
+            || (!isGuest && (it->mFlags & RDONLYHOST))
+           )
+            rc = VERR_PERMISSION_DENIED;
+
+    /*
+     * Set the actual value
+     */
+    if (RT_SUCCESS(rc))
+    {
+        RTTIMESPEC time;
+        uint64_t u64TimeNano = RTTimeSpecGetNano(RTTimeNow(&time));
+        if (found)
+        {
+            it->mValue = pcszValue;
+            it->mTimestamp = u64TimeNano;
+            it->mFlags = fFlags;
+        }
+        else  /* This can throw.  No problem as we have nothing to roll back. */
+            mProperties.push_back(Property(pcszName, pcszValue, u64TimeNano, fFlags));
+    }
+
+    /*
+     * Send a notification to the host and return.
+     */
+    if (RT_SUCCESS(rc))
+    {
+        // if (isGuest)  /* Notify the host even for properties that the host
+        //                * changed.  Less efficient, but ensures consistency. */
+            notifyHost(pcszName);
+        Log2(("Set string %s, rc=%Rrc, value=%s\n", pcszName, rc, pcszValue));
+    }
+    LogFlowThisFunc(("rc = %Rrc\n", rc));
+    return rc;
+}
+
+
+/**
+ * Remove a value in the property registry by name, checking the validity
+ * of the arguments passed.
+ *
+ * @returns iprt status value
+ * @param   cParms  the number of HGCM parameters supplied
+ * @param   paParms the array of HGCM parameters
+ * @param   isGuest is this call coming from the guest (or the host)?
+ * @thread  HGCM
+ */
+int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest)
+{
+    int rc = VINF_SUCCESS;
+    const char *pcszName;
+    uint32_t cbName;
+
+    LogFlowThisFunc(("\n"));
+
+    /*
+     * Check the user-supplied parameters.
+     */
+    if (   (cParms != 1)  /* Hardcoded value as the next lines depend on it. */
+        || RT_FAILURE(VBoxHGCMParmPtrConstGet(&paParms[0],
+               (const void **) &pcszName, &cbName))  /* name */
+       )
+        rc = VERR_INVALID_PARAMETER;
+    if (RT_SUCCESS(rc))
+        rc = validateName(pcszName, cbName);
+
+    /*
+     * If the property exists, check its flags to see if we are allowed
+     * to change it.
+     */
+    PropertyList::iterator it;
+    bool found = false;
+    if (RT_SUCCESS(rc))
+        for (it = mProperties.begin(); it != mProperties.end(); ++it)
+            if (it->mName.compare(pcszName) == 0)
+            {
+                found = true;
+                break;
+            }
+    if (RT_SUCCESS(rc) && found)
+        if (   (isGuest && (it->mFlags & RDONLYGUEST))
+            || (!isGuest && (it->mFlags & RDONLYHOST))
+           )
+            rc = VERR_PERMISSION_DENIED;
+
+    /*
+     * And delete the property if all is well.
+     */
+    if (RT_SUCCESS(rc) && found)
+    {
+        mProperties.erase(it);
+        // if (isGuest)  /* Notify the host even for properties that the host
+        //                * changed.  Less efficient, but ensures consistency. */
+            notifyHost(pcszName);
+    }
+    LogFlowThisFunc(("rc = %Rrc\n", rc));
+    return rc;
+}
+
+/**
+ * Enumerate guest properties by mask, checking the validity
- * of the arguments passed.
- *
@@ -450 +700 @@
- * @thread  HGCM
- */
-setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest
+enumProps(uint32_t cParms, VBOXHGCMSVCPARM paParms[]
-{
-    int rc = VINF_SUCCESS;
-
-
-
-
+
+
+
+
+
+
-    LogFlowThisFunc(("\n"));
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-       )
-        rc = VERR_INVALID_PARAMETER;
-    /*
-     * Check the values passed in the parameters for correctness.
-     */
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[0], (void **) &pszName, &cchName);
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[1], (void **) &pszValue, &cchValue);
-    if (RT_SUCCESS(rc))
-        rc = validateName(pszName, cchName);
-    if (RT_SUCCESS(rc))
-        rc = validateValue(pszValue, cchValue);
-
-    /*
-     * If the property already exists, check its flags to see if we are allowed
-     * to change it.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        CFGMR3QueryU32(mpFlagsNode, pszName, &fFlags);  /* Failure is no problem here. */
-        if (   (isGuest && (fFlags & RDONLYGUEST))
-            || (!isGuest && (fFlags & RDONLYHOST))
-           )
-            rc = VERR_PERMISSION_DENIED;
-    }
-
-    /*
-     * Check whether the user supplied flags (if any) are valid.
-     */
-    if (RT_SUCCESS(rc) && (3 == cParms))
-    {
-        char *pszFlags;
-        uint32_t cchFlags;
-        rc = VBoxHGCMParmPtrGet(&paParms[2], (void **) &pszFlags, &cchFlags);
-        if (RT_SUCCESS(rc))
-            rc = validateFlags(pszFlags, &fFlags);
-    }
-    /*
-     * Set the actual value
-     */
-    if (RT_SUCCESS(rc))
-    {
-        RTTIMESPEC time;
-        CFGMR3RemoveValue(mpValueNode, pszName);
-        CFGMR3RemoveValue(mpTimestampNode, pszName);
-        CFGMR3RemoveValue(mpFlagsNode, pszName);
-        rc = CFGMR3InsertString(mpValueNode, pszName, pszValue);
-        if (RT_SUCCESS(rc))
-            rc = CFGMR3InsertInteger(mpTimestampNode, pszName,
-                                     RTTimeSpecGetNano(RTTimeNow(&time)));
-        if (RT_SUCCESS(rc))
-            rc = CFGMR3InsertInteger(mpFlagsNode, pszName, fFlags);
-        /* If anything goes wrong, make sure that we leave a clean state
-         * behind. */
-        if (RT_FAILURE(rc))
-        {
-            CFGMR3RemoveValue(mpValueNode, pszName);
-            CFGMR3RemoveValue(mpTimestampNode, pszName);
-            CFGMR3RemoveValue(mpFlagsNode, pszName);
-        }
-    }
-    /*
-     * Send a notification to the host and return.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        if (isGuest)
-            notifyHost(pszName);
-        Log2(("Set string %s, rc=%Rrc, value=%s\n", pszName, rc, pszValue));
-    }
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
-    return rc;
-}
-
-
-/**
- * Remove a value in the property registry by name, checking the validity
- * of the arguments passed.
- *
- * @returns iprt status value
- * @param   cParms  the number of HGCM parameters supplied
- * @param   paParms the array of HGCM parameters
- * @thread  HGCM
- */
-int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest)
-{
-    int rc = VINF_SUCCESS;
-    char *pszName;
-    uint32_t cbName;
-
-    LogFlowThisFunc(("\n"));
-    AssertReturn(VALID_PTR(mpValueNode), VERR_WRONG_ORDER);  /* a.k.a. VERR_NOT_INITIALIZED */
-
-    /*
-     * Check the user-supplied parameters.
-     */
-    if (   (cParms != 1)  /* Hardcoded value as the next lines depend on it. */
-        || (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)   /* name */
-       )
-        rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[0], (void **) &pszName, &cbName);
-    if (RT_SUCCESS(rc))
-        rc = validateName(pszName, cbName);
-
-    /*
-     * If the property already exists, check its flags to see if we are allowed
-     * to change it.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        uint32_t fFlags = NILFLAG;
-        CFGMR3QueryU32(mpFlagsNode, pszName, &fFlags);  /* Failure is no problem here. */
-        if (   (isGuest && (fFlags & RDONLYGUEST))
-            || (!isGuest && (fFlags & RDONLYHOST))
-           )
-            rc = VERR_PERMISSION_DENIED;
-    }
-
-    /*
-     * And delete the property if all is well.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        CFGMR3RemoveValue(mpValueNode, pszName);
-        if (isGuest)
-            notifyHost(pszName);
-    }
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
-    return rc;
-}
-
-/**
- * Enumerate guest properties by mask, checking the validity
- * of the arguments passed.
- *
- * @returns iprt status value
- * @param   cParms  the number of HGCM parameters supplied
- * @param   paParms the array of HGCM parameters
- * @thread  HGCM
- */
-int Service::enumProps(uint32_t cParms, VBOXHGCMSVCPARM paParms[])
-{
-    /* We reallocate the temporary buffer in which we build up our array in
-     * increments of size BLOCK: */
-    enum
-    {
-        /* Calculate the increment, not yet rounded down */
-        BLOCKINCRFULL = (MAX_NAME_LEN + MAX_VALUE_LEN + MAX_FLAGS_LEN + 2048),
-        /* And this is the increment after rounding */
-        BLOCKINCR = BLOCKINCRFULL - BLOCKINCRFULL % 1024
-    };
-    int rc = VINF_SUCCESS;
-
-/*
- * Get the HGCM function arguments.
- */
-    char *paszPatterns = NULL, *pchBuf = NULL;
-    uint32_t cchPatterns = 0, cchBuf = 0;
-    LogFlowThisFunc(("\n"));
-    AssertReturn(VALID_PTR(mpValueNode), VERR_WRONG_ORDER);  /* a.k.a. VERR_NOT_INITIALIZED */
-    if (   (cParms != 3)  /* Hardcoded value as the next lines depend on it. */
-        || (paParms[0].type != VBOX_HGCM_SVC_PARM_PTR)   /* patterns */
-        || (paParms[1].type != VBOX_HGCM_SVC_PARM_PTR)   /* return buffer */
-       )
-        rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-        rc = VBoxHGCMParmPtrGet(&paParms[0], (void **) &paszPatterns, &cchPatterns);
-    if (RT_SUCCESS(rc) && cchPatterns > MAX_PATTERN_LEN)
-        rc = VERR_TOO_MUCH_DATA;
-
-
-
-
-
-
+
+
+
+
-    bool matchAll = false;
-    char pszPatterns[MAX_PATTERN_LEN];
-asz
+cch
-        || (cchPatterns < 2)  /* An empty pattern string means match all */
-       )
@@ -664 +732 @@
-    {
-        for (unsigned i = 0; i < cchPatterns - 1; ++i)
-asz
-asz
+cch
+cch
-            else
-                pszPatterns[i] = '|';
@@ -671 +739 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-           )
-        {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            if (RT_SUCCESS(rc))
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-        /* Copy the memory if it fits into the guest buffer */
-iTmpBuf
-memcpy(pchBuf, TmpBuf.get(), iTmp
+buffer.size()
+buffer.copy(pchBuf, cch
-        else
-            rc = VERR_BUFFER_OVERFLOW;
@@ -753 +797 @@
-void Service::notifyHost(const char *pszProperty)
-{
-
-
-
+
-    char szFlags[MAX_FLAGS_LEN];
-    char *pszName = NULL, *pszValue = NULL, *pszFlags = NULL;
-
-
+
+
-    if (NULL == mpfnHostCallback)
-        return;  /* Nothing to do. */
-
-
+
+
+
+
+
+
+
+
+
-    /*
-     * First case: if the property exists then send the host its current value
-     */
-
-
-
-
-
-
-
-
+
+
+
-        if (RT_SUCCESS(rc))
-            rc = RTStrDupEx(&pszName, pszProperty);
-        if (RT_SUCCESS(rc))
-szValue
+it->mValue.c_str()
-        if (RT_SUCCESS(rc))
-            rc = RTStrDupEx(&pszFlags, szFlags);
@@ -785 +829 @@
-                             (PFNRT)Service::reqNotify, 7, mpfnHostCallback,
-                &n