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

Timestamp:

Jun 19, 2014 3:12:30 PM (11 years ago)

Author:

vboxsync

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

94439

Message:

Main,Frontends: use safearray for IFramebuffer::Notify3DEvent

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/Framebuffer.cpp (modified) (1 diff)
• VBoxSDL/Framebuffer.h (modified) (1 diff)
• VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/UIFrameBuffer.h (modified) (1 diff)

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

@@ -577 +577 @@
 }
 
-STDMETHODIMP VBoxSDLFB::Notify3DEvent(ULONG uType, BYTE *pReserved)
+STDMETHODIMP VBoxSDLFB::Notify3DEvent(ULONG uType, ComSafeArrayIn(BYTE, aData))
 {
     return E_NOTIMPL;

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

@@ -96 +96 @@
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand);
 
-    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pReserved);
+    STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, aData));
 
     // internal public methods

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

@@ -409 +409 @@
 }
 
-STDMETHODIMP UIFrameBuffer::Notify3DEvent(ULONG uType, BYTE *pData)
+STDMETHODIMP UIFrameBuffer::Notify3DEvent(ULONG uType, ComSafeArrayIn(BYTE, aData))
 {
     /* Lock access to frame-buffer: */
@@ -426 +426 @@
     }
 
+    com::SafeArray<BYTE> data(ComSafeArrayInArg(aData));
     switch (uType)
     {
@@ -432 +433 @@
             /* Notify machine-view with the async-signal
              * about 3D overlay visibility change: */
-            BOOL fVisible = !!pData;
+            BOOL fVisible = data[0];
             LogRel2(("UIFrameBuffer::Notify3DEvent: Sending to async-handler: "
                      "(VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA = %s)\n",

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h

@@ -152 +152 @@
     /** EMT callback: Notifies frame-buffer about 3D backend event.
       * @param        uType Event type. Currently only VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA is supported.
-      * @param        pData Event-specific data, depends on the supplied event type.
-      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
-      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
-    STDMETHOD(Notify3DEvent)(ULONG uType, BYTE *pData);
+      * @param        aData Event-specific data, depends on the supplied event type.
+      * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
+      * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
+    STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, aData));
 
     /** Returns frame-buffer data address. */