vbox的更動 28013 路徑 trunk/src/VBox/HostServices/GuestControl

時間撮記:

2010-4-6 下午02:54:26 (15 年 以前)

作者:

vboxsync

訊息:

Guest Control: Update (protocol hacking bugfixes).

檔案:

• trunk/src/VBox/HostServices/GuestControl/service.cpp (修改) (8 筆差異)

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

@@ -340 +340 @@
 int Service::execBufferAssign(PVBOXGUESTCTRPARAMBUFFER pBuf, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
-    execBufferFree(pBuf);
-
     RTCritSectEnter(&critsect);
 
@@ -476 +474 @@
                         rc = VINF_HGCM_ASYNC_EXECUTE;
     
-                    if (RT_SUCCESS(rc))
+                    if (   RT_SUCCESS(rc)
+                        && rc != VINF_HGCM_ASYNC_EXECUTE)
                     {
                         /*
@@ -487 +486 @@
                         {
                             if (it->uAssignedToClientID == 0)
+                            {
                                 bFound = true;
+                                break;
+                            }
                         }
                         if (!bFound) /* No new command found, defer ... */
@@ -495 +497 @@
                          * Okay we got a host command which is unassigned at the moment.                    
                          */
-                        if (RT_SUCCESS(rc))
+                        if (   RT_SUCCESS(rc)
+                            && rc != VINF_HGCM_ASYNC_EXECUTE)
                         {
                             /* 
@@ -502 +505 @@
                              * below. Then we just could repeat this one here.
                              */
-                            uint32_t uCmd = 0;
-                            if (it->parmBuf.uParmCount)
+                            uint32_t uCmd = 1; /** @todo HARDCODED FOR EXEC! */
+                            uint32_t uParmCount = it->parmBuf.uParmCount;
+                            if (uParmCount)
                                 it->parmBuf.pParms[0].getUInt32(&uCmd);
                             paParms[0].setUInt32(uCmd); /* msg id */
-                            paParms[1].setUInt32(it->parmBuf.uParmCount); /* parms count */
+                            paParms[1].setUInt32(uParmCount); /* parms count */
     
                             /* Assign this command to the specific client ID. */
@@ -529 +533 @@
                          !bFound && it != mHostCmds.end(); ++it)
                     {
-                        if (it->uAssignedToClientID == u32ClientID)                      
+                        if (it->uAssignedToClientID == u32ClientID)    
+                        {
                             bFound = true;
+                            break;
+                        }
                     }
                     Assert(bFound);
@@ -542 +549 @@
                      * Finally remove the command from the list. 
                      */
+                    execBufferFree(&it->parmBuf);
                     mHostCmds.erase(it);
                 }
@@ -584 +592 @@
 {
     int rc = VINF_SUCCESS;
+
+    ASMBreakpoint();
 
     LogFlowFunc(("fn = %d, cParms = %d, pparms = %d\n",