← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Main/hgcm/HGCMThread.cpp

  • 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/Main/hgcm/HGCMThread.cpp
300
300
                    /* Wait until the thread is ready. */
301
301
                    rc = RTThreadUserWait (thread, 30000);
302
302
                    AssertRC (rc);
303
 
                    Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE (rc));
 
303
                    Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE(rc));
304
304
                }
305
305
                else
306
306
                {
334
334
    int rc = RTCritSectEnter (&m_critsect);
335
335
 
336
336
#ifdef LOG_ENABLED
337
 
    if (RT_FAILURE (rc))
 
337
    if (RT_FAILURE(rc))
338
338
    {
339
339
        Log(("HGCMThread::MsgPost: FAILURE: could not obtain worker thread mutex, rc = %Rrc!!!\n", rc));
340
340
    }
475
475
            /* Move the message to the m_pMsgInProcessHead list */
476
476
            rc = Enter ();
477
477
 
478
 
            if (RT_FAILURE (rc))
 
478
            if (RT_FAILURE(rc))
479
479
            {
480
480
                break;
481
481
            }
637
637
        rc = VERR_NO_MEMORY;
638
638
    }
639
639
 
640
 
    if (RT_SUCCESS (rc))
 
640
    if (RT_SUCCESS(rc))
641
641
    {
642
642
        *pHandle = handle;
643
643
    }
738
738
{
739
739
    int rc = hgcmMsgPostInternal (hMsg, pfnCallback, false);
740
740
 
741
 
    if (RT_SUCCESS (rc))
 
741
    if (RT_SUCCESS(rc))
742
742
    {
743
743
        rc = VINF_HGCM_ASYNC_EXECUTE;
744
744
    }