Changeset 36872 in vbox for trunk/src/VBox

Timestamp:

Apr 28, 2011 8:53:57 AM (14 years ago)

Author:

vboxsync

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

71449

Message:

HostServices/GuestCtrl: Fixed several bugs revealed by upcoming testcase.

File:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (modified) (6 diffs)

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

@@ -309 +309 @@
 int Service::paramBufferAllocate(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t uMsg, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    AssertPtr(pBuf);
-    int rc = VINF_SUCCESS;
+    AssertPtrReturn(pBuf, VERR_INVALID_POINTER);
+    if (cParms)
+        AssertPtrReturn(paParms, VERR_INVALID_POINTER);
 
     /* Paranoia. */
     if (cParms > 256)
         cParms = 256;
+
+    int rc = VINF_SUCCESS;
 
     /*
@@ -321 +324 @@
      * in an unmodified state.
      */
-    if (RT_SUCCESS(rc))
-    {
-        pBuf->uMsg = uMsg;
-        pBuf->uParmCount = cParms;
+    pBuf->uMsg = uMsg;
+    pBuf->uParmCount = cParms;
+    if (pBuf->uParmCount)
+    {
         pBuf->pParms = (VBOXHGCMSVCPARM*)RTMemAlloc(sizeof(VBOXHGCMSVCPARM) * pBuf->uParmCount);
         if (NULL == pBuf->pParms)
-        {
             rc = VERR_NO_MEMORY;
-        }
-        else
-        {
-            for (uint32_t i = 0; i < pBuf->uParmCount; i++)
+    }
+
+    if (RT_SUCCESS(rc))
+    {
+        for (uint32_t i = 0; i < pBuf->uParmCount; i++)
+        {
+            pBuf->pParms[i].type = paParms[i].type;
+            switch (paParms[i].type)
             {
-                pBuf->pParms[i].type = paParms[i].type;
-                switch (paParms[i].type)
-                {
-                    case VBOX_HGCM_SVC_PARM_32BIT:
-                        pBuf->pParms[i].u.uint32 = paParms[i].u.uint32;
-                        break;
-
-                    case VBOX_HGCM_SVC_PARM_64BIT:
-                        /* Not supported yet. */
-                        break;
-
-                    case VBOX_HGCM_SVC_PARM_PTR:
-                        pBuf->pParms[i].u.pointer.size = paParms[i].u.pointer.size;
-                        if (pBuf->pParms[i].u.pointer.size > 0)
+                case VBOX_HGCM_SVC_PARM_32BIT:
+                    pBuf->pParms[i].u.uint32 = paParms[i].u.uint32;
+                    break;
+
+                case VBOX_HGCM_SVC_PARM_64BIT:
+                    /* Not supported yet. */
+                    break;
+
+                case VBOX_HGCM_SVC_PARM_PTR:
+                    pBuf->pParms[i].u.pointer.size = paParms[i].u.pointer.size;
+                    if (pBuf->pParms[i].u.pointer.size > 0)
+                    {
+                        pBuf->pParms[i].u.pointer.addr = RTMemAlloc(pBuf->pParms[i].u.pointer.size);
+                        if (NULL == pBuf->pParms[i].u.pointer.addr)
                         {
-                            pBuf->pParms[i].u.pointer.addr = RTMemAlloc(pBuf->pParms[i].u.pointer.size);
-                            if (NULL == pBuf->pParms[i].u.pointer.addr)
-                            {
-                                rc = VERR_NO_MEMORY;
-                                break;
-                            }
-                            else
-                                memcpy(pBuf->pParms[i].u.pointer.addr,
-                                       paParms[i].u.pointer.addr,
-                                       pBuf->pParms[i].u.pointer.size);
+                            rc = VERR_NO_MEMORY;
+                            break;
                         }
                         else
-                        {
-                            /* Size is 0 -- make sure we don't have any pointer. */
-                            pBuf->pParms[i].u.pointer.addr = NULL;
-                        }
-                        break;
-
-                    default:
-                        break;
-                }
-                if (RT_FAILURE(rc))
+                            memcpy(pBuf->pParms[i].u.pointer.addr,
+                                   paParms[i].u.pointer.addr,
+                                   pBuf->pParms[i].u.pointer.size);
+                    }
+                    else
+                    {
+                        /* Size is 0 -- make sure we don't have any pointer. */
+                        pBuf->pParms[i].u.pointer.addr = NULL;
+                    }
+                    break;
+
+                default:
                     break;
             }
+            if (RT_FAILURE(rc))
+                break;
         }
     }
@@ -785 +787 @@
     if (mNumClients == 0)
         return VERR_NOT_FOUND;
-
     HostCmd newCmd;
     int rc = paramBufferAllocate(&newCmd.mParmBuf, eFunction, cParms, paParms);
-    if (   RT_SUCCESS(rc)
-        && newCmd.mParmBuf.uParmCount > 0)
+    if (RT_SUCCESS(rc) && cParms)
     {
         /*
@@ -799 +799 @@
     }
 
-    bool fProcessed = false;
     if (RT_SUCCESS(rc))
     {
+        bool fProcessed = false;
+
         /* Can we wake up a waiting client on guest? */
         if (!mClientWaiterList.empty())
@@ -814 +815 @@
             mClientWaiterList.pop_front();
 
-            /* If we got VERR_TOO_MUCH_DATA we buffer the host command in the next block
-             * and return success to the host. */
-            if (rc == VERR_TOO_MUCH_DATA)
+            /*
+             * If we got back an error (like VERR_TOO_MUCH_DATA or VERR_BUFFER_OVERFLOW)
+             * we buffer the host command in the next block and return success to the host.
+             */
+            if (RT_FAILURE(rc))
             {
                 rc = VINF_SUCCESS;
@@ -932 +935 @@
         switch (eFunction)
         {
+            case HOST_CANCEL_PENDING_WAITS:
+                LogFlowFunc(("HOST_CANCEL_PENDING_WAITS\n"));
+                rc = processHostCmd(eFunction, cParms, paParms);
+                break;
+
             /* The host wants to execute something. */
             case HOST_EXEC_CMD: