Changeset 29518 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 17, 2010 10:06:22 AM (15 years ago)

Author:

vboxsync

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

61658

Message:

Main: onMousePointerShapeChange reworked

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (2 diffs)
• VBoxSDL/VBoxSDL.cpp (modified) (5 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (4 diffs)
• VirtualBox/src/runtime/UISession.cpp (modified) (4 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -305 +305 @@
 
     STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
-                                         ULONG width, ULONG height, BYTE *shape)
+                                         ULONG width, ULONG height, ComSafeArrayIn(BYTE,shape))
     {
         return VBOX_E_DONT_CALL_AGAIN;
@@ -1243 +1243 @@
 }
 #endif /* !VBOX_WITH_HARDENING */
-

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -100 +100 @@
 {
     PointerShapeChangeData(BOOL aVisible, BOOL aAlpha, ULONG aXHot, ULONG aYHot,
-                           ULONG aWidth, ULONG aHeight, const uint8_t *aShape)
+                           ULONG aWidth, ULONG aHeight, ComSafeArrayIn(BYTE,pShape))
         : visible(aVisible), alpha(aAlpha), xHot(aXHot), yHot(aYHot),
-          width(aWidth), height(aHeight), shape(NULL)
+          width(aWidth), height(aHeight)
     {
         // make a copy of the shape
-        if (aShape)
-        {
-            uint32_t shapeSize = ((((aWidth + 7) / 8) * aHeight + 3) & ~3) + aWidth * 4 * aHeight;
-            shape = new uint8_t [shapeSize];
-            if (shape)
-                memcpy((void *)shape, (void *)aShape, shapeSize);
-        }
+        com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
+        size_t cbShapeSize = aShape.size();
+        shape.resize(cbShapeSize);
+        ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
     }
 
     ~PointerShapeChangeData()
     {
-        if (shape) delete[] shape;
     }
 
@@ -125 +121 @@
     const ULONG width;
     const ULONG height;
-    const uint8_t *shape;
+    com::SafeArray<BYTE> shape;
 };
 
@@ -401 +397 @@
 
     STDMETHOD(OnMousePointerShapeChange)(BOOL visible, BOOL alpha, ULONG xHot, ULONG yHot,
-                                         ULONG width, ULONG height, BYTE *shape)
+                                         ULONG width, ULONG height, ComSafeArrayIn(BYTE, shape))
     {
         PointerShapeChangeData *data;
         data = new PointerShapeChangeData(visible, alpha, xHot, yHot, width, height,
-                                          shape);
+                                          ComSafeArrayInArg(shape));
         Assert(data);
         if (!data)
@@ -4430 +4426 @@
         return;
 
-    if (data->shape)
+    if (data->shape.size() > 0)
     {
         bool ok = false;
@@ -4437 +4433 @@
         uint32_t srcShapePtrScan = data->width * 4;
 
-        const uint8_t *srcAndMaskPtr = data->shape;
-        const uint8_t *srcShapePtr = data->shape + ((andMaskSize + 3) & ~3);
+        const uint8_t* shape = data->shape.raw();
+        const uint8_t *srcAndMaskPtr = shape;
+        const uint8_t *srcShapePtr = shape + ((andMaskSize + 3) & ~3);
 
 #if 0

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

@@ -30 +30 @@
 #include "VBoxGlobal.h"
 #include "VBoxProblemReporter.h"
+#include "VBox/com/array.h"
 
 #ifdef Q_WS_PM
@@ -209 +210 @@
     MousePointerChangeEvent (bool visible, bool alpha, uint xhot, uint yhot,
                              uint width, uint height,
-                             const uchar *shape) :
+                             ComSafeArrayIn(BYTE,pShape)) :
         QEvent ((QEvent::Type) VBoxDefs::MousePointerChangeEventType),
