Changeset 39232 in vbox

Timestamp:

Nov 8, 2011 12:44:08 PM (13 years ago)

Author:

vboxsync

Message:

GuestProperties: Ripped out the std::list code.

File:

• trunk/src/VBox/HostServices/GuestProperties/service.cpp (modified) (32 diffs)

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

@@ -64 +64 @@
 struct Property
 {
-#define USE_STRSPACE
-#ifdef USE_STRSPACE
     /** The string space core record. */
     RTSTRSPACECORE mStrCore;
-#endif
     /** The name of the property */
     std::string mName;
@@ -81 +78 @@
     Property() : mTimestamp(0), mFlags(NILFLAG)
     {
-#ifdef USE_STRSPACE
         RT_ZERO(mStrCore);
-#endif
     }
     /** Constructor with const char * */
@@ -91 +86 @@
           mFlags(u32Flags)
     {
-#ifdef USE_STRSPACE
         RT_ZERO(mStrCore);
         mStrCore.pszString = mName.c_str();
-#endif
     }
     /** Constructor with std::string */
@@ -172 +165 @@
     /** Global flags for the service */
     ePropFlags meGlobalFlags;
-#ifdef USE_STRSPACE
     /** The property string space handle. */
     RTSTRSPACE mhProperties;
     /** The number of properties. */
     unsigned mcProperties;
-#else
-    /** The property list */
-    PropertyList mProperties;
-#endif
     /** The list of property changes for guest notifications */
     PropertyList mGuestNotifications;
@@ -280 +268 @@
     Property *getPropertyInternal(const char *pszName)
     {
-#ifdef USE_STRSPACE
         return (Property *)RTStrSpaceGet(&mhProperties, pszName);
-#else
-        for (PropertyList::iterator it = mProperties.begin();
-              it != mProperties.end();
-              ++it)
-            if (it->mName.compare(pszName) == 0)
-                return &*it; /* the wonders of stdandard C++... ;-) */
-        return NULL;
-#endif
     }
 
@@ -296 +275 @@
         : mpHelpers(pHelpers)
         , meGlobalFlags(NILFLAG)
-#ifdef USE_STRSPACE
         , mhProperties(NULL)
         , mcProperties(0)
-#endif
         , mpfnHostCallback(NULL)
         , mpvHostData(NULL)
@@ -509 +486 @@
     /** @todo validate the array sizes... */
 
-#ifdef USE_STRSPACE
     for (unsigned i = 0; RT_SUCCESS(rc) && papszNames[i] != NULL; ++i)
     {
@@ -564 +540 @@
     }
 
-#else  /* !USE_STRSPACE */
-    /*
-     * 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) && papszNames[i] != NULL; ++i)
-        {
-            uint32_t fFlags;
-            if (   !VALID_PTR(papszNames[i])
-                || !VALID_PTR(papszValues[i])
-                || !VALID_PTR(papszFlags[i])
-              )
-                rc = VERR_INVALID_POINTER;
-            if (RT_SUCCESS(rc))
-                rc = validateFlags(papszFlags[i], &fFlags);
-            if (RT_SUCCESS(rc))
-                mProperties.push_back(Property(papszNames[i], papszValues[i],
-                                               pau64Timestamps[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; papszNames[i] != NULL; ++i)
-            for (PropertyList::iterator it = mProperties.begin(); it != itEnd; ++it)
-                if (it->mName.compare(papszNames[i]) == 0)
-                {
-                    mProperties.erase(it);
-                    break;
-                }
-    }
-
-    /*
-     * 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());
-    }
-#endif /* !USE_STRSPACE */
     return rc;
 }
@@ -639 +557 @@
 int Service::getProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    int rc = VINF_SUCCESS;
+    int         rc;
     const char *pcszName = NULL;        /* shut up gcc */
