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

Timestamp:

May 8, 2012 8:56:52 AM (13 years ago)

Author:

vboxsync

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

77830

Message:

Main+Frontends: replace custom QueryInterface method to eliminate unnecessary code variation

Location:

trunk/src/VBox/Frontends

Files:

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

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2007-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
     }
 #endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
 
-    NS_DECL_ISUPPORTS
+    BEGIN_COM_MAP(VRDPFramebuffer)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+    END_COM_MAP()
 
     STDMETHOD(COMGETTER(Width))(ULONG *width);

trunk/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2007-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
     }
 #endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
-
-    NS_DECL_ISUPPORTS
+
+    BEGIN_COM_MAP(NullFB)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+    END_COM_MAP()
 
     // public methods only for internal purposes

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -68 +68 @@
     }
 #endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
-
-    NS_DECL_ISUPPORTS
+
+    BEGIN_COM_MAP(VBoxSDLFB)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+    END_COM_MAP()
 
     STDMETHOD(COMGETTER(Width))(ULONG *width);
@@ -223 +224 @@
     }
 #endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
-
-    NS_DECL_ISUPPORTS
+
+    BEGIN_COM_MAP(VBoxSDLFBOverlay)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+    END_COM_MAP()
 
     STDMETHOD(COMGETTER(X))(ULONG *x);

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

@@ -7 +7 @@
 
 /*
- * Copyright (C) 2010 Oracle Corporation
+ * Copyright (C) 2004-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2010-2011 Oracle Corporation
+ * Copyright (C) 2004-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -127 +127 @@
     void setDeleted(bool fIsDeleted) { m_fIsDeleted = fIsDeleted; }
 
-    NS_DECL_ISUPPORTS
-
-#if defined (Q_OS_WIN32)
+#if defined(Q_OS_WIN32)
     STDMETHOD_(ULONG, AddRef)()
     {
@@ -144 +142 @@
 #endif
 
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
+    BEGIN_COM_MAP(UIFrameBuffer)
+        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+    END_COM_MAP()
 
     /* IFramebuffer COM methods */
-    STDMETHOD(COMGETTER(Address)) (BYTE **ppAddress);
-    STDMETHOD(COMGETTER(Width)) (ULONG *puWidth);
-    STDMETHOD(COMGETTER(Height)) (ULONG *puHeight);
-    STDMETHOD(COMGETTER(BitsPerPixel)) (ULONG *puBitsPerPixel);
-    STDMETHOD(COMGETTER(BytesPerLine)) (ULONG *puBytesPerLine);
-    STDMETHOD(COMGETTER(PixelFormat)) (ULONG *puPixelFormat);
-    STDMETHOD(COMGETTER(UsesGuestVRAM)) (BOOL *pbUsesGuestVRAM);
-    STDMETHOD(COMGETTER(HeightReduction)) (ULONG *puHeightReduction);
-    STDMETHOD(COMGETTER(Overlay)) (IFramebufferOverlay **ppOverlay);
-    STDMETHOD(COMGETTER(WinId)) (LONG64 *pWinId);
+    STDMETHOD(COMGETTER(Address))(BYTE **ppAddress);
+    STDMETHOD(COMGETTER(Width))(ULONG *puWidth);
+    STDMETHOD(COMGETTER(Height))(ULONG *puHeight);
+    STDMETHOD(COMGETTER(BitsPerPixel))(ULONG *puBitsPerPixel);
+    STDMETHOD(COMGETTER(BytesPerLine))(ULONG *puBytesPerLine);
+    STDMETHOD(COMGETTER(PixelFormat))(ULONG *puPixelFormat);
+    STDMETHOD(COMGETTER(UsesGuestVRAM))(BOOL *pbUsesGuestVRAM);
+    STDMETHOD(COMGETTER(HeightReduction))(ULONG *puHeightReduction);
+    STDMETHOD(COMGETTER(Overlay))(IFramebufferOverlay **ppOverlay);
+    STDMETHOD(COMGETTER(WinId))(LONG64 *pWinId);
 
     STDMETHOD(Lock)();
     STDMETHOD(Unlock)();
 
-    STDMETHOD(RequestResize) (ULONG uScreenId, ULONG uPixelFormat,
-                              BYTE *pVRAM, ULONG uBitsPerPixel, ULONG uBytesPerLine,
-                              ULONG uWidth, ULONG uHeight,
-                              BOOL *pbFinished);
-
-    STDMETHOD(VideoModeSupported) (ULONG uWidth, ULONG uHeight, ULONG uBPP,
-                                   BOOL *pbSupported);
+    STDMETHOD(RequestResize)(ULONG uScreenId, ULONG uPixelFormat,
+                             BYTE *pVRAM, ULONG uBitsPerPixel, ULONG uBytesPerLine,
+                             ULONG uWidth, ULONG uHeight,
+                             BOOL *pbFinished);
+
+    STDMETHOD(VideoModeSupported)(ULONG uWidth, ULONG uHeight, ULONG uBPP,
+                                  BOOL *pbSupported);
 
     STDMETHOD(GetVisibleRegion)(BYTE *pRectangles, ULONG uCount, ULONG *puCountCopied);
@@ -247 +247 @@
     bool m_fIsDeleted;
 
-#if defined (Q_OS_WIN32)
+#if defined(Q_OS_WIN32)
 private: