← Back to branch summary

~ubuntu-branches/ubuntu/raring/virtualbox-ose/raring

« back to all changes in this revision

Viewing changes to src/VBox/Frontends/VBoxSDL/Framebuffer.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Frontends/VBoxSDL/Framebuffer.h
70
70
            delete this;
71
71
        return cnt;
72
72
    }
73
 
    STDMETHOD(QueryInterface) (REFIID riid , void **ppObj)
74
 
    {
75
 
        if (riid == IID_IUnknown)
76
 
        {
77
 
            *ppObj = this;
78
 
            AddRef();
79
 
            return S_OK;
80
 
        }
81
 
        if (riid == IID_IFramebuffer)
82
 
        {
83
 
            *ppObj = this;
84
 
            AddRef();
85
 
            return S_OK;
86
 
        }
87
 
        *ppObj = NULL;
88
 
        return E_NOINTERFACE;
89
 
    }
90
73
#endif
 
74
    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
91
75
 
92
76
    NS_DECL_ISUPPORTS
93
77
 
241
225
            delete this;
242
226
        return cnt;
243
227
    }
244
 
    STDMETHOD(QueryInterface) (REFIID riid , void **ppObj)
245
 
    {
246
 
        if (riid == IID_IUnknown)
247
 
        {
248
 
            *ppObj = this;
249
 
            AddRef();
250
 
            return S_OK;
251
 
        }
252
 
        if (riid == IID_IFramebuffer)
253
 
        {
254
 
            *ppObj = this;
255
 
            AddRef();
256
 
            return S_OK;
257
 
        }
258
 
        *ppObj = NULL;
259
 
        return E_NOINTERFACE;
260
 
    }
261
228
#endif
 
229
    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
262
230
 
263
231
    NS_DECL_ISUPPORTS
264
232