-    char *pchBuf;
-    uint32_t cbName, cchBuf;
-    char szFlags[MAX_FLAGS_LEN];
+    char       *pchBuf;
+    uint32_t    cbName, cbBuf;
 
     /*
@@ -651 +568 @@
     if (   cParms != 4  /* Hardcoded value as the next lines depend on it. */
         || RT_FAILURE(paParms[0].getString(&pcszName, &cbName))  /* name */
-        || RT_FAILURE(paParms[1].getBuffer((void **)&pchBuf, &cchBuf))  /* buffer */
+        || RT_FAILURE(paParms[1].getBuffer((void **)&pchBuf, &cbBuf))  /* buffer */
        )
         rc = VERR_INVALID_PARAMETER;
     else
         rc = validateName(pcszName, cbName);
+    if (RT_FAILURE(rc))
+    {
+        LogFlowThisFunc(("rc = %Rrc\n", rc));
+        return rc;
+    }
 
     /*
@@ -661 +583 @@
      */
 
-#ifdef USE_STRSPACE
     /* Get the property. */
-    Property *it = NULL;
-    if (RT_SUCCESS(rc))
-    {
-        it = getPropertyInternal(pcszName);
-        if (!it)
-            rc = VERR_NOT_FOUND;
-    }
-
-#else  /* !USE_STRSPACE */
-    /* Get the value size */
-    PropertyList::const_iterator it;
-    if (RT_SUCCESS(rc))
-    {
+    Property *pProp = getPropertyInternal(pcszName);
+    if (pProp)
+    {
+        char szFlags[MAX_FLAGS_LEN];
+        rc = writeFlags(pProp->mFlags, szFlags);
+        if (RT_SUCCESS(rc))
+        {
+            /* Check that the buffer is big enough */
+            size_t cchBufActual = pProp->mValue.size() + 1 + strlen(szFlags);   /** @todo r=bird: Buffer overflow bug here? size() == strlen(). */
+            paParms[3].setUInt32((uint32_t)cchBufActual);
+            if (cchBufActual <= cbBuf)
+            {
+                /* Write the value, flags and timestamp */
+                pProp->mValue.copy(pchBuf, cbBuf, 0);
+                pchBuf[pProp->mValue.size()] = '\0'; /* Terminate the value */
+                strcpy(pchBuf + pProp->mValue.size() + 1, szFlags);
+                paParms[2].setUInt64(pProp->mTimestamp);
+
+                /*
+                 * Done!  Do exit logging and return.
+                 */
+                Log2(("Queried string %s, value=%s, timestamp=%lld, flags=%s\n",
+                      pcszName, pProp->mValue.c_str(), pProp->mTimestamp, szFlags));
+            }
+            else
+                rc = VERR_BUFFER_OVERFLOW;
+        }
+    }
+    else
         rc = VERR_NOT_FOUND;
-        for (it = mProperties.begin(); it != mProperties.end(); ++it)
-            if (it->mName.compare(pcszName) == 0)
-            {
-                rc = VINF_SUCCESS;
-                break;
-            }
-    }
-#endif /* !USE_STRSPACE */
-    if (RT_SUCCESS(rc))
-        rc = writeFlags(it->mFlags, szFlags);
-    if (RT_SUCCESS(rc))
-    {
-        /* Check that the buffer is big enough */
-        size_t cchBufActual = it->mValue.size() + 1 + strlen(szFlags);
-        paParms[3].setUInt32 ((uint32_t)cchBufActual);
-        if (cchBufActual <= cchBuf)
-        {
-            /* Write the value, flags and timestamp */
-            it->mValue.copy(pchBuf, cchBuf, 0);
-            pchBuf[it->mValue.size()] = '\0'; /* Terminate the value */
-            strcpy(pchBuf + it->mValue.size() + 1, szFlags);
-            paParms[2].setUInt64 (it->mTimestamp);
-
-            /*
-             * Done!  Do exit logging and return.
-             */
-            Log2(("Queried string %s, value=%s, timestamp=%lld, flags=%s\n",
-                  pcszName, it->mValue.c_str(), it->mTimestamp, szFlags));
-        }
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-    }
-
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
+
+    LogFlowThisFunc(("rc = %Rrc (%s)\n", rc, pcszName));
     return rc;
 }
