Changeset 27640 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm

Timestamp:

Mar 23, 2010 3:36:18 PM (15 years ago)

Author:

vboxsync

Message:

wddm: mouse pointer integration fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/Miniport/wddm/VBoxVideoWddm.cpp

@@ -2006 +2006 @@
 {
     PVIDEO_POINTER_ATTRIBUTES pPointerAttributes = &pPointerInfo->Attributes.data;
-    /* pPointerAttributes maointains the visibility state, clear all except visibility */
-    pPointerAttributes->Enable &= 0xffff0000 | VBOX_MOUSE_POINTER_VISIBLE;
+    /* pPointerAttributes maintains the visibility state, clear all except visibility */
+    pPointerAttributes->Enable &= VBOX_MOUSE_POINTER_VISIBLE;
 
     Assert(pSetPointerShape->Flags.Value == 1 || pSetPointerShape->Flags.Value == 2);
@@ -2046 +2046 @@
 
     pPointerAttributes->Enable |= VBOX_MOUSE_POINTER_SHAPE;
-    //
-    // Initialize Pointer attributes and position
-    //
-    if (pPointerAttributes->Enable & VBOX_MOUSE_POINTER_VISIBLE)
-    {
-        /* New coordinates of pointer's hot spot */
-        pPointerAttributes->Column = (SHORT)(pPointerInfo->xPos) - (SHORT)(pSetPointerShape->YHot);
-        pPointerAttributes->Row    = (SHORT)(pPointerInfo->yPos) - (SHORT)(pSetPointerShape->YHot);
-    }
-    else
-    {
-        /* Pointer should be created invisible */
-        pPointerAttributes->Column = -1;
-        pPointerAttributes->Row    = -1;
-    }
-
-    /* VBOX: We have to pass to miniport hot spot coordinates and alpha flag.
-     * They will be encoded in the pPointerAttributes::Enable field.
+
+    /*
+     * The hot spot coordinates and alpha flag will be encoded in the pPointerAttributes::Enable field.
      * High word will contain hot spot info and low word - flags.
      */
-
     pPointerAttributes->Enable |= (pSetPointerShape->YHot & 0xFF) << 24;
     pPointerAttributes->Enable |= (pSetPointerShape->XHot & 0xFF) << 16;
@@ -2079 +2063 @@
     CONST DXGKARG_SETPOINTERPOSITION*  pSetPointerPosition)
 {
-    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+//    dfprintf(("==> "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     vboxVDbgBreakFv();
@@ -2099 +2083 @@
     }
 
-    pPointerInfo->xPos = pSetPointerPosition->X;
-    pPointerInfo->yPos = pSetPointerPosition->Y;
+    pPointerAttributes->Column = pSetPointerPosition->X;
+    pPointerAttributes->Row = pSetPointerPosition->Y;
 
     if (bNotifyVisibility && vboxQueryHostWantsAbsolute())
@@ -2116 +2100 @@
     }
 
-    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
+//    dfprintf(("<== "__FUNCTION__ ", hAdapter(0x%x)\n", hAdapter));
 
     return STATUS_SUCCESS;
@@ -2138 +2122 @@
         PDEVICE_EXTENSION pDevExt = (PDEVICE_EXTENSION)hAdapter;
         PVBOXWDDM_POINTER_INFO pPointerInfo = &pDevExt->aSources[pSetPointerShape->VidPnSourceId].PointerInfo;
+        /* @todo: to avoid extra data copy and extra heap allocation,
+         *  need to maintain the pre-allocated HGSMI buffer and convert the data directly to it */
         if (vboxVddmPointerShapeToAttributes(pSetPointerShape, pPointerInfo))
         {