Changeset 41215 in vbox

Timestamp:

May 8, 2012 6:00:42 PM (13 years ago)

Author:

vboxsync

Message:

Frontends/VBoxSDL: clean up framebuffer implementation in a COM-compatible fashion

Location:

trunk/src/VBox/Frontends/VBoxSDL

Files:

• Framebuffer.cpp (modified) (5 diffs)
• Framebuffer.h (modified) (4 diffs)
• VBoxSDL.cpp (modified) (4 diffs)

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

@@ -75 +75 @@
 //
 
-/**
- * SDL framebuffer constructor. It is called from the main
+HRESULT VBoxSDLFB::FinalConstruct()
+{
+    return S_OK;
+}
+
+/**
+ * SDL framebuffer init method. It is called from the main
  * (i.e. SDL) thread. Therefore it is safe to use SDL calls
  * here.
+ * @returns COM status code
  * @param fFullscreen    flag whether we start in fullscreen mode
  * @param fResizable     flag whether the SDL window should be resizable
@@ -87 +93 @@
  * @param iFixedHeight   fixed SDL height (-1 means not set)
  */
-VBoxSDLFB::VBoxSDLFB(uint32_t uScreenId,
-                     bool fFullscreen, bool fResizable, bool fShowSDLConfig,
-                     bool fKeepHostRes, uint32_t u32FixedWidth,
-                     uint32_t u32FixedHeight, uint32_t u32FixedBPP)
+HRESULT VBoxSDLFB::init(uint32_t uScreenId,
+                        bool fFullscreen, bool fResizable, bool fShowSDLConfig,
+                        bool fKeepHostRes, uint32_t u32FixedWidth,
+                        uint32_t u32FixedHeight, uint32_t u32FixedBPP)
 {
     int rc;
-    LogFlow(("VBoxSDLFB::VBoxSDLFB\n"));
-
-#if defined (RT_OS_WINDOWS)
-    refcnt = 0;
-#endif
+    LogFlow(("VBoxSDLFB::init\n"));
 
     mScreenId       = uScreenId;
@@ -138 +140 @@
     Assert(mScreen);
     mfInitialized = true;
-}
-
-VBoxSDLFB::~VBoxSDLFB()
-{
-    LogFlow(("VBoxSDLFB::~VBoxSDLFB\n"));
+
+    return S_OK;
+}
+
+void VBoxSDLFB::FinalRelease()
+{
+    uninit();
+}
+
+void VBoxSDLFB::uninit()
+{
+    LogFlow(("VBoxSDLFB::uninit\n"));
     if (mSurfVRAM)
     {
@@ -160 +169 @@
 }
 
-bool VBoxSDLFB::init(bool fShowSDLConfig)
+bool VBoxSDLFB::initSDL(bool fShowSDLConfig)
 {
     LogFlow(("VBoxSDLFB::init\n"));
@@ -240 +249 @@
  * @remarks must be called from the SDL thread!
  */
-void VBoxSDLFB::uninit()
+void VBoxSDLFB::uninitSDL()
 {
     if (gfSdlInitialized)

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

@@ -43 +43 @@
 
 class VBoxSDLFB :
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
     VBOX_SCRIPTABLE_IMPL(IFramebuffer)
 {
 public:
-    VBoxSDLFB(uint32_t uScreenId,
-              bool fFullscreen = false, bool fResizable = true, bool fShowSDLConfig = false,
-              bool fKeepHostRes = false, uint32_t u32FixedWidth = ~(uint32_t)0,
-              uint32_t u32FixedHeight = ~(uint32_t)0, uint32_t u32FixedBPP = ~(uint32_t)0);
-    virtual ~VBoxSDLFB();
-
-    static bool init(bool fShowSDLConfig);
-    static void uninit();
-
-#ifdef RT_OS_WINDOWS
-    STDMETHOD_(ULONG, AddRef)()
-    {
-        return ::InterlockedIncrement (&refcnt);
-    }
-    STDMETHOD_(ULONG, Release)()
-    {
-        long cnt = ::InterlockedDecrement (&refcnt);
-        if (cnt == 0)
-            delete this;
-        return cnt;
-    }
-#endif
+    DECLARE_NOT_AGGREGATABLE(VBoxSDLFB)
+
+    DECLARE_PROTECT_FINAL_CONSTRUCT()
+
+    VBoxSDLFB() { /* empty */ }
+    ~VBoxSDLFB() { /* empty */ }
+
+    HRESULT FinalConstruct();
+    void FinalRelease();
+
+    HRESULT init(uint32_t uScreenId,
+                 bool fFullscreen = false, bool fResizable = true, bool fShowSDLConfig = false,
+                 bool fKeepHostRes = false, uint32_t u32FixedWidth = ~(uint32_t)0,
+                 uint32_t u32FixedHeight = ~(uint32_t)0, uint32_t u32FixedBPP = ~(uint32_t)0);
+    void uninit();
+
+    static bool initSDL(bool fShowSDLConfig);
+    static void uninitSDL();
 
     BEGIN_COM_MAP(VBoxSDLFB)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+        VBOX_MINIMAL_INTERFACE_ENTRIES(IFramebuffer)
     END_COM_MAP()
 
@@ -188 +185 @@
     /** secure label offset from the top of the secure label */
     uint32_t mLabelOffs;
-
-#endif
-#ifdef RT_OS_WINDOWS
-    long refcnt;
-#endif
+#endif
+
     SDL_Surface *mSurfVRAM;
 
@@ -204 +198 @@
 
 class VBoxSDLFBOverlay :
-    public IFramebufferOverlay
+    public CComObjectRootEx<CComMultiThreadModelNoCS>,
+    VBOX_SCRIPTABLE_IMPL(IFramebufferOverlay)
 {
 public:
+    DECLARE_NOT_AGGREGATABLE(VBoxSDLFBOverlay)
+
     VBoxSDLFBOverlay(ULONG x, ULONG y, ULONG width, ULONG height, BOOL visible,
                      VBoxSDLFB *aParent);
     virtual ~VBoxSDLFBOverlay();
 
-#ifdef RT_OS_WINDOWS
-    STDMETHOD_(ULONG, AddRef)()
-    {
-        return ::InterlockedIncrement (&refcnt);
-    }
-    STDMETHOD_(ULONG, Release)()
-    {
-        long cnt = ::InterlockedDecrement (&refcnt);
-        if (cnt == 0)
-            delete this;
-        return cnt;
-    }
-#endif
-
     BEGIN_COM_MAP(VBoxSDLFBOverlay)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
+        VBOX_MINIMAL_INTERFACE_ENTRIES(IFramebufferOverlay)
     END_COM_MAP()
 
@@ -277 +260 @@
     /** Additional SDL surface used for combining the framebuffer and the overlay */
     SDL_Surface *mBlendedBits;
-#ifdef RT_OS_WINDOWS
-    long refcnt;
-#endif
 };
 

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

@@ -203 +203 @@
 
 static ULONG       gcMonitors = 1;
-static VBoxSDLFB  *gpFramebuffer[64];
+static ComObjPtr<VBoxSDLFB>  gpFramebuffer[64];
 static SDL_Cursor *gpDefaultCursor = NULL;
 #ifdef VBOXSDL_WITH_X11
@@ -1780 +1780 @@
 
     /* static initialization of the SDL stuff */
-    if (!VBoxSDLFB::init(fShowSDLConfig))
+    if (!VBoxSDLFB::initSDL(fShowSDLConfig))
         goto leave;
 
@@ -1790 +1790 @@
     {
         // create our SDL framebuffer instance
-        gpFramebuffer[i] = new VBoxSDLFB(i, fFullscreen, fResizable, fShowSDLConfig, false,
-                                         fixedWidth, fixedHeight, fixedBPP);
-
-        if (!gpFramebuffer[i])
+        rc = gpFramebuffer[i].createObject();
+        if (SUCCEEDED(rc))
+            rc = gpFramebuffer[i]->init(i, fFullscreen, fResizable, fShowSDLConfig, false,
+                                        fixedWidth, fixedHeight, fixedBPP);
+
+        if (FAILED(rc) || !gpFramebuffer[i])
         {
             RTPrintf("Error: could not create framebuffer object!\n");
@@ -2870 +2872 @@
     }
 
-    VBoxSDLFB::uninit();
+    VBoxSDLFB::uninitSDL();
 
 #ifdef VBOX_SECURELABEL