@@ -738 +643 @@
 
     LogFlowThisFunc(("\n"));
-
-#ifndef USE_STRSPACE /** @todo r=bird: This check is wrong as it will prevent updating
-                      *        existing properties when the maximum is reached! */
-    /*
-     * 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;
-#endif
 
     /*
@@ -774 +670 @@
     if ((3 == cParms) && RT_SUCCESS(rc))
         rc = validateFlags(pcszFlags, &fFlags);
-    if (RT_SUCCESS(rc))
+    if (RT_FAILURE(rc))
+    {
+        LogFlowThisFunc(("rc = %Rrc\n", rc));
+        return rc;
+    }
+
+    /*
+     * If the property already exists, check its flags to see if we are allowed
+     * to change it.
+     */
+    Property *pProp = getPropertyInternal(pcszName);
+    rc = checkPermission(pProp ? (ePropFlags)pProp->mFlags : NILFLAG, isGuest);
+    if (rc == VINF_SUCCESS)
     {
         /*
-         * If the property already exists, check its flags to see if we are allowed
-         * to change it.
+         * Set the actual value
          */
-#ifdef USE_STRSPACE
-        Property *it = getPropertyInternal(pcszName);
-        bool found = it != NULL;
-#else
-        PropertyList::iterator it;
-        bool found = false;
-        for (it = mProperties.begin(); it != mProperties.end(); ++it)
-            if (it->mName.compare(pcszName) == 0)
+        if (pProp)
+        {
+            pProp->mValue = pcszValue;
+            pProp->mTimestamp = u64TimeNano;
+            pProp->mFlags = fFlags;
+        }
+        else if (mcProperties < MAX_PROPS)
+        {
+            /* Create a new string space record. */
+            pProp = new Property(pcszName, pcszValue, u64TimeNano, fFlags);
+            if (pProp)
             {
-                found = true;
-                break;
-            }
-#endif /* !USE_STRSPACE */
-
-        rc = checkPermission(found ? (ePropFlags)it->mFlags : NILFLAG,
-                             isGuest);
-        if (rc == VINF_SUCCESS)
-        {
-            /*
-             * Set the actual value
-             */
-            if (found)
-            {
-                it->mValue = pcszValue;
-                it->mTimestamp = u64TimeNano;
-                it->mFlags = fFlags;
-            }
-#ifdef USE_STRSPACE
-            else if (mcProperties < MAX_PROPS)
-            {
-                /* Create a new string space record. */
-                it = new Property(pcszName, pcszValue, u64TimeNano, fFlags);
-                if (it)
+                if (RTStrSpaceInsert(&mhProperties, &pProp->mStrCore))
+                    mcProperties++;
+                else
                 {
-                    if (RTStrSpaceInsert(&mhProperties, &it->mStrCore))
-                        mcProperties++;
-                    else
-                    {
-                        AssertFailed();
-                        delete it;
-                        rc = VERR_INTERNAL_ERROR_3;
-                    }
+                    AssertFailed();
+                    delete pProp;
+                    rc = VERR_INTERNAL_ERROR_3;
                 }
-                else
-                    rc = VERR_NO_MEMORY;
             }
             else
-                rc = VERR_TOO_MUCH_DATA;
-#else
-            else  /* This can throw.  No problem as we have nothing to roll back. */
-                mProperties.push_back(Property(pcszName, pcszValue, u64TimeNano, fFlags));
-#endif
-
-            /*
-             * Send a notification to the host and return.
-             */
-            // if (isGuest)  /* Notify the host even for properties that the host
-            //                * changed.  Less efficient, but ensures consistency. */
-                doNotifications(pcszName, u64TimeNano);
-            Log2(("Set string %s, rc=%Rrc, value=%s\n", pcszName, rc, pcszValue));
+                rc = VERR_NO_MEMORY;
         }
-    }
-
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
+        else
+            rc = VERR_TOO_MUCH_DATA;
+
+        /*
+         * Send a notification to the host and return.
+         */
+        // if (isGuest)  /* Notify the host even for properties that the host
+        //                * changed.  Less efficient, but ensures consistency. */
+            doNotifications(pcszName, u64TimeNano);
+        Log2(("Set string %s, rc=%Rrc, value=%s\n", pcszName, rc, pcszValue));
+    }
+
+    LogFlowThisFunc(("rc = %Rrc (%s = %s)\n", rc, pcszName, pcszValue));
     return rc;
 }
