Changeset 75771 in vbox for trunk/src

Timestamp:

Nov 27, 2018 12:53:36 PM (6 years ago)

Author:

vboxsync

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

126973

Message:

VMMDev,HGCM: Give access to VMMDevRequestHeader::fRequestor. [adjustments] bugref:9105

Location:

trunk/src/VBox

Files:

• Devices/VMMDev/VMMDevHGCM.cpp (modified) (1 diff)
• Main/src-client/HGCM.cpp (modified) (1 diff)

trunk/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp

@@ -1541 +1541 @@
 {
     PVMMDEV pThis = RT_FROM_MEMBER(pInterface, VMMDevState, IHGCMPort);
+    AssertPtrReturn(pCmd, VMMDEV_REQUESTOR_LOWEST);
     if (pThis->guestInfo2.fFeatures & VBOXGSTINFO2_F_REQUESTOR_INFO)
-        if (pCmd)
-            return pCmd->fRequestor;
-   return 0;
+        return pCmd->fRequestor;
+   return VMMDEV_REQUESTOR_LEGACY;
 }
 

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

@@ -896 +896 @@
 {
     HGCMMsgHeader *pMsgHdr = (HGCMMsgHeader *)(hCall);
-    AssertPtrReturn(pMsgHdr, 0);
+    AssertPtrReturn(pMsgHdr, VMMDEV_REQUESTOR_LOWEST);
 
     PVBOXHGCMCMD pCmd = pMsgHdr->pCmd;
-    AssertPtrReturn(pCmd, 0);
+    AssertPtrReturn(pCmd, VMMDEV_REQUESTOR_LOWEST);
 
     PPDMIHGCMPORT pHgcmPort = pMsgHdr->pHGCMPort;
-    AssertPtrReturn(pHgcmPort, 0);
+    AssertPtrReturn(pHgcmPort, VMMDEV_REQUESTOR_LOWEST);
 
     return pHgcmPort->pfnGetRequestor(pHgcmPort, pCmd);