← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtualbox/precise-updates

« back to all changes in this revision

Viewing changes to src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-10-17 23:23:09 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20111017232309-kzm6841lzk61ranj
Tags: 4.1.4-dfsg-1
http://bugs.debian.org/507188
http://bugs.debian.org/637349
https://launchpad.net/bugs/840668
* New upstream release.
  - Fixes missing icons when using pt_BR locale. (Closes: #507188)
  - Fixes guest additions download url. (Closes: #637349; LP: #840668)
* Refresh patches.
* Drop the vboxmouse x11 driver. The mouse integration is now completely
  handled by the kernel module.
* Restrict dh_pycentral to the virtualbox binary package.
* Merge changes from the Ubuntu package but use them only when built
  on Ubuntu:
  - Add an Apport hook.
  - Add vboxguest modalias to the package control field.
* Pass KBUILD_VERBOSE=2 to kmk.
* Add 36-fix-text-mode.patch to fix text mode when using the vboxvideo driver.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp
1
 
/* $Id: crservice.cpp 37433 2011-06-14 11:44:45Z vboxsync $ */
 
1
/* $Id: crservice.cpp $ */
2
2
 
3
3
/** @file
4
4
 * VBox crOpenGL: Host service entry points.
1352
1352
                else
1353
1353
                {
1354
1354
                    CHECK_ERROR_RET(pFramebuffer, COMGETTER(WinId)(&winId), rc);
1355
 
                    CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc);
1356
 
                    CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc);
1357
 
 
1358
 
                    rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId);
1359
 
                    AssertRCReturn(rc, rc);
 
1355
 
 
1356
                    if (!winId)
 
1357
                    {
 
1358
                        /* View associated with framebuffer is destroyed, happens with 2d accel enabled */
 
1359
                        rc = crVBoxServerUnmapScreen(screenId);
 
1360
                        AssertRCReturn(rc, rc);
 
1361
                    }
 
1362
                    else
 
1363
                    {
 
1364
                        CHECK_ERROR_RET(pFramebuffer, COMGETTER(Width)(&w), rc);
 
1365
                        CHECK_ERROR_RET(pFramebuffer, COMGETTER(Height)(&h), rc);
 
1366
 
 
1367
                        rc = crVBoxServerMapScreen(screenId, xo, yo, w, h, winId);
 
1368
                        AssertRCReturn(rc, rc);
 
1369
                    }
1360
1370
                }
1361
1371
 
1362
1372
                rc = VINF_SUCCESS;