diff options
Diffstat (limited to 'src')
1255 files changed, 2789 insertions, 5439 deletions
diff --git a/src/Makefile.kmk b/src/Makefile.kmk index aeb2bbb35..20e758357 100644 --- a/src/Makefile.kmk +++ b/src/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14158 2008-11-13 02:53:38Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the src directory. # diff --git a/src/VBox/Additions/Makefile.kmk b/src/VBox/Additions/Makefile.kmk index d2e013fbd..c29d35b5e 100644 --- a/src/VBox/Additions/Makefile.kmk +++ b/src/VBox/Additions/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15986 2009-01-16 10:10:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VirtualBox Guest Additions. # diff --git a/src/VBox/Additions/common/Makefile.kmk b/src/VBox/Additions/common/Makefile.kmk index bf11f39aa..b456e2cf5 100644 --- a/src/VBox/Additions/common/Makefile.kmk +++ b/src/VBox/Additions/common/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14347 2008-11-19 11:32:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common addition code. # diff --git a/src/VBox/Additions/common/VBoxControl/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/Makefile.kmk index d90b931d3..dee9d172e 100644 --- a/src/VBox/Additions/common/VBoxControl/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14220 2008-11-14 15:05:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Additions Command Line Management Interface. # diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp index c2ef3df19..8ea0e29a9 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxControl.cpp 16152 2009-01-21 17:22:59Z vboxsync $ */ +/** $Id: VBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface */ diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp index 847044616..babb7e839 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControlSVN.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxControlSVN.cpp 10099 2008-07-02 12:40:08Z vboxsync $ */ +/* $Id: VBoxControlSVN.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface * SVN revision. diff --git a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk index 8ae7d3d78..0ec0c73fb 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxControl/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14233 2008-11-17 07:32:42Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBoxControl testcases. # diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp index a28b9887e..b3aa5b2f4 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp @@ -1,4 +1,4 @@ -/** $Id: tstVBoxControl.cpp 14233 2008-11-17 07:32:42Z vboxsync $ */ +/** $Id: tstVBoxControl.cpp $ */ /** @file * VBoxControl - Guest Additions Command Line Management Interface, test case */ diff --git a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk index 5284b0263..40ad23c7e 100644 --- a/src/VBox/Additions/common/VBoxGuest/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuest/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16013 2009-01-17 23:58:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Cross Platform Guest Additions Driver. # diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c index a1f7efda6..82ded64f6 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-freebsd.c 8250 2008-04-21 18:42:58Z vboxsync $ */ +/* $Id: VBoxGuest-freebsd.c $ */ /** @file * VirtualBox Guest Additions Driver for FreeBSD. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp index aec6fff62..54d718cb6 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-os2.cpp 14297 2008-11-18 12:40:43Z vboxsync $ */ +/* $Id: VBoxGuest-os2.cpp $ */ /** @file * VBoxGuest - OS/2 specifics. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def index b44c50edc..d41ee37de 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def @@ -1,4 +1,4 @@ -; $Id: VBoxGuest-os2.def 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxGuest-os2.def $ ;; @file ; VBoxGuest - OS/2 definition file. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c index 664493a48..9b1b9f826 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest-solaris.c 14203 2008-11-14 11:04:50Z vboxsync $ */ +/* $Id: VBoxGuest-solaris.c $ */ /** @file * VirtualBox Guest Additions Driver for Solaris. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp index 788bbe11d..68c939e4a 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuest.cpp 14462 2008-11-21 14:17:21Z vboxsync $ */ +/* $Id: VBoxGuest.cpp $ */ /** @file * VBoxGuest - Guest Additions Driver. */ diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm index 8106612e0..0720186d6 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm @@ -1,4 +1,4 @@ -; $Id: VBoxGuestA-os2.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxGuestA-os2.asm $ ;; @file ; VBoxGuest - OS/2 assembly file, the first file in the link. ; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h index 7b414fdeb..f836c5149 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestInternal.h 11820 2008-08-29 14:09:39Z vboxsync $ */ +/* $Id: VBoxGuestInternal.h $ */ /** @file * VBoxGuest - Guest Additions Driver. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk index 4034f4553..b08ea9800 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the common guest addition code library. # diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h index a119f5f14..7760f8aee 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h @@ -1,4 +1,4 @@ -/* $Id: VBGLR3Internal.h 10797 2008-07-22 08:12:42Z vboxsync $ */ +/* $Id: VBGLR3Internal.h $ */ /** @file * VBoxGuestR3Lib - Ring-3 support library for the guest additions, Internal header. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp index 9c9e75685..a6250d9db 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3Lib.cpp 14217 2008-11-14 14:51:23Z vboxsync $ */ +/* $Id: VBoxGuestR3Lib.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Core. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp index 299b2c1e8..274d22e4b 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibClipboard.cpp 10552 2008-07-11 20:05:12Z vboxsync $ */ +/* $Id: VBoxGuestR3LibClipboard.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Clipboard. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp index a2764c557..713f92813 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxGuestR3LibDaemonize.cpp 11179 2008-08-06 14:45:17Z vboxsync $ */ +/** $Id: VBoxGuestR3LibDaemonize.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, daemonize a process. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp index 894e480c4..b4806909d 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGR.cpp 10553 2008-07-11 20:11:27Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGR.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, GR. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp index ad3bab04a..4aa25ffc4 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibGuestProp.cpp 14359 2008-11-19 16:27:41Z vboxsync $ */ +/* $Id: VBoxGuestR3LibGuestProp.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, * guest properties. diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp index 9b60c06cf..969207a89 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMisc.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMisc.cpp 10638 2008-07-15 10:01:32Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMisc.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Misc. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp index 9b8de26c2..01b05e8dd 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxGuestR3LibMouse.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxGuestR3LibMouse.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Mouse. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp index ee59a5075..5c15891cf 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxGuestR3LibSeamless.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/** $Id: VBoxGuestR3LibSeamless.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Seamless mode. */ diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp index 68034bd9d..8cd2425f6 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxGuestR3LibTime.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/** $Id: VBoxGuestR3LibTime.cpp $ */ /** @file * VBoxGuestR3Lib - Ring-3 Support Library for VirtualBox guest additions, Time. */ diff --git a/src/VBox/Additions/common/VBoxService/Makefile.kmk b/src/VBox/Additions/common/VBoxService/Makefile.kmk index 9d8bb1a56..0394ad06f 100644 --- a/src/VBox/Additions/common/VBoxService/Makefile.kmk +++ b/src/VBox/Additions/common/VBoxService/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16014 2009-01-18 00:04:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Cross Platform Guest Addition Services. # diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp index 19ea045f4..dfdc01b48 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxService.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/** $Id: VBoxService.cpp $ */ /** @file * VBoxService - Guest Additions Service Skeleton. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp index d1ac03dc5..f161de99d 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceClipboard-os2.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxServiceClipboard-os2.cpp 8580 2008-05-05 13:56:33Z vboxsync $ */ +/** $Id: VBoxServiceClipboard-os2.cpp $ */ /** @file * VBoxService - Guest Additions Clipboard Service, OS/2. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h index 539c00a81..802147469 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxServiceInternal.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxServiceInternal.h $ */ /** @file * VBoxService - Guest Additions Services. */ diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp index 234ca4098..8d2064d75 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp @@ -1,4 +1,4 @@ -/** $Id: VBoxServiceTimeSync.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/** $Id: VBoxServiceTimeSync.cpp $ */ /** @file * VBoxService - Guest Additions TimeSync Service. */ diff --git a/src/VBox/Additions/freebsd/Installer/vboxguest.sh b/src/VBox/Additions/freebsd/Installer/vboxguest.sh index 367dea0a0..367dea0a0 100644..100755 --- a/src/VBox/Additions/freebsd/Installer/vboxguest.sh +++ b/src/VBox/Additions/freebsd/Installer/vboxguest.sh diff --git a/src/VBox/Additions/freebsd/Makefile.kmk b/src/VBox/Additions/freebsd/Makefile.kmk index 453884a24..7b2d9e771 100644 --- a/src/VBox/Additions/freebsd/Makefile.kmk +++ b/src/VBox/Additions/freebsd/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD guest additions base directory. # diff --git a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk index 0e9c429c8..2267096cb 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk +++ b/src/VBox/Additions/freebsd/vboxvfs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the FreeBSD Shared folder kernel module. # diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h index 382099fd3..789a31835 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxvfs.h 8250 2008-04-21 18:42:58Z vboxsync $ */ +/* $Id: vboxvfs.h $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c index 7853972ba..6ea7d173d 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vfsops.c 13835 2008-11-05 02:34:43Z vboxsync $ */ +/* $Id: vboxvfs_vfsops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c index 1cef32fa6..9746382f2 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vnops.c 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: vboxvfs_vnops.c $ */ /** @file * Description. */ diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk index ce0f192c8..19e15a560 100644 --- a/src/VBox/Additions/linux/Makefile.kmk +++ b/src/VBox/Additions/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the linux guest additions base directory. # @@ -89,6 +89,7 @@ $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \ $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids \ $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl \ $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl \ + $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15suse.pl \ $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/Makefile.test \ $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/test.c \ $(PATH_BIN)/additions/vboxmouse_drv.o \ @@ -142,6 +143,7 @@ $(PATH_BIN)/additions/VBoxLinuxAdditions.run: \ $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/vboxvideo.ids $(VBOX_LNX_ADD_INS_OUT_DIR) $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config.pl $(VBOX_LNX_ADD_INS_OUT_DIR) $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15.pl $(VBOX_LNX_ADD_INS_OUT_DIR) + $(QUIET)$(INSTALL) -m 0755 $(VBOX_PATH_X11_ADDITION_INSTALLER)/x11config15suse.pl $(VBOX_LNX_ADD_INS_OUT_DIR) $(QUIET)$(INSTALL) -m 0644 $(VBOX_PATH_LINUX_ADDITION_INSTALLER)/90-vboxguest.fdi $(VBOX_LNX_ADD_INS_OUT_DIR) $(QUIET)$(VBOX_LNX_ADD_BIN_COPY_SYMBOLS) $(PATH_BIN)/additions/vboxmouse_drv.o $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv.o $(QUIET)$(VBOX_LNX_ADD_BIN_COPY) $(PATH_BIN)/additions/vboxmouse_drv_70.so $(VBOX_LNX_ADD_INS_OUT_DIR)/vboxmouse_drv_70.so diff --git a/src/VBox/Additions/linux/daemon/Makefile.kmk b/src/VBox/Additions/linux/daemon/Makefile.kmk index 40e668fad..e4f189686 100644 --- a/src/VBox/Additions/linux/daemon/Makefile.kmk +++ b/src/VBox/Additions/linux/daemon/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Linux Guest Addition Linux Daemon. # diff --git a/src/VBox/Additions/linux/installer/90-vboxguest.fdi b/src/VBox/Additions/linux/installer/90-vboxguest.fdi index dad367255..15361cc34 100644 --- a/src/VBox/Additions/linux/installer/90-vboxguest.fdi +++ b/src/VBox/Additions/linux/installer/90-vboxguest.fdi @@ -2,7 +2,7 @@ <!-- # Sun xVM VirtualBox # Hal driver description for the vboxmouse driver -# $Id: 90-vboxguest.fdi 12283 2008-09-09 10:19:10Z vboxsync $ +# $Id: 90-vboxguest.fdi 36284 2008-09-09 10:19:10Z mt221433 $ Copyright (C) 2008 Sun Microsystems, Inc. diff --git a/src/VBox/Additions/linux/installer/vboxadd-timesync.sh b/src/VBox/Additions/linux/installer/vboxadd-timesync.sh index e0bdc9bc8..e0bdc9bc8 100644..100755 --- a/src/VBox/Additions/linux/installer/vboxadd-timesync.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-timesync.sh diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh index 64911170b..64911170b 100644..100755 --- a/src/VBox/Additions/linux/installer/vboxadd.sh +++ b/src/VBox/Additions/linux/installer/vboxadd.sh diff --git a/src/VBox/Additions/linux/module/Makefile.kmk b/src/VBox/Additions/linux/module/Makefile.kmk index 06a1fa9de..e1875f247 100644 --- a/src/VBox/Additions/linux/module/Makefile.kmk +++ b/src/VBox/Additions/linux/module/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15589 2008-12-16 14:24:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Linux Guest Additions Kernel Module. # diff --git a/src/VBox/Additions/linux/module/files_vboxadd b/src/VBox/Additions/linux/module/files_vboxadd index 52e01bfae..52e01bfae 100644..100755 --- a/src/VBox/Additions/linux/module/files_vboxadd +++ b/src/VBox/Additions/linux/module/files_vboxadd diff --git a/src/VBox/Additions/linux/module/vboxmod.c b/src/VBox/Additions/linux/module/vboxmod.c index 7709ee66a..18ad9f1a8 100644 --- a/src/VBox/Additions/linux/module/vboxmod.c +++ b/src/VBox/Additions/linux/module/vboxmod.c @@ -350,7 +350,6 @@ static int vboxadd_hgcm_disconnect(struct file *filp, unsigned long userspace_in rc = -EFAULT; } if (rc >= 0) { - LogRelFunc(("client ID %u\n", info.u32ClientID)); vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_DISCONNECT, &info); rc = -RTErrConvertToErrno(vrc); @@ -551,7 +550,6 @@ static int vboxadd_hgcm_call(unsigned long userspace_info, uint32_t u32Size) } if (rc >= 0) { int vrc; - LogRelFunc(("client ID %u\n", pInfo->u32ClientID)); vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_CALL(u32Size), pInfo); rc = -RTErrConvertToErrno(vrc); @@ -611,7 +609,6 @@ static int vboxadd_hgcm_call_timed(unsigned long userspace_info, } if (rc >= 0) { int vrc; - LogRelFunc(("client ID %u\n", pInfo->info.u32ClientID)); pInfo->fInterruptible = true; /* User space may not do uninterruptible waits */ vrc = vboxadd_cmc_call(vboxDev, VBOXGUEST_IOCTL_HGCM_CALL_TIMED(u32Size), pInfo); diff --git a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk index 1069e647b..7561e86d3 100644 --- a/src/VBox/Additions/linux/sharedfolders/Makefile.kmk +++ b/src/VBox/Additions/linux/sharedfolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15589 2008-12-16 14:24:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the vboxvfs (linux shared folders module). # diff --git a/src/VBox/Additions/linux/sharedfolders/files_vboxvfs b/src/VBox/Additions/linux/sharedfolders/files_vboxvfs index f47c2a61c..f47c2a61c 100644..100755 --- a/src/VBox/Additions/linux/sharedfolders/files_vboxvfs +++ b/src/VBox/Additions/linux/sharedfolders/files_vboxvfs diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c index bac5db8da..53d94f251 100644 --- a/src/VBox/Additions/linux/sharedfolders/regops.c +++ b/src/VBox/Additions/linux/sharedfolders/regops.c @@ -122,9 +122,7 @@ sf_reg_write (struct file *file, const char *buf, size_t size, loff_t *off) struct sf_inode_info *sf_i = GET_INODE_INFO (inode); struct sf_glob_info *sf_g = GET_GLOB_INFO (inode->i_sb); struct sf_reg_info *sf_r = file->private_data; - loff_t pos = (file->f_flags & O_APPEND) - ? inode->i_size - : *off; + loff_t pos; TRACE (); BUG_ON (!sf_i); @@ -136,11 +134,14 @@ sf_reg_write (struct file *file, const char *buf, size_t size, loff_t *off) return -EINVAL; } + pos = *off; + if (file->f_flags & O_APPEND) + pos += inode->i_size; + /** XXX Check write permission accoring to inode->i_mode! */ - if (!size) { + if (!size) return 0; - } tmp = kmalloc (CHUNK_SIZE, GFP_KERNEL); if (!tmp) { diff --git a/src/VBox/Additions/solaris/Installer/makepackage.sh b/src/VBox/Additions/solaris/Installer/makepackage.sh index 05f424b91..05f424b91 100644..100755 --- a/src/VBox/Additions/solaris/Installer/makepackage.sh +++ b/src/VBox/Additions/solaris/Installer/makepackage.sh diff --git a/src/VBox/Additions/solaris/Installer/postinstall.sh b/src/VBox/Additions/solaris/Installer/postinstall.sh index 81fe3feb7..852042c7e 100644..100755 --- a/src/VBox/Additions/solaris/Installer/postinstall.sh +++ b/src/VBox/Additions/solaris/Installer/postinstall.sh @@ -19,13 +19,16 @@ uncompress_files() { + # self-overwriting uncompress -f "$1/VBoxClient.Z" > /dev/null 2>&1 uncompress -f "$1/VBoxService.Z" > /dev/null 2>&1 uncompress -f "$1/VBoxControl.Z" > /dev/null 2>&1 uncompress -f "$1/vboxvideo_drv_13.so.Z" > /dev/null 2>&1 uncompress -f "$1/vboxvideo_drv_14.so.Z" > /dev/null 2>&1 + uncompress -f "$1/vboxvideo_drv_15.so.Z" > /dev/null 2>&1 uncompress -f "$1/vboxvideo_drv_71.so.Z" > /dev/null 2>&1 uncompress -f "$1/vboxmouse_drv_14.so.Z" > /dev/null 2>&1 + uncompress -f "$1/vboxmouse_drv_15.so.Z" > /dev/null 2>&1 uncompress -f "$1/vboxmouse_drv_70.so.Z" > /dev/null 2>&1 uncompress -f "$1/vboxmouse_drv_71.so.Z" > /dev/null 2>&1 } @@ -76,6 +79,10 @@ echo "Creating links..." # Install Xorg components to the required places xorgversion_long=`/usr/X11/bin/Xorg -version 2>&1 | grep "X Window System Version"` xorgversion=`/usr/bin/expr "${xorgversion_long}" : 'X Window System Version \([^ ]*\)'` +if test -z "$xorgversion_long"; then + xorgversion_long=`/usr/X11/bin/Xorg -version 2>&1 | grep "X.Org X Server"` + xorgversion=`/usr/bin/expr "${xorgversion_long}" : 'X.Org X Server \([^ ]*\)'` +fi vboxmouse_src="" vboxvideo_src="" @@ -89,6 +96,10 @@ case "$xorgversion" in vboxmouse_src="vboxmouse_drv_14.so" vboxvideo_src="vboxvideo_drv_14.so" ;; + 1.5.* ) + vboxmouse_src="vboxmouse_drv_15.so" + vboxvideo_src="vboxvideo_drv_15.so" + ;; 7.1.* | *7.2.* ) vboxmouse_src="vboxmouse_drv_71.so" vboxvideo_src="vboxvideo_drv_71.so" diff --git a/src/VBox/Additions/solaris/Installer/preremove.sh b/src/VBox/Additions/solaris/Installer/preremove.sh index b3d707849..b3d707849 100644..100755 --- a/src/VBox/Additions/solaris/Installer/preremove.sh +++ b/src/VBox/Additions/solaris/Installer/preremove.sh diff --git a/src/VBox/Additions/solaris/Makefile.kmk b/src/VBox/Additions/solaris/Makefile.kmk index 34ca36c86..b805d4248 100644 --- a/src/VBox/Additions/solaris/Makefile.kmk +++ b/src/VBox/Additions/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15911 2009-01-13 12:04:29Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Solaris guest additions base directory. # @@ -95,9 +95,11 @@ else $(SOLARIS_ADD_BIN)/VBoxControl \ $(SOLARIS_ADD_BIN)/vboxvideo_drv_13.so \ $(SOLARIS_ADD_BIN)/vboxvideo_drv_14.so \ + $(SOLARIS_ADD_BIN)/vboxvideo_drv_15.so \ $(SOLARIS_ADD_BIN)/vboxvideo_drv_70.so \ $(SOLARIS_ADD_BIN)/vboxvideo_drv_71.so \ $(SOLARIS_ADD_BIN)/vboxmouse_drv_14.so \ + $(SOLARIS_ADD_BIN)/vboxmouse_drv_15.so \ $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so \ $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so endif @@ -156,9 +158,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxControl $(SOLARIS_ADD_INST_DIR_64)/VBoxControl $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_13.so $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_13.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_14.so $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_15.so $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_70.so $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxvideo_drv_71.so $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_71.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_14.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_15.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_71.so $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxguest $(SOLARIS_ADD_INST_DIR_32)/vboxguest @@ -167,9 +171,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxControl $(SOLARIS_ADD_INST_DIR_32)/VBoxControl $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_13.so $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_13.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_14.so $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_15.so $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_70.so $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxvideo_drv_71.so $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_71.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_14.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_15.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_71.so ifdef VBOX_COMPRESS @@ -179,9 +185,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/VBoxControl $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_13.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxvideo_drv_71.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_71.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/VBoxClient @@ -189,9 +197,11 @@ ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/VBoxControl $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_13.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxvideo_drv_71.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_71.so endif # VBOX_COMPRESS @@ -202,9 +212,11 @@ else # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxControl $(SOLARIS_ADD_INST_DIR_ISA)/VBoxControl $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_13.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_13.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_14.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_15.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_70.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxvideo_drv_71.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_71.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_14.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_14.so + $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_15.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_15.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_70.so $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_71.so ifdef VBOX_COMPRESS @@ -214,9 +226,11 @@ else # !VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/VBoxControl $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_13.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxvideo_drv_71.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_14.so + $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_15.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_70.so $(QUIET)$(VBOX_COMPRESS) $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_71.so endif # VBOX_COMPRESS diff --git a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk index 3b53f4dff..134b2baf2 100644 --- a/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk +++ b/src/VBox/Additions/solaris/SharedFolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris Shared folder kernel module. # diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h index 8119bb04a..6a0ed533b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs.h @@ -1,4 +1,4 @@ -/* $Id: vboxvfs.h 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: vboxvfs.h $ */ /** @file * VirtualBox File System Driver for Solaris Guests, Internal Header. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c index f6dbd1d63..a6568ae1b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_mount.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_mount.c 10456 2008-07-10 07:04:39Z vboxsync $ */ +/* $Id: vboxvfs_mount.c $ */ /** @file * VirtualBox File System Mount Helper, Solaris host. * Userspace mount wrapper that parses mount (or user-specified) options diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c index 52d4b7c4c..4ef489802 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_utils.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_utils.c 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: vboxvfs_utils.c $ */ /** @file * VirtualBox File System Driver for Solaris Guests, Utility functions. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c index 688211a15..986b407f5 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vfsops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vfsops.c 13835 2008-11-05 02:34:43Z vboxsync $ */ +/* $Id: vboxvfs_vfsops.c $ */ /** @file * VirtualBox File System Driver for Solaris Guests. VFS operations. */ diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c index 1b7a6bc0c..b7b26e04b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxvfs_vnops.c @@ -1,4 +1,4 @@ -/* $Id: vboxvfs_vnops.c 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: vboxvfs_vnops.c $ */ /** @file * VirtualBox File System Driver for Solaris Guests, VNode Operations. */ diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk index 88850e108..066c01357 100644 --- a/src/VBox/Additions/x11/Makefile.kmk +++ b/src/VBox/Additions/x11/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12446 2008-09-14 23:32:31Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the X11 Guest Additions. # diff --git a/src/VBox/Additions/x11/installer/98vboxadd-xclient b/src/VBox/Additions/x11/installer/98vboxadd-xclient index f0c0b1f2c..f0c0b1f2c 100644..100755 --- a/src/VBox/Additions/x11/installer/98vboxadd-xclient +++ b/src/VBox/Additions/x11/installer/98vboxadd-xclient diff --git a/src/VBox/Additions/x11/installer/VBoxRandR.sh b/src/VBox/Additions/x11/installer/VBoxRandR.sh index 98fad199d..0e1e6b81d 100755 --- a/src/VBox/Additions/x11/installer/VBoxRandR.sh +++ b/src/VBox/Additions/x11/installer/VBoxRandR.sh @@ -61,21 +61,44 @@ fi # If we were called with the --test parameter, we check whether the display # we are running on is really using the VBox video driver (and RandR 1.2), -# and whether we are running on a buggy version of X.org which might crash +# and whether we are running on a buggy version of X.Org which might crash # when we resize. if test "$1" = "--test"; then + # Check for buggy X.Org versions xout=`$xorgbin -version 2>&1` - if echo "$xout" | grep 1.4.99.901 > /dev/null; then - exit 1 - elif echo "$xout" | grep 1.4.99.902 > /dev/null; then - exit 1 - elif echo "$xout" | grep 1.4.99.903 > /dev/null; then - exit 1 - elif echo "$xout" | grep 1.4.99.904 > /dev/null; then - exit 1 - elif echo "$xout" | grep 1.4.99.905 > /dev/null; then + if echo "$xout" | grep "1\.4\.99\.90[12345]" > /dev/null + then + echo "Warning: the version of the X Window system on your guest has a known" + echo "problem. Because of this, dynamic resizing and seamless mode will not work." + echo exit 1 fi + # Check to see if the server is configured to use static modes only. + for conf in "/etc/X11/xorg.conf-4" "/etc/X11/xorg.conf" "/etc/X11/.xorg.conf" "/etc/xorg.conf" \ + "/usr/etc/X11/xorg.conf-4" "/usr/etc/X11/xorg.conf" "/usr/lib/X11/xorg.conf-4" \ + "/usr/lib/X11/xorg.conf" + do + if [ -r $conf ] + then + if awk -v IN_SECTION=0 \ +'tolower($0) ~ /^[ \t]*section/ { IN_SECTION=1 } '\ +'tolower($0) ~ /^[ \t]*modes/ { if (IN_SECTION) { print "mode"; exit } } '\ +'tolower($0) ~ /^[ \t]*option[ \t]+\"preferredmode\"/ { if (IN_SECTION) { print "mode"; exit } } '\ +'tolower($0) ~ /endsection/ { IN_SECTION=0 }' \ + $conf 2>/dev/null | grep mode > /dev/null + then + echo "Disabling dynamic resizing as the X server is configured to only use static" + echo "resolutions. To fix this, edit the server configuration file, remove all" + echo "\"Modes\" lines from the \"Screen\" section and any Option \"PreferredMode\"" + echo "lines from \"Monitor\" sections and restart the server." + echo + exit 1 + fi + fi + done + # Don't write out error information in this case, as this script is also + # called from the installer, and vboxvideo will not yet be in place yet in + # that case. $randrbin 2> /dev/null | grep VBOX1 > /dev/null exit fi @@ -84,3 +107,4 @@ fi # which is the one corresponding to the last video mode hint sent by the host. $randrbin --output VBOX1 --preferred $refreshbin 2>&1 > /dev/null + diff --git a/src/VBox/Additions/x11/installer/x11config.pl b/src/VBox/Additions/x11/installer/x11config.pl index 69c385b31..69c385b31 100644..100755 --- a/src/VBox/Additions/x11/installer/x11config.pl +++ b/src/VBox/Additions/x11/installer/x11config.pl diff --git a/src/VBox/Additions/x11/installer/x11config15.pl b/src/VBox/Additions/x11/installer/x11config15.pl index d23c35221..d23c35221 100644..100755 --- a/src/VBox/Additions/x11/installer/x11config15.pl +++ b/src/VBox/Additions/x11/installer/x11config15.pl diff --git a/src/VBox/Additions/x11/installer/x11config15suse.pl b/src/VBox/Additions/x11/installer/x11config15suse.pl new file mode 100755 index 000000000..419a6698a --- /dev/null +++ b/src/VBox/Additions/x11/installer/x11config15suse.pl @@ -0,0 +1,159 @@ +#!/usr/bin/perl -w +# +# Sun xVM VirtualBox +# +# Guest Additions X11 config update script +# +# Copyright (C) 2006-2008 Sun Microsystems, Inc. +# +# This file is part of VirtualBox Open Source Edition (OSE), as +# available from http://www.virtualbox.org. This file is free software; +# you can redistribute it and/or modify it under the terms of the GNU +# General Public License (GPL) as published by the Free Software +# Foundation, in version 2 as it comes in the "COPYING" file of the +# VirtualBox OSE distribution. VirtualBox OSE is distributed in the +# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. +# +# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa +# Clara, CA 95054 USA or visit http://www.sun.com if you need +# additional information or have any questions. +# + +# Versions of (open)SUSE which ship X.Org Server 1.5 still do not enable +# mouse autodetection, so on these systems we have to enable vboxmouse in the +# X.Org configuration file as well as vboxvideo. When uninstalling, we enable +# the fbdev driver, which SUSE prefers over vesa, and we leave the references +# to vboxmouse in place, as without the driver they are harmless. + +use File::Copy; + +# This is the file name for the temporary file we write the new configuration +# to. +# @todo: perl must have an API for generating this +my $temp="/tmp/xorg.conf"; +# The list of possible names of X.org configuration files +my @cfg_files = ("/etc/X11/xorg.conf-4", "/etc/X11/xorg.conf", "/etc/X11/.xorg.conf", "/etc/xorg.conf", + "/usr/etc/X11/xorg.conf-4", "/usr/etc/X11/xorg.conf", "/usr/lib/X11/xorg.conf-4", + "/usr/lib/X11/xorg.conf"); +# File descriptor of the old configuration file +my $CFG; +# File descriptor of the temporary file +my $TMP; + +# The name of the mouse driver we are enabling +my $mousedrv = 'vboxmouse'; +# The name of the video driver we are enabling +my $videodrv= 'vboxvideo'; + +# If we are uninstalling, restore the old video driver +if (@ARGV && "$ARGV[0]" eq 'uninstall') +{ + $videodrv = 'fbdev' # SUSE prefers this one +} + +# How many different configuration files have we found? +my $config_count = 0; + +# Subroutine to roll back after a partial installation +sub do_fail { + foreach $cfg (@cfg_files) { + move "$cfg.vbox", $cfg; + unlink "$cfg.vbox"; + } + die $_[0]; +} + +# Perform the substitution on any configuration file we may find. +foreach $cfg (@cfg_files) { + + if (open(CFG, $cfg)) { + open(TMP, ">$temp") + or &do_fail("Can't create $TMP: $!\n"); + + my $have_mouse = 0; + my $in_section = 0; + my $in_layout = 0; + + # Go through the configuration file line by line + while (defined ($line = <CFG>)) { + # Look for the start of sections + if ($line =~ /^\s*Section\s*"([a-zA-Z]+)"/i) { + my $section = lc($1); + # And see if they are device or input device sections + if (($section eq "inputdevice") || $section eq "device") { + $in_section = 1; + } + # Or server layout sections + if ($section eq "serverlayout") + { + $in_section = 1; + $in_layout = 1; + } + } else { + if ($line =~ /^\s*EndSection/i && $in_layout) { + # We always add this to the end of the server layout. + print TMP " InputDevice \"VBoxMouse\"\n" + } + if ($line =~ /^\s*EndSection/i) { + $in_section = 0; + $in_layout = 0; + } + } + + if ($in_section) { + # Inside sections, look for any graphics drivers and replace + # them with our one. + if ($line =~ /^\s*driver\s+\"(fbdev|vga|vesa|vboxvideo|ChangeMe)\"/i) { + $line =~ s/(fbdev|vga|vesa|vboxvideo|ChangeMe)/$videodrv/i; + } + # Also keep track of whether this configuration file contains + # an input device section for vboxmouse. If it does, we don't + # need to add one later. + if ($line =~ /^\s*driver\s+\"(?:vboxmouse)\"/i) + { + $have_mouse = 1 + } + + # We add vboxmouse to the server layout section ourselves, so + # remove any existing references to it. + if ( $line =~ /^\s*inputdevice.*\"vboxmouse\"/i) + { + $line = ""; + } + } + print TMP $line; + } + + # We always add a vboxmouse section at the end for SUSE guests using + # X.Org 1.5 if vboxmouse is not referenced anywhere else in the file, + # and we do not remove it when we uninstall the additions, as it will + # not do any harm if it is left. + if (!$have_mouse) { + print TMP "\n"; + print TMP "Section \"InputDevice\"\n"; + print TMP " Identifier \"VBoxMouse\"\n"; + print TMP " Driver \"$mousedrv\"\n"; + print TMP " Option \"Device\" \"\/dev\/vboxadd\"\n"; + print TMP " Option \"SendCoreEvents\" \"on\"\n"; + print TMP "EndSection\n"; + } + close(TMP); + + # We do not overwrite existing "$cfg.vbox" files in order to keep a + # record of what the configuration looked like before the very first + # installation of the additions. + copy $cfg, "$cfg.bak"; + if (! -e "$cfg.vbox") { + rename $cfg, "$cfg.vbox"; + } + copy $temp, $cfg + or &do_fail("Could not overwrite configuration file $cfg! Exiting..."); + unlink $temp; + + $config_count++; + } +} + +# Warn if we did not find any configuration files +$config_count != 0 or die "Could not find any X11 configuration files"; + diff --git a/src/VBox/Additions/x11/installer/x11restore.pl b/src/VBox/Additions/x11/installer/x11restore.pl index 811e78de0..8e17e1862 100644..100755 --- a/src/VBox/Additions/x11/installer/x11restore.pl +++ b/src/VBox/Additions/x11/installer/x11restore.pl @@ -1,5 +1,5 @@ #!/usr/bin/perl -w -# $Revision: 8178 $ +# $Revision: 29890 $ # # Sun xVM VirtualBox # diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h b/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h index 22f7eeaa7..1b0d60206 100644 --- a/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h +++ b/src/VBox/Additions/x11/x11include/7.0/X11/XlibConf.h @@ -1,6 +1,6 @@ /* include/X11/XlibConf.h. Generated by configure. */ /* - * $Id: XlibConf.h.in,v 1.1 2005/07/08 06:57:07 keithp Exp $ + * $Id: XlibConf.h.in $ * * Copyright © 2005 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h index bfdfbee97..e449b2ed8 100644 --- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h +++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/composite.h @@ -1,5 +1,5 @@ /* - * $Id: composite.h,v 1.2 2004/07/31 06:16:50 anholt Exp $ + * $Id: composite.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h index 2304e961d..5f9cffef4 100644 --- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h +++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/compositeproto.h @@ -1,5 +1,5 @@ /* - * $Id: compositeproto.h,v 1.2 2004/07/31 06:16:50 anholt Exp $ + * $Id: compositeproto.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h index b190d68c7..833a584f2 100644 --- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h +++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damageproto.h @@ -1,5 +1,5 @@ /* - * $Id: damageproto.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $ + * $Id: damageproto.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h index d523cea98..dc7221ffb 100644 --- a/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h +++ b/src/VBox/Additions/x11/x11include/7.0/X11/extensions/damagewire.h @@ -1,5 +1,5 @@ /* - * $Id: damagewire.h,v 1.2 2004/07/29 19:29:55 stukreit Exp $ + * $Id: damagewire.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h b/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h index 4775793ab..84e5e190b 100644 --- a/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h +++ b/src/VBox/Additions/x11/x11include/7.0/xorg/picturestr.h @@ -1,5 +1,5 @@ /* - * $Id: picturestr.h,v 1.15 2005/12/09 18:35:21 ajax Exp $ + * $Id: picturestr.h $ * * Copyright © 2000 SuSE, Inc. * diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h b/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h index bfd19fa93..00013b7af 100644 --- a/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h +++ b/src/VBox/Additions/x11/x11include/7.0/xorg/renderedge.h @@ -1,5 +1,5 @@ /* - * $Id: renderedge.h,v 1.4 2005/08/24 11:18:33 daniels Exp $ + * $Id: renderedge.h $ * * Copyright © 2004 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h b/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h index 43925f42f..e555855a3 100644 --- a/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h +++ b/src/VBox/Additions/x11/x11include/7.0/xorg/uda1380.h @@ -1,5 +1,5 @@ /************************************************************************************* - * $Id: uda1380.h,v 1.3 2005/09/24 21:56:00 bogdand Exp $ + * $Id: uda1380.h $ * * Copyright (C) 2005 Bogdan D. bogdand@users.sourceforge.net * diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h b/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h index cfc2b5f07..9b6105032 100644 --- a/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h +++ b/src/VBox/Additions/x11/x11include/7.1/xorg/damage.h @@ -1,5 +1,5 @@ /* - * $Id: damage.h,v 1.3 2005/07/01 22:43:41 daniels Exp $ + * $Id: damage.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h b/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h index ce11af10c..ed6068bc7 100644 --- a/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h +++ b/src/VBox/Additions/x11/x11include/7.1/xorg/damagestr.h @@ -1,5 +1,5 @@ /* - * $Id: damagestr.h,v 1.6 2005/07/03 07:02:01 daniels Exp $ + * $Id: damagestr.h $ * * Copyright © 2003 Keith Packard * diff --git a/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h b/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h index b9ee6f14d..14d334b54 100644 --- a/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h +++ b/src/VBox/Additions/x11/x11include/7.1/xorg/picturestr.h @@ -1,5 +1,5 @@ /* - * $Id: picturestr.h,v 1.14 2005/08/24 11:18:33 daniels Exp $ + * $Id: picturestr.h $ * * Copyright © 2000 SuSE, Inc. * diff --git a/src/VBox/Additions/x11/xclient/Makefile.kmk b/src/VBox/Additions/x11/xclient/Makefile.kmk index 5edd3e0a9..cad3e04bd 100644 --- a/src/VBox/Additions/x11/xclient/Makefile.kmk +++ b/src/VBox/Additions/x11/xclient/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16014 2009-01-18 00:04:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest Addition X11 Client. # diff --git a/src/VBox/Additions/x11/xclient/clipboard.cpp b/src/VBox/Additions/x11/xclient/clipboard.cpp index 45fa1087c..7611f9ee9 100644 --- a/src/VBox/Additions/x11/xclient/clipboard.cpp +++ b/src/VBox/Additions/x11/xclient/clipboard.cpp @@ -1,4 +1,4 @@ -/** $Id: clipboard.cpp 14297 2008-11-18 12:40:43Z vboxsync $ */ +/** $Id: clipboard.cpp $ */ /** @file * Guest Additions - X11 Shared Clipboard. */ diff --git a/src/VBox/Additions/x11/xgraphics/Makefile.kmk b/src/VBox/Additions/x11/xgraphics/Makefile.kmk index 0c05a9c9d..5cf142e25 100644 --- a/src/VBox/Additions/x11/xgraphics/Makefile.kmk +++ b/src/VBox/Additions/x11/xgraphics/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Linux Additions X.org graphics driver. # diff --git a/src/VBox/Additions/x11/xgraphics/vboxutils.c b/src/VBox/Additions/x11/xgraphics/vboxutils.c index d478bb158..c02809b29 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxutils.c +++ b/src/VBox/Additions/x11/xgraphics/vboxutils.c @@ -252,8 +252,8 @@ vboxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects) for (i = 0; i < iRects; i++) { - cmdHdr.x = (int16_t)aRects[i].x1; - cmdHdr.y = (int16_t)aRects[i].y1; + cmdHdr.x = (int16_t)aRects[i].x1 - pVBox->viewportX; + cmdHdr.y = (int16_t)aRects[i].y1 - pVBox->viewportY; cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1); cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1); diff --git a/src/VBox/Additions/x11/xgraphics/vboxutils_68.c b/src/VBox/Additions/x11/xgraphics/vboxutils_68.c index f47b4047e..668612d94 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxutils_68.c +++ b/src/VBox/Additions/x11/xgraphics/vboxutils_68.c @@ -232,8 +232,8 @@ vboxHandleDirtyRect(ScrnInfoPtr pScrn, int iRects, BoxPtr aRects) for (i = 0; i < iRects; i++) { - cmdHdr.x = (int16_t)aRects[i].x1; - cmdHdr.y = (int16_t)aRects[i].y1; + cmdHdr.x = (int16_t)aRects[i].x1 - pVBox->viewportX; + cmdHdr.y = (int16_t)aRects[i].y1 - pVBox->viewportY; cmdHdr.w = (uint16_t)(aRects[i].x2 - aRects[i].x1); cmdHdr.h = (uint16_t)(aRects[i].y2 - aRects[i].y1); diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo.h b/src/VBox/Additions/x11/xgraphics/vboxvideo.h index 355de8304..4f72f5f9c 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo.h +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo.h @@ -156,6 +156,7 @@ typedef struct _VBOXRec * safe to touch the hardware. */ Bool vtSwitch; Bool useVbva; + int viewportX, viewportY; VMMDevMemory *pVMMDevMemory; VBVAMEMORY *pVbvaMemory; } VBOXRec, *VBOXPtr; diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c index b7a2c57b9..12474232d 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_13.c @@ -1215,12 +1215,21 @@ static void VBOXAdjustFrame(int scrnIndex, int x, int y, int flags) { VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]); + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; TRACE; /* Don't fiddle with the hardware if we are switched * to a virtual terminal. */ - if (!pVBox->vtSwitch) + if (!pVBox->vtSwitch) { + pVBox->viewportX = x; + pVBox->viewportY = y; + /* If VBVA is enabled the graphics card will not notice the change. */ + if (pVBox->useVbva == TRUE) + vboxDisableVbva(pScrn); VBESetDisplayStart(pVBox->pVbe, x, y, TRUE); + if (pVBox->useVbva == TRUE) + vboxEnableVbva(pScrn); + } TRACE2; } diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c index 0ed9a413b..facbc0d61 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_15.c @@ -1282,12 +1282,21 @@ static void VBOXAdjustFrame(int scrnIndex, int x, int y, int flags) { VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]); + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; TRACE; /* Don't fiddle with the hardware if we are switched * to a virtual terminal. */ - if (!pVBox->vtSwitch) + if (!pVBox->vtSwitch) { + pVBox->viewportX = x; + pVBox->viewportY = y; + /* If VBVA is enabled the graphics card will not notice the change. */ + if (pVBox->useVbva == TRUE) + vboxDisableVbva(pScrn); VBESetDisplayStart(pVBox->pVbe, x, y, TRUE); + if (pVBox->useVbva == TRUE) + vboxEnableVbva(pScrn); + } TRACE2; } diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c index 73c6a7b8a..e5376235c 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.c @@ -830,8 +830,16 @@ static void VBOXAdjustFrame(int scrnIndex, int x, int y, int flags) { VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]); + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + pVBox->viewportX = x; + pVBox->viewportY = y; + /* If VBVA is enabled the graphics card will not notice the change. */ + if (pVBox->useVbva == TRUE) + vboxDisableVbva(pScrn); VBESetDisplayStart(pVBox->pVbe, x, y, TRUE); + if (pVBox->useVbva == TRUE) + vboxEnableVbva(pScrn); } static void diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h index ee39edd09..77998dc25 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_68.h @@ -152,6 +152,7 @@ typedef struct _VBOXRec size_t pointerSize; Bool pointerOffscreen; Bool useVbva; + int viewportX, viewportY; VMMDevVideoAccelFlush *reqf; VMMDevVideoAccelEnable *reqe; VMMDevMemory *pVMMDevMemory; diff --git a/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c b/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c index 90aeec489..047826faf 100644 --- a/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c +++ b/src/VBox/Additions/x11/xgraphics/vboxvideo_70.c @@ -51,7 +51,34 @@ * Authors: Paulo César Pereira de Andrade <pcpa@conectiva.com.br> */ -#define DEBUG_VERB 2 +#ifdef DEBUG_michael +# define DEBUG_VIDEO 1 +#endif +#ifdef DEBUG_VIDEO + +#define TRACE \ +do { \ + xf86Msg(X_INFO, __PRETTY_FUNCTION__); \ + xf86Msg(X_INFO, ": entering\n"); \ +} while(0) +#define TRACE2 \ +do { \ + xf86Msg(X_INFO, __PRETTY_FUNCTION__); \ + xf86Msg(X_INFO, ": leaving\n"); \ +} while(0) +#define TRACE3(...) \ +do { \ + xf86Msg(X_INFO, __PRETTY_FUNCTION__); \ + xf86Msg(X_INFO, __VA_ARGS__); \ +} while(0) + +#else /* DEBUG_VIDEO not defined */ + +#define TRACE do { } while(0) +#define TRACE2 do { } while(0) +#define TRACE3(...) do { } while(0) + +#endif /* DEBUG_VIDEO not defined */ #ifdef XFree86LOADER # include "xorg-server.h" @@ -885,8 +912,16 @@ static void VBOXAdjustFrame(int scrnIndex, int x, int y, int flags) { VBOXPtr pVBox = VBOXGetRec(xf86Screens[scrnIndex]); + ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; + pVBox->viewportX = x; + pVBox->viewportY = y; + /* If VBVA is enabled the graphics card will not notice the change. */ + if (pVBox->useVbva == TRUE) + vboxDisableVbva(pScrn); VBESetDisplayStart(pVBox->pVbe, x, y, TRUE); + if (pVBox->useVbva == TRUE) + vboxEnableVbva(pScrn); } static void diff --git a/src/VBox/Additions/x11/xmouse/Makefile.kmk b/src/VBox/Additions/x11/xmouse/Makefile.kmk index 8816908a1..e3ecccc39 100644 --- a/src/VBox/Additions/x11/xmouse/Makefile.kmk +++ b/src/VBox/Additions/x11/xmouse/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16091 2009-01-20 16:53:58Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Additions XFree86 and X.org mouse drivers. # diff --git a/src/VBox/Devices/Audio/DevIchAc97.cpp b/src/VBox/Devices/Audio/DevIchAc97.cpp index 13637db18..7bdc41a66 100644 --- a/src/VBox/Devices/Audio/DevIchAc97.cpp +++ b/src/VBox/Devices/Audio/DevIchAc97.cpp @@ -1,4 +1,4 @@ -/* $Id: DevIchAc97.cpp 12978 2008-10-03 23:28:44Z vboxsync $ */ +/* $Id: DevIchAc97.cpp $ */ /** @file * DevIchAc97 - VBox ICH AC97 Audio Controller. */ diff --git a/src/VBox/Devices/Audio/DevSB16.cpp b/src/VBox/Devices/Audio/DevSB16.cpp index 94f57726a..fee50e2b1 100644 --- a/src/VBox/Devices/Audio/DevSB16.cpp +++ b/src/VBox/Devices/Audio/DevSB16.cpp @@ -1,4 +1,4 @@ -/* $Id: DevSB16.cpp 12978 2008-10-03 23:28:44Z vboxsync $ */ +/* $Id: DevSB16.cpp $ */ /** @file * DevSB16 - VBox SB16 Audio Controller. * diff --git a/src/VBox/Devices/Audio/solaudio.c b/src/VBox/Devices/Audio/solaudio.c index a0436e272..350fbab32 100644 --- a/src/VBox/Devices/Audio/solaudio.c +++ b/src/VBox/Devices/Audio/solaudio.c @@ -1,4 +1,4 @@ -/* $Id: solaudio.c 8345 2008-04-24 07:08:53Z vboxsync $ */ +/* $Id: solaudio.c $ */ /** @file * VirtualBox Audio Driver - Solaris host. */ diff --git a/src/VBox/Devices/Builtins.cpp b/src/VBox/Devices/Builtins.cpp index c32b8b1ec..0b9532b8f 100644 --- a/src/VBox/Devices/Builtins.cpp +++ b/src/VBox/Devices/Builtins.cpp @@ -1,4 +1,4 @@ -/* $Id: Builtins.cpp 15963 2009-01-15 12:47:03Z vboxsync $ */ +/* $Id: Builtins.cpp $ */ /** @file * Built-in drivers & devices (part 1) */ diff --git a/src/VBox/Devices/Builtins.h b/src/VBox/Devices/Builtins.h index e34e44765..1b2323aab 100644 --- a/src/VBox/Devices/Builtins.h +++ b/src/VBox/Devices/Builtins.h @@ -1,4 +1,4 @@ -/* $Id: Builtins.h 16031 2009-01-19 07:03:00Z vboxsync $ */ +/* $Id: Builtins.h $ */ /** @file * Built-in drivers & devices (part 1) header. */ diff --git a/src/VBox/Devices/Builtins2.h b/src/VBox/Devices/Builtins2.h index 5dc138730..706b19057 100644 --- a/src/VBox/Devices/Builtins2.h +++ b/src/VBox/Devices/Builtins2.h @@ -1,4 +1,4 @@ -/* $Id: Builtins2.h 9693 2008-06-13 16:30:46Z vboxsync $ */ +/* $Id: Builtins2.h $ */ /** @file * Built-in drivers & devices (part 2) header. */ diff --git a/src/VBox/Devices/Bus/DevPCI.cpp b/src/VBox/Devices/Bus/DevPCI.cpp index 03a79a299..66809441b 100644 --- a/src/VBox/Devices/Bus/DevPCI.cpp +++ b/src/VBox/Devices/Bus/DevPCI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPCI.cpp 15787 2009-01-05 08:17:25Z vboxsync $ */ +/* $Id: DevPCI.cpp $ */ /** @file * DevPCI - PCI BUS Device. */ diff --git a/src/VBox/Devices/Bus/PCIInternal.h b/src/VBox/Devices/Bus/PCIInternal.h index e5bbb7ecf..997203138 100644 --- a/src/VBox/Devices/Bus/PCIInternal.h +++ b/src/VBox/Devices/Bus/PCIInternal.h @@ -1,4 +1,4 @@ -/* $Id: PCIInternal.h 13217 2008-10-13 13:40:54Z vboxsync $ */ +/* $Id: PCIInternal.h $ */ /** @file * DevPCI - PCI Internal header - Only for hiding bits of PCIDEVICE. */ diff --git a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk index e39fa1ddb..2953a619a 100644 --- a/src/VBox/Devices/Graphics/BIOS/Makefile.kmk +++ b/src/VBox/Devices/Graphics/BIOS/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13155 2008-10-10 08:07:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VGA BIOS Sub-Makefile # diff --git a/src/VBox/Devices/Graphics/BIOS/dataseghack b/src/VBox/Devices/Graphics/BIOS/dataseghack index 02a2d4c52..02a2d4c52 100644..100755 --- a/src/VBox/Devices/Graphics/BIOS/dataseghack +++ b/src/VBox/Devices/Graphics/BIOS/dataseghack diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp index af9b862d4..8a0526ff0 100644 --- a/src/VBox/Devices/Graphics/DevVGA.cpp +++ b/src/VBox/Devices/Graphics/DevVGA.cpp @@ -1,5 +1,5 @@ #ifdef VBOX -/* $Id: DevVGA.cpp 15977 2009-01-15 18:42:16Z vboxsync $ */ +/* $Id: DevVGA.cpp $ */ /** @file * DevVGA - VBox VGA/VESA device. */ diff --git a/src/VBox/Devices/Graphics/DevVGA.h b/src/VBox/Devices/Graphics/DevVGA.h index 9e833e074..46059b0a6 100644 --- a/src/VBox/Devices/Graphics/DevVGA.h +++ b/src/VBox/Devices/Graphics/DevVGA.h @@ -1,4 +1,4 @@ -/* $Id: DevVGA.h 15120 2008-12-08 16:53:53Z vboxsync $ */ +/* $Id: DevVGA.h $ */ /** @file * DevVGA - VBox VGA/VESA device, internal header. */ diff --git a/src/VBox/Devices/Graphics/DevVGAModes.h b/src/VBox/Devices/Graphics/DevVGAModes.h index 8ea9b90ae..e577dbf27 100644 --- a/src/VBox/Devices/Graphics/DevVGAModes.h +++ b/src/VBox/Devices/Graphics/DevVGAModes.h @@ -1,4 +1,4 @@ -/* $Id: DevVGAModes.h 11166 2008-08-06 00:24:37Z vboxsync $ */ +/* $Id: DevVGAModes.h $ */ /** @file * DevVGA - VBox VGA/VESA device, VBE modes. * diff --git a/src/VBox/Devices/Graphics/DevVGATmpl.h b/src/VBox/Devices/Graphics/DevVGATmpl.h index 267ade056..271858fed 100644 --- a/src/VBox/Devices/Graphics/DevVGATmpl.h +++ b/src/VBox/Devices/Graphics/DevVGATmpl.h @@ -1,4 +1,4 @@ -/* $Id: $ */ +/* $Id: $ */ /** @file * DevVGA - VBox VGA/VESA device, code templates. */ diff --git a/src/VBox/Devices/Input/DevPS2.cpp b/src/VBox/Devices/Input/DevPS2.cpp index 7fa4c6208..7cf155868 100644 --- a/src/VBox/Devices/Input/DevPS2.cpp +++ b/src/VBox/Devices/Input/DevPS2.cpp @@ -1,5 +1,5 @@ #ifdef VBOX -/* $Id: $ */ +/* $Id: $ */ /** @file * DevPS2 - PS/2 keyboard & mouse controller device. */ diff --git a/src/VBox/Devices/Makefile.kmk b/src/VBox/Devices/Makefile.kmk index 3dd087ded..988ebe9be 100644 --- a/src/VBox/Devices/Makefile.kmk +++ b/src/VBox/Devices/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16064 2009-01-19 21:11:58Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the devices, drivers and services. # diff --git a/src/VBox/Devices/Network/DevE1000.cpp b/src/VBox/Devices/Network/DevE1000.cpp index 11ba6e507..909d610ed 100644 --- a/src/VBox/Devices/Network/DevE1000.cpp +++ b/src/VBox/Devices/Network/DevE1000.cpp @@ -1,4 +1,4 @@ -/* $Id: DevE1000.cpp 15955 2009-01-14 20:14:36Z vboxsync $ */ +/* $Id: DevE1000.cpp $ */ /** @file * DevE1000 - Intel 82540EM Ethernet Controller Emulation. * diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp index 2b4137b36..f2a13e819 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.cpp +++ b/src/VBox/Devices/Network/DevE1000Phy.cpp @@ -1,4 +1,4 @@ -/** $Id: DevE1000Phy.cpp 15955 2009-01-14 20:14:36Z vboxsync $ */ +/** $Id: DevE1000Phy.cpp $ */ /** @file * DevE1000Phy - Intel 82540EM Ethernet Controller Internal PHY Emulation. * diff --git a/src/VBox/Devices/Network/DevE1000Phy.h b/src/VBox/Devices/Network/DevE1000Phy.h index 71bd0efcd..fe4a7a318 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.h +++ b/src/VBox/Devices/Network/DevE1000Phy.h @@ -1,4 +1,4 @@ -/** $Id: DevE1000Phy.h 15955 2009-01-14 20:14:36Z vboxsync $ */ +/** $Id: DevE1000Phy.h $ */ /** @file * DevE1000Phy - Intel 82540EM Ethernet Controller Internal PHY Emulation, Header. */ diff --git a/src/VBox/Devices/Network/DevEEPROM.cpp b/src/VBox/Devices/Network/DevEEPROM.cpp index bce308f96..c72410dc9 100644 --- a/src/VBox/Devices/Network/DevEEPROM.cpp +++ b/src/VBox/Devices/Network/DevEEPROM.cpp @@ -1,4 +1,4 @@ -/* $Id: DevEEPROM.cpp 15955 2009-01-14 20:14:36Z vboxsync $ */ +/* $Id: DevEEPROM.cpp $ */ /** @file * DevEEPROM - Microware-compatible 64x16-bit 93C46 EEPROM Emulation. */ diff --git a/src/VBox/Devices/Network/DevEEPROM.h b/src/VBox/Devices/Network/DevEEPROM.h index 66c0646d1..911601568 100644 --- a/src/VBox/Devices/Network/DevEEPROM.h +++ b/src/VBox/Devices/Network/DevEEPROM.h @@ -1,4 +1,4 @@ -/* $Id: DevEEPROM.h 15955 2009-01-14 20:14:36Z vboxsync $ */ +/* $Id: DevEEPROM.h $ */ /** @file * DevEEPROM - Microware-compatible 64x16-bit 93C46 EEPROM Emulation, Header. */ diff --git a/src/VBox/Devices/Network/DevPCNet.cpp b/src/VBox/Devices/Network/DevPCNet.cpp index d55e3728a..71818d7e8 100644 --- a/src/VBox/Devices/Network/DevPCNet.cpp +++ b/src/VBox/Devices/Network/DevPCNet.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPCNet.cpp 15006 2008-12-04 20:08:23Z vboxsync $ */ +/* $Id: DevPCNet.cpp $ */ /** @file * DevPCNet - AMD PCnet-PCI II / PCnet-FAST III (Am79C970A / Am79C973) Ethernet Controller Emulation. * diff --git a/src/VBox/Devices/Network/DrvIntNet.cpp b/src/VBox/Devices/Network/DrvIntNet.cpp index 04c264157..0fccb2d02 100644 --- a/src/VBox/Devices/Network/DrvIntNet.cpp +++ b/src/VBox/Devices/Network/DrvIntNet.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvIntNet.cpp 15541 2008-12-15 20:29:08Z vboxsync $ */ +/* $Id: DrvIntNet.cpp $ */ /** @file * DrvIntNet - Internal network transport driver. */ diff --git a/src/VBox/Devices/Network/DrvNAT.cpp b/src/VBox/Devices/Network/DrvNAT.cpp index 9c2bf05c3..444c06c96 100644 --- a/src/VBox/Devices/Network/DrvNAT.cpp +++ b/src/VBox/Devices/Network/DrvNAT.cpp @@ -505,7 +505,7 @@ void slirp_output(void *pvUser, const uint8_t *pu8Buf, int cb) cDroppedPackets++; LogRel(("NAT: Dropping package (couldn't alloc queue item to)\n")); } - RTMemFree((void *)pItem->pu8Buf); + RTMemFree((void *)pu8Buf); #endif } diff --git a/src/VBox/Devices/Network/DrvTAP.cpp b/src/VBox/Devices/Network/DrvTAP.cpp index 038502cdd..66cd62bdd 100644 --- a/src/VBox/Devices/Network/DrvTAP.cpp +++ b/src/VBox/Devices/Network/DrvTAP.cpp @@ -1,4 +1,4 @@ -/** $Id: DrvTAP.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/** $Id: DrvTAP.cpp $ */ /** @file * Universial TAP network transport driver. */ diff --git a/src/VBox/Devices/Network/DrvTAPOs2.cpp b/src/VBox/Devices/Network/DrvTAPOs2.cpp index f112a00ba..5b51a1baf 100644 --- a/src/VBox/Devices/Network/DrvTAPOs2.cpp +++ b/src/VBox/Devices/Network/DrvTAPOs2.cpp @@ -1,4 +1,4 @@ -/** $Id: DrvTAPOs2.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/** $Id: DrvTAPOs2.cpp $ */ /** @file * VBox network devices: OS/2 TAP network transport driver. */ diff --git a/src/VBox/Devices/Network/Pcap.cpp b/src/VBox/Devices/Network/Pcap.cpp index 97428313f..7bf60a632 100644 --- a/src/VBox/Devices/Network/Pcap.cpp +++ b/src/VBox/Devices/Network/Pcap.cpp @@ -1,4 +1,4 @@ -/* $Id: Pcap.cpp 10755 2008-07-18 19:57:45Z vboxsync $ */ +/* $Id: Pcap.cpp $ */ /** @file * Helpers for writing libpcap files. */ diff --git a/src/VBox/Devices/Network/Pcap.h b/src/VBox/Devices/Network/Pcap.h index be8a84e54..a4028f082 100644 --- a/src/VBox/Devices/Network/Pcap.h +++ b/src/VBox/Devices/Network/Pcap.h @@ -1,4 +1,4 @@ -/* $Id: Pcap.h 10755 2008-07-18 19:57:45Z vboxsync $ */ +/* $Id: Pcap.h $ */ /** @file * Helpers for writing libpcap files. */ diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp index 1f106ff4e..2fa8511fb 100644 --- a/src/VBox/Devices/Network/SrvIntNetR0.cpp +++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp @@ -1,4 +1,4 @@ -/* $Id: SrvIntNetR0.cpp 15893 2009-01-12 14:11:29Z vboxsync $ */ +/* $Id: SrvIntNetR0.cpp $ */ /** @file * Internal networking - The ring 0 service. */ diff --git a/src/VBox/Devices/Network/slirp/bootp.c b/src/VBox/Devices/Network/slirp/bootp.c index 99b2667c4..a40c3e6ef 100644 --- a/src/VBox/Devices/Network/slirp/bootp.c +++ b/src/VBox/Devices/Network/slirp/bootp.c @@ -138,6 +138,15 @@ static void bootp_reply(PNATState pData, struct bootp_t *bp) struct in_addr requested_ip; /* the requested IP in DHCPREQUEST */ int send_nak = 0; +#define FILL_BOOTP_EXT(q, tag, len, pvalue) \ + do { \ + struct bootp_ext *be = (struct bootp_ext *)(q); \ + be->bpe_tag = (tag); \ + be->bpe_len = (len); \ + memcpy(&be[1], (pvalue), (len)); \ + (q) = (uint8_t *)(&be[1]) + (len); \ + }while(0) + /* extract exact DHCP msg type */ requested_ip.s_addr = 0xffffffff; dhcp_decode(bp->bp_vend, DHCP_OPT_LEN, &dhcp_msg_type, &requested_ip); @@ -205,6 +214,7 @@ static void bootp_reply(PNATState pData, struct bootp_t *bp) && bootp_filename) RTStrPrintf((char*)rbp->bp_file, sizeof(rbp->bp_file), "%s", bootp_filename); + /* Address/port of the DHCP server. */ saddr.sin_addr.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_ALIAS); saddr.sin_port = htons(BOOTP_SERVER); @@ -217,7 +227,7 @@ static void bootp_reply(PNATState pData, struct bootp_t *bp) memcpy(rbp->bp_hwaddr, bp->bp_hwaddr, 6); rbp->bp_yiaddr = daddr.sin_addr; /* Client IP address */ - rbp->bp_siaddr = saddr.sin_addr; /* Server IP address */ + rbp->bp_siaddr = pData->tftp_server; /* Next Server IP address, i.e. TFTP */ q = rbp->bp_vend; memcpy(q, rfc1533_cookie, 4); @@ -250,60 +260,37 @@ static void bootp_reply(PNATState pData, struct bootp_t *bp) else LogRel(("NAT: DHCP offered IP address %R[IP4]\n", &daddr.sin_addr)); - if ( dhcp_msg_type == DHCPDISCOVER || dhcp_msg_type == DHCPREQUEST) { - *q++ = RFC2132_SRV_ID; - *q++ = 4; - memcpy(q, &saddr.sin_addr, 4); - q += 4; + FILL_BOOTP_EXT(q, RFC2132_SRV_ID, 4, &saddr.sin_addr); } if (!send_nak && ( dhcp_msg_type == DHCPDISCOVER || dhcp_msg_type == DHCPREQUEST)) { - *q++ = RFC1533_NETMASK; - *q++ = 4; - *q++ = (pData->netmask & 0xff000000) >> 24; - *q++ = (pData->netmask & 0x00ff0000) >> 16; - *q++ = (pData->netmask & 0x0000ff00) >> 8; - *q++ = (pData->netmask & 0x000000ff); - - *q++ = RFC1533_GATEWAY; - *q++ = 4; - memcpy(q, &saddr.sin_addr, 4); - q += 4; - - *q++ = RFC1533_DNS; - *q++ = 4; + uint32_t lease_time = htonl(LEASE_TIME); + uint32_t netmask = htonl(pData->netmask); + + FILL_BOOTP_EXT(q, RFC1533_NETMASK, 4, &netmask); + FILL_BOOTP_EXT(q, RFC1533_GATEWAY, 4, &saddr.sin_addr); + dns_addr_dhcp.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_DNS); - memcpy(q, &dns_addr_dhcp, 4); - q += 4; + FILL_BOOTP_EXT(q, RFC1533_DNS, 4, &dns_addr_dhcp.s_addr); - *q++ = RFC2132_LEASE_TIME; - *q++ = 4; - val = htonl(LEASE_TIME); - memcpy(q, &val, 4); - q += 4; + FILL_BOOTP_EXT(q, RFC2132_LEASE_TIME, 4, &lease_time); if (*slirp_hostname) { val = (int)strlen(slirp_hostname); - *q++ = RFC1533_HOSTNAME; - *q++ = val; - memcpy(q, slirp_hostname, val); - q += val; + FILL_BOOTP_EXT(q, RFC1533_HOSTNAME, val, slirp_hostname); } if (pData->pszDomain && pData->fPassDomain) { val = (int)strlen(pData->pszDomain); - *q++ = RFC1533_DOMAINNAME; - *q++ = val; - memcpy(q, pData->pszDomain, val); - q += val; + FILL_BOOTP_EXT(q, RFC1533_DOMAINNAME, val, pData->pszDomain); } } *q++ = RFC1533_END; diff --git a/src/VBox/Devices/Network/slirp/bootp.h b/src/VBox/Devices/Network/slirp/bootp.h index b5931b306..352bcb5fb 100644 --- a/src/VBox/Devices/Network/slirp/bootp.h +++ b/src/VBox/Devices/Network/slirp/bootp.h @@ -113,4 +113,10 @@ struct bootp_t uint8_t bp_vend[DHCP_OPT_LEN]; }; +struct bootp_ext +{ + uint8_t bpe_tag; + uint8_t bpe_len; +}; + void bootp_input(PNATState, struct mbuf *m); diff --git a/src/VBox/Devices/Network/slirp/ctl.h b/src/VBox/Devices/Network/slirp/ctl.h index 9f56d5d15..bdc2c754b 100644 --- a/src/VBox/Devices/Network/slirp/ctl.h +++ b/src/VBox/Devices/Network/slirp/ctl.h @@ -2,5 +2,7 @@ #define CTL_EXEC 1 #define CTL_ALIAS 2 #define CTL_DNS 3 +#define CTL_TFTP CTL_DNS #define CTL_BROADCAST 255 +#define CTL_CHECK(x, ctl) (((x) & ~pData->netmask) == (ctl)) diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.c b/src/VBox/Devices/Network/slirp/ip_icmp.c index 3776858a0..d0283e7aa 100644 --- a/src/VBox/Devices/Network/slirp/ip_icmp.c +++ b/src/VBox/Devices/Network/slirp/ip_icmp.c @@ -188,6 +188,7 @@ icmp_find_original_mbuf(PNATState pData, struct ip *ip) && icp->icmp_seq == icp0->icmp_seq) { found = 1; + Log(("Have found %R[natsock]\n", icm->im_so)); break; } Log(("Have found nothing\n")); @@ -274,6 +275,7 @@ icmp_attach(PNATState pData, struct mbuf *m) Assert(ip->ip_p == IPPROTO_ICMP); icm = RTMemAlloc(sizeof(struct icmp_msg)); icm->im_m = m; + icm->im_so = m->m_so; LIST_INSERT_HEAD(&pData->icmp_msg_head, icm, im_list); return 0; } @@ -368,6 +370,7 @@ freeit: #ifndef RT_OS_WINDOWS if (pData->icmp_socket.s != -1) { + m->m_so = &pData->icmp_socket; icmp_attach(pData, m); ttl = ip->ip_ttl; Log(("NAT/ICMP: try to set TTL(%d)\n", ttl)); @@ -379,7 +382,7 @@ freeit: if (sendto(pData->icmp_socket.s, icp, icmplen, 0, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - DEBUG_MISC((dfd,"icmp_input udp sendto tx errno = %d-%s\n", + Log((dfd,"icmp_input udp sendto tx errno = %d-%s\n", errno, strerror(errno))); icmp_error(pData, m, ICMP_UNREACH,ICMP_UNREACH_NET, 0, strerror(errno)); m_free(pData, m); @@ -400,9 +403,10 @@ freeit: pData->icmp_socket.so_laddr.s_addr = ip->ip_src.s_addr; /* XXX: hack*/ pData->icmp_socket.so_icmp_id = icp->icmp_id; pData->icmp_socket.so_icmp_seq = icp->icmp_seq; + m->m_so = &pData->icmp_socket; memset(&ipopt, 0, sizeof(IP_OPTION_INFORMATION)); ipopt.Ttl = ip->ip_ttl; - status = ICMP_SEND_ECHO(pData->phEvents[VBOX_ICMP_EVENT_INDEX], notify_slirp, addr.sin_addr.s_addr, + status = ICMP_SEND_ECHO(pData->phEvents[VBOX_ICMP_EVENT_INDEX], notify_slirp, addr.sin_addr.s_addr, icp->icmp_data, icmplen - ICMP_MINLEN, &ipopt); if (status == 0 && (error = GetLastError()) != ERROR_IO_PENDING) { @@ -628,7 +632,7 @@ icmp_reflect(PNATState pData, struct mbuf *m) icmpstat.icps_reflect++; } #if defined(RT_OS_WINDOWS) && !defined(VBOX_WITH_SIMPLIFIED_SLIRP_SYNC) -static void WINAPI +static void WINAPI notify_slirp(void *ctx) { /* pData name is important see slirp_state.h */ diff --git a/src/VBox/Devices/Network/slirp/slirp.c b/src/VBox/Devices/Network/slirp/slirp.c index 41ed05215..beb65f15b 100644 --- a/src/VBox/Devices/Network/slirp/slirp.c +++ b/src/VBox/Devices/Network/slirp/slirp.c @@ -378,6 +378,9 @@ int slirp_init(PNATState *ppData, const char *pszNetAddr, uint32_t u32Netmask, inet_aton(pszNetAddr, &special_addr); alias_addr.s_addr = special_addr.s_addr | htonl(CTL_ALIAS); + /* @todo: add ability to configurate this staff */ + pData->tftp_server.s_addr = htonl(ntohl(special_addr.s_addr) | CTL_TFTP); + getouraddr(pData); return fNATfailed ? VINF_NAT_DNS : VINF_SUCCESS; } @@ -771,7 +774,7 @@ void slirp_select_poll(PNATState pData, fd_set *readfds, fd_set *writefds, fd_se continue; } - ret = soread(pData, so, /*fCloseIfNothingRead=*/false); + ret = soread(pData, so); /* Output it if we read something */ if (ret > 0) tcp_output(pData, sototcpcb(so)); @@ -788,7 +791,7 @@ void slirp_select_poll(PNATState pData, fd_set *readfds, fd_set *writefds, fd_se */ for (;;) { - ret = soread(pData, so, /*fCloseIfNothingRead=*/true); + ret = soread(pData, so); if (ret > 0) tcp_output(pData, sototcpcb(so)); else @@ -999,8 +1002,9 @@ void arp_input(PNATState pData, const uint8_t *pkt, int pkt_len) case ARPOP_REQUEST: if ((htip & pData->netmask) == ntohl(special_addr.s_addr)) { - if ( (htip & ~pData->netmask) == CTL_DNS - || (htip & ~pData->netmask) == CTL_ALIAS) + if ( CTL_CHECK(htip,CTL_DNS) + || CTL_CHECK(htip, CTL_ALIAS) + || CTL_CHECK(htip, CTL_TFTP)) goto arp_ok; for (ex_ptr = exec_list; ex_ptr; ex_ptr = ex_ptr->ex_next) { diff --git a/src/VBox/Devices/Network/slirp/slirp_state.h b/src/VBox/Devices/Network/slirp/slirp_state.h index d5ac494fa..440f563e7 100644 --- a/src/VBox/Devices/Network/slirp/slirp_state.h +++ b/src/VBox/Devices/Network/slirp/slirp_state.h @@ -92,6 +92,7 @@ typedef struct NATState struct in_addr alias_addr; struct in_addr special_addr; struct in_addr dns_addr; + struct in_addr tftp_server; struct in_addr loopback_addr; uint32_t netmask; uint8_t client_ethaddr[6]; diff --git a/src/VBox/Devices/Network/slirp/socket.c b/src/VBox/Devices/Network/slirp/socket.c index 62d988312..a6f3ec8d6 100644 --- a/src/VBox/Devices/Network/slirp/socket.c +++ b/src/VBox/Devices/Network/slirp/socket.c @@ -96,7 +96,7 @@ sofree(PNATState pData, struct socket *so) * a read() of 0 (or less) means it's disconnected */ int -soread(PNATState pData, struct socket *so, int fCloseIfNothingRead) +soread(PNATState pData, struct socket *so) { int n, nn, lss, total; struct sbuf *sb = &so->so_snd; @@ -183,7 +183,12 @@ soread(PNATState pData, struct socket *so, int fCloseIfNothingRead) * www.youtube.com I see this very often. Closing the socket too early * would be dangerous. */ - if (nn == 0 && !fCloseIfNothingRead) + int status, ignored; + unsigned long pending = 0; + status = WSAIoctl(so->s, FIONREAD, NULL, 0, &pending, sizeof(unsigned long), &ignored, NULL, NULL); + if (status < 0) + Log2(("error in WSAIoctl: %d\n", WSAGetLastError())); + if (nn == 0 && (pending != 0)) return 0; #endif if (nn < 0 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)) @@ -251,7 +256,7 @@ sorecvoob(PNATState pData, struct socket *so) * urgent data, or the read() doesn't return all the * urgent data. */ - soread(pData, so, /*fCloseIfNothingRead=*/false); + soread(pData, so); tp->snd_up = tp->snd_una + so->so_snd.sb_cc; tp->t_force = 1; tcp_output(pData, tp); @@ -461,7 +466,7 @@ sorecvfrom(PNATState pData, struct socket *so) return; m->m_data += if_maxlinkhdr; #ifdef VBOX_WITH_SIMPLIFIED_SLIRP_SYNC - m->m_data += sizeof(struct udphdr) + m->m_data += sizeof(struct udphdr) + sizeof(struct ip); /*XXX: no options atm*/ #endif @@ -801,6 +806,7 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c struct mbuf *m; struct icmp_msg *icm; uint8_t proto; + int type = 0; ip = (struct ip *)buff; hlen = (ip->ip_hl << 2); @@ -814,8 +820,9 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c return; } - if ( icp->icmp_type == ICMP_TIMXCEED - || icp->icmp_type == ICMP_UNREACH) + type = icp->icmp_type; + if ( type == ICMP_TIMXCEED + || type == ICMP_UNREACH) { ip = &icp->icmp_ip; DO_ALIAS(&ip->ip_dst); @@ -863,8 +870,9 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c ip->ip_p = IPPROTO_ICMP; /* the original package could be whatever, but we're response via ICMP*/ icp = (struct icmp *)((char *)ip + (ip->ip_hl << 2)); - if ( icp->icmp_type == ICMP_TIMXCEED - || icp->icmp_type == ICMP_UNREACH) + type = icp->icmp_type; + if ( type == ICMP_TIMXCEED + || type == ICMP_UNREACH) { /* according RFC 793 error messages required copy of initial IP header + 64 bit */ memcpy(&icp->icmp_ip, ip_copy, old_ip_len); @@ -877,8 +885,8 @@ send_icmp_to_guest(PNATState pData, char *buff, size_t len, struct socket *so, c LIST_REMOVE(icm, im_list); /* Don't call m_free here*/ - if ( icp->icmp_type == ICMP_TIMXCEED - || icp->icmp_type == ICMP_UNREACH) + if ( type == ICMP_TIMXCEED + || type == ICMP_UNREACH) { icm->im_so->so_m = NULL; switch (proto) diff --git a/src/VBox/Devices/Network/slirp/socket.h b/src/VBox/Devices/Network/slirp/socket.h index a1af0db01..387246eaf 100644 --- a/src/VBox/Devices/Network/slirp/socket.h +++ b/src/VBox/Devices/Network/slirp/socket.h @@ -97,7 +97,7 @@ void so_init _P((void)); struct socket * solookup _P((struct socket *, struct in_addr, u_int, struct in_addr, u_int)); struct socket * socreate _P((void)); void sofree _P((PNATState, struct socket *)); -int soread _P((PNATState, struct socket *, int)); +int soread _P((PNATState, struct socket *)); void sorecvoob _P((PNATState, struct socket *)); int sosendoob _P((struct socket *)); int sowrite _P((PNATState, struct socket *)); diff --git a/src/VBox/Devices/Network/slirp/tcp_subr.c b/src/VBox/Devices/Network/slirp/tcp_subr.c index faeb07615..25641ddde 100644 --- a/src/VBox/Devices/Network/slirp/tcp_subr.c +++ b/src/VBox/Devices/Network/slirp/tcp_subr.c @@ -383,9 +383,9 @@ int tcp_fconnect(PNATState pData, struct socket *so) fd_nonblock(s); opt = 1; - setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt, sizeof(opt)); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR, (char *)&opt, sizeof(opt)); opt = 1; - setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt, sizeof(opt)); + setsockopt(s, SOL_SOCKET, SO_OOBINLINE, (char *)&opt, sizeof(opt)); addr.sin_family = AF_INET; if ((so->so_faddr.s_addr & htonl(pData->netmask)) == special_addr.s_addr) @@ -444,7 +444,9 @@ tcp_connect(PNATState pData, struct socket *inso) struct sockaddr_in addr; socklen_t addrlen = sizeof(struct sockaddr_in); struct tcpcb *tp; - int s, opt; + int s, opt, status; + socklen_t optlen; + static int cVerbose = 1; DEBUG_CALL("tcp_connect"); DEBUG_ARG("inso = %lx", (long)inso); @@ -484,12 +486,48 @@ tcp_connect(PNATState pData, struct socket *inso) } fd_nonblock(s); opt = 1; - setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&opt,sizeof(int)); + setsockopt(s, SOL_SOCKET, SO_REUSEADDR,(char *)&opt, sizeof(int)); opt = 1; - setsockopt(s,SOL_SOCKET,SO_OOBINLINE,(char *)&opt,sizeof(int)); + setsockopt(s, SOL_SOCKET, SO_OOBINLINE,(char *)&opt, sizeof(int)); opt = 1; - setsockopt(s,IPPROTO_TCP,TCP_NODELAY,(char *)&opt,sizeof(int)); + setsockopt(s, IPPROTO_TCP, TCP_NODELAY,(char *)&opt, sizeof(int)); + optlen = sizeof(int); + status = getsockopt(s, SOL_SOCKET, SO_RCVBUF, &opt, &optlen); + if (status < 0) + { + LogRel(("NAT: Error(%d) while getting RCV capacity\n", errno)); + goto no_sockopt; + } + if (cVerbose > 0) + LogRel(("NAT: old socket rcv size: %dKB\n", opt / 1024)); + opt *= 4; + status = setsockopt(s, SOL_SOCKET, SO_RCVBUF, &opt, sizeof(int)); + if (status < 0) + { + LogRel(("NAT: Error(%d) while setting RCV capacity to (%d)\n", errno, opt)); + goto no_sockopt; + } + optlen = sizeof(int); + status = getsockopt(s, SOL_SOCKET, SO_SNDBUF, &opt, &optlen); + if (status < 0) + { + LogRel(("NAT: Error(%d) while getting SND capacity\n", errno)); + goto no_sockopt; + } + if (cVerbose > 0) + LogRel(("NAT: old socket snd size: %dKB\n", opt / 1024)); + opt *= 4; + status = setsockopt(s, SOL_SOCKET, SO_SNDBUF, &opt, sizeof(int)); + if (status < 0) + { + LogRel(("NAT: Error(%d) while setting SND capacity to (%d)\n", errno, opt)); + goto no_sockopt; + } + if (cVerbose > 0) + cVerbose--; + + no_sockopt: so->so_fport = addr.sin_port; so->so_faddr = addr.sin_addr; /* Translate connections from localhost to the real hostname */ diff --git a/src/VBox/Devices/Network/slirp/udp.c b/src/VBox/Devices/Network/slirp/udp.c index 4e7d16a12..c91d76c35 100644 --- a/src/VBox/Devices/Network/slirp/udp.c +++ b/src/VBox/Devices/Network/slirp/udp.c @@ -44,6 +44,7 @@ #include <slirp.h> #include "ip_icmp.h" +#include "ctl.h" /* @@ -158,7 +159,8 @@ udp_input(PNATState pData, register struct mbuf *m, int iphlen) /* * handle TFTP */ - if (ntohs(uh->uh_dport) == TFTP_SERVER) + if ( ntohs(uh->uh_dport) == TFTP_SERVER + && CTL_CHECK(ntohl(ip->ip_dst.s_addr), CTL_TFTP)) { tftp_input(pData, m); goto bad; diff --git a/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp b/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp index 2a03468cc..792cfd79f 100644 --- a/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp +++ b/src/VBox/Devices/Network/solaris/vbox-libdlpi.cpp @@ -1,4 +1,4 @@ -/** $Id: vbox-libdlpi.cpp 9124 2008-05-26 13:48:23Z vboxsync $ */ +/** $Id: vbox-libdlpi.cpp $ */ /** @file * Dynamically load libdpli & symbols on Solaris hosts, Internal header. */ diff --git a/src/VBox/Devices/Network/solaris/vbox-libdlpi.h b/src/VBox/Devices/Network/solaris/vbox-libdlpi.h index 9785e404b..abd0d6719 100644 --- a/src/VBox/Devices/Network/solaris/vbox-libdlpi.h +++ b/src/VBox/Devices/Network/solaris/vbox-libdlpi.h @@ -1,4 +1,4 @@ -/** $Id: vbox-libdlpi.h 8960 2008-05-20 14:49:14Z vboxsync $ */ +/** $Id: vbox-libdlpi.h $ */ /** @file * Dynamically load libdpli & symbols on Solaris hosts, Internal header. */ diff --git a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp index acbe4d2e6..c5f50fedb 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIntNet-1.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstIntNet-1.cpp $ */ /** @file * VBox - Testcase for internal networking, simple NetFlt trunk creation. */ diff --git a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp index ae6c18f57..49ce5c930 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIntNetR0.cpp 15842 2009-01-07 16:41:48Z vboxsync $ */ +/* $Id: tstIntNetR0.cpp $ */ /** @file * Internal networking - Usermode testcase for the kernel mode bits. * diff --git a/src/VBox/Devices/PC/BIOS/Makefile.kmk b/src/VBox/Devices/PC/BIOS/Makefile.kmk index b73fdeb97..65cc663c6 100644 --- a/src/VBox/Devices/PC/BIOS/Makefile.kmk +++ b/src/VBox/Devices/PC/BIOS/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13155 2008-10-10 08:07:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # PC BIOS Sub-Makefile. # diff --git a/src/VBox/Devices/PC/BIOS/logo.c b/src/VBox/Devices/PC/BIOS/logo.c index 8c13f42f8..bb88be2cb 100644 --- a/src/VBox/Devices/PC/BIOS/logo.c +++ b/src/VBox/Devices/PC/BIOS/logo.c @@ -1,4 +1,4 @@ -/* $Id: logo.c 9534 2008-06-09 11:37:06Z vboxsync $ */ +/* $Id: logo.c $ */ /** @file * Stuff for drawing the BIOS logo. */ diff --git a/src/VBox/Devices/PC/BIOS/rombios.c b/src/VBox/Devices/PC/BIOS/rombios.c index 0277a7de3..624706e02 100644 --- a/src/VBox/Devices/PC/BIOS/rombios.c +++ b/src/VBox/Devices/PC/BIOS/rombios.c @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////// -// $Id: rombios.c,v 1.176 2006/12/30 17:13:17 vruppert Exp $ +// $Id: rombios.c $ ///////////////////////////////////////////////////////////////////////// // // Copyright (C) 2002 MandrakeSoft S.A. diff --git a/src/VBox/Devices/PC/DevACPI.cpp b/src/VBox/Devices/PC/DevACPI.cpp index b2860ea26..8bcca84d4 100644 --- a/src/VBox/Devices/PC/DevACPI.cpp +++ b/src/VBox/Devices/PC/DevACPI.cpp @@ -1,4 +1,4 @@ -/* $Id: DevACPI.cpp 16042 2009-01-19 12:06:00Z vboxsync $ */ +/* $Id: DevACPI.cpp $ */ /** @file * DevACPI - Advanced Configuration and Power Interface (ACPI) Device. */ diff --git a/src/VBox/Devices/PC/DevAPIC.cpp b/src/VBox/Devices/PC/DevAPIC.cpp index 3f733662a..110774192 100644 --- a/src/VBox/Devices/PC/DevAPIC.cpp +++ b/src/VBox/Devices/PC/DevAPIC.cpp @@ -1,5 +1,5 @@ #ifdef VBOX -/* $Id: DevAPIC.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: DevAPIC.cpp $ */ /** @file * Advanced Programmable Interrupt Controller (APIC) Device and * I/O Advanced Programmable Interrupt Controller (IO-APIC) Device. diff --git a/src/VBox/Devices/PC/DevDMA.cpp b/src/VBox/Devices/PC/DevDMA.cpp index 2a90db227..2376da859 100644 --- a/src/VBox/Devices/PC/DevDMA.cpp +++ b/src/VBox/Devices/PC/DevDMA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevDMA.cpp 12978 2008-10-03 23:28:44Z vboxsync $ */ +/* $Id: DevDMA.cpp $ */ /** @file * DevDMA - DMA Controller Device. */ diff --git a/src/VBox/Devices/PC/DevPIC.cpp b/src/VBox/Devices/PC/DevPIC.cpp index e9d2f62e9..107ee6656 100644 --- a/src/VBox/Devices/PC/DevPIC.cpp +++ b/src/VBox/Devices/PC/DevPIC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPIC.cpp 12977 2008-10-03 23:24:35Z vboxsync $ */ +/* $Id: DevPIC.cpp $ */ /** @file * DevPIC - Intel 8259 Programmable Interrupt Controller (PIC) Device. */ diff --git a/src/VBox/Devices/PC/DevPcArch.c b/src/VBox/Devices/PC/DevPcArch.c index f3f1aef5b..19dc0d528 100644 --- a/src/VBox/Devices/PC/DevPcArch.c +++ b/src/VBox/Devices/PC/DevPcArch.c @@ -1,4 +1,4 @@ -/* $Id: DevPcArch.c 12977 2008-10-03 23:24:35Z vboxsync $ */ +/* $Id: DevPcArch.c $ */ /** @file * DevPcArch - PC Architechture Device. */ diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp index e3d01857a..9c1ee4716 100644 --- a/src/VBox/Devices/PC/DevPcBios.cpp +++ b/src/VBox/Devices/PC/DevPcBios.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPcBios.cpp 15366 2008-12-12 13:50:32Z vboxsync $ */ +/* $Id: DevPcBios.cpp $ */ /** @file * PC BIOS Device. */ diff --git a/src/VBox/Devices/PC/DevPcBios.h b/src/VBox/Devices/PC/DevPcBios.h index 1b50ebf72..09b796cb2 100644 --- a/src/VBox/Devices/PC/DevPcBios.h +++ b/src/VBox/Devices/PC/DevPcBios.h @@ -1,4 +1,4 @@ -/* $Id: DevPcBios.h 12653 2008-09-22 16:03:25Z vboxsync $ */ +/* $Id: DevPcBios.h $ */ /** @file * DevPcBios - PC BIOS Device, header shared with the BIOS code. */ diff --git a/src/VBox/Devices/PC/DevPit-i8254.cpp b/src/VBox/Devices/PC/DevPit-i8254.cpp index 448ae853a..e7e1fd43e 100644 --- a/src/VBox/Devices/PC/DevPit-i8254.cpp +++ b/src/VBox/Devices/PC/DevPit-i8254.cpp @@ -1,4 +1,4 @@ -/* $Id: DevPit-i8254.cpp 16148 2009-01-21 16:22:30Z vboxsync $ */ +/* $Id: DevPit-i8254.cpp $ */ /** @file * DevPIT-i8254 - Intel 8254 Programmable Interval Timer (PIT) And Dummy Speaker Device. */ diff --git a/src/VBox/Devices/PC/DevRTC.cpp b/src/VBox/Devices/PC/DevRTC.cpp index e84acaa9f..472e089c2 100644 --- a/src/VBox/Devices/PC/DevRTC.cpp +++ b/src/VBox/Devices/PC/DevRTC.cpp @@ -1,4 +1,4 @@ -/* $Id: DevRTC.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/* $Id: DevRTC.cpp $ */ /** @file * Motorola MC146818 RTC/CMOS Device. */ diff --git a/src/VBox/Devices/PC/DrvACPI.cpp b/src/VBox/Devices/PC/DrvACPI.cpp index c7542dee4..9525a35ab 100644 --- a/src/VBox/Devices/PC/DrvACPI.cpp +++ b/src/VBox/Devices/PC/DrvACPI.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvACPI.cpp 14710 2008-11-27 15:13:46Z vboxsync $ */ +/* $Id: DrvACPI.cpp $ */ /** @file * DrvACPI - ACPI Host Driver. */ diff --git a/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk b/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk index 40944343a..99bb62a03 100644 --- a/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk +++ b/src/VBox/Devices/PC/Etherboot-src/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 8760 2008-05-11 18:39:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VBox Etherboot Network boot ROM makefile. # diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c index ec7c2816f..26786ab29 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.c @@ -6,7 +6,7 @@ This file Copyright (C) 2003 Michael Brown <mbrown@fensystems.co.uk> of Fen Systems Ltd. (http://www.fensystems.co.uk/). All rights reserved. -$Id: undi.c 11982 2008-09-02 13:09:44Z vboxsync $ +$Id: undi.c $ ***************************************************************************/ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h index 470617a29..c20689e0e 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/drivers/net/undi.h @@ -6,7 +6,7 @@ This file Copyright (C) 2003 Michael Brown <mbrown@fensystems.co.uk> of Fen Systems Ltd. (http://www.fensystems.co.uk/). All rights reserved. -$Id: undi.h 11982 2008-09-02 13:09:44Z vboxsync $ +$Id: undi.h $ ***************************************************************************/ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c b/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c index 8339ee020..5ba665960 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/firmware/pcbios/basemem.c @@ -7,7 +7,7 @@ * updating the Free Base Memory Size counter at 40:13h. * * Michael Brown <mbrown@fensystems.co.uk> (mcb30) - * $Id: basemem.c 1 vboxsync $ + * $Id: basemem.c $ */ #define fbms ( ( uint16_t * ) phys_to_virt ( 0x413 ) ) diff --git a/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h b/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h index 47dbe33c2..1deef4253 100644 --- a/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h +++ b/src/VBox/Devices/PC/Etherboot-src/arch/i386/include/callbacks_arch.h @@ -5,7 +5,7 @@ * * Initial version by Michael Brown <mbrown@fensystems.co.uk>, January 2004. * - * $Id: callbacks_arch.h 1 vboxsync $ + * $Id: callbacks_arch.h $ */ #ifndef CALLBACKS_ARCH_H diff --git a/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c b/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c index 638308dbf..99676ae9f 100644 --- a/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c +++ b/src/VBox/Devices/PC/Etherboot-src/core/dns_resolver.c @@ -22,8 +22,8 @@ * This code is using nuts and bolts from throughout etherboot. * It is a fresh implementation according to the DNS RFC, #1035 * -* $Revision: 11982 $ -* $Author: vboxsync $ +* $Revision: 35885 $ +* $Author: umoeller $ * $Date: 2008-09-02 15:09:44 +0200 (Tue, 02 Sep 2008) $ * * REVISION HISTORY: diff --git a/src/VBox/Devices/PC/Etherboot-src/genrules.pl b/src/VBox/Devices/PC/Etherboot-src/genrules.pl index 3cf9c6d84..3cf9c6d84 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/genrules.pl +++ b/src/VBox/Devices/PC/Etherboot-src/genrules.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h b/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h index 2f635f27f..95ba2af9b 100644 --- a/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h +++ b/src/VBox/Devices/PC/Etherboot-src/include/callbacks.h @@ -5,7 +5,7 @@ * * Initial version by Michael Brown <mbrown@fensystems.co.uk>, January 2004. * - * $Id: callbacks.h 1 vboxsync $ + * $Id: callbacks.h $ */ #ifndef CALLBACKS_H diff --git a/src/VBox/Devices/PC/Etherboot-src/include/pxe.h b/src/VBox/Devices/PC/Etherboot-src/include/pxe.h index 396891864..ec12cddce 100644 --- a/src/VBox/Devices/PC/Etherboot-src/include/pxe.h +++ b/src/VBox/Devices/PC/Etherboot-src/include/pxe.h @@ -632,7 +632,7 @@ typedef struct { * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * - * $Id: pxe.h 1 vboxsync $ + * $Id: pxe.h $ */ /* diff --git a/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl index fe37e6b6e..fe37e6b6e 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/catrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl index 64128698c..64128698c 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/disrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/geniso b/src/VBox/Devices/PC/Etherboot-src/util/geniso index cf0469902..cf0469902 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/geniso +++ b/src/VBox/Devices/PC/Etherboot-src/util/geniso diff --git a/src/VBox/Devices/PC/Etherboot-src/util/genliso b/src/VBox/Devices/PC/Etherboot-src/util/genliso index b8d9a11df..b8d9a11df 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/genliso +++ b/src/VBox/Devices/PC/Etherboot-src/util/genliso diff --git a/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids b/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids index 6501a7f7c..6501a7f7c 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids +++ b/src/VBox/Devices/PC/Etherboot-src/util/get-pci-ids diff --git a/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl b/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl index 8f995bc46..8f995bc46 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/makelilo.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl b/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl index 9d751e190..9d751e190 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/makerom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl b/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl index 695468c26..695468c26 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/modrom.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl b/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl index c6255ae73..c6255ae73 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/swapdevids.pl diff --git a/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl b/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl index 1f58ff9ee..1f58ff9ee 100644..100755 --- a/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl +++ b/src/VBox/Devices/PC/Etherboot-src/util/zfilelen.pl diff --git a/src/VBox/Devices/PC/vbox.dsl b/src/VBox/Devices/PC/vbox.dsl index 77ce4ac6f..e13cef7a6 100644 --- a/src/VBox/Devices/PC/vbox.dsl +++ b/src/VBox/Devices/PC/vbox.dsl @@ -1,4 +1,4 @@ -// $Id: vbox.dsl 16042 2009-01-19 12:06:00Z vboxsync $ +// $Id: vbox.dsl $ /// @file // // VirtualBox ACPI diff --git a/src/VBox/Devices/Parallel/DevParallel.cpp b/src/VBox/Devices/Parallel/DevParallel.cpp index 4d5ba6254..6e8b79d88 100644 --- a/src/VBox/Devices/Parallel/DevParallel.cpp +++ b/src/VBox/Devices/Parallel/DevParallel.cpp @@ -1,4 +1,4 @@ -/* $Id: DevParallel.cpp 12978 2008-10-03 23:28:44Z vboxsync $ */ +/* $Id: DevParallel.cpp $ */ /** @file * DevParallel - Parallel (Port) Device Emulation. * diff --git a/src/VBox/Devices/Parallel/DrvHostParallel.cpp b/src/VBox/Devices/Parallel/DrvHostParallel.cpp index e7f22dcef..5f0db0bd3 100644 --- a/src/VBox/Devices/Parallel/DrvHostParallel.cpp +++ b/src/VBox/Devices/Parallel/DrvHostParallel.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostParallel.cpp 11286 2008-08-08 22:33:43Z vboxsync $ */ +/* $Id: DrvHostParallel.cpp $ */ /** @file * VirtualBox Host Parallel Port Driver. * diff --git a/src/VBox/Devices/Serial/DevSerial.cpp b/src/VBox/Devices/Serial/DevSerial.cpp index 7d9cf9a57..b6cb43f22 100644 --- a/src/VBox/Devices/Serial/DevSerial.cpp +++ b/src/VBox/Devices/Serial/DevSerial.cpp @@ -1,4 +1,4 @@ -/* $Id: DevSerial.cpp 12978 2008-10-03 23:28:44Z vboxsync $ */ +/* $Id: DevSerial.cpp $ */ /** @file * DevSerial - 16450 UART emulation. */ diff --git a/src/VBox/Devices/Serial/DrvHostSerial.cpp b/src/VBox/Devices/Serial/DrvHostSerial.cpp index ce8ed4718..603d80205 100644 --- a/src/VBox/Devices/Serial/DrvHostSerial.cpp +++ b/src/VBox/Devices/Serial/DrvHostSerial.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostSerial.cpp 15836 2009-01-07 15:45:20Z vboxsync $ */ +/* $Id: DrvHostSerial.cpp $ */ /** @file * VBox stream I/O devices: Host serial driver * @@ -757,7 +757,7 @@ static DECLCALLBACK(int) drvHostSerialRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD rc = RTFileRead(pThis->DeviceFileR, abBuffer, sizeof(abBuffer), &cbRead); if (RT_FAILURE(rc)) { - LogRel(("HostSerial#%d: Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc)); + LogRel(("HostSerial#%d: (1) Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc)); rcThread = rc; break; } @@ -795,7 +795,11 @@ static DECLCALLBACK(int) drvHostSerialRecvThread(PPDMDRVINS pDrvIns, PPDMTHREAD rc = RTFileRead(pThis->DeviceFile, abBuffer, sizeof(abBuffer), &cbRead); if (RT_FAILURE(rc)) { - LogRel(("HostSerial#%d: Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc)); + /* don't terminate worker thread when data unavailable */ + if (rc == VERR_TRY_AGAIN) + continue; + + LogRel(("HostSerial#%d: (2) Read failed with %Rrc, terminating the worker thread.\n", pDrvIns->iInstance, rc)); rcThread = rc; break; } @@ -963,7 +967,7 @@ static DECLCALLBACK(int) drvHostSerialMonitorThread(PPDMDRVINS pDrvIns, PPDMTHRE /* * Wait for status line change. */ - rc = ioctl(pThis->DeviceFile, TIOCMIWAIT, &uStatusLinesToCheck); + rc = ioctl(pThis->DeviceFile, TIOCMIWAIT, uStatusLinesToCheck); if (pThread->enmState != PDMTHREADSTATE_RUNNING) break; if (rc < 0) diff --git a/src/VBox/Devices/Storage/ATAController.h b/src/VBox/Devices/Storage/ATAController.h index 7f1eaf642..74bf07686 100644 --- a/src/VBox/Devices/Storage/ATAController.h +++ b/src/VBox/Devices/Storage/ATAController.h @@ -1,4 +1,4 @@ -/* $Id: ATAController.h 15252 2008-12-10 15:37:23Z vboxsync $ */ +/* $Id: ATAController.h $ */ /** @file * DevATA, DevAHCI - Shared ATA/ATAPI controller types. */ diff --git a/src/VBox/Devices/Storage/Debug.cpp b/src/VBox/Devices/Storage/Debug.cpp index c8322554d..09d96fe8f 100644 --- a/src/VBox/Devices/Storage/Debug.cpp +++ b/src/VBox/Devices/Storage/Debug.cpp @@ -1,4 +1,4 @@ -/* $Id: Debug.cpp 12927 2008-10-02 11:34:15Z vboxsync $ */ +/* $Id: Debug.cpp $ */ /** @file * VBox storage devices: debug helpers */ diff --git a/src/VBox/Devices/Storage/DevATA.cpp b/src/VBox/Devices/Storage/DevATA.cpp index 6ae66c60c..1acec6218 100644 --- a/src/VBox/Devices/Storage/DevATA.cpp +++ b/src/VBox/Devices/Storage/DevATA.cpp @@ -1,4 +1,4 @@ -/* $Id: DevATA.cpp 16114 2009-01-21 09:13:08Z vboxsync $ */ +/* $Id: DevATA.cpp $ */ /** @file * VBox storage devices: ATA/ATAPI controller device (disk and cdrom). */ @@ -1351,7 +1351,86 @@ static void ataSetSector(ATADevState *s, uint64_t iLBA) } -static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf, uint32_t cSectors) +static void ataWarningDiskFull(PPDMDEVINS pDevIns) +{ + int rc; + LogRel(("PIIX3 ATA: Host disk full\n")); + rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), + false, "DevATA_DISKFULL", + N_("Host system reported disk full. VM execution is suspended. You can resume after freeing some space")); + AssertRC(rc); +} + +static void ataWarningFileTooBig(PPDMDEVINS pDevIns) +{ + int rc; + LogRel(("PIIX3 ATA: File too big\n")); + rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), + false, "DevATA_FILETOOBIG", + N_("Host system reported that the file size limit of the host file system has been exceeded. VM execution is suspended. You need to move your virtual hard disk to a filesystem which allows bigger files")); + AssertRC(rc); +} + +static void ataWarningISCSI(PPDMDEVINS pDevIns) +{ + int rc; + LogRel(("PIIX3 ATA: iSCSI target unavailable\n")); + rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), + false, "DevATA_ISCSIDOWN", + N_("The iSCSI target has stopped responding. VM execution is suspended. You can resume when it is available again")); + AssertRC(rc); +} + +/** + * Suspend I/O operations on a controller. Also suspends EMT, because it's + * waiting for I/O to make progress. The next attempt to perform an I/O + * operation will be made when EMT is resumed up again (as the resume + * callback below restarts I/O). + * + * @param pCtl Controller for which to suspend I/O. + */ +static void ataSuspendRedo(PATACONTROLLER pCtl) +{ + PPDMDEVINS pDevIns = CONTROLLER_2_DEVINS(pCtl); + PVMREQ pReq; + int rc; + + pCtl->fRedoIdle = true; + rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, + (PFNRT)PDMDevHlpVMSuspend, 1, pDevIns); + AssertReleaseRC(rc); + VMR3ReqFree(pReq); +} + +bool ataIsRedoSetWarning(ATADevState *s, int rc) +{ + PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s); + Assert(!PDMCritSectIsOwner(&pCtl->lock)); + if (rc == VERR_DISK_FULL) + { + ataWarningDiskFull(ATADEVSTATE_2_DEVINS(s)); + ataSuspendRedo(pCtl); + return true; + } + if (rc == VERR_FILE_TOO_BIG) + { + ataWarningFileTooBig(ATADEVSTATE_2_DEVINS(s)); + ataSuspendRedo(pCtl); + return true; + } + if (rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_REFUSED) + { + /* iSCSI connection abort (first error) or failure to reestablish + * connection (second error). Pause VM. On resume we'll retry. */ + ataWarningISCSI(ATADEVSTATE_2_DEVINS(s)); + ataSuspendRedo(pCtl); + return true; + } + return false; +} + + +static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf, uint32_t cSectors, bool *fRedo) { PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s); int rc; @@ -1366,6 +1445,11 @@ static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf, uint3 STAM_REL_COUNTER_ADD(&s->StatBytesRead, cSectors * 512); + if (RT_SUCCESS(rc)) + *fRedo = false; + else + *fRedo = ataIsRedoSetWarning(s, rc); + STAM_PROFILE_START(&pCtl->StatLockWait, a); PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS); STAM_PROFILE_STOP(&pCtl->StatLockWait, a); @@ -1373,7 +1457,7 @@ static int ataReadSectors(ATADevState *s, uint64_t u64Sector, void *pvBuf, uint3 } -static int ataWriteSectors(ATADevState *s, uint64_t u64Sector, const void *pvBuf, uint32_t cSectors) +static int ataWriteSectors(ATADevState *s, uint64_t u64Sector, const void *pvBuf, uint32_t cSectors, bool *fRedo) { PATACONTROLLER pCtl = ATADEVSTATE_2_CONTROLLER(s); int rc; @@ -1396,6 +1480,11 @@ static int ataWriteSectors(ATADevState *s, uint64_t u64Sector, const void *pvBuf STAM_REL_COUNTER_ADD(&s->StatBytesWritten, cSectors * 512); + if (RT_SUCCESS(rc)) + *fRedo = false; + else + *fRedo = ataIsRedoSetWarning(s, rc); + STAM_PROFILE_START(&pCtl->StatLockWait, a); PDMCritSectEnter(&pCtl->lock, VINF_SUCCESS); STAM_PROFILE_STOP(&pCtl->StatLockWait, a); @@ -1417,50 +1506,18 @@ static void ataReadWriteSectorsBT(ATADevState *s) } -static void ataWarningDiskFull(PPDMDEVINS pDevIns) -{ - int rc; - LogRel(("PIIX3 ATA: Host disk full\n")); - rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), - false, "DevATA_DISKFULL", - N_("Host system reported disk full. VM execution is suspended. You can resume after freeing some space")); - AssertRC(rc); -} - - -static void ataWarningFileTooBig(PPDMDEVINS pDevIns) -{ - int rc; - LogRel(("PIIX3 ATA: File too big\n")); - rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), - false, "DevATA_FILETOOBIG", - N_("Host system reported that the file size limit of the host file system has been exceeded. VM execution is suspended. You need to move your virtual hard disk to a filesystem which allows bigger files")); - AssertRC(rc); -} - - -static void ataWarningISCSI(PPDMDEVINS pDevIns) -{ - int rc; - LogRel(("PIIX3 ATA: iSCSI target unavailable\n")); - rc = VMSetRuntimeError(PDMDevHlpGetVM(pDevIns), - false, "DevATA_ISCSIDOWN", - N_("The iSCSI target has stopped responding. VM execution is suspended. You can resume when it is available again")); - AssertRC(rc); -} - - static bool ataReadSectorsSS(ATADevState *s) { int rc; uint32_t cSectors; uint64_t iLBA; + bool fRedo; cSectors = s->cbElementaryTransfer / 512; Assert(cSectors); iLBA = ataGetSector(s); Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA)); - rc = ataReadSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors); + rc = ataReadSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo); if (RT_SUCCESS(rc)) { ataSetSector(s, iLBA + cSectors); @@ -1470,23 +1527,8 @@ static bool ataReadSectorsSS(ATADevState *s) } else { - if (rc == VERR_DISK_FULL) - { - ataWarningDiskFull(ATADEVSTATE_2_DEVINS(s)); - return true; - } - if (rc == VERR_FILE_TOO_BIG) - { - ataWarningFileTooBig(ATADEVSTATE_2_DEVINS(s)); - return true; - } - if (rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_REFUSED) - { - /* iSCSI connection abort (first error) or failure to reestablish - * connection (second error). Pause VM. On resume we'll retry. */ - ataWarningISCSI(ATADEVSTATE_2_DEVINS(s)); - return true; - } + if (fRedo) + return fRedo; if (s->cErrors++ < MAX_LOG_REL_ERRORS) LogRel(("PIIX3 ATA: LUN#%d: disk read error (rc=%Rrc iSector=%#RX64 cSectors=%#RX32)\n", s->iLUN, rc, iLBA, cSectors)); @@ -1498,7 +1540,6 @@ static bool ataReadSectorsSS(ATADevState *s) if (rc != VERR_INTERRUPTED) ataCmdError(s, ID_ERR); } - /** @todo implement redo for iSCSI */ return false; } @@ -1508,12 +1549,13 @@ static bool ataWriteSectorsSS(ATADevState *s) int rc; uint32_t cSectors; uint64_t iLBA; + bool fRedo; cSectors = s->cbElementaryTransfer / 512; Assert(cSectors); iLBA = ataGetSector(s); Log(("%s: %d sectors at LBA %d\n", __FUNCTION__, cSectors, iLBA)); - rc = ataWriteSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors); + rc = ataWriteSectors(s, iLBA, s->CTX_SUFF(pbIOBuffer), cSectors, &fRedo); if (RT_SUCCESS(rc)) { ataSetSector(s, iLBA + cSectors); @@ -1523,23 +1565,8 @@ static bool ataWriteSectorsSS(ATADevState *s) } else { - if (rc == VERR_DISK_FULL) - { - ataWarningDiskFull(ATADEVSTATE_2_DEVINS(s)); - return true; - } - if (rc == VERR_FILE_TOO_BIG) - { - ataWarningFileTooBig(ATADEVSTATE_2_DEVINS(s)); - return true; - } - if (rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_REFUSED) - { - /* iSCSI connection abort (first error) or failure to reestablish - * connection (second error). Pause VM. On resume we'll retry. */ - ataWarningISCSI(ATADEVSTATE_2_DEVINS(s)); - return true; - } + if (fRedo) + return fRedo; if (s->cErrors++ < MAX_LOG_REL_ERRORS) LogRel(("PIIX3 ATA: LUN#%d: disk write error (rc=%Rrc iSector=%#RX64 cSectors=%#RX32)\n", s->iLUN, rc, iLBA, cSectors)); @@ -1551,7 +1578,6 @@ static bool ataWriteSectorsSS(ATADevState *s) if (rc != VERR_INTERRUPTED) ataCmdError(s, ID_ERR); } - /** @todo implement redo for iSCSI */ return false; } @@ -4277,27 +4303,6 @@ static void ataDMATransfer(PATACONTROLLER pCtl) } -/** - * Suspend I/O operations on a controller. Also suspends EMT, because it's - * waiting for I/O to make progress. The next attempt to perform an I/O - * operation will be made when EMT is resumed up again (as the resume - * callback below restarts I/O). - * - * @param pCtl Controller for which to suspend I/O. - */ -static void ataSuspendRedo(PATACONTROLLER pCtl) -{ - PPDMDEVINS pDevIns = CONTROLLER_2_DEVINS(pCtl); - PVMREQ pReq; - int rc; - - pCtl->fRedoIdle = true; - rc = VMR3ReqCall(PDMDevHlpGetVM(pDevIns), VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, - (PFNRT)PDMDevHlpVMSuspend, 1, pDevIns); - AssertReleaseRC(rc); - VMR3ReqFree(pReq); -} - /** Asynch I/O thread for an interface. Once upon a time this was readable * code with several loops and a different semaphore for each purpose. But * then came the "how can one save the state in the middle of a PIO transfer" @@ -4452,7 +4457,6 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser) * request. Occurs very rarely, not worth optimizing. */ LogRel(("%s: Ctl#%d: redo entire operation\n", __FUNCTION__, ATACONTROLLER_IDX(pCtl))); ataAsyncIOPutRequest(pCtl, pReq); - ataSuspendRedo(pCtl); break; } } @@ -4557,7 +4561,6 @@ static DECLCALLBACK(int) ataAsyncIOLoop(RTTHREAD ThreadSelf, void *pvUser) { LogRel(("PIIX3 ATA: Ctl#%d: redo DMA operation\n", ATACONTROLLER_IDX(pCtl))); ataAsyncIOPutRequest(pCtl, &ataDMARequest); - ataSuspendRedo(pCtl); break; } diff --git a/src/VBox/Devices/Storage/DrvHostBase.cpp b/src/VBox/Devices/Storage/DrvHostBase.cpp index 25bd976a0..0dbc05e8f 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.cpp +++ b/src/VBox/Devices/Storage/DrvHostBase.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostBase.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/* $Id: DrvHostBase.cpp $ */ /** @file * DrvHostBase - Host base drive access driver. */ diff --git a/src/VBox/Devices/Storage/DrvHostBase.h b/src/VBox/Devices/Storage/DrvHostBase.h index b4202abb7..f8c0c5c8a 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.h +++ b/src/VBox/Devices/Storage/DrvHostBase.h @@ -1,4 +1,4 @@ -/* $Id: DrvHostBase.h 15831 2009-01-07 12:51:42Z vboxsync $ */ +/* $Id: DrvHostBase.h $ */ /** @file * DrvHostBase - Host base drive access driver. */ diff --git a/src/VBox/Devices/Storage/DrvHostDVD.cpp b/src/VBox/Devices/Storage/DrvHostDVD.cpp index 636b60ca0..4838288e0 100644 --- a/src/VBox/Devices/Storage/DrvHostDVD.cpp +++ b/src/VBox/Devices/Storage/DrvHostDVD.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvHostDVD.cpp 15831 2009-01-07 12:51:42Z vboxsync $ */ +/* $Id: DrvHostDVD.cpp $ */ /** @file * DrvHostDVD - Host DVD block driver. */ diff --git a/src/VBox/Devices/Storage/DrvVD.cpp b/src/VBox/Devices/Storage/DrvVD.cpp index 37d84677b..3980f8c79 100644 --- a/src/VBox/Devices/Storage/DrvVD.cpp +++ b/src/VBox/Devices/Storage/DrvVD.cpp @@ -1,4 +1,4 @@ -/* $Id: DrvVD.cpp 15592 2008-12-16 14:48:13Z vboxsync $ */ +/* $Id: DrvVD.cpp $ */ /** @file * DrvVD - Generic VBox disk media driver. */ diff --git a/src/VBox/Devices/Storage/RawHDDCore.cpp b/src/VBox/Devices/Storage/RawHDDCore.cpp index ec0f4c839..c15744b2f 100644 --- a/src/VBox/Devices/Storage/RawHDDCore.cpp +++ b/src/VBox/Devices/Storage/RawHDDCore.cpp @@ -1,4 +1,4 @@ -/* $Id: RawHDDCore.cpp 15366 2008-12-12 13:50:32Z vboxsync $ */ +/* $Id: RawHDDCore.cpp $ */ /** @file * RawHDDCore - Raw Disk image, Core Code. */ diff --git a/src/VBox/Devices/Storage/VBoxHDD-new.cpp b/src/VBox/Devices/Storage/VBoxHDD-new.cpp index 4c39ba12d..142de03e1 100644 --- a/src/VBox/Devices/Storage/VBoxHDD-new.cpp +++ b/src/VBox/Devices/Storage/VBoxHDD-new.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHDD-new.cpp 15591 2008-12-16 14:46:08Z vboxsync $ */ +/* $Id: VBoxHDD-new.cpp $ */ /** @file * VBoxHDD - VBox HDD Container implementation. */ diff --git a/src/VBox/Devices/Storage/VDICore.h b/src/VBox/Devices/Storage/VDICore.h index e6166ca7b..263287c0e 100644 --- a/src/VBox/Devices/Storage/VDICore.h +++ b/src/VBox/Devices/Storage/VDICore.h @@ -1,4 +1,4 @@ -/* $Id: VDICore.h 12639 2008-09-22 13:19:14Z vboxsync $ */ +/* $Id: VDICore.h $ */ /** @file * Virtual Disk Image (VDI), Core Code Header (internal). */ diff --git a/src/VBox/Devices/Storage/VmdkHDDCore.cpp b/src/VBox/Devices/Storage/VmdkHDDCore.cpp index 74f12b8fa..5172e6bbd 100644 --- a/src/VBox/Devices/Storage/VmdkHDDCore.cpp +++ b/src/VBox/Devices/Storage/VmdkHDDCore.cpp @@ -1,4 +1,4 @@ -/* $Id: VmdkHDDCore.cpp 15565 2008-12-16 09:45:10Z vboxsync $ */ +/* $Id: VmdkHDDCore.cpp $ */ /** @file * VMDK Disk image, Core Code. */ diff --git a/src/VBox/Devices/Storage/ide.h b/src/VBox/Devices/Storage/ide.h index b4b234531..ffcacfe43 100644 --- a/src/VBox/Devices/Storage/ide.h +++ b/src/VBox/Devices/Storage/ide.h @@ -1,4 +1,4 @@ -/* $Id: ide.h 12931 2008-10-02 11:46:56Z vboxsync $ */ +/* $Id: ide.h $ */ /** @file * VBox storage devices: ATA/ATAPI declarations */ diff --git a/src/VBox/Devices/Storage/testcase/Makefile.kmk b/src/VBox/Devices/Storage/testcase/Makefile.kmk index 6e1b336f5..e7074a911 100644 --- a/src/VBox/Devices/Storage/testcase/Makefile.kmk +++ b/src/VBox/Devices/Storage/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15366 2008-12-12 13:50:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the storage device & driver testcases. # diff --git a/src/VBox/Devices/VBoxDDUDeps.cpp b/src/VBox/Devices/VBoxDDUDeps.cpp index 41b9e790e..0f60eae8d 100644 --- a/src/VBox/Devices/VBoxDDUDeps.cpp +++ b/src/VBox/Devices/VBoxDDUDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDDUDeps.cpp 8770 2008-05-12 02:04:54Z vboxsync $ */ +/* $Id: VBoxDDUDeps.cpp $ */ /** @file * VBoxDDU - For dragging in library objects. */ diff --git a/src/VBox/Devices/VMMDev/VBoxDev.cpp b/src/VBox/Devices/VMMDev/VBoxDev.cpp index 92600a96d..a9b18ff24 100644 --- a/src/VBox/Devices/VMMDev/VBoxDev.cpp +++ b/src/VBox/Devices/VMMDev/VBoxDev.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDev.cpp 15534 2008-12-15 19:06:14Z vboxsync $ */ +/* $Id: VBoxDev.cpp $ */ /** @file * VMMDev - Guest <-> VMM/Host communication device. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp index fc004ef19..cb8b8ed49 100644 --- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp +++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDevHGCM.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/* $Id: VMMDevHGCM.cpp $ */ /** @file * VMMDev - HGCM - Host-Guest Communication Manager Device. */ diff --git a/src/VBox/Devices/VMMDev/VMMDevState.h b/src/VBox/Devices/VMMDev/VMMDevState.h index 3d890fc57..89443f820 100644 --- a/src/VBox/Devices/VMMDev/VMMDevState.h +++ b/src/VBox/Devices/VMMDev/VMMDevState.h @@ -1,4 +1,4 @@ -/* $Id: VMMDevState.h 12687 2008-09-24 14:07:47Z vboxsync $ */ +/* $Id: VMMDevState.h $ */ /** @file * VMMDev - Guest <-> VMM/Host communication device, internal header. */ diff --git a/src/VBox/Devices/testcase/Makefile.kmk b/src/VBox/Devices/testcase/Makefile.kmk index 9cb414ca3..153cdb117 100644 --- a/src/VBox/Devices/testcase/Makefile.kmk +++ b/src/VBox/Devices/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15478 2008-12-14 23:57:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Devices testcases. # diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp index b3493642f..90d08ab23 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDeviceStructSize.cpp 15475 2008-12-14 23:21:50Z vboxsync $ */ +/* $Id: tstDeviceStructSize.cpp $ */ /** @file * tstDeviceStructSize - testcase for check structure sizes/alignment * and to verify that HC and GC uses the same diff --git a/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp b/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp index 42992c7cd..8dcc87ccb 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSizeGC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDeviceStructSizeGC.cpp 16042 2009-01-19 12:06:00Z vboxsync $ */ +/* $Id: tstDeviceStructSizeGC.cpp $ */ /** @file * tstDeviceStructSizeGC - Generate structure member and size checks from the GC perspective. * diff --git a/src/VBox/Devices/vl_vbox.h b/src/VBox/Devices/vl_vbox.h index 0dd959311..de431f82f 100644 --- a/src/VBox/Devices/vl_vbox.h +++ b/src/VBox/Devices/vl_vbox.h @@ -1,4 +1,4 @@ -/* $Id: vl_vbox.h 12910 2008-10-02 09:36:48Z vboxsync $ */ +/* $Id: vl_vbox.h $ */ /** @file * VBox vl.h Replacement. * diff --git a/src/VBox/Disassembler/DisasmFormatBytes.cpp b/src/VBox/Disassembler/DisasmFormatBytes.cpp index 8c6eee18f..a57af8944 100644 --- a/src/VBox/Disassembler/DisasmFormatBytes.cpp +++ b/src/VBox/Disassembler/DisasmFormatBytes.cpp @@ -1,4 +1,4 @@ -/* $Id: DisasmFormatBytes.cpp 9266 2008-05-31 02:32:20Z vboxsync $ */ +/* $Id: DisasmFormatBytes.cpp $ */ /** @file * VBox Disassembler - Helper for formatting the opcode bytes. */ diff --git a/src/VBox/Disassembler/DisasmFormatYasm.cpp b/src/VBox/Disassembler/DisasmFormatYasm.cpp index 6f6d8810c..1cdf0fe63 100644 --- a/src/VBox/Disassembler/DisasmFormatYasm.cpp +++ b/src/VBox/Disassembler/DisasmFormatYasm.cpp @@ -1,4 +1,4 @@ -/* $Id: DisasmFormatYasm.cpp 11493 2008-08-19 15:59:34Z vboxsync $ */ +/* $Id: DisasmFormatYasm.cpp $ */ /** @file * VBox Disassembler - Yasm(/Nasm) Style Formatter. */ diff --git a/src/VBox/Disassembler/Makefile.kmk b/src/VBox/Disassembler/Makefile.kmk index 2f318685b..61df4045e 100644 --- a/src/VBox/Disassembler/Makefile.kmk +++ b/src/VBox/Disassembler/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12989 2008-10-06 02:15:39Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Disassembler. # diff --git a/src/VBox/Disassembler/testcase/Makefile.kmk b/src/VBox/Disassembler/testcase/Makefile.kmk index fc52a5b2e..aa4e22699 100644 --- a/src/VBox/Disassembler/testcase/Makefile.kmk +++ b/src/VBox/Disassembler/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15302 2008-12-11 12:32:27Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox Disassembler. # diff --git a/src/VBox/Disassembler/testcase/tstAsm.mac b/src/VBox/Disassembler/testcase/tstAsm.mac index faf860e93..a2e95722e 100644 --- a/src/VBox/Disassembler/testcase/tstAsm.mac +++ b/src/VBox/Disassembler/testcase/tstAsm.mac @@ -1,4 +1,4 @@ -; $Id: tstAsm.mac 8966 2008-05-20 16:48:02Z vboxsync $ +; $Id: tstAsm.mac $ ;; @file ; Disassembly testcase - Common header for the xREG macros. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm index eaab68045..274f2daef 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-1.asm 8979 2008-05-20 19:48:26Z vboxsync $ +; $Id: tstAsmLock-1.asm $ ;; @file ; Disassembly testcase - Valid lock sequences and related instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm index 086c642f0..0ad9db8ba 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-2.asm 8980 2008-05-20 19:50:06Z vboxsync $ +; $Id: tstAsmLock-2.asm $ ;; @file ; Disassembly testcase - Invalid invariants. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm index c50cbadfe..f9bceda8d 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmLock-3.asm 8966 2008-05-20 16:48:02Z vboxsync $ +; $Id: tstAsmLock-3.asm $ ;; @file ; Disassembly testcase - Invalid lock sequences for non-locking instructions. ; diff --git a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm index 47c9c4e1c..a3e2b9e19 100644 --- a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmRegs-1.asm 9925 2008-06-25 14:42:31Z vboxsync $ +; $Id: tstAsmRegs-1.asm $ ;; @file ; Disassembly testcase - Accessing all the registers ; diff --git a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp index 7b18363a4..aa457e40e 100644 --- a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp +++ b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDisasm-2.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstDisasm-2.cpp $ */ /** @file * Testcase - Generic Disassembler Tool. */ diff --git a/src/VBox/Frontends/Makefile.kmk b/src/VBox/Frontends/Makefile.kmk index 1654354ed..340b727d2 100644 --- a/src/VBox/Frontends/Makefile.kmk +++ b/src/VBox/Frontends/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12260 2008-09-09 03:04:28Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox frontends. # diff --git a/src/VBox/Frontends/VBoxBFE/Makefile.kmk b/src/VBox/Frontends/VBoxBFE/Makefile.kmk index 0c3dc5b60..189d6200d 100644 --- a/src/VBox/Frontends/VBoxBFE/Makefile.kmk +++ b/src/VBox/Frontends/VBoxBFE/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16012 2009-01-17 23:46:56Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxBFE (a basic frontend which doesn't make use of Main). # diff --git a/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp b/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp index 562d2852e..79a948e9a 100644 --- a/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp +++ b/src/VBox/Frontends/VBoxBFE/USBProxyServiceLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: USBProxyServiceLinux.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: USBProxyServiceLinux.cpp $ */ /** @file * VBox frontends: Basic Frontend (BFE): * Implementation of USBProxyServiceLinux class diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp index 065c235b7..83254d324 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxBFE.cpp 15256 2008-12-10 15:53:00Z vboxsync $ */ +/* $Id: VBoxBFE.cpp $ */ /** @file * Basic Frontend (BFE): VBoxBFE main routines. * diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp index 59deb3bbe..10d8f87ff 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxBFEHardened.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: VBoxBFEHardened.cpp $ */ /** @file * VBoxSDL - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxFB/Makefile.kmk b/src/VBox/Frontends/VBoxFB/Makefile.kmk index 3519a99b9..caa94c9f4 100644 --- a/src/VBox/Frontends/VBoxFB/Makefile.kmk +++ b/src/VBox/Frontends/VBoxFB/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12258 2008-09-09 03:01:02Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxFB. # diff --git a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk index 225d643b2..43848e244 100644 --- a/src/VBox/Frontends/VBoxHeadless/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12258 2008-09-09 03:01:02Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the headless frontend. # diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp index e0fbec133..ece3cc2bc 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHeadlessHardened.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: VBoxHeadlessHardened.cpp $ */ /** @file * VBoxHeadless - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk index e1332f754..450d44513 100644 --- a/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/VideoCapture/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12258 2008-09-09 03:01:02Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the ffmpeg frame buffer module. # diff --git a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk index fffbee31e..0fb9374b7 100644 --- a/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk +++ b/src/VBox/Frontends/VBoxHeadless/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12258 2008-09-09 03:01:02Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VRDP (headless RDP server) frontend testcase. # diff --git a/src/VBox/Frontends/VBoxManage/Makefile.kmk b/src/VBox/Frontends/VBoxManage/Makefile.kmk index 1f39bf3d8..ea2adee80 100644 --- a/src/VBox/Frontends/VBoxManage/Makefile.kmk +++ b/src/VBox/Frontends/VBoxManage/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15492 2008-12-15 10:36:07Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxManage (the cli frontend). # diff --git a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp index 9d2706e3a..b2c48f0ae 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxInternalManage.cpp 16052 2009-01-19 18:24:29Z vboxsync $ */ +/* $Id: VBoxInternalManage.cpp $ */ /** @file * VBoxManage - The 'internalcommands' command. * diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp index 150ad05ea..c5dbde6bd 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManage.cpp 16052 2009-01-19 18:24:29Z vboxsync $ */ +/* $Id: VBoxManage.cpp $ */ /** @file * VBoxManage - VirtualBox's command-line interface. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManage.h b/src/VBox/Frontends/VBoxManage/VBoxManage.h index 70cdc0c33..a9bf3326e 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManage.h +++ b/src/VBox/Frontends/VBoxManage/VBoxManage.h @@ -1,4 +1,4 @@ -/* $Id: VBoxManage.h 16057 2009-01-19 19:21:02Z vboxsync $ */ +/* $Id: VBoxManage.h $ */ /** @file * VBoxManage - VirtualBox command-line interface, internal header file. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp index 1f2a408d7..7ec586576 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageDisk.cpp 16150 2009-01-21 16:53:45Z vboxsync $ */ +/* $Id: VBoxManageDisk.cpp $ */ /** @file * VBoxManage - The disk delated commands. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp index 31a706e6c..a3beb5b6a 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageGuestProp.cpp 16104 2009-01-20 21:52:07Z vboxsync $ */ +/* $Id: VBoxManageGuestProp.cpp $ */ /** @file * VBoxManage - The 'guestproperty' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp index b13e471d7..d1cc919d3 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageInfo.cpp 16052 2009-01-19 18:24:29Z vboxsync $ */ +/* $Id: VBoxManageInfo.cpp $ */ /** @file * VBoxManage - The 'showvminfo' command and helper routines. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp index 6ef9a6ed7..ff5e24b5f 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageList.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageList.cpp 16052 2009-01-19 18:24:29Z vboxsync $ */ +/* $Id: VBoxManageList.cpp $ */ /** @file * VBoxManage - The 'list' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp index fbd8469a7..3d23722ed 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageMetrics.cpp 16052 2009-01-19 18:24:29Z vboxsync $ */ +/* $Id: VBoxManageMetrics.cpp $ */ /** @file * VBoxManage - The 'metrics' command. */ diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp index 4b79fd499..811b46581 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageSVN.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxManageSVN.cpp 14732 2008-11-27 18:44:11Z vboxsync $ */ +/* $Id: VBoxManageSVN.cpp $ */ /** @file * VBoxManage - VBoxSVNRev(), separate file to speed up the build. */ diff --git a/src/VBox/Frontends/VBoxSDL/Makefile.kmk b/src/VBox/Frontends/VBoxSDL/Makefile.kmk index bdb40e16a..a7d9fc3fb 100644 --- a/src/VBox/Frontends/VBoxSDL/Makefile.kmk +++ b/src/VBox/Frontends/VBoxSDL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16012 2009-01-17 23:46:56Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxSDL (a simple frontend based on SDL). # diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp index a4e206b34..ac6fa3a47 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxSDLHardened.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: VBoxSDLHardened.cpp $ */ /** @file * VBoxSDL - Hardened main(). */ diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m index f790b701e..f790b701e 100755..100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLMain-darwin.m diff --git a/src/VBox/Frontends/VirtualBox/Makefile.kmk b/src/VBox/Frontends/VirtualBox/Makefile.kmk index 63d807c25..1cf9d34f5 100644 --- a/src/VBox/Frontends/VirtualBox/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14728 2008-11-27 18:01:16Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VirtualBox Qt3 GUI. # diff --git a/src/VBox/Frontends/VirtualBox/include/VBoxAquaStyle.h b/src/VBox/Frontends/VirtualBox/include/VBoxAquaStyle.h index 7d2454eac..bdd41de15 100644 --- a/src/VBox/Frontends/VirtualBox/include/VBoxAquaStyle.h +++ b/src/VBox/Frontends/VirtualBox/include/VBoxAquaStyle.h @@ -1,4 +1,4 @@ -/** $Id: $ */ +/** $Id: $ */ /** @file * Qt GUI - VBox Variation on the QAquaStyle. */ diff --git a/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h b/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h index 9a439e2be..402967611 100644 --- a/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h +++ b/src/VBox/Frontends/VirtualBox/include/VBoxIChatTheaterWrapper.h @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.h $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp index 49bb08a0e..fcd00e6f5 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBQuartz2D.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFBQuartz2D.cpp 12631 2008-09-22 09:33:54Z vboxsync $ */ +/* $Id: VBoxFBQuartz2D.cpp $ */ /** @file * Qt GUI (aka VirtualBox) - Quartz2D framebuffer implementation. */ diff --git a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp index 0fbbc9d68..b2546f4cd 100644 --- a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp +++ b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxAquaStyle.cpp @@ -1,4 +1,4 @@ -/** $Id: $ */ +/** $Id: $ */ /** @file * Qt GUI - VBox Variation on the QAquaStyle. */ diff --git a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxIChatTheaterWrapper.m b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxIChatTheaterWrapper.m index a135022c3..dc4491f92 100644 --- a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxIChatTheaterWrapper.m +++ b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxIChatTheaterWrapper.m @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.m 8170 2008-04-18 17:52:25Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.m $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp index 60f1b8aa4..fa19ed42b 100644 --- a/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp +++ b/src/VBox/Frontends/VirtualBox/src/darwin/VBoxUtils-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUtils-darwin.cpp 8444 2008-04-29 08:38:27Z vboxsync $ */ +/* $Id: VBoxUtils-darwin.cpp $ */ /** @file * Qt GUI - Utility Classes and Functions specific to Darwin. */ diff --git a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp index 589dcb28b..a1572c766 100644 --- a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp +++ b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp @@ -1,4 +1,4 @@ -/* $Id: hardenedmain.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: hardenedmain.cpp $ */ /** @file * VirtualBox3 - Hardened main(). */ diff --git a/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.asm b/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.asm index 3dada14c1..cce66e212 100644 --- a/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.asm +++ b/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.asm @@ -1,4 +1,4 @@ -; $Id: VBoxHlp.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxHlp.asm $ ;; @file ; ; VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.cpp b/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.cpp index a9e90c8db..8e6ab02ac 100644 --- a/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.cpp +++ b/src/VBox/Frontends/VirtualBox/src/os2/VBoxHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHlp.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxHlp.cpp $ */ /** @file * VBox frontends: Qt GUI ("VirtualBox"): * Implementation of OS/2-specific helpers that require to reside in a DLL diff --git a/src/VBox/Frontends/VirtualBox4/Makefile.kmk b/src/VBox/Frontends/VirtualBox4/Makefile.kmk index 21bd7f486..2ac3f85d9 100644 --- a/src/VBox/Frontends/VirtualBox4/Makefile.kmk +++ b/src/VBox/Frontends/VirtualBox4/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16023 2009-01-19 03:54:24Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VirtualBox Qt GUI. # diff --git a/src/VBox/Frontends/VirtualBox4/include/VBoxAquaStyle.h b/src/VBox/Frontends/VirtualBox4/include/VBoxAquaStyle.h index 251aa6a6c..09ba7d3d1 100644 --- a/src/VBox/Frontends/VirtualBox4/include/VBoxAquaStyle.h +++ b/src/VBox/Frontends/VirtualBox4/include/VBoxAquaStyle.h @@ -1,4 +1,4 @@ -/** $Id: $ */ +/** $Id: $ */ /** @file * Qt GUI - VBox Variation on the QAquaStyle. */ diff --git a/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h b/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h index f233a8da8..979aeb26a 100644 --- a/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h +++ b/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h @@ -34,6 +34,7 @@ #include <QMap> #include <QColor> #include <QDialog> +#include <QMenu> #ifdef VBOX_WITH_DEBUGGER_GUI # include <VBox/dbggui.h> @@ -48,7 +49,6 @@ class QAction; class QActionGroup; class QLabel; class QSpacerItem; -class QMenu; class VBoxConsoleView; class QIStateIndicator; @@ -58,6 +58,22 @@ class VBoxSwitchMenu; class VBoxChangeDockIconUpdateEvent; +/* We want to make the first action highlighted but not + * selected, but Qt makes the both or neither one of this, + * so, just move the focus to the next eligible object, + * which will be the first menu action. This little + * subclass made only for that purpose. */ +class QIMenu : public QMenu +{ + Q_OBJECT; + +public: + + QIMenu (QWidget *aParent) : QMenu (aParent) {} + + void selectFirstAction() { QMenu::focusNextChild(); } +}; + class VBoxConsoleWnd : public QIWithRetranslateUI2<QMainWindow> { Q_OBJECT; @@ -73,8 +89,8 @@ public: void refreshView(); - bool isWindowMaximized() const - { + bool isWindowMaximized() const + { #ifdef Q_WS_MAC /* On Mac OS X we didn't really jump to the fullscreen mode but * maximize the window. This situation has to be considered when @@ -82,10 +98,10 @@ public: return !(isTrueSeamless()) && QMainWindow::isMaximized(); #else /* Q_WS_MAC */ return QMainWindow::isMaximized(); -#endif /* Q_WS_MAC */ +#endif /* Q_WS_MAC */ } - bool isWindowFullScreen() const - { + bool isWindowFullScreen() const + { #ifdef Q_WS_MAC /* On Mac OS X we didn't really jump to the fullscreen mode but * maximize the window. This situation has to be considered when @@ -93,7 +109,7 @@ public: return isTrueFullscreen() || isTrueSeamless(); #else /* Q_WS_MAC */ return QMainWindow::isFullScreen(); -#endif /* Q_WS_MAC */ +#endif /* Q_WS_MAC */ } bool isTrueFullscreen() const { return mIsFullscreen; } @@ -235,7 +251,7 @@ private slots: private: /** Popup version of the main menu */ - QMenu *mMainMenu; + QIMenu *mMainMenu; QActionGroup *mRunningActions; QActionGroup *mRunningOrPausedActions; diff --git a/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h b/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h index 6c30828ef..d985eecc3 100644 --- a/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h +++ b/src/VBox/Frontends/VirtualBox4/include/VBoxGlobal.h @@ -1019,6 +1019,7 @@ public slots: void showRegistrationDialog (bool aForce = true); void showUpdateDialog (bool aForce = true); + void perDayNewVersionNotifier(); protected: diff --git a/src/VBox/Frontends/VirtualBox4/include/VBoxIChatTheaterWrapper.h b/src/VBox/Frontends/VirtualBox4/include/VBoxIChatTheaterWrapper.h index 9a439e2be..402967611 100644 --- a/src/VBox/Frontends/VirtualBox4/include/VBoxIChatTheaterWrapper.h +++ b/src/VBox/Frontends/VirtualBox4/include/VBoxIChatTheaterWrapper.h @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.h $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h b/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h index 9b365c240..e0804fd3e 100644 --- a/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h +++ b/src/VBox/Frontends/VirtualBox4/include/VBoxProblemReporter.h @@ -231,6 +231,8 @@ public: void cannotDeleteMachine (const CVirtualBox &vbox, const CMachine &machine); void cannotDiscardSavedState (const CConsole &console); + void cannotSendACPIToMachine(); + void cannotSetSnapshotFolder (const CMachine &aMachine, const QString &aPath); void cannotDiscardSnapshot (const CConsole &aConsole, const QString &aSnapshotName); diff --git a/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk index 3d951ab73..aee9355ad 100644 --- a/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk +++ b/src/VBox/Frontends/VirtualBox4/nls/ApprovedLanguages.kmk @@ -1,4 +1,4 @@ -# $Id: ApprovedLanguages.kmk 12955 2008-10-02 19:09:28Z vboxsync $ +# $Id: ApprovedLanguages.kmk $ ## @file # ApprovedLanguages.kmk - List of approved GUI translations # diff --git a/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_de.ts index b8d9208b2..1d438b5f5 100644 --- a/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_de.ts +++ b/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_de.ts @@ -4,31 +4,31 @@ <context> <name>@@@</name> <message> - <location filename="../src/VBoxGlobal.cpp" line="3267"/> + <location filename="../src/VBoxGlobal.cpp" line="3268"/> <source>English</source> <comment>Native language name</comment> <translation>Deutsch</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3279"/> + <location filename="../src/VBoxGlobal.cpp" line="3280"/> <source>--</source> <comment>Native language country name (empty if this language is for all countries)</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3291"/> + <location filename="../src/VBoxGlobal.cpp" line="3292"/> <source>English</source> <comment>Language name, in English</comment> <translation>German</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3303"/> + <location filename="../src/VBoxGlobal.cpp" line="3304"/> <source>--</source> <comment>Language country name, in English (empty if native country name is empty)</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3315"/> + <location filename="../src/VBoxGlobal.cpp" line="3316"/> <source>Sun Microsystems, Inc.</source> <comment>Comma-separated list of translators</comment> <translation>Sun Microsystems, Inc.</translation> @@ -494,7 +494,7 @@ <message> <location filename="../ui/VBoxCloseVMDlg.ui" line="133"/> <source>S&end the shutdown signal</source> - <translation>S&ende Signal zum Herunterfahren</translation> + <translation>die virtuelle Maschine mittels ACPI-Event &herunterfahren</translation> </message> <message> <location filename="../ui/VBoxCloseVMDlg.ui" line="207"/> @@ -520,490 +520,490 @@ <context> <name>VBoxConsoleWnd</name> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1574"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1583"/> <source>VirtualBox OSE</source> <translation>VirtualBox OSE</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1594"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1605"/> <source>&Fullscreen Mode</source> <translation>&Vollbildmodus</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1595"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1606"/> <source>Switch to fullscreen mode</source> <translation>Schaltet in den Vollbildmodus</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1601"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1612"/> <source>Mouse Integration</source> <comment>enable/disable...</comment> <translation>Mauszeiger-Integration</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1603"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1614"/> <source>Auto-resize Guest Display</source> <comment>enable/disable...</comment> <translation>Größe des Gastes automatisch anpassen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1604"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1615"/> <source>Auto-resize &Guest Display</source> <translation>Größe des &Gastes automatisch anpassen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1608"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1619"/> <source>Automatically resize the guest display when the window is resized (requires Guest Additions)</source> <translation>Passt die Größe der Gastanzeige automatisch an, wenn sich die Fenstergröße ändert (erfordert Gasterweiterungen)</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1610"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1621"/> <source>&Adjust Window Size</source> <translation>Fenstergröße &anpassen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1612"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1623"/> <source>Adjust window size and position to best fit the guest display</source> <translation>Passt Fenstergröße und -position an die Auflösung des Gastes an</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1616"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1627"/> <source>Send the Ctrl-Alt-Del sequence to the virtual machine</source> <translation>Sendet die Sequenz Strg-Alt-Entf (Affengriff) an die virtuelle Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1619"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1630"/> <source>&Insert Ctrl-Alt-Backspace</source> <translation>&Sende Strg-Alt-Rücktaste</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1622"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1633"/> <source>Send the Ctrl-Alt-Backspace sequence to the virtual machine</source> <translation>Sendet die Sequenz Strg-Alt-Rücktaste an die virtuelle Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1625"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1636"/> <source>&Reset</source> <translation>&Zurücksetzen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1626"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1637"/> <source>Reset the virtual machine</source> <translation>Zurücksetzen der virtuellen Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1634"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1645"/> <source>ACPI S&hutdown</source> <translation>Ausschalten per &ACPI</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1637"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1648"/> <source>Send the ACPI Power Button press event to the virtual machine</source> <translation>Sendet das ACPI-Ereignis "Einschaltknopf gedrückt" an die virtuelle Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1639"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1650"/> <source>&Close...</source> <translation>&Schließen...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1640"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1651"/> <source>Close the virtual machine</source> <translation>Schließt die virtuelle Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1643"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1654"/> <source>Take &Snapshot...</source> <translation>&Sicherungspunkt erstellen...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1644"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1655"/> <source>Take a snapshot of the virtual machine</source> <translation>Erstellt einen Sicherungspunkt der virtuellen Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1654"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1665"/> <source>&Floppy Image...</source> <translation>&Diskettenabbild...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1655"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1666"/> <source>Mount a floppy image file</source> <translation>Bindet ein Diskettenabbild ein</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1657"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1668"/> <source>Unmount F&loppy</source> <translation>&Diskettenlaufwerk trennen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1659"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1670"/> <source>Unmount the currently mounted floppy media</source> <translation>Trennt das momentan zugewiesene Diskettenmedium</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1661"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1672"/> <source>&CD/DVD-ROM Image...</source> <translation>&CD/DVD-ROM-Abbild...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1663"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1674"/> <source>Mount a CD/DVD-ROM image file</source> <translation>Bindet ein CD/DVD-ROM-Abblid ein</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1665"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1676"/> <source>Unmount C&D/DVD-ROM</source> <translation>&CD/DVD-ROM trennen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1667"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1678"/> <source>Unmount the currently mounted CD/DVD-ROM media</source> <translation>Momentan zugewiesenes CD/DVD-ROM-Medium trennen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1671"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1682"/> <source>Remote Dis&play</source> <translation>&Fernsteuerung aktivieren</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1673"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1684"/> <source>Enable or disable remote desktop (RDP) connections to this machine</source> <translation>Ein- oder Ausschalten der Fernsteuerung (remote desktop protocol, RDP) für diese virtuelle Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1675"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1686"/> <source>&Shared Folders...</source> <translation>&Gemeinsame Ordner...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1677"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1688"/> <source>Open the dialog to operate on shared folders</source> <translation>Öffnet den Dialog für gemeinsame Ordner</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1679"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1690"/> <source>&Install Guest Additions...</source> <translation>&Gasterweiterungen installieren...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1681"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1692"/> <source>Mount the Guest Additions installation image</source> <translation>Medium mit Gasterweiterungen einbinden</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1700"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1711"/> <source>Mount &Floppy</source> <translation>&Diskettenlaufwerk einbinden</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1701"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1712"/> <source>Mount &CD/DVD-ROM</source> <translation>&CD/DVD-ROM einbinden</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1703"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1714"/> <source>&USB Devices</source> <translation>&USB-Geräte</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1710"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1721"/> <source>&Devices</source> <translation>&Geräte</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1715"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1726"/> <source>De&bug</source> <translation>De&bug</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1717"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1728"/> <source>&Help</source> <translation>&Hilfe</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1987"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1998"/> <source><hr>VRDP Server is listening on port %1</source> <translation><hr>VRDP-Server lauscht an Port %1</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2066"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2077"/> <source>&Pause</source> <translation>&Pause</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2068"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2079"/> <source>Suspend the execution of the virtual machine</source> <translation>Suspendiert die Ausführung der virtuellen Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2072"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2083"/> <source>R&esume</source> <translation>&Fortfahren</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2074"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2085"/> <source>Resume the execution of the virtual machine</source> <translation>Fährt mit der Ausführung der virtuellen Maschine fort</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2082"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2093"/> <source>Disable &Mouse Integration</source> <translation>&Mauszeiger-Integration deaktivieren</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2085"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2096"/> <source>Temporarily disable host mouse pointer integration</source> <translation>Integration des Mauszeigers vorübergehend deaktivieren</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2089"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2100"/> <source>Enable &Mouse Integration</source> <translation>&Mauszeiger-Integration aktivieren</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2092"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2103"/> <source>Enable temporarily disabled host mouse pointer integration</source> <translation>Aktiviert vorübergehend die deaktivierte Integration des Mauszeigers</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2633"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2647"/> <source>Snapshot %1</source> <translation>Sicherungspunkt %1</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3052"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3066"/> <source>Host Drive </source> <translation>Host-Laufwerk </translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1614"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1625"/> <source>&Insert Ctrl-Alt-Del</source> <translation>&Sende Strg-Alt-Entf</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1707"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1718"/> <source>&Machine</source> <translation>&Maschine</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1702"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1713"/> <source>&Network Adapters</source> <translation>&Netzwerkadapter</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3086"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3100"/> <source>Adapter %1</source> <comment>network</comment> <translation>Adapter %1</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3006"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3020"/> <source>Mount the selected physical drive of the host PC</source> <comment>Floppy tip</comment> <translation>Bindet das ausgewählte physische Laufwerk des Host-PCs ein</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3054"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3068"/> <source>Mount the selected physical drive of the host PC</source> <comment>CD/DVD tip</comment> <translation>Bindet das ausgewählte physische Laufwerk des Host-PCs ein</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3101"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3115"/> <source>Disconnect the cable from the selected virtual network adapter</source> <translation>Trennt das virtuelle Kabel vom ausgewählten Netzwerkadapter</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3102"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3116"/> <source>Connect the cable to the selected virtual network adapter</source> <translation>Verbindet das Kabel mit dem ausgewählten Netzwerkadapter</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1597"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1608"/> <source>Seam&less Mode</source> <translation>Naht&loser Mode</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1598"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1609"/> <source>Switch to seamless desktop integration mode</source> <translation>Schaltet in den nahtlosen Fenstermodus</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1789"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1800"/> <source><qt><nobr>Indicates the activity of the floppy media:</nobr>%1</qt></source> <comment>Floppy tooltip</comment> <translation>Zeigt die Aktivität der Diskette:<nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1802"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1813"/> <source><br><nobr><b>Host Drive</b>: %1</nobr></source> <comment>Floppy tooltip</comment> <translation><br><nobr><b>Hostlaufwerk</b>: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1809"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1820"/> <source><br><nobr><b>Image</b>: %1</nobr></source> <comment>Floppy tooltip</comment> <translation><br><nobr><b>Abbild</b>: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1815"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1826"/> <source><br><nobr><b>No media mounted</b></nobr></source> <comment>Floppy tooltip</comment> <translation><br><nobr><b>Kein Medium zugewiesen</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1833"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1844"/> <source><qt><nobr>Indicates the activity of the CD/DVD-ROM media:</nobr>%1</qt></source> <comment>DVD-ROM tooltip</comment> <translation><qt><nobr>Zeigt die Aktivität des CD/DVD-ROM-Mediums:</nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1846"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1857"/> <source><br><nobr><b>Host Drive</b>: %1</nobr></source> <comment>DVD-ROM tooltip</comment> <translation><br><nobr><b>Hostlaufwerk</b>: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1853"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1864"/> <source><br><nobr><b>Image</b>: %1</nobr></source> <comment>DVD-ROM tooltip</comment> <translation><br><nobr><b>Abbild</b>: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1859"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1870"/> <source><br><nobr><b>No media mounted</b></nobr></source> <comment>DVD-ROM tooltip</comment> <translation><br><nobr><b>Kein Medium zugewiesen</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1871"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1882"/> <source><qt><nobr>Indicates the activity of virtual hard disks:</nobr>%1</qt></source> <comment>HDD tooltip</comment> <translation><qt><nobr>Zeigt die Aktivität der virtuellen Festplatten:</nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1888"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1899"/> <source><br><nobr><b>No hard disks attached</b></nobr></source> <comment>HDD tooltip</comment> <translation><br><nobr><b>Keine Festplatten angeschlossen</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1909"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1920"/> <source><qt><nobr>Indicates the activity of the network interfaces:</nobr>%1</qt></source> <comment>Network adapters tooltip</comment> <translation><qt><nobr>Zeigt die Aktivität der Netzinterfaces:</nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1918"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1929"/> <source><br><nobr><b>Adapter %1 (%2)</b>: cable %3</nobr></source> <comment>Network adapters tooltip</comment> <translation><br><nobr><b>Adapter %1 (%2)</b>: Kabel %3</nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1921"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1932"/> <source>connected</source> <comment>Network adapters tooltip</comment> <translation>verbunden</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1922"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1933"/> <source>disconnected</source> <comment>Network adapters tooltip</comment> <translation>getrennt</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1927"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1938"/> <source><br><nobr><b>All network adapters are disabled</b></nobr></source> <comment>Network adapters tooltip</comment> <translation><br><nobr><b>Alle Netzwerkadapter sind deaktiviert</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1939"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1950"/> <source><qt><nobr>Indicates the activity of the attached USB devices:</nobr>%1</qt></source> <comment>USB device tooltip</comment> <translation><qt><nobr>Zeigt die Aktivität der angeschlossenen USB-Geräte:</nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1957"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1968"/> <source><br><nobr><b>No USB devices attached</b></nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr><b>Keine USB-Geräte angeschlossen</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1964"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1975"/> <source><br><nobr><b>USB Controller is disabled</b></nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr><b>USB-Controller ist deaktiviert</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1996"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2007"/> <source><qt><nobr>Indicates the activity of shared folders:</nobr>%1</qt></source> <comment>Shared folders tooltip</comment> <translation><qt><nobr>Zeigt die Aktivität der gemeinsamen Ordner:</nobr>%1</qt></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2034"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2045"/> <source><br><nobr><b>No shared folders</b></nobr></source> <comment>Shared folders tooltip</comment> <translation><br><nobr><b>Keine gemeinsamen Ordner</b></nobr></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1646"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1657"/> <source>Session I&nformation Dialog</source> <translation>Session-I&nformationen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1648"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1659"/> <source>Show Session Information Dialog</source> <translation>Zeigt einen Dialog mit Session-Informationen</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1576"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1585"/> <source>Sun xVM VirtualBox</source> <translation></translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1687"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1698"/> <source>&Statistics...</source> <comment>debug action</comment> <translation>&Statistiken...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1689"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1700"/> <source>&Command Line...</source> <comment>debug action</comment> <translation>&Kommandozeile...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1726"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1737"/> <source>Indicates whether the guest display auto-resize function is On (<img src=:/auto_resize_on_16px.png/>) or Off (<img src=:/auto_resize_off_16px.png/>). Note that this function requires Guest Additions to be installed in the guest OS.</source> <translation>Zeigt, ob die automatische Größenanpassung des Fenster aktiviert ist (<img src=:/auto_resize_on_16px.png/>) oder nicht (<img src=:/auto_resize_off_16px.png/>). Beachten Sie, dass für diese Funktion Gasterweiterungen im Gast-BS installiert sein müssen.</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1735"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1746"/> <source>Indicates whether the host mouse pointer is captured by the guest OS:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;pointer is not captured</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;pointer is captured</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;mouse integration (MI) is On</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI is Off, pointer is captured</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI is Off, pointer is not captured</nobr><br>Note that the mouse integration feature requires Guest Additions to be installed in the guest OS.</source> <translation>Zeigt, ob der Mauszeiger im Gast-BS gefangen ist:<br><nobr><img src=:/mouse_disabled_16px.png/>&nbsp;&nbsp;Zeiger ist nicht gefangen</nobr><br><nobr><img src=:/mouse_16px.png/>&nbsp;&nbsp;Zeiger ist gefangen</nobr><br><nobr><img src=:/mouse_seamless_16px.png/>&nbsp;&nbsp;Mauszeiger-Integration (MI) ist an</nobr><br><nobr><img src=:/mouse_can_seamless_16px.png/>&nbsp;&nbsp;MI ist aus, Zeiger ist gefangen</nobr><br><nobr><img src=:/mouse_can_seamless_uncaptured_16px.png/>&nbsp;&nbsp;MI ist aus, Zeiger ist nicht gefangen</nobr><br>Beachten Sie, dass für die Mauszeiger-Integration die Gasterweiterungen im Gast installiert sein müssen.</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1738"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1749"/> <source>Indicates whether the keyboard is captured by the guest OS (<img src=:/hostkey_captured_16px.png/>) or not (<img src=:/hostkey_16px.png/>).</source> <translation>Zeigt, ob die Tastatur vom Gast gefangen ist (<img src=:/hostkey_captured_16px.png/>) oder nicht (<img src=:/hostkey_16px.png/>).</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1985"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1996"/> <source>Indicates whether the Remote Display (VRDP Server) is enabled (<img src=:/vrdp_16px.png/>) or not (<img src=:/vrdp_disabled_16px.png/>).</source> <translation>Zeigt an, ob die Fernsteuerung (VRDP-Server) aktiviert ist (<img src=:/vrdp_16px.png/>) oder nicht (<img src=:/vrdp_disabled_16px.png/>).</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1691"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1702"/> <source>&Logging...</source> <comment>debug action</comment> <translation>&Logging...</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="1743"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="1754"/> <source>Shows the currently assigned Host key.<br>This key, when pressed alone, toggles the keyboard and mouse capture state. It can also be used in combination with other keys to quickly perform actions from the main menu.</source> <translation>Zeigt die momentan zugeordnete Host-Taste.<br>Wird diese Taste allein gedrückt, schaltet sie den Fangmodus für Tastatur und Maus um. Die Taste führt in Kombination mit anderen Tasten bestimmte Aktionen aus dem Hauptmenü aus.</translation> </message> @@ -1291,187 +1291,187 @@ <context> <name>VBoxGlobal</name> <message> - <location filename="../src/VBoxGlobal.cpp" line="1968"/> + <location filename="../src/VBoxGlobal.cpp" line="1969"/> <source>Unknown device %1:%2</source> <comment>USB device details</comment> <translation>Unbekanntes Gerät %1:%2</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="1994"/> + <location filename="../src/VBoxGlobal.cpp" line="1995"/> <source><nobr>Vendor ID: %1</nobr><br><nobr>Product ID: %2</nobr><br><nobr>Revision: %3</nobr></source> <comment>USB device tooltip</comment> <translation><nobr>Hersteller ID: %1</nobr><br><nobr>Produkt ID: %2</nobr><br><nobr>Revision: %3</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2000"/> + <location filename="../src/VBoxGlobal.cpp" line="2001"/> <source><br><nobr>Serial No. %1</nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr>Seriennr. %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2007"/> + <location filename="../src/VBoxGlobal.cpp" line="2008"/> <source><br><nobr>State: %1</nobr></source> <comment>USB device tooltip</comment> <translation><br><nobr>Zustand: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2104"/> + <location filename="../src/VBoxGlobal.cpp" line="2105"/> <source>Name</source> <comment>details report</comment> <translation>Name</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2105"/> + <location filename="../src/VBoxGlobal.cpp" line="2106"/> <source>OS Type</source> <comment>details report</comment> <translation>Gastbetriebssystem</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2106"/> + <location filename="../src/VBoxGlobal.cpp" line="2107"/> <source>Base Memory</source> <comment>details report</comment> <translation>Hauptspeicher</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2107"/> + <location filename="../src/VBoxGlobal.cpp" line="2108"/> <source><nobr>%3 MB</nobr></source> <comment>details report</comment> <translation><nobr>%3 MB</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2142"/> + <location filename="../src/VBoxGlobal.cpp" line="2143"/> <source>General</source> <comment>details report</comment> <translation>Allgemein</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2122"/> + <location filename="../src/VBoxGlobal.cpp" line="2123"/> <source>Video Memory</source> <comment>details report</comment> <translation>Grafikspeicher</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2123"/> + <location filename="../src/VBoxGlobal.cpp" line="2124"/> <source><nobr>%4 MB</nobr></source> <comment>details report</comment> <translation><nobr>%4 MB</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2124"/> + <location filename="../src/VBoxGlobal.cpp" line="2125"/> <source>Boot Order</source> <comment>details report</comment> <translation>Bootreihenfolge</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2125"/> + <location filename="../src/VBoxGlobal.cpp" line="2126"/> <source>ACPI</source> <comment>details report</comment> <translation>ACPI</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2126"/> + <location filename="../src/VBoxGlobal.cpp" line="2127"/> <source>IO APIC</source> <comment>details report</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2179"/> + <location filename="../src/VBoxGlobal.cpp" line="2180"/> <source>Not Attached</source> <comment>details report (HDDs)</comment> <translation>nicht angeschlossen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2187"/> + <location filename="../src/VBoxGlobal.cpp" line="2188"/> <source>Hard Disks</source> <comment>details report</comment> <translation>Festplatten</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2233"/> + <location filename="../src/VBoxGlobal.cpp" line="2234"/> <source>Enabled</source> <comment>details report (ACPI)</comment> <translation>aktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2233"/> + <location filename="../src/VBoxGlobal.cpp" line="2234"/> <source>Disabled</source> <comment>details report (ACPI)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2238"/> + <location filename="../src/VBoxGlobal.cpp" line="2239"/> <source>Enabled</source> <comment>details report (IO APIC)</comment> <translation>aktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2238"/> + <location filename="../src/VBoxGlobal.cpp" line="2239"/> <source>Disabled</source> <comment>details report (IO APIC)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2323"/> + <location filename="../src/VBoxGlobal.cpp" line="2324"/> <source>Not mounted</source> <comment>details report (floppy)</comment> <translation>nicht zugewiesen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2329"/> + <location filename="../src/VBoxGlobal.cpp" line="2330"/> <source>Image</source> <comment>details report (floppy)</comment> <translation>Abbild</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2342"/> + <location filename="../src/VBoxGlobal.cpp" line="2343"/> <source>Host Drive</source> <comment>details report (floppy)</comment> <translation>Host-Laufwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2353"/> + <location filename="../src/VBoxGlobal.cpp" line="2354"/> <source>Floppy</source> <comment>details report</comment> <translation>Diskettenlaufwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2284"/> + <location filename="../src/VBoxGlobal.cpp" line="2285"/> <source>Not mounted</source> <comment>details report (DVD)</comment> <translation>nicht zugewiesen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2290"/> + <location filename="../src/VBoxGlobal.cpp" line="2291"/> <source>Image</source> <comment>details report (DVD)</comment> <translation>Abbild</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2303"/> + <location filename="../src/VBoxGlobal.cpp" line="2304"/> <source>Host Drive</source> <comment>details report (DVD)</comment> <translation>Host-Laufwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2314"/> + <location filename="../src/VBoxGlobal.cpp" line="2315"/> <source>CD/DVD-ROM</source> <comment>details report</comment> <translation>CD/DVD-ROM</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2362"/> + <location filename="../src/VBoxGlobal.cpp" line="2363"/> <source>Host Driver</source> <comment>details report (audio)</comment> <translation>Host-Treiber</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2369"/> + <location filename="../src/VBoxGlobal.cpp" line="2370"/> <source>Disabled</source> <comment>details report (audio)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2375"/> + <location filename="../src/VBoxGlobal.cpp" line="2376"/> <source>Audio</source> <comment>details report</comment> <translation>Audio</translation> @@ -1483,376 +1483,376 @@ <translation>Adapter %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2413"/> + <location filename="../src/VBoxGlobal.cpp" line="2414"/> <source>Disabled</source> <comment>details report (network)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2421"/> + <location filename="../src/VBoxGlobal.cpp" line="2422"/> <source>Network</source> <comment>details report</comment> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2520"/> + <location filename="../src/VBoxGlobal.cpp" line="2521"/> <source>Device Filters</source> <comment>details report (USB)</comment> <translation>Gerätefilter</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2522"/> + <location filename="../src/VBoxGlobal.cpp" line="2523"/> <source>%1 (%2 active)</source> <comment>details report (USB)</comment> <translation>%1 (%2 aktiv)</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2526"/> + <location filename="../src/VBoxGlobal.cpp" line="2527"/> <source>Disabled</source> <comment>details report (USB)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2565"/> + <location filename="../src/VBoxGlobal.cpp" line="2566"/> <source>VRDP Server Port</source> <comment>details report (VRDP)</comment> <translation>VRDP-Serverport</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2569"/> + <location filename="../src/VBoxGlobal.cpp" line="2570"/> <source>Disabled</source> <comment>details report (VRDP)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2575"/> + <location filename="../src/VBoxGlobal.cpp" line="2576"/> <source>Remote Display</source> <comment>details report</comment> <translation>Fernsteuerung</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="5050"/> + <location filename="../src/VBoxGlobal.cpp" line="5051"/> <source>Opening URLs is not implemented yet.</source> <translation>Öffnen von URLs ist noch nicht implementiert.</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3324"/> + <location filename="../src/VBoxGlobal.cpp" line="3325"/> <source>Powered Off</source> <comment>MachineState</comment> <translation>Ausgeschaltet</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3325"/> + <location filename="../src/VBoxGlobal.cpp" line="3326"/> <source>Saved</source> <comment>MachineState</comment> <translation>Gesichert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3326"/> + <location filename="../src/VBoxGlobal.cpp" line="3327"/> <source>Aborted</source> <comment>MachineState</comment> <translation>Abgebrochen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3327"/> + <location filename="../src/VBoxGlobal.cpp" line="3328"/> <source>Running</source> <comment>MachineState</comment> <translation>Laufend</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3328"/> + <location filename="../src/VBoxGlobal.cpp" line="3329"/> <source>Paused</source> <comment>MachineState</comment> <translation>Angehalten</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3330"/> + <location filename="../src/VBoxGlobal.cpp" line="3331"/> <source>Starting</source> <comment>MachineState</comment> <translation>Starten</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3331"/> + <location filename="../src/VBoxGlobal.cpp" line="3332"/> <source>Stopping</source> <comment>MachineState</comment> <translation>Stoppen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3332"/> + <location filename="../src/VBoxGlobal.cpp" line="3333"/> <source>Saving</source> <comment>MachineState</comment> <translation>Sichern</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3333"/> + <location filename="../src/VBoxGlobal.cpp" line="3334"/> <source>Restoring</source> <comment>MachineState</comment> <translation>Wiederherstellen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3334"/> + <location filename="../src/VBoxGlobal.cpp" line="3335"/> <source>Discarding</source> <comment>MachineState</comment> <translation>Verwerfen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3337"/> + <location filename="../src/VBoxGlobal.cpp" line="3338"/> <source>Closed</source> <comment>SessionState</comment> <translation>Geschlossen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3338"/> + <location filename="../src/VBoxGlobal.cpp" line="3339"/> <source>Open</source> <comment>SessionState</comment> <translation>Geöffnet</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3339"/> + <location filename="../src/VBoxGlobal.cpp" line="3340"/> <source>Spawning</source> <comment>SessionState</comment> <translation>Erzeugen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3340"/> + <location filename="../src/VBoxGlobal.cpp" line="3341"/> <source>Closing</source> <comment>SessionState</comment> <translation>Schließe</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3342"/> + <location filename="../src/VBoxGlobal.cpp" line="3343"/> <source>None</source> <comment>DeviceType</comment> <translation>Kein</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3343"/> + <location filename="../src/VBoxGlobal.cpp" line="3344"/> <source>Floppy</source> <comment>DeviceType</comment> <translation>Diskette</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3344"/> + <location filename="../src/VBoxGlobal.cpp" line="3345"/> <source>CD/DVD-ROM</source> <comment>DeviceType</comment> <translation>CD/DVD-ROM</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3345"/> + <location filename="../src/VBoxGlobal.cpp" line="3346"/> <source>Hard Disk</source> <comment>DeviceType</comment> <translation>Platte</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3346"/> + <location filename="../src/VBoxGlobal.cpp" line="3347"/> <source>Network</source> <comment>DeviceType</comment> <translation>Netzwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3360"/> + <location filename="../src/VBoxGlobal.cpp" line="3361"/> <source>Normal</source> <comment>DiskType</comment> <translation>Normal</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3361"/> + <location filename="../src/VBoxGlobal.cpp" line="3362"/> <source>Immutable</source> <comment>DiskType</comment> <translation>Nicht veränderlich</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3362"/> + <location filename="../src/VBoxGlobal.cpp" line="3363"/> <source>Writethrough</source> <comment>DiskType</comment> <translation>Durchschreibend</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3365"/> + <location filename="../src/VBoxGlobal.cpp" line="3366"/> <source>Null</source> <comment>VRDPAuthType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3366"/> + <location filename="../src/VBoxGlobal.cpp" line="3367"/> <source>External</source> <comment>VRDPAuthType</comment> <translation>Extern</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3367"/> + <location filename="../src/VBoxGlobal.cpp" line="3368"/> <source>Guest</source> <comment>VRDPAuthType</comment> <translation>Gast</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3374"/> + <location filename="../src/VBoxGlobal.cpp" line="3375"/> <source>Ignore</source> <comment>USBFilterActionType</comment> <translation>Ignorieren</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3376"/> + <location filename="../src/VBoxGlobal.cpp" line="3377"/> <source>Hold</source> <comment>USBFilterActionType</comment> <translation>Halten</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3379"/> + <location filename="../src/VBoxGlobal.cpp" line="3380"/> <source>Null Audio Driver</source> <comment>AudioDriverType</comment> <translation>Null Audiotreiber</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3381"/> + <location filename="../src/VBoxGlobal.cpp" line="3382"/> <source>Windows Multimedia</source> <comment>AudioDriverType</comment> <translation>Windows Multimedia</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3385"/> + <location filename="../src/VBoxGlobal.cpp" line="3386"/> <source>OSS Audio Driver</source> <comment>AudioDriverType</comment> <translation>OSS-Audio-Treiber</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3387"/> + <location filename="../src/VBoxGlobal.cpp" line="3388"/> <source>ALSA Audio Driver</source> <comment>AudioDriverType</comment> <translation>ALSA-Audio-Treiber</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3389"/> + <location filename="../src/VBoxGlobal.cpp" line="3390"/> <source>Windows DirectSound</source> <comment>AudioDriverType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3391"/> + <location filename="../src/VBoxGlobal.cpp" line="3392"/> <source>CoreAudio</source> <comment>AudioDriverType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3410"/> + <location filename="../src/VBoxGlobal.cpp" line="3411"/> <source>Not attached</source> <comment>NetworkAttachmentType</comment> <translation>nicht angeschlossen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3412"/> + <location filename="../src/VBoxGlobal.cpp" line="3413"/> <source>NAT</source> <comment>NetworkAttachmentType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3414"/> + <location filename="../src/VBoxGlobal.cpp" line="3415"/> <source>Host Interface</source> <comment>NetworkAttachmentType</comment> <translation>Hostinterface</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3416"/> + <location filename="../src/VBoxGlobal.cpp" line="3417"/> <source>Internal Network</source> <comment>NetworkAttachmentType</comment> <translation>Internes Netzwerk</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3433"/> + <location filename="../src/VBoxGlobal.cpp" line="3434"/> <source>Not supported</source> <comment>USBDeviceState</comment> <translation>nicht unterstützt</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3435"/> + <location filename="../src/VBoxGlobal.cpp" line="3436"/> <source>Unavailable</source> <comment>USBDeviceState</comment> <translation>nicht verfügbar</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3437"/> + <location filename="../src/VBoxGlobal.cpp" line="3438"/> <source>Busy</source> <comment>USBDeviceState</comment> <translation>beschäftigt</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3439"/> + <location filename="../src/VBoxGlobal.cpp" line="3440"/> <source>Available</source> <comment>USBDeviceState</comment> <translation>verfügbar</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3441"/> + <location filename="../src/VBoxGlobal.cpp" line="3442"/> <source>Held</source> <comment>USBDeviceState</comment> <translation>gehalten</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3443"/> + <location filename="../src/VBoxGlobal.cpp" line="3444"/> <source>Captured</source> <comment>USBDeviceState</comment> <translation>gefangen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3419"/> + <location filename="../src/VBoxGlobal.cpp" line="3420"/> <source>Disabled</source> <comment>ClipboardType</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3421"/> + <location filename="../src/VBoxGlobal.cpp" line="3422"/> <source>Host To Guest</source> <comment>ClipboardType</comment> <translation>Host zu Gast</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3423"/> + <location filename="../src/VBoxGlobal.cpp" line="3424"/> <source>Guest To Host</source> <comment>ClipboardType</comment> <translation>Gast zu Host</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3425"/> + <location filename="../src/VBoxGlobal.cpp" line="3426"/> <source>Bidirectional</source> <comment>ClipboardType</comment> <translation>Bidirektional</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="4326"/> + <location filename="../src/VBoxGlobal.cpp" line="4327"/> <source>Select a directory</source> <translation>Wählen Sie ein Verzeichnis</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="4529"/> + <location filename="../src/VBoxGlobal.cpp" line="4530"/> <source>Select a file</source> <translation>Wählen Sie eine Datei</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2447"/> + <location filename="../src/VBoxGlobal.cpp" line="2448"/> <source>Port %1</source> <comment>details report (serial ports)</comment> <translation>Port %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2455"/> + <location filename="../src/VBoxGlobal.cpp" line="2456"/> <source>Disabled</source> <comment>details report (serial ports)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2463"/> + <location filename="../src/VBoxGlobal.cpp" line="2464"/> <source>Serial Ports</source> <comment>details report</comment> <translation>Serielle Schnittstellen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2532"/> + <location filename="../src/VBoxGlobal.cpp" line="2533"/> <source>USB</source> <comment>details report</comment> <translation>USB</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2542"/> + <location filename="../src/VBoxGlobal.cpp" line="2543"/> <source>Shared Folders</source> <comment>details report (shared folders)</comment> <translation>Gemeinsame Ordner</translation> @@ -1864,43 +1864,43 @@ <translation type="obsolete">%1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2547"/> + <location filename="../src/VBoxGlobal.cpp" line="2548"/> <source>None</source> <comment>details report (shared folders)</comment> <translation>keine</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2553"/> + <location filename="../src/VBoxGlobal.cpp" line="2554"/> <source>Shared Folders</source> <comment>details report</comment> <translation>Gemeinsame Ordner</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3329"/> + <location filename="../src/VBoxGlobal.cpp" line="3330"/> <source>Stuck</source> <comment>MachineState</comment> <translation>Hängt</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3369"/> + <location filename="../src/VBoxGlobal.cpp" line="3370"/> <source>Disconnected</source> <comment>PortMode</comment> <translation>nicht verbunden</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3370"/> + <location filename="../src/VBoxGlobal.cpp" line="3371"/> <source>Host Pipe</source> <comment>PortMode</comment> <translation>Host-Pipe</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3371"/> + <location filename="../src/VBoxGlobal.cpp" line="3372"/> <source>Host Device</source> <comment>PortMode</comment> <translation>Host-Schnittstelle</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3445"/> + <location filename="../src/VBoxGlobal.cpp" line="3446"/> <source>User-defined</source> <comment>serial port</comment> <translation>benutzerdefiniert</translation> @@ -1924,217 +1924,217 @@ <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2365"/> + <location filename="../src/VBoxGlobal.cpp" line="2366"/> <source>Controller</source> <comment>details report (audio)</comment> <translation>Controller</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2483"/> + <location filename="../src/VBoxGlobal.cpp" line="2484"/> <source>Port %1</source> <comment>details report (parallel ports)</comment> <translation>Port %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2491"/> + <location filename="../src/VBoxGlobal.cpp" line="2492"/> <source>Disabled</source> <comment>details report (parallel ports)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2500"/> + <location filename="../src/VBoxGlobal.cpp" line="2501"/> <source>Parallel Ports</source> <comment>details report</comment> <translation>Parallel-Ports</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3393"/> + <location filename="../src/VBoxGlobal.cpp" line="3394"/> <source>PulseAudio</source> <comment>AudioDriverType</comment> <translation>PulseAudio</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3396"/> + <location filename="../src/VBoxGlobal.cpp" line="3397"/> <source>ICH AC97</source> <comment>AudioControllerType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3398"/> + <location filename="../src/VBoxGlobal.cpp" line="3399"/> <source>SoundBlaster 16</source> <comment>AudioControllerType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3428"/> + <location filename="../src/VBoxGlobal.cpp" line="3429"/> <source>PIIX3</source> <comment>IDEControllerType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3430"/> + <location filename="../src/VBoxGlobal.cpp" line="3431"/> <source>PIIX4</source> <comment>IDEControllerType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2129"/> + <location filename="../src/VBoxGlobal.cpp" line="2130"/> <source>PAE/NX</source> <comment>details report</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2253"/> + <location filename="../src/VBoxGlobal.cpp" line="2254"/> <source>Enabled</source> <comment>details report (PAE/NX)</comment> <translation>aktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2253"/> + <location filename="../src/VBoxGlobal.cpp" line="2254"/> <source>Disabled</source> <comment>details report (PAE/NX)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3347"/> + <location filename="../src/VBoxGlobal.cpp" line="3348"/> <source>USB</source> <comment>DeviceType</comment> <translation>USB</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3348"/> + <location filename="../src/VBoxGlobal.cpp" line="3349"/> <source>Shared Folder</source> <comment>DeviceType</comment> <translation>Gemeinsame Ordner</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3350"/> + <location filename="../src/VBoxGlobal.cpp" line="3351"/> <source>IDE</source> <comment>StorageBus</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3351"/> + <location filename="../src/VBoxGlobal.cpp" line="3352"/> <source>SATA</source> <comment>StorageBus</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3353"/> + <location filename="../src/VBoxGlobal.cpp" line="3354"/> <source>Primary</source> <comment>StorageBusChannel</comment> <translation>Primärer</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3354"/> + <location filename="../src/VBoxGlobal.cpp" line="3355"/> <source>Secondary</source> <comment>StorageBusChannel</comment> <translation>Sekundärer</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3357"/> + <location filename="../src/VBoxGlobal.cpp" line="3358"/> <source>Master</source> <comment>StorageBusDevice</comment> <translation>Master</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3358"/> + <location filename="../src/VBoxGlobal.cpp" line="3359"/> <source>Slave</source> <comment>StorageBusDevice</comment> <translation>Slave</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3355"/> + <location filename="../src/VBoxGlobal.cpp" line="3356"/> <source>Port %1</source> <comment>StorageBusChannel</comment> <translation>Port %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3383"/> + <location filename="../src/VBoxGlobal.cpp" line="3384"/> <source>Solaris Audio</source> <comment>AudioDriverType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3401"/> + <location filename="../src/VBoxGlobal.cpp" line="3402"/> <source>PCnet-PCI II (Am79C970A)</source> <comment>NetworkAdapterType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3403"/> + <location filename="../src/VBoxGlobal.cpp" line="3404"/> <source>PCnet-FAST III (Am79C973)</source> <comment>NetworkAdapterType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3405"/> + <location filename="../src/VBoxGlobal.cpp" line="3406"/> <source>Intel PRO/1000 MT Desktop (82540EM)</source> <comment>NetworkAdapterType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3407"/> + <location filename="../src/VBoxGlobal.cpp" line="3408"/> <source>Intel PRO/1000 T Server (82543GC)</source> <comment>NetworkAdapterType</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2024"/> + <location filename="../src/VBoxGlobal.cpp" line="2025"/> <source><nobr>Vendor ID: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Hersteller-ID: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2029"/> + <location filename="../src/VBoxGlobal.cpp" line="2030"/> <source><nobr>Product ID: %2</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Produkt-ID: %2</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2034"/> + <location filename="../src/VBoxGlobal.cpp" line="2035"/> <source><nobr>Revision: %3</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Revision: %3</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2039"/> + <location filename="../src/VBoxGlobal.cpp" line="2040"/> <source><nobr>Product: %4</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Produkt: %4</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2044"/> + <location filename="../src/VBoxGlobal.cpp" line="2045"/> <source><nobr>Manufacturer: %5</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Hersteller: %5</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2049"/> + <location filename="../src/VBoxGlobal.cpp" line="2050"/> <source><nobr>Serial No.: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Seriennr: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2054"/> + <location filename="../src/VBoxGlobal.cpp" line="2055"/> <source><nobr>Port: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Port: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2061"/> + <location filename="../src/VBoxGlobal.cpp" line="2062"/> <source><nobr>State: %1</nobr></source> <comment>USB filter tooltip</comment> <translation><nobr>Zustand: %1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2396"/> + <location filename="../src/VBoxGlobal.cpp" line="2397"/> <source>host interface, %1</source> <comment>details report (network)</comment> <translation>Hostinterface, %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2399"/> + <location filename="../src/VBoxGlobal.cpp" line="2400"/> <source>internal network, '%1'</source> <comment>details report (network)</comment> <translation>Internes Netzwerk, '%1'</translation> @@ -2146,89 +2146,89 @@ <translation>Adapter %1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="334"/> + <location filename="../src/VBoxGlobal.cpp" line="335"/> <source><br><nobr>Type&nbsp;(Format):&nbsp;&nbsp;%2&nbsp;(%3)</nobr></source> <comment>hard disk</comment> <translation></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="340"/> + <location filename="../src/VBoxGlobal.cpp" line="341"/> <source><br><nobr>Attached to:&nbsp;&nbsp;%1</nobr></source> <comment>medium</comment> <translation><br><nobr>Gebunden an:&nbsp;&nbsp;%1</nobr></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="341"/> + <location filename="../src/VBoxGlobal.cpp" line="342"/> <source><i>Not&nbsp;Attached</i></source> <comment>medium</comment> <translation><i>Not&nbsp;angeschlossen</i></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="349"/> + <location filename="../src/VBoxGlobal.cpp" line="350"/> <source><br><i>Checking accessibility...</i></source> <comment>medium</comment> <translation><br><i>Überprüfe Zugriffsrecht...</i></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="367"/> + <location filename="../src/VBoxGlobal.cpp" line="368"/> <source><hr>Failed to check media accessibility.<br>%1.</source> <comment>medium</comment> <translation><hr>Die Zugriffsrechte des Mediums konnten nicht ermittelt werden.<br>%1</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="417"/> + <location filename="../src/VBoxGlobal.cpp" line="418"/> <source><hr><img src=%1/>&nbsp;Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source> <comment>medium</comment> <translation><hr><img src=%1/>&nbsp;Durch zuweisen dieses Abbildes wird ein neues differentielles Abbild erzeugt.</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="535"/> + <location filename="../src/VBoxGlobal.cpp" line="536"/> <source>Checking...</source> <comment>medium</comment> <translation>Überprüfen...</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="539"/> + <location filename="../src/VBoxGlobal.cpp" line="540"/> <source>Inaccessible</source> <comment>medium</comment> <translation>Nicht zugreifbar</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="585"/> + <location filename="../src/VBoxGlobal.cpp" line="586"/> <source><hr>Some of the media in this hard disk chain are inaccessible. Please use the Virtual Media Manager in <b>Show Differencing Hard Disks</b> mode to inspect these media.</source> <translation><hr>Einige der zu dieser virtuellen Festplatte gehörigen Dateien sind nicht zugreifbar. Bitte verwenden Sie den Manager für virtuelle Medien im Modus <b>Zeige Differenz-Abbilder</b> um diese Dateien anzuzeigen.</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="604"/> + <location filename="../src/VBoxGlobal.cpp" line="605"/> <source>%1<hr>This base hard disk is indirectly attached using the following differencing hard disk:<br>%2%3</source> <translation>%1<hr>Diese Basisfestplatte ist indirekt über die folgenden Differenzfestplatten eingebunden:<br>%2%3</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2130"/> + <location filename="../src/VBoxGlobal.cpp" line="2131"/> <source>3D Acceleration</source> <comment>details report</comment> <translation>3D-Beschleunigung</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2258"/> + <location filename="../src/VBoxGlobal.cpp" line="2259"/> <source>Enabled</source> <comment>details report (3D Acceleration)</comment> <translation>aktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="2258"/> + <location filename="../src/VBoxGlobal.cpp" line="2259"/> <source>Disabled</source> <comment>details report (3D Acceleration)</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3335"/> + <location filename="../src/VBoxGlobal.cpp" line="3336"/> <source>Setting Up</source> <comment>MachineState</comment> <translation>Einstellen</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="3363"/> + <location filename="../src/VBoxGlobal.cpp" line="3364"/> <source>Differencing</source> <comment>DiskType</comment> <translation>Differentiell</translation> @@ -3008,166 +3008,166 @@ <translation>Der gesicherte Zustand der virtuellen Maschine <b>%1</b> konnte nicht freigegeben werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="956"/> + <location filename="../src/VBoxProblemReporter.cpp" line="963"/> <source>Failed to discard the snapshot <b>%1</b> of the virtual machine <b>%2</b>.</source> <translation>Der Sicherungspunkt <b>%1</b> der virtuellen Maschine <b>%2</b> konnte nicht freigegeben werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="981"/> + <location filename="../src/VBoxProblemReporter.cpp" line="988"/> <source>Failed to discard the current state of the virtual machine <b>%1</b>.</source> <translation>Der aktuelle Zustand der virtuellen Maschine <b>%1</b> konnte nicht freigegeben werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1005"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1012"/> <source>Failed to discard the current snapshot and the current state of the virtual machine <b>%1</b>.</source> <translation>Der aktuelle Sicherungspunkt sowie der aktuelle Zustand der virtuellen Maschine <b>%1</b> konnten nicht freigegeben werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1016"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1023"/> <source>There is no virtual machine named <b>%1</b>.</source> <translation>Es gibt keine virtuelle Maschine mit dem Namen <b>%1</b>.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1064"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1071"/> <source><p>Are you sure you want to permanently delete the virtual machine <b>%1</b>?</p><p>This operation cannot be undone.</p></source> <translation><p>Möchten Sie die virtuelle Maschine <b>%1</b> wirklich dauerhaft löschen?</p><p>Dieser Vorgang kann nicht rückgängig gemacht werden.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1077"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1084"/> <source><p>Are you sure you want to unregister the inaccessible virtual machine <b>%1</b>?</p><p>You will no longer be able to register it back from GUI.</p></source> <translation><p>Möchten Sie die Bindung der inaktiven virtuellen Maschine <b>%1</b> wirklich aufheben?</p><p>Sie kann mit dieser GUI nicht wieder zugewiesen werden.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1093"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1100"/> <source><p>Are you sure you want to discard the saved state of the virtual machine <b>%1</b>?</p><p>This operation is equivalent to resetting or powering off the machine without doing a proper shutdown by means of the guest OS.</p></source> <translation><p>Möchten Sie den gesicherten Zustand der virtuellen Maschine <b>%1</b> wirklich freigeben?</p><p>Diese Operation ist gleichbedeutend mit dem Ausschalten der VM ohne sauberes Herunterfahren durch das Gast-Betriebssystem.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1329"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1336"/> <source>Failed to create a new session.</source> <translation>Eine neue Sitzung konnte nicht angelegt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1348"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1355"/> <source>Failed to open a session for the virtual machine <b>%1</b>.</source> <translation>Für die virtuelle Maschine <b>%1</b> konnte keine neue Sitzung eröffnet werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1379"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1386"/> <source>Failed to create the host network interface <b>%1</b>.</source> <translation>Das Hostinterface <b>%1</b> konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1397"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1404"/> <source>Failed to remove the host network interface <b>%1</b>.</source> <translation>Das Hostinterface <b>%1</b> konnte nicht gelöscht werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1424"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1431"/> <source>Failed to attach the USB device <b>%1</b> to the virtual machine <b>%2</b>.</source> <translation>Das USB-Gerät <b>%1</b> konnte nicht an die virtuelle Maschine <b>%2</b> gebunden werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1450"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1457"/> <source>Failed to detach the USB device <b>%1</b> from the virtual machine <b>%2</b>.</source> <translation>Die Bindung des USB-Gerätes <b>%1</b> an die virtuelle Maschine <b>%2</b> konnte nicht aufgehoben werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1503"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1510"/> <source>Failed to create a shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) for the virtual machine <b>%3</b>.</source> <translation>Der gemeinsame Ordner <b>%1</b> (mit Verweis auf <nobr><b>%2</b></nobr>) für die virtuelle Maschine <b>%3</b> konnte nicht erstellt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1485"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1492"/> <source>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</source> <translation>Der gemeinsame Ordner <b>%1</b> (Verweis auf <nobr><b>%2</b></nobr>) konnte nicht aus der virtuellen Maschine <b>%3</b> entfernt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1794"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1801"/> <source><p>The Virtual Machine reports that the guest OS does not support <b>mouse pointer integration</b> in the current video mode. You need to capture the mouse (by clicking over the VM display or pressing the host key) in order to use the mouse inside the guest OS.</p></source> <translation><p>Der VM-Monitor zeigt an, dass das Gastbetriebssystem keine <b>Mauszeiger-Integration</b> für den aktuellen Videomodus unterstützt. Um die Maus im Gastsystem zu nutzen, muss diese durch Mausklick im VM-Fenster gefangen werden.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1813"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1820"/> <source><p>The Virtual Machine is currently in the <b>Paused</b> state and therefore does not accept any keyboard or mouse input. If you want to continue to work inside the VM, you need to resume it by selecting the corresponding action from the menu bar.</p></source> <translation><p>Die virtuelle Maschine ist momentan <b>angehalten</b> und nimmt deshalb keine Maus- und Tastatureingaben entgegen. Um mit der Arbeit der virtuellen Maschine fortzufahren, müssen Sie die virtuelle Maschine weiterlaufen lassen.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2067"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2074"/> <source><p>Cannot run VirtualBox in <i>VM Selector</i> mode due to local restrictions.</p><p>The application will now terminate.</p></source> <translation><p>VirtualBox kann aufgrund von lokalen Beschränkungen nicht im <i>VM Selektor-Modus</i> ausgeführt werden.</p><p>Die Anwendung wird nun beendet.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2095"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2102"/> <source><nobr>Fatal Error</nobr></source> <comment>runtime error info</comment> <translation><nobr>Schwerwiegender Fehler</nobr></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2101"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2108"/> <source><nobr>Non-Fatal Error</nobr></source> <comment>runtime error info</comment> <translation><nobr>Normaler Fehler</nobr></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2107"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2114"/> <source><nobr>Warning</nobr></source> <comment>runtime error info</comment> <translation><nobr>Warnung</nobr></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2128"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2135"/> <source><nobr>Error ID: </nobr></source> <comment>runtime error info</comment> <translation><nobr>Fehler ID: </nobr></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2130"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2137"/> <source>Severity: </source> <comment>runtime error info</comment> <translation>Dringlichkeit:</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2144"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2151"/> <source><p>A fatal error has occurred during virtual machine execution! The virtual machine will be powered off. It is suggested to use the clipboard to copy the following error message for further examination:</p></source> <translation><p>Während der Ausführung der virtuellen Maschine ist ein schwerwiegender Fehler aufgetreten! Die VM wird abgeschaltet. Es wird empfohlen, die folgende Fehlermeldung für eine spätere Untersuchung in die Zwischenablage zu kopieren:</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2156"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2163"/> <source><p>An error has occurred during virtual machine execution! The error details are shown below. You can try to correct the described error and resume the virtual machine execution.</p></source> <translation><p>Während der Ausführung der virtuellen Maschine ist ein Fehler aufgetreten. Einzelheiten werden unten gezeigt. Sie können versuchen, den angezeigten Fehler zu beheben und mit der Ausführung fortzufahren.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2166"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2173"/> <source><p>The virtual machine execution may run into an error condition as described below. You may ignore this message, but it is suggested to perform an appropriate action to make sure the described error will not happen.</p></source> <translation><p>Die Ausführung der virtuellen Maschine kann zu einem Fehler führen, wie unten beschrieben. Sie können diese Meldung ignorieren, allerdings wird empfohlen, angemessen zu reagieren, um sicherzustellen, dass der Fehler nicht auftreten wird.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2280"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2287"/> <source>Result&nbsp;Code: </source> <comment>error info</comment> <translation>Fehlercode:</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2286"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2293"/> <source>Component: </source> <comment>error info</comment> <translation>Komponente:</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2294"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2301"/> <source>Interface: </source> <comment>error info</comment> <translation>Interface:</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2303"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2310"/> <source>Callee: </source> <comment>error info</comment> <translation>Callee:</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2311"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2318"/> <source>Callee&nbsp;RC: </source> <comment>error info</comment> <translation>Callee&nbsp;RC:</translation> @@ -3183,57 +3183,57 @@ <translation><p>Die Sprachdatei <b><nobr>%1</nobr></b> konnte nicht geöffnet werden.<p>Die Sprache wird vorübergehend auf Englisch zurückgesetzt. Bitte wählen Sie in den <b>Globalen Einstellungen</b> eine neue Sprache aus.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1592"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1599"/> <source><p>VirtualBox Guest Additions installed in the Guest OS are too old: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) will most likely stop working properly.</p><p>Please update Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> <translation><p>Die im Gast installierten VirtualBox Gasterweiterungen sind zu alt: Version %1 ist installiert, erwartet wird Version %2. Einige Features, die Gasterweiterungen benötigen (Mauszeiger-Integration, automatische Anpassung der Gastanzeige) funktionieren höchstwahrscheinlich nicht.</p><p>Bitte aktualisieren Sie die Gasterweiterungen durch <b>Gasterweiterungen installieren</b> aus dem Menü <b>Geräte</b>.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1608"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1615"/> <source><p>VirtualBox Guest Additions installed in the Guest OS are outdated: the installed version is %1, the expected version is %2. Some features that require Guest Additions (mouse integration, guest display auto-resize) may not work as expected.</p><p>It is recommended to update Guest Additions to the current version by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> <translation><p>Die im Gast installierten Virtualbox Gasterweiterungen sind überholt: Version %1 ist installiert, erwartet wird Version %2. Einige Features, die Gasterweiterungen benötigen (Mauszeiger-Integration, automatische Anpassung der Gastanzeige) funktionieren möglicherweise nicht wie erwartet.</p><p>Bitte aktualisieren Sie die Gasterweiterungen durch <b>Gasterweiterungen installieren</b> aus dem Menü <b>Geräte</b>.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1624"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1631"/> <source><p>VirtualBox Guest Additions installed in the Guest OS are too recent for this version of VirtualBox: the installed version is %1, the expected version is %2.</p><p>Using a newer version of Additions with an older version of VirtualBox is not supported. Please install the current version of Guest Additions by choosing <b>Install Guest Additions</b> from the <b>Devices</b> menu.</p></source> <translation><p>Die im Gast installierten Virtualbox Gasterweiterungen sind zu neu für diese Version von VirtualBox: Version %1 ist installiert, erwartet wird Version %2.</p><p>Die Nutzung einer neueren Version der Gasterweiterungen mit einer älteren Version von VirtualBox wird nicht unterstützt. Bitte aktualisieren Sie die Gasterweiterungen durch <b>Gasterweiterungen installieren</b> aus dem Menü <b>Geräte</b>.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="932"/> + <location filename="../src/VBoxProblemReporter.cpp" line="939"/> <source>Failed to change the snapshot folder path of the virtual machine <b>%1<b> to <nobr><b>%2</b></nobr>.</source> <translation>Der Ordner für Sicherungspunkte der virtuellen Maschine <b>%1</b> konnte nicht nach <nobr>%2</b></nobr> geändert werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1523"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1530"/> <source><p>Failed to remove the shared folder <b>%1</b> (pointing to <nobr><b>%2</b></nobr>) from the virtual machine <b>%3</b>.</p><p>Please close all programs in the guest OS that may be using this shared folder and try again.</p></source> <translation>Der gemeinsame Ordner <b>%1</b> (mit Verweis auf <nobr><b>%2</b></nobr>) konnte nicht aus der virtuellen Maschine <b>%3</b> entfernt werden.</p><p>Bitte schließen Sie alle Programme im Gast, die diesen gemeinsamen Ordner benutzen, und versuchen Sie die Aktion erneut.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1537"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1544"/> <source><p>Could not find the VirtualBox Guest Additions CD image file <nobr><b>%1</b></nobr> or <nobr><b>%2</b>.</nobr></p><p>Do you want to download this CD image from the Internet?</p></source> <translation><p>Ein CDROM-Abbild mit den VirtualBox-Gasterweiterungen konnte weder unter <nobr><b>%1</b></nobr> noch unter <nobr><b>%2</b></nobr> gefunden werden.</p><p>Möchten Sie diese Datei nun aus dem Internet herunterladen?</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1549"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1556"/> <source><p>Failed to download the VirtualBox Guest Additions CD image from <nobr><a href="%1">%2</a>.</nobr></p><p>%3</p></source> <translation><p>Das CDROM-Abbild mit den VirtualBox Gasterweiterungen konnte nicht von <nobr><a href="%1">%2</a></nobr> heruntergeladen werden.</p><p>%3</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1559"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1566"/> <source><p>Are you sure you want to download the VirtualBox Guest Additions CD image from <nobr><a href="%1">%2</a></nobr> (size %3 bytes)?</p></source> <translation><p>Sind Sie sicher, dass Sie ein CDROM-Abbild mit den VirtualBox Gasterweiterungen von <nobr><a href="%1">%2</a></nobr> (Größe %3 Byte) herunterladen wollen?</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1574"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1581"/> <source><p>The VirtualBox Guest Additions CD image has been successfully downloaded from <nobr><a href="%1">%2</a></nobr> and saved locally as <nobr><b>%3</b>.</nobr></p><p>Do you want to register this CD image and mount it on the virtual CD/DVD drive?</p></source> <translation><p>Das CDROM-Abbild mit den VirtualBox Gasterweiterungen wurde erfolgreich von <nobr><a href="%1">%2</a></nobr> heruntergeladen und lokal als <nobr><b>%3</b></nobr> gespeichert.</p><p>Möchten Sie das CDROM-Abbild registrieren und als virtuelle CD/DVD einbinden?</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1988"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1995"/> <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the color quality of the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode but report it as 24&nbsp;bit (16 million colors). You may try to select a different color quality to see if this message disappears or you can simply disable the message now if you are sure the required color quality (%4&nbsp;bit) is not available in the given guest OS.</p></source> <translation><p>Das Fenster der virtuellen Maschine ist optimiert für eine Anzeige im <b>%1-Bit</b>-Farbmodus, der aktuelle Modus des virtuellen Bildschirms ist aber auf <b>%2-&nbsp;Bit</b> gesetzt.</p><p>Bitte öffnen Sie die Einstellungen für die Anzeige im Gast und wählen Sie den <b>%3-Bit</b>-Farbmodus, falls verfügbar, um die beste Performance der Anzeige zu erreichen.</p><p><b>Beachten Sie</b>: Manche Betriebssysteme (z.B. OS/2) arbeiten tatsächlich im 32-Bit-Farbmodus, zeigen aber einen 24-Bit-Farbmodus (16 Millionen Farben) an. Sie können versuchen, einen anderen Farbmodus einzustellen, um zu testen, ob diese Meldung verschwindet. Oder Sie können diese Meldung nun deaktivieren falls Sie sicher sind, dass der erforderliche Farbmodus (%4&nbsp;Bit) im Gast-Betriebssystem nicht verfügbar ist.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2053"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2060"/> <source><p>You didn't attach a hard disk to the new virtual machine. The machine will not be able to boot unless you attach a hard disk with a guest operating system or some other bootable media to it later using the machine settings dialog or the First Run Wizard.</p><p>Do you want to continue?</p></source> <translation><p>Sie haben der neuen virtuellen Maschine keine Festplatte zugewiesen. Die Maschine kann nicht booten bis Sie der VM eine Festplatte mit einem Betriebssystem oder ein anderes bootbares Medium zuweisen. Sie können dafür die VM-Einstellungen oder den Startassistenten verwenden.</p><p>Möchten Sie fortfahren?</p></translation> </message> @@ -3253,94 +3253,94 @@ <translation>Das ACPI-Ereignis <i>Netztaste gedrückt</i> konnte nicht an die virtuelle Maschine <b>%1</b> übermittelt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1650"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1657"/> <source><p>Congratulations! You have been successfully registered as a user of VirtualBox.</p><p>Thank you for finding time to fill out the registration form!</p></source> <translation><p>Herzlichen Glückwunsch! Sie haben sich erfolgreich als Nutzer von VirtualBox registriert.</p><p>Vielen Dank, dass Sie sich die Zeit zum Ausfüllen des Formulars genommen haben!</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1653"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1660"/> <source><p>Failed to register the VirtualBox product</p><p>%1</p></source> <translation><p>Die Registrierung des Produkts VirtualBox ist fehlgeschlagen</p><p>%1</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1065"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1072"/> <source>Delete</source> <comment>machine</comment> <translation>Löschen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1078"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1085"/> <source>Unregister</source> <comment>machine</comment> <translation>Freigeben</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1095"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1102"/> <source>Discard</source> <comment>saved state</comment> <translation>Verwerfen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1561"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1568"/> <source>Download</source> <comment>additions</comment> <translation>Herunterladen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1576"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1583"/> <source>Mount</source> <comment>additions</comment> <translation>Einbinden</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1741"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1748"/> <source><p>The host key is currently defined as <b>%1</b>.</p></source> <comment>additional message box paragraph</comment> <translation><p>Die Host-Taste ist momentan auf <b>%1</b> eingestellt.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1713"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1720"/> <source>Capture</source> <comment>do input capture</comment> <translation>Fangen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1834"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1841"/> <source>Check</source> <comment>inaccessible media message box</comment> <translation>Überprüfen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1937"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1944"/> <source>Switch</source> <comment>fullscreen</comment> <translation>Einschalten</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1959"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1966"/> <source>Switch</source> <comment>seamless</comment> <translation>Einschalten</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2037"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2044"/> <source><p>Do you really want to reset the virtual machine?</p><p>When the machine is reset, unsaved data of all applications running inside it will be lost.</p></source> <translation><p>Möchten Sie die virtuelle Maschine wirklich zurücksetzen?</p><p>Dabei gehen ungesicherte Daten aller noch offenen Anwendungen des Gastes verloren.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2039"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2046"/> <source>Reset</source> <comment>machine</comment> <translation>Zurücksetzen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2058"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2065"/> <source>Continue</source> <comment>no hard disk attached</comment> <translation>Fortfahren</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2059"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2066"/> <source>Go Back</source> <comment>no hard disk attached</comment> <translation>Zurück</translation> @@ -3371,18 +3371,18 @@ <translation>Die Einstellungen der virtuellen Maschine <b>%1</b> konnten nicht von der Datei <b><nobr>%2</nobr></b> geladen werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1206"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1213"/> <source><p>There are hard disks attached to SATA ports of this virtual machine. If you disable the SATA controller, all these hard disks will be automatically detached.</p><p>Are you sure that you want to disable the SATA controller?</p></source> <translation><p>An den SATA-Controller sind Festplatten angeschlossen. Wenn Sie den virtuellen SATA-Controller deaktivieren, wird die Bindung an alle diese Platten automatisch aufgehoben.</p><p>Möchten Sie den SATA-Controller wirklich deaktivieren?</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1208"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1215"/> <source>Disable</source> <comment>hard disk</comment> <translation>Deaktivieren</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1913"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1920"/> <source>&Backup</source> <comment>warnAboutAutoConvertedSettings message box</comment> <translation>&Sichern</translation> @@ -3393,54 +3393,54 @@ <translation>Die Datei <b><nobr>%1</nobr></b> konnte nicht nach <b><nobr>%1</nobr></b> kopiert werden (%3).</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1224"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1231"/> <source>&Create</source> <comment>hard disk</comment> <translation>&Erzeugen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1225"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1232"/> <source>Select</source> <comment>hard disk</comment> <translation>Auswählen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1031"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1038"/> <source><p>Could not enter seamless mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p></source> <translation><p>Der nahtlose Modus konnte nicht aktiviert werden, weil dem Gast zu wenig Video-RAM zugewiesen wurde.</p><p>Sie sollten der VM mindestens <b>%1</b> Video-RAM zur Verfügung stellen.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1046"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1053"/> <source><p>Could not switch the guest display to fullscreen mode due to insufficient guest video memory.</p><p>You should configure the virtual machine to have at least <b>%1</b> of video memory.</p><p>Press <b>Ignore</b> to switch to fullscreen mode anyway or press <b>Cancel</b> to cancel the operation.</p></source> <translation><p>Der Vollbbildmodus konnte nicht aktiviert werden, weil dem Gast zu wenig Video-RAM zugewiesen wurde.</p><p>Sie sollten die VM so konfigurieren, dass ihr zumindest <b>%1</b> Video-RAM zur Verfügung steht.</p><p>Drücken Sie <b>Ignorieren</b> um dennoch in den Vollbildmodus zu wechseln oder betätigen Sie <b>Abbrechen</b> um dies nicht zu tun.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1680"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1687"/> <source>You have already installed the latest VirtualBox version. Please repeat the version check later.</source> <translation>Sie haben bereits die neueste Version von VirtualBox installiert.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1706"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1713"/> <source><p>You have <b>clicked the mouse</b> inside the Virtual Machine display or pressed the <b>host key</b>. This will cause the Virtual Machine to <b>capture</b> the host mouse pointer (only if the mouse pointer integration is not currently supported by the guest OS) and the keyboard, which will make them unavailable to other applications running on your host machine.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> <translation><p>Sie haben in das VM-Fenster <b>geklickt</b> oder die <b>Host-Taste</b> betätigt. Maus sowie Tastatur werden daher <b>gefangen</b> (die Maus nur, falls Mauszeiger-Integration vom aktuellen Gast-System nicht unterstützt wird). Dadurch sind diese für andere Anwendungen neben VirtualBox nicht verfügbar.</p><p>Durch Betätigen der Host-Taste kann dieser Modus jederzeit beendet werden. Die momentan zugeordnete Host-Taste wird in der Statusleiste am unteren Rand des VM-Fensters gezeigt (Symbol&nbsp;<img src=:/hostkey_16px.png/>&nbsp;). Zusammen mit dem daneben liegenden Maus-Icon zeigen diese den aktuellen Tastatur- und Maus-Fangmodus.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1739"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1746"/> <source><p>You have the <b>Auto capture keyboard</b> option turned on. This will cause the Virtual Machine to automatically <b>capture</b> the keyboard every time the VM window is activated and make it unavailable to other applications running on your host machine: when the keyboard is captured, all keystrokes (including system ones like Alt-Tab) will be directed to the VM.</p><p>You can press the <b>host key</b> at any time to <b>uncapture</b> the keyboard and mouse (if it is captured) and return them to normal operation. The currently assigned host key is shown on the status bar at the bottom of the Virtual Machine window, next to the&nbsp;<img src=:/hostkey_16px.png/>&nbsp;icon. This icon, together with the mouse icon placed nearby, indicate the current keyboard and mouse capture state.</p></source> <translation><p>Sie haben den Modus <b>Tastatur fangen</b> eingeschaltet. Wird das VM-Fenster aktiviert, wird die Tastatur automatisch <b>gefangen</b> und damit für andere Anwendungen temporär nicht mehr verfügbar: Alle Tasteneingaben (inklusive Alt-Tab) werden in die VM umgeleitet.</p></p>Sie können die <b>Host-Taste</b> jederzeit betätigen, um diesen Modus für Tastatur (und Maus, falls ebenfalls gefangen) zu beenden. Die momentan zugeordnete Host-Taste wird in der Statusleiste am unteren Ende des VM-Fensters neben dem&nbsp;<img src=:/hostkey_16px.png/>&nbsp;Icongezeigt. Zusammen mit dem Icon für die Maus daneben zeigt es den aktuellen Status für Maus und Tastatur.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1784"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1791"/> <source><p>The Virtual Machine reports that the guest OS supports <b>mouse pointer integration</b>. This means that you do not need to <i>capture</i> the mouse pointer to be able to use it in your guest OS -- all mouse actions you perform when the mouse pointer is over the Virtual Machine's display are directly sent to the guest OS. If the mouse is currently captured, it will be automatically uncaptured.</p><p>The mouse icon on the status bar will look like&nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;to inform you that mouse pointer integration is supported by the guest OS and is currently turned on.</p><p><b>Note</b>: Some applications may behave incorrectly in mouse pointer integration mode. You can always disable it for the current session (and enable it again) by selecting the corresponding action from the menu bar.</p></source> <translation><p>Die virtuelle Maschine meldet Unterstützung der <b>Mauszeiger-Integration</b> durch das Gastsystem. Dies bedeutet, dass die Maus nicht gefangen werden muss, um es im Gastsystem zu benutzen, sondern alle Mausaktionen über der VM-Anzeigebereich werden direkt an den Gast weitergeleitet. Der Fangmodus wird automatisch aufgehoben, falls die Maus momentan gefangen ist.</p><p>Das Mausicon in der Statuszeile wird so &nbsp;<img src=:/mouse_seamless_16px.png/>&nbsp;aussehen, um anzuzeigen, dass die Mauszeiger-Integration durch den Gast unterstützt und momentan aktiv ist.</p><p><b>Beachten Sie</b>: Einige Anwendungen verhalten sich möglicherweise inkorrekt, wenn die Mauszeiger-Integration aktiv ist. Sie können diesen Modus durch Auswahl des entsprechenden Eintrages in der Menüzeile jederzeit deaktivieren.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1934"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1941"/> <source><p>The virtual machine window will be now switched to <b>fullscreen</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in fullscreen mode. You can access it by pressing <b>Host+Home</b>.</p></source> <translation><p>Die virtuelle Maschine wird nun in den <b>Vollbildmodus</b> geschaltet. Sie können jederzeit durch Betätigen von <b>%1</b> zum normalen Fenstermodus zurückkehren. Als <i>Host-Taste</i> ist momentan <b>%2</b> eingestellt.</p><p>Das Hauptmenü wird im Vollbildmodus nicht angezeigt. Auf dieses kann durch Betätigen von <b>Host+Home</b> zugegriffen werden.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1956"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1963"/> <source><p>The virtual machine window will be now switched to <b>Seamless</b> mode. You can go back to windowed mode at any time by pressing <b>%1</b>. Note that the <i>Host</i> key is currently defined as <b>%2</b>.</p><p>Note that the main menu bar is hidden in seamless mode. You can access it by pressing <b>Host+Home</b>.</p></source> <translation><p>Die virtuelle Maschine wird nun in den <b>nahtlosen</b> Anzeigemodus geschaltet. Durch Betätigen von <b>%1</b> können Sie jederzeit in den normalen Fenstermodus zurückkehren. Die <i>Host-Taste</i> ist momentan als <b>%2</b> eingestellt.</p><p>Das Hauptmenü wird im nahtlosen Modus nicht angezeigt. Auf dieses kann durch Betätigung von <b>Host+Home</b> zugegriffen werden.</p></translation> </message> @@ -3505,190 +3505,195 @@ <translation>Zeigt einen Dialog mit Produktinformationen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1664"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1671"/> <source><p>A new version of VirtualBox has been released! Version <b>%1</b> is available at <a href="http://www.virtualbox.org/">virtualbox.org</a>.</p><p>You can download this version from this direct link:</p><p><a href=%2>%3</a></p></source> <translation><p>Eine neue Version von VirtualBox ist verfügbar! Version <b>%1</b> ist auf <a href="http//www.virtualbox.org/">virtualbox.org</a> verfügbar.</p><p>Sie können diese Version von der folgenden Adresse herunterladen:</p><p><a href=%2>%3</a></p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1109"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1116"/> <source><p>Are you sure you want to release the %1 <nobr><b>%2</b></nobr>?</p><p>This will detach it from the following virtual machine(s): <b>%3</b>.</p></source> <translation><p>Möchten Sie %1 <nobr><b>%2</b></nobr> wirklich freigeben?</p><p>Dieses Medium ist momentan an folgendede virtuelle Maschinen gebunden: <b>%3</b>.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1113"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1120"/> <source>Release</source> <comment>detach medium</comment> <translation>&Freigeben</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1124"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1131"/> <source><p>Are you sure you want to remove the %1 <nobr><b>%2</b></nobr> from the list of known media?</p></source> <translation><p>Möchten Sie die %1 <nobr><b>%2</b></nobr> wirklich von der Liste der bekannten Medien löschen?</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1132"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1139"/> <source>Note that this hard disk is inaccessible so that its storage unit cannot be deleted right now.</source> <translation>Beachten Sie, dass die Festplatte nicht zugreifbar ist. Daher kann diese momentan nicht gelöscht werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1137"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1144"/> <source>The next dialog will let you choose whether you also want to delete the storage unit of this hard disk or keep it for later usage.</source> <translation>Im folgenden Dialog haben Sie die Möglichkeit, das Speichermedium explizit zu löschen oder für eine spätere Verwendung zu bewahren.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1143"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1150"/> <source><p>Note that the storage unit of this medium will not be deleted and therefore it will be possible to add it to the list later again.</p></source> <translation><p>Beachten Sie, dass der Datencontainer für dieses Medium nicht gelöscht wird und Sie daher das Medium später zu dieser Liste wieder hinzufügen können.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1147"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1154"/> <source>Remove</source> <comment>medium</comment> <translation>Entfernen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1159"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1166"/> <source><p>The hard disk storage unit at location <b>%1</b> already exists. You cannot create a new virtual hard disk that uses this location because it can be already used by another virtual hard disk.</p><p>Please specify a different location.</p></source> <translation><p>Der Datencontainer <b>%1</b> ist bereits vorhanden. Sie können keine neue virtuelle Festplatte mit diesem Container erstellen, weil dieser bereits von einer anderen virtuellen Maschine benutzt werden kann.</p><p>Bitte wählen Sie einen anderen Namen bzw. einen anderen Ordner.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1175"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1182"/> <source><p>Do you want to delete the storage unit of the hard disk <nobr><b>%1</b></nobr>?</p><p>If you select <b>Delete</b> then the specified storage unit will be permanently deleted. This operation <b>cannot be undone</b>.</p><p>If you select <b>Keep</b> then the hard disk will be only removed from the list of known hard disks, but the storage unit will be left untouched which makes it possible to add this hard disk to the list later again.</p></source> <translation><p>Möchten Sie den Datencontainer der virtuellen Festplatte <nobr><b>%1</b></nobr> wirklich löschen?</p><p>Wählen Sie <b>Löschen</b>, um den Container permament zu löschen. Diese Operation <b>kann nicht</b> rückgäng gemacht werden.</p><p>Wählen Sie <b>Behalten</b> um die virtuelle Festplatte von der Liste der bekannten Medien zu löschen, den Datencontainer aber zu behalten. Dadurch können Sie die virtuelle Festplatte später wieder hinzufügen.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1180"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1187"/> <source>Delete</source> <comment>hard disk storage</comment> <translation>Löschen</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1181"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1188"/> <source>Keep</source> <comment>hard disk storage</comment> <translation>Behalten</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1193"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1200"/> <source>Failed to delete the storage unit of the hard disk <b>%1</b>.</source> <translation>Der Datencontainer der virtuellen Festplatte <b>%1</b> konnte nicht gelöscht werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1219"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1226"/> <source><p>There are no unused hard disks available for the newly created attachment.</p><p>Press the <b>Create</b> button to start the <i>New Virtual Disk</i> wizard and create a new hard disk, or press the <b>Select</b> button to open the <i>Virtual Media Manager</i> and select what to do.</p></source> <translation><p>Für diesen neuen Anschluss sind keine unbenutzten Plattenabbilder verfügbar.</p><p>Wählen Sie <b>Erzeugen</b>, um eine neue virtuelle Platte zu erzeugen. Oder drücken Sie auf <b>Auswählen</b>, um den <i>Manager für virtuelle Medien</i> zu starten.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1234"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1241"/> <source>Failed to create the hard disk storage <nobr><b>%1</b>.</nobr></source> <translation>Die virtuelle Festplatte <nobr><b>%1</b></nobr> konnte nicht erzeugt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1248"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1255"/> <source>Failed to attach the hard disk <nobr><b>%1</b></nobr> to the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>Die virtuelle Festplatte <nobr><b>%1</b></nobr> konnte nicht an den Slot <i>%2</i> der virtuellen Maschine <b>%3</b> angeschlossen werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1261"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1268"/> <source>Failed to detach the hard disk <nobr><b>%1</b></nobr> from the slot <i>%2</i> of the machine <b>%3</b>.</source> <translation>Die virtuelle Festplatte <nobr><b>%1</b></nobr> konnte nicht vom Slot <i>%2</i> der virtuellen Maschine <b>%3</b> getrennt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1276"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1283"/> <source>Failed to mount the %1 <nobr><b>%2</b></nobr> to the machine <b>%3</b>.</source> <translation>Die %1 <nobr><b>%2</b></nobr> konnte nicht an die virtuelle Maschine <b>%3</b> angeschlossen werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1291"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1298"/> <source>Failed to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source> <translation>Die %1 <nobr><b>%2</b></nobr> konnte nicht von der virtuellen Maschine <b>%3</b> getrennt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1305"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1312"/> <source>Failed to open the %1 <nobr><b>%2</b></nobr>.</source> <translation>Die %1 <nobr><b>%2</b></nobr> konnte nicht geöffnet werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1317"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1324"/> <source>Failed to close the %1 <nobr><b>%2</b></nobr>.</source> <translation>Die %1 <nobr><b>%2</b></nobr> konnte nicht geschlossen werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1359"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1366"/> <source>Failed to get the accessibility state of the medium <nobr><b>%1</b></nobr>.</source> <translation>Die Rechte für das Medium <nobr><b>%1</b></nobr> konnten nicht ermittelt werden.</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1639"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1646"/> <source><p>Failed to connect to the VirtualBox online registration service due to the following error:</p><p><b>%1</b></p></source> <translation><p>Die Verbindung zur VirtualBox-Online-Registrierung konnte aufgrund des folgenden Fehlers nicht aufgebaut werden:</p><p><b>%1</b></p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1673"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1680"/> <source><p>Unable to obtain the new version information due to the following error:</p><p><b>%1</b></p></source> <translation><p>Neue Versionsinformationen konnten aufgrund des folgenden Fehlers nicht ermittelt werden:</p><p><b>%1</b></p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1829"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1836"/> <source><p>One or more virtual hard disks, CD/DVD or floppy media are not currently accessible. As a result, you will not be able to operate virtual machines that use these media until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see what media are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source> <translation><p>Eine oder mehrere virtuelle Festplatten, CD/DVD-ROMs oder Diskettenmedien sind momentan nicht zugreifbar. Virtuelle Maschinen, die diese Medien benutzen, können so lange nicht benutzt werden, bis die Medien wieder zugreifbar werden.</p><p>Wählen Sie <b>Überprüfen</b> um den Manager für virtuelle Medien zu öffnen oder wählen Sie <b>Ignorieren</b>, um dieses Problem zu ignorieren.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1865"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1872"/> <source><p>Your existing VirtualBox settings files were automatically converted from the old format to a new format necessary for the new version of VirtualBox.</p><p>Press <b>OK</b> to start VirtualBox now or press <b>More</b> if you want to get more information about what files were converted and access additional actions.</p><p>Press <b>Exit</b> to terminate the VirtualBox application without saving the results of the conversion to disk.</p></source> <translation><p>Die vorhandenen VirtualBox-Einstellungen wurden automatisch aus dem alten Format in ein neues Format für die aktuelle Version von VirtualBox konvertiert.</p><p>Wählen Sie <b>OK</b>, um VirtualBox nun zu starten oder <b>Mehr</b>, um mehr Informationen über die konvertierten Dateien zu erhalten sowie für zusätzliche Optionen.</p><p>Wählen Sie <b>Beenden</b>, um VirtualBox ohne Speichern der Konvertierungen zu beenden.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1871"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1878"/> <source>&More</source> <comment>warnAboutAutoConvertedSettings message box</comment> <translation>&Mehr</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1915"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1922"/> <source>E&xit</source> <comment>warnAboutAutoConvertedSettings message box</comment> <translation>B&eenden</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1902"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1909"/> <source><p>The following VirtualBox settings files have been automatically converted to the new settings file format version <b>%1</b>.</p><p>However, the results of the conversion were not saved back to disk yet. Please press:</p><ul><li><b>Backup</b> to create backup copies of the settings files in the old format before saving them in the new format;</li><li><b>Overwrite</b> to save all auto-converted files without creating backup copies (it will not be possible to use these settings files with an older version of VirtualBox afterwards);</li>%2</ul><p>It is recommended to always select <b>Backup</b> because in this case it will be possible to go back to the previous version of VirtualBox (if necessary) without losing your current settings. See the VirtualBox Manual for more information about downgrading.</p></source> <translation><p>Die folgenden Dateien mit VirtualBox-Einstellungen wurden automatisch in die neue Formatversion <b>%1</b> konvertiert.</p><p>Die konvertierten Dateien wurden allerdings noch nicht abgespeichert. Wählen Sie <p><ul><li><b>Sichern</b>, um Sicherheitskopien im alten Format zu erzeugen,</li><li><b>Überschreiben</b>, um alle konvertierten Dateien ohne Sicherheitskopien zu überschreiben; diese Einstellungen können allerdings nicht mehr mit einer älteren Version von VirtualBox verwendet werden,</li><li>%2</ul><p>Es wird empfohlen, <b>Sichern</b> zu wählen, um die Sicherheitskopien mit älteren Versionen von VirtualBox verwenden zu können. Lesen Sie auch die Dokumentation für mehr Informationen über Downgrading.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1905"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1912"/> <source><li><b>Exit</b> to terminate VirtualBox without saving the results of the conversion to disk.</li></source> <translation><li><b>Beenden</b>, um VirtualBox ohne Sichern der konvertierten Dateien zu verlassen.</li></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="1912"/> + <location filename="../src/VBoxProblemReporter.cpp" line="1919"/> <source>O&verwrite</source> <comment>warnAboutAutoConvertedSettings message box</comment> <translation>&Überschreiben</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2021"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2028"/> <source><p>A critical error has occurred while running the virtual machine and the machine execution has been stopped.</p><p>For help, please see the Community section on <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> or your support contract. Please provide the contents of the log file <tt>VBox.log</tt> and the image file <tt>VBox.png</tt>, which you can find in the <nobr><b>%1</b></nobr> directory, as well as a description of what you were doing when this error happened. Note that you can also access the above files by selecting <b>Show Log</b> from the <b>Machine</b> menu of the main VirtualBox window.</p><p>Press <b>OK</b> if you want to power off the machine or press <b>Ignore</b> if you want to leave it as is for debugging. Please note that debugging requires special knowledge and tools, so it is recommended to press <b>OK</b> now.</p></source> <translation><p>Ein schwerwiegender Fehler ist aufgetreten, und die Ausführung der virtuellen Maschine wurde unterbrochen.</p><p>Zusätzliche Informationen zu diesem Fehler suchen Sie bitte in der Community-Sektion auf <a href=http://www.virtualbox.org>http://www.virtualbox.org</a> bzw. handeln Sie gemäß Ihres Supportvertrages. Bitte geben Sie die Logdatei <tt>VBox.log</tt>, den Screenshot <tt>VBox.png</tt>, den Sie im Verzeichnis <nobr><b>%1</b></nobr> finden können, sowie eine Beschreibung der Maßnahmen, die zu diesem Fehler führten, weiter. Sie können diese Dateien auch durch Auswahl von <b>Zeige Log...</b> im Menü <b>Maschine</b> des Hauptfensters finden.</p><p>Drücken Sie <b>OK</b>, wenn Sie die virtuelle Maschine ausschalten wollen. Drücken Sie <b>Ignorieren</b>, wenn Sie diese für Debugging offen lassen wollen. Zum Debuggen sind spezielle Kenntnisse und Tools notwendig, so dass die empfohlene Aktion hier <b>OK</b> ist.</p></translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2178"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2185"/> <source>hard disk</source> <comment>failed to close ...</comment> <translation>die Festplatte</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2180"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2187"/> <source>CD/DVD image</source> <comment>failed to close ...</comment> <translation>das CD/DVD-Abbild</translation> </message> <message> - <location filename="../src/VBoxProblemReporter.cpp" line="2182"/> + <location filename="../src/VBoxProblemReporter.cpp" line="2189"/> <source>floppy image</source> <comment>failed to close ...</comment> <translation>das Diskettenabbild</translation> </message> + <message> + <location filename="../src/VBoxProblemReporter.cpp" line="928"/> + <source>Cannot send the ACPI Power Button press event to the virtual machine because ACPI is not available now.</source> + <translation>Das ACPI-Event zum Herunterfahren der VM kann nicht gesendet werden, weil der Gast das ACPI-Subsystem momentan nicht benutzt.</translation> + </message> </context> <context> <name>VBoxRegistrationDlg</name> @@ -3756,7 +3761,7 @@ <context> <name>VBoxSFDialog</name> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="3749"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="3763"/> <source>Shared Folders</source> <translation>Gemeinsame Ordner</translation> </message> @@ -4136,12 +4141,12 @@ <context> <name>VBoxSwitchMenu</name> <message> - <location filename="../src/VBoxGlobal.cpp" line="5821"/> + <location filename="../src/VBoxGlobal.cpp" line="5832"/> <source>Disable</source> <translation>Deaktivieren</translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="5821"/> + <location filename="../src/VBoxGlobal.cpp" line="5832"/> <source>Enable</source> <translation>Aktivieren</translation> </message> @@ -4196,13 +4201,13 @@ <context> <name>VBoxUSBMenu</name> <message> - <location filename="../src/VBoxGlobal.cpp" line="5751"/> + <location filename="../src/VBoxGlobal.cpp" line="5762"/> <source><no available devices></source> <comment>USB devices</comment> <translation><keine Geräte verfügbar></translation> </message> <message> - <location filename="../src/VBoxGlobal.cpp" line="5754"/> + <location filename="../src/VBoxGlobal.cpp" line="5765"/> <source>No supported devices connected to the host PC</source> <comment>USB device tooltip</comment> <translation>Keine unterstützten Geräte mit dem PC verbunden</translation> @@ -4613,19 +4618,19 @@ p, li {white-space: pre-wrap; } <translation>Keine Netzwerkadapter</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2053"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2064"/> <source>Enabled</source> <comment>nested paging</comment> <translation>aktiviert</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2054"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2065"/> <source>Disabled</source> <comment>nested paging</comment> <translation>deaktiviert</translation> </message> <message> - <location filename="../src/VBoxConsoleWnd.cpp" line="2058"/> + <location filename="../src/VBoxConsoleWnd.cpp" line="2069"/> <source>Nested Paging</source> <translation>Nested Paging</translation> </message> @@ -4978,12 +4983,12 @@ p, li {white-space: pre-wrap; } <context> <name>VBoxVMSettingsGeneral</name> <message> - <location filename="../src/VBoxVMSettingsGeneral.cpp" line="402"/> + <location filename="../src/VBoxVMSettingsGeneral.cpp" line="405"/> <source><qt>%1&nbsp;MB</qt></source> <translation><qt>%1&nbsp;MB</qt></translation> </message> <message> - <location filename="../src/VBoxVMSettingsGeneral.cpp" line="430"/> + <location filename="../src/VBoxVMSettingsGeneral.cpp" line="433"/> <source>Displays the path where snapshots of this virtual machine will be stored. Note that snapshots can take quite a lot of disk space.</source> <translation>Zeigt den Pfad an, wo Sicherungspunkte für diese virtuelle Maschine gespeichert werden. Beachten Sie, dass Sicherungspunkte viel Platz beanspruchen können.</translation> </message> @@ -5118,82 +5123,82 @@ p, li {white-space: pre-wrap; } <translation>&VT-x/AMD-V aktivieren</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="725"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="745"/> <source>When checked, the Physical Address Extension (PAE) feature of the host CPU will be exposed to the virtual machine.</source> <translation>Aktiviert die Unterstützung für Physical Address Extension (PAE) für Gäste. Nur möglich, wenn der Host diesen Modus ebenfalls unterstützt.</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="728"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="748"/> <source>Enable PA&E/NX</source> <translation>PA&E/NX aktivieren</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="737"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="757"/> <source>&Shared Clipboard:</source> <translation>&Gemeinsame Zwischenablage:</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="760"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="780"/> <source>Defines the mode of sharing the clipboard between the guest and the host OS. Note that this feature requires Guest Additions to be installed in the guest OS.</source> <translation>Legt den Modus der gemeinsamen Zwischenablage zwischen Host und Gast fest. Dieses Feature benötigt installierte Gasterweiterungen im Gast-Betriebssystem.</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="773"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="793"/> <source>Defines the type of the virtual IDE controller. Depending on this value, VirtualBox will provide different virtual IDE hardware devices to the guest OS.</source> <translation>Wählt den Typ des virtuellen IDE-Controllers. Abhängig von dieser Einstellung emuliert VirtualBox unterschiedliche IDE-Hardware für den Gast.</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="800"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="820"/> <source>&IDE Controller Type:</source> <translation>&IDE-Controller im Gast:</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="813"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="833"/> <source>S&napshot Folder:</source> <translation>Ordner &Sicherungspunkte:</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="850"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="870"/> <source>&Description</source> <translation>&Beschreibung</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="856"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="876"/> <source>Displays the description of the virtual machine. The description field is useful for commenting configuration details of the installed guest OS.</source> <translation>Zeigt die Beschreibung für diese virtuelle Maschine. Das Beschreibungsfeld kann für Kommentare über die Konfiguration des installierten Gastsystems verwendet werden.</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="867"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="887"/> <source>&Other</source> <translation>&Sonstiges</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="902"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="922"/> <source>If checked, any change to mounted CD/DVD or Floppy media performed during machine execution will be saved in the settings file in order to preserve the configuration of mounted media between runs.</source> <translation>Falls ausgewählt, werden zur Laufzeit zugewiesene CD/DVD- oder Diskettenmedien in den Einstellungen gespeichert um die Zuweisung über die Laufzeit der VM hinaus beizubehalten.</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="905"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="925"/> <source>&Remember Mounted Media</source> <translation>&Gebundene Medien merken</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="889"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="909"/> <source>Runtime:</source> <translation>Laufzeit:</translation> </message> <message> - <location filename="../src/VBoxVMSettingsGeneral.cpp" line="337"/> + <location filename="../src/VBoxVMSettingsGeneral.cpp" line="340"/> <source>you have assigned more than <b>75%</b> of your computer's memory (<b>%1</b>) to the virtual machine. Not enough memory is left for your host operating system. Please select a smaller amount.</source> <translation>haben Sie mehr als <b>75%</b> des Hauptspeichers (<b>%1</b>) für die virtuelle Maschine reserviert. Dadurch bleibt zu wenig Hauptspeicher für den Host übrig. Bitte vermindern Sie den Hauptspeicher für diese VM.</translation> </message> <message> - <location filename="../src/VBoxVMSettingsGeneral.cpp" line="346"/> + <location filename="../src/VBoxVMSettingsGeneral.cpp" line="349"/> <source>you have assigned more than <b>50%</b> of your computer's memory (<b>%1</b>) to the virtual machine. Not enough memory might be left for your host operating system. Continue at your own risk.</source> <translation>haben Sie mehr als <b>50%</b> des Hauptspeichers (<b>%1</b>) für die virtuelle Maschine reserviert. Dadurch kann eventuell zu wenig Speicher für den Host übrig bleiben. Fahren Sie auf eigenes Risiko fort.</translation> </message> <message> - <location filename="../src/VBoxVMSettingsGeneral.cpp" line="355"/> + <location filename="../src/VBoxVMSettingsGeneral.cpp" line="358"/> <source>you have assigned less than <b>%1</b> for video memory which is the minimum amount required to switch the virtual machine to fullscreen or seamless mode.</source> <translation>haben Sie weniger als <b>%1</b> Grafikspeicher reserviert. Um in den Vollbidmodus oder in den nahtlosen Modus schalten zu können, ist das zu wenig.</translation> </message> @@ -5208,12 +5213,12 @@ p, li {white-space: pre-wrap; } <translation>&3D-Beschleunigung aktivieren</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="709"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="727"/> <source>When checked, the virtual machine will try to make use of the nested paging extension of Intel VT-x and AMD-V.</source> <translation>Durch Auswählen dieser Option wird die virtuelle Machine den Modus "Nested Paging" verwenden, falls die CPU dies unterstützt (nur falls VT-x/AMD-V aktiviert ist).</translation> </message> <message> - <location filename="../ui/VBoxVMSettingsGeneral.ui" line="712"/> + <location filename="../ui/VBoxVMSettingsGeneral.ui" line="730"/> <source>Enable Nested Pa&ging</source> <translation>Nested P&aging aktivieren</translation> </message> diff --git a/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_fr.ts index 7c5d5170f..635c7b161 100644 --- a/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_fr.ts +++ b/src/VBox/Frontends/VirtualBox4/nls/VirtualBox_fr.ts @@ -3404,7 +3404,7 @@ Version %1</source> <message> <location filename="../src/VBoxProblemReporter.cpp" line="690"/> <source>Failed to access the USB subsystem.</source> - <translation>Erreur d'accès au sous système USB.</translation> + <translation>Erreur d'accès au sous-système USB.</translation> </message> <message> <location filename="../src/VBoxProblemReporter.cpp" line="701"/> @@ -3759,7 +3759,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue <message> <location filename="../src/VBoxProblemReporter.cpp" line="1988"/> <source><p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode but the color quality of the virtual display is currently set to <b>%2&nbsp;bit</b>.</p><p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, if it is available, for best possible performance of the virtual video subsystem.</p><p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode but report it as 24&nbsp;bit (16 million colors). You may try to select a different color quality to see if this message disappears or you can simply disable the message now if you are sure the required color quality (%4&nbsp;bit) is not available in the given guest OS.</p></source> - <translation><p>L'écran de votre l'ordinateur est optimisé pour le traitement en mode couleur <b>%1&nbsp;bits</b> alors que le mode couleur de l'écran de la machine virtuelle est de <b>%2&nbsp;bits</b>.</p><p>Configurez le mode couleur de l'écran à l'aide de la boîte de dialogue correspondante sur votre ordinateur afin d'obtenir des meilleures performances.</p><p><b>Note&nbsp;:</b> Certains systèmes d'exploitations, tel que OS/2, peuvent fonctionner en mode couleur 32 bits mais annoncent 24 bits (16 millions de couleurs). Vous pouvez choisir un autre mode de couleur pour voir si ce message n'est plus affiché ou simplement désactiver ce message si vous êtes sur que votre système n'offre pas le mode couleur (%4&nbsp;).</p></translation> + <translation><p>La fenêtre de la machine virtuelle est optimisé pour le traitement en mode couleur <b>%1&nbsp;bits</b> alors que le mode couleur de l'écran virtuelle est de <b>%2&nbsp;bits</b>.</p><p>Pour une performance graphique optimale, veuillez configurer le système invité pour utiliser une mode coleur <b>%3&nbsp;bits</b> si possible.</p><p><b>Note&nbsp;:</b> Certains systèmes d'exploitations, tel que OS/2, peuvent fonctionner en mode couleur 32 bits mais annoncent 24 bits (16 millions de couleurs). Vous pouvez essayer de choisir un autre mode de couleur pour voir si ce message n'est plus affiché ou simplement désactiver ce message si vous êtes sûr que votre système n'offre pas de mode couleur approprié (%4&nbsp;bits).</p></translation> </message> <message> <location filename="../src/VBoxProblemReporter.cpp" line="1947"/> @@ -4223,7 +4223,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue <message> <location filename="../src/VBoxProblemReporter.cpp" line="1829"/> <source><p>One or more virtual hard disks, CD/DVD or floppy media are not currently accessible. As a result, you will not be able to operate virtual machines that use these media until they become accessible later.</p><p>Press <b>Check</b> to open the Virtual Media Manager window and see what media are inaccessible, or press <b>Ignore</b> to ignore this message.</p></source> - <translation><p>Un ou plusieurs disques durs virtuels, supports optique ou disquette ne sont pas pas accessibles actuellement. Vous ne pourrez démarrer des machines virtuelles qui utilisent ces supports tant qu'il ne seront pas accessibles.</p><p>Activez <b>Vérifier</b> pour ouvrir le Gestionnaire de supports virtuels pour voir quels supports sont inaccessibles, ou bien activez <b>Ignorer</b> pour ignorer ce message.</p></translation> + <translation><p>Un ou plusieurs disques durs virtuels, supports optique ou disquette ne sont pas pas accessibles actuellement. Vous ne pourrez démarrer des machines virtuelles qui utilisent ces supports tant qu'il ne seront pas accessibles.</p><p>Activez le bouton <b>Ouvrir</b> pour ouvrir le Gestionnaire de supports virtuels pour voir quels supports sont inaccessibles, ou bien <b>Ignorer</b> pour ignorer ce message.</p></translation> </message> <message> <location filename="../src/VBoxProblemReporter.cpp" line="1865"/> @@ -4634,7 +4634,7 @@ Pour que la souris soit capturée, cliquer dans la fenêtre de la machine virtue <message> <location filename="../src/VBoxSnapshotsWgt.cpp" line="681"/> <source>&Discard Snapshot</source> - <translation>&Rejeter un instantané</translation> + <translation>&Rejeter l'instantané</translation> </message> <message> <location filename="../src/VBoxSnapshotsWgt.cpp" line="682"/> diff --git a/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp b/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp index 5bfdc3222..5f499bee9 100644 --- a/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleView.cpp @@ -2025,6 +2025,25 @@ bool VBoxConsoleView::pmEvent (QMSG *aMsg) #elif defined(Q_WS_X11) /** + * This function is a "predicate" for XCheckIfEvent(). It will check + * the XEvent passed to it to see if it is a keypress event matching + * the keyrelease event in @a pvArg. + * @returns True if the event matches, False otherwise + * @param pEvent the event to compare, taken from the event queue + * @param pvArg the keyrelease event we would like to compare against + */ +static Bool VBoxConsoleViewCompEvent(Display *, XEvent *pEvent, + XPointer pvArg) +{ + XEvent *pKeyEvent = (XEvent *) pvArg; + if ((pEvent->type == XKeyPress) && + (pEvent->xkey.keycode == pKeyEvent->xkey.keycode)) + return True; + else + return False; +} + +/** * This routine gets X11 events before they are processed by Qt. This is * used for our platform specific keyboard implementation. A return value * of TRUE indicates that the event has been processed by us. @@ -2068,20 +2087,14 @@ bool VBoxConsoleView::x11Event (XEvent *event) /* Fix for http://www.virtualbox.org/ticket/1296: * when X11 sends events for repeated keys, it always inserts an - * XKeyRelease before the XKeyPress. Since it nearly always - * (always?) uses the same time stamp for both, we can spot the - * unwanted event and discard it. Of course, if we do miss one it - * isn't fatal for our purposes. */ - if ((XKeyRelease == event->type) && XPending(event->xkey.display)) - { - XEvent nextEvent; - - XPeekEvent(event->xkey.display, &nextEvent); - if ((XKeyPress == nextEvent.type) && - (event->xkey.keycode == nextEvent.xkey.keycode) && - (event->xkey.time == nextEvent.xkey.time)) - /* Discard it, don't pass it to Qt. */ - return true; + * XKeyRelease before the XKeyPress. */ + XEvent returnEvent; + if ((event->type == XKeyRelease) && + (XCheckIfEvent(event->xkey.display, &returnEvent, + VBoxConsoleViewCompEvent, (XPointer) event) == True)) { + XPutBackEvent(event->xkey.display, &returnEvent); + /* Discard it, don't pass it to Qt. */ + return true; } KeySym ks = ::XKeycodeToKeysym (event->xkey.display, event->xkey.keycode, 0); diff --git a/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp b/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp index f3e75bad5..29bfdc262 100644 --- a/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp @@ -384,7 +384,7 @@ VBoxConsoleWnd (VBoxConsoleWnd **aSelf, QWidget* aParent, ///// Menubar /////////////////////////////////////////////////////////// - mMainMenu = new QMenu (this); + mMainMenu = new QIMenu (this); /* Machine submenu */ @@ -1175,9 +1175,11 @@ void VBoxConsoleWnd::popupMainMenu (bool aCenter) pos.setY (pos.y() - mMainMenu->frameGeometry().height()); } - mMainMenu->setActiveAction (mMainMenu->actions().first()); mMainMenu->popup (pos); + mMainMenu->selectFirstAction(); +#ifdef Q_WS_WIN mMainMenu->activateWindow(); +#endif } // @@ -1261,6 +1263,8 @@ void VBoxConsoleWnd::closeEvent (QCloseEvent *e) static const char *kPowerOff = "powerOff"; static const char *kDiscardCurState = "discardCurState"; + bool isACPIEnabled = csession.GetConsole().GetGuestEnteredACPIMode(); + if (!console) { e->accept(); @@ -1315,7 +1319,7 @@ void VBoxConsoleWnd::closeEvent (QCloseEvent *e) dlg.pmIcon->setPixmap (vboxGlobal().vmGuestOSTypeIcon (typeId)); /* make the Discard checkbox invisible if there are no snapshots */ - dlg.mCbDiscardCurState->setVisible ((cmachine.GetSnapshotCount() > 0)); + dlg.mCbDiscardCurState->setVisible (cmachine.GetSnapshotCount() > 0); if (machine_state != KMachineState_Stuck) { @@ -1323,28 +1327,24 @@ void VBoxConsoleWnd::closeEvent (QCloseEvent *e) QStringList lastAction = cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (','); AssertWrapperOk (cmachine); - if (lastAction [0] == kPowerOff) - { - dlg.mRbPowerOff->setChecked (true); - dlg.mRbPowerOff->setFocus(); - } - else if (lastAction [0] == kShutdown) - { - dlg.mRbShutdown->setChecked (true); - dlg.mRbShutdown->setFocus(); - } - else if (lastAction [0] == kSave) + if (lastAction [0] == kSave) { dlg.mRbSave->setChecked (true); dlg.mRbSave->setFocus(); } + else if (lastAction [0] == kPowerOff || !isACPIEnabled) + { + dlg.mRbShutdown->setEnabled (isACPIEnabled); + dlg.mRbPowerOff->setChecked (true); + dlg.mRbPowerOff->setFocus(); + } else /* the default is ACPI Shutdown */ { dlg.mRbShutdown->setChecked (true); dlg.mRbShutdown->setFocus(); } - dlg.mCbDiscardCurState->setChecked ( - lastAction.count() > 1 && lastAction [1] == kDiscardCurState); + dlg.mCbDiscardCurState->setChecked (lastAction.count() > 1 && + lastAction [1] == kDiscardCurState); } else { @@ -1455,11 +1455,17 @@ void VBoxConsoleWnd::closeEvent (QCloseEvent *e) if (success || wasShutdown) { + /* read the last user's choice for the given VM */ + QStringList prevAction = + cmachine.GetExtraData (VBoxDefs::GUI_LastCloseAction).split (','); /* memorize the last user's choice for the given VM */ QString lastAction = kPowerOff; if (dlg.mRbSave->isChecked()) lastAction = kSave; - else if (dlg.mRbShutdown->isChecked()) + else if (dlg.mRbShutdown->isChecked() || + (dlg.mRbPowerOff->isChecked() && + prevAction [0] == kShutdown && + !isACPIEnabled)) lastAction = kShutdown; else if (dlg.mRbPowerOff->isChecked()) lastAction = kPowerOff; @@ -1563,7 +1569,10 @@ bool VBoxConsoleWnd::x11Event (XEvent *event) } #endif +#ifdef Q_WS_MAC extern void qt_set_sequence_auto_mnemonic ( bool on ); +#endif + /** * Sets the strings of the subwidgets using the current * language. @@ -1590,7 +1599,9 @@ void VBoxConsoleWnd::retranslateUi() /* VM actions */ +#ifdef Q_WS_MAC qt_set_sequence_auto_mnemonic (false); +#endif mVmFullscreenAction->setText (VBoxGlobal::insertKeyToActionText (tr ("&Fullscreen Mode"), "F")); mVmFullscreenAction->setStatusTip (tr ("Switch to fullscreen mode" )); @@ -2590,6 +2601,9 @@ void VBoxConsoleWnd::vmPause (bool on) void VBoxConsoleWnd::vmACPIShutdown() { + if (!csession.GetConsole().GetGuestEnteredACPIMode()) + return vboxProblem().cannotSendACPIToMachine(); + if (console) { CConsole cconsole = console->console(); diff --git a/src/VBox/Frontends/VirtualBox4/src/VBoxFBQuartz2D.cpp b/src/VBox/Frontends/VirtualBox4/src/VBoxFBQuartz2D.cpp index 03670e61e..f7af62d87 100644 --- a/src/VBox/Frontends/VirtualBox4/src/VBoxFBQuartz2D.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/VBoxFBQuartz2D.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxFBQuartz2D.cpp 12628 2008-09-22 09:04:57Z vboxsync $ */ +/* $Id: VBoxFBQuartz2D.cpp $ */ /** @file * Qt GUI (aka VirtualBox) - Quartz2D framebuffer implementation. */ diff --git a/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp index 09bf94b45..7ef4db7a2 100644 --- a/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp @@ -47,6 +47,7 @@ #include <QProcess> #include <QThread> #include <QPainter> +#include <QTimer> #ifdef Q_WS_X11 #ifndef VBOX_OSE @@ -5114,6 +5115,11 @@ void VBoxGlobal::showRegistrationDialog (bool aForce) */ void VBoxGlobal::showUpdateDialog (bool aForce) { + /* Silently check in one day after current time-stamp */ + QTimer::singleShot (24 /* hours */ * 60 /* minutes */ * + 60 /* seconds */ * 1000 /* milliseconds */, + this, SLOT (perDayNewVersionNotifier())); + bool isNecessary = VBoxUpdateDlg::isNecessary(); if (!aForce && !isNecessary) @@ -5154,6 +5160,11 @@ void VBoxGlobal::showUpdateDialog (bool aForce) } } +void VBoxGlobal::perDayNewVersionNotifier() +{ + showUpdateDialog (false /* force show? */); +} + // Protected members //////////////////////////////////////////////////////////////////////////////// diff --git a/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp b/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp index 144398cc5..4d6316202 100644 --- a/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/VBoxProblemReporter.cpp @@ -921,6 +921,13 @@ void VBoxProblemReporter::cannotDiscardSavedState (const CConsole &console) formatErrorInfo (res)); } +void VBoxProblemReporter::cannotSendACPIToMachine() +{ + message (mainWindowShown(), Warning, + tr ("Cannot send the ACPI Power Button press event to the " + "virtual machine because ACPI is not available now.")); +} + void VBoxProblemReporter::cannotSetSnapshotFolder (const CMachine &aMachine, const QString &aPath) { diff --git a/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c b/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c index 4244f844f..e57dd025e 100644 --- a/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c +++ b/src/VBox/Frontends/VirtualBox4/src/X11/keyboard-new.c @@ -111,7 +111,7 @@ unsigned X11DRV_KeyEvent(Display *display, KeyCode code) unsigned scan; KeySym keysym = XKeycodeToKeysym(display, code, 0); scan = 0; - if (keysym) /* otherwise, keycode not used */ + if (keysym != 0) /* otherwise, keycode not used */ { if ((keysym >> 8) == 0xFF) /* non-character key */ scan = nonchar_key_scan[keysym & 0xff]; @@ -123,7 +123,10 @@ unsigned X11DRV_KeyEvent(Display *display, KeyCode code) scan = 0x39; else if (keysym == 0xFE03) /* ISO level3 shift, aka AltGr */ scan = 0x138; - else if (use_builtin_table != 0) + } + if (keysym != 0 && scan == 0) + { + if (use_builtin_table != 0) scan = main_keyboard_type_scans[builtin_table_number][code]; else scan = keyc2scan[code]; diff --git a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxAquaStyle.cpp b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxAquaStyle.cpp index 0fbbc9d68..b2546f4cd 100644 --- a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxAquaStyle.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxAquaStyle.cpp @@ -1,4 +1,4 @@ -/** $Id: $ */ +/** $Id: $ */ /** @file * Qt GUI - VBox Variation on the QAquaStyle. */ diff --git a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxDockIconPreview.cpp b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxDockIconPreview.cpp index 86103a7b3..4c40186bf 100644 --- a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxDockIconPreview.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxDockIconPreview.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxDockIconPreview.cpp 15804 2009-01-05 14:55:35Z vboxsync $ */ +/* $Id: VBoxDockIconPreview.cpp $ */ /** @file * Qt GUI - Realtime Dock Icon Preview */ diff --git a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxIChatTheaterWrapper.m b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxIChatTheaterWrapper.m index a135022c3..dc4491f92 100644 --- a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxIChatTheaterWrapper.m +++ b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxIChatTheaterWrapper.m @@ -1,4 +1,4 @@ -/* $Id: VBoxIChatTheaterWrapper.m 8170 2008-04-18 17:52:25Z vboxsync $ */ +/* $Id: VBoxIChatTheaterWrapper.m $ */ /** @file * Qt GUI - iChat Theater cocoa wrapper. */ diff --git a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp index ad1cb1f9e..b4e2f56f8 100644 --- a/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/darwin/VBoxUtils-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxUtils-darwin.cpp 15804 2009-01-05 14:55:35Z vboxsync $ */ +/* $Id: VBoxUtils-darwin.cpp $ */ /** @file * Qt GUI - Utility Classes and Functions specific to Darwin. */ diff --git a/src/VBox/Frontends/VirtualBox4/src/hardenedmain.cpp b/src/VBox/Frontends/VirtualBox4/src/hardenedmain.cpp index 644087b1e..570788507 100644 --- a/src/VBox/Frontends/VirtualBox4/src/hardenedmain.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/hardenedmain.cpp @@ -1,4 +1,4 @@ -/* $Id: hardenedmain.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: hardenedmain.cpp $ */ /** @file * VirtualBox - Hardened main(). */ diff --git a/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.asm b/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.asm index 3dada14c1..cce66e212 100644 --- a/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.asm +++ b/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.asm @@ -1,4 +1,4 @@ -; $Id: VBoxHlp.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxHlp.asm $ ;; @file ; ; VBox frontends: Qt GUI ("VirtualBox"): diff --git a/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.cpp b/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.cpp index a9e90c8db..8e6ab02ac 100644 --- a/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.cpp +++ b/src/VBox/Frontends/VirtualBox4/src/os2/VBoxHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxHlp.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VBoxHlp.cpp $ */ /** @file * VBox frontends: Qt GUI ("VirtualBox"): * Implementation of OS/2-specific helpers that require to reside in a DLL diff --git a/src/VBox/GuestHost/Makefile.kmk b/src/VBox/GuestHost/Makefile.kmk index 5f60ce2b0..e8e341482 100644 --- a/src/VBox/GuestHost/Makefile.kmk +++ b/src/VBox/GuestHost/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15532 2008-12-15 18:53:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest/Host part # diff --git a/src/VBox/GuestHost/OpenGL/Makefile.kmk b/src/VBox/GuestHost/OpenGL/Makefile.kmk index 9d57a6bc3..1cae5068f 100644 --- a/src/VBox/GuestHost/OpenGL/Makefile.kmk +++ b/src/VBox/GuestHost/OpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15799 2009-01-05 13:10:38Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Guest/Host OpenGL part # diff --git a/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py b/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py index 135ec23f2..135ec23f2 100644..100755 --- a/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py +++ b/src/VBox/GuestHost/OpenGL/glapi_parser/apiutil.py diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c index 01b02cb43..01b02cb43 100755..100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c index 96059a000..5ec40cbf5 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c @@ -1,4 +1,4 @@ -/* $Id: state_snapshot.c 15532 2008-12-15 18:53:11Z vboxsync $ */ +/* $Id: state_snapshot.c $ */ /** @file * VBox Context state saving/loading used by VM snapshot diff --git a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c index cfcd64359..54414992b 100644 --- a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c +++ b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c @@ -1,4 +1,4 @@ -/* $Id: vboxhgcm.c 15964 2009-01-15 12:52:20Z vboxsync $ */ +/* $Id: vboxhgcm.c $ */ /** @file * VBox HGCM connection diff --git a/src/VBox/HostDrivers/Makefile.kmk b/src/VBox/HostDrivers/Makefile.kmk index 1dae601fa..ce7d7fdce 100644 --- a/src/VBox/HostDrivers/Makefile.kmk +++ b/src/VBox/HostDrivers/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14545 2008-11-24 21:15:01Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox Host drivers. # diff --git a/src/VBox/HostDrivers/Support/Makefile.kmk b/src/VBox/HostDrivers/Support/Makefile.kmk index 7333bf284..b6c9433b5 100644 --- a/src/VBox/HostDrivers/Support/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15589 2008-12-16 14:24:08Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the support library and the drivers/modules/kexts it uses. # diff --git a/src/VBox/HostDrivers/Support/SUPDrv.c b/src/VBox/HostDrivers/Support/SUPDrv.c index 4e7fbe908..32b4db14b 100644 --- a/src/VBox/HostDrivers/Support/SUPDrv.c +++ b/src/VBox/HostDrivers/Support/SUPDrv.c @@ -1,4 +1,4 @@ -/* $Revision: 15843 $ */ +/* $Revision: 41435 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Common code. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvIDC.h b/src/VBox/HostDrivers/Support/SUPDrvIDC.h index 785dc66ac..219c0392d 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIDC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIDC.h @@ -1,4 +1,4 @@ -/* $Id: SUPDrvIDC.h 10377 2008-07-08 16:26:13Z vboxsync $ */ +/* $Id: SUPDrvIDC.h $ */ /** @file * VirtualBox Support Driver - Inter-Driver Communciation (IDC) definitions. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvIOC.h b/src/VBox/HostDrivers/Support/SUPDrvIOC.h index d025dd6b9..7e11f8f0b 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIOC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIOC.h @@ -1,4 +1,4 @@ -/* $Revision: 15838 $ */ +/* $Revision: 41426 $ */ /** @file * VirtualBox Support Driver - IOCtl definitions. */ diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h b/src/VBox/HostDrivers/Support/SUPDrvInternal.h index 5ae9c8b49..10a123f1c 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h +++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h @@ -1,4 +1,4 @@ -/* $Revision: 16029 $ */ +/* $Revision: 41713 $ */ /** @file * VirtualBox Support Driver - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/SUPLib.cpp b/src/VBox/HostDrivers/Support/SUPLib.cpp index ed3db1125..f8258caf1 100644 --- a/src/VBox/HostDrivers/Support/SUPLib.cpp +++ b/src/VBox/HostDrivers/Support/SUPLib.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib.cpp 15841 2009-01-07 16:40:02Z vboxsync $ */ +/* $Id: SUPLib.cpp $ */ /** @file * VirtualBox Support Library - Common code. */ diff --git a/src/VBox/HostDrivers/Support/SUPLibInternal.h b/src/VBox/HostDrivers/Support/SUPLibInternal.h index 6b026256c..da70f8237 100644 --- a/src/VBox/HostDrivers/Support/SUPLibInternal.h +++ b/src/VBox/HostDrivers/Support/SUPLibInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPLibInternal.h 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPLibInternal.h $ */ /** @file * VirtualBox Support Library - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0.def b/src/VBox/HostDrivers/Support/SUPR0.def index 659532b0d..29c32b79f 100644 --- a/src/VBox/HostDrivers/Support/SUPR0.def +++ b/src/VBox/HostDrivers/Support/SUPR0.def @@ -1,4 +1,4 @@ -; $Id: SUPR0.def 15838 2009-01-07 15:57:24Z vboxsync $ +; $Id: SUPR0.def $ ;; @file ; VirtualBox Support Driver - Built-in exports. ; diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c index fed29823d..11f668b92 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClient.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClient.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient.c 11794 2008-08-29 09:13:37Z vboxsync $ */ +/* $Id: SUPR0IdcClient.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Core. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c index 523b0c5e5..b88c2c73e 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientComponent.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClientComponent.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Component APIs. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h index 22133089b..7cfe72aa5 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientInternal.h 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClientInternal.h $ */ /** @file * VirtualBox Support Driver - Internal header for the IDC client library. */ diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c index 7a21a84c9..53b48f988 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClientStubs.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClientStubs.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Stubs for SUPR0 APIs. */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp index 08fea59f5..2ea70616f 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedIPRT.cpp 15352 2008-12-12 06:08:19Z vboxsync $ */ +/* $Id: SUPR3HardenedIPRT.cpp $ */ /** @file * VirtualBox Support Library - Hardened Support Routines using IPRT. */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp index 58adb1a0f..67a4eb4d1 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedMain.cpp 16067 2009-01-20 07:52:25Z vboxsync $ */ +/* $Id: SUPR3HardenedMain.cpp $ */ /** @file * VirtualBox Support Library - Hardened main(). */ diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp index 5a6adf439..332105abe 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPR3HardenedVerify.cpp 15353 2008-12-12 06:10:39Z vboxsync $ */ +/* $Id: SUPR3HardenedVerify.cpp $ */ /** @file * VirtualBox Support Library - Verification of Hardened Installation. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvc.cpp b/src/VBox/HostDrivers/Support/SUPSvc.cpp index acf7ff293..ef0bd9fc9 100644 --- a/src/VBox/HostDrivers/Support/SUPSvc.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvc.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: SUPSvc.cpp $ */ /** @file * VirtualBox Support Service - Common Code. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp index 585a29377..2fe724dd1 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvcGlobal.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: SUPSvcGlobal.cpp $ */ /** @file * VirtualBox Support Service - The Global Service. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp index ed05d64d8..320031714 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvcGrant.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: SUPSvcGrant.cpp $ */ /** @file * VirtualBox Support Service - The Grant Service. */ diff --git a/src/VBox/HostDrivers/Support/SUPSvcInternal.h b/src/VBox/HostDrivers/Support/SUPSvcInternal.h index 05c244d11..267a28220 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcInternal.h +++ b/src/VBox/HostDrivers/Support/SUPSvcInternal.h @@ -1,4 +1,4 @@ -/* $Id: SUPSvcInternal.h 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: SUPSvcInternal.h $ */ /** @file * VirtualBox Support Service - Internal header. */ diff --git a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp index c47ba6863..2e4240c33 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: $ */ +/* $Id: $ */ /** @file * * VBox host drivers - Ring-0 support drivers - Darwin host: diff --git a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp index 215fc3129..042189fcf 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: $ */ +/* $Id: $ */ /** @file * VirtualBox Support Library - Darwin specific parts. */ diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c index 1351f1cb2..bcb1603e6 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c +++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-darwin.c 10262 2008-07-04 23:42:33Z vboxsync $ */ +/* $Id: SUPR0IdcClient-darwin.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Darwin Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c index 8201b475b..e470ddacf 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPDrv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-freebsd.c 16030 2009-01-19 05:24:30Z vboxsync $ */ +/* $Id: SUPDrv-freebsd.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - FreeBSD specifics. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp index 6443b4619..5af8cdcb6 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp +++ b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: $ */ +/* $Id: $ */ /** @file * VirtualBox Support Library - FreeBSD specific parts. */ diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c index f9d0000eb..307505d6b 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-freebsd.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClient-freebsd.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, FreeBSD Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c index 7fa74a1b6..e06fbcb15 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 15999 $ */ +/* $Rev: 41679 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Linux specifics. */ diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c index 40a54909a..1b6094265 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-linux.mod.c 10662 2008-07-15 14:36:00Z vboxsync $ */ +/* $Id: SUPDrv-linux.mod.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Autogenerated Linux code. * This is checked in to assist syntax checking the module. diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp index c02beae38..88388bb63 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp +++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-linux.cpp 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPLib-linux.cpp $ */ /** @file * VirtualBox Support Library - GNU/Linux specific parts. */ diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c index 90abb0a92..d725cf5fb 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-linux.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClient-linux.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Linux Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/linux/files_vboxdrv b/src/VBox/HostDrivers/Support/linux/files_vboxdrv index bca75a850..bca75a850 100644..100755 --- a/src/VBox/HostDrivers/Support/linux/files_vboxdrv +++ b/src/VBox/HostDrivers/Support/linux/files_vboxdrv diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp index 86fdd350c..2e755ff8e 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp +++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-os2.cpp 13998 2008-11-10 12:08:56Z vboxsync $ */ +/* $Id: SUPDrv-os2.cpp $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - OS/2 specifics. */ diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm b/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm index 4498a58df..5992ecd16 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm +++ b/src/VBox/HostDrivers/Support/os2/SUPDrvA-os2.asm @@ -1,4 +1,4 @@ -; $Id: SUPDrvA-os2.asm 10729 2008-07-17 15:05:47Z vboxsync $ +; $Id: SUPDrvA-os2.asm $ ;; @file ; VBoxDrv - OS/2 assembly file, the first file in the link. ; diff --git a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp index fee169bfc..4c2ddaa34 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp +++ b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-os2.cpp 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPLib-os2.cpp $ */ /** @file * VirtualBox Support Library - OS/2 specific parts. */ diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c index ef05452ec..304bff00b 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c +++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-os2.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClient-os2.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, OS/2 Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c index fc3e580fc..ff65b4220 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-solaris.c 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPDrv-solaris.c $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Solaris specifics. */ @@ -694,52 +694,62 @@ static int VBoxDrvSolarisIOCtlSlow(PSUPDRVSESSION pSession, int iCmd, int Mode, { int rc; uint32_t cbBuf = 0; - SUPREQHDR Hdr; + union + { + SUPREQHDR Hdr; + uint8_t abBuf[64]; + } StackBuf; PSUPREQHDR pHdr; /* * Read the header. */ - if (RT_UNLIKELY(IOCPARM_LEN(iCmd) != sizeof(Hdr))) + if (RT_UNLIKELY(IOCPARM_LEN(iCmd) != sizeof(StackBuf.Hdr))) { - LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(Hdr))); + LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: iCmd=%#x len %d expected %d\n", iCmd, IOCPARM_LEN(iCmd), sizeof(StackBuf.Hdr))); return EINVAL; } - rc = ddi_copyin((void *)iArg, &Hdr, sizeof(Hdr), Mode); + rc = ddi_copyin((void *)iArg, &StackBuf.Hdr, sizeof(StackBuf.Hdr), Mode); if (RT_UNLIKELY(rc)) { LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: ddi_copyin(,%#lx,) failed; iCmd=%#x. rc=%d\n", iArg, iCmd, rc)); return EFAULT; } - if (RT_UNLIKELY((Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC)) + if (RT_UNLIKELY((StackBuf.Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK) != SUPREQHDR_FLAGS_MAGIC)) { - LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: bad header magic %#x; iCmd=%#x\n", Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK, iCmd)); + LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: bad header magic %#x; iCmd=%#x\n", StackBuf.Hdr.fFlags & SUPREQHDR_FLAGS_MAGIC_MASK, iCmd)); return EINVAL; } - cbBuf = RT_MAX(Hdr.cbIn, Hdr.cbOut); - if (RT_UNLIKELY( Hdr.cbIn < sizeof(Hdr) - || Hdr.cbOut < sizeof(Hdr) + cbBuf = RT_MAX(StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut); + if (RT_UNLIKELY( StackBuf.Hdr.cbIn < sizeof(StackBuf.Hdr) + || StackBuf.Hdr.cbOut < sizeof(StackBuf.Hdr) || cbBuf > _1M*16)) { - LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", Hdr.cbIn, Hdr.cbOut, iCmd)); + LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: max(%#x,%#x); iCmd=%#x\n", StackBuf.Hdr.cbIn, StackBuf.Hdr.cbOut, iCmd)); return EINVAL; } /* * Buffer the request. */ - pHdr = RTMemTmpAlloc(cbBuf); - if (RT_UNLIKELY(!pHdr)) + if (cbBuf <= sizeof(StackBuf)) + pHdr = &StackBuf.Hdr; + else { - LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: failed to allocate buffer of %d bytes for iCmd=%#x.\n", cbBuf, iCmd)); - return ENOMEM; + pHdr = RTMemTmpAlloc(cbBuf); + if (RT_UNLIKELY(!pHdr)) + { + LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: failed to allocate buffer of %d bytes for iCmd=%#x.\n", cbBuf, iCmd)); + return ENOMEM; + } } rc = ddi_copyin((void *)iArg, pHdr, cbBuf, Mode); if (RT_UNLIKELY(rc)) { - LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: copy_from_user(,%#lx, %#x) failed; iCmd=%#x. rc=%d\n", iArg, Hdr.cbIn, iCmd, rc)); - RTMemFree(pHdr); + LogRel((DEVICE_NAME ":VBoxDrvSolarisIOCtlSlow: copy_from_user(,%#lx, %#x) failed; iCmd=%#x. rc=%d\n", iArg, cbBuf, iCmd, rc)); + if (pHdr != &StackBuf.Hdr) + RTMemFree(pHdr); return EFAULT; } @@ -747,7 +757,7 @@ static int VBoxDrvSolarisIOCtlSlow(PSUPDRVSESSION pSession, int iCmd, int Mode, * Process the IOCtl. */ rc = supdrvIOCtl(iCmd, &g_DevExt, pSession, pHdr); - + /* * Copy ioctl data and output buffer back to user space. */ @@ -770,7 +780,8 @@ static int VBoxDrvSolarisIOCtlSlow(PSUPDRVSESSION pSession, int iCmd, int Mode, else rc = EINVAL; - RTMemTmpFree(pHdr); + if (pHdr != &StackBuf.Hdr) + RTMemTmpFree(pHdr); return rc; } diff --git a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp index b4dbdd82f..8db0c8c62 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp +++ b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-solaris.cpp 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPLib-solaris.cpp $ */ /** @file * VirtualBox Support Library - Solaris specific parts. */ diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c index f6dd151e0..c0fd3496d 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-solaris.c 10258 2008-07-04 23:31:26Z vboxsync $ */ +/* $Id: SUPR0IdcClient-solaris.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Solaris Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk index c755f723c..721669201 100644 --- a/src/VBox/HostDrivers/Support/testcase/Makefile.kmk +++ b/src/VBox/HostDrivers/Support/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14515 2008-11-24 12:33:00Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the SUPLib testcases. # diff --git a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp index e0bf7de3a..681cf4031 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp @@ -1,4 +1,4 @@ -/* $Id: tstContiguous.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: tstContiguous.cpp $ */ /** @file * VBox Support Driver - Contiguous Memory Testcase (ring-3). */ diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp index e519b1372..64c26fa00 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp @@ -1,4 +1,4 @@ -/** $Id: tstInt.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/** $Id: tstInt.cpp $ */ /** @file * Testcase: Test the interrupt gate feature of the support library. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp index 5af79d3d2..9a948215c 100644 --- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPDrv-win.cpp 13913 2008-11-06 12:59:01Z vboxsync $ */ +/* $Id: SUPDrv-win.cpp $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Windows NT specifics. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp index 1102570a6..4913cb294 100644 --- a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPLib-win.cpp 13865 2008-11-05 14:14:11Z vboxsync $ */ +/* $Id: SUPLib-win.cpp $ */ /** @file * VirtualBox Support Library - Windows NT specific parts. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c index 6021ecdd6..8703a8abc 100644 --- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c +++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c @@ -1,4 +1,4 @@ -/* $Id: SUPR0IdcClient-win.c 10263 2008-07-05 00:26:17Z vboxsync $ */ +/* $Id: SUPR0IdcClient-win.c $ */ /** @file * VirtualBox Support Driver - IDC Client Lib, Windows Specific Code. */ diff --git a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp index fae7d49d0..d0f9a61ba 100644 --- a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: SUPSvc-win.cpp 14303 2008-11-18 13:45:38Z vboxsync $ */ +/* $Id: SUPSvc-win.cpp $ */ /** @file * VirtualBox Support Service - Windows Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk index 0f1fdf72d..37b51b5f6 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15949 2009-01-14 18:21:43Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Network Filter Driver (VBoxNetFlt). # @@ -119,9 +119,6 @@ VBoxNetFlt-inf_SOURCES += \ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.sys: $$(TARGET_VBoxNetFlt) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) -$(PATH_TARGET)/VBoxNetFltMpCat.dir/VBoxNetFlt.sys: $$(TARGET_VBoxNetFlt) | $$(dir $$@) - $(INSTALL) -m 644 $< $(@D) - $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFltNotify.dll: $$(TARGET_VBoxNetFltNotify) | $$(dir $$@) $(INSTALL) -m 644 $< $(@D) @@ -133,7 +130,6 @@ $(PATH_TARGET)/VBoxNetFltCat.dir/VBoxNetFlt.cat: \ $(call VBOX_MAKE_CAT_FN, $(@D),$@) $(PATH_TARGET)/VBoxNetFltMpCat.dir/VBoxNetFlt_m.cat: \ - $(PATH_TARGET)/VBoxNetFltMpCat.dir/VBoxNetFlt.sys \ $(PATH_TARGET)/VBoxNetFltMpCat.dir/VBoxNetFlt_m.inf $(call MSG_TOOL,Inf2Cat,VBoxNetFlt-inf,$@,$<) $(call VBOX_MAKE_CAT_FN, $(@D),$@) diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c index ca26bcf1f..16db753e7 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt.c 15950 2009-01-14 18:25:22Z vboxsync $ */ +/* $Id: VBoxNetFlt.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Common Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h index 56d3aac33..486fa7e79 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFltInternal.h 15923 2009-01-13 18:20:34Z vboxsync $ */ +/* $Id: VBoxNetFltInternal.h $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Internal Header. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp index 6d2afe61f..6f1e3237e 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-darwin.cpp 15527 2008-12-15 18:11:08Z vboxsync $ */ +/* $Id: VBoxNetFlt-darwin.cpp $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Darwin Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c index ba74ed7f1..5204be057 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-linux.c 16098 2009-01-20 19:22:12Z vboxsync $ */ +/* $Id: VBoxNetFlt-linux.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Linux Specific Code. */ @@ -289,7 +289,7 @@ DECLINLINE(void) vboxNetFltLinuxReleaseNetDev(PVBOXNETFLTINS pThis, struct net_d #endif } -#define VBOXNETFLT_CB_TAG 0xA1C9D7C3 +#define VBOXNETFLT_CB_TAG(skb) (0xA1C90000 | (skb->dev->ifindex & 0xFFFF)) #define VBOXNETFLT_SKB_TAG(skb) (*(uint32_t*)&((skb)->cb[sizeof((skb)->cb)-sizeof(uint32_t)])) /** @@ -301,7 +301,7 @@ DECLINLINE(void) vboxNetFltLinuxReleaseNetDev(PVBOXNETFLTINS pThis, struct net_d */ DECLINLINE(bool) vboxNetFltLinuxSkBufIsOur(struct sk_buff *pBuf) { - return VBOXNETFLT_SKB_TAG(pBuf) == VBOXNETFLT_CB_TAG ; + return VBOXNETFLT_SKB_TAG(pBuf) == VBOXNETFLT_CB_TAG(pBuf); } @@ -355,7 +355,7 @@ static struct sk_buff *vboxNetFltLinuxSkBufFromSG(PVBOXNETFLTINS pThis, PINTNETS skb_push(pPkt, ETH_HLEN); VBOX_SKB_RESET_MAC_HDR(pPkt); } - VBOXNETFLT_SKB_TAG(pPkt) = VBOXNETFLT_CB_TAG; + VBOXNETFLT_SKB_TAG(pPkt) = VBOXNETFLT_CB_TAG(pPkt); return pPkt; } diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt index 95819176e..95819176e 100644..100755 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt diff --git a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c index f69fa8f60..981eaf3b1 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/solaris/VBoxNetFlt-solaris.c @@ -1,4 +1,4 @@ -/* $Id: VBoxNetFlt-solaris.c 16082 2009-01-20 12:47:18Z vboxsync $ */ +/* $Id: VBoxNetFlt-solaris.c $ */ /** @file * VBoxNetFlt - Network Filter Driver (Host), Solaris Specific Code. */ diff --git a/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk b/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk index 6b4f99a60..a1d05b0b7 100644 --- a/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk +++ b/src/VBox/HostDrivers/VBoxTAP/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12252 2008-09-09 01:58:29Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Windows Network Driver. # diff --git a/src/VBox/HostServices/GuestProperties/Makefile.kmk b/src/VBox/HostServices/GuestProperties/Makefile.kmk index f2d593828..4fa948df0 100644 --- a/src/VBox/HostServices/GuestProperties/Makefile.kmk +++ b/src/VBox/HostServices/GuestProperties/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13916 2008-11-06 13:48:05Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Info Services Host Service. # diff --git a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk index 79b52d943..a1d988503 100644 --- a/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk +++ b/src/VBox/HostServices/GuestProperties/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14104 2008-11-11 19:16:32Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Guest Properties Host Service testcases. # diff --git a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp index c480c5742..f07597e47 100644 --- a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp +++ b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGuestPropSvc.cpp 14461 2008-11-21 14:11:03Z vboxsync $ */ +/* $Id: tstGuestPropSvc.cpp $ */ /** @file * * Testcase for the guest property service. diff --git a/src/VBox/HostServices/Makefile.kmk b/src/VBox/HostServices/Makefile.kmk index 2f29fe0ac..6a13b66e7 100644 --- a/src/VBox/HostServices/Makefile.kmk +++ b/src/VBox/HostServices/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14140 2008-11-12 19:08:56Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VBox Host Services. # diff --git a/src/VBox/HostServices/SharedClipboard/Makefile.kmk b/src/VBox/HostServices/SharedClipboard/Makefile.kmk index cf719ec5d..bb7efe888 100644 --- a/src/VBox/HostServices/SharedClipboard/Makefile.kmk +++ b/src/VBox/HostServices/SharedClipboard/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12250 2008-09-09 01:34:00Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Clipboard Host Service. # diff --git a/src/VBox/HostServices/SharedClipboard/clipboard-helper.cpp b/src/VBox/HostServices/SharedClipboard/clipboard-helper.cpp index 2b4f3f457..288cf4d85 100644 --- a/src/VBox/HostServices/SharedClipboard/clipboard-helper.cpp +++ b/src/VBox/HostServices/SharedClipboard/clipboard-helper.cpp @@ -1,4 +1,4 @@ -/* $Id: clipboard-helper.cpp 8280 2008-04-22 12:28:31Z vboxsync $ */ +/* $Id: clipboard-helper.cpp $ */ /** @file * Shared Clipboard: Some helper function for converting between the various eol. */ diff --git a/src/VBox/HostServices/SharedClipboard/clipboard-helper.h b/src/VBox/HostServices/SharedClipboard/clipboard-helper.h index 5f7486b0f..f1dbf6b7c 100644 --- a/src/VBox/HostServices/SharedClipboard/clipboard-helper.h +++ b/src/VBox/HostServices/SharedClipboard/clipboard-helper.h @@ -1,4 +1,4 @@ -/* $Id: clipboard-helper.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: clipboard-helper.h $ */ /** @file * Shared Clipboard: Some helper function for converting between the various eol. */ diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp index c3c0a8dfb..91ee6738c 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.cpp @@ -1,4 +1,4 @@ -/* $Id: darwin-pasteboard.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: darwin-pasteboard.cpp $ */ /** @file * Shared Clipboard: Mac OS X host implementation. */ diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h index 0fbba2443..c6bdb969c 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h @@ -1,4 +1,4 @@ -/* $Id: darwin-pasteboard.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: darwin-pasteboard.h $ */ /** @file * Shared Clipboard: Mac OS X host implementation. */ diff --git a/src/VBox/HostServices/SharedClipboard/darwin.cpp b/src/VBox/HostServices/SharedClipboard/darwin.cpp index 82c6cdb59..af3839356 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: darwin.cpp 14303 2008-11-18 13:45:38Z vboxsync $ */ +/* $Id: darwin.cpp $ */ /** @file * Shared Clipboard: Mac OS X host. */ diff --git a/src/VBox/HostServices/SharedFolders/Makefile.kmk b/src/VBox/HostServices/SharedFolders/Makefile.kmk index 992b8d5db..0421167d6 100644 --- a/src/VBox/HostServices/SharedFolders/Makefile.kmk +++ b/src/VBox/HostServices/SharedFolders/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12250 2008-09-09 01:34:00Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Folders Host Service. # diff --git a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk index 173c4789c..280a6526c 100644 --- a/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk +++ b/src/VBox/HostServices/SharedFolders/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13363 2008-10-17 07:41:23Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Shared Folders Host Service testcases. # diff --git a/src/VBox/HostServices/SharedFolders/vbsf.cpp b/src/VBox/HostServices/SharedFolders/vbsf.cpp index 40c335653..d321e27c3 100644 --- a/src/VBox/HostServices/SharedFolders/vbsf.cpp +++ b/src/VBox/HostServices/SharedFolders/vbsf.cpp @@ -683,6 +683,7 @@ static int vbsfOpenFile (const char *pszPath, SHFLCREATEPARMS *pParms) /* Open or create a file. */ unsigned fOpen = 0; bool fNoError = false; + static int cErrors; int rc = vbsfConvertFileOpenFlags(pParms->CreateFlags, &fOpen); if (RT_SUCCESS(rc)) @@ -730,6 +731,18 @@ static int vbsfOpenFile (const char *pszPath, SHFLCREATEPARMS *pParms) because the driver (VBoxSF.sys) expects rc = VINF_SUCCESS and checks the result code. */ fNoError = true; break; + case VERR_TOO_MANY_OPEN_FILES: + if (cErrors < 32) + { + LogRel(("SharedFolders host service: Cannot open '%s' -- too many open files.\n", pszPath)); +#if defined RT_OS_LINUX || RT_OS_SOLARIS + if (cErrors < 1) + LogRel(("SharedFolders host service: Try to increase the limit for open files (ulimt -n)\n")); +#endif + cErrors++; + } + pParms->Result = SHFL_NO_RESULT; + break; default: pParms->Result = SHFL_NO_RESULT; } diff --git a/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexAsync.cpp b/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexAsync.cpp deleted file mode 100644 index 37c352a7e..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexAsync.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/** @file - * - * VBox OpenGL - * - * Complex buffered OpenGL functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include "vboxgl.h" - -void vboxglFogfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(Fogfv, GLenum, GLfloat); -} - -void vboxglFogiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(Fogiv, GLenum, GLint); -} - -void vboxglLightModelfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(LightModelfv, GLenum, GLfloat); -} - -void vboxglLightModeliv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(LightModeliv, GLenum, GLint); -} - -void vboxglLightfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(Lightfv, GLenum, GLenum, GLfloat); -} - -void vboxglLightiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(Lightiv, GLenum, GLenum, GLint); -} - -void vboxglMaterialfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(Materialfv, GLenum, GLenum, GLfloat); -} - -void vboxglMaterialiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(Materialiv, GLenum, GLenum, GLint); -} - -void vboxglPixelMapfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(PixelMapfv, GLenum, GLsizei, GLfloat); -} - -void vboxglPixelMapuiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(PixelMapuiv, GLenum, GLsizei, GLuint); -} - -void vboxglPixelMapusv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(PixelMapusv, GLenum, GLsizei, GLushort); -} - -void vboxglDeleteTextures(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(DeleteTextures, GLsizei, GLuint); -} - -void vboxglTexEnviv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexEnviv, GLenum, GLenum, GLint); -} - -void vboxglTexEnvfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexEnvfv, GLenum, GLenum, GLfloat); -} - -void vboxglTexGendv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexGendv, GLenum, GLenum, GLdouble); -} - -void vboxglTexGenfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexGenfv, GLenum, GLenum, GLfloat); -} - -void vboxglTexGeniv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexGeniv, GLenum, GLenum, GLint); -} - -void vboxglTexParameterfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexParameterfv, GLenum, GLenum, GLfloat); -} - - -void vboxglTexParameteriv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(TexParameteriv, GLenum, GLenum, GLint); -} - -void vboxglLoadMatrixd (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP1PTR(LoadMatrixd, GLdouble); -} - -void vboxglLoadMatrixf (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP1PTR(LoadMatrixf, GLfloat); -} - - -void vboxglMultMatrixd (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP1PTR(MultMatrixd, GLdouble); -} - -void vboxglMultMatrixf (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP1PTR(MultMatrixf, GLfloat); -} - -void vboxglPolygonStipple (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP1PTR(PolygonStipple, GLubyte); -} - -void vboxglClipPlane (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(ClipPlane, GLenum, GLdouble); -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglVertexPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP4PTR(VertexPointer, GLint, GLenum, GLsizei, GLvoid); -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglTexCoordPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP4PTR(TexCoordPointer, GLint, GLenum, GLsizei, GLvoid); - return; -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglColorPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP4PTR(ColorPointer, GLint, GLenum, GLsizei, GLvoid); -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglEdgeFlagPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTR(EdgeFlagPointer, GLsizei, GLvoid); -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglIndexPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(IndexPointer, GLenum, GLsizei, GLvoid); -} - -/** @todo might not work as the caller could change the array contents afterwards */ -void vboxglNormalPointer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(NormalPointer, GLenum, GLsizei, GLvoid); -} - -void vboxglCallLists (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTR(CallLists, GLsizei, GLenum, GLvoid); -} - -void vboxglMap1d (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - - VBOX_OGL_GEN_OP6PTR(Map1d, GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble); -} - -void vboxglMap1f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP6PTR(Map1f, GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat); -} - -void vboxglMap2d (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP10PTR(Map2d, GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble); -} - -void vboxglMap2f (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP10PTR(Map2f, GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat); -} - -void vboxglTexImage1D (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP8PTR(TexImage1D, GLenum, GLint, GLint, GLsizei, GLint, GLenum, GLenum, GLvoid); -} - -void vboxglTexImage2D (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP9PTR(TexImage2D, GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, GLvoid); -} - - -void vboxglTexSubImage1D (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP7PTR(TexSubImage1D, GLenum, GLint, GLint, GLsizei, GLenum, GLenum, GLvoid) -} - -void vboxglTexSubImage2D (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP9PTR(TexSubImage2D, GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid); -} - -void vboxglPrioritizeTextures (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP3PTRPTR(PrioritizeTextures, GLsizei, GLuint, GLclampf); -} - - -void vboxglRectdv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTRPTR(Rectdv, GLdouble, GLdouble); -} - -void vboxglRectfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTRPTR(Rectfv, GLfloat, GLfloat); -} - -void vboxglRectiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTRPTR(Rectiv, GLint, GLint); -} - -void vboxglRectsv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_OP2PTRPTR(Rectsv, GLshort, GLshort); -} diff --git a/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexSync.cpp b/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexSync.cpp deleted file mode 100644 index 6b0a6c56e..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/HostOGLComplexSync.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/** @file - * - * VBox OpenGL - * - * Simple buffered OpenGL functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include "vboxgl.h" - - -void vboxglReadPixels (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP7_PASS_PTR(ReadPixels, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, GLvoid); -} - -/** @todo */ -void vboxglFeedbackBuffer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - AssertFailed(); -// VBOX_OGL_GEN_SYNC_OP3_PTR(FeedbackBuffer, GLsizei, GLenum, GLfloat); -} - -/** @todo */ -void vboxglSelectBuffer (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - AssertFailed(); -// VBOX_OGL_GEN_SYNC_OP2_PTR(SelectBuffer, GLsizei, GLuint); -} - -/* Note: when in GL_FEEDBACK or GL_SELECT mode -> fill those buffers - * when switching to GL_FEEDBACK or GL_SELECT mode -> pass pointers - */ -void vboxglRenderMode (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - /** @todo */ - AssertFailed(); - VBOX_OGL_GEN_SYNC_OP1_RET(GLint, RenderMode, GLenum); -} - -void vboxglGenTextures (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GenTextures, GLsizei, GLuint); -} - -void vboxglGetBooleanv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetBooleanv, GLenum, GLboolean); -} - -void vboxglGetDoublev (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetDoublev, GLenum, GLdouble); -} - -void vboxglGetFloatv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetFloatv, GLenum, GLfloat); -} - -void vboxglGetIntegerv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetIntegerv, GLenum, GLint); -} - -void vboxglGetLightfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetLightfv, GLenum ,GLenum, GLfloat); -} - -void vboxglGetLightiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetLightiv, GLenum ,GLenum, GLint); -} - -void vboxglGetMaterialfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetMaterialfv, GLenum ,GLenum, GLfloat); -} - -void vboxglGetMaterialiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetMaterialiv, GLenum ,GLenum, GLint); -} - -void vboxglGetPixelMapfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetPixelMapfv, GLenum, GLfloat); -} - -void vboxglGetPixelMapuiv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetPixelMapuiv, GLenum, GLuint); -} - -void vboxglGetPixelMapusv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetPixelMapusv, GLenum, GLushort); -} - -void vboxglGetTexEnviv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexEnviv, GLenum, GLenum, GLint); -} - -void vboxglGetTexEnvfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexEnvfv, GLenum, GLenum, GLfloat); -} - -void vboxglGetTexGendv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexGendv, GLenum, GLenum, GLdouble); -} - -void vboxglGetTexGenfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexGenfv, GLenum, GLenum, GLfloat); -} - -void vboxglGetTexGeniv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexGeniv, GLenum, GLenum, GLint); -} - -void vboxglGetTexParameterfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexParameterfv, GLenum, GLenum, GLfloat); -} - -void vboxglGetTexParameteriv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP3_PASS_PTR(GetTexParameteriv, GLenum, GLenum, GLint); -} - -void vboxglGetClipPlane (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP2_PASS_PTR(GetClipPlane, GLenum, GLdouble); -} - -void vboxglGetPolygonStipple (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP1_PASS_PTR(GetPolygonStipple, GLubyte); -} - -void vboxglGetTexLevelParameterfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP4_PASS_PTR(GetTexLevelParameterfv, GLenum, GLint, GLenum, GLfloat); -} - -void vboxglGetTexLevelParameteriv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP4_PASS_PTR(GetTexLevelParameteriv, GLenum, GLint, GLenum, GLint); -} - -void vboxglGetTexImage (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP5_PASS_PTR(GetTexImage, GLenum, GLint, GLenum, GLenum, GLvoid); -} diff --git a/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleAsync.cpp b/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleAsync.cpp deleted file mode 100644 index b0c59a843..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleAsync.cpp +++ /dev/null @@ -1,278 +0,0 @@ -/** @file - * - * VBox OpenGL - * - * Simple buffered OpenGL functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include "vboxgl.h" - -GL_GEN_FUNC1(ReadBuffer, GLenum) - -GL_GEN_VPAR_FUNC5(CopyPixels, GLint, GLint, GLsizei, GLsizei, GLenum) - -GL_GEN_FUNC1(Enable, GLenum) -GL_GEN_FUNC1(Disable, GLenum) - -GL_GEN_VPAR_FUNC2(Accum, GLenum, GLfloat) -GL_GEN_VPAR_FUNC2(AlphaFunc, GLenum, GLclampf) -GL_GEN_VPAR_FUNC2(BindTexture, GLenum, GLuint) - -GL_GEN_FUNC1(ArrayElement, GLint) - -GL_GEN_FUNC1(Begin, GLenum) -GL_GEN_FUNC2(BlendFunc, GLenum) - -GL_GEN_FUNC1(CallList, GLuint) - -GL_GEN_FUNC3V(Color3b, GLbyte) -GL_GEN_FUNC3V(Color3d, GLdouble) -GL_GEN_FUNC3V(Color3f, GLfloat) -GL_GEN_FUNC3V(Color3i, GLint) -GL_GEN_FUNC3V(Color3s, GLshort) - -GL_GEN_FUNC3V(Color3ub, GLubyte) -GL_GEN_FUNC3V(Color3ui, GLuint) -GL_GEN_FUNC3V(Color3us, GLushort) - -GL_GEN_FUNC4V(Color4b, GLbyte) -GL_GEN_FUNC4V(Color4d, GLdouble) -GL_GEN_FUNC4V(Color4f, GLfloat) -GL_GEN_FUNC4V(Color4i, GLint) -GL_GEN_FUNC4V(Color4s, GLshort) - -GL_GEN_FUNC4V(Color4ub, GLubyte) -GL_GEN_FUNC4V(Color4ui, GLuint) -GL_GEN_FUNC4V(Color4us, GLushort) - -GL_GEN_FUNC1(Clear, GLbitfield) -GL_GEN_FUNC4(ClearAccum, GLfloat) -GL_GEN_FUNC4(ClearColor, GLclampf) -GL_GEN_FUNC1(ClearDepth, GLclampd) -GL_GEN_FUNC1(ClearIndex, GLfloat) -GL_GEN_FUNC1(ClearStencil, GLint) - -GL_GEN_FUNC2V(Vertex2d, GLdouble) -GL_GEN_FUNC2V(Vertex2f, GLfloat) -GL_GEN_FUNC2V(Vertex2i, GLint) -GL_GEN_FUNC2V(Vertex2s, GLshort) - -GL_GEN_FUNC3V(Vertex3d, GLdouble) -GL_GEN_FUNC3V(Vertex3f, GLfloat) -GL_GEN_FUNC3V(Vertex3i, GLint) -GL_GEN_FUNC3V(Vertex3s, GLshort) - -GL_GEN_FUNC4V(Vertex4d, GLdouble) -GL_GEN_FUNC4V(Vertex4f, GLfloat) -GL_GEN_FUNC4V(Vertex4i, GLint) -GL_GEN_FUNC4V(Vertex4s, GLshort) - -GL_GEN_FUNC1V(TexCoord1d, GLdouble) -GL_GEN_FUNC1V(TexCoord1f, GLfloat) -GL_GEN_FUNC1V(TexCoord1i, GLint) -GL_GEN_FUNC1V(TexCoord1s, GLshort) - -GL_GEN_FUNC2V(TexCoord2d, GLdouble) -GL_GEN_FUNC2V(TexCoord2f, GLfloat) -GL_GEN_FUNC2V(TexCoord2i, GLint) -GL_GEN_FUNC2V(TexCoord2s, GLshort) - -GL_GEN_FUNC3V(TexCoord3d, GLdouble) -GL_GEN_FUNC3V(TexCoord3f, GLfloat) -GL_GEN_FUNC3V(TexCoord3i, GLint) -GL_GEN_FUNC3V(TexCoord3s, GLshort) - -GL_GEN_FUNC4V(TexCoord4d, GLdouble) -GL_GEN_FUNC4V(TexCoord4f, GLfloat) -GL_GEN_FUNC4V(TexCoord4i, GLint) -GL_GEN_FUNC4V(TexCoord4s, GLshort) - -GL_GEN_FUNC3V(Normal3b, GLbyte) -GL_GEN_FUNC3V(Normal3d, GLdouble) -GL_GEN_FUNC3V(Normal3f, GLfloat) -GL_GEN_FUNC3V(Normal3i, GLint) -GL_GEN_FUNC3V(Normal3s, GLshort) - -GL_GEN_FUNC2V(RasterPos2d, GLdouble) -GL_GEN_FUNC2V(RasterPos2f, GLfloat) -GL_GEN_FUNC2V(RasterPos2i, GLint) -GL_GEN_FUNC2V(RasterPos2s, GLshort) - -GL_GEN_FUNC3V(RasterPos3d, GLdouble) -GL_GEN_FUNC3V(RasterPos3f, GLfloat) -GL_GEN_FUNC3V(RasterPos3i, GLint) -GL_GEN_FUNC3V(RasterPos3s, GLshort) - -GL_GEN_FUNC4V(RasterPos4d, GLdouble) -GL_GEN_FUNC4V(RasterPos4f, GLfloat) -GL_GEN_FUNC4V(RasterPos4i, GLint) -GL_GEN_FUNC4V(RasterPos4s, GLshort) - -GL_GEN_FUNC1V(EvalCoord1d, GLdouble) -GL_GEN_FUNC1V(EvalCoord1f, GLfloat) - -GL_GEN_FUNC2V(EvalCoord2d, GLdouble) -GL_GEN_FUNC2V(EvalCoord2f, GLfloat) - -GL_GEN_FUNC1(EvalPoint1, GLint) -GL_GEN_FUNC2(EvalPoint2, GLint) - -GL_GEN_FUNC1V(Indexd, GLdouble) -GL_GEN_FUNC1V(Indexf, GLfloat) -GL_GEN_FUNC1V(Indexi, GLint) -GL_GEN_FUNC1V(Indexs, GLshort) -GL_GEN_FUNC1V(Indexub, GLubyte) - -GL_GEN_FUNC4(Rotated, GLdouble) -GL_GEN_FUNC4(Rotatef, GLfloat) - -GL_GEN_FUNC3(Scaled, GLdouble) -GL_GEN_FUNC3(Scalef, GLfloat) - -GL_GEN_FUNC3(Translated, GLdouble) -GL_GEN_FUNC3(Translatef, GLfloat) - -GL_GEN_FUNC1(DepthFunc, GLenum) -GL_GEN_FUNC1(DepthMask, GLboolean) - -GL_GEN_FUNC1(CullFace, GLenum) - -GL_GEN_VPAR_FUNC2(DeleteLists, GLuint, GLsizei) - -GL_GEN_VPAR_FUNC2(DepthRange, GLclampd, GLclampd) -GL_GEN_FUNC1(DisableClientState, GLenum) -GL_GEN_FUNC1(EnableClientState, GLenum) -GL_GEN_VPAR_FUNC3(EvalMesh1, GLenum, GLint, GLint) -GL_GEN_VPAR_FUNC5(EvalMesh2, GLenum, GLint, GLint, GLint, GLint) -GL_GEN_VPAR_FUNC2(LineStipple, GLint, GLushort) -GL_GEN_FUNC1(LineWidth, GLfloat) -GL_GEN_FUNC1(ListBase, GLuint) - -GL_GEN_VPAR_FUNC2(Fogf, GLenum, GLfloat) -GL_GEN_VPAR_FUNC2(Fogi, GLenum, GLint) - - -GL_GEN_VPAR_FUNC2(LightModelf, GLenum, GLfloat) -GL_GEN_VPAR_FUNC2(LightModeli, GLenum, GLint) - - -GL_GEN_VPAR_FUNC3(Lightf, GLenum, GLenum, GLfloat) -GL_GEN_VPAR_FUNC3(Lighti, GLenum, GLenum, GLint) - - -GL_GEN_VPAR_FUNC3(DrawArrays, GLenum, GLint, GLsizei) - -GL_GEN_FUNC1(DrawBuffer, GLenum) - -GL_GEN_FUNC1V(EdgeFlag, GLboolean) - -GL_GEN_FUNC(End) -GL_GEN_FUNC(EndList) - -GL_GEN_FUNC1(FrontFace, GLenum) - - -GL_GEN_VPAR_FUNC7(CopyTexImage1D, GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLint ) - -GL_GEN_VPAR_FUNC8(CopyTexImage2D, GLenum , GLint , GLenum , GLint , GLint , GLsizei , GLsizei , GLint ) - -GL_GEN_VPAR_FUNC6(CopyTexSubImage1D, GLenum , GLint , GLint , GLint , GLint , GLsizei ) - -GL_GEN_VPAR_FUNC8(CopyTexSubImage2D, GLenum , GLint , GLint , GLint , GLint , GLint , GLsizei , GLsizei ) - -GL_GEN_VPAR_FUNC4(ColorMask, GLboolean , GLboolean , GLboolean , GLboolean ) - -GL_GEN_VPAR_FUNC2(ColorMaterial, GLenum, GLenum ) - -GL_GEN_FUNC1(LogicOp, GLenum) - -GL_GEN_VPAR_FUNC3(MapGrid1d, GLint, GLdouble, GLdouble) -GL_GEN_VPAR_FUNC3(MapGrid1f, GLint, GLfloat, GLfloat) - -GL_GEN_VPAR_FUNC6(MapGrid2d, GLint , GLdouble , GLdouble , GLint , GLdouble , GLdouble ) - -GL_GEN_VPAR_FUNC6(MapGrid2f, GLint , GLfloat , GLfloat , GLint , GLfloat , GLfloat ) - -GL_GEN_VPAR_FUNC3(Materialf, GLenum , GLenum , GLfloat ) - -GL_GEN_VPAR_FUNC3(Materiali, GLenum , GLenum , GLint ) - -GL_GEN_FUNC1(MatrixMode, GLenum) - -GL_GEN_VPAR_FUNC6(Ortho, GLdouble , GLdouble , GLdouble , GLdouble , GLdouble , GLdouble ) - -GL_GEN_FUNC1(PassThrough, GLfloat) - -GL_GEN_VPAR_FUNC2(PixelStoref, GLenum, GLfloat) -GL_GEN_VPAR_FUNC2(PixelStorei, GLenum, GLint) -GL_GEN_VPAR_FUNC2(PixelTransferf, GLenum, GLfloat) -GL_GEN_VPAR_FUNC2(PixelTransferi, GLenum, GLint) - -GL_GEN_FUNC2(PixelZoom, GLfloat) -GL_GEN_FUNC1(PointSize, GLfloat) - -GL_GEN_FUNC2(PolygonMode, GLenum) -GL_GEN_FUNC2(PolygonOffset, GLfloat) - -GL_GEN_FUNC(PopAttrib) -GL_GEN_FUNC(PopClientAttrib) -GL_GEN_FUNC(PopMatrix) -GL_GEN_FUNC(PopName) - - -GL_GEN_FUNC1(PushAttrib, GLbitfield) -GL_GEN_FUNC1(PushClientAttrib, GLbitfield) -GL_GEN_FUNC (PushMatrix) -GL_GEN_FUNC1(PushName, GLuint) - -GL_GEN_VPAR_FUNC3(TexEnvf, GLenum , GLenum , GLfloat) -GL_GEN_VPAR_FUNC3(TexEnvi, GLenum , GLenum , GLint) -GL_GEN_VPAR_FUNC3(TexGend, GLenum , GLenum , GLdouble) -GL_GEN_VPAR_FUNC3(TexGenf, GLenum , GLenum , GLfloat) -GL_GEN_VPAR_FUNC3(TexGeni, GLenum , GLenum , GLint) - -GL_GEN_VPAR_FUNC3(TexParameterf, GLenum , GLenum , GLfloat ) -GL_GEN_VPAR_FUNC3(TexParameteri, GLenum , GLenum , GLint ) - -GL_GEN_FUNC (LoadIdentity) -GL_GEN_FUNC1(LoadName, GLuint) - -GL_GEN_FUNC1(ShadeModel, GLenum) -GL_GEN_VPAR_FUNC3(StencilFunc, GLenum, GLint, GLuint) -GL_GEN_FUNC1(StencilMask, GLuint) -GL_GEN_VPAR_FUNC3(StencilOp, GLenum, GLenum, GLenum) - -GL_GEN_VPAR_FUNC4(Viewport, GLint, GLint, GLsizei, GLsizei) -GL_GEN_VPAR_FUNC4(Scissor, GLint, GLint, GLsizei, GLsizei) - - -GL_GEN_FUNC4(Rectd, GLdouble) -GL_GEN_FUNC4(Rectf, GLfloat) -GL_GEN_FUNC4(Recti, GLint) -GL_GEN_FUNC4(Rects, GLshort) - -GL_GEN_VPAR_FUNC2(NewList, GLuint, GLenum) - -GL_GEN_FUNC2(Hint, GLenum) -GL_GEN_FUNC1(IndexMask, GLuint) -GL_GEN_FUNC(InitNames) - - -GL_GEN_FUNC6(Frustum, GLdouble) - diff --git a/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleSync.cpp b/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleSync.cpp deleted file mode 100644 index ebe5a0fd8..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/HostOGLSimpleSync.cpp +++ /dev/null @@ -1,62 +0,0 @@ -/** @file - * - * VBox OpenGL - * - * Simple buffered OpenGL functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include "vboxgl.h" - - -/* OpenGL functions */ -void vboxglFinish (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - /** @todo if no back buffer, then draw to screen */ - VBOX_OGL_GEN_SYNC_OP(Finish); -} - -void vboxglFlush (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - /** @todo if no back buffer, then draw to screen */ - VBOX_OGL_GEN_SYNC_OP(Flush); -} - -void vboxglGenLists (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP1_RET(GLuint, GenLists, GLsizei); -} - -void vboxglIsEnabled (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - /** @todo cache? */ - VBOX_OGL_GEN_SYNC_OP1_RET(GLboolean, IsEnabled, GLenum); -} - -void vboxglIsList (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP1_RET(GLboolean, IsList, GLuint); -} - -void vboxglIsTexture (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - VBOX_OGL_GEN_SYNC_OP1_RET(GLboolean, IsTexture, GLuint); -} - - - diff --git a/src/VBox/HostServices/SharedOpenGL.old/Makefile.kmk b/src/VBox/HostServices/SharedOpenGL.old/Makefile.kmk deleted file mode 100644 index 0d4ad23cf..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/Makefile.kmk +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: Makefile.kmk 21700 2007-06-01 16:01:28Z umoeller $ -## @file -# Sub-Makefile for the OpenGL Host Service. -# - -# -# Copyright (C) 2006-2007 Sun Microsystems, Inc. -# -# This file is part of VirtualBox Open Source Edition (OSE), as -# available from http://www.virtualbox.org. This file is free software; -# you can redistribute it and/or modify it under the terms of the GNU -# General Public License (GPL) as published by the Free Software -# Foundation, in version 2 as it comes in the "COPYING" file of the -# VirtualBox OSE distribution. VirtualBox OSE is distributed in the -# hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. -# -# Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa -# Clara, CA 95054 USA or visit http://www.sun.com if you need -# additional information or have any questions. -# - -SUB_DEPTH = ../../../.. -include $(KBUILD_PATH)/subheader.kmk - -# -# The opengl service DLL. -# -DLLS += VBoxSharedOpenGL -VBoxSharedOpenGL_TEMPLATE = VBOXR3 -VBoxSharedOpenGL_DEFS = VBOX_WITH_HGCM VBOX_OGL_HOST_SIDE -VBoxSharedOpenGL_INCS.win = \ - $(PATH_TOOL_$(VBOX_VCC_TOOL)_ATLMFC_INC) \ - $(VBOX_PATH_SDK) -VBoxSharedOpenGL_CXXFLAGS.linux = -pthread - -VBoxSharedOpenGL_SOURCES = \ - service.cpp \ - vboxgl.cpp \ - HostOGLSimpleAsync.cpp \ - HostOGLSimpleSync.cpp \ - HostOGLComplexAsync.cpp \ - HostOGLComplexSync.cpp \ - glext.cpp - -VBoxSharedOpenGL_SOURCES.linux = \ - gllindrv.cpp - -VBoxSharedOpenGL_SOURCES.win = \ - glwindrv.cpp - -VBoxSharedOpenGL_LIBS = \ - $(LIB_VMM) \ - $(LIB_RUNTIME) \ - $(LIB_REM) -VBoxSharedOpenGL_LIBS.win = \ - $(PATH_SDK_WINPSDK_LIB)/opengl32.lib -VBoxSharedOpenGL_LIBPATH.linux = \ - $(VBOX_LIBPATH_X11) -VBoxSharedOpenGL_LIBS.linux = \ - GL - -include $(KBUILD_PATH)/subfooter.kmk - diff --git a/src/VBox/HostServices/SharedOpenGL.old/gldrv.h b/src/VBox/HostServices/SharedOpenGL.old/gldrv.h deleted file mode 100644 index 343b21b7c..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/gldrv.h +++ /dev/null @@ -1,209 +0,0 @@ -/** @file - * VBox OpenGL windows helper functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#ifndef ___VBOXGLWIN_H -#define ___VBOXGLWIN_H - -#include <iprt/types.h> -#include <iprt/mem.h> - -#ifdef RT_OS_WINDOWS -#define VBOX_OGL_DEBUG_WINDOW_OUTPUT -#elif defined(RT_OS_LINUX) - -#define GLX_GLXEXT_PROTOTYPES -#include <X11/Xlib.h> -#include <GL/gl.h> -#include <GL/glx.h> -#include <GL/glxext.h> - -#define VBOX_OGL_DEBUG_WINDOW_OUTPUT -#endif - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT -#if defined(RT_OS_WINDOWS) -#define VBOX_OGL_GUEST_TO_HOST_HDC(a) pClient->hdc -#elif defined(RT_OS_LINUX) -#define VBOX_OGL_GUEST_TO_HOST_HDC(a) pClient->glxContext -#endif -#endif - - -typedef struct -{ - uint64_t lastretval; - uint32_t ulLastError; - - bool fHasLastError; - - uint8_t *pLastParam; - uint32_t cbLastParam; - - struct - { -#ifdef RT_OS_WINDOWS - HWND hwnd; - HDC hdc; - HGLRC hglrc; -#elif defined RT_OS_LINUX - Display *dpy; - Window win; - GLXContext ctx; - GLXFBConfig *fbConfig; - XVisualInfo *visinfo; -#endif - } enable; - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT -#ifdef RT_OS_WINDOWS - HWND hwnd; - HDC hdc; -#elif defined RT_OS_LINUX - Display *dpy; - Window xWindow; - GLXFBConfig actFBConfig; - int winWidth, winHeight; - GLXFBConfig *PixelFormatToFBConfigMapper; - int numFBConfigs; - GLXContext glxContext; - PFNGLXCHOOSEFBCONFIGSGIXPROC glxChooseFBConfig; - PFNGLXGETVISUALFROMFBCONFIGSGIXPROC glxGetVisualFromFBConfig; - PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC glxCreateNewContext; -#endif -#endif -} VBOXOGLCTX, *PVBOXOGLCTX; - - -#ifndef RT_OS_WINDOWS - -typedef uint32_t DWORD; -typedef uint16_t WORD; -typedef uint8_t BYTE; -typedef BYTE BOOL; -typedef RTGCUINTPTR HANDLE; -typedef HANDLE HDC; -typedef HANDLE HGLRC; -typedef uint32_t UINT; -typedef uint32_t COLORREF; -typedef void VOID; -typedef void * LPVOID; -typedef int16_t SHORT; -typedef uint16_t USHORT; -typedef int64_t INT64; -typedef int32_t INT32; -typedef float FLOAT; /* ??? */ - -#define DECLARE_HANDLE(a) typedef HANDLE a -#define WINAPI - -#define PFD_DOUBLEBUFFER 0x00000001 -#define PFD_STEREO 0x00000002 -#define PFD_DRAW_TO_WINDOW 0x00000004 -#define PFD_SUPPORT_OPENGL 0x00000020 - -#define PFD_TYPE_RGBA 0 -#define PFD_TYPE_COLORINDEX 1 - -#define PFD_MAIN_PLANE 0 -#define PFD_OVERLAY_PLANE 1 -#define PFD_UNDERLAY_PLANE (-1) - -typedef struct -{ - WORD nSize; - WORD nVersion; - DWORD dwFlags; - BYTE iPixelType; - BYTE cColorBits; - BYTE cRedBits; - BYTE cRedShift; - BYTE cGreenBits; - BYTE cGreenShift; - BYTE cBlueBits; - BYTE cBlueShift; - BYTE cAlphaBits; - BYTE cAlphaShift; - BYTE cAccumBits; - BYTE cAccumRedBits; - BYTE cAccumGreenBits; - BYTE cAccumBlueBits; - BYTE cAccumAlphaBits; - BYTE cDepthBits; - BYTE cStencilBits; - BYTE cAuxBuffers; - BYTE iLayerType; - BYTE bReserved; - DWORD dwLayerMask; - DWORD dwVisibleMask; - DWORD dwDamageMask; -} PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESCRIPTOR, *LPPIXELFORMATDESCRIPTOR; - -typedef struct -{ - WORD nSize; - WORD nVersion; - DWORD dwFlags; - BYTE iPixelType; - BYTE cColorBits; - BYTE cRedBits; - BYTE cRedShift; - BYTE cGreenBits; - BYTE cGreenShift; - BYTE cBlueBits; - BYTE cBlueShift; - BYTE cAlphaBits; - BYTE cAlphaShift; - BYTE cAccumBits; - BYTE cAccumRedBits; - BYTE cAccumGreenBits; - BYTE cAccumBlueBits; - BYTE cAccumAlphaBits; - BYTE cDepthBits; - BYTE cStencilBits; - BYTE cAuxBuffers; - BYTE iLayerPlane; - BYTE bReserved; - COLORREF crTransparent; -} LAYERPLANEDESCRIPTOR, *PLAYERPLANEDESCRIPTOR, LPLAYERPLANEDESCRIPTOR; - -#endif - -void vboxglDrvReleaseContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvCreateContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvDeleteContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvCopyContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvSetContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvCreateLayerContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvShareLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvDescribeLayerPlane(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvSetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvGetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvRealizeLayerPalette(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvSwapLayerBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvDescribePixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvSetPixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrvSwapBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); - -int vboxglEnableOpenGL(VBOXOGLCTX *pClient); -int vboxglDisableOpenGL(VBOXOGLCTX *pClient); - -RTUINTPTR vboxDrvIsExtensionAvailable(char *pszExtFunctionName); - -#endif /* !___VBOXGLWIN_H */ diff --git a/src/VBox/HostServices/SharedOpenGL.old/glext.cpp b/src/VBox/HostServices/SharedOpenGL.old/glext.cpp deleted file mode 100644 index 1b877b422..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/glext.cpp +++ /dev/null @@ -1,109 +0,0 @@ -/** @file - * - * VBox OpenGL helper functions - * - * OpenGL extensions - * - * References: http://oss.sgi.com/projects/ogl-sample/registry/ - * http://icps.u-strasbg.fr/~marchesin/perso/extensions/ - */ - -/* - * - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#define VBOX_OGL_WITH_EXTENSION_ARRAY -#include "vboxgl.h" -#include <VBox/HostServices/wglext.h> - -#define LOG_GROUP LOG_GROUP_SHARED_OPENGL -#include <VBox/log.h> -#include <iprt/string.h> - -/** - * Initialize OpenGL extensions - * - * @returns VBox error code - */ -int vboxInitOpenGLExtensions() -{ - const GLubyte *pszExtensions = glGetString(GL_EXTENSIONS); - static bool fInitialized = false; - - if (fInitialized) - return VINF_SUCCESS; - - for (unsigned int i=0;i<RT_ELEMENTS(OpenGLExtensions);i++) - { - if (strstr((char *)pszExtensions, OpenGLExtensions[i].pszExtName)) - { - *OpenGLExtensions[i].ppfnFunction = vboxDrvIsExtensionAvailable((char *)OpenGLExtensions[i].pszExtFunctionName); - OpenGLExtensions[i].fAvailable = !!*OpenGLExtensions[i].ppfnFunction; - } - } - fInitialized = true; - return VINF_SUCCESS; -} - -/** - * Check if an opengl extension function is available - * - * @returns VBox error code - * @param pszFunctionName OpenGL extension function name - */ -bool vboxwglGetProcAddress(char *pszFunctionName) -{ - for (unsigned int i=0;i<RT_ELEMENTS(OpenGLExtensions);i++) - { - if ( OpenGLExtensions[i].fAvailable - && !strcmp(OpenGLExtensions[i].pszExtFunctionName, pszFunctionName)) - { - Log(("vboxwglGetProcAddress: found %s\n", pszFunctionName)); - return true; - } - } - Log(("vboxwglGetProcAddress: didn't find %s\n", pszFunctionName)); - return false; -} - -#ifdef RT_OS_WINDOWS -void vboxwglSwapIntervalEXT (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - Assert(pfnwglSwapIntervalEXT); - - OGL_CMD(wglSwapIntervalEXT, 1); - OGL_PARAM(int, interval); - pClient->lastretval = pfnwglSwapIntervalEXT(interval); - if (!pClient->lastretval) - Log(("wglSwapIntervalEXT failed with %d\n", GetLastError())); - - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxwglGetSwapIntervalEXT (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - Assert(pfnwglGetSwapIntervalEXT); - - OGL_CMD(wglGetSwapIntervalEXT, 0); - pClient->lastretval = pfnwglGetSwapIntervalEXT(); - if (!pClient->lastretval) - Log(("wglGetSwapIntervalEXT failed with %d\n", GetLastError())); - - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} -#endif /* RT_OS_WINDOWS */ diff --git a/src/VBox/HostServices/SharedOpenGL.old/gllindrv.cpp b/src/VBox/HostServices/SharedOpenGL.old/gllindrv.cpp deleted file mode 100644 index 7d41af772..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/gllindrv.cpp +++ /dev/null @@ -1,612 +0,0 @@ -/** @file - * - * VBox OpenGL - * - * Simple buffered OpenGL functions - * - * Contributed by: Alexander Eichner - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ -#define GLX_GLXEXT_PROTOTYPES - -#include "vboxgl.h" -#define LOG_GROUP LOG_GROUP_SHARED_OPENGL -#include <VBox/log.h> -#include <string.h> -#include <stdio.h> -#include <GL/gl.h> -#include <GL/glx.h> -#include <GL/glxext.h> - - -/* X11 server connection for all OpenGL clients. - * Neccessary because Mesa and DRI cannot handle more than one - * connection per thread (only hardware acceleration, software rendering - * runs fine with more than one connection). - * Would crash in vboxglDisconnect if on every vboxglConnect - * a new Display is created */ -Display *glXDisplay = NULL; - -static Bool WaitForNotify( Display *dpy, XEvent *event, XPointer arg ) { - return (event->type == MapNotify) && (event->xmap.window == (Window) arg); -} - -/* from http://www.mesa3d.org/brianp/sig97/exten.htm */ -GLboolean vboxglCheckExtension(Display *dpy, int screenNum, const char *extName ) -{ - /* - ** Search for extName in the extensions string. Use of strstr() - ** is not sufficient because extension names can be prefixes of - ** other extension names. Could use strtok() but the constant - ** string returned by glGetString can be in read-only memory. - */ - char *p = (char *) glXQueryExtensionsString(dpy, screenNum); - char *end; - int extNameLen; - - extNameLen = strlen(extName); - end = p + strlen(p); - - while (p < end) { - int n = strcspn(p, " "); - if ((extNameLen == n) && (strncmp(extName, p, n) == 0)) { - return GL_TRUE; - } - p += (n + 1); - } - return GL_FALSE; -} - -/** - * Global init of VBox OpenGL - * - * @returns VBox error code - */ -int vboxglGlobalInit() -{ - Log(("vboxglGlobalInit\n")); - - /*vboxInitOpenGLExtensions();*/ - return VINF_SUCCESS; -} - -/** - * Global deinit of VBox OpenGL - * - * @returns VBox error code - */ -int vboxglGlobalUnload() -{ - Log(("vboxglGlobalUnload\n")); - - if (glXDisplay) - XCloseDisplay(glXDisplay); - - return VINF_SUCCESS; -} - -/** - * Enable OpenGL - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglEnableOpenGL(PVBOXOGLCTX pClient) -{ - static int attribs[] = { - GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT, - GLX_RENDER_TYPE, GLX_RGBA_BIT, - GLX_DOUBLEBUFFER, GL_TRUE, /* Request a double-buffered color buffer with */ - GLX_RED_SIZE, 1, /* the maximum number of bits per component */ - GLX_GREEN_SIZE, 1, - GLX_BLUE_SIZE, 1, - None - }; - int screen_num; - XSetWindowAttributes attr; - unsigned long mask; - int returnedFBConfigs; - - /* we have to set up a rendering context to be able to use glGetString - * a window is created but is not mapped to screen (so it's not visible') - * and a GLXContext is bound to it */ - screen_num = DefaultScreen(pClient->dpy); - pClient->enable.fbConfig = pClient->glxChooseFBConfig(pClient->dpy, screen_num, attribs, &returnedFBConfigs); - Log(("vboxglGetString: returned FBConfigs: %d\n", returnedFBConfigs)); - pClient->enable.visinfo = pClient->glxGetVisualFromFBConfig(pClient->dpy, pClient->enable.fbConfig[0]); - /* Create Window */ - attr.background_pixel = 0; - attr.border_pixel = 0; - attr.colormap = XCreateColormap(pClient->dpy, RootWindow(pClient->dpy, screen_num), pClient->enable.visinfo->visual, AllocNone); - attr.event_mask = StructureNotifyMask | ExposureMask; - mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - pClient->enable.win = XCreateWindow(pClient->dpy, RootWindow(pClient->dpy, screen_num), 0, 0, 100, 100, - 0, pClient->enable.visinfo->depth, InputOutput, - pClient->enable.visinfo->visual, mask, &attr); - /* Create Context */ - pClient->enable.ctx = pClient->glxCreateNewContext(pClient->dpy, pClient->enable.fbConfig[0], GLX_RGBA_TYPE, NULL, GL_TRUE); - glXMakeCurrent(pClient->dpy, pClient->enable.win, pClient->enable.ctx); - - return VINF_SUCCESS; -} - -/** - * Disable OpenGL - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglDisableOpenGL(PVBOXOGLCTX pClient) -{ - /* Free all data */ - if (pClient->enable.ctx) - { - glFlush(); - glXMakeCurrent(pClient->dpy, None, NULL); - XDestroyWindow(pClient->dpy, pClient->enable.win); - glXDestroyContext(pClient->dpy, pClient->enable.ctx); - XFree(pClient->enable.visinfo); - XFree(pClient->enable.fbConfig); - } - - return VINF_SUCCESS; -} - -/** - * Client connect init - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglConnect(PVBOXOGLCTX pClient) -{ - int rc = VERR_NOT_IMPLEMENTED; - Log(("vboxglConnect\n")); - - pClient->PixelFormatToFBConfigMapper = NULL; - pClient->xWindow = 0; - - if (!glXDisplay) - glXDisplay = XOpenDisplay(NULL); - - pClient->dpy = glXDisplay; - - if (pClient->dpy) { - int screenNum, major, minor; - - screenNum = DefaultScreen(pClient->dpy); - glXQueryVersion(pClient->dpy, &major, &minor); - - if ((major == 1) && (minor >= 3)) { - Log(("Server GLX 1.3 supported\n")); - pClient->glxChooseFBConfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXChooseFBConfig"); - pClient->glxGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXGetVisualFromFBConfig"); - pClient->glxCreateNewContext = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXCreateNewContext"); - } else if (vboxglCheckExtension(pClient->dpy, screenNum, "GLX_SGIX_fbconfig")) { - Log(("GLX_SGIX_fbconfig extension supported\n")); - pClient->glxChooseFBConfig = (PFNGLXCHOOSEFBCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXChooseFBConfigSGIX"); - pClient->glxGetVisualFromFBConfig = (PFNGLXGETVISUALFROMFBCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXGetVisualFromFBConfigSGIX"); - pClient->glxCreateNewContext = (PFNGLXCREATECONTEXTWITHCONFIGSGIXPROC) glXGetProcAddressARB( - (GLubyte *) "glXCreateContextWithConfigSGIX"); - } else { - Log(("Error no FBConfig supported\n")); - rc = VERR_NOT_IMPLEMENTED; - } - if (pClient->glxChooseFBConfig && pClient->glxGetVisualFromFBConfig && pClient->glxCreateNewContext) - rc = VINF_SUCCESS; - } - - return rc; -} - -/** - * Client disconnect cleanup - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglDisconnect(PVBOXOGLCTX pClient) -{ - Log(("vboxglDisconnect\n")); - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - if (pClient->xWindow != 0) { - XUnmapWindow(pClient->dpy, pClient->xWindow); - XDestroyWindow(pClient->dpy, pClient->xWindow); - } - if (pClient->PixelFormatToFBConfigMapper) { - XFree(pClient->PixelFormatToFBConfigMapper); - } - - pClient->dpy = NULL; - pClient->xWindow = 0; - pClient->actFBConfig = NULL; -#endif - return VINF_SUCCESS; -} - -/* Driver functions */ -void vboxglDrvCreateContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - XSetWindowAttributes attr; - XVisualInfo *visinfo = NULL; - unsigned long mask; - GLXFBConfig fbConfig; - GLXContextID glrc; - int screen_num; - XEvent event; - OGL_CMD(DrvCreateContext, 1); - OGL_PARAM(HDC, hdc); - - Log(("DrvCreateContext %x\n", hdc)); -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - - screen_num = DefaultScreen(pClient->dpy); - fbConfig = pClient->actFBConfig; - - visinfo = pClient->glxGetVisualFromFBConfig(pClient->dpy, fbConfig); - - if (pClient->xWindow == 0) { - - /* window attributes */ - attr.background_pixel = 0; - attr.border_pixel = 0; - attr.colormap = XCreateColormap(pClient->dpy, RootWindow(pClient->dpy, screen_num ), visinfo->visual, AllocNone); - attr.event_mask = StructureNotifyMask | ExposureMask; - mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - pClient->xWindow = XCreateWindow(pClient->dpy, - RootWindow(pClient->dpy, screen_num), - 0, 0, pClient->winWidth, pClient->winHeight, 0, - visinfo->depth, InputOutput, - visinfo->visual, mask, &attr); - } - XResizeWindow(pClient->dpy, pClient->xWindow, pClient->winWidth, pClient->winHeight); - pClient->glxContext = pClient->glxCreateNewContext(pClient->dpy, fbConfig, GLX_RGBA_TYPE, NULL, GL_TRUE); - - XMapWindow(pClient->dpy, pClient->xWindow); - XIfEvent(pClient->dpy, &event, WaitForNotify, (XPointer)pClient->xWindow ); - - glrc = 1; - Assert(glrc); -#else - AssertFailed(); - glrc = 0; -#endif - - pClient->lastretval = (uint64_t)glrc; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvDeleteContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvDeleteContext, 1); - OGL_PARAM(HGLRC, hglrc); - Log(("DrvDeleteContext %x\n", hglrc)); - - glXDestroyContext(pClient->dpy, VBOX_OGL_GUEST_TO_HOST_HDC(hglrc)); - pClient->lastretval = 1; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvSetContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSetContext, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(HGLRC, hglrc); - Log(("DrvSetContext %x %x\n", hdc, hglrc)); -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - - pClient->lastretval = glXMakeCurrent(pClient->dpy, pClient->xWindow, - VBOX_OGL_GUEST_TO_HOST_HDC(hglrc)); - if (!pClient->lastretval) - Log(("glXMakeCurrent failed\n")); - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -#else - AssertFailed(); -#endif -} - -void vboxglDrvCopyContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvDeleteContext, 3); - OGL_PARAM(HGLRC, hglrcSrc); - OGL_PARAM(HGLRC, hglrcDst); - OGL_PARAM(UINT, mask); - Log(("DrvCopyContext %x %x %x\n", hglrcSrc, hglrcDst, mask)); - - glXCopyContext(pClient->dpy, VBOX_OGL_GUEST_TO_HOST_HDC(hglrc), VBOX_OGL_GUEST_TO_HOST_HDC(hglrc), mask); - pClient->lastretval = 1; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvReleaseContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvReleaseContext, 1); - OGL_PARAM(HGLRC, hglrc); - Log(("DrvReleaseContext %x\n", hglrc)); - /* clear current selection */ - pClient->lastretval = glXMakeCurrent(pClient->dpy, None, NULL); - - if (!pClient->lastretval) - Log(("glXMakeCurrent failed\n")); - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvCreateLayerContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - XSetWindowAttributes attr; - XVisualInfo *visinfo = NULL; - unsigned long mask; - GLXFBConfig fbConfig; - GLXContextID glrc; - int screen_num; - XEvent event; - OGL_CMD(DrvCreateLayerContext, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - - Log(("DrvCreateLayerContext %x\n", hdc)); -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - - screen_num = DefaultScreen(pClient->dpy); - fbConfig = pClient->actFBConfig; - visinfo = pClient->glxGetVisualFromFBConfig(pClient->dpy, fbConfig); - - if (pClient->xWindow == 0) { - - /* window attributes */ - attr.background_pixel = 0; - attr.border_pixel = 0; - attr.colormap = XCreateColormap(pClient->dpy, RootWindow(pClient->dpy, screen_num ), visinfo->visual, AllocNone); - attr.event_mask = StructureNotifyMask | ExposureMask; - mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; - pClient->xWindow = XCreateWindow(pClient->dpy, - RootWindow(pClient->dpy, screen_num), - 0, 0, pClient->winWidth, pClient->winHeight, 0, - visinfo->depth, InputOutput, - visinfo->visual, mask, &attr); - } - XResizeWindow(pClient->dpy, pClient->xWindow, pClient->winWidth, pClient->winHeight); - pClient->glxContext = pClient->glxCreateNewContext(pClient->dpy, fbConfig, GLX_RGBA_TYPE, NULL, GL_TRUE); - XMapWindow(pClient->dpy, pClient->xWindow); - XIfEvent(pClient->dpy, &event, WaitForNotify, (XPointer)pClient->xWindow ); - - glrc = 1; - Assert(glrc); - - pClient->lastretval = glrc; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -#else - AssertFailed(); -#endif -} - -void vboxglDrvShareLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvShareLists, 3); - OGL_PARAM(HGLRC, hglrc1); - OGL_PARAM(HGLRC, hglrc2); - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - - -void vboxglDrvRealizeLayerPalette(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvRealizeLayerPalette, 3); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(BOOL, bRealize); - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvSwapLayerBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSwapLayerBuffers, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(UINT, fuPlanes); - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvSetPixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - int screen_num; - OGL_CMD(DrvSetPixelFormat, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(uint32_t, cx); - OGL_PARAM(uint32_t, cy); - - Log(("vboxDrvSetPixelFormat %d\n", iPixelFormat)); - - /* Get GLXFBConfig based on the given ID */ - pClient->actFBConfig = pClient->PixelFormatToFBConfigMapper[iPixelFormat-1]; - screen_num = DefaultScreen(pClient->dpy); - - pClient->winWidth = cx; - pClient->winHeight = cy; - pClient->lastretval = true; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvSwapBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSwapBuffers, 1); - OGL_PARAM(HDC, hdc); - - glXSwapBuffers(pClient->dpy, pClient->xWindow); - pClient->lastretval = 1; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvDescribeLayerPlane(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - PLAYERPLANEDESCRIPTOR plpd; - - OGL_CMD(DrvDescribeLayerPlane, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(UINT, nBytes); - Assert(pClient->cbLastParam == nBytes); - plpd = (PLAYERPLANEDESCRIPTOR)pClient->pLastParam; - - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvSetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSetLayerPaletteEntries, 5); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(int, iStart); - OGL_PARAM(int, cEntries); - OGL_MEMPARAM(COLORREF, pcr); - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvGetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - COLORREF *pcr; - - OGL_CMD(DrvGetLayerPaletteEntries, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(int, iStart); - OGL_PARAM(int, cEntries); - - Assert(pClient->cbLastParam == sizeof(COLORREF)*cEntries); - pcr = (COLORREF *)pClient->pLastParam; - pClient->lastretval = 0; /** @todo */ - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -void vboxglDrvDescribePixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - LPPIXELFORMATDESCRIPTOR ppfd; - GLXFBConfig *allFBConfigs, matchingFBConfig; - int screenNum, glxReturnValue; - - OGL_CMD(DrvDescribePixelFormat, 3); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(UINT, nBytes); - Assert(pClient->cbLastParam == nBytes); - ppfd = (LPPIXELFORMATDESCRIPTOR)pClient->pLastParam; - - Log(("iPixelFormat: %d\n", iPixelFormat)); - - if (!pClient->PixelFormatToFBConfigMapper) { - /* First get number of all visuals for the return value */ - screenNum = DefaultScreen(pClient->dpy); - allFBConfigs = glXGetFBConfigs(pClient->dpy, screenNum, - &pClient->numFBConfigs); - pClient->PixelFormatToFBConfigMapper = allFBConfigs; - } - - if (nBytes == sizeof(PIXELFORMATDESCRIPTOR)) { - int redSize, greenSize, blueSize, alphaSize, xVisual, xRenderable; - /* Get GLXFBConfig which matches iPixelFormat */ - matchingFBConfig = pClient->PixelFormatToFBConfigMapper[iPixelFormat-1]; - - Log(("Filling values into PIXELFORMATDESCRIPTOR\n")); - /* translate all values to theire corresponding Windows ones */ - ppfd->nSize = sizeof(PIXELFORMATDESCRIPTOR); - ppfd->nVersion = 1; - ppfd->iLayerType = PFD_MAIN_PLANE; - ppfd->dwFlags = 0; - - /* Set cColorBits */ - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_RED_SIZE, &redSize); - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_GREEN_SIZE, &greenSize); - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_BLUE_SIZE, &blueSize); - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_ALPHA_SIZE, &alphaSize); - ppfd->cColorBits = redSize + greenSize + blueSize; - ppfd->cRedBits = redSize; - ppfd->cBlueBits = blueSize; - ppfd->cGreenBits = greenSize; - ppfd->cAlphaBits = alphaSize; - - /* Set dwFlags */ - if (!glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_DRAWABLE_TYPE, &glxReturnValue)) { - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_VISUAL_ID, &xVisual); - glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_X_RENDERABLE, &xRenderable); - if ((glxReturnValue & GLX_WINDOW_BIT) && xVisual) - ppfd->dwFlags |= (PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL); - } - if (!glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_DOUBLEBUFFER, &glxReturnValue)) { - if (glxReturnValue) - ppfd->dwFlags |= PFD_DOUBLEBUFFER; - } - /* Set iPixelType */ - if (!glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_RENDER_TYPE, &glxReturnValue)) { - if (glxReturnValue & GLX_RGBA_BIT) - ppfd->iPixelType = PFD_TYPE_RGBA; - else if ((glxReturnValue & GLX_COLOR_INDEX_BIT) & !(glxReturnValue & GLX_RGBA_BIT)) - ppfd->iPixelType = PFD_TYPE_COLORINDEX; - } - /* Set cDepthBits */ - if (!glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_DEPTH_SIZE, &glxReturnValue)) { - ppfd->cDepthBits = glxReturnValue; - } else { - ppfd->cDepthBits = 0; - } - /* Set cStencilBits */ - if (!glXGetFBConfigAttrib(pClient->dpy, matchingFBConfig, GLX_STENCIL_SIZE, &glxReturnValue)) { - ppfd->cStencilBits = glxReturnValue; - } else { - ppfd->cStencilBits = 0; - } - /** @todo Fill in the rest */ - } - - pClient->lastretval = pClient->numFBConfigs; - pClient->fHasLastError = true; - pClient->ulLastError = glGetError(); -} - -RTUINTPTR vboxDrvIsExtensionAvailable(char *pszExtFunctionName) -{ - RTUINTPTR pfnProc = (RTUINTPTR)glXGetProcAddress((const GLubyte *)pszExtFunctionName); - Log(("vboxDrvIsExtensionAvailable %s -> %d\n", pszExtFunctionName, !!pfnProc)); - return pfnProc; -} - diff --git a/src/VBox/HostServices/SharedOpenGL.old/glwindrv.cpp b/src/VBox/HostServices/SharedOpenGL.old/glwindrv.cpp deleted file mode 100644 index 031c95d53..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/glwindrv.cpp +++ /dev/null @@ -1,532 +0,0 @@ -/** @file - * VBox OpenGL - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - - -#include <iprt/alloc.h> -#include <iprt/string.h> -#include <iprt/assert.h> -#include <iprt/thread.h> -#include <VBox/err.h> -#include "vboxgl.h" - -#define LOG_GROUP LOG_GROUP_SHARED_OPENGL -#include <VBox/log.h> -#include "gldrv.h" - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT -LRESULT CALLBACK VBoxOGLWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_CREATE: - return 0; - - case WM_CLOSE: - PostQuitMessage( 0 ); - return 0; - - case WM_DESTROY: - return 0; - - default: - return DefWindowProc( hWnd, message, wParam, lParam ); - } -} - -DECLCALLBACK(int) vboxWndThread(RTTHREAD ThreadSelf, void *pvUser) -{ - VBOXOGLCTX *pClient = (VBOXOGLCTX *)pvUser; - HWND hwnd; - - hwnd = pClient->hwnd= CreateWindow("VBoxOGL", "VirtualBox OpenGL", - WS_CAPTION | WS_POPUPWINDOW | WS_VISIBLE, - 0, 0, 0, 0, - NULL, NULL, 0, NULL); - Assert(hwnd); - while(true) - { - MSG msg; - - if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) - { - if (msg.message == WM_QUIT) - break; - - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - DestroyWindow(hwnd); - return VINF_SUCCESS; -} - -#endif - -/** - * Global init of VBox OpenGL for windows - * - * @returns VBox error code - */ -int vboxglGlobalInit() -{ - Log(("vboxglGlobalInit\n")); - - WNDCLASS wc; - HWND hWnd; - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - wc.style = CS_OWNDC; - wc.lpfnWndProc = VBoxOGLWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = 0; - wc.hIcon = LoadIcon(NULL, IDI_APPLICATION); - wc.hCursor = LoadCursor(NULL, IDC_ARROW); - wc.hbrBackground = (HBRUSH)GetStockObject(BLACK_BRUSH); - wc.lpszMenuName = NULL; - wc.lpszClassName = "VBoxOGL"; - RegisterClass(&wc); -#endif - - PIXELFORMATDESCRIPTOR pfd; - int iFormat; - - wc.style = CS_OWNDC; - wc.lpfnWndProc = DefWindowProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = 0; - wc.hIcon = NULL; - wc.hCursor = NULL; - wc.hbrBackground = NULL; - wc.lpszMenuName = NULL; - wc.lpszClassName = "VBoxOGLDummy"; - RegisterClass( &wc ); - - /* create dummy window to avoid Intel/Nvidia opengl drivers - * problem with DC from desktop window */ - hWnd = CreateWindow("VBoxOGLDummy", "", WS_POPUPWINDOW, - 0, 0, 0, 0, NULL, NULL, 0, NULL ); - Assert(hWnd); - - HDC hdc = GetDC(hWnd); - - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 24; - pfd.cDepthBits = 16; - pfd.iLayerType = PFD_MAIN_PLANE; - iFormat = ChoosePixelFormat(hdc, &pfd); - SetPixelFormat(hdc, iFormat, &pfd); - - HGLRC hRC = wglCreateContext(hdc); - wglMakeCurrent(hdc, hRC); - - vboxInitOpenGLExtensions(); - - wglMakeCurrent(NULL, NULL); - wglDeleteContext(hRC); - ReleaseDC(hWnd, hdc); - DestroyWindow(hWnd); - - return VINF_SUCCESS; -} - -/** - * Global deinit of VBox OpenGL - * - * @returns VBox error code - */ -int vboxglGlobalUnload() -{ - Log(("vboxglGlobalUnload\n")); - - return VINF_SUCCESS; -} - -/** - * Enable OpenGL - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglEnableOpenGL(PVBOXOGLCTX pClient) -{ - PIXELFORMATDESCRIPTOR pfd; - int iFormat; - - if (!pClient->enable.hwnd) - { - pClient->enable.hwnd = CreateWindow("VBoxOGLDummy", "", WS_POPUPWINDOW, - 0, 0, 0, 0, NULL, NULL, 0, NULL ); - } - - Assert(pClient->enable.hwnd); - pClient->enable.hdc = GetDC(pClient->enable.hwnd); - - ZeroMemory(&pfd, sizeof(pfd)); - pfd.nSize = sizeof(pfd); - pfd.nVersion = 1; - pfd.dwFlags = PFD_DRAW_TO_WINDOW | PFD_SUPPORT_OPENGL | PFD_DOUBLEBUFFER; - pfd.iPixelType = PFD_TYPE_RGBA; - pfd.cColorBits = 24; - pfd.cDepthBits = 16; - pfd.iLayerType = PFD_MAIN_PLANE; - iFormat = ChoosePixelFormat(pClient->enable.hdc, &pfd); - SetPixelFormat(pClient->enable.hdc, iFormat, &pfd); - - pClient->enable.hglrc = wglCreateContext(pClient->enable.hdc); - wglMakeCurrent(pClient->enable.hdc, pClient->enable.hglrc); - return VINF_SUCCESS; -} - - -/** - * Disable OpenGL - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglDisableOpenGL(PVBOXOGLCTX pClient) -{ - wglMakeCurrent(NULL, NULL); - wglDeleteContext(pClient->enable.hglrc); - ReleaseDC(pClient->enable.hwnd, pClient->enable.hdc); - if (pClient->enable.hwnd) - { - DestroyWindow(pClient->enable.hwnd); - pClient->enable.hwnd = 0; - } - return VINF_SUCCESS; -} - -/** - * Client connect init - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglConnect(PVBOXOGLCTX pClient) -{ - Log(("vboxglConnect\n")); - return VINF_SUCCESS; -} - -/** - * Client disconnect cleanup - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglDisconnect(PVBOXOGLCTX pClient) -{ - Log(("vboxglDisconnect\n")); -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - if (pClient->hwnd) - { - if (pClient->hdc) - ReleaseDC(pClient->hwnd, pClient->hdc); - PostMessage(pClient->hwnd, WM_CLOSE, 0, 0); - pClient->hwnd = 0; - } -#endif - return VINF_SUCCESS; -} - - -/* Driver functions */ -void vboxglDrvCreateContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - HGLRC glrc = 0; - - OGL_CMD(DrvCreateContext, 1); - OGL_PARAM(HDC, hdc); - - Log(("DrvCreateContext %x\n", hdc)); - Assert(VBOX_OGL_GUEST_TO_HOST_HDC(hdc)); - glrc = wglCreateContext(pClient->hdc); - - pClient->lastretval = (uint64_t)glrc; - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvSetContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSetContext, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(HGLRC, hglrc); - - Log(("DrvSetyContext %x %x\n", hdc, hglrc)); - pClient->lastretval = wglMakeCurrent(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), hglrc); - if (!pClient->lastretval) - Log(("wglMakeCurrent failed with %d\n", GetLastError())); - - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvCopyContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvDeleteContext, 3); - OGL_PARAM(HGLRC, hglrcSrc); - OGL_PARAM(HGLRC, hglrcDst); - OGL_PARAM(UINT, mask); - Log(("DrvCopyContext %x %x %x\n", hglrcSrc, hglrcDst, mask)); - pClient->lastretval = wglCopyContext(hglrcSrc, hglrcDst, mask); - if (!pClient->lastretval) - Log(("wglCopyContext failed with %d\n", GetLastError())); - - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvReleaseContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvReleaseContext, 1); - OGL_PARAM(HGLRC, hglrc); - - Log(("DrvReleaseContext %x\n", hglrc)); - /* clear current selection */ - pClient->lastretval = wglMakeCurrent(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), NULL); - if (!pClient->lastretval) - Log(("wglMakeCurrent failed with %d\n", GetLastError())); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvDeleteContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvDeleteContext, 1); - OGL_PARAM(HGLRC, hglrc); - - Log(("DrvDeleteContext %x\n", hglrc)); - pClient->lastretval = wglDeleteContext(hglrc); - if (!pClient->lastretval) - Log(("wglDeleteContext failed with %d\n", GetLastError())); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvCreateLayerContext(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - HGLRC glrc = 0; - - OGL_CMD(DrvCreateLayerContext, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - - Log(("DrvCreateLayerContext %x %d\n", hdc, iLayerPlane)); - Assert(VBOX_OGL_GUEST_TO_HOST_HDC(hdc)); - glrc = wglCreateLayerContext(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iLayerPlane); - - pClient->lastretval = (uint64_t)glrc; - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvShareLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvShareLists, 3); - OGL_PARAM(HGLRC, hglrc1); - OGL_PARAM(HGLRC, hglrc2); - - Log(("DrvShareLists %x %x\n", hglrc1, hglrc2)); - pClient->lastretval = wglShareLists(hglrc1, hglrc2); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - - -void vboxglDrvRealizeLayerPalette(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvRealizeLayerPalette, 3); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(BOOL, bRealize); - Log(("DrvRealizeLayerPalette %x %d %d\n", hdc, iLayerPlane, bRealize)); - pClient->lastretval = wglRealizeLayerPalette(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iLayerPlane, bRealize); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvSwapLayerBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSwapLayerBuffers, 2); - OGL_PARAM(HDC, hdc); - OGL_PARAM(UINT, fuPlanes); - Log(("DrvSwapLayerBuffers %x %d\n", hdc, fuPlanes)); - pClient->lastretval = wglSwapLayerBuffers(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), fuPlanes); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvSetPixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - int rc; - PIXELFORMATDESCRIPTOR pfd; - - OGL_CMD(DrvSetPixelFormat, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(uint32_t, cx); - OGL_PARAM(uint32_t, cy); - -#ifdef VBOX_OGL_DEBUG_WINDOW_OUTPUT - if (!pClient->hwnd) - { - RTThreadCreate(NULL, vboxWndThread, pClient, 0, RTTHREADTYPE_DEFAULT, 0, "OpenGLWnd"); - while (!pClient->hwnd) - RTThreadSleep(100); - } - SetWindowPos(pClient->hwnd, NULL, 0, 0, cx, cy, SWP_NOMOVE | SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOOWNERZORDER); - - pClient->hdc = GetDC(pClient->hwnd); - - rc = DescribePixelFormat(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iPixelFormat, sizeof(pfd), &pfd); - if (rc) - { - pClient->lastretval = SetPixelFormat(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iPixelFormat, &pfd); - } - else - { - Log(("DescribePixelFormat %d failed with 0 (%d)\n", iPixelFormat, GetLastError())); - pClient->lastretval = 0; - } - -#else - AssertFailed(); -#endif - - Log(("DrvSetPixelFormat %x %d (%d,%d)\n", hdc, iPixelFormat, cx, cy)); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvSwapBuffers(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSwapBuffers, 1); - OGL_PARAM(HDC, hdc); - - Log(("DrvSwapBuffers %x\n", hdc)); - pClient->lastretval = SwapBuffers(VBOX_OGL_GUEST_TO_HOST_HDC(hdc)); - if (!pClient->lastretval) - Log(("SwapBuffers failed with %d\n", GetLastError())); - - /** @todo sync bitmap/screen contents */ - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvDescribeLayerPlane(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - PLAYERPLANEDESCRIPTOR plpd; - - OGL_CMD(DrvDescribeLayerPlane, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(UINT, nBytes); - Assert(pClient->cbLastParam == nBytes); - plpd = (PLAYERPLANEDESCRIPTOR)pClient->pLastParam; - - Log(("DrvDescribeLayerPlane %x %d %d %d %x\n", hdc, iPixelFormat, iLayerPlane, nBytes, plpd)); - pClient->lastretval = wglDescribeLayerPlane(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iPixelFormat, iLayerPlane, nBytes, plpd); - if (!pClient->lastretval) - Log(("wglDescribeLayerPlane failed with %d\n", GetLastError())); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvSetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - OGL_CMD(DrvSetLayerPaletteEntries, 5); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(int, iStart); - OGL_PARAM(int, cEntries); - OGL_MEMPARAM(COLORREF, pcr); - - Log(("DrvSetLayerPaletteEntries %x %d %d %d %x\n", hdc, iLayerPlane, iStart, cEntries, pcr)); - pClient->lastretval = wglSetLayerPaletteEntries(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iLayerPlane, iStart, cEntries, pcr); - if (!pClient->lastretval) - Log(("wglSetLayerPaletteEntries failed with %d\n", GetLastError())); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvGetLayerPaletteEntries(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - COLORREF *pcr; - - OGL_CMD(DrvGetLayerPaletteEntries, 4); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iLayerPlane); - OGL_PARAM(int, iStart); - OGL_PARAM(int, cEntries); - - Assert(pClient->cbLastParam == sizeof(COLORREF)*cEntries); - pcr = (COLORREF *)pClient->pLastParam; - - Log(("DrvGetLayerPaletteEntries %x %d %d %d %x\n", hdc, iLayerPlane, iStart, cEntries, pcr)); - pClient->lastretval = wglGetLayerPaletteEntries(VBOX_OGL_GUEST_TO_HOST_HDC(hdc), iLayerPlane, iStart, cEntries, pcr); - if (!pClient->lastretval) - Log(("wglGetLayerPaletteEntries failed with %d\n", GetLastError())); - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); -} - -void vboxglDrvDescribePixelFormat(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer) -{ - LPPIXELFORMATDESCRIPTOR ppfd; - - OGL_CMD(DrvDescribePixelFormat, 3); - OGL_PARAM(HDC, hdc); - OGL_PARAM(int, iPixelFormat); - OGL_PARAM(UINT, nBytes); - Assert(pClient->cbLastParam == nBytes); - ppfd = (LPPIXELFORMATDESCRIPTOR)pClient->pLastParam; - - hdc = VBOX_OGL_GUEST_TO_HOST_HDC(hdc); - if (!hdc) - hdc = GetDC(0); - - Log(("DrvDescribePixelFormat %x %d %d %x\n", hdc, iPixelFormat, nBytes, ppfd)); - pClient->lastretval = DescribePixelFormat(hdc, iPixelFormat, nBytes, ppfd); - if (!pClient->lastretval) - Log(("DescribePixelFormat failed with %d\n", GetLastError())); - - pClient->fHasLastError = true; - pClient->ulLastError = GetLastError(); - - if (!VBOX_OGL_GUEST_TO_HOST_HDC(hdc)) - ReleaseDC(0, pClient->hdc); -} - -RTUINTPTR vboxDrvIsExtensionAvailable(char *pszExtFunctionName) -{ - RTUINTPTR pfnProc = (RTUINTPTR)wglGetProcAddress(pszExtFunctionName); - - Log(("vboxDrvIsExtensionAvailable %s -> %d\n", pszExtFunctionName, !!pfnProc)); - return pfnProc; -} diff --git a/src/VBox/HostServices/SharedOpenGL.old/service.cpp b/src/VBox/HostServices/SharedOpenGL.old/service.cpp deleted file mode 100644 index 4028c549a..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/service.cpp +++ /dev/null @@ -1,388 +0,0 @@ -/** @file - * VBox OpenGL: Host service entry points. - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#include <iprt/alloc.h> -#include <iprt/string.h> -#include <iprt/assert.h> -#include <VBox/ssm.h> -#define LOG_GROUP LOG_GROUP_SHARED_OPENGL -#include <VBox/log.h> - -#include "vboxgl.h" -#include "gldrv.h" - - -PVBOXHGCMSVCHELPERS g_pHelpers; - - -static DECLCALLBACK(int) svcUnload (void *) -{ - int rc = VINF_SUCCESS; - - Log(("svcUnload\n")); - - vboxglGlobalUnload(); - return rc; -} - -static DECLCALLBACK(int) svcConnect (void *, uint32_t u32ClientID, void *pvClient) -{ - int rc = VINF_SUCCESS; - - NOREF(u32ClientID); - NOREF(pvClient); - - Log(("svcConnect: u32ClientID = %d\n", u32ClientID)); - - vboxglConnect((PVBOXOGLCTX)pvClient); - return rc; -} - -static DECLCALLBACK(int) svcDisconnect (void *, uint32_t u32ClientID, void *pvClient) -{ - int rc = VINF_SUCCESS; - VBOXOGLCTX *pClient = (VBOXOGLCTX *)pvClient; - - NOREF(pClient); - - Log(("svcDisconnect: u32ClientID = %d\n", u32ClientID)); - vboxglDisconnect((PVBOXOGLCTX)pvClient); - return rc; -} - -/** - * We can't save the OpenGL state, so there's not much to do. Perhaps we should invalidate the client id? - */ -static DECLCALLBACK(int) svcSaveState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM) -{ - VBOXOGLCTX *pClient = (VBOXOGLCTX *)pvClient; - - NOREF(pClient); - NOREF(pSSM); - - Log(("svcSaveState: u32ClientID = %d\n", u32ClientID)); - - return VINF_SUCCESS; -} - -static DECLCALLBACK(int) svcLoadState(void *, uint32_t u32ClientID, void *pvClient, PSSMHANDLE pSSM) -{ - VBOXOGLCTX *pClient = (VBOXOGLCTX *)pvClient; - - NOREF(pClient); - NOREF(pSSM); - - Log(("svcLoadState: u32ClientID = %d\n", u32ClientID)); - - return VINF_SUCCESS; -} - -static DECLCALLBACK(void) svcCall (void *, VBOXHGCMCALLHANDLE callHandle, uint32_t u32ClientID, void *pvClient, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) -{ - int rc = VINF_SUCCESS; - - Log(("svcCall: u32ClientID = %d, fn = %d, cParms = %d, pparms = %d\n", u32ClientID, u32Function, cParms, paParms)); - - VBOXOGLCTX *pClient = (VBOXOGLCTX *)pvClient; - -#ifdef DEBUG - uint32_t i; - - for (i = 0; i < cParms; i++) - { - /** @todo parameters other than 32 bit */ - Log((" pparms[%d]: type %d value %d\n", i, paParms[i].type, paParms[i].u.uint32)); - } -#endif - - switch (u32Function) - { - case VBOXOGL_FN_GLGETSTRING: - { - Log(("svcCall: VBOXOGL_FN_GLGETSTRING\n")); - - /* Verify parameter count and types. */ - if (cParms != VBOXOGL_CPARMS_GLGETSTRING) - { - rc = VERR_INVALID_PARAMETER; - } - else - if ( paParms[0].type != VBOX_HGCM_SVC_PARM_32BIT /* name */ - || paParms[1].type != VBOX_HGCM_SVC_PARM_PTR /* string */ - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - /* Fetch parameters. */ - uint32_t name = paParms[0].u.uint32; - char *pString = (char *)paParms[1].u.pointer.addr; - uint32_t cbString = paParms[1].u.pointer.size; - - /* Verify parameters values. */ - if ( (cbString < 32) - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - /* Execute the function. */ - rc = vboxglGetString(pClient, name, pString, &cbString); - - if (RT_SUCCESS(rc)) - { - /* Update parameters.*/ - paParms[1].u.pointer.size = cbString; - } - } - } - break; - } - - case VBOXOGL_FN_GLFLUSH: - { - Log(("svcCall: VBOXOGL_FN_GLFLUSH\n")); - - /* Verify parameter count and types. */ - if (cParms != VBOXOGL_CPARMS_GLFLUSH) - { - rc = VERR_INVALID_PARAMETER; - } - else - if ( paParms[0].type != VBOX_HGCM_SVC_PARM_PTR /* pCmdBuffer */ - || paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT /* cCommands */ - || paParms[2].type != VBOX_HGCM_SVC_PARM_64BIT /* retval */ - || paParms[3].type != VBOX_HGCM_SVC_PARM_32BIT /* lasterror */ - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - /* Fetch parameters. */ - uint8_t *pCmdBuffer = (uint8_t *)paParms[0].u.pointer.addr; - uint32_t cbCmdBuffer = paParms[0].u.pointer.size; - uint32_t cCommands = paParms[1].u.uint32; - GLenum lasterror; - uint64_t lastretval; - - /* Execute the function. */ - rc = vboxglFlushBuffer(pClient, pCmdBuffer, cbCmdBuffer, cCommands, &lasterror, &lastretval); - - if (RT_SUCCESS(rc)) - { - /* Update parameters.*/ - paParms[2].u.uint64 = lastretval; - paParms[3].u.uint32 = lasterror; - } - } - break; - } - - case VBOXOGL_FN_GLFLUSHPTR: - { - Log(("svcCall: VBOXOGL_FN_GLFLUSHPTR\n")); - - /* Verify parameter count and types. */ - if (cParms != VBOXOGL_CPARMS_GLFLUSHPTR) - { - rc = VERR_INVALID_PARAMETER; - } - else - if ( paParms[0].type != VBOX_HGCM_SVC_PARM_PTR /* pCmdBuffer */ - || paParms[1].type != VBOX_HGCM_SVC_PARM_32BIT /* cCommands */ - || ( paParms[2].type != VBOX_HGCM_SVC_PARM_PTR /* pLastParam */ - && paParms[2].type != VBOX_HGCM_SVC_PARM_32BIT) /* pLastParam if NULL */ - || paParms[3].type != VBOX_HGCM_SVC_PARM_64BIT /* retval */ - || paParms[4].type != VBOX_HGCM_SVC_PARM_32BIT /* lasterror */ - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - /* Fetch parameters. */ - uint8_t *pCmdBuffer = (uint8_t *)paParms[0].u.pointer.addr; - uint32_t cbCmdBuffer = paParms[0].u.pointer.size; - uint32_t cCommands = paParms[1].u.uint32; - GLenum lasterror; - uint64_t lastretval; - - /* Save the last parameter of the last command in the client structure so the macro can pick it up there */ - if (paParms[2].type == VBOX_HGCM_SVC_PARM_32BIT) - { - /* HGCM doesn't like NULL pointers. */ - pClient->pLastParam = NULL; - pClient->cbLastParam = 0; - } - else - { - pClient->pLastParam = (uint8_t *)paParms[2].u.pointer.addr; - pClient->cbLastParam = paParms[2].u.pointer.size; - } - - /* Execute the function. */ - rc = vboxglFlushBuffer(pClient, pCmdBuffer, cbCmdBuffer, cCommands, &lasterror, &lastretval); - - /* Clear last parameter info again */ - pClient->pLastParam = 0; - pClient->cbLastParam = 0; - - if (RT_SUCCESS(rc)) - { - /* Update parameters.*/ - paParms[3].u.uint64 = lastretval; - paParms[4].u.uint32 = lasterror; - } - } - break; - } - - case VBOXOGL_FN_GLCHECKEXT: - { - Log(("svcCall: VBOXOGL_FN_GLCHECKEXT\n")); - - /* Verify parameter count and types. */ - if (cParms != VBOXOGL_CPARMS_GLCHECKEXT) - { - rc = VERR_INVALID_PARAMETER; - } - else - if ( paParms[0].type != VBOX_HGCM_SVC_PARM_PTR /* pszExtFnName */ - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - /* Fetch parameters. */ - char *pszExtFnName = (char *)paParms[0].u.pointer.addr; - uint32_t cbExtFnName = paParms[0].u.pointer.size; /* size including null terminator */ - - /* sanity checks */ - if ( cbExtFnName > 256 - || pszExtFnName[cbExtFnName-1] != 0 - ) - { - rc = VERR_INVALID_PARAMETER; - } - else - { -#ifdef RT_OS_WINDOWS - /* Execute the function. */ - if (vboxwglGetProcAddress(pszExtFnName)) - rc = VINF_SUCCESS; - else - rc = VERR_FILE_NOT_FOUND; -#else - rc = VERR_FILE_NOT_FOUND; -#endif - if (RT_SUCCESS(rc)) - { - /* Update parameters.*/ - } - } - } - break; - } - - default: - { - rc = VERR_NOT_IMPLEMENTED; - } - } - - LogFlow(("svcCall: rc = %Rrc\n", rc)); - - g_pHelpers->pfnCallComplete (callHandle, rc); -} - -/* - * We differentiate between a function handler for the guest and one for the host. The guest is not allowed to add or remove mappings for obvious security reasons. - */ -static DECLCALLBACK(int) svcHostCall (void *, uint32_t u32Function, uint32_t cParms, VBOXHGCMSVCPARM paParms[]) -{ - int rc = VINF_SUCCESS; - - Log(("svcHostCall: fn = %d, cParms = %d, pparms = %d\n", u32Function, cParms, paParms)); - -#ifdef DEBUG - uint32_t i; - - for (i = 0; i < cParms; i++) - { - /** @todo parameters other than 32 bit */ - Log((" pparms[%d]: type %d value %d\n", i, paParms[i].type, paParms[i].u.uint32)); - } -#endif - - switch (u32Function) - { - default: - rc = VERR_NOT_IMPLEMENTED; - break; - } - - LogFlow(("svcHostCall: rc = %Rrc\n", rc)); - return rc; -} - -extern "C" DECLCALLBACK(DECLEXPORT(int)) VBoxHGCMSvcLoad (VBOXHGCMSVCFNTABLE *ptable) -{ - int rc = VINF_SUCCESS; - - Log(("VBoxHGCMSvcLoad: ptable = %p\n", ptable)); - - if (!ptable) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - Log(("VBoxHGCMSvcLoad: ptable->cbSize = %d, ptable->u32Version = 0x%08X\n", ptable->cbSize, ptable->u32Version)); - - if ( ptable->cbSize != sizeof (VBOXHGCMSVCFNTABLE) - || ptable->u32Version != VBOX_HGCM_SVC_VERSION) - { - rc = VERR_INVALID_PARAMETER; - } - else - { - g_pHelpers = ptable->pHelpers; - - ptable->cbClient = sizeof (VBOXOGLCTX); - - ptable->pfnUnload = svcUnload; - ptable->pfnConnect = svcConnect; - ptable->pfnDisconnect = svcDisconnect; - ptable->pfnCall = svcCall; - ptable->pfnHostCall = svcHostCall; - ptable->pfnSaveState = svcSaveState; - ptable->pfnLoadState = svcLoadState; - ptable->pvService = NULL; - - vboxglGlobalInit(); - } - } - - return rc; -} diff --git a/src/VBox/HostServices/SharedOpenGL.old/vboxgl.cpp b/src/VBox/HostServices/SharedOpenGL.old/vboxgl.cpp deleted file mode 100644 index 41d88f5db..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/vboxgl.cpp +++ /dev/null @@ -1,150 +0,0 @@ -/** @file - * VBox OpenGL - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - - -#include <iprt/alloc.h> -#include <iprt/string.h> -#include <iprt/assert.h> -#include <VBox/err.h> -#define VBOX_OGL_WITH_CMD_STRINGS -#define VBOX_OGL_WITH_FUNCTION_WRAPPERS -#include "vboxgl.h" - -#define LOG_GROUP LOG_GROUP_SHARED_OPENGL -#include <VBox/log.h> - -/** - * glGetString implementation - * - * @returns VBox error code - * @param pClient Client context - * @param name glGetString name parameter - * @param pString String pointer - * @param pcbString String length (in/out) - */ -int vboxglGetString(VBOXOGLCTX *pClient, GLenum name, char *pString, uint32_t *pcbString) -{ - const GLubyte *pName; - uint32_t cbLen; - int rc = VINF_SUCCESS; - - vboxglEnableOpenGL(pClient); - - pName = glGetString(name); - if (pName == NULL) - { - Log(("glGetString failed for name %x\n", name)); - rc = VERR_INVALID_PARAMETER; - goto end; - } - cbLen = strlen((char *)pName) + 1; - - if (cbLen > *pcbString) - cbLen = *pcbString - 1; - - memcpy(pString, pName, cbLen); - /* force termination */ - pString[cbLen] = 0; - *pcbString = cbLen + 1; - -end: - - vboxglDisableOpenGL(pClient); - - return rc; -} - -/** - * Flush all queued OpenGL commands - * - * @returns VBox error code - * @param pClient Client context - * @param pCmdBuffer Command buffer - * @param cbCmdBuffer Command buffer size - * @param cCommands Number of commands in the buffer - * @param pLastError Pointer to last error (out) - * @param pLastRetVal Pointer to return val of last executed command (out) - */ -int vboxglFlushBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer, uint32_t cbCmdBuffer, uint32_t cCommands, GLenum *pLastError, uint64_t *pLastRetVal) -{ - uint32_t i; - uint8_t *pOrgBuffer = pCmdBuffer; - - Log(("vboxglFlushBuffer cCommands=%d cbCmdBuffer=%x\n", cCommands, cbCmdBuffer)); - - pClient->fHasLastError = false; - - for (i=0;i<cCommands;i++) - { - PVBOX_OGL_CMD pCmd = (PVBOX_OGL_CMD)pCmdBuffer; - - Assert(((RTHCUINTPTR)pCmdBuffer & VBOX_OGL_CMD_ALIGN_MASK) == 0); -#ifdef VBOX_OGL_CMD_STRICT - AssertMsgReturn(pCmd->Magic == VBOX_OGL_CMD_MAGIC, ("Invalid magic dword %x\n", pCmd->Magic), VERR_INVALID_PARAMETER); -#endif - AssertMsgReturn(pCmd->enmOp < VBOX_OGL_OP_Last, ("Invalid OpenGL cmd %x\n", pCmd->enmOp), VERR_INVALID_PARAMETER); - -if ( pCmd->enmOp != VBOX_OGL_OP_Vertex3f - && pCmd->enmOp != VBOX_OGL_OP_Normal3f) - Log(("Flush cmd %s cParams=%d cbCmd=%x\n", pszVBoxOGLCmd[pCmd->enmOp], pCmd->cParams, pCmd->cbCmd)); - - /* call wrapper */ - AssertMsgReturn(pfnOGLWrapper[pCmd->enmOp], ("No wrapper for opcode %x\n", pCmd->enmOp), VERR_INVALID_PARAMETER); - pfnOGLWrapper[pCmd->enmOp](pClient, pCmdBuffer); - - pCmdBuffer += pCmd->cbCmd; - } - AssertReturn(pCmdBuffer == pOrgBuffer + cbCmdBuffer, VERR_INVALID_PARAMETER); - - *pLastRetVal = pClient->lastretval; - if (pClient->fHasLastError) - *pLastError = pClient->ulLastError; - else - *pLastError = glGetError(); - -#ifdef DEBUG - Log(("Flush: last return value=%RX64\n", *pLastRetVal)); - switch(*pLastError) - { - case GL_NO_ERROR: - Log(("Flush: last error GL_NO_ERROR (%x)\n", GL_NO_ERROR)); - break; - case GL_INVALID_ENUM: - Log(("Flush: last error GL_INVALID_ENUM (%x)\n", GL_INVALID_ENUM)); - break; - case GL_INVALID_VALUE: - Log(("Flush: last error GL_INVALID_VALUE (%x)\n", GL_INVALID_VALUE)); - break; - case GL_INVALID_OPERATION: - Log(("Flush: last error GL_INVALID_OPERATION (%x)\n", GL_INVALID_OPERATION)); - break; - case GL_STACK_OVERFLOW: - Log(("Flush: last error GL_STACK_OVERFLOW (%x)\n", GL_STACK_OVERFLOW)); - break; - case GL_STACK_UNDERFLOW: - Log(("Flush: last error GL_STACK_UNDERFLOW (%x)\n", GL_STACK_UNDERFLOW)); - break; - case GL_OUT_OF_MEMORY: - Log(("Flush: last error GL_OUT_OF_MEMORY (%x)\n", GL_OUT_OF_MEMORY)); - break; - } -#endif - return VINF_SUCCESS; -} diff --git a/src/VBox/HostServices/SharedOpenGL.old/vboxgl.h b/src/VBox/HostServices/SharedOpenGL.old/vboxgl.h deleted file mode 100644 index 425d4206e..000000000 --- a/src/VBox/HostServices/SharedOpenGL.old/vboxgl.h +++ /dev/null @@ -1,371 +0,0 @@ -/** @file - * VBox OpenGL helper functions - */ - -/* - * Copyright (C) 2006-2007 Sun Microsystems, Inc. - * - * This file is part of VirtualBox Open Source Edition (OSE), as - * available from http://www.virtualbox.org. This file is free software; - * you can redistribute it and/or modify it under the terms of the GNU - * General Public License (GPL) as published by the Free Software - * Foundation, in version 2 as it comes in the "COPYING" file of the - * VirtualBox OSE distribution. VirtualBox OSE is distributed in the - * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. - * - * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa - * Clara, CA 95054 USA or visit http://www.sun.com if you need - * additional information or have any questions. - */ - -#ifndef ___VBOGL_H -#define ___VBOGL_H - -#ifdef RT_OS_WINDOWS -#include <windows.h> -#endif -#include <GL/gl.h> -#include <VBox/types.h> -#include "gldrv.h" -#include <VBox/HostServices/wglext.h> - -typedef void (* PFN_VBOXGLWRAPPER)(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); - -/** - * Global init of VBox OpenGL - * - * @returns VBox error code - */ -int vboxglGlobalInit(); - -/** - * Global deinit of VBox OpenGL - * - * @returns VBox error code - */ -int vboxglGlobalUnload(); - -/** - * Client connect init - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglConnect(PVBOXOGLCTX pClient); - -/** - * Client disconnect cleanup - * - * @returns VBox error code - * @param pClient Client context - */ -int vboxglDisconnect(PVBOXOGLCTX pClient); - -/** - * Log to the debug output device - * - * @returns VBox error code - * @param pClient - * @param name glGetString name parameter - * @param pString String pointer - * @param pcbString String length (in/out) - */ -int vboxglGetString(VBOXOGLCTX *pClient, GLenum name, char *pString, uint32_t *pcbString); - -/** - * Flush all queued OpenGL commands - * - * @returns VBox error code - * @param pClient Client context - * @param pCmdBuffer Command buffer - * @param cbCmdBuffer Command buffer size - * @param cCommands Number of commands in the buffer - * @param pLastError Pointer to last error (out) - * @param pLastRetVal Pointer to return val of last executed command (out) - */ -int vboxglFlushBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer, uint32_t cbCmdBuffer, uint32_t cCommands, GLenum *pLastError, uint64_t *pLastRetVal); - - -/** - * Initialize OpenGL extensions - * - * @returns VBox error code - */ -int vboxInitOpenGLExtensions(); - -/** - * Check if an opengl extension function is available - * - * @returns VBox error code - * @param pszFunctionName OpenGL extension function name - */ -#ifdef RT_OS_WINDOWS -bool vboxwglGetProcAddress(char *pszFunctionName); -#endif - -/* OpenGL wrappers */ -void vboxglArrayElement(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglBegin(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglBindTexture(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglBlendFunc(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCallList(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3b(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3ub(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3ui(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor3us(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4b(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4ub(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4ui(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColor4us(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClear(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClearAccum(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClearColor(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClearDepth(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClearIndex(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClearStencil(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglAccum(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglAlphaFunc(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex2i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex2s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex3d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex3f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex3i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex3s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex4d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex4f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex4i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertex4s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord1d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord1f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord1i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord1s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord2i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord2s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord3d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord3f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord3i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord3s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord4d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord4f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord4i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoord4s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormal3b(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormal3d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormal3f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormal3i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormal3s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos2i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos2s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos3d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos3f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos3i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos3s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos4d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos4f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos4i(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRasterPos4s(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalCoord1d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalCoord1f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalCoord2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalCoord2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalPoint1(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalPoint2(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexd(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexi(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexs(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexub(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRotated(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRotatef(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglScaled(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglScalef(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTranslated(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTranslatef(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDepthFunc(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDepthMask(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFinish(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFlush(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDeleteLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCullFace(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDeleteTextures(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDepthRange(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDisableClientState(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEnableClientState(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalMesh1(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEvalMesh2(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFogf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFogfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFogi(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFogiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightModelf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightModelfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightModeli(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightModeliv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLighti(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLightiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLineStipple(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLineWidth(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglListBase(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrawArrays(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDrawBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEdgeFlag(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEnd(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEndList(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCopyTexImage1D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCopyTexImage2D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColorMaterial(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMateriali(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMaterialf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMaterialfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMaterialiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPopAttrib(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPopClientAttrib(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPopMatrix(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPopName(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPushAttrib(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPushClientAttrib(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPushMatrix(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPushName(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglReadBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGendv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGenf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGend(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGeni(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexEnvi(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexEnvf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexEnviv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexEnvfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGeniv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexGenfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexParameterf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexParameteri(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexParameterfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexParameteriv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLoadIdentity(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLoadName(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLoadMatrixd(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLoadMatrixf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglStencilFunc(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglShadeModel(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglStencilMask(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglStencilOp(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglScissor(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglViewport(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectd(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRecti(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRects(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectdv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRectsv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMultMatrixd(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMultMatrixf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNewList(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglHint(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexMask(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglInitNames(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexCoordPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglVertexPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColorPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEdgeFlagPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIndexPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglNormalPointer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPolygonStipple(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCallLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglClipPlane(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFrustum(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGenTextures(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMap1d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMap1f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMap2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMap2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMapGrid1d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMapGrid1f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMapGrid2d(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMapGrid2f(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCopyPixels(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexImage1D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexImage2D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexSubImage1D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglTexSubImage2D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFeedbackBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglSelectBuffer(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIsList(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIsTexture(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglRenderMode(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglReadPixels(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglIsEnabled(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGenLists(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelTransferf(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelTransferi(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelZoom(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelStorei(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelStoref(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelMapfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelMapuiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPixelMapusv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPointSize(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPolygonMode(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPolygonOffset(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPassThrough(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglOrtho(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglMatrixMode(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglLogicOp(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglColorMask(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCopyTexSubImage1D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglCopyTexSubImage2D(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglFrontFace(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglDisable(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglEnable(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglPrioritizeTextures(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetBooleanv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetDoublev(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetFloatv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetIntegerv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetLightfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetLightiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetMaterialfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetMaterialiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetPixelMapfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetPixelMapuiv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetPixelMapusv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexEnviv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexEnvfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexGendv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexGenfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexGeniv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexParameterfv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexParameteriv(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetClipPlane(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetPolygonStipple(VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexLevelParameterfv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexLevelParameteriv (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxglGetTexImage (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); - -#ifdef RT_OS_WINDOWS -void vboxwglSwapIntervalEXT (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -void vboxwglGetSwapIntervalEXT (VBOXOGLCTX *pClient, uint8_t *pCmdBuffer); -#endif - -/* after the above */ -#include <VBox/HostServices/VBoxOpenGLSvc.h> -#include <VBox/HostServices/VBoxOGLOp.h> - -#endif /* !___VBOGL_H */ diff --git a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk index 1af3b682b..1c6b50e07 100644 --- a/src/VBox/HostServices/SharedOpenGL/Makefile.kmk +++ b/src/VBox/HostServices/SharedOpenGL/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15532 2008-12-15 18:53:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VirtualBox Windows Chromium OpenGL ICD. # diff --git a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp index 29416d128..7c0a21f9e 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp +++ b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp @@ -1,4 +1,4 @@ -/* $Id: crservice.cpp 15707 2008-12-19 18:16:40Z vboxsync $ */ +/* $Id: crservice.cpp $ */ /** @file * VBox crOpenGL: Host service entry points. diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py b/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py index 47f4637dc..84bc49a6b 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/get_sizes.py @@ -305,6 +305,7 @@ extensions_num_get_values = { 'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_vertex_program'), 'GL_VERTEX_PROGRAM_BINDING_NV': (1, 'CR_NV_vertex_program'), 'GL_MAX_VERTEX_ATTRIBS_ARB': (1, 'CR_ARB_vertex_program'), + 'GL_MAX_TEXTURE_COORDS_ARB': (1, 'CR_ARB_vertex_program'), 'GL_PROGRAM_ERROR_POSITION_NV': (1, 'CR_NV_fragment_program'), 'GL_FRAGMENT_PROGRAM_BINDING_NV': (1, 'CR_NV_fragment_program'), 'GL_MAX_RECTANGLE_TEXTURE_SIZE_NV': (1, 'CR_NV_texture_rectangle'), diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c index ff4cee7bb..6c6eefb96 100755..100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c @@ -1,4 +1,4 @@ -/* $Id: unpack_visibleregion.c 15532 2008-12-15 18:53:11Z vboxsync $ */ +/* $Id: unpack_visibleregion.c $ */ /** @file * VBox Packing VisibleRegion information diff --git a/src/VBox/Installer/Makefile.kmk b/src/VBox/Installer/Makefile.kmk index 51db9c0e2..374d353c2 100644 --- a/src/VBox/Installer/Makefile.kmk +++ b/src/VBox/Installer/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12611 2008-09-19 17:43:54Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Install misc stuff and create dist packages. # diff --git a/src/VBox/Installer/linux/Makefile.kmk b/src/VBox/Installer/linux/Makefile.kmk index 9855baf91..aae5ea926 100644 --- a/src/VBox/Installer/linux/Makefile.kmk +++ b/src/VBox/Installer/linux/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15670 2008-12-18 18:59:15Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the Linux installer. # diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh index f8cef4db9..f8cef4db9 100644..100755 --- a/src/VBox/Installer/linux/VBox.sh +++ b/src/VBox/Installer/linux/VBox.sh diff --git a/src/VBox/Installer/linux/VBoxSysInfo.sh b/src/VBox/Installer/linux/VBoxSysInfo.sh index f07a91821..f07a91821 100644..100755 --- a/src/VBox/Installer/linux/VBoxSysInfo.sh +++ b/src/VBox/Installer/linux/VBoxSysInfo.sh diff --git a/src/VBox/Installer/linux/vboxdrv.sh.in b/src/VBox/Installer/linux/vboxdrv.sh.in index 96af077d7..96af077d7 100644..100755 --- a/src/VBox/Installer/linux/vboxdrv.sh.in +++ b/src/VBox/Installer/linux/vboxdrv.sh.in diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk index 44e210cc4..c9399e560 100644 --- a/src/VBox/Installer/solaris/Makefile.kmk +++ b/src/VBox/Installer/solaris/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15951 2009-01-14 18:29:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the Solaris installer. # diff --git a/src/VBox/Installer/solaris/VBoxISAExec.c b/src/VBox/Installer/solaris/VBoxISAExec.c index 9d1dc32f2..3d28f4aa4 100644 --- a/src/VBox/Installer/solaris/VBoxISAExec.c +++ b/src/VBox/Installer/solaris/VBoxISAExec.c @@ -1,4 +1,4 @@ -/* $Id: VBoxISAExec.c 15912 2009-01-13 12:39:05Z vboxsync $ */ +/* $Id: VBoxISAExec.c $ */ /** @file * VBoxISAExec, ISA exec wrapper, Solaris hosts. */ diff --git a/src/VBox/Installer/solaris/VBoxZoneAccess.c b/src/VBox/Installer/solaris/VBoxZoneAccess.c index b131e36a2..5ddf8efd4 100644 --- a/src/VBox/Installer/solaris/VBoxZoneAccess.c +++ b/src/VBox/Installer/solaris/VBoxZoneAccess.c @@ -1,4 +1,4 @@ -/* $Id: VBoxZoneAccess.c 15550 2008-12-15 21:34:32Z vboxsync $ */ +/* $Id: VBoxZoneAccess.c $ */ /** @file * VBoxZoneAccess - Hack that keeps vboxdrv referenced for granting zone access, Solaris hosts. */ diff --git a/src/VBox/Installer/solaris/makepackage.sh b/src/VBox/Installer/solaris/makepackage.sh index 7dce122ca..c323fb2b1 100644..100755 --- a/src/VBox/Installer/solaris/makepackage.sh +++ b/src/VBox/Installer/solaris/makepackage.sh @@ -87,6 +87,13 @@ hardlink_fixup() mv -f "tmp-$1" "$1" } +symlink_fixup() +{ + "$VBOX_AWK" 'NF == 3 && $1=="s" && '"$2"' { '"$3"' } { print }' "$1" > "tmp-$1" + mv -f "tmp-$1" "$1" +} + + # prepare file list cd "$VBOX_INSTALLED_DIR" echo 'i pkginfo=./vbox.pkginfo' > prototype @@ -111,7 +118,7 @@ if test -f $VBOX_INSTALLED_DIR/amd64/VBoxBFE || test -f $VBOX_INSTALLED_DIR/i386 fi if test -f $VBOX_INSTALLED_DIR/amd64/VBoxHeadless || test -f $VBOX_INSTALLED_DIR/i386/VBoxHeadless; then ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxHeadless - ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxVRDP + ln -fs ./VBoxHeadless $VBOX_INSTALLED_DIR/VBoxVRDP fi find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.copyright|VirtualBoxKern' | pkgproto >> prototype @@ -120,6 +127,7 @@ find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postins filelist_fixup prototype '$2 == "none"' '$5 = "root"; $6 = "bin"' filelist_fixup prototype '$2 == "none"' '$3 = "opt/VirtualBox/"$3"="$3' hardlink_fixup prototype '$2 == "none"' '$3 = "opt/VirtualBox/"$3' +symlink_fixup prototype '$2 == "none"' '$3 = "opt/VirtualBox/"$3' # install the kernel modules to the right place. filelist_fixup prototype '$3 == "opt/VirtualBox/i386/vboxdrv=i386/vboxdrv"' '$3 = "platform/i86pc/kernel/drv/vboxdrv=i386/vboxdrv"; $6 = "sys"' diff --git a/src/VBox/Installer/solaris/postinstall.sh b/src/VBox/Installer/solaris/postinstall.sh index b29d2d643..926341da2 100644..100755 --- a/src/VBox/Installer/solaris/postinstall.sh +++ b/src/VBox/Installer/solaris/postinstall.sh @@ -66,10 +66,16 @@ if test -f "$VBOXBASEDIR/amd64/VBoxHeadless" || test -f "$VBOXBASEDIR/i386/VBoxH if test -d $VBOXBASEDIR/amd64; then /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/amd64/rdesktop-vrdp-keymaps=$VBOXBASEDIR/rdesktop-vrdp-keymaps s /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/amd64/additions=$VBOXBASEDIR/additions s + if test -f $VBOXBASEDIR/VirtualBox.chm; then + /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/amd64/VirtualBox.chm=$VBOXBASEDIR/VirtualBox.chm s + fi fi if test -d $VBOXBASEDIR/i386; then /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/i386/rdesktop-vrdp-keymaps=$VBOXBASEDIR/rdesktop-vrdp-keymaps s /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/i386/additions=$VBOXBASEDIR/additions s + if test -f $VBOXBASEDIR/VirtualBox.chm; then + /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/i386/VirtualBox.chm=$VBOXBASEDIR/VirtualBox.chm s + fi fi /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxHeadless=/$VBOXBASEDIR/VBox.sh s /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxVRDP=$VBOXBASEDIR/VBox.sh s diff --git a/src/VBox/Installer/solaris/preremove.sh b/src/VBox/Installer/solaris/preremove.sh index bc9d9d739..bc9d9d739 100644..100755 --- a/src/VBox/Installer/solaris/preremove.sh +++ b/src/VBox/Installer/solaris/preremove.sh diff --git a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh index d2af64222..1d4922338 100644..100755 --- a/src/VBox/Installer/solaris/smf-vboxwebsrv.sh +++ b/src/VBox/Installer/solaris/smf-vboxwebsrv.sh @@ -1,5 +1,5 @@ #!/sbin/sh -# $Id: smf-vboxwebsrv.sh 14788 2008-11-28 15:50:18Z vboxsync $ +# $Id: smf-vboxwebsrv.sh $ # Copyright (C) 2008 Sun Microsystems, Inc. # diff --git a/src/VBox/Installer/solaris/vbi/makepackage.sh b/src/VBox/Installer/solaris/vbi/makepackage.sh index 308aa6726..308aa6726 100644..100755 --- a/src/VBox/Installer/solaris/vbi/makepackage.sh +++ b/src/VBox/Installer/solaris/vbi/makepackage.sh diff --git a/src/VBox/Installer/solaris/vbi/preremove.sh b/src/VBox/Installer/solaris/vbi/preremove.sh index 3cf12d659..3cf12d659 100644..100755 --- a/src/VBox/Installer/solaris/vbi/preremove.sh +++ b/src/VBox/Installer/solaris/vbi/preremove.sh diff --git a/src/VBox/Installer/solaris/zoneaccess.sh b/src/VBox/Installer/solaris/zoneaccess.sh index 433bd64ae..433bd64ae 100644..100755 --- a/src/VBox/Installer/solaris/zoneaccess.sh +++ b/src/VBox/Installer/solaris/zoneaccess.sh diff --git a/src/VBox/Main/ConsoleImpl.cpp b/src/VBox/Main/ConsoleImpl.cpp index 38eaedecd..9f019135d 100644 --- a/src/VBox/Main/ConsoleImpl.cpp +++ b/src/VBox/Main/ConsoleImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl.cpp 15991 2009-01-16 14:02:20Z vboxsync $ */ +/* $Id: ConsoleImpl.cpp $ */ /** @file * @@ -193,6 +193,10 @@ struct VMPowerUpTask : public VMProgressTask /* No null output parameters in IPC*/ MediaState_T dummy; + /* we may be holding important error info on the current thread; + * preserve it */ + ErrorInfoKeeper eik; + /* if the locked media list is not empty, treat as a failure and * unlock all */ for (LockedMedia::const_iterator it = lockedMedia.begin(); diff --git a/src/VBox/Main/ConsoleImpl2.cpp b/src/VBox/Main/ConsoleImpl2.cpp index 08568b722..bcbe58fb8 100644 --- a/src/VBox/Main/ConsoleImpl2.cpp +++ b/src/VBox/Main/ConsoleImpl2.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl2.cpp 16049 2009-01-19 17:12:11Z vboxsync $ */ +/* $Id: ConsoleImpl2.cpp $ */ /** @file * VBox Console COM Class implementation * diff --git a/src/VBox/Main/ConsoleVRDPServer.cpp b/src/VBox/Main/ConsoleVRDPServer.cpp index 8f3225c19..1a73cd787 100644 --- a/src/VBox/Main/ConsoleVRDPServer.cpp +++ b/src/VBox/Main/ConsoleVRDPServer.cpp @@ -1,4 +1,4 @@ -/* $Id: ConsoleVRDPServer.cpp 15916 2009-01-13 14:12:22Z vboxsync $ */ +/* $Id: ConsoleVRDPServer.cpp $ */ /** @file * diff --git a/src/VBox/Main/DVDDriveImpl.cpp b/src/VBox/Main/DVDDriveImpl.cpp index 12c130f90..529e6807e 100644 --- a/src/VBox/Main/DVDDriveImpl.cpp +++ b/src/VBox/Main/DVDDriveImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DVDDriveImpl.cpp 15991 2009-01-16 14:02:20Z vboxsync $ */ +/* $Id: DVDDriveImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/DisplayImpl.cpp b/src/VBox/Main/DisplayImpl.cpp index 9fda8178b..fab602968 100644 --- a/src/VBox/Main/DisplayImpl.cpp +++ b/src/VBox/Main/DisplayImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.cpp 15874 2009-01-08 16:26:25Z vboxsync $ */ +/* $Id: DisplayImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/FloppyDriveImpl.cpp b/src/VBox/Main/FloppyDriveImpl.cpp index 5a6162ca6..a628a1b96 100644 --- a/src/VBox/Main/FloppyDriveImpl.cpp +++ b/src/VBox/Main/FloppyDriveImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: FloppyDriveImpl.cpp 15991 2009-01-16 14:02:20Z vboxsync $ */ +/* $Id: FloppyDriveImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/Global.cpp b/src/VBox/Main/Global.cpp index c073ed850..cf1edcac3 100644 --- a/src/VBox/Main/Global.cpp +++ b/src/VBox/Main/Global.cpp @@ -1,4 +1,4 @@ -/* $Id: Global.cpp 16004 2009-01-16 18:18:46Z vboxsync $ */ +/* $Id: Global.cpp $ */ /** @file * diff --git a/src/VBox/Main/GuestImpl.cpp b/src/VBox/Main/GuestImpl.cpp index f69da8673..2bac3c612 100644 --- a/src/VBox/Main/GuestImpl.cpp +++ b/src/VBox/Main/GuestImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: GuestImpl.cpp 16125 2009-01-21 11:03:50Z vboxsync $ */ +/* $Id: GuestImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/HardDisk2Impl.cpp b/src/VBox/Main/HardDisk2Impl.cpp index 763a8ff48..d635e4242 100644 --- a/src/VBox/Main/HardDisk2Impl.cpp +++ b/src/VBox/Main/HardDisk2Impl.cpp @@ -1,4 +1,4 @@ -/* $Id: HardDisk2Impl.cpp 16118 2009-01-21 09:43:00Z vboxsync $ */ +/* $Id: HardDisk2Impl.cpp $ */ /** @file * diff --git a/src/VBox/Main/HardDiskFormatImpl.cpp b/src/VBox/Main/HardDiskFormatImpl.cpp index 3d100db40..10998b3c6 100644 --- a/src/VBox/Main/HardDiskFormatImpl.cpp +++ b/src/VBox/Main/HardDiskFormatImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HardDiskFormatImpl.cpp 15649 2008-12-18 12:37:11Z vboxsync $ */ +/* $Id: HardDiskFormatImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/HostImpl.cpp b/src/VBox/Main/HostImpl.cpp index fe71325cd..4f10bc101 100644 --- a/src/VBox/Main/HostImpl.cpp +++ b/src/VBox/Main/HostImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostImpl.cpp 15869 2009-01-08 14:52:34Z vboxsync $ */ +/* $Id: HostImpl.cpp $ */ /** @file * VirtualBox COM class implementation: Host */ @@ -2347,6 +2347,10 @@ HRESULT Host::checkUSBProxyService() /* disable the USB controller completely to avoid assertions if the * USB proxy service could not start. */ + Bstr message; + if ( SUCCEEDED(mUSBProxyService->getLastErrorMessage(message.asOutParam())) + && !message.isNull()) + return setWarning (E_FAIL, Utf8Str(message).raw()); if (mUSBProxyService->getLastError() == VERR_FILE_NOT_FOUND) return setWarning (E_FAIL, tr ("Could not load the Host USB Proxy Service (%Rrc). " diff --git a/src/VBox/Main/HostNetworkInterfaceImpl.cpp b/src/VBox/Main/HostNetworkInterfaceImpl.cpp index be9e0e713..e6f6ff9ef 100644 --- a/src/VBox/Main/HostNetworkInterfaceImpl.cpp +++ b/src/VBox/Main/HostNetworkInterfaceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: HostNetworkInterfaceImpl.cpp 15511 2008-12-15 15:38:07Z vboxsync $ */ +/* $Id: HostNetworkInterfaceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/KeyboardImpl.cpp b/src/VBox/Main/KeyboardImpl.cpp index fa12c5524..f1bf5f1fb 100644 --- a/src/VBox/Main/KeyboardImpl.cpp +++ b/src/VBox/Main/KeyboardImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.cpp 15715 2008-12-22 13:15:30Z vboxsync $ */ +/* $Id: KeyboardImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/MachineDebuggerImpl.cpp b/src/VBox/Main/MachineDebuggerImpl.cpp index 1eab6672a..1aae5522b 100644 --- a/src/VBox/Main/MachineDebuggerImpl.cpp +++ b/src/VBox/Main/MachineDebuggerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MachineDebuggerImpl.cpp 15827 2009-01-07 10:22:15Z vboxsync $ */ +/* $Id: MachineDebuggerImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/MachineImpl.cpp b/src/VBox/Main/MachineImpl.cpp index a8dbc0bde..b9db74c2d 100644 --- a/src/VBox/Main/MachineImpl.cpp +++ b/src/VBox/Main/MachineImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MachineImpl.cpp 16001 2009-01-16 16:56:47Z vboxsync $ */ +/* $Id: MachineImpl.cpp $ */ /** @file * Implementation of IMachine in VBoxSVC. @@ -901,13 +901,19 @@ STDMETHODIMP Machine::COMSETTER(OSTypeId) (IN_BSTR aOSTypeId) guestOSType.asOutParam()); CheckComRCReturnRC (rc); + /* when setting, always use the "etalon" value for consistency -- lookup + * by ID is case-insensitive and the input value may have different case */ + Bstr osTypeId; + rc = guestOSType->COMGETTER(Id) (osTypeId.asOutParam()); + CheckComRCReturnRC (rc); + AutoWriteLock alock (this); rc = checkStateDependency (MutableStateDep); CheckComRCReturnRC (rc); mUserData.backup(); - mUserData->mOSTypeId = aOSTypeId; + mUserData->mOSTypeId = osTypeId; return S_OK; } diff --git a/src/VBox/Main/Makefile.kmk b/src/VBox/Main/Makefile.kmk index ecb109842..db22f30b9 100644 --- a/src/VBox/Main/Makefile.kmk +++ b/src/VBox/Main/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16049 2009-01-19 17:12:11Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Makefile for the VBox Main module. # @@ -290,10 +290,11 @@ VBoxSVC_SOURCES.win = \ win/HostPowerWin.cpp \ win/VBoxSVC.rc +VBoxSVC_SOURCES.linux = \ + linux/HostHardwareLinux.cpp + ifdef VBOX_WITH_DBUS -VBoxSVC_SOURCES.linux += \ - linux/HostHardwareLinux.cpp \ - linux/vbox-dbus.cpp + VBoxSVC_SOURCES.linux += linux/vbox-dbus.cpp endif VBoxSVC_SOURCES.solaris = \ diff --git a/src/VBox/Main/MediumImpl.cpp b/src/VBox/Main/MediumImpl.cpp index 653749dc3..acb4b8374 100644 --- a/src/VBox/Main/MediumImpl.cpp +++ b/src/VBox/Main/MediumImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MediumImpl.cpp 15215 2008-12-09 23:46:52Z vboxsync $ */ +/* $Id: MediumImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/MouseImpl.cpp b/src/VBox/Main/MouseImpl.cpp index c7f50fae2..bf579d304 100644 --- a/src/VBox/Main/MouseImpl.cpp +++ b/src/VBox/Main/MouseImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: MouseImpl.cpp 15716 2008-12-22 13:36:56Z vboxsync $ */ +/* $Id: MouseImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/ParallelPortImpl.cpp b/src/VBox/Main/ParallelPortImpl.cpp index e49ca4c5c..f7ba0c7e4 100644 --- a/src/VBox/Main/ParallelPortImpl.cpp +++ b/src/VBox/Main/ParallelPortImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ParallelPortImpl.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: ParallelPortImpl.cpp $ */ /** @file * VirtualBox COM class implementation */ diff --git a/src/VBox/Main/Performance.cpp b/src/VBox/Main/Performance.cpp index 751c780d7..625e68b7e 100644 --- a/src/VBox/Main/Performance.cpp +++ b/src/VBox/Main/Performance.cpp @@ -1,4 +1,4 @@ -/* $Id: Performance.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: Performance.cpp $ */ /** @file * diff --git a/src/VBox/Main/PerformanceImpl.cpp b/src/VBox/Main/PerformanceImpl.cpp index 99cadac80..e87ecf2e3 100644 --- a/src/VBox/Main/PerformanceImpl.cpp +++ b/src/VBox/Main/PerformanceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceImpl.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: PerformanceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/ProgressImpl.cpp b/src/VBox/Main/ProgressImpl.cpp index df34bdb96..acba9dc35 100644 --- a/src/VBox/Main/ProgressImpl.cpp +++ b/src/VBox/Main/ProgressImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: ProgressImpl.cpp 15165 2008-12-09 13:20:45Z vboxsync $ */ +/* $Id: ProgressImpl.cpp $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/RemoteUSBDeviceImpl.cpp b/src/VBox/Main/RemoteUSBDeviceImpl.cpp index e0f4f1bcd..1866613a9 100644 --- a/src/VBox/Main/RemoteUSBDeviceImpl.cpp +++ b/src/VBox/Main/RemoteUSBDeviceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: RemoteUSBDeviceImpl.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: RemoteUSBDeviceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/SATAControllerImpl.cpp b/src/VBox/Main/SATAControllerImpl.cpp index 24c01b179..381e7729b 100644 --- a/src/VBox/Main/SATAControllerImpl.cpp +++ b/src/VBox/Main/SATAControllerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: SATAControllerImpl.cpp 14972 2008-12-04 12:10:37Z vboxsync $ */ +/* $Id: SATAControllerImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/SystemPropertiesImpl.cpp b/src/VBox/Main/SystemPropertiesImpl.cpp index 178f1bdae..c2483ee78 100644 --- a/src/VBox/Main/SystemPropertiesImpl.cpp +++ b/src/VBox/Main/SystemPropertiesImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: SystemPropertiesImpl.cpp 16081 2009-01-20 11:21:43Z vboxsync $ */ +/* $Id: SystemPropertiesImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/USBControllerImpl.cpp b/src/VBox/Main/USBControllerImpl.cpp index 4e42b4240..d5e99867c 100644 --- a/src/VBox/Main/USBControllerImpl.cpp +++ b/src/VBox/Main/USBControllerImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: USBControllerImpl.cpp 15829 2009-01-07 11:17:56Z vboxsync $ */ +/* $Id: USBControllerImpl.cpp $ */ /** @file * Implementation of IUSBController. */ diff --git a/src/VBox/Main/USBDeviceImpl.cpp b/src/VBox/Main/USBDeviceImpl.cpp index ca890fec4..5acb3d46e 100644 --- a/src/VBox/Main/USBDeviceImpl.cpp +++ b/src/VBox/Main/USBDeviceImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: USBDeviceImpl.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: USBDeviceImpl.cpp $ */ /** @file * diff --git a/src/VBox/Main/VMMDevInterface.cpp b/src/VBox/Main/VMMDevInterface.cpp index f97066a48..d3f6c6c90 100644 --- a/src/VBox/Main/VMMDevInterface.cpp +++ b/src/VBox/Main/VMMDevInterface.cpp @@ -694,8 +694,9 @@ DECLCALLBACK(int) VMMDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle) /* * Validate configuration. */ - if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0OpenGLEnabled\0crOpenGLEnabled\0")) + if (!CFGMR3AreValuesValid(pCfgHandle, "Object\0")) return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES; + PPDMIBASE pBaseIgnore; int rc = pDrvIns->pDrvHlp->pfnAttach(pDrvIns, &pBaseIgnore); if (rc != VERR_PDM_NO_ATTACHED_DRIVER) @@ -794,27 +795,7 @@ DECLCALLBACK(int) VMMDev::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfgHandle) AssertMsgFailed(("pfnQueryStatusLed failed with %Rrc (pLed=%x)\n", rc, pLed)); } else - { LogRel(("Failed to load Shared Folders service %Rrc\n", rc)); - } - - bool fEnabled; - - /* Check CFGM option. */ - rc = CFGMR3QueryBool(pCfgHandle, "OpenGLEnabled", &fEnabled); - if ( RT_SUCCESS(rc) - && fEnabled) - { - rc = pData->pVMMDev->hgcmLoadService ("VBoxSharedOpenGL", "VBoxSharedOpenGL"); - if (RT_SUCCESS(rc)) - { - LogRel(("Shared OpenGL service loaded.\n")); - } - else - { - LogRel(("Failed to load Shared OpenGL service %Rrc\n", rc)); - } - } pDrvIns->pDrvHlp->pfnSSMRegister(pDrvIns, "HGCM", 0, HGCM_SSM_VERSION, 4096/* bad guess */, NULL, iface_hgcmSave, NULL, NULL, iface_hgcmLoad, NULL); #endif /* VBOX_WITH_HGCM */ diff --git a/src/VBox/Main/VirtualBoxBase.cpp b/src/VBox/Main/VirtualBoxBase.cpp index da3d56d9f..f47a9f74e 100644 --- a/src/VBox/Main/VirtualBoxBase.cpp +++ b/src/VBox/Main/VirtualBoxBase.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxBase.cpp 14904 2008-12-02 14:37:52Z vboxsync $ */ +/* $Id: VirtualBoxBase.cpp $ */ /** @file * diff --git a/src/VBox/Main/VirtualBoxImpl.cpp b/src/VBox/Main/VirtualBoxImpl.cpp index 5f7df47d3..3f229f21e 100644 --- a/src/VBox/Main/VirtualBoxImpl.cpp +++ b/src/VBox/Main/VirtualBoxImpl.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxImpl.cpp 16040 2009-01-19 11:11:12Z vboxsync $ */ +/* $Id: VirtualBoxImpl.cpp $ */ /** @file * Implementation of IVirtualBox in VBoxSVC. @@ -1303,11 +1303,41 @@ STDMETHODIMP VirtualBox::FindFloppyImage (IN_BSTR aLocation, /** @note Locks this object for reading. */ STDMETHODIMP VirtualBox::GetGuestOSType (IN_BSTR aId, IGuestOSType **aType) { - CheckComArgNotNull(aType); + /* Old ID to new ID conversion table. See r39691 for a source */ + static const wchar_t *kOldNewIDs[] = + { + L"unknown", L"Other", + L"win31", L"Windows31", + L"win95", L"Windows95", + L"win98", L"Windows98", + L"winme", L"WindowsMe", + L"winnt4", L"WindowsNT4", + L"win2k", L"Windows2000", + L"winxp", L"WindowsXP", + L"win2k3", L"Windows2003", + L"winvista", L"WindowsVista", + L"win2k8", L"Windows2008", + L"ecs", L"OS2eCS", + L"fedoracore", L"Fedora", + /* the rest is covered by the case-insensitive comparison */ + }; + + CheckComArgNotNull (aType); AutoCaller autoCaller (this); CheckComRCReturnRC (autoCaller.rc()); + /* first, look for a substitution */ + Bstr id = aId; + for (size_t i = 0; i < RT_ELEMENTS (kOldNewIDs) / 2; i += 2) + { + if (id == kOldNewIDs [i]) + { + id = kOldNewIDs [i + 1]; + break; + } + } + *aType = NULL; AutoReadLock alock (this); @@ -1318,7 +1348,7 @@ STDMETHODIMP VirtualBox::GetGuestOSType (IN_BSTR aId, IGuestOSType **aType) { const Bstr &typeId = (*it)->id(); AssertMsg (!!typeId, ("ID must not be NULL")); - if (typeId == aId) + if (typeId.compareIgnoreCase (id) == 0) { (*it).queryInterfaceTo (aType); break; diff --git a/src/VBox/Main/darwin/NetIfList-darwin.cpp b/src/VBox/Main/darwin/NetIfList-darwin.cpp index 20e9c3eb7..44f9b5629 100644 --- a/src/VBox/Main/darwin/NetIfList-darwin.cpp +++ b/src/VBox/Main/darwin/NetIfList-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIfList-darwin.cpp 15548 2008-12-15 21:33:35Z vboxsync $ */ +/* $Id: NetIfList-darwin.cpp $ */ /** @file * Main - NetIfList, Darwin implementation. */ diff --git a/src/VBox/Main/darwin/PerformanceDarwin.cpp b/src/VBox/Main/darwin/PerformanceDarwin.cpp index dc273cd5a..1cde14bf2 100644 --- a/src/VBox/Main/darwin/PerformanceDarwin.cpp +++ b/src/VBox/Main/darwin/PerformanceDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceDarwin.cpp 14944 2008-12-03 14:09:42Z vboxsync $ */ +/* $Id: PerformanceDarwin.cpp $ */ /** @file * diff --git a/src/VBox/Main/darwin/iokit.cpp b/src/VBox/Main/darwin/iokit.cpp index 1e2bc5237..39aa42300 100644 --- a/src/VBox/Main/darwin/iokit.cpp +++ b/src/VBox/Main/darwin/iokit.cpp @@ -1,4 +1,4 @@ -/* $Id: iokit.cpp 11857 2008-08-29 23:39:12Z vboxsync $ */ +/* $Id: iokit.cpp $ */ /** @file * Main - Darwin IOKit Routines. * diff --git a/src/VBox/Main/darwin/iokit.h b/src/VBox/Main/darwin/iokit.h index 37ffff940..f4573c14b 100644 --- a/src/VBox/Main/darwin/iokit.h +++ b/src/VBox/Main/darwin/iokit.h @@ -1,4 +1,4 @@ -/* $Id: iokit.h 11638 2008-08-26 01:02:36Z vboxsync $ */ +/* $Id: iokit.h $ */ /** @file * Main - Darwin IOKit Routines. */ diff --git a/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp b/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp index 25ff705c9..e068f3f45 100644 --- a/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp +++ b/src/VBox/Main/freebsd/PerformanceFreeBSD.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceFreeBSD.cpp 16016 2009-01-18 00:25:10Z vboxsync $ */ +/* $Id: PerformanceFreeBSD.cpp $ */ /** @file * VirtualBox Performance Collector, FreeBSD Specialization. */ diff --git a/src/VBox/Main/glue/SupportErrorInfo.cpp b/src/VBox/Main/glue/SupportErrorInfo.cpp index d389dbc69..fd659deeb 100644 --- a/src/VBox/Main/glue/SupportErrorInfo.cpp +++ b/src/VBox/Main/glue/SupportErrorInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: SupportErrorInfo.cpp 13580 2008-10-27 14:04:18Z vboxsync $ */ +/* $Id: SupportErrorInfo.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer: diff --git a/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp b/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp index f25f029df..873475f63 100644 --- a/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp +++ b/src/VBox/Main/glue/VirtualBoxErrorInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxErrorInfo.cpp 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: VirtualBoxErrorInfo.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer: diff --git a/src/VBox/Main/glue/com.cpp b/src/VBox/Main/glue/com.cpp index 021e02ae1..a18ce24f6 100644 --- a/src/VBox/Main/glue/com.cpp +++ b/src/VBox/Main/glue/com.cpp @@ -1,4 +1,4 @@ -/* $Id: com.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: com.cpp $ */ /** @file * MS COM / XPCOM Abstraction Layer diff --git a/src/VBox/Main/glue/string.cpp b/src/VBox/Main/glue/string.cpp index 589169486..686764921 100644 --- a/src/VBox/Main/glue/string.cpp +++ b/src/VBox/Main/glue/string.cpp @@ -1,4 +1,4 @@ -/* $Id: string.cpp 14948 2008-12-03 15:06:30Z vboxsync $ */ +/* $Id: string.cpp $ */ /** @file * diff --git a/src/VBox/Main/idl/VirtualBox.xidl b/src/VBox/Main/idl/VirtualBox.xidl index 5a75b0f96..82e68cfed 100644 --- a/src/VBox/Main/idl/VirtualBox.xidl +++ b/src/VBox/Main/idl/VirtualBox.xidl @@ -1,7 +1,7 @@ <?xml version="1.0" ?> <!-- - * $Id: VirtualBox.xidl 16089 2009-01-20 16:19:59Z vboxsync $ * + * $Id: VirtualBox.xidl 41799 2009-01-20 16:19:59Z dmik $ * * * :tabSize=2:indentSize=2:noTabs=true: * :folding=explicit:collapseFolds=1: diff --git a/src/VBox/Main/idl/midl.xsl b/src/VBox/Main/idl/midl.xsl index d21c7952a..ef863ac44 100644 --- a/src/VBox/Main/idl/midl.xsl +++ b/src/VBox/Main/idl/midl.xsl @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: midl.xsl 14572 2008-11-25 13:37:40Z vboxsync $ --> +<!-- $Id: midl.xsl 39869 2008-11-25 13:37:40Z dmik $ --> <!-- * A template to generate a MS IDL compatible interface definition file diff --git a/src/VBox/Main/idl/xpidl.xsl b/src/VBox/Main/idl/xpidl.xsl index 85b9cc4d8..dda6e4e6b 100644 --- a/src/VBox/Main/idl/xpidl.xsl +++ b/src/VBox/Main/idl/xpidl.xsl @@ -1,5 +1,5 @@ <?xml version="1.0"?> -<!-- $Id: xpidl.xsl 14572 2008-11-25 13:37:40Z vboxsync $ --> +<!-- $Id: xpidl.xsl 39869 2008-11-25 13:37:40Z dmik $ --> <!-- * A template to generate a XPCOM IDL compatible interface definition file diff --git a/src/VBox/Main/include/AudioAdapterImpl.h b/src/VBox/Main/include/AudioAdapterImpl.h index c6583b4ac..364051090 100644 --- a/src/VBox/Main/include/AudioAdapterImpl.h +++ b/src/VBox/Main/include/AudioAdapterImpl.h @@ -1,4 +1,4 @@ -/* $Id: AudioAdapterImpl.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: AudioAdapterImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ConsoleImpl.h b/src/VBox/Main/include/ConsoleImpl.h index fe8a922a5..8d017ebd5 100644 --- a/src/VBox/Main/include/ConsoleImpl.h +++ b/src/VBox/Main/include/ConsoleImpl.h @@ -1,4 +1,4 @@ -/* $Id: ConsoleImpl.h 15708 2008-12-19 18:28:27Z vboxsync $ */ +/* $Id: ConsoleImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ConsoleVRDPServer.h b/src/VBox/Main/include/ConsoleVRDPServer.h index d8a114fe0..1ef3ab53f 100644 --- a/src/VBox/Main/include/ConsoleVRDPServer.h +++ b/src/VBox/Main/include/ConsoleVRDPServer.h @@ -1,4 +1,4 @@ -/* $Id: ConsoleVRDPServer.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: ConsoleVRDPServer.h $ */ /** @file * diff --git a/src/VBox/Main/include/DVDDriveImpl.h b/src/VBox/Main/include/DVDDriveImpl.h index 6654dff85..bb1bf13f7 100644 --- a/src/VBox/Main/include/DVDDriveImpl.h +++ b/src/VBox/Main/include/DVDDriveImpl.h @@ -1,4 +1,4 @@ -/* $Id: DVDDriveImpl.h 15991 2009-01-16 14:02:20Z vboxsync $ */ +/* $Id: DVDDriveImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/DisplayImpl.h b/src/VBox/Main/include/DisplayImpl.h index 60add7731..704b3e828 100644 --- a/src/VBox/Main/include/DisplayImpl.h +++ b/src/VBox/Main/include/DisplayImpl.h @@ -1,4 +1,4 @@ -/* $Id: DisplayImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: DisplayImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/FloppyDriveImpl.h b/src/VBox/Main/include/FloppyDriveImpl.h index 48dec8e38..14ea27524 100644 --- a/src/VBox/Main/include/FloppyDriveImpl.h +++ b/src/VBox/Main/include/FloppyDriveImpl.h @@ -1,4 +1,4 @@ -/* $Id: FloppyDriveImpl.h 15991 2009-01-16 14:02:20Z vboxsync $ */ +/* $Id: FloppyDriveImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/Global.h b/src/VBox/Main/include/Global.h index 4f2261ce7..969b18117 100644 --- a/src/VBox/Main/include/Global.h +++ b/src/VBox/Main/include/Global.h @@ -1,4 +1,4 @@ -/* $Id: Global.h 15762 2008-12-25 23:53:50Z vboxsync $ */ +/* $Id: Global.h $ */ /** @file * diff --git a/src/VBox/Main/include/HardDisk2Impl.h b/src/VBox/Main/include/HardDisk2Impl.h index 9ac6a5c7a..9c8842a35 100644 --- a/src/VBox/Main/include/HardDisk2Impl.h +++ b/src/VBox/Main/include/HardDisk2Impl.h @@ -1,4 +1,4 @@ -/* $Id: HardDisk2Impl.h 15486 2008-12-15 09:57:20Z vboxsync $ */ +/* $Id: HardDisk2Impl.h $ */ /** @file * diff --git a/src/VBox/Main/include/HardDiskFormatImpl.h b/src/VBox/Main/include/HardDiskFormatImpl.h index c3f0a9599..0c9e7fb3c 100644 --- a/src/VBox/Main/include/HardDiskFormatImpl.h +++ b/src/VBox/Main/include/HardDiskFormatImpl.h @@ -1,4 +1,4 @@ -/* $Id: HardDiskFormatImpl.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: HardDiskFormatImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/HostHardwareLinux.h b/src/VBox/Main/include/HostHardwareLinux.h index e4e6e1937..366a6cca4 100644 --- a/src/VBox/Main/include/HostHardwareLinux.h +++ b/src/VBox/Main/include/HostHardwareLinux.h @@ -1,4 +1,4 @@ -/* $Id: HostHardwareLinux.h 15468 2008-12-14 15:54:21Z vboxsync $ */ +/* $Id: HostHardwareLinux.h $ */ /** @file * Classes for handling hardware detection under Linux. Please feel free to * expand these to work for other systems (Solaris!) or to add new ones for diff --git a/src/VBox/Main/include/HostImpl.h b/src/VBox/Main/include/HostImpl.h index 722cb0c6d..0c3e9231c 100644 --- a/src/VBox/Main/include/HostImpl.h +++ b/src/VBox/Main/include/HostImpl.h @@ -1,4 +1,4 @@ -/* $Id: HostImpl.h 15570 2008-12-16 10:39:34Z vboxsync $ */ +/* $Id: HostImpl.h $ */ /** @file * Implemenation of IHost. */ diff --git a/src/VBox/Main/include/HostNetworkInterfaceImpl.h b/src/VBox/Main/include/HostNetworkInterfaceImpl.h index 07e641c27..53af1d7eb 100644 --- a/src/VBox/Main/include/HostNetworkInterfaceImpl.h +++ b/src/VBox/Main/include/HostNetworkInterfaceImpl.h @@ -1,4 +1,4 @@ -/* $Id: HostNetworkInterfaceImpl.h 15570 2008-12-16 10:39:34Z vboxsync $ */ +/* $Id: HostNetworkInterfaceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/KeyboardImpl.h b/src/VBox/Main/include/KeyboardImpl.h index 817668c61..de9dbbb89 100644 --- a/src/VBox/Main/include/KeyboardImpl.h +++ b/src/VBox/Main/include/KeyboardImpl.h @@ -1,4 +1,4 @@ -/* $Id: KeyboardImpl.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: KeyboardImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/MachineDebuggerImpl.h b/src/VBox/Main/include/MachineDebuggerImpl.h index c9972f556..c91a42365 100644 --- a/src/VBox/Main/include/MachineDebuggerImpl.h +++ b/src/VBox/Main/include/MachineDebuggerImpl.h @@ -1,4 +1,4 @@ -/* $Id: MachineDebuggerImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: MachineDebuggerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/MachineImpl.h b/src/VBox/Main/include/MachineImpl.h index 9fb9ab6a8..6fbbaad57 100644 --- a/src/VBox/Main/include/MachineImpl.h +++ b/src/VBox/Main/include/MachineImpl.h @@ -1,4 +1,4 @@ -/* $Id: MachineImpl.h 15582 2008-12-16 13:22:33Z vboxsync $ */ +/* $Id: MachineImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/MediumImpl.h b/src/VBox/Main/include/MediumImpl.h index e627e5146..0fc3e8769 100644 --- a/src/VBox/Main/include/MediumImpl.h +++ b/src/VBox/Main/include/MediumImpl.h @@ -1,4 +1,4 @@ -/* $Id: MediumImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: MediumImpl.h $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/include/MouseImpl.h b/src/VBox/Main/include/MouseImpl.h index 07850c478..3ca1106b7 100644 --- a/src/VBox/Main/include/MouseImpl.h +++ b/src/VBox/Main/include/MouseImpl.h @@ -1,4 +1,4 @@ -/* $Id: MouseImpl.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: MouseImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/NetworkAdapterImpl.h b/src/VBox/Main/include/NetworkAdapterImpl.h index d4fd61c14..24606c335 100644 --- a/src/VBox/Main/include/NetworkAdapterImpl.h +++ b/src/VBox/Main/include/NetworkAdapterImpl.h @@ -1,4 +1,4 @@ -/* $Id: NetworkAdapterImpl.h 15708 2008-12-19 18:28:27Z vboxsync $ */ +/* $Id: NetworkAdapterImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ParallelPortImpl.h b/src/VBox/Main/include/ParallelPortImpl.h index d563abcc4..6a784a983 100644 --- a/src/VBox/Main/include/ParallelPortImpl.h +++ b/src/VBox/Main/include/ParallelPortImpl.h @@ -1,4 +1,4 @@ -/* $Id: ParallelPortImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: ParallelPortImpl.h $ */ /** @file * VirtualBox COM class implementation. diff --git a/src/VBox/Main/include/Performance.h b/src/VBox/Main/include/Performance.h index b3b5e90d3..6e8410012 100644 --- a/src/VBox/Main/include/Performance.h +++ b/src/VBox/Main/include/Performance.h @@ -1,4 +1,4 @@ -/* $Id: Performance.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: Performance.h $ */ /** @file * diff --git a/src/VBox/Main/include/PerformanceImpl.h b/src/VBox/Main/include/PerformanceImpl.h index f08d1cdae..b6f26ec5e 100644 --- a/src/VBox/Main/include/PerformanceImpl.h +++ b/src/VBox/Main/include/PerformanceImpl.h @@ -1,4 +1,4 @@ -/* $Id: PerformanceImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: PerformanceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/ProgressImpl.h b/src/VBox/Main/include/ProgressImpl.h index 9feb00bae..3f5484c99 100644 --- a/src/VBox/Main/include/ProgressImpl.h +++ b/src/VBox/Main/include/ProgressImpl.h @@ -1,4 +1,4 @@ -/* $Id: ProgressImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: ProgressImpl.h $ */ /** @file * * VirtualBox COM class implementation diff --git a/src/VBox/Main/include/RemoteUSBDeviceImpl.h b/src/VBox/Main/include/RemoteUSBDeviceImpl.h index af399c27d..35e4b3a2e 100644 --- a/src/VBox/Main/include/RemoteUSBDeviceImpl.h +++ b/src/VBox/Main/include/RemoteUSBDeviceImpl.h @@ -1,4 +1,4 @@ -/* $Id: RemoteUSBDeviceImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: RemoteUSBDeviceImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/SATAControllerImpl.h b/src/VBox/Main/include/SATAControllerImpl.h index 9c0a962c7..9ca452f61 100644 --- a/src/VBox/Main/include/SATAControllerImpl.h +++ b/src/VBox/Main/include/SATAControllerImpl.h @@ -1,4 +1,4 @@ -/* $Id: SATAControllerImpl.h 14949 2008-12-03 15:17:16Z vboxsync $ */ +/* $Id: SATAControllerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/SystemPropertiesImpl.h b/src/VBox/Main/include/SystemPropertiesImpl.h index 8ccd8ab1e..24cd0b9d1 100644 --- a/src/VBox/Main/include/SystemPropertiesImpl.h +++ b/src/VBox/Main/include/SystemPropertiesImpl.h @@ -1,4 +1,4 @@ -/* $Id: SystemPropertiesImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: SystemPropertiesImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/USBControllerImpl.h b/src/VBox/Main/include/USBControllerImpl.h index b9e00a650..54f408827 100644 --- a/src/VBox/Main/include/USBControllerImpl.h +++ b/src/VBox/Main/include/USBControllerImpl.h @@ -1,4 +1,4 @@ -/* $Id: USBControllerImpl.h 15157 2008-12-09 11:39:21Z vboxsync $ */ +/* $Id: USBControllerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/USBDeviceImpl.h b/src/VBox/Main/include/USBDeviceImpl.h index 1b7152db7..7ee09d4f7 100644 --- a/src/VBox/Main/include/USBDeviceImpl.h +++ b/src/VBox/Main/include/USBDeviceImpl.h @@ -1,4 +1,4 @@ -/* $Id: USBDeviceImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: USBDeviceImpl.h $ */ /** @file * Header file for the OUSBDevice (IUSBDevice) class, VBoxC. diff --git a/src/VBox/Main/include/VRDPServerImpl.h b/src/VBox/Main/include/VRDPServerImpl.h index 9714c889d..fd2a0c719 100644 --- a/src/VBox/Main/include/VRDPServerImpl.h +++ b/src/VBox/Main/include/VRDPServerImpl.h @@ -1,4 +1,4 @@ -/* $Id: VRDPServerImpl.h 15051 2008-12-05 17:20:00Z vboxsync $ */ +/* $Id: VRDPServerImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/VirtualBoxImpl.h b/src/VBox/Main/include/VirtualBoxImpl.h index 355440961..4c9bba236 100644 --- a/src/VBox/Main/include/VirtualBoxImpl.h +++ b/src/VBox/Main/include/VirtualBoxImpl.h @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxImpl.h 15318 2008-12-11 17:27:02Z vboxsync $ */ +/* $Id: VirtualBoxImpl.h $ */ /** @file * diff --git a/src/VBox/Main/include/VirtualBoxXMLUtil.h b/src/VBox/Main/include/VirtualBoxXMLUtil.h index 4b3a91e61..42938c822 100644 --- a/src/VBox/Main/include/VirtualBoxXMLUtil.h +++ b/src/VBox/Main/include/VirtualBoxXMLUtil.h @@ -1,4 +1,4 @@ -/* $Id: VirtualBoxXMLUtil.h 15708 2008-12-19 18:28:27Z vboxsync $ */ +/* $Id: VirtualBoxXMLUtil.h $ */ /** @file * diff --git a/src/VBox/Main/include/vbox-dbus-internal.h b/src/VBox/Main/include/vbox-dbus-internal.h new file mode 100644 index 000000000..a4d87c087 --- /dev/null +++ b/src/VBox/Main/include/vbox-dbus-internal.h @@ -0,0 +1,101 @@ +/** @file + * + * Stubs for dynamically loading libdbus-1 and the symbols + * which are needed by VirtualBox. + */ + +/* + * Copyright (C) 2008 Sun Microsystems, Inc. + * + * This file is part of VirtualBox Open Source Edition (OSE), as + * available from http://www.virtualbox.org. This file is free software; + * you can redistribute it and/or modify it under the terms of the GNU + * General Public License (GPL) as published by the Free Software + * Foundation, in version 2 as it comes in the "COPYING" file of the + * VirtualBox OSE distribution. VirtualBox OSE is distributed in the + * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa + * Clara, CA 95054 USA or visit http://www.sun.com if you need + * additional information or have any questions. + */ + +#ifndef VBOX_PROXY_STUB +#error This file is a private header, intended to be included in specific places only +#endif + +/** The following are the symbols which we need from libdbus-1. */ +VBOX_PROXY_STUB(dbus_error_init, void, (DBusError *error), + (error)) +VBOX_PROXY_STUB(dbus_bus_get, DBusConnection *, + (DBusBusType type, DBusError *error), (type, error)) +VBOX_PROXY_STUB(dbus_bus_get_private, DBusConnection *, + (DBusBusType type, DBusError *error), (type, error)) +VBOX_PROXY_STUB(dbus_error_free, void, (DBusError *error), + (error)) +VBOX_PROXY_STUB(dbus_connection_unref, void, (DBusConnection *connection), + (connection)) +VBOX_PROXY_STUB(dbus_connection_close, void, (DBusConnection *connection), + (connection)) +VBOX_PROXY_STUB(dbus_connection_set_exit_on_disconnect, void, + (DBusConnection *connection, dbus_bool_t boolean), + (connection, boolean)) +VBOX_PROXY_STUB(dbus_bus_name_has_owner, dbus_bool_t, + (DBusConnection *connection, const char *string, DBusError *error), + (connection, string, error)) +VBOX_PROXY_STUB(dbus_bus_add_match, void, + (DBusConnection *connection, const char *string, + DBusError *error), + (connection, string, error)) +VBOX_PROXY_STUB(dbus_bus_remove_match, void, + (DBusConnection *connection, const char *string, + DBusError *error), + (connection, string, error)) +VBOX_PROXY_STUB(dbus_message_unref, void, (DBusMessage *message), + (message)) +VBOX_PROXY_STUB(dbus_message_new_method_call, DBusMessage*, + (const char *string1, const char *string2, const char *string3, + const char *string4), + (string1, string2, string3, string4)) +VBOX_PROXY_STUB(dbus_message_iter_init_append, void, + (DBusMessage *message, DBusMessageIter *iter), + (message, iter)) +VBOX_PROXY_STUB(dbus_message_iter_append_basic, dbus_bool_t, + (DBusMessageIter *iter, int val, const void *string), + (iter, val, string)) +VBOX_PROXY_STUB(dbus_connection_send_with_reply_and_block, DBusMessage *, + (DBusConnection *connection, DBusMessage *message, int val, + DBusError *error), + (connection, message, val, error)) +VBOX_PROXY_STUB(dbus_message_iter_init, dbus_bool_t, + (DBusMessage *message, DBusMessageIter *iter), + (message, iter)) +VBOX_PROXY_STUB(dbus_message_iter_get_arg_type, int, (DBusMessageIter *iter), + (iter)) +VBOX_PROXY_STUB(dbus_message_iter_get_element_type, int, + (DBusMessageIter *iter), (iter)) +VBOX_PROXY_STUB(dbus_message_iter_recurse, void, + (DBusMessageIter *iter1, DBusMessageIter *iter2), + (iter1, iter2)) +VBOX_PROXY_STUB(dbus_message_iter_get_basic, void, + (DBusMessageIter *iter, void *pvoid), (iter, pvoid)) +VBOX_PROXY_STUB(dbus_message_iter_next, dbus_bool_t, (DBusMessageIter *iter), + (iter)) +VBOX_PROXY_STUB(dbus_connection_add_filter, dbus_bool_t, + (DBusConnection *connection, + DBusHandleMessageFunction function1, void *pvoid, + DBusFreeFunction function2), + (connection, function1, pvoid, function2)) +VBOX_PROXY_STUB(dbus_connection_remove_filter, void, + (DBusConnection *connection, + DBusHandleMessageFunction function, void *pvoid), + (connection, function, pvoid)) +VBOX_PROXY_STUB(dbus_connection_read_write_dispatch, dbus_bool_t, + (DBusConnection *connection, int val), (connection, val)) +VBOX_PROXY_STUB(dbus_message_is_signal, dbus_bool_t, + (DBusMessage *message, const char *string1, + const char *string2), + (message, string1, string2)) +VBOX_PROXY_STUB(dbus_connection_pop_message, DBusMessage *, + (DBusConnection *connection), (connection)) + diff --git a/src/VBox/Main/include/vbox-dbus.h b/src/VBox/Main/include/vbox-dbus.h index 7ab8885de..3411f3cf0 100644 --- a/src/VBox/Main/include/vbox-dbus.h +++ b/src/VBox/Main/include/vbox-dbus.h @@ -25,8 +25,8 @@ #include <stdint.h> -#define LIB_DBUS_1_2 "libdbus-1.so.2" /* This should be compatible */ -#define LIB_DBUS_1_3 "libdbus-1.so.3" +#define VBOX_DBUS_1_2_LIB "libdbus-1.so.2" /* This should be compatible */ +#define VBOX_DBUS_1_3_LIB "libdbus-1.so.3" /** Types and defines from the dbus header files which we need. These are * taken more or less verbatim from the DBus public interface header files. */ @@ -84,114 +84,22 @@ typedef DBusHandlerResult (*DBusHandleMessageFunction) (DBusConnection *, DBusMessage *, void *); typedef void (*DBusFreeFunction) (void *); -/** The following are the symbols which we need from libdbus-1. */ -extern void (*vbox_dbus_error_init)(DBusError *); -inline void dbus_error_init(DBusError *error) -{ vbox_dbus_error_init(error); } -extern DBusConnection *(*vbox_dbus_bus_get)(DBusBusType, DBusError *); -inline DBusConnection *dbus_bus_get(DBusBusType type, DBusError *error) -{ return vbox_dbus_bus_get(type, error); } -extern DBusConnection *(*vbox_dbus_bus_get_private)(DBusBusType, DBusError *); -inline DBusConnection *dbus_bus_get_private(DBusBusType type, DBusError *error) -{ return vbox_dbus_bus_get_private(type, error); } -extern void (*vbox_dbus_error_free)(DBusError *); -inline void dbus_error_free(DBusError *error) -{ vbox_dbus_error_free(error); } -extern void (*vbox_dbus_connection_unref)(DBusConnection *); -inline void dbus_connection_unref(DBusConnection *connection) -{ vbox_dbus_connection_unref(connection); } -extern void (*vbox_dbus_connection_close)(DBusConnection *); -inline void dbus_connection_close(DBusConnection *connection) -{ vbox_dbus_connection_close(connection); } -extern void (*vbox_dbus_connection_set_exit_on_disconnect)(DBusConnection *, dbus_bool_t); -inline void dbus_connection_set_exit_on_disconnect(DBusConnection *connection, dbus_bool_t boolean) -{ vbox_dbus_connection_set_exit_on_disconnect(connection, boolean); } -extern dbus_bool_t (*vbox_dbus_bus_name_has_owner)(DBusConnection *, const char *, - DBusError *); -inline dbus_bool_t dbus_bus_name_has_owner(DBusConnection *connection, const char *string, - DBusError *error) -{ return vbox_dbus_bus_name_has_owner(connection, string, error); } -extern void (*vbox_dbus_bus_add_match)(DBusConnection *, const char *, DBusError *); -inline void dbus_bus_add_match(DBusConnection *connection, const char *string, DBusError *error) -{ vbox_dbus_bus_add_match(connection, string, error); } -extern void (*vbox_dbus_bus_remove_match)(DBusConnection *, const char *, DBusError *); -inline void dbus_bus_remove_match(DBusConnection *connection, const char *string, DBusError *error) -{ vbox_dbus_bus_remove_match(connection, string, error); } -extern void (*vbox_dbus_message_unref)(DBusMessage *); -inline void dbus_message_unref(DBusMessage *message) -{ vbox_dbus_message_unref(message); } -extern DBusMessage* (*vbox_dbus_message_new_method_call)(const char *, const char *, - const char *, const char *); -inline DBusMessage* dbus_message_new_method_call(const char *string1, const char *string2, - const char *string3, const char *string4) -{ return vbox_dbus_message_new_method_call(string1, string2, string3, string4); } -extern void (*vbox_dbus_message_iter_init_append)(DBusMessage *, DBusMessageIter *); -inline void dbus_message_iter_init_append(DBusMessage *message, DBusMessageIter *iter) -{ vbox_dbus_message_iter_init_append(message, iter); } -extern dbus_bool_t (*vbox_dbus_message_iter_append_basic)(DBusMessageIter *, int, - const void *); -inline dbus_bool_t dbus_message_iter_append_basic(DBusMessageIter *iter, int val, - const void *string) -{ return vbox_dbus_message_iter_append_basic(iter, val, string); } -extern DBusMessage * (*vbox_dbus_connection_send_with_reply_and_block)(DBusConnection *, - DBusMessage *, int, - DBusError *error); -inline DBusMessage * dbus_connection_send_with_reply_and_block(DBusConnection *connection, - DBusMessage *message, int val, - DBusError *error) -{ return vbox_dbus_connection_send_with_reply_and_block(connection, message, val, error); } -extern dbus_bool_t (*vbox_dbus_message_iter_init) (DBusMessage *, DBusMessageIter *); -inline dbus_bool_t dbus_message_iter_init(DBusMessage *message, DBusMessageIter *iter) -{ return vbox_dbus_message_iter_init(message, iter); } -extern int (*vbox_dbus_message_iter_get_arg_type) (DBusMessageIter *); -inline int dbus_message_iter_get_arg_type(DBusMessageIter *iter) -{ return vbox_dbus_message_iter_get_arg_type(iter); } -extern int (*vbox_dbus_message_iter_get_element_type) (DBusMessageIter *); -inline int dbus_message_iter_get_element_type(DBusMessageIter *iter) -{ return vbox_dbus_message_iter_get_element_type(iter); } -extern void (*vbox_dbus_message_iter_recurse) (DBusMessageIter *, DBusMessageIter *); -inline void dbus_message_iter_recurse(DBusMessageIter *iter1, DBusMessageIter *iter2) -{ vbox_dbus_message_iter_recurse(iter1, iter2); } -extern void (*vbox_dbus_message_iter_get_basic) (DBusMessageIter *, void *); -inline void dbus_message_iter_get_basic(DBusMessageIter *iter, void *pvoid) -{ vbox_dbus_message_iter_get_basic(iter, pvoid); } -extern dbus_bool_t (*vbox_dbus_message_iter_next) (DBusMessageIter *); -inline dbus_bool_t dbus_message_iter_next(DBusMessageIter *iter) -{ return vbox_dbus_message_iter_next(iter); } -extern dbus_bool_t (*vbox_dbus_connection_add_filter) (DBusConnection *, DBusHandleMessageFunction, - void *, DBusFreeFunction); -inline dbus_bool_t dbus_connection_add_filter(DBusConnection *connection, - DBusHandleMessageFunction function1, - void *pvoid, DBusFreeFunction function2) -{ return vbox_dbus_connection_add_filter(connection, function1, pvoid, function2); } -extern void (*vbox_dbus_connection_remove_filter) (DBusConnection *, DBusHandleMessageFunction, - void *); -inline void dbus_connection_remove_filter(DBusConnection *connection, - DBusHandleMessageFunction function, void *pvoid) -{ vbox_dbus_connection_remove_filter(connection, function, pvoid); } -extern dbus_bool_t (*vbox_dbus_connection_read_write_dispatch) (DBusConnection *, int); -inline dbus_bool_t dbus_connection_read_write_dispatch(DBusConnection *connection, int val) -{ return vbox_dbus_connection_read_write_dispatch(connection, val); } -extern dbus_bool_t (*vbox_dbus_message_is_signal) (DBusMessage *, const char *, const char *); -inline dbus_bool_t dbus_message_is_signal(DBusMessage *message, const char *string1, const char *string2) -{ return vbox_dbus_message_is_signal(message, string1, string2); } -extern DBusMessage *(*vbox_dbus_connection_pop_message)(DBusConnection *); -inline DBusMessage *dbus_connection_pop_message(DBusConnection *connection) -{ return vbox_dbus_connection_pop_message(connection); } +/* Declarations of the functions that we need from libdbus-1 */ +#define VBOX_PROXY_STUB(function, rettype, signature, shortsig) \ +extern rettype ( function ) signature ; + +#include "vbox-dbus-internal.h" + +#undef VBOX_PROXY_STUB /** - * Checks whether libdbus is present and if so loads all symbols we need. This - * should be called before making any calls to libdbus if that library is being - * loaded at runtime. - * @returns true if libdbus was found, false otherwise. + * Try to dynamically load the DBus library. This function should be called + * before attempting to use any of the DBus functions. It is safe to call this + * function multiple times. + * + * @returns iprt status code */ -extern bool VBoxDBusCheckPresence(void); -/** Wrapper around dbus_connection_unref. We need this to use it as a free - * function in auto pointers, as a function pointer won't wash here. */ -extern void VBoxDBusConnectionUnref(DBusConnection *pConnection); -/** Wrapper around dbus_message_unref. We need this to use it as a free - * function in auto pointers, as a function pointer won't wash here. */ -extern void VBoxDBusMessageUnref(DBusMessage *pMessage); +extern int VBoxLoadDBusLib(void); #endif /* ____H_VBOX_DBUS not defined */ /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/linux/HostHardwareLinux.cpp b/src/VBox/Main/linux/HostHardwareLinux.cpp index 9fb61fa57..f4bc923bc 100644 --- a/src/VBox/Main/linux/HostHardwareLinux.cpp +++ b/src/VBox/Main/linux/HostHardwareLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: HostHardwareLinux.cpp 16137 2009-01-21 13:55:57Z vboxsync $ */ +/* $Id: HostHardwareLinux.cpp $ */ /** @file * Classes for handling hardware detection under Linux. Please feel free to * expand these to work for other systems (Solaris!) or to add new ones for @@ -78,6 +78,9 @@ static int getDVDInfoFromMTab(char *mountTable, DriveInfoList *pList); /* These must be extern to be usable in the RTMemAutoPtr template */ extern void VBoxHalShutdown (DBusConnection *pConnection); extern void VBoxHalShutdownPrivate (DBusConnection *pConnection); +extern void VBoxDBusConnectionUnref(DBusConnection *pConnection); +extern void VBoxDBusConnectionCloseAndUnref(DBusConnection *pConnection); +extern void VBoxDBusMessageUnref(DBusMessage *pMessage); static int halInit(RTMemAutoPtr <DBusConnection, VBoxHalShutdown> *pConnection); static int halInitPrivate(RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> *pConnection); @@ -108,7 +111,7 @@ int VBoxMainDriveInfo::updateDVDs () mDVDList.clear (); #if defined(RT_OS_LINUX) #ifdef VBOX_WITH_DBUS - if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing())) + if (RT_SUCCESS (rc) && RT_SUCCESS(VBoxLoadDBusLib()) && (!success || testing())) rc = getDriveInfoFromHal(&mDVDList, true /* isDVD */, &success); #endif /* VBOX_WITH_DBUS defined */ // On Linux without hal, the situation is much more complex. We will take a @@ -153,7 +156,9 @@ int VBoxMainDriveInfo::updateFloppies () mFloppyList.clear (); #if defined(RT_OS_LINUX) #ifdef VBOX_WITH_DBUS - if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing())) + if ( RT_SUCCESS (rc) + && RT_SUCCESS(VBoxLoadDBusLib()) + && (!success || testing())) rc = getDriveInfoFromHal(&mFloppyList, false /* isDVD */, &success); #endif /* VBOX_WITH_DBUS defined */ // As with the CDROMs, on Linux we have to take a multi-level approach @@ -196,7 +201,9 @@ int VBoxMainUSBDeviceInfo::UpdateDevices () mDeviceList.clear(); #if defined(RT_OS_LINUX) #ifdef VBOX_WITH_DBUS - if (RT_SUCCESS (rc) && VBoxDBusCheckPresence() && (!success || testing())) + if ( RT_SUCCESS (rc) + && RT_SUCCESS(VBoxLoadDBusLib()) + && (!success || testing())) rc = getUSBDeviceInfoFromHal(&mDeviceList, &halSuccess); /* Try the old API if the new one *succeeded* as only one of them will * pick up devices anyway. */ @@ -222,9 +229,11 @@ struct VBoxMainHotplugWaiter::Context RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> mConnection; /** Semaphore which is set when a device is hotplugged and reset when * it is read. */ - bool mTriggered; + volatile bool mTriggered; /** A flag to say that we wish to interrupt the current wait. */ - bool mInterrupt; + volatile bool mInterrupt; + /** Constructor */ + Context() : mTriggered(false), mInterrupt(false) {} #endif /* defined RT_OS_LINUX && defined VBOX_WITH_DBUS */ }; @@ -237,9 +246,9 @@ VBoxMainHotplugWaiter::VBoxMainHotplugWaiter () #if defined RT_OS_LINUX && defined VBOX_WITH_DBUS int rc = VINF_SUCCESS; - if (VBoxDBusCheckPresence()) + mContext = new Context; + if (RT_SUCCESS(VBoxLoadDBusLib())) { - mContext = new Context; for (unsigned i = 0; RT_SUCCESS(rc) && i < 5 && !mContext->mConnection; ++i) { rc = halInitPrivate (&mContext->mConnection); @@ -253,7 +262,7 @@ VBoxMainHotplugWaiter::VBoxMainHotplugWaiter () if ( RT_SUCCESS (rc) && !dbus_connection_add_filter (mContext->mConnection.get(), dbusFilterFunction, - &mContext->mTriggered, NULL)) + (void *) &mContext->mTriggered, NULL)) rc = VERR_NO_MEMORY; if (RT_FAILURE (rc)) mContext->mConnection.reset(); @@ -267,7 +276,7 @@ VBoxMainHotplugWaiter::~VBoxMainHotplugWaiter () #if defined RT_OS_LINUX && defined VBOX_WITH_DBUS if (!!mContext->mConnection) dbus_connection_remove_filter (mContext->mConnection.get(), dbusFilterFunction, - &mContext->mTriggered); + (void *) &mContext->mTriggered); delete mContext; #endif /* defined RT_OS_LINUX && defined VBOX_WITH_DBUS */ } @@ -294,6 +303,8 @@ int VBoxMainHotplugWaiter::Wait(unsigned cMillies) { connected = dbus_connection_read_write_dispatch (mContext->mConnection.get(), cRealMillies); + if (mContext->mInterrupt) + LogFlowFunc(("wait loop interrupted\n")); if (cMillies != RT_INDEFINITE_WAIT) mContext->mInterrupt = true; } @@ -309,6 +320,7 @@ int VBoxMainHotplugWaiter::Wait(unsigned cMillies) void VBoxMainHotplugWaiter::Interrupt() { #if defined RT_OS_LINUX && defined VBOX_WITH_DBUS + LogFlowFunc(("\n")); mContext->mInterrupt = true; #endif /* defined RT_OS_LINUX && defined VBOX_WITH_DBUS */ } @@ -616,7 +628,7 @@ int halInitPrivate (RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> *pConn bool halSuccess = true; autoDBusError dbusError; - RTMemAutoPtr <DBusConnection, VBoxDBusConnectionUnref> dbusConnection; + RTMemAutoPtr <DBusConnection, VBoxDBusConnectionCloseAndUnref> dbusConnection; dbusConnection = dbus_bus_get_private (DBUS_BUS_SYSTEM, &dbusError.get()); if (!dbusConnection) halSuccess = false; @@ -649,7 +661,7 @@ int halInitPrivate (RTMemAutoPtr <DBusConnection, VBoxHalShutdownPrivate> *pConn * Helper function for shutting down a connection to DBus and hal. * @param pConnection the connection handle */ -/* static */ +/* extern */ void VBoxHalShutdown (DBusConnection *pConnection) { AssertReturnVoid(VALID_PTR (pConnection)); @@ -671,7 +683,7 @@ void VBoxHalShutdown (DBusConnection *pConnection) * Helper function for shutting down a private connection to DBus and hal. * @param pConnection the connection handle */ -/* static */ +/* extern */ void VBoxHalShutdownPrivate (DBusConnection *pConnection) { AssertReturnVoid(VALID_PTR (pConnection)); @@ -690,6 +702,33 @@ void VBoxHalShutdownPrivate (DBusConnection *pConnection) dbusError.FlowLog(); } +/** Wrapper around dbus_connection_unref. We need this to use it as a real + * function in auto pointers, as a function pointer won't wash here. */ +/* extern */ +void VBoxDBusConnectionUnref(DBusConnection *pConnection) +{ + dbus_connection_unref(pConnection); +} + +/** + * This function closes and unrefs a private connection to dbus. It should + * only be called once no-one else is referencing the connection. + */ +/* extern */ +void VBoxDBusConnectionCloseAndUnref(DBusConnection *pConnection) +{ + dbus_connection_close(pConnection); + dbus_connection_unref(pConnection); +} + +/** Wrapper around dbus_message_unref. We need this to use it as a real + * function in auto pointers, as a function pointer won't wash here. */ +/* extern */ +void VBoxDBusMessageUnref(DBusMessage *pMessage) +{ + dbus_message_unref(pMessage); +} + /** * Find the UDIs of hal entries that contain Key=Value property. * @returns iprt status code. If a non-fatal error occurs, we return success @@ -1169,7 +1208,7 @@ int getUSBInterfacesFromHal(std::vector <std::string> *pList, DBusHandlerResult dbusFilterFunction (DBusConnection *pConnection, DBusMessage *pMessage, void *pvUser) { - bool *pTriggered = reinterpret_cast<bool *> (pvUser); + volatile bool *pTriggered = reinterpret_cast<volatile bool *> (pvUser); if ( dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager", "DeviceAdded") || dbus_message_is_signal (pMessage, "org.freedesktop.Hal.Manager", diff --git a/src/VBox/Main/linux/NetIfList-linux.cpp b/src/VBox/Main/linux/NetIfList-linux.cpp index 58ff03b0e..1455b3475 100644 --- a/src/VBox/Main/linux/NetIfList-linux.cpp +++ b/src/VBox/Main/linux/NetIfList-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIfList-linux.cpp 15936 2009-01-14 12:37:54Z vboxsync $ */ +/* $Id: NetIfList-linux.cpp $ */ /** @file * Main - NetIfList, Linux implementation. */ @@ -57,11 +57,15 @@ static int getInterfaceInfo(int iSocket, const char *pszName, PNETIFINFO pInfo) pInfo->enmType = NETIF_T_UNKNOWN; break; } - /* Pick up some garbage from stack. */ + /* Generate UUID from name and MAC address. */ RTUUID uuid; - Assert(sizeof(uuid) <= sizeof(Req)); + RTUuidClear(&uuid); + memcpy(&uuid, Req.ifr_name, RT_MIN(sizeof(Req.ifr_name), sizeof(uuid))); + uuid.Gen.u8ClockSeqHiAndReserved = (uuid.Gen.u8ClockSeqHiAndReserved & 0x3f) | 0x80; + uuid.Gen.u16TimeHiAndVersion = (uuid.Gen.u16TimeHiAndVersion & 0x0fff) | 0x4000; memcpy(uuid.Gen.au8Node, &Req.ifr_hwaddr.sa_data, sizeof(uuid.Gen.au8Node)); pInfo->Uuid = uuid; + memcpy(&pInfo->MACAddress, Req.ifr_hwaddr.sa_data, sizeof(pInfo->MACAddress)); if (ioctl(iSocket, SIOCGIFADDR, &Req) >= 0) diff --git a/src/VBox/Main/linux/PerformanceLinux.cpp b/src/VBox/Main/linux/PerformanceLinux.cpp index 4373680de..0741179e9 100644 --- a/src/VBox/Main/linux/PerformanceLinux.cpp +++ b/src/VBox/Main/linux/PerformanceLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceLinux.cpp 12546 2008-09-17 17:11:15Z vboxsync $ */ +/* $Id: PerformanceLinux.cpp $ */ /** @file * diff --git a/src/VBox/Main/linux/vbox-dbus.cpp b/src/VBox/Main/linux/vbox-dbus.cpp index 14c334acb..e0d4cc2bb 100644 --- a/src/VBox/Main/linux/vbox-dbus.cpp +++ b/src/VBox/Main/linux/vbox-dbus.cpp @@ -22,143 +22,69 @@ #include "vbox-dbus.h" -#include <iprt/err.h> -#include <iprt/ldr.h> +#define LOG_GROUP LOG_GROUP_MAIN +#include <VBox/log.h> +#include <VBox/err.h> -/** - * Whether we have tried to load libdbus-1 yet. This flag should only be set - * to "true" after we have either loaded the library and all symbols which we - * need, or failed to load something and unloaded and set back to zero - * pLibDBus. - */ -static bool gCheckedForLibDBus = false; -/** - * Pointer to the libdbus-1 shared object. This should only be set once all - * needed libraries and symbols have been successfully loaded. - */ -static RTLDRMOD ghLibDBus = NULL; +#include <iprt/ldr.h> +#include <iprt/assert.h> +#include <iprt/once.h> /** The following are the symbols which we need from libdbus. */ -void (*vbox_dbus_error_init)(DBusError *); -DBusConnection *(*vbox_dbus_bus_get)(DBusBusType, DBusError *); -DBusConnection *(*vbox_dbus_bus_get_private)(DBusBusType, DBusError *); -void (*vbox_dbus_error_free)(DBusError *); -void (*vbox_dbus_connection_unref)(DBusConnection *); -void (*vbox_dbus_connection_close)(DBusConnection *); -void (*vbox_dbus_connection_set_exit_on_disconnect)(DBusConnection *, dbus_bool_t); -dbus_bool_t (*vbox_dbus_bus_name_has_owner)(DBusConnection *, const char *, - DBusError *); -void (*vbox_dbus_bus_add_match)(DBusConnection *, const char *, DBusError *); -void (*vbox_dbus_bus_remove_match)(DBusConnection *, const char *, DBusError *); -void (*vbox_dbus_message_unref)(DBusMessage *); -DBusMessage* (*vbox_dbus_message_new_method_call)(const char *, const char *, - const char *, const char *); -void (*vbox_dbus_message_iter_init_append)(DBusMessage *, DBusMessageIter *); -dbus_bool_t (*vbox_dbus_message_iter_append_basic)(DBusMessageIter *, int, - const void *); -DBusMessage * (*vbox_dbus_connection_send_with_reply_and_block)(DBusConnection *, - DBusMessage *, int, - DBusError *error); -dbus_bool_t (*vbox_dbus_message_iter_init) (DBusMessage *, DBusMessageIter *); -int (*vbox_dbus_message_iter_get_arg_type) (DBusMessageIter *); -int (*vbox_dbus_message_iter_get_element_type) (DBusMessageIter *); -void (*vbox_dbus_message_iter_recurse) (DBusMessageIter *, DBusMessageIter *); -void (*vbox_dbus_message_iter_get_basic) (DBusMessageIter *, void *); -dbus_bool_t (*vbox_dbus_message_iter_next) (DBusMessageIter *); -dbus_bool_t (*vbox_dbus_connection_add_filter) (DBusConnection *, DBusHandleMessageFunction, - void *, DBusFreeFunction); -void (*vbox_dbus_connection_remove_filter) (DBusConnection *, DBusHandleMessageFunction, - void *); -dbus_bool_t (*vbox_dbus_connection_read_write_dispatch) (DBusConnection *, int); -dbus_bool_t (*vbox_dbus_message_is_signal) (DBusMessage *, const char *, const char *); -DBusMessage *(*vbox_dbus_connection_pop_message)(DBusConnection *); +#define VBOX_PROXY_STUB(function, rettype, signature, shortsig) \ +void (*function ## _fn)(void); \ +rettype function signature \ +{ return ( (rettype (*) signature) function ## _fn ) shortsig; } + +#include "vbox-dbus-internal.h" + +static int32_t loadDBusLibOnce(void *, void *); -bool VBoxDBusCheckPresence(void) +#undef VBOX_PROXY_STUB + +/* Now comes a table of functions to be loaded from libdbus-1 */ +typedef struct { - RTLDRMOD hLibDBus; + const char *name; + void (**fn)(void); +} SHARED_FUNC; - if (ghLibDBus != 0 && gCheckedForLibDBus == true) - return true; - if (gCheckedForLibDBus == true) - return false; - if ( !RT_SUCCESS(RTLdrLoad(LIB_DBUS_1_3, &hLibDBus)) - && !RT_SUCCESS(RTLdrLoad(LIB_DBUS_1_2, &hLibDBus))) - { - return false; - } - if ( RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_init", - (void **) &vbox_dbus_error_init)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_get", - (void **) &vbox_dbus_bus_get)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_get_private", - (void **) &vbox_dbus_bus_get_private)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_error_free", - (void **) &vbox_dbus_error_free)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_unref", - (void **) &vbox_dbus_connection_unref)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_close", - (void **) &vbox_dbus_connection_close)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_set_exit_on_disconnect", - (void **) &vbox_dbus_connection_set_exit_on_disconnect)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_name_has_owner", - (void **) &vbox_dbus_bus_name_has_owner)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_add_match", - (void **) &vbox_dbus_bus_add_match)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_bus_remove_match", - (void **) &vbox_dbus_bus_remove_match)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_unref", - (void **) &vbox_dbus_message_unref)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_new_method_call", - (void **) &vbox_dbus_message_new_method_call)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_init_append", - (void **) &vbox_dbus_message_iter_init_append)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_append_basic", - (void **) &vbox_dbus_message_iter_append_basic)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_send_with_reply_and_block", - (void **) &vbox_dbus_connection_send_with_reply_and_block)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_init", - (void **) &vbox_dbus_message_iter_init)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_arg_type", - (void **) &vbox_dbus_message_iter_get_arg_type)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_element_type", - (void **) &vbox_dbus_message_iter_get_element_type)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_recurse", - (void **) &vbox_dbus_message_iter_recurse)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_get_basic", - (void **) &vbox_dbus_message_iter_get_basic)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_iter_next", - (void **) &vbox_dbus_message_iter_next)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_add_filter", - (void **) &vbox_dbus_connection_add_filter)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_remove_filter", - (void **) &vbox_dbus_connection_remove_filter)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_read_write_dispatch", - (void **) &vbox_dbus_connection_read_write_dispatch)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_message_is_signal", - (void **) &vbox_dbus_message_is_signal)) - && RT_SUCCESS(RTLdrGetSymbol(hLibDBus, "dbus_connection_pop_message", - (void **) &vbox_dbus_connection_pop_message)) - ) - { - ghLibDBus = hLibDBus; - gCheckedForLibDBus = true; - return true; - } - else - { - RTLdrClose(hLibDBus); - gCheckedForLibDBus = true; - return false; - } -} +#define VBOX_PROXY_STUB(s, dummy1, dummy2, dummy3 ) { #s , & s ## _fn } , +static SHARED_FUNC SharedFuncs[] = +{ +#include "vbox-dbus-internal.h" + { NULL, NULL } +}; +#undef VBOX_PROXY_STUB -void VBoxDBusConnectionUnref(DBusConnection *pConnection) +/* extern */ +int VBoxLoadDBusLib(void) { - dbus_connection_unref(pConnection); + static RTONCE sOnce = RTONCE_INITIALIZER; + + LogFlowFunc(("\n")); + int rc = RTOnce (&sOnce, loadDBusLibOnce, NULL, NULL); + LogFlowFunc(("rc = %Rrc\n", rc)); + return rc; } -void VBoxDBusMessageUnref(DBusMessage *pMessage) +/* The function which does the actual work for VBoxLoadDBusLib, serialised for + * thread safety. */ +static int32_t loadDBusLibOnce(void *, void *) { - dbus_message_unref(pMessage); + int rc = VINF_SUCCESS; + RTLDRMOD hLib; + + LogFlowFunc(("\n")); + rc = RTLdrLoad(VBOX_DBUS_1_2_LIB, &hLib); + if (RT_FAILURE(rc)) + rc = RTLdrLoad(VBOX_DBUS_1_3_LIB, &hLib); + if (RT_FAILURE(rc)) + LogRelFunc(("Failed to load library %s or %s\n", + VBOX_DBUS_1_2_LIB, VBOX_DBUS_1_3_LIB)); + for (unsigned i = 0; RT_SUCCESS(rc) && SharedFuncs[i].name != NULL; ++i) + rc = RTLdrGetSymbol(hLib, SharedFuncs[i].name, (void**)SharedFuncs[i].fn); + LogFlowFunc(("rc = %Rrc\n", rc)); + return rc; } diff --git a/src/VBox/Main/os2/NetIfList-os2.cpp b/src/VBox/Main/os2/NetIfList-os2.cpp index d4cd47358..1a2019549 100644 --- a/src/VBox/Main/os2/NetIfList-os2.cpp +++ b/src/VBox/Main/os2/NetIfList-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIfList-os2.cpp 15548 2008-12-15 21:33:35Z vboxsync $ */ +/* $Id: NetIfList-os2.cpp $ */ /** @file * Main - NetIfList, OS/2 implementation. */ diff --git a/src/VBox/Main/os2/PerformanceOs2.cpp b/src/VBox/Main/os2/PerformanceOs2.cpp index fc13dc398..e5f57f559 100644 --- a/src/VBox/Main/os2/PerformanceOs2.cpp +++ b/src/VBox/Main/os2/PerformanceOs2.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceOs2.cpp 12400 2008-09-11 10:34:58Z vboxsync $ */ +/* $Id: PerformanceOs2.cpp $ */ /** @file * diff --git a/src/VBox/Main/solaris/DynLoadLibSolaris.cpp b/src/VBox/Main/solaris/DynLoadLibSolaris.cpp index 2be48bead..3d8c15ae6 100644 --- a/src/VBox/Main/solaris/DynLoadLibSolaris.cpp +++ b/src/VBox/Main/solaris/DynLoadLibSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: DynLoadLibSolaris.cpp 12866 2008-10-01 13:50:12Z vboxsync $ */ +/* $Id: DynLoadLibSolaris.cpp $ */ /** @file * Dynamically load libraries for Solaris hosts. */ diff --git a/src/VBox/Main/solaris/DynLoadLibSolaris.h b/src/VBox/Main/solaris/DynLoadLibSolaris.h index 96c54f2e4..a221bacf6 100644 --- a/src/VBox/Main/solaris/DynLoadLibSolaris.h +++ b/src/VBox/Main/solaris/DynLoadLibSolaris.h @@ -1,4 +1,4 @@ -/* $Id: DynLoadLibSolaris.h 15753 2008-12-24 19:08:24Z vboxsync $ */ +/* $Id: DynLoadLibSolaris.h $ */ /** @file * Dynamically loaded libraries for Solaris hosts, Internal header. */ diff --git a/src/VBox/Main/solaris/NetIfList-solaris.cpp b/src/VBox/Main/solaris/NetIfList-solaris.cpp index 26ca5141b..2acf8e81c 100644 --- a/src/VBox/Main/solaris/NetIfList-solaris.cpp +++ b/src/VBox/Main/solaris/NetIfList-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIfList-solaris.cpp 15548 2008-12-15 21:33:35Z vboxsync $ */ +/* $Id: NetIfList-solaris.cpp $ */ /** @file * Main - NetIfList, Solaris implementation. */ diff --git a/src/VBox/Main/solaris/PerformanceSolaris.cpp b/src/VBox/Main/solaris/PerformanceSolaris.cpp index af3a8e975..faebe6f6f 100644 --- a/src/VBox/Main/solaris/PerformanceSolaris.cpp +++ b/src/VBox/Main/solaris/PerformanceSolaris.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceSolaris.cpp 14948 2008-12-03 15:06:30Z vboxsync $ */ +/* $Id: PerformanceSolaris.cpp $ */ /** @file * diff --git a/src/VBox/Main/testcase/Makefile.kmk b/src/VBox/Main/testcase/Makefile.kmk index 0f7d73299..4a18b3c24 100644 --- a/src/VBox/Main/testcase/Makefile.kmk +++ b/src/VBox/Main/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15422 2008-12-13 07:46:20Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox API testcases. # diff --git a/src/VBox/Main/testcase/tstCollector.cpp b/src/VBox/Main/testcase/tstCollector.cpp index fb0958503..6df067a3d 100644 --- a/src/VBox/Main/testcase/tstCollector.cpp +++ b/src/VBox/Main/testcase/tstCollector.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCollector.cpp 16018 2009-01-18 00:30:41Z vboxsync $ */ +/* $Id: tstCollector.cpp $ */ /** @file * diff --git a/src/VBox/Main/testcase/tstHostHardwareLinux.cpp b/src/VBox/Main/testcase/tstHostHardwareLinux.cpp index b69970ec4..08d78bec4 100644 --- a/src/VBox/Main/testcase/tstHostHardwareLinux.cpp +++ b/src/VBox/Main/testcase/tstHostHardwareLinux.cpp @@ -1,4 +1,4 @@ -/* $Id: tstHostHardwareLinux.cpp 15465 2008-12-14 14:31:14Z vboxsync $ */ +/* $Id: tstHostHardwareLinux.cpp $ */ /** @file * * Test executable for quickly excercising/debugging the Linux host hardware diff --git a/src/VBox/Main/webservice/Makefile.kmk b/src/VBox/Main/webservice/Makefile.kmk index bacc25115..7ff8885d9 100644 --- a/src/VBox/Main/webservice/Makefile.kmk +++ b/src/VBox/Main/webservice/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16122 2009-01-21 10:44:12Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VBox web service. # diff --git a/src/VBox/Main/webservice/samples/perl/clienttest.pl b/src/VBox/Main/webservice/samples/perl/clienttest.pl index 51a1e3fe0..51a1e3fe0 100644..100755 --- a/src/VBox/Main/webservice/samples/perl/clienttest.pl +++ b/src/VBox/Main/webservice/samples/perl/clienttest.pl diff --git a/src/VBox/Main/webservice/samples/python/vboxshell.py b/src/VBox/Main/webservice/samples/python/vboxshell.py index 3e68beb27..3e68beb27 100644..100755 --- a/src/VBox/Main/webservice/samples/python/vboxshell.py +++ b/src/VBox/Main/webservice/samples/python/vboxshell.py diff --git a/src/VBox/Main/webservice/split-soapC.sed b/src/VBox/Main/webservice/split-soapC.sed index 538102b86..2b8b5cdef 100644 --- a/src/VBox/Main/webservice/split-soapC.sed +++ b/src/VBox/Main/webservice/split-soapC.sed @@ -1,4 +1,4 @@ -# $Id: split-soapC.sed 16122 2009-01-21 10:44:12Z vboxsync $ +# $Id: split-soapC.sed $ ## @file # Sed script for splitting up the monsterous soapC.cpp # diff --git a/src/VBox/Main/win/NetIfList-win.cpp b/src/VBox/Main/win/NetIfList-win.cpp index 30356e1d0..94490be8f 100644 --- a/src/VBox/Main/win/NetIfList-win.cpp +++ b/src/VBox/Main/win/NetIfList-win.cpp @@ -1,4 +1,4 @@ -/* $Id: NetIfList-win.cpp 15966 2009-01-15 13:14:53Z vboxsync $ */ +/* $Id: NetIfList-win.cpp $ */ /** @file * Main - NetIfList, Windows implementation. */ diff --git a/src/VBox/Main/win/PerformanceWin.cpp b/src/VBox/Main/win/PerformanceWin.cpp index 913bb3d06..545b45401 100644 --- a/src/VBox/Main/win/PerformanceWin.cpp +++ b/src/VBox/Main/win/PerformanceWin.cpp @@ -1,4 +1,4 @@ -/* $Id: PerformanceWin.cpp 14948 2008-12-03 15:06:30Z vboxsync $ */ +/* $Id: PerformanceWin.cpp $ */ /** @file * diff --git a/src/VBox/Main/xpcom/server.cpp b/src/VBox/Main/xpcom/server.cpp index 112eeaec0..25cfe5f61 100644 --- a/src/VBox/Main/xpcom/server.cpp +++ b/src/VBox/Main/xpcom/server.cpp @@ -1,4 +1,4 @@ -/* $Id: server.cpp 15904 2009-01-13 08:25:13Z vboxsync $ */ +/* $Id: server.cpp $ */ /** @file * XPCOM server process (VBoxSVC) start point. */ @@ -60,6 +60,10 @@ #include <errno.h> #include <getopt.h> +#ifndef RT_OS_OS2 +# include <sys/resource.h> +#endif + // for the backtrace signal handler #if defined(DEBUG) && defined(RT_OS_LINUX) # define USE_BACKTRACE @@ -1156,6 +1160,23 @@ int main (int argc, char **argv) RTFileClose(pidFile); } +#ifndef RT_OS_OS2 + // Increase the file table size to 10240 or as high as possible. + struct rlimit lim; + if (getrlimit(RLIMIT_NOFILE, &lim) == 0) + { + if ( lim.rlim_cur < 10240 + && lim.rlim_cur < lim.rlim_max) + { + lim.rlim_cur = RT_MIN(lim.rlim_max, 10240); + if (setrlimit(RLIMIT_NOFILE, &lim) == -1) + printf("WARNING: failed to increase file descriptor limit. (%d)\n", errno); + } + } + else + printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno); +#endif + PLEvent *ev; while (gKeepRunning) { diff --git a/src/VBox/Makefile.kmk b/src/VBox/Makefile.kmk index 0ef8936b4..791430cf8 100644 --- a/src/VBox/Makefile.kmk +++ b/src/VBox/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 14162 2008-11-13 08:55:50Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for src/VBox. # @@ -27,7 +27,9 @@ ifdef VBOX_SINGLE_MAKEFILE ifdef VBOX_ONLY_ADDITIONS include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk ifdef VBOX_WITH_CROGL - include $(PATH_SUB_CURRENT)/GuestHost/Makefile.kmk + if1of ($(KBUILD_TARGET),win) + include $(PATH_SUB_CURRENT)/GuestHost/Makefile.kmk + endif endif include $(PATH_SUB_CURRENT)/Additions/Makefile.kmk diff --git a/src/VBox/RDP/client/Makefile.kmk b/src/VBox/RDP/client/Makefile.kmk index 7f2bfb2de..8b19fde2b 100644 --- a/src/VBox/RDP/client/Makefile.kmk +++ b/src/VBox/RDP/client/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13795 2008-11-04 18:10:38Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # VBox - rdesktop with VRDP enhancements sub-makefile. # diff --git a/src/VBox/RDP/client/rdesktop.c b/src/VBox/RDP/client/rdesktop.c index 2be74dff1..9dba52050 100644 --- a/src/VBox/RDP/client/rdesktop.c +++ b/src/VBox/RDP/client/rdesktop.c @@ -95,7 +95,12 @@ RD_BOOL g_hide_decorations = False; RD_BOOL g_use_rdp5 = True; RD_BOOL g_rdpclip = True; RD_BOOL g_console_session = False; +#ifndef VBOX RD_BOOL g_numlock_sync = False; +#else /* VBOX */ +/* Always use numlock synchronization with VRDP. */ +RD_BOOL g_numlock_sync = True; +#endif /* VBOX */ RD_BOOL g_lspci_enabled = False; RD_BOOL g_owncolmap = False; RD_BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */ diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk index 05d918b89..24bca1e44 100644 --- a/src/VBox/Runtime/Makefile.kmk +++ b/src/VBox/Runtime/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16015 2009-01-18 00:17:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the IPRT (IPRT). # diff --git a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp index cf3c73bfc..fdab152ae 100644 --- a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp +++ b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertShouldPanic-vbox.cpp 13306 2008-10-15 21:17:04Z vboxsync $ */ +/* $Id: RTAssertShouldPanic-vbox.cpp $ */ /** @file * IPRT - Assertions, generic RTAssertShouldPanic. */ diff --git a/src/VBox/Runtime/VBox/VBoxRTDeps.cpp b/src/VBox/Runtime/VBox/VBoxRTDeps.cpp index 130ee1b52..6b118d8e2 100644 --- a/src/VBox/Runtime/VBox/VBoxRTDeps.cpp +++ b/src/VBox/Runtime/VBox/VBoxRTDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxRTDeps.cpp 13306 2008-10-15 21:17:04Z vboxsync $ */ +/* $Id: VBoxRTDeps.cpp $ */ /** @file * IPRT - VBoxRT.dll/so dependencies. */ diff --git a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl index 8aa29c408..fe292d9b0 100644 --- a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl +++ b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl @@ -16,6 +16,15 @@ VirtualBox OSE distribution. VirtualBox OSE is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY of any kind. + The contents of this file may alternatively be used under the terms + of the Common Development and Distribution License Version 1.0 + (CDDL) only, as it comes in the "COPYING.CDDL" file of the + VirtualBox OSE distribution, in which case the provisions of the + CDDL are applicable instead of those of the GPL. + + You may elect to license modified versions of this file under the + terms and conditions of either the GPL or the CDDL or both. + Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, CA 95054 USA or visit http://www.sun.com if you need additional information or have any questions. diff --git a/src/VBox/Runtime/VBox/log-vbox.cpp b/src/VBox/Runtime/VBox/log-vbox.cpp index 62fe58df1..7f36f9b4d 100644 --- a/src/VBox/Runtime/VBox/log-vbox.cpp +++ b/src/VBox/Runtime/VBox/log-vbox.cpp @@ -1,4 +1,4 @@ -/* $Id: log-vbox.cpp 16079 2009-01-20 11:13:08Z vboxsync $ */ +/* $Id: log-vbox.cpp $ */ /** @file * Virtual Box Runtime - Logging configuration. */ diff --git a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp index 67ba03dd8..cd24c781b 100644 --- a/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor-redirect.cpp @@ -1,4 +1,4 @@ -/* $Id: logbackdoor-redirect.cpp 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: logbackdoor-redirect.cpp $ */ /** @file * Virtual Box Runtime - RTLog stubs for the stripped down IPRT used by * RuntimeGuestR3Shared (X11), output is redirected diff --git a/src/VBox/Runtime/VBox/logbackdoor.cpp b/src/VBox/Runtime/VBox/logbackdoor.cpp index 83bc150a8..c7444b87b 100644 --- a/src/VBox/Runtime/VBox/logbackdoor.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor.cpp @@ -1,4 +1,4 @@ -/* $Id: logbackdoor.cpp 10479 2008-07-10 16:25:23Z vboxsync $ */ +/* $Id: logbackdoor.cpp $ */ /** @file * Virtual Box Runtime - Guest Backdoor Logging. */ diff --git a/src/VBox/Runtime/VBox/strformat-vbox.cpp b/src/VBox/Runtime/VBox/strformat-vbox.cpp index 0058e9f1f..b073ed4d3 100644 --- a/src/VBox/Runtime/VBox/strformat-vbox.cpp +++ b/src/VBox/Runtime/VBox/strformat-vbox.cpp @@ -1,4 +1,4 @@ -/* $Id: strformat-vbox.cpp 14061 2008-11-10 23:12:54Z vboxsync $ */ +/* $Id: strformat-vbox.cpp $ */ /** @file * IPRT - VBox String Formatter extensions. */ diff --git a/src/VBox/Runtime/common/alloc/alloc.cpp b/src/VBox/Runtime/common/alloc/alloc.cpp index a5ceea270..b84986696 100644 --- a/src/VBox/Runtime/common/alloc/alloc.cpp +++ b/src/VBox/Runtime/common/alloc/alloc.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc.cpp 11019 2008-07-30 22:47:04Z vboxsync $ */ +/* $Id: alloc.cpp $ */ /** @file * IPRT - Memory Allocation. */ diff --git a/src/VBox/Runtime/common/alloc/heapsimple.cpp b/src/VBox/Runtime/common/alloc/heapsimple.cpp index 711030b55..41886b52d 100644 --- a/src/VBox/Runtime/common/alloc/heapsimple.cpp +++ b/src/VBox/Runtime/common/alloc/heapsimple.cpp @@ -1,4 +1,4 @@ -/* $Id: heapsimple.cpp 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: heapsimple.cpp $ */ /** @file * IPRT - A Simple Heap. */ diff --git a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm index f555bb0b4..c00277da4 100644 --- a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm +++ b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm @@ -1,4 +1,4 @@ -; $Id: ASMMultU64ByU32DivByU32.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: ASMMultU64ByU32DivByU32.asm $ ;; @file ; IPRT - Assembly Functions, ASMMultU64ByU32DivByU32. ; diff --git a/src/VBox/Runtime/common/checksum/crc32.cpp b/src/VBox/Runtime/common/checksum/crc32.cpp index a69d076b1..3b389010c 100644 --- a/src/VBox/Runtime/common/checksum/crc32.cpp +++ b/src/VBox/Runtime/common/checksum/crc32.cpp @@ -1,4 +1,4 @@ -/* $Id: crc32.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: crc32.cpp $ */ /** @file * IPRT - CRC32. */ diff --git a/src/VBox/Runtime/common/checksum/crc64.cpp b/src/VBox/Runtime/common/checksum/crc64.cpp index 25502bd48..308a79cea 100644 --- a/src/VBox/Runtime/common/checksum/crc64.cpp +++ b/src/VBox/Runtime/common/checksum/crc64.cpp @@ -1,4 +1,4 @@ -/* $Id: crc64.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: crc64.cpp $ */ /** @file * IPRT - CRC64. * diff --git a/src/VBox/Runtime/common/checksum/ipv4.cpp b/src/VBox/Runtime/common/checksum/ipv4.cpp index 84785af7f..992b0ab92 100644 --- a/src/VBox/Runtime/common/checksum/ipv4.cpp +++ b/src/VBox/Runtime/common/checksum/ipv4.cpp @@ -1,4 +1,4 @@ -/* $Id: ipv4.cpp 12821 2008-09-30 07:30:01Z vboxsync $ */ +/* $Id: ipv4.cpp $ */ /** @file * IPRT - IPv4 Checksum calculation and validation. */ diff --git a/src/VBox/Runtime/common/checksum/md5.cpp b/src/VBox/Runtime/common/checksum/md5.cpp index d47f984eb..ddefcff53 100644 --- a/src/VBox/Runtime/common/checksum/md5.cpp +++ b/src/VBox/Runtime/common/checksum/md5.cpp @@ -1,4 +1,4 @@ -/* $Id: md5.cpp 14048 2008-11-10 22:43:16Z vboxsync $ */ +/* $Id: md5.cpp $ */ /** @file * MD5 message digest functions */ diff --git a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp index 3a6632959..bed8dbc9a 100644 --- a/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp +++ b/src/VBox/Runtime/common/err/RTErrConvertFromErrno.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromErrno.cpp 9931 2008-06-25 15:20:38Z vboxsync $ */ +/* $Id: RTErrConvertFromErrno.cpp $ */ /** @file * IPRT - Convert errno to iprt status codes. */ diff --git a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp index 9d34f958f..80431b3a6 100644 --- a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp +++ b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp @@ -1,4 +1,4 @@ -/* $Rev: 14262 $ */ +/* $Rev: 39431 $ */ /** @file * IPRT - Convert iprt status codes to errno. */ diff --git a/src/VBox/Runtime/common/err/errmsg.cpp b/src/VBox/Runtime/common/err/errmsg.cpp index f4069f466..dc3844b6d 100644 --- a/src/VBox/Runtime/common/err/errmsg.cpp +++ b/src/VBox/Runtime/common/err/errmsg.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsg.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: errmsg.cpp $ */ /** @file * IPRT - Status code messages. */ diff --git a/src/VBox/Runtime/common/err/errmsg.sed b/src/VBox/Runtime/common/err/errmsg.sed index 0996372cd..0736f2133 100644 --- a/src/VBox/Runtime/common/err/errmsg.sed +++ b/src/VBox/Runtime/common/err/errmsg.sed @@ -1,4 +1,4 @@ -# $Id: errmsg.sed 8256 2008-04-21 20:53:28Z vboxsync $ +# $Id: errmsg.sed $ ## @file # IPRT - SED script for converting */err.h. # diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed index c17bc48b8..e60377c67 100644 --- a/src/VBox/Runtime/common/err/errmsgcom.sed +++ b/src/VBox/Runtime/common/err/errmsgcom.sed @@ -1,4 +1,4 @@ -# $Id: errmsgcom.sed 8256 2008-04-21 20:53:28Z vboxsync $ +# $Id: errmsgcom.sed $ ## @file # IPRT - SED script for converting COM errors # diff --git a/src/VBox/Runtime/common/err/errmsgxpcom.cpp b/src/VBox/Runtime/common/err/errmsgxpcom.cpp index 69f7fe017..a16476883 100644 --- a/src/VBox/Runtime/common/err/errmsgxpcom.cpp +++ b/src/VBox/Runtime/common/err/errmsgxpcom.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsgxpcom.cpp 14626 2008-11-26 10:01:53Z vboxsync $ */ +/* $Id: errmsgxpcom.cpp $ */ /** @file * IPRT - Status code messages for XPCOM. */ diff --git a/src/VBox/Runtime/common/ldr/ldr.cpp b/src/VBox/Runtime/common/ldr/ldr.cpp index 8179f8b37..02a6ee9a1 100644 --- a/src/VBox/Runtime/common/ldr/ldr.cpp +++ b/src/VBox/Runtime/common/ldr/ldr.cpp @@ -1,4 +1,4 @@ -/* $Id: ldr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldr.cpp $ */ /** @file * IPRT - Binary Image Loader. */ diff --git a/src/VBox/Runtime/common/ldr/ldrELF.cpp b/src/VBox/Runtime/common/ldr/ldrELF.cpp index bb2114e5f..b1303c03f 100644 --- a/src/VBox/Runtime/common/ldr/ldrELF.cpp +++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrELF.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrELF.cpp $ */ /** @file * IPRT - Binary Image Loader, Executable and Linker Format (ELF). */ diff --git a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h index 73cf17aab..2da3360d4 100644 --- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h +++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h @@ -1,4 +1,4 @@ -/* $Id: ldrELFRelocatable.cpp.h 14049 2008-11-10 22:45:51Z vboxsync $ */ +/* $Id: ldrELFRelocatable.cpp.h $ */ /** @file * IPRT - Binary Image Loader, Template for ELF Relocatable Images. */ diff --git a/src/VBox/Runtime/common/ldr/ldrEx.cpp b/src/VBox/Runtime/common/ldr/ldrEx.cpp index e33de593e..a309bd164 100644 --- a/src/VBox/Runtime/common/ldr/ldrEx.cpp +++ b/src/VBox/Runtime/common/ldr/ldrEx.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrEx.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: ldrEx.cpp $ */ /** @file * IPRT - Binary Image Loader, Extended Features. */ diff --git a/src/VBox/Runtime/common/ldr/ldrFile.cpp b/src/VBox/Runtime/common/ldr/ldrFile.cpp index 7f4132c71..2731494e3 100644 --- a/src/VBox/Runtime/common/ldr/ldrFile.cpp +++ b/src/VBox/Runtime/common/ldr/ldrFile.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrFile.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrFile.cpp $ */ /** @file * IPRT - Binary Image Loader, The File Oriented Parts. */ diff --git a/src/VBox/Runtime/common/ldr/ldrNative.cpp b/src/VBox/Runtime/common/ldr/ldrNative.cpp index a4b5e2de6..a7fe37d17 100644 --- a/src/VBox/Runtime/common/ldr/ldrNative.cpp +++ b/src/VBox/Runtime/common/ldr/ldrNative.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative.cpp 12423 2008-09-12 14:42:49Z vboxsync $ */ +/* $Id: ldrNative.cpp $ */ /** @file * IPRT - Binary Image Loader, Native interface. */ diff --git a/src/VBox/Runtime/common/ldr/ldrPE.cpp b/src/VBox/Runtime/common/ldr/ldrPE.cpp index 95e8722e3..308343fbe 100644 --- a/src/VBox/Runtime/common/ldr/ldrPE.cpp +++ b/src/VBox/Runtime/common/ldr/ldrPE.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrPE.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: ldrPE.cpp $ */ /** @file * IPRT - Binary Image Loader, Portable Executable (PE). */ diff --git a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp index 69c6b064f..f31d1c50d 100644 --- a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp +++ b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrkStuff.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrkStuff.cpp $ */ /** @file * IPRT - Binary Image Loader, kLdr Interface. */ diff --git a/src/VBox/Runtime/common/log/log.cpp b/src/VBox/Runtime/common/log/log.cpp index 865890224..d2bab9f3c 100644 --- a/src/VBox/Runtime/common/log/log.cpp +++ b/src/VBox/Runtime/common/log/log.cpp @@ -1,4 +1,4 @@ -/* $Id: log.cpp 14435 2008-11-20 21:04:13Z vboxsync $ */ +/* $Id: log.cpp $ */ /** @file * Runtime VBox - Logger. */ diff --git a/src/VBox/Runtime/common/log/logcom.cpp b/src/VBox/Runtime/common/log/logcom.cpp index 585e7f514..df29e4136 100644 --- a/src/VBox/Runtime/common/log/logcom.cpp +++ b/src/VBox/Runtime/common/log/logcom.cpp @@ -1,4 +1,4 @@ -/* $Id: logcom.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: logcom.cpp $ */ /** @file * IPRT - Logging to Serial Port. */ diff --git a/src/VBox/Runtime/common/log/logellipsis.cpp b/src/VBox/Runtime/common/log/logellipsis.cpp index 88bcfeee7..b2fd8501a 100644 --- a/src/VBox/Runtime/common/log/logellipsis.cpp +++ b/src/VBox/Runtime/common/log/logellipsis.cpp @@ -1,4 +1,4 @@ -/* $Id: logellipsis.cpp 12099 2008-09-04 17:54:01Z vboxsync $ */ +/* $Id: logellipsis.cpp $ */ /** @file * Runtime VBox - Logger, the ellipsis variants. */ diff --git a/src/VBox/Runtime/common/log/logformat.cpp b/src/VBox/Runtime/common/log/logformat.cpp index 1102def5a..8bbcb836f 100644 --- a/src/VBox/Runtime/common/log/logformat.cpp +++ b/src/VBox/Runtime/common/log/logformat.cpp @@ -1,4 +1,4 @@ -/* $Id: logformat.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: logformat.cpp $ */ /** @file * IPRT - Log Formatter. */ diff --git a/src/VBox/Runtime/common/log/logrel.cpp b/src/VBox/Runtime/common/log/logrel.cpp index 279c878f0..d984218ee 100644 --- a/src/VBox/Runtime/common/log/logrel.cpp +++ b/src/VBox/Runtime/common/log/logrel.cpp @@ -1,4 +1,4 @@ -/* $Id: logrel.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: logrel.cpp $ */ /** @file * Runtime VBox - Logger. */ diff --git a/src/VBox/Runtime/common/log/logrelellipsis.cpp b/src/VBox/Runtime/common/log/logrelellipsis.cpp index d4668a737..969a75139 100644 --- a/src/VBox/Runtime/common/log/logrelellipsis.cpp +++ b/src/VBox/Runtime/common/log/logrelellipsis.cpp @@ -1,4 +1,4 @@ -/* $Id: logrelellipsis.cpp 12099 2008-09-04 17:54:01Z vboxsync $ */ +/* $Id: logrelellipsis.cpp $ */ /** @file * Runtime VBox - Logger, the release ellipsis variants. */ diff --git a/src/VBox/Runtime/common/math/ceill.asm b/src/VBox/Runtime/common/math/ceill.asm index f06afff1f..b29e01fdb 100644 --- a/src/VBox/Runtime/common/math/ceill.asm +++ b/src/VBox/Runtime/common/math/ceill.asm @@ -1,4 +1,4 @@ -; $Id: ceill.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: ceill.asm $ ;; @file ; IPRT - No-CRT ceill - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/cosl.asm b/src/VBox/Runtime/common/math/cosl.asm index a2afffeb6..cf1389c74 100644 --- a/src/VBox/Runtime/common/math/cosl.asm +++ b/src/VBox/Runtime/common/math/cosl.asm @@ -1,4 +1,4 @@ -; $Id: cosl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: cosl.asm $ ;; @file ; IPRT - No-CRT cosl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabs.asm b/src/VBox/Runtime/common/math/fabs.asm index d60093eef..0dc03a53d 100644 --- a/src/VBox/Runtime/common/math/fabs.asm +++ b/src/VBox/Runtime/common/math/fabs.asm @@ -1,4 +1,4 @@ -; $Id: $ +; $Id: $ ;; @file ; IPRT - No-CRT fabs - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabsf.asm b/src/VBox/Runtime/common/math/fabsf.asm index f00f99aa0..44f1ca4af 100644 --- a/src/VBox/Runtime/common/math/fabsf.asm +++ b/src/VBox/Runtime/common/math/fabsf.asm @@ -1,4 +1,4 @@ -; $Id: $ +; $Id: $ ;; @file ; IPRT - No-CRT fabsf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/fabsl.asm b/src/VBox/Runtime/common/math/fabsl.asm index 93d942998..283bc88bf 100644 --- a/src/VBox/Runtime/common/math/fabsl.asm +++ b/src/VBox/Runtime/common/math/fabsl.asm @@ -1,4 +1,4 @@ -; $Id: $ +; $Id: $ ;; @file ; IPRT - No-CRT fabsl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floor.asm b/src/VBox/Runtime/common/math/floor.asm index 2668cb278..7eee7c220 100644 --- a/src/VBox/Runtime/common/math/floor.asm +++ b/src/VBox/Runtime/common/math/floor.asm @@ -1,4 +1,4 @@ -; $Id: floor.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: floor.asm $ ;; @file ; IPRT - No-CRT floor - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floorf.asm b/src/VBox/Runtime/common/math/floorf.asm index fbe1430f8..95379353f 100644 --- a/src/VBox/Runtime/common/math/floorf.asm +++ b/src/VBox/Runtime/common/math/floorf.asm @@ -1,4 +1,4 @@ -; $Id: floorf.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: floorf.asm $ ;; @file ; IPRT - No-CRT floorf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/floorl.asm b/src/VBox/Runtime/common/math/floorl.asm index 088184ed3..8e0443a46 100644 --- a/src/VBox/Runtime/common/math/floorl.asm +++ b/src/VBox/Runtime/common/math/floorl.asm @@ -1,4 +1,4 @@ -; $Id: floorl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: floorl.asm $ ;; @file ; IPRT - No-CRT floorl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/ldexpl.asm b/src/VBox/Runtime/common/math/ldexpl.asm index 9251200c3..6bdabaf45 100644 --- a/src/VBox/Runtime/common/math/ldexpl.asm +++ b/src/VBox/Runtime/common/math/ldexpl.asm @@ -1,4 +1,4 @@ -; $Id: ldexpl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: ldexpl.asm $ ;; @file ; IPRT - No-CRT ldexpl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrint.asm b/src/VBox/Runtime/common/math/llrint.asm index 350452aa2..cb94f3f09 100644 --- a/src/VBox/Runtime/common/math/llrint.asm +++ b/src/VBox/Runtime/common/math/llrint.asm @@ -1,4 +1,4 @@ -; $Id: llrint.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: llrint.asm $ ;; @file ; IPRT - No-CRT llrint - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrintf.asm b/src/VBox/Runtime/common/math/llrintf.asm index be1d90636..7231535ff 100644 --- a/src/VBox/Runtime/common/math/llrintf.asm +++ b/src/VBox/Runtime/common/math/llrintf.asm @@ -1,4 +1,4 @@ -; $Id: llrintf.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: llrintf.asm $ ;; @file ; IPRT - No-CRT llrintf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/llrintl.asm b/src/VBox/Runtime/common/math/llrintl.asm index 7bf3fb4ee..8f786ac1e 100644 --- a/src/VBox/Runtime/common/math/llrintl.asm +++ b/src/VBox/Runtime/common/math/llrintl.asm @@ -1,4 +1,4 @@ -; $Id: llrintl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: llrintl.asm $ ;; @file ; IPRT - No-CRT llrintl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/logl.asm b/src/VBox/Runtime/common/math/logl.asm index 24e1c23a3..7769d1d63 100644 --- a/src/VBox/Runtime/common/math/logl.asm +++ b/src/VBox/Runtime/common/math/logl.asm @@ -1,4 +1,4 @@ -; $Id: logl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: logl.asm $ ;; @file ; IPRT - No-CRT logl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrint.asm b/src/VBox/Runtime/common/math/lrint.asm index f6bc0fafe..f61766527 100644 --- a/src/VBox/Runtime/common/math/lrint.asm +++ b/src/VBox/Runtime/common/math/lrint.asm @@ -1,4 +1,4 @@ -; $Id: lrint.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: lrint.asm $ ;; @file ; IPRT - No-CRT lrint - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrintf.asm b/src/VBox/Runtime/common/math/lrintf.asm index 4b4ac241b..67c3cce4e 100644 --- a/src/VBox/Runtime/common/math/lrintf.asm +++ b/src/VBox/Runtime/common/math/lrintf.asm @@ -1,4 +1,4 @@ -; $Id: lrintf.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: lrintf.asm $ ;; @file ; IPRT - No-CRT lrintf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/lrintl.asm b/src/VBox/Runtime/common/math/lrintl.asm index 3772a46ac..0c9028b7a 100644 --- a/src/VBox/Runtime/common/math/lrintl.asm +++ b/src/VBox/Runtime/common/math/lrintl.asm @@ -1,4 +1,4 @@ -; $Id: lrintl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: lrintl.asm $ ;; @file ; IPRT - No-CRT lrintl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainder.asm b/src/VBox/Runtime/common/math/remainder.asm index 0ad4ed28a..d9121d432 100644 --- a/src/VBox/Runtime/common/math/remainder.asm +++ b/src/VBox/Runtime/common/math/remainder.asm @@ -1,4 +1,4 @@ -; $Id: remainder.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: remainder.asm $ ;; @file ; IPRT - No-CRT remainder - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainderf.asm b/src/VBox/Runtime/common/math/remainderf.asm index a7f4dfd19..284dc37b2 100644 --- a/src/VBox/Runtime/common/math/remainderf.asm +++ b/src/VBox/Runtime/common/math/remainderf.asm @@ -1,4 +1,4 @@ -; $Id: remainderf.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: remainderf.asm $ ;; @file ; IPRT - No-CRT remainderf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/remainderl.asm b/src/VBox/Runtime/common/math/remainderl.asm index 906fb056f..899156d0c 100644 --- a/src/VBox/Runtime/common/math/remainderl.asm +++ b/src/VBox/Runtime/common/math/remainderl.asm @@ -1,4 +1,4 @@ -; $Id: remainderl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: remainderl.asm $ ;; @file ; IPRT - No-CRT remainderl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/sinl.asm b/src/VBox/Runtime/common/math/sinl.asm index 2aeda1c2e..c7a4de074 100644 --- a/src/VBox/Runtime/common/math/sinl.asm +++ b/src/VBox/Runtime/common/math/sinl.asm @@ -1,4 +1,4 @@ -; $Id: sinl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: sinl.asm $ ;; @file ; IPRT - No-CRT sinl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/tanl.asm b/src/VBox/Runtime/common/math/tanl.asm index dea3a519b..bafe9d046 100644 --- a/src/VBox/Runtime/common/math/tanl.asm +++ b/src/VBox/Runtime/common/math/tanl.asm @@ -1,4 +1,4 @@ -; $Id: tanl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: tanl.asm $ ;; @file ; IPRT - No-CRT tanl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/trunc.asm b/src/VBox/Runtime/common/math/trunc.asm index 74404fb2b..860530f62 100644 --- a/src/VBox/Runtime/common/math/trunc.asm +++ b/src/VBox/Runtime/common/math/trunc.asm @@ -1,4 +1,4 @@ -; $Id: trunc.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: trunc.asm $ ;; @file ; IPRT - No-CRT trunc - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/truncf.asm b/src/VBox/Runtime/common/math/truncf.asm index 667999263..2b0e96001 100644 --- a/src/VBox/Runtime/common/math/truncf.asm +++ b/src/VBox/Runtime/common/math/truncf.asm @@ -1,4 +1,4 @@ -; $Id: truncf.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: truncf.asm $ ;; @file ; IPRT - No-CRT truncf - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/math/truncl.asm b/src/VBox/Runtime/common/math/truncl.asm index f16b5d7a9..000e82791 100644 --- a/src/VBox/Runtime/common/math/truncl.asm +++ b/src/VBox/Runtime/common/math/truncl.asm @@ -1,4 +1,4 @@ -; $Id: truncl.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: truncl.asm $ ;; @file ; IPRT - No-CRT truncl - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp index 5271b053e..fc7ad69e8 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg1Weak.cpp 14500 2008-11-24 02:22:08Z vboxsync $ */ +/* $Id: RTAssertMsg1Weak.cpp $ */ /** @file * IPRT - RTAssertMsg1Weak. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp index c2d1191ca..c39caa505 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2.cpp 14500 2008-11-24 02:22:08Z vboxsync $ */ +/* $Id: RTAssertMsg2.cpp $ */ /** @file * IPRT - RTAssertMsg2. */ diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp index 74f3a4530..e42d8e960 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertMsg2Weak.cpp 14500 2008-11-24 02:22:08Z vboxsync $ */ +/* $Id: RTAssertMsg2Weak.cpp $ */ /** @file * IPRT - RTAssertMsg2Weak. */ diff --git a/src/VBox/Runtime/common/misc/assert.cpp b/src/VBox/Runtime/common/misc/assert.cpp index f588e671d..19d488c42 100644 --- a/src/VBox/Runtime/common/misc/assert.cpp +++ b/src/VBox/Runtime/common/misc/assert.cpp @@ -1,4 +1,4 @@ -/* $Id: assert.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: assert.cpp $ */ /** @file * IPRT - Assertion Workers. */ diff --git a/src/VBox/Runtime/common/misc/cache.cpp b/src/VBox/Runtime/common/misc/cache.cpp index 82361f44d..80ac47daa 100644 --- a/src/VBox/Runtime/common/misc/cache.cpp +++ b/src/VBox/Runtime/common/misc/cache.cpp @@ -1,4 +1,4 @@ -/* $Id: cache.cpp 10848 2008-07-24 09:11:00Z vboxsync $ */ +/* $Id: cache.cpp $ */ /** @file * IPRT - Object cache */ diff --git a/src/VBox/Runtime/common/misc/cidr.cpp b/src/VBox/Runtime/common/misc/cidr.cpp index c395a2125..2ac877b25 100644 --- a/src/VBox/Runtime/common/misc/cidr.cpp +++ b/src/VBox/Runtime/common/misc/cidr.cpp @@ -1,4 +1,4 @@ -/* $Id: cidr.cpp 8359 2008-04-24 13:46:45Z vboxsync $ */ +/* $Id: cidr.cpp $ */ /** @file * IPRT - IPv4 address parsing. */ diff --git a/src/VBox/Runtime/common/misc/getopt.cpp b/src/VBox/Runtime/common/misc/getopt.cpp index 59efb5cee..6bdb52409 100644 --- a/src/VBox/Runtime/common/misc/getopt.cpp +++ b/src/VBox/Runtime/common/misc/getopt.cpp @@ -1,4 +1,4 @@ -/* $Id: getopt.cpp 8927 2008-05-19 17:43:01Z vboxsync $ */ +/* $Id: getopt.cpp $ */ /** @file * IPRT - Command Line Parsing */ diff --git a/src/VBox/Runtime/common/misc/handletable.cpp b/src/VBox/Runtime/common/misc/handletable.cpp index a9ddcb142..9837fc211 100644 --- a/src/VBox/Runtime/common/misc/handletable.cpp +++ b/src/VBox/Runtime/common/misc/handletable.cpp @@ -1,4 +1,4 @@ -/* $Id: handletable.cpp 10789 2008-07-21 17:22:32Z vboxsync $ */ +/* $Id: handletable.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/handletable.h b/src/VBox/Runtime/common/misc/handletable.h index 4e63f89ca..550c70691 100644 --- a/src/VBox/Runtime/common/misc/handletable.h +++ b/src/VBox/Runtime/common/misc/handletable.h @@ -1,4 +1,4 @@ -/* $Id: handletable.h 10789 2008-07-21 17:22:32Z vboxsync $ */ +/* $Id: handletable.h $ */ /** @file * IPRT - Handle Tables, internal header. */ diff --git a/src/VBox/Runtime/common/misc/handletablectx.cpp b/src/VBox/Runtime/common/misc/handletablectx.cpp index 286313c48..011eaf3f6 100644 --- a/src/VBox/Runtime/common/misc/handletablectx.cpp +++ b/src/VBox/Runtime/common/misc/handletablectx.cpp @@ -1,4 +1,4 @@ -/* $Id: handletablectx.cpp 10790 2008-07-21 18:43:39Z vboxsync $ */ +/* $Id: handletablectx.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/handletablesimple.cpp b/src/VBox/Runtime/common/misc/handletablesimple.cpp index 702a32329..a64682900 100644 --- a/src/VBox/Runtime/common/misc/handletablesimple.cpp +++ b/src/VBox/Runtime/common/misc/handletablesimple.cpp @@ -1,4 +1,4 @@ -/* $Id: handletablesimple.cpp 10790 2008-07-21 18:43:39Z vboxsync $ */ +/* $Id: handletablesimple.cpp $ */ /** @file * IPRT - Handle Tables. */ diff --git a/src/VBox/Runtime/common/misc/once.cpp b/src/VBox/Runtime/common/misc/once.cpp index 25ace76dd..d12ef19ce 100644 --- a/src/VBox/Runtime/common/misc/once.cpp +++ b/src/VBox/Runtime/common/misc/once.cpp @@ -1,4 +1,4 @@ -/* $Id: once.cpp 10940 2008-07-29 16:32:25Z vboxsync $ */ +/* $Id: once.cpp $ */ /** @file * IPRT - Execute Once. */ diff --git a/src/VBox/Runtime/common/misc/req.cpp b/src/VBox/Runtime/common/misc/req.cpp index 10605f821..7da304598 100644 --- a/src/VBox/Runtime/common/misc/req.cpp +++ b/src/VBox/Runtime/common/misc/req.cpp @@ -1,4 +1,4 @@ -/* $Id: VMReq.cpp 17451 2007-01-15 14:08:28Z bird $ */ +/* $Id: VMReq.cpp $ */ /** @file * IPRT - Request packets */ diff --git a/src/VBox/Runtime/common/misc/sanity-c.c b/src/VBox/Runtime/common/misc/sanity-c.c index e5214aade..3f3158862 100644 --- a/src/VBox/Runtime/common/misc/sanity-c.c +++ b/src/VBox/Runtime/common/misc/sanity-c.c @@ -1,4 +1,4 @@ -/* $Id: sanity-c.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: sanity-c.c $ */ /** @file * IPRT - Setup Sanity Checks, C. */ diff --git a/src/VBox/Runtime/common/misc/sanity-cpp.cpp b/src/VBox/Runtime/common/misc/sanity-cpp.cpp index a7755678b..2eda1c497 100644 --- a/src/VBox/Runtime/common/misc/sanity-cpp.cpp +++ b/src/VBox/Runtime/common/misc/sanity-cpp.cpp @@ -1,4 +1,4 @@ -/* $Id: sanity-cpp.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: sanity-cpp.cpp $ */ /** @file * IPRT - Setup Sanity Checks, C++. */ diff --git a/src/VBox/Runtime/common/misc/sanity.h b/src/VBox/Runtime/common/misc/sanity.h index 7e5b5f787..4416c968c 100644 --- a/src/VBox/Runtime/common/misc/sanity.h +++ b/src/VBox/Runtime/common/misc/sanity.h @@ -1,4 +1,4 @@ -/* $Id: sanity.h 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: sanity.h $ */ /** @file * IPRT - Setup Sanity Checks, C and C++. */ diff --git a/src/VBox/Runtime/common/misc/semspingpong.cpp b/src/VBox/Runtime/common/misc/semspingpong.cpp index 00f8db7e4..597bbf95a 100644 --- a/src/VBox/Runtime/common/misc/semspingpong.cpp +++ b/src/VBox/Runtime/common/misc/semspingpong.cpp @@ -1,4 +1,4 @@ -/* $Id: semspingpong.cpp 14057 2008-11-10 23:00:21Z vboxsync $ */ +/* $Id: semspingpong.cpp $ */ /** @file * IPRT - Thread Ping-Pong Construct. */ diff --git a/src/VBox/Runtime/common/misc/setjmp.asm b/src/VBox/Runtime/common/misc/setjmp.asm index a12e25486..f318613df 100644 --- a/src/VBox/Runtime/common/misc/setjmp.asm +++ b/src/VBox/Runtime/common/misc/setjmp.asm @@ -1,4 +1,4 @@ -; $Id: setjmp.asm 8259 2008-04-21 21:01:41Z vboxsync $ +; $Id: setjmp.asm $ ;; @file ; IPRT - No-CRT setjmp & longjmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/misc/thread.cpp b/src/VBox/Runtime/common/misc/thread.cpp index 8d9c04cb9..02fcf7948 100644 --- a/src/VBox/Runtime/common/misc/thread.cpp +++ b/src/VBox/Runtime/common/misc/thread.cpp @@ -1,4 +1,4 @@ -/* $Id: thread.cpp 15880 2009-01-08 18:46:22Z vboxsync $ */ +/* $Id: thread.cpp $ */ /** @file * IPRT - Threads, common routines. */ diff --git a/src/VBox/Runtime/common/misc/zip.cpp b/src/VBox/Runtime/common/misc/zip.cpp index 476afe4cf..1ba0ab312 100644 --- a/src/VBox/Runtime/common/misc/zip.cpp +++ b/src/VBox/Runtime/common/misc/zip.cpp @@ -1,4 +1,4 @@ -/* $Id: zip.cpp 14055 2008-11-10 22:57:43Z vboxsync $ */ +/* $Id: zip.cpp $ */ /** @file * IPRT - Compression. */ diff --git a/src/VBox/Runtime/common/rand/rand.cpp b/src/VBox/Runtime/common/rand/rand.cpp index acab004c7..70aa40230 100644 --- a/src/VBox/Runtime/common/rand/rand.cpp +++ b/src/VBox/Runtime/common/rand/rand.cpp @@ -1,4 +1,4 @@ -/* $Id: rand.cpp 11557 2008-08-21 21:47:31Z vboxsync $ */ +/* $Id: rand.cpp $ */ /** @file * IPRT - Random Numbers. */ diff --git a/src/VBox/Runtime/common/rand/randadv.cpp b/src/VBox/Runtime/common/rand/randadv.cpp index c0b2ee126..fe9aabd8d 100644 --- a/src/VBox/Runtime/common/rand/randadv.cpp +++ b/src/VBox/Runtime/common/rand/randadv.cpp @@ -1,4 +1,4 @@ -/* $Id: randadv.cpp 11523 2008-08-20 20:48:52Z vboxsync $ */ +/* $Id: randadv.cpp $ */ /** @file * IPRT - Random Numbers, Generic Glue. */ diff --git a/src/VBox/Runtime/common/rand/randparkmiller.cpp b/src/VBox/Runtime/common/rand/randparkmiller.cpp index f1e44dcb6..569836dfa 100644 --- a/src/VBox/Runtime/common/rand/randparkmiller.cpp +++ b/src/VBox/Runtime/common/rand/randparkmiller.cpp @@ -1,4 +1,4 @@ -/* $Id: randparkmiller.cpp 11523 2008-08-20 20:48:52Z vboxsync $ */ +/* $Id: randparkmiller.cpp $ */ /** @file * IPRT - Random Numbers, Park-Miller Pseudo Random. */ diff --git a/src/VBox/Runtime/common/string/RTStrNLen.cpp b/src/VBox/Runtime/common/string/RTStrNLen.cpp index 48ef626a9..bac035bc7 100644 --- a/src/VBox/Runtime/common/string/RTStrNLen.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLen.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrNLen.cpp 10949 2008-07-29 18:56:03Z vboxsync $ */ +/* $Id: RTStrNLen.cpp $ */ /** @file * IPRT - RTStrNLen. */ diff --git a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp index 382f15645..9fdba1256 100644 --- a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp @@ -1,4 +1,4 @@ -/* $Id: RTStrNLenEx.cpp 10949 2008-07-29 18:56:03Z vboxsync $ */ +/* $Id: RTStrNLenEx.cpp $ */ /** @file * IPRT - RTStrNLenEx. */ diff --git a/src/VBox/Runtime/common/string/memchr.asm b/src/VBox/Runtime/common/string/memchr.asm index df5939be9..17ac3b949 100644 --- a/src/VBox/Runtime/common/string/memchr.asm +++ b/src/VBox/Runtime/common/string/memchr.asm @@ -1,4 +1,4 @@ -; $Id: memchr.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: memchr.asm $ ;; @file ; IPRT - No-CRT memchr - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memchr.cpp b/src/VBox/Runtime/common/string/memchr.cpp index 642bf4ed2..97ad18294 100644 --- a/src/VBox/Runtime/common/string/memchr.cpp +++ b/src/VBox/Runtime/common/string/memchr.cpp @@ -1,4 +1,4 @@ -/* $Id: memchr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memchr.cpp $ */ /** @file * IPRT - CRT Strings, memcpy(). */ diff --git a/src/VBox/Runtime/common/string/memchr_alias.c b/src/VBox/Runtime/common/string/memchr_alias.c index 09c8a0461..ce07090df 100644 --- a/src/VBox/Runtime/common/string/memchr_alias.c +++ b/src/VBox/Runtime/common/string/memchr_alias.c @@ -1,4 +1,4 @@ -/* $Id: memchr_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memchr_alias.c $ */ /** @file * IPRT - No-CRT memchr() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memcmp.asm b/src/VBox/Runtime/common/string/memcmp.asm index df5cff5f6..8e28d0b5c 100644 --- a/src/VBox/Runtime/common/string/memcmp.asm +++ b/src/VBox/Runtime/common/string/memcmp.asm @@ -1,4 +1,4 @@ -; $Id: memcmp.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: memcmp.asm $ ;; @file ; IPRT - No-CRT memcmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memcmp.cpp b/src/VBox/Runtime/common/string/memcmp.cpp index 581bf83c0..d80cf6d49 100644 --- a/src/VBox/Runtime/common/string/memcmp.cpp +++ b/src/VBox/Runtime/common/string/memcmp.cpp @@ -1,4 +1,4 @@ -/* $Id: memcmp.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memcmp.cpp $ */ /** @file * IPRT - CRT Strings, memcmp(). */ diff --git a/src/VBox/Runtime/common/string/memcmp_alias.c b/src/VBox/Runtime/common/string/memcmp_alias.c index 1c9f36779..6324caf0b 100644 --- a/src/VBox/Runtime/common/string/memcmp_alias.c +++ b/src/VBox/Runtime/common/string/memcmp_alias.c @@ -1,4 +1,4 @@ -/* $Id: memcmp_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memcmp_alias.c $ */ /** @file * IPRT - No-CRT memcmp() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memcpy.asm b/src/VBox/Runtime/common/string/memcpy.asm index af5553797..7d3594f07 100644 --- a/src/VBox/Runtime/common/string/memcpy.asm +++ b/src/VBox/Runtime/common/string/memcpy.asm @@ -1,4 +1,4 @@ -; $Id: memcpy.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: memcpy.asm $ ;; @file ; IPRT - No-CRT memcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memcpy.cpp b/src/VBox/Runtime/common/string/memcpy.cpp index 895eb6b43..e4d7d538b 100644 --- a/src/VBox/Runtime/common/string/memcpy.cpp +++ b/src/VBox/Runtime/common/string/memcpy.cpp @@ -1,4 +1,4 @@ -/* $Id: memcpy.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memcpy.cpp $ */ /** @file * IPRT - CRT Strings, memcpy(). */ diff --git a/src/VBox/Runtime/common/string/memcpy_alias.c b/src/VBox/Runtime/common/string/memcpy_alias.c index b4528d0bd..087edd801 100644 --- a/src/VBox/Runtime/common/string/memcpy_alias.c +++ b/src/VBox/Runtime/common/string/memcpy_alias.c @@ -1,4 +1,4 @@ -/* $Id: memcpy_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memcpy_alias.c $ */ /** @file * IPRT - No-CRT memcpy() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/memmove.asm b/src/VBox/Runtime/common/string/memmove.asm index c364bae57..8c7e70039 100644 --- a/src/VBox/Runtime/common/string/memmove.asm +++ b/src/VBox/Runtime/common/string/memmove.asm @@ -1,4 +1,4 @@ -; $Id: memmove.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: memmove.asm $ ;; @file ; IPRT - No-CRT memmove - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memmove_alias.c b/src/VBox/Runtime/common/string/memmove_alias.c index 952624e75..60b509c57 100644 --- a/src/VBox/Runtime/common/string/memmove_alias.c +++ b/src/VBox/Runtime/common/string/memmove_alias.c @@ -1,4 +1,4 @@ -/* $Id: memmove_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memmove_alias.c $ */ /** @file * IPRT - No-CRT memmove() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/mempcpy.asm b/src/VBox/Runtime/common/string/mempcpy.asm index e35cbc1be..718626a49 100644 --- a/src/VBox/Runtime/common/string/mempcpy.asm +++ b/src/VBox/Runtime/common/string/mempcpy.asm @@ -1,4 +1,4 @@ -; $Id: mempcpy.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: mempcpy.asm $ ;; @file ; IPRT - No-CRT mempcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memset.asm b/src/VBox/Runtime/common/string/memset.asm index 545733b8d..a9cdfc832 100644 --- a/src/VBox/Runtime/common/string/memset.asm +++ b/src/VBox/Runtime/common/string/memset.asm @@ -1,4 +1,4 @@ -; $Id: memset.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: memset.asm $ ;; @file ; IPRT - No-CRT memset - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/memset.cpp b/src/VBox/Runtime/common/string/memset.cpp index 198b2787e..bb5763e54 100644 --- a/src/VBox/Runtime/common/string/memset.cpp +++ b/src/VBox/Runtime/common/string/memset.cpp @@ -1,4 +1,4 @@ -/* $Id: memset.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memset.cpp $ */ /** @file * IPRT - CRT Strings, memset(). */ diff --git a/src/VBox/Runtime/common/string/memset_alias.c b/src/VBox/Runtime/common/string/memset_alias.c index ddaa5d83a..7ce4ad7b2 100644 --- a/src/VBox/Runtime/common/string/memset_alias.c +++ b/src/VBox/Runtime/common/string/memset_alias.c @@ -1,4 +1,4 @@ -/* $Id: memset_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: memset_alias.c $ */ /** @file * IPRT - No-CRT memset() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/simplepattern.cpp b/src/VBox/Runtime/common/string/simplepattern.cpp index 3a0cb9752..9efd7b41c 100644 --- a/src/VBox/Runtime/common/string/simplepattern.cpp +++ b/src/VBox/Runtime/common/string/simplepattern.cpp @@ -1,4 +1,4 @@ -/* $Id: simplepattern.cpp 13549 2008-10-24 11:31:40Z vboxsync $ */ +/* $Id: simplepattern.cpp $ */ /** @file * IPRT - RTStrSimplePattern. */ diff --git a/src/VBox/Runtime/common/string/straprintf.cpp b/src/VBox/Runtime/common/string/straprintf.cpp index c63b745a1..5e05e6520 100644 --- a/src/VBox/Runtime/common/string/straprintf.cpp +++ b/src/VBox/Runtime/common/string/straprintf.cpp @@ -1,4 +1,4 @@ -/* $Id: straprintf.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: straprintf.cpp $ */ /** @file * IPRT - Allocating String Formatters. */ diff --git a/src/VBox/Runtime/common/string/strchr.asm b/src/VBox/Runtime/common/string/strchr.asm index bbd915cfd..a56d70bb9 100644 --- a/src/VBox/Runtime/common/string/strchr.asm +++ b/src/VBox/Runtime/common/string/strchr.asm @@ -1,4 +1,4 @@ -; $Id: strchr.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: strchr.asm $ ;; @file ; IPRT - No-CRT strchr - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strchr_alias.c b/src/VBox/Runtime/common/string/strchr_alias.c index 348741eb9..72a0100db 100644 --- a/src/VBox/Runtime/common/string/strchr_alias.c +++ b/src/VBox/Runtime/common/string/strchr_alias.c @@ -1,4 +1,4 @@ -/* $Id: strchr_alias.c 9503 2008-06-08 03:04:08Z vboxsync $ */ +/* $Id: strchr_alias.c $ */ /** @file * IPRT - No-CRT strchr() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strcmp.asm b/src/VBox/Runtime/common/string/strcmp.asm index e617b1a9d..194562a4d 100644 --- a/src/VBox/Runtime/common/string/strcmp.asm +++ b/src/VBox/Runtime/common/string/strcmp.asm @@ -1,4 +1,4 @@ -; $Id: strcmp.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: strcmp.asm $ ;; @file ; IPRT - No-CRT strcmp - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strcmp_alias.c b/src/VBox/Runtime/common/string/strcmp_alias.c index 0591941e3..60fda92c8 100644 --- a/src/VBox/Runtime/common/string/strcmp_alias.c +++ b/src/VBox/Runtime/common/string/strcmp_alias.c @@ -1,4 +1,4 @@ -/* $Id: strcmp_alias.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strcmp_alias.c $ */ /** @file * IPRT - No-CRT strcmp() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strcpy.asm b/src/VBox/Runtime/common/string/strcpy.asm index ba79a0a11..ecba50c53 100644 --- a/src/VBox/Runtime/common/string/strcpy.asm +++ b/src/VBox/Runtime/common/string/strcpy.asm @@ -1,4 +1,4 @@ -; $Id: strcpy.asm 14024 2008-11-10 17:07:24Z vboxsync $ +; $Id: strcpy.asm $ ;; @file ; IPRT - No-CRT strcpy - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strcpy.cpp b/src/VBox/Runtime/common/string/strcpy.cpp index 65868236f..31e05f2f5 100644 --- a/src/VBox/Runtime/common/string/strcpy.cpp +++ b/src/VBox/Runtime/common/string/strcpy.cpp @@ -1,4 +1,4 @@ -/* $Id: strcpy.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strcpy.cpp $ */ /** @file * IPRT - CRT Strings, strcpy(). */ diff --git a/src/VBox/Runtime/common/string/strcpy_alias.c b/src/VBox/Runtime/common/string/strcpy_alias.c index 239503188..0bb870c47 100644 --- a/src/VBox/Runtime/common/string/strcpy_alias.c +++ b/src/VBox/Runtime/common/string/strcpy_alias.c @@ -1,4 +1,4 @@ -/* $Id: strcpy_alias.c 14021 2008-11-10 16:31:22Z vboxsync $ */ +/* $Id: strcpy_alias.c $ */ /** @file * IPRT - No-CRT strcpy() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strformat.cpp b/src/VBox/Runtime/common/string/strformat.cpp index 0a056521d..29b20fe17 100644 --- a/src/VBox/Runtime/common/string/strformat.cpp +++ b/src/VBox/Runtime/common/string/strformat.cpp @@ -1,4 +1,4 @@ -/* $Id: strformat.cpp 14066 2008-11-10 23:33:15Z vboxsync $ */ +/* $Id: strformat.cpp $ */ /** @file * IPRT - String Formatter. */ diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp index ccdeaa2c2..95329fbf1 100644 --- a/src/VBox/Runtime/common/string/strformatrt.cpp +++ b/src/VBox/Runtime/common/string/strformatrt.cpp @@ -1,4 +1,4 @@ -/* $Id: strformatrt.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: strformatrt.cpp $ */ /** @file * IPRT - IPRT String Formatter Extensions. */ diff --git a/src/VBox/Runtime/common/string/strformattype.cpp b/src/VBox/Runtime/common/string/strformattype.cpp index 385565d42..791d0cd9d 100644 --- a/src/VBox/Runtime/common/string/strformattype.cpp +++ b/src/VBox/Runtime/common/string/strformattype.cpp @@ -1,4 +1,4 @@ -/* $Id: strformattype.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: strformattype.cpp $ */ /** @file * IPRT - IPRT String Formatter Extensions, Dynamic Types. */ diff --git a/src/VBox/Runtime/common/string/string.cpp b/src/VBox/Runtime/common/string/string.cpp index 75a4034c5..8d1da7d69 100644 --- a/src/VBox/Runtime/common/string/string.cpp +++ b/src/VBox/Runtime/common/string/string.cpp @@ -1,4 +1,4 @@ -/* $Id: string.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: string.cpp $ */ /** @file * IPRT - String Manipulation. */ diff --git a/src/VBox/Runtime/common/string/strlen.asm b/src/VBox/Runtime/common/string/strlen.asm index adff3ba51..272e5e70d 100644 --- a/src/VBox/Runtime/common/string/strlen.asm +++ b/src/VBox/Runtime/common/string/strlen.asm @@ -1,4 +1,4 @@ -; $Id: strlen.asm 14021 2008-11-10 16:31:22Z vboxsync $ +; $Id: strlen.asm $ ;; @file ; IPRT - No-CRT strlen - AMD64 & X86. ; diff --git a/src/VBox/Runtime/common/string/strlen.cpp b/src/VBox/Runtime/common/string/strlen.cpp index bfc84b731..455f9346b 100644 --- a/src/VBox/Runtime/common/string/strlen.cpp +++ b/src/VBox/Runtime/common/string/strlen.cpp @@ -1,4 +1,4 @@ -/* $Id: strlen.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strlen.cpp $ */ /** @file * IPRT - CRT Strings, strlen(). */ diff --git a/src/VBox/Runtime/common/string/strlen_alias.c b/src/VBox/Runtime/common/string/strlen_alias.c index 945090308..60f39b04a 100644 --- a/src/VBox/Runtime/common/string/strlen_alias.c +++ b/src/VBox/Runtime/common/string/strlen_alias.c @@ -1,4 +1,4 @@ -/* $Id: strlen_alias.c 10137 2008-07-03 04:12:26Z vboxsync $ */ +/* $Id: strlen_alias.c $ */ /** @file * IPRT - No-CRT strlen() alias for gcc. */ diff --git a/src/VBox/Runtime/common/string/strncmp.cpp b/src/VBox/Runtime/common/string/strncmp.cpp index a582b2a0c..d3643848e 100644 --- a/src/VBox/Runtime/common/string/strncmp.cpp +++ b/src/VBox/Runtime/common/string/strncmp.cpp @@ -1,4 +1,4 @@ -/* $Id: strncmp.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strncmp.cpp $ */ /** @file * IPRT - CRT Strings, strncmp(). */ diff --git a/src/VBox/Runtime/common/string/strpbrk.cpp b/src/VBox/Runtime/common/string/strpbrk.cpp index effa820cf..c582153b7 100644 --- a/src/VBox/Runtime/common/string/strpbrk.cpp +++ b/src/VBox/Runtime/common/string/strpbrk.cpp @@ -1,4 +1,4 @@ -/* $Id: strpbrk.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strpbrk.cpp $ */ /** @file * IPRT - strpbrk(). */ diff --git a/src/VBox/Runtime/common/string/strprintf.cpp b/src/VBox/Runtime/common/string/strprintf.cpp index b0715703a..8a7e629bb 100644 --- a/src/VBox/Runtime/common/string/strprintf.cpp +++ b/src/VBox/Runtime/common/string/strprintf.cpp @@ -1,4 +1,4 @@ -/* $Id: strprintf.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strprintf.cpp $ */ /** @file * IPRT - String Formatters. */ diff --git a/src/VBox/Runtime/common/string/strspace.cpp b/src/VBox/Runtime/common/string/strspace.cpp index d8ce1b8ea..98ee4368b 100644 --- a/src/VBox/Runtime/common/string/strspace.cpp +++ b/src/VBox/Runtime/common/string/strspace.cpp @@ -1,4 +1,4 @@ -/* $Id: strspace.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strspace.cpp $ */ /** @file * IPRT - Unique String Spaces. */ diff --git a/src/VBox/Runtime/common/string/strstrip.cpp b/src/VBox/Runtime/common/string/strstrip.cpp index b2d4691e5..34896ae54 100644 --- a/src/VBox/Runtime/common/string/strstrip.cpp +++ b/src/VBox/Runtime/common/string/strstrip.cpp @@ -1,4 +1,4 @@ -/* $Id: strstrip.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: strstrip.cpp $ */ /** @file * IPRT - String Stripping and Trimming. */ diff --git a/src/VBox/Runtime/common/string/strtonum.cpp b/src/VBox/Runtime/common/string/strtonum.cpp index 31ac198f4..b78e7fbc7 100644 --- a/src/VBox/Runtime/common/string/strtonum.cpp +++ b/src/VBox/Runtime/common/string/strtonum.cpp @@ -1,4 +1,4 @@ -/* $Id: strtonum.cpp 8279 2008-04-22 12:13:16Z vboxsync $ */ +/* $Id: strtonum.cpp $ */ /** @file * IPRT - String To Number Convertion. */ diff --git a/src/VBox/Runtime/common/string/uni.cpp b/src/VBox/Runtime/common/string/uni.cpp index 05837206b..94e450798 100644 --- a/src/VBox/Runtime/common/string/uni.cpp +++ b/src/VBox/Runtime/common/string/uni.cpp @@ -1,4 +1,4 @@ -/* $Id: uni.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: uni.cpp $ */ /** @file * IPRT - Unicode. */ diff --git a/src/VBox/Runtime/common/string/unidata.cpp b/src/VBox/Runtime/common/string/unidata.cpp index 5c3792445..e379f7bf0 100644 --- a/src/VBox/Runtime/common/string/unidata.cpp +++ b/src/VBox/Runtime/common/string/unidata.cpp @@ -1,4 +1,4 @@ -/* $Id: unidata.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: unidata.cpp $ */ /** @file * IPRT - Unicode Tables * diff --git a/src/VBox/Runtime/common/string/uniread.cpp b/src/VBox/Runtime/common/string/uniread.cpp index 66e1c9a29..01b00087e 100644 --- a/src/VBox/Runtime/common/string/uniread.cpp +++ b/src/VBox/Runtime/common/string/uniread.cpp @@ -1,4 +1,4 @@ -/* $Id: uniread.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: uniread.cpp $ */ /** @file * IPRT - Unicode Specification Reader. */ diff --git a/src/VBox/Runtime/common/string/utf-16.cpp b/src/VBox/Runtime/common/string/utf-16.cpp index 47efb32b7..cd72cdc25 100644 --- a/src/VBox/Runtime/common/string/utf-16.cpp +++ b/src/VBox/Runtime/common/string/utf-16.cpp @@ -1,4 +1,4 @@ -/* $Id: utf-16.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: utf-16.cpp $ */ /** @file * IPRT - UTF-16 */ diff --git a/src/VBox/Runtime/common/string/utf-8.cpp b/src/VBox/Runtime/common/string/utf-8.cpp index bfee00ef3..5d830e93c 100644 --- a/src/VBox/Runtime/common/string/utf-8.cpp +++ b/src/VBox/Runtime/common/string/utf-8.cpp @@ -1,4 +1,4 @@ -/* $Id: utf-8.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/* $Id: utf-8.cpp $ */ /** @file * IPRT - UTF-8 Decoding. */ diff --git a/src/VBox/Runtime/common/table/avl_Base.cpp.h b/src/VBox/Runtime/common/table/avl_Base.cpp.h index 79e1403c4..32d6e1117 100644 --- a/src/VBox/Runtime/common/table/avl_Base.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Base.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Base.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_Base.cpp.h $ */ /** @file * kAVLBase - basic routines for all AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h index 9074abab5..3db25a220 100644 --- a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Destroy.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_Destroy.cpp.h $ */ /** @file * kAVLDestroy - Walk the tree calling a callback to destroy all the nodes. */ diff --git a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h index 21a559518..784f710fd 100644 --- a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h +++ b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_DoWithAll.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_DoWithAll.cpp.h $ */ /** @file * kAVLDoWithAll - Do with all nodes routine for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Enum.cpp.h b/src/VBox/Runtime/common/table/avl_Enum.cpp.h index 5612cf189..de7d94d84 100644 --- a/src/VBox/Runtime/common/table/avl_Enum.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Enum.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Enum.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_Enum.cpp.h $ */ /** @file * Enumeration routines for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_Get.cpp.h b/src/VBox/Runtime/common/table/avl_Get.cpp.h index 1975a3ea6..6f1756f8d 100644 --- a/src/VBox/Runtime/common/table/avl_Get.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Get.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Get.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_Get.cpp.h $ */ /** @file * kAVLGet - get routine for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h index 15d42bc96..7a489e6fd 100644 --- a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_GetBestFit.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_GetBestFit.cpp.h $ */ /** @file * kAVLGetBestFit - Get Best Fit routine for AVL trees. * Intended specially on heaps. The tree should allow duplicate keys. diff --git a/src/VBox/Runtime/common/table/avl_Range.cpp.h b/src/VBox/Runtime/common/table/avl_Range.cpp.h index e2603de10..d1d2b90dd 100644 --- a/src/VBox/Runtime/common/table/avl_Range.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Range.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_Range.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_Range.cpp.h $ */ /** @file * kAVLRange - Range routines for AVL trees. */ diff --git a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h index 06c974964..bbd6322db 100644 --- a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h @@ -1,4 +1,4 @@ -/* $Id: avl_RemoveBestFit.cpp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: avl_RemoveBestFit.cpp.h $ */ /** @file * kAVLRemoveBestFit - Remove Best Fit routine for AVL trees. * Intended specially on heaps. The tree should allow duplicate keys. diff --git a/src/VBox/Runtime/common/table/avlgcptr.cpp b/src/VBox/Runtime/common/table/avlgcptr.cpp index 1cedafdc3..08b6dbf3c 100644 --- a/src/VBox/Runtime/common/table/avlgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlgcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlgcptr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlgcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlhcphys.cpp b/src/VBox/Runtime/common/table/avlhcphys.cpp index 98371f9db..6e18fd1a1 100644 --- a/src/VBox/Runtime/common/table/avlhcphys.cpp +++ b/src/VBox/Runtime/common/table/avlhcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlhcphys.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlhcphys.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avllu32.cpp b/src/VBox/Runtime/common/table/avllu32.cpp index cf3133a0e..cf80cad1a 100644 --- a/src/VBox/Runtime/common/table/avllu32.cpp +++ b/src/VBox/Runtime/common/table/avllu32.cpp @@ -1,4 +1,4 @@ -/* $Id: avllu32.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avllu32.cpp $ */ /** @file * IPRT - AVL tree, uint32_t, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlogcphys.cpp b/src/VBox/Runtime/common/table/avlogcphys.cpp index 3d326a44e..439856af0 100644 --- a/src/VBox/Runtime/common/table/avlogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlogcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlogcphys.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlogcphys.cpp $ */ /** @file * IPRT - AVL tree, RTGCPHYS, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlogcptr.cpp b/src/VBox/Runtime/common/table/avlogcptr.cpp index 06c4b679f..865e9bb7a 100644 --- a/src/VBox/Runtime/common/table/avlogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlogcptr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlohcphys.cpp b/src/VBox/Runtime/common/table/avlohcphys.cpp index 54cfcf1e0..355717d4e 100644 --- a/src/VBox/Runtime/common/table/avlohcphys.cpp +++ b/src/VBox/Runtime/common/table/avlohcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlohcphys.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlohcphys.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avloioport.cpp b/src/VBox/Runtime/common/table/avloioport.cpp index e33494968..123ad8e35 100644 --- a/src/VBox/Runtime/common/table/avloioport.cpp +++ b/src/VBox/Runtime/common/table/avloioport.cpp @@ -1,4 +1,4 @@ -/* $Id: avloioport.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avloioport.cpp $ */ /** @file * IPRT - AVL tree, RTIOPORT, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlou32.cpp b/src/VBox/Runtime/common/table/avlou32.cpp index b261d9b44..8a3e4f9f0 100644 --- a/src/VBox/Runtime/common/table/avlou32.cpp +++ b/src/VBox/Runtime/common/table/avlou32.cpp @@ -1,4 +1,4 @@ -/* $Id: avlou32.cpp 9230 2008-05-29 15:30:59Z vboxsync $ */ +/* $Id: avlou32.cpp $ */ /** @file * IPRT - AVL tree, uint_32, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlpv.cpp b/src/VBox/Runtime/common/table/avlpv.cpp index 2ca018e0b..cf265769c 100644 --- a/src/VBox/Runtime/common/table/avlpv.cpp +++ b/src/VBox/Runtime/common/table/avlpv.cpp @@ -1,4 +1,4 @@ -/* $Id: avlpv.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlpv.cpp $ */ /** @file * IPRT - AVL tree, void *, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlrgcptr.cpp b/src/VBox/Runtime/common/table/avlrgcptr.cpp index 9a4438b1f..0aacc968f 100644 --- a/src/VBox/Runtime/common/table/avlrgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrgcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrgcptr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlrgcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlrogcphys.cpp b/src/VBox/Runtime/common/table/avlrogcphys.cpp index e723c6b1d..53026808a 100644 --- a/src/VBox/Runtime/common/table/avlrogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlrogcphys.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrogcphys.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlrogcphys.cpp $ */ /** @file * IPRT - AVL tree, RTGCPHYS, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlrogcptr.cpp b/src/VBox/Runtime/common/table/avlrogcptr.cpp index 1c777597f..f6863023f 100644 --- a/src/VBox/Runtime/common/table/avlrogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlrogcptr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlrogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlroioport.cpp b/src/VBox/Runtime/common/table/avlroioport.cpp index 4f5cc5cdc..459b23df4 100644 --- a/src/VBox/Runtime/common/table/avlroioport.cpp +++ b/src/VBox/Runtime/common/table/avlroioport.cpp @@ -1,4 +1,4 @@ -/* $Id: avlroioport.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlroioport.cpp $ */ /** @file * IPRT - AVL tree, RTIOPORT, range, unique keys, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlroogcptr.cpp b/src/VBox/Runtime/common/table/avlroogcptr.cpp index cfb0805da..d13c13d43 100644 --- a/src/VBox/Runtime/common/table/avlroogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlroogcptr.cpp @@ -1,4 +1,4 @@ -/* $Id: avlroogcptr.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlroogcptr.cpp $ */ /** @file * IPRT - AVL tree, RTGCPTR, range, unique keys, overlapping ranges, offset pointers. */ diff --git a/src/VBox/Runtime/common/table/avlu32.cpp b/src/VBox/Runtime/common/table/avlu32.cpp index 890774bd7..425387155 100644 --- a/src/VBox/Runtime/common/table/avlu32.cpp +++ b/src/VBox/Runtime/common/table/avlu32.cpp @@ -1,4 +1,4 @@ -/* $Id: avlu32.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlu32.cpp $ */ /** @file * IPRT - AVL tree, uint32_t, unique keys. */ diff --git a/src/VBox/Runtime/common/table/avlul.cpp b/src/VBox/Runtime/common/table/avlul.cpp index ce5a17f04..13e908a1d 100644 --- a/src/VBox/Runtime/common/table/avlul.cpp +++ b/src/VBox/Runtime/common/table/avlul.cpp @@ -1,4 +1,4 @@ -/* $Id: avlul.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: avlul.cpp $ */ /** @file * IPRT - AVL tree, unsigned long, unique keys. */ diff --git a/src/VBox/Runtime/common/table/table.cpp b/src/VBox/Runtime/common/table/table.cpp index 9efde85d5..a09953f93 100644 --- a/src/VBox/Runtime/common/table/table.cpp +++ b/src/VBox/Runtime/common/table/table.cpp @@ -1,4 +1,4 @@ -/* $Id: table.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: table.cpp $ */ /** @file * IPRT - AVL tree, RTHCPHYS, unique keys. */ diff --git a/src/VBox/Runtime/common/time/time.cpp b/src/VBox/Runtime/common/time/time.cpp index 0aa1d4bcc..fbc46f09d 100644 --- a/src/VBox/Runtime/common/time/time.cpp +++ b/src/VBox/Runtime/common/time/time.cpp @@ -1,4 +1,4 @@ -/* $Id: time.cpp 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: time.cpp $ */ /** @file * IPRT - Time. */ diff --git a/src/VBox/Runtime/common/time/timeprog.cpp b/src/VBox/Runtime/common/time/timeprog.cpp index 9af9aa45c..15108867e 100644 --- a/src/VBox/Runtime/common/time/timeprog.cpp +++ b/src/VBox/Runtime/common/time/timeprog.cpp @@ -1,4 +1,4 @@ -/* $Id: timeprog.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: timeprog.cpp $ */ /** @file * IPRT - Time Relative to Program Start. */ diff --git a/src/VBox/Runtime/common/time/timesup.cpp b/src/VBox/Runtime/common/time/timesup.cpp index 7358f4731..c0722fbf6 100644 --- a/src/VBox/Runtime/common/time/timesup.cpp +++ b/src/VBox/Runtime/common/time/timesup.cpp @@ -1,4 +1,4 @@ -/* $Id: timesup.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: timesup.cpp $ */ /** @file * IPRT - Time using SUPLib. */ diff --git a/src/VBox/Runtime/common/time/timesupA.asm b/src/VBox/Runtime/common/time/timesupA.asm index 4f268a4c9..c92f84b28 100644 --- a/src/VBox/Runtime/common/time/timesupA.asm +++ b/src/VBox/Runtime/common/time/timesupA.asm @@ -1,4 +1,4 @@ -; $Id: timesupA.asm 13832 2008-11-05 02:01:12Z vboxsync $ +; $Id: timesupA.asm $ ;; @file ; IPRT - Time using SUPLib, the Assembly Implementation. ; diff --git a/src/VBox/Runtime/common/time/timesupA.mac b/src/VBox/Runtime/common/time/timesupA.mac index 32f08a888..ab268557c 100644 --- a/src/VBox/Runtime/common/time/timesupA.mac +++ b/src/VBox/Runtime/common/time/timesupA.mac @@ -1,4 +1,4 @@ -; $Id: timesupA.mac 8272 2008-04-22 11:18:25Z vboxsync $ +; $Id: timesupA.mac $ ;; @file ; IPRT - Time using SUPLib, the Assembly Code Template. ; diff --git a/src/VBox/Runtime/common/time/timesupref.cpp b/src/VBox/Runtime/common/time/timesupref.cpp index cfb55289e..d11d92be5 100644 --- a/src/VBox/Runtime/common/time/timesupref.cpp +++ b/src/VBox/Runtime/common/time/timesupref.cpp @@ -1,4 +1,4 @@ -/* $Id: timesupref.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: timesupref.cpp $ */ /** @file * IPRT - Time using SUPLib, the C Implementation. */ diff --git a/src/VBox/Runtime/common/time/timesupref.h b/src/VBox/Runtime/common/time/timesupref.h index 6d2182015..e745a2727 100644 --- a/src/VBox/Runtime/common/time/timesupref.h +++ b/src/VBox/Runtime/common/time/timesupref.h @@ -1,4 +1,4 @@ -/* $Id: timesupref.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: timesupref.h $ */ /** @file * IPRT - Time using SUPLib, the C Code Template. */ diff --git a/src/VBox/Runtime/common/time/timesysalias.cpp b/src/VBox/Runtime/common/time/timesysalias.cpp index 87491e912..e101cea51 100644 --- a/src/VBox/Runtime/common/time/timesysalias.cpp +++ b/src/VBox/Runtime/common/time/timesysalias.cpp @@ -1,4 +1,4 @@ -/* $Id: timesysalias.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: timesysalias.cpp $ */ /** @file * IPRT - Time using RTTimeSystem*. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp index 99ecfda9a..3c03ab868 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwin.cpp 10136 2008-07-03 04:09:28Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwin.cpp $ */ /** @file * IPRT - Convert Darwin Mach returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp index 1e19ee3e0..5cb0d4609 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinCOM.cpp 15459 2008-12-14 11:23:14Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinCOM.cpp $ */ /** @file * IPRT - Convert Darwin COM returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp index a302d91c4..00c5d4694 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinIO.cpp 15459 2008-12-14 11:23:14Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinIO.cpp $ */ /** @file * IPRT - Convert Darwin IOKit returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp index fcfcce262..b93b92807 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromDarwinKern.cpp 15459 2008-12-14 11:23:14Z vboxsync $ */ +/* $Id: RTErrConvertFromDarwinKern.cpp $ */ /** @file * IPRT - Convert Darwin Mach returns codes to iprt status codes. */ diff --git a/src/VBox/Runtime/gc/initterm-gc.cpp b/src/VBox/Runtime/gc/initterm-gc.cpp index 6731f571f..591a38f54 100644 --- a/src/VBox/Runtime/gc/initterm-gc.cpp +++ b/src/VBox/Runtime/gc/initterm-gc.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-gc.cpp 13813 2008-11-04 21:55:34Z vboxsync $ */ +/* $Id: initterm-gc.cpp $ */ /** @file * IPRT - Init Raw-mode Context. */ diff --git a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp index a2ac412f1..5f09f18f2 100644 --- a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp +++ b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTAssertShouldPanic-generic.cpp 13319 2008-10-16 08:23:23Z vboxsync $ */ +/* $Id: RTAssertShouldPanic-generic.cpp $ */ /** @file * IPRT - Assertions, generic RTAssertShouldPanic. */ diff --git a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp index 9538472ce..d36b2c2e3 100644 --- a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirQueryInfo-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTDirQueryInfo-generic.cpp $ */ /** @file * IPRT - RTDirQueryInfo, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp index 5b1610307..8030fa1b2 100644 --- a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTDirSetTimes-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTDirSetTimes-generic.cpp $ */ /** @file * IPRT - RTDirSetTimes, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp index a065045b5..598511398 100644 --- a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileCopy-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTFileCopy-generic.cpp $ */ /** @file * IPRT - RTFileCopy, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileMove-generic.cpp b/src/VBox/Runtime/generic/RTFileMove-generic.cpp index e154d17d1..ff26f811f 100644 --- a/src/VBox/Runtime/generic/RTFileMove-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileMove-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileMove-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTFileMove-generic.cpp $ */ /** @file * IPRT - RTFileMove, Generic. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp index af30b370d..3165a67c8 100644 --- a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAll-generic.cpp 8925 2008-05-19 16:59:11Z vboxsync $ */ +/* $Id: RTFileReadAll-generic.cpp $ */ /** @file * IPRT - RTFileReadAll, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp index e8cae0460..43f21423c 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllByHandle-generic.cpp 8925 2008-05-19 16:59:11Z vboxsync $ */ +/* $Id: RTFileReadAllByHandle-generic.cpp $ */ /** @file * IPRT - RTFileReadAllByHandle, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp index b9750f888..42b07aab2 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllByHandleEx-generic.cpp 8954 2008-05-20 14:02:01Z vboxsync $ */ +/* $Id: RTFileReadAllByHandleEx-generic.cpp $ */ /** @file * IPRT - RTFileReadAllByHandleEx, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp index c4b565282..f59dbb58e 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllEx-generic.cpp 8925 2008-05-19 16:59:11Z vboxsync $ */ +/* $Id: RTFileReadAllEx-generic.cpp $ */ /** @file * IPRT - RTFileReadAllEx, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp index acdb11ade..600910bf7 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTFileReadAllFree-generic.cpp 8925 2008-05-19 16:59:11Z vboxsync $ */ +/* $Id: RTFileReadAllFree-generic.cpp $ */ /** @file * IPRT - RTFileReadAllFree, generic implementation. */ diff --git a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp index 83ea574ca..d9f91b1f9 100644 --- a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogDefaultInit-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogDefaultInit-generic.cpp $ */ /** @file * IPRT - Default Log Init, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp index c1ddac49b..9db6e8fe7 100644 --- a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-generic.cpp $ */ /** @file * IPRT - Log To Debugger, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp index 076ccaba9..dc4035591 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdErr-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteStdErr-generic.cpp $ */ /** @file * IPRT - Log To StdErr, Generic. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp index 7a1fef742..3e2e5af61 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdErr-stub-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteStdErr-stub-generic.cpp $ */ /** @file * IPRT - Log To StdErr, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp index 2e06f3699..166a9ca9d 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-generic.cpp $ */ /** @file * IPRT - Log To StdOut, Generic. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp index 648ad81f2..d8ae088e7 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-stub-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-stub-generic.cpp $ */ /** @file * IPRT - Log To StdOut, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp index 4e719c4ce..ed057b934 100644 --- a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteUser-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteUser-generic.cpp $ */ /** @file * IPRT - Log User Specific Output, Generic Dummy. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp index 580ec9ea9..b13a95f08 100644 --- a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuId-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpCpuId-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuId. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp index 19bc0e910..c7e1d6c2b 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuIdFromSetIndex-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpCpuIdFromSetIndex-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuIdFromSetIndex. */ diff --git a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp index 4f2fe695a..05f36a3cd 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpCpuIdToSetIndex-generic.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: RTMpCpuIdToSetIndex-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpCpuIdToSetIndex. */ diff --git a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp index a4c21fa75..56ccf7022 100644 --- a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCount-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpGetCount-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetCount. */ diff --git a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp index a9c185c2a..1de4355d6 100644 --- a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCurFrequency-generic.cpp 10425 2008-07-09 14:08:23Z vboxsync $ */ +/* $Id: RTMpGetCurFrequency-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetCurFrequency. */ diff --git a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp index 8f8b5d1b7..e805b6733 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetMaxCpuId-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpGetMaxCpuId-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetMaxCpuId. */ diff --git a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp index d83839834..c19a8b1f0 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetMaxFrequency-generic.cpp 10425 2008-07-09 14:08:23Z vboxsync $ */ +/* $Id: RTMpGetMaxFrequency-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetMaxFrequency. */ diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp index 9fa4e31a5..9f117adf2 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetOnlineCount-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpGetOnlineCount-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetOnlineCount. */ diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp index ba7e8f252..5bf698e58 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetOnlineSet-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpGetOnlineSet-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetOnlineSet. */ diff --git a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp index 85518f571..6ec549800 100644 --- a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetSet-generic.cpp 9429 2008-06-05 15:22:37Z vboxsync $ */ +/* $Id: RTMpGetSet-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpGetSet. */ diff --git a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp index 865171481..4e1a27cc1 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuOnline-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpIsCpuOnline-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpIsCpuOnline. */ diff --git a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp index f33c29f5e..b20f435df 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuPossible-generic.cpp 9429 2008-06-05 15:22:37Z vboxsync $ */ +/* $Id: RTMpIsCpuPossible-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Generic RTMpIsCpuPossible. */ diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp index d8c312457..9e59998a0 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTRandAdvCreateSystemFaster-generic.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: RTRandAdvCreateSystemFaster-generic.cpp $ */ /** @file * IPRT - Random Numbers, generic RTRandAdvCreateSystemFaster. */ diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp index 66977ce90..fa641a06c 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTRandAdvCreateSystemTruer-generic.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: RTRandAdvCreateSystemTruer-generic.cpp $ */ /** @file * IPRT - Random Numbers, generic RTRandAdvCreateSystemTruer. */ diff --git a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp index a195ac653..62edce543 100644 --- a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-generic.cpp 11350 2008-08-12 11:25:18Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-generic.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, generic stub. */ diff --git a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp index bd5ec04e2..d63ce4da1 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeLocalDeltaNano-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTTimeLocalDeltaNano-generic.cpp $ */ /** @file * IPRT - Time, generic RTTimeLocalDeltaNano. */ diff --git a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp index cc5a0ed6b..93f528123 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: $ */ +/* $Id: $ */ /** @file * IPRT - Time, generic RTTimeLocalExplode. */ diff --git a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp index 14cd236f1..2cd63ab49 100644 --- a/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimerCreate-generic.cpp @@ -1,4 +1,4 @@ -/** $Id: RTTimerCreate-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/** $Id: RTTimerCreate-generic.cpp $ */ /** @file * IPRT - Timers, Generic RTTimerCreate() Implementation. */ diff --git a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp index 5cc97983a..31bb9bd28 100644 --- a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp @@ -1,4 +1,4 @@ -/** $Id: RTTimerLRCreate-generic.cpp 10944 2008-07-29 18:08:58Z vboxsync $ */ +/** $Id: RTTimerLRCreate-generic.cpp $ */ /** @file * IPRT - Low Resolution Timers, Generic RTTimerLRCreate() Implementation. */ diff --git a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp index 4d44333c3..4cf60a4f1 100644 --- a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTUuidCreate-generic.cpp 11413 2008-08-14 08:03:03Z vboxsync $ */ +/* $Id: RTUuidCreate-generic.cpp $ */ /** @file * IPRT - UUID, Generic RTUuidCreate implementation. */ diff --git a/src/VBox/Runtime/generic/critsect-generic.cpp b/src/VBox/Runtime/generic/critsect-generic.cpp index a10c515fd..92a4e7577 100644 --- a/src/VBox/Runtime/generic/critsect-generic.cpp +++ b/src/VBox/Runtime/generic/critsect-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: critsect-generic.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: critsect-generic.cpp $ */ /** @file * IPRT - Critical Section, Generic. */ diff --git a/src/VBox/Runtime/generic/env-generic.cpp b/src/VBox/Runtime/generic/env-generic.cpp index ebe59d3ef..a5b7e76b1 100644 --- a/src/VBox/Runtime/generic/env-generic.cpp +++ b/src/VBox/Runtime/generic/env-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: env-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: env-generic.cpp $ */ /** @file * IPRT - Environment, Generic. */ diff --git a/src/VBox/Runtime/generic/fs-stubs-generic.cpp b/src/VBox/Runtime/generic/fs-stubs-generic.cpp index fcc0fdca6..468d3f67f 100644 --- a/src/VBox/Runtime/generic/fs-stubs-generic.cpp +++ b/src/VBox/Runtime/generic/fs-stubs-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-stubs-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: fs-stubs-generic.cpp $ */ /** @file * IPRT - File System, Generic Stubs. */ diff --git a/src/VBox/Runtime/generic/mppresent-generic.cpp b/src/VBox/Runtime/generic/mppresent-generic.cpp index fb5992b70..6dad88b00 100644 --- a/src/VBox/Runtime/generic/mppresent-generic.cpp +++ b/src/VBox/Runtime/generic/mppresent-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: mppresent-generic.cpp 12104 2008-09-04 19:33:44Z vboxsync $ */ +/* $Id: mppresent-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Stubs for the RTMp*Present* API. */ diff --git a/src/VBox/Runtime/generic/pathhost-generic.cpp b/src/VBox/Runtime/generic/pathhost-generic.cpp index 5ac72c125..52e4efd16 100644 --- a/src/VBox/Runtime/generic/pathhost-generic.cpp +++ b/src/VBox/Runtime/generic/pathhost-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: pathhost-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: pathhost-generic.cpp $ */ /** @file * IPRT - Path Convertions, generic. */ diff --git a/src/VBox/Runtime/generic/sched-generic.cpp b/src/VBox/Runtime/generic/sched-generic.cpp index cd8158b99..f1842e600 100644 --- a/src/VBox/Runtime/generic/sched-generic.cpp +++ b/src/VBox/Runtime/generic/sched-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: sched-generic.cpp $ */ /** @file * IPRT - Scheduling, generic stubs. */ diff --git a/src/VBox/Runtime/generic/semfastmutex-generic.cpp b/src/VBox/Runtime/generic/semfastmutex-generic.cpp index 556334db0..e7a7448f3 100644 --- a/src/VBox/Runtime/generic/semfastmutex-generic.cpp +++ b/src/VBox/Runtime/generic/semfastmutex-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semfastmutex-generic.cpp $ */ /** @file * IPRT - Fast Mutex, Generic. */ diff --git a/src/VBox/Runtime/generic/semnoint-generic.cpp b/src/VBox/Runtime/generic/semnoint-generic.cpp index a4b34e597..a908f3efc 100644 --- a/src/VBox/Runtime/generic/semnoint-generic.cpp +++ b/src/VBox/Runtime/generic/semnoint-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semnoint-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semnoint-generic.cpp $ */ /** @file * IPRT - Generic Non-Interruptable Wait and Request Functions. */ diff --git a/src/VBox/Runtime/generic/semrw-generic.cpp b/src/VBox/Runtime/generic/semrw-generic.cpp index 5ad2bfed0..be056c034 100644 --- a/src/VBox/Runtime/generic/semrw-generic.cpp +++ b/src/VBox/Runtime/generic/semrw-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semrw-generic.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: semrw-generic.cpp $ */ /** @file * Excerpt from kProfileR3.cpp. */ diff --git a/src/VBox/Runtime/generic/semsrw-generic.cpp b/src/VBox/Runtime/generic/semsrw-generic.cpp index 90d10a2f8..135c0487a 100644 --- a/src/VBox/Runtime/generic/semsrw-generic.cpp +++ b/src/VBox/Runtime/generic/semsrw-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: semsrw-generic.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: semsrw-generic.cpp $ */ /** @file * IPRT - Read-Write Semaphore, Generic. * diff --git a/src/VBox/Runtime/generic/spinlock-generic.cpp b/src/VBox/Runtime/generic/spinlock-generic.cpp index c80a65821..1515c6187 100644 --- a/src/VBox/Runtime/generic/spinlock-generic.cpp +++ b/src/VBox/Runtime/generic/spinlock-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-generic.cpp $ */ /** @file * IPRT - Spinlock, generic implementation. */ diff --git a/src/VBox/Runtime/generic/timer-generic.cpp b/src/VBox/Runtime/generic/timer-generic.cpp index 0a8f64043..66144af5f 100644 --- a/src/VBox/Runtime/generic/timer-generic.cpp +++ b/src/VBox/Runtime/generic/timer-generic.cpp @@ -1,4 +1,4 @@ -/** $Id: timer-generic.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/** $Id: timer-generic.cpp $ */ /** @file * IPRT - Timers, Generic. */ diff --git a/src/VBox/Runtime/generic/timerlr-generic.cpp b/src/VBox/Runtime/generic/timerlr-generic.cpp index 2d0273163..cf87ab4d2 100644 --- a/src/VBox/Runtime/generic/timerlr-generic.cpp +++ b/src/VBox/Runtime/generic/timerlr-generic.cpp @@ -1,4 +1,4 @@ -/** $Id: timerlr-generic.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/** $Id: timerlr-generic.cpp $ */ /** @file * IPRT - Low Resolution Timers, Generic. * diff --git a/src/VBox/Runtime/generic/tls-generic.cpp b/src/VBox/Runtime/generic/tls-generic.cpp index 213c4fa3a..dad23bcea 100644 --- a/src/VBox/Runtime/generic/tls-generic.cpp +++ b/src/VBox/Runtime/generic/tls-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tls-generic.cpp $ */ /** @file * IPRT - Thread Local Storage (TSL), Generic Implementation. */ diff --git a/src/VBox/Runtime/generic/utf16locale-generic.cpp b/src/VBox/Runtime/generic/utf16locale-generic.cpp index 98b037f21..15ba03a55 100644 --- a/src/VBox/Runtime/generic/utf16locale-generic.cpp +++ b/src/VBox/Runtime/generic/utf16locale-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: utf16locale-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: utf16locale-generic.cpp $ */ /** @file * IPRT - UTF-16 Locale Specific Manipulation, Generic. */ diff --git a/src/VBox/Runtime/generic/uuid-generic.cpp b/src/VBox/Runtime/generic/uuid-generic.cpp index 30dddd236..92e81b2a1 100644 --- a/src/VBox/Runtime/generic/uuid-generic.cpp +++ b/src/VBox/Runtime/generic/uuid-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: uuid-generic.cpp 14067 2008-11-10 23:35:26Z vboxsync $ */ +/* $Id: uuid-generic.cpp $ */ /** @file * IPRT - UUID, Generic. */ diff --git a/src/VBox/Runtime/include/internal/dir.h b/src/VBox/Runtime/include/internal/dir.h index c53696ec8..0d9c3449d 100644 --- a/src/VBox/Runtime/include/internal/dir.h +++ b/src/VBox/Runtime/include/internal/dir.h @@ -1,4 +1,4 @@ -/* $Id: dir.h 14059 2008-11-10 23:05:44Z vboxsync $ */ +/* $Id: dir.h $ */ /** @file * IPRT - Internal Header for RTDir. */ diff --git a/src/VBox/Runtime/include/internal/file.h b/src/VBox/Runtime/include/internal/file.h index 6f2e04653..a5c35f324 100644 --- a/src/VBox/Runtime/include/internal/file.h +++ b/src/VBox/Runtime/include/internal/file.h @@ -1,4 +1,4 @@ -/* $Id: file.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: file.h $ */ /** @file * IPRT - Internal RTFile header. */ diff --git a/src/VBox/Runtime/include/internal/fs.h b/src/VBox/Runtime/include/internal/fs.h index 013b84fe6..648ff6522 100644 --- a/src/VBox/Runtime/include/internal/fs.h +++ b/src/VBox/Runtime/include/internal/fs.h @@ -1,4 +1,4 @@ -/* $Id: fs.h 14058 2008-11-10 23:01:55Z vboxsync $ */ +/* $Id: fs.h $ */ /** @file * IPRT - Internal RTFs header. */ diff --git a/src/VBox/Runtime/include/internal/initterm.h b/src/VBox/Runtime/include/internal/initterm.h index 244266d46..aff126aba 100644 --- a/src/VBox/Runtime/include/internal/initterm.h +++ b/src/VBox/Runtime/include/internal/initterm.h @@ -1,4 +1,4 @@ -/* $Id: initterm.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm.h $ */ /** @file * IPRT - Initialization & Termination. */ diff --git a/src/VBox/Runtime/include/internal/ldr.h b/src/VBox/Runtime/include/internal/ldr.h index 342945636..4cd266154 100644 --- a/src/VBox/Runtime/include/internal/ldr.h +++ b/src/VBox/Runtime/include/internal/ldr.h @@ -1,4 +1,4 @@ -/* $Id: ldr.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldr.h $ */ /** @file * IPRT - Loader Internals. */ diff --git a/src/VBox/Runtime/include/internal/ldrMZ.h b/src/VBox/Runtime/include/internal/ldrMZ.h index 5e1b7a456..9ad8f2b58 100644 --- a/src/VBox/Runtime/include/internal/ldrMZ.h +++ b/src/VBox/Runtime/include/internal/ldrMZ.h @@ -1,4 +1,4 @@ -/* $Id: ldrMZ.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrMZ.h $ */ /** @file * IPRT, MZ header. */ diff --git a/src/VBox/Runtime/include/internal/ldrPE.h b/src/VBox/Runtime/include/internal/ldrPE.h index df54e32e9..a48b16536 100644 --- a/src/VBox/Runtime/include/internal/ldrPE.h +++ b/src/VBox/Runtime/include/internal/ldrPE.h @@ -1,4 +1,4 @@ -/* $Id: ldrPE.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrPE.h $ */ /** @file * IPRT - Windows NT PE Structures and Constants. */ diff --git a/src/VBox/Runtime/include/internal/magics.h b/src/VBox/Runtime/include/internal/magics.h index 5d4780c76..68852c6af 100644 --- a/src/VBox/Runtime/include/internal/magics.h +++ b/src/VBox/Runtime/include/internal/magics.h @@ -1,4 +1,4 @@ -/* $Id: magics.h 12287 2008-09-09 11:58:51Z vboxsync $ */ +/* $Id: magics.h $ */ /** @file * IPRT - Internal header defining The Magic Numbers. */ diff --git a/src/VBox/Runtime/include/internal/memobj.h b/src/VBox/Runtime/include/internal/memobj.h index b47de60cf..77510eb94 100644 --- a/src/VBox/Runtime/include/internal/memobj.h +++ b/src/VBox/Runtime/include/internal/memobj.h @@ -1,4 +1,4 @@ -/* $Revision: 14824 $ */ +/* $Revision: 40150 $ */ /** @file * IPRT - Ring-0 Memory Objects. */ diff --git a/src/VBox/Runtime/include/internal/path.h b/src/VBox/Runtime/include/internal/path.h index e880c8511..9acf06dc9 100644 --- a/src/VBox/Runtime/include/internal/path.h +++ b/src/VBox/Runtime/include/internal/path.h @@ -1,4 +1,4 @@ -/* $Id: path.h 11836 2008-08-29 16:52:20Z vboxsync $ */ +/* $Id: path.h $ */ /** @file * IPRT - RTPath Internal header. */ diff --git a/src/VBox/Runtime/include/internal/process.h b/src/VBox/Runtime/include/internal/process.h index cd805f46e..ad5da2ca9 100644 --- a/src/VBox/Runtime/include/internal/process.h +++ b/src/VBox/Runtime/include/internal/process.h @@ -1,4 +1,4 @@ -/* $Id: process.h 11836 2008-08-29 16:52:20Z vboxsync $ */ +/* $Id: process.h $ */ /** @file * IPRT - Internal RTProc header. */ diff --git a/src/VBox/Runtime/include/internal/rand.h b/src/VBox/Runtime/include/internal/rand.h index a444ed8d0..59b566f32 100644 --- a/src/VBox/Runtime/include/internal/rand.h +++ b/src/VBox/Runtime/include/internal/rand.h @@ -1,4 +1,4 @@ -/* $Id: rand.h 11523 2008-08-20 20:48:52Z vboxsync $ */ +/* $Id: rand.h $ */ /** @file * IPRT - Internal RTRand header */ diff --git a/src/VBox/Runtime/include/internal/sched.h b/src/VBox/Runtime/include/internal/sched.h index b5ade815d..7d1bcc68f 100644 --- a/src/VBox/Runtime/include/internal/sched.h +++ b/src/VBox/Runtime/include/internal/sched.h @@ -1,4 +1,4 @@ -/* $Id: sched.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: sched.h $ */ /** @file * IPRT - Internal RTSched header. */ diff --git a/src/VBox/Runtime/include/internal/strict.h b/src/VBox/Runtime/include/internal/strict.h index 3691e93e6..e12bcdd39 100644 --- a/src/VBox/Runtime/include/internal/strict.h +++ b/src/VBox/Runtime/include/internal/strict.h @@ -1,4 +1,4 @@ -/* $Id: strict.h 8651 2008-05-07 12:16:29Z vboxsync $ */ +/* $Id: strict.h $ */ /** @file * IPRT - Internal Header Defining Strictness Indicators. */ diff --git a/src/VBox/Runtime/include/internal/string.h b/src/VBox/Runtime/include/internal/string.h index 9ac2c297e..d4816dd5e 100644 --- a/src/VBox/Runtime/include/internal/string.h +++ b/src/VBox/Runtime/include/internal/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: string.h $ */ /** @file * IPRT - Internal RTStr header. */ diff --git a/src/VBox/Runtime/include/internal/thread.h b/src/VBox/Runtime/include/internal/thread.h index 5ca0be4f1..fca62e49b 100644 --- a/src/VBox/Runtime/include/internal/thread.h +++ b/src/VBox/Runtime/include/internal/thread.h @@ -1,4 +1,4 @@ -/* $Id: thread.h 8645 2008-05-07 11:01:00Z vboxsync $ */ +/* $Id: thread.h $ */ /** @file * IPRT - Internal RTThread header. */ diff --git a/src/VBox/Runtime/include/internal/time.h b/src/VBox/Runtime/include/internal/time.h index 688d94c13..4fda4403b 100644 --- a/src/VBox/Runtime/include/internal/time.h +++ b/src/VBox/Runtime/include/internal/time.h @@ -1,4 +1,4 @@ -/* $Id: time.h 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: time.h $ */ /** @file * IPRT - Internal RTTime header */ diff --git a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp index e40bb1b06..900354045 100644 --- a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp +++ b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromNtStatus.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTErrConvertFromNtStatus.cpp $ */ /** @file * IPRT - Convert NT status codes to iprt status codes. */ diff --git a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp index 484919c47..8bffb9ee9 100644 --- a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp +++ b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromOS2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTErrConvertFromOS2.cpp $ */ /** @file * IPRT - Convert OS/2 error codes to iprt status codes. */ diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp index 7d6a36bfc..ad747c915 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv.cpp 14743 2008-11-27 21:17:06Z vboxsync $ */ +/* $Id: alloc-r0drv.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver. */ diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.h b/src/VBox/Runtime/r0drv/alloc-r0drv.h index 95a94bf1f..218b9c265 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.h +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-r0drv.h $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver. */ diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp index c6a7af318..39569ede0 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-darwin.cpp $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp index eb768e739..4af33a943 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteStdOut-r0drv-darwin.cpp 10608 2008-07-14 16:21:07Z vboxsync $ */ +/* $Id: RTLogWriteStdOut-r0drv-darwin.cpp $ */ /** @file * IPRT - Log To StdOut, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp index 38075ee40..4be5e2582 100644 --- a/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/alloc-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-r0drv-darwin.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp index 2293d6f61..c0184edcc 100644 --- a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-darwin.cpp 14500 2008-11-24 02:22:08Z vboxsync $ */ +/* $Id: assert-r0drv-darwin.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp index b24712549..a7be03f7e 100644 --- a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm-r0drv-darwin.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp index f08b91b23..76c77a5b5 100644 --- a/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/memobj-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-darwin.cpp 15835 2009-01-07 15:18:17Z vboxsync $ */ +/* $Id: memobj-r0drv-darwin.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp index 8d481c04f..f3b7f0285 100644 --- a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-darwin.cpp 15843 2009-01-07 18:35:24Z vboxsync $ */ +/* $Id: mp-r0drv-darwin.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp index 7f2b50022..26d7ad7e2 100644 --- a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-darwin.cpp $ */ /** @file * IPRT - Process, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp index 1a1e7359e..20c8fe391 100644 --- a/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semaphore-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: semaphore-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semaphore-r0drv-darwin.cpp $ */ /** @file * IPRT - Semaphores, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp index 1f140a01a..6757ee45d 100644 --- a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-r0drv-darwin.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h index 5d341cafb..c0659e19a 100644 --- a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h +++ b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-darwin-kernel.h 14338 2008-11-18 23:38:52Z vboxsync $ */ +/* $Id: the-darwin-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Darwing kernel. */ diff --git a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp index a15273fce..b15ea018d 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread-r0drv-darwin.cpp $ */ /** @file * IPRT - Threads, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp index 1ffb77942..82c69651e 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread2-r0drv-darwin.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp index 10e880c41..d205f220a 100644 --- a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-r0drv-darwin.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, Darwin. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c index 39c3e5774..7171b195c 100644 --- a/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/alloc-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-r0drv-freebsd.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c index 9281b8ba3..d8e01f4cc 100644 --- a/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/assert-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: assert-r0drv-freebsd.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c index fd1795754..591b77973 100644 --- a/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/initterm-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm-r0drv-freebsd.c $ */ /** @file * IPRT - Initialization & Termination, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c index 200e4d9f6..8913375d2 100644 --- a/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/memobj-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-freebsd.c 14824 2008-11-30 07:52:59Z vboxsync $ */ +/* $Id: memobj-r0drv-freebsd.c $ */ /** @file * IPRT - Ring-0 Memory Objects, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-darwin.cpp index 0ec7eb1c8..6d3340b5d 100644 --- a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-darwin.cpp 15843 2009-01-07 18:35:24Z vboxsync $ */ +/* $Id: mp-r0drv-darwin.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c index d122e9627..96af287aa 100644 --- a/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/process-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-freebsd.c $ */ /** @file * IPRT - Process Management, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c index 8419ea1f4..dbfcfca69 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semevent-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semevent-r0drv-freebsd.c $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c index ea40e202e..ac840b7f0 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semeventmulti-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-freebsd.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c index 5118b5ac4..096a3e5d2 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semfastmutex-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-freebsd.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c index 6589d65d1..cb00eec87 100644 --- a/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/spinlock-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-r0drv-freebsd.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h b/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h index 173bb83cb..40be912f4 100644 --- a/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h +++ b/src/VBox/Runtime/r0drv/freebsd/the-freebsd-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-freebsd-kernel.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: the-freebsd-kernel.h $ */ /** @file * IPRT - Ring-0 Driver, The FreeBSD Kernel Headers. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c index 3b0e89718..b476cd3fc 100644 --- a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread-r0drv-freebsd.c $ */ /** @file * IPRT - Threads (Part 1), Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c index c2b97b9ea..5217823f6 100644 --- a/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/thread2-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread2-r0drv-freebsd.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c index c16725017..7f356a10c 100644 --- a/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/time-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-freebsd.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-r0drv-freebsd.c $ */ /** @file * IPRT - Time, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c index 751b26bf4..5573b3b40 100644 --- a/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/timer-r0drv-freebsd.c @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-freebsd.c 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: timer-r0drv-freebsd.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, FreeBSD. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp index 1896c2bc4..9c6570012 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpIsCpuWorkPending-r0drv-generic.cpp 15843 2009-01-07 18:35:24Z vboxsync $ */ +/* $Id: RTMpIsCpuWorkPending-r0drv-generic.cpp $ */ /** @file * IPRT - RTMpIsCpuWorkPending, Generic. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp index 7baec28f0..bd4f39ca6 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpOn-r0drv-generic.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTMpOn-r0drv-generic.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp index daaec9619..2b98f8f97 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptDisable-r0drv-generic.cpp 13254 2008-10-14 12:35:50Z vboxsync $ */ +/* $Id: RTThreadPreemptDisable-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptDisable, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp index 4449e055c..0dce5464b 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptIsEnabled-r0drv-generic.cpp 13254 2008-10-14 12:35:50Z vboxsync $ */ +/* $Id: RTThreadPreemptIsEnabled-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptIsEnabled, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp index 9edc35d82..d02196769 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptRestore-r0drv-generic.cpp 13275 2008-10-15 08:48:31Z vboxsync $ */ +/* $Id: RTThreadPreemptRestore-r0drv-generic.cpp $ */ /** @file * IPRT - RTThreadPreemptRestore, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp index 1ccd55b93..7060b8510 100644 --- a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-generic.cpp 9619 2008-06-11 15:02:41Z vboxsync $ */ +/* $Id: mpnotification-r0drv-generic.cpp $ */ /** @file * IPRT - Multiprocessor Notifications, Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp index ce478be32..42db20506 100644 --- a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv.cpp 13476 2008-10-22 09:40:31Z vboxsync $ */ +/* $Id: initterm-r0drv.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Common. */ diff --git a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c index 61b64a297..1c988774e 100644 --- a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-linux.c $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c index fb75f4a68..cbd5d1cfd 100644 --- a/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/RTThreadPreemptDisable-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptDisable-r0drv-linux.c 15801 2009-01-05 13:18:08Z vboxsync $ */ +/* $Id: RTThreadPreemptDisable-r0drv-linux.c $ */ /** @file * IPRT - RTThreadPreemptDisable, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c index e5e9d9ab4..d29272174 100644 --- a/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/RTThreadPreemptRestore-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: RTThreadPreemptRestore-r0drv-linux.c 15801 2009-01-05 13:18:08Z vboxsync $ */ +/* $Id: RTThreadPreemptRestore-r0drv-linux.c $ */ /** @file * IPRT - RTThreadPreemptRestore, Generic ring-0 driver implementation. */ diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c index f1c50e121..a71ce6059 100644 --- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-linux.c 13665 2008-10-29 17:42:51Z vboxsync $ */ +/* $Id: alloc-r0drv-linux.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c index 0f36f7e15..61d674168 100644 --- a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-linux.c 13512 2008-10-23 07:21:59Z vboxsync $ */ +/* $Id: assert-r0drv-linux.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c index 7a8a6109b..c3b0b4d8b 100644 --- a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm-r0drv-linux.c $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c index c3130c9e9..b18cb1c7c 100644 --- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Revision: 14824 $ */ +/* $Revision: 42342 $ */ /** @file * IPRT - Ring-0 Memory Objects, Linux. */ @@ -743,14 +743,25 @@ int rtR0MemObjNativeLockUser(PPRTR0MEMOBJINTERNAL ppMem, RTR3PTR R3Ptr, size_t c if (rc == cPages) { /* - * Flush dcache (required?) and protect against fork. + * Flush dcache (required?), protect against fork and _really_ pin the page + * table entries. get_user_pages() will protect against swapping out the + * pages but it will NOT protect against removing page table entries. This + * can be achieved with + * - using mlock / mmap(..., MAP_LOCKED, ...) from userland. This requires + * an appropriate limit set up with setrlimit(..., RLIMIT_MEMLOCK, ...). + * Usual Linux distributions support only a limited size of locked pages + * (e.g. 32KB). + * - setting the PageReserved bit (as we do in rtR0MemObjLinuxAllocPages() + * or by + * - setting the VM_LOCKED flag. This is the same as doing mlock() without + * a range check. */ /** @todo The Linux fork() protection will require more work if this API * is to be used for anything but locking VM pages. */ while (rc-- > 0) { flush_dcache_page(pMemLnx->apPages[rc]); - papVMAs[rc]->vm_flags |= VM_DONTCOPY; + papVMAs[rc]->vm_flags |= (VM_DONTCOPY | VM_LOCKED); } up_read(&pTask->mm->mmap_sem); diff --git a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c index 7be4fdb62..9fb8ee38e 100644 --- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-linux.c 15843 2009-01-07 18:35:24Z vboxsync $ */ +/* $Id: mp-r0drv-linux.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c index 3e4ee4fdf..dfe740aa9 100644 --- a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-linux.c 12029 2008-09-03 12:15:34Z vboxsync $ */ +/* $Id: mpnotification-r0drv-linux.c $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c index 09c892efe..d33496a79 100644 --- a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-linux.c $ */ /** @file * IPRT - Process, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c index f92c9da1e..4c545e997 100644 --- a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semevent-r0drv-linux.c $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c index 6b39b57f5..e1069930e 100644 --- a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-linux.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c index f1981c5f9..0dcd2fee1 100644 --- a/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semfastmutex-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-linux.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c index e85393a21..268ca5fa6 100644 --- a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semmutex-r0drv-linux.c $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c index fd7503a26..e43f76d8b 100644 --- a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-linux.c 13770 2008-11-03 19:18:27Z vboxsync $ */ +/* $Id: spinlock-r0drv-linux.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/string.h b/src/VBox/Runtime/r0drv/linux/string.h index cb4a7005f..459c04320 100644 --- a/src/VBox/Runtime/r0drv/linux/string.h +++ b/src/VBox/Runtime/r0drv/linux/string.h @@ -1,4 +1,4 @@ -/* $Id: string.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: string.h $ */ /** @file * IPRT - wrapper for the linux kernel asm/string.h. */ diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h index b6ea5f23f..8d15808b4 100644 --- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-linux-kernel.h 15851 2009-01-08 10:30:27Z vboxsync $ */ +/* $Id: the-linux-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Linux kernel. */ diff --git a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c index 215c4e10b..221808575 100644 --- a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-linux.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread-r0drv-linux.c $ */ /** @file * IPRT - Threads, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c index debb2bc12..b1e765900 100644 --- a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-linux.c 14465 2008-11-21 15:04:40Z vboxsync $ */ +/* $Id: thread2-r0drv-linux.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c index 3ccaa3725..d9d58d8aa 100644 --- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-linux.c 9369 2008-06-03 22:30:19Z vboxsync $ */ +/* $Id: time-r0drv-linux.c $ */ /** @file * IPRT - Time, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c index 141ac21a5..8bc7ffaf4 100644 --- a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-linux.c 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: timer-r0drv-linux.c $ */ /** @file * IPRT - Timers, Ring-0 Driver, Linux. */ diff --git a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp index 44f3705d4..56798063c 100644 --- a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp @@ -1,4 +1,4 @@ -/* $Revision: 15718 $ */ +/* $Revision: 41282 $ */ /** @file * IPRT - Ring-0 Memory Objects, Common Code. */ diff --git a/src/VBox/Runtime/r0drv/mp-r0drv.h b/src/VBox/Runtime/r0drv/mp-r0drv.h index 0a397876f..673688051 100644 --- a/src/VBox/Runtime/r0drv/mp-r0drv.h +++ b/src/VBox/Runtime/r0drv/mp-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv.h 9602 2008-06-11 12:09:31Z vboxsync $ */ +/* $Id: mp-r0drv.h $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Internal Header. */ diff --git a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c index f581edc13..1db075fc3 100644 --- a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv.c 12292 2008-09-09 13:16:16Z vboxsync $ */ +/* $Id: mpnotification-r0drv.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Event Notifications. */ diff --git a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp index fd14b021a..fa7748210 100644 --- a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-r0drv-nt.cpp $ */ /** @file * IPRT - Log To Debugger, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp index 765ef0e95..850c9e00d 100644 --- a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-nt.cpp 14069 2008-11-10 23:39:34Z vboxsync $ */ +/* $Id: alloc-r0drv-nt.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp index 57a5813f9..880b31d46 100644 --- a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-nt.cpp 11917 2008-09-01 12:55:38Z vboxsync $ */ +/* $Id: assert-r0drv-nt.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp index 52ff4f9c4..6a39ab2a6 100644 --- a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-nt.cpp 9603 2008-06-11 12:13:02Z vboxsync $ */ +/* $Id: initterm-r0drv-nt.cpp $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h index 901d046fe..ff6c96a2a 100644 --- a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h +++ b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h @@ -1,4 +1,4 @@ -/* $Id: internal-r0drv-nt.h 9582 2008-06-10 23:38:18Z vboxsync $ */ +/* $Id: internal-r0drv-nt.h $ */ /** @file * IPRT - Internal Header for the NT Ring-0 Driver Code. */ diff --git a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp index 49b39708d..536b16d81 100644 --- a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-nt.cpp 14824 2008-11-30 07:52:59Z vboxsync $ */ +/* $Id: memobj-r0drv-nt.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp index a404af946..e0e358a0c 100644 --- a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-nt.cpp 15896 2009-01-12 14:19:37Z vboxsync $ */ +/* $Id: mp-r0drv-nt.cpp $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp index 935f91d28..6b1ded3d4 100644 --- a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-nt.cpp 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: mpnotification-r0drv-nt.cpp $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp index 2de16ddf6..92540ca4c 100644 --- a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-nt.cpp $ */ /** @file * IPRT - Process, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp index eb08c3ac4..fbb549ba6 100644 --- a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semevent-r0drv-nt.cpp $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp index 22878a1e7..276e4cbff 100644 --- a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-nt.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp index 803cedd49..05f00c3ba 100644 --- a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-nt.cpp 12160 2008-09-05 23:23:14Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-nt.cpp $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp index 5d2f8b06a..46449c703 100644 --- a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semmutex-r0drv-nt.cpp $ */ /** @file * IPRT - Mutex Semaphores, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp index 47a7ca3ac..eb7851b51 100644 --- a/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/spinlock-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-r0drv-nt.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h index 29eecbe5b..c58347b5c 100644 --- a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h +++ b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-nt-kernel.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: the-nt-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the NT kernel. */ diff --git a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp index 8e25d0439..56ae34d5b 100644 --- a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-nt.cpp 13262 2008-10-14 13:09:04Z vboxsync $ */ +/* $Id: thread-r0drv-nt.cpp $ */ /** @file * IPRT - Threads, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp index 428696749..756d32e68 100644 --- a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-nt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread2-r0drv-nt.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp index d6259d23d..17ff2c364 100644 --- a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-nt.cpp 9958 2008-06-26 14:25:49Z vboxsync $ */ +/* $Id: time-r0drv-nt.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, Nt. */ diff --git a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp index 9697bb34a..283164c6a 100644 --- a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-nt.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/* $Id: timer-r0drv-nt.cpp $ */ /** @file * IPRT - Timers, Ring-0 Driver, NT. */ diff --git a/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm index dedefeb81..17e370520 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0AssertPanicSystem-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: RTR0AssertPanicSystem-r0drv-os2.asm 13306 2008-10-15 21:17:04Z vboxsync $ +; $Id: RTR0AssertPanicSystem-r0drv-os2.asm $ ;; @file ; IPRT - RTR0AssertPanicSystem, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm index 2ad429f45..e0c94b7f2 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHQueryDOSVar.asm @@ -1,4 +1,4 @@ -; $Id: RTR0Os2DHQueryDOSVar.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: RTR0Os2DHQueryDOSVar.asm $ ;; @file ; IPRT - DevHelp_GetDOSVar, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm index 82e221123..e1b44d42b 100644 --- a/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm +++ b/src/VBox/Runtime/r0drv/os2/RTR0Os2DHVMGlobalToProcess.asm @@ -1,4 +1,4 @@ -; $Id: RTR0Os2DHVMGlobalToProcess.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: RTR0Os2DHVMGlobalToProcess.asm $ ;; @file ; IPRT - DevHelp_VMGlobalToProcess, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp index 4602890a6..e33b3af08 100644 --- a/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/alloc-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-r0drv-os2.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp index 33c222ee7..1bf907d49 100644 --- a/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/assert-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: assert-r0drv-os2.cpp $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm index 4da5eea74..0e0808aab 100644 --- a/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/assertA-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: assertA-r0drv-os2.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: assertA-r0drv-os2.asm $ ;; @file ; IPRT - DevHelp_GetDOSVar, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp index 55d491a93..9a1872a81 100644 --- a/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/initterm-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm-r0drv-os2.cpp $ */ /** @file * IPRT - Initialization & Termination, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp index aec685219..dfa0f4a3e 100644 --- a/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/memobj-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-os2.cpp 14824 2008-11-30 07:52:59Z vboxsync $ */ +/* $Id: memobj-r0drv-os2.cpp $ */ /** @file * IPRT - Ring-0 Memory Objects, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp index eac1e4624..a05d0617e 100644 --- a/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/process-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: process-r0drv-os2.cpp $ */ /** @file * IPRT - Process Management, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp index cb326e452..8e31e33c7 100644 --- a/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semevent-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semevent-r0drv-os2.cpp $ */ /** @file * IPRT - Single Release Event Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp index 29063eac3..2e2842f5a 100644 --- a/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semeventmulti-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-os2.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp index e8d33cfef..523007cf4 100644 --- a/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/semfastmutex-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-os2.cpp $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp index d2b7b5fc2..e239f766a 100644 --- a/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/spinlock-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: spinlock-r0drv-os2.cpp $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h b/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h index 9071d4cd8..78b55b6a1 100644 --- a/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h +++ b/src/VBox/Runtime/r0drv/os2/the-os2-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-os2-kernel.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: the-os2-kernel.h $ */ /** @file * IPRT - Ring-0 Driver, The OS/2 Kernel Headers. */ diff --git a/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp index 38931b387..c12627fb5 100644 --- a/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/thread-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread-r0drv-os2.cpp $ */ /** @file * IPRT - Threads (Part 1), Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp index e13d305f8..77f4cbc56 100644 --- a/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/thread2-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread2-r0drv-os2.cpp $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Generic Stubs. */ diff --git a/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp index ab4bf1b9a..778ee2b0a 100644 --- a/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/time-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-r0drv-os2.cpp $ */ /** @file * IPRT - Time, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp index 7e1ed467c..207fe7fbd 100644 --- a/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/timer-r0drv-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-r0drv-os2.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/* $Id: timer-r0drv-os2.cpp $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, OS/2. */ diff --git a/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm b/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm index 788bcc907..474f85767 100644 --- a/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm +++ b/src/VBox/Runtime/r0drv/os2/timerA-r0drv-os2.asm @@ -1,4 +1,4 @@ -; $Id: timerA-r0drv-os2.asm 8256 2008-04-21 20:53:28Z vboxsync $ +; $Id: timerA-r0drv-os2.asm $ ;; @file ; IPRT - DevHelp_VMGlobalToProcess, Ring-0 Driver, OS/2. ; diff --git a/src/VBox/Runtime/r0drv/power-r0drv.h b/src/VBox/Runtime/r0drv/power-r0drv.h index ce8bae1ff..5eff3bade 100644 --- a/src/VBox/Runtime/r0drv/power-r0drv.h +++ b/src/VBox/Runtime/r0drv/power-r0drv.h @@ -1,4 +1,4 @@ -/* $Id: power-r0drv.h 13478 2008-10-22 09:44:13Z vboxsync $ */ +/* $Id: power-r0drv.h $ */ /** @file * IPRT - Power Management, Ring-0 Driver, Internal Header. */ diff --git a/src/VBox/Runtime/r0drv/powernotification-r0drv.c b/src/VBox/Runtime/r0drv/powernotification-r0drv.c index 85fe3f69e..fdd4f1812 100644 --- a/src/VBox/Runtime/r0drv/powernotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/powernotification-r0drv.c @@ -1,4 +1,4 @@ -/* $Id: powernotification-r0drv.c 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: powernotification-r0drv.c $ */ /** @file * IPRT - Power Management, Ring-0 Driver, Event Notifications. */ diff --git a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c index 046e8d235..df0fae836 100644 --- a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-r0drv-solaris.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c index b927cd633..5665e3736 100644 --- a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: assert-r0drv-solaris.c 13314 2008-10-15 22:46:08Z vboxsync $ */ +/* $Id: assert-r0drv-solaris.c $ */ /** @file * IPRT - Assertion Workers, Ring-0 Drivers, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c index c6d905e42..279a8e5e5 100644 --- a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: initterm-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: initterm-r0drv-solaris.c $ */ /** @file * IPRT - Initialization & Termination, R0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c index f765ab28f..a0e47e8dc 100644 --- a/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/memobj-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-solaris.c 14824 2008-11-30 07:52:59Z vboxsync $ */ +/* $Id: memobj-r0drv-solaris.c $ */ /** @file * IPRT - Ring-0 Memory Objects, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c index 005a0ca54..4db2a8946 100644 --- a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-solaris.c 15843 2009-01-07 18:35:24Z vboxsync $ */ +/* $Id: mp-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c index 4d7d1ecc9..37e38e8ba 100644 --- a/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-solaris.c 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: mpnotification-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c index 9d973d268..11086dc9c 100644 --- a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-solaris.c 13299 2008-10-15 19:07:33Z vboxsync $ */ +/* $Id: process-r0drv-solaris.c $ */ /** @file * IPRT - Process Management, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c index 6a9876fbf..8c3f9e9eb 100644 --- a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semevent-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semevent-r0drv-solaris.c $ */ /** @file * IPRT - Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c index 5fb55d4ec..8d2444644 100644 --- a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semeventmulti-r0drv-solaris.c $ */ /** @file * IPRT - Multiple Release Event Semaphores, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c index 4a03cf781..07f6b26b9 100644 --- a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: semfastmutex-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: semfastmutex-r0drv-solaris.c $ */ /** @file * IPRT - Fast Mutex Semaphores, Ring-0 Driver, Solaris. */ @@ -54,7 +54,7 @@ typedef struct RTSEMFASTMUTEXINTERNAL /** Magic value (RTSEMFASTMUTEX_MAGIC). */ uint32_t u32Magic; /** The Solaris mutex. */ - kmutex_t Mtx; + krwlock_t Mtx; } RTSEMFASTMUTEXINTERNAL, *PRTSEMFASTMUTEXINTERNAL; @@ -67,7 +67,7 @@ RTDECL(int) RTSemFastMutexCreate(PRTSEMFASTMUTEX pMutexSem) if (pFastInt) { pFastInt->u32Magic = RTSEMFASTMUTEX_MAGIC; - mutex_init (&pFastInt->Mtx, "IPRT Fast Mutex Semaphore", MUTEX_DRIVER, NULL); + rw_init (&pFastInt->Mtx, "RWLOCK", RW_DRIVER, NULL); *pMutexSem = pFastInt; return VINF_SUCCESS; } @@ -86,7 +86,7 @@ RTDECL(int) RTSemFastMutexDestroy(RTSEMFASTMUTEX MutexSem) VERR_INVALID_PARAMETER); ASMAtomicXchgU32(&pFastInt->u32Magic, RTSEMFASTMUTEX_MAGIC_DEAD); - mutex_destroy(&pFastInt->Mtx); + rw_destroy(&pFastInt->Mtx); RTMemFree(pFastInt); return VINF_SUCCESS; @@ -101,7 +101,7 @@ RTDECL(int) RTSemFastMutexRequest(RTSEMFASTMUTEX MutexSem) ("pFastInt->u32Magic=%RX32 pFastInt=%p\n", pFastInt->u32Magic, pFastInt), VERR_INVALID_PARAMETER); - mutex_enter(&pFastInt->Mtx); + rw_enter(&pFastInt->Mtx, RW_WRITER); return VINF_SUCCESS; } @@ -114,7 +114,7 @@ RTDECL(int) RTSemFastMutexRelease(RTSEMFASTMUTEX MutexSem) ("pFastInt->u32Magic=%RX32 pFastInt=%p\n", pFastInt->u32Magic, pFastInt), VERR_INVALID_PARAMETER); - mutex_exit(&pFastInt->Mtx); + rw_exit(&pFastInt->Mtx); return VINF_SUCCESS; } diff --git a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c index 2a059cedb..7ffcdf709 100644 --- a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: spinlock-r0drv-solaris.c 13248 2008-10-14 11:27:51Z vboxsync $ */ +/* $Id: spinlock-r0drv-solaris.c $ */ /** @file * IPRT - Spinlocks, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h index f2322077f..8c3d1d122 100644 --- a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h +++ b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-solaris-kernel.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: the-solaris-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Solaris kernel. */ diff --git a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c index 332184bb5..ce69da57c 100644 --- a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-solaris.c 13262 2008-10-14 13:09:04Z vboxsync $ */ +/* $Id: thread-r0drv-solaris.c $ */ /** @file * IPRT - Threads, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c index 60e6710a2..505fbf734 100644 --- a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-solaris.c 11770 2008-08-28 15:35:52Z vboxsync $ */ +/* $Id: thread2-r0drv-solaris.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c index c7c0a5214..073a500fc 100644 --- a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-solaris.c 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-r0drv-solaris.c $ */ /** @file * IPRT - Time, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c index 98c300434..7491b9079 100644 --- a/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c @@ -1,4 +1,4 @@ -/** $Id: timer-r0drv-solaris.c 9557 2008-06-09 18:19:26Z vboxsync $ */ +/** $Id: timer-r0drv-solaris.c $ */ /** @file * IPRT - Timer, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi b/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi Binary files differindex ff920f5e7..b5da82bac 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi +++ b/src/VBox/Runtime/r0drv/solaris/vbi/32/vbi diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi b/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi Binary files differindex e0a523e47..2afc52e19 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi +++ b/src/VBox/Runtime/r0drv/solaris/vbi/64/vbi diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c index c36a3a1cd..72dc4f8a7 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/alloc-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: alloc-r0drv-solaris.c 9149 2008-05-27 09:27:29Z vboxsync $ */ +/* $Id: alloc-r0drv-solaris.c $ */ /** @file * IPRT - Memory Allocation, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c index eba3fa44a..94ac769bf 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/os/vbi.c @@ -54,12 +54,12 @@ #include <sys/ddi.h> #include <sys/sunddi.h> #include <sys/modctl.h> +#include <sys/machparam.h> -#include <sys/vbi.h> +#include "vbi.h" /* - * If we are running on an old version of Solaris, then - * we have to use dl_lookup to find contig_free(). + * We have to use dl_lookup to find contig_free(). */ extern void *contig_alloc(size_t, ddi_dma_attr_t *, uintptr_t, int); extern void contig_free(void *, size_t); @@ -67,16 +67,46 @@ extern void contig_free(void *, size_t); static void (*p_contig_free)(void *, size_t) = contig_free; /* - * Workarounds for running on old versions of solaris with lower NCPU. - * If we detect this, the assumption is that NCPU was such that a cpuset_t - * is just a ulong_t + * Workarounds for running on old versions of solaris with different cross call + * interfaces. If we find xc_init_cpu() in the kenel, then just use the defined + * interfaces for xc_call() from the include file where the xc_call() + * interfaces just takes a pointer to a ulong_t array. The array must be long + * enough to hold "ncpus" bits at runtime. + + * The reason for the hacks is that using the type "cpuset_t" is pretty much + * impossible from code built outside the Solaris source repository that wants + * to run on multiple releases of Solaris. + * + * For old style xc_call()s, 32 bit solaris and older 64 bit versions use + * "ulong_t" as cpuset_t. + * + * Later versions of 64 bit Solaris used: struct {ulong_t words[x];} + * where "x" depends on NCPU. + * + * We detect the difference in 64 bit support by checking the kernel value of + * max_cpuid, which always holds the compiled value of NCPU - 1. + * + * If Solaris increases NCPU to more than 256, this module will continue + * to work on all versions of Solaris as long as the number of installed + * CPUs in the machine is <= VBI_NCPU. If VBI_NCPU is increased, this code + * has to be re-written some to provide compatibility with older Solaris which + * expects cpuset_t to be based on NCPU==256 -- or we discontinue support + * of old Nevada/S10. */ -static int use_old_xc_call = 0; +static int use_old = 0; +static int use_old_with_ulong = 0; static void (*p_xc_call)() = (void (*)())xc_call; -#pragma weak cpuset_all -#pragma weak cpuset_all_but -#pragma weak cpuset_only +#define VBI_NCPU 256 +#define VBI_SET_WORDS (VBI_NCPU / (sizeof (ulong_t) * 8)) +typedef struct vbi_cpuset { + ulong_t words[VBI_SET_WORDS]; +} vbi_cpuset_t; +#define X_CALL_HIPRI (2) /* for old Solaris interface */ + +/* + * module linkage stuff + */ static struct modlmisc vbi_modlmisc = { &mod_miscops, "VirtualBox Interfaces V3" }; @@ -85,8 +115,13 @@ static struct modlinkage vbi_modlinkage = { MODREV_1, (void *)&vbi_modlmisc, NULL }; +extern uintptr_t kernelbase; #define IS_KERNEL(v) ((uintptr_t)(v) >= kernelbase) +static int vbi_verbose = 0; + +#define VBI_VERBOSE(msg) {if (vbi_verbose) cmn_err(CE_WARN, msg);} + int _init(void) { @@ -94,11 +129,22 @@ _init(void) /* * Check to see if this version of virtualbox interface module will work - * with the kernel. The sizeof (cpuset_t) is problematic, as it changed - * with the change to NCPU in nevada build 87 and S10U6. + * with the kernel. */ - if (max_cpuid + 1 != NCPU) - use_old_xc_call = 1; + if (kobj_getsymvalue("xc_init_cpu", 1) != NULL) { + /* + * Our bit vector storage needs to be large enough for the + * actual number of CPUs running in the sytem. + */ + if (ncpus > VBI_NCPU) + return (EINVAL); + } else { + use_old = 1; + if (max_cpuid + 1 == sizeof(ulong_t) * 8) + use_old_with_ulong = 1; + else if (max_cpuid + 1 != VBI_NCPU) + return (EINVAL); /* cpuset_t size mismatch */ + } /* * In older versions of Solaris contig_free() is a static routine. @@ -140,9 +186,9 @@ static ddi_dma_attr_t base_attr = { (uint64_t)0, /* lower limit */ (uint64_t)0, /* high limit */ (uint64_t)0xffffffff, /* counter limit */ - (uint64_t)MMU_PAGESIZE, /* alignment */ - (uint64_t)MMU_PAGESIZE, /* burst size */ - (uint64_t)MMU_PAGESIZE, /* effective DMA size */ + (uint64_t)PAGESIZE, /* pagesize alignment */ + (uint64_t)PAGESIZE, /* pagesize burst size */ + (uint64_t)PAGESIZE, /* pagesize effective DMA size */ (uint64_t)0xffffffff, /* max DMA xfer size */ (uint64_t)0xffffffff, /* segment boundary */ 1, /* list length (1 for contiguous) */ @@ -157,20 +203,22 @@ vbi_contig_alloc(uint64_t *phys, size_t size) pfn_t pfn; void *ptr; - if ((size & MMU_PAGEOFFSET) != 0) + if ((size & PAGEOFFSET) != 0) return (NULL); attr = base_attr; attr.dma_attr_addr_hi = *phys; - ptr = contig_alloc(size, &attr, MMU_PAGESIZE, 1); + ptr = contig_alloc(size, &attr, PAGESIZE, 1); - if (ptr == NULL) + if (ptr == NULL) { + VBI_VERBOSE("vbi_contig_alloc() failure"); return (NULL); + } pfn = hat_getpfnum(kas.a_hat, (caddr_t)ptr); if (pfn == PFN_INVALID) panic("vbi_contig_alloc(): hat_getpfnum() failed\n"); - *phys = (uint64_t)pfn << MMU_PAGESHIFT; + *phys = (uint64_t)pfn << PAGESHIFT; return (ptr); } @@ -185,12 +233,14 @@ vbi_kernel_map(uint64_t pa, size_t size, uint_t prot) { caddr_t va; - if ((pa & MMU_PAGEOFFSET) || (size & MMU_PAGEOFFSET)) + if ((pa & PAGEOFFSET) || (size & PAGEOFFSET)) { + VBI_VERBOSE("vbi_kernel_map() bad pa or size"); return (NULL); + } va = vmem_alloc(heap_arena, size, VM_SLEEP); - hat_devload(kas.a_hat, va, size, (pfn_t)(pa >> MMU_PAGESHIFT), + hat_devload(kas.a_hat, va, size, (pfn_t)(pa >> PAGESHIFT), prot, HAT_LOAD | HAT_LOAD_LOCK | HAT_UNORDERED_OK); return (va); @@ -378,13 +428,13 @@ vbi_cpu_id(void) int vbi_max_cpu_id(void) { - return (NCPU - 1); + return (max_cpuid); } int vbi_cpu_maxcount(void) { - return (NCPU); + return (max_cpuid + 1); } int @@ -419,102 +469,95 @@ vbi_preempt_enable(void) void vbi_execute_on_all(void *func, void *arg) { - cpuset_t set; - ulong_t hack_set; + vbi_cpuset_t set; int i; - /* - * hack for a kernel compiled with the different NCPU than this module - */ - ASSERT(curthread->t_preempt >= 1); - if (use_old_xc_call) { - hack_set = 0; - for (i = 0; i < ncpus; ++i) - hack_set |= 1ul << i; - p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, hack_set, - (xc_func_t)func); + for (i = 0; i < VBI_SET_WORDS; ++i) + set.words[i] = (ulong_t)-1L; + if (use_old) { + if (use_old_with_ulong) { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set.words[0], (xc_func_t)func); + } else { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set, (xc_func_t)func); + } } else { - CPUSET_ALL(set); - xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, set, - (xc_func_t)func); + xc_call((xc_arg_t)arg, 0, 0, &set.words[0], (xc_func_t)func); } } void vbi_execute_on_others(void *func, void *arg) { - cpuset_t set; - ulong_t hack_set; + vbi_cpuset_t set; int i; - /* - * hack for a kernel compiled with the different NCPU than this module - */ - ASSERT(curthread->t_preempt >= 1); - if (use_old_xc_call) { - hack_set = 0; - for (i = 0; i < ncpus; ++i) { - if (i != CPU->cpu_id) - hack_set |= 1ul << i; + for (i = 0; i < VBI_SET_WORDS; ++i) + set.words[i] = (ulong_t)-1L; + BT_CLEAR(set.words, vbi_cpu_id()); + if (use_old) { + if (use_old_with_ulong) { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set.words[0], (xc_func_t)func); + } else { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set, (xc_func_t)func); } - p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, hack_set, - (xc_func_t)func); } else { - CPUSET_ALL_BUT(set, CPU->cpu_id); - xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, set, - (xc_func_t)func); + xc_call((xc_arg_t)arg, 0, 0, &set.words[0], (xc_func_t)func); } } void vbi_execute_on_one(void *func, void *arg, int c) { - cpuset_t set; - ulong_t hack_set; + vbi_cpuset_t set; + int i; - /* - * hack for a kernel compiled with the different NCPU than this module - */ - ASSERT(curthread->t_preempt >= 1); - if (use_old_xc_call) { - hack_set = 1ul << c; - p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, hack_set, - (xc_func_t)func); + for (i = 0; i < VBI_SET_WORDS; ++i) + set.words[i] = 0; + BT_SET(set.words, vbi_cpu_id()); + if (use_old) { + if (use_old_with_ulong) { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set.words[0], (xc_func_t)func); + } else { + p_xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, + set, (xc_func_t)func); + } } else { - CPUSET_ONLY(set, c); - xc_call((xc_arg_t)arg, 0, 0, X_CALL_HIPRI, set, - (xc_func_t)func); + xc_call((xc_arg_t)arg, 0, 0, &set.words[0], (xc_func_t)func); } } int vbi_lock_va(void *addr, size_t len, void **handle) { - page_t **ppl; - int rc = 0; + faultcode_t err; - if (IS_KERNEL(addr)) { - /* kernel mappings on x86 are always locked */ - *handle = NULL; - } else { - rc = as_pagelock(curproc->p_as, &ppl, (caddr_t)addr, len, - S_WRITE); - if (rc != 0) - return (rc); - *handle = (void *)ppl; + /* + * kernel mappings on x86 are always locked, so only handle user. + */ + *handle = NULL; + if (!IS_KERNEL(addr)) { + err = as_fault(curproc->p_as->a_hat, curproc->p_as, + (caddr_t)addr, len, F_SOFTLOCK, S_WRITE); + if (err != 0) { + VBI_VERBOSE("vbi_lock_va() failed to lock"); + return (-1); + } } - return (rc); + return (0); } +/*ARGSUSED*/ void vbi_unlock_va(void *addr, size_t len, void *handle) { - page_t **ppl = (page_t **)handle; - - if (IS_KERNEL(addr)) - ASSERT(handle == NULL); - else - as_pageunlock(curproc->p_as, ppl, (caddr_t)addr, len, S_WRITE); + if (!IS_KERNEL(addr)) + as_fault(curproc->p_as->a_hat, curproc->p_as, (caddr_t)addr, + len, F_SOFTUNLOCK, S_WRITE); } uint64_t @@ -528,10 +571,10 @@ vbi_va_to_pa(void *addr) hat = kas.a_hat; else hat = curproc->p_as->a_hat; - pfn = hat_getpfnum(hat, (caddr_t)(v & MMU_PAGEMASK)); + pfn = hat_getpfnum(hat, (caddr_t)(v & PAGEMASK)); if (pfn == PFN_INVALID) return (-(uint64_t)1); - return (((uint64_t)pfn << MMU_PAGESHIFT) | (v & MMU_PAGEOFFSET)); + return (((uint64_t)pfn << PAGESHIFT) | (v & PAGEOFFSET)); } @@ -568,12 +611,10 @@ segvbi_create(struct seg *seg, void *args) * now load locked mappings to the pages */ va = seg->s_base; - ASSERT(((uintptr_t)va & MMU_PAGEOFFSET) == 0); - pgcnt = seg->s_size >> MMU_PAGESHIFT; - for (p = 0; p < pgcnt; ++p, va += MMU_PAGESIZE) { - ASSERT((a->palist[p] & MMU_PAGEOFFSET) == 0); + pgcnt = seg->s_size >> PAGESHIFT; + for (p = 0; p < pgcnt; ++p, va += PAGESIZE) { hat_devload(as->a_hat, va, - MMU_PAGESIZE, a->palist[p] >> MMU_PAGESHIFT, + PAGESIZE, a->palist[p] >> PAGESHIFT, data->prot | HAT_UNORDERED_OK, HAT_LOAD | HAT_LOAD_LOCK); } @@ -597,12 +638,11 @@ segvbi_dup(struct seg *seg, struct seg *newseg) return (0); } -/*ARGSUSED*/ static int segvbi_unmap(struct seg *seg, caddr_t addr, size_t len) { if (addr < seg->s_base || addr + len > seg->s_base + seg->s_size || - (len & MMU_PAGEOFFSET) || ((uintptr_t)addr & MMU_PAGEOFFSET)) + (len & PAGEOFFSET) || ((uintptr_t)addr & PAGEOFFSET)) panic("segvbi_unmap"); if (addr != seg->s_base || len != seg->s_size) @@ -625,7 +665,6 @@ segvbi_free(struct seg *seg) /* * We never demand-fault for seg_vbi. */ -/*ARGSUSED*/ static int segvbi_fault(struct hat *hat, struct seg *seg, caddr_t addr, size_t len, enum fault_type type, enum seg_rw rw) @@ -633,54 +672,47 @@ segvbi_fault(struct hat *hat, struct seg *seg, caddr_t addr, size_t len, return (FC_MAKE_ERR(EFAULT)); } -/*ARGSUSED*/ static int segvbi_faulta(struct seg *seg, caddr_t addr) { return (0); } -/*ARGSUSED*/ static int segvbi_setprot(struct seg *seg, caddr_t addr, size_t len, uint_t prot) { return (EACCES); } -/*ARGSUSED*/ static int segvbi_checkprot(struct seg *seg, caddr_t addr, size_t len, uint_t prot) { return (EINVAL); } -/*ARGSUSED*/ static int segvbi_kluster(struct seg *seg, caddr_t addr, ssize_t delta) { return (-1); } -/*ARGSUSED*/ static int segvbi_sync(struct seg *seg, caddr_t addr, size_t len, int attr, uint_t flags) { return (0); } -/*ARGSUSED*/ static size_t segvbi_incore(struct seg *seg, caddr_t addr, size_t len, char *vec) { size_t v; - for (v = 0, len = (len + MMU_PAGEOFFSET) & MMU_PAGEMASK; len; - len -= MMU_PAGESIZE, v += MMU_PAGESIZE) + for (v = 0, len = (len + PAGEOFFSET) & PAGEMASK; len; + len -= PAGESIZE, v += PAGESIZE) *vec++ = 1; return (v); } -/*ARGSUSED*/ static int segvbi_lockop(struct seg *seg, caddr_t addr, size_t len, int attr, int op, ulong_t *lockmap, size_t pos) @@ -688,7 +720,6 @@ segvbi_lockop(struct seg *seg, caddr_t addr, return (0); } -/*ARGSUSED*/ static int segvbi_getprot(struct seg *seg, caddr_t addr, size_t len, uint_t *protv) { @@ -702,7 +733,6 @@ segvbi_getoffset(struct seg *seg, caddr_t addr) return ((uintptr_t)addr - (uintptr_t)seg->s_base); } -/*ARGSUSED*/ static int segvbi_gettype(struct seg *seg, caddr_t addr) { @@ -711,7 +741,6 @@ segvbi_gettype(struct seg *seg, caddr_t addr) static vnode_t vbivp; -/*ARGSUSED*/ static int segvbi_getvp(struct seg *seg, caddr_t addr, struct vnode **vpp) { @@ -719,19 +748,16 @@ segvbi_getvp(struct seg *seg, caddr_t addr, struct vnode **vpp) return (0); } -/*ARGSUSED*/ static int segvbi_advise(struct seg *seg, caddr_t addr, size_t len, uint_t behav) { return (0); } -/*ARGSUSED*/ static void segvbi_dump(struct seg *seg) {} -/*ARGSUSED*/ static int segvbi_pagelock(struct seg *seg, caddr_t addr, size_t len, struct page ***ppp, enum lock_type type, enum seg_rw rw) @@ -739,28 +765,24 @@ segvbi_pagelock(struct seg *seg, caddr_t addr, size_t len, return (ENOTSUP); } -/*ARGSUSED*/ static int segvbi_setpagesize(struct seg *seg, caddr_t addr, size_t len, uint_t szc) { return (ENOTSUP); } -/*ARGSUSED*/ static int segvbi_getmemid(struct seg *seg, caddr_t addr, memid_t *memid) { return (ENODEV); } -/*ARGSUSED*/ static lgrp_mem_policy_info_t * segvbi_getpolicy(struct seg *seg, caddr_t addr) { return (NULL); } -/*ARGSUSED*/ static int segvbi_capable(struct seg *seg, segcapability_t capability) { @@ -810,13 +832,12 @@ vbi_user_map(caddr_t *va, uint_t prot, uint64_t *palist, size_t len) args.prot = prot; as_rangelock(as); map_addr(va, len, 0, 0, MAP_SHARED); - ASSERT(((uintptr_t)*va & MMU_PAGEOFFSET) == 0); - ASSERT((len & MMU_PAGEOFFSET) == 0); - ASSERT(len != 0); if (*va != NULL) error = as_map(as, *va, len, segvbi_create, &args); else error = ENOMEM; + if (error) + VBI_VERBOSE("vbi_user_map() failed"); as_rangeunlock(as); return (error); } @@ -906,11 +927,6 @@ vbi_stimer_begin( { vbi_stimer_t *t = kmem_zalloc(sizeof (*t), KM_SLEEP); - ASSERT(when < INT64_MAX); - ASSERT(interval < INT64_MAX); - ASSERT(interval + when < INT64_MAX); - ASSERT(on_cpu == VBI_ANY_CPU || on_cpu < ncpus); - t->s_handler.cyh_func = vbi_stimer_func; t->s_handler.cyh_arg = t; t->s_handler.cyh_level = CY_LOCK_LEVEL; @@ -941,7 +957,6 @@ done: extern void vbi_stimer_end(vbi_stimer_t *t) { - ASSERT(t->s_cyclic != CYCLIC_NONE); mutex_enter(&cpu_lock); cyclic_remove(t->s_cyclic); mutex_exit(&cpu_lock); @@ -965,7 +980,7 @@ static void vbi_gtimer_func(void *arg) { vbi_gtimer_t *t = arg; - t->g_func(t->g_arg, ++t->g_counters[CPU->cpu_id]); + t->g_func(t->g_arg, ++t->g_counters[vbi_cpu_id()]); } /* @@ -1006,10 +1021,6 @@ vbi_gtimer_begin( if (interval == 0) return (NULL); - ASSERT(when < INT64_MAX); - ASSERT(interval < INT64_MAX); - ASSERT(interval + when < INT64_MAX); - t = kmem_zalloc(sizeof (*t), KM_SLEEP); t->g_counters = kmem_zalloc(ncpus * sizeof (uint64_t), KM_SLEEP); t->g_when = when + gethrtime(); @@ -1031,7 +1042,6 @@ vbi_gtimer_begin( extern void vbi_gtimer_end(vbi_gtimer_t *t) { - ASSERT(t->g_cyclic != CYCLIC_NONE); mutex_enter(&cpu_lock); cyclic_remove(t->g_cyclic); mutex_exit(&cpu_lock); diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h index d11d008e1..1dc9232ec 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h +++ b/src/VBox/Runtime/r0drv/solaris/vbi/i86pc/sys/vbi.h @@ -36,6 +36,8 @@ extern "C" { * facilities. The interface uses limited types when crossing the kernel * to hypervisor boundary. (void *) is for handles and function and other * pointers. uint64 for physical addresses, size_t and int elsewhere. + * The goal is for this module to eventually be part of OpenSolaris once + * interfaces have become more stable. */ /* diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c index 225261c1f..0f1af542e 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/memobj-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: memobj-r0drv-solaris.c 14824 2008-11-30 07:52:59Z vboxsync $ */ +/* $Id: memobj-r0drv-solaris.c $ */ /** @file * IPRT - Ring-0 Memory Objects, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c index a5cbba2d4..3b1440529 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/mp-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mp-r0drv-solaris.c 15907 2009-01-13 10:01:12Z vboxsync $ */ +/* $Id: mp-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c index 5d81a3bb3..704570b60 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/mpnotification-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: mpnotification-r0drv-solaris.c 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: mpnotification-r0drv-solaris.c $ */ /** @file * IPRT - Multiprocessor Event Notifications, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c index 52ad88ce7..672f0763a 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/process-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: process-r0drv-solaris.c 9149 2008-05-27 09:27:29Z vboxsync $ */ +/* $Id: process-r0drv-solaris.c $ */ /** @file * IPRT - Process Management, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/the-solaris-kernel.h b/src/VBox/Runtime/r0drv/solaris/vbi/the-solaris-kernel.h index 023e1268f..0cd447e75 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/the-solaris-kernel.h +++ b/src/VBox/Runtime/r0drv/solaris/vbi/the-solaris-kernel.h @@ -1,4 +1,4 @@ -/* $Id: the-solaris-kernel.h 9149 2008-05-27 09:27:29Z vboxsync $ */ +/* $Id: the-solaris-kernel.h $ */ /** @file * IPRT - Include all necessary headers for the Solaris kernel. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c index 09c6220a8..78a9e27d6 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/thread-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread-r0drv-solaris.c 13254 2008-10-14 12:35:50Z vboxsync $ */ +/* $Id: thread-r0drv-solaris.c $ */ /** @file * IPRT - Threads, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c index 333f19608..b401405bc 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/thread2-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: thread2-r0drv-solaris.c 9149 2008-05-27 09:27:29Z vboxsync $ */ +/* $Id: thread2-r0drv-solaris.c $ */ /** @file * IPRT - Threads (Part 2), Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c index 23c30e8da..1606f9243 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/time-r0drv-solaris.c @@ -1,4 +1,4 @@ -/* $Id: time-r0drv-solaris.c 9149 2008-05-27 09:27:29Z vboxsync $ */ +/* $Id: time-r0drv-solaris.c $ */ /** @file * IPRT - Time, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c index 71834af40..f89b52f22 100644 --- a/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/vbi/timer-r0drv-solaris.c @@ -1,4 +1,4 @@ -/** $Id: timer-r0drv-solaris.c 14318 2008-11-18 16:56:53Z vboxsync $ */ +/** $Id: timer-r0drv-solaris.c $ */ /** @file * IPRT - Timer, Ring-0 Driver, Solaris. */ diff --git a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp index bb8e0e667..481cc9ba5 100644 --- a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp +++ b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-ef-cpp.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-ef-cpp.cpp $ */ /** @file * IPRT - Memory Allocation, C++ electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc-ef.cpp b/src/VBox/Runtime/r3/alloc-ef.cpp index b868f134a..e5cd84ab6 100644 --- a/src/VBox/Runtime/r3/alloc-ef.cpp +++ b/src/VBox/Runtime/r3/alloc-ef.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-ef.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: alloc-ef.cpp $ */ /** @file * IPRT - Memory Allocation, electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc-ef.h b/src/VBox/Runtime/r3/alloc-ef.h index 73eb39861..6e83bc868 100644 --- a/src/VBox/Runtime/r3/alloc-ef.h +++ b/src/VBox/Runtime/r3/alloc-ef.h @@ -1,4 +1,4 @@ -/* $Id: alloc-ef.h 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: alloc-ef.h $ */ /** @file * IPRT - Memory Allocation, electric fence. */ diff --git a/src/VBox/Runtime/r3/alloc.cpp b/src/VBox/Runtime/r3/alloc.cpp index 43b48f4bb..40d85813f 100644 --- a/src/VBox/Runtime/r3/alloc.cpp +++ b/src/VBox/Runtime/r3/alloc.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc.cpp 11019 2008-07-30 22:47:04Z vboxsync $ */ +/* $Id: alloc.cpp $ */ /** @file * IPRT - Memory Allocation. */ diff --git a/src/VBox/Runtime/r3/darwin/alloc-darwin.cpp b/src/VBox/Runtime/r3/darwin/alloc-darwin.cpp index b3c691a64..3343146fa 100644 --- a/src/VBox/Runtime/r3/darwin/alloc-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/alloc-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-darwin.cpp 11019 2008-07-30 22:47:04Z vboxsync $ */ +/* $Id: alloc-darwin.cpp $ */ /** @file * IPRT - Memory Allocation, POSIX. */ diff --git a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp index bfe5be0db..05ecbbd62 100644 --- a/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/filelock-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-darwin.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: filelock-darwin.cpp $ */ /** @file * IPRT - File Locking, POSIX. */ diff --git a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp index fe083c4de..67e0a2a6b 100644 --- a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-darwin.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: mp-darwin.cpp $ */ /** @file * IPRT - Multiprocessor, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp index f6259aade..9835384b9 100644 --- a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-darwin.cpp 11838 2008-08-29 17:14:02Z vboxsync $ */ +/* $Id: rtProcInitExePath-darwin.cpp $ */ /** @file * IPRT - rtProcInitName, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp index cf9275570..e48089642 100644 --- a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-darwin.cpp 15881 2009-01-08 18:46:52Z vboxsync $ */ +/* $Id: sched-darwin.cpp $ */ /** @file * IPRT - Scheduling, Darwin. */ diff --git a/src/VBox/Runtime/r3/darwin/time-darwin.cpp b/src/VBox/Runtime/r3/darwin/time-darwin.cpp index 3fab3ea6c..6fcfbb57c 100644 --- a/src/VBox/Runtime/r3/darwin/time-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/time-darwin.cpp @@ -1,4 +1,4 @@ -/* $Id: time-darwin.cpp 15870 2009-01-08 15:08:24Z vboxsync $ */ +/* $Id: time-darwin.cpp $ */ /** @file * IPRT - Time, Darwin. */ diff --git a/src/VBox/Runtime/r3/dir.cpp b/src/VBox/Runtime/r3/dir.cpp index 89490feb9..6a8d8e779 100644 --- a/src/VBox/Runtime/r3/dir.cpp +++ b/src/VBox/Runtime/r3/dir.cpp @@ -1,4 +1,4 @@ -/* $Id: dir.cpp 9358 2008-06-03 15:59:24Z vboxsync $ */ +/* $Id: dir.cpp $ */ /** @file * IPRT - Directory Manipulation. */ diff --git a/src/VBox/Runtime/r3/fileio.cpp b/src/VBox/Runtime/r3/fileio.cpp index 99798c445..aeaed6df8 100644 --- a/src/VBox/Runtime/r3/fileio.cpp +++ b/src/VBox/Runtime/r3/fileio.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio.cpp 8913 2008-05-19 11:34:46Z vboxsync $ */ +/* $Id: fileio.cpp $ */ /** @file * IPRT - File I/O. */ diff --git a/src/VBox/Runtime/r3/freebsd/alloc-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/alloc-freebsd.cpp index 8409fce3e..aca20a43d 100644 --- a/src/VBox/Runtime/r3/freebsd/alloc-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/alloc-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-freebsd.cpp 11020 2008-07-30 22:48:35Z vboxsync $ */ +/* $Id: alloc-freebsd.cpp $ */ /** @file * IPRT - Memory Allocation, POSIX. */ diff --git a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp index 84eb0700f..602f284aa 100644 --- a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-freebsd.cpp 16024 2009-01-19 04:45:55Z vboxsync $ */ +/* $Id: rtProcInitExePath-freebsd.cpp $ */ /** @file * IPRT - rtProcInitName, FreeBSD. */ diff --git a/src/VBox/Runtime/r3/fs.cpp b/src/VBox/Runtime/r3/fs.cpp index 519698b20..74a9d64f1 100644 --- a/src/VBox/Runtime/r3/fs.cpp +++ b/src/VBox/Runtime/r3/fs.cpp @@ -1,4 +1,4 @@ -/* $Id: fs.cpp 14058 2008-11-10 23:01:55Z vboxsync $ */ +/* $Id: fs.cpp $ */ /** @file * IPRT - File System. */ diff --git a/src/VBox/Runtime/r3/init.cpp b/src/VBox/Runtime/r3/init.cpp index 48691153b..4e30e5d00 100644 --- a/src/VBox/Runtime/r3/init.cpp +++ b/src/VBox/Runtime/r3/init.cpp @@ -1,4 +1,4 @@ -/* $Id: init.cpp 14856 2008-12-01 13:41:12Z vboxsync $ */ +/* $Id: init.cpp $ */ /** @file * IPRT - Init Ring-3. */ diff --git a/src/VBox/Runtime/r3/linux/mp-linux.cpp b/src/VBox/Runtime/r3/linux/mp-linux.cpp index 6eed83dff..7fcc9b73a 100644 --- a/src/VBox/Runtime/r3/linux/mp-linux.cpp +++ b/src/VBox/Runtime/r3/linux/mp-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-linux.cpp 15399 2008-12-12 22:02:14Z vboxsync $ */ +/* $Id: mp-linux.cpp $ */ /** @file * IPRT - Multiprocessor, Linux. */ diff --git a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp index 22b254d59..36a145a97 100644 --- a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp +++ b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-linux.cpp 11838 2008-08-29 17:14:02Z vboxsync $ */ +/* $Id: rtProcInitExePath-linux.cpp $ */ /** @file * IPRT - rtProcInitName, Linux. */ diff --git a/src/VBox/Runtime/r3/linux/sched-linux.cpp b/src/VBox/Runtime/r3/linux/sched-linux.cpp index d4e2957a8..ffaf7caf6 100644 --- a/src/VBox/Runtime/r3/linux/sched-linux.cpp +++ b/src/VBox/Runtime/r3/linux/sched-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-linux.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: sched-linux.cpp $ */ /** @file * IPRT - Scheduling, POSIX. */ diff --git a/src/VBox/Runtime/r3/linux/semevent-linux.cpp b/src/VBox/Runtime/r3/linux/semevent-linux.cpp index 556715746..f1595c436 100644 --- a/src/VBox/Runtime/r3/linux/semevent-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semevent-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-linux.cpp 14468 2008-11-21 15:44:27Z vboxsync $ */ +/* $Id: semevent-linux.cpp $ */ /** @file * IPRT - Event Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp index 3464c90a8..b7e883a0b 100644 --- a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-linux.cpp 14468 2008-11-21 15:44:27Z vboxsync $ */ +/* $Id: semeventmulti-linux.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp index 271f77b9d..003789398 100644 --- a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-linux.cpp 8651 2008-05-07 12:16:29Z vboxsync $ */ +/* $Id: semmutex-linux.cpp $ */ /** @file * IPRT - Mutex Semaphore, Linux (2.6.x+). */ diff --git a/src/VBox/Runtime/r3/linux/sysfs.cpp b/src/VBox/Runtime/r3/linux/sysfs.cpp index 526a89227..6d0fd58c4 100644 --- a/src/VBox/Runtime/r3/linux/sysfs.cpp +++ b/src/VBox/Runtime/r3/linux/sysfs.cpp @@ -1,4 +1,4 @@ -/* $Id: sysfs.cpp 15644 2008-12-18 11:16:58Z vboxsync $ */ +/* $Id: sysfs.cpp $ */ /** @file * IPRT - Linux sysfs access. */ diff --git a/src/VBox/Runtime/r3/linux/time-linux.cpp b/src/VBox/Runtime/r3/linux/time-linux.cpp index 102e500b0..8dfe73d5c 100644 --- a/src/VBox/Runtime/r3/linux/time-linux.cpp +++ b/src/VBox/Runtime/r3/linux/time-linux.cpp @@ -1,4 +1,4 @@ -/* $Id: time-linux.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-linux.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/os2/filelock-os2.cpp b/src/VBox/Runtime/r3/os2/filelock-os2.cpp index b6e33cfce..63930a9d3 100644 --- a/src/VBox/Runtime/r3/os2/filelock-os2.cpp +++ b/src/VBox/Runtime/r3/os2/filelock-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: filelock-os2.cpp $ */ /** @file * IPRT - File Locking, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/mp-os2.cpp b/src/VBox/Runtime/r3/os2/mp-os2.cpp index f3a12a5d0..15569b465 100644 --- a/src/VBox/Runtime/r3/os2/mp-os2.cpp +++ b/src/VBox/Runtime/r3/os2/mp-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-os2.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: mp-os2.cpp $ */ /** @file * IPRT - Multiprocessor, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp index 16064dfde..32332b190 100644 --- a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp +++ b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-os2.cpp 13908 2008-11-06 11:53:47Z vboxsync $ */ +/* $Id: rtProcInitExePath-os2.cpp $ */ /** @file * IPRT - rtProcInitName, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/sched-os2.cpp b/src/VBox/Runtime/r3/os2/sched-os2.cpp index ea64a4135..c826d53a0 100644 --- a/src/VBox/Runtime/r3/os2/sched-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sched-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: sched-os2.cpp $ */ /** @file * IPRT - Scheduling, OS/2 */ diff --git a/src/VBox/Runtime/r3/os2/sems-os2.cpp b/src/VBox/Runtime/r3/os2/sems-os2.cpp index a08d68b2c..57b27ae2f 100644 --- a/src/VBox/Runtime/r3/os2/sems-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sems-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: sems-os2.cpp 10839 2008-07-23 19:48:51Z vboxsync $ */ +/* $Id: sems-os2.cpp $ */ /** @file * IPRT - Semaphores, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/thread-os2.cpp b/src/VBox/Runtime/r3/os2/thread-os2.cpp index c7d50363c..b4784dbe4 100644 --- a/src/VBox/Runtime/r3/os2/thread-os2.cpp +++ b/src/VBox/Runtime/r3/os2/thread-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: thread-os2.cpp $ */ /** @file * IPRT - Threads, OS/2. */ diff --git a/src/VBox/Runtime/r3/os2/time-os2.cpp b/src/VBox/Runtime/r3/os2/time-os2.cpp index d39e1fc24..13fcad048 100644 --- a/src/VBox/Runtime/r3/os2/time-os2.cpp +++ b/src/VBox/Runtime/r3/os2/time-os2.cpp @@ -1,4 +1,4 @@ -/* $Id: time-os2.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-os2.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp index eea23eb77..689119130 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -1,4 +1,4 @@ -/* $Id: path.cpp 14324 2008-11-18 19:09:34Z vboxsync $ */ +/* $Id: path.cpp $ */ /** @file * IPRT - Path Manipulation. */ diff --git a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp index 9beb4446e..6518ef890 100644 --- a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTMpGetCount-posix.cpp 11243 2008-08-08 13:19:14Z vboxsync $ */ +/* $Id: RTMpGetCount-posix.cpp $ */ /** @file * IPRT - RTMpGetCount, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp index 2e2d501f6..8ff6ead0e 100644 --- a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-posix.cpp 15850 2009-01-08 10:16:09Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-posix.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, POSIX implementation. */ diff --git a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp index 74ee305cf..7c5e9acc2 100644 --- a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: RTTimeNow-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTTimeNow-posix.cpp $ */ /** @file * IPRT - RTTimeNow, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/alloc-posix.cpp b/src/VBox/Runtime/r3/posix/alloc-posix.cpp index be5efcc1b..3e18b4ec5 100644 --- a/src/VBox/Runtime/r3/posix/alloc-posix.cpp +++ b/src/VBox/Runtime/r3/posix/alloc-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-posix.cpp 11020 2008-07-30 22:48:35Z vboxsync $ */ +/* $Id: alloc-posix.cpp $ */ /** @file * IPRT - Memory Allocation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/dir-posix.cpp b/src/VBox/Runtime/r3/posix/dir-posix.cpp index baf3e1c63..9ffd82225 100644 --- a/src/VBox/Runtime/r3/posix/dir-posix.cpp +++ b/src/VBox/Runtime/r3/posix/dir-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: dir-posix.cpp 14062 2008-11-10 23:23:05Z vboxsync $ */ +/* $Id: dir-posix.cpp $ */ /** @file * IPRT - Directory manipulation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/env-posix.cpp b/src/VBox/Runtime/r3/posix/env-posix.cpp index df5e2556f..6236501cc 100644 --- a/src/VBox/Runtime/r3/posix/env-posix.cpp +++ b/src/VBox/Runtime/r3/posix/env-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: env-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: env-posix.cpp $ */ /** @file * IPRT - Environment, Posix. */ @@ -32,6 +32,11 @@ /******************************************************************************* * Header Files * *******************************************************************************/ +#ifdef RT_OS_DARWIN +/* pick the correct prototype for unsetenv. */ +# define _POSIX_C_SOURCE 1 +#endif + #include <iprt/env.h> #include <iprt/string.h> #include <iprt/alloca.h> @@ -99,8 +104,22 @@ RTDECL(int) RTEnvUnset(const char *pszVar) return VINF_ENV_VAR_NOT_FOUND; /* Ok, try remove it. */ - if (!putenv((char *)pszVar)) +#ifdef RT_OS_WINDOWS + /* Windows does not have unsetenv(). Clear the environment variable according to the MSN docs. */ + char *pszBuf; + int rc = RTStrAPrintf(&pszBuf, "%s=", pszVar); + if (RT_FAILURE(rc)) + return rc; + rc = putenv(pszBuf); + RTStrFree(pszBuf); + if (!rc) + return VINF_SUCCESS; +#else + /* This is the preferred function as putenv() like used above does neither work on Solaris nor on Darwin. */ + if (!unsetenv((char*)pszVar)) return VINF_SUCCESS; +#endif + return RTErrConvertFromErrno(errno); } diff --git a/src/VBox/Runtime/r3/posix/fileio-posix.cpp b/src/VBox/Runtime/r3/posix/fileio-posix.cpp index 6ce9cf376..fd65e4b92 100644 --- a/src/VBox/Runtime/r3/posix/fileio-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileio-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio-posix.cpp 10644 2008-07-15 11:18:20Z vboxsync $ */ +/* $Id: fileio-posix.cpp $ */ /** @file * IPRT - File I/O, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/filelock-posix.cpp b/src/VBox/Runtime/r3/posix/filelock-posix.cpp index 41c7cfcb3..17bcb97c3 100644 --- a/src/VBox/Runtime/r3/posix/filelock-posix.cpp +++ b/src/VBox/Runtime/r3/posix/filelock-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: filelock-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: filelock-posix.cpp $ */ /** @file * IPRT - File Locking, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/fs-posix.cpp b/src/VBox/Runtime/r3/posix/fs-posix.cpp index 0dbdc93d0..c1e20287c 100644 --- a/src/VBox/Runtime/r3/posix/fs-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fs-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: fs-posix.cpp $ */ /** @file * IPRT - File System, Linux. */ diff --git a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp index b879eef7b..9e9739f49 100644 --- a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp +++ b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative-posix.cpp 12146 2008-09-05 16:27:28Z vboxsync $ */ +/* $Id: ldrNative-posix.cpp $ */ /** @file * IPRT - Binary Image Loader, POSIX native. */ diff --git a/src/VBox/Runtime/r3/posix/path-posix.cpp b/src/VBox/Runtime/r3/posix/path-posix.cpp index f617cc95d..726b5ee55 100644 --- a/src/VBox/Runtime/r3/posix/path-posix.cpp +++ b/src/VBox/Runtime/r3/posix/path-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: path-posix.cpp 15813 2009-01-05 16:06:55Z vboxsync $ */ +/* $Id: path-posix.cpp $ */ /** @file * IPRT - Path Manipulation, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/process-posix.cpp b/src/VBox/Runtime/r3/posix/process-posix.cpp index e03a249dd..eed1ee369 100644 --- a/src/VBox/Runtime/r3/posix/process-posix.cpp +++ b/src/VBox/Runtime/r3/posix/process-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: process-posix.cpp 15026 2008-12-05 09:43:41Z vboxsync $ */ +/* $Id: process-posix.cpp $ */ /** @file * IPRT - Process, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/rand-posix.cpp b/src/VBox/Runtime/r3/posix/rand-posix.cpp index b53c5957e..ac706d689 100644 --- a/src/VBox/Runtime/r3/posix/rand-posix.cpp +++ b/src/VBox/Runtime/r3/posix/rand-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: rand-posix.cpp 11557 2008-08-21 21:47:31Z vboxsync $ */ +/* $Id: rand-posix.cpp $ */ /** @file * IPRT - Random Numbers and Byte Streams, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/sched-posix.cpp b/src/VBox/Runtime/r3/posix/sched-posix.cpp index 86f67e381..e8f90e864 100644 --- a/src/VBox/Runtime/r3/posix/sched-posix.cpp +++ b/src/VBox/Runtime/r3/posix/sched-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-posix.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: sched-posix.cpp $ */ /** @file * IPRT - Scheduling, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semevent-posix.cpp b/src/VBox/Runtime/r3/posix/semevent-posix.cpp index c2789133b..c89b90280 100644 --- a/src/VBox/Runtime/r3/posix/semevent-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semevent-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semevent-posix.cpp 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: semevent-posix.cpp $ */ /** @file * IPRT - Event Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp index d2df8af2f..cf446f83c 100644 --- a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semeventmulti-posix.cpp 14318 2008-11-18 16:56:53Z vboxsync $ */ +/* $Id: semeventmulti-posix.cpp $ */ /** @file * IPRT - Multiple Release Event Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp index 217dee87e..9050f9496 100644 --- a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semmutex-posix.cpp 8651 2008-05-07 12:16:29Z vboxsync $ */ +/* $Id: semmutex-posix.cpp $ */ /** @file * IPRT - Mutex Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/semrw-posix.cpp b/src/VBox/Runtime/r3/posix/semrw-posix.cpp index bbd4da38c..03336d346 100644 --- a/src/VBox/Runtime/r3/posix/semrw-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semrw-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: semrw-posix.cpp 8653 2008-05-07 12:31:30Z vboxsync $ */ +/* $Id: semrw-posix.cpp $ */ /** @file * IPRT - Read-Write Semaphore, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/thread-posix.cpp b/src/VBox/Runtime/r3/posix/thread-posix.cpp index de36ed092..d76682db9 100644 --- a/src/VBox/Runtime/r3/posix/thread-posix.cpp +++ b/src/VBox/Runtime/r3/posix/thread-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-posix.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: thread-posix.cpp $ */ /** @file * IPRT - Threads, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/time-posix.cpp b/src/VBox/Runtime/r3/posix/time-posix.cpp index 7191e4966..34f538a20 100644 --- a/src/VBox/Runtime/r3/posix/time-posix.cpp +++ b/src/VBox/Runtime/r3/posix/time-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: time-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-posix.cpp $ */ /** @file * IPRT - Time, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/timer-posix.cpp b/src/VBox/Runtime/r3/posix/timer-posix.cpp index 2393aeb9f..92cb17e19 100644 --- a/src/VBox/Runtime/r3/posix/timer-posix.cpp +++ b/src/VBox/Runtime/r3/posix/timer-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-posix.cpp 14298 2008-11-18 12:47:26Z vboxsync $ */ +/* $Id: timer-posix.cpp $ */ /** @file * IPRT - Timer, POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/tls-posix.cpp b/src/VBox/Runtime/r3/posix/tls-posix.cpp index 7722b3ea3..6cac43c73 100644 --- a/src/VBox/Runtime/r3/posix/tls-posix.cpp +++ b/src/VBox/Runtime/r3/posix/tls-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-posix.cpp 11790 2008-08-28 19:53:30Z vboxsync $ */ +/* $Id: tls-posix.cpp $ */ /** @file * IPRT - Thread Local Storage (TLS), POSIX. */ diff --git a/src/VBox/Runtime/r3/posix/utf8-posix.cpp b/src/VBox/Runtime/r3/posix/utf8-posix.cpp index 6394f3a82..a7e878182 100644 --- a/src/VBox/Runtime/r3/posix/utf8-posix.cpp +++ b/src/VBox/Runtime/r3/posix/utf8-posix.cpp @@ -1,4 +1,4 @@ -/* $Id: utf8-posix.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: utf8-posix.cpp $ */ /** @file * IPRT - UTF-8 helpers, POSIX. */ diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp index 78080a70b..d7c2fee58 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp @@ -1,4 +1,4 @@ -/* $Id: process.cpp 11836 2008-08-29 16:52:20Z vboxsync $ */ +/* $Id: process.cpp $ */ /** @file * IPRT - Process, Common. */ diff --git a/src/VBox/Runtime/r3/solaris/alloc-solaris.cpp b/src/VBox/Runtime/r3/solaris/alloc-solaris.cpp index 0293f8c9f..ee97b8309 100644 --- a/src/VBox/Runtime/r3/solaris/alloc-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/alloc-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-solaris.cpp 11020 2008-07-30 22:48:35Z vboxsync $ */ +/* $Id: alloc-solaris.cpp $ */ /** @file * IPRT - Memory Allocation, POSIX. */ diff --git a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp index 282509712..f6bf56e13 100644 --- a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-solaris.cpp 12108 2008-09-04 20:17:24Z vboxsync $ */ +/* $Id: mp-solaris.cpp $ */ /** @file * IPRT - Multiprocessor, Solaris. */ diff --git a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp index 49813cf04..d154b361e 100644 --- a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-solaris.cpp 11840 2008-08-29 17:49:10Z vboxsync $ */ +/* $Id: rtProcInitExePath-solaris.cpp $ */ /** @file * IPRT - rtProcInitName, Solaris. */ diff --git a/src/VBox/Runtime/r3/stream.cpp b/src/VBox/Runtime/r3/stream.cpp index 0f2c474c8..ed8a07990 100644 --- a/src/VBox/Runtime/r3/stream.cpp +++ b/src/VBox/Runtime/r3/stream.cpp @@ -1,4 +1,4 @@ -/* $Id: stream.cpp 14060 2008-11-10 23:10:48Z vboxsync $ */ +/* $Id: stream.cpp $ */ /** @file * IPRT - I/O Stream. */ diff --git a/src/VBox/Runtime/r3/tcp.cpp b/src/VBox/Runtime/r3/tcp.cpp index 27313bf86..af3d23af1 100644 --- a/src/VBox/Runtime/r3/tcp.cpp +++ b/src/VBox/Runtime/r3/tcp.cpp @@ -1,4 +1,4 @@ -/* $Id: tcp.cpp 15655 2008-12-18 13:28:02Z vboxsync $ */ +/* $Id: tcp.cpp $ */ /** @file * IPRT - TCP/IP. */ diff --git a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp index 216a40891..34dec02cb 100644 --- a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp +++ b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTLogWriteDebugger-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTLogWriteDebugger-win.cpp $ */ /** @file * IPRT - Log To Debugger, Win32. */ diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp index be558cd85..3cf4ff980 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTSystemQueryOSInfo-win.cpp 15954 2009-01-14 19:46:17Z vboxsync $ */ +/* $Id: RTSystemQueryOSInfo-win.cpp $ */ /** @file * IPRT - RTSystemQueryOSInfo, generic stub. */ diff --git a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp index 4690203be..ba4f9722e 100644 --- a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp +++ b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp @@ -1,4 +1,4 @@ -/* $Id: RTUuidCreate-win.cpp 9749 2008-06-17 08:42:50Z vboxsync $ */ +/* $Id: RTUuidCreate-win.cpp $ */ /** @file * IPRT - UUID, Windows RTUuidCreate implementation. */ diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win32.def b/src/VBox/Runtime/r3/win/VBoxRT-win32.def index 01e105ea3..71168dcb4 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win32.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win32.def @@ -1,4 +1,4 @@ -; $Id: $
+; $Id: $
;; @file
; IPRT - Win32 ASM exports.
;
diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win64.def b/src/VBox/Runtime/r3/win/VBoxRT-win64.def index 3ea841b6d..0db5426e8 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win64.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win64.def @@ -1,4 +1,4 @@ -; $Id: $
+; $Id: $
;; @file
; IPRT - Win64 ASM exports.
;
diff --git a/src/VBox/Runtime/r3/win/alloc-win.cpp b/src/VBox/Runtime/r3/win/alloc-win.cpp index 28169107e..96fa83420 100644 --- a/src/VBox/Runtime/r3/win/alloc-win.cpp +++ b/src/VBox/Runtime/r3/win/alloc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: alloc-win.cpp 11020 2008-07-30 22:48:35Z vboxsync $ */ +/* $Id: alloc-win.cpp $ */ /** @file * IPRT - Memory Allocation, Win32. */ diff --git a/src/VBox/Runtime/r3/win/dir-win.cpp b/src/VBox/Runtime/r3/win/dir-win.cpp index e58a114a8..450bedc16 100644 --- a/src/VBox/Runtime/r3/win/dir-win.cpp +++ b/src/VBox/Runtime/r3/win/dir-win.cpp @@ -1,4 +1,4 @@ -/* $Id: dir-win.cpp 14062 2008-11-10 23:23:05Z vboxsync $ */ +/* $Id: dir-win.cpp $ */ /** @file * IPRT - Directory, win32. */ diff --git a/src/VBox/Runtime/r3/win/dllmain-win.cpp b/src/VBox/Runtime/r3/win/dllmain-win.cpp index 841b33fef..9ae8ee197 100644 --- a/src/VBox/Runtime/r3/win/dllmain-win.cpp +++ b/src/VBox/Runtime/r3/win/dllmain-win.cpp @@ -1,4 +1,4 @@ -/* $Id: dllmain-win.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: dllmain-win.cpp $ */ /** @file * IPRT - Win32 DllMain (Ring-3). */ diff --git a/src/VBox/Runtime/r3/win/fileio-win.cpp b/src/VBox/Runtime/r3/win/fileio-win.cpp index b0066c34b..898f9cac9 100644 --- a/src/VBox/Runtime/r3/win/fileio-win.cpp +++ b/src/VBox/Runtime/r3/win/fileio-win.cpp @@ -1,4 +1,4 @@ -/* $Id: fileio-win.cpp 14064 2008-11-10 23:27:40Z vboxsync $ */ +/* $Id: fileio-win.cpp $ */ /** @file * IPRT - File I/O, native implementation for the Windows host platform. */ diff --git a/src/VBox/Runtime/r3/win/fs-win.cpp b/src/VBox/Runtime/r3/win/fs-win.cpp index 7c267d07e..174a66ef3 100644 --- a/src/VBox/Runtime/r3/win/fs-win.cpp +++ b/src/VBox/Runtime/r3/win/fs-win.cpp @@ -1,4 +1,4 @@ -/* $Id: fs-win.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: fs-win.cpp $ */ /** @file * IPRT - File System, Win32. */ diff --git a/src/VBox/Runtime/r3/win/ldrNative-win.cpp b/src/VBox/Runtime/r3/win/ldrNative-win.cpp index 4722b0348..b596c6792 100644 --- a/src/VBox/Runtime/r3/win/ldrNative-win.cpp +++ b/src/VBox/Runtime/r3/win/ldrNative-win.cpp @@ -1,4 +1,4 @@ -/* $Id: ldrNative-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: ldrNative-win.cpp $ */ /** @file * IPRT - Binary Image Loader, Win32 native. */ diff --git a/src/VBox/Runtime/r3/win/localipc-win.cpp b/src/VBox/Runtime/r3/win/localipc-win.cpp index e5270e116..27afa7c3c 100644 --- a/src/VBox/Runtime/r3/win/localipc-win.cpp +++ b/src/VBox/Runtime/r3/win/localipc-win.cpp @@ -1,4 +1,4 @@ -/* $Id: localipc-win.cpp 11725 2008-08-27 22:21:47Z vboxsync $ */ +/* $Id: localipc-win.cpp $ */ /** @file * IPRT - Local IPC, Windows Implementation Using Named Pipes. */ diff --git a/src/VBox/Runtime/r3/win/mp-win.cpp b/src/VBox/Runtime/r3/win/mp-win.cpp index ffb3884ec..48e05a19f 100644 --- a/src/VBox/Runtime/r3/win/mp-win.cpp +++ b/src/VBox/Runtime/r3/win/mp-win.cpp @@ -1,4 +1,4 @@ -/* $Id: mp-win.cpp 9429 2008-06-05 15:22:37Z vboxsync $ */ +/* $Id: mp-win.cpp $ */ /** @file * IPRT - Multiprocessor, Windows. */ diff --git a/src/VBox/Runtime/r3/win/path-win.cpp b/src/VBox/Runtime/r3/win/path-win.cpp index a84082543..6413cc961 100644 --- a/src/VBox/Runtime/r3/win/path-win.cpp +++ b/src/VBox/Runtime/r3/win/path-win.cpp @@ -1,4 +1,4 @@ -/* $Id: path-win.cpp 15813 2009-01-05 16:06:55Z vboxsync $ */ +/* $Id: path-win.cpp $ */ /** @file * IPRT - Path manipulation. */ diff --git a/src/VBox/Runtime/r3/win/process-win.cpp b/src/VBox/Runtime/r3/win/process-win.cpp index 6b12bd3de..39e47a12d 100644 --- a/src/VBox/Runtime/r3/win/process-win.cpp +++ b/src/VBox/Runtime/r3/win/process-win.cpp @@ -1,4 +1,4 @@ -/* $Id: process-win.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: process-win.cpp $ */ /** @file * IPRT - Process, Win32. */ diff --git a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp index 3d0f2c21a..fa2f6d485 100644 --- a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp +++ b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp @@ -1,4 +1,4 @@ -/* $Id: rtProcInitExePath-win.cpp 11838 2008-08-29 17:14:02Z vboxsync $ */ +/* $Id: rtProcInitExePath-win.cpp $ */ /** @file * IPRT - rtProcInitName, Windows. */ diff --git a/src/VBox/Runtime/r3/win/sched-win.cpp b/src/VBox/Runtime/r3/win/sched-win.cpp index 1697f7736..7a2f7878b 100644 --- a/src/VBox/Runtime/r3/win/sched-win.cpp +++ b/src/VBox/Runtime/r3/win/sched-win.cpp @@ -1,4 +1,4 @@ -/* $Id: sched-win.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: sched-win.cpp $ */ /** @file * IPRT - Scheduling, Win32. */ diff --git a/src/VBox/Runtime/r3/win/sems-win.cpp b/src/VBox/Runtime/r3/win/sems-win.cpp index 5560d1596..46c871749 100644 --- a/src/VBox/Runtime/r3/win/sems-win.cpp +++ b/src/VBox/Runtime/r3/win/sems-win.cpp @@ -1,4 +1,4 @@ -/* $Id: sems-win.cpp 10839 2008-07-23 19:48:51Z vboxsync $ */ +/* $Id: sems-win.cpp $ */ /** @file * IPRT - Semaphores, implementation for Windows host platform. */ diff --git a/src/VBox/Runtime/r3/win/thread-win.cpp b/src/VBox/Runtime/r3/win/thread-win.cpp index eb24437f7..6ad8f8146 100644 --- a/src/VBox/Runtime/r3/win/thread-win.cpp +++ b/src/VBox/Runtime/r3/win/thread-win.cpp @@ -1,4 +1,4 @@ -/* $Id: thread-win.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: thread-win.cpp $ */ /** @file * IPRT - Threads, Win32. */ diff --git a/src/VBox/Runtime/r3/win/time-win.cpp b/src/VBox/Runtime/r3/win/time-win.cpp index c55570e6d..52290fd45 100644 --- a/src/VBox/Runtime/r3/win/time-win.cpp +++ b/src/VBox/Runtime/r3/win/time-win.cpp @@ -1,4 +1,4 @@ -/* $Id: time-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: time-win.cpp $ */ /** @file * IPRT - Time, win32. */ diff --git a/src/VBox/Runtime/r3/win/timer-win.cpp b/src/VBox/Runtime/r3/win/timer-win.cpp index df1f0a4b1..709c67840 100644 --- a/src/VBox/Runtime/r3/win/timer-win.cpp +++ b/src/VBox/Runtime/r3/win/timer-win.cpp @@ -1,4 +1,4 @@ -/* $Id: timer-win.cpp 9950 2008-06-26 11:56:57Z vboxsync $ */ +/* $Id: timer-win.cpp $ */ /** @file * IPRT - Timer. */ diff --git a/src/VBox/Runtime/r3/win/tls-win.cpp b/src/VBox/Runtime/r3/win/tls-win.cpp index df74e2fe5..801798704 100644 --- a/src/VBox/Runtime/r3/win/tls-win.cpp +++ b/src/VBox/Runtime/r3/win/tls-win.cpp @@ -1,4 +1,4 @@ -/* $Id: tls-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tls-win.cpp $ */ /** @file * IPRT - Thread Local Storage (TLS), Win32. */ diff --git a/src/VBox/Runtime/r3/win/utf16locale-win.cpp b/src/VBox/Runtime/r3/win/utf16locale-win.cpp index cb75099f8..01d630471 100644 --- a/src/VBox/Runtime/r3/win/utf16locale-win.cpp +++ b/src/VBox/Runtime/r3/win/utf16locale-win.cpp @@ -1,4 +1,4 @@ -/* $Id: utf16locale-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: utf16locale-win.cpp $ */ /** @file * IPRT - UTF-16 Locale Specific Manipulation, Win32. */ diff --git a/src/VBox/Runtime/r3/win/utf8-win.cpp b/src/VBox/Runtime/r3/win/utf8-win.cpp index 90faed767..eab3af0b0 100644 --- a/src/VBox/Runtime/r3/win/utf8-win.cpp +++ b/src/VBox/Runtime/r3/win/utf8-win.cpp @@ -1,4 +1,4 @@ -/* $Id: utf8-win.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: utf8-win.cpp $ */ /** @file * IPRT - UTF8 helpers. */ diff --git a/src/VBox/Runtime/r3/win/uuid-win.cpp b/src/VBox/Runtime/r3/win/uuid-win.cpp index 1e3eba31d..266a11087 100644 --- a/src/VBox/Runtime/r3/win/uuid-win.cpp +++ b/src/VBox/Runtime/r3/win/uuid-win.cpp @@ -1,4 +1,4 @@ -/* $Id: uuid-win.cpp 9743 2008-06-16 22:53:02Z vboxsync $ */ +/* $Id: uuid-win.cpp $ */ /** @file * IPRT - UUID, Windows implementation. */ diff --git a/src/VBox/Runtime/testcase/Makefile.kmk b/src/VBox/Runtime/testcase/Makefile.kmk index 31cbd8e4f..ddd9d224c 100644 --- a/src/VBox/Runtime/testcase/Makefile.kmk +++ b/src/VBox/Runtime/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15821 2009-01-06 16:49:21Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the IPRT testcases. # diff --git a/src/VBox/Runtime/testcase/ioctl.h b/src/VBox/Runtime/testcase/ioctl.h index da61f2ff3..48d5c490a 100644 --- a/src/VBox/Runtime/testcase/ioctl.h +++ b/src/VBox/Runtime/testcase/ioctl.h @@ -1,4 +1,4 @@ -/* $Id: ioctl.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: ioctl.h $ */ /** @file * VBox L4/OSS audio - header for Linux IoCtls. */ diff --git a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp index 5157b6f2b..bd09bf315 100644 --- a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp +++ b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp @@ -1,4 +1,4 @@ -/* $Id: ntGetTimerResolution.cpp 9963 2008-06-26 14:41:05Z vboxsync $ */ +/* $Id: ntGetTimerResolution.cpp $ */ /** @file * IPRT - Win32 (NT) testcase for getting the timer resolution. */ diff --git a/src/VBox/Runtime/testcase/tstAvl.cpp b/src/VBox/Runtime/testcase/tstAvl.cpp index dee6f6212..abf15117f 100644 --- a/src/VBox/Runtime/testcase/tstAvl.cpp +++ b/src/VBox/Runtime/testcase/tstAvl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstAvl.cpp 13836 2008-11-05 02:42:54Z vboxsync $ */ +/* $Id: tstAvl.cpp $ */ /** @file * IPRT Testcase - Avl trees. */ diff --git a/src/VBox/Runtime/testcase/tstBitOperations.cpp b/src/VBox/Runtime/testcase/tstBitOperations.cpp index 2166780f8..ad282c65a 100644 --- a/src/VBox/Runtime/testcase/tstBitOperations.cpp +++ b/src/VBox/Runtime/testcase/tstBitOperations.cpp @@ -1,4 +1,4 @@ -/* $Id: tstBitOperations.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstBitOperations.cpp $ */ /** @file * IPRT Testcase - Inlined Bit Operations. */ diff --git a/src/VBox/Runtime/testcase/tstCidr.cpp b/src/VBox/Runtime/testcase/tstCidr.cpp index dc3a389eb..ad81b6c99 100644 --- a/src/VBox/Runtime/testcase/tstCidr.cpp +++ b/src/VBox/Runtime/testcase/tstCidr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCidr.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: tstCidr.cpp $ */ /** @file * IPRT Testcase - IPv4. */ diff --git a/src/VBox/Runtime/testcase/tstCritSect.cpp b/src/VBox/Runtime/testcase/tstCritSect.cpp index 46ffd7285..4cda8d6af 100644 --- a/src/VBox/Runtime/testcase/tstCritSect.cpp +++ b/src/VBox/Runtime/testcase/tstCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCritSect.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstCritSect.cpp $ */ /** @file * IPRT Testcase - Critical Sections. */ diff --git a/src/VBox/Runtime/testcase/tstDeadlock.cpp b/src/VBox/Runtime/testcase/tstDeadlock.cpp index a2e98abc1..70528b915 100644 --- a/src/VBox/Runtime/testcase/tstDeadlock.cpp +++ b/src/VBox/Runtime/testcase/tstDeadlock.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDeadlock.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstDeadlock.cpp $ */ /** @file * IPRT Testcase - deadlock detection. Will never really "work". */ diff --git a/src/VBox/Runtime/testcase/tstDir-2.cpp b/src/VBox/Runtime/testcase/tstDir-2.cpp index f1671c4f2..8db2c5dac 100644 --- a/src/VBox/Runtime/testcase/tstDir-2.cpp +++ b/src/VBox/Runtime/testcase/tstDir-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir-2.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstDir-2.cpp $ */ /** @file * IPRT Testcase - Directory listing & filtering . */ diff --git a/src/VBox/Runtime/testcase/tstDir-3.cpp b/src/VBox/Runtime/testcase/tstDir-3.cpp index 554f8ab84..00ed35130 100644 --- a/src/VBox/Runtime/testcase/tstDir-3.cpp +++ b/src/VBox/Runtime/testcase/tstDir-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir-3.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstDir-3.cpp $ */ /** @file * IPRT Testcase - Directory listing & filtering (no parameters needed). */ diff --git a/src/VBox/Runtime/testcase/tstDir.cpp b/src/VBox/Runtime/testcase/tstDir.cpp index 64b182570..ec69e1272 100644 --- a/src/VBox/Runtime/testcase/tstDir.cpp +++ b/src/VBox/Runtime/testcase/tstDir.cpp @@ -1,4 +1,4 @@ -/* $Id: tstDir.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstDir.cpp $ */ /** @file * IPRT Testcase - Directory listing. */ diff --git a/src/VBox/Runtime/testcase/tstEnv.cpp b/src/VBox/Runtime/testcase/tstEnv.cpp index eff54f03a..25e8b64f6 100644 --- a/src/VBox/Runtime/testcase/tstEnv.cpp +++ b/src/VBox/Runtime/testcase/tstEnv.cpp @@ -1,4 +1,4 @@ -/* $Id: tstEnv.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstEnv.cpp $ */ /** @file * IPRT Testcase - Environment. */ diff --git a/src/VBox/Runtime/testcase/tstErrUnique.cpp b/src/VBox/Runtime/testcase/tstErrUnique.cpp index d050d0b52..4e551b07d 100644 --- a/src/VBox/Runtime/testcase/tstErrUnique.cpp +++ b/src/VBox/Runtime/testcase/tstErrUnique.cpp @@ -1,4 +1,4 @@ -/* $Id: tstErrUnique.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstErrUnique.cpp $ */ /** @file * IPRT Testcase - Error Messages. */ diff --git a/src/VBox/Runtime/testcase/tstFile.cpp b/src/VBox/Runtime/testcase/tstFile.cpp index 444359c21..557843de5 100644 --- a/src/VBox/Runtime/testcase/tstFile.cpp +++ b/src/VBox/Runtime/testcase/tstFile.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFile.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstFile.cpp $ */ /** @file * IPRT Testcase - File I/O. */ diff --git a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp index 143c7149d..84b0d8d5a 100644 --- a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp +++ b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFileAppendWin-1.cpp 9138 2008-05-26 22:26:10Z vboxsync $ */ +/* $Id: tstFileAppendWin-1.cpp $ */ /** @file * IPRT Testcase - Exploration of File Appending on Windows. */ diff --git a/src/VBox/Runtime/testcase/tstFileLock.cpp b/src/VBox/Runtime/testcase/tstFileLock.cpp index a746c49c2..f6bfecdbe 100644 --- a/src/VBox/Runtime/testcase/tstFileLock.cpp +++ b/src/VBox/Runtime/testcase/tstFileLock.cpp @@ -1,4 +1,4 @@ -/* $Id: tstFileLock.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstFileLock.cpp $ */ /** @file * IPRT Testcase - File Locks. */ diff --git a/src/VBox/Runtime/testcase/tstGetOpt.cpp b/src/VBox/Runtime/testcase/tstGetOpt.cpp index 201008bb6..8dc969c7f 100644 --- a/src/VBox/Runtime/testcase/tstGetOpt.cpp +++ b/src/VBox/Runtime/testcase/tstGetOpt.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGetOpt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstGetOpt.cpp $ */ /** @file * IPRT Testcase - RTGetOpt */ diff --git a/src/VBox/Runtime/testcase/tstHandleTable.cpp b/src/VBox/Runtime/testcase/tstHandleTable.cpp index 58c6b1792..ba61b2b89 100644 --- a/src/VBox/Runtime/testcase/tstHandleTable.cpp +++ b/src/VBox/Runtime/testcase/tstHandleTable.cpp @@ -1,4 +1,4 @@ -/* $Id: tstHandleTable.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstHandleTable.cpp $ */ /** @file * IPRT Testcase - Handle Tables. */ diff --git a/src/VBox/Runtime/testcase/tstInlineAsm.cpp b/src/VBox/Runtime/testcase/tstInlineAsm.cpp index 8a5084901..eee6a83a4 100644 --- a/src/VBox/Runtime/testcase/tstInlineAsm.cpp +++ b/src/VBox/Runtime/testcase/tstInlineAsm.cpp @@ -1,4 +1,4 @@ -/* $Id: tstInlineAsm.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstInlineAsm.cpp $ */ /** @file * IPRT Testcase - inline assembly. */ diff --git a/src/VBox/Runtime/testcase/tstIoCtl.cpp b/src/VBox/Runtime/testcase/tstIoCtl.cpp index de900c1e5..0fbae69ed 100644 --- a/src/VBox/Runtime/testcase/tstIoCtl.cpp +++ b/src/VBox/Runtime/testcase/tstIoCtl.cpp @@ -1,4 +1,4 @@ -/* $Id: tstIoCtl.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstIoCtl.cpp $ */ /** @file * IPRT Testcase - file IoCtl. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-2.cpp b/src/VBox/Runtime/testcase/tstLdr-2.cpp index 6bdf9d265..7185a813b 100644 --- a/src/VBox/Runtime/testcase/tstLdr-2.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-2.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLdr-2.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*, manual inspection. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-3.cpp b/src/VBox/Runtime/testcase/tstLdr-3.cpp index 5875dd99d..789bb4bc3 100644 --- a/src/VBox/Runtime/testcase/tstLdr-3.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-3.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLdr-3.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*, manual inspection. */ diff --git a/src/VBox/Runtime/testcase/tstLdr-4.cpp b/src/VBox/Runtime/testcase/tstLdr-4.cpp index 164f747cb..81849d601 100644 --- a/src/VBox/Runtime/testcase/tstLdr-4.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr-4.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLdr-4.cpp $ */ /** @file * IPRT - Testcase for RTLdrOpen using ldrLdrObjR0.r0. */ diff --git a/src/VBox/Runtime/testcase/tstLdr.cpp b/src/VBox/Runtime/testcase/tstLdr.cpp index ee92a7af6..068034e3c 100644 --- a/src/VBox/Runtime/testcase/tstLdr.cpp +++ b/src/VBox/Runtime/testcase/tstLdr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdr.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLdr.cpp $ */ /** @file * IPRT - Testcase for parts of RTLdr*. */ diff --git a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp index ad6b6d44a..9ec6cd17c 100644 --- a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp +++ b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrDisasmTest.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstLdrDisasmTest.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLdrLoad.cpp b/src/VBox/Runtime/testcase/tstLdrLoad.cpp index 9f867bcdc..44f17b2d2 100644 --- a/src/VBox/Runtime/testcase/tstLdrLoad.cpp +++ b/src/VBox/Runtime/testcase/tstLdrLoad.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrLoad.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLdrLoad.cpp $ */ /** @file * IPRT Testcase - Native Loader. */ diff --git a/src/VBox/Runtime/testcase/tstLdrObj.cpp b/src/VBox/Runtime/testcase/tstLdrObj.cpp index 94d19f20d..ac2e72912 100644 --- a/src/VBox/Runtime/testcase/tstLdrObj.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObj.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrObj.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: tstLdrObj.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp index f8fcff1f6..4c4492289 100644 --- a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLdrObjR0.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstLdrObjR0.cpp $ */ /** @file * IPRT - RTLdr test object. * diff --git a/src/VBox/Runtime/testcase/tstLog.cpp b/src/VBox/Runtime/testcase/tstLog.cpp index 09e8107a4..9243cfb39 100644 --- a/src/VBox/Runtime/testcase/tstLog.cpp +++ b/src/VBox/Runtime/testcase/tstLog.cpp @@ -1,4 +1,4 @@ -/* $Id: tstLog.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstLog.cpp $ */ /** @file * IPRT Testcase - Log Formatting. */ diff --git a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp index 03f5b0322..0a1a0f0bd 100644 --- a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp +++ b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMemAutoPtr.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstMemAutoPtr.cpp $ */ /** @file * IPRT - Testcase the RTMemAutoPtr template. */ diff --git a/src/VBox/Runtime/testcase/tstMove.cpp b/src/VBox/Runtime/testcase/tstMove.cpp index 6a9c5ccb2..047ae23d7 100644 --- a/src/VBox/Runtime/testcase/tstMove.cpp +++ b/src/VBox/Runtime/testcase/tstMove.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMove.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstMove.cpp $ */ /** @file * IPRT - RTFileMove & RTDirMove test program. */ diff --git a/src/VBox/Runtime/testcase/tstMp-1.cpp b/src/VBox/Runtime/testcase/tstMp-1.cpp index 002f5259a..4563cd8b2 100644 --- a/src/VBox/Runtime/testcase/tstMp-1.cpp +++ b/src/VBox/Runtime/testcase/tstMp-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMp-1.cpp 12107 2008-09-04 20:10:06Z vboxsync $ */ +/* $Id: tstMp-1.cpp $ */ /** @file * IPRT Testcase - RTMp. */ diff --git a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp index 4a8af4821..f324b5dd0 100644 --- a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp +++ b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstNoCrt-1.cpp 14026 2008-11-10 17:11:07Z vboxsync $ */ +/* $Id: tstNoCrt-1.cpp $ */ /** @file * IPRT Testcase - Testcase for the No-CRT assembly bits. */ diff --git a/src/VBox/Runtime/testcase/tstOnce.cpp b/src/VBox/Runtime/testcase/tstOnce.cpp index 3861c8122..01292a60c 100644 --- a/src/VBox/Runtime/testcase/tstOnce.cpp +++ b/src/VBox/Runtime/testcase/tstOnce.cpp @@ -1,4 +1,4 @@ -/* $Id: tstOnce.cpp 10947 2008-07-29 18:27:35Z vboxsync $ */ +/* $Id: tstOnce.cpp $ */ /** @file * IPRT Testcase - RTOnce. */ diff --git a/src/VBox/Runtime/testcase/tstPath.cpp b/src/VBox/Runtime/testcase/tstPath.cpp index 04f7b3598..800b95761 100644 --- a/src/VBox/Runtime/testcase/tstPath.cpp +++ b/src/VBox/Runtime/testcase/tstPath.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPath.cpp 15813 2009-01-05 16:06:55Z vboxsync $ */ +/* $Id: tstPath.cpp $ */ /** @file * IPRT Testcase - Test various path functions. */ diff --git a/src/VBox/Runtime/testcase/tstPrfRT.cpp b/src/VBox/Runtime/testcase/tstPrfRT.cpp index 08299159e..22a623383 100644 --- a/src/VBox/Runtime/testcase/tstPrfRT.cpp +++ b/src/VBox/Runtime/testcase/tstPrfRT.cpp @@ -1,4 +1,4 @@ -/* $Id: tstPrfRT.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstPrfRT.cpp $ */ /** @file * IPRT testcase - profile some of the important functions. */ diff --git a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp index f13b7514b..7c5da1d14 100644 --- a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp +++ b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTFsQueries.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstRTFsQueries.cpp $ */ /** @file * IPRT Testcase - RTFs Queries.. */ diff --git a/src/VBox/Runtime/testcase/tstRTProcWait.cpp b/src/VBox/Runtime/testcase/tstRTProcWait.cpp index 00e09cb7e..34fa5673a 100644 --- a/src/VBox/Runtime/testcase/tstRTProcWait.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcWait.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRTProcWait.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstRTProcWait.cpp $ */ /** @file * IPRT Testcase - RTProcWait. */ diff --git a/src/VBox/Runtime/testcase/tstRand.cpp b/src/VBox/Runtime/testcase/tstRand.cpp index 3786b53c7..8b1dc350e 100644 --- a/src/VBox/Runtime/testcase/tstRand.cpp +++ b/src/VBox/Runtime/testcase/tstRand.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRand.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstRand.cpp $ */ /** @file * IPRT - Testcase for the RTRand API. */ diff --git a/src/VBox/Runtime/testcase/tstSemMutex.cpp b/src/VBox/Runtime/testcase/tstSemMutex.cpp index 60a739925..726f645ed 100644 --- a/src/VBox/Runtime/testcase/tstSemMutex.cpp +++ b/src/VBox/Runtime/testcase/tstSemMutex.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSemMutex.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstSemMutex.cpp $ */ /** @file * IPRT Testcase - Simple Semaphore Smoke Test. */ diff --git a/src/VBox/Runtime/testcase/tstSemPingPong.cpp b/src/VBox/Runtime/testcase/tstSemPingPong.cpp index 9b1556f25..19f630714 100644 --- a/src/VBox/Runtime/testcase/tstSemPingPong.cpp +++ b/src/VBox/Runtime/testcase/tstSemPingPong.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSemPingPong.cpp 12874 2008-10-01 20:09:09Z vboxsync $ */ +/* $Id: tstSemPingPong.cpp $ */ /** @file * IPRT Testcase - RTSemPing/RTSemPong. */ diff --git a/src/VBox/Runtime/testcase/tstSems.cpp b/src/VBox/Runtime/testcase/tstSems.cpp index 133f92328..a59adba8b 100644 --- a/src/VBox/Runtime/testcase/tstSems.cpp +++ b/src/VBox/Runtime/testcase/tstSems.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSems.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstSems.cpp $ */ /** @file * IPRT Testcase - Simple Semaphore Smoke Test. */ diff --git a/src/VBox/Runtime/testcase/tstStrFormat.cpp b/src/VBox/Runtime/testcase/tstStrFormat.cpp index 3952de6ac..7741708ad 100644 --- a/src/VBox/Runtime/testcase/tstStrFormat.cpp +++ b/src/VBox/Runtime/testcase/tstStrFormat.cpp @@ -1,4 +1,4 @@ -/* $Id: tstStrFormat.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstStrFormat.cpp $ */ /** @file * IPRT Testcase - String formatting. */ diff --git a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp index d3b283a69..42278a789 100644 --- a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp +++ b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp @@ -1,4 +1,4 @@ -/* $Id: tstStrSimplePattern.cpp 13472 2008-10-22 09:19:00Z vboxsync $ */ +/* $Id: tstStrSimplePattern.cpp $ */ /** @file * IPRT Testcase - RTStrSimplePattern. */ diff --git a/src/VBox/Runtime/testcase/tstStrToNum.cpp b/src/VBox/Runtime/testcase/tstStrToNum.cpp index 7d7a0c9f8..5a5cff467 100644 --- a/src/VBox/Runtime/testcase/tstStrToNum.cpp +++ b/src/VBox/Runtime/testcase/tstStrToNum.cpp @@ -1,4 +1,4 @@ -/* $Id: tstStrToNum.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: tstStrToNum.cpp $ */ /** @file * IPRT Testcase - String To Number Conversion. */ diff --git a/src/VBox/Runtime/testcase/tstSystemQueryOsInfo.cpp b/src/VBox/Runtime/testcase/tstSystemQueryOsInfo.cpp index 49a964b3e..3ddb735e8 100644 --- a/src/VBox/Runtime/testcase/tstSystemQueryOsInfo.cpp +++ b/src/VBox/Runtime/testcase/tstSystemQueryOsInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSystemQueryOsInfo.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstSystemQueryOsInfo.cpp $ */ /** @file * IPRT Testcase - RTSystemQueryOSInfo. */ diff --git a/src/VBox/Runtime/testcase/tstTSC.cpp b/src/VBox/Runtime/testcase/tstTSC.cpp index 439c9d61e..431369b7e 100644 --- a/src/VBox/Runtime/testcase/tstTSC.cpp +++ b/src/VBox/Runtime/testcase/tstTSC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTSC.cpp 12548 2008-09-17 17:59:49Z vboxsync $ */ +/* $Id: tstTSC.cpp $ */ /** @file * IPRT Testcase - SMP TSC testcase. */ diff --git a/src/VBox/Runtime/testcase/tstThread-1.cpp b/src/VBox/Runtime/testcase/tstThread-1.cpp index 64889fc89..a1791b68d 100644 --- a/src/VBox/Runtime/testcase/tstThread-1.cpp +++ b/src/VBox/Runtime/testcase/tstThread-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstThread-1.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstThread-1.cpp $ */ /** @file * IPRT Testcase - Thread Testcase no.1. */ diff --git a/src/VBox/Runtime/testcase/tstTime-2.cpp b/src/VBox/Runtime/testcase/tstTime-2.cpp index b914add26..cabf1e678 100644 --- a/src/VBox/Runtime/testcase/tstTime-2.cpp +++ b/src/VBox/Runtime/testcase/tstTime-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-2.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstTime-2.cpp $ */ /** @file * IPRT Testcase - Simple RTTime test. */ diff --git a/src/VBox/Runtime/testcase/tstTime-3.cpp b/src/VBox/Runtime/testcase/tstTime-3.cpp index 6eb3a9ac4..6df3a5c92 100644 --- a/src/VBox/Runtime/testcase/tstTime-3.cpp +++ b/src/VBox/Runtime/testcase/tstTime-3.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-3.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstTime-3.cpp $ */ /** @file * IPRT Testcase - Simple RTTime test. */ diff --git a/src/VBox/Runtime/testcase/tstTime-4.cpp b/src/VBox/Runtime/testcase/tstTime-4.cpp index 015afa246..99053ce18 100644 --- a/src/VBox/Runtime/testcase/tstTime-4.cpp +++ b/src/VBox/Runtime/testcase/tstTime-4.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime-4.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstTime-4.cpp $ */ /** @file * IPRT Testcase - Simple RTTime vs. RTTimeSystem test. */ diff --git a/src/VBox/Runtime/testcase/tstTime.cpp b/src/VBox/Runtime/testcase/tstTime.cpp index e77438e66..c608fde04 100644 --- a/src/VBox/Runtime/testcase/tstTime.cpp +++ b/src/VBox/Runtime/testcase/tstTime.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTime.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstTime.cpp $ */ /** @file * IPRT Testcase - Simple RTTime tests. */ diff --git a/src/VBox/Runtime/testcase/tstTimeSpec.cpp b/src/VBox/Runtime/testcase/tstTimeSpec.cpp index 28ffd41fc..c3b13138a 100644 --- a/src/VBox/Runtime/testcase/tstTimeSpec.cpp +++ b/src/VBox/Runtime/testcase/tstTimeSpec.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTimeSpec.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: tstTimeSpec.cpp $ */ /** @file * IPRT - RTTimeSpec and PRTTIME tests. */ diff --git a/src/VBox/Runtime/testcase/tstTimer.cpp b/src/VBox/Runtime/testcase/tstTimer.cpp index a91e17cdf..03a16f3f9 100644 --- a/src/VBox/Runtime/testcase/tstTimer.cpp +++ b/src/VBox/Runtime/testcase/tstTimer.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTimer.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstTimer.cpp $ */ /** @file * IPRT Testcase - Timers. */ diff --git a/src/VBox/Runtime/testcase/tstTimerLR.cpp b/src/VBox/Runtime/testcase/tstTimerLR.cpp index 5bf2ec28a..68b47e23c 100644 --- a/src/VBox/Runtime/testcase/tstTimerLR.cpp +++ b/src/VBox/Runtime/testcase/tstTimerLR.cpp @@ -1,4 +1,4 @@ -/* $Id: tstTimerLR.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstTimerLR.cpp $ */ /** @file * IPRT Testcase - Low Resolution Timers. */ diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp index afa6c20ac..256631c2f 100644 --- a/src/VBox/Runtime/testcase/tstUtf8.cpp +++ b/src/VBox/Runtime/testcase/tstUtf8.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUtf8.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstUtf8.cpp $ */ /** @file * IPRT Testcase - UTF-8 and UTF-16 string conversions. */ diff --git a/src/VBox/Runtime/testcase/tstUuid.cpp b/src/VBox/Runtime/testcase/tstUuid.cpp index 734bab66c..230363ea8 100644 --- a/src/VBox/Runtime/testcase/tstUuid.cpp +++ b/src/VBox/Runtime/testcase/tstUuid.cpp @@ -1,4 +1,4 @@ -/* $Id: tstUuid.cpp 13837 2008-11-05 02:54:02Z vboxsync $ */ +/* $Id: tstUuid.cpp $ */ /** @file * IPRT Testcase - UUID. */ diff --git a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp index b17cdb0e3..857b7ab31 100644 --- a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp +++ b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp @@ -1,4 +1,4 @@ -/* $Id: RTErrConvertFromWin32.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: RTErrConvertFromWin32.cpp $ */ /** @file * IPRT - Convert win32 error codes to iprt status codes. */ diff --git a/src/VBox/Runtime/win/errmsgwin.cpp b/src/VBox/Runtime/win/errmsgwin.cpp index 6c965c856..09e175862 100644 --- a/src/VBox/Runtime/win/errmsgwin.cpp +++ b/src/VBox/Runtime/win/errmsgwin.cpp @@ -1,4 +1,4 @@ -/* $Id: errmsgwin.cpp 14626 2008-11-26 10:01:53Z vboxsync $ */ +/* $Id: errmsgwin.cpp $ */ /** @file * IPRT - Status code messages. */ diff --git a/src/VBox/VMM/CFGM.cpp b/src/VBox/VMM/CFGM.cpp index f4c444962..730732f0f 100644 --- a/src/VBox/VMM/CFGM.cpp +++ b/src/VBox/VMM/CFGM.cpp @@ -1,4 +1,4 @@ -/* $Id: CFGM.cpp 14070 2008-11-10 23:45:24Z vboxsync $ */ +/* $Id: CFGM.cpp $ */ /** @file * CFGM - Configuration Manager. */ diff --git a/src/VBox/VMM/CFGMInternal.h b/src/VBox/VMM/CFGMInternal.h index 1f98fe483..e1ab20c21 100644 --- a/src/VBox/VMM/CFGMInternal.h +++ b/src/VBox/VMM/CFGMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CFGMInternal.h 14070 2008-11-10 23:45:24Z vboxsync $ */ +/* $Id: CFGMInternal.h $ */ /** @file * CFGM - Internal header file. */ diff --git a/src/VBox/VMM/CPUM.cpp b/src/VBox/VMM/CPUM.cpp index 786a6dbcb..e5dc0d458 100644 --- a/src/VBox/VMM/CPUM.cpp +++ b/src/VBox/VMM/CPUM.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUM.cpp 15962 2009-01-15 12:33:49Z vboxsync $ */ +/* $Id: CPUM.cpp $ */ /** @file * CPUM - CPU Monitor / Manager. */ @@ -1014,6 +1014,7 @@ static DECLCALLBACK(int) cpumR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Versio /* * Check that the basic cpuid id information is unchanged. + * @todo we should check the 64 bits capabilities too! */ uint32_t au32CpuId[8] = {0}; ASMCpuId(0, &au32CpuId[0], &au32CpuId[1], &au32CpuId[2], &au32CpuId[3]); @@ -1022,9 +1023,14 @@ static DECLCALLBACK(int) cpumR3Load(PVM pVM, PSSMHANDLE pSSM, uint32_t u32Versio rc = SSMR3GetMem(pSSM, &au32CpuIdSaved[0], sizeof(au32CpuIdSaved)); if (RT_SUCCESS(rc)) { + /* Ignore CPU stepping. */ + au32CpuId[4] &= 0xfffffff0; + au32CpuIdSaved[4] &= 0xfffffff0; + /* Ignore APIC ID (AMD specs). */ au32CpuId[5] &= ~0xff000000; au32CpuIdSaved[5] &= ~0xff000000; + /* Ignore the number of Logical CPUs (AMD specs). */ au32CpuId[5] &= ~0x00ff0000; au32CpuIdSaved[5] &= ~0x00ff0000; diff --git a/src/VBox/VMM/CPUMInternal.h b/src/VBox/VMM/CPUMInternal.h index 1c2f39eef..d301d402a 100644 --- a/src/VBox/VMM/CPUMInternal.h +++ b/src/VBox/VMM/CPUMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CPUMInternal.h 16113 2009-01-21 09:08:29Z vboxsync $ */ +/* $Id: CPUMInternal.h $ */ /** @file * CPUM - Internal header file. */ diff --git a/src/VBox/VMM/CPUMInternal.mac b/src/VBox/VMM/CPUMInternal.mac index 8c72f8b3e..cf194a5bd 100644 --- a/src/VBox/VMM/CPUMInternal.mac +++ b/src/VBox/VMM/CPUMInternal.mac @@ -1,4 +1,4 @@ -; $Id: CPUMInternal.mac 15962 2009-01-15 12:33:49Z vboxsync $ +; $Id: CPUMInternal.mac $ ;; @file ; CPUM - Internal header file (asm). ; diff --git a/src/VBox/VMM/DBGF.cpp b/src/VBox/VMM/DBGF.cpp index bc21887a5..3fb465b9b 100644 --- a/src/VBox/VMM/DBGF.cpp +++ b/src/VBox/VMM/DBGF.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGF.cpp 14660 2008-11-26 18:20:22Z vboxsync $ */ +/* $Id: DBGF.cpp $ */ /** @file * DBGF - Debugger Facility. */ diff --git a/src/VBox/VMM/DBGFAddr.cpp b/src/VBox/VMM/DBGFAddr.cpp index 0bacad42a..e75866f5f 100644 --- a/src/VBox/VMM/DBGFAddr.cpp +++ b/src/VBox/VMM/DBGFAddr.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAddr.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: DBGFAddr.cpp $ */ /** @file * DBGF - Debugger Facility, Mixed Address Methods. */ diff --git a/src/VBox/VMM/DBGFAddrSpace.cpp b/src/VBox/VMM/DBGFAddrSpace.cpp index 6b5ecd594..edf6aaa3f 100644 --- a/src/VBox/VMM/DBGFAddrSpace.cpp +++ b/src/VBox/VMM/DBGFAddrSpace.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAddrSpace.cpp 12677 2008-09-24 07:19:03Z vboxsync $ */ +/* $Id: DBGFAddrSpace.cpp $ */ /** @file * DBGF - Debugger Facility, Address Space Management. */ diff --git a/src/VBox/VMM/DBGFBp.cpp b/src/VBox/VMM/DBGFBp.cpp index 661c03ad0..6c7645a37 100644 --- a/src/VBox/VMM/DBGFBp.cpp +++ b/src/VBox/VMM/DBGFBp.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFBp.cpp 13818 2008-11-04 22:59:47Z vboxsync $ */ +/* $Id: DBGFBp.cpp $ */ /** @file * DBGF - Debugger Facility, Breakpoint Management. */ diff --git a/src/VBox/VMM/DBGFDisas.cpp b/src/VBox/VMM/DBGFDisas.cpp index 42199a802..f7023c840 100644 --- a/src/VBox/VMM/DBGFDisas.cpp +++ b/src/VBox/VMM/DBGFDisas.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFDisas.cpp 15942 2009-01-14 13:20:58Z vboxsync $ */ +/* $Id: DBGFDisas.cpp $ */ /** @file * DBGF - Debugger Facility, Disassembler. */ diff --git a/src/VBox/VMM/DBGFInfo.cpp b/src/VBox/VMM/DBGFInfo.cpp index 71cf7828a..407855a79 100644 --- a/src/VBox/VMM/DBGFInfo.cpp +++ b/src/VBox/VMM/DBGFInfo.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFInfo.cpp 13818 2008-11-04 22:59:47Z vboxsync $ */ +/* $Id: DBGFInfo.cpp $ */ /** @file * DBGF - Debugger Facility, Info. */ diff --git a/src/VBox/VMM/DBGFInternal.h b/src/VBox/VMM/DBGFInternal.h index 3deb359b1..9680fbe7c 100644 --- a/src/VBox/VMM/DBGFInternal.h +++ b/src/VBox/VMM/DBGFInternal.h @@ -1,4 +1,4 @@ -/* $Id: DBGFInternal.h 12989 2008-10-06 02:15:39Z vboxsync $ */ +/* $Id: DBGFInternal.h $ */ /** @file * DBGF - Internal header file. */ diff --git a/src/VBox/VMM/DBGFLog.cpp b/src/VBox/VMM/DBGFLog.cpp index f9dddc924..fbc84c6ee 100644 --- a/src/VBox/VMM/DBGFLog.cpp +++ b/src/VBox/VMM/DBGFLog.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFLog.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: DBGFLog.cpp $ */ /** @file * DBGF - Debugger Facility, Log Manager. */ diff --git a/src/VBox/VMM/DBGFMem.cpp b/src/VBox/VMM/DBGFMem.cpp index e1540d661..6dac3ec93 100644 --- a/src/VBox/VMM/DBGFMem.cpp +++ b/src/VBox/VMM/DBGFMem.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFMem.cpp 15997 2009-01-16 16:13:23Z vboxsync $ */ +/* $Id: DBGFMem.cpp $ */ /** @file * DBGF - Debugger Facility, Memory Methods. */ diff --git a/src/VBox/VMM/DBGFModule.cpp b/src/VBox/VMM/DBGFModule.cpp index bbb917153..ae203bacc 100644 --- a/src/VBox/VMM/DBGFModule.cpp +++ b/src/VBox/VMM/DBGFModule.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFModule.cpp 12677 2008-09-24 07:19:03Z vboxsync $ */ +/* $Id: DBGFModule.cpp $ */ /** @file * DBGF - Debugger Facility, Module & Segment Management. */ diff --git a/src/VBox/VMM/DBGFOS.cpp b/src/VBox/VMM/DBGFOS.cpp index 627cc883a..6ae4942d5 100644 --- a/src/VBox/VMM/DBGFOS.cpp +++ b/src/VBox/VMM/DBGFOS.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFOS.cpp 13782 2008-11-04 12:16:30Z vboxsync $ */ +/* $Id: DBGFOS.cpp $ */ /** @file * DBGF - Debugger Facility, Guest OS Diggers. */ diff --git a/src/VBox/VMM/DBGFStack.cpp b/src/VBox/VMM/DBGFStack.cpp index 30b095ffc..89aef53e8 100644 --- a/src/VBox/VMM/DBGFStack.cpp +++ b/src/VBox/VMM/DBGFStack.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFStack.cpp 13975 2008-11-07 16:33:20Z vboxsync $ */ +/* $Id: DBGFStack.cpp $ */ /** @file * DBGF - Debugger Facility, Call Stack Analyser. */ diff --git a/src/VBox/VMM/DBGFSym.cpp b/src/VBox/VMM/DBGFSym.cpp index bcecb6866..25c1c7994 100644 --- a/src/VBox/VMM/DBGFSym.cpp +++ b/src/VBox/VMM/DBGFSym.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFSym.cpp 16080 2009-01-20 11:15:58Z vboxsync $ */ +/* $Id: DBGFSym.cpp $ */ /** @file * DBGF - Debugger Facility, Symbol Management. */ diff --git a/src/VBox/VMM/EM.cpp b/src/VBox/VMM/EM.cpp index eb0fcf022..b0def6ed2 100644 --- a/src/VBox/VMM/EM.cpp +++ b/src/VBox/VMM/EM.cpp @@ -1,4 +1,4 @@ -/* $Id: EM.cpp 16132 2009-01-21 12:30:44Z vboxsync $ */ +/* $Id: EM.cpp $ */ /** @file * EM - Execution Monitor / Manager. */ diff --git a/src/VBox/VMM/EMInternal.h b/src/VBox/VMM/EMInternal.h index e3154dda5..7bf6fe49b 100644 --- a/src/VBox/VMM/EMInternal.h +++ b/src/VBox/VMM/EMInternal.h @@ -1,4 +1,4 @@ -/* $Id: EMInternal.h 15633 2008-12-17 15:08:11Z vboxsync $ */ +/* $Id: EMInternal.h $ */ /** @file * EM - Internal header file. */ diff --git a/src/VBox/VMM/GMM.cpp b/src/VBox/VMM/GMM.cpp index 8f4dffcb2..385dceac1 100644 --- a/src/VBox/VMM/GMM.cpp +++ b/src/VBox/VMM/GMM.cpp @@ -1,4 +1,4 @@ -/* $Id: GMM.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: GMM.cpp $ */ /** @file * GMM - Global Memory Manager, ring-3 request wrappers. */ diff --git a/src/VBox/VMM/HWACCM.cpp b/src/VBox/VMM/HWACCM.cpp index 71d380303..66261f470 100644 --- a/src/VBox/VMM/HWACCM.cpp +++ b/src/VBox/VMM/HWACCM.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCM.cpp 16136 2009-01-21 13:17:41Z vboxsync $ */ +/* $Id: HWACCM.cpp $ */ /** @file * HWACCM - Intel/AMD VM Hardware Support Manager */ diff --git a/src/VBox/VMM/HWACCMInternal.h b/src/VBox/VMM/HWACCMInternal.h index 5d8034349..db5485fb7 100644 --- a/src/VBox/VMM/HWACCMInternal.h +++ b/src/VBox/VMM/HWACCMInternal.h @@ -1,4 +1,4 @@ -/* $Id: HWACCMInternal.h 15962 2009-01-15 12:33:49Z vboxsync $ */ +/* $Id: HWACCMInternal.h $ */ /** @file * HWACCM - Internal header file. */ diff --git a/src/VBox/VMM/IOM.cpp b/src/VBox/VMM/IOM.cpp index 2de746db4..71871662d 100644 --- a/src/VBox/VMM/IOM.cpp +++ b/src/VBox/VMM/IOM.cpp @@ -1,4 +1,4 @@ -/* $Id: IOM.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: IOM.cpp $ */ /** @file * IOM - Input / Output Monitor. */ diff --git a/src/VBox/VMM/IOMInternal.h b/src/VBox/VMM/IOMInternal.h index 25d056a55..43b5bf2e6 100644 --- a/src/VBox/VMM/IOMInternal.h +++ b/src/VBox/VMM/IOMInternal.h @@ -1,4 +1,4 @@ -/* $Id: IOMInternal.h 13413 2008-10-20 23:15:20Z vboxsync $ */ +/* $Id: IOMInternal.h $ */ /** @file * IOM - Internal header file. */ diff --git a/src/VBox/VMM/MM.cpp b/src/VBox/VMM/MM.cpp index ed1f0a4e9..71c296d86 100644 --- a/src/VBox/VMM/MM.cpp +++ b/src/VBox/VMM/MM.cpp @@ -1,4 +1,4 @@ -/* $Id: MM.cpp 14299 2008-11-18 13:25:40Z vboxsync $ */ +/* $Id: MM.cpp $ */ /** @file * MM - Memory Manager. */ diff --git a/src/VBox/VMM/MMHeap.cpp b/src/VBox/VMM/MMHeap.cpp index e49ecd4f1..06a4148d0 100644 --- a/src/VBox/VMM/MMHeap.cpp +++ b/src/VBox/VMM/MMHeap.cpp @@ -1,4 +1,4 @@ -/* $Id: MMHeap.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: MMHeap.cpp $ */ /** @file * MM - Memory Manager - Heap. */ diff --git a/src/VBox/VMM/MMHyper.cpp b/src/VBox/VMM/MMHyper.cpp index ce4e16b6c..1e938f402 100644 --- a/src/VBox/VMM/MMHyper.cpp +++ b/src/VBox/VMM/MMHyper.cpp @@ -1,4 +1,4 @@ -/* $Id: MMHyper.cpp 15538 2008-12-15 19:32:34Z vboxsync $ */ +/* $Id: MMHyper.cpp $ */ /** @file * MM - Memory Manager - Hypervisor Memory Area. */ diff --git a/src/VBox/VMM/MMInternal.h b/src/VBox/VMM/MMInternal.h index 33e46e229..63d55c620 100644 --- a/src/VBox/VMM/MMInternal.h +++ b/src/VBox/VMM/MMInternal.h @@ -1,4 +1,4 @@ -/* $Id: MMInternal.h 14597 2008-11-25 20:41:40Z vboxsync $ */ +/* $Id: MMInternal.h $ */ /** @file * MM - Internal header file. */ diff --git a/src/VBox/VMM/MMPagePool.cpp b/src/VBox/VMM/MMPagePool.cpp index 3e506d1f3..9ed394998 100644 --- a/src/VBox/VMM/MMPagePool.cpp +++ b/src/VBox/VMM/MMPagePool.cpp @@ -1,4 +1,4 @@ -/* $Id: MMPagePool.cpp 14602 2008-11-25 21:55:34Z vboxsync $ */ +/* $Id: MMPagePool.cpp $ */ /** @file * MM - Memory Manager - Page Pool. */ diff --git a/src/VBox/VMM/MMPhys.cpp b/src/VBox/VMM/MMPhys.cpp index 9d2b1f2a2..a6466b304 100644 --- a/src/VBox/VMM/MMPhys.cpp +++ b/src/VBox/VMM/MMPhys.cpp @@ -1,4 +1,4 @@ -/* $Id: MMPhys.cpp 13841 2008-11-05 03:38:52Z vboxsync $ */ +/* $Id: MMPhys.cpp $ */ /** @file * MM - Memory Manager - Physical Memory. * diff --git a/src/VBox/VMM/Makefile.kmk b/src/VBox/VMM/Makefile.kmk index b4f2f28c9..6bbc08720 100644 --- a/src/VBox/VMM/Makefile.kmk +++ b/src/VBox/VMM/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15414 2008-12-13 04:33:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the VMM. # diff --git a/src/VBox/VMM/PATM/CSAM.cpp b/src/VBox/VMM/PATM/CSAM.cpp index d476e6356..2568c3f3f 100644 --- a/src/VBox/VMM/PATM/CSAM.cpp +++ b/src/VBox/VMM/PATM/CSAM.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAM.cpp 14755 2008-11-28 02:58:01Z vboxsync $ */ +/* $Id: CSAM.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager */ @@ -1942,6 +1942,13 @@ static DECLCALLBACK(int) CSAMCodePageWriteHandler(PVM pVM, RTGCPTR GCPtr, void * Assert(enmAccessType == PGMACCESSTYPE_WRITE); Log(("CSAMCodePageWriteHandler: write to %RGv size=%zu\n", GCPtr, cbBuf)); + if ( PAGE_ADDRESS(pvPtr) == PAGE_ADDRESS((uintptr_t)pvPtr + cbBuf - 1) + && !memcmp(pvPtr, pvBuf, cbBuf)) + { + Log(("CSAMCodePageWriteHandler: dummy write -> ignore\n")); + return VINF_PGM_HANDLER_DO_DEFAULT; + } + if (VM_IS_EMT(pVM)) { rc = PATMR3PatchWrite(pVM, GCPtr, (uint32_t)cbBuf); diff --git a/src/VBox/VMM/PATM/CSAMInternal.h b/src/VBox/VMM/PATM/CSAMInternal.h index bde9b7a42..97af734e6 100644 --- a/src/VBox/VMM/PATM/CSAMInternal.h +++ b/src/VBox/VMM/PATM/CSAMInternal.h @@ -1,4 +1,4 @@ -/* $Id: CSAMInternal.h 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: CSAMInternal.h $ */ /** @file * CSAM - Internal header file. */ diff --git a/src/VBox/VMM/PATM/PATM.cpp b/src/VBox/VMM/PATM/PATM.cpp index a1ce7c389..f6c0cf010 100644 --- a/src/VBox/VMM/PATM/PATM.cpp +++ b/src/VBox/VMM/PATM/PATM.cpp @@ -1,4 +1,4 @@ -/* $Id: PATM.cpp 15677 2008-12-19 09:26:23Z vboxsync $ */ +/* $Id: PATM.cpp $ */ /** @file * PATM - Dynamic Guest OS Patching Manager * diff --git a/src/VBox/VMM/PATM/PATMA.asm b/src/VBox/VMM/PATM/PATMA.asm index eadfd21cf..8a4fceea1 100644 --- a/src/VBox/VMM/PATM/PATMA.asm +++ b/src/VBox/VMM/PATM/PATMA.asm @@ -1,4 +1,4 @@ -; $Id: PATMA.asm 11979 2008-09-02 13:00:58Z vboxsync $ +; $Id: PATMA.asm $ ;; @file ; PATM Assembly Routines. ; diff --git a/src/VBox/VMM/PATM/PATMA.h b/src/VBox/VMM/PATM/PATMA.h index f1c6defb1..e8dd109ec 100644 --- a/src/VBox/VMM/PATM/PATMA.h +++ b/src/VBox/VMM/PATM/PATMA.h @@ -1,4 +1,4 @@ -/* $Id: PATMA.h 11920 2008-09-01 13:44:18Z vboxsync $ */ +/* $Id: PATMA.h $ */ /** @file * PATM macros & definitions (identical to PATMA.mac!!) */ diff --git a/src/VBox/VMM/PATM/PATMA.mac b/src/VBox/VMM/PATM/PATMA.mac index e96ea7e97..cc91fe00d 100644 --- a/src/VBox/VMM/PATM/PATMA.mac +++ b/src/VBox/VMM/PATM/PATMA.mac @@ -1,4 +1,4 @@ -; $Id: PATMA.mac 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: PATMA.mac $ ;; @file ; PATM macros & definitions (identical to PATMA.h!!) ; diff --git a/src/VBox/VMM/PATM/PATMGuest.cpp b/src/VBox/VMM/PATM/PATMGuest.cpp index 36706f618..9b24f79ba 100644 --- a/src/VBox/VMM/PATM/PATMGuest.cpp +++ b/src/VBox/VMM/PATM/PATMGuest.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMGuest.cpp 13835 2008-11-05 02:34:43Z vboxsync $ */ +/* $Id: PATMGuest.cpp $ */ /** @file * PATMGuest - Guest OS Patching Manager (non-generic) */ diff --git a/src/VBox/VMM/PATM/PATMInternal.h b/src/VBox/VMM/PATM/PATMInternal.h index 3aefa5026..7d51262ef 100644 --- a/src/VBox/VMM/PATM/PATMInternal.h +++ b/src/VBox/VMM/PATM/PATMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PATMInternal.h 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: PATMInternal.h $ */ /** @file * PATM - Internal header file. */ diff --git a/src/VBox/VMM/PATM/PATMPatch.cpp b/src/VBox/VMM/PATM/PATMPatch.cpp index a02c406bb..54d699fbf 100644 --- a/src/VBox/VMM/PATM/PATMPatch.cpp +++ b/src/VBox/VMM/PATM/PATMPatch.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMPatch.cpp 13830 2008-11-05 01:49:18Z vboxsync $ */ +/* $Id: PATMPatch.cpp $ */ /** @file * PATMPatch - Dynamic Guest OS Instruction patches * diff --git a/src/VBox/VMM/PATM/PATMPatch.h b/src/VBox/VMM/PATM/PATMPatch.h index ebae0f498..d718e3ccb 100644 --- a/src/VBox/VMM/PATM/PATMPatch.h +++ b/src/VBox/VMM/PATM/PATMPatch.h @@ -1,4 +1,4 @@ -/* $Id: PATMPatch.h 9228 2008-05-29 15:23:15Z vboxsync $ */ +/* $Id: PATMPatch.h $ */ /** @file * PATMPatch - Internal header file. */ diff --git a/src/VBox/VMM/PATM/PATMSSM.cpp b/src/VBox/VMM/PATM/PATMSSM.cpp index 1eaff34a2..7409c04dd 100644 --- a/src/VBox/VMM/PATM/PATMSSM.cpp +++ b/src/VBox/VMM/PATM/PATMSSM.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMSSM.cpp 14887 2008-12-02 10:15:21Z vboxsync $ */ +/* $Id: PATMSSM.cpp $ */ /** @file * PATMSSM - Dynamic Guest OS Patching Manager; Save and load state * diff --git a/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp b/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp index 2bbcda1b0..1ad884b20 100644 --- a/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp +++ b/src/VBox/VMM/PATM/VMMAll/CSAMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAMAll.cpp 14299 2008-11-18 13:25:40Z vboxsync $ */ +/* $Id: CSAMAll.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context */ diff --git a/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp b/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp index 9755ff884..836a5bfef 100644 --- a/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp +++ b/src/VBox/VMM/PATM/VMMAll/PATMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: PATMAll.cpp $ */ /** @file * PATM - The Patch Manager, all contexts. */ diff --git a/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp b/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp index bd4f86753..957b2d13f 100644 --- a/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp +++ b/src/VBox/VMM/PATM/VMMGC/CSAMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: CSAMGC.cpp 14029 2008-11-10 17:27:22Z vboxsync $ */ +/* $Id: CSAMGC.cpp $ */ /** @file * CSAM - Guest OS Code Scanning and Analysis Manager - Any Context */ diff --git a/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp b/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp index d1af67ee8..c0bf85fbb 100644 --- a/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp +++ b/src/VBox/VMM/PATM/VMMGC/PATMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: PATMGC.cpp 14029 2008-11-10 17:27:22Z vboxsync $ */ +/* $Id: PATMGC.cpp $ */ /** @file * PATM - Dynamic Guest OS Patching Manager - Guest Context */ diff --git a/src/VBox/VMM/PDM.cpp b/src/VBox/VMM/PDM.cpp index 1c02543f0..572c5b032 100644 --- a/src/VBox/VMM/PDM.cpp +++ b/src/VBox/VMM/PDM.cpp @@ -1,4 +1,4 @@ -/* $Id: PDM.cpp 16021 2009-01-19 00:34:50Z vboxsync $ */ +/* $Id: PDM.cpp $ */ /** @file * PDM - Pluggable Device Manager. */ diff --git a/src/VBox/VMM/PDMCritSect.cpp b/src/VBox/VMM/PDMCritSect.cpp index b8eafd6ec..b508067f1 100644 --- a/src/VBox/VMM/PDMCritSect.cpp +++ b/src/VBox/VMM/PDMCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMCritSect.cpp 14657 2008-11-26 18:08:15Z vboxsync $ */ +/* $Id: PDMCritSect.cpp $ */ /** @file * PDM - Critical Sections, Ring-3. */ diff --git a/src/VBox/VMM/PDMDevHlp.cpp b/src/VBox/VMM/PDMDevHlp.cpp index cdd25cdc1..664f97302 100644 --- a/src/VBox/VMM/PDMDevHlp.cpp +++ b/src/VBox/VMM/PDMDevHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevHlp.cpp 15129 2008-12-08 19:12:50Z vboxsync $ */ +/* $Id: PDMDevHlp.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Device Helpers. */ diff --git a/src/VBox/VMM/PDMDevMiscHlp.cpp b/src/VBox/VMM/PDMDevMiscHlp.cpp index 7580fc59d..93bfedf8a 100644 --- a/src/VBox/VMM/PDMDevMiscHlp.cpp +++ b/src/VBox/VMM/PDMDevMiscHlp.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevMiscHlp.cpp 13820 2008-11-05 00:55:49Z vboxsync $ */ +/* $Id: PDMDevMiscHlp.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Misc. Device Helpers. */ diff --git a/src/VBox/VMM/PDMDevice.cpp b/src/VBox/VMM/PDMDevice.cpp index 4ea247201..bed99ea4e 100644 --- a/src/VBox/VMM/PDMDevice.cpp +++ b/src/VBox/VMM/PDMDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDevice.cpp 14299 2008-11-18 13:25:40Z vboxsync $ */ +/* $Id: PDMDevice.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Device parts. */ diff --git a/src/VBox/VMM/PDMDriver.cpp b/src/VBox/VMM/PDMDriver.cpp index d66ff18e2..0c1ef10a6 100644 --- a/src/VBox/VMM/PDMDriver.cpp +++ b/src/VBox/VMM/PDMDriver.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMDriver.cpp 14070 2008-11-10 23:45:24Z vboxsync $ */ +/* $Id: PDMDriver.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, Driver parts. */ diff --git a/src/VBox/VMM/PDMInternal.h b/src/VBox/VMM/PDMInternal.h index b1ffc56b8..daf0543bb 100644 --- a/src/VBox/VMM/PDMInternal.h +++ b/src/VBox/VMM/PDMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PDMInternal.h 13519 2008-10-23 08:58:37Z vboxsync $ */ +/* $Id: PDMInternal.h $ */ /** @file * PDM - Internal header file. */ diff --git a/src/VBox/VMM/PDMLdr.cpp b/src/VBox/VMM/PDMLdr.cpp index 84cab8720..07bc7a32c 100644 --- a/src/VBox/VMM/PDMLdr.cpp +++ b/src/VBox/VMM/PDMLdr.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMLdr.cpp 14595 2008-11-25 20:21:52Z vboxsync $ */ +/* $Id: PDMLdr.cpp $ */ /** @file * PDM - Pluggable Device Manager, module loader. */ diff --git a/src/VBox/VMM/PDMQueue.cpp b/src/VBox/VMM/PDMQueue.cpp index 89d7a4a2a..797be77e0 100644 --- a/src/VBox/VMM/PDMQueue.cpp +++ b/src/VBox/VMM/PDMQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMQueue.cpp 14074 2008-11-11 00:02:26Z vboxsync $ */ +/* $Id: PDMQueue.cpp $ */ /** @file * PDM Queue - Transport data and tasks to EMT and R3. */ diff --git a/src/VBox/VMM/PDMThread.cpp b/src/VBox/VMM/PDMThread.cpp index 5691633f5..4e3adc674 100644 --- a/src/VBox/VMM/PDMThread.cpp +++ b/src/VBox/VMM/PDMThread.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMThread.cpp 15540 2008-12-15 20:01:28Z vboxsync $ */ +/* $Id: PDMThread.cpp $ */ /** @file * PDM Thread - VM Thread Management. */ diff --git a/src/VBox/VMM/PGM.cpp b/src/VBox/VMM/PGM.cpp index 1615907f0..e1310e6d8 100644 --- a/src/VBox/VMM/PGM.cpp +++ b/src/VBox/VMM/PGM.cpp @@ -1,4 +1,4 @@ -/* $Id: PGM.cpp 16113 2009-01-21 09:08:29Z vboxsync $ */ +/* $Id: PGM.cpp $ */ /** @file * PGM - Page Manager and Monitor. (Mixing stuff here, not good?) */ diff --git a/src/VBox/VMM/PGMBth.h b/src/VBox/VMM/PGMBth.h index 661ddd2d6..98706f37c 100644 --- a/src/VBox/VMM/PGMBth.h +++ b/src/VBox/VMM/PGMBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMBth.h 13937 2008-11-06 20:52:05Z vboxsync $ */ +/* $Id: PGMBth.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow+Guest Paging Template. */ diff --git a/src/VBox/VMM/PGMDbg.cpp b/src/VBox/VMM/PGMDbg.cpp index 4f3a4762b..eeb448f35 100644 --- a/src/VBox/VMM/PGMDbg.cpp +++ b/src/VBox/VMM/PGMDbg.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMDbg.cpp 14966 2008-12-04 01:54:38Z vboxsync $ */ +/* $Id: PGMDbg.cpp $ */ /** @file * PGM - Page Manager and Monitor - Debugger & Debugging APIs. */ diff --git a/src/VBox/VMM/PGMGst.h b/src/VBox/VMM/PGMGst.h index a69e44b53..15b9d57a2 100644 --- a/src/VBox/VMM/PGMGst.h +++ b/src/VBox/VMM/PGMGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMGst.h 14301 2008-11-18 13:31:42Z vboxsync $ */ +/* $Id: PGMGst.h $ */ /** @file * VBox - Page Manager / Monitor, Guest Paging Template. */ diff --git a/src/VBox/VMM/PGMHandler.cpp b/src/VBox/VMM/PGMHandler.cpp index 64d74b7b4..c010d9a94 100644 --- a/src/VBox/VMM/PGMHandler.cpp +++ b/src/VBox/VMM/PGMHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMHandler.cpp 14969 2008-12-04 10:57:17Z vboxsync $ */ +/* $Id: PGMHandler.cpp $ */ /** @file * PGM - Page Manager / Monitor, Access Handlers. */ diff --git a/src/VBox/VMM/PGMInternal.h b/src/VBox/VMM/PGMInternal.h index 36c5c418d..d05fe919c 100644 --- a/src/VBox/VMM/PGMInternal.h +++ b/src/VBox/VMM/PGMInternal.h @@ -1,4 +1,4 @@ -/* $Id: PGMInternal.h 16045 2009-01-19 16:27:59Z vboxsync $ */ +/* $Id: PGMInternal.h $ */ /** @file * PGM - Internal header file. */ diff --git a/src/VBox/VMM/PGMMap.cpp b/src/VBox/VMM/PGMMap.cpp index 9841153a0..06dbe593f 100644 --- a/src/VBox/VMM/PGMMap.cpp +++ b/src/VBox/VMM/PGMMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMMap.cpp 15410 2008-12-13 01:04:17Z vboxsync $ */ +/* $Id: PGMMap.cpp $ */ /** @file * PGM - Page Manager, Guest Context Mappings. */ diff --git a/src/VBox/VMM/PGMPhys.cpp b/src/VBox/VMM/PGMPhys.cpp index ce1fd8dda..6008669ab 100644 --- a/src/VBox/VMM/PGMPhys.cpp +++ b/src/VBox/VMM/PGMPhys.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMPhys.cpp 16045 2009-01-19 16:27:59Z vboxsync $ */ +/* $Id: PGMPhys.cpp $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Addressing. */ diff --git a/src/VBox/VMM/PGMPhysRWTmpl.h b/src/VBox/VMM/PGMPhysRWTmpl.h index 19179ebed..c91a498e6 100644 --- a/src/VBox/VMM/PGMPhysRWTmpl.h +++ b/src/VBox/VMM/PGMPhysRWTmpl.h @@ -1,4 +1,4 @@ -/* $Id: PGMPhysRWTmpl.h 13146 2008-10-09 22:58:12Z vboxsync $ */ +/* $Id: PGMPhysRWTmpl.h $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Access Template. */ diff --git a/src/VBox/VMM/PGMPool.cpp b/src/VBox/VMM/PGMPool.cpp index 21b93b2e2..0c1e68b6c 100644 --- a/src/VBox/VMM/PGMPool.cpp +++ b/src/VBox/VMM/PGMPool.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMPool.cpp 15225 2008-12-10 04:24:39Z vboxsync $ */ +/* $Id: PGMPool.cpp $ */ /** @file * PGM Shadow Page Pool. */ diff --git a/src/VBox/VMM/PGMShw.h b/src/VBox/VMM/PGMShw.h index b01de856d..318ccc444 100644 --- a/src/VBox/VMM/PGMShw.h +++ b/src/VBox/VMM/PGMShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMShw.h 14151 2008-11-12 23:26:37Z vboxsync $ */ +/* $Id: PGMShw.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow Paging Template. */ diff --git a/src/VBox/VMM/REMInternal.h b/src/VBox/VMM/REMInternal.h index 124ceac0d..5769692ff 100644 --- a/src/VBox/VMM/REMInternal.h +++ b/src/VBox/VMM/REMInternal.h @@ -1,4 +1,4 @@ -/* $Id: REMInternal.h 15063 2008-12-07 14:04:13Z vboxsync $ */ +/* $Id: REMInternal.h $ */ /** @file * REM - Internal header file. */ diff --git a/src/VBox/VMM/SELM.cpp b/src/VBox/VMM/SELM.cpp index e0e2d9c15..66a5715f0 100644 --- a/src/VBox/VMM/SELM.cpp +++ b/src/VBox/VMM/SELM.cpp @@ -1,4 +1,4 @@ -/* $Id: SELM.cpp 15750 2008-12-24 12:59:56Z vboxsync $ */ +/* $Id: SELM.cpp $ */ /** @file * SELM - The Selector Manager. */ diff --git a/src/VBox/VMM/SELMInternal.h b/src/VBox/VMM/SELMInternal.h index 1c16eaeac..3fff167c2 100644 --- a/src/VBox/VMM/SELMInternal.h +++ b/src/VBox/VMM/SELMInternal.h @@ -1,4 +1,4 @@ -/* $Id: SELMInternal.h 13577 2008-10-27 13:53:04Z vboxsync $ */ +/* $Id: SELMInternal.h $ */ /** @file * SELM - Internal header file. */ diff --git a/src/VBox/VMM/SSM.cpp b/src/VBox/VMM/SSM.cpp index 8f23e7c6c..be1550d68 100644 --- a/src/VBox/VMM/SSM.cpp +++ b/src/VBox/VMM/SSM.cpp @@ -1,4 +1,4 @@ -/* $Id: SSM.cpp 15845 2009-01-07 19:51:29Z vboxsync $ */ +/* $Id: SSM.cpp $ */ /** @file * SSM - Saved State Manager. */ diff --git a/src/VBox/VMM/SSMInternal.h b/src/VBox/VMM/SSMInternal.h index d8fe06d34..eac30cba2 100644 --- a/src/VBox/VMM/SSMInternal.h +++ b/src/VBox/VMM/SSMInternal.h @@ -1,4 +1,4 @@ -/* $Id: SSMInternal.h 13597 2008-10-27 18:57:03Z vboxsync $ */ +/* $Id: SSMInternal.h $ */ /** @file * SSM - Internal header file. */ diff --git a/src/VBox/VMM/STAM.cpp b/src/VBox/VMM/STAM.cpp index d72a105aa..b20cafb16 100644 --- a/src/VBox/VMM/STAM.cpp +++ b/src/VBox/VMM/STAM.cpp @@ -1,4 +1,4 @@ -/* $Id: STAM.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: STAM.cpp $ */ /** @file * STAM - The Statistics Manager. */ diff --git a/src/VBox/VMM/STAMInternal.h b/src/VBox/VMM/STAMInternal.h index 42037de2f..f9089db25 100644 --- a/src/VBox/VMM/STAMInternal.h +++ b/src/VBox/VMM/STAMInternal.h @@ -1,4 +1,4 @@ -/* $Id: STAMInternal.h 12989 2008-10-06 02:15:39Z vboxsync $ */ +/* $Id: STAMInternal.h $ */ /** @file * STAM Internal Header. */ diff --git a/src/VBox/VMM/TM.cpp b/src/VBox/VMM/TM.cpp index 311b30c2f..a886a91bc 100644 --- a/src/VBox/VMM/TM.cpp +++ b/src/VBox/VMM/TM.cpp @@ -1,4 +1,4 @@ -/* $Id: TM.cpp 15844 2009-01-07 18:51:03Z vboxsync $ */ +/* $Id: TM.cpp $ */ /** @file * TM - Time Manager. */ diff --git a/src/VBox/VMM/TMInternal.h b/src/VBox/VMM/TMInternal.h index 99f3419e8..84634198b 100644 --- a/src/VBox/VMM/TMInternal.h +++ b/src/VBox/VMM/TMInternal.h @@ -1,4 +1,4 @@ -/* $Id: TMInternal.h 13742 2008-11-03 12:19:40Z vboxsync $ */ +/* $Id: TMInternal.h $ */ /** @file * TM - Internal header file. */ diff --git a/src/VBox/VMM/TRPM.cpp b/src/VBox/VMM/TRPM.cpp index 9f025d8fd..af148ea54 100644 --- a/src/VBox/VMM/TRPM.cpp +++ b/src/VBox/VMM/TRPM.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPM.cpp 14755 2008-11-28 02:58:01Z vboxsync $ */ +/* $Id: TRPM.cpp $ */ /** @file * TRPM - The Trap Monitor. */ @@ -1231,6 +1231,8 @@ VMMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTRCPTR pHandl * Exactly why 0x80 is safe on 32-bit Windows is a bit hazy, but it seems * to work ok... However on 64-bit Vista (SMP?) is doesn't work reliably. * Booting Linux/BSD guest will cause system lockups on most of the computers. + * -> Update: It seems gate 0x80 is not safe on 32-bits Windows either. See + * defect #3604. * * PORTME - Check if your host keeps any of these gates free from hw ints. * @@ -1239,7 +1241,7 @@ VMMR3DECL(int) TRPMR3SetGuestTrapHandler(PVM pVM, unsigned iTrap, RTRCPTR pHandl /** @todo handle those dependencies better! */ /** @todo Solve this in a proper manner. see defect #1186 */ #if defined(RT_OS_WINDOWS) && defined(RT_ARCH_X86) - if (iTrap == 0x2E || iTrap == 0x80) + if (iTrap == 0x2E) #elif defined(RT_OS_LINUX) if (iTrap == 0x80) #else diff --git a/src/VBox/VMM/TRPMInternal.h b/src/VBox/VMM/TRPMInternal.h index 0a416d491..b1d0a4aae 100644 --- a/src/VBox/VMM/TRPMInternal.h +++ b/src/VBox/VMM/TRPMInternal.h @@ -1,4 +1,4 @@ -/* $Id: TRPMInternal.h 14515 2008-11-24 12:33:00Z vboxsync $ */ +/* $Id: TRPMInternal.h $ */ /** @file * TRPM - Internal header file. */ diff --git a/src/VBox/VMM/TRPMInternal.mac b/src/VBox/VMM/TRPMInternal.mac index 3064618a5..58c80092e 100644 --- a/src/VBox/VMM/TRPMInternal.mac +++ b/src/VBox/VMM/TRPMInternal.mac @@ -1,4 +1,4 @@ -; $Id: TRPMInternal.mac 14351 2008-11-19 13:38:31Z vboxsync $ +; $Id: TRPMInternal.mac $ ;; @file ; TRPM - Internal header file. ; diff --git a/src/VBox/VMM/VBoxVMMDeps.cpp b/src/VBox/VMM/VBoxVMMDeps.cpp index 408c30a12..3239a8aa6 100644 --- a/src/VBox/VMM/VBoxVMMDeps.cpp +++ b/src/VBox/VMM/VBoxVMMDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxVMMDeps.cpp 13035 2008-10-07 09:54:32Z vboxsync $ */ +/* $Id: VBoxVMMDeps.cpp $ */ /** @file * VBoxVMM link dependencies - drag all we want into the link! */ diff --git a/src/VBox/VMM/VM.cpp b/src/VBox/VMM/VM.cpp index 357139a1d..2adb01018 100644 --- a/src/VBox/VMM/VM.cpp +++ b/src/VBox/VMM/VM.cpp @@ -1,4 +1,4 @@ -/* $Id: VM.cpp 15349 2008-12-12 02:36:19Z vboxsync $ */ +/* $Id: VM.cpp $ */ /** @file * VM - Virtual Machine */ diff --git a/src/VBox/VMM/VMEmt.cpp b/src/VBox/VMM/VMEmt.cpp index be392dc42..e498ce8f2 100644 --- a/src/VBox/VMM/VMEmt.cpp +++ b/src/VBox/VMM/VMEmt.cpp @@ -1,4 +1,4 @@ -/* $Id: VMEmt.cpp 13858 2008-11-05 13:45:41Z vboxsync $ */ +/* $Id: VMEmt.cpp $ */ /** @file * VM - Virtual Machine, The Emulation Thread. */ diff --git a/src/VBox/VMM/VMInternal.h b/src/VBox/VMM/VMInternal.h index a9fed3749..b8c7dbf9d 100644 --- a/src/VBox/VMM/VMInternal.h +++ b/src/VBox/VMM/VMInternal.h @@ -1,4 +1,4 @@ -/* $Id: VMInternal.h 13791 2008-11-04 16:12:57Z vboxsync $ */ +/* $Id: VMInternal.h $ */ /** @file * VM - Internal header file. */ diff --git a/src/VBox/VMM/VMM.cpp b/src/VBox/VMM/VMM.cpp index 34d5436d6..fde29b9c6 100644 --- a/src/VBox/VMM/VMM.cpp +++ b/src/VBox/VMM/VMM.cpp @@ -1,4 +1,4 @@ -/* $Id: VMM.cpp 16107 2009-01-20 23:16:00Z vboxsync $ */ +/* $Id: VMM.cpp $ */ /** @file * VMM - The Virtual Machine Monitor Core. */ diff --git a/src/VBox/VMM/VMMAll/CPUMAllA.asm b/src/VBox/VMM/VMMAll/CPUMAllA.asm index 8ba0d8561..b43cac3b2 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllA.asm +++ b/src/VBox/VMM/VMMAll/CPUMAllA.asm @@ -1,4 +1,4 @@ -; $Id: CPUMAllA.asm 16108 2009-01-21 00:16:27Z vboxsync $ +; $Id: CPUMAllA.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp index 440ab75f3..1ca29eef5 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp +++ b/src/VBox/VMM/VMMAll/CPUMAllRegs.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMAllRegs.cpp 15416 2008-12-13 05:31:06Z vboxsync $ */ +/* $Id: CPUMAllRegs.cpp $ */ /** @file * CPUM - CPU Monitor(/Manager) - Getters and Setters. */ diff --git a/src/VBox/VMM/VMMAll/CPUMStack.cpp b/src/VBox/VMM/VMMAll/CPUMStack.cpp index 6a43fe3f0..e800ee9b5 100644 --- a/src/VBox/VMM/VMMAll/CPUMStack.cpp +++ b/src/VBox/VMM/VMMAll/CPUMStack.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMStack.cpp 14994 2008-12-04 15:44:25Z vboxsync $ */ +/* $Id: CPUMStack.cpp $ */ /** @file * CPUM - CPU Monitor(/Manager) - Stack manipulation. */ diff --git a/src/VBox/VMM/VMMAll/DBGFAll.cpp b/src/VBox/VMM/VMMAll/DBGFAll.cpp index 586d8d2dc..5be3ad842 100644 --- a/src/VBox/VMM/VMMAll/DBGFAll.cpp +++ b/src/VBox/VMM/VMMAll/DBGFAll.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFAll.cpp 12989 2008-10-06 02:15:39Z vboxsync $ */ +/* $Id: DBGFAll.cpp $ */ /** @file * DBGF - Debugger Facility, All Context Code. */ diff --git a/src/VBox/VMM/VMMAll/EMAll.cpp b/src/VBox/VMM/VMMAll/EMAll.cpp index 704af6c22..7f331d747 100644 --- a/src/VBox/VMM/VMMAll/EMAll.cpp +++ b/src/VBox/VMM/VMMAll/EMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: EMAll.cpp 15635 2008-12-17 16:44:58Z vboxsync $ */ +/* $Id: EMAll.cpp $ */ /** @file * EM - Execution Monitor(/Manager) - All contexts */ diff --git a/src/VBox/VMM/VMMAll/EMAllA.asm b/src/VBox/VMM/VMMAll/EMAllA.asm index 8579fbc2d..9a6d1e98c 100644 --- a/src/VBox/VMM/VMMAll/EMAllA.asm +++ b/src/VBox/VMM/VMMAll/EMAllA.asm @@ -1,4 +1,4 @@ -; $Id: EMAllA.asm 15420 2008-12-13 07:21:55Z vboxsync $ +; $Id: EMAllA.asm $ ;; @file ; EM Assembly Routines. ; diff --git a/src/VBox/VMM/VMMAll/HWACCMAll.cpp b/src/VBox/VMM/VMMAll/HWACCMAll.cpp index b27755589..df07a7384 100644 --- a/src/VBox/VMM/VMMAll/HWACCMAll.cpp +++ b/src/VBox/VMM/VMMAll/HWACCMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCMAll.cpp 15167 2008-12-09 13:45:12Z vboxsync $ */ +/* $Id: HWACCMAll.cpp $ */ /** @file * HWACCM - All contexts. */ diff --git a/src/VBox/VMM/VMMAll/IOMAll.cpp b/src/VBox/VMM/VMMAll/IOMAll.cpp index bb6d51dad..85592cb81 100644 --- a/src/VBox/VMM/VMMAll/IOMAll.cpp +++ b/src/VBox/VMM/VMMAll/IOMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMAll.cpp 14075 2008-11-11 00:14:05Z vboxsync $ */ +/* $Id: IOMAll.cpp $ */ /** @file * IOM - Input / Output Monitor - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp index 3239b7766..3569202a9 100644 --- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp +++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMAllMMIO.cpp 16037 2009-01-19 10:30:36Z vboxsync $ */ +/* $Id: IOMAllMMIO.cpp $ */ /** @file * IOM - Input / Output Monitor - Any Context, MMIO & String I/O. */ @@ -1758,6 +1758,12 @@ VMMDECL(int) IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped Log(("IOMMMIOModifyPage %RGp -> %RGp flags=%RX64\n", GCPhys, GCPhysRemapped, fPageFlags)); + /* This currently only works in real mode, protected mode without paging or with nested paging. */ + if ( !HWACCMIsEnabled(pVM) /* useless without VT-x/AMD-V */ + || ( CPUMIsGuestInPagedProtectedMode(pVM) + && !HWACCMIsNestedPagingActive(pVM))) + return VINF_SUCCESS; /* ignore */ + /* * Lookup the current context range node and statistics. */ @@ -1769,11 +1775,6 @@ VMMDECL(int) IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped GCPhys &= ~(RTGCPHYS)0xfff; GCPhysRemapped &= ~(RTGCPHYS)0xfff; - /* This currently only works in real mode, protected mode without paging or with nested paging. */ - if ( CPUMIsGuestInPagedProtectedMode(pVM) - && !HWACCMIsNestedPagingActive(pVM)) - return VINF_SUCCESS; /* ignore */ - int rc = PGMHandlerPhysicalPageAlias(pVM, pRange->GCPhys, GCPhys, GCPhysRemapped); AssertRCReturn(rc, rc); @@ -1784,10 +1785,9 @@ VMMDECL(int) IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped Assert(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT); #endif - /* Mark it as writable and present so reads and writes no longer fault. */ - rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, fPageFlags, ~fPageFlags); + /* @note this is a NOP in the EPT case; we'll just let it fault again to resync the page. */ + rc = PGMPrefetchPage(pVM, (RTGCPTR)GCPhys); Assert(rc == VINF_SUCCESS || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT); - return VINF_SUCCESS; } @@ -1802,10 +1802,14 @@ VMMDECL(int) IOMMMIOModifyPage(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCPhysRemapped */ VMMDECL(int) IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys) { - uint32_t cb; - Log(("IOMMMIOResetRegion %RGp\n", GCPhys)); + /* This currently only works in real mode, protected mode without paging or with nested paging. */ + if ( !HWACCMIsEnabled(pVM) /* useless without VT-x/AMD-V */ + || ( CPUMIsGuestInPagedProtectedMode(pVM) + && !HWACCMIsNestedPagingActive(pVM))) + return VINF_SUCCESS; /* ignore */ + /* * Lookup the current context range node and statistics. */ @@ -1814,33 +1818,26 @@ VMMDECL(int) IOMMMIOResetRegion(PVM pVM, RTGCPHYS GCPhys) ("Handlers and page tables are out of sync or something! GCPhys=%RGp\n", GCPhys), VERR_INTERNAL_ERROR); - /* This currently only works in real mode, protected mode without paging or with nested paging. */ - if ( CPUMIsGuestInPagedProtectedMode(pVM) - && !HWACCMIsNestedPagingActive(pVM)) - return VINF_SUCCESS; /* ignore */ + /* Reset the entire range by clearing all shadow page table entries. */ + int rc = PGMHandlerPhysicalReset(pVM, pRange->GCPhys); + AssertRC(rc); +#ifdef VBOX_STRICT + uint32_t cb = pRange->cb; - cb = pRange->cb; GCPhys = pRange->GCPhys; while (cb) { - int rc = PGMHandlerPhysicalPageReset(pVM, pRange->GCPhys, GCPhys); - AssertRC(rc); - /* Mark it as not present again to intercept all read and write access. */ - rc = PGMShwModifyPage(pVM, (RTGCPTR)GCPhys, 1, 0, ~(uint64_t)(X86_PTE_RW|X86_PTE_P)); - Assert(rc == VINF_SUCCESS || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT); - -#ifdef VBOX_STRICT uint64_t fFlags; RTHCPHYS HCPhys; rc = PGMShwGetPage(pVM, (RTGCPTR)GCPhys, &fFlags, &HCPhys); Assert(rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT); -#endif cb -= PAGE_SIZE; GCPhys += PAGE_SIZE; } +#endif return VINF_SUCCESS; } #endif /* !IN_RC */ diff --git a/src/VBox/VMM/VMMAll/MMAll.cpp b/src/VBox/VMM/VMMAll/MMAll.cpp index cf8c9a2c4..8657686c3 100644 --- a/src/VBox/VMM/VMMAll/MMAll.cpp +++ b/src/VBox/VMM/VMMAll/MMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAll.cpp 15174 2008-12-09 14:11:35Z vboxsync $ */ +/* $Id: MMAll.cpp $ */ /** @file * MM - Memory Manager - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/MMAllHyper.cpp b/src/VBox/VMM/VMMAll/MMAllHyper.cpp index 060917227..504663232 100644 --- a/src/VBox/VMM/VMMAll/MMAllHyper.cpp +++ b/src/VBox/VMM/VMMAll/MMAllHyper.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAllHyper.cpp 14075 2008-11-11 00:14:05Z vboxsync $ */ +/* $Id: MMAllHyper.cpp $ */ /** @file * MM - Memory Manager - Hypervisor Memory Area, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp index 3132e9eac..6844db32e 100644 --- a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp +++ b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp @@ -1,4 +1,4 @@ -/* $Id: MMAllPagePool.cpp 14157 2008-11-13 02:50:46Z vboxsync $ */ +/* $Id: MMAllPagePool.cpp $ */ /** @file * MM - Memory Manager - Page Pool. * diff --git a/src/VBox/VMM/VMMAll/PDMAll.cpp b/src/VBox/VMM/VMMAll/PDMAll.cpp index da3e20cbf..abf355804 100644 --- a/src/VBox/VMM/VMMAll/PDMAll.cpp +++ b/src/VBox/VMM/VMMAll/PDMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: PDMAll.cpp $ */ /** @file * PDM Critical Sections */ diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp index 608f2c61a..c355dae2b 100644 --- a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAllCritSect.cpp 13898 2008-11-06 09:44:29Z vboxsync $ */ +/* $Id: PDMAllCritSect.cpp $ */ /** @file * PDM - Critical Sections, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp index fd4b1e9c8..af7386ce8 100644 --- a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMAllQueue.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: PDMAllQueue.cpp $ */ /** @file * PDM Queue - Transport data and tasks to EMT and R3. */ diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp index f30c526e8..df5efb0d8 100644 --- a/src/VBox/VMM/VMMAll/PGMAll.cpp +++ b/src/VBox/VMM/VMMAll/PGMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAll.cpp 15990 2009-01-16 13:58:36Z vboxsync $ */ +/* $Id: PGMAll.cpp $ */ /** @file * PGM - Page Manager and Monitor - All context code. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllBth.h b/src/VBox/VMM/VMMAll/PGMAllBth.h index fac8b0947..8d7d7b286 100644 --- a/src/VBox/VMM/VMMAll/PGMAllBth.h +++ b/src/VBox/VMM/VMMAll/PGMAllBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllBth.h 15410 2008-12-13 01:04:17Z vboxsync $ */ +/* $Id: PGMAllBth.h $ */ /** @file * VBox - Page Manager, Shadow+Guest Paging Template - All context code. * diff --git a/src/VBox/VMM/VMMAll/PGMAllGst.h b/src/VBox/VMM/VMMAll/PGMAllGst.h index dc4f06f43..34a2c5d74 100644 --- a/src/VBox/VMM/VMMAll/PGMAllGst.h +++ b/src/VBox/VMM/VMMAll/PGMAllGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllGst.h 15410 2008-12-13 01:04:17Z vboxsync $ */ +/* $Id: PGMAllGst.h $ */ /** @file * VBox - Page Manager, Guest Paging Template - All context code. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp index adea6e215..1f5f53d95 100644 --- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllHandler.cpp 16047 2009-01-19 16:30:58Z vboxsync $ */ +/* $Id: PGMAllHandler.cpp $ */ /** @file * PGM - Page Manager / Monitor, Access Handlers. */ @@ -818,6 +818,7 @@ VMMDECL(int) PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys) { case PGMPHYSHANDLERTYPE_PHYSICAL_WRITE: case PGMPHYSHANDLERTYPE_PHYSICAL_ALL: + case PGMPHYSHANDLERTYPE_MMIO: /* @note Only use when clearing aliased mmio ranges! */ { /* * Set the flags and flush shadow PT entries. @@ -841,11 +842,6 @@ VMMDECL(int) PGMHandlerPhysicalReset(PVM pVM, RTGCPHYS GCPhys) /* * Invalid. */ - case PGMPHYSHANDLERTYPE_MMIO: - AssertMsgFailed(("Can't reset type %d!\n", pCur->enmType)); - rc = VERR_INTERNAL_ERROR; - break; - default: AssertMsgFailed(("Invalid type %d! Corruption!\n", pCur->enmType)); rc = VERR_INTERNAL_ERROR; @@ -1031,6 +1027,7 @@ VMMDECL(int) PGMHandlerPhysicalPageReset(PVM pVM, RTGCPHYS GCPhys, RTGCPHYS GCP int rc = pgmPhysGetPageEx(&pVM->pgm.s, GCPhysPage, &pPage); AssertRCReturn(rc, rc); PGM_PAGE_SET_HNDL_PHYS_STATE(pPage, pgmHandlerPhysicalCalcState(pCur)); + #ifndef IN_RC HWACCMInvalidatePhysPage(pVM, GCPhysPage); #endif diff --git a/src/VBox/VMM/VMMAll/PGMAllMap.cpp b/src/VBox/VMM/VMMAll/PGMAllMap.cpp index f49dbc812..065050492 100644 --- a/src/VBox/VMM/VMMAll/PGMAllMap.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllMap.cpp 13232 2008-10-13 20:03:48Z vboxsync $ */ +/* $Id: PGMAllMap.cpp $ */ /** @file * PGM - Page Manager and Monitor - All context code. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp index c9984a49e..333f3be17 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllPhys.cpp 15428 2008-12-13 10:02:55Z vboxsync $ */ +/* $Id: PGMAllPhys.cpp $ */ /** @file * PGM - Page Manager and Monitor, Physical Memory Addressing. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllPool.cpp b/src/VBox/VMM/VMMAll/PGMAllPool.cpp index 659043027..ed46cea5d 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPool.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPool.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMAllPool.cpp 15432 2008-12-13 10:48:00Z vboxsync $ */ +/* $Id: PGMAllPool.cpp $ */ /** @file * PGM Shadow Page Pool. */ diff --git a/src/VBox/VMM/VMMAll/PGMAllShw.h b/src/VBox/VMM/VMMAll/PGMAllShw.h index 75cf80177..f2a829f83 100644 --- a/src/VBox/VMM/VMMAll/PGMAllShw.h +++ b/src/VBox/VMM/VMMAll/PGMAllShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMAllShw.h 14147 2008-11-12 23:07:51Z vboxsync $ */ +/* $Id: PGMAllShw.h $ */ /** @file * VBox - Page Manager, Shadow Paging Template - All context code. */ @@ -350,11 +350,7 @@ PGM_SHW_DECL(int, ModifyPage)(PVM pVM, RTGCUINTPTR GCPtr, size_t cb, uint64_t fF if (pPT->a[iPTE].n.u1Present) { pPT->a[iPTE].u = (pPT->a[iPTE].u & (fMask | SHW_PTE_PG_MASK)) | (fFlags & ~SHW_PTE_PG_MASK); -/** @todo r=bird: I think this may break assumptions in page pool GCPhys - * tracking, and I seems to recall putting it here to prevent API users from - * making anything !P. The assertion is kind of useless now, as it - * won't hit anything any longer... */ - Assert(pPT->a[iPTE].n.u1Present || !(fMask & X86_PTE_P)); + Assert(pPT->a[iPTE].n.u1Present); # if PGM_SHW_TYPE == PGM_TYPE_EPT HWACCMInvalidatePhysPage(pVM, (RTGCPHYS)GCPtr); # else diff --git a/src/VBox/VMM/VMMAll/REMAll.cpp b/src/VBox/VMM/VMMAll/REMAll.cpp index f504106ee..a7413dd9d 100644 --- a/src/VBox/VMM/VMMAll/REMAll.cpp +++ b/src/VBox/VMM/VMMAll/REMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: REMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: REMAll.cpp $ */ /** @file * REM - Recompiled Execution Monitor, all Contexts part. */ diff --git a/src/VBox/VMM/VMMAll/SELMAll.cpp b/src/VBox/VMM/VMMAll/SELMAll.cpp index 9ca02620f..540d28ec6 100644 --- a/src/VBox/VMM/VMMAll/SELMAll.cpp +++ b/src/VBox/VMM/VMMAll/SELMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: SELMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: SELMAll.cpp $ */ /** @file * SELM All contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAll.cpp b/src/VBox/VMM/VMMAll/TMAll.cpp index 2778cfec3..e4e0642b4 100644 --- a/src/VBox/VMM/VMMAll/TMAll.cpp +++ b/src/VBox/VMM/VMMAll/TMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAll.cpp 13633 2008-10-28 17:12:11Z vboxsync $ */ +/* $Id: TMAll.cpp $ */ /** @file * TM - Timeout Manager, all contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllCpu.cpp b/src/VBox/VMM/VMMAll/TMAllCpu.cpp index 859f17cb3..47cab876b 100644 --- a/src/VBox/VMM/VMMAll/TMAllCpu.cpp +++ b/src/VBox/VMM/VMMAll/TMAllCpu.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllCpu.cpp 13586 2008-10-27 16:33:51Z vboxsync $ */ +/* $Id: TMAllCpu.cpp $ */ /** @file * TM - Timeout Manager, CPU Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllReal.cpp b/src/VBox/VMM/VMMAll/TMAllReal.cpp index f3f101fef..f55183145 100644 --- a/src/VBox/VMM/VMMAll/TMAllReal.cpp +++ b/src/VBox/VMM/VMMAll/TMAllReal.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllReal.cpp 12989 2008-10-06 02:15:39Z vboxsync $ */ +/* $Id: TMAllReal.cpp $ */ /** @file * TM - Timeout Manager, Real Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp index 1113ea313..232711b92 100644 --- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp +++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp @@ -1,4 +1,4 @@ -/* $Id: TMAllVirtual.cpp 14299 2008-11-18 13:25:40Z vboxsync $ */ +/* $Id: TMAllVirtual.cpp $ */ /** @file * TM - Timeout Manager, Virtual Time, All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/TRPMAll.cpp b/src/VBox/VMM/VMMAll/TRPMAll.cpp index 7cedfeae6..d6ab6bf55 100644 --- a/src/VBox/VMM/VMMAll/TRPMAll.cpp +++ b/src/VBox/VMM/VMMAll/TRPMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: TRPMAll.cpp $ */ /** @file * TRPM - Trap Monitor - Any Context. */ diff --git a/src/VBox/VMM/VMMAll/VMAll.cpp b/src/VBox/VMM/VMMAll/VMAll.cpp index 25c52277b..2908999e2 100644 --- a/src/VBox/VMM/VMMAll/VMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: VMAll.cpp 13832 2008-11-05 02:01:12Z vboxsync $ */ +/* $Id: VMAll.cpp $ */ /** @file * VM - Virtual Machine All Contexts. */ diff --git a/src/VBox/VMM/VMMAll/VMMAll.cpp b/src/VBox/VMM/VMMAll/VMMAll.cpp index 88ad02350..b630c631a 100644 --- a/src/VBox/VMM/VMMAll/VMMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMMAll.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMAll.cpp 14875 2008-12-01 16:24:22Z vboxsync $ */ +/* $Id: VMMAll.cpp $ */ /** @file * VMM All Contexts. */ diff --git a/src/VBox/VMM/VMMCodingGuidelines.cpp b/src/VBox/VMM/VMMCodingGuidelines.cpp index b088d612b..a007bb268 100644 --- a/src/VBox/VMM/VMMCodingGuidelines.cpp +++ b/src/VBox/VMM/VMMCodingGuidelines.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMCodingGuidelines.cpp 9212 2008-05-29 09:38:38Z vboxsync $ */ +/* $Id: VMMCodingGuidelines.cpp $ */ /** @file * VMM - Coding Guidelines. */ diff --git a/src/VBox/VMM/VMMDocsRawMode.cpp b/src/VBox/VMM/VMMDocsRawMode.cpp index 3c49b71df..f8292427b 100644 --- a/src/VBox/VMM/VMMDocsRawMode.cpp +++ b/src/VBox/VMM/VMMDocsRawMode.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMDocsRawMode.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VMMDocsRawMode.cpp $ */ /** @file * This file contains the documentation of the raw-mode execution. */ diff --git a/src/VBox/VMM/VMMGC/CPUMGC.cpp b/src/VBox/VMM/VMMGC/CPUMGC.cpp index cd13abf2b..37e29c4b3 100644 --- a/src/VBox/VMM/VMMGC/CPUMGC.cpp +++ b/src/VBox/VMM/VMMGC/CPUMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMGC.cpp 13960 2008-11-07 13:04:45Z vboxsync $ */ +/* $Id: CPUMGC.cpp $ */ /** @file * CPUM - Guest Context Code. */ diff --git a/src/VBox/VMM/VMMGC/CPUMGCA.asm b/src/VBox/VMM/VMMGC/CPUMGCA.asm index 6a7b64197..4a48e1632 100644 --- a/src/VBox/VMM/VMMGC/CPUMGCA.asm +++ b/src/VBox/VMM/VMMGC/CPUMGCA.asm @@ -1,4 +1,4 @@ -; $Id: CPUMGCA.asm 13960 2008-11-07 13:04:45Z vboxsync $ +; $Id: CPUMGCA.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMGC/DBGFGC.cpp b/src/VBox/VMM/VMMGC/DBGFGC.cpp index a26e7edf3..e101c5272 100644 --- a/src/VBox/VMM/VMMGC/DBGFGC.cpp +++ b/src/VBox/VMM/VMMGC/DBGFGC.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFGC.cpp 14864 2008-12-01 14:39:11Z vboxsync $ */ +/* $Id: DBGFGC.cpp $ */ /** @file * DBGF - Debugger Facility, GC part. * diff --git a/src/VBox/VMM/VMMGC/EMGCA.asm b/src/VBox/VMM/VMMGC/EMGCA.asm index b39566f1b..e0f70de28 100644 --- a/src/VBox/VMM/VMMGC/EMGCA.asm +++ b/src/VBox/VMM/VMMGC/EMGCA.asm @@ -1,4 +1,4 @@ -; $Id: EMAllA.asm 20278 2007-04-09 11:56:29Z sandervl $ +; $Id: EMAllA.asm $ ;; @file ; EM Assembly Routines. ; diff --git a/src/VBox/VMM/VMMGC/HWACCMGCA.asm b/src/VBox/VMM/VMMGC/HWACCMGCA.asm index 3d20997de..6fedc9331 100644 --- a/src/VBox/VMM/VMMGC/HWACCMGCA.asm +++ b/src/VBox/VMM/VMMGC/HWACCMGCA.asm @@ -1,4 +1,4 @@ -; $Id: HWACCMGCA.asm 15962 2009-01-15 12:33:49Z vboxsync $ +; $Id: HWACCMGCA.asm $ ;; @file ; VMXM - GC vmx helpers ; diff --git a/src/VBox/VMM/VMMGC/IOMGC.cpp b/src/VBox/VMM/VMMGC/IOMGC.cpp index 76ac5e8df..cd27e2278 100644 --- a/src/VBox/VMM/VMMGC/IOMGC.cpp +++ b/src/VBox/VMM/VMMGC/IOMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: IOMGC.cpp 12989 2008-10-06 02:15:39Z vboxsync $ */ +/* $Id: IOMGC.cpp $ */ /** @file * IOM - Input / Output Monitor - Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/MMRamGC.cpp b/src/VBox/VMM/VMMGC/MMRamGC.cpp index e57ae9103..e496c8d3c 100644 --- a/src/VBox/VMM/VMMGC/MMRamGC.cpp +++ b/src/VBox/VMM/VMMGC/MMRamGC.cpp @@ -1,4 +1,4 @@ -/* $Id: MMRamGC.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: MMRamGC.cpp $ */ /** @file * MMRamGC - Guest Context Ram access Routines, pair for MMRamGCA.asm. */ diff --git a/src/VBox/VMM/VMMGC/MMRamGCA.asm b/src/VBox/VMM/VMMGC/MMRamGCA.asm index b5397fabf..138fa49ac 100644 --- a/src/VBox/VMM/VMMGC/MMRamGCA.asm +++ b/src/VBox/VMM/VMMGC/MMRamGCA.asm @@ -1,4 +1,4 @@ -; $Id: MMRamGCA.asm 12989 2008-10-06 02:15:39Z vboxsync $ +; $Id: MMRamGCA.asm $ ;; @file ; MMRamGCA - Guest Context Ram access Assembly Routines. ; diff --git a/src/VBox/VMM/VMMGC/PDMGCDevice.cpp b/src/VBox/VMM/VMMGC/PDMGCDevice.cpp index 216e62554..e4b855511 100644 --- a/src/VBox/VMM/VMMGC/PDMGCDevice.cpp +++ b/src/VBox/VMM/VMMGC/PDMGCDevice.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMGCDevice.cpp 13824 2008-11-05 01:11:24Z vboxsync $ */ +/* $Id: PDMGCDevice.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, GC Device parts. */ diff --git a/src/VBox/VMM/VMMGC/PGMGC.cpp b/src/VBox/VMM/VMMGC/PGMGC.cpp index cea22db18..a1983372f 100644 --- a/src/VBox/VMM/VMMGC/PGMGC.cpp +++ b/src/VBox/VMM/VMMGC/PGMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMGC.cpp 13235 2008-10-13 20:48:53Z vboxsync $ */ +/* $Id: PGMGC.cpp $ */ /** @file * PGM - Page Monitor, Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/PGMGCBth.h b/src/VBox/VMM/VMMGC/PGMGCBth.h index 9cb66e782..e4a7758a8 100644 --- a/src/VBox/VMM/VMMGC/PGMGCBth.h +++ b/src/VBox/VMM/VMMGC/PGMGCBth.h @@ -1,4 +1,4 @@ -/* $Id: PGMGCBth.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: PGMGCBth.h $ */ /** @file * VBox - Page Manager, Shadow+Guest Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/PGMGCGst.h b/src/VBox/VMM/VMMGC/PGMGCGst.h index 052baaaba..118a049db 100644 --- a/src/VBox/VMM/VMMGC/PGMGCGst.h +++ b/src/VBox/VMM/VMMGC/PGMGCGst.h @@ -1,4 +1,4 @@ -/* $Id: PGMGCGst.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: PGMGCGst.h $ */ /** @file * VBox - Page Manager, Guest Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/PGMGCShw.h b/src/VBox/VMM/VMMGC/PGMGCShw.h index 6fda923c0..61bb96792 100644 --- a/src/VBox/VMM/VMMGC/PGMGCShw.h +++ b/src/VBox/VMM/VMMGC/PGMGCShw.h @@ -1,4 +1,4 @@ -/* $Id: PGMGCShw.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: PGMGCShw.h $ */ /** @file * VBox - Page Manager, Shadow Paging Template - Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/SELMGC.cpp b/src/VBox/VMM/VMMGC/SELMGC.cpp index 60fc59319..85fa2648b 100644 --- a/src/VBox/VMM/VMMGC/SELMGC.cpp +++ b/src/VBox/VMM/VMMGC/SELMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: SELMGC.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/* $Id: SELMGC.cpp $ */ /** @file * SELM - The Selector Manager, Guest Context. */ diff --git a/src/VBox/VMM/VMMGC/TRPMGC.cpp b/src/VBox/VMM/VMMGC/TRPMGC.cpp index 40a5dd63c..7cf6f51f7 100644 --- a/src/VBox/VMM/VMMGC/TRPMGC.cpp +++ b/src/VBox/VMM/VMMGC/TRPMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMGC.cpp 13823 2008-11-05 01:10:20Z vboxsync $ */ +/* $Id: TRPMGC.cpp $ */ /** @file * TRPM - The Trap Monitor, Guest Context */ diff --git a/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp b/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp index daf911219..8da4c99eb 100644 --- a/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp +++ b/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMGCHandlers.cpp 13960 2008-11-07 13:04:45Z vboxsync $ */ +/* $Id: TRPMGCHandlers.cpp $ */ /** @file * TRPM - Guest Context Trap Handlers, CPP part */ diff --git a/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm b/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm index dc432f0cf..1d40a9f1e 100644 --- a/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm +++ b/src/VBox/VMM/VMMGC/TRPMGCHandlersA.asm @@ -1,4 +1,4 @@ -; $Id: TRPMGCHandlersA.asm 15416 2008-12-13 05:31:06Z vboxsync $ +; $Id: TRPMGCHandlersA.asm $ ;; @file ; TRPM - Guest Context Trap Handlers ; diff --git a/src/VBox/VMM/VMMGC/VMMGC.cpp b/src/VBox/VMM/VMMGC/VMMGC.cpp index fcd21ec32..b2241990c 100644 --- a/src/VBox/VMM/VMMGC/VMMGC.cpp +++ b/src/VBox/VMM/VMMGC/VMMGC.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMGC.cpp 13816 2008-11-04 22:52:12Z vboxsync $ */ +/* $Id: VMMGC.cpp $ */ /** @file * VMM - Raw-mode Context. */ diff --git a/src/VBox/VMM/VMMGC/VMMGC.mac b/src/VBox/VMM/VMMGC/VMMGC.mac index bc68b678c..c37842d4a 100644 --- a/src/VBox/VMM/VMMGC/VMMGC.mac +++ b/src/VBox/VMM/VMMGC/VMMGC.mac @@ -1,4 +1,4 @@ -; $Id: VMMGC.mac 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: VMMGC.mac $ ;; @file ; VMMGC - Raw-mode Context Assembly Macros. ; diff --git a/src/VBox/VMM/VMMGC/VMMGC0.asm b/src/VBox/VMM/VMMGC/VMMGC0.asm index 146916a35..9c1cb3767 100644 --- a/src/VBox/VMM/VMMGC/VMMGC0.asm +++ b/src/VBox/VMM/VMMGC/VMMGC0.asm @@ -1,4 +1,4 @@ -; $Id: VMMGC0.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VMMGC0.asm $ ;; @file ; VMMGC0 - The first object module in the link. ; diff --git a/src/VBox/VMM/VMMGC/VMMGC99.asm b/src/VBox/VMM/VMMGC/VMMGC99.asm index 2d0242c95..cf26adcb2 100644 --- a/src/VBox/VMM/VMMGC/VMMGC99.asm +++ b/src/VBox/VMM/VMMGC/VMMGC99.asm @@ -1,4 +1,4 @@ -; $Id: VMMGC99.asm 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: VMMGC99.asm $ ;; @file ; VMMGC99 - The last object module in the link. ; diff --git a/src/VBox/VMM/VMMGC/VMMGCA.asm b/src/VBox/VMM/VMMGC/VMMGCA.asm index ab94ba2d6..67d5a477d 100644 --- a/src/VBox/VMM/VMMGC/VMMGCA.asm +++ b/src/VBox/VMM/VMMGC/VMMGCA.asm @@ -1,4 +1,4 @@ -; $Id: VMMGCA.asm 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: VMMGCA.asm $ ;; @file ; VMMGC - Raw-mode Context Virtual Machine Monitor assembly routines. ; diff --git a/src/VBox/VMM/VMMGC/VMMGCBuiltin.def b/src/VBox/VMM/VMMGC/VMMGCBuiltin.def index a9fd16e2d..76ad61426 100644 --- a/src/VBox/VMM/VMMGC/VMMGCBuiltin.def +++ b/src/VBox/VMM/VMMGC/VMMGCBuiltin.def @@ -1,4 +1,4 @@ -; $Id: VMMGCBuiltin.def 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: VMMGCBuiltin.def $ ;; @file ; VMM Raw-mode Context Builtin DLL - Definition file for generating import library. ; diff --git a/src/VBox/VMM/VMMGC/VMMGCDeps.cpp b/src/VBox/VMM/VMMGC/VMMGCDeps.cpp index 41eb921f1..91153725e 100644 --- a/src/VBox/VMM/VMMGC/VMMGCDeps.cpp +++ b/src/VBox/VMM/VMMGC/VMMGCDeps.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMGCDeps.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: VMMGCDeps.cpp $ */ /** @file * VMMGC Runtime Dependencies. */ diff --git a/src/VBox/VMM/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMGuruMeditation.cpp index 220907bd4..2159c6e2d 100644 --- a/src/VBox/VMM/VMMGuruMeditation.cpp +++ b/src/VBox/VMM/VMMGuruMeditation.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMGuruMeditation.cpp 13840 2008-11-05 03:31:46Z vboxsync $ */ +/* $Id: VMMGuruMeditation.cpp $ */ /** @file * VMM - The Virtual Machine Monitor, Guru Meditation Code. */ diff --git a/src/VBox/VMM/VMMInternal.h b/src/VBox/VMM/VMMInternal.h index 9bfeae458..6e5ff8706 100644 --- a/src/VBox/VMM/VMMInternal.h +++ b/src/VBox/VMM/VMMInternal.h @@ -1,4 +1,4 @@ -/* $Id: VMMInternal.h 14680 2008-11-27 02:08:02Z vboxsync $ */ +/* $Id: VMMInternal.h $ */ /** @file * VMM - Internal header file. */ diff --git a/src/VBox/VMM/VMMInternal.mac b/src/VBox/VMM/VMMInternal.mac index 249ea241c..93bcc052c 100644 --- a/src/VBox/VMM/VMMInternal.mac +++ b/src/VBox/VMM/VMMInternal.mac @@ -1,4 +1,4 @@ -; $Id: VMMInternal.mac 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VMMInternal.mac $ ;; @file ; VMM - Internal header file. ; diff --git a/src/VBox/VMM/VMMR0/CPUMR0.cpp b/src/VBox/VMM/VMMR0/CPUMR0.cpp index f028f76d4..4b6905c76 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0.cpp +++ b/src/VBox/VMM/VMMR0/CPUMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: CPUMR0.cpp 16121 2009-01-21 10:31:45Z vboxsync $ */ +/* $Id: CPUMR0.cpp $ */ /** @file * CPUM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/CPUMR0A.asm b/src/VBox/VMM/VMMR0/CPUMR0A.asm index 0a768052f..6d53f11cb 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0A.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0A.asm @@ -1,4 +1,4 @@ -; $Id: CPUMR0A.asm 16113 2009-01-21 09:08:29Z vboxsync $ +; $Id: CPUMR0A.asm $ ;; @file ; CPUM - Guest Context Assembly Routines. ; diff --git a/src/VBox/VMM/VMMR0/DBGFR0.cpp b/src/VBox/VMM/VMMR0/DBGFR0.cpp index 64c75d875..002f2e849 100644 --- a/src/VBox/VMM/VMMR0/DBGFR0.cpp +++ b/src/VBox/VMM/VMMR0/DBGFR0.cpp @@ -1,4 +1,4 @@ -/* $Id: DBGFR0.cpp 16105 2009-01-20 22:02:48Z vboxsync $ */ +/* $Id: DBGFR0.cpp $ */ /** @file * DBGF - Debugger Facility, R0 part. * diff --git a/src/VBox/VMM/VMMR0/GMMR0.cpp b/src/VBox/VMM/VMMR0/GMMR0.cpp index d3a80f558..175fd7c8d 100644 --- a/src/VBox/VMM/VMMR0/GMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: GMMR0.cpp 14299 2008-11-18 13:25:40Z vboxsync $ */ +/* $Id: GMMR0.cpp $ */ /** @file * GMM - Global Memory Manager. */ diff --git a/src/VBox/VMM/VMMR0/GMMR0Internal.h b/src/VBox/VMM/VMMR0/GMMR0Internal.h index 782ce85de..fababee62 100644 --- a/src/VBox/VMM/VMMR0/GMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GMMR0Internal.h @@ -1,4 +1,4 @@ -/* $Id: GMMR0Internal.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: GMMR0Internal.h $ */ /** @file * GMM - The Global Memory Manager, Internal Header. */ diff --git a/src/VBox/VMM/VMMR0/GVMMR0.cpp b/src/VBox/VMM/VMMR0/GVMMR0.cpp index 3bbe23318..404a1470f 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GVMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: GVMMR0.cpp 15865 2009-01-08 13:10:01Z vboxsync $ */ +/* $Id: GVMMR0.cpp $ */ /** @file * GVMM - Global VM Manager. */ diff --git a/src/VBox/VMM/VMMR0/GVMMR0Internal.h b/src/VBox/VMM/VMMR0/GVMMR0Internal.h index 61a4d089b..27047066a 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GVMMR0Internal.h @@ -1,4 +1,4 @@ -/* $Id: GVMMR0Internal.h 14811 2008-11-29 23:48:26Z vboxsync $ */ +/* $Id: GVMMR0Internal.h $ */ /** @file * GVMM - The Global VM Manager, Internal header. */ diff --git a/src/VBox/VMM/VMMR0/HWACCMR0.cpp b/src/VBox/VMM/VMMR0/HWACCMR0.cpp index a4a3e486c..232a66d9f 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWACCMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWACCMR0.cpp 16119 2009-01-21 10:19:34Z vboxsync $ */ +/* $Id: HWACCMR0.cpp $ */ /** @file * HWACCM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/HWACCMR0A.asm b/src/VBox/VMM/VMMR0/HWACCMR0A.asm index 4fe36cff1..a2fb76047 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0A.asm +++ b/src/VBox/VMM/VMMR0/HWACCMR0A.asm @@ -1,4 +1,4 @@ -; $Id: HWACCMR0A.asm 15415 2008-12-13 05:29:54Z vboxsync $ +; $Id: HWACCMR0A.asm $ ;; @file ; VMXM - R0 vmx helpers ; diff --git a/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac b/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac index 841428297..1c3fc98c8 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac +++ b/src/VBox/VMM/VMMR0/HWACCMR0Mixed.mac @@ -1,4 +1,4 @@ -; $Id: HWACCMR0Mixed.mac 15440 2008-12-13 13:09:30Z vboxsync $ +; $Id: HWACCMR0Mixed.mac $ ;; @file ; HWACCMR0Mixed.mac - Stuff that darwin needs to build two versions of. ; diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.cpp b/src/VBox/VMM/VMMR0/HWSVMR0.cpp index 1a64e34e3..632ebe97a 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWSVMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWSVMR0.cpp 15931 2009-01-14 09:40:44Z vboxsync $ */ +/* $Id: HWSVMR0.cpp $ */ /** @file * HWACCM SVM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/HWSVMR0.h b/src/VBox/VMM/VMMR0/HWSVMR0.h index d69aa6b9c..6dbfec0ca 100644 --- a/src/VBox/VMM/VMMR0/HWSVMR0.h +++ b/src/VBox/VMM/VMMR0/HWSVMR0.h @@ -1,4 +1,4 @@ -/* $Id: HWSVMR0.h 15414 2008-12-13 04:33:30Z vboxsync $ */ +/* $Id: HWSVMR0.h $ */ /** @file * HWACCM AMD-V - Internal header file. */ diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.cpp b/src/VBox/VMM/VMMR0/HWVMXR0.cpp index 7137c9788..66b58022c 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp +++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp @@ -1,4 +1,4 @@ -/* $Id: HWVMXR0.cpp 16110 2009-01-21 01:37:45Z vboxsync $ */ +/* $Id: HWVMXR0.cpp $ */ /** @file * HWACCM VMX - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.h b/src/VBox/VMM/VMMR0/HWVMXR0.h index d06412d9a..292d48ea9 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.h +++ b/src/VBox/VMM/VMMR0/HWVMXR0.h @@ -1,4 +1,4 @@ -/* $Id: HWVMXR0.h 15605 2008-12-16 19:54:21Z vboxsync $ */ +/* $Id: HWVMXR0.h $ */ /** @file * HWACCM VT-x - Internal header file. */ diff --git a/src/VBox/VMM/VMMR0/PDMR0Device.cpp b/src/VBox/VMM/VMMR0/PDMR0Device.cpp index 8d5aa8197..f787510e1 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Device.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Device.cpp @@ -1,4 +1,4 @@ -/* $Id: PDMR0Device.cpp 13824 2008-11-05 01:11:24Z vboxsync $ */ +/* $Id: PDMR0Device.cpp $ */ /** @file * PDM - Pluggable Device and Driver Manager, R0 Device parts. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0.cpp b/src/VBox/VMM/VMMR0/PGMR0.cpp index 0eab0a35e..994cd1d7e 100644 --- a/src/VBox/VMM/VMMR0/PGMR0.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMR0.cpp 13824 2008-11-05 01:11:24Z vboxsync $ */ +/* $Id: PGMR0.cpp $ */ /** @file * PGM - Page Manager and Monitor, Ring-0. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0Bth.h b/src/VBox/VMM/VMMR0/PGMR0Bth.h index d75e872e9..97e3583a1 100644 --- a/src/VBox/VMM/VMMR0/PGMR0Bth.h +++ b/src/VBox/VMM/VMMR0/PGMR0Bth.h @@ -1,4 +1,4 @@ -/* $Id: PGMR0Bth.h 8977 2008-05-20 19:23:25Z vboxsync $ */ +/* $Id: PGMR0Bth.h $ */ /** @file * VBox - Page Manager / Monitor, Shadow+Guest Paging Template. */ diff --git a/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp b/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp index c2dce16be..bf7790313 100644 --- a/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0DynMap.cpp @@ -1,4 +1,4 @@ -/* $Id: PGMR0DynMap.cpp 15436 2008-12-13 11:59:30Z vboxsync $ */ +/* $Id: PGMR0DynMap.cpp $ */ /** @file * PGM - Page Manager and Monitor, ring-0 dynamic mapping cache. */ diff --git a/src/VBox/VMM/VMMR0/TRPMR0.cpp b/src/VBox/VMM/VMMR0/TRPMR0.cpp index 5ec61de35..50b788f68 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0.cpp +++ b/src/VBox/VMM/VMMR0/TRPMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: TRPMR0.cpp 15414 2008-12-13 04:33:30Z vboxsync $ */ +/* $Id: TRPMR0.cpp $ */ /** @file * TRPM - The Trap Monitor - HC Ring 0 */ diff --git a/src/VBox/VMM/VMMR0/TRPMR0A.asm b/src/VBox/VMM/VMMR0/TRPMR0A.asm index 55107be79..4a0d4fb8e 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0A.asm +++ b/src/VBox/VMM/VMMR0/TRPMR0A.asm @@ -1,4 +1,4 @@ -; $Id: TRPMR0A.asm 14515 2008-11-24 12:33:00Z vboxsync $ +; $Id: TRPMR0A.asm $ ;; @file ; TRPM - Host Context Ring-0 ; diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp index c6e768605..8554ec834 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.cpp +++ b/src/VBox/VMM/VMMR0/VMMR0.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMR0.cpp 15696 2008-12-19 14:20:13Z vboxsync $ */ +/* $Id: VMMR0.cpp $ */ /** @file * VMM - Host Context Ring 0. */ diff --git a/src/VBox/VMM/VMMR0/VMMR0A.asm b/src/VBox/VMM/VMMR0/VMMR0A.asm index 3e8341b34..4fc64a0e5 100644 --- a/src/VBox/VMM/VMMR0/VMMR0A.asm +++ b/src/VBox/VMM/VMMR0/VMMR0A.asm @@ -1,4 +1,4 @@ -; $Id: VMMR0A.asm 14721 2008-11-27 16:34:10Z vboxsync $ +; $Id: VMMR0A.asm $ ;; @file ; VMM - R0 assembly routines. ; diff --git a/src/VBox/VMM/VMMSwitcher.cpp b/src/VBox/VMM/VMMSwitcher.cpp index 54b424661..d3036a88b 100644 --- a/src/VBox/VMM/VMMSwitcher.cpp +++ b/src/VBox/VMM/VMMSwitcher.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMSwitcher.cpp 15414 2008-12-13 04:33:30Z vboxsync $ */ +/* $Id: VMMSwitcher.cpp $ */ /** @file * VMM - The Virtual Machine Monitor, World Switcher(s). */ diff --git a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm index 5a836e4e9..a6c12f432 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitTo32Bit.asm @@ -1,4 +1,4 @@ -; $Id: 32BitTo32Bit.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: 32BitTo32Bit.asm $ ;; @file ; VMM - World Switchers, 32-Bit to 32-Bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm index 4dfce7f98..64783b32d 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitToAMD64.asm @@ -1,4 +1,4 @@ -; $Id: 32BitToAMD64.asm 14890 2008-12-02 10:47:49Z vboxsync $ +; $Id: 32BitToAMD64.asm $ ;; @file ; VMM - World Switchers, 32-Bit to AMD64 ; diff --git a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm index 1a480bf6b..410d8e6b6 100644 --- a/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/32BitToPAE.asm @@ -1,4 +1,4 @@ -; $Id: 32BitToPAE.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: 32BitToPAE.asm $ ;; @file ; VMM - World Switchers, 32-Bit to 32-Bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm index 71b0b3eca..88e4e0a84 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/AMD64To32Bit.asm @@ -1,4 +1,4 @@ -; $Id: AMD64To32Bit.asm 14169 2008-11-13 12:44:05Z vboxsync $ +; $Id: AMD64To32Bit.asm $ ;; @file ; VMM - World Switchers, AMD64 to 32-bit ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm index f7bd2b963..085d55b86 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/AMD64ToPAE.asm @@ -1,4 +1,4 @@ -; $Id: AMD64ToPAE.asm 14167 2008-11-13 12:31:38Z vboxsync $ +; $Id: AMD64ToPAE.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac index 555aca412..80953476e 100644 --- a/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac +++ b/src/VBox/VMM/VMMSwitcher/AMD64andLegacy.mac @@ -1,4 +1,4 @@ -; $Id: AMD64andLegacy.mac 15414 2008-12-13 04:33:30Z vboxsync $ +; $Id: AMD64andLegacy.mac $ ;; @file ; VMM - World Switchers, template for AMD64 to PAE and 32-bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm index 6c9402581..a6dac9a1b 100644 --- a/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm +++ b/src/VBox/VMM/VMMSwitcher/PAETo32Bit.asm @@ -1,4 +1,4 @@ -; $Id: PAETo32Bit.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: PAETo32Bit.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm index 910bbb401..02e08a3b1 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm +++ b/src/VBox/VMM/VMMSwitcher/PAEToAMD64.asm @@ -1,4 +1,4 @@ -; $Id: PAEToAMD64.asm 14892 2008-12-02 11:10:19Z vboxsync $ +; $Id: PAEToAMD64.asm $ ;; @file ; VMM - World Switchers, PAE to AMD64 ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm index 3edea0a32..b103e5ad2 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm +++ b/src/VBox/VMM/VMMSwitcher/PAEToPAE.asm @@ -1,4 +1,4 @@ -; $Id: PAEToPAE.asm 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: PAEToPAE.asm $ ;; @file ; VMM - World Switchers, PAE to PAE ; diff --git a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac index f822c9be1..df2fe51a3 100644 --- a/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac +++ b/src/VBox/VMM/VMMSwitcher/PAEand32Bit.mac @@ -1,4 +1,4 @@ -; $Id: PAEand32Bit.mac 14192 2008-11-13 21:36:51Z vboxsync $ +; $Id: PAEand32Bit.mac $ ;; @file ; VMM - World Switchers, template for PAE and 32-Bit. ; diff --git a/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h b/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h index 4942c7212..8b635d3ff 100644 --- a/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h +++ b/src/VBox/VMM/VMMSwitcher/VMMSwitcher.h @@ -1,4 +1,4 @@ -/* $Id: VMMSwitcher.h 14979 2008-12-04 13:14:29Z vboxsync $ */ +/* $Id: VMMSwitcher.h $ */ /** @file * VMM - World Switchers. */ diff --git a/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac b/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac index 42ad2a182..f89634906 100644 --- a/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac +++ b/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac @@ -1,4 +1,4 @@ -; $Id: VMMSwitcher.mac 14979 2008-12-04 13:14:29Z vboxsync $ +; $Id: VMMSwitcher.mac $ ;; @file ; VMM - World Switchers. ; diff --git a/src/VBox/VMM/VMMTests.cpp b/src/VBox/VMM/VMMTests.cpp index 3f2ee9f32..651d5642e 100644 --- a/src/VBox/VMM/VMMTests.cpp +++ b/src/VBox/VMM/VMMTests.cpp @@ -1,4 +1,4 @@ -/* $Id: VMMTests.cpp 13858 2008-11-05 13:45:41Z vboxsync $ */ +/* $Id: VMMTests.cpp $ */ /** @file * VMM - The Virtual Machine Monitor Core, Tests. */ diff --git a/src/VBox/VMM/VMReq.cpp b/src/VBox/VMM/VMReq.cpp index 9106a8644..69ce5d07a 100644 --- a/src/VBox/VMM/VMReq.cpp +++ b/src/VBox/VMM/VMReq.cpp @@ -1,4 +1,4 @@ -/* $Id: VMReq.cpp 13858 2008-11-05 13:45:41Z vboxsync $ */ +/* $Id: VMReq.cpp $ */ /** @file * VM - Virtual Machine */ diff --git a/src/VBox/VMM/testcase/Makefile.kmk b/src/VBox/VMM/testcase/Makefile.kmk index a109a43ff..1d64f36b3 100644 --- a/src/VBox/VMM/testcase/Makefile.kmk +++ b/src/VBox/VMM/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15236 2008-12-10 09:50:10Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the VMM testcases. # diff --git a/src/VBox/VMM/testcase/mkdsk.sh b/src/VBox/VMM/testcase/mkdsk.sh index 3201eee37..3201eee37 100644..100755 --- a/src/VBox/VMM/testcase/mkdsk.sh +++ b/src/VBox/VMM/testcase/mkdsk.sh diff --git a/src/VBox/VMM/testcase/tstAnimate.cpp b/src/VBox/VMM/testcase/tstAnimate.cpp index d37ca01d6..79d7c2758 100644 --- a/src/VBox/VMM/testcase/tstAnimate.cpp +++ b/src/VBox/VMM/testcase/tstAnimate.cpp @@ -1,4 +1,4 @@ -/* $Id: tstAnimate.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstAnimate.cpp $ */ /** @file * VBox Animation Testcase / Tool. */ diff --git a/src/VBox/VMM/testcase/tstAsmStructs.cpp b/src/VBox/VMM/testcase/tstAsmStructs.cpp index 00c5d2203..40d198fe6 100644 --- a/src/VBox/VMM/testcase/tstAsmStructs.cpp +++ b/src/VBox/VMM/testcase/tstAsmStructs.cpp @@ -1,4 +1,4 @@ -/* $Id: tstAsmStructs.cpp 15236 2008-12-10 09:50:10Z vboxsync $ */ +/* $Id: tstAsmStructs.cpp $ */ /** @file * Testcase for checking offsets in the assembly structures shared with C/C++. */ diff --git a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm index c8008818b..ce3111770 100644 --- a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm +++ b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm @@ -1,4 +1,4 @@ -; $Id: tstAsmStructsAsm.asm 15236 2008-12-10 09:50:10Z vboxsync $ +; $Id: tstAsmStructsAsm.asm $ ;; @file ; Assembly / C structure layout testcase. ; diff --git a/src/VBox/VMM/testcase/tstCFGM.cpp b/src/VBox/VMM/testcase/tstCFGM.cpp index 226c2e036..dcfd4bc7f 100644 --- a/src/VBox/VMM/testcase/tstCFGM.cpp +++ b/src/VBox/VMM/testcase/tstCFGM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCFGM.cpp 13818 2008-11-04 22:59:47Z vboxsync $ */ +/* $Id: tstCFGM.cpp $ */ /** @file * Testcase for CFGM. */ diff --git a/src/VBox/VMM/testcase/tstCompiler.cpp b/src/VBox/VMM/testcase/tstCompiler.cpp index ec334de14..ba8cc7249 100644 --- a/src/VBox/VMM/testcase/tstCompiler.cpp +++ b/src/VBox/VMM/testcase/tstCompiler.cpp @@ -1,4 +1,4 @@ -/* $Id: tstCompiler.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: tstCompiler.cpp $ */ /** @file * Testing how the compiler deals with various things. * diff --git a/src/VBox/VMM/testcase/tstGlobalConfig.cpp b/src/VBox/VMM/testcase/tstGlobalConfig.cpp index 1c257144a..0850236d8 100644 --- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp +++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp @@ -1,4 +1,4 @@ -/* $Id: tstGlobalConfig.cpp 11822 2008-08-29 14:21:03Z vboxsync $ */ +/* $Id: tstGlobalConfig.cpp $ */ /** @file * Ring-3 Management program for the GCFGM mock-up. */ diff --git a/src/VBox/VMM/testcase/tstHelp.h b/src/VBox/VMM/testcase/tstHelp.h index fcbe4876d..469fc4573 100644 --- a/src/VBox/VMM/testcase/tstHelp.h +++ b/src/VBox/VMM/testcase/tstHelp.h @@ -1,4 +1,4 @@ -/* $Id: tstHelp.h 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: tstHelp.h $ */ /** @file * VMM testcase - Helper stuff. */ diff --git a/src/VBox/VMM/testcase/tstInstrEmul.cpp b/src/VBox/VMM/testcase/tstInstrEmul.cpp index 1bbd3cc2a..fde8d40d8 100644 --- a/src/VBox/VMM/testcase/tstInstrEmul.cpp +++ b/src/VBox/VMM/testcase/tstInstrEmul.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMicro.cpp 37408 2008-10-03 22:22:37Z bird $ */ +/* $Id: tstMicro.cpp $ */ /** @file * Micro Testcase, checking emulation of certain instructions */ diff --git a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp index 68015bfae..9693420db 100644 --- a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp +++ b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMMHyperHeap.cpp 13818 2008-11-04 22:59:47Z vboxsync $ */ +/* $Id: tstMMHyperHeap.cpp $ */ /** @file * MM Hypervisor Heap testcase. */ diff --git a/src/VBox/VMM/testcase/tstMicro.cpp b/src/VBox/VMM/testcase/tstMicro.cpp index e13c1d87f..723c0cc8e 100644 --- a/src/VBox/VMM/testcase/tstMicro.cpp +++ b/src/VBox/VMM/testcase/tstMicro.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMicro.cpp 15942 2009-01-14 13:20:58Z vboxsync $ */ +/* $Id: tstMicro.cpp $ */ /** @file * Micro Testcase, profiling special CPU operations. */ diff --git a/src/VBox/VMM/testcase/tstMicro.h b/src/VBox/VMM/testcase/tstMicro.h index 920ea8c6a..97b2e38f7 100644 --- a/src/VBox/VMM/testcase/tstMicro.h +++ b/src/VBox/VMM/testcase/tstMicro.h @@ -1,4 +1,4 @@ -/* $Id: tstMicro.h 13813 2008-11-04 21:55:34Z vboxsync $ */ +/* $Id: tstMicro.h $ */ /** @file * Micro Testcase, profiling special CPU operations. */ diff --git a/src/VBox/VMM/testcase/tstMicro.mac b/src/VBox/VMM/testcase/tstMicro.mac index 2bc927fae..6a6ebcb5d 100644 --- a/src/VBox/VMM/testcase/tstMicro.mac +++ b/src/VBox/VMM/testcase/tstMicro.mac @@ -1,4 +1,4 @@ -; $Id: tstMicro.mac 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: tstMicro.mac $ ;; @file ; Micro Testcase, profiling special CPU operations. ; diff --git a/src/VBox/VMM/testcase/tstMicroGC.cpp b/src/VBox/VMM/testcase/tstMicroGC.cpp index 90be2a954..fc24aa686 100644 --- a/src/VBox/VMM/testcase/tstMicroGC.cpp +++ b/src/VBox/VMM/testcase/tstMicroGC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstMicroGC.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: tstMicroGC.cpp $ */ /** @file * Micro Testcase, profiling special CPU operations - GC Code (hacks). */ diff --git a/src/VBox/VMM/testcase/tstMicroGCA.asm b/src/VBox/VMM/testcase/tstMicroGCA.asm index a13b6d3d0..22c05e83e 100644 --- a/src/VBox/VMM/testcase/tstMicroGCA.asm +++ b/src/VBox/VMM/testcase/tstMicroGCA.asm @@ -1,4 +1,4 @@ -; $Id: tstMicroGCA.asm 13813 2008-11-04 21:55:34Z vboxsync $ +; $Id: tstMicroGCA.asm $ ;; @file ; tstMicroGCA ; diff --git a/src/VBox/VMM/testcase/tstSSM.cpp b/src/VBox/VMM/testcase/tstSSM.cpp index 1c61814d0..fec2ce0db 100644 --- a/src/VBox/VMM/testcase/tstSSM.cpp +++ b/src/VBox/VMM/testcase/tstSSM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstSSM.cpp 13818 2008-11-04 22:59:47Z vboxsync $ */ +/* $Id: tstSSM.cpp $ */ /** @file * Saved State Manager Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMM-2.cpp b/src/VBox/VMM/testcase/tstVMM-2.cpp index 33c7c6aa0..f2f5c4c41 100644 --- a/src/VBox/VMM/testcase/tstVMM-2.cpp +++ b/src/VBox/VMM/testcase/tstVMM-2.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMM-2.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstVMM-2.cpp $ */ /** @file * VMM Testcase - no. 2. */ diff --git a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp index e2e8059c6..f8d298dd9 100644 --- a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp +++ b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMM.cpp 17451 2007-01-15 14:08:28Z bird $ */ +/* $Id: tstVMM.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMM.cpp b/src/VBox/VMM/testcase/tstVMM.cpp index 27ad4801f..6d61aa2ad 100644 --- a/src/VBox/VMM/testcase/tstVMM.cpp +++ b/src/VBox/VMM/testcase/tstVMM.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMM.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstVMM.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMMFork.cpp b/src/VBox/VMM/testcase/tstVMMFork.cpp index 3bb9a03f0..1bec00a16 100644 --- a/src/VBox/VMM/testcase/tstVMMFork.cpp +++ b/src/VBox/VMM/testcase/tstVMMFork.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMMFork.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstVMMFork.cpp $ */ /** @file * VMM Fork Test. */ diff --git a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp index 8878e9774..f3d0bd45e 100644 --- a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp +++ b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMMR0CallHost-1.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstVMMR0CallHost-1.cpp $ */ /** @file * Testcase for the VMMR0JMPBUF operations. */ diff --git a/src/VBox/VMM/testcase/tstVMREQ.cpp b/src/VBox/VMM/testcase/tstVMREQ.cpp index 206f502ad..1c2370b16 100644 --- a/src/VBox/VMM/testcase/tstVMREQ.cpp +++ b/src/VBox/VMM/testcase/tstVMREQ.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMREQ.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstVMREQ.cpp $ */ /** @file * VMM Testcase. */ diff --git a/src/VBox/VMM/testcase/tstVMStructGC.cpp b/src/VBox/VMM/testcase/tstVMStructGC.cpp index b93f1b999..d56499ac7 100644 --- a/src/VBox/VMM/testcase/tstVMStructGC.cpp +++ b/src/VBox/VMM/testcase/tstVMStructGC.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMStructGC.cpp 16019 2009-01-18 01:33:51Z vboxsync $ */ +/* $Id: tstVMStructGC.cpp $ */ /** @file * tstVMMStructGC - Generate structure member and size checks from the GC perspective. * diff --git a/src/VBox/VMM/testcase/tstVMStructSize.cpp b/src/VBox/VMM/testcase/tstVMStructSize.cpp index 81ce5f26e..89865d2c7 100644 --- a/src/VBox/VMM/testcase/tstVMStructSize.cpp +++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp @@ -1,4 +1,4 @@ -/* $Id: tstVMStructSize.cpp 14411 2008-11-20 13:26:47Z vboxsync $ */ +/* $Id: tstVMStructSize.cpp $ */ /** @file * tstVMStructSize - testcase for check structure sizes/alignment * and to verify that HC and GC uses the same diff --git a/src/apps/Makefile.kmk b/src/apps/Makefile.kmk index 051d67b8a..9579fefd5 100644 --- a/src/apps/Makefile.kmk +++ b/src/apps/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12194 2008-09-08 02:12:23Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for the external apps. # diff --git a/src/apps/tunctl/Makefile.kmk b/src/apps/tunctl/Makefile.kmk index d92c41bc6..289752213 100644 --- a/src/apps/tunctl/Makefile.kmk +++ b/src/apps/tunctl/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 31342 2008-05-28 08:44:35Z frank $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for VBoxTunctl # diff --git a/src/bldprogs/Makefile.kmk b/src/bldprogs/Makefile.kmk index d26338d8a..2c3a11c49 100644 --- a/src/bldprogs/Makefile.kmk +++ b/src/bldprogs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13155 2008-10-10 08:07:41Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for various generic build tools (there is currently only one of them). # diff --git a/src/bldprogs/bin2c.c b/src/bldprogs/bin2c.c index 4266000e5..3cfdc4346 100644 --- a/src/bldprogs/bin2c.c +++ b/src/bldprogs/bin2c.c @@ -1,4 +1,4 @@ -/* $Id: bin2c.c 12192 2008-09-08 01:54:10Z vboxsync $ */ +/* $Id: bin2c.c $ */ /** @file * bin2c - Binary 2 C Structure Converter. */ diff --git a/src/bldprogs/biossums.c b/src/bldprogs/biossums.c index 1f6697710..19a23d306 100644 --- a/src/bldprogs/biossums.c +++ b/src/bldprogs/biossums.c @@ -1,4 +1,4 @@ -/* $Id: biossums.c 14076 2008-11-11 07:24:05Z vboxsync $ */ +/* $Id: biossums.c $ */ /** @file * Tool for modifying a BIOS image to write the BIOS checksum. */ diff --git a/src/libs/Makefile.kmk b/src/libs/Makefile.kmk index f138e4e00..a2d025250 100644 --- a/src/libs/Makefile.kmk +++ b/src/libs/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15897 2009-01-12 14:31:42Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Top-level makefile for the external libraries. # diff --git a/src/libs/kStuff/Makefile.kmk b/src/libs/kStuff/Makefile.kmk index d3358efe1..9e6e29acf 100644 --- a/src/libs/kStuff/Makefile.kmk +++ b/src/libs/kStuff/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12196 2008-09-08 02:23:00Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for kStuff, for statically linking into VBoxRT. # diff --git a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp index 81f03f648..778bb136f 100644 --- a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpAlloc-iprt.cpp 8155 2008-04-18 15:16:47Z vboxsync $ *//* $Id: kHlpAlloc-iprt.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: kHlpAlloc-iprt.cpp $ */ /** @file * kHlpAlloc - Memory Allocation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp index c386d12de..e48624101 100644 --- a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpEnv-iprt.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: kHlpEnv-iprt.cpp $ */ /** @file * kHlpEnv - Environment Manipulation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp index ff5f0ceae..0a900c1c4 100644 --- a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpPage-iprt.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: kHlpPage-iprt.cpp $ */ /** @file * kHlpPage - Page Memory Allocation, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kHlpString-iprt.cpp b/src/libs/kStuff/iprt/kHlpString-iprt.cpp index f45374201..883d0b473 100644 --- a/src/libs/kStuff/iprt/kHlpString-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpString-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kHlpString-iprt.cpp 8155 2008-04-18 15:16:47Z vboxsync $ */ +/* $Id: kHlpString-iprt.cpp $ */ /** @file * kHlpString - String And Memory Routines, IPRT based implementation. */ diff --git a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp index a012cb419..691af74d0 100644 --- a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp +++ b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp @@ -1,4 +1,4 @@ -/* $Id: kRdrFile-iprt.cpp 8245 2008-04-21 17:24:28Z vboxsync $ */ +/* $Id: kRdrFile-iprt.cpp $ */ /** @file * IPRT - kRdr Backend. */ diff --git a/src/libs/liblzf-1.51/Makefile.kmk b/src/libs/liblzf-1.51/Makefile.kmk index d5bebba61..ab7d7b98d 100644 --- a/src/libs/liblzf-1.51/Makefile.kmk +++ b/src/libs/liblzf-1.51/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 12196 2008-09-08 02:23:00Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for liblzf. # diff --git a/src/libs/liblzf-1.51/configure b/src/libs/liblzf-1.51/configure index f329662ef..f329662ef 100644..100755 --- a/src/libs/liblzf-1.51/configure +++ b/src/libs/liblzf-1.51/configure diff --git a/src/libs/liblzf-1.51/install-sh b/src/libs/liblzf-1.51/install-sh index e9de23842..e9de23842 100644..100755 --- a/src/libs/liblzf-1.51/install-sh +++ b/src/libs/liblzf-1.51/install-sh diff --git a/src/libs/xpcom18a4/Makefile.kmk b/src/libs/xpcom18a4/Makefile.kmk index 3121c346b..125b9608b 100644 --- a/src/libs/xpcom18a4/Makefile.kmk +++ b/src/libs/xpcom18a4/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 15333 2008-12-11 18:56:36Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for XPCOM. # diff --git a/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdPrivate.h b/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdPrivate.h index 4186591a4..013d244dc 100644 --- a/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdPrivate.h +++ b/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdPrivate.h @@ -44,7 +44,7 @@ class ipcClient; // upper limit on the number of active connections // XXX may want to make this more dynamic // -#define IPC_MAX_CLIENTS 100 +#define IPC_MAX_CLIENTS 1500 // // array of connected clients diff --git a/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp b/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp index 209d6286c..281b9135e 100644 --- a/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp +++ b/src/libs/xpcom18a4/ipc/ipcd/daemon/src/ipcdUnix.cpp @@ -44,6 +44,11 @@ #include <stdlib.h> #include <string.h> +#if defined(VBOX) && !defined(XP_OS2) +# include <sys/resource.h> +# include <errno.h> +#endif + #include "prio.h" #include "prerror.h" #include "prthread.h" @@ -521,6 +526,23 @@ int main(int argc, char **argv) IPC_NotifyParent(); +#if defined(VBOX) && !defined(XP_OS2) + // Increase the file table size to 10240 or as high as possible. + struct rlimit lim; + if (getrlimit(RLIMIT_NOFILE, &lim) == 0) + { + if ( lim.rlim_cur < 10240 + && lim.rlim_cur < lim.rlim_max) + { + lim.rlim_cur = lim.rlim_max <= 10240 ? lim.rlim_max : 10240; + if (setrlimit(RLIMIT_NOFILE, &lim) == -1) + printf("WARNING: failed to increase file descriptor limit. (%d)\n", errno); + } + } + else + printf("WARNING: failed to obtain per-process file-descriptor limit (%d).\n", errno); +#endif + PollLoop(listenFD); } diff --git a/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp b/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp index f66851ba2..5f829626b 100644 --- a/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp +++ b/src/libs/xpcom18a4/ipc/ipcd/shared/src/ipcConfig.cpp @@ -39,6 +39,11 @@ #elif defined(XP_OS2) && defined(XP_OS2_NATIVEIPC) #else #include <string.h> +#ifdef XP_UNIX +#include <unistd.h> +#include <sys/types.h> +#include <pwd.h> +#endif #include "ipcConfig.h" #include "ipcLog.h" #include "prenv.h" @@ -70,6 +75,13 @@ void IPC_GetDefaultSocketPath(char *buf, PRUint32 bufLen) bufLen -= (sizeof(kDefaultSocketPrefix) - 1); logName = PR_GetEnv("VBOX_IPC_SOCKETID"); +#if defined(VBOX) && defined(XP_UNIX) + if (!logName || !logName[0]) { + struct passwd *passStruct = getpwuid(getuid()); + if (passStruct) + logName = passStruct->pw_name; + } +#endif if (!logName || !logName[0]) { logName = PR_GetEnv("LOGNAME"); if (!logName || !logName[0]) { diff --git a/src/libs/xpcom18a4/nsprpub/Makefile.in b/src/libs/xpcom18a4/nsprpub/Makefile.in index 9273b16db..9273b16db 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/Makefile.in diff --git a/src/libs/xpcom18a4/nsprpub/admin/explode.pl b/src/libs/xpcom18a4/nsprpub/admin/explode.pl index 881f21b9b..881f21b9b 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/explode.pl +++ b/src/libs/xpcom18a4/nsprpub/admin/explode.pl diff --git a/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh b/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh index 4250ce4a0..4250ce4a0 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/makeTargetDirs.sh diff --git a/src/libs/xpcom18a4/nsprpub/admin/repackage.sh b/src/libs/xpcom18a4/nsprpub/admin/repackage.sh index 37ba0e163..37ba0e163 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/repackage.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/repackage.sh diff --git a/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh b/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh index f90582e2d..f90582e2d 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh +++ b/src/libs/xpcom18a4/nsprpub/admin/symlinks.sh diff --git a/src/libs/xpcom18a4/nsprpub/config/Makefile.in b/src/libs/xpcom18a4/nsprpub/config/Makefile.in index 1b83ffa56..1b83ffa56 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/config/Makefile.in diff --git a/src/libs/xpcom18a4/nsprpub/config/config.mk b/src/libs/xpcom18a4/nsprpub/config/config.mk index 697a6015d..697a6015d 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/config.mk +++ b/src/libs/xpcom18a4/nsprpub/config/config.mk diff --git a/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl b/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl index 947b822ae..947b822ae 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl +++ b/src/libs/xpcom18a4/nsprpub/config/nfspwd.pl diff --git a/src/libs/xpcom18a4/nsprpub/config/nspr-config.in b/src/libs/xpcom18a4/nsprpub/config/nspr-config.in index e9e186791..e9e186791 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/nspr-config.in +++ b/src/libs/xpcom18a4/nsprpub/config/nspr-config.in diff --git a/src/libs/xpcom18a4/nsprpub/config/rules.mk b/src/libs/xpcom18a4/nsprpub/config/rules.mk index bba50ee75..bba50ee75 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/config/rules.mk +++ b/src/libs/xpcom18a4/nsprpub/config/rules.mk diff --git a/src/libs/xpcom18a4/nsprpub/configure b/src/libs/xpcom18a4/nsprpub/configure index 2046d79f6..2046d79f6 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/configure +++ b/src/libs/xpcom18a4/nsprpub/configure diff --git a/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in index 09edb474b..630af186b 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/linux/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com index 511e5913b..32de8a9ba 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.com 1 vboxsync $" +#ident "$Id: Makefile.com $" # MACH = $(shell mach) diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in index 53ac721f5..0c2d2e317 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ index b5ea1586b..9c49cf206 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/Makefile.targ @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.targ 1 vboxsync $" +#ident "$Id: Makefile.targ $" # pkginfo: pkginfo.tmpl ../awk_pkginfo diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in index 66885f029..ab54db6fb 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend index 47748f629..57bc554e3 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/depend @@ -1,7 +1,7 @@ # Copyright 2002 Microsystems, Inc. All Rights Reserved. # Use is subject to license terms. # -# $Id: depend 1 vboxsync $ +# $Id: depend $ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl index d387aa5dc..431ef37a0 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/pkginfo.tmpl @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: pkginfo.tmpl 1 vboxsync $" +#ident "$Id: pkginfo.tmpl $" # # # This required package information file describes characteristics of the diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com index d7c4366ca..e92c4e513 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_com 1 vboxsync $" +#ident "$Id: prototype_com $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 index 652e25a1f..76b920168 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_i386 @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_i386 1 vboxsync $" +#ident "$Id: prototype_i386 $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc index ae0a7032e..4da58b010 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWpr/prototype_sparc @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_sparc 1 vboxsync $" +#ident "$Id: prototype_sparc $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in index 66885f029..ab54db6fb 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/Makefile.in @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: Makefile.in 1 vboxsync $" +#ident "$Id: Makefile.in $" # MOD_DEPTH = ../../.. diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend index 027675ef6..5be1ecd98 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/depend @@ -1,7 +1,7 @@ # Copyright 2002 Microsystems, Inc. All Rights Reserved. # Use is subject to license terms. # -# $Id: depend 1 vboxsync $ +# $Id: depend $ # # This package information file defines software dependencies associated # with the pkg. You can define three types of pkg dependencies with this file: diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl index f7504a307..0b13c5be4 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/pkginfo.tmpl @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: pkginfo.tmpl 1 vboxsync $" +#ident "$Id: pkginfo.tmpl $" # # # This required package information file describes characteristics of the diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com index ac92436fd..700d61ca9 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_com @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_com 1 vboxsync $" +#ident "$Id: prototype_com $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc index 26e6d7d70..cd3da1210 100644 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/SUNWprx/prototype_sparc @@ -2,7 +2,7 @@ # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -#ident "$Id: prototype_sparc 1 vboxsync $" +#ident "$Id: prototype_sparc $" # # This required package information file contains a list of package contents. # The 'pkgmk' command uses this file to identify the contents of a package diff --git a/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh b/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh index 80d6fab36..b01645e47 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh +++ b/src/libs/xpcom18a4/nsprpub/pkg/solaris/bld_awk_pkginfo.ksh @@ -1,6 +1,6 @@ #!/usr/bin/ksh -p # -#ident "$Id: bld_awk_pkginfo.ksh 1 vboxsync $" +#ident "$Id: bld_awk_pkginfo.ksh $" # # Copyright 2002 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. diff --git a/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl b/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl index 9f0d90bc1..9f0d90bc1 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl +++ b/src/libs/xpcom18a4/nsprpub/pr/src/misc/compile-et.pl diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh index 3af86d394..3af86d394 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.ksh diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh index bb4a65eba..bb4a65eba 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runtests.sh diff --git a/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh b/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh index e7a325019..e7a325019 100644..100755 --- a/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh +++ b/src/libs/xpcom18a4/nsprpub/pr/tests/runy2ktests.ksh diff --git a/src/libs/xpcom18a4/python/sample/vboxshell.py b/src/libs/xpcom18a4/python/sample/vboxshell.py index ace25a408..ace25a408 100644..100755 --- a/src/libs/xpcom18a4/python/sample/vboxshell.py +++ b/src/libs/xpcom18a4/python/sample/vboxshell.py diff --git a/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl b/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl index b8962930d..b8962930d 100644..100755 --- a/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl +++ b/src/libs/xpcom18a4/xpcom/reflect/xptcall/public/genstubs.pl diff --git a/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl b/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl index 81ccb2123..81ccb2123 100644..100755 --- a/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl +++ b/src/libs/xpcom18a4/xpcom/tools/analyze-xpcom-log.pl diff --git a/src/recompiler/Makefile.kmk b/src/recompiler/Makefile.kmk index d97faa38d..060ce4406 100644 --- a/src/recompiler/Makefile.kmk +++ b/src/recompiler/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 13852 2008-11-05 12:50:30Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # The Recompiler Sub-Makefile. # diff --git a/src/recompiler/Sun/config-host.h b/src/recompiler/Sun/config-host.h index ad44fb356..4604e18b1 100644 --- a/src/recompiler/Sun/config-host.h +++ b/src/recompiler/Sun/config-host.h @@ -1,4 +1,4 @@ -/* $Id: config-host.h 8168 2008-04-18 16:58:27Z vboxsync $ */ +/* $Id: config-host.h $ */ /** @file * Sun host config - maintained by hand */ diff --git a/src/recompiler/Sun/config.h b/src/recompiler/Sun/config.h index 19288a1ed..ee88150a3 100644 --- a/src/recompiler/Sun/config.h +++ b/src/recompiler/Sun/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h 15520 2008-12-15 16:58:50Z vboxsync $ */ +/* $Id: config.h $ */ /** @file * Sun config - Maintained by hand */ diff --git a/src/recompiler/Sun/crt/stdio.h b/src/recompiler/Sun/crt/stdio.h index 4806d221f..5198a85fb 100644 --- a/src/recompiler/Sun/crt/stdio.h +++ b/src/recompiler/Sun/crt/stdio.h @@ -1,4 +1,4 @@ -/* $Id: stdio.h 8174 2008-04-18 19:26:36Z vboxsync $ */ +/* $Id: stdio.h $ */ /** @file * Our minimal stdio */ diff --git a/src/recompiler/Sun/deftoimp.sed b/src/recompiler/Sun/deftoimp.sed index aa0d7bd32..51b5850d1 100644 --- a/src/recompiler/Sun/deftoimp.sed +++ b/src/recompiler/Sun/deftoimp.sed @@ -1,4 +1,4 @@ -# $Id: deftoimp.sed 8155 2008-04-18 15:16:47Z vboxsync $ +# $Id: deftoimp.sed $ ## @file # SED script for generating a dummy .so from a windows .def file. # diff --git a/src/recompiler/Sun/op-darwin.sed b/src/recompiler/Sun/op-darwin.sed index be5efd5b7..03a8d278f 100644 --- a/src/recompiler/Sun/op-darwin.sed +++ b/src/recompiler/Sun/op-darwin.sed @@ -1,4 +1,4 @@ -# $Id: op-darwin.sed 8155 2008-04-18 15:16:47Z vboxsync $ +# $Id: op-darwin.sed $ ## @file # # SED script for transforming op.S (i386 ELF from GNU/linux) into diff --git a/src/recompiler/Sun/op-validate.sed b/src/recompiler/Sun/op-validate.sed index ead649288..904fd4567 100644 --- a/src/recompiler/Sun/op-validate.sed +++ b/src/recompiler/Sun/op-validate.sed @@ -1,4 +1,4 @@ -# $Id: op-validate.sed 4541 2007-09-05 19:32:48Z vboxsync $ +# $Id: op-validate.sed $ ## @file # # Just some quit sed hacks for validating an op.S assembly file. diff --git a/src/recompiler/Sun/structs.h b/src/recompiler/Sun/structs.h index 936419496..e5216bbcf 100644 --- a/src/recompiler/Sun/structs.h +++ b/src/recompiler/Sun/structs.h @@ -1,4 +1,4 @@ -/* $Id: structs.h 11982 2008-09-02 13:09:44Z vboxsync $ */ +/* $Id: structs.h $ */ /** @file * VBox Recompiler - structure offset tables. * diff --git a/src/recompiler/Sun/testmath.c b/src/recompiler/Sun/testmath.c index d0aab0804..0e8416c7d 100644 --- a/src/recompiler/Sun/testmath.c +++ b/src/recompiler/Sun/testmath.c @@ -1,4 +1,4 @@ -/* $Id: testmath.c 13840 2008-11-05 03:31:46Z vboxsync $ */
+/* $Id: testmath.c $ */
/** @file
* Testcase for the no-crt math stuff.
*/
diff --git a/src/recompiler/VBoxREM.def b/src/recompiler/VBoxREM.def index 6b4ea5803..7701fc5be 100644 --- a/src/recompiler/VBoxREM.def +++ b/src/recompiler/VBoxREM.def @@ -1,4 +1,4 @@ -; $Id: VBoxREM.def 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxREM.def $ ;; @file ; ; VBoxREM Definition File. diff --git a/src/recompiler/VBoxREMWrapper.cpp b/src/recompiler/VBoxREMWrapper.cpp index ab636dcde..fc1600b81 100644 --- a/src/recompiler/VBoxREMWrapper.cpp +++ b/src/recompiler/VBoxREMWrapper.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxREMWrapper.cpp 15520 2008-12-15 16:58:50Z vboxsync $ */ +/* $Id: VBoxREMWrapper.cpp $ */ /** @file * * VBoxREM Win64 DLL Wrapper. diff --git a/src/recompiler/VBoxREMWrapperA.asm b/src/recompiler/VBoxREMWrapperA.asm index 6f6ebfcf6..d1e3d8327 100644 --- a/src/recompiler/VBoxREMWrapperA.asm +++ b/src/recompiler/VBoxREMWrapperA.asm @@ -1,4 +1,4 @@ -; $Id: VBoxREMWrapperA.asm 12001 2008-09-02 17:20:41Z vboxsync $
+; $Id: VBoxREMWrapperA.asm $
;; @file
;
; VBoxREM Wrapper, Assembly routines and wrapper Templates.
diff --git a/src/recompiler/VBoxRecompiler.c b/src/recompiler/VBoxRecompiler.c index 250c6ba1f..3a932dfff 100644 --- a/src/recompiler/VBoxRecompiler.c +++ b/src/recompiler/VBoxRecompiler.c @@ -1,4 +1,4 @@ -/* $Id: VBoxRecompiler.c 16128 2009-01-21 11:15:09Z vboxsync $ */ +/* $Id: VBoxRecompiler.c $ */ /** @file * VBox Recompiler - QEMU. */ diff --git a/src/recompiler_new/Makefile.kmk b/src/recompiler_new/Makefile.kmk index c9e2fe412..162ecf4b0 100644 --- a/src/recompiler_new/Makefile.kmk +++ b/src/recompiler_new/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 16059 2009-01-19 19:38:17Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # The Recompiler Sub-Makefile. # diff --git a/src/recompiler_new/Sun/config-host.h b/src/recompiler_new/Sun/config-host.h index 693cb2dbe..d58c05375 100644 --- a/src/recompiler_new/Sun/config-host.h +++ b/src/recompiler_new/Sun/config-host.h @@ -1,4 +1,4 @@ -/* $Id: config-host.h 13731 2008-11-01 19:39:12Z vboxsync $ */ +/* $Id: config-host.h $ */ /** @file * Sun host config - maintained by hand */ diff --git a/src/recompiler_new/Sun/config.h b/src/recompiler_new/Sun/config.h index f80c7657f..d4cc3d490 100644 --- a/src/recompiler_new/Sun/config.h +++ b/src/recompiler_new/Sun/config.h @@ -1,4 +1,4 @@ -/* $Id: config.h 15278 2008-12-10 19:22:20Z vboxsync $ */ +/* $Id: config.h $ */ /** @file * Sun config - Maintained by hand */ diff --git a/src/recompiler_new/Sun/crt/stdio.h b/src/recompiler_new/Sun/crt/stdio.h index 261e48c11..b3e6cdd1b 100644 --- a/src/recompiler_new/Sun/crt/stdio.h +++ b/src/recompiler_new/Sun/crt/stdio.h @@ -1,4 +1,4 @@ -/* $Id: stdio.h 16056 2009-01-19 19:19:02Z vboxsync $ */ +/* $Id: stdio.h $ */ /** @file * Our minimal stdio */ diff --git a/src/recompiler_new/Sun/deftoimp.sed b/src/recompiler_new/Sun/deftoimp.sed index aa0d7bd32..51b5850d1 100644 --- a/src/recompiler_new/Sun/deftoimp.sed +++ b/src/recompiler_new/Sun/deftoimp.sed @@ -1,4 +1,4 @@ -# $Id: deftoimp.sed 8155 2008-04-18 15:16:47Z vboxsync $ +# $Id: deftoimp.sed $ ## @file # SED script for generating a dummy .so from a windows .def file. # diff --git a/src/recompiler_new/Sun/testmath.c b/src/recompiler_new/Sun/testmath.c index cf22e3e9a..f32bdbf42 100644 --- a/src/recompiler_new/Sun/testmath.c +++ b/src/recompiler_new/Sun/testmath.c @@ -1,4 +1,4 @@ -/* $Id: testmath.c 14916 2008-12-02 15:41:18Z vboxsync $ */
+/* $Id: testmath.c $ */
/** @file
* Testcase for the no-crt math stuff.
*/
diff --git a/src/recompiler_new/VBoxREM.def b/src/recompiler_new/VBoxREM.def index 6b4ea5803..7701fc5be 100644 --- a/src/recompiler_new/VBoxREM.def +++ b/src/recompiler_new/VBoxREM.def @@ -1,4 +1,4 @@ -; $Id: VBoxREM.def 8155 2008-04-18 15:16:47Z vboxsync $ +; $Id: VBoxREM.def $ ;; @file ; ; VBoxREM Definition File. diff --git a/src/recompiler_new/VBoxREMWrapper.cpp b/src/recompiler_new/VBoxREMWrapper.cpp index 1685caf37..e98c8c78e 100644 --- a/src/recompiler_new/VBoxREMWrapper.cpp +++ b/src/recompiler_new/VBoxREMWrapper.cpp @@ -1,4 +1,4 @@ -/* $Id: VBoxREMWrapper.cpp 15764 2008-12-26 11:03:42Z vboxsync $ */ +/* $Id: VBoxREMWrapper.cpp $ */ /** @file * * VBoxREM Win64 DLL Wrapper. diff --git a/src/recompiler_new/VBoxREMWrapperA.asm b/src/recompiler_new/VBoxREMWrapperA.asm index d535987e7..d1e3d8327 100644 --- a/src/recompiler_new/VBoxREMWrapperA.asm +++ b/src/recompiler_new/VBoxREMWrapperA.asm @@ -1,4 +1,4 @@ -; $Id: VBoxREMWrapperA.asm 13456 2008-10-21 16:55:48Z vboxsync $
+; $Id: VBoxREMWrapperA.asm $
;; @file
;
; VBoxREM Wrapper, Assembly routines and wrapper Templates.
diff --git a/src/recompiler_new/VBoxRecompiler.c b/src/recompiler_new/VBoxRecompiler.c index 3bba076be..c4be2ba3e 100644 --- a/src/recompiler_new/VBoxRecompiler.c +++ b/src/recompiler_new/VBoxRecompiler.c @@ -1,4 +1,4 @@ -/* $Id: VBoxRecompiler.c 16135 2009-01-21 13:13:47Z vboxsync $ */ +/* $Id: VBoxRecompiler.c $ */ /** @file * VBox Recompiler - QEMU. */ @@ -1815,7 +1815,7 @@ REMR3DECL(int) REMR3State(PVM pVM) CPUMGetGuestCpuId(pVM, 0x80000001, &u32Dummy, &u32Dummy, &u32Dummy, &pVM->rem.s.Env.cpuid_ext2_features); } - /* Sync FPU state after CR4 and CPUID. */ + /* Sync FPU state after CR4, CPUID and EFER (!). */ if (fFlags & CPUM_CHANGED_FPU_REM) save_raw_fp_state(&pVM->rem.s.Env, (uint8_t *)&pCtx->fpu); /* 'save' is an excellent name. */ } diff --git a/src/recompiler_new/target-i386/op_helper.c b/src/recompiler_new/target-i386/op_helper.c index 6458beea1..e8aeaf20e 100644 --- a/src/recompiler_new/target-i386/op_helper.c +++ b/src/recompiler_new/target-i386/op_helper.c @@ -5692,7 +5692,7 @@ void sync_seg(CPUX86State *env1, int seg_reg, int selector) e2);
}
else
- tss_load_seg(seg_reg, selector);
+ helper_load_seg(seg_reg, selector);
env = savedenv;
/* Successful sync. */
@@ -5982,7 +5982,7 @@ void restore_raw_fp_state(CPUX86State *env, uint8_t *ptr) int fpus, fptag, i, nb_xmm_regs;
CPU86_LDouble tmp;
uint8_t *addr;
- int data64 = !!(env->hflags & HF_CS64_MASK);
+ int data64 = !!(env->hflags & HF_LMA_MASK);
if (env->cpuid_features & CPUID_FXSR)
{
@@ -6060,7 +6060,7 @@ void save_raw_fp_state(CPUX86State *env, uint8_t *ptr) int i, fpus, fptag, nb_xmm_regs;
CPU86_LDouble tmp;
uint8_t *addr;
- int data64 = !!(env->hflags & HF_CS64_MASK);
+ int data64 = !!(env->hflags & HF_LMA_MASK); /* don't use HF_CS64_MASK here as cs hasn't been synced when this function is called. */
if (env->cpuid_features & CPUID_FXSR)
{
diff --git a/src/testcase/Makefile.kmk b/src/testcase/Makefile.kmk index f8fc9c4d6..c75a9d526 100644 --- a/src/testcase/Makefile.kmk +++ b/src/testcase/Makefile.kmk @@ -1,4 +1,4 @@ -# $Id: Makefile.kmk 11805 2008-08-29 10:17:27Z vboxsync $ +# $Id: Makefile.kmk $ ## @file # Sub-Makefile for misc testcases. # diff --git a/src/testcase/tstRunTestcases.cpp b/src/testcase/tstRunTestcases.cpp index 7ca7b1818..17d6e08a8 100644 --- a/src/testcase/tstRunTestcases.cpp +++ b/src/testcase/tstRunTestcases.cpp @@ -1,4 +1,4 @@ -/* $Id: tstRunTestcases.cpp 14831 2008-11-30 10:31:16Z vboxsync $ */ +/* $Id: tstRunTestcases.cpp $ */ /** @file * tstRunTescases - Driver program for running VBox testcase (tst* testcase/tst*). */ |