Changeset 49420 in vbox for trunk/src/VBox/Main/src-client

Timestamp:

Nov 8, 2013 3:54:02 PM (11 years ago)

Author:

vboxsync

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

90501

Message:

forward-port and adopt VHWA fixes

File:

• trunk/src/VBox/Main/src-client/DisplayImpl.cpp (modified) (1 diff)

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

@@ -3810 +3810 @@
 #ifdef VBOX_WITH_VIDEOHWACCEL
 
-void Display::handleVHWACommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCommand)
+#ifndef S_FALSE
+# define S_FALSE ((HRESULT)1L)
+#endif
+
+int Display::handleVHWACommandProcess(PVBOXVHWACMD pCommand)
 {
     unsigned id = (unsigned)pCommand->iDisplay;
     int rc = VINF_SUCCESS;
-    if (id < mcMonitors)
-    {
-        IFramebuffer *pFramebuffer = maFramebuffers[id].pFramebuffer;
-#ifdef DEBUG_misha
-        Assert (pFramebuffer);
-#endif
-
-        if (pFramebuffer != NULL)
-        {
-            HRESULT hr = pFramebuffer->ProcessVHWACommand((BYTE*)pCommand);
-            if (FAILED(hr))
-            {
-                rc = (hr == E_NOTIMPL) ? VERR_NOT_IMPLEMENTED : VERR_GENERAL_FAILURE;
-            }
-        }
-        else
-        {
-            rc = VERR_NOT_IMPLEMENTED;
-        }
-    }
-    else
-    {
-        rc = VERR_INVALID_PARAMETER;
-    }
-
-    if (RT_FAILURE(rc))
-    {
-        /* tell the guest the command is complete */
-        pCommand->Flags &= (~VBOXVHWACMD_FLAG_HG_ASYNCH);
-        pCommand->rc = rc;
-    }
-}
-
-DECLCALLBACK(void) Display::displayVHWACommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCommand)
+    if (id >= mcMonitors)
+        return VERR_INVALID_PARAMETER;
+
+    ComPtr<IFramebuffer> pFramebuffer;
+    AutoReadLock arlock(this COMMA_LOCKVAL_SRC_POS);
+    pFramebuffer = maFramebuffers[id].pFramebuffer;
+    arlock.release();
+
+    if (pFramebuffer == NULL)
+        return VERR_INVALID_STATE; /* notify we can not handle request atm */
+
+    HRESULT hr = pFramebuffer->ProcessVHWACommand((BYTE*)pCommand);
+    if (hr == S_FALSE)
+        return VINF_SUCCESS;
+    else if (SUCCEEDED(hr))
+        return VINF_CALLBACK_RETURN;
+    else if (hr == E_ACCESSDENIED)
+        return VERR_INVALID_STATE; /* notify we can not handle request atm */
+    else if (hr == E_NOTIMPL)
+        return VERR_NOT_IMPLEMENTED;
+    return VERR_GENERAL_FAILURE;
+}
+
+DECLCALLBACK(int) Display::displayVHWACommandProcess(PPDMIDISPLAYCONNECTOR pInterface, PVBOXVHWACMD pCommand)
 {
     PDRVMAINDISPLAY pDrv = PDMIDISPLAYCONNECTOR_2_MAINDISPLAY(pInterface);
 
-    pDrv->pDisplay->handleVHWACommandProcess(pInterface, pCommand);
+    return pDrv->pDisplay->handleVHWACommandProcess(pCommand);
 }
 #endif