Changeset 28286 in vbox for trunk/src/VBox/HostServices/GuestControl

Timestamp:

Apr 14, 2010 10:02:30 AM (15 years ago)

Author:

vboxsync

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

60033

Message:

Guest Control: Update (introducing contexts for callbacks).

File:

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

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

@@ -244 +244 @@
     int processHostMsg(VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int notifyGuest(GuestCall *pCall, uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
-    int notifyHost(VBOXHGCMCALLHANDLE callHandle, uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
+    int notifyHost(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     int processCmd(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[]);
     void call(VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID,
@@ -487 +487 @@
 }
 
-int Service::notifyHost(VBOXHGCMCALLHANDLE callHandle, uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
+int Service::notifyHost(uint32_t eFunction, uint32_t cParms, VBOXHGCMSVCPARM paParms[])
 {
     LogFlowFunc(("eFunction=%ld, cParms=%ld, paParms=%p\n",
@@ -493 +493 @@
     int rc = VINF_SUCCESS;
     if (   eFunction == GUEST_EXEC_SEND_STATUS
-        && cParms    == 4)
+        && cParms    == 5)
     {
         HOSTEXECCALLBACKDATA data;
-        data.u32Magic = HOSTCALLBACKMAGIC;
-        paParms[0].getUInt32(&data.pid);
-        paParms[1].getUInt32(&data.status);
-        paParms[2].getUInt32(&data.flags);
+        data.hdr.u32Magic = HOSTEXECCALLBACKDATAMAGIC;
+        paParms[0].getUInt32(&data.hdr.u32ContextID);
+
+        paParms[1].getUInt32(&data.u32PID);
+        paParms[2].getUInt32(&data.u32Status);
+        paParms[3].getUInt32(&data.u32Flags);
         paParms[4].getPointer(&data.pvData, &data.cbData);
 
@@ -576 +578 @@
             case GUEST_EXEC_SEND_STATUS:
                 LogFlowFunc(("SEND_STATUS\n"));
-                rc = notifyHost(callHandle, eFunction, cParms, paParms);
+                rc = notifyHost(eFunction, cParms, paParms);
                 break;