-        vis (visible), alph (alpha), xh (xhot), yh (yhot), w (width), h (height),
-        data (NULL)
-    {
-        // make a copy of shape
-        uint dataSize = ((((width + 7) / 8 * height) + 3) & ~3) + width * 4 * height;
-
-        if (shape) {
-            data = new uchar [dataSize];
-            memcpy ((void *) data, (void *) shape, dataSize);
-        }
+        vis (visible), alph (alpha), xh (xhot), yh (yhot), w (width), h (height)
+    {
+        com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
+        size_t cbShapeSize = aShape.size();
+        shape.resize(cbShapeSize);
+        ::memcpy(shape.raw(), aShape.raw(), cbShapeSize);
     }
     ~MousePointerChangeEvent()
     {
-        if (data) delete[] data;
     }
     bool isVisible() const { return vis; }
@@ -232 +228 @@
     uint width() const { return w; }
     uint height() const { return h; }
-    const uchar *shapeData() const { return data; }
+    const uchar *shapeData() const { return shape.raw(); }
 private:
     bool vis, alph;
     uint xh, yh, w, h;
-    const uchar *data;
+    com::SafeArray <uint8_t> shape;
 };
 
@@ -423 +419 @@
                                           ULONG xhot, ULONG yhot,
                                           ULONG width, ULONG height,
-                                          BYTE *shape)
+                                          ComSafeArrayIn(BYTE,shape))
     {
         QApplication::postEvent (mView,
                                  new MousePointerChangeEvent (visible, alpha,
                                                               xhot, yhot,
-                                                              width, height, shape));
+                                                              width, height, ComSafeArrayInArg(shape)));
         return S_OK;
     }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -55 +55 @@
 public:
 
-    UIMousePointerShapeChangeEvent(bool bIsVisible, bool bIsAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight, const uchar *pShape)
+    UIMousePointerShapeChangeEvent(bool bIsVisible, bool bIsAlpha, uint uXHot, uint uYHot, uint uWidth, uint uHeight, ComSafeArrayIn(BYTE,pShape))
         : QEvent((QEvent::Type)UIConsoleEventType_MousePointerShapeChange)
-        , m_bIsVisible(bIsVisible), m_bIsAlpha(bIsAlpha), m_uXHot(uXHot), m_uYHot(uYHot), m_uWidth(uWidth), m_uHeight(uHeight), m_pData(0)
-    {
-        uint dataSize = ((((m_uWidth + 7) / 8 * m_uHeight) + 3) & ~3) + m_uWidth * 4 * m_uHeight;
-        if (pShape)
-        {
-            m_pData = new uchar[dataSize];
-            memcpy((void*)m_pData, (void*)pShape, dataSize);
-        }
+        , m_bIsVisible(bIsVisible), m_bIsAlpha(bIsAlpha), m_uXHot(uXHot), m_uYHot(uYHot), m_uWidth(uWidth), m_uHeight(uHeight)
+    {
+        com::SafeArray <BYTE> aShape(ComSafeArrayInArg (pShape));
+        size_t cbShapeSize = aShape.size();
+        m_shape.resize(cbShapeSize);
+        ::memcpy(m_shape.raw(), aShape.raw(), cbShapeSize);
     }
 
     virtual ~UIMousePointerShapeChangeEvent()
     {
-        if (m_pData) delete[] m_pData;
     }
 
@@ -78 +75 @@
     uint width() const { return m_uWidth; }
     uint height() const { return m_uHeight; }
-    const uchar *shapeData() const { return m_pData; }
+    const uchar *shapeData() const { return m_shape.raw(); }
 
 private:
@@ -84 +81 @@
     bool m_bIsVisible, m_bIsAlpha;
     uint m_uXHot, m_uYHot, m_uWidth, m_uHeight;
-    const uchar *m_pData;
+    com::SafeArray <uint8_t> m_shape;
 };
 
@@ -386 +383 @@
     VBOX_SCRIPTABLE_DISPATCH_IMPL(IConsoleCallback)
 
-    STDMETHOD(OnMousePointerShapeChange)(BOOL bIsVisible, BOOL bAlpha, ULONG uXHot, ULONG uYHot, ULONG uWidth, ULONG uHeight, BYTE *pShape)
-    {
-        QApplication::postEvent(m_pEventHandler, new UIMousePointerShapeChangeEvent(bIsVisible, bAlpha, uXHot, uYHot, uWidth, uHeight, pShape));
+    STDMETHOD(OnMousePointerShapeChange)(BOOL bIsVisible, BOOL bAlpha, ULONG uXHot, ULONG uYHot, ULONG uWidth, ULONG uHeight, ComSafeArrayIn(BYTE,pShape))
+    {
+        QApplication::postEvent(m_pEventHandler, new UIMousePointerShapeChangeEvent(bIsVisible, bAlpha, uXHot, uYHot, uWidth, uHeight, ComSafeArrayInArg(pShape)));
         return S_OK;
     }