Changeset 79482 in vbox for trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

Timestamp:

Jul 3, 2019 2:35:37 AM (6 years ago)

Author:

vboxsync

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

131746

Message:

x11/VBoxClient: Heed RT_NEED_NEW_AND_DELETE.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp (modified) (8 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/draganddrop.cpp

@@ -113 +113 @@
         XEvent x11;
     };
+#ifdef IN_GUEST
+    RTMEM_IMPLEMENT_NEW_AND_DELETE();
+#endif
 };
 
@@ -275 +278 @@
 
 private:
-
+#ifdef RT_NEED_NEW_AND_DELETE
+    RTMEM_IMPLEMENT_NEW_AND_DELETE();
+#endif
     xHelpers(Display *pDisplay)
       : m_pDisplay(pDisplay)
@@ -430 +435 @@
 
 public:
-
+#ifdef RT_NEED_NEW_AND_DELETE
+    RTMEM_IMPLEMENT_NEW_AND_DELETE();
+#endif
     VBoxDnDProxyWnd(void);
-
     virtual ~VBoxDnDProxyWnd(void);
 
@@ -453 +459 @@
 };
 
+/** This class only serve to avoid dragging in generic new() and delete(). */
+class WrappedXEvent
+{
+public:
+    XEvent m_Event;
+
+public:
+#ifdef RT_NEED_NEW_AND_DELETE
+    RTMEM_IMPLEMENT_NEW_AND_DELETE();
+#endif
+    WrappedXEvent(const XEvent &a_rSrcEvent)
+    {
+        m_Event = a_rSrcEvent;
+    }
+
+    WrappedXEvent()
+    {
+        RT_ZERO(m_Event);
+    }
+
+    WrappedXEvent &operator=(const XEvent &a_rSrcEvent)
+    {
+        m_Event = a_rSrcEvent;
+        return *this;
+    }
+};
+
 /**
  * Class for handling a single drag and drop operation, that is,
@@ -480 +513 @@
     };
 
+#ifdef RT_NEED_NEW_AND_DELETE
+    RTMEM_IMPLEMENT_NEW_AND_DELETE();
+#endif
     DragInstance(Display *pDisplay, DragAndDropService *pParent);
 
@@ -579 +615 @@
     volatile uint32_t           m_enmState;
     /** The instance's own X event queue. */
-    RTCMTList<XEvent>           m_eventQueueList;
+    RTCMTList<WrappedXEvent>    m_eventQueueList;
     /** Critical section for providing serialized access to list
      *  event queue's contents. */
@@ -1484 +1520 @@
             if (RT_SUCCESS(rc2))
             {
-                XEvent e = m_eventQueueList.at(i);
+                XEvent e = m_eventQueueList.at(i).m_Event;
 
                 fFound = e.type == iType;
@@ -1542 +1578 @@
             if (RT_SUCCESS(rc2))
             {
-                XEvent e = m_eventQueueList.at(i);
+                XEvent e = m_eventQueueList.at(i).m_Event;
                 if (   e.type                 == ClientMessage
                     && e.xclient.message_type == aType)