← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2011-07-04 13:02:31 UTC
  • mfrom: (3.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20110704130231-l843es6wqhx614n7
Tags: 4.0.10-dfsg-1ubuntu1
* Merge from Debian unstable, remaining changes:
  - Add Apport hook.
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Drop *-source packages.
* Add the Modaliases control field manually for maximum backportability.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp
240
240
                /* This IRP passed down to lower driver. */
241
241
                pIrp->IoStatus.Status = STATUS_SUCCESS;
242
242
 
243
 
                rc = vboxguestwinSendIrpSynchronously(pDevExt->win.s.pNextLowerDriver, pIrp, TRUE);
244
 
 
245
 
                /* Do not complete the IRP. */
 
243
                IoSkipCurrentIrpStackLocation(pIrp);
 
244
 
 
245
                rc = IoCallDriver(pDevExt->win.s.pNextLowerDriver, pIrp);
 
246
                Log(("VBoxGuest::vboxguestwinGuestPnp: QUERY_REMOVE_DEVICE: Next lower driver replied rc = 0x%x\n", rc));
 
247
 
 
248
                /* we must not do anything the IRP after doing IoSkip & CallDriver
 
249
                 * since the driver below us will complete (or already have completed) the IRP.
 
250
                 * I.e. just return the status we got from IoCallDriver */
246
251
                return rc;
247
252
            }
248
253
 
330
335
                /* This IRP passed down to lower driver. */
331
336
                pIrp->IoStatus.Status = STATUS_SUCCESS;
332
337
 
333
 
                rc = vboxguestwinSendIrpSynchronously(pDevExt->win.s.pNextLowerDriver, pIrp, TRUE);
334
 
 
335
 
                /* Do not complete the IRP. */
 
338
                IoSkipCurrentIrpStackLocation(pIrp);
 
339
 
 
340
                rc = IoCallDriver(pDevExt->win.s.pNextLowerDriver, pIrp);
 
341
                Log(("VBoxGuest::vboxguestwinGuestPnp: QUERY_STOP_DEVICE: Next lower driver replied rc = 0x%x\n", rc));
 
342
 
 
343
                /* we must not do anything with the IRP after doing IoSkip & CallDriver
 
344
                 * since the driver below us will complete (or already have completed) the IRP.
 
345
                 * I.e. just return the status we got from IoCallDriver */
336
346
                return rc;
337
347
            }
338
348