Changeset 56378 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 12, 2015 6:10:56 AM (10 years ago)

Author:

vboxsync

Message:

Windows guest additions, VBVA: host mouse cursor capability.

Location:

trunk/src/VBox/Additions

Files:

• WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp (modified) (2 diffs)
• WINNT/Graphics/Video/mp/common/VBoxMPCommon.h (modified) (1 diff)
• WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h (modified) (1 diff)
• WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp (modified) (4 diffs)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp (modified) (1 diff)
• WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp (modified) (2 diffs)
• common/VBoxVideo/HGSMIBase.cpp (modified) (3 diffs)
• common/VBoxVideo/Modesetting.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.cpp

@@ -19 +19 @@
 #include "VBoxMPCommon.h"
 #include <VBox/Hardware/VBoxVideoVBE.h>
+#include <iprt/asm.h>
 
 int VBoxMPCmnMapAdapterMemory(PVBOXMP_COMMON pCommon, void **ppv, uint32_t ulOffset, uint32_t ulSize)
@@ -106 +107 @@
 #endif
 }
+
+static bool vboxMPCmnIsXorPointer(uint32_t fFlags,
+                                  uint32_t cWidth,
+                                  uint32_t cHeight,
+                                  const uint8_t *pu8Pixels,
+                                  uint32_t cbLength)
+{
+    if (   (fFlags & VBOX_MOUSE_POINTER_SHAPE) == 0
+        || (fFlags & VBOX_MOUSE_POINTER_ALPHA) != 0)
+    
+    {
+        return false;
+    }
+
+    if (cWidth > 8192 || cHeight > 8192)
+    {
+        /* Not supported cursor size. */
+        return false;
+    }
+
+    /* Pointer data consists of AND mask and XOR_MASK */
+    const uint32_t cbAndLine = (cWidth + 7) / 8;
+    const uint32_t cbAndMask = ((cbAndLine * cHeight + 3) & ~3);
+    const uint32_t cbXorMask = cWidth * 4 * cHeight;
+
+    if (cbAndMask + cbXorMask > cbLength)
+    {
+        return false;
+    }
+
+    /* If AND mask contains only 1, then it is a XOR only cursor. */
+    bool fXorOnly = true;
+    const uint8_t *pu8AndLine = &pu8Pixels[0];
+    uint32_t i;
+    for (i = 0; i < cHeight; ++i)
+    {
+        if (ASMBitFirstClear(pu8AndLine, cWidth) != -1)
+        {
+            fXorOnly = false;
+            break;
+        }
+        pu8AndLine += cbAndLine;
+    }
+
+    return fXorOnly;
+}
+
+bool VBoxMPCmnUpdatePointerShape(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_ATTRIBUTES pAttrs, uint32_t cbLength)
+{
+    const uint32_t fFlags = pAttrs->Enable & 0x0000FFFF;
+    const uint32_t cHotX = (pAttrs->Enable >> 16) & 0xFF;
+    const uint32_t cHotY = (pAttrs->Enable >> 24) & 0xFF;
+    const uint32_t cWidth = pAttrs->Width;
+    const uint32_t cHeight = pAttrs->Height;
+    uint8_t *pPixels = &pAttrs->Pixels[0];
+
+    if (pCommon->u32MouseCursorFlags & VBVA_MOUSE_CURSOR_NO_XOR)
+    {
+        if (vboxMPCmnIsXorPointer(fFlags,
+                                  cWidth, cHeight, pPixels,
+                                  cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES)))
+        {
+            return false;
+        }
+    }
+
+    int rc = VBoxHGSMIUpdatePointerShape(&pCommon->guestCtx,
+                                         fFlags, cHotX, cHotY,
+                                         cWidth, cHeight, pPixels,
+                                         cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES));
+    return RT_SUCCESS(rc);
+}

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPCommon.h

@@ -52 +52 @@
 
 /* Pointer related */
