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

Timestamp:

Nov 27, 2018 2:14:41 PM (6 years ago)

Author:

vboxsync

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

126975

Message:

HGCM: Added fRequestor and fRestoring to VBOXHGCMSVCFNTABLE::pfnConnect. bugref:9105

File:

• trunk/src/VBox/Main/src-client/HGCM.cpp (modified) (8 diffs)

trunk/src/VBox/Main/src-client/HGCM.cpp

@@ -170 +170 @@
         static int LoadState(PSSMHANDLE pSSM);
 
-        int CreateAndConnectClient(uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn);
+        int CreateAndConnectClient(uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn, uint32_t fRequestor, bool fRestoring);
         int DisconnectClient(uint32_t u32ClientId, bool fFromService);
 
@@ -412 +412 @@
 {
     public:
-        /* client identifier */
+        /** client identifier */
         uint32_t u32ClientId;
+        /** Requestor flags. */
+        uint32_t fRequestor;
+        /** Set if restoring. */
+        bool fRestoring;
 };
 
@@ -434 +438 @@
         PPDMIHGCMPORT pHGCMPort;
 };
-
 
 class HGCMMsgCall: public HGCMMsgHeader
@@ -606 +609 @@
                 {
                     rc = pSvc->m_fntable.pfnConnect(pSvc->m_fntable.pvService, pMsg->u32ClientId,
-                                                    HGCM_CLIENT_DATA(pSvc, pClient));
+                                                    HGCM_CLIENT_DATA(pSvc, pClient),
+                                                    pMsg->fRequestor, pMsg->fRestoring);
 
                     hgcmObjDereference(pClient);
@@ -1423 +1427 @@
             uint32_t u32ClientId;
             rc = SSMR3GetU32(pSSM, &u32ClientId);
+            uint32_t fRequestor = VMMDEV_REQUESTOR_LEGACY; /** @todo save/restore fRequestor. */
             if (RT_FAILURE(rc))
             {
@@ -1431 +1436 @@
 
             /* Connect the client. */
-            rc = pSvc->CreateAndConnectClient(NULL, u32ClientId);
+            rc = pSvc->CreateAndConnectClient(NULL, u32ClientId, fRequestor, true /*fRestoring*/);
             if (RT_FAILURE(rc))
             {
@@ -1460 +1465 @@
  *                        If NULL, use the given 'u32ClientIdIn' handle.
  * @param u32ClientIdIn   The handle for the client, when 'pu32ClientIdOut' is NULL.
- * @return VBox rc.
- */
-int HGCMService::CreateAndConnectClient(uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn)
-{
-    LogFlowFunc(("pu32ClientIdOut = %p, u32ClientIdIn = %d\n", pu32ClientIdOut, u32ClientIdIn));
+ * @param fRequestor      The requestor flags, VMMDEV_REQUESTOR_LEGACY if not available.
+ * @param fRestoring      Set if we're restoring a saved state.
+ * @return VBox status code.
+ */
+int HGCMService::CreateAndConnectClient(uint32_t *pu32ClientIdOut, uint32_t u32ClientIdIn, uint32_t fRequestor, bool fRestoring)
+{
+    LogFlowFunc(("pu32ClientIdOut = %p, u32ClientIdIn = %d, fRequestor = %#x, fRestoring = %d\n",
+                 pu32ClientIdOut, u32ClientIdIn, fRequestor, fRestoring));
 
     /* Allocate a client information structure. */
@@ -1980 +1988 @@
                 {
                     /* Call the service instance method. */
-                    rc = pService->CreateAndConnectClient(pMsg->pu32ClientId, 0);
+                    rc = pService->CreateAndConnectClient(pMsg->pu32ClientId,
+                                                          0,
+                                                          pMsg->pHGCMPort->pfnGetRequestor(pMsg->pHGCMPort, pMsg->pCmd),
+                                                          pMsg->pHGCMPort->pfnIsCmdRestored(pMsg->pHGCMPort, pMsg->pCmd));
 
                     /* Release the service after resolve. */