Changeset 49430 in vbox for trunk/src/VBox

Timestamp:

Nov 8, 2013 5:27:37 PM (11 years ago)

Author:

vboxsync

Message:

VHWA: forward port other fixes

Location:

trunk/src/VBox

Files:

• Devices/Graphics/HGSMI/HGSMIHost.cpp (modified) (2 diffs)
• Frontends/VirtualBox/src/VBoxFBOverlay.cpp (modified) (2 diffs)

trunk/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp

@@ -1040 +1040 @@
     LogFlowFunc(("pIns = %p, pvMem = %p\n", pIns, pvMem));
 
-    VM_ASSERT_OTHER_THREAD(pIns->pVM);
-
 #if 0
     void *pvContext = NULL;
@@ -1047 +1045 @@
 
     HGSMIOFFSET offBuffer = HGSMIHeapBufferOffset (&pIns->hostHeap, pvMem);
-
-//    /* Have to forward to EMT because FIFO processing is there. */
-//    int rc = VMR3ReqCallVoid (pIns->pVM, &pReq, RT_INDEFINITE_WAIT,
-//                              (PFNRT) hgsmiHostCommandProcess,
-//                              3, pIns, offBuffer, &pvContext);
 
     int rc = hgsmiHostCommandProcess (pIns, offBuffer,

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -4421 +4421 @@
 
         if (!mOverlayImage.hasSurfaces())
-        {
-            Assert(0);
             vboxSetGlOn(false);
-        }
     }
     else
@@ -5187 +5184 @@
         g_VBoxCmdEntriesCache.free(pCur);
     }
+
+    RTCritSectEnter(&mCritSect);
+
+    mbResetting = false;
+
+    RTCritSectLeave(&mCritSect);
 }