Changeset 34665 in vbox for trunk/src/VBox/Additions/common/VBoxVideo

Timestamp:

Dec 2, 2010 11:05:33 PM (14 years ago)

Author:

vboxsync

Message:

Additions/common/VBoxVideo and Additions/WINNT/Graphics: some adjustments to the common VBoxVideo code

Location:

trunk/src/VBox/Additions/common/VBoxVideo

Files:

• HGSMIBase.cpp (modified) (3 diffs)
• VBVABase.cpp (modified) (9 diffs)

trunk/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp

@@ -324 +324 @@
     {
         VBVAINFOVIEW *pInfo = (VBVAINFOVIEW *)p;
-        rc = pfnFill(pvData, pInfo);
+        rc = pfnFill(pvData, pInfo, u32Count);
         if (RT_SUCCESS(rc))
             VBoxHGSMIBufferSubmit (pCtx, p);
@@ -337 +337 @@
 /**
  * Get the information needed to map the basic communication structures in
- * device memory into our address space.
+ * device memory into our address space.  All pointer parameters are optional.
  *
  * @param  cbVRAM               how much video RAM is allocated to the device
  * @param  poffVRAMBaseMapping  where to save the offset from the start of the
- *                              device VRAM of the whole area to map 
+ *                              device VRAM of the whole area to map
  * @param  pcbMapping           where to save the mapping size
  * @param  poffGuestHeapMemory  where to save the offset into the mapped area
@@ -357 +357 @@
                                          uint32_t *poffHostFlags)
 {
-    AssertPtrReturnVoid(poffVRAMBaseMapping);
-    AssertPtrReturnVoid(pcbMapping);
-    AssertPtrReturnVoid(poffGuestHeapMemory);
-    AssertPtrReturnVoid(pcbGuestHeapMemory);
-    AssertPtrReturnVoid(poffHostFlags);
-    *poffVRAMBaseMapping = cbVRAM - VBVA_ADAPTER_INFORMATION_SIZE;
-    *pcbMapping = VBVA_ADAPTER_INFORMATION_SIZE;
-    *poffGuestHeapMemory = 0;
-    *pcbGuestHeapMemory = VBVA_ADAPTER_INFORMATION_SIZE - sizeof(HGSMIHOSTFLAGS);
-    *poffHostFlags = VBVA_ADAPTER_INFORMATION_SIZE - sizeof(HGSMIHOSTFLAGS);
+    AssertPtrNullReturnVoid(poffVRAMBaseMapping);
+    AssertPtrNullReturnVoid(pcbMapping);
+    AssertPtrNullReturnVoid(poffGuestHeapMemory);
+    AssertPtrNullReturnVoid(pcbGuestHeapMemory);
+    AssertPtrNullReturnVoid(poffHostFlags);
+    if (poffVRAMBaseMapping)
+        *poffVRAMBaseMapping = cbVRAM - VBVA_ADAPTER_INFORMATION_SIZE;
+    if (pcbMapping)
+        *pcbMapping = VBVA_ADAPTER_INFORMATION_SIZE;
+    if (poffGuestHeapMemory)
+        *poffGuestHeapMemory = 0;
+    if (pcbGuestHeapMemory)
+        *pcbGuestHeapMemory =   VBVA_ADAPTER_INFORMATION_SIZE
+                              - sizeof(HGSMIHOSTFLAGS);
+    if (poffHostFlags)
+        *poffHostFlags =   VBVA_ADAPTER_INFORMATION_SIZE
+                         - sizeof(HGSMIHOSTFLAGS);
 }
 

trunk/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp

@@ -49 +49 @@
 static bool vboxVBVAInformHost(PVBVABUFFERCONTEXT pCtx,
                                PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                               bool bEnable)
+                               int32_t cScreen, bool bEnable)
 {
     bool bRc = false;
@@ -58 +58 @@
     {
         void *p = VBoxHGSMIBufferAlloc(pHGSMICtx,
-                                       sizeof (VBVAENABLE),
+                                       sizeof (VBVAENABLE_EX),
                                        HGSMI_CH_VBVA,
                                        VBVA_ENABLE);
@@ -67 +67 @@
         else
         {
-            VBVAENABLE *pEnable = (VBVAENABLE *)p;
-
-            pEnable->u32Flags  = bEnable? VBVA_F_ENABLE: VBVA_F_DISABLE;
-            pEnable->u32Offset = pCtx->offVRAMBuffer;
-            pEnable->i32Result = VERR_NOT_SUPPORTED;
+            VBVAENABLE_EX *pEnable = (VBVAENABLE_EX *)p;
+
+            pEnable->Base.u32Flags  = bEnable? VBVA_F_ENABLE: VBVA_F_DISABLE;
+            pEnable->Base.u32Offset = pCtx->offVRAMBuffer;
+            pEnable->Base.i32Result = VERR_NOT_SUPPORTED;
+            if (cScreen >= 0)
+            {
+                pEnable->Base.u32Flags |= VBVA_F_EXTENDED | VBVA_F_ABSOFFSET;
+                pEnable->u32ScreenId    = cScreen;
+            }
 
             VBoxHGSMIBufferSubmit(pHGSMICtx, p);
@@ -77 +82 @@
             if (bEnable)
             {
-                bRc = RT_SUCCESS(pEnable->i32Result);
+                bRc = RT_SUCCESS(pEnable->Base.i32Result);
             }
             else
@@ -96 +101 @@
 RTDECL(bool) VBoxVBVAEnable(PVBVABUFFERCONTEXT pCtx,
                             PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
-                            VBVABUFFER *pVBVA)
+                            VBVABUFFER *pVBVA, int32_t cScreen)
 {
     bool bRc = false;
@@ -122 +127 @@
         pCtx->pVBVA      = pVBVA;
 
-        bRc = vboxVBVAInformHost(pCtx, pHGSMICtx, true);
+        bRc = vboxVBVAInformHost(pCtx, pHGSMICtx, cScreen, true);
     }
 
     if (!bRc)
     {
-        VBoxVBVADisable(pCtx, pHGSMICtx);
+        VBoxVBVADisable(pCtx, pHGSMICtx, cScreen);
     }
 
@@ -134 +139 @@
 
 RTDECL(void) VBoxVBVADisable(PVBVABUFFERCONTEXT pCtx,
-                             PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx)
+                             PHGSMIGUESTCOMMANDCONTEXT pHGSMICtx,
+                             int32_t cScreen)
 {
     LogFlowFunc(("\n"));
@@ -142 +148 @@
     pCtx->pVBVA             = NULL;
 
-    vboxVBVAInformHost(pCtx, pHGSMICtx, false);
+    vboxVBVAInformHost(pCtx, pHGSMICtx, cScreen, false);
 
     return;
@@ -374 +380 @@
 
     return false;
+}
+
+RTDECL(void) VBoxVBVASetupBufferContext(PVBVABUFFERCONTEXT pCtx,
+                                        uint32_t offVRAMBuffer,
+                                        uint32_t cbBuffer)
+{
+    pCtx->offVRAMBuffer = offVRAMBuffer;
+    pCtx->cbBuffer      = cbBuffer;
 }