-inline bool VBoxMPCmnUpdatePointerShape(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_ATTRIBUTES pAttrs, uint32_t cbLength)
-{
-    int rc;
-    rc =   VBoxHGSMIUpdatePointerShape(&pCommon->guestCtx,
-                                       pAttrs->Enable & 0x0000FFFF,
-                                       (pAttrs->Enable >> 16) & 0xFF,
-                                       (pAttrs->Enable >> 24) & 0xFF,
-                                       pAttrs->Width, pAttrs->Height, pAttrs->Pixels,
-                                       cbLength - sizeof(VIDEO_POINTER_ATTRIBUTES));
-    return RT_SUCCESS(rc);
-}
+bool VBoxMPCmnUpdatePointerShape(PVBOXMP_COMMON pCommon, PVIDEO_POINTER_ATTRIBUTES pAttrs, uint32_t cbLength);
 
 RT_C_DECLS_END

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/common/VBoxMPDevExt.h

@@ -67 +67 @@
 
     BOOLEAN fAnyX;                      /* Unrestricted horizontal resolution flag. */
+
+    uint32_t u32MouseCursorFlags;       /* VBVA_MOUSE_CURSOR_* */
 } VBOXMP_COMMON, *PVBOXMP_COMMON;
 

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/wddm/VBoxMPWddm.cpp

@@ -1135 +1135 @@
                 if (VBoxCommonFromDeviceExt(pDevExt)->bHGSMI)
                 {
+                    PVBOXMP_COMMON pCommon = VBoxCommonFromDeviceExt(pDevExt);
+                    pCommon->u32MouseCursorFlags = VBoxHGSMIGetMouseCursorFlags(&pCommon->guestCtx);
+
                     vboxWddmSetupDisplays(pDevExt);
                     if (!VBoxCommonFromDeviceExt(pDevExt)->bHGSMI)
@@ -4193 +4196 @@
 }
 
+static void vboxWddmHostPointerEnable(PVBOXMP_DEVEXT pDevExt, BOOLEAN fEnable)
+{
+    VIDEO_POINTER_ATTRIBUTES PointerAttributes;
+    RT_ZERO(PointerAttributes);
+    if (fEnable)
+    {
+        PointerAttributes.Enable = VBOX_MOUSE_POINTER_VISIBLE;
+    }
+    VBoxMPCmnUpdatePointerShape(VBoxCommonFromDeviceExt(pDevExt), &PointerAttributes, sizeof(PointerAttributes));
+}
+
 NTSTATUS
 APIENTRY
@@ -4238 +4252 @@
         {
             BOOLEAN bResult = VBoxMPCmnUpdatePointerShape(VBoxCommonFromDeviceExt(pDevExt), &pPointerInfo->Attributes.data, VBOXWDDM_POINTER_ATTRIBUTES_SIZE);
-            Assert(bResult);
+            if (!bResult)
+            {
+                vboxWddmHostPointerEnable(pDevExt, FALSE);
+            }
         }
         else
         {
             // tell the host to use the guest's pointer
-            VIDEO_POINTER_ATTRIBUTES PointerAttributes;
-
-            /* Visible and No Shape means Show the pointer.
-             * It is enough to init only this field.
-             */
-            PointerAttributes.Enable = pSetPointerPosition->Flags.Visible ? VBOX_MOUSE_POINTER_VISIBLE : 0;
-
-            BOOLEAN bResult = VBoxMPCmnUpdatePointerShape(VBoxCommonFromDeviceExt(pDevExt), &PointerAttributes, sizeof (PointerAttributes));
-            Assert(bResult);
+            vboxWddmHostPointerEnable(pDevExt, pSetPointerPosition->Flags.Visible);
         }
     }
@@ -4286 +4295 @@
             else
             {
-                AssertBreakpoint();
-                LOGREL(("vboxUpdatePointerShape failed"));
+                // tell the host to use the guest's pointer
+                vboxWddmHostPointerEnable(pDevExt, FALSE);
             }
         }

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPDriver.cpp