@@ -860 +740 @@
 int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGuest)
 {
-    int rc = VINF_SUCCESS;
+    int         rc;
     const char *pcszName = NULL;        /* shut up gcc */
-    uint32_t cbName;
+    uint32_t    cbName;
 
     LogFlowThisFunc(("\n"));
@@ -875 +755 @@
     else
         rc = VERR_INVALID_PARAMETER;
-    if (RT_SUCCESS(rc))
-    {
-        /*
-         * If the property exists, check its flags to see if we are allowed
-         * to change it.
-         */
-#ifdef USE_STRSPACE
-        Property *it = getPropertyInternal(pcszName);
-        bool found = it != NULL;
-        if (it)
-            rc = checkPermission((ePropFlags)it->mFlags, isGuest);
-#else
-        PropertyList::iterator it;
-        bool found = false;
-        for (it = mProperties.begin(); it != mProperties.end(); ++it)
-            if (it->mName.compare(pcszName) == 0)
-            {
-                found = true;
-                rc = checkPermission((ePropFlags)it->mFlags, isGuest);
-                break;
-            }
-#endif
-
-        /*
-         * And delete the property if all is well.
-         */
-        if (rc == VINF_SUCCESS && found)
-        {
-            uint64_t u64Timestamp = getCurrentTimestamp();
-#ifdef USE_STRSPACE
-            bool fRc = RTStrSpaceRemove(&mhProperties, it->mStrCore.pszString);
-            Assert(fRc); NOREF(fRc);
-            mcProperties--;
-            delete it;
-#else
-            mProperties.erase(it);
-#endif
-            // if (isGuest)  /* Notify the host even for properties that the host
-            //                * changed.  Less efficient, but ensures consistency. */
-                doNotifications(pcszName, u64Timestamp);
-        }
-    }
-
-    LogFlowThisFunc(("rc = %Rrc\n", rc));
+    if (RT_FAILURE(rc))
+    {
+        LogFlowThisFunc(("rc = %Rrc\n", rc));
+        return rc;
+    }
+
+    /*
+     * If the property exists, check its flags to see if we are allowed
+     * to change it.
+     */
+    Property *pProp = getPropertyInternal(pcszName);
+    if (pProp)
+        rc = checkPermission((ePropFlags)pProp->mFlags, isGuest);
+
+    /*
+     * And delete the property if all is well.
+     */
+    if (rc == VINF_SUCCESS && pProp)
+    {
+        uint64_t u64Timestamp = getCurrentTimestamp();
+        bool fRc = RTStrSpaceRemove(&mhProperties, pProp->mStrCore.pszString);
+        Assert(fRc); NOREF(fRc);
+        mcProperties--;
+        delete pProp;
+        // if (isGuest)  /* Notify the host even for properties that the host
+        //                * changed.  Less efficient, but ensures consistency. */
+            doNotifications(pcszName, u64Timestamp);
+    }
+
+    LogFlowThisFunc(("rc = %Rrc (%s)\n", rc, pcszName));
     return rc;
 }
-
-#ifdef USE_STRSPACE
 
 /**
@@ -990 +854 @@
     return 0;
 }
-#endif /* USE_STRSPACE */
 
 /**
@@ -1011 +874 @@
     char *pchBuf = NULL;
     uint32_t cbPatterns = 0;
-    uint32_t cchBuf = 0;
+    uint32_t cbBuf = 0;
     LogFlowThisFunc(("\n"));
     if (   (cParms != 3)  /* Hardcoded value as the next lines depend on it. */
         || RT_FAILURE(paParms[0].getString(&pchPatterns, &cbPatterns))  /* patterns */
