Changeset 41216 in vbox for trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h

Timestamp:

May 8, 2012 6:05:41 PM (13 years ago)

Author:

vboxsync

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

77855

Message:

Frontends: back out the Framebuffer cleanup, to be retried later

File:

• trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.h (modified) (5 diffs)

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2007 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -43 +43 @@
 
 class VBoxSDLFB :
-    public CComObjectRootEx<CComMultiThreadModelNoCS>,
     VBOX_SCRIPTABLE_IMPL(IFramebuffer)
 {
 public:
-    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_MINIMAL_INTERFACE_ENTRIES(IFramebuffer)
-    END_COM_MAP()
+    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
+    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
+
+    NS_DECL_ISUPPORTS
 
     STDMETHOD(COMGETTER(Width))(ULONG *width);
@@ -185 +187 @@
     /** secure label offset from the top of the secure label */
     uint32_t mLabelOffs;
-#endif
-
+
+#endif
+#ifdef RT_OS_WINDOWS
+    long refcnt;
+#endif
     SDL_Surface *mSurfVRAM;
 
@@ -198 +203 @@
 
 class VBoxSDLFBOverlay :
-    public CComObjectRootEx<CComMultiThreadModelNoCS>,
-    VBOX_SCRIPTABLE_IMPL(IFramebufferOverlay)
+    public IFramebufferOverlay
 {
 public:
-    DECLARE_NOT_AGGREGATABLE(VBoxSDLFBOverlay)
-
     VBoxSDLFBOverlay(ULONG x, ULONG y, ULONG width, ULONG height, BOOL visible,
                      VBoxSDLFB *aParent);
     virtual ~VBoxSDLFBOverlay();
 
-    BEGIN_COM_MAP(VBoxSDLFBOverlay)
-        VBOX_MINIMAL_INTERFACE_ENTRIES(IFramebufferOverlay)
-    END_COM_MAP()
+#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
+    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
+
+    NS_DECL_ISUPPORTS
 
     STDMETHOD(COMGETTER(X))(ULONG *x);
@@ -260 +275 @@
     /** Additional SDL surface used for combining the framebuffer and the overlay */
     SDL_Surface *mBlendedBits;
+#ifdef RT_OS_WINDOWS
+    long refcnt;
+#endif
 };