@@ -149 +149 @@
     VBoxSetupDisplaysHGSMI(&pExt->u.primary.commonInfo, phVRAM, ulApertureSize, cbVRAM, 0);
 
+    PVBOXMP_COMMON pCommon = &pExt->u.primary.commonInfo;
+    if (pCommon->bHGSMI)
+    {
+        pCommon->u32MouseCursorFlags = VBoxHGSMIGetMouseCursorFlags(&pCommon->guestCtx);
+    }
+
     /* Check if the chip restricts horizontal resolution or not.
      * Must be done after VBoxSetupDisplaysHGSMI, because it initializes the common structure.

trunk/src/VBox/Additions/WINNT/Graphics/Video/mp/xpdm/VBoxMPIOCTL.cpp

@@ -316 +316 @@
     {
         LOG(("Fallback to sw pointer."));
-        pStatus->Status = ERROR_INVALID_FUNCTION;
         bRC = FALSE;
+    }
+
+    if (!bRC)
+    {
+        pStatus->Status = ERROR_INVALID_FUNCTION;
     }
 
@@ -359 +363 @@
     else
     {
-        pStatus->Status = ERROR_INVALID_FUNCTION;
         bRC = FALSE;
+    }
+
+    if (!bRC)
+    {
+        pStatus->Status = ERROR_INVALID_FUNCTION;
     }
 

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

@@ -492 +492 @@
  * @param  u32Index  the index of the parameter to query,
  *                   @see VBVACONF32::u32Index
+ * @param  u32DefValue defaut value
  * @param  pulValue  where to store the value of the parameter on success
  */
-RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
-                               uint32_t u32Index, uint32_t *pulValue)
+RTDECL(int) VBoxQueryConfHGSMIDef(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                                  uint32_t u32Index, uint32_t u32DefValue, uint32_t *pulValue)
 {
     int rc = VINF_SUCCESS;
@@ -512 +513 @@
         /* Prepare data to be sent to the host. */
         p->u32Index = u32Index;
-        p->u32Value = UINT32_MAX;
+        p->u32Value = u32DefValue;
         rc = VBoxHGSMIBufferSubmit(pCtx, p);
         if (RT_SUCCESS(rc))
@@ -528 +529 @@
 }
 
+RTDECL(int) VBoxQueryConfHGSMI(PHGSMIGUESTCOMMANDCONTEXT pCtx,
+                               uint32_t u32Index, uint32_t *pulValue)
+{
+    return VBoxQueryConfHGSMIDef(pCtx, u32Index, UINT32_MAX, pulValue);
+}
 
 /**

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

@@ -373 +373 @@
 {
     uint32_t u32Flags = 0;
-    int rc = VBoxQueryConfHGSMI(pCtx, VBOX_VBVA_CONF32_SCREEN_FLAGS, &u32Flags);
+    int rc = VBoxQueryConfHGSMIDef(pCtx, VBOX_VBVA_CONF32_SCREEN_FLAGS, 0, &u32Flags);
     LogFunc(("u32Flags = 0x%x rc %Rrc\n", u32Flags, rc));
     if (RT_FAILURE(rc))
@@ -379 +379 @@
     return (uint16_t)u32Flags;
 }
+
+
+/**
+ * Query the mouse cursor flags VBVA_MOUSE_CURSOR_*.
+ *
+ * @returns The mask of VBVA_MOUSE_CURSOR_* flags or 0 if host does not support the request.
+ * @param  pCtx  the context containing the heap to use
+ */
+RTDECL(uint32_t) VBoxHGSMIGetMouseCursorFlags(PHGSMIGUESTCOMMANDCONTEXT pCtx)
+{
+    uint32_t u32Flags = 0;
+    int rc = VBoxQueryConfHGSMIDef(pCtx, VBOX_VBVA_CONF32_MOUSE_CURSOR, 0, &u32Flags);
+    LogFunc(("u32Flags = 0x%x rc %Rrc\n", u32Flags, rc));
+    if (RT_FAILURE(rc))
+        u32Flags = 0;
+    return u32Flags;
+}