-        || RT_FAILURE(paParms[1].getBuffer((void **) &pchBuf, &cchBuf))  /* return buffer */
+        || RT_FAILURE(paParms[1].getBuffer((void **)&pchBuf, &cbBuf))  /* return buffer */
        )
         rc = VERR_INVALID_PARAMETER;
@@ -1024 +887 @@
      * First repack the patterns into the format expected by RTStrSimplePatternMatch()
      */
-    char pszPatterns[MAX_PATTERN_LEN];
+    char szPatterns[MAX_PATTERN_LEN];
     if (RT_SUCCESS(rc))
     {
         for (unsigned i = 0; i < cbPatterns - 1; ++i)
             if (pchPatterns[i] != '\0')
-                pszPatterns[i] = pchPatterns[i];
+                szPatterns[i] = pchPatterns[i];
             else
-                pszPatterns[i] = '|';
-        pszPatterns[cbPatterns - 1] = '\0';
-    }
-
-#ifdef USE_STRSPACE
+                szPatterns[i] = '|';
+        szPatterns[cbPatterns - 1] = '\0';
+    }
+
     /*
      * Next enumerate into the buffer.
@@ -1042 +904 @@
     {
         EnumData EnumData;
-        EnumData.pszPattern = pszPatterns;
+        EnumData.pszPattern = szPatterns;
         EnumData.pchCur     = pchBuf;
-        EnumData.cbLeft     = cchBuf;
+        EnumData.cbLeft     = cbBuf;
         EnumData.cbNeeded   = 0;
         rc = RTStrSpaceEnumerate(&mhProperties, enumPropsCallback, &EnumData);
@@ -1064 +926 @@
     }
 
-#else  /* !USE_STRSPACE */
-    /*
-     * Next enumerate into a temporary buffer.  This can throw, but this is
-     * not a problem as we have nothing to roll back.
-     */
-    std::string buffer;
-    for (PropertyList::const_iterator it = mProperties.begin();
-         RT_SUCCESS(rc) && (it != mProperties.end()); ++it)
-    {
-        if (it->Matches(pszPatterns))
-        {
-            char szFlags[MAX_FLAGS_LEN];
-            char szTimestamp[256];
-            uint32_t cchTimestamp;
-            buffer += it->mName;
-            buffer += '\0';
-            buffer += it->mValue;
-            buffer += '\0';
-            cchTimestamp = RTStrFormatNumber(szTimestamp, it->mTimestamp,
-                                             10, 0, 0, 0);
-            buffer.append(szTimestamp, cchTimestamp);
-            buffer += '\0';
-            rc = writeFlags(it->mFlags, szFlags);
-            if (RT_SUCCESS(rc))
-                buffer += szFlags;
-            buffer += '\0';
-        }
-    }
-    if (RT_SUCCESS(rc))
-        buffer.append(4, '\0');  /* The final terminators */
-
-    /*
-     * Finally write out the temporary buffer to the real one if it is not too
-     * small.
-     */
-    if (RT_SUCCESS(rc))
-    {
-        paParms[2].setUInt32((uint32_t)buffer.size());
-        /* Copy the memory if it fits into the guest buffer */
-        if (buffer.size() <= cchBuf)
-            buffer.copy(pchBuf, cchBuf);
-        else
-            rc = VERR_BUFFER_OVERFLOW;
-    }
-#endif /* !USE_STRSPACE */
     return rc;
 }
@@ -1151 +968 @@
     uint64_t u64Timestamp;
     char *pchBuf;
