Changeset 7801 in vbox for trunk/src/VBox/Main

Timestamp:

Apr 8, 2008 1:12:40 PM (17 years ago)

Author:

vboxsync

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

29367

Message:

HGCM: Add user data pointer to HGCM service function table

File:

• trunk/src/VBox/Main/hgcm/HGCM.cpp (modified) (10 diffs)

trunk/src/VBox/Main/hgcm/HGCM.cpp

@@ -294 +294 @@
                     if (m_fntable.pfnUnload)
                     {
-                        m_fntable.pfnUnload ();
+                        m_fntable.pfnUnload (m_fntable.pvService);
                     }
                 }
@@ -492 +492 @@
                 if (pSvc->m_fntable.pfnUnload)
                 {
-                    pSvc->m_fntable.pfnUnload ();
+                    pSvc->m_fntable.pfnUnload (pSvc->m_fntable.pvService);
                 }
 
@@ -509 +509 @@
                 if (pClient)
                 {
-                    rc = pSvc->m_fntable.pfnConnect (pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient));
+                    rc = pSvc->m_fntable.pfnConnect (pSvc->m_fntable.pvService, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient));
 
                     hgcmObjDereference (pClient);
@@ -529 +529 @@
                 if (pClient)
                 {
-                    rc = pSvc->m_fntable.pfnDisconnect (pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient));
+                    rc = pSvc->m_fntable.pfnDisconnect (pSvc->m_fntable.pvService, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient));
 
                     hgcmObjDereference (pClient);
@@ -550 +550 @@
                 if (pClient)
                 {
-                    pSvc->m_fntable.pfnCall ((VBOXHGCMCALLHANDLE)pMsg, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->u32Function, pMsg->cParms, pMsg->paParms);
+                    pSvc->m_fntable.pfnCall (pSvc->m_fntable.pvService, (VBOXHGCMCALLHANDLE)pMsg, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->u32Function, pMsg->cParms, pMsg->paParms);
 
                     hgcmObjDereference (pClient);
@@ -566 +566 @@
                 LogFlowFunc(("SVC_MSG_HOSTCALL u32Function = %d, cParms = %d, paParms = %p\n", pMsg->u32Function, pMsg->cParms, pMsg->paParms));
 
-                rc = pSvc->m_fntable.pfnHostCall (pMsg->u32Function, pMsg->cParms, pMsg->paParms);
+                rc = pSvc->m_fntable.pfnHostCall (pSvc->m_fntable.pvService, pMsg->u32Function, pMsg->cParms, pMsg->paParms);
             } break;
 
@@ -581 +581 @@
                     if (pSvc->m_fntable.pfnLoadState)
                     {
-                        rc = pSvc->m_fntable.pfnLoadState (pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
+                        rc = pSvc->m_fntable.pfnLoadState (pSvc->m_fntable.pvService, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
                     }
 
@@ -607 +607 @@
                     {
                         g_fSaveState = true;
-                        rc = pSvc->m_fntable.pfnSaveState (pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
+                        rc = pSvc->m_fntable.pfnSaveState (pSvc->m_fntable.pvService, pMsg->u32ClientId, HGCM_CLIENT_DATA(pSvc, pClient), pMsg->pSSM);
                         g_fSaveState = false;
                     }
@@ -633 +633 @@
                     if (pSvc->m_fntable.pfnRegisterExtension)
                     {
-                        rc = pSvc->m_fntable.pfnRegisterExtension (pMsg->pfnExtension, pMsg->pvExtension);
+                        rc = pSvc->m_fntable.pfnRegisterExtension (pSvc->m_fntable.pvService, pMsg->pfnExtension, pMsg->pvExtension);
                     }
                     else
@@ -661 +661 @@
                     if (pSvc->m_fntable.pfnRegisterExtension)
                     {
-                        rc = pSvc->m_fntable.pfnRegisterExtension (NULL, NULL);
+                        rc = pSvc->m_fntable.pfnRegisterExtension (pSvc->m_fntable.pvService, NULL, NULL);
                     }
                     else