-    uint32_t cchBuf;
-    rc = paParms[2].getBuffer((void **) &pchBuf, &cchBuf);
+    uint32_t cbBuf;
+    rc = paParms[2].getBuffer((void **)&pchBuf, &cbBuf);
     if (RT_SUCCESS(rc))
     {
@@ -1173 +990 @@
         paParms[1].setUInt64(u64Timestamp);
         paParms[3].setUInt32((uint32_t)buffer.size());
-        if (buffer.size() <= cchBuf)
-            buffer.copy(pchBuf, cchBuf);
+        if (buffer.size() <= cbBuf)
+            buffer.copy(pchBuf, cbBuf);
         else
             rc = VERR_BUFFER_OVERFLOW;
@@ -1198 +1015 @@
     char *pchBuf;
     uint32_t cchPatterns = 0;
-    uint32_t cchBuf = 0;
+    uint32_t cbBuf = 0;
     uint64_t u64Timestamp;
 
@@ -1208 +1025 @@
         || RT_FAILURE(paParms[0].getString(&pszPatterns, &cchPatterns))  /* patterns */
         || RT_FAILURE(paParms[1].getUInt64(&u64Timestamp))  /* timestamp */
-        || RT_FAILURE(paParms[2].getBuffer((void **) &pchBuf, &cchBuf))  /* return buffer */
+        || RT_FAILURE(paParms[2].getBuffer((void **)&pchBuf, &cbBuf))  /* return buffer */
        )
         rc = VERR_INVALID_PARAMETER;
@@ -1251 +1068 @@
 void Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp)
 {
-    int rc = VINF_SUCCESS;
-
     AssertPtrReturnVoid(pszProperty);
     LogFlowThisFunc (("pszProperty=%s, u64Timestamp=%llu\n", pszProperty, u64Timestamp));
@@ -1268 +1083 @@
     prop.mTimestamp = u64Timestamp;
     /* prop is currently a delete event for pszProperty */
-    bool found = false;
-#ifdef USE_STRSPACE
-    if (RT_SUCCESS(rc))
-    {
-        Property *pProp = getPropertyInternal(pszProperty);
-        if (pProp)
-        {
-            found = true;
-            /* Make prop into a change event. */
-            prop.mValue = pProp->mValue;
-            prop.mFlags = pProp->mFlags;
-        }
-    }
-#else  /* !USE_STRSPACE */
-    if (RT_SUCCESS(rc))
-        for (PropertyList::const_iterator it = mProperties.begin();
-             !found && it != mProperties.end(); ++it)
-            if (it->mName.compare(pszProperty) == 0)
-            {
-                found = true;
-                /* Make prop into a change event. */
-                prop.mValue = it->mValue;
-                prop.mFlags = it->mFlags;
-            }
-#endif /* !USE_STRSPACE */
+    Property const * const pProp = getPropertyInternal(pszProperty);
+    if (pProp)
+    {
+        /* Make prop into a change event. */
+        prop.mValue = pProp->mValue;
+        prop.mFlags = pProp->mFlags;
+    }
 
     /* Release waiters if applicable and add the event to the queue for
      * guest notifications */
-    if (RT_SUCCESS(rc))
-    {
-        try
+    int rc = VINF_SUCCESS;
+    try
+    {
+        CallList::iterator it = mGuestWaiters.begin();
+        while (it != mGuestWaiters.end())
         {
-            CallList::iterator it = mGuestWaiters.begin();
-            while (it != mGuestWaiters.end())
+            const char *pszPatterns;
+            uint32_t cchPatterns;
+            it->mParms[0].getString(&pszPatterns, &cchPatterns);
+            if (prop.Matches(pszPatterns))
             {
-                const char *pszPatterns;
-                uint32_t cchPatterns;
-                it->mParms[0].getString(&pszPatterns, &cchPatterns);
-                if (prop.Matches(pszPatterns))
-                {
-                    GuestCall curCall = *it;
-                    int rc2 = getNotificationWriteOut(curCall.mParms, prop);
-                    if (RT_SUCCESS(rc2))
-                        rc2 = curCall.mRc;
-                    mpHelpers->pfnCallComplete(curCall.mHandle, rc2);
-                    it = mGuestWaiters.erase(it);
-                }
-                else
-                    ++it;
+                GuestCall curCall = *it;
+                int rc2 = getNotificationWriteOut(curCall.mParms, prop);
+                if (RT_SUCCESS(rc2))
+                    rc2 = curCall.mRc;
+                mpHelpers->pfnCallComplete(curCall.mHandle, rc2);
+                it = mGuestWaiters.erase(it);
             }
-            mGuestNotifications.push_back(prop);
+            else
+                ++it;
         }
-        catch (std::bad_alloc)
-        {
-            rc = VERR_NO_MEMORY;
-        }
+        mGuestNotifications.push_back(prop);
+    }
+    catch (std::bad_alloc)
+    {
+        rc = VERR_NO_MEMORY;
     }
     if (mGuestNotifications.size() > MAX_GUEST_NOTIFICATIONS)
@@ -1332 +1127 @@
      * current value
      */
-    if (found && mpfnHostCallback != NULL)
+    if (pProp && mpfnHostCallback != NULL)
     {
         char szFlags[MAX_FLAGS_LEN];
@@ -1347 +1142 @@
      * send the host an empty value
      */
-    if (!found && mpfnHostCallback != NULL)
+    if (!pProp && mpfnHostCallback != NULL)
     {
         /* Send out a host notification */
@@ -1353 +1148 @@
             rc = notifyHost(pszProperty, NULL, u64Timestamp, NULL);
     }
-    LogFlowThisFunc (("returning\n"));
+    LogFlowThisFunc(("returning\n"));
 }
 
@@ -1367 +1162 @@
                         uint64_t u64Timestamp, const char *pszFlags)
 {
-    LogFlowFunc (("pszName=%s, pszValue=%s, u64Timestamp=%llu, pszFlags=%s\n",
-                  pszName, pszValue, u64Timestamp, pszFlags));
+    LogFlowFunc(("pszName=%s, pszValue=%s, u64Timestamp=%llu, pszFlags=%s\n",
+                 pszName, pszValue, u64Timestamp, pszFlags));
     HOSTCALLBACKDATA HostCallbackData;
     HostCallbackData.u32Magic     = HOSTCALLBACKMAGIC;
@@ -1550 +1345 @@
 extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable)
 {
-    int rc = VINF_SUCCESS;
+    int rc = VERR_IPE_UNINITIALIZED_STATUS;
 
     LogFlowFunc(("ptable = %p\n", ptable));
 
-    if (!VALID_PTR(ptable))
-    {
+    if (!RT_VALID_PTR(ptable))
         rc = VERR_INVALID_PARAMETER;
-    }
     else
     {
         LogFlowFunc(("ptable->cbSize = %d, ptable->u32Version = 0x%08X\n", ptable->cbSize, ptable->u32Version));
 
-        if (   ptable->cbSize != sizeof (VBOXHGCMSVCFNTABLE)
+        if (   ptable->cbSize != sizeof(VBOXHGCMSVCFNTABLE)
             || ptable->u32Version != VBOX_HGCM_SVC_VERSION)
-        {
             rc = VERR_VERSION_MISMATCH;
-        }
         else
         {
-            std::auto_ptr<Service> apService;
+            Service *pService = NULL;
             /* No exceptions may propagate outside. */
-            try {
-                apService = std::auto_ptr<Service>(new Service(ptable->pHelpers));
-            } catch (int rcThrown) {
+            try
+            {
+                pService = new Service(ptable->pHelpers);
+                rc = VINF_SUCCESS;
+            }
+            catch (int rcThrown)
+            {
                 rc = rcThrown;
-            } catch (...) {
-                rc = VERR_UNRESOLVED_ERROR;
+            }
+            catch (...)
+            {
+                rc = VERR_UNEXPECTED_EXCEPTION;
             }
 
@@ -1594 +1391 @@
 
                 /* Service specific initialization. */
-                ptable->pvService = apService.release();
+                ptable->pvService = pService;
             }
+            else
+                Assert(!pService);
         }
     }