diff options
| author | Felix Geyer <fgeyer@debian.org> | 2013-03-02 22:29:33 +0100 |
|---|---|---|
| committer | Felix Geyer <fgeyer@debian.org> | 2013-03-02 22:29:33 +0100 |
| commit | fb32dd2be67519662e93ffbbe520c79d95b1fbfb (patch) | |
| tree | e445911bff35c842af26b5e5c0ee31573be49008 | |
| parent | 490244144bf10ecd165f2f81f2c88b7781c91d85 (diff) | |
| download | virtualbox-upstream/4.2.8-dfsg.tar.gz | |
Imported Upstream version 4.2.8-dfsgupstream/4.2.8-dfsg
2126 files changed, 9174 insertions, 5356 deletions
diff --git a/.scm-settings b/.scm-settings index 3ac072d88..489e99109 100644 --- a/.scm-settings +++ b/.scm-settings @@ -10,7 +10,7 @@ # # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/Config.kmk b/Config.kmk index cc1ec64b3..6c6e8070d 100644 --- a/Config.kmk +++ b/Config.kmk @@ -7,7 +7,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -196,7 +196,7 @@ VBOX_VERSION_MINOR = 2 # This is the current build number. It should be increased every time we publish a # new build. The define is available in every source file. Only even build numbers # will be published, odd numbers are set during development. -VBOX_VERSION_BUILD = 6 +VBOX_VERSION_BUILD = 8 # The raw version string. This *must not* contain any other information/fields than # major, minor and build revision (as it is now) -- also will be used for host/guest version # comparison. @@ -416,6 +416,8 @@ else ifdef VBOX_WITH_VDMA endif # Disable the Intel PXE ROM (uses Etherboot). VBOX_WITH_INTEL_PXE = +# not yet! +VBOX_WITHOUT_IPXE=1 # Enable EFI support VBOX_WITH_EFI = 1 # Enable EFI/Ovmf support @@ -476,6 +478,8 @@ if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win) endif # Emulated USB smart card reader VBOX_WITH_USB_CARDREADER = 1 +# Emulated USB webcam +VBOX_WITH_USB_VIDEO = 1 ## @} @@ -1012,6 +1016,7 @@ ifdef VBOX_OSE VBOX_WITH_DOCS_TRANSLATIONS=1 VBOX_WITH_TESTSUITE= VBOX_WITH_INTEL_PXE= + VBOX_WITH_DEVMAPPER= ## @todo remove once the iPXE code is in public tree VBOX_WITHOUT_IPXE=1 VBOX_WITH_FFMPEG= @@ -5196,7 +5201,7 @@ endif SVN ?= svn$(HOSTSUFF_EXE) VBOX_SVN_REV_KMK = $(PATH_OUT)/revision.kmk ifndef VBOX_SVN_REV - VBOX_SVN_REV_FALLBACK := $(patsubst %:,, $Rev: 82870 $ ) + VBOX_SVN_REV_FALLBACK := $(patsubst %:,, $Rev: 83876 $ ) VBOX_SVN_DEP := $(wildcard $(PATH_ROOT)/.svn/entries) ifeq ($(which $(SVN)),) VBOX_SVN_DEP := @@ -5341,4 +5346,4 @@ st stat status: quick: $(MAKE) VBOX_QUICK=1 - + diff --git a/Makefile.kmk b/Makefile.kmk index bbd985602..1abbd6925 100644 --- a/Makefile.kmk +++ b/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -934,7 +934,10 @@ ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64) + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.amd64) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 else $(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 additions) - $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1" + ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING + ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) 'echo $@ && dchroot -c ubuntu-11.10-amd64 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux2.amd64/$(KBUILD_TYPE) VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter"' + endif + $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.amd64) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)" $(call VBOX_BLD_VM_MSG_END__,Linux/amd64 additions) endif @@ -944,7 +947,10 @@ ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86) + $(VBOX_KMK_TIME) $(KMK) $(VBOX_ADDITIONS_BUILD.x86) packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 else $(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 additions) - $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1" + ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING + ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) 'echo $@ && dchroot -c ubuntu-11.10-i386 "cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && BUILD_PLATFORM_ARCH=x86 tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) PATH_OUT=/mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME)/out/linux2.x86/$(KBUILD_TYPE) VBOX_WITH_LIGHTDM_GREETER=1 vbox-greeter"' + endif + $(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_ADDITIONS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_ADDITIONS_BUILD.x86) all packing VBOX_WITHOUT_LINUX_GUEST_PACKAGE=1 VBOX_WITH_LIGHTDM_GREETER_PACKING=$(VBOX_WITH_LIGHTDM_GREETER_PACKING)" $(call VBOX_BLD_VM_MSG_END__,Linux/x86 additions) endif @@ -3,7 +3,7 @@ # libraries VBox OSE depends on. # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -43,7 +43,7 @@ which_wrapper() fi } -OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr [:upper:] [:lower:]` +OS=`uname -s | sed -e 's/GNU\/Linux/Linux/g' | tr '[:upper:]' '[:lower:]'` case "$OS" in linux) ;; diff --git a/doc/VBox-CodingGuidelines.cpp b/doc/VBox-CodingGuidelines.cpp index a7117af79..d5d04b4b3 100644 --- a/doc/VBox-CodingGuidelines.cpp +++ b/doc/VBox-CodingGuidelines.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/doc/VBox-MakefileGuidelines.cpp b/doc/VBox-MakefileGuidelines.cpp index 9692ed919..1e6e67487 100644 --- a/doc/VBox-MakefileGuidelines.cpp +++ b/doc/VBox-MakefileGuidelines.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/doc/manual/en_US/user_AdvancedTopics.xml b/doc/manual/en_US/user_AdvancedTopics.xml index 9b935f349..2dfe64fbd 100644 --- a/doc/manual/en_US/user_AdvancedTopics.xml +++ b/doc/manual/en_US/user_AdvancedTopics.xml @@ -252,6 +252,10 @@ HKEY_CLASSES_ROOT\CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32</s guest logons on platforms which support this framework. Virtually all modern Linux/Unix distributions rely on PAM.</para> + <para>For automated logons on Ubuntu (or Ubuntu-derived) distributions + using LightDM as the display manager, please see + <xref linkend="autologon_unix_lightdm" />.</para> + <para>The <computeroutput>pam_vbox.so</computeroutput> module itself <emphasis role="bold">does not</emphasis> do an actual verification of the credentials passed to the guest OS; instead it relies on other @@ -405,6 +409,124 @@ HKEY_CLASSES_ROOT\CLSID\{275D3BCC-22BB-4948-A7F6-3A3054EBA92B}\InprocServer32</s Consult the appropriate syslog file for more information and use the <computeroutput>debug</computeroutput> option.</para> </note></para> + + <sect3 id="autologon_unix_lightdm"> + <title>VirtualBox Greeter for Ubuntu / LightDM</title> + + <para>Starting with version 4.2.6, VirtualBox comes with an own greeter + module named vbox-greeter which can be used with LightDM 1.0.1 or later. + LightDM is the default display manager since Ubuntu 10.11 and therefore + also can be used for automated guest logons.</para> + + <para>vbox-greeter does not need the pam_vbox module described above + in order to function -- it comes with its own authentication mechanism + provided by LightDM. However, to provide maximum of flexibility both + modules can be used together on the same guest.</para> + + <para>As for the pam_vbox module, vbox-greeter is shipped as part of + the Guest Additions but it is not installed and/or activated on the + guest OS by default For installing vbox-greeter automatically upon + Guest Additions installation, use the + <computeroutput>--with-autologon</computeroutput> switch when starting + the VBoxLinuxAdditions.run file:<screen> + # ./VBoxLinuxAdditions.run -- --with-autologon</screen></para> + + <para>For manual or postponed installation, the + <computeroutput>vbox-greeter.desktop</computeroutput> + file has to be copied from + <computeroutput>/opt/VBoxGuestAdditions-<version>/shared/VBoxGuestAdditions/</computeroutput> + to the <computeroutput>xgreeters</computeroutput> directory, usually + <computeroutput>/usr/share/xgreeters/</computeroutput>. + Please refer to your guest OS documentation for the correct LightDM + greeter directory.</para> + + <para>The vbox-greeter module itself already was installed by the + VirtualBox Guest Additions installer and resides in + <computeroutput>/usr/sbin/</computeroutput>. To enable vbox-greeter as + the standard greeter module, the file + <computeroutput>/etc/lightdm/lightdm.conf</computeroutput> needs to be + edited:</para> + + <para><screen> + [SeatDefaults] + greeter-session=vbox-greeter</screen></para> + + <note><para>The LightDM server needs to be fully restarted in order to + get vbox-greeter used as the default greeter. As root, do a + <computeroutput>service lightdm --full-restart</computeroutput> on + Ubuntu, or simply restart the guest.</para></note> + + <note><para>vbox-greeter is independent of the graphical session chosen + by the user (like Gnome, KDE, Unity etc). However it requires FLTK 1.3 + for representing its user interface.</para></note> + + <para>In addition to the guest property values of the + pam_vbox module listed above, vbox-greeter has the following guest + properties for further customizing its user interface, residing all in + <computeroutput>/VirtualBox/GuestAdd/Greeter/</computeroutput>:</para> + + <orderedlist> + <listitem> + <para><computeroutput>HideRestart</computeroutput>: Set to "1" if + vbox-greeter should hide the button to restart the guest. This + property must be set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>HideShutdown</computeroutput>: Set to "1" if + vbox-greeter should hide the button to shutdown the guest. This + property must be set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>BannerPath</computeroutput>: Path to a .PNG + file for using it as a banner on the top. The image size must be + 460 x 90 pixels, any bit depth. This property must be + set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>UseTheming</computeroutput>: Set to "1" for + turning on the following theming options. This property must be + set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>Theme/BackgroundColor</computeroutput>: + Hexadecimal RRGGBB color for the background. This property must be + set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>Theme/LogonDialog/HeaderColor</computeroutput>: + Hexadecimal RRGGBB foreground color for the header text. This + property must be set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>Theme/LogonDialog/BackgroundColor</computeroutput>: + Hexadecimal RRGGBB color for the logon dialog background. This + property must be set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + + <listitem> + <para><computeroutput>Theme/LogonDialog/ButtonColor</computeroutput>: + Hexadecimal RRGGBB background color for the logon dialog button. This + property must be set read-only for the guest + (<computeroutput>RDONLYGUEST</computeroutput>).</para> + </listitem> + </orderedlist> + + <note><para>The same restrictions for the guest properties above apply + as for the ones specified in the pam_vbox section.</para></note> + </sect3> </sect2> </sect1> diff --git a/doc/manual/en_US/user_Frontends.xml b/doc/manual/en_US/user_Frontends.xml index 09c0e8cf1..1a59786da 100644 --- a/doc/manual/en_US/user_Frontends.xml +++ b/doc/manual/en_US/user_Frontends.xml @@ -126,10 +126,10 @@ <listitem> <para>If you run the KDE desktop, you might prefer <computeroutput>krdc</computeroutput>, the KDE RDP viewer. The - command line would look like this:<screen>krdc --window --high-quality rdp:/1.2.3.4[:3389]</screen></para> + command line would look like this:<screen>krdc rdp://1.2.3.4[:3389]</screen></para> <para>Again, replace "1.2.3.4" with the host IP address, and 3389 - with a different port if necessary. The "rdp:/" bit is required + with a different port if necessary. The "rdp://" bit is required with krdc to switch it into RDP mode.</para> </listitem> diff --git a/doc/manual/en_US/user_KnownIssues.xml b/doc/manual/en_US/user_KnownIssues.xml index da7a4d01d..594cc7d83 100644 --- a/doc/manual/en_US/user_KnownIssues.xml +++ b/doc/manual/en_US/user_KnownIssues.xml @@ -80,6 +80,13 @@ experience this, do not attempt to execute 64-bit guests. Refer to the VirtualBox user forum for additional information.</para> </listitem> + + <listitem> + <para><emphasis role="bold">NX (no execute, data execution + prevention)</emphasis> only works for guests running on 64-bit hosts + or guests running on 32-bit hosts with PAE enabled and requires that + hardware virtualization be enabled.</para> + </listitem> <listitem> <para>For <emphasis role="bold">basic Direct3D support in Windows diff --git a/doc/manual/user_ChangeLogImpl.xml b/doc/manual/user_ChangeLogImpl.xml index 5bbb3a033..d08e001f4 100644 --- a/doc/manual/user_ChangeLogImpl.xml +++ b/doc/manual/user_ChangeLogImpl.xml @@ -1,6 +1,174 @@ <?xml version="1.0" encoding="UTF-8"?> <sect1> + <title>Version 4.2.8 (2013-02-20)</title> + + <para>This is a maintenance release. The following items were fixed and/or + added:</para> + + <itemizedlist> + + <listitem> + <para>VMM: fixed guest crash with huge amount of guest RAM on + VT-x hosts (bug #11306)</para> + </listitem> + + <listitem> + <para>GUI: fixed a layout bug in the Mac OS X clone VM dialog + (bug #10982)</para> + </listitem> + + <listitem> + <para>GUI: not all the translation tags were taken into account + during the language switch (bug #11342)</para> + </listitem> + + <listitem> + <para>GUI: take-guest-screenshot dialog sometimes had no keyboard + input available on Windows host</para> + </listitem> + + <listitem> + <para>Main/Machine: fix generation of spurious event for inaccessible + VMs which triggered an endless event generation loop in cooperation + with the GUI which became unresponsive (4.2.6 regression, bug + #11323)</para> + </listitem> + + <listitem> + <para>Main/Display: fix for an access violation under certain + conditions in multi-monitor configurations (bug #10539)</para> + </listitem> + + <listitem> + <para>Main/Metrics: network metrics are now collected for + active (up) interfaces only, the state of an interface being evaluated + when the associated metric is enabled via setupMetrics</para> + </listitem> + + <listitem> + <para>Snapshots: reduce the time for merging snapshots under + certain conditions</para> + </listitem> + + <listitem> + <para>Storage: fixed data corruption after resizing a VDI image under + certain circumstances (bug #11344)</para> + </listitem> + + <listitem> + <para>Storage: fixed non working online merging of snapshots + (4.2.6 regression, bug #11359)</para> + </listitem> + + <listitem> + <para>Storage: fixed crash when connecting to certain QNAP iSCSI + targets</para> + </listitem> + + <listitem> + <para>Storage: fixed incompatibility of VHD differencing images with + Hyper-V (bug #5990)</para> + </listitem> + + <listitem> + <para>Bridged Networking: fixed TCP pseudo header checksum computation + for IPv6 (bug #9380)</para> + </listitem> + + <listitem> + <para>3D support: fix Battlefield 1942 game crashes (bug #11369)</para> + </listitem> + + <listitem> + <para>Settings: really sanitise the name of VM folders and settings + file, the code was disabled before (bug #10549)</para> + </listitem> + + <listitem> + <para>Settings: allow to change VRDE settings for saved VMs</para> + </listitem> + + <listitem> + <para>VBoxManage: don't crash during <emphasis>screenshotpng</emphasis> + if there is no display (bug #11363)</para> + </listitem> + + <listitem> + <para>Linux hosts: work around gcc bug 55940 which might lead to wrong + kernel module code if gcc 4.7 is used to compile the 32-bit Linux + host kernel (bug #11035)</para> + </listitem> + + <listitem> + <para>Linux hosts: fixed inconsistent lock state and deadlock warnings on module + load and VM startup when CONFIG_PROVE_LOCKING is enabled (bug #11318)</para> + </listitem> + + <listitem> + <para>Linux hosts: made "]" key work again on Japanese keyboards</para> + </listitem> + + <listitem> + <para>Mac OS X hosts: don't crash the kernel during dtrace if the VBox + kernel extensions are loaded (10.6 hosts only; bug #11273)</para> + </listitem> + + <listitem> + <para>Solaris / Mac OS X hosts: machine CPU load metrics now report 100% + when all cores are fully utilized (used to be a single core)</para> + </listitem> + + <listitem> + <para>Solaris 11 host installer: wait for any services left over from + a previous installation to be terminated to avoid confusing SMF. + </para> + </listitem> + + <listitem> + <para>Guest Additions: don't block signals for processes executed + via guest control</para> + </listitem> + + <listitem> + <para>Guest Additions: fixed a small memory leak in VBoxService + (bug #10970)</para> + </listitem> + + <listitem> + <para>Windows Additions: fixed shared folder issue with + large reads/writes on 64 bit Windows guests (bug #11115)</para> + </listitem> + + <listitem> + <para>Linux Additions: added auto-logon support for Linux guests using + LightDM as the display manager</para> + </listitem> + + <listitem> + <para>Linux Additions: Linux 3.8 compile fixes (bug #11036)</para> + </listitem> + + <listitem> + <para>X11 Additions: fixed blocked SIGALRM in 3D desktop sessions + (bug #10987)</para> + </listitem> + + <listitem> + <para>X11 Additions: fixed an unresolved reference in vboxvideo_drv + for X.org 6.8 guests and before (e.g. RHEL4; 4.2.0 regression)</para> + </listitem> + + <listitem> + <para>X11 Additions: fixed screen automatic resizing for guests with + X.org 1.3 or older (4.2.0 regression)</para> + </listitem> + + </itemizedlist> + + </sect1> + + <sect1> <title>Version 4.2.6 (2012-12-19)</title> <para>This is a maintenance release. The following items were fixed and/or @@ -36,7 +204,7 @@ <listitem> <para>GUI: several minor fixes, including palette fixes (bug #11191)</para> </listitem> - + <listitem> <para>GUI: fixed Windows 2012 OS type (bug #11206)</para> </listitem> @@ -177,7 +345,7 @@ <para>Solaris hosts: added a dependency to ensure that the user directories are reachable when starting VBox services</para> </listitem> - + <listitem> <para>Windows host installer: integrated user-contributed translations, thanks to all contributors!</para> @@ -191,9 +359,9 @@ <para>Windows Additions: don't fail if the shared folders host service is not available</para> </listitem> - + <listitem> - <para>Windows Additions: fixed Guest Additions startup on Windows 2000 + <para>Windows Additions: fixed Guest Additions startup on Windows 2000 guests (bug #11253)</para> </listitem> diff --git a/doc/manual/xidl2docbook.xsl b/doc/manual/xidl2docbook.xsl index 12ea93990..97c537414 100644 --- a/doc/manual/xidl2docbook.xsl +++ b/doc/manual/xidl2docbook.xsl @@ -5,7 +5,7 @@ XSLT stylesheet that generates docbook from VirtualBox.xidl. - Copyright (C) 2006-2008 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/DevPCNet.h b/include/VBox/DevPCNet.h index 52e357ad2..1729b378b 100644 --- a/include/VBox/DevPCNet.h +++ b/include/VBox/DevPCNet.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HGSMI/HGSMI.h b/include/VBox/HGSMI/HGSMI.h index 352487d9c..c34f190cf 100644 --- a/include/VBox/HGSMI/HGSMI.h +++ b/include/VBox/HGSMI/HGSMI.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HGSMI/HGSMIChSetup.h b/include/VBox/HGSMI/HGSMIChSetup.h index 5f1165105..79cab8ddc 100644 --- a/include/VBox/HGSMI/HGSMIChSetup.h +++ b/include/VBox/HGSMI/HGSMIChSetup.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HGSMI/HGSMIChannels.h b/include/VBox/HGSMI/HGSMIChannels.h index 3b5bd6dbf..cde3430de 100644 --- a/include/VBox/HGSMI/HGSMIChannels.h +++ b/include/VBox/HGSMI/HGSMIChannels.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/Hardware/VBoxVideoVBE.h b/include/VBox/Hardware/VBoxVideoVBE.h index 6d5d1ab7f..dc61d45de 100644 --- a/include/VBox/Hardware/VBoxVideoVBE.h +++ b/include/VBox/Hardware/VBoxVideoVBE.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/GuestPropertySvc.h b/include/VBox/HostServices/GuestPropertySvc.h index 7e99d2ece..baa54c82c 100644 --- a/include/VBox/HostServices/GuestPropertySvc.h +++ b/include/VBox/HostServices/GuestPropertySvc.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/Service.h b/include/VBox/HostServices/Service.h index 98e227a26..b82a04f91 100644 --- a/include/VBox/HostServices/Service.h +++ b/include/VBox/HostServices/Service.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/VBoxClipboardExt.h b/include/VBox/HostServices/VBoxClipboardExt.h index a1392ec00..b9d52dbb9 100644 --- a/include/VBox/HostServices/VBoxClipboardExt.h +++ b/include/VBox/HostServices/VBoxClipboardExt.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/VBoxClipboardSvc.h b/include/VBox/HostServices/VBoxClipboardSvc.h index 0bb5607c8..692121bde 100644 --- a/include/VBox/HostServices/VBoxClipboardSvc.h +++ b/include/VBox/HostServices/VBoxClipboardSvc.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/VBoxCrOpenGLSvc.h b/include/VBox/HostServices/VBoxCrOpenGLSvc.h index 150faac72..bf8bcbb22 100644 --- a/include/VBox/HostServices/VBoxCrOpenGLSvc.h +++ b/include/VBox/HostServices/VBoxCrOpenGLSvc.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/HostServices/VBoxHostChannel.h b/include/VBox/HostServices/VBoxHostChannel.h index d98bc1c79..bf3c14348 100644 --- a/include/VBox/HostServices/VBoxHostChannel.h +++ b/include/VBox/HostServices/VBoxHostChannel.h @@ -1,5 +1,5 @@ /** @file - * + * * Host Channel: the service definition. */ diff --git a/include/VBox/HostServices/VBoxOGLOp.h b/include/VBox/HostServices/VBoxOGLOp.h index d125c2547..02c802890 100644 --- a/include/VBox/HostServices/VBoxOGLOp.h +++ b/include/VBox/HostServices/VBoxOGLOp.h @@ -4,7 +4,7 @@ /* * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/RemoteDesktop/VRDEVideoIn.h b/include/VBox/RemoteDesktop/VRDEVideoIn.h new file mode 100644 index 000000000..c13dd2cca --- /dev/null +++ b/include/VBox/RemoteDesktop/VRDEVideoIn.h @@ -0,0 +1,972 @@ +/** @file + * VBox Remote Desktop Extension (VRDE) - Video Input interface. + */ + +/* + * Copyright (C) 2012-2013 Oracle Corporation + * + * Oracle Corporation confidential + * All rights reserved + */ + +#ifndef ___VBox_RemoteDesktop_VRDEVideoIn_h +#define ___VBox_RemoteDesktop_VRDEVideoIn_h + + +/* Define VRDE_VIDEOIN_WITH_VRDEINTERFACE to include the server VRDE interface parts. */ + +#ifdef VRDE_VIDEOIN_WITH_VRDEINTERFACE +#include <VBox/RemoteDesktop/VRDE.h> +#endif /* VRDE_VIDEOIN_WITH_VRDEINTERFACE */ + +#ifdef AssertCompileSize +#define ASSERTSIZE(type, size) AssertCompileSize(type, size); +#else +#define ASSERTSIZE(type, size) +#endif /* AssertCompileSize */ + + +/* + * Interface for accessing a video camera device on the client. + * + * Async callbacks are used for providing feedback, reporting errors, etc. + * + * Initial version supports: Camera + Processing Unit + Streaming Control. + * + * There are 2 modes: + * 1) The virtual WebCam is already attached to the guest. + * 2) The virtual WebCam will be attached when the client has it. + * + * Initially the mode 1 is supported. + * + * Mode 1 details: + * The WebCam has some fixed functionality, according to the descriptors, + * which has been already read by the guest. So some of functions will + * not work if the client does not support them. + * + * Mode 2 details: + * Virtual WebCam descriptors are built from the client capabilities. + * + * Similarly to the smartcard, the server will inform the ConsoleVRDE that there is a WebCam. + * ConsoleVRDE creates a VRDEVIDEOIN handle and forwards virtual WebCam requests to it. + * + * Interface with VBox. + * + * Virtual WebCam ConsoleVRDE VRDE + * + * Negotiate <-> + * <- VideoInDeviceNotify(Attached, DeviceId) + * -> GetDeviceDesc + * <- DeviceDesc + * 2 <- CreateCamera + * 2 CameraCreated -> + * + * CameraRequest -> Request -> + * Response <- <- Response <- Response + * Frame <- <- Frame <- Frame + * <- VideoInDeviceNotify(Detached, DeviceId) + * + * Unsupported requests fail. + * The Device Description received from the client may be used to validate WebCam requests + * in the ConsoleVRDE code, for example filter out unsupported requests. + * + */ + +/* All structures in this file are packed. + * Everything is little-endian. + */ +#pragma pack(1) + +/* + * The interface supports generic video input descriptors, capabilities and controls: + * * Descriptors + * + Interface + * - Input, Camera Terminal + * - Processing Unit + * + Video Streaming + * - Input Header + * - Payload Format + * - Video Frame + * - Still Image Frame + * * Video Control requests + * + Interface + * - Power Mode + * + Unit and Terminal + * camera + * - Scanning Mode (interlaced, progressive) + * - Auto-Exposure Mode + * - Auto-Exposure Priority + * - Exposure Time Absolute, Relative + * - Focus Absolute, Relative, Auto + * - Iris Absolute, Relative + * - Zoom Absolute, Relative + * - PanTilt Absolute, Relative + * - Roll Absolute, Relative + * - Privacy + * processing + * - Backlight Compensation + * - Brightness + * - Contrast + * - Gain + * - Power Line Frequency + * - Hue Manual, Auto + * - Saturation + * - Sharpness + * - Gamma + * - White Balance Temperature Manual, Auto + * - White Balance Component Manual, Auto + * - Digital Multiplier + * - Digital Multiplier Limit + * * Video Streaming requests + * + Interface + * - Synch Delay + * - Still Image Trigger + * - Generate Key Frame + * - Update Frame Segment + * - Stream Error Code + * + * + * Notes: + * * still capture uses a method similar to method 2, because the still frame will + * be send instead of video over the channel. + * Also the method 2 can be in principle emulated by both 1 and 3 on the client. + * However the client can initiate a still frame transfer, similar to hardware button trigger. + * * all control changes are async. + * * probe/commit are not used. The server can select a supported format/frame from the list. + * * no color matching. sRGB is the default. + * * most of constants are the same as in USB Video Class spec, but they are not the same and + * should be always converted. + */ + +/* + * The DEVICEDEC describes the device and provides a list of supported formats: + * VRDEVIDEOINDEVICEDESC + * VRDEVIDEOINFORMATDESC[0]; + * VRDEVIDEOINFRAMEDESC[0..N-1] + * VRDEVIDEOINFORMATDESC[1]; + * VRDEVIDEOINFRAMEDESC[0..M-1] + * ... + */ + +typedef struct VRDEVIDEOINDEVICEDESC +{ + uint16_t u16ObjectiveFocalLengthMin; + uint16_t u16ObjectiveFocalLengthMax; + uint16_t u16OcularFocalLength; + uint16_t u16MaxMultiplier; + uint32_t fu32CameraControls; /* VRDE_VIDEOIN_F_CT_CTRL_* */ + uint32_t fu32ProcessingControls; /* VRDE_VIDEOIN_F_PU_CTRL_* */ + uint8_t fu8DeviceCaps; /* VRDE_VIDEOIN_F_DEV_CAP_* */ + uint8_t u8NumFormats; /* Number of following VRDEVIDEOINFORMATDESC structures. */ + uint16_t cbExt; /* Size of the optional extended description. */ + /* An extended description may follow. */ + /* An array of VRDEVIDEOINFORMATDESC follows. */ +} VRDEVIDEOINDEVICEDESC; + +/* VRDEVIDEOINDEVICEDESC::fu32CameraControls */ +#define VRDE_VIDEOIN_F_CT_CTRL_SCANNING_MODE 0x00000001 /* D0: Scanning Mode */ +#define VRDE_VIDEOIN_F_CT_CTRL_AE_MODE 0x00000002 /* D1: Auto-Exposure Mode */ +#define VRDE_VIDEOIN_F_CT_CTRL_AE_PRIORITY 0x00000004 /* D2: Auto-Exposure Priority */ +#define VRDE_VIDEOIN_F_CT_CTRL_EXPOSURE_TIME_ABSOLUTE 0x00000008 /* D3: Exposure Time (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_EXPOSURE_TIME_RELATIVE 0x00000010 /* D4: Exposure Time (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_FOCUS_ABSOLUTE 0x00000020 /* D5: Focus (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_FOCUS_RELATIVE 0x00000040 /* D6: Focus (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_IRIS_ABSOLUTE 0x00000080 /* D7: Iris (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_IRIS_RELATIVE 0x00000100 /* D8: Iris (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_ZOOM_ABSOLUTE 0x00000200 /* D9: Zoom (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_ZOOM_RELATIVE 0x00000400 /* D10: Zoom (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_PANTILT_ABSOLUTE 0x00000800 /* D11: PanTilt (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_PANTILT_RELATIVE 0x00001000 /* D12: PanTilt (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_ROLL_ABSOLUTE 0x00002000 /* D13: Roll (Absolute) */ +#define VRDE_VIDEOIN_F_CT_CTRL_ROLL_RELATIVE 0x00004000 /* D14: Roll (Relative) */ +#define VRDE_VIDEOIN_F_CT_CTRL_RESERVED1 0x00008000 /* D15: Reserved */ +#define VRDE_VIDEOIN_F_CT_CTRL_RESERVED2 0x00010000 /* D16: Reserved */ +#define VRDE_VIDEOIN_F_CT_CTRL_FOCUS_AUTO 0x00020000 /* D17: Focus, Auto */ +#define VRDE_VIDEOIN_F_CT_CTRL_PRIVACY 0x00040000 /* D18: Privacy */ + +/* VRDEVIDEOINDEVICEDESC::fu32ProcessingControls */ +#define VRDE_VIDEOIN_F_PU_CTRL_BRIGHTNESS 0x00000001 /* D0: Brightness */ +#define VRDE_VIDEOIN_F_PU_CTRL_CONTRAST 0x00000002 /* D1: Contrast */ +#define VRDE_VIDEOIN_F_PU_CTRL_HUE 0x00000004 /* D2: Hue */ +#define VRDE_VIDEOIN_F_PU_CTRL_SATURATION 0x00000008 /* D3: Saturation */ +#define VRDE_VIDEOIN_F_PU_CTRL_SHARPNESS 0x00000010 /* D4: Sharpness */ +#define VRDE_VIDEOIN_F_PU_CTRL_GAMMA 0x00000020 /* D5: Gamma */ +#define VRDE_VIDEOIN_F_PU_CTRL_WHITE_BALANCE_TEMPERATURE 0x00000040 /* D6: White Balance Temperature */ +#define VRDE_VIDEOIN_F_PU_CTRL_WHITE_BALANCE_COMPONENT 0x00000080 /* D7: White Balance Component */ +#define VRDE_VIDEOIN_F_PU_CTRL_BACKLIGHT_COMPENSATION 0x00000100 /* D8: Backlight Compensation */ +#define VRDE_VIDEOIN_F_PU_CTRL_GAIN 0x00000200 /* D9: Gain */ +#define VRDE_VIDEOIN_F_PU_CTRL_POWER_LINE_FREQUENCY 0x00000400 /* D10: Power Line Frequency */ +#define VRDE_VIDEOIN_F_PU_CTRL_HUE_AUTO 0x00000800 /* D11: Hue, Auto */ +#define VRDE_VIDEOIN_F_PU_CTRL_WHITE_BALANCE_TEMPERATURE_AUTO 0x00001000 /* D12: White Balance Temperature, Auto */ +#define VRDE_VIDEOIN_F_PU_CTRL_WHITE_BALANCE_COMPONENT_AUTO 0x00002000 /* D13: White Balance Component, Auto */ +#define VRDE_VIDEOIN_F_PU_CTRL_DIGITAL_MULTIPLIER 0x00004000 /* D14: Digital Multiplier */ +#define VRDE_VIDEOIN_F_PU_CTRL_DIGITAL_MULTIPLIER_LIMIT 0x00008000 /* D15: Digital Multiplier Limit */ + +/* VRDEVIDEOINDEVICEDESC::fu8DeviceCaps */ +#define VRDE_VIDEOIN_F_DEV_CAP_DYNAMICCHANGE 0x01 /* Whether dynamic format change is supported. */ +#define VRDE_VIDEOIN_F_DEV_CAP_TRIGGER 0x02 /* Whether hardware triggering is supported. */ +#define VRDE_VIDEOIN_F_DEV_CAP_TRIGGER_USAGE 0x04 /* 0 - still image, 1 - generic button event.*/ + +/* The video format descriptor. */ +typedef struct VRDEVIDEOINFORMATDESC +{ + uint16_t cbFormat; /* Size of the structure including cbFormat and format specific data. */ + uint8_t u8FormatId; /* The unique identifier of the format on the client. */ + uint8_t u8FormatType; /* MJPEG etc. VRDE_VIDEOIN_FORMAT_* */ + uint8_t u8FormatFlags; /* VRDE_VIDEOIN_F_FMT_* */ + uint8_t u8NumFrames; /* Number of following VRDEVIDEOINFRAMEDESC structures. */ + uint16_t u16Reserved; /* Must be set to 0. */ + /* Other format specific data may follow. */ + /* An array of VRDEVIDEOINFRAMEDESC follows. */ +} VRDEVIDEOINFORMATDESC; + +/* VRDEVIDEOINFORMATDESC::u8FormatType */ +#define VRDE_VIDEOIN_FORMAT_UNCOMPRESSED 0x04 +#define VRDE_VIDEOIN_FORMAT_MJPEG 0x06 +#define VRDE_VIDEOIN_FORMAT_MPEG2TS 0x0A +#define VRDE_VIDEOIN_FORMAT_DV 0x0C +#define VRDE_VIDEOIN_FORMAT_FRAME_BASED 0x10 +#define VRDE_VIDEOIN_FORMAT_STREAM_BASED 0x12 + +/* VRDEVIDEOINFORMATDESC::u8FormatFlags. */ +#define VRDE_VIDEOIN_F_FMT_GENERATEKEYFRAME 0x01 /* Supports Generate Key Frame */ +#define VRDE_VIDEOIN_F_FMT_UPDATEFRAMESEGMENT 0x02 /* Supports Update Frame Segment */ +#define VRDE_VIDEOIN_F_FMT_COPYPROTECT 0x04 /* If duplication should be restricted. */ +#define VRDE_VIDEOIN_F_FMT_COMPQUALITY 0x08 /* If the format supports an adjustable compression quality. */ + +typedef struct VRDEVIDEOINFRAMEDESC +{ + uint16_t cbFrame; /* Size of the structure including cbFrame and frame specific data. */ + uint8_t u8FrameId; /* The unique identifier of the frame for the corresponding format on the client. */ + uint8_t u8FrameFlags; + uint16_t u16Width; + uint16_t u16Height; + uint32_t u32NumFrameIntervals; /* The number of supported frame intervals. */ + uint32_t u32MinFrameInterval; /* Shortest frame interval supported (at highest frame rate), in 100ns units. */ + uint32_t u32MaxFrameInterval; /* Longest frame interval supported (at lowest frame rate), in 100ns units. */ + /* Supported frame intervals (in 100ns units) follow if VRDE_VIDEOIN_F_FRM_DISCRETE_INTERVALS is set. + * uint32_t au32FrameIntervals[u32NumFrameIntervals]; + */ + /* Other frame specific data may follow. */ +} VRDEVIDEOINFRAMEDESC; + +/* VRDEVIDEOINFRAMEDESC::u8FrameFlags. */ +#define VRDE_VIDEOIN_F_FRM_STILL 0x01 /* If still images are supported for this frame. */ +#define VRDE_VIDEOIN_F_FRM_DISCRETE_INTERVALS 0x02 /* If the discrete intervals list is included. */ + +/* + * Controls. + * + * The same structures are used for both SET and GET requests. + * Requests are async. A callback is invoked, when the client returns a reply. + * A control change notification also uses these structures. + * + * If a control request can not be fulfilled, then VRDE_VIDEOIN_CTRLHDR_F_FAIL + * will be set and u8Status contains the error code. This replaces the VC_REQUEST_ERROR_CODE_CONTROL. + */ + +typedef struct VRDEVIDEOINCTRLHDR +{ + uint16_t u16ControlSelector; /* VRDE_VIDEOIN_CTRLSEL_* */ + uint16_t u16RequestType; /* VRDE_VIDEOIN_CTRLREQ_* */ + uint16_t u16ParmSize; /* The size of the control specific parameters. */ + uint8_t u8Flags; /* VRDE_VIDEOIN_CTRLHDR_F_* */ + uint8_t u8Status; /* VRDE_VIDEOIN_CTRLHDR_STATUS_* */ + /* Control specific data follows. */ +} VRDEVIDEOINCTRLHDR; + +/* Control request types: VRDEVIDEOINCTRLHDR::u16RequestType. */ +#define VRDE_VIDEOIN_CTRLREQ_UNDEFINED 0x00 +#define VRDE_VIDEOIN_CTRLREQ_SET_CUR 0x01 +#define VRDE_VIDEOIN_CTRLREQ_GET_CUR 0x81 +#define VRDE_VIDEOIN_CTRLREQ_GET_MIN 0x82 +#define VRDE_VIDEOIN_CTRLREQ_GET_MAX 0x83 +#define VRDE_VIDEOIN_CTRLREQ_GET_RES 0x84 +#define VRDE_VIDEOIN_CTRLREQ_GET_LEN 0x85 +#define VRDE_VIDEOIN_CTRLREQ_GET_INFO 0x86 +#define VRDE_VIDEOIN_CTRLREQ_GET_DEF 0x87 + +/* VRDEVIDEOINCTRLHDR::u8Flags */ +#define VRDE_VIDEOIN_CTRLHDR_F_NOTIFY 0x01 /* Control change notification, the attribute is derived from u16RequestType and F_FAIL. */ +#define VRDE_VIDEOIN_CTRLHDR_F_FAIL 0x02 /* The operation failed. Error code is in u8Status. */ + +/* VRDEVIDEOINCTRLHDR::u8Status if the VRDE_VIDEOIN_CTRLHDR_F_FAIL is set. */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_SUCCESS 0x00 /**/ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_NOTREADY 0x01 /* Not ready */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_WRONGSTATE 0x02 /* Wrong state */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_POWER 0x03 /* Power */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_OUTOFRANGE 0x04 /* Out of range */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_INVALIDUNIT 0x05 /* Invalid unit */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_INVALIDCONTROL 0x06 /* Invalid control */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_INVALIDREQUEST 0x07 /* Invalid Request */ +#define VRDE_VIDEOIN_CTRLHDR_STATUS_UNKNOWN 0xFF /* Unknown */ + +/* Control selectors. 16 bit. High byte is the category. Low byte is the identifier.*/ +#ifdef RT_MAKE_U16 +#define VRDE_VIDEOIN_CTRLSEL_MAKE(Lo, Hi) RT_MAKE_U16(Lo, Hi) +#else +#define VRDE_VIDEOIN_CTRLSEL_MAKE(Lo, Hi) ((uint16_t)( (uint16_t)((uint8_t)(Hi)) << 8 | (uint8_t)(Lo) )) +#endif + +#define VRDE_VIDEOIN_CTRLSEL_VC(a) VRDE_VIDEOIN_CTRLSEL_MAKE(a, 0x01) +#define VRDE_VIDEOIN_CTRLSEL_CT(a) VRDE_VIDEOIN_CTRLSEL_MAKE(a, 0x02) +#define VRDE_VIDEOIN_CTRLSEL_PU(a) VRDE_VIDEOIN_CTRLSEL_MAKE(a, 0x03) +#define VRDE_VIDEOIN_CTRLSEL_VS(a) VRDE_VIDEOIN_CTRLSEL_MAKE(a, 0x04) +#define VRDE_VIDEOIN_CTRLSEL_HW(a) VRDE_VIDEOIN_CTRLSEL_MAKE(a, 0x05) + +#define VRDE_VIDEOIN_CTRLSEL_VC_VIDEO_POWER_MODE_CONTROL VRDE_VIDEOIN_CTRLSEL_VC(0x01) + +#define VRDE_VIDEOIN_CTRLSEL_CT_UNDEFINED VRDE_VIDEOIN_CTRLSEL_CT(0x00) +#define VRDE_VIDEOIN_CTRLSEL_CT_SCANNING_MODE VRDE_VIDEOIN_CTRLSEL_CT(0x01) +#define VRDE_VIDEOIN_CTRLSEL_CT_AE_MODE VRDE_VIDEOIN_CTRLSEL_CT(0x02) +#define VRDE_VIDEOIN_CTRLSEL_CT_AE_PRIORITY VRDE_VIDEOIN_CTRLSEL_CT(0x03) +#define VRDE_VIDEOIN_CTRLSEL_CT_EXPOSURE_TIME_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x04) +#define VRDE_VIDEOIN_CTRLSEL_CT_EXPOSURE_TIME_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x05) +#define VRDE_VIDEOIN_CTRLSEL_CT_FOCUS_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x06) +#define VRDE_VIDEOIN_CTRLSEL_CT_FOCUS_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x07) +#define VRDE_VIDEOIN_CTRLSEL_CT_FOCUS_AUTO VRDE_VIDEOIN_CTRLSEL_CT(0x08) +#define VRDE_VIDEOIN_CTRLSEL_CT_IRIS_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x09) +#define VRDE_VIDEOIN_CTRLSEL_CT_IRIS_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x0A) +#define VRDE_VIDEOIN_CTRLSEL_CT_ZOOM_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x0B) +#define VRDE_VIDEOIN_CTRLSEL_CT_ZOOM_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x0C) +#define VRDE_VIDEOIN_CTRLSEL_CT_PANTILT_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x0D) +#define VRDE_VIDEOIN_CTRLSEL_CT_PANTILT_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x0E) +#define VRDE_VIDEOIN_CTRLSEL_CT_ROLL_ABSOLUTE VRDE_VIDEOIN_CTRLSEL_CT(0x0F) +#define VRDE_VIDEOIN_CTRLSEL_CT_ROLL_RELATIVE VRDE_VIDEOIN_CTRLSEL_CT(0x10) +#define VRDE_VIDEOIN_CTRLSEL_CT_PRIVACY VRDE_VIDEOIN_CTRLSEL_CT(0x11) + +#define VRDE_VIDEOIN_CTRLSEL_PU_UNDEFINED VRDE_VIDEOIN_CTRLSEL_PU(0x00) +#define VRDE_VIDEOIN_CTRLSEL_PU_BACKLIGHT_COMPENSATION VRDE_VIDEOIN_CTRLSEL_PU(0x01) +#define VRDE_VIDEOIN_CTRLSEL_PU_BRIGHTNESS VRDE_VIDEOIN_CTRLSEL_PU(0x02) +#define VRDE_VIDEOIN_CTRLSEL_PU_CONTRAST VRDE_VIDEOIN_CTRLSEL_PU(0x03) +#define VRDE_VIDEOIN_CTRLSEL_PU_GAIN VRDE_VIDEOIN_CTRLSEL_PU(0x04) +#define VRDE_VIDEOIN_CTRLSEL_PU_POWER_LINE_FREQUENCY VRDE_VIDEOIN_CTRLSEL_PU(0x05) +#define VRDE_VIDEOIN_CTRLSEL_PU_HUE VRDE_VIDEOIN_CTRLSEL_PU(0x06) +#define VRDE_VIDEOIN_CTRLSEL_PU_SATURATION VRDE_VIDEOIN_CTRLSEL_PU(0x07) +#define VRDE_VIDEOIN_CTRLSEL_PU_SHARPNESS VRDE_VIDEOIN_CTRLSEL_PU(0x08) +#define VRDE_VIDEOIN_CTRLSEL_PU_GAMMA VRDE_VIDEOIN_CTRLSEL_PU(0x09) +#define VRDE_VIDEOIN_CTRLSEL_PU_WHITE_BALANCE_TEMPERATURE VRDE_VIDEOIN_CTRLSEL_PU(0x0A) +#define VRDE_VIDEOIN_CTRLSEL_PU_WHITE_BALANCE_TEMPERATURE_AUTO VRDE_VIDEOIN_CTRLSEL_PU(0x0B) +#define VRDE_VIDEOIN_CTRLSEL_PU_WHITE_BALANCE_COMPONENT VRDE_VIDEOIN_CTRLSEL_PU(0x0C) +#define VRDE_VIDEOIN_CTRLSEL_PU_WHITE_BALANCE_COMPONENT_AUTO VRDE_VIDEOIN_CTRLSEL_PU(0x0D) +#define VRDE_VIDEOIN_CTRLSEL_PU_DIGITAL_MULTIPLIER VRDE_VIDEOIN_CTRLSEL_PU(0x0E) +#define VRDE_VIDEOIN_CTRLSEL_PU_DIGITAL_MULTIPLIER_LIMIT VRDE_VIDEOIN_CTRLSEL_PU(0x0F) +#define VRDE_VIDEOIN_CTRLSEL_PU_HUE_AUTO VRDE_VIDEOIN_CTRLSEL_PU(0x10) +#define VRDE_VIDEOIN_CTRLSEL_PU_ANALOG_VIDEO_STANDARD VRDE_VIDEOIN_CTRLSEL_PU(0x11) +#define VRDE_VIDEOIN_CTRLSEL_PU_ANALOG_LOCK_STATUS VRDE_VIDEOIN_CTRLSEL_PU(0x12) + +#define VRDE_VIDEOIN_CTRLSEL_VS_UNDEFINED VRDE_VIDEOIN_CTRLSEL_VS(0x00) +#define VRDE_VIDEOIN_CTRLSEL_VS_START VRDE_VIDEOIN_CTRLSEL_VS(0x01) +#define VRDE_VIDEOIN_CTRLSEL_VS_STOP VRDE_VIDEOIN_CTRLSEL_VS(0x02) +#define VRDE_VIDEOIN_CTRLSEL_VS_STILL_IMAGE_TRIGGER VRDE_VIDEOIN_CTRLSEL_VS(0x05) +#define VRDE_VIDEOIN_CTRLSEL_VS_STREAM_ERROR_CODE VRDE_VIDEOIN_CTRLSEL_VS(0x06) +#define VRDE_VIDEOIN_CTRLSEL_VS_GENERATE_KEY_FRAME VRDE_VIDEOIN_CTRLSEL_VS(0x07) +#define VRDE_VIDEOIN_CTRLSEL_VS_UPDATE_FRAME_SEGMENT VRDE_VIDEOIN_CTRLSEL_VS(0x08) +#define VRDE_VIDEOIN_CTRLSEL_VS_SYNCH_DELAY VRDE_VIDEOIN_CTRLSEL_VS(0x09) + +#define VRDE_VIDEOIN_CTRLSEL_HW_BUTTON VRDE_VIDEOIN_CTRLSEL_HW(0x01) + +typedef struct VRDEVIDEOINCTRL_VIDEO_POWER_MODE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8DevicePowerMode; +} VRDEVIDEOINCTRL_VIDEO_POWER_MODE; + +typedef struct VRDEVIDEOINCTRL_CT_SCANNING_MODE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8ScanningMode; +} VRDEVIDEOINCTRL_CT_SCANNING_MODE; + +typedef struct VRDEVIDEOINCTRL_CT_AE_MODE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8AutoExposureMode; +} VRDEVIDEOINCTRL_CT_AE_MODE; + +typedef struct VRDEVIDEOINCTRL_CT_AE_PRIORITY +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8AutoExposurePriority; +} VRDEVIDEOINCTRL_CT_AE_PRIORITY; + +typedef struct VRDEVIDEOINCTRL_CT_EXPOSURE_TIME_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint32_t u32ExposureTimeAbsolute; +} VRDEVIDEOINCTRL_CT_EXPOSURE_TIME_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_EXPOSURE_TIME_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8ExposureTimeRelative; +} VRDEVIDEOINCTRL_CT_EXPOSURE_TIME_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_FOCUS_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16FocusAbsolute; +} VRDEVIDEOINCTRL_CT_FOCUS_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_FOCUS_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8FocusRelative; + uint8_t u8Speed; +} VRDEVIDEOINCTRL_CT_FOCUS_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_FOCUS_AUTO +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8FocusAuto; +} VRDEVIDEOINCTRL_CT_FOCUS_AUTO; + +typedef struct VRDEVIDEOINCTRL_CT_IRIS_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16IrisAbsolute; +} VRDEVIDEOINCTRL_CT_IRIS_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_IRIS_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8IrisRelative; +} VRDEVIDEOINCTRL_CT_IRIS_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_ZOOM_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16ZoomAbsolute; +} VRDEVIDEOINCTRL_CT_ZOOM_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_ZOOM_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8Zoom; + uint8_t u8DigitalZoom; + uint8_t u8Speed; +} VRDEVIDEOINCTRL_CT_ZOOM_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_PANTILT_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint32_t u32PanAbsolute; + uint32_t u32TiltAbsolute; +} VRDEVIDEOINCTRL_CT_PANTILT_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_PANTILT_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8PanRelative; + uint8_t u8PanSpeed; + uint8_t u8TiltRelative; + uint8_t u8TiltSpeed; +} VRDEVIDEOINCTRL_CT_PANTILT_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_ROLL_ABSOLUTE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16RollAbsolute; +} VRDEVIDEOINCTRL_CT_ROLL_ABSOLUTE; + +typedef struct VRDEVIDEOINCTRL_CT_ROLL_RELATIVE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8RollRelative; + uint8_t u8Speed; +} VRDEVIDEOINCTRL_CT_ROLL_RELATIVE; + +typedef struct VRDEVIDEOINCTRL_CT_PRIVACY_MODE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8Privacy; +} VRDEVIDEOINCTRL_CT_PRIVACY_MODE; + +typedef struct VRDEVIDEOINCTRL_PU_BACKLIGHT_COMPENSATION +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16BacklightCompensation; +} VRDEVIDEOINCTRL_PU_BACKLIGHT_COMPENSATION; + +typedef struct VRDEVIDEOINCTRL_PU_BRIGHTNESS +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Brightness; +} VRDEVIDEOINCTRL_PU_BRIGHTNESS; + +typedef struct VRDEVIDEOINCTRL_PU_CONTRAST +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Contrast; +} VRDEVIDEOINCTRL_PU_CONTRAST; + +typedef struct VRDEVIDEOINCTRL_PU_GAIN +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Gain; +} VRDEVIDEOINCTRL_PU_GAIN; + +typedef struct VRDEVIDEOINCTRL_PU_POWER_LINE_FREQUENCY +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16PowerLineFrequency; +} VRDEVIDEOINCTRL_PU_POWER_LINE_FREQUENCY; + +typedef struct VRDEVIDEOINCTRL_PU_HUE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Hue; +} VRDEVIDEOINCTRL_PU_HUE; + +typedef struct VRDEVIDEOINCTRL_PU_HUE_AUTO +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8HueAuto; +} VRDEVIDEOINCTRL_PU_HUE_AUTO; + +typedef struct VRDEVIDEOINCTRL_PU_SATURATION +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Saturation; +} VRDEVIDEOINCTRL_PU_SATURATION; + +typedef struct VRDEVIDEOINCTRL_PU_SHARPNESS +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Sharpness; +} VRDEVIDEOINCTRL_PU_SHARPNESS; + +typedef struct VRDEVIDEOINCTRL_PU_GAMMA +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Gamma; +} VRDEVIDEOINCTRL_PU_GAMMA; + +typedef struct VRDEVIDEOINCTRL_PU_WHITE_BALANCE_TEMPERATURE +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16WhiteBalanceTemperature; +} VRDEVIDEOINCTRL_PU_WHITE_BALANCE_TEMPERATURE; + +typedef struct VRDEVIDEOINCTRL_PU_WHITE_BALANCE_TEMPERATURE_AUTO +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8WhiteBalanceTemperatureAuto; +} VRDEVIDEOINCTRL_PU_WHITE_BALANCE_TEMPERATURE_AUTO; + +typedef struct VRDEVIDEOINCTRL_PU_WHITE_BALANCE_COMPONENT +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16WhiteBalanceBlue; + uint16_t u16WhiteBalanceRed; +} VRDEVIDEOINCTRL_PU_WHITE_BALANCE_COMPONENT; + +typedef struct VRDEVIDEOINCTRL_PU_WHITE_BALANCE_COMPONENT_AUTO +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8WhiteBalanceComponentAuto; +} VRDEVIDEOINCTRL_PU_WHITE_BALANCE_COMPONENT_AUTO; + +typedef struct VRDEVIDEOINCTRL_PU_DIGITAL_MULTIPLIER +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16MultiplierStep; +} VRDEVIDEOINCTRL_PU_DIGITAL_MULTIPLIER; + +typedef struct VRDEVIDEOINCTRL_PU_DIGITAL_MULTIPLIER_LIMIT +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16MultiplierLimit; +} VRDEVIDEOINCTRL_PU_DIGITAL_MULTIPLIER_LIMIT; + +typedef struct VRDEVIDEOINCTRL_PU_ANALOG_VIDEO_STANDARD +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8VideoStandard; +} VRDEVIDEOINCTRL_PU_ANALOG_VIDEO_STANDARD; + +typedef struct VRDEVIDEOINCTRL_PU_ANALOG_LOCK_STATUS +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8Status; +} VRDEVIDEOINCTRL_PU_ANALOG_LOCK_STATUS; + +/* Start sending video frames with this format. */ +#define VRDEVIDEOINCTRL_F_VS_START_FID 0x01 +#define VRDEVIDEOINCTRL_F_VS_START_EOF 0x02 + +typedef struct VRDEVIDEOINCTRL_VS_START +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8FormatId; /* The format id on the client: VRDEVIDEOINFORMATDESC::u8FormatId. */ + uint8_t u8FramingInfo; /* VRDEVIDEOINCTRL_F_VS_START_*. Set by the client. */ + uint16_t u16Width; + uint16_t u16Height; + uint32_t u32FrameInterval; /* Frame interval in 100 ns units, 0 means a still image capture. + * The client may choose a different interval if this value is + * not supported. + */ + uint16_t u16CompQuality; /* 0 .. 10000 = 0 .. 100%. + * Applicable if the format has VRDE_VIDEOIN_F_FMT_COMPQUALITY, + * otherwise this field is ignored. + */ + uint16_t u16Delay; /* Latency in ms from video data capture to presentation on the channel. + * Set by the client, read by the server. + */ + uint32_t u32ClockFrequency; /* @todo just all clocks in 100ns units? */ +} VRDEVIDEOINCTRL_VS_START; + +/* Stop sending video frames. */ +typedef struct VRDEVIDEOINCTRL_VS_STOP +{ + VRDEVIDEOINCTRLHDR hdr; +} VRDEVIDEOINCTRL_VS_STOP; + +typedef struct VRDEVIDEOINCTRL_VS_SYNCH_DELAY +{ + VRDEVIDEOINCTRLHDR hdr; + uint16_t u16Delay; +} VRDEVIDEOINCTRL_VS_SYNCH_DELAY; + +typedef struct VRDEVIDEOINCTRL_VS_STILL_IMAGE_TRIGGER +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8Trigger; +} VRDEVIDEOINCTRL_VS_STILL_IMAGE_TRIGGER; + +typedef struct VRDEVIDEOINCTRL_VS_GENERATE_KEY_FRAME +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8GenerateKeyFrame; +} VRDEVIDEOINCTRL_VS_GENERATE_KEY_FRAME; + +typedef struct VRDEVIDEOINCTRL_VS_UPDATE_FRAME_SEGMENT +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8StartFrameSegment; + uint8_t u8EndFrameSegment; +} VRDEVIDEOINCTRL_VS_UPDATE_FRAME_SEGMENT; + +typedef struct VRDEVIDEOINCTRL_VS_STREAM_ERROR_CODE +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8StreamErrorCode; +} VRDEVIDEOINCTRL_VS_STREAM_ERROR_CODE; + +/* A hardware button was pressed/released on the device. */ +typedef struct VRDEVIDEOINCTRL_HW_BUTTON +{ + VRDEVIDEOINCTRLHDR hdr; + uint8_t u8Pressed; +} VRDEVIDEOINCTRL_CT_HW_BUTTON; + +/* + * Payload transfers. How frames are sent to the server: + * the client send a PAYLOAD packet, which has the already set format. + * The server enables the transfers by sending VRDEVIDEOINCTRL_VS_START. + */ + +/* Payload header */ +typedef struct VRDEVIDEOINPAYLOADHDR +{ + uint8_t u8HeaderLength; /* Entire header. */ + uint8_t u8HeaderInfo; /* VRDE_VIDEOIN_PAYLOAD_F_* */ + uint32_t u32PresentationTime; /* @todo define this */ + uint32_t u32SourceTimeClock; /* @todo At the moment when the frame was sent to the channel. + * Allows the server to measure clock drift. + */ + uint16_t u16Reserved; /* @todo */ +} VRDEVIDEOINPAYLOADHDR; + +/* VRDEVIDEOINPAYLOADHDR::u8HeaderInfo */ +#define VRDE_VIDEOIN_PAYLOAD_F_FID 0x01 /* Frame ID */ +#define VRDE_VIDEOIN_PAYLOAD_F_EOF 0x02 /* End of Frame */ +#define VRDE_VIDEOIN_PAYLOAD_F_PTS 0x04 /* Presentation Time */ +#define VRDE_VIDEOIN_PAYLOAD_F_SCR 0x08 /* Source Clock Reference */ +#define VRDE_VIDEOIN_PAYLOAD_F_RES 0x10 /* Reserved */ +#define VRDE_VIDEOIN_PAYLOAD_F_STI 0x20 /* Still Image */ +#define VRDE_VIDEOIN_PAYLOAD_F_ERR 0x40 /* Error */ +#define VRDE_VIDEOIN_PAYLOAD_F_EOH 0x80 /* End of header */ + + +/* + * The network channel specification. + */ + +/* + * The protocol uses a dynamic RDP channel. + * Everything is little-endian. + */ + +#define VRDE_VIDEOIN_CHANNEL "RVIDEOIN" + +/* Major functions. */ +#define VRDE_VIDEOIN_FN_NEGOTIATE 0x0000 /* Version and capabilities check. */ +#define VRDE_VIDEOIN_FN_NOTIFY 0x0001 /* Device attach/detach from the client. */ +#define VRDE_VIDEOIN_FN_DEVICEDESC 0x0002 /* Query device description. */ +#define VRDE_VIDEOIN_FN_CONTROL 0x0003 /* Control the device and start/stop video input. */ +#define VRDE_VIDEOIN_FN_CONTROL_NOTIFY 0x0004 /* The client reports a control change, etc. */ +#define VRDE_VIDEOIN_FN_FRAME 0x0005 /* Frame from the client. */ + +/* Status codes. */ +#define VRDE_VIDEOIN_STATUS_SUCCESS 0 /* Function completed successfully. */ +#define VRDE_VIDEOIN_STATUS_FAILED 1 /* Failed for some reason. */ + +typedef struct VRDEVIDEOINMSGHDR +{ + uint32_t u32Length; /* The length of the message in bytes, including the header. */ + uint32_t u32DeviceId; /* The client's device id. */ + uint32_t u32MessageId; /* Unique id assigned by the server. The client must send a reply with the same id. + * If the client initiates a request, then this must be set to 0, because there is + * currently no client requests, which would require a response from the server. + */ + uint16_t u16FunctionId; /* VRDE_VIDEOIN_FN_* */ + uint16_t u16Status; /* The result of a request. VRDE_VIDEOIN_STATUS_*. */ +} VRDEVIDEOINMSGHDR; +ASSERTSIZE(VRDEVIDEOINMSGHDR, 16) + +/* + * VRDE_VIDEOIN_FN_NEGOTIATE + * + * Sent by the server when the channel is established and the client replies with its capabilities. + */ +#define VRDE_VIDEOIN_NEGOTIATE_VERSION 1 + +#define VRDE_VIDEOIN_NEGOTIATE_CAP_VOID 0 + +typedef struct VRDEVIDEOINMSG_NEGOTIATE +{ + VRDEVIDEOINMSGHDR hdr; + uint32_t u32Version; /* VRDE_VIDEOIN_NEGOTIATE_VERSION */ + uint32_t fu32Capabilities; /* VRDE_VIDEOIN_NEGOTIATE_CAP_* */ +} VRDEVIDEOINMSG_NEGOTIATE; + +/* + * VRDE_VIDEOIN_FN_NOTIFY + * + * Sent by the client when a webcam is attached or detached. + * The client must send the ATTACH notification for each webcam, which is + * already connected to the client when the VIDEOIN channel is established. + */ +#define VRDE_VIDEOIN_NOTIFY_ATTACH 0 +#define VRDE_VIDEOIN_NOTIFY_DETACH 1 + +typedef struct VRDEVIDEOINMSG_NOTIFY +{ + VRDEVIDEOINMSGHDR hdr; + uint32_t u32NotifyEvent; /* VRDE_VIDEOIN_NOTIFY_* */ + /* Event specific data may follow. The underlying protocol provides the length of the message. */ +} VRDEVIDEOINMSG_NOTIFY; + +/* + * VRDE_VIDEOIN_FN_DEVICEDESC + * + * The server queries the description of a device. + */ +typedef struct VRDEVIDEOINMSG_DEVICEDESC_REQ +{ + VRDEVIDEOINMSGHDR hdr; +} VRDEVIDEOINMSG_DEVICEDESC_REQ; + +typedef struct VRDEVIDEOINMSG_DEVICEDESC_RSP +{ + VRDEVIDEOINMSGHDR hdr; + VRDEVIDEOINDEVICEDESC Device; + /* + * VRDEVIDEOINFORMATDESC[0] + * VRDEVIDEOINFRAMEDESC[0] + * ... + * VRDEVIDEOINFRAMEDESC[n] + * VRDEVIDEOINFORMATDESC[1] + * VRDEVIDEOINFRAMEDESC[0] + * ... + * VRDEVIDEOINFRAMEDESC[m] + * ... + */ +} VRDEVIDEOINMSG_DEVICEDESC_RSP; + +/* + * VRDE_VIDEOIN_FN_CONTROL + * VRDE_VIDEOIN_FN_CONTROL_NOTIFY + * + * Either sent by the server or by the client as a notification/response. + * If sent by the client as a notification, then hdr.u32MessageId must be 0. + */ +typedef struct VRDEVIDEOINMSG_CONTROL +{ + VRDEVIDEOINMSGHDR hdr; + VRDEVIDEOINCTRLHDR Control; + /* Control specific data may follow. */ +} VRDEVIDEOINMSG_CONTROL; + +/* + * VRDE_VIDEOIN_FN_FRAME + * + * The client sends a video/still frame in the already specified format. + * hdr.u32MessageId must be 0. + */ +typedef struct VRDEVIDEOINMSG_FRAME +{ + VRDEVIDEOINMSGHDR hdr; + VRDEVIDEOINPAYLOADHDR Payload; + /* The frame data follow. */ +} VRDEVIDEOINMSG_FRAME; + + +#ifdef VRDE_VIDEOIN_WITH_VRDEINTERFACE +/* + * The application interface between VirtualBox and the VRDE server. + */ + +#define VRDE_VIDEOIN_INTERFACE_NAME "VIDEOIN" + +typedef struct VRDEVIDEOINDEVICEHANDLE +{ + uint32_t u32ClientId; + uint32_t u32DeviceId; +} VRDEVIDEOINDEVICEHANDLE; + +/* The VRDE server video input interface entry points. Interface version 1. */ +typedef struct VRDEVIDEOININTERFACE +{ + /* The header. */ + VRDEINTERFACEHDR header; + + /* Tell the server that this device will be used and associate a context with the device. + * + * @param hServer The VRDE server instance. + * @param pDeviceHandle The device reported by ATTACH notification. + * @param pvDeviceCtx The caller context associated with the pDeviceHandle. + * + * @return IPRT status code. + */ + DECLR3CALLBACKMEMBER(int, VRDEVideoInDeviceAttach, (HVRDESERVER hServer, + const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, + void *pvDeviceCtx)); + + /* This device will be not be used anymore. The device context must not be used by the server too. + * + * @param hServer The VRDE server instance. + * @param pDeviceHandle The device reported by ATTACH notification. + * + * @return IPRT status code. + */ + DECLR3CALLBACKMEMBER(int, VRDEVideoInDeviceDetach, (HVRDESERVER hServer, + const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle)); + + /* Get a device description. + * + * @param hServer The VRDE server instance. + * @param pvUser The callers context of this request. + * @param pDeviceHandle The device reported by ATTACH notification. + * + * @return IPRT status code. + */ + DECLR3CALLBACKMEMBER(int, VRDEVideoInGetDeviceDesc, (HVRDESERVER hServer, + void *pvUser, + const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle)); + + /* Submit a set/get control request. + * + * @param hServer The VRDE server instance. + * @param pvUser The callers context of this request. + * @param pDeviceHandle The device reported by ATTACH notification. + * @param pReq The request. + * @param cbReq Size of the request. + * + * @return IPRT status code. + */ + DECLR3CALLBACKMEMBER(int, VRDEVideoInControl, (HVRDESERVER hServer, + void *pvUser, + const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, + const VRDEVIDEOINCTRLHDR *pReq, + uint32_t cbReq)); + +} VRDEVIDEOININTERFACE; + + +/* + * Notifications. + * Data structures: pvData of VRDEVIDEOINCALLBACKS::VRDECallbackVideoInNotify. + */ +typedef struct VRDEVIDEOINNOTIFYATTACH +{ + VRDEVIDEOINDEVICEHANDLE deviceHandle; +} VRDEVIDEOINNOTIFYATTACH; + +typedef struct VRDEVIDEOINNOTIFYDETACH +{ + VRDEVIDEOINDEVICEHANDLE deviceHandle; +} VRDEVIDEOINNOTIFYDETACH; + + +/* Video input interface callbacks. */ +typedef struct VRDEVIDEOINCALLBACKS +{ + /** The header. */ + VRDEINTERFACEHDR header; + + /* Notifications. + * + * @param pvCallback The callbacks context specified in VRDEGetInterface. + * @param u32EventId The notification identifier: VRDE_VIDEOIN_NOTIFY_*. + * @param pvData The notification specific data. + * @param cbData The size of buffer pointed by pvData. + */ + DECLR3CALLBACKMEMBER(void, VRDECallbackVideoInNotify,(void *pvCallback, + uint32_t u32Id, + const void *pvData, + uint32_t cbData)); + + /* Device description received from the client. + * + * @param pvCallback The callbacks context specified in VRDEGetInterface. + * @param rcRequest The result code of the request. + * @param pDeviceCtx The device context associated with the device in VRDEVideoInGetDeviceDesc. + * @param pvUser The pvUser parameter of VRDEVideoInGetDeviceDesc. + * @param pDeviceDesc The device description. + * @param cbDeviceDesc The size of buffer pointed by pDevice. + */ + DECLR3CALLBACKMEMBER(void, VRDECallbackVideoInDeviceDesc,(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINDEVICEDESC *pDeviceDesc, + uint32_t cbDeviceDesc)); + + /* Control response or notification. + * + * @param pvCallback The callbacks context specified in VRDEGetInterface. + * @param rcRequest The result code of the request. + * @param pDeviceCtx The device context associated with the device in VRDEVideoInGetDeviceDesc. + * @param pvUser The pvUser parameter of VRDEVideoInControl. NULL if this is a notification. + * @param pControl The control information. + * @param cbControl The size of buffer pointed by pControl. + */ + DECLR3CALLBACKMEMBER(void, VRDECallbackVideoInControl,(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINCTRLHDR *pControl, + uint32_t cbControl)); + + /* Frame which was received from the client. + * + * @param pvCallback The callbacks context specified in VRDEGetInterface. + * @param rcRequest The result code of the request. + * @param pDeviceCtx The device context associated with the device in VRDEVideoInGetDeviceDesc. + * @param pFrame The frame data. + * @param cbFrame The size of buffer pointed by pFrame. + */ + DECLR3CALLBACKMEMBER(void, VRDECallbackVideoInFrame,(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + const VRDEVIDEOINPAYLOADHDR *pFrame, + uint32_t cbFrame)); + +} VRDEVIDEOINCALLBACKS; +#endif /* VRDE_VIDEOIN_WITH_VRDEINTERFACE */ + +#pragma pack() + +#endif diff --git a/include/VBox/VBoxCrHgsmi.h b/include/VBox/VBoxCrHgsmi.h index 9d25a5dfd..e79a5c1fc 100644 --- a/include/VBox/VBoxCrHgsmi.h +++ b/include/VBox/VBoxCrHgsmi.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxDrvCfg-win.h b/include/VBox/VBoxDrvCfg-win.h index ac8092a49..abca190f2 100644 --- a/include/VBox/VBoxDrvCfg-win.h +++ b/include/VBox/VBoxDrvCfg-win.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxGL2D.h b/include/VBox/VBoxGL2D.h index ab0f99dbd..a29c2726e 100644 --- a/include/VBox/VBoxGL2D.h +++ b/include/VBox/VBoxGL2D.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxGuest.h b/include/VBox/VBoxGuest.h index d23e5a2d0..6893667c4 100644 --- a/include/VBox/VBoxGuest.h +++ b/include/VBox/VBoxGuest.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxGuest2.h b/include/VBox/VBoxGuest2.h index 4e17b2dfc..05344c32b 100644 --- a/include/VBox/VBoxGuest2.h +++ b/include/VBox/VBoxGuest2.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxGuestLib.h b/include/VBox/VBoxGuestLib.h index c860a0739..b8ee8e308 100644 --- a/include/VBox/VBoxGuestLib.h +++ b/include/VBox/VBoxGuestLib.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxNetCfg-win.h b/include/VBox/VBoxNetCfg-win.h index 8e327c0dc..8dcaa0a49 100644 --- a/include/VBox/VBoxNetCfg-win.h +++ b/include/VBox/VBoxNetCfg-win.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxUhgsmi.h b/include/VBox/VBoxUhgsmi.h index 459c6352a..eed8345d8 100644 --- a/include/VBox/VBoxUhgsmi.h +++ b/include/VBox/VBoxUhgsmi.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxVideo.h b/include/VBox/VBoxVideo.h index bbc6d7b5a..68d4846f4 100644 --- a/include/VBox/VBoxVideo.h +++ b/include/VBox/VBoxVideo.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxVideo3D.h b/include/VBox/VBoxVideo3D.h index 91c6e3069..1ad98166f 100644 --- a/include/VBox/VBoxVideo3D.h +++ b/include/VBox/VBoxVideo3D.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VBoxVideoGuest.h b/include/VBox/VBoxVideoGuest.h index b0718231f..c3e5f3308 100644 --- a/include/VBox/VBoxVideoGuest.h +++ b/include/VBox/VBoxVideoGuest.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VDEPlugSymDefs.h b/include/VBox/VDEPlugSymDefs.h index 483b7834f..fd11a8ca3 100644 --- a/include/VBox/VDEPlugSymDefs.h +++ b/include/VBox/VDEPlugSymDefs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VMMDev.h b/include/VBox/VMMDev.h index fe81237d4..6ae715669 100644 --- a/include/VBox/VMMDev.h +++ b/include/VBox/VMMDev.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/VMMDev2.h b/include/VBox/VMMDev2.h index 3a8ebbed5..c8709f720 100644 --- a/include/VBox/VMMDev2.h +++ b/include/VBox/VMMDev2.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/asmdefs.mac b/include/VBox/asmdefs.mac index 96b0e52d1..b877e6322 100644 --- a/include/VBox/asmdefs.mac +++ b/include/VBox/asmdefs.mac @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/bioslogo.h b/include/VBox/bioslogo.h index b78d1caed..1c5fd041c 100644 --- a/include/VBox/bioslogo.h +++ b/include/VBox/bioslogo.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/cdefs.h b/include/VBox/cdefs.h index 652f7f6ba..1715174cf 100644 --- a/include/VBox/cdefs.h +++ b/include/VBox/cdefs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/ErrorInfo.h b/include/VBox/com/ErrorInfo.h index 1037b2532..e15a639d1 100644 --- a/include/VBox/com/ErrorInfo.h +++ b/include/VBox/com/ErrorInfo.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/VirtualBox.h b/include/VBox/com/VirtualBox.h index 92fe1e84b..645aca1e2 100644 --- a/include/VBox/com/VirtualBox.h +++ b/include/VBox/com/VirtualBox.h @@ -16,7 +16,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/array.h b/include/VBox/com/array.h index 7f1796d93..e65b88c73 100644 --- a/include/VBox/com/array.h +++ b/include/VBox/com/array.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/assert.h b/include/VBox/com/assert.h index 0a9b1afdd..e61fd5e8f 100644 --- a/include/VBox/com/assert.h +++ b/include/VBox/com/assert.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/defs.h b/include/VBox/com/defs.h index aa9800dd9..db158c650 100644 --- a/include/VBox/com/defs.h +++ b/include/VBox/com/defs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/errorprint.h b/include/VBox/com/errorprint.h index 2ee116760..18c65e4cb 100644 --- a/include/VBox/com/errorprint.h +++ b/include/VBox/com/errorprint.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/com/ptr.h b/include/VBox/com/ptr.h index 1942274b0..9b5e344c0 100644 --- a/include/VBox/com/ptr.h +++ b/include/VBox/com/ptr.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/dbg.h b/include/VBox/dbg.h index 320dac165..688b7fb20 100644 --- a/include/VBox/dbg.h +++ b/include/VBox/dbg.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/dbggui.h b/include/VBox/dbggui.h index 59a48dc59..608376edd 100644 --- a/include/VBox/dbggui.h +++ b/include/VBox/dbggui.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/dbus-calls.h b/include/VBox/dbus-calls.h index 79517fe40..315be6727 100644 --- a/include/VBox/dbus-calls.h +++ b/include/VBox/dbus-calls.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/dbus.h b/include/VBox/dbus.h index f87023fd4..468525b8a 100644 --- a/include/VBox/dbus.h +++ b/include/VBox/dbus.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/err.h b/include/VBox/err.h index 3fae9bc95..0f511d699 100644 --- a/include/VBox/err.h +++ b/include/VBox/err.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/err.sed b/include/VBox/err.sed index b9c18489e..52bb36263 100644 --- a/include/VBox/err.sed +++ b/include/VBox/err.sed @@ -3,7 +3,7 @@ # SED script for converting VBox/err.h to .mac. # -# Copyright (C) 2006-2009 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/hgcmsvc.h b/include/VBox/hgcmsvc.h index c3480a73f..9442bb7d9 100644 --- a/include/VBox/hgcmsvc.h +++ b/include/VBox/hgcmsvc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/intnetinline.h b/include/VBox/intnetinline.h index bcc42f1a3..408e0c50f 100644 --- a/include/VBox/intnetinline.h +++ b/include/VBox/intnetinline.h @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/nasm.mac b/include/VBox/nasm.mac index 416a72f6d..a8010a679 100644 --- a/include/VBox/nasm.mac +++ b/include/VBox/nasm.mac @@ -5,7 +5,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h index cbc0b739e..af71bad8c 100644 --- a/include/VBox/ostypes.h +++ b/include/VBox/ostypes.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/param.h b/include/VBox/param.h index 0f94967c1..86a5c1182 100644 --- a/include/VBox/param.h +++ b/include/VBox/param.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/scsi.h b/include/VBox/scsi.h index 20bcd5e10..46f8f4162 100644 --- a/include/VBox/scsi.h +++ b/include/VBox/scsi.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/settings.h b/include/VBox/settings.h index 4c69a0e24..921379bed 100644 --- a/include/VBox/settings.h +++ b/include/VBox/settings.h @@ -17,7 +17,7 @@ */ /* - * Copyright (C) 2007-2012 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -788,6 +788,7 @@ struct Hardware ChipsetType_T chipsetType; // requires settings version 1.11 (VirtualBox 4.0) + bool fEmulatedUSBWebcam; // 1.13 (VirtualBox 4.2) bool fEmulatedUSBCardReader; // 1.12 (VirtualBox 4.1) VRDESettings vrdeSettings; diff --git a/include/VBox/shflsvc.h b/include/VBox/shflsvc.h index f4e0765c9..4199e4361 100644 --- a/include/VBox/shflsvc.h +++ b/include/VBox/shflsvc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/sup.h b/include/VBox/sup.h index 5913ff9ce..546d93e72 100644 --- a/include/VBox/sup.h +++ b/include/VBox/sup.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/types.h b/include/VBox/types.h index 9abf5b6ba..5a300cabd 100644 --- a/include/VBox/types.h +++ b/include/VBox/types.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usb.h b/include/VBox/usb.h index db648c7a4..4ab531a0c 100644 --- a/include/VBox/usb.h +++ b/include/VBox/usb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usbfilter.h b/include/VBox/usbfilter.h index 1ed209fd7..45c3151c0 100644 --- a/include/VBox/usbfilter.h +++ b/include/VBox/usbfilter.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usblib-darwin.h b/include/VBox/usblib-darwin.h index db43e743a..a767cc0ac 100644 --- a/include/VBox/usblib-darwin.h +++ b/include/VBox/usblib-darwin.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usblib-solaris.h b/include/VBox/usblib-solaris.h index f8c4b4c27..992aef441 100644 --- a/include/VBox/usblib-solaris.h +++ b/include/VBox/usblib-solaris.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usblib-win.h b/include/VBox/usblib-win.h index ed8885bb1..193bde755 100644 --- a/include/VBox/usblib-win.h +++ b/include/VBox/usblib-win.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/usblib.h b/include/VBox/usblib.h index 21d464194..5d00af68d 100644 --- a/include/VBox/usblib.h +++ b/include/VBox/usblib.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vd-cache-plugin.h b/include/VBox/vd-cache-plugin.h index af1856803..b5af47943 100644 --- a/include/VBox/vd-cache-plugin.h +++ b/include/VBox/vd-cache-plugin.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vd-ifs.h b/include/VBox/vd-ifs.h index 662b55d71..0476b60f2 100644 --- a/include/VBox/vd-ifs.h +++ b/include/VBox/vd-ifs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vd.h b/include/VBox/vd.h index d9dbb8eae..185fd159e 100644 --- a/include/VBox/vd.h +++ b/include/VBox/vd.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/version.h b/include/VBox/version.h index 8a48c1f67..defa32195 100644 --- a/include/VBox/version.h +++ b/include/VBox/version.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/cfgm.h b/include/VBox/vmm/cfgm.h index 9b4e47ab0..9b5447f25 100644 --- a/include/VBox/vmm/cfgm.h +++ b/include/VBox/vmm/cfgm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/cpum.mac b/include/VBox/vmm/cpum.mac index 8f906d067..c74078643 100644 --- a/include/VBox/vmm/cpum.mac +++ b/include/VBox/vmm/cpum.mac @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2010 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/cpumdis.h b/include/VBox/vmm/cpumdis.h index 9aa509a34..dab556a86 100644 --- a/include/VBox/vmm/cpumdis.h +++ b/include/VBox/vmm/cpumdis.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/csam.h b/include/VBox/vmm/csam.h index 675cac7fb..9d9dd9e64 100644 --- a/include/VBox/vmm/csam.h +++ b/include/VBox/vmm/csam.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/dbgf.h b/include/VBox/vmm/dbgf.h index 65bb94c78..25dfb1231 100644 --- a/include/VBox/vmm/dbgf.h +++ b/include/VBox/vmm/dbgf.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/dbgfsel.h b/include/VBox/vmm/dbgfsel.h index 708666bf0..2be4ee84e 100644 --- a/include/VBox/vmm/dbgfsel.h +++ b/include/VBox/vmm/dbgfsel.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/em.h b/include/VBox/vmm/em.h index a0efe5fcc..6ef5628fa 100644 --- a/include/VBox/vmm/em.h +++ b/include/VBox/vmm/em.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/gmm.h b/include/VBox/vmm/gmm.h index 0f93c94a0..e5db104c2 100644 --- a/include/VBox/vmm/gmm.h +++ b/include/VBox/vmm/gmm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/gvm.h b/include/VBox/vmm/gvm.h index b0d607de4..0fe406b02 100644 --- a/include/VBox/vmm/gvm.h +++ b/include/VBox/vmm/gvm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/gvmm.h b/include/VBox/vmm/gvmm.h index e78d181b6..eb86f9b24 100644 --- a/include/VBox/vmm/gvmm.h +++ b/include/VBox/vmm/gvmm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/hwacc_svm.h b/include/VBox/vmm/hwacc_svm.h index 8912e378c..e88df2c8a 100644 --- a/include/VBox/vmm/hwacc_svm.h +++ b/include/VBox/vmm/hwacc_svm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/hwacc_vmx.h b/include/VBox/vmm/hwacc_vmx.h index a96f587e3..ed3625436 100644 --- a/include/VBox/vmm/hwacc_vmx.h +++ b/include/VBox/vmm/hwacc_vmx.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/hwaccm.h b/include/VBox/vmm/hwaccm.h index 98a7d02e6..ae749932c 100644 --- a/include/VBox/vmm/hwaccm.h +++ b/include/VBox/vmm/hwaccm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/iem.h b/include/VBox/vmm/iem.h index 617a05a6a..62e1b28a1 100644 --- a/include/VBox/vmm/iem.h +++ b/include/VBox/vmm/iem.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/iom.h b/include/VBox/vmm/iom.h index a7e552c9a..fdcdef4b9 100644 --- a/include/VBox/vmm/iom.h +++ b/include/VBox/vmm/iom.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/mm.h b/include/VBox/vmm/mm.h index 66490fcec..42871dfca 100644 --- a/include/VBox/vmm/mm.h +++ b/include/VBox/vmm/mm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/patm.h b/include/VBox/vmm/patm.h index 70b7fa559..227c85c07 100644 --- a/include/VBox/vmm/patm.h +++ b/include/VBox/vmm/patm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmapi.h b/include/VBox/vmm/pdmapi.h index 1fb8aef6e..45f79b7e7 100644 --- a/include/VBox/vmm/pdmapi.h +++ b/include/VBox/vmm/pdmapi.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmasynccompletion.h b/include/VBox/vmm/pdmasynccompletion.h index 1d1af2650..06e708c88 100644 --- a/include/VBox/vmm/pdmasynccompletion.h +++ b/include/VBox/vmm/pdmasynccompletion.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmblkcache.h b/include/VBox/vmm/pdmblkcache.h index fc92bc4f3..14d85f675 100644 --- a/include/VBox/vmm/pdmblkcache.h +++ b/include/VBox/vmm/pdmblkcache.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmcritsect.h b/include/VBox/vmm/pdmcritsect.h index 02d7924d9..d83706777 100644 --- a/include/VBox/vmm/pdmcritsect.h +++ b/include/VBox/vmm/pdmcritsect.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmdev.h b/include/VBox/vmm/pdmdev.h index 892ed590d..93228f62d 100644 --- a/include/VBox/vmm/pdmdev.h +++ b/include/VBox/vmm/pdmdev.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmdrv.h b/include/VBox/vmm/pdmdrv.h index d830ea692..90b34a3b6 100644 --- a/include/VBox/vmm/pdmdrv.h +++ b/include/VBox/vmm/pdmdrv.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmifs.h b/include/VBox/vmm/pdmifs.h index 17dba105b..5d8a02ad5 100644 --- a/include/VBox/vmm/pdmifs.h +++ b/include/VBox/vmm/pdmifs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmnetinline.h b/include/VBox/vmm/pdmnetinline.h index 66c3078fe..ac2bb6f76 100644 --- a/include/VBox/vmm/pdmnetinline.h +++ b/include/VBox/vmm/pdmnetinline.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmusb.h b/include/VBox/vmm/pdmusb.h index ae3f5cfb4..8566ca1f4 100644 --- a/include/VBox/vmm/pdmusb.h +++ b/include/VBox/vmm/pdmusb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/pdmwebcaminfs.h b/include/VBox/vmm/pdmwebcaminfs.h new file mode 100644 index 000000000..eb33cce60 --- /dev/null +++ b/include/VBox/vmm/pdmwebcaminfs.h @@ -0,0 +1,115 @@ +/* $Id: pdmwebcaminfs.h $ */ + +/** @file + * webcaminfs - interfaces between dev and driver. + */ + +/* + * Copyright (C) 2011-2013 Oracle Corporation + * + * 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. + * + * 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. + */ + +#ifndef ___VBox_vmm_pdmwebcaminfs_h +#define ___VBox_vmm_pdmwebcaminfs_h + + +typedef struct PDMIWEBCAM_DEVICEDESC PDMIWEBCAM_DEVICEDESC; +typedef struct PDMIWEBCAM_CTRLHDR PDMIWEBCAM_CTRLHDR; + + +#define PDMIWEBCAMDOWN_IID "0846959f-8b4a-4b2c-be78-9903b2ae9de5" +typedef struct PDMIWEBCAMDOWN *PPDMIWEBCAMDOWN; +typedef struct PDMIWEBCAMDOWN +{ + /* + * Send a control request to the webcam. + * Async response will be returned by pfnWebcamUpControl callback. + * + * @param pInterface Pointer to the interface. + * @param pvUser The callers context. + * @param u64DeviceId Unique id for the reported webcam assigned by the driver. + * @param pCtrl The control data. + * @param cbCtrl The size of the control data. + */ + DECLR3CALLBACKMEMBER(int, pfnWebcamDownControl, (PPDMIWEBCAMDOWN pInterface, + void *pvUser, + uint64_t u64DeviceId, + const PDMIWEBCAM_CTRLHDR *pCtrl, + uint32_t cbCtrl)); +} PDMIWEBCAMDOWN; + + +#define PDMIWEBCAMUP_IID "7921e96b-b8e2-4173-a73d-787620fc3cab" +typedef struct PDMIWEBCAMUP *PPDMIWEBCAMUP; +typedef struct PDMIWEBCAMUP +{ + /* + * A webcam is available. + * + * @param pInterface Pointer to the interface. + * @param u64DeviceId Unique id for the reported webcam assigned by the driver. + * @param pDeviceDesc The device description. + * @param cbDeviceDesc The size of the device description. + */ + DECLR3CALLBACKMEMBER(int, pfnWebcamUpAttached,(PPDMIWEBCAMUP pInterface, + uint64_t u64DeviceId, + const PDMIWEBCAM_DEVICEDESC *pDeviceDesc, + uint32_t cbDeviceDesc)); + + /* + * The webcam is not available anymore. + * + * @param pInterface Pointer to the interface. + * @param u64DeviceId Unique id for the reported webcam assigned by the driver. + */ + DECLR3CALLBACKMEMBER(void, pfnWebcamUpDetached,(PPDMIWEBCAMUP pInterface, + uint64_t u64DeviceId)); + + /* + * There is a control response or a control change for the webcam. + * + * @param pInterface Pointer to the interface. + * @param fResponse True if this is a response for a previous pfnWebcamDownControl call. + * @param pvUser The pvUser parameter of the pfnWebcamDownControl call. Undefined if fResponse == false. + * @param u64DeviceId Unique id for the reported webcam assigned by the driver. + * @param pCtrl The control data. + * @param cbCtrl The size of the control data. + */ + DECLR3CALLBACKMEMBER(void, pfnWebcamUpControl,(PPDMIWEBCAMUP pInterface, + bool fResponse, + void *pvUser, + uint64_t u64DeviceId, + const PDMIWEBCAM_CTRLHDR *pCtrl, + uint32_t cbCtrl)); + + /* + * A new frame. + * + * @param pInterface Pointer to the interface. + * @param u64DeviceId Unique id for the reported webcam assigned by the driver. + * @param pu8Frame The frame data including the payload header and the image data. + * @param cbFrame The size of the frame data. + */ + DECLR3CALLBACKMEMBER(void, pfnWebcamUpFrame,(PPDMIWEBCAMUP pInterface, + uint64_t u64DeviceId, + const uint8_t *pu8Frame, + uint32_t cbFrame)); +} PDMIWEBCAMUP; + +#endif diff --git a/include/VBox/vmm/pgm.h b/include/VBox/vmm/pgm.h index 4006ec6a5..dc7f00915 100644 --- a/include/VBox/vmm/pgm.h +++ b/include/VBox/vmm/pgm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/rem.h b/include/VBox/vmm/rem.h index 79a188107..bda6e29a6 100644 --- a/include/VBox/vmm/rem.h +++ b/include/VBox/vmm/rem.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/ssm.h b/include/VBox/vmm/ssm.h index 427e07965..50c895e29 100644 --- a/include/VBox/vmm/ssm.h +++ b/include/VBox/vmm/ssm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/stam.h b/include/VBox/vmm/stam.h index c25c606f5..1c576f0ae 100644 --- a/include/VBox/vmm/stam.h +++ b/include/VBox/vmm/stam.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/tm.h b/include/VBox/vmm/tm.h index be328b1cf..880ecab66 100644 --- a/include/VBox/vmm/tm.h +++ b/include/VBox/vmm/tm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/trpm.h b/include/VBox/vmm/trpm.h index 0cdfc153e..772b37245 100644 --- a/include/VBox/vmm/trpm.h +++ b/include/VBox/vmm/trpm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/uvm.h b/include/VBox/vmm/uvm.h index 10b8e49b3..e5de99327 100644 --- a/include/VBox/vmm/uvm.h +++ b/include/VBox/vmm/uvm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/vmapi.h b/include/VBox/vmm/vmapi.h index b15fc7f61..35223ba37 100644 --- a/include/VBox/vmm/vmapi.h +++ b/include/VBox/vmm/vmapi.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vmm/vmm.h b/include/VBox/vmm/vmm.h index e3af0c293..a28a9bafa 100644 --- a/include/VBox/vmm/vmm.h +++ b/include/VBox/vmm/vmm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vrdpusb.h b/include/VBox/vrdpusb.h index 92491500c..69bdeb6bb 100644 --- a/include/VBox/vrdpusb.h +++ b/include/VBox/vrdpusb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/VBox/vusb.h b/include/VBox/vusb.h index 3a2d9b8f8..9ebe6ca18 100644 --- a/include/VBox/vusb.h +++ b/include/VBox/vusb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -54,6 +54,7 @@ RT_C_DECLS_BEGIN #define VUSB_DT_DEVICE_QUALIFIER 0x06 #define VUSB_DT_OTHER_SPEED_CFG 0x07 #define VUSB_DT_INTERFACE_POWER 0x08 +#define VUSB_DT_INTERFACE_ASSOCIATION 0x0B /** @} */ /** @name USB Descriptor minimum sizes (from spec) @@ -162,6 +163,26 @@ typedef const VUSBDESCCONFIG *PCVUSBDESCCONFIG; /** + * USB interface association descriptor (from USB ECN Interface Association Descriptors) + */ +typedef struct VUSBDESCIAD +{ + uint8_t bLength; + uint8_t bDescriptorType; + uint8_t bFirstInterface; + uint8_t bInterfaceCount; + uint8_t bFunctionClass; + uint8_t bFunctionSubClass; + uint8_t bFunctionProtocol; + uint8_t iFunction; +} VUSBDESCIAD; +/** Pointer to a USB interface association descriptor. */ +typedef VUSBDESCIAD *PVUSBDESCIAD; +/** Pointer to a readonly USB interface association descriptor. */ +typedef const VUSBDESCIAD *PCVUSBDESCIAD; + + +/** * USB interface descriptor (from spec) */ typedef struct VUSBDESCINTERFACE @@ -256,6 +277,11 @@ typedef struct VUSBDESCINTERFACEEX /** Pointer to an array of the endpoints referenced by the interface. * Core.bNumEndpoints in size. */ const struct VUSBDESCENDPOINTEX *paEndpoints; + /** Interface association descriptor, which prepends a group of interfaces, + * starting with this interface. */ + PCVUSBDESCIAD pIAD; + /** Size of interface association descriptor. */ + uint16_t cbIAD; } VUSBDESCINTERFACEEX; /** Pointer to an prased USB interface descriptor. */ typedef VUSBDESCINTERFACEEX *PVUSBDESCINTERFACEEX; diff --git a/include/iprt/alloc.h b/include/iprt/alloc.h index e30b7f870..783c18986 100644 --- a/include/iprt/alloc.h +++ b/include/iprt/alloc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/alloca.h b/include/iprt/alloca.h index 4aa00e6ab..c47771cd8 100644 --- a/include/iprt/alloca.h +++ b/include/iprt/alloca.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/asm-amd64-x86.h b/include/iprt/asm-amd64-x86.h index 22efb4417..3652e3cfd 100644 --- a/include/iprt/asm-amd64-x86.h +++ b/include/iprt/asm-amd64-x86.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -524,8 +524,8 @@ DECLINLINE(void) ASMCpuId(uint32_t uOperator, void *pvEAX, void *pvEBX, void *pv /** - * Performs the cpuid instruction returning all registers. - * Some subfunctions of cpuid take ECX as additional parameter (currently known for EAX=4) + * Performs the CPUID instruction with EAX and ECX input returning ALL output + * registers. * * @param uOperator CPUID operation (eax). * @param uIdxECX ecx index @@ -535,7 +535,7 @@ DECLINLINE(void) ASMCpuId(uint32_t uOperator, void *pvEAX, void *pvEBX, void *pv * @param pvEDX Where to store edx. * @remark We're using void pointers to ease the use of special bitfield structures and such. */ -#if RT_INLINE_ASM_EXTERNAL && !RT_INLINE_ASM_USES_INTRIN +#if RT_INLINE_ASM_EXTERNAL || RT_INLINE_ASM_USES_INTRIN DECLASM(void) ASMCpuId_Idx_ECX(uint32_t uOperator, uint32_t uIdxECX, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX); #else DECLINLINE(void) ASMCpuId_Idx_ECX(uint32_t uOperator, uint32_t uIdxECX, void *pvEAX, void *pvEBX, void *pvECX, void *pvEDX) @@ -568,8 +568,7 @@ DECLINLINE(void) ASMCpuId_Idx_ECX(uint32_t uOperator, uint32_t uIdxECX, void *pv # elif RT_INLINE_ASM_USES_INTRIN int aInfo[4]; - /* ??? another intrinsic ??? */ - __cpuid(aInfo, uOperator); + __cpuidex(aInfo, uOperator, uIdxECX); *(uint32_t *)pvEAX = aInfo[0]; *(uint32_t *)pvEBX = aInfo[1]; *(uint32_t *)pvECX = aInfo[2]; diff --git a/include/iprt/asm.h b/include/iprt/asm.h index abaef3a03..fb3a34418 100644 --- a/include/iprt/asm.h +++ b/include/iprt/asm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/asmdefs.mac b/include/iprt/asmdefs.mac index 665c674bd..c25e88584 100644 --- a/include/iprt/asmdefs.mac +++ b/include/iprt/asmdefs.mac @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/avl.h b/include/iprt/avl.h index 9c1b99dfc..6506e8b33 100644 --- a/include/iprt/avl.h +++ b/include/iprt/avl.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 1999-2003 knut st. osmundsen <bird-src-spam@anduin.net> + * Copyright (C) 1999-2012 knut st. osmundsen <bird-src-spam@anduin.net> * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/base64.h b/include/iprt/base64.h index b52f48e17..dfbbc1343 100644 --- a/include/iprt/base64.h +++ b/include/iprt/base64.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/buildconfig.h b/include/iprt/buildconfig.h index 9e4a9c575..8853fb805 100644 --- a/include/iprt/buildconfig.h +++ b/include/iprt/buildconfig.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/cdefs.h b/include/iprt/cdefs.h index db52defac..a192b4343 100644 --- a/include/iprt/cdefs.h +++ b/include/iprt/cdefs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/cidr.h b/include/iprt/cidr.h index 5e0541869..ef11c9f02 100644 --- a/include/iprt/cidr.h +++ b/include/iprt/cidr.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/circbuf.h b/include/iprt/circbuf.h index b0c58ffe3..99f0d82e4 100644 --- a/include/iprt/circbuf.h +++ b/include/iprt/circbuf.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/cpp/ministring.h b/include/iprt/cpp/ministring.h index 29c974093..3d0860549 100644 --- a/include/iprt/cpp/ministring.h +++ b/include/iprt/cpp/ministring.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/cpp/xml.h b/include/iprt/cpp/xml.h index 55238200c..03ee78ad4 100644 --- a/include/iprt/cpp/xml.h +++ b/include/iprt/cpp/xml.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/crc.h b/include/iprt/crc.h index 82e3b11be..0f9fa9644 100644 --- a/include/iprt/crc.h +++ b/include/iprt/crc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/ctype.h b/include/iprt/ctype.h index b491aa328..e97b00d76 100644 --- a/include/iprt/ctype.h +++ b/include/iprt/ctype.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/dbg.h b/include/iprt/dbg.h index 04bea8279..f68c12ae8 100644 --- a/include/iprt/dbg.h +++ b/include/iprt/dbg.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/dir.h b/include/iprt/dir.h index 38d99aa33..c7e499cdf 100644 --- a/include/iprt/dir.h +++ b/include/iprt/dir.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/dvm.h b/include/iprt/dvm.h index f36a5f100..4501856eb 100644 --- a/include/iprt/dvm.h +++ b/include/iprt/dvm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/env.h b/include/iprt/env.h index 64277d128..4046e6aa9 100644 --- a/include/iprt/env.h +++ b/include/iprt/env.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/err.h b/include/iprt/err.h index 13b9914f2..4644aa7a3 100644 --- a/include/iprt/err.h +++ b/include/iprt/err.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/err.sed b/include/iprt/err.sed index 2271331ca..89cfeafd9 100644 --- a/include/iprt/err.sed +++ b/include/iprt/err.sed @@ -3,7 +3,7 @@ # # -# Copyright (C) 2006-2009 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/file.h b/include/iprt/file.h index 3357ab23b..50ce6f54a 100644 --- a/include/iprt/file.h +++ b/include/iprt/file.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/fs.h b/include/iprt/fs.h index 6ad2d2c5d..365843e94 100644 --- a/include/iprt/fs.h +++ b/include/iprt/fs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/getopt.h b/include/iprt/getopt.h index bf976ceff..c7ba0e50b 100644 --- a/include/iprt/getopt.h +++ b/include/iprt/getopt.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/handletable.h b/include/iprt/handletable.h index 0ade74127..72a0cf81b 100644 --- a/include/iprt/handletable.h +++ b/include/iprt/handletable.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/heap.h b/include/iprt/heap.h index f9e0c5249..4151fac03 100644 --- a/include/iprt/heap.h +++ b/include/iprt/heap.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/initterm.h b/include/iprt/initterm.h index 9fff94fcb..ad409207d 100644 --- a/include/iprt/initterm.h +++ b/include/iprt/initterm.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -46,6 +46,8 @@ RT_C_DECLS_BEGIN #define RTR3INIT_FLAGS_SUPLIB RT_BIT(0) /** Initializing IPRT from a DLL. */ #define RTR3INIT_FLAGS_DLL RT_BIT(1) +/** We are sharing a process space, so we need to behave. */ +#define RTR3INIT_FLAGS_UNOBTRUSIVE RT_BIT(2) /** @} */ /** @name RTR3InitEx version @@ -103,6 +105,10 @@ RTR3DECL(int) RTR3InitEx(uint32_t iVersion, uint32_t fFlags, int cArgs, char *** */ RTR3DECL(void) RTR3Term(void); +/** + * Are we running in unobtrusive mode? + */ +RTR3DECL(bool) RTR3InitIsUnobtrusive(void); #endif /* IN_RING3 */ diff --git a/include/iprt/isofs.h b/include/iprt/isofs.h index c7774cd92..e6f3356e0 100644 --- a/include/iprt/isofs.h +++ b/include/iprt/isofs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/ldr.h b/include/iprt/ldr.h index 9e036d839..cf3596134 100644 --- a/include/iprt/ldr.h +++ b/include/iprt/ldr.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/linux/sysfs.h b/include/iprt/linux/sysfs.h index 27010af4b..c48627999 100644 --- a/include/iprt/linux/sysfs.h +++ b/include/iprt/linux/sysfs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/list.h b/include/iprt/list.h index 1a4a4bc06..215b983be 100644 --- a/include/iprt/list.h +++ b/include/iprt/list.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/localipc.h b/include/iprt/localipc.h index 0a887e425..9551c59c7 100644 --- a/include/iprt/localipc.h +++ b/include/iprt/localipc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/lockvalidator.h b/include/iprt/lockvalidator.h index 7e0f08c19..6ab25b777 100644 --- a/include/iprt/lockvalidator.h +++ b/include/iprt/lockvalidator.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/log.h b/include/iprt/log.h index cce17079a..3b951d92b 100644 --- a/include/iprt/log.h +++ b/include/iprt/log.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/mangling.h b/include/iprt/mangling.h index cc8b4ec69..8f97d84f4 100644 --- a/include/iprt/mangling.h +++ b/include/iprt/mangling.h @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2011-2012 Oracle Corporation + * Copyright (C) 2011-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -894,6 +894,7 @@ # define RTPathAppPrivateArch RT_MANGLER(RTPathAppPrivateArch) # define RTPathAppPrivateArchTop RT_MANGLER(RTPathAppPrivateArchTop) # define RTPathAppPrivateNoArch RT_MANGLER(RTPathAppPrivateNoArch) +# define RTPathCalcRelative RT_MANGLER(RTPathCalcRelative) # define RTPathChangeToDosSlashes RT_MANGLER(RTPathChangeToDosSlashes) # define RTPathChangeToUnixSlashes RT_MANGLER(RTPathChangeToUnixSlashes) # define RTPathCompare RT_MANGLER(RTPathCompare) @@ -1018,6 +1019,7 @@ # define RTR3InitExe RT_MANGLER(RTR3InitExe) # define RTR3InitExeNoArguments RT_MANGLER(RTR3InitExeNoArguments) # define RTR3InitEx RT_MANGLER(RTR3InitEx) +# define RTR3InitIsUnobtrusive RT_MANGLER(RTR3InitIsUnobtrusive) # define rtR3MemAlloc RT_MANGLER(rtR3MemAlloc) # define rtR3MemFree RT_MANGLER(rtR3MemFree) # define rtR3MemRealloc RT_MANGLER(rtR3MemRealloc) diff --git a/include/iprt/manifest.h b/include/iprt/manifest.h index f7092b2af..2574b07c7 100644 --- a/include/iprt/manifest.h +++ b/include/iprt/manifest.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/md5.h b/include/iprt/md5.h index e085abb6c..f9f48320b 100644 --- a/include/iprt/md5.h +++ b/include/iprt/md5.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/mem.h b/include/iprt/mem.h index 883de0fe1..f99b5b7de 100644 --- a/include/iprt/mem.h +++ b/include/iprt/mem.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/memobj.h b/include/iprt/memobj.h index 3a3b7025c..b44983808 100644 --- a/include/iprt/memobj.h +++ b/include/iprt/memobj.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/mempool.h b/include/iprt/mempool.h index 6be563d32..229433427 100644 --- a/include/iprt/mempool.h +++ b/include/iprt/mempool.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/memtracker.h b/include/iprt/memtracker.h index 5d557b20a..ca22fec50 100644 --- a/include/iprt/memtracker.h +++ b/include/iprt/memtracker.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/message.h b/include/iprt/message.h index b70a79bed..1d78f1769 100644 --- a/include/iprt/message.h +++ b/include/iprt/message.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/mp.h b/include/iprt/mp.h index 70c0bf5ec..2bb59dea1 100644 --- a/include/iprt/mp.h +++ b/include/iprt/mp.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/amd64/fenv.h b/include/iprt/nocrt/amd64/fenv.h index 002aa01f9..0daf3e219 100644 --- a/include/iprt/nocrt/amd64/fenv.h +++ b/include/iprt/nocrt/amd64/fenv.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/amd64/math.h b/include/iprt/nocrt/amd64/math.h index 8d1e6536e..762ac4f4e 100644 --- a/include/iprt/nocrt/amd64/math.h +++ b/include/iprt/nocrt/amd64/math.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/compiler/compiler.h b/include/iprt/nocrt/compiler/compiler.h index ea9f89525..77523d3c0 100644 --- a/include/iprt/nocrt/compiler/compiler.h +++ b/include/iprt/nocrt/compiler/compiler.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/compiler/gcc.h b/include/iprt/nocrt/compiler/gcc.h index 890448b33..9aeb3ce6b 100644 --- a/include/iprt/nocrt/compiler/gcc.h +++ b/include/iprt/nocrt/compiler/gcc.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/compiler/msc.h b/include/iprt/nocrt/compiler/msc.h index 1fbb3a149..6ee0003cb 100644 --- a/include/iprt/nocrt/compiler/msc.h +++ b/include/iprt/nocrt/compiler/msc.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/fenv.h b/include/iprt/nocrt/fenv.h index 32d8163ce..710a6ee90 100644 --- a/include/iprt/nocrt/fenv.h +++ b/include/iprt/nocrt/fenv.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/inttypes.h b/include/iprt/nocrt/inttypes.h index dc42dbb4f..b86ec08d9 100644 --- a/include/iprt/nocrt/inttypes.h +++ b/include/iprt/nocrt/inttypes.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/limits.h b/include/iprt/nocrt/limits.h index 047f96443..2b377d162 100644 --- a/include/iprt/nocrt/limits.h +++ b/include/iprt/nocrt/limits.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/math.h b/include/iprt/nocrt/math.h index da37c5f65..568f17c14 100644 --- a/include/iprt/nocrt/math.h +++ b/include/iprt/nocrt/math.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/setjmp.h b/include/iprt/nocrt/setjmp.h index c7c7aaf0f..9f61a955b 100644 --- a/include/iprt/nocrt/setjmp.h +++ b/include/iprt/nocrt/setjmp.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/stdarg.h b/include/iprt/nocrt/stdarg.h index daa6e0a7a..3e52e0c1d 100644 --- a/include/iprt/nocrt/stdarg.h +++ b/include/iprt/nocrt/stdarg.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/stddef.h b/include/iprt/nocrt/stddef.h index 8487c26e0..372f597d1 100644 --- a/include/iprt/nocrt/stddef.h +++ b/include/iprt/nocrt/stddef.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/stdlib.h b/include/iprt/nocrt/stdlib.h index 9bfc1d2fc..7332ac267 100644 --- a/include/iprt/nocrt/stdlib.h +++ b/include/iprt/nocrt/stdlib.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/string.h b/include/iprt/nocrt/string.h index 2ed2f72d5..2ebee9b03 100644 --- a/include/iprt/nocrt/string.h +++ b/include/iprt/nocrt/string.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/x86/fenv.h b/include/iprt/nocrt/x86/fenv.h index 3a3db7dae..8dc2c90d9 100644 --- a/include/iprt/nocrt/x86/fenv.h +++ b/include/iprt/nocrt/x86/fenv.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/nocrt/x86/math.h b/include/iprt/nocrt/x86/math.h index 1d5dbed4b..6ed0337c0 100644 --- a/include/iprt/nocrt/x86/math.h +++ b/include/iprt/nocrt/x86/math.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/once.h b/include/iprt/once.h index 31afb7397..b30bcc055 100644 --- a/include/iprt/once.h +++ b/include/iprt/once.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/param.h b/include/iprt/param.h index 0e95e52db..5e80074a5 100644 --- a/include/iprt/param.h +++ b/include/iprt/param.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/path.h b/include/iprt/path.h index 7e51f87dc..e3fbc0a9e 100644 --- a/include/iprt/path.h +++ b/include/iprt/path.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -592,6 +592,24 @@ typedef FNRTPATHTRAVERSER *PFNRTPATHTRAVERSER; */ RTDECL(int) RTPathTraverseList(const char *pszPathList, char chSep, PFNRTPATHTRAVERSER pfnCallback, void *pvUser1, void *pvUser2); +/** + * Calculate a relative path between the two given paths. + * + * @returns IPRT status code. + * @retval VINF_SUCCESS on success. + * @retval VERR_BUFFER_OVERFLOW if the result is too big to fit within + * cbPathDst bytes. + * @retval VERR_NOT_SUPPORTED if both paths start with different volume specifiers. + * @param pszPathDst Where to store the resulting path. + * @param cbPathDst The size of the buffer pszPathDst points to, + * terminator included. + * @param pszPathFrom The path to start from creating the relative path. + * @param pszPathTo The path to reach with the created relative path. + */ +RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, + const char *pszPathFrom, + const char *pszPathTo); + #ifdef IN_RING3 diff --git a/include/iprt/pipe.h b/include/iprt/pipe.h index 11715c88a..ec9f891db 100644 --- a/include/iprt/pipe.h +++ b/include/iprt/pipe.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/power.h b/include/iprt/power.h index 7a2907341..499427369 100644 --- a/include/iprt/power.h +++ b/include/iprt/power.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/process.h b/include/iprt/process.h index b359e8ad4..790470f4f 100644 --- a/include/iprt/process.h +++ b/include/iprt/process.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/rand.h b/include/iprt/rand.h index f9fa5b80c..3a58c5ddb 100644 --- a/include/iprt/rand.h +++ b/include/iprt/rand.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/runtime-loader.h b/include/iprt/runtime-loader.h index 81ba40e65..9bbf17782 100644 --- a/include/iprt/runtime-loader.h +++ b/include/iprt/runtime-loader.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/runtime.h b/include/iprt/runtime.h index b70bfd1ba..eb1a4ae92 100644 --- a/include/iprt/runtime.h +++ b/include/iprt/runtime.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/s3.h b/include/iprt/s3.h index 2c200d5a4..3d448b019 100644 --- a/include/iprt/s3.h +++ b/include/iprt/s3.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/semaphore.h b/include/iprt/semaphore.h index 0eba39c70..23e59dbbc 100644 --- a/include/iprt/semaphore.h +++ b/include/iprt/semaphore.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/sg.h b/include/iprt/sg.h index d515de8b0..28adf7fd4 100644 --- a/include/iprt/sg.h +++ b/include/iprt/sg.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/sha.h b/include/iprt/sha.h index 046ca8137..a61426de6 100644 --- a/include/iprt/sha.h +++ b/include/iprt/sha.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/sort.h b/include/iprt/sort.h index dd4e93e50..b9f9e1fb1 100644 --- a/include/iprt/sort.h +++ b/include/iprt/sort.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/spinlock.h b/include/iprt/spinlock.h index 2c36a0fd2..49fa27346 100644 --- a/include/iprt/spinlock.h +++ b/include/iprt/spinlock.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/stdint.h b/include/iprt/stdint.h index 59c2d7266..f80095ccd 100644 --- a/include/iprt/stdint.h +++ b/include/iprt/stdint.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/strcache.h b/include/iprt/strcache.h index d38834835..b590d81f3 100644 --- a/include/iprt/strcache.h +++ b/include/iprt/strcache.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/stream.h b/include/iprt/stream.h index e8ac0d08a..720d6d84b 100644 --- a/include/iprt/stream.h +++ b/include/iprt/stream.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/symlink.h b/include/iprt/symlink.h index 85edf1ade..2d1e618f5 100644 --- a/include/iprt/symlink.h +++ b/include/iprt/symlink.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/system.h b/include/iprt/system.h index e7083e27c..d11f7b40a 100644 --- a/include/iprt/system.h +++ b/include/iprt/system.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/table.h b/include/iprt/table.h index 70023979d..6746b9637 100644 --- a/include/iprt/table.h +++ b/include/iprt/table.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/test.h b/include/iprt/test.h index c004ab4fe..a2a9ce8c8 100644 --- a/include/iprt/test.h +++ b/include/iprt/test.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/thread.h b/include/iprt/thread.h index 6bd63b99f..5fc9333a5 100644 --- a/include/iprt/thread.h +++ b/include/iprt/thread.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/time.h b/include/iprt/time.h index 7a94dcd70..f5e413170 100644 --- a/include/iprt/time.h +++ b/include/iprt/time.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/types.h b/include/iprt/types.h index e841dea52..b91e3f032 100644 --- a/include/iprt/types.h +++ b/include/iprt/types.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/uni.h b/include/iprt/uni.h index 6f0c23ecf..0f908f23f 100644 --- a/include/iprt/uni.h +++ b/include/iprt/uni.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/uuid.h b/include/iprt/uuid.h index 94604e2b0..1a9c97502 100644 --- a/include/iprt/uuid.h +++ b/include/iprt/uuid.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/vfs.h b/include/iprt/vfs.h index 6eefa01d5..8ed6f217c 100644 --- a/include/iprt/vfs.h +++ b/include/iprt/vfs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/vfslowlevel.h b/include/iprt/vfslowlevel.h index d5208cf4e..c077016e9 100644 --- a/include/iprt/vfslowlevel.h +++ b/include/iprt/vfslowlevel.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/include/iprt/zip.h b/include/iprt/zip.h index f3bfd4bd7..67e07ce71 100644 --- a/include/iprt/zip.h +++ b/include/iprt/zip.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp index afa7b69cb..440c4b81d 100644 --- a/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/VBoxControl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp index 7536162bb..38c8d3e58 100644 --- a/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp +++ b/src/VBox/Additions/common/VBoxControl/testcase/tstVBoxControl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c index 1720abb23..1552f7150 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c index b4270bae8..ab0942e12 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c @@ -1,4 +1,4 @@ -/* $Rev: 80789 $ */ +/* $Rev: 83687 $ */ /** @file * VBoxGuest - Linux specifics. * @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -196,7 +196,11 @@ static struct miscdevice g_MiscDeviceUser = /** PCI hotplug structure. */ -static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] = +static const struct pci_device_id +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0) +__devinitdata +#endif +g_VBoxGuestPciId[] = { { vendor: VMMDEV_VENDORID, diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp index a74f55953..53fbbfbd6 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 knut st. osmundsen <bird-src-spam@anduin.net> + * Copyright (C) 2007-2012 knut st. osmundsen <bird-src-spam@anduin.net> * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def index 4728686eb..15c049149 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.def @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2007 Oracle Corporation +; Copyright (C) 2007-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf index 6c23af13b..1e2c814fa 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.conf @@ -1,7 +1,7 @@ # # OpenSolaris Guest Driver Configuration # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp index fb844b78e..79520a412 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win-pnp.cpp @@ -2,7 +2,7 @@ * * VBoxGuest-win-pnp - Windows Plug'n'Play specifics. * - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp index 47cdf0e18..a19a2aab6 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp @@ -2,7 +2,7 @@ * * VBoxGuest - Windows specifics. * - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h index a3b02659e..c8d6a2036 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.h @@ -2,7 +2,7 @@ * * VBoxGuest - Windows specifics. * - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp index 594e0921c..5c4dada0b 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2012 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm index bb8757f19..1d5d11d62 100644 --- a/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm +++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuestA-os2.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2007 knut st. osmundsen <bird-src-spam@anduin.net> +; Copyright (C) 2007-2010 knut st. osmundsen <bird-src-spam@anduin.net> ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile index c0326547e..a25cc9f2c 100644 --- a/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/freebsd/Makefile @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2009 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/linux/Makefile b/src/VBox/Additions/common/VBoxGuest/linux/Makefile index 5b03a9a15..a3529d848 100644 --- a/src/VBox/Additions/common/VBoxGuest/linux/Makefile +++ b/src/VBox/Additions/common/VBoxGuest/linux/Makefile @@ -1,10 +1,10 @@ -# $Revision: 79403 $ +# $Revision: 83687 $ ## @file # VirtualBox Guest Additions Module Makefile. # # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest index f733baa02..f9f8a9d77 100755 --- a/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest +++ b/src/VBox/Additions/common/VBoxGuest/linux/files_vboxguest @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp index eb9a7b690..238da6dcb 100644 --- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp +++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestInst.cpp @@ -2,7 +2,7 @@ * * Small tool to (un)install the VBoxGuest device driver * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestMsg.mc b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestMsg.mc index 65a14b5f5..9cba3c3f2 100644 --- a/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestMsg.mc +++ b/src/VBox/Additions/common/VBoxGuest/win/VBoxGuestMsg.mc @@ -1,7 +1,7 @@ ; ; VBoxGuest Device Driver Messages ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp index ea1fe1873..ad336f9ae 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/GenericRequest.cpp @@ -1,10 +1,10 @@ -/* $Revision: 71271 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLibR0 - Generic VMMDev request management. */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp index f6aa77b46..0a6d65aa9 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCM.cpp @@ -1,4 +1,4 @@ -/* $Revision: 76853 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager. * @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp index fa2703aa2..7357398ec 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp @@ -1,10 +1,10 @@ -/* $Revision: 77449 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLib - Host-Guest Communication Manager internal functions, implemented by VBoxGuest */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp index c21ce6cdb..d6c667d37 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/Init.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/Init.cpp @@ -1,10 +1,10 @@ -/* $Revision: 79609 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLibR0 - Library initialization. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp index 51f1281d0..73e219a3d 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/PhysHeap.cpp @@ -1,10 +1,10 @@ -/* $Revision: 67140 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp index 9d7959005..c7c379ee9 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.cpp @@ -1,10 +1,10 @@ -/* $Revision: 81725 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLibR0 - IDC with VBoxGuest and HGCM helpers. */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h index 9e78e4041..b22ca1c9d 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h +++ b/src/VBox/Additions/common/VBoxGuestLib/SysHlp.h @@ -1,10 +1,10 @@ -/* $Revision: 78884 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxGuestLibR0 - System dependent helpers internal header. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h index 98cf339c7..6fe015da2 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -138,20 +138,13 @@ extern VBGLDATA g_vbgldata; * * @param a_fLocked For the windows shared folders workarounds. * - * @remarks Disable the PageList feature for 64-bit Windows, because shared - * folders do not work, if this is enabled. This should be reenabled - * again when the problem is fixed. - * @remarks Disabled the PageList feature for 32-bit Windows, see xTracker - * ticket 6096 and public ticket 10290. Hopefully this is the same - * issue as on Windows/AMD64. + * @remarks Disabled the PageList feature for locked memory on Windows, + * because a new MDL is created by VBGL to get the page addresses + * and the pages from the MDL are marked as dirty when they should not. */ #if defined(RT_OS_WINDOWS) -# ifdef RT_ARCH_AMD64 -# define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) ( 0 ) -# else -# define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) \ - ( !(a_fLocked) && (g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) ) -# endif +# define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) \ + ( !(a_fLocked) && (g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) ) #else # define VBGLR0_CAN_USE_PHYS_PAGE_LIST(a_fLocked) \ ( !!(g_vbgldata.hostVersion.features & VMMDEV_HVF_HGCM_PHYS_PAGE_LIST) ) diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h index a36e81291..463c13dc3 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBGLR3Internal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h index 0046f8ea3..fccd343ec 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestLog.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c index a792acafd..f05111309 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c @@ -1,10 +1,10 @@ -/* $Revision: 76380 $ */ +/* $Revision: 83629 $ */ /** @file * VBoxGuestR0LibSharedFolders - Ring 0 Shared Folders calls. */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -442,6 +442,52 @@ DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, return rc; } +DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, + uint64_t offset, uint32_t *pcbBuffer, + uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) +{ + uint32_t cbToRead = *pcbBuffer; + uint32_t cbData = sizeof(VBoxSFRead) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]); + VBoxSFRead *pData = (VBoxSFRead *)RTMemTmpAlloc(cbData); + HGCMPageListInfo *pPgLst = (HGCMPageListInfo *)(pData + 1); + uint16_t iPage; + int rc; + + if (RT_UNLIKELY(!pData)) + return VERR_NO_TMP_MEMORY; + + VBOX_INIT_CALL(&pData->callInfo, READ, pClient); + + pData->root.type = VMMDevHGCMParmType_32bit; + pData->root.u.value32 = pMap->root; + + pData->handle.type = VMMDevHGCMParmType_64bit; + pData->handle.u.value64 = hFile; + pData->offset.type = VMMDevHGCMParmType_64bit; + pData->offset.u.value64 = offset; + pData->cb.type = VMMDevHGCMParmType_32bit; + pData->cb.u.value32 = cbToRead; + pData->buffer.type = VMMDevHGCMParmType_PageList; + pData->buffer.u.PageList.size = cbToRead; + pData->buffer.u.PageList.offset = sizeof(VBoxSFRead); + + pPgLst->flags = VBOX_HGCM_F_PARM_DIRECTION_FROM_HOST; + pPgLst->offFirstPage = offFirstPage; + pPgLst->cPages = cPages; + for (iPage = 0; iPage < cPages; iPage++) + pPgLst->aPages[iPage] = paPages[iPage]; + + rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData); + if (RT_SUCCESS (rc)) + { + rc = pData->callInfo.result; + *pcbBuffer = pData->cb.u.value32; + } + + RTMemTmpFree(pData); + return rc; +} + DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked) { @@ -524,6 +570,52 @@ DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHAND } +DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, + uint64_t offset, uint32_t *pcbBuffer, + uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) +{ + uint32_t cbToWrite = *pcbBuffer; + uint32_t cbData = sizeof(VBoxSFWrite) + RT_UOFFSETOF(HGCMPageListInfo, aPages[cPages]); + VBoxSFWrite *pData = (VBoxSFWrite *)RTMemTmpAlloc(cbData); + HGCMPageListInfo *pPgLst = (HGCMPageListInfo *)(pData + 1); + uint16_t iPage; + int rc; + + if (RT_UNLIKELY(!pData)) + return VERR_NO_TMP_MEMORY; + + VBOX_INIT_CALL(&pData->callInfo, WRITE, pClient); + + pData->root.type = VMMDevHGCMParmType_32bit; + pData->root.u.value32 = pMap->root; + + pData->handle.type = VMMDevHGCMParmType_64bit; + pData->handle.u.value64 = hFile; + pData->offset.type = VMMDevHGCMParmType_64bit; + pData->offset.u.value64 = offset; + pData->cb.type = VMMDevHGCMParmType_32bit; + pData->cb.u.value32 = cbToWrite; + pData->buffer.type = VMMDevHGCMParmType_PageList; + pData->buffer.u.PageList.size = cbToWrite; + pData->buffer.u.PageList.offset = sizeof(VBoxSFWrite); + + pPgLst->flags = VBOX_HGCM_F_PARM_DIRECTION_TO_HOST; + pPgLst->offFirstPage = offFirstPage; + pPgLst->cPages = cPages; + for (iPage = 0; iPage < cPages; iPage++) + pPgLst->aPages[iPage] = paPages[iPage]; + + rc = VbglHGCMCall (pClient->handle, &pData->callInfo, cbData); + if (RT_SUCCESS (rc)) + { + rc = pData->callInfo.result; + *pcbBuffer = pData->cb.u.value32; + } + + RTMemTmpFree(pData); + return rc; +} + DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile) { int rc = VINF_SUCCESS; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h index 3947a13da..5e5c95761 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -172,8 +172,14 @@ DECLVBGL(int) vboxCallRename (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pS DECLVBGL(int) vboxCallFlush (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile); DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); +DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, + uint64_t offset, uint32_t *pcbBuffer, + uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages); DECLVBGL(int) vboxCallWrite (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer); +DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, + uint64_t offset, uint32_t *pcbBuffer, + uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages); DECLVBGL(int) vboxCallLock (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock); diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp index 32ccf4c43..662d70b69 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3Lib.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp index 2c13b0aa1..045d46706 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibClipboard.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp index a25515e19..7809a4200 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibCredentials.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp index a314e522c..2687112fe 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibDaemonize.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2009 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp index b8a3fa7f2..a5e165015 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGR.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp index 514d60c93..f28cafed6 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp index 32c7d7968..4fb9bf59b 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestProp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp index 03cfce8fd..e253838ba 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibHostVersion.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp index 25fc44ee6..52e39ab22 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibMouse.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp index aa146281b..60b47a08a 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSeamless.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp index 3476f0320..1ebec9cd6 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibSharedFolders.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp index c03b2c222..13830afe7 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibTime.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp index 3298d85d8..d76104351 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibVideo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2009 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp b/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp index 007792376..beda4bb27 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VMMDev.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp index a87645569..04f69636c 100644 --- a/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp +++ b/src/VBox/Additions/common/VBoxGuestLib/VbglR0CanUsePhysPageList.cpp @@ -1,10 +1,10 @@ -/* $Revision: 77449 $ */ +/* $Revision: 83629 $ */ /** @file * VBoxGuestLibR0 - Physical memory heap. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -34,6 +34,9 @@ */ DECLR0VBGL(bool) VbglR0CanUsePhysPageList(void) { + /* a_fLocked is false, because the actual capability of the host is requested. + * See VBGLR0_CAN_USE_PHYS_PAGE_LIST definition. + */ int rc = vbglR0Enter(); return RT_SUCCESS(rc) && VBGLR0_CAN_USE_PHYS_PAGE_LIST(/*a_fLocked =*/ false); diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-os2.def b/src/VBox/Additions/common/VBoxService/VBoxService-os2.def index 2c14ceede..aed84c68a 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-os2.def +++ b/src/VBox/Additions/common/VBoxService/VBoxService-os2.def @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2007 Oracle Corporation +; Copyright (C) 2007-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp index 9a990e2a6..eb970fa8a 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxService.cpp b/src/VBox/Additions/common/VBoxService/VBoxService.cpp index 639b97f78..3e442cddd 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxService.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxService.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp index 06d172e40..04e4d52de 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceAutoMount.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp index ecfd743c3..3d5d0a867 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceBalloon.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp index 07778cd70..794c19bf6 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -41,6 +41,8 @@ using namespace guestControl; static uint32_t g_uControlIntervalMS = 0; /** The semaphore we're blocking our main control thread on. */ static RTSEMEVENTMULTI g_hControlEvent = NIL_RTSEMEVENTMULTI; +/** The VM session ID. Changes whenever the VM is restored or reset. */ +static uint64_t g_idControlSession; /** The guest control service client ID. */ static uint32_t g_uControlSvcClientID = 0; /** How many started guest processes are kept into memory for supplying @@ -69,17 +71,19 @@ static uint32_t g_uControlFileCount = 0; * Internal Functions * *******************************************************************************/ /** @todo Shorten "VBoxServiceControl" to "gstsvcCntl". */ -static int VBoxServiceControlReapThreads(void); -static int VBoxServiceControlStartAllowed(bool *pbAllowed); -static int VBoxServiceControlHandleCmdStartProc(uint32_t u32ClientId, uint32_t uNumParms); -static int VBoxServiceControlHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms, void *pvScratchBuf, size_t cbScratchBuf); -static int VBoxServiceControlHandleCmdGetOutput(uint32_t u32ClientId, uint32_t uNumParms); -static int VBoxServiceControlHandleFileOpen(uint32_t idClient, uint32_t cParms); -static int VBoxServiceControlHandleFileClose(uint32_t idClient, uint32_t cParms); -static int VBoxServiceControlHandleFileRead(uint32_t idClient, uint32_t cParms); -static int VBoxServiceControlHandleFileWrite(uint32_t idClient, uint32_t cParms, void *pvScratchBuf, size_t cbScratchBuf); -static int VBoxServiceControlHandleFileSeek(uint32_t idClient, uint32_t cParms); -static int VBoxServiceControlHandleFileTell(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlHandleCmdStartProc(uint32_t u32ClientId, uint32_t uNumParms); +static int VBoxServiceControlHandleCmdSetInput(uint32_t u32ClientId, uint32_t uNumParms, void *pvScratchBuf, size_t cbScratchBuf); +static int VBoxServiceControlHandleCmdGetOutput(uint32_t u32ClientId, uint32_t uNumParms); +static int VBoxServiceControlHandleFileOpen(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlHandleFileClose(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlHandleFileRead(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlHandleFileWrite(uint32_t idClient, uint32_t cParms, void *pvScratchBuf, size_t cbScratchBuf); +static int VBoxServiceControlHandleFileSeek(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlHandleFileTell(uint32_t idClient, uint32_t cParms); +static int VBoxServiceControlReapThreads(void); +static void VBoxServiceControlShutdown(void); +static int vboxServiceControlSessionCloseAll(void); +static int VBoxServiceControlStartAllowed(bool *pbAllowed); #ifdef DEBUG static int vboxServiceControlDump(const char *pszFileName, void *pvBuf, size_t cbBuf) @@ -193,6 +197,9 @@ static DECLCALLBACK(int) VBoxServiceControlInit(void) int rc = RTSemEventMultiCreate(&g_hControlEvent); AssertRCReturn(rc, rc); + VbglR3GetSessionId(&g_idControlSession); + /* The status code is ignored as this information is not available with VBox < 3.2.10. */ + rc = VbglR3GuestCtrlConnect(&g_uControlSvcClientID); if (RT_SUCCESS(rc)) { @@ -265,10 +272,25 @@ DECLCALLBACK(int) VBoxServiceControlWorker(bool volatile *pfShutdown) if (RT_SUCCESS(rc)) { VBoxServiceVerbose(3, "Msg=%u (%u parms) retrieved\n", uMsg, cParms); + + uint64_t idNewSession = g_idControlSession; + int rc2 = VbglR3GetSessionId(&idNewSession); + if ( RT_SUCCESS(rc2) + && (idNewSession != g_idControlSession)) + { + VBoxServiceVerbose(1, "The VM session ID changed\n"); + g_idControlSession = idNewSession; + + /* Close all opened guest sessions -- all context IDs, sessions etc. + * are now invalid. */ + rc2 = vboxServiceControlSessionCloseAll(); + AssertRC(rc2); + } + switch (uMsg) { case HOST_CANCEL_PENDING_WAITS: - VBoxServiceVerbose(3, "Host asked us to quit ...\n"); + VBoxServiceVerbose(1, "We were asked to quit ...\n"); break; case HOST_EXEC_CMD: @@ -320,7 +342,6 @@ DECLCALLBACK(int) VBoxServiceControlWorker(bool volatile *pfShutdown) if ( *pfShutdown || (RT_SUCCESS(rc) && uMsg == HOST_CANCEL_PENDING_WAITS)) { - rc = VINF_SUCCESS; break; } @@ -328,6 +349,8 @@ DECLCALLBACK(int) VBoxServiceControlWorker(bool volatile *pfShutdown) RTThreadYield(); } + VBoxServiceVerbose(0, "Guest control service stopped\n"); + /* Delete scratch buffer. */ if (pvScratchBuf) RTMemFree(pvScratchBuf); @@ -1033,11 +1056,14 @@ static int VBoxServiceControlReapThreads(void) /** - * Destroys all guest process threads which are still active. + * Closes a formerly opened guest session. + * + * @return IPRT status code. + * @param uSessionID Guest session to close. */ -static void VBoxServiceControlShutdown(void) +static int vboxServiceControlSessionClose(uint32_t uSessionID) { - VBoxServiceVerbose(2, "Shutting down ...\n"); + /* Note: Sessions are not implemented yet, so just shutdown all started guest processes. */ /* Signal all threads in the active list that we want to shutdown. */ PVBOXSERVICECTRLTHREAD pThread; @@ -1055,7 +1081,10 @@ static void VBoxServiceControlShutdown(void) 30 * 1000 /* Wait 30 seconds max. */, NULL /* rc */); if (RT_FAILURE(rc2)) + { VBoxServiceError("Guest process thread failed to stop; rc=%Rrc\n", rc2); + /* Keep going. */ + } if (fLast) break; @@ -1063,15 +1092,40 @@ static void VBoxServiceControlShutdown(void) pThread = pNext; } - int rc2 = VBoxServiceControlReapThreads(); - if (RT_FAILURE(rc2)) - VBoxServiceError("Reaping inactive threads failed with rc=%Rrc\n", rc2); + int rc = VBoxServiceControlReapThreads(); + if (RT_FAILURE(rc)) + VBoxServiceError("Reaping inactive threads failed with rc=%Rrc\n", rc); AssertMsg(RTListIsEmpty(&g_lstControlThreadsActive), ("Guest process active thread list still contains entries when it should not\n")); AssertMsg(RTListIsEmpty(&g_lstControlThreadsInactive), ("Guest process inactive thread list still contains entries when it should not\n")); + return rc; +} + + +/** + * Closes (shuts down) all opened guest sessions. + * + * @return IPRT status code. + */ +static int vboxServiceControlSessionCloseAll(void) +{ + return vboxServiceControlSessionClose(0 /* Session ID, not used yet */); +} + + +/** + * Destroys all guest process threads which are still active. + */ +static void VBoxServiceControlShutdown(void) +{ + VBoxServiceVerbose(2, "Shutting down ...\n"); + + int rc2 = vboxServiceControlSessionCloseAll(); + AssertRC(rc2); + /* Destroy critical section. */ RTCritSectDelete(&g_csControlThreads); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp index 78ec20a8b..503bcbaae 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1623,18 +1623,8 @@ static int VBoxServiceControlThreadProcessWorker(PVBOXSERVICECTRLTHREAD pThread) rc2, rc); } - VBoxServiceVerbose(3, "[PID %u]: Cancelling pending host requests (client ID=%u)\n", - pThread->uPID, pThread->uClientID); - rc2 = VbglR3GuestCtrlCancelPendingWaits(pThread->uClientID); - if (RT_FAILURE(rc2)) - { - VBoxServiceError("[PID %u]: Cancelling pending host requests failed; rc=%Rrc\n", - pThread->uPID, rc2); - if (RT_SUCCESS(rc)) - rc = rc2; - } - - /* Disconnect from guest control service. */ + /* Disconnect this client from the guest control service. This also cancels all + * outstanding host requests. */ VBoxServiceVerbose(3, "[PID %u]: Disconnecting (client ID=%u) ...\n", pThread->uPID, pThread->uClientID); VbglR3GuestCtrlDisconnect(pThread->uClientID); diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp index 53dc16759..9e80808ba 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp index 39c9912de..3e97d2bfa 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp index 3e4b8b1cf..13a671964 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h index 430f9a7df..eb3ac648e 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h index cf932cbe2..60296c55f 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceResource-win.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp index 112a296f8..db7e8a323 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceStats.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp index 3371cb2f8..3c84e28ad 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp index b09ef3e82..8bc61846c 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceUtils.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2012 Oracle Corporation + * Copyright (C) 2009-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -110,7 +110,8 @@ int VBoxServiceReadProp(uint32_t u32ClientId, const char *pszPropName, break; /* done */ } - RTMemFree(pvBuf); + if (pvBuf) + RTMemFree(pvBuf); return rc; } @@ -167,8 +168,11 @@ int VBoxServiceReadPropUInt32(uint32_t u32ClientId, const char *pszPropName, int VBoxServiceReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool fReadOnly, char **ppszValue, char **ppszFlags, uint64_t *puTimestamp) { - char *pszFlags; - int rc = VBoxServiceReadProp(u32ClientId, pszPropName, ppszValue, &pszFlags, puTimestamp); + AssertPtrReturn(ppszValue, VERR_INVALID_PARAMETER); + + char *pszValue = NULL; + char *pszFlags = NULL; + int rc = VBoxServiceReadProp(u32ClientId, pszPropName, &pszValue, &pszFlags, puTimestamp); if (RT_SUCCESS(rc)) { /* Check security bits. */ @@ -180,10 +184,22 @@ int VBoxServiceReadHostProp(uint32_t u32ClientId, const char *pszPropName, bool rc = VERR_ACCESS_DENIED; } - if (ppszFlags) - *ppszFlags = pszFlags; + if (RT_SUCCESS(rc)) + { + *ppszValue = pszValue; + + if (ppszFlags) + *ppszFlags = pszFlags; + else if (pszFlags) + RTStrFree(pszFlags); + } else - RTStrFree(pszFlags); + { + if (pszValue) + RTStrFree(pszValue); + if (pszFlags) + RTStrFree(pszFlags); + } } return rc; diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp index a23128a58..28a900620 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -40,6 +40,8 @@ #include "VBoxServiceInternal.h" #include "VBoxServiceUtils.h" +static uint32_t s_uGuestPropClientID = 0; +static uint32_t s_uIter = 0; /******************************************************************************* * Structures and Typedefs * @@ -52,11 +54,11 @@ typedef struct WCHAR wszLogonDomain[_MAX_PATH]; /** Number of assigned user processes. */ ULONG ulNumProcs; - /** Last (highest) session number. This + /** Last (highest) session ID. This * is needed for distinguishing old session * process counts from new (current) session * ones. */ - ULONG ulSession; + ULONG ulLastSession; } VBOXSERVICEVMINFOUSER, *PVBOXSERVICEVMINFOUSER; /** Structure for the file information lookup. */ @@ -71,6 +73,8 @@ typedef struct { /** The PID. */ DWORD id; + /** The SID. */ + PSID pSid; /** The LUID. */ LUID luid; /** Interactive process. */ @@ -84,7 +88,7 @@ typedef struct uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs); bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER a_pUserInfo, PLUID a_pSession); int VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppProc, DWORD *pdwCount); -void VBoxServiceVMInfoWinProcessesFree(PVBOXSERVICEVMINFOPROC paProcs); +void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs); typedef BOOL WINAPI FNQUERYFULLPROCESSIMAGENAME(HANDLE, DWORD, LPTSTR, PDWORD); typedef FNQUERYFULLPROCESSIMAGENAME *PFNQUERYFULLPROCESSIMAGENAME; @@ -92,6 +96,28 @@ typedef FNQUERYFULLPROCESSIMAGENAME *PFNQUERYFULLPROCESSIMAGENAME; #ifndef TARGET_NT4 +static bool vboxServiceVMInfoSession0Separation(void) +{ + /** @todo Only do this once. Later. */ + OSVERSIONINFOEX OSInfoEx; + RT_ZERO(OSInfoEx); + OSInfoEx.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); + if ( !GetVersionEx((LPOSVERSIONINFO) &OSInfoEx) + || OSInfoEx.dwPlatformId != VER_PLATFORM_WIN32_NT) + { + /* Platform other than NT (e.g. Win9x) not supported. */ + return false; + } + + if ( OSInfoEx.dwMajorVersion >= 6 + && OSInfoEx.dwMinorVersion >= 0) + { + return true; + } + + return false; +} + /** * Retrieves the module name of a given process. * @@ -211,10 +237,13 @@ static int VBoxServiceVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pPro case TokenGroups: dwTokenInfoSize = 0; - /* Allocating will follow in a second step. */ + /* Allocation will follow in a second step. */ break; - /** @todo Implement more token classes here. */ + case TokenUser: + dwTokenInfoSize = 0; + /* Allocation will follow in a second step. */ + break; default: VBoxServiceError("Token class not implemented: %ld", tkClass); @@ -242,6 +271,14 @@ static int VBoxServiceVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pPro dwTokenInfoSize = dwRetLength; break; + case TokenUser: + pvTokenInfo = (PTOKEN_USER)HeapAlloc(GetProcessHeap(), + HEAP_ZERO_MEMORY, dwRetLength); + if (!pvTokenInfo) + dwErr = GetLastError(); + dwTokenInfoSize = dwRetLength; + break; + default: AssertMsgFailed(("Re-allocating of token information for token class not implemented\n")); break; @@ -264,6 +301,7 @@ static int VBoxServiceVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pPro case TokenStatistics: { PTOKEN_STATISTICS pStats = (PTOKEN_STATISTICS)pvTokenInfo; + AssertPtr(pStats); memcpy(&pProc->luid, &pStats->AuthenticationId, sizeof(LUID)); /** @todo Add more information of TOKEN_STATISTICS as needed. */ break; @@ -309,6 +347,34 @@ static int VBoxServiceVMInfoWinProcessesGetTokenInfo(PVBOXSERVICEVMINFOPROC pPro break; } + case TokenUser: + { + PTOKEN_USER pUser = (PTOKEN_USER)pvTokenInfo; + AssertPtr(pUser); + + DWORD dwLength = GetLengthSid(pUser->User.Sid); + Assert(dwLength); + if (dwLength) + { + pProc->pSid = (PSID)RTMemAlloc(dwLength); + AssertPtr(pProc->pSid); + if (CopySid(dwLength, pProc->pSid, pUser->User.Sid)) + { + if (!IsValidSid(pProc->pSid)) + dwErr = ERROR_INVALID_NAME; + } + else + dwErr = GetLastError(); + } + else + dwErr = ERROR_NO_DATA; + + if (dwErr != ERROR_SUCCESS) + VBoxServiceError("Error retrieving SID of process PID=%ld: %ld\n", + pProc->id, dwErr); + break; + } + default: AssertMsgFailed(("Unhandled token information class\n")); break; @@ -396,23 +462,22 @@ int VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppaProcs, PDW for (DWORD i = 0; i < cProcesses; i++) { paProcs[i].id = paPID[i]; - rc = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups); - if (RT_FAILURE(rc)) - { - /* Because some processes cannot be opened/parsed on - Windows, we should not consider to be this an error here. */ - rc = VINF_SUCCESS; - } - else - { - rc = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics); - if (RT_FAILURE(rc)) - { - /* Because some processes cannot be opened/parsed on - Windows, we should not consider to be this an error here. */ - rc = VINF_SUCCESS; - } - } + paProcs[i].pSid = NULL; + + int rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenUser); + if (RT_FAILURE(rc2) && g_cVerbosity) + VBoxServiceError("Get token class \"user\" for process %ld failed, rc=%Rrc\n", + paProcs[i].id, rc2); + + rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenGroups); + if (RT_FAILURE(rc2) && g_cVerbosity) + VBoxServiceError("Get token class \"groups\" for process %ld failed, rc=%Rrc\n", + paProcs[i].id, rc2); + + rc2 = VBoxServiceVMInfoWinProcessesGetTokenInfo(&paProcs[i], TokenStatistics); + if (RT_FAILURE(rc2) && g_cVerbosity) + VBoxServiceError("Get token class \"statistics\" for process %ld failed, rc=%Rrc\n", + paProcs[i].id, rc2); } /* Save number of processes */ @@ -438,8 +503,13 @@ int VBoxServiceVMInfoWinProcessesEnumerate(PVBOXSERVICEVMINFOPROC *ppaProcs, PDW * * @param paProcs What */ -void VBoxServiceVMInfoWinProcessesFree(PVBOXSERVICEVMINFOPROC paProcs) +void VBoxServiceVMInfoWinProcessesFree(DWORD cProcs, PVBOXSERVICEVMINFOPROC paProcs) { + for (DWORD i = 0; i < cProcs; i++) + { + if (paProcs[i].pSid) + RTMemFree(paProcs[i].pSid); + } RTMemFree(paProcs); } @@ -447,14 +517,14 @@ void VBoxServiceVMInfoWinProcessesFree(PVBOXSERVICEVMINFOPROC paProcs) * Determines whether the specified session has processes on the system. * * @returns Number of processes found for a specified session. - * @param pSession The session. + * @param pSession The current user's SID. * @param paProcs The process snapshot. * @param cProcs The number of processes in the snaphot. * @param puSession Looked up session number. Optional. */ uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, PVBOXSERVICEVMINFOPROC const paProcs, DWORD cProcs, - PULONG puSession) + PULONG puTerminalSession) { if (!pSession) { @@ -466,10 +536,18 @@ uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, NTSTATUS rcNt = LsaGetLogonSessionData(pSession, &pSessionData); if (rcNt != STATUS_SUCCESS) { - VBoxServiceError("Could not get logon session data! rcNt=%#x", rcNt); + VBoxServiceError("Could not get logon session data! rcNt=%#x\n", rcNt); return 0; } + if (!IsValidSid(pSessionData->Sid)) + { + VBoxServiceError("User SID=%p is not valid\n", pSessionData->Sid); + return 0; + } + + int rc = VINF_SUCCESS; + /* * Even if a user seems to be logged in, it could be a stale/orphaned logon * session. So check if we have some processes bound to it by comparing the @@ -478,40 +556,35 @@ uint32_t VBoxServiceVMInfoWinSessionHasProcesses(PLUID pSession, uint32_t cNumProcs = 0; for (DWORD i = 0; i < cProcs; i++) { - VBoxServiceVerbose(4, "PID=%ld: (Interactive: %RTbool) %ld:%ld <-> %ld:%ld\n", - paProcs[i].id, paProcs[i].fInteractive, - paProcs[i].luid.HighPart, paProcs[i].luid.LowPart, - pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart); if (g_cVerbosity) { TCHAR szModule[_1K]; - int rc2 = VBoxServiceVMInfoWinProcessesGetModuleName(&paProcs[i], szModule, sizeof(szModule)); - if (RT_SUCCESS(rc2)) + rc = VBoxServiceVMInfoWinProcessesGetModuleName(&paProcs[i], szModule, sizeof(szModule)); + if (RT_SUCCESS(rc)) VBoxServiceVerbose(4, "PID=%ld: %s\n", paProcs[i].id, szModule); } - if ( paProcs[i].fInteractive - && ( paProcs[i].luid.HighPart == pSessionData->LogonId.HighPart - && paProcs[i].luid.LowPart == pSessionData->LogonId.LowPart)) + PSID pProcSID = paProcs[i].pSid; + if ( RT_SUCCESS(rc) + && pProcSID + && IsValidSid(pProcSID)) { - cNumProcs++; - if (!g_cVerbosity) /* We want a bit more info on higher verbosity. */ - break; + if ( EqualSid(pSessionData->Sid, paProcs[i].pSid) + && paProcs[i].fInteractive) + { + cNumProcs++; + if (!g_cVerbosity) /* We want a bit more info on higher verbosity. */ + break; + } } } - if (g_cVerbosity) - VBoxServiceVerbose(3, "Session %u has %u processes total\n", - pSessionData->Session, cNumProcs); - else - VBoxServiceVerbose(3, "Session %u has at least one process\n", - pSessionData->Session); - - if (puSession) - *puSession = pSessionData->Session; + if (puTerminalSession) + *puTerminalSession = pSessionData->Session; LsaFreeReturnBuffer(pSessionData); + return cNumProcs; } @@ -586,12 +659,25 @@ bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSes return false; } - VBoxServiceVerbose(3, "Session data: Name=%ls, Session=%u, LogonID=%ld,%ld, LogonType=%ld\n", + VBoxServiceVerbose(3, "Session data: Name=%ls, SessionID=%RU32, LogonID=%ld,%ld, LogonType=%ld\n", pSessionData->UserName.Buffer, pSessionData->Session, pSessionData->LogonId.HighPart, pSessionData->LogonId.LowPart, pSessionData->LogonType); + if (vboxServiceVMInfoSession0Separation()) + { + /* Starting at Windows Vista user sessions begin with session 1, so + * ignore (stale) session 0 users. */ + if ( pSessionData->Session == 0 + /* Also check the logon time. */ + || pSessionData->LogonTime.QuadPart == 0) + { + LsaFreeReturnBuffer(pSessionData); + return false; + } + } + /* * Only handle users which can login interactively or logged in * remotely over native RDP. @@ -711,6 +797,9 @@ bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSes pUserInfo->wszUser, fFoundUser ? "is" : "is not"); } + if (fFoundUser) + pUserInfo->ulLastSession = pSessionData->Session; + LsaFreeReturnBuffer(pSessionData); return fFoundUser; } @@ -727,9 +816,15 @@ bool VBoxServiceVMInfoWinIsLoggedIn(PVBOXSERVICEVMINFOUSER pUserInfo, PLUID pSes */ int VBoxServiceVMInfoWinWriteUsers(char **ppszUserList, uint32_t *pcUsersInList) { + AssertPtrReturn(ppszUserList, VERR_INVALID_POINTER); + AssertPtrReturn(pcUsersInList, VERR_INVALID_POINTER); + PLUID paSessions = NULL; ULONG cSessions = 0; + int rc2 = VbglR3GuestPropConnect(&s_uGuestPropClientID); + AssertRC(rc2); + /* This function can report stale or orphaned interactive logon sessions of already logged off users (especially in Windows 2000). */ NTSTATUS rcNt = LsaEnumerateLogonSessions(&cSessions, &paSessions); @@ -777,56 +872,73 @@ int VBoxServiceVMInfoWinWriteUsers(char **ppszUserList, uint32_t *pcUsersInList) else { ULONG cUniqueUsers = 0; + + /** + * Note: The cSessions loop variable does *not* correlate with + * the Windows session ID! + */ for (ULONG i = 0; i < cSessions; i++) { - VBoxServiceVerbose(3, "Handling session %u\n", i); + VBoxServiceVerbose(3, "Handling session %RU32 (of %RU32)\n", i + 1, cSessions); - VBOXSERVICEVMINFOUSER UserInfo; - if (VBoxServiceVMInfoWinIsLoggedIn(&UserInfo, &paSessions[i])) + VBOXSERVICEVMINFOUSER userSession; + if (VBoxServiceVMInfoWinIsLoggedIn(&userSession, &paSessions[i])) { - VBoxServiceVerbose(4, "Handling user=%ls, domain=%ls, package=%ls\n", - UserInfo.wszUser, UserInfo.wszLogonDomain, UserInfo.wszAuthenticationPackage); + VBoxServiceVerbose(4, "Handling user=%ls, domain=%ls, package=%ls, session=%RU32\n", + userSession.wszUser, userSession.wszLogonDomain, userSession.wszAuthenticationPackage, + userSession.ulLastSession); /* Retrieve assigned processes of current session. */ - ULONG ulSession; - uint32_t cSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs, &ulSession); + uint32_t cCurSessionProcs = VBoxServiceVMInfoWinSessionHasProcesses(&paSessions[i], paProcs, cProcs, + NULL /* Terminal session ID */); /* Don't return here when current session does not have assigned processes * anymore -- in that case we have to search through the unique users list below * and see if got a stale user/session entry. */ + if (g_cVerbosity > 3) + { + char szDebugSessionPath[255]; RTStrPrintf(szDebugSessionPath, sizeof(szDebugSessionPath), "/VirtualBox/GuestInfo/Debug/LSA/Session/%RU32", + userSession.ulLastSession); + VBoxServiceWritePropF(s_uGuestPropClientID, szDebugSessionPath, + "#%RU32: cSessionProcs=%RU32 (of %RU32 procs total)", s_uIter, cCurSessionProcs, cProcs); + } + bool fFoundUser = false; - for (ULONG i = 0; i < cUniqueUsers; i++) + for (ULONG a = 0; a < cUniqueUsers; a++) { - if ( !wcscmp(UserInfo.wszUser, pUserInfo[i].wszUser) - && !wcscmp(UserInfo.wszLogonDomain, pUserInfo[i].wszLogonDomain) - && !wcscmp(UserInfo.wszAuthenticationPackage, pUserInfo[i].wszAuthenticationPackage) - && cSessionProcs) + PVBOXSERVICEVMINFOUSER pCurUser = &pUserInfo[a]; + AssertPtr(pCurUser); + + if ( !wcscmp(userSession.wszUser, pCurUser->wszUser) + && !wcscmp(userSession.wszLogonDomain, pCurUser->wszLogonDomain) + && !wcscmp(userSession.wszAuthenticationPackage, pCurUser->wszAuthenticationPackage)) { /* * Only respect the highest session for the current user. */ - if (ulSession > pUserInfo[i].ulSession) + if (userSession.ulLastSession > pCurUser->ulLastSession) { - VBoxServiceVerbose(4, "Updating user=%ls to %u processes (last session: %u)\n", - UserInfo.wszUser, cSessionProcs, ulSession); + VBoxServiceVerbose(4, "Updating user=%ls to %u processes (last used session: %RU32)\n", + pCurUser->wszUser, cCurSessionProcs, userSession.ulLastSession); - pUserInfo[i].ulNumProcs = cSessionProcs; - pUserInfo[i].ulSession = ulSession; + if (!cCurSessionProcs) + VBoxServiceVerbose(3, "Stale session for user=%ls detected! Processes: %RU32 -> %RU32, Session: %RU32 -> %RU32\n", + pCurUser->wszUser, + pCurUser->ulNumProcs, cCurSessionProcs, + pCurUser->ulLastSession, userSession.ulLastSession); - if (!cSessionProcs) - VBoxServiceVerbose(3, "Stale session for user=%ls detected! Old processes: %u, new: %u\n", - pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, cSessionProcs); + pCurUser->ulNumProcs = cCurSessionProcs; + pCurUser->ulLastSession = userSession.ulLastSession; } /* There can be multiple session objects using the same session ID for the * current user -- so when we got the same session again just add the found * processes to it. */ - else if (pUserInfo[i].ulSession == ulSession) + else if (pCurUser->ulLastSession == userSession.ulLastSession) { - VBoxServiceVerbose(4, "Adding %u processes to user=%ls (session %u)\n", - cSessionProcs, UserInfo.wszUser, ulSession); + VBoxServiceVerbose(4, "Updating processes for user=%ls (old procs=%RU32, new procs=%RU32, session=%RU32)\n", + pCurUser->wszUser, pCurUser->ulNumProcs, cCurSessionProcs, pCurUser->ulLastSession); - pUserInfo[i].ulNumProcs += cSessionProcs; - pUserInfo[i].ulSession = ulSession; + pCurUser->ulNumProcs = cCurSessionProcs; } fFoundUser = true; @@ -836,28 +948,44 @@ int VBoxServiceVMInfoWinWriteUsers(char **ppszUserList, uint32_t *pcUsersInList) if (!fFoundUser) { - VBoxServiceVerbose(4, "Adding new user=%ls (session %u) with %u processes\n", - UserInfo.wszUser, ulSession, cSessionProcs); + VBoxServiceVerbose(4, "Adding new user=%ls (session=%RU32) with %RU32 processes\n", + userSession.wszUser, userSession.ulLastSession, cCurSessionProcs); - memcpy(&pUserInfo[cUniqueUsers], &UserInfo, sizeof(VBOXSERVICEVMINFOUSER)); - pUserInfo[cUniqueUsers].ulNumProcs = cSessionProcs; - pUserInfo[cUniqueUsers].ulSession = ulSession; + memcpy(&pUserInfo[cUniqueUsers], &userSession, sizeof(VBOXSERVICEVMINFOUSER)); + pUserInfo[cUniqueUsers].ulNumProcs = cCurSessionProcs; cUniqueUsers++; Assert(cUniqueUsers <= cSessions); } } } + if (g_cVerbosity > 3) + VBoxServiceWritePropF(s_uGuestPropClientID, "/VirtualBox/GuestInfo/Debug/LSA", + "#%RU32: cSessions=%RU32, cProcs=%RU32, cUniqueUsers=%RU32", + s_uIter, cSessions, cProcs, cUniqueUsers); + VBoxServiceVerbose(3, "Found %u unique logged-in user(s)\n", cUniqueUsers); *pcUsersInList = 0; for (ULONG i = 0; i < cUniqueUsers; i++) { + if (g_cVerbosity > 3) + { + char szDebugUserPath[255]; RTStrPrintf(szDebugUserPath, sizeof(szDebugUserPath), "/VirtualBox/GuestInfo/Debug/LSA/User/%RU32", i); + VBoxServiceWritePropF(s_uGuestPropClientID, szDebugUserPath, + "#%RU32: szName=%ls, sessionID=%RU32, cProcs=%RU32", + s_uIter, pUserInfo[i].wszUser, pUserInfo[i].ulLastSession, pUserInfo[i].ulNumProcs); + } + + bool fAddUser = false; if (pUserInfo[i].ulNumProcs) + fAddUser = true; + + if (fAddUser) { - VBoxServiceVerbose(3, "User %ls has %ld processes (session %u)\n", - pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, pUserInfo[i].ulSession); + VBoxServiceVerbose(3, "User \"%ls\" has %RU32 interactive processes (session=%RU32)\n", + pUserInfo[i].wszUser, pUserInfo[i].ulNumProcs, pUserInfo[i].ulLastSession); if (*pcUsersInList > 0) { @@ -882,9 +1010,13 @@ int VBoxServiceVMInfoWinWriteUsers(char **ppszUserList, uint32_t *pcUsersInList) RTMemFree(pUserInfo); } - VBoxServiceVMInfoWinProcessesFree(paProcs); + VBoxServiceVMInfoWinProcessesFree(cProcs, paProcs); } LsaFreeReturnBuffer(paSessions); + + s_uIter++; + VbglR3GuestPropDisconnect(s_uGuestPropClientID); + return rc; } diff --git a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp index c162cbd70..37cc591ef 100644 --- a/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -308,13 +308,20 @@ static void vboxServiceFreeLAClientInfo(PVBOXSERVICELACLIENTINFO pClient) if (pClient) { if (pClient->pszName) + { RTStrFree(pClient->pszName); + pClient->pszName = NULL; + } if (pClient->pszLocation) + { RTStrFree(pClient->pszLocation); + pClient->pszLocation = NULL; + } if (pClient->pszDomain) + { RTStrFree(pClient->pszDomain); - - pClient = NULL; + pClient->pszDomain = NULL; + } } } @@ -382,7 +389,7 @@ static void vboxserviceVMInfoWriteFixedProperties(void) } #if defined(VBOX_WITH_DBUS) && defined(RT_OS_LINUX) /* Not yet for Solaris/FreeBSB. */ -/* +/* * Simple wrapper to work around compiler-specific va_list madness. */ static dbus_bool_t vboxService_dbus_message_get_args(DBusMessage *message, @@ -504,8 +511,8 @@ static int vboxserviceVMInfoWriteUsers(void) { char **ppszSessions; int cSessions; if ( (dbus_message_get_type(pMsgSessions) == DBUS_MESSAGE_TYPE_METHOD_CALL) - && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY, - DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions, + && vboxService_dbus_message_get_args(pReplySessions, &dbErr, DBUS_TYPE_ARRAY, + DBUS_TYPE_OBJECT_PATH, &ppszSessions, &cSessions, DBUS_TYPE_INVALID /* Termination */)) { VBoxServiceVerbose(4, "ConsoleKit: retrieved %RU16 session(s)\n", cSessions); @@ -587,7 +594,7 @@ static int vboxserviceVMInfoWriteUsers(void) && ppwEntry->pw_uid >= uid_min /* Only respect users, not daemons etc. */ && ppwEntry->pw_name) { - VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n", + VBoxServiceVerbose(4, "ConsoleKit: session '%s' -> %s (uid: %RU32)\n", *ppszCurSession, ppwEntry->pw_name, uid); bool fFound = false; @@ -629,7 +636,7 @@ static int vboxserviceVMInfoWriteUsers(void) else { VBoxServiceError("ConsoleKit: unable to retrieve session parameters (msg type=%d): %s", - dbus_message_get_type(pMsgSessions), + dbus_message_get_type(pMsgSessions), dbus_error_is_set(&dbErr) ? dbErr.message : "No error information available\n"); } dbus_message_unref(pReplySessions); @@ -750,6 +757,8 @@ static int vboxserviceVMInfoWriteUsers(void) } if (pszUserList) RTStrFree(pszUserList); + + VBoxServiceVerbose(4, "Writing users returned with rc=%Rrc\n", rc); return rc; } @@ -1185,11 +1194,12 @@ DECLCALLBACK(int) VBoxServiceVMInfoWorker(bool volatile *pfShutdown) * works with VBox (latest) 4.1 and up. */ /* Check for new connection. */ - char *pszLAClientID; + char *pszLAClientID = NULL; int rc2 = VBoxServiceReadHostProp(g_uVMInfoGuestPropSvcClientID, g_pszLAActiveClient, true /* Read only */, &pszLAClientID, NULL /* Flags */, NULL /* Timestamp */); if (RT_SUCCESS(rc2)) { + AssertPtr(pszLAClientID); if (RTStrICmp(pszLAClientID, "0")) /* Is a client connected? */ { uint32_t uLAClientID = RTStrToInt32(pszLAClientID); @@ -1252,6 +1262,8 @@ DECLCALLBACK(int) VBoxServiceVMInfoWorker(bool volatile *pfShutdown) VBoxServiceError("VRDP: Querying connected location awareness client failed with rc=%Rrc\n", rc2); } + VBoxServiceVerbose(3, "VRDP: Handling location awareness done\n"); + /* * Flush all properties if we were restored. */ diff --git a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp index 84b18dfa4..29f2ff88f 100644 --- a/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp +++ b/src/VBox/Additions/common/VBoxService/testcase/tstUserInfo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp index 0e5fa467c..72b7ed1b7 100644 --- a/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/HGSMIBase.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp index 5f481049c..f9b559c69 100644 --- a/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp +++ b/src/VBox/Additions/common/VBoxVideo/VBVABase.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py b/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py index c47f990a3..65c4660d2 100755 --- a/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py +++ b/src/VBox/Additions/common/crOpenGL/Linux_i386_glxapi_exports.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2009 Oracle Corporation +Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py index b7fe6b9f5..7fc6cddb9 100755 --- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py +++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2009 Oracle Corporation +Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py index 7d9378e65..26903439b 100755 --- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py +++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_exports_dri.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2009 Oracle Corporation +Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py b/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py index d395732db..e835ecb2c 100755 --- a/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py +++ b/src/VBox/Additions/common/crOpenGL/SunOS_i386_glxapi_exports.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2009 Oracle Corporation +Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/VBoxICDList.h b/src/VBox/Additions/common/crOpenGL/VBoxICDList.h index 54c7e4521..cc43c1c62 100644 --- a/src/VBox/Additions/common/crOpenGL/VBoxICDList.h +++ b/src/VBox/Additions/common/crOpenGL/VBoxICDList.h @@ -2,7 +2,7 @@ * * VirtualBox Windows NT/2000/XP guest OpenGL ICD * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.c b/src/VBox/Additions/common/crOpenGL/dri_drv.c index d19b99b1c..37f501e93 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/dri_drv.h b/src/VBox/Additions/common/crOpenGL/dri_drv.h index 9ee57766c..7c5807d29 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/dri_drv.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/dri_glx.h b/src/VBox/Additions/common/crOpenGL/dri_glx.h index a2a389701..5ff295610 100644 --- a/src/VBox/Additions/common/crOpenGL/dri_glx.h +++ b/src/VBox/Additions/common/crOpenGL/dri_glx.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c index 8e7b6ba57..0a5ef2370 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.c +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h index 0d94e1c3a..acbc71169 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_drv.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_drv.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h index ce5510f51..a8551de61 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glfuncsList.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h index c1592cdf1..6c449f852 100644 --- a/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h +++ b/src/VBox/Additions/common/crOpenGL/fakedri_glxfuncsList.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c index 232a7c673..2dc757ae8 100644 --- a/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c +++ b/src/VBox/Additions/common/crOpenGL/feedback/feedback_context.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c index 4f94870ae..183c0219c 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_c_exports.c +++ b/src/VBox/Additions/common/crOpenGL/glx_c_exports.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/glx_proto.h b/src/VBox/Additions/common/crOpenGL/glx_proto.h index 2ab6d05cb..610847494 100644 --- a/src/VBox/Additions/common/crOpenGL/glx_proto.h +++ b/src/VBox/Additions/common/crOpenGL/glx_proto.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.c b/src/VBox/Additions/common/crOpenGL/icd_drv.c index 22a9eadb1..cff7f9ac4 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.c +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/icd_drv.h b/src/VBox/Additions/common/crOpenGL/icd_drv.h index e610de150..46c0b56c4 100644 --- a/src/VBox/Additions/common/crOpenGL/icd_drv.h +++ b/src/VBox/Additions/common/crOpenGL/icd_drv.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/load.c b/src/VBox/Additions/common/crOpenGL/load.c index dc245caab..9307125ed 100644 --- a/src/VBox/Additions/common/crOpenGL/load.c +++ b/src/VBox/Additions/common/crOpenGL/load.c @@ -1307,7 +1307,7 @@ raise(SIGINT);*/ { int rc; - RTR3InitDll(0); + RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE); if (!disable_sync) { diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c index cf445966f..240815b60 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_framebuffer.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c index d0cc9040c..7592b2e4c 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_getshaders.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c index e19959a35..f52615ef1 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_glsl.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c index b5c60aec5..00fba8eba 100644 --- a/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c +++ b/src/VBox/Additions/common/crOpenGL/pack/packspu_texture.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/pam/pam_vbox.cpp b/src/VBox/Additions/common/pam/pam_vbox.cpp index b8d85fda8..4852f0335 100644 --- a/src/VBox/Additions/common/pam/pam_vbox.cpp +++ b/src/VBox/Additions/common/pam/pam_vbox.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/common/testcase/tstPageFusion.cpp b/src/VBox/Additions/common/testcase/tstPageFusion.cpp index 321d3bffd..74a010f2f 100644 --- a/src/VBox/Additions/common/testcase/tstPageFusion.cpp +++ b/src/VBox/Additions/common/testcase/tstPageFusion.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/freebsd/Makefile b/src/VBox/Additions/freebsd/Makefile index 85920e3f1..3a06b3061 100644 --- a/src/VBox/Additions/freebsd/Makefile +++ b/src/VBox/Additions/freebsd/Makefile @@ -4,7 +4,7 @@ # # -# Copyright (C) 2009 Oracle Corporation +# Copyright (C) 2009-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/freebsd/drm/Makefile b/src/VBox/Additions/freebsd/drm/Makefile index 15a581a4d..5c8800378 100644 --- a/src/VBox/Additions/freebsd/drm/Makefile +++ b/src/VBox/Additions/freebsd/drm/Makefile @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c index 2e2a91d80..9d6a3db14 100644 --- a/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/freebsd/drm/vboxvideo_drm.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c index a9d9c14a3..6b367836f 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c index 575a55ed2..622cbc48b 100644 --- a/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c +++ b/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vnops.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/Makefile b/src/VBox/Additions/linux/Makefile index c5beef410..2154b24f9 100644 --- a/src/VBox/Additions/linux/Makefile +++ b/src/VBox/Additions/linux/Makefile @@ -4,7 +4,7 @@ # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/Makefile.kmk b/src/VBox/Additions/linux/Makefile.kmk index 28f77ffa6..a5d6edeb0 100644 --- a/src/VBox/Additions/linux/Makefile.kmk +++ b/src/VBox/Additions/linux/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -23,6 +23,9 @@ include $(KBUILD_PATH)/subheader.kmk # include $(PATH_SUB_CURRENT)/sharedfolders/Makefile.kmk include $(PATH_SUB_CURRENT)/drm/Makefile.kmk +ifdef VBOX_WITH_LIGHTDM_GREETER + include $(PATH_SUB_CURRENT)/lightdm-greeter/Makefile.kmk +endif # # Globals @@ -122,7 +125,8 @@ VBOX_ADD_BIN.linux += \ VBoxClient-all VBOX_ADD_STRIP_SBIN += \ - VBoxService + VBoxService \ + $(if $(VBOX_WITH_LIGHTDM_GREETER),vbox-greeter) VBOX_ADD_STRIP_LIB += \ VBoxOGLarrayspu.so \ @@ -208,6 +212,11 @@ VBOX_LNX_ADD_DBG_FILES := \ $(addprefix $(VBOX_LNX_ADD_DBG_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)) \ $(addprefix $(VBOX_LNX_ADD_DBG_MOD_DIR),$(VBOX_LNX_ADD_STRIP_MOD)) +ifdef VBOX_WITH_LIGHTDM_GREETER_PACKING +VBOX_LNX_ADD_INST_FILES += \ + $(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),vbox-greeter) +endif + # Cleanup of the the installer directory files OTHER_CLEAN += $(VBOX_LNX_ADD_INST_FILES) $(VBOX_LNX_ADD_DBG_FILES) @@ -250,6 +259,13 @@ $(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),$(VBOX_LNX_ADD_STRIP_SBIN)): \ $(QUIET)$(INSTALL) -m 0755 $(if $(VBOX_DO_STRIP),-s,) $< $@ $(QUIET)objcopy --add-gnu-debuglink=$@ $@ +# pattern rule for stripping and copying vbox-greeter to the installation directory +$(addprefix $(VBOX_LNX_ADD_INST_SBIN_DIR),vbox-greeter): \ + $(VBOX_LNX_ADD_INST_SBIN_DIR)% : $(subst linux,linux2,$(PATH_STAGE_BIN))/additions/% \ + | $$(dir $$@) + $(call MSG_INST_FILE,$<,$@) + $(QUIET)$(INSTALL) -m 0755 $< $@ + # pattern rule for stripping and copying the VBOX_LNX_ADD_STRIP_LIB files to the installation directory $(addprefix $(VBOX_LNX_ADD_INST_LIB_DIR),$(VBOX_LNX_ADD_STRIP_LIB)): \ $(VBOX_LNX_ADD_INST_LIB_DIR)% : $(PATH_STAGE_BIN)/additions/% \ @@ -320,7 +336,6 @@ $(addprefix $(VBOX_LNX_ADD_INST_MOD_DIR),$(VBOX_LNX_ADD_INIT)): \ $(QUIET)$(RM) -Rf $@ $(QUIET)$(CP) -RPf -- $< $@ - INSTALLS += GuestDrivers-src GuestDrivers-src_INST = $(INST_ADDITIONS)src/ GuestDrivers-src_MODE = a+r,u+w @@ -341,6 +356,7 @@ lnx_add_inst-noexec_INSTTYPE = stage lnx_add_inst-noexec_SOURCES = \ $(VBOX_REL_X11_ADD_INST)vboxclient.desktop \ $(VBOX_REL_X11_ADD_INST)vboxvideo.ids \ + $(if $(VBOX_WITH_LIGHTDM_GREETER_PACKING),lightdm-greeter/vbox-greeter.desktop,) \ selinux-fedora/vbox_x11.pp \ selinux-fedora/vbox_accel.pp @@ -363,6 +379,7 @@ LnxAdd-scripts_SOURCES = \ LnxAdd-scripts_EXEC_SOURCES = \ $(VBOX_REL_LNX_HOST_DRV)do_dkms \ $(VBOX_REL_LNX_INST_SRC)routines.sh \ + $(VBOX_REL_LNX_ADD_INST)module-autologon.sh=>installer/module-autologon \ $(VBOX_REL_LNX_ADD_INST)vboxadd.sh=>vboxadd \ $(VBOX_REL_LNX_ADD_INST)vboxadd-service.sh=>vboxadd-service \ $(VBOX_REL_LNX_ADD_INST)vboxadd-x11.sh=>vboxadd-x11 \ diff --git a/src/VBox/Additions/linux/drm/Makefile.module b/src/VBox/Additions/linux/drm/Makefile.module index c382be7bd..81b69a40b 100644 --- a/src/VBox/Additions/linux/drm/Makefile.module +++ b/src/VBox/Additions/linux/drm/Makefile.module @@ -3,7 +3,7 @@ # # (For 2.6.x this file must be 'Makefile'!) # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/files_vboxvideo_drm b/src/VBox/Additions/linux/drm/files_vboxvideo_drm index 9f18c86fa..2a652de4f 100755 --- a/src/VBox/Additions/linux/drm/files_vboxvideo_drm +++ b/src/VBox/Additions/linux/drm/files_vboxvideo_drm @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo.h b/src/VBox/Additions/linux/drm/vboxvideo.h index 907b70e74..a02ae0aaa 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo.h +++ b/src/VBox/Additions/linux/drm/vboxvideo.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_crtc.c b/src/VBox/Additions/linux/drm/vboxvideo_crtc.c index aa4c2742e..e209eb406 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_crtc.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_crtc.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_dac.c b/src/VBox/Additions/linux/drm/vboxvideo_dac.c index 94e1e7001..e8b459f33 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_dac.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_dac.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_device.c b/src/VBox/Additions/linux/drm/vboxvideo_device.c index e23d4774f..ecc49eb4d 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_device.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_device.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_display.c b/src/VBox/Additions/linux/drm/vboxvideo_display.c index 16294abaf..3aa8eb704 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_display.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_display.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.c b/src/VBox/Additions/linux/drm/vboxvideo_drm.c index 02c23183f..45cf015c6 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drm.h b/src/VBox/Additions/linux/drm/vboxvideo_drm.h index 0613a9d23..11407e945 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drm.h +++ b/src/VBox/Additions/linux/drm/vboxvideo_drm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drv.c b/src/VBox/Additions/linux/drm/vboxvideo_drv.c index c5df61cef..c115aac6b 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drv.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_drv.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_drv.h b/src/VBox/Additions/linux/drm/vboxvideo_drv.h index 7cbd5f5a8..2e180816b 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_drv.h +++ b/src/VBox/Additions/linux/drm/vboxvideo_drv.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_kms.c b/src/VBox/Additions/linux/drm/vboxvideo_kms.c index 1fe68efef..0d12ac467 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_kms.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_kms.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/drm/vboxvideo_vga.c b/src/VBox/Additions/linux/drm/vboxvideo_vga.c index a8717b2f4..676bca651 100644 --- a/src/VBox/Additions/linux/drm/vboxvideo_vga.c +++ b/src/VBox/Additions/linux/drm/vboxvideo_vga.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/export_modules b/src/VBox/Additions/linux/export_modules index a8c929ed2..9df93899e 100755 --- a/src/VBox/Additions/linux/export_modules +++ b/src/VBox/Additions/linux/export_modules @@ -4,7 +4,7 @@ # Create a tar archive containing the sources of the Linux guest kernel # modules # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/installer/deffiles b/src/VBox/Additions/linux/installer/deffiles index 074ab2241..02d54663b 100644 --- a/src/VBox/Additions/linux/installer/deffiles +++ b/src/VBox/Additions/linux/installer/deffiles @@ -25,6 +25,7 @@ DEFAULT_FILE_NAMES=" \ /usr/bin/vboxadd-xclient \ /usr/bin/VBoxClient \ /usr/bin/VBoxControl \ + /usr/sbin/vbox-greeter \ /usr/sbin/vboxadd-timesync \ /usr/sbin/vboxadd-service \ /usr/sbin/VBoxService \ @@ -43,6 +44,7 @@ DEFAULT_FILE_NAMES=" \ /usr/lib64/VBoxOGLpassthroughspu.so \ /usr/lib/VBoxOGL.so \ /usr/lib64/VBoxOGL.so \ + /usr/share/xgreeters/vbox-greeter.desktop \ /etc/X11/Xsession.d/98vboxadd-xclient \ /etc/X11/xinit.d/98vboxadd-xclient \ /etc/X11/xinit/xinitrc.d/98vboxadd-xclient.sh \ diff --git a/src/VBox/Additions/linux/installer/module-autologon.sh b/src/VBox/Additions/linux/installer/module-autologon.sh new file mode 100644 index 000000000..47b287d9c --- /dev/null +++ b/src/VBox/Additions/linux/installer/module-autologon.sh @@ -0,0 +1,169 @@ +# Oracle VM VirtualBox +# VirtualBox Linux Guest Additions installer - autologon module +# + +# Copyright (C) 2012-2013 Oracle Corporation +# +# 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. +# + +# @todo Document functions and their usage! + +MOD_AUTOLOGON_DEFAULT_LIGHTDM_CONFIG="/etc/lightdm/lightdm.conf" +MOD_AUTOLOGON_DEFAULT_LIGHTDM_GREETER_DIR="/usr/share/xgreeters" + +mod_autologon_init() +{ + echo "Initializing auto-logon support ..." + return 0 +} + +mod_autologon_install_ex() +{ + info "Installing auto-logon support ..." + + ## Parameters: + # Greeter directory. Defaults to /usr/share/xgreeters. + greeter_dir="$1" + # LightDM config. Defaults to /etc/lightdm/lightdm.conf. + lightdm_config="$2" + # Whether to force installation if non-compatible distribution + # is detected. + force="$3" + + # Check for Ubuntu and derivates. @todo Debian? + distros="Ubuntu UbuntuStudio Edubuntu Kubuntu Lubuntu Mythbuntu Xubuntu" + ## @todo Map Linux Mint versions to Ubuntu ones. + + ## @todo Move the distro check to a routine / globals as soon as + ## we have other distribution-dependent stuff. + which lsb_release &>/dev/null + if test "$?" -ne "0"; then + info "Error: lsb_release not found (path set?), skipping auto-logon installation" + return 1 + fi + distro_name=$(lsb_release -si) + distro_ver=$(lsb_release -sr) + + for distro_cur in ${distros}; do + if test "$distro_name" = "$distro_cur"; then + distro_found="true" + break + fi + done + + if test -z "$distro_found"; then + if ! test "$force" = "force"; then + info "Error: Unsupported distribution \"$distro_name\" found, skipping auto-logon installation" + return 1 + fi + info "Warning: Unsupported distribution \"$distro_name\" found" + else + # Do we have Ubuntu 11.10 or greater? + # Use AWK for comparison since we run on plan sh. + echo | awk 'END { exit ( !('"$distro_ver >= 11.10"') ); }' + if test "$?" -ne "0"; then + if ! test "$force" = "force"; then + info "Error: Version $distro_ver of \"$distro_name\" not supported, skipping auto-logon installation" + return 1 + fi + info "Warning: Unsupported \"$distro_name\" version $distro_ver found" + fi + fi + + # Install dependencies (lightdm and FLTK 1.3+) using apt-get. + which apt-get &>/dev/null + if test "$?" -ne "0"; then + info "Error: apt-get not found (path set?), skipping auto-logon installation" + return 1 + fi + info "Checking and installing necessary dependencies ..." + apt-get -qqq -y install libfltk1.3 libfltk-images1.3 || return 1 + apt-get -qqq -y install lightdm || return 1 + + # Check for LightDM config. + if ! test -f "$lightdm_config"; then + info "Error: LightDM config \"$lightdm_config\" not found (LightDM installed?), skipping auto-logon installation" + return 1 + fi + + # Check for /usr/share/xgreeters. + if ! test -d "$greeter_dir"; then + if ! test "$force" = "force"; then + info "Error: Directory \"$greeter_dir\" does not exist, skipping auto-logon installation" + return 1 + fi + info "Warning: Directory \"$greeter_dir\" does not exist, creating it" + mkdir -p -m 755 "$greeter_dir" || return 1 + fi + + # Link to required greeter files into $greeter_dir. + add_symlink "$INSTALLATION_DIR/share/VBoxGuestAdditions/vbox-greeter.desktop" "$greeter_dir/vbox-greeter.desktop" + + # Backup and activate greeter config. + if ! test -f "$lightdm_config.vbox-backup"; then + info "Backing up LightDM configuration file ..." + cp "$lightdm_config" "$lightdm_config.vbox-backup" || return 1 + chmod 644 "$lightdm_config.vbox-backup" || return 1 + fi + sed -i -e 's/^\s*greeter-session\s*=.*/greeter-session=vbox-greeter/g' "$lightdm_config" || return 1 + chmod 644 "$lightdm_config" || return 1 + + info "Auto-logon installation successful" + return 0 +} + +mod_autologon_install() +{ + if [ -z "$MOD_AUTOLOGON_LIGHTDM_GREETER_DIR" ]; then + MOD_AUTOLOGON_LIGHTDM_GREETER_DIR=$MOD_AUTOLOGON_DEFAULT_LIGHTDM_GREETER_DIR + fi + if [ -z "$MOD_AUTOLOGON_LIGHTDM_CONFIG" ]; then + MOD_AUTOLOGON_LIGHTDM_CONFIG=$MOD_AUTOLOGON_DEFAULT_LIGHTDM_CONFIG + fi + + mod_autologon_install_ex "$MOD_AUTOLOGON_LIGHTDM_GREETER_DIR" "$MOD_AUTOLOGON_LIGHTDM_CONFIG" "$MOD_AUTOLOGON_FORCE" + return $? +} + +mod_autologon_pre_uninstall() +{ + echo "Preparing to uninstall auto-logon support ..." + return 0 +} + +mod_autologon_uninstall() +{ + if test -z "$MOD_AUTOLOGON_LIGHTDM_CONFIG"; then + return 0 + fi + info "Un-installing auto-logon support ..." + + # Switch back to original greeter. + if test -f "$MOD_AUTOLOGON_LIGHTDM_CONFIG.vbox-backup"; then + mv "$MOD_AUTOLOGON_LIGHTDM_CONFIG.vbox-backup" "$MOD_AUTOLOGON_LIGHTDM_CONFIG" + if test "$?" -ne "0"; then + info "Warning: Could not restore original LightDM config \"$MOD_AUTOLOGON_LIGHTDM_CONFIG\"" + fi + fi + + # Remove greeter directory (if not empty). + rm "$MOD_AUTOLOGON_LIGHTDM_GREETER_DIR" 2>/dev/null + + info "Auto-logon uninstallation successful" + return 0 +} + +mod_autologon_config_save() +{ + echo " +MOD_AUTOLOGON_LIGHTDM_CONFIG='$MOD_AUTOLOGON_LIGHTDM_CONFIG' +MOD_AUTOLOGON_LIGHTDM_GREETER_DIR='$MOD_AUTOLOGON_LIGHTDM_GREETER_DIR'" +} + diff --git a/src/VBox/Additions/linux/installer/vboxadd-service.sh b/src/VBox/Additions/linux/installer/vboxadd-service.sh index caec21118..cf30b9e42 100755 --- a/src/VBox/Additions/linux/installer/vboxadd-service.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-service.sh @@ -2,7 +2,7 @@ # # Linux Additions Guest Additions service daemon init script. # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/installer/vboxadd-x11.sh b/src/VBox/Additions/linux/installer/vboxadd-x11.sh index ffa1e16d4..4f94c8cf3 100755 --- a/src/VBox/Additions/linux/installer/vboxadd-x11.sh +++ b/src/VBox/Additions/linux/installer/vboxadd-x11.sh @@ -1,10 +1,10 @@ #! /bin/sh # -# Linux Additions X11 setup init script ($Revision: 80787 $) +# Linux Additions X11 setup init script ($Revision: 83687 $) # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/installer/vboxadd.sh b/src/VBox/Additions/linux/installer/vboxadd.sh index dddfb3a55..44dfc3790 100755 --- a/src/VBox/Additions/linux/installer/vboxadd.sh +++ b/src/VBox/Additions/linux/installer/vboxadd.sh @@ -1,10 +1,10 @@ #! /bin/sh # -# Linux Additions kernel module init script ($Revision: 81734 $) +# Linux Additions kernel module init script ($Revision: 83687 $) # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c index 2bce28493..fd3097a8e 100644 --- a/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c +++ b/src/VBox/Additions/linux/sharedfolders/mount.vboxsf.c @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/sharedfolders/regops.c b/src/VBox/Additions/linux/sharedfolders/regops.c index 9cce17396..a3bbd6968 100644 --- a/src/VBox/Additions/linux/sharedfolders/regops.c +++ b/src/VBox/Additions/linux/sharedfolders/regops.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/sharedfolders/vfsmod.c b/src/VBox/Additions/linux/sharedfolders/vfsmod.c index 3c5513618..20f5a26e6 100644 --- a/src/VBox/Additions/linux/sharedfolders/vfsmod.c +++ b/src/VBox/Additions/linux/sharedfolders/vfsmod.c @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/linux/testcase/TimesyncBackdoor.c b/src/VBox/Additions/linux/testcase/TimesyncBackdoor.c index c35956f1e..e78dbb270 100644 --- a/src/VBox/Additions/linux/testcase/TimesyncBackdoor.c +++ b/src/VBox/Additions/linux/testcase/TimesyncBackdoor.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c index 344c44bbc..9ec00b8af 100644 --- a/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c +++ b/src/VBox/Additions/solaris/DRM/vboxvideo_drm.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Installer/makepackage.sh b/src/VBox/Additions/solaris/Installer/makepackage.sh index 4080e644c..0fe9aeb0f 100755 --- a/src/VBox/Additions/solaris/Installer/makepackage.sh +++ b/src/VBox/Additions/solaris/Installer/makepackage.sh @@ -2,7 +2,7 @@ # # VirtualBox Solaris Guest Additions package creation script. # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Installer/postinstall.sh b/src/VBox/Additions/solaris/Installer/postinstall.sh index 850491753..02fa1c19f 100755 --- a/src/VBox/Additions/solaris/Installer/postinstall.sh +++ b/src/VBox/Additions/solaris/Installer/postinstall.sh @@ -2,7 +2,7 @@ # # VirtualBox postinstall script for Solaris. # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Installer/preremove.sh b/src/VBox/Additions/solaris/Installer/preremove.sh index 688df2662..4b0be8b7d 100755 --- a/src/VBox/Additions/solaris/Installer/preremove.sh +++ b/src/VBox/Additions/solaris/Installer/preremove.sh @@ -2,7 +2,7 @@ # # VirtualBox pre-remove script for Solaris Guest Additions. # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Installer/vboxguest.sh b/src/VBox/Additions/solaris/Installer/vboxguest.sh index bb0d0b9d6..8c8781f78 100755 --- a/src/VBox/Additions/solaris/Installer/vboxguest.sh +++ b/src/VBox/Additions/solaris/Installer/vboxguest.sh @@ -2,7 +2,7 @@ # # VirtualBox Guest Additions kernel module control script for Solaris. # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Installer/vboxservice.xml b/src/VBox/Additions/solaris/Installer/vboxservice.xml index 1a2ebef6f..61f896d5a 100644 --- a/src/VBox/Additions/solaris/Installer/vboxservice.xml +++ b/src/VBox/Additions/solaris/Installer/vboxservice.xml @@ -3,7 +3,7 @@ # # Solaris SMF service manifest for VBoxService (timesync). # - Copyright (C) 2008-2010 Oracle Corporation + Copyright (C) 2008-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c index 1851ed6a1..3e5356eb6 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_mount.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c index 766941ed2..2dd87f5be 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h index 40ce7c064..5a348c44b 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c index 6a06e5cdf..09ed0daed 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h index ab4d9cb48..8b6e6b0e7 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vfs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c index 7acac0603..bba0b3868 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h index f76795fed..8196143f3 100644 --- a/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h +++ b/src/VBox/Additions/solaris/SharedFolders/vboxfs_vnode.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c index 771706707..04863b08e 100644 --- a/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/Virtio-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c index cd201abea..4511b49bb 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioNet-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c index a34c951c1..7eab19e11 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioPci-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c index 4a9f8acbd..51d9f6a81 100644 --- a/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c +++ b/src/VBox/Additions/solaris/Virtio/VirtioRing-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/Installer/x11config.sh b/src/VBox/Additions/x11/Installer/x11config.sh index 3bb981a01..01d5bc179 100755 --- a/src/VBox/Additions/x11/Installer/x11config.sh +++ b/src/VBox/Additions/x11/Installer/x11config.sh @@ -2,7 +2,7 @@ # # Guest Additions X11 config update script # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/Installer/x11config15sol.pl b/src/VBox/Additions/x11/Installer/x11config15sol.pl index 8b1a20542..c76e3506e 100755 --- a/src/VBox/Additions/x11/Installer/x11config15sol.pl +++ b/src/VBox/Additions/x11/Installer/x11config15sol.pl @@ -2,7 +2,7 @@ # # Guest Additions X11 config update script # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/Installer/x11restore.pl b/src/VBox/Additions/x11/Installer/x11restore.pl index cf17d2979..a4776c6a4 100755 --- a/src/VBox/Additions/x11/Installer/x11restore.pl +++ b/src/VBox/Additions/x11/Installer/x11restore.pl @@ -1,9 +1,9 @@ #!/usr/bin/perl -w -# $Revision: 79612 $ +# $Revision: 83687 $ # # Restore xorg.conf while removing Guest Additions. # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/Makefile.kmk b/src/VBox/Additions/x11/Makefile.kmk index bb97addbe..4413783a0 100644 --- a/src/VBox/Additions/x11/Makefile.kmk +++ b/src/VBox/Additions/x11/Makefile.kmk @@ -3,7 +3,7 @@ # Sub-Makefile for the X11 Guest Additions. # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -24,7 +24,9 @@ if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) ifneq ($(KBUILD_TARGET), solaris) include $(PATH_SUB_CURRENT)/vboxmouse/Makefile.kmk endif - include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk + ifndef VBOX_USE_SYSTEM_XORG_HEADERS + include $(PATH_SUB_CURRENT)/x11stubs/Makefile.kmk + endif endif include $(FILE_KBUILD_SUB_FOOTER) diff --git a/src/VBox/Additions/x11/VBoxClient/VBoxClient.h b/src/VBox/Additions/x11/VBoxClient/VBoxClient.h index d2405149b..63d5842a0 100644 --- a/src/VBox/Additions/x11/VBoxClient/VBoxClient.h +++ b/src/VBox/Additions/x11/VBoxClient/VBoxClient.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp index 4097d1746..24ba7e9d2 100644 --- a/src/VBox/Additions/x11/VBoxClient/clipboard.cpp +++ b/src/VBox/Additions/x11/VBoxClient/clipboard.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/display.cpp b/src/VBox/Additions/x11/VBoxClient/display.cpp index d6889023e..ae3e02c67 100644 --- a/src/VBox/Additions/x11/VBoxClient/display.cpp +++ b/src/VBox/Additions/x11/VBoxClient/display.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp index 71ecbc868..5a5f50320 100644 --- a/src/VBox/Additions/x11/VBoxClient/hostversion.cpp +++ b/src/VBox/Additions/x11/VBoxClient/hostversion.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/main.cpp b/src/VBox/Additions/x11/VBoxClient/main.cpp index d069b856e..604a67d70 100644 --- a/src/VBox/Additions/x11/VBoxClient/main.cpp +++ b/src/VBox/Additions/x11/VBoxClient/main.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-glue.h b/src/VBox/Additions/x11/VBoxClient/seamless-glue.h index d8fa32e0f..6b617b4b7 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-glue.h +++ b/src/VBox/Additions/x11/VBoxClient/seamless-glue.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-guest.h b/src/VBox/Additions/x11/VBoxClient/seamless-guest.h index 4a2d42205..e468531ae 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-guest.h +++ b/src/VBox/Additions/x11/VBoxClient/seamless-guest.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp index ab04873bb..81467a3e4 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp +++ b/src/VBox/Additions/x11/VBoxClient/seamless-host.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-host.h b/src/VBox/Additions/x11/VBoxClient/seamless-host.h index d10523bc7..812eb8811 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-host.h +++ b/src/VBox/Additions/x11/VBoxClient/seamless-host.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp index 9e345d84a..7c7d8a342 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp +++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless-x11.h b/src/VBox/Additions/x11/VBoxClient/seamless-x11.h index db2a6f125..68fcad1b5 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless-x11.h +++ b/src/VBox/Additions/x11/VBoxClient/seamless-x11.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless.cpp b/src/VBox/Additions/x11/VBoxClient/seamless.cpp index 214f87a73..84e8147c3 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless.cpp +++ b/src/VBox/Additions/x11/VBoxClient/seamless.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/seamless.h b/src/VBox/Additions/x11/VBoxClient/seamless.h index 46b45b6e9..c1ffc2791 100644 --- a/src/VBox/Additions/x11/VBoxClient/seamless.h +++ b/src/VBox/Additions/x11/VBoxClient/seamless.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp index 0c7c4fc61..d79080d25 100644 --- a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp +++ b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11-auto.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp index 44d3bc2a4..638f2cff7 100644 --- a/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp +++ b/src/VBox/Additions/x11/VBoxClient/testcase/tstSeamlessX11.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/thread.cpp b/src/VBox/Additions/x11/VBoxClient/thread.cpp index 182070f39..4655cb7b1 100644 --- a/src/VBox/Additions/x11/VBoxClient/thread.cpp +++ b/src/VBox/Additions/x11/VBoxClient/thread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/VBoxClient/thread.h b/src/VBox/Additions/x11/VBoxClient/thread.h index 2c4321d41..8cd118ac5 100644 --- a/src/VBox/Additions/x11/VBoxClient/thread.h +++ b/src/VBox/Additions/x11/VBoxClient/thread.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk index f7f2c8c96..5a4dbf452 100644 --- a/src/VBox/Additions/x11/vboxmouse/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxmouse/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -249,6 +249,7 @@ endif # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES # ifndef VBOX_ONLY_ADDITIONS ifndef VBOX_USE_SYSTEM_XORG_HEADERS @@ -263,109 +264,29 @@ ifdef VBOX_WITH_TESTCASES $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse68.run: $$(vboxmouse_drv_1_STAGE_TARGET) $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - "$(vboxmouse_drv_1_STAGE_TARGET)" "$(VBOXMOUSE_SRC_PATH)/undefined" --static + "$(vboxmouse_drv_1_STAGE_TARGET)" --static "$(VBOXMOUSE_SRC_PATH)/undefined" $(QUIET)$(APPEND) -t "$@" "done" endif - TESTING += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run - OTHERS += $(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run -$$(vboxmouse_drv_70_0_OUTDIR)/tstvboxmouse70.run: $$(vboxmouse_drv_70_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_70_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run - OTHERS += $(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run -$$(vboxmouse_drv_71_0_OUTDIR)/tstvboxmouse71.run: $$(vboxmouse_drv_71_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_71_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run - OTHERS += $(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run -$$(vboxmouse_drv_13_0_OUTDIR)/tstvboxmouse13.run: $$(vboxmouse_drv_13_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_13_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run - OTHERS += $(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run -$$(vboxmouse_drv_14_0_OUTDIR)/tstvboxmouse14.run: $$(vboxmouse_drv_14_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_14_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run - OTHERS += $(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run -$$(vboxmouse_drv_15_0_OUTDIR)/tstvboxmouse15.run: $$(vboxmouse_drv_15_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_15_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run - OTHERS += $(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run -$$(vboxmouse_drv_16_0_OUTDIR)/tstvboxmouse16.run: $$(vboxmouse_drv_16_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_16_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - -ifneq ($(KBUILD_TARGET), linux) - - TESTING += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run - OTHERS += $(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run -$$(vboxmouse_drv_17_0_OUTDIR)/tstvboxmouse17.run: $$(vboxmouse_drv_17_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_17_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run - OTHERS += $(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run -$$(vboxmouse_drv_18_0_OUTDIR)/tstvboxmouse18.run: $$(vboxmouse_drv_18_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_18_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run - OTHERS += $(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run -$$(vboxmouse_drv_19_0_OUTDIR)/tstvboxmouse19.run: $$(vboxmouse_drv_19_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_19_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run - OTHERS += $(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run -$$(vboxmouse_drv_110_0_OUTDIR)/tstvboxmouse110.run: $$(vboxmouse_drv_110_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_110_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run - OTHERS += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run -$$(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run: $$(vboxmouse_drv_111_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_111_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run - OTHERS += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run -$$(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run: $$(vboxmouse_drv_112_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxmouse_drv_112_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - -endif # neq ($(KBUILD_TARGET),linux) +## +# Using the extra expansion to replace $(ver) before eval, thus everything +# else needs escaped dollars. + define def_vboxmouse_test + TESTING += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run + OTHERS += $$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run + $$$$(vboxmouse_drv$(ver)_0_OUTDIR)/tstvboxmouse$(ver).run: $$$$(vboxmouse_drv$(ver)_1_STAGE_TARGET) + $$(QUIET)$$(call MSG_L1,Checking for unresolved symbols in $$<) + $$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST) \ + $$(vboxmouse_drv$(ver)_1_STAGE_TARGET) $$(VBOXMOUSE_SRC_PATH)/undefined $$(VBOXMOUSE_SRC_PATH)/undefined_extra + $$(QUIET)$$(APPEND) -t "$$@" "done" + endef + + $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test))) + + ifneq ($(KBUILD_TARGET), linux) + $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test))) + + endif # neq ($(KBUILD_TARGET),linux) endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) diff --git a/src/VBox/Additions/x11/vboxmouse/undefined b/src/VBox/Additions/x11/vboxmouse/undefined index 8f1dfdf32..14c32d988 100644 --- a/src/VBox/Additions/x11/vboxmouse/undefined +++ b/src/VBox/Additions/x11/vboxmouse/undefined @@ -7,29 +7,14 @@ InitPtrFeedbackClassDeviceStruct InitValuatorClassDeviceStruct VErrorF Xalloc -_ITM_registerTMCloneTable -_ITM_deregisterTMCloneTable -_Jv_RegisterClasses -___errno -__cxa_finalize -__deregister_frame_info_bases -__divdi3 -__errno_location -__fxstat64 -__gmon_start__ -__iob -__moddi3 -__register_frame_info_bases -__stack_chk_fail -__udivdi3 -__umoddi3 -__xstat64 +Xfree calloc chdir chmod chown close fchmod +fchown fcntl fflush flock @@ -41,6 +26,7 @@ fsync ftruncate ftruncate64 futimes +fwrite getcwd getenv geteuid @@ -53,7 +39,6 @@ lchown lseek lseek64 malloc -nanosleep memalign memchr memcmp @@ -67,11 +52,14 @@ miPointerGetScreen mmap64 mprotect munmap +nanosleep nl_langinfo open open64 posix_memalign +pthread_self pthread_sigmask +pthread_yield putenv read realloc @@ -95,6 +83,7 @@ tolower unlink unsetenv utimes +vfprintf write xf86AddEnabledDevice xf86AddInputDriver @@ -111,7 +100,11 @@ xf86RemoveEnabledDevice xf86ScaleAxis xf86SetIntOption xf86SetStrOption +xf86close xf86errno +xf86ioctl xf86isspace +xf86open +xf86read xf86strtoul xf86vsnprintf diff --git a/src/VBox/Additions/x11/vboxmouse/undefined_extra b/src/VBox/Additions/x11/vboxmouse/undefined_extra new file mode 100644 index 000000000..72c99ca89 --- /dev/null +++ b/src/VBox/Additions/x11/vboxmouse/undefined_extra @@ -0,0 +1,18 @@ +_ITM_deregisterTMCloneTable +_ITM_registerTMCloneTable +_Jv_RegisterClasses +___errno +__cxa_finalize +__deregister_frame_info_bases +__divdi3 +__errno_location +__fxstat64 +__gmon_start__ +__iob +__lxstat64 +__moddi3 +__register_frame_info_bases +__stack_chk_fail +__udivdi3 +__umoddi3 +__xstat64 diff --git a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c index 85c9706f5..847ec94d7 100644 --- a/src/VBox/Additions/x11/vboxmouse/vboxmouse.c +++ b/src/VBox/Additions/x11/vboxmouse/vboxmouse.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk index 59d9c9239..e1b6cd901 100644 --- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk +++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -343,6 +343,7 @@ endif # Check the undefined symbols in the X.Org modules against lists of allowed # symbols. Not very elegant, but it will catch problems early. + ifdef VBOX_WITH_TESTCASES # ifndef VBOX_ONLY_ADDITIONS ifndef VBOX_USE_SYSTEM_XORG_HEADERS @@ -356,118 +357,29 @@ ifdef VBOX_WITH_TESTCASES OTHERS += $(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo68.run: $$(vboxvideo_drv_1_STAGE_TARGET) $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined --static + $(QUIET)$(ASH) $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ + $(vboxvideo_drv_1_STAGE_TARGET) --static $(VBOXVIDEO_SRC_PATH)/undefined $(QUIET)$(APPEND) -t "$@" "done" endif - TESTING += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run - OTHERS += $(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run -$$(vboxvideo_drv_70_0_OUTDIR)/tstvboxvideo70.run: $$(vboxvideo_drv_70_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_70_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run - OTHERS += $(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run -$$(vboxvideo_drv_71_0_OUTDIR)/tstvboxvideo71.run: $$(vboxvideo_drv_71_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_71_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run - OTHERS += $(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run -$$(vboxvideo_drv_13_0_OUTDIR)/tstvboxvideo13.run: $$(vboxvideo_drv_13_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_13_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run - OTHERS += $(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run -$$(vboxvideo_drv_14_0_OUTDIR)/tstvboxvideo14.run: $$(vboxvideo_drv_14_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_14_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run - OTHERS += $(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run -$$(vboxvideo_drv_15_0_OUTDIR)/tstvboxvideo15.run: $$(vboxvideo_drv_15_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_15_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run - OTHERS += $(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run -$$(vboxvideo_drv_16_0_OUTDIR)/tstvboxvideo16.run: $$(vboxvideo_drv_16_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_16_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run - OTHERS += $(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run -$$(vboxvideo_drv_17_0_OUTDIR)/tstvboxvideo17.run: $$(vboxvideo_drv_17_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_17_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run - OTHERS += $(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run -$$(vboxvideo_drv_18_0_OUTDIR)/tstvboxvideo18.run: $$(vboxvideo_drv_18_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_18_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run - OTHERS += $(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run -$$(vboxvideo_drv_19_0_OUTDIR)/tstvboxvideo19.run: $$(vboxvideo_drv_19_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_19_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run - OTHERS += $(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run -$$(vboxvideo_drv_110_0_OUTDIR)/tstvboxvideo110.run: $$(vboxvideo_drv_110_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_110_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run - OTHERS += $(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run -$$(vboxvideo_drv_111_0_OUTDIR)/tstvboxvideo111.run: $$(vboxvideo_drv_111_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_111_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run - OTHERS += $(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run -$$(vboxvideo_drv_112_0_OUTDIR)/tstvboxvideo112.run: $$(vboxvideo_drv_112_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_112_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" - - TESTING += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run - OTHERS += $(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run -$$(vboxvideo_drv_113_0_OUTDIR)/tstvboxvideo113.run: $$(vboxvideo_drv_113_1_STAGE_TARGET) - $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<) - $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_HOST) \ - $(vboxvideo_drv_113_1_STAGE_TARGET) $(VBOXVIDEO_SRC_PATH)/undefined - $(QUIET)$(APPEND) -t "$@" "done" +## +# Using the extra expansion to replace $(ver) before eval, thus everything +# else needs escaped dollars. + define def_vboxvideo_test + TESTING += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run + OTHERS += $$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run + $$$$(vboxvideo_drv$(ver)_0_OUTDIR)/tstvboxvideo$(ver).run: $$$$(vboxvideo_drv$(ver)_1_STAGE_TARGET) + $$(QUIET)$$(call MSG_L1,Checking for unresolved symbols in $$<) + $$(QUIET)$$(ASH) $$(PATH_ROOT)/src/bldprogs/checkUndefined.sh $$(KBUILD_HOST) \ + $$(vboxvideo_drv$(ver)_1_STAGE_TARGET) $$(VBOXVIDEO_SRC_PATH)/undefined $$(VBOXVIDEO_SRC_PATH)/undefined_extra + $$(QUIET)$$(APPEND) -t "$$@" "done" + endef + + $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxvideo_test))) endif # ! VBOX_ONLY_SDK endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH)) - endif # eq ($(KBUILD_TARGET),linux) + endif # 1of ($(KBUILD_TARGET),linux solaris) endif # ! VBOX_USE_SYSTEM_XORG_HEADERS # endif # ! VBOX_ONLY_ADDITIONS endif # VBOX_WITH_TESTCASES diff --git a/src/VBox/Additions/x11/vboxvideo/edid.c b/src/VBox/Additions/x11/vboxvideo/edid.c index 2628a3241..fd7aff4f3 100644 --- a/src/VBox/Additions/x11/vboxvideo/edid.c +++ b/src/VBox/Additions/x11/vboxvideo/edid.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/pointer.c b/src/VBox/Additions/x11/vboxvideo/pointer.c index 8ddada547..45fcecaf4 100644 --- a/src/VBox/Additions/x11/vboxvideo/pointer.c +++ b/src/VBox/Additions/x11/vboxvideo/pointer.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/setmode.c b/src/VBox/Additions/x11/vboxvideo/setmode.c index 72f1c041d..fcb9eb646 100644 --- a/src/VBox/Additions/x11/vboxvideo/setmode.c +++ b/src/VBox/Additions/x11/vboxvideo/setmode.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -143,9 +143,12 @@ Bool VBOXAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height) PixmapPtr pPixmap = pScreen->GetScreenPixmap(pScreen); VBOXPtr pVBox = VBOXGetRec(pScrn); uint64_t cbLine = vboxLineLength(pScrn, width); + int displayWidth = vboxDisplayPitch(pScrn, cbLine); TRACE_LOG("width=%d, height=%d\n", width, height); - if (width == pScrn->virtualX && height == pScrn->virtualY) + if ( width == pScrn->virtualX + && height == pScrn->virtualY + && displayWidth == pScrn->displayWidth) return TRUE; if (!pPixmap) { xf86DrvMsg(pScrn->scrnIndex, X_ERROR, @@ -165,7 +168,7 @@ Bool VBOXAdjustScreenPixmap(ScrnInfoPtr pScrn, int width, int height) vboxClearVRAM(pScrn, width, height); pScrn->virtualX = width; pScrn->virtualY = height; - pScrn->displayWidth = vboxDisplayPitch(pScrn, cbLine); + pScrn->displayWidth = displayWidth; pVBox->cbLine = cbLine; #ifdef VBOX_DRI if (pVBox->useDRI) diff --git a/src/VBox/Additions/x11/vboxvideo/undefined b/src/VBox/Additions/x11/vboxvideo/undefined index 8895a12c6..ce114dd61 100644 --- a/src/VBox/Additions/x11/vboxvideo/undefined +++ b/src/VBox/Additions/x11/vboxvideo/undefined @@ -15,27 +15,11 @@ MakeAtom PixmapWidthPaddingInfo RRChangeOutputProperty ShadowFBInit2 +VErrorF XNFcalloc XNFstrdup Xalloc -_ITM_registerTMCloneTable -_ITM_deregisterTMCloneTable -_Jv_RegisterClasses -___errno -__cxa_finalize -__deregister_frame_info_bases -__divdi3 -__errno_location -__fxstat64 -__gmon_start__ -__iob -__isoc99_sscanf -__moddi3 -__register_frame_info_bases -__stack_chk_fail -__udivdi3 -__umoddi3 -__xstat64 +Xfree calloc chdir chmod @@ -46,6 +30,7 @@ drmGetVersion fbPictureInit fbScreenInit fchmod +fchown fcntl fflush flock @@ -57,6 +42,7 @@ fsync ftruncate ftruncate64 futimes +fwrite getcwd getenv geteuid @@ -68,8 +54,8 @@ ioctl lchown lseek lseek64 +lstat malloc -nanosleep memalign memchr memcmp @@ -85,6 +71,7 @@ miSetVisualTypes mmap64 mprotect munmap +nanosleep nl_langinfo open open64 @@ -92,7 +79,9 @@ pciTag pci_device_map_range pci_device_unmap_range posix_memalign +pthread_self pthread_sigmask +pthread_yield putenv read realloc @@ -104,18 +93,17 @@ serverGeneration setenv sigdelset sigfillset -sprintf snprintf -sscanf +sprintf sscanf stat stderr strchr strcmp strcpy -strncpy strlen strncmp +strncpy strpbrk strstr symlink @@ -123,19 +111,20 @@ tolower unlink unsetenv utimes +vfprintf vgaHWFreeHWRec vgaHWGetHWRec -vgaHWGetIndex vgaHWGetIOBase +vgaHWGetIndex vgaHWRestore vgaHWSave vgaHWSetStdFuncs write xf86AddDriver xf86ConfigPciEntity -xf86CrtcConfigPrivateIndex xf86CreateCursorInfoRec xf86CrtcConfigInit +xf86CrtcConfigPrivateIndex xf86CrtcCreate xf86CrtcScreenInit xf86CrtcSetSizeRange @@ -160,13 +149,14 @@ xf86MatchPciInstances xf86ModesAdd xf86Msg xf86OutputCreate +xf86OutputSetEDID xf86OutputUseScreenMonitor xf86PrintChipsets xf86PrintDepthBpp xf86PrintModes xf86SaveScreen -xf86Screens xf86ScreenToScrn +xf86Screens xf86ScrnToScreen xf86SetBackingStore xf86SetBlackWhitePixels @@ -174,13 +164,26 @@ xf86SetDefaultVisual xf86SetDepthBpp xf86SetDesiredModes xf86SetDpi -xf86OutputSetEDID xf86SetGamma xf86SetModeDefaultName xf86SetSingleMode xf86SetWeight xf86ShowUnusedOptions xf86UnMapVidMem +xf86calloc +xf86close xf86errno +xf86free +xf86ioctl xf86isspace +xf86memchr +xf86memcpy +xf86memset +xf86open +xf86sprintf +xf86sscanf +xf86strcmp +xf86strcpy +xf86strlen xf86strtoul +xf86vsnprintf diff --git a/src/VBox/Additions/x11/vboxvideo/undefined_extra b/src/VBox/Additions/x11/vboxvideo/undefined_extra new file mode 100644 index 000000000..7c54a2c1b --- /dev/null +++ b/src/VBox/Additions/x11/vboxvideo/undefined_extra @@ -0,0 +1,19 @@ +_ITM_deregisterTMCloneTable +_ITM_registerTMCloneTable +_Jv_RegisterClasses +___errno +__cxa_finalize +__deregister_frame_info_bases +__divdi3 +__errno_location +__fxstat64 +__gmon_start__ +__iob +__isoc99_sscanf +__lxstat64 +__moddi3 +__register_frame_info_bases +__stack_chk_fail +__udivdi3 +__umoddi3 +__xstat64 diff --git a/src/VBox/Additions/x11/vboxvideo/vboxutils.c b/src/VBox/Additions/x11/vboxvideo/vboxutils.c index 75a0ccb36..c1df71d4c 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxutils.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxutils.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c index 608064261..e9952a15b 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h index 64a91f3e3..549ec4ba7 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo.h +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -54,6 +54,7 @@ #include <VBox/VBoxVideoGuest.h> #include <VBox/VBoxVideo.h> +#include <iprt/asm-math.h> #ifdef DEBUG @@ -264,7 +265,8 @@ static inline int32_t vboxLineLength(ScrnInfoPtr pScrn, int32_t cDisplayWidth) /** Calculate the display pitch from the scan line length */ static inline int32_t vboxDisplayPitch(ScrnInfoPtr pScrn, int32_t cbLine) { - return (int32_t)((uint64_t)cbLine * 8 / vboxBPP(pScrn)); + /* take care to reference __udivdi3! */ + return ASMDivU64ByU32RetU32((uint64_t)cbLine * 8, vboxBPP(pScrn)); } extern void vboxClearVRAM(ScrnInfoPtr pScrn, int32_t cNewX, int32_t cNewY); diff --git a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c index 46ded3524..465ff9b5f 100644 --- a/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c +++ b/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/vboxvideo/vbva.c b/src/VBox/Additions/x11/vboxvideo/vbva.c index 9f5bac94c..67b0adc94 100644 --- a/src/VBox/Additions/x11/vboxvideo/vbva.c +++ b/src/VBox/Additions/x11/vboxvideo/vbva.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c index 401eec1d7..84ac0ba9f 100644 --- a/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c +++ b/src/VBox/Additions/x11/x11stubs/libXcomposite-1.0.0/libXcomposite.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGCEmulateCodeView.cpp b/src/VBox/Debugger/DBGCEmulateCodeView.cpp index d970d7ced..28d27eb17 100644 --- a/src/VBox/Debugger/DBGCEmulateCodeView.cpp +++ b/src/VBox/Debugger/DBGCEmulateCodeView.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGCInternal.h b/src/VBox/Debugger/DBGCInternal.h index a7a0f6a92..6207b1c14 100644 --- a/src/VBox/Debugger/DBGCInternal.h +++ b/src/VBox/Debugger/DBGCInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGCOps.cpp b/src/VBox/Debugger/DBGCOps.cpp index ea9ce5a7e..4372c770a 100644 --- a/src/VBox/Debugger/DBGCOps.cpp +++ b/src/VBox/Debugger/DBGCOps.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGConsole.cpp b/src/VBox/Debugger/DBGConsole.cpp index 0787dcf11..90fde877f 100644 --- a/src/VBox/Debugger/DBGConsole.cpp +++ b/src/VBox/Debugger/DBGConsole.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGPlugInDiggers.cpp b/src/VBox/Debugger/DBGPlugInDiggers.cpp index 838391025..6ea2b4a7d 100644 --- a/src/VBox/Debugger/DBGPlugInDiggers.cpp +++ b/src/VBox/Debugger/DBGPlugInDiggers.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/DBGPlugInWinNt.cpp b/src/VBox/Debugger/DBGPlugInWinNt.cpp index 503bc48a3..72ec3b4f2 100644 --- a/src/VBox/Debugger/DBGPlugInWinNt.cpp +++ b/src/VBox/Debugger/DBGPlugInWinNt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/VBoxDbgBase.cpp b/src/VBox/Debugger/VBoxDbgBase.cpp index dd08ef339..03c4e9692 100644 --- a/src/VBox/Debugger/VBoxDbgBase.cpp +++ b/src/VBox/Debugger/VBoxDbgBase.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/VBoxDbgConsole.cpp b/src/VBox/Debugger/VBoxDbgConsole.cpp index 61f5ca697..90c720446 100644 --- a/src/VBox/Debugger/VBoxDbgConsole.cpp +++ b/src/VBox/Debugger/VBoxDbgConsole.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/VBoxDbgConsole.h b/src/VBox/Debugger/VBoxDbgConsole.h index 258471729..7b89af4ff 100644 --- a/src/VBox/Debugger/VBoxDbgConsole.h +++ b/src/VBox/Debugger/VBoxDbgConsole.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp index 5e42c2742..c93f87e2b 100644 --- a/src/VBox/Debugger/VBoxDbgStatsQt4.cpp +++ b/src/VBox/Debugger/VBoxDbgStatsQt4.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/testcase/tstDBGCParser.cpp b/src/VBox/Debugger/testcase/tstDBGCParser.cpp index 56785209c..5c1b884e8 100644 --- a/src/VBox/Debugger/testcase/tstDBGCParser.cpp +++ b/src/VBox/Debugger/testcase/tstDBGCParser.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp index b0429d19c..037fa3389 100644 --- a/src/VBox/Debugger/testcase/tstDBGCStubs.cpp +++ b/src/VBox/Debugger/testcase/tstDBGCStubs.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp index d39f4b6a5..0d1915dbf 100644 --- a/src/VBox/Debugger/testcase/tstVBoxDbg.cpp +++ b/src/VBox/Debugger/testcase/tstVBoxDbg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/DevCodec.cpp b/src/VBox/Devices/Audio/DevCodec.cpp index c17fbc546..e2f321e8f 100644 --- a/src/VBox/Devices/Audio/DevCodec.cpp +++ b/src/VBox/Devices/Audio/DevCodec.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/DevCodec.h b/src/VBox/Devices/Audio/DevCodec.h index b43420f37..bb5d7e25d 100644 --- a/src/VBox/Devices/Audio/DevCodec.h +++ b/src/VBox/Devices/Audio/DevCodec.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/DevIchAc97.cpp b/src/VBox/Devices/Audio/DevIchAc97.cpp index e6bba5a73..1b2aeb93f 100644 --- a/src/VBox/Devices/Audio/DevIchAc97.cpp +++ b/src/VBox/Devices/Audio/DevIchAc97.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/DevIchIntelHDA.cpp b/src/VBox/Devices/Audio/DevIchIntelHDA.cpp index 30a220fef..3685ac4e1 100644 --- a/src/VBox/Devices/Audio/DevIchIntelHDA.cpp +++ b/src/VBox/Devices/Audio/DevIchIntelHDA.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/alsa_stubs.h b/src/VBox/Devices/Audio/alsa_stubs.h index 7baf1b378..bfb650ad8 100644 --- a/src/VBox/Devices/Audio/alsa_stubs.h +++ b/src/VBox/Devices/Audio/alsa_stubs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/audiosniffer.c b/src/VBox/Devices/Audio/audiosniffer.c index 7cff38cda..fd6506da7 100644 --- a/src/VBox/Devices/Audio/audiosniffer.c +++ b/src/VBox/Devices/Audio/audiosniffer.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/coreaudio.c b/src/VBox/Devices/Audio/coreaudio.c index 5b945210c..ef9c7bdd0 100644 --- a/src/VBox/Devices/Audio/coreaudio.c +++ b/src/VBox/Devices/Audio/coreaudio.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/filteraudio.c b/src/VBox/Devices/Audio/filteraudio.c index fe64e48c4..9c3a2e3f3 100644 --- a/src/VBox/Devices/Audio/filteraudio.c +++ b/src/VBox/Devices/Audio/filteraudio.c @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/pulse_stubs.h b/src/VBox/Devices/Audio/pulse_stubs.h index 83b16ae04..8262ed898 100644 --- a/src/VBox/Devices/Audio/pulse_stubs.h +++ b/src/VBox/Devices/Audio/pulse_stubs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/pulseaudio.c b/src/VBox/Devices/Audio/pulseaudio.c index eb70fadde..e2bd1d56c 100644 --- a/src/VBox/Devices/Audio/pulseaudio.c +++ b/src/VBox/Devices/Audio/pulseaudio.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/solaudio.c b/src/VBox/Devices/Audio/solaudio.c index ef8b7763d..850da5b29 100644 --- a/src/VBox/Devices/Audio/solaudio.c +++ b/src/VBox/Devices/Audio/solaudio.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Audio/winaudio.c b/src/VBox/Devices/Audio/winaudio.c index 5d0532d17..9cf226e51 100644 --- a/src/VBox/Devices/Audio/winaudio.c +++ b/src/VBox/Devices/Audio/winaudio.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp b/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp index 690dcb47b..80ebcbf22 100644 --- a/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp +++ b/src/VBox/Devices/BiosCommonCode/MakeAlternativeSource.cpp @@ -955,6 +955,24 @@ static bool disCode(uint32_t uFlatAddr, uint32_t cb, bool fIs16Bit) && pb[3] == 0xff && pb[4] == 0xff ) + || ( pb[0] == 0xa1 /* int1a_function switch */ + && pb[1] == 0x66 + && pb[2] == 0xc8 + && pb[3] == 0x66 + && pb[4] == 0xed + && pb[5] == 0x66 + && pb[6] == 0x1f + && pb[7] == 0x67 + ) + || ( pb[0] == 0x49 /* apm_out_str switch */ + && pb[1] == 0x87 + && pb[2] == 0x18 + && pb[3] == 0x88 + && pb[4] == 0x5b + && pb[5] == 0x87 + && pb[6] == 0x76 + && pb[7] == 0x87 + ) || 0 ) return disByteData(uFlatAddr, cb); diff --git a/src/VBox/Devices/Bus/DevPCI.cpp b/src/VBox/Devices/Bus/DevPCI.cpp index 7f799054f..01682870a 100644 --- a/src/VBox/Devices/Bus/DevPCI.cpp +++ b/src/VBox/Devices/Bus/DevPCI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/DevPciIch9.cpp b/src/VBox/Devices/Bus/DevPciIch9.cpp index a7512391e..8fa55ba6e 100644 --- a/src/VBox/Devices/Bus/DevPciIch9.cpp +++ b/src/VBox/Devices/Bus/DevPciIch9.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/MsiCommon.cpp b/src/VBox/Devices/Bus/MsiCommon.cpp index db2727c07..6c8ab099f 100644 --- a/src/VBox/Devices/Bus/MsiCommon.cpp +++ b/src/VBox/Devices/Bus/MsiCommon.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/MsiCommon.h b/src/VBox/Devices/Bus/MsiCommon.h index 4567b0e93..73ddda46f 100644 --- a/src/VBox/Devices/Bus/MsiCommon.h +++ b/src/VBox/Devices/Bus/MsiCommon.h @@ -3,7 +3,7 @@ * Header for MSI/MSI-X support routines. */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/MsixCommon.cpp b/src/VBox/Devices/Bus/MsixCommon.cpp index 06b085899..abe169b57 100644 --- a/src/VBox/Devices/Bus/MsixCommon.cpp +++ b/src/VBox/Devices/Bus/MsixCommon.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/PCIInternal.h b/src/VBox/Devices/Bus/PCIInternal.h index 0e0bc08f2..edb32c900 100644 --- a/src/VBox/Devices/Bus/PCIInternal.h +++ b/src/VBox/Devices/Bus/PCIInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Bus/SrvPciRawR0.cpp b/src/VBox/Devices/Bus/SrvPciRawR0.cpp index 22b0479cb..678a2ba7c 100644 --- a/src/VBox/Devices/Bus/SrvPciRawR0.cpp +++ b/src/VBox/Devices/Bus/SrvPciRawR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/DevEFI.cpp b/src/VBox/Devices/EFI/DevEFI.cpp index 6251db2ec..524af54af 100644 --- a/src/VBox/Devices/EFI/DevEFI.cpp +++ b/src/VBox/Devices/EFI/DevEFI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h index 450473433..44e579c82 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.h @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac index bf21d4d8b..bb7857e1d 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/DevEFI.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2009 Oracle Corporation +; Copyright (C) 2009-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h index 4cb9cb4dd..2286ec237 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxDebugLib.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h index bf5caf4f1..95fc4132a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxMemLayout.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h index 58f6743ad..5458159c5 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Include/VBoxPkg.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c index b977ae848..a45179335 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf index 6078b9d0f..d6dd88806 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.inf @@ -5,7 +5,7 @@ # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c index 8d789563b..8d84662ae 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxDebugLib/VBoxPrintString.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c index 97559f45b..0f9749225 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxGenericBdsLib/BdsBoot.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf index a282c5a85..57b28daee 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxOemHookStatusCodeLib/VBoxOemHookStatusCodeLib.inf @@ -4,7 +4,7 @@ # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c index e8fbf0ae7..9454f570c 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/Library/VBoxPeCoffLib/BasePeCoff.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c index 649db9ee1..6bd73d02e 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/VBoxAppleSim.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf index 1c3ebaa68..1372501b4 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxHfs.inf @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf index 0ca9c1462..1d73ec06f 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/VBoxIso9660.inf @@ -3,7 +3,7 @@ # VBox ISO9660 FS driver # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h index bebfa41eb..4dd78291e 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_core.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c index 6b9696de4..421c1684c 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h index bcdab2fb8..38d0b2ec0 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_efi_base.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c index 998c31ca3..3a8325435 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxFsDxe/fsw_iso9660.c @@ -14,7 +14,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile index e7e209b37..83a95a79a 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxMisc/Makefile @@ -4,7 +4,7 @@ #/ # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf index 23637f221..920fcc943 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxOSELogo/VBoxOSELogo.inf @@ -5,7 +5,7 @@ # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd index 5dfa9bcd9..e2102ee50 100644 --- a/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd +++ b/src/VBox/Devices/EFI/Firmware2/VBoxPkg/env.cmd @@ -6,7 +6,7 @@ REM * Environment Setup Script for VBoxPkg + EDK2. REM */
REM /*
-REM Copyright (C) 2009 Oracle Corporation
+REM Copyright (C) 2009-2012 Oracle Corporation
REM
REM This file is part of VirtualBox Open Source Edition (OSE), as
REM available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd Binary files differindex 14759e80a..dfde044a1 100644 --- a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd +++ b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI32.fd diff --git a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd Binary files differindex 677222745..29258fb2a 100644 --- a/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd +++ b/src/VBox/Devices/EFI/FirmwareBin/VBoxEFI64.fd diff --git a/src/VBox/Devices/EFI/Thunk/EfiThunk.asm b/src/VBox/Devices/EFI/Thunk/EfiThunk.asm index c49cc120c..76f125ec0 100644 --- a/src/VBox/Devices/EFI/Thunk/EfiThunk.asm +++ b/src/VBox/Devices/EFI/Thunk/EfiThunk.asm @@ -8,7 +8,7 @@ ; see: http://www.tortall.net/projects/yasm/manual/html/manual.html#objfmt-bin-section ; -; Copyright (C) 2009 Oracle Corporation +; Copyright (C) 2009-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm index c5b96955a..f6f6011f9 100644 --- a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm +++ b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.asm @@ -6651,7 +6651,7 @@ vesa_pm_end: ; 0xc4714 LB 0x1 section _DATA progbits vstart=0x4800 align=1 ; size=0x36e0 class=DATA group=DGROUP _msg_vga_init: ; 0xc4800 LB 0x2e - db 'Oracle VM VirtualBox Version 4.2.6 VGA BIOS', 00dh, 00ah, 000h + db 'Oracle VM VirtualBox Version 4.2.8 VGA BIOS', 00dh, 00ah, 000h _vga_modes: ; 0xc482e LB 0x80 db 000h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h, 001h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h db 002h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h, 003h, 000h, 000h, 004h, 000h, 0b8h, 0ffh, 002h @@ -7539,7 +7539,7 @@ _vbebios_vendor_name: ; 0xc7e35 LB 0x13 _vbebios_product_name: ; 0xc7e48 LB 0x21 db 'Oracle VM VirtualBox VBE Adapter', 000h _vbebios_product_revision: ; 0xc7e69 LB 0x23 - db 'Oracle VM VirtualBox Version 4.2.6', 000h + db 'Oracle VM VirtualBox Version 4.2.8', 000h _vbebios_info_string: ; 0xc7e8c LB 0x2b db 'VirtualBox VBE Display Adapter enabled', 00dh, 00ah, 00dh, 00ah, 000h _no_vbebios_info_string: ; 0xc7eb7 LB 0x29 @@ -7567,4 +7567,4 @@ section CONST2 progbits vstart=0x7ee0 align=1 ; size=0x0 class=DATA group=DGROUP db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h - db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 0c8h + db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 0c4h diff --git a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum index cf5bbb5d9..1c9cf3fc0 100644 --- a/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum +++ b/src/VBox/Devices/Graphics/BIOS/VBoxVgaBiosAlternative.md5sum @@ -1 +1 @@ -522ec63709549bdf20600b56c4695da5 *VBoxVgaBios.rom +45b071757df7f9b58714be2479c316d3 *VBoxVgaBios.rom diff --git a/src/VBox/Devices/Graphics/BIOS/inlines.h b/src/VBox/Devices/Graphics/BIOS/inlines.h index f147698fb..4b3fe3d83 100644 --- a/src/VBox/Devices/Graphics/BIOS/inlines.h +++ b/src/VBox/Devices/Graphics/BIOS/inlines.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGA.cpp b/src/VBox/Devices/Graphics/DevVGA.cpp index a636ad77a..6602ee905 100644 --- a/src/VBox/Devices/Graphics/DevVGA.cpp +++ b/src/VBox/Devices/Graphics/DevVGA.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGA.h b/src/VBox/Devices/Graphics/DevVGA.h index f576fda9e..558266fbe 100644 --- a/src/VBox/Devices/Graphics/DevVGA.h +++ b/src/VBox/Devices/Graphics/DevVGA.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -277,6 +277,8 @@ typedef struct VGAState { # if defined(VBOX_WITH_HGSMI) && (defined(VBOX_WITH_VIDEOHWACCEL) || defined(VBOX_WITH_CRHGSMI)) /** LUN\#0: VBVA callbacks interface */ PDMIDISPLAYVBVACALLBACKS IVBVACallbacks; +# elif HC_ARCH_BITS == 32 + uint32_t Padding0; # endif /** Pointer to base interface of the driver. */ R3PTRTYPE(PPDMIBASE) pDrvBase; diff --git a/src/VBox/Devices/Graphics/DevVGAModes.h b/src/VBox/Devices/Graphics/DevVGAModes.h index f03f7e7e6..5edcbb8d5 100644 --- a/src/VBox/Devices/Graphics/DevVGAModes.h +++ b/src/VBox/Devices/Graphics/DevVGAModes.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGASavedState.h b/src/VBox/Devices/Graphics/DevVGASavedState.h index dc7cbd46b..75facfc9f 100644 --- a/src/VBox/Devices/Graphics/DevVGASavedState.h +++ b/src/VBox/Devices/Graphics/DevVGASavedState.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGATmpl.h b/src/VBox/Devices/Graphics/DevVGATmpl.h index bd65c65eb..6c9efb5ad 100644 --- a/src/VBox/Devices/Graphics/DevVGATmpl.h +++ b/src/VBox/Devices/Graphics/DevVGATmpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp index 01269b17d..0019fba84 100644 --- a/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp +++ b/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp b/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp index 40466cdb2..389e3d3fc 100644 --- a/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp +++ b/src/VBox/Devices/Graphics/DevVGA_VDMA.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp index e987756dd..fc3b21383 100644 --- a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp +++ b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h index fb8eb127a..febd80158 100644 --- a/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h +++ b/src/VBox/Devices/Graphics/HGSMI/HGSMIHost.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.cpp b/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.cpp index fc67e67f7..3e0686a2a 100644 --- a/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.cpp +++ b/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.h b/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.h index e998390c7..eb76aed91 100644 --- a/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.h +++ b/src/VBox/Devices/Graphics/HGSMI/HGSMIHostHlp.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Input/DevPS2.cpp b/src/VBox/Devices/Input/DevPS2.cpp index d63bfa5c3..78f7d1df5 100644 --- a/src/VBox/Devices/Input/DevPS2.cpp +++ b/src/VBox/Devices/Input/DevPS2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp index e0ceb2313..379a339d9 100644 --- a/src/VBox/Devices/Input/DrvKeyboardQueue.cpp +++ b/src/VBox/Devices/Input/DrvKeyboardQueue.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Input/DrvMouseQueue.cpp b/src/VBox/Devices/Input/DrvMouseQueue.cpp index 19a843108..ad1e9c1ce 100644 --- a/src/VBox/Devices/Input/DrvMouseQueue.cpp +++ b/src/VBox/Devices/Input/DrvMouseQueue.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Input/UsbKbd.cpp b/src/VBox/Devices/Input/UsbKbd.cpp index e2c18e44b..aa7155831 100644 --- a/src/VBox/Devices/Input/UsbKbd.cpp +++ b/src/VBox/Devices/Input/UsbKbd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -298,7 +298,9 @@ static const VUSBDESCINTERFACEEX g_UsbHidInterfaceDesc = /* .pvMore = */ NULL, /* .pvClass = */ &g_UsbHidIfHidDesc, /* .cbClass = */ sizeof(g_UsbHidIfHidDesc), - &g_aUsbHidEndpointDescs[0] + &g_aUsbHidEndpointDescs[0], + /* .pIAD = */ NULL, + /* .cbIAD = */ 0 }; static const VUSBINTERFACE g_aUsbHidInterfaces[] = diff --git a/src/VBox/Devices/Input/UsbMouse.cpp b/src/VBox/Devices/Input/UsbMouse.cpp index c85da4dac..163d7c881 100644 --- a/src/VBox/Devices/Input/UsbMouse.cpp +++ b/src/VBox/Devices/Input/UsbMouse.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -378,7 +378,9 @@ static const VUSBDESCINTERFACEEX g_UsbHidMInterfaceDesc = /* .pvMore = */ NULL, /* .pvClass = */ &g_UsbHidMIfHidDesc, /* .cbClass = */ sizeof(g_UsbHidMIfHidDesc), - &g_aUsbHidMEndpointDescs[0] + &g_aUsbHidMEndpointDescs[0], + /* .pIAD = */ NULL, + /* .cbIAD = */ 0 }; static const VUSBDESCINTERFACEEX g_UsbHidTInterfaceDesc = @@ -397,7 +399,9 @@ static const VUSBDESCINTERFACEEX g_UsbHidTInterfaceDesc = /* .pvMore = */ NULL, /* .pvClass = */ &g_UsbHidTIfHidDesc, /* .cbClass = */ sizeof(g_UsbHidTIfHidDesc), - &g_aUsbHidTEndpointDescs[0] + &g_aUsbHidTEndpointDescs[0], + /* .pIAD = */ NULL, + /* .cbIAD = */ 0 }; static const VUSBINTERFACE g_aUsbHidMInterfaces[] = diff --git a/src/VBox/Devices/Network/DevE1000.cpp b/src/VBox/Devices/Network/DevE1000.cpp index 8497b54a9..525220e49 100644 --- a/src/VBox/Devices/Network/DevE1000.cpp +++ b/src/VBox/Devices/Network/DevE1000.cpp @@ -14,7 +14,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevE1000Phy.cpp b/src/VBox/Devices/Network/DevE1000Phy.cpp index 0d8af67a1..7f9718f5c 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.cpp +++ b/src/VBox/Devices/Network/DevE1000Phy.cpp @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevE1000Phy.h b/src/VBox/Devices/Network/DevE1000Phy.h index a4e6e2aa0..12aa31c65 100644 --- a/src/VBox/Devices/Network/DevE1000Phy.h +++ b/src/VBox/Devices/Network/DevE1000Phy.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevEEPROM.cpp b/src/VBox/Devices/Network/DevEEPROM.cpp index 88272be3e..8946d05ce 100644 --- a/src/VBox/Devices/Network/DevEEPROM.cpp +++ b/src/VBox/Devices/Network/DevEEPROM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevEEPROM.h b/src/VBox/Devices/Network/DevEEPROM.h index 20e829406..a4073fc1b 100644 --- a/src/VBox/Devices/Network/DevEEPROM.h +++ b/src/VBox/Devices/Network/DevEEPROM.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevINIP.cpp b/src/VBox/Devices/Network/DevINIP.cpp index 756bf302e..ea9b8b201 100644 --- a/src/VBox/Devices/Network/DevINIP.cpp +++ b/src/VBox/Devices/Network/DevINIP.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2009 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevPCNet.cpp b/src/VBox/Devices/Network/DevPCNet.cpp index 0f0f2bfab..b106b0695 100644 --- a/src/VBox/Devices/Network/DevPCNet.cpp +++ b/src/VBox/Devices/Network/DevPCNet.cpp @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DevVirtioNet.cpp b/src/VBox/Devices/Network/DevVirtioNet.cpp index 56ee1f4bf..149c057aa 100644 --- a/src/VBox/Devices/Network/DevVirtioNet.cpp +++ b/src/VBox/Devices/Network/DevVirtioNet.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvDedicatedNic.cpp b/src/VBox/Devices/Network/DrvDedicatedNic.cpp index 00c2b7f48..d72095697 100644 --- a/src/VBox/Devices/Network/DrvDedicatedNic.cpp +++ b/src/VBox/Devices/Network/DrvDedicatedNic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvIntNet.cpp b/src/VBox/Devices/Network/DrvIntNet.cpp index 2abed09a4..7f77ff180 100644 --- a/src/VBox/Devices/Network/DrvIntNet.cpp +++ b/src/VBox/Devices/Network/DrvIntNet.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvNAT.cpp b/src/VBox/Devices/Network/DrvNAT.cpp index 15a1ca3c8..7f1718735 100644 --- a/src/VBox/Devices/Network/DrvNAT.cpp +++ b/src/VBox/Devices/Network/DrvNAT.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvNetSniffer.cpp b/src/VBox/Devices/Network/DrvNetSniffer.cpp index 48eeb2fe8..bf4bf4d2d 100644 --- a/src/VBox/Devices/Network/DrvNetSniffer.cpp +++ b/src/VBox/Devices/Network/DrvNetSniffer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvTAP.cpp b/src/VBox/Devices/Network/DrvTAP.cpp index cc2663cf2..4c1d08137 100644 --- a/src/VBox/Devices/Network/DrvTAP.cpp +++ b/src/VBox/Devices/Network/DrvTAP.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvUDPTunnel.cpp b/src/VBox/Devices/Network/DrvUDPTunnel.cpp index e97b68e31..a978a2219 100644 --- a/src/VBox/Devices/Network/DrvUDPTunnel.cpp +++ b/src/VBox/Devices/Network/DrvUDPTunnel.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/DrvVDE.cpp b/src/VBox/Devices/Network/DrvVDE.cpp index 5dd5ed2ea..89f5e90ed 100644 --- a/src/VBox/Devices/Network/DrvVDE.cpp +++ b/src/VBox/Devices/Network/DrvVDE.cpp @@ -5,7 +5,7 @@ /* * Contributed by Renzo Davoli. VirtualSquare. University of Bologna, 2010 - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/Pcap.h b/src/VBox/Devices/Network/Pcap.h index c05b39030..6b79759d2 100644 --- a/src/VBox/Devices/Network/Pcap.h +++ b/src/VBox/Devices/Network/Pcap.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/SrvIntNetR0.cpp b/src/VBox/Devices/Network/SrvIntNetR0.cpp index a6d4772cd..411f10920 100644 --- a/src/VBox/Devices/Network/SrvIntNetR0.cpp +++ b/src/VBox/Devices/Network/SrvIntNetR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/lwip/vbox/sys_arch.c b/src/VBox/Devices/Network/lwip/vbox/sys_arch.c index c7aebe27e..573b02c52 100644 --- a/src/VBox/Devices/Network/lwip/vbox/sys_arch.c +++ b/src/VBox/Devices/Network/lwip/vbox/sys_arch.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh index 5c871dae9..32bbad179 100755 --- a/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh +++ b/src/VBox/Devices/Network/scripts/VBoxConvertNATStats.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2009 Oracle Corporation +# Copyright (C) 2009-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/bootp.c b/src/VBox/Devices/Network/slirp/bootp.c index 31d434c24..69ea650f1 100644 --- a/src/VBox/Devices/Network/slirp/bootp.c +++ b/src/VBox/Devices/Network/slirp/bootp.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/debug.c b/src/VBox/Devices/Network/slirp/debug.c index 14c292953..22284b72e 100644 --- a/src/VBox/Devices/Network/slirp/debug.c +++ b/src/VBox/Devices/Network/slirp/debug.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/debug.h b/src/VBox/Devices/Network/slirp/debug.h index 0a2ae9001..8cedf5e58 100644 --- a/src/VBox/Devices/Network/slirp/debug.h +++ b/src/VBox/Devices/Network/slirp/debug.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/ext.h b/src/VBox/Devices/Network/slirp/ext.h index e18285ae4..3248f5597 100644 --- a/src/VBox/Devices/Network/slirp/ext.h +++ b/src/VBox/Devices/Network/slirp/ext.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.c b/src/VBox/Devices/Network/slirp/ip_icmp.c index e924372d9..70c87e8d6 100644 --- a/src/VBox/Devices/Network/slirp/ip_icmp.c +++ b/src/VBox/Devices/Network/slirp/ip_icmp.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/ip_icmp.h b/src/VBox/Devices/Network/slirp/ip_icmp.h index eb3715f55..eb26aed84 100644 --- a/src/VBox/Devices/Network/slirp/ip_icmp.h +++ b/src/VBox/Devices/Network/slirp/ip_icmp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/ip_input.c b/src/VBox/Devices/Network/slirp/ip_input.c index db485f8d8..6b4d48c12 100644 --- a/src/VBox/Devices/Network/slirp/ip_input.c +++ b/src/VBox/Devices/Network/slirp/ip_input.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/ip_output.c b/src/VBox/Devices/Network/slirp/ip_output.c index 654e3ce20..562571830 100644 --- a/src/VBox/Devices/Network/slirp/ip_output.c +++ b/src/VBox/Devices/Network/slirp/ip_output.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c index d255457a5..d451d9c14 100644 --- a/src/VBox/Devices/Network/slirp/libalias/alias_dns.c +++ b/src/VBox/Devices/Network/slirp/libalias/alias_dns.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/libslirp.h b/src/VBox/Devices/Network/slirp/libslirp.h index e67dfcee1..c14596b60 100644 --- a/src/VBox/Devices/Network/slirp/libslirp.h +++ b/src/VBox/Devices/Network/slirp/libslirp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/misc.c b/src/VBox/Devices/Network/slirp/misc.c index 578a62076..f785a6ebb 100644 --- a/src/VBox/Devices/Network/slirp/misc.c +++ b/src/VBox/Devices/Network/slirp/misc.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/misc.h b/src/VBox/Devices/Network/slirp/misc.h index 64601eda0..940df28da 100644 --- a/src/VBox/Devices/Network/slirp/misc.h +++ b/src/VBox/Devices/Network/slirp/misc.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/sbuf.c b/src/VBox/Devices/Network/slirp/sbuf.c index 1f8c8b4c8..45babcee3 100644 --- a/src/VBox/Devices/Network/slirp/sbuf.c +++ b/src/VBox/Devices/Network/slirp/sbuf.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/slirp.c b/src/VBox/Devices/Network/slirp/slirp.c index 35215f37f..52a092b47 100644 --- a/src/VBox/Devices/Network/slirp/slirp.c +++ b/src/VBox/Devices/Network/slirp/slirp.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/slirp.h b/src/VBox/Devices/Network/slirp/slirp.h index 5e37af660..7b5a06a6d 100644 --- a/src/VBox/Devices/Network/slirp/slirp.h +++ b/src/VBox/Devices/Network/slirp/slirp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/socket.c b/src/VBox/Devices/Network/slirp/socket.c index 05d122bb4..de7021832 100644 --- a/src/VBox/Devices/Network/slirp/socket.c +++ b/src/VBox/Devices/Network/slirp/socket.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/socket.h b/src/VBox/Devices/Network/slirp/socket.h index 42e34976f..d97afd5b1 100644 --- a/src/VBox/Devices/Network/slirp/socket.h +++ b/src/VBox/Devices/Network/slirp/socket.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tcp_input.c b/src/VBox/Devices/Network/slirp/tcp_input.c index b9a34f8e6..0c4eb2195 100644 --- a/src/VBox/Devices/Network/slirp/tcp_input.c +++ b/src/VBox/Devices/Network/slirp/tcp_input.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tcp_output.c b/src/VBox/Devices/Network/slirp/tcp_output.c index 2a8a50d85..07a1d9104 100644 --- a/src/VBox/Devices/Network/slirp/tcp_output.c +++ b/src/VBox/Devices/Network/slirp/tcp_output.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tcp_subr.c b/src/VBox/Devices/Network/slirp/tcp_subr.c index 5fb68c6d3..be5ef8472 100644 --- a/src/VBox/Devices/Network/slirp/tcp_subr.c +++ b/src/VBox/Devices/Network/slirp/tcp_subr.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.c b/src/VBox/Devices/Network/slirp/tcp_timer.c index f378b5471..90a2ccd47 100644 --- a/src/VBox/Devices/Network/slirp/tcp_timer.c +++ b/src/VBox/Devices/Network/slirp/tcp_timer.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tcp_timer.h b/src/VBox/Devices/Network/slirp/tcp_timer.h index a9edba864..dd0a33aa7 100644 --- a/src/VBox/Devices/Network/slirp/tcp_timer.h +++ b/src/VBox/Devices/Network/slirp/tcp_timer.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/tftp.h b/src/VBox/Devices/Network/slirp/tftp.h index 690e5d628..e3460b2b8 100644 --- a/src/VBox/Devices/Network/slirp/tftp.h +++ b/src/VBox/Devices/Network/slirp/tftp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/udp.c b/src/VBox/Devices/Network/slirp/udp.c index 10685f955..2c1135a8f 100644 --- a/src/VBox/Devices/Network/slirp/udp.c +++ b/src/VBox/Devices/Network/slirp/udp.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/udp.h b/src/VBox/Devices/Network/slirp/udp.h index a5c0bf2f3..e9aa69df0 100644 --- a/src/VBox/Devices/Network/slirp/udp.h +++ b/src/VBox/Devices/Network/slirp/udp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/slirp/zone.h b/src/VBox/Devices/Network/slirp/zone.h index 9372901e3..089f04190 100644 --- a/src/VBox/Devices/Network/slirp/zone.h +++ b/src/VBox/Devices/Network/slirp/zone.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp index 02c33144f..29ce9dfd8 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNet-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -749,7 +749,7 @@ int main(int argc, char **argv) return 1; case 'V': - RTPrintf("$Revision: 78135 $\n"); + RTPrintf("$Revision: 83687 $\n"); return 0; default: diff --git a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp index 2b17cde13..8a69f1bb9 100644 --- a/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp +++ b/src/VBox/Devices/Network/testcase/tstIntNetR0.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp index 3f961b71e..a95c4fa8e 100644 --- a/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp +++ b/src/VBox/Devices/PC/ACPI/VBoxAcpi.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm index e1733b19a..65197cedc 100644 --- a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm +++ b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.asm @@ -7,7 +7,7 @@ ; Source file: bios.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -91,7 +91,7 @@ ; Source file: ata.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -175,7 +175,7 @@ ; Source file: eltorito.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2013 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -217,7 +217,7 @@ ; Source file: boot.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -259,7 +259,7 @@ ; Source file: keyboard.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -343,7 +343,7 @@ ; Source file: serial.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -385,7 +385,7 @@ ; Source file: system.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -427,7 +427,7 @@ ; Source file: timepci.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -511,7 +511,7 @@ ; Source file: parallel.c ; ; -; Copyright (C) 2006-2011 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -557,7 +557,7 @@ ; ; ; -; Copyright (C) 2004-2011 Oracle Corporation +; Copyright (C) 2004-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -575,7 +575,7 @@ ; ; ; -; Copyright (C) 2004-2011 Oracle Corporation +; Copyright (C) 2004-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -593,7 +593,7 @@ ; ; ; -; Copyright (C) 2011 Oracle Corporation +; Copyright (C) 2011-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; @@ -794,10 +794,10 @@ section _DATA progbits vstart=0x0 align=1 ; size=0x30 class=DATA group=DGROUP _dskacc: ; 0xf0000 LB 0x30 db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 059h, 027h, 0d0h, 027h, 000h, 000h, 000h, 000h - db 042h, 073h, 0e4h, 073h, 05fh, 07eh, 0f0h, 07eh, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h + db 04bh, 073h, 0edh, 073h, 068h, 07eh, 0f9h, 07eh, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h db 05fh, 033h, 032h, 05fh, 000h, 0dah, 00fh, 000h, 000h, 001h, 0f3h, 000h, 000h, 000h, 000h, 000h -section CONST progbits vstart=0x30 align=1 ; size=0xc94 class=DATA group=DGROUP +section CONST progbits vstart=0x30 align=1 ; size=0xc96 class=DATA group=DGROUP db 'NMI Handler called', 00ah, 000h db 'INT18: BOOT FAILURE', 00ah, 000h db '%s', 00ah, 000h, 000h @@ -825,7 +825,7 @@ section CONST progbits vstart=0x30 align=1 ; size=0xc94 class=DATA group=DGROUP db '%s: bad floppy type', 00ah, 000h db '%s: unsupported AH=%02x', 00ah, 000h, 000h db 'int13_eltorito', 000h - db '%s: call with AX=%04x. Please report', 00ah, 000h + db '%s: call with AX=%04x not implemented.', 00ah, 000h db '%s: unsupported AH=%02x', 00ah, 000h db 'int13_cdemu', 000h db '%s: function %02x, emulation not active for DL= %02x', 00ah, 000h @@ -909,20 +909,20 @@ section CONST progbits vstart=0x30 align=1 ; size=0xc94 class=DATA group=DGROUP db 'APM: Unsupported function AX=%04X BX=%04X called', 00ah, 000h, 000h db 'PCI: Unsupported function AX=%04X BX=%04X called', 00ah, 000h -section CONST2 progbits vstart=0xcc4 align=1 ; size=0x3fa class=DATA group=DGROUP -_bios_cvs_version_string: ; 0xf0cc4 LB 0x12 - db 'VirtualBox 4.2.6', 000h, 000h -_bios_prefix_string: ; 0xf0cd6 LB 0x8 +section CONST2 progbits vstart=0xcc6 align=1 ; size=0x3fa class=DATA group=DGROUP +_bios_cvs_version_string: ; 0xf0cc6 LB 0x12 + db 'VirtualBox 4.2.8', 000h, 000h +_bios_prefix_string: ; 0xf0cd8 LB 0x8 db 'BIOS: ', 000h, 000h -_isotag: ; 0xf0cde LB 0x6 +_isotag: ; 0xf0ce0 LB 0x6 db 'CD001', 000h -_eltorito: ; 0xf0ce4 LB 0x18 +_eltorito: ; 0xf0ce6 LB 0x18 db 'EL TORITO SPECIFICATION', 000h -_drivetypes: ; 0xf0cfc LB 0x28 +_drivetypes: ; 0xf0cfe LB 0x28 db 046h, 06ch, 06fh, 070h, 070h, 079h, 000h, 000h, 000h, 000h, 048h, 061h, 072h, 064h, 020h, 044h db 069h, 073h, 06bh, 000h, 043h, 044h, 02dh, 052h, 04fh, 04dh, 000h, 000h, 000h, 000h, 04ch, 041h db 04eh, 000h, 000h, 000h, 000h, 000h, 000h, 000h -_scan_to_scanascii: ; 0xf0d24 LB 0x37a +_scan_to_scanascii: ; 0xf0d26 LB 0x37a db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 01bh, 001h, 01bh, 001h, 01bh, 001h db 000h, 001h, 000h, 000h, 031h, 002h, 021h, 002h, 000h, 000h, 000h, 078h, 000h, 000h, 032h, 003h db 040h, 003h, 000h, 003h, 000h, 079h, 000h, 000h, 033h, 004h, 023h, 004h, 000h, 000h, 000h, 07ah @@ -979,13 +979,13 @@ _scan_to_scanascii: ; 0xf0d24 LB 0x37a db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 05ch, 056h, 07ch, 056h db 000h, 000h, 000h, 000h, 000h, 000h, 000h, 085h, 000h, 087h, 000h, 089h, 000h, 08bh, 000h, 000h db 000h, 086h, 000h, 088h, 000h, 08ah, 000h, 08ch, 000h, 000h -_panic_msg_keyb_buffer_full: ; 0xf109e LB 0x20 +_panic_msg_keyb_buffer_full: ; 0xf10a0 LB 0x20 db '%s: keyboard input buffer full', 00ah, 000h - ; Padding 0x542 bytes at 0xf10be - times 1346 db 0 + ; Padding 0x540 bytes at 0xf10c0 + times 1344 db 0 -section _TEXT progbits vstart=0x1600 align=1 ; size=0x7745 class=CODE group=AUTO +section _TEXT progbits vstart=0x1600 align=1 ; size=0x7755 class=CODE group=AUTO read_byte_: ; 0xf1600 LB 0xe push bx ; 53 push bp ; 55 @@ -1147,11 +1147,11 @@ _int18_panic_msg: ; 0xf16f7 LB 0x10 _log_bios_start: ; 0xf1707 LB 0x1e push bp ; 55 mov bp, sp ; 89 e5 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 call 018aeh ; e8 99 01 - push 00cc4h ; 68 c4 0c + push 00cc6h ; 68 c6 0c push strict word 00059h ; 68 59 00 push strict byte 00004h ; 6a 04 call 018e9h ; e8 c9 01 @@ -1176,7 +1176,7 @@ _print_bios_banner: ; 0xf1725 LB 0x2c int 010h ; cd 10 pop bp ; 5d retn ; c3 - call 06ff8h ; e8 a9 58 + call 07001h ; e8 b2 58 pop bp ; 5d retn ; c3 send_: ; 0xf1751 LB 0x38 @@ -1309,7 +1309,7 @@ put_luint_: ; 0xf1840 LB 0x6e mov dx, cx ; 89 ca mov bx, strict word 0000ah ; bb 0a 00 xor cx, cx ; 31 c9 - call 08c50h ; e8 f7 73 + call 08c60h ; e8 07 74 mov word [bp-004h], ax ; 89 46 fc mov cx, dx ; 89 d1 mov dx, ax ; 89 c2 @@ -2272,7 +2272,7 @@ _ata_detect: ; 0xf1f23 LB 0x621 xor di, di ; 31 ff xor dx, dx ; 31 d2 mov word [bp-01ah], di ; 89 7e e6 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 call 018aeh ; e8 fb f6 @@ -2906,7 +2906,7 @@ ata_cmd_packet_: ; 0xf280a LB 0x2e3 mov byte [bp-002h], ah ; 88 66 fe cmp byte [bp+00eh], 002h ; 80 7e 0e 02 jne short 0285ah ; 75 1f - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 call 018aeh ; e8 68 f0 @@ -3690,7 +3690,7 @@ _int13_diskette_function: ; 0xf2df4 LB 0x799 je short 02f2fh ; 74 04 cmp AL, strict byte 048h ; 3c 48 jbe short 02f58h ; 76 29 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 call 018aeh ; e8 74 e9 @@ -4328,7 +4328,7 @@ _int13_diskette_function: ; 0xf2df4 LB 0x799 mov word [bp+01ah], ax ; 89 46 1a mov ax, strict word 00006h ; b8 06 00 jmp near 02e83h ; e9 19 f9 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 call 018aeh ; e8 39 e3 @@ -4372,7 +4372,7 @@ _cdemu_emulated_drive: ; 0xf35b7 LB 0x14 call 01600h ; e8 37 e0 pop bp ; 5d retn ; c3 -_int13_eltorito: ; 0xf35cb LB 0x17d +_int13_eltorito: ; 0xf35cb LB 0x186 push si ; 56 push di ; 57 push bp ; 55 @@ -4386,116 +4386,119 @@ _int13_eltorito: ; 0xf35cb LB 0x17d shr ax, 008h ; c1 e8 08 cmp ax, strict word 0004bh ; 3d 4b 00 jc short 035f3h ; 72 0a - jbe short 0360eh ; 76 23 + jbe short 03619h ; 76 2e cmp ax, strict word 0004dh ; 3d 4d 00 jbe short 035fah ; 76 0a - jmp near 0370ah ; e9 17 01 + jmp near 03715h ; e9 22 01 cmp ax, strict word 0004ah ; 3d 4a 00 - jne near 0370ah ; 0f 85 10 01 + jne near 03715h ; 0f 85 1b 01 + mov bx, 00cd8h ; bb d8 0c + mov cx, ds ; 8c d9 + mov ax, strict word 00004h ; b8 04 00 + call 018aeh ; e8 a9 e2 push word [bp+01ah] ; ff 76 1a push 0026ch ; 68 6c 02 push 0027bh ; 68 7b 02 - push strict byte 00007h ; 6a 07 - call 018e9h ; e8 e1 e2 + push strict byte 00004h ; 6a 04 + call 018e9h ; e8 d6 e2 add sp, strict byte 00008h ; 83 c4 08 - jmp near 03727h ; e9 19 01 + jmp near 03730h ; e9 17 01 mov dx, word [bp+00eh] ; 8b 56 0e mov ax, word [bp+008h] ; 8b 46 08 mov bx, strict word 00013h ; bb 13 00 - call 0160eh ; e8 f4 df + call 0160eh ; e8 e9 df mov es, di ; 8e c7 movzx bx, byte [es:si+001h] ; 26 0f b6 5c 01 mov dx, word [bp+00eh] ; 8b 56 0e inc dx ; 42 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 e3 df + call 0160eh ; e8 d8 df mov es, di ; 8e c7 movzx bx, byte [es:si+002h] ; 26 0f b6 5c 02 mov dx, word [bp+00eh] ; 8b 56 0e inc dx ; 42 inc dx ; 42 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 d1 df + call 0160eh ; e8 c6 df mov es, di ; 8e c7 movzx bx, byte [es:si+003h] ; 26 0f b6 5c 03 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00003h ; 83 c2 03 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 be df + call 0160eh ; e8 b3 df mov es, di ; 8e c7 mov bx, word [es:si+008h] ; 26 8b 5c 08 mov cx, word [es:si+00ah] ; 26 8b 4c 0a mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00004h ; 83 c2 04 mov ax, word [bp+008h] ; 8b 46 08 - call 0164ah ; e8 e4 df + call 0164ah ; e8 d9 df mov es, di ; 8e c7 mov bx, word [es:si+004h] ; 26 8b 5c 04 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00008h ; 83 c2 08 mov ax, word [bp+008h] ; 8b 46 08 - call 0162ah ; e8 b2 df + call 0162ah ; e8 a7 df mov es, di ; 8e c7 mov bx, word [es:si+006h] ; 26 8b 5c 06 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 0000ah ; 83 c2 0a mov ax, word [bp+008h] ; 8b 46 08 - call 0162ah ; e8 a0 df + call 0162ah ; e8 95 df mov es, di ; 8e c7 mov bx, word [es:si+00ch] ; 26 8b 5c 0c mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 0000ch ; 83 c2 0c mov ax, word [bp+008h] ; 8b 46 08 - call 0162ah ; e8 8e df + call 0162ah ; e8 83 df mov es, di ; 8e c7 mov bx, word [es:si+00eh] ; 26 8b 5c 0e mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 0000eh ; 83 c2 0e mov ax, word [bp+008h] ; 8b 46 08 - call 0162ah ; e8 7c df + call 0162ah ; e8 71 df mov es, di ; 8e c7 movzx bx, byte [es:si+012h] ; 26 0f b6 5c 12 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00010h ; 83 c2 10 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 4d df + call 0160eh ; e8 42 df mov es, di ; 8e c7 movzx bx, byte [es:si+014h] ; 26 0f b6 5c 14 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00011h ; 83 c2 11 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 3a df + call 0160eh ; e8 2f df mov es, di ; 8e c7 movzx bx, byte [es:si+010h] ; 26 0f b6 5c 10 mov dx, word [bp+00eh] ; 8b 56 0e add dx, strict byte 00012h ; 83 c2 12 mov ax, word [bp+008h] ; 8b 46 08 - call 0160eh ; e8 27 df + call 0160eh ; e8 1c df test byte [bp+01ah], 0ffh ; f6 46 1a ff - jne short 036f3h ; 75 06 + jne short 036feh ; 75 06 mov es, di ; 8e c7 mov byte [es:si], 000h ; 26 c6 04 00 mov byte [bp+01bh], 000h ; c6 46 1b 00 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 0c df + call 0160eh ; e8 01 df and byte [bp+020h], 0feh ; 80 66 20 fe pop bp ; 5d pop di ; 5f pop si ; 5e retn ; c3 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 99 e1 + call 018aeh ; e8 8e e1 mov ax, word [bp+01ah] ; 8b 46 1a shr ax, 008h ; c1 e8 08 push ax ; 50 push 0026ch ; 68 6c 02 - push 002a1h ; 68 a1 02 - push strict byte 00004h ; 6a 04 - jmp near 03605h ; e9 de fe + push 002a3h ; 68 a3 02 + jmp near 0360eh ; e9 de fe mov ax, word [bp+01ah] ; 8b 46 1a xor ah, ah ; 30 e4 or ah, 001h ; 80 cc 01 @@ -4505,10 +4508,10 @@ _int13_eltorito: ; 0xf35cb LB 0x17d xor bh, bh ; 30 ff mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 cc de + call 0160eh ; e8 c3 de or byte [bp+020h], 001h ; 80 4e 20 01 - jmp short 03706h ; eb be -device_is_cdrom_: ; 0xf3748 LB 0x32 + jmp short 03711h ; eb c0 +device_is_cdrom_: ; 0xf3751 LB 0x32 push bx ; 53 push dx ; 52 push bp ; 55 @@ -4516,23 +4519,23 @@ device_is_cdrom_: ; 0xf3748 LB 0x32 mov bl, al ; 88 c3 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 c4 de + call 0161ch ; e8 bb de cmp bl, 010h ; 80 fb 10 - jc short 03761h ; 72 04 + jc short 0376ah ; 72 04 xor ax, ax ; 31 c0 - jmp short 03776h ; eb 15 + jmp short 0377fh ; eb 15 xor bh, bh ; 30 ff imul bx, bx, strict byte 00018h ; 6b db 18 mov es, ax ; 8e c0 add bx, 00122h ; 81 c3 22 01 cmp byte [es:bx+01fh], 005h ; 26 80 7f 1f 05 - jne short 0375dh ; 75 ea + jne short 03766h ; 75 ea mov ax, strict word 00001h ; b8 01 00 pop bp ; 5d pop dx ; 5a pop bx ; 5b retn ; c3 -cdrom_boot_: ; 0xf377a LB 0x42f +cdrom_boot_: ; 0xf3783 LB 0x42f push bx ; 53 push cx ; 51 push dx ; 52 @@ -4541,30 +4544,30 @@ cdrom_boot_: ; 0xf377a LB 0x42f enter 0081ah, 000h ; c8 1a 08 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 90 de + call 0161ch ; e8 87 de mov word [bp-00ch], ax ; 89 46 f4 mov si, 00322h ; be 22 03 mov word [bp-00eh], ax ; 89 46 f2 mov word [bp-008h], 00122h ; c7 46 f8 22 01 mov word [bp-006h], ax ; 89 46 fa mov byte [bp-004h], 000h ; c6 46 fc 00 - jmp short 037ach ; eb 09 + jmp short 037b5h ; eb 09 inc byte [bp-004h] ; fe 46 fc cmp byte [bp-004h], 010h ; 80 7e fc 10 - jnc short 037b7h ; 73 0b + jnc short 037c0h ; 73 0b movzx ax, byte [bp-004h] ; 0f b6 46 fc - call 03748h ; e8 95 ff + call 03751h ; e8 95 ff test ax, ax ; 85 c0 - je short 037a3h ; 74 ec + je short 037ach ; 74 ec cmp byte [bp-004h], 010h ; 80 7e fc 10 - jc short 037c3h ; 72 06 + jc short 037cch ; 72 06 mov ax, strict word 00002h ; b8 02 00 - jmp near 03b49h ; e9 86 03 + jmp near 03b52h ; e9 86 03 mov cx, strict word 0000ch ; b9 0c 00 xor bx, bx ; 31 db mov dx, ss ; 8c d2 lea ax, [bp-01ah] ; 8d 46 e6 - call 08cbah ; e8 ea 54 + call 08ccah ; e8 f1 54 mov word [bp-01ah], strict word 00028h ; c7 46 e6 28 00 mov ax, strict word 00011h ; b8 11 00 xor dx, dx ; 31 d2 @@ -4580,7 +4583,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f db 066h, 026h, 0c7h, 047h, 00ah, 001h, 000h, 000h, 008h ; mov dword [es:bx+00ah], strict dword 008000001h ; 66 26 c7 47 0a 01 00 00 08 mov byte [bp-002h], 000h ; c6 46 fe 00 - jmp short 0382ah ; eb 2b + jmp short 03833h ; eb 2b lea dx, [bp-0081ah] ; 8d 96 e6 f7 push SS ; 16 push dx ; 52 @@ -4592,14 +4595,14 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 0280ah ; e8 ed ef + call 0280ah ; e8 e4 ef test ax, ax ; 85 c0 - je short 03850h ; 74 2f + je short 03859h ; 74 2f inc byte [bp-002h] ; fe 46 fe cmp byte [bp-002h], 004h ; 80 7e fe 04 - jnbe short 03850h ; 77 26 + jnbe short 03859h ; 77 26 cmp byte [bp-004h], 008h ; 80 7e fc 08 - jbe short 037ffh ; 76 cf + jbe short 03808h ; 76 cf lea dx, [bp-0081ah] ; 8d 96 e6 f7 push SS ; 16 push dx ; 52 @@ -4611,36 +4614,36 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 07f5dh ; e8 0f 47 - jmp short 0381dh ; eb cd + call 07f66h ; e8 0f 47 + jmp short 03826h ; eb cd test ax, ax ; 85 c0 - je short 0385ah ; 74 06 + je short 03863h ; 74 06 mov ax, strict word 00003h ; b8 03 00 - jmp near 03b49h ; e9 ef 02 + jmp near 03b52h ; e9 ef 02 cmp byte [bp-0081ah], 000h ; 80 be e6 f7 00 - je short 03867h ; 74 06 + je short 03870h ; 74 06 mov ax, strict word 00004h ; b8 04 00 - jmp near 03b49h ; e9 e2 02 + jmp near 03b52h ; e9 e2 02 xor di, di ; 31 ff - jmp short 03871h ; eb 06 + jmp short 0387ah ; eb 06 inc di ; 47 cmp di, strict byte 00005h ; 83 ff 05 - jnc short 03881h ; 73 10 + jnc short 0388ah ; 73 10 mov al, byte [bp+di-00819h] ; 8a 83 e7 f7 - cmp al, byte [di+00cdeh] ; 3a 85 de 0c - je short 0386bh ; 74 f0 + cmp al, byte [di+00ce0h] ; 3a 85 e0 0c + je short 03874h ; 74 f0 mov ax, strict word 00005h ; b8 05 00 - jmp near 03b49h ; e9 c8 02 + jmp near 03b52h ; e9 c8 02 xor di, di ; 31 ff - jmp short 0388bh ; eb 06 + jmp short 03894h ; eb 06 inc di ; 47 cmp di, strict byte 00017h ; 83 ff 17 - jnc short 0389bh ; 73 10 + jnc short 038a4h ; 73 10 mov al, byte [bp+di-00813h] ; 8a 83 ed f7 - cmp al, byte [di+00ce4h] ; 3a 85 e4 0c - je short 03885h ; 74 f0 + cmp al, byte [di+00ce6h] ; 3a 85 e6 0c + je short 0388eh ; 74 f0 mov ax, strict word 00006h ; b8 06 00 - jmp near 03b49h ; e9 ae 02 + jmp near 03b52h ; e9 ae 02 mov ax, word [bp-007d3h] ; 8b 86 2d f8 mov dx, word [bp-007d1h] ; 8b 96 2f f8 mov word [bp-01ah], strict word 00028h ; c7 46 e6 28 00 @@ -4653,7 +4656,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f xchg ah, al ; 86 c4 mov word [bp-013h], ax ; 89 46 ed cmp byte [bp-004h], 008h ; 80 7e fc 08 - jbe short 038e1h ; 76 20 + jbe short 038eah ; 76 20 lea dx, [bp-0081ah] ; 8d 96 e6 f7 push SS ; 16 push dx ; 52 @@ -4665,8 +4668,8 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 07f5dh ; e8 7e 46 - jmp short 038ffh ; eb 1e + call 07f66h ; e8 7e 46 + jmp short 03908h ; eb 1e lea dx, [bp-0081ah] ; 8d 96 e6 f7 push SS ; 16 push dx ; 52 @@ -4678,40 +4681,40 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 0280ah ; e8 0b ef + call 0280ah ; e8 02 ef test ax, ax ; 85 c0 - je short 03909h ; 74 06 + je short 03912h ; 74 06 mov ax, strict word 00007h ; b8 07 00 - jmp near 03b49h ; e9 40 02 + jmp near 03b52h ; e9 40 02 cmp byte [bp-0081ah], 001h ; 80 be e6 f7 01 - je short 03916h ; 74 06 + je short 0391fh ; 74 06 mov ax, strict word 00008h ; b8 08 00 - jmp near 03b49h ; e9 33 02 + jmp near 03b52h ; e9 33 02 cmp byte [bp-00819h], 000h ; 80 be e7 f7 00 - je short 03923h ; 74 06 + je short 0392ch ; 74 06 mov ax, strict word 00009h ; b8 09 00 - jmp near 03b49h ; e9 26 02 + jmp near 03b52h ; e9 26 02 cmp byte [bp-007fch], 055h ; 80 be 04 f8 55 - je short 03930h ; 74 06 + je short 03939h ; 74 06 mov ax, strict word 0000ah ; b8 0a 00 - jmp near 03b49h ; e9 19 02 + jmp near 03b52h ; e9 19 02 cmp byte [bp-007fbh], 0aah ; 80 be 05 f8 aa - jne short 0392ah ; 75 f3 + jne short 03933h ; 75 f3 cmp byte [bp-007fah], 088h ; 80 be 06 f8 88 - je short 03944h ; 74 06 + je short 0394dh ; 74 06 mov ax, strict word 0000bh ; b8 0b 00 - jmp near 03b49h ; e9 05 02 + jmp near 03b52h ; e9 05 02 mov al, byte [bp-007f9h] ; 8a 86 07 f8 mov es, [bp-00eh] ; 8e 46 f2 mov byte [es:si+001h], al ; 26 88 44 01 cmp byte [bp-007f9h], 000h ; 80 be 07 f8 00 - jne short 0395dh ; 75 07 + jne short 03966h ; 75 07 mov byte [es:si+002h], 0e0h ; 26 c6 44 02 e0 - jmp short 03970h ; eb 13 + jmp short 03979h ; eb 13 cmp byte [bp-007f9h], 004h ; 80 be 07 f8 04 - jnc short 0396bh ; 73 07 + jnc short 03974h ; 73 07 mov byte [es:si+002h], 000h ; 26 c6 44 02 00 - jmp short 03970h ; eb 05 + jmp short 03979h ; eb 05 mov byte [es:si+002h], 080h ; 26 c6 44 02 80 movzx di, byte [bp-004h] ; 0f b6 7e fc mov ax, di ; 89 f8 @@ -4728,7 +4731,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov word [es:si+004h], dx ; 26 89 54 04 mov di, word [bp-007f8h] ; 8b be 08 f8 test di, di ; 85 ff - jne short 03999h ; 75 03 + jne short 039a2h ; 75 03 mov di, 007c0h ; bf c0 07 mov es, [bp-00eh] ; 8e 46 f2 mov word [es:si+00ch], di ; 26 89 7c 0c @@ -4763,7 +4766,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f sub dx, ax ; 29 c2 mov word [es:bx+01ch], dx ; 26 89 57 1c cmp byte [bp-004h], 008h ; 80 7e fc 08 - jbe short 03a2ch ; 76 27 + jbe short 03a35h ; 76 27 push di ; 57 push dword 000000001h ; 66 6a 01 mov ax, word [bp-00ah] ; 8b 46 f6 @@ -4771,7 +4774,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, strict word 00009h ; b9 09 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 03a11h ; e2 fa + loop 03a1ah ; e2 fa push dx ; 52 push ax ; 50 push strict byte 00000h ; 6a 00 @@ -4779,8 +4782,8 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 07f5dh ; e8 33 45 - jmp short 03a51h ; eb 25 + call 07f66h ; e8 33 45 + jmp short 03a5ah ; eb 25 push di ; 57 push dword 000000001h ; 66 6a 01 mov ax, word [bp-00ah] ; 8b 46 f6 @@ -4788,7 +4791,7 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, strict word 00009h ; b9 09 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 03a38h ; e2 fa + loop 03a41h ; e2 fa push dx ; 52 push ax ; 50 push strict byte 00000h ; 6a 00 @@ -4796,52 +4799,52 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov dx, strict word 0000ch ; ba 0c 00 - call 0280ah ; e8 b9 ed + call 0280ah ; e8 b0 ed les bx, [bp-008h] ; c4 5e f8 mov word [es:bx+01ch], strict word 00000h ; 26 c7 47 1c 00 00 test ax, ax ; 85 c0 - je short 03a64h ; 74 06 + je short 03a6dh ; 74 06 mov ax, strict word 0000ch ; b8 0c 00 - jmp near 03b49h ; e9 e5 00 + jmp near 03b52h ; e9 e5 00 mov es, [bp-00eh] ; 8e 46 f2 mov al, byte [es:si+001h] ; 26 8a 44 01 cmp AL, strict byte 002h ; 3c 02 - jc short 03a7ch ; 72 0d - jbe short 03a94h ; 76 23 + jc short 03a85h ; 72 0d + jbe short 03a9dh ; 76 23 cmp AL, strict byte 004h ; 3c 04 - je short 03aaah ; 74 35 + je short 03ab3h ; 74 35 cmp AL, strict byte 003h ; 3c 03 - je short 03a9fh ; 74 26 - jmp near 03af2h ; e9 76 00 + je short 03aa8h ; 74 26 + jmp near 03afbh ; e9 76 00 cmp AL, strict byte 001h ; 3c 01 - jne short 03af2h ; 75 72 + jne short 03afbh ; 75 72 mov es, [bp-00eh] ; 8e 46 f2 db 066h, 026h, 0c7h, 044h, 012h, 050h, 000h, 00fh, 000h ; mov dword [es:si+012h], strict dword 0000f0050h ; 66 26 c7 44 12 50 00 0f 00 mov word [es:si+010h], strict word 00002h ; 26 c7 44 10 02 00 - jmp short 03af2h ; eb 5e + jmp short 03afbh ; eb 5e db 066h, 026h, 0c7h, 044h, 012h, 050h, 000h, 012h, 000h ; mov dword [es:si+012h], strict dword 000120050h ; 66 26 c7 44 12 50 00 12 00 - jmp short 03a8ch ; eb ed + jmp short 03a95h ; eb ed db 066h, 026h, 0c7h, 044h, 012h, 050h, 000h, 024h, 000h ; mov dword [es:si+012h], strict dword 000240050h ; 66 26 c7 44 12 50 00 24 00 - jmp short 03a8ch ; eb e2 + jmp short 03a95h ; eb e2 mov dx, 001c4h ; ba c4 01 mov ax, di ; 89 f8 - call 01600h ; e8 4e db + call 01600h ; e8 45 db and AL, strict byte 03fh ; 24 3f xor ah, ah ; 30 e4 mov es, [bp-00eh] ; 8e 46 f2 mov word [es:si+014h], ax ; 26 89 44 14 mov dx, 001c4h ; ba c4 01 mov ax, di ; 89 f8 - call 01600h ; e8 3b db + call 01600h ; e8 32 db xor ah, ah ; 30 e4 mov bx, ax ; 89 c3 sal bx, 002h ; c1 e3 02 mov dx, 001c5h ; ba c5 01 mov ax, di ; 89 f8 - call 01600h ; e8 2c db + call 01600h ; e8 23 db xor ah, ah ; 30 e4 add ax, bx ; 01 d8 inc ax ; 40 @@ -4849,36 +4852,36 @@ cdrom_boot_: ; 0xf377a LB 0x42f mov word [es:si+012h], ax ; 26 89 44 12 mov dx, 001c3h ; ba c3 01 mov ax, di ; 89 f8 - call 01600h ; e8 18 db + call 01600h ; e8 0f db xor ah, ah ; 30 e4 inc ax ; 40 mov es, [bp-00eh] ; 8e 46 f2 mov word [es:si+010h], ax ; 26 89 44 10 mov es, [bp-00eh] ; 8e 46 f2 cmp byte [es:si+001h], 000h ; 26 80 7c 01 00 - je short 03b30h ; 74 34 + je short 03b39h ; 74 34 cmp byte [es:si+002h], 000h ; 26 80 7c 02 00 - jne short 03b19h ; 75 16 + jne short 03b22h ; 75 16 mov dx, strict word 00010h ; ba 10 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 f4 da + call 01600h ; e8 eb da or AL, strict byte 041h ; 0c 41 movzx bx, al ; 0f b6 d8 mov dx, strict word 00010h ; ba 10 00 mov ax, strict word 00040h ; b8 40 00 - jmp short 03b2dh ; eb 14 + jmp short 03b36h ; eb 14 mov dx, 002c0h ; ba c0 02 mov ax, word [bp-00ch] ; 8b 46 f4 - call 01600h ; e8 de da + call 01600h ; e8 d5 da db 0feh, 0c0h ; inc al ; fe c0 movzx bx, al ; 0f b6 d8 mov dx, 002c0h ; ba c0 02 mov ax, word [bp-00ch] ; 8b 46 f4 - call 0160eh ; e8 de da + call 0160eh ; e8 d5 da mov es, [bp-00eh] ; 8e 46 f2 cmp byte [es:si+001h], 000h ; 26 80 7c 01 00 - je short 03b3eh ; 74 04 + je short 03b47h ; 74 04 mov byte [es:si], 001h ; 26 c6 04 01 mov es, [bp-00eh] ; 8e 46 f2 movzx ax, byte [es:si+002h] ; 26 0f b6 44 02 @@ -4908,59 +4911,57 @@ cdrom_boot_: ; 0xf377a LB 0x42f or byte [di], al ; 08 05 add AL, strict byte 003h ; 04 03 add al, byte [bx+di] ; 02 01 - add byte [bx], dh ; 00 37 - aas ; 3f - sbb byte [bx], bh ; 18 3f - pop ax ; 58 - cmp AL, strict byte 082h ; 3c 82 - cmp AL, strict byte 04dh ; 3c 4d - cmp AL, strict byte 082h ; 3c 82 - cmp AL, strict byte 04dh ; 3c 4d - cmp AL, strict byte 074h ; 3c 74 - sbb byte [ds:bx], bh ; 3e 18 3f - aaa ; 37 - aas ; 3f - aaa ; 37 + add byte [bx+si+03fh], al ; 00 40 3f + and word [bx], di ; 21 3f + popaw ; 61 + cmp AL, strict byte 08bh ; 3c 8b + cmp AL, strict byte 056h ; 3c 56 + cmp AL, strict byte 08bh ; 3c 8b + cmp AL, strict byte 056h ; 3c 56 + cmp AL, strict byte 07dh ; 3c 7d + and word [ds:bx], di ; 3e 21 3f + inc ax ; 40 aas ; 3f - sbb byte [bx], bh ; 18 3f - sbb byte [bx], bh ; 18 3f - sbb byte [bx], bh ; 18 3f - sbb byte [bx], bh ; 18 3f - sbb byte [bx], bh ; 18 3f - das ; 2f + inc ax ; 40 aas ; 3f - sbb byte [bx], bh ; 18 3f - aaa ; 37 + and word [bx], di ; 21 3f + and word [bx], di ; 21 3f + and word [bx], di ; 21 3f + and word [bx], di ; 21 3f + and word [bx], di ; 21 3f + cmp byte [bx], bh ; 38 3f + and word [bx], di ; 21 3f + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f - aaa ; 37 + inc ax ; 40 aas ; 3f -_int13_cdemu: ; 0xf3ba9 LB 0x429 +_int13_cdemu: ; 0xf3bb2 LB 0x429 push si ; 56 push di ; 57 enter 0002ah, 000h ; c8 2a 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 64 da + call 0161ch ; e8 5b da mov di, 00322h ; bf 22 03 mov cx, ax ; 89 c1 mov si, di ; 89 fe @@ -4976,53 +4977,53 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 27 da + call 0160eh ; e8 1e da mov es, cx ; 8e c1 cmp byte [es:di], 000h ; 26 80 3d 00 - je short 03bfdh ; 74 0e + je short 03c06h ; 74 0e movzx ax, byte [es:di+002h] ; 26 0f b6 45 02 mov dx, word [bp+016h] ; 8b 56 16 xor dh, dh ; 30 f6 cmp ax, dx ; 39 d0 - je short 03c26h ; 74 29 - mov bx, 00cd6h ; bb d6 0c + je short 03c2fh ; 74 29 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 a6 dc + call 018aeh ; e8 9d dc mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 push ax ; 50 mov ax, word [bp+01ah] ; 8b 46 1a shr ax, 008h ; c1 e8 08 push ax ; 50 - push 002bah ; 68 ba 02 - push 002c6h ; 68 c6 02 + push 002bch ; 68 bc 02 + push 002c8h ; 68 c8 02 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 c9 dc + call 018e9h ; e8 c0 dc add sp, strict byte 0000ah ; 83 c4 0a - jmp near 03f57h ; e9 31 03 + jmp near 03f60h ; e9 31 03 mov ax, word [bp+01ah] ; 8b 46 1a shr ax, 008h ; c1 e8 08 cmp ax, strict word 00050h ; 3d 50 00 - jnbe near 03f37h ; 0f 87 04 03 + jnbe near 03f40h ; 0f 87 04 03 push CS ; 0e pop ES ; 07 mov cx, strict word 0001eh ; b9 1e 00 - mov di, 03b50h ; bf 50 3b + mov di, 03b59h ; bf 59 3b repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov ax, word [cs:di+03b6dh] ; 2e 8b 85 6d 3b + mov ax, word [cs:di+03b76h] ; 2e 8b 85 76 3b mov bx, word [bp+01ah] ; 8b 5e 1a xor bh, bh ; 30 ff jmp ax ; ff e0 mov ax, word [bp+01ah] ; 8b 46 1a xor ah, ah ; 30 e4 or ah, 003h ; 80 cc 03 - jmp near 03f5fh ; e9 07 03 + jmp near 03f68h ; e9 07 03 mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 9f d9 + call 01600h ; e8 96 d9 mov cl, al ; 88 c1 movzx ax, cl ; 0f b6 c1 sal ax, 008h ; c1 e0 08 @@ -5031,10 +5032,10 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 95 d9 + call 0160eh ; e8 8c d9 test cl, cl ; 84 c9 - je near 03f1ch ; 0f 84 9d 02 - jmp near 03f73h ; e9 f1 02 + je near 03f25h ; 0f 84 9d 02 + jmp near 03f7ch ; e9 f1 02 mov es, [bp-004h] ; 8e 46 fc mov di, word [es:si+014h] ; 26 8b 7c 14 mov dx, word [es:si+012h] ; 26 8b 54 12 @@ -5059,17 +5060,17 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 xor ch, ch ; 30 ed mov word [bp-00ah], cx ; 89 4e f6 test cx, cx ; 85 c9 - je near 03f18h ; 0f 84 4a 02 + je near 03f21h ; 0f 84 4a 02 cmp di, word [bp-010h] ; 3b 7e f0 - jc near 03f57h ; 0f 82 82 02 + jc near 03f60h ; 0f 82 82 02 cmp ax, dx ; 39 d0 - jnc near 03f57h ; 0f 83 7c 02 + jnc near 03f60h ; 0f 83 7c 02 cmp si, bx ; 39 de - jnc near 03f57h ; 0f 83 76 02 + jnc near 03f60h ; 0f 83 76 02 mov dx, word [bp+01ah] ; 8b 56 1a shr dx, 008h ; c1 ea 08 cmp dx, strict byte 00004h ; 83 fa 04 - je near 03f18h ; 0f 84 2a 02 + je near 03f21h ; 0f 84 2a 02 mov dx, word [bp+014h] ; 8b 56 14 shr dx, 004h ; c1 ea 04 mov cx, word [bp+00ah] ; 8b 4e 0a @@ -5080,13 +5081,13 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov word [bp-00ch], dx ; 89 56 f4 xor dl, dl ; 30 d2 xor cx, cx ; 31 c9 - call 08c89h ; e8 7d 4f + call 08c99h ; e8 84 4f xor bx, bx ; 31 db add ax, si ; 01 f0 adc dx, bx ; 11 da mov bx, di ; 89 fb xor cx, cx ; 31 c9 - call 08c89h ; e8 70 4f + call 08c99h ; e8 77 4f mov bx, word [bp-010h] ; 8b 5e f0 dec bx ; 4b xor cx, cx ; 31 c9 @@ -5123,7 +5124,7 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 xor bx, bx ; 31 db mov dx, ss ; 8c d2 lea ax, [bp-02ah] ; 8d 46 d6 - call 08cbah ; e8 46 4f + call 08ccah ; e8 4d 4f mov word [bp-02ah], strict word 00028h ; c7 46 d6 28 00 mov ax, word [bp-014h] ; 8b 46 ec add ax, si ; 01 f0 @@ -5158,7 +5159,7 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov bx, word [bp-008h] ; 8b 5e f8 mov word [es:bx+01ch], dx ; 26 89 57 1c cmp byte [bp-002h], 008h ; 80 7e fe 08 - jbe short 03e02h ; 76 2a + jbe short 03e0bh ; 76 2a push word [bp-00eh] ; ff 76 f2 push word [bp-00ch] ; ff 76 f4 push strict byte 00001h ; 6a 01 @@ -5167,7 +5168,7 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov cx, strict word 00009h ; b9 09 00 sal si, 1 ; d1 e6 rcl di, 1 ; d1 d7 - loop 03de8h ; e2 fa + loop 03df1h ; e2 fa push di ; 57 push si ; 56 push ax ; 50 @@ -5175,8 +5176,8 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov cx, ss ; 8c d1 lea bx, [bp-02ah] ; 8d 5e d6 mov dx, strict word 0000ch ; ba 0c 00 - call 07f5dh ; e8 5d 41 - jmp short 03e2ah ; eb 28 + call 07f66h ; e8 5d 41 + jmp short 03e33h ; eb 28 push word [bp-00eh] ; ff 76 f2 push word [bp-00ch] ; ff 76 f4 push strict byte 00001h ; 6a 01 @@ -5185,7 +5186,7 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov cx, strict word 00009h ; b9 09 00 sal si, 1 ; d1 e6 rcl di, 1 ; d1 d7 - loop 03e12h ; e2 fa + loop 03e1bh ; e2 fa push di ; 57 push si ; 56 push ax ; 50 @@ -5193,33 +5194,33 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov cx, ss ; 8c d1 lea bx, [bp-02ah] ; 8d 5e d6 mov dx, strict word 0000ch ; ba 0c 00 - call 0280ah ; e8 e0 e9 + call 0280ah ; e8 d7 e9 mov dl, al ; 88 c2 les bx, [bp-008h] ; c4 5e f8 db 066h, 026h, 0c7h, 047h, 01ah, 000h, 000h, 000h, 000h ; mov dword [es:bx+01ah], strict dword 000000000h ; 66 26 c7 47 1a 00 00 00 00 test dl, dl ; 84 d2 - je near 03f18h ; 0f 84 da 00 - mov bx, 00cd6h ; bb d6 0c + je near 03f21h ; 0f 84 da 00 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 65 da + call 018aeh ; e8 5c da movzx ax, dl ; 0f b6 c2 push ax ; 50 mov ax, word [bp+01ah] ; 8b 46 1a shr ax, 008h ; c1 e8 08 push ax ; 50 - push 002bah ; 68 ba 02 - push 002fch ; 68 fc 02 + push 002bch ; 68 bc 02 + push 002feh ; 68 fe 02 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 8a da + call 018e9h ; e8 81 da add sp, strict byte 0000ah ; 83 c4 0a mov ax, word [bp+01ah] ; 8b 46 1a xor ah, ah ; 30 e4 or ah, 002h ; 80 cc 02 mov word [bp+01ah], ax ; 89 46 1a mov byte [bp+01ah], 000h ; c6 46 1a 00 - jmp near 03f62h ; e9 ee 00 + jmp near 03f6bh ; e9 ee 00 mov es, [bp-004h] ; 8e 46 fc mov di, word [es:si+014h] ; 26 8b 7c 14 mov dx, word [es:si+012h] ; 26 8b 54 12 @@ -5261,30 +5262,30 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 mov dl, byte [es:si+001h] ; 26 8a 54 01 mov word [bp+014h], ax ; 89 46 14 cmp dl, 003h ; 80 fa 03 - je short 03f00h ; 74 1a + je short 03f09h ; 74 1a cmp dl, 002h ; 80 fa 02 - je short 03efch ; 74 11 + je short 03f05h ; 74 11 cmp dl, 001h ; 80 fa 01 - jne short 03f04h ; 75 14 + jne short 03f0dh ; 75 14 mov ax, word [bp+014h] ; 8b 46 14 xor al, al ; 30 c0 or AL, strict byte 002h ; 0c 02 mov word [bp+014h], ax ; 89 46 14 - jmp short 03f04h ; eb 08 + jmp short 03f0dh ; eb 08 or AL, strict byte 004h ; 0c 04 - jmp short 03ef7h ; eb f7 + jmp short 03f00h ; eb f7 or AL, strict byte 005h ; 0c 05 - jmp short 03ef7h ; eb f3 + jmp short 03f00h ; eb f3 mov es, [bp-004h] ; 8e 46 fc cmp byte [es:si+001h], 004h ; 26 80 7c 01 04 - jnc short 03f18h ; 73 0a + jnc short 03f21h ; 73 0a mov word [bp+00ch], 0efc7h ; c7 46 0c c7 ef mov word [bp+00ah], 0f000h ; c7 46 0a 00 f0 mov byte [bp+01bh], 000h ; c6 46 1b 00 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 e7 d6 + call 0160eh ; e8 de d6 and byte [bp+020h], 0feh ; 80 66 20 fe leave ; c9 pop di ; 5f @@ -5292,18 +5293,18 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 retn ; c3 or bh, 003h ; 80 cf 03 mov word [bp+01ah], bx ; 89 5e 1a - jmp short 03f1ch ; eb e5 - mov bx, 00cd6h ; bb d6 0c + jmp short 03f25h ; eb e5 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 6c d9 + call 018aeh ; e8 63 d9 mov ax, word [bp+01ah] ; 8b 46 1a shr ax, 008h ; c1 e8 08 push ax ; 50 - push 002bah ; 68 ba 02 - push 0031dh ; 68 1d 03 + push 002bch ; 68 bc 02 + push 0031fh ; 68 1f 03 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 95 d9 + call 018e9h ; e8 8c d9 add sp, strict byte 00008h ; 83 c4 08 mov ax, word [bp+01ah] ; 8b 46 1a xor ah, ah ; 30 e4 @@ -5314,9 +5315,9 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 xor bh, bh ; 30 ff mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 9b d6 + call 0160eh ; e8 92 d6 or byte [bp+020h], 001h ; 80 4e 20 01 - jmp short 03f2bh ; eb b2 + jmp short 03f34h ; eb b2 push ax ; 50 dec si ; 4e dec cx ; 49 @@ -5335,73 +5336,73 @@ _int13_cdemu: ; 0xf3ba9 LB 0x429 or byte [di], al ; 08 05 add AL, strict byte 003h ; 04 03 add al, byte [bx+di] ; 02 01 - add byte [bp+si], ah ; 00 22 + add byte [bp+di], ch ; 00 2b inc bp ; 45 - mov AL, byte [07d42h] ; a0 42 7d + test ax, 08642h ; a9 42 86 inc ax ; 40 - and al, byte [di+072h] ; 22 45 72 + sub ax, word [di+07bh] ; 2b 45 7b inc ax ; 40 - and al, byte [di+072h] ; 22 45 72 + sub ax, word [di+07bh] ; 2b 45 7b inc ax ; 40 - and al, byte [di-060h] ; 22 45 a0 + sub ax, word [di-057h] ; 2b 45 a9 inc dx ; 42 - and al, byte [di+022h] ; 22 45 22 + sub ax, word [di+02bh] ; 2b 45 2b inc bp ; 45 - mov AL, byte [0a042h] ; a0 42 a0 + test ax, 0a942h ; a9 42 a9 inc dx ; 42 - mov AL, byte [0a042h] ; a0 42 a0 + test ax, 0a942h ; a9 42 a9 inc dx ; 42 - mov AL, byte [0a742h] ; a0 42 a7 + test ax, 0b042h ; a9 42 b0 inc ax ; 40 - mov AL, byte [02242h] ; a0 42 22 + test ax, 02b42h ; a9 42 2b inc bp ; 45 - mov AL, strict byte 040h ; b0 40 - retn ; c3 + mov cx, 0cc40h ; b9 40 cc inc ax ; 40 - jc short 04002h ; 72 40 - retn ; c3 + jnp short 0400bh ; 7b 40 + int3 ; cc inc ax ; 40 - adc word [bp+si-049h], ax ; 11 42 b7 + sbb al, byte [bp+si-040h] ; 1a 42 c0 inc dx ; 42 - retn ; c3 + int3 ; cc inc ax ; 40 - loop 0400eh ; e2 42 - fild dword [si-01dh] ; db 44 e3 + jmp short 04017h ; eb 42 + in AL, strict byte 044h ; e4 44 + in AL, DX ; ec inc sp ; 44 - db 022h + db 02bh inc bp ; 45 -_int13_cdrom: ; 0xf3fd2 LB 0x56d +_int13_cdrom: ; 0xf3fdb LB 0x56d push si ; 56 push di ; 57 enter 00028h, 000h ; c8 28 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 3b d6 + call 0161ch ; e8 32 d6 mov word [bp-018h], ax ; 89 46 e8 mov si, 00122h ; be 22 01 mov word [bp-00ah], ax ; 89 46 f6 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 19 d6 + call 0160eh ; e8 10 d6 mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 cmp ax, 000e0h ; 3d e0 00 - jc short 04004h ; 72 05 + jc short 0400dh ; 72 05 cmp ax, 000f0h ; 3d f0 00 - jc short 04022h ; 72 1e + jc short 0402bh ; 72 1e mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 push ax ; 50 mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 push ax ; 50 - push 0034dh ; 68 4d 03 - push 00359h ; 68 59 03 + push 0034fh ; 68 4f 03 + push 0035bh ; 68 5b 03 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 cd d8 + call 018e9h ; e8 c4 d8 add sp, strict byte 0000ah ; 83 c4 0a - jmp near 044ffh ; e9 dd 04 + jmp near 04508h ; e9 dd 04 mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 mov es, [bp-00ah] ; 8e 46 f6 @@ -5410,36 +5411,36 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov dl, byte [es:bx+000d0h] ; 26 8a 97 d0 00 mov byte [bp-006h], dl ; 88 56 fa cmp dl, 010h ; 80 fa 10 - jc short 0404bh ; 72 10 + jc short 04054h ; 72 10 push ax ; 50 mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 push ax ; 50 - push 0034dh ; 68 4d 03 - push 00384h ; 68 84 03 - jmp short 04017h ; eb cc + push 0034fh ; 68 4f 03 + push 00386h ; 68 86 03 + jmp short 04020h ; eb cc mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 cmp ax, strict word 00050h ; 3d 50 00 - jnbe near 04522h ; 0f 87 ca 04 + jnbe near 0452bh ; 0f 87 ca 04 push CS ; 0e pop ES ; 07 mov cx, strict word 0001eh ; b9 1e 00 - mov di, 03f79h ; bf 79 3f + mov di, 03f82h ; bf 82 3f repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov ax, word [cs:di+03f96h] ; 2e 8b 85 96 3f + mov ax, word [cs:di+03f9fh] ; 2e 8b 85 9f 3f mov bx, word [bp+01ch] ; 8b 5e 1c xor bh, bh ; 30 ff jmp ax ; ff e0 mov ax, word [bp+01ch] ; 8b 46 1c xor ah, ah ; 30 e4 or ah, 003h ; 80 cc 03 - jmp near 04507h ; e9 8a 04 + jmp near 04510h ; e9 8a 04 mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 7a d5 + call 01600h ; e8 71 d5 mov cl, al ; 88 c1 movzx ax, cl ; 0f b6 c1 sal ax, 008h ; c1 e0 08 @@ -5448,18 +5449,18 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 70 d5 + call 0160eh ; e8 67 d5 test cl, cl ; 84 c9 - je near 042a4h ; 0f 84 00 02 - jmp near 0451bh ; e9 74 04 + je near 042adh ; 0f 84 00 02 + jmp near 04524h ; e9 74 04 or bh, 002h ; 80 cf 02 mov word [bp+01ch], bx ; 89 5e 1c - jmp near 0450ah ; e9 5a 04 + jmp near 04513h ; e9 5a 04 mov word [bp+016h], 0aa55h ; c7 46 16 55 aa or bh, 030h ; 80 cf 30 mov word [bp+01ch], bx ; 89 5e 1c mov word [bp+01ah], strict word 00007h ; c7 46 1a 07 00 - jmp near 042a4h ; e9 e1 01 + jmp near 042adh ; e9 e1 01 mov bx, word [bp+010h] ; 8b 5e 10 mov es, [bp+00ah] ; 8e 46 0a mov di, bx ; 89 df @@ -5475,16 +5476,16 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov ax, word [es:bx+00eh] ; 26 8b 47 0e mov word [bp-01ch], ax ; 89 46 e4 or ax, word [bp-010h] ; 0b 46 f0 - je short 0410eh ; 74 18 + je short 04117h ; 74 18 mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 push ax ; 50 - push 0034dh ; 68 4d 03 - push 003b6h ; 68 b6 03 + push 0034fh ; 68 4f 03 + push 003b8h ; 68 b8 03 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 e1 d7 + call 018e9h ; e8 d8 d7 add sp, strict byte 00008h ; 83 c4 08 - jmp near 044ffh ; e9 f1 03 + jmp near 04508h ; e9 f1 03 mov es, [bp-012h] ; 8e 46 ee mov ax, word [es:di+008h] ; 26 8b 45 08 mov word [bp-010h], ax ; 89 46 f0 @@ -5493,14 +5494,14 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 cmp ax, strict word 00044h ; 3d 44 00 - je near 042a0h ; 0f 84 74 01 + je near 042a9h ; 0f 84 74 01 cmp ax, strict word 00047h ; 3d 47 00 - je near 042a0h ; 0f 84 6d 01 + je near 042a9h ; 0f 84 6d 01 mov cx, strict word 0000ch ; b9 0c 00 xor bx, bx ; 31 db mov dx, ss ; 8c d2 lea ax, [bp-028h] ; 8d 46 d8 - call 08cbah ; e8 7a 4b + call 08ccah ; e8 81 4b mov word [bp-028h], strict word 00028h ; c7 46 d8 28 00 mov ax, word [bp-010h] ; 8b 46 f0 mov dx, word [bp-01ch] ; 8b 56 e4 @@ -5516,14 +5517,14 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov word [es:si+00ah], ax ; 26 89 44 0a mov word [es:si+00ch], 00800h ; 26 c7 44 0c 00 08 cmp byte [bp-006h], 008h ; 80 7e fa 08 - jbe short 04197h ; 76 26 + jbe short 041a0h ; 76 26 push dword [bp-016h] ; 66 ff 76 ea push strict byte 00001h ; 6a 01 xor bx, bx ; 31 db mov cx, strict word 0000bh ; b9 0b 00 sal ax, 1 ; d1 e0 rcl bx, 1 ; d1 d3 - loop 0417ch ; e2 fa + loop 04185h ; e2 fa push bx ; 53 push ax ; 50 push strict byte 00000h ; 6a 00 @@ -5531,15 +5532,15 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov cx, ss ; 8c d1 lea bx, [bp-028h] ; 8d 5e d8 mov dx, strict word 0000ch ; ba 0c 00 - call 07f5dh ; e8 c8 3d - jmp short 041bbh ; eb 24 + call 07f66h ; e8 c8 3d + jmp short 041c4h ; eb 24 push dword [bp-016h] ; 66 ff 76 ea push strict byte 00001h ; 6a 01 xor bx, bx ; 31 db mov cx, strict word 0000bh ; b9 0b 00 sal ax, 1 ; d1 e0 rcl bx, 1 ; d1 d3 - loop 041a2h ; e2 fa + loop 041abh ; e2 fa push bx ; 53 push ax ; 50 push strict byte 00000h ; 6a 00 @@ -5547,7 +5548,7 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov cx, ss ; 8c d1 lea bx, [bp-028h] ; 8d 5e d8 mov dx, strict word 0000ch ; ba 0c 00 - call 0280ah ; e8 4f e6 + call 0280ah ; e8 46 e6 mov byte [bp-004h], al ; 88 46 fc mov es, [bp-00ah] ; 8e 46 f6 mov ax, word [es:si+016h] ; 26 8b 44 16 @@ -5555,31 +5556,31 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov cx, strict word 0000bh ; b9 0b 00 shr bx, 1 ; d1 eb rcr ax, 1 ; d1 d8 - loop 041cch ; e2 fa + loop 041d5h ; e2 fa mov es, [bp-012h] ; 8e 46 ee mov word [es:di+002h], ax ; 26 89 45 02 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je near 042a0h ; 0f 84 bf 00 - mov bx, 00cd6h ; bb d6 0c + je near 042a9h ; 0f 84 bf 00 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 c2 d6 + call 018aeh ; e8 b9 d6 movzx ax, byte [bp-004h] ; 0f b6 46 fc push ax ; 50 mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 push ax ; 50 - push 0034dh ; 68 4d 03 - push 003dfh ; 68 df 03 + push 0034fh ; 68 4f 03 + push 003e1h ; 68 e1 03 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 e6 d6 + call 018e9h ; e8 dd d6 add sp, strict byte 0000ah ; 83 c4 0a mov ax, word [bp+01ch] ; 8b 46 1c xor ah, ah ; 30 e4 or ah, 00ch ; 80 cc 0c - jmp near 04507h ; e9 f6 02 + jmp near 04510h ; e9 f6 02 cmp bx, strict byte 00002h ; 83 fb 02 - jnbe near 044ffh ; 0f 87 e7 02 + jnbe near 04508h ; 0f 87 e7 02 movzx ax, byte [bp-006h] ; 0f b6 46 fa imul ax, ax, strict byte 00018h ; 6b c0 18 mov es, [bp-00ah] ; 8e 46 f6 @@ -5587,20 +5588,20 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d add di, ax ; 01 c7 mov al, byte [es:di+021h] ; 26 8a 45 21 cmp bx, strict byte 00002h ; 83 fb 02 - je short 04291h ; 74 62 + je short 0429ah ; 74 62 cmp bx, strict byte 00001h ; 83 fb 01 - je short 0426fh ; 74 3b + je short 04278h ; 74 3b test bx, bx ; 85 db - jne near 042a0h ; 0f 85 66 00 + jne near 042a9h ; 0f 85 66 00 cmp AL, strict byte 0ffh ; 3c ff - jne short 04250h ; 75 12 + jne short 04259h ; 75 12 mov ax, word [bp+01ch] ; 8b 46 1c xor ah, ah ; 30 e4 or ah, 0b4h ; 80 cc b4 mov word [bp+01ch], ax ; 89 46 1c xor al, al ; 30 c0 or AL, strict byte 001h ; 0c 01 - jmp near 04507h ; e9 b7 02 + jmp near 04510h ; e9 b7 02 movzx dx, byte [bp-006h] ; 0f b6 56 fa imul dx, dx, strict byte 00018h ; 6b d2 18 db 0feh, 0c0h @@ -5612,13 +5613,13 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d xor al, al ; 30 c0 or AL, strict byte 001h ; 0c 01 mov word [bp+01ch], ax ; 89 46 1c - jmp near 042a0h ; e9 31 00 + jmp near 042a9h ; e9 31 00 test al, al ; 84 c0 - jne short 0427fh ; 75 0c + jne short 04288h ; 75 0c or bh, 0b0h ; 80 cf b0 mov word [bp+01ch], bx ; 89 5e 1c mov byte [bp+01ch], al ; 88 46 1c - jmp near 0450ah ; e9 8b 02 + jmp near 04513h ; e9 8b 02 movzx dx, byte [bp-006h] ; 0f b6 56 fa imul dx, dx, strict byte 00018h ; 6b d2 18 db 0feh, 0c8h @@ -5637,7 +5638,7 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 5f d3 + call 0160eh ; e8 56 d3 and byte [bp+022h], 0feh ; 80 66 22 fe leave ; c9 pop di ; 5f @@ -5649,15 +5650,15 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d add si, ax ; 01 c6 mov al, byte [es:si+021h] ; 26 8a 44 21 test al, al ; 84 c0 - je short 042d1h ; 74 06 + je short 042dah ; 74 06 or bh, 0b1h ; 80 cf b1 - jmp near 040aah ; e9 d9 fd + jmp near 040b3h ; e9 d9 fd cmp byte [bp-004h], 000h ; 80 7e fc 00 - je short 042a0h ; 74 c9 + je short 042a9h ; 74 c9 mov ax, word [bp+01ch] ; 8b 46 1c xor ah, ah ; 30 e4 or ah, 0b1h ; 80 cc b1 - jmp near 04507h ; e9 25 02 + jmp near 04510h ; e9 25 02 mov dx, word [bp+010h] ; 8b 56 10 mov cx, word [bp+00ah] ; 8b 4e 0a mov bx, dx ; 89 d3 @@ -5667,8 +5668,8 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov ax, word [es:di] ; 26 8b 05 mov word [bp-00eh], ax ; 89 46 f2 cmp ax, strict word 0001ah ; 3d 1a 00 - jc near 044ffh ; 0f 82 01 02 - jc short 0434dh ; 72 4d + jc near 04508h ; 0f 82 01 02 + jc short 04356h ; 72 4d movzx di, byte [bp-006h] ; 0f b6 7e fa imul di, di, strict byte 00018h ; 6b ff 18 mov es, [bp-00ah] ; 8e 46 f6 @@ -5690,7 +5691,7 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d db 066h, 026h, 0c7h, 045h, 014h, 0ffh, 0ffh, 0ffh, 0ffh ; mov dword [es:di+014h], strict dword 0ffffffffh ; 66 26 c7 45 14 ff ff ff ff cmp word [bp-00eh], strict byte 0001eh ; 83 7e f2 1e - jc near 04423h ; 0f 82 ce 00 + jc near 0442ch ; 0f 82 ce 00 mov es, [bp-008h] ; 8e 46 f8 mov word [es:bx], strict word 0001eh ; 26 c7 07 1e 00 mov ax, word [bp-018h] ; 8b 46 e8 @@ -5742,22 +5743,22 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov byte [es:si+001feh], 011h ; 26 c6 84 fe 01 11 xor cl, cl ; 30 c9 xor ch, ch ; 30 ed - jmp short 04406h ; eb 05 + jmp short 0440fh ; eb 05 cmp ch, 00fh ; 80 fd 0f - jnc short 04419h ; 73 13 + jnc short 04422h ; 73 13 movzx dx, ch ; 0f b6 d5 add dx, 00312h ; 81 c2 12 03 mov ax, word [bp-018h] ; 8b 46 e8 - call 01600h ; e8 ed d1 + call 01600h ; e8 e4 d1 add cl, al ; 00 c1 db 0feh, 0c5h ; inc ch ; fe c5 - jmp short 04401h ; eb e8 + jmp short 0440ah ; eb e8 neg cl ; f6 d9 mov es, [bp-00ah] ; 8e 46 f6 mov byte [es:si+001ffh], cl ; 26 88 8c ff 01 cmp word [bp-00eh], strict byte 00042h ; 83 7e f2 42 - jc near 042a0h ; 0f 82 75 fe + jc near 042a9h ; 0f 82 75 fe movzx ax, byte [bp-006h] ; 0f b6 46 fa cwd ; 99 db 02bh, 0c2h @@ -5775,7 +5776,7 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d ; mov dword [es:bx+01eh], strict dword 00024beddh ; 66 26 c7 47 1e dd be 24 00 mov word [es:bx+022h], strict word 00000h ; 26 c7 47 22 00 00 test al, al ; 84 c0 - jne short 0446ch ; 75 09 + jne short 04475h ; 75 09 db 066h, 026h, 0c7h, 047h, 024h, 049h, 053h, 041h, 020h ; mov dword [es:bx+024h], strict dword 020415349h ; 66 26 c7 47 24 49 53 41 20 mov es, [bp-008h] ; 8e 46 f8 @@ -5784,7 +5785,7 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d db 066h, 026h, 0c7h, 047h, 02ch, 020h, 020h, 020h, 020h ; mov dword [es:bx+02ch], strict dword 020202020h ; 66 26 c7 47 2c 20 20 20 20 test al, al ; 84 c0 - jne short 04498h ; 75 13 + jne short 044a1h ; 75 13 mov word [es:bx+030h], dx ; 26 89 57 30 db 066h, 026h, 0c7h, 047h, 032h, 000h, 000h, 000h, 000h ; mov dword [es:bx+032h], strict dword 000000000h ; 66 26 c7 47 32 00 00 00 00 @@ -5799,32 +5800,32 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d mov word [es:bx+03eh], strict word 00000h ; 26 c7 47 3e 00 00 xor al, al ; 30 c0 mov AH, strict byte 01eh ; b4 1e - jmp short 044c0h ; eb 05 + jmp short 044c9h ; eb 05 cmp ah, 040h ; 80 fc 40 - jnc short 044cfh ; 73 0f + jnc short 044d8h ; 73 0f movzx si, ah ; 0f b6 f4 mov es, [bp-008h] ; 8e 46 f8 add si, bx ; 01 de add al, byte [es:si] ; 26 02 04 db 0feh, 0c4h ; inc ah ; fe c4 - jmp short 044bbh ; eb ec + jmp short 044c4h ; eb ec neg al ; f6 d8 mov es, [bp-008h] ; 8e 46 f8 mov byte [es:bx+041h], al ; 26 88 47 41 - jmp near 042a0h ; e9 c5 fd + jmp near 042a9h ; e9 c5 fd or bh, 006h ; 80 cf 06 mov word [bp+01ch], bx ; 89 5e 1c - jmp short 0451bh ; eb 38 + jmp short 04524h ; eb 38 cmp bx, strict byte 00006h ; 83 fb 06 - je near 042a0h ; 0f 84 b6 fd + je near 042a9h ; 0f 84 b6 fd cmp bx, strict byte 00001h ; 83 fb 01 - jc short 044ffh ; 72 10 - jbe near 042a0h ; 0f 86 ad fd + jc short 04508h ; 72 10 + jbe near 042a9h ; 0f 86 ad fd cmp bx, strict byte 00003h ; 83 fb 03 - jc short 044ffh ; 72 07 + jc short 04508h ; 72 07 cmp bx, strict byte 00004h ; 83 fb 04 - jbe near 042a0h ; 0f 86 a1 fd + jbe near 042a9h ; 0f 86 a1 fd mov ax, word [bp+01ch] ; 8b 46 1c xor ah, ah ; 30 e4 or ah, 001h ; 80 cc 01 @@ -5834,54 +5835,54 @@ _int13_cdrom: ; 0xf3fd2 LB 0x56d xor bh, bh ; 30 ff mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 f3 d0 + call 0160eh ; e8 ea d0 or byte [bp+022h], 001h ; 80 4e 22 01 - jmp near 042b3h ; e9 91 fd - mov bx, 00cd6h ; bb d6 0c + jmp near 042bch ; e9 91 fd + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 81 d3 + call 018aeh ; e8 78 d3 mov ax, word [bp+01ch] ; 8b 46 1c shr ax, 008h ; c1 e8 08 push ax ; 50 - push 0034dh ; 68 4d 03 - push 002a1h ; 68 a1 02 + push 0034fh ; 68 4f 03 + push 002a3h ; 68 a3 02 push strict byte 00004h ; 6a 04 - jmp near 04105h ; e9 c6 fb -print_boot_device_: ; 0xf453f LB 0x48 + jmp near 0410eh ; e9 c6 fb +print_boot_device_: ; 0xf4548 LB 0x48 push cx ; 51 push bp ; 55 mov bp, sp ; 89 e5 test al, al ; 84 c0 - je short 0454ch ; 74 05 + je short 04555h ; 74 05 mov dx, strict word 00002h ; ba 02 00 - jmp short 04566h ; eb 1a + jmp short 0456fh ; eb 1a test dl, dl ; 84 d2 - je short 04555h ; 74 05 + je short 0455eh ; 74 05 mov dx, strict word 00003h ; ba 03 00 - jmp short 04566h ; eb 11 + jmp short 0456fh ; eb 11 test bl, 080h ; f6 c3 80 - jne short 0455eh ; 75 04 + jne short 04567h ; 75 04 xor dh, dh ; 30 f6 - jmp short 04566h ; eb 08 + jmp short 0456fh ; eb 08 test bl, 080h ; f6 c3 80 - je short 04584h ; 74 21 + je short 0458dh ; 74 21 mov dx, strict word 00001h ; ba 01 00 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 3d d3 + call 018aeh ; e8 34 d3 imul dx, dx, strict byte 0000ah ; 6b d2 0a - add dx, 00cfch ; 81 c2 fc 0c + add dx, 00cfeh ; 81 c2 fe 0c push dx ; 52 - push 00402h ; 68 02 04 + push 00404h ; 68 04 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 68 d3 + call 018e9h ; e8 5f d3 add sp, strict byte 00006h ; 83 c4 06 pop bp ; 5d pop cx ; 59 retn ; c3 -print_boot_failure_: ; 0xf4587 LB 0x90 +print_boot_failure_: ; 0xf4590 LB 0x90 push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -5890,238 +5891,238 @@ print_boot_failure_: ; 0xf4587 LB 0x90 and ah, 07fh ; 80 e4 7f movzx si, ah ; 0f b6 f4 test al, al ; 84 c0 - je short 045b4h ; 74 1b - mov bx, 00cd6h ; bb d6 0c + je short 045bdh ; 74 1b + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 0a d3 - push 00d10h ; 68 10 0d - push 00416h ; 68 16 04 + call 018aeh ; e8 01 d3 + push 00d12h ; 68 12 0d + push 00418h ; 68 18 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 3a d3 + call 018e9h ; e8 31 d3 add sp, strict byte 00006h ; 83 c4 06 - jmp short 045f8h ; eb 44 + jmp short 04601h ; eb 44 test dl, dl ; 84 d2 - je short 045c8h ; 74 10 - mov bx, 00cd6h ; bb d6 0c + je short 045d1h ; 74 10 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 eb d2 - push 00d1ah ; 68 1a 0d - jmp short 045a7h ; eb df + call 018aeh ; e8 e2 d2 + push 00d1ch ; 68 1c 0d + jmp short 045b0h ; eb df test bl, 080h ; f6 c3 80 - je short 045deh ; 74 11 - mov bx, 00cd6h ; bb d6 0c + je short 045e7h ; 74 11 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 d6 d2 + call 018aeh ; e8 cd d2 push si ; 56 - push 00d06h ; 68 06 0d - jmp short 045edh ; eb 0f - mov bx, 00cd6h ; bb d6 0c + push 00d08h ; 68 08 0d + jmp short 045f6h ; eb 0f + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 c5 d2 + call 018aeh ; e8 bc d2 push si ; 56 - push 00cfch ; 68 fc 0c - push 0042bh ; 68 2b 04 + push 00cfeh ; 68 fe 0c + push 0042dh ; 68 2d 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 f4 d2 + call 018e9h ; e8 eb d2 add sp, strict byte 00008h ; 83 c4 08 cmp byte [bp+006h], 001h ; 80 7e 06 01 - jne short 04612h ; 75 14 + jne short 0461bh ; 75 14 test dh, dh ; 84 f6 - jne short 04607h ; 75 05 - push 00443h ; 68 43 04 - jmp short 0460ah ; eb 03 - push 0046dh ; 68 6d 04 + jne short 04610h ; 75 05 + push 00445h ; 68 45 04 + jmp short 04613h ; eb 03 + push 0046fh ; 68 6f 04 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 da d2 + call 018e9h ; e8 d1 d2 add sp, strict byte 00004h ; 83 c4 04 pop bp ; 5d pop si ; 5e retn 00002h ; c2 02 00 -print_cdromboot_failure_: ; 0xf4617 LB 0x24 +print_cdromboot_failure_: ; 0xf4620 LB 0x24 push bx ; 53 push cx ; 51 push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 mov dx, ax ; 89 c2 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 84 d2 + call 018aeh ; e8 7b d2 push dx ; 52 - push 004a2h ; 68 a2 04 + push 004a4h ; 68 a4 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 b6 d2 + call 018e9h ; e8 ad d2 add sp, strict byte 00006h ; 83 c4 06 pop bp ; 5d pop dx ; 5a pop cx ; 59 pop bx ; 5b retn ; c3 -_int19_function: ; 0xf463b LB 0x251 +_int19_function: ; 0xf4644 LB 0x251 push si ; 56 push di ; 57 enter 0000eh, 000h ; c8 0e 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 d2 cf + call 0161ch ; e8 c9 cf mov bx, ax ; 89 c3 mov word [bp-00ah], ax ; 89 46 f6 mov byte [bp-004h], 000h ; c6 46 fc 00 mov ax, strict word 0003dh ; b8 3d 00 - call 0165ch ; e8 03 d0 + call 0165ch ; e8 fa cf movzx si, al ; 0f b6 f0 mov ax, strict word 00038h ; b8 38 00 - call 0165ch ; e8 fa cf + call 0165ch ; e8 f1 cf and AL, strict byte 0f0h ; 24 f0 xor ah, ah ; 30 e4 sal ax, 004h ; c1 e0 04 or si, ax ; 09 c6 mov ax, strict word 0003ch ; b8 3c 00 - call 0165ch ; e8 eb cf + call 0165ch ; e8 e2 cf and AL, strict byte 00fh ; 24 0f xor ah, ah ; 30 e4 sal ax, 00ch ; c1 e0 0c or si, ax ; 09 c6 mov dx, 00339h ; ba 39 03 mov ax, bx ; 89 d8 - call 01600h ; e8 7e cf + call 01600h ; e8 75 cf test al, al ; 84 c0 - je short 04691h ; 74 0b + je short 0469ah ; 74 0b mov dx, 00339h ; ba 39 03 mov ax, bx ; 89 d8 - call 01600h ; e8 72 cf + call 01600h ; e8 69 cf movzx si, al ; 0f b6 f0 cmp byte [bp+008h], 001h ; 80 7e 08 01 - jne short 046a7h ; 75 10 + jne short 046b0h ; 75 10 mov ax, strict word 0003ch ; b8 3c 00 - call 0165ch ; e8 bf cf + call 0165ch ; e8 b6 cf and AL, strict byte 0f0h ; 24 f0 xor ah, ah ; 30 e4 sar ax, 004h ; c1 f8 04 - call 07217h ; e8 70 2b + call 07220h ; e8 70 2b cmp byte [bp+008h], 002h ; 80 7e 08 02 - jne short 046b0h ; 75 03 + jne short 046b9h ; 75 03 shr si, 004h ; c1 ee 04 cmp byte [bp+008h], 003h ; 80 7e 08 03 - jne short 046b9h ; 75 03 + jne short 046c2h ; 75 03 shr si, 008h ; c1 ee 08 cmp byte [bp+008h], 004h ; 80 7e 08 04 - jne short 046c2h ; 75 03 + jne short 046cbh ; 75 03 shr si, 00ch ; c1 ee 0c cmp si, strict byte 00010h ; 83 fe 10 - jnc short 046cbh ; 73 04 + jnc short 046d4h ; 73 04 mov byte [bp-004h], 001h ; c6 46 fc 01 xor al, al ; 30 c0 mov byte [bp-002h], al ; 88 46 fe mov byte [bp-006h], al ; 88 46 fa mov byte [bp-008h], al ; 88 46 f8 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 cd d1 + call 018aeh ; e8 c4 d1 push si ; 56 movzx ax, byte [bp+008h] ; 0f b6 46 08 push ax ; 50 - push 004c2h ; 68 c2 04 + push 004c4h ; 68 c4 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 fa d1 + call 018e9h ; e8 f1 d1 add sp, strict byte 00008h ; 83 c4 08 and si, strict byte 0000fh ; 83 e6 0f cmp si, strict byte 00002h ; 83 fe 02 - jc short 04708h ; 72 0e - jbe short 04717h ; 76 1b + jc short 04711h ; 72 0e + jbe short 04720h ; 76 1b cmp si, strict byte 00004h ; 83 fe 04 - je short 04735h ; 74 34 + je short 0473eh ; 74 34 cmp si, strict byte 00003h ; 83 fe 03 - je short 0472bh ; 74 25 - jmp short 04762h ; eb 5a + je short 04734h ; 74 25 + jmp short 0476bh ; eb 5a cmp si, strict byte 00001h ; 83 fe 01 - jne short 04762h ; 75 55 + jne short 0476bh ; 75 55 xor al, al ; 30 c0 mov byte [bp-002h], al ; 88 46 fe mov byte [bp-006h], al ; 88 46 fa - jmp short 0477ah ; eb 63 + jmp short 04783h ; eb 63 mov dx, 00338h ; ba 38 03 mov ax, word [bp-00ah] ; 8b 46 f6 - call 01600h ; e8 e0 ce + call 01600h ; e8 d7 ce add AL, strict byte 080h ; 04 80 mov byte [bp-002h], al ; 88 46 fe mov byte [bp-006h], 000h ; c6 46 fa 00 - jmp short 0477ah ; eb 4f + jmp short 04783h ; eb 4f mov byte [bp-002h], 000h ; c6 46 fe 00 mov byte [bp-006h], 001h ; c6 46 fa 01 - jmp short 0473fh ; eb 0a + jmp short 04748h ; eb 0a mov byte [bp-008h], 001h ; c6 46 f8 01 cmp byte [bp-006h], 000h ; 80 7e fa 00 - je short 0477ah ; 74 3b - call 0377ah ; e8 38 f0 + je short 04783h ; 74 3b + call 03783h ; e8 38 f0 mov bx, ax ; 89 c3 test AL, strict byte 0ffh ; a8 ff - je short 04769h ; 74 21 - call 04617h ; e8 cc fe + je short 04772h ; 74 21 + call 04620h ; e8 cc fe movzx ax, byte [bp-004h] ; 0f b6 46 fc push ax ; 50 movzx bx, byte [bp-002h] ; 0f b6 5e fe movzx dx, byte [bp-008h] ; 0f b6 56 f8 movzx ax, byte [bp-006h] ; 0f b6 46 fa mov cx, strict word 00001h ; b9 01 00 - call 04587h ; e8 25 fe + call 04590h ; e8 25 fe xor ax, ax ; 31 c0 xor dx, dx ; 31 d2 - jmp near 04888h ; e9 1f 01 + jmp near 04891h ; e9 1f 01 mov dx, 0032eh ; ba 2e 03 mov ax, word [bp-00ah] ; 8b 46 f6 - call 0161ch ; e8 aa ce + call 0161ch ; e8 a1 ce mov di, ax ; 89 c7 shr bx, 008h ; c1 eb 08 mov byte [bp-002h], bl ; 88 5e fe cmp byte [bp-008h], 001h ; 80 7e f8 01 - jne near 047f6h ; 0f 85 74 00 + jne near 047ffh ; 0f 85 74 00 xor si, si ; 31 f6 mov ax, 0e200h ; b8 00 e2 mov es, ax ; 8e c0 cmp word [es:si], 0aa55h ; 26 81 3c 55 aa - jne short 0474bh ; 75 bb + jne short 04754h ; 75 bb mov cx, ax ; 89 c1 mov si, word [es:si+01ah] ; 26 8b 74 1a cmp word [es:si+002h], 0506eh ; 26 81 7c 02 6e 50 - jne short 0474bh ; 75 ad + jne short 04754h ; 75 ad cmp word [es:si], 05024h ; 26 81 3c 24 50 - jne short 0474bh ; 75 a6 + jne short 04754h ; 75 a6 mov di, word [es:si+00eh] ; 26 8b 7c 0e mov dx, word [es:di] ; 26 8b 15 mov ax, word [es:di+002h] ; 26 8b 45 02 cmp ax, 06568h ; 3d 68 65 - jne short 047d4h ; 75 1f + jne short 047ddh ; 75 1f cmp dx, 07445h ; 81 fa 45 74 - jne short 047d4h ; 75 19 + jne short 047ddh ; 75 19 movzx bx, byte [bp-002h] ; 0f b6 5e fe movzx dx, byte [bp-008h] ; 0f b6 56 f8 movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 0453fh ; e8 75 fd + call 04548h ; e8 75 fd mov word [bp-00eh], strict word 00006h ; c7 46 f2 06 00 mov word [bp-00ch], cx ; 89 4e f4 - jmp short 047f0h ; eb 1c + jmp short 047f9h ; eb 1c movzx bx, byte [bp-002h] ; 0f b6 5e fe movzx dx, byte [bp-008h] ; 0f b6 56 f8 movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 0453fh ; e8 5c fd + call 04548h ; e8 5c fd sti ; fb mov word [bp-00ch], cx ; 89 4e f4 mov es, cx ; 8e c1 mov ax, word [es:si+01ah] ; 26 8b 44 1a mov word [bp-00eh], ax ; 89 46 f2 call far [bp-00eh] ; ff 5e f2 - jmp near 0474bh ; e9 55 ff + jmp near 04754h ; e9 55 ff cmp byte [bp-006h], 000h ; 80 7e fa 00 - jne short 04822h ; 75 26 + jne short 0482bh ; 75 26 cmp byte [bp-008h], 000h ; 80 7e f8 00 - jne short 04822h ; 75 20 + jne short 0482bh ; 75 20 mov di, 007c0h ; bf c0 07 mov es, di ; 8e c7 mov dl, byte [bp-002h] ; 8a 56 fe @@ -6134,40 +6135,40 @@ _int19_function: ; 0xf463b LB 0x251 mov ax, strict word 00000h ; b8 00 00 sbb ax, strict byte 00000h ; 83 d8 00 test ax, ax ; 85 c0 - jne near 0474bh ; 0f 85 29 ff + jne near 04754h ; 0f 85 29 ff cmp byte [bp-002h], 000h ; 80 7e fe 00 db 00fh, 094h, 0c1h ; sete cl ; 0f 94 c1 cmp byte [bp-006h], 000h ; 80 7e fa 00 - je short 04831h ; 74 02 + je short 0483ah ; 74 02 mov CL, strict byte 001h ; b1 01 xor dx, dx ; 31 d2 mov ax, di ; 89 f8 - call 0161ch ; e8 e4 cd + call 0161ch ; e8 db cd mov bx, ax ; 89 c3 mov dx, strict word 00002h ; ba 02 00 mov ax, di ; 89 f8 - call 0161ch ; e8 da cd + call 0161ch ; e8 d1 cd cmp bx, ax ; 39 c3 - je short 04857h ; 74 11 + je short 04860h ; 74 11 test cl, cl ; 84 c9 - jne short 0486dh ; 75 23 + jne short 04876h ; 75 23 mov dx, 001feh ; ba fe 01 mov ax, di ; 89 f8 - call 0161ch ; e8 ca cd + call 0161ch ; e8 c1 cd cmp ax, 0aa55h ; 3d 55 aa - je short 0486dh ; 74 16 + je short 04876h ; 74 16 movzx ax, byte [bp-004h] ; 0f b6 46 fc push ax ; 50 movzx bx, byte [bp-002h] ; 0f b6 5e fe movzx dx, byte [bp-008h] ; 0f b6 56 f8 movzx ax, byte [bp-006h] ; 0f b6 46 fa xor cx, cx ; 31 c9 - jmp near 0475fh ; e9 f2 fe + jmp near 04768h ; e9 f2 fe movzx bx, byte [bp-002h] ; 0f b6 5e fe movzx dx, byte [bp-008h] ; 0f b6 56 f8 movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 0453fh ; e8 c3 fc + call 04548h ; e8 c3 fc movzx bx, byte [bp-002h] ; 0f b6 5e fe xor dx, dx ; 31 d2 xor ax, ax ; 31 c0 @@ -6177,17 +6178,17 @@ _int19_function: ; 0xf463b LB 0x251 pop di ; 5f pop si ; 5e retn ; c3 -keyboard_panic_: ; 0xf488c LB 0x11 +keyboard_panic_: ; 0xf4895 LB 0x11 push bp ; 55 mov bp, sp ; 89 e5 push ax ; 50 - push 004e2h ; 68 e2 04 + push 004e4h ; 68 e4 04 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 51 d0 + call 018e9h ; e8 48 d0 add sp, strict byte 00006h ; 83 c4 06 pop bp ; 5d retn ; c3 -_keyboard_init: ; 0xf489d LB 0x27a +_keyboard_init: ; 0xf48a6 LB 0x27a push bp ; 55 mov bp, sp ; 89 e5 mov AL, strict byte 0aah ; b0 aa @@ -6199,44 +6200,44 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 048c0h ; 74 0d + je short 048c9h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 048c0h ; 76 08 + jbe short 048c9h ; 76 08 xor al, al ; 30 c0 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 048a9h ; eb e9 + jmp short 048b2h ; eb e9 test bx, bx ; 85 db - jne short 048c9h ; 75 05 + jne short 048d2h ; 75 05 xor ax, ax ; 31 c0 - call 0488ch ; e8 c3 ff + call 04895h ; e8 c3 ff mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 048e3h ; 75 0d + jne short 048ech ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 048e3h ; 76 08 + jbe short 048ech ; 76 08 mov AL, strict byte 001h ; b0 01 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 048cch ; eb e9 + jmp short 048d5h ; eb e9 test bx, bx ; 85 db - jne short 048edh ; 75 06 + jne short 048f6h ; 75 06 mov ax, strict word 00001h ; b8 01 00 - call 0488ch ; e8 9f ff + call 04895h ; e8 9f ff mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, strict word 00055h ; 3d 55 00 - je short 048feh ; 74 06 + je short 04907h ; 74 06 mov ax, 003dfh ; b8 df 03 - call 0488ch ; e8 8e ff + call 04895h ; e8 8e ff mov AL, strict byte 0abh ; b0 ab mov dx, strict word 00064h ; ba 64 00 out DX, AL ; ee @@ -6246,44 +6247,44 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 0491eh ; 74 0d + je short 04927h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 0491eh ; 76 08 + jbe short 04927h ; 76 08 mov AL, strict byte 010h ; b0 10 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04907h ; eb e9 + jmp short 04910h ; eb e9 test bx, bx ; 85 db - jne short 04928h ; 75 06 + jne short 04931h ; 75 06 mov ax, strict word 0000ah ; b8 0a 00 - call 0488ch ; e8 64 ff + call 04895h ; e8 64 ff mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 04942h ; 75 0d + jne short 0494bh ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04942h ; 76 08 + jbe short 0494bh ; 76 08 mov AL, strict byte 011h ; b0 11 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 0492bh ; eb e9 + jmp short 04934h ; eb e9 test bx, bx ; 85 db - jne short 0494ch ; 75 06 + jne short 04955h ; 75 06 mov ax, strict word 0000bh ; b8 0b 00 - call 0488ch ; e8 40 ff + call 04895h ; e8 40 ff mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test ax, ax ; 85 c0 - je short 0495ch ; 74 06 + je short 04965h ; 74 06 mov ax, 003e0h ; b8 e0 03 - call 0488ch ; e8 30 ff + call 04895h ; e8 30 ff mov AL, strict byte 0ffh ; b0 ff mov dx, strict word 00060h ; ba 60 00 out DX, AL ; ee @@ -6293,75 +6294,75 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 0497ch ; 74 0d + je short 04985h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 0497ch ; 76 08 + jbe short 04985h ; 76 08 mov AL, strict byte 020h ; b0 20 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04965h ; eb e9 + jmp short 0496eh ; eb e9 test bx, bx ; 85 db - jne short 04986h ; 75 06 + jne short 0498fh ; 75 06 mov ax, strict word 00014h ; b8 14 00 - call 0488ch ; e8 06 ff + call 04895h ; e8 06 ff mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 049a0h ; 75 0d + jne short 049a9h ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 049a0h ; 76 08 + jbe short 049a9h ; 76 08 mov AL, strict byte 021h ; b0 21 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04989h ; eb e9 + jmp short 04992h ; eb e9 test bx, bx ; 85 db - jne short 049aah ; 75 06 + jne short 049b3h ; 75 06 mov ax, strict word 00015h ; b8 15 00 - call 0488ch ; e8 e2 fe + call 04895h ; e8 e2 fe mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000fah ; 3d fa 00 - je short 049bbh ; 74 06 + je short 049c4h ; 74 06 mov ax, 003e1h ; b8 e1 03 - call 0488ch ; e8 d1 fe + call 04895h ; e8 d1 fe mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 049d5h ; 75 0d + jne short 049deh ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 049d5h ; 76 08 + jbe short 049deh ; 76 08 mov AL, strict byte 031h ; b0 31 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 049beh ; eb e9 + jmp short 049c7h ; eb e9 test bx, bx ; 85 db - jne short 049dfh ; 75 06 + jne short 049e8h ; 75 06 mov ax, strict word 0001fh ; b8 1f 00 - call 0488ch ; e8 ad fe + call 04895h ; e8 ad fe mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000aah ; 3d aa 00 - je short 049f8h ; 74 0e + je short 04a01h ; 74 0e in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000aah ; 3d aa 00 - je short 049f8h ; 74 06 + je short 04a01h ; 74 06 mov ax, 003e2h ; b8 e2 03 - call 0488ch ; e8 94 fe + call 04895h ; e8 94 fe mov AL, strict byte 0f5h ; b0 f5 mov dx, strict word 00060h ; ba 60 00 out DX, AL ; ee @@ -6371,44 +6372,44 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 04a18h ; 74 0d + je short 04a21h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04a18h ; 76 08 + jbe short 04a21h ; 76 08 mov AL, strict byte 040h ; b0 40 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04a01h ; eb e9 + jmp short 04a0ah ; eb e9 test bx, bx ; 85 db - jne short 04a22h ; 75 06 + jne short 04a2bh ; 75 06 mov ax, strict word 00028h ; b8 28 00 - call 0488ch ; e8 6a fe + call 04895h ; e8 6a fe mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 04a3ch ; 75 0d + jne short 04a45h ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04a3ch ; 76 08 + jbe short 04a45h ; 76 08 mov AL, strict byte 041h ; b0 41 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04a25h ; eb e9 + jmp short 04a2eh ; eb e9 test bx, bx ; 85 db - jne short 04a46h ; 75 06 + jne short 04a4fh ; 75 06 mov ax, strict word 00029h ; b8 29 00 - call 0488ch ; e8 46 fe + call 04895h ; e8 46 fe mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000fah ; 3d fa 00 - je short 04a57h ; 74 06 + je short 04a60h ; 74 06 mov ax, 003e3h ; b8 e3 03 - call 0488ch ; e8 35 fe + call 04895h ; e8 35 fe mov AL, strict byte 060h ; b0 60 mov dx, strict word 00064h ; ba 64 00 out DX, AL ; ee @@ -6418,18 +6419,18 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 04a77h ; 74 0d + je short 04a80h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04a77h ; 76 08 + jbe short 04a80h ; 76 08 mov AL, strict byte 050h ; b0 50 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04a60h ; eb e9 + jmp short 04a69h ; eb e9 test bx, bx ; 85 db - jne short 04a81h ; 75 06 + jne short 04a8ah ; 75 06 mov ax, strict word 00032h ; b8 32 00 - call 0488ch ; e8 0b fe + call 04895h ; e8 0b fe mov AL, strict byte 065h ; b0 65 mov dx, strict word 00060h ; ba 60 00 out DX, AL ; ee @@ -6439,18 +6440,18 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 04aa1h ; 74 0d + je short 04aaah ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04aa1h ; 76 08 + jbe short 04aaah ; 76 08 mov AL, strict byte 060h ; b0 60 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04a8ah ; eb e9 + jmp short 04a93h ; eb e9 test bx, bx ; 85 db - jne short 04aabh ; 75 06 + jne short 04ab4h ; 75 06 mov ax, strict word 0003ch ; b8 3c 00 - call 0488ch ; e8 e1 fd + call 04895h ; e8 e1 fd mov AL, strict byte 0f4h ; b0 f4 mov dx, strict word 00060h ; ba 60 00 out DX, AL ; ee @@ -6460,52 +6461,52 @@ _keyboard_init: ; 0xf489d LB 0x27a db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 04acbh ; 74 0d + je short 04ad4h ; 74 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04acbh ; 76 08 + jbe short 04ad4h ; 76 08 mov AL, strict byte 070h ; b0 70 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04ab4h ; eb e9 + jmp short 04abdh ; eb e9 test bx, bx ; 85 db - jne short 04ad5h ; 75 06 + jne short 04adeh ; 75 06 mov ax, strict word 00046h ; b8 46 00 - call 0488ch ; e8 b7 fd + call 04895h ; e8 b7 fd mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 04aefh ; 75 0d + jne short 04af8h ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 04aefh ; 76 08 + jbe short 04af8h ; 76 08 mov AL, strict byte 071h ; b0 71 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04ad8h ; eb e9 + jmp short 04ae1h ; eb e9 test bx, bx ; 85 db - jne short 04af9h ; 75 06 + jne short 04b02h ; 75 06 mov ax, strict word 00046h ; b8 46 00 - call 0488ch ; e8 93 fd + call 04895h ; e8 93 fd mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000fah ; 3d fa 00 - je short 04b0ah ; 74 06 + je short 04b13h ; 74 06 mov ax, 003e4h ; b8 e4 03 - call 0488ch ; e8 82 fd + call 04895h ; e8 82 fd mov AL, strict byte 0a8h ; b0 a8 mov dx, strict word 00064h ; ba 64 00 out DX, AL ; ee xor ax, ax ; 31 c0 - call 05cfbh ; e8 e6 11 + call 05d04h ; e8 e6 11 pop bp ; 5d retn ; c3 -enqueue_key_: ; 0xf4b17 LB 0x90 +enqueue_key_: ; 0xf4b20 LB 0x90 push bx ; 53 push cx ; 51 push si ; 56 @@ -6515,32 +6516,32 @@ enqueue_key_: ; 0xf4b17 LB 0x90 mov bl, dl ; 88 d3 mov dx, strict word 0001ah ; ba 1a 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 ef ca + call 0161ch ; e8 e6 ca mov di, ax ; 89 c7 mov dx, strict word 0001ch ; ba 1c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 e4 ca + call 0161ch ; e8 db ca mov si, ax ; 89 c6 lea cx, [si+002h] ; 8d 4c 02 cmp cx, strict byte 0003eh ; 83 f9 3e - jc short 04b45h ; 72 03 + jc short 04b4eh ; 72 03 mov cx, strict word 0001eh ; b9 1e 00 cmp cx, di ; 39 f9 - jne short 04b4dh ; 75 04 + jne short 04b56h ; 75 04 xor ax, ax ; 31 c0 - jmp short 04b72h ; eb 25 + jmp short 04b7bh ; eb 25 xor bh, bh ; 30 ff mov dx, si ; 89 f2 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 b7 ca + call 0160eh ; e8 ae ca movzx bx, byte [bp-002h] ; 0f b6 5e fe lea dx, [si+001h] ; 8d 54 01 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 aa ca + call 0160eh ; e8 a1 ca mov bx, cx ; 89 cb mov dx, strict word 0001ch ; ba 1c 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 bb ca + call 0162ah ; e8 b2 ca mov ax, strict word 00001h ; b8 01 00 leave ; c9 pop di ; 5f @@ -6557,86 +6558,85 @@ enqueue_key_: ; 0xf4b17 LB 0x90 inc bp ; 45 cmp bh, byte [bx+si] ; 3a 38 sub bl, byte [ss:di] ; 36 2a 1d - db 0dfh - dec bp ; 4d - insb ; 6c + call 0c0e0h ; e8 4d 75 dec sp ; 4c - cmp cx, word [si+03bh] ; 3b 4c 3b + inc sp ; 44 dec sp ; 4c - out DX, AL ; ee + inc sp ; 44 dec sp ; 4c - adc AL, strict byte 04ch ; 14 4c - pushaw ; 60 + db 0f7h + dec sp ; 4c + sbb ax, 0694ch ; 1d 4c 69 dec bp ; 4d - scasw ; af + mov ax, 0db4dh ; b8 4d db dec bp ; 4d - ror byte [di-053h], CL ; d2 4d ad + mov DH, strict byte 04ch ; b6 4c + inc sp ; 44 dec sp ; 4c - cmp cx, word [si+03bh] ; 3b 4c 3b + inc sp ; 44 dec sp ; 4c - daa ; 27 - dec bp ; 4d - sub ax, 0904ch ; 2d 4c 90 - dec bp ; 4d - retf ; cb + xor byte [di+036h], cl ; 30 4d 36 + dec sp ; 4c + cwd ; 99 dec bp ; 4d -_int09_function: ; 0xf4ba7 LB 0x358 + aam 04dh ; d4 4d +_int09_function: ; 0xf4bb0 LB 0x358 push si ; 56 push di ; 57 enter 0000ch, 000h ; c8 0c 00 00 mov al, byte [bp+018h] ; 8a 46 18 mov byte [bp-006h], al ; 88 46 fa test al, al ; 84 c0 - jne short 04bd0h ; 75 19 - mov bx, 00cd6h ; bb d6 0c + jne short 04bd9h ; 75 19 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 ec cc - push 004f5h ; 68 f5 04 + call 018aeh ; e8 e3 cc + push 004f7h ; 68 f7 04 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 1f cd + call 018e9h ; e8 16 cd add sp, strict byte 00004h ; 83 c4 04 - jmp near 04efbh ; e9 2b 03 + jmp near 04f04h ; e9 2b 03 mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 27 ca + call 01600h ; e8 1e ca mov byte [bp-00ah], al ; 88 46 f6 mov bl, al ; 88 c3 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 19 ca + call 01600h ; e8 10 ca mov byte [bp-00ch], al ; 88 46 f4 mov byte [bp-008h], al ; 88 46 f8 mov dx, 00096h ; ba 96 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 0a ca + call 01600h ; e8 01 ca mov byte [bp-004h], al ; 88 46 fc mov byte [bp-002h], al ; 88 46 fe mov al, byte [bp-006h] ; 8a 46 fa push CS ; 0e pop ES ; 07 mov cx, strict word 00010h ; b9 10 00 - mov di, 04b78h ; bf 78 4b + mov di, 04b81h ; bf 81 4b repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov ax, word [cs:di+04b87h] ; 2e 8b 85 87 4b + mov ax, word [cs:di+04b90h] ; 2e 8b 85 90 4b jmp ax ; ff e0 xor bl, 040h ; 80 f3 40 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 ec c9 + call 0160eh ; e8 e3 c9 or byte [bp-008h], 040h ; 80 4e f8 40 movzx bx, byte [bp-008h] ; 0f b6 5e f8 - jmp near 04da3h ; e9 76 01 + jmp near 04dach ; e9 76 01 mov al, byte [bp-00ch] ; 8a 46 f4 and AL, strict byte 0bfh ; 24 bf mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 - jmp near 04da3h ; e9 68 01 + jmp near 04dach ; e9 68 01 test byte [bp-002h], 002h ; f6 46 fe 02 - jne near 04eddh ; 0f 85 9a 02 + jne near 04ee6h ; 0f 85 9a 02 mov al, byte [bp-006h] ; 8a 46 fa and AL, strict byte 07fh ; 24 7f cmp AL, strict byte 02ah ; 3c 2a @@ -6645,249 +6645,249 @@ _int09_function: ; 0xf4ba7 LB 0x358 xor ah, ah ; 30 e4 inc ax ; 40 test byte [bp-006h], 080h ; f6 46 fa 80 - je short 04c5ch ; 74 06 + je short 04c65h ; 74 06 not al ; f6 d0 and bl, al ; 20 c3 - jmp short 04c5eh ; eb 02 + jmp short 04c67h ; eb 02 or bl, al ; 08 c3 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 a5 c9 - jmp near 04eddh ; e9 71 02 + call 0160eh ; e8 9c c9 + jmp near 04ee6h ; e9 71 02 test byte [bp-004h], 001h ; f6 46 fc 01 - jne near 04eddh ; 0f 85 69 02 + jne near 04ee6h ; 0f 85 69 02 or bl, 004h ; 80 cb 04 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 8c c9 + call 0160eh ; e8 83 c9 mov al, byte [bp-004h] ; 8a 46 fc test AL, strict byte 002h ; a8 02 - je short 04c96h ; 74 0d + je short 04c9fh ; 74 0d or AL, strict byte 004h ; 0c 04 mov byte [bp-002h], al ; 88 46 fe movzx bx, al ; 0f b6 d8 mov dx, 00096h ; ba 96 00 - jmp short 04ca4h ; eb 0e + jmp short 04cadh ; eb 0e mov al, byte [bp-00ch] ; 8a 46 f4 or AL, strict byte 001h ; 0c 01 mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 64 c9 - jmp near 04eddh ; e9 30 02 + call 0160eh ; e8 5b c9 + jmp near 04ee6h ; e9 30 02 test byte [bp-004h], 001h ; f6 46 fc 01 - jne near 04eddh ; 0f 85 28 02 + jne near 04ee6h ; 0f 85 28 02 and bl, 0fbh ; 80 e3 fb xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 4b c9 + call 0160eh ; e8 42 c9 mov al, byte [bp-004h] ; 8a 46 fc test AL, strict byte 002h ; a8 02 - je short 04cd7h ; 74 0d + je short 04ce0h ; 74 0d and AL, strict byte 0fbh ; 24 fb mov byte [bp-002h], al ; 88 46 fe movzx bx, al ; 0f b6 d8 mov dx, 00096h ; ba 96 00 - jmp short 04ce5h ; eb 0e + jmp short 04ceeh ; eb 0e mov al, byte [bp-00ch] ; 8a 46 f4 and AL, strict byte 0feh ; 24 fe mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 23 c9 - jmp near 04eddh ; e9 ef 01 + call 0160eh ; e8 1a c9 + jmp near 04ee6h ; e9 ef 01 or bl, 008h ; 80 cb 08 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 12 c9 + call 0160eh ; e8 09 c9 mov al, byte [bp-004h] ; 8a 46 fc test AL, strict byte 002h ; a8 02 - je short 04d10h ; 74 0d + je short 04d19h ; 74 0d or AL, strict byte 008h ; 0c 08 mov byte [bp-002h], al ; 88 46 fe movzx bx, al ; 0f b6 d8 mov dx, 00096h ; ba 96 00 - jmp short 04d1eh ; eb 0e + jmp short 04d27h ; eb 0e mov al, byte [bp-00ch] ; 8a 46 f4 or AL, strict byte 002h ; 0c 02 mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 ea c8 - jmp near 04eddh ; e9 b6 01 + call 0160eh ; e8 e1 c8 + jmp near 04ee6h ; e9 b6 01 and bl, 0f7h ; 80 e3 f7 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 d9 c8 + call 0160eh ; e8 d0 c8 mov al, byte [bp-004h] ; 8a 46 fc test AL, strict byte 002h ; a8 02 - je short 04d49h ; 74 0d + je short 04d52h ; 74 0d and AL, strict byte 0f7h ; 24 f7 mov byte [bp-002h], al ; 88 46 fe movzx bx, al ; 0f b6 d8 mov dx, 00096h ; ba 96 00 - jmp short 04d57h ; eb 0e + jmp short 04d60h ; eb 0e mov al, byte [bp-00ch] ; 8a 46 f4 and AL, strict byte 0fdh ; 24 fd mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 b1 c8 - jmp near 04eddh ; e9 7d 01 + call 0160eh ; e8 a8 c8 + jmp near 04ee6h ; e9 7d 01 test byte [bp-004h], 003h ; f6 46 fc 03 - jne near 04eddh ; 0f 85 75 01 + jne near 04ee6h ; 0f 85 75 01 mov al, byte [bp-00ch] ; 8a 46 f4 or AL, strict byte 020h ; 0c 20 mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 92 c8 + call 0160eh ; e8 89 c8 mov bl, byte [bp-00ah] ; 8a 5e f6 xor bl, 020h ; 80 f3 20 xor bh, bh ; 30 ff mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 81 c8 - jmp near 04eddh ; e9 4d 01 + call 0160eh ; e8 78 c8 + jmp near 04ee6h ; e9 4d 01 test byte [bp-004h], 003h ; f6 46 fc 03 - jne near 04eddh ; 0f 85 45 01 + jne near 04ee6h ; 0f 85 45 01 mov al, byte [bp-00ch] ; 8a 46 f4 and AL, strict byte 0dfh ; 24 df mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 62 c8 - jmp near 04eddh ; e9 2e 01 + call 0160eh ; e8 59 c8 + jmp near 04ee6h ; e9 2e 01 mov al, byte [bp-00ch] ; 8a 46 f4 or AL, strict byte 010h ; 0c 10 mov byte [bp-008h], al ; 88 46 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 4b c8 + call 0160eh ; e8 42 c8 mov bl, byte [bp-00ah] ; 8a 5e f6 xor bl, 010h ; 80 f3 10 - jmp short 04d82h ; eb b7 + jmp short 04d8bh ; eb b7 mov al, byte [bp-00ch] ; 8a 46 f4 and AL, strict byte 0efh ; 24 ef - jmp short 04d9dh ; eb cb + jmp short 04da6h ; eb cb mov al, bl ; 88 d8 and AL, strict byte 00ch ; 24 0c cmp AL, strict byte 00ch ; 3c 0c - jne short 04ddfh ; 75 05 + jne short 04de8h ; 75 05 jmp far 0f000h:0e05bh ; ea 5b e0 00 f0 test byte [bp-006h], 080h ; f6 46 fa 80 - jne near 04eddh ; 0f 85 f6 00 + jne near 04ee6h ; 0f 85 f6 00 cmp byte [bp-006h], 058h ; 80 7e fa 58 - jbe short 04e0bh ; 76 1e - mov bx, 00cd6h ; bb d6 0c + jbe short 04e14h ; 76 1e + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 b6 ca + call 018aeh ; e8 ad ca movzx ax, byte [bp-006h] ; 0f b6 46 fa push ax ; 50 - push 0050fh ; 68 0f 05 + push 00511h ; 68 11 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 e4 ca + call 018e9h ; e8 db ca add sp, strict byte 00006h ; 83 c4 06 - jmp near 04efbh ; e9 f0 00 + jmp near 04f04h ; e9 f0 00 test bl, 008h ; f6 c3 08 - je short 04e22h ; 74 12 + je short 04e2bh ; 74 12 movzx si, byte [bp-006h] ; 0f b6 76 fa imul si, si, strict byte 0000ah ; 6b f6 0a - mov dl, byte [si+00d2ah] ; 8a 94 2a 0d - mov ax, word [si+00d2ah] ; 8b 84 2a 0d - jmp near 04eaeh ; e9 8c 00 + mov dl, byte [si+00d2ch] ; 8a 94 2c 0d + mov ax, word [si+00d2ch] ; 8b 84 2c 0d + jmp near 04eb7h ; e9 8c 00 test bl, 004h ; f6 c3 04 - je short 04e39h ; 74 12 + je short 04e42h ; 74 12 movzx si, byte [bp-006h] ; 0f b6 76 fa imul si, si, strict byte 0000ah ; 6b f6 0a - mov dl, byte [si+00d28h] ; 8a 94 28 0d - mov ax, word [si+00d28h] ; 8b 84 28 0d - jmp near 04eaeh ; e9 75 00 + mov dl, byte [si+00d2ah] ; 8a 94 2a 0d + mov ax, word [si+00d2ah] ; 8b 84 2a 0d + jmp near 04eb7h ; e9 75 00 mov al, byte [bp-002h] ; 8a 46 fe and AL, strict byte 002h ; 24 02 test al, al ; 84 c0 - jbe short 04e57h ; 76 15 + jbe short 04e60h ; 76 15 mov al, byte [bp-006h] ; 8a 46 fa cmp AL, strict byte 047h ; 3c 47 - jc short 04e57h ; 72 0e + jc short 04e60h ; 72 0e cmp AL, strict byte 053h ; 3c 53 - jnbe short 04e57h ; 77 0a + jnbe short 04e60h ; 77 0a mov DL, strict byte 0e0h ; b2 e0 movzx si, al ; 0f b6 f0 imul si, si, strict byte 0000ah ; 6b f6 0a - jmp short 04eaah ; eb 53 + jmp short 04eb3h ; eb 53 test bl, 003h ; f6 c3 03 - je short 04e89h ; 74 2d + je short 04e92h ; 74 2d movzx si, byte [bp-006h] ; 0f b6 76 fa imul si, si, strict byte 0000ah ; 6b f6 0a - movzx ax, byte [si+00d2ch] ; 0f b6 84 2c 0d + movzx ax, byte [si+00d2eh] ; 0f b6 84 2e 0d movzx dx, bl ; 0f b6 d3 test dx, ax ; 85 c2 - je short 04e79h ; 74 0a - mov dl, byte [si+00d24h] ; 8a 94 24 0d - mov ax, word [si+00d24h] ; 8b 84 24 0d - jmp short 04e81h ; eb 08 + je short 04e82h ; 74 0a mov dl, byte [si+00d26h] ; 8a 94 26 0d mov ax, word [si+00d26h] ; 8b 84 26 0d + jmp short 04e8ah ; eb 08 + mov dl, byte [si+00d28h] ; 8a 94 28 0d + mov ax, word [si+00d28h] ; 8b 84 28 0d shr ax, 008h ; c1 e8 08 mov byte [bp-006h], al ; 88 46 fa - jmp short 04eb4h ; eb 2b + jmp short 04ebdh ; eb 2b movzx si, byte [bp-006h] ; 0f b6 76 fa imul si, si, strict byte 0000ah ; 6b f6 0a - movzx ax, byte [si+00d2ch] ; 0f b6 84 2c 0d + movzx ax, byte [si+00d2eh] ; 0f b6 84 2e 0d movzx dx, bl ; 0f b6 d3 test dx, ax ; 85 c2 - je short 04ea6h ; 74 0a + je short 04eafh ; 74 0a + mov dl, byte [si+00d28h] ; 8a 94 28 0d + mov ax, word [si+00d28h] ; 8b 84 28 0d + jmp short 04eb7h ; eb 08 mov dl, byte [si+00d26h] ; 8a 94 26 0d mov ax, word [si+00d26h] ; 8b 84 26 0d - jmp short 04eaeh ; eb 08 - mov dl, byte [si+00d24h] ; 8a 94 24 0d - mov ax, word [si+00d24h] ; 8b 84 24 0d shr ax, 008h ; c1 e8 08 mov byte [bp-006h], al ; 88 46 fa cmp byte [bp-006h], 000h ; 80 7e fa 00 - jne short 04ed4h ; 75 1a + jne short 04eddh ; 75 1a test dl, dl ; 84 d2 - jne short 04ed4h ; 75 16 - mov bx, 00cd6h ; bb d6 0c + jne short 04eddh ; 75 16 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 e5 c9 - push 00546h ; 68 46 05 + call 018aeh ; e8 dc c9 + push 00548h ; 68 48 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 18 ca + call 018e9h ; e8 0f ca add sp, strict byte 00004h ; 83 c4 04 xor dh, dh ; 30 f6 movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 04b17h ; e8 3a fc + call 04b20h ; e8 3a fc mov al, byte [bp-006h] ; 8a 46 fa and AL, strict byte 07fh ; 24 7f cmp AL, strict byte 01dh ; 3c 1d - je short 04eeah ; 74 04 + je short 04ef3h ; 74 04 and byte [bp-002h], 0feh ; 80 66 fe fe and byte [bp-002h], 0fdh ; 80 66 fe fd movzx bx, byte [bp-002h] ; 0f b6 5e fe mov dx, 00096h ; ba 96 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 13 c7 + call 0160eh ; e8 0a c7 leave ; c9 pop di ; 5f pop si ; 5e retn ; c3 -dequeue_key_: ; 0xf4eff LB 0x90 +dequeue_key_: ; 0xf4f08 LB 0x90 push si ; 56 push di ; 57 enter 00004h, 000h ; c8 04 00 00 @@ -6897,36 +6897,36 @@ dequeue_key_: ; 0xf4eff LB 0x90 mov word [bp-004h], cx ; 89 4e fc mov dx, strict word 0001ah ; ba 1a 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 04 c7 + call 0161ch ; e8 fb c6 mov bx, ax ; 89 c3 mov dx, strict word 0001ch ; ba 1c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 f9 c6 + call 0161ch ; e8 f0 c6 cmp bx, ax ; 39 c3 - je short 04f64h ; 74 3d + je short 04f6dh ; 74 3d mov dx, bx ; 89 da mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 d1 c6 + call 01600h ; e8 c8 c6 mov cl, al ; 88 c1 lea dx, [bx+001h] ; 8d 57 01 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 c6 c6 + call 01600h ; e8 bd c6 mov es, [bp-004h] ; 8e 46 fc mov byte [es:si], cl ; 26 88 0c mov es, [bp-002h] ; 8e 46 fe mov byte [es:di], al ; 26 88 05 cmp word [bp+008h], strict byte 00000h ; 83 7e 08 00 - je short 04f5fh ; 74 13 + je short 04f68h ; 74 13 inc bx ; 43 inc bx ; 43 cmp bx, strict byte 0003eh ; 83 fb 3e - jc short 04f56h ; 72 03 + jc short 04f5fh ; 72 03 mov bx, strict word 0001eh ; bb 1e 00 mov dx, strict word 0001ah ; ba 1a 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 cb c6 + call 0162ah ; e8 c2 c6 mov ax, strict word 00001h ; b8 01 00 - jmp short 04f66h ; eb 02 + jmp short 04f6fh ; eb 02 xor ax, ax ; 31 c0 leave ; c9 pop di ; 5f @@ -6936,33 +6936,33 @@ dequeue_key_: ; 0xf4eff LB 0x90 adc word [bx+si], dx ; 11 10 or cl, byte [bx+di] ; 0a 09 add ax, 00102h ; 05 02 01 - add byte [bp+di], ch ; 00 2b + add byte [si], dh ; 00 34 push dx ; 52 - inc cx ; 41 + dec dx ; 4a push ax ; 50 - mov byte [bx+si-02ch], dl ; 88 50 d4 + xchg cx, ax ; 91 + push ax ; 50 + fst qword [bx+si-013h] ; dd 50 ed push ax ; 50 - in AL, strict byte 050h ; e4 50 - push CS ; 0e - push cx ; 51 pop SS ; 17 push cx ; 51 - mov byte [bx+di-047h], dl ; 88 51 b9 + and byte [bx+di-06fh], dl ; 20 51 91 + push cx ; 51 + retn 0ef51h ; c2 51 ef push cx ; 51 - out strict byte 051h, AL ; e6 51 - and byte [bp+si+06eh], dl ; 20 52 6e + sub word [bp+si+077h], dx ; 29 52 77 push dx ; 52 -_int16_function: ; 0xf4f8f LB 0x314 +_int16_function: ; 0xf4f98 LB 0x314 push di ; 57 enter 00006h, 000h ; c8 06 00 00 mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 63 c6 + call 01600h ; e8 5a c6 mov cl, al ; 88 c1 mov bh, al ; 88 c7 mov dx, 00097h ; ba 97 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 56 c6 + call 01600h ; e8 4d c6 mov bl, al ; 88 c3 movzx dx, cl ; 0f b6 d1 sar dx, 004h ; c1 fa 04 @@ -6971,7 +6971,7 @@ _int16_function: ; 0xf4f8f LB 0x314 xor ah, ah ; 30 e4 xor al, dl ; 30 d0 test ax, ax ; 85 c0 - je short 0501fh ; 74 60 + je short 05028h ; 74 60 cli ; fa mov AL, strict byte 0edh ; b0 ed mov dx, strict word 00060h ; ba 60 00 @@ -6981,17 +6981,17 @@ _int16_function: ; 0xf4f8f LB 0x314 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 04fd8h ; 75 08 + jne short 04fe1h ; 75 08 mov AL, strict byte 021h ; b0 21 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04fc6h ; eb ee + jmp short 04fcfh ; eb ee mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000fah ; 3d fa 00 - jne short 0501eh ; 75 3b + jne short 05027h ; 75 3b and bl, 0f8h ; 80 e3 f8 movzx ax, bh ; 0f b6 c7 sar ax, 004h ; c1 f8 04 @@ -7007,11 +7007,11 @@ _int16_function: ; 0xf4f8f LB 0x314 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 0500dh ; 75 08 + jne short 05016h ; 75 08 mov AL, strict byte 021h ; b0 21 mov dx, 00080h ; ba 80 00 out DX, AL ; ee - jmp short 04ffbh ; eb ee + jmp short 05004h ; eb ee mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h @@ -7019,39 +7019,39 @@ _int16_function: ; 0xf4f8f LB 0x314 xor bh, bh ; 30 ff mov dx, 00097h ; ba 97 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 f0 c5 + call 0160eh ; e8 e7 c5 sti ; fb mov ax, word [bp+014h] ; 8b 46 14 shr ax, 008h ; c1 e8 08 cmp ax, 000a2h ; 3d a2 00 - jnbe near 0522bh ; 0f 87 ff 01 + jnbe near 05234h ; 0f 87 ff 01 push CS ; 0e pop ES ; 07 mov cx, strict word 0000ch ; b9 0c 00 - mov di, 04f6ch ; bf 6c 4f + mov di, 04f75h ; bf 75 4f repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov ax, word [cs:di+04f77h] ; 2e 8b 85 77 4f + mov ax, word [cs:di+04f80h] ; 2e 8b 85 80 4f jmp ax ; ff e0 push strict byte 00001h ; 6a 01 mov cx, ss ; 8c d1 lea bx, [bp-006h] ; 8d 5e fa mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 04effh ; e8 af fe + call 04f08h ; e8 af fe test ax, ax ; 85 c0 - jne short 0505fh ; 75 0b - push 0057dh ; 68 7d 05 + jne short 05068h ; 75 0b + push 0057fh ; 68 7f 05 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 8d c8 + call 018e9h ; e8 84 c8 add sp, strict byte 00004h ; 83 c4 04 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je short 0506bh ; 74 06 + je short 05074h ; 74 06 cmp byte [bp-006h], 0f0h ; 80 7e fa f0 - je short 05071h ; 74 06 + je short 0507ah ; 74 06 cmp byte [bp-006h], 0e0h ; 80 7e fa e0 - jne short 05075h ; 75 04 + jne short 0507eh ; 75 04 mov byte [bp-006h], 000h ; c6 46 fa 00 movzx dx, byte [bp-004h] ; 0f b6 56 fc sal dx, 008h ; c1 e2 08 @@ -7067,19 +7067,19 @@ _int16_function: ; 0xf4f8f LB 0x314 lea bx, [bp-006h] ; 8d 5e fa mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 04effh ; e8 63 fe + call 04f08h ; e8 63 fe test ax, ax ; 85 c0 - jne short 050a7h ; 75 07 + jne short 050b0h ; 75 07 or word [bp+01eh], strict byte 00040h ; 83 4e 1e 40 leave ; c9 pop di ; 5f retn ; c3 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je short 050b3h ; 74 06 + je short 050bch ; 74 06 cmp byte [bp-006h], 0f0h ; 80 7e fa f0 - je short 050b9h ; 74 06 + je short 050c2h ; 74 06 cmp byte [bp-006h], 0e0h ; 80 7e fa e0 - jne short 050bdh ; 75 04 + jne short 050c6h ; 75 04 mov byte [bp-006h], 000h ; c6 46 fa 00 movzx dx, byte [bp-004h] ; 0f b6 56 fc sal dx, 008h ; c1 e2 08 @@ -7092,18 +7092,18 @@ _int16_function: ; 0xf4f8f LB 0x314 retn ; c3 mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 23 c5 + call 01600h ; e8 1a c5 mov dx, word [bp+014h] ; 8b 56 14 mov dl, al ; 88 c2 - jmp short 05082h ; eb 9e + jmp short 0508bh ; eb 9e mov al, byte [bp+012h] ; 8a 46 12 movzx dx, al ; 0f b6 d0 mov ax, word [bp+012h] ; 8b 46 12 shr ax, 008h ; c1 e8 08 xor ah, ah ; 30 e4 - call 04b17h ; e8 22 fa + call 04b20h ; e8 22 fa test ax, ax ; 85 c0 - jne short 05106h ; 75 0d + jne short 0510fh ; 75 0d mov ax, word [bp+014h] ; 8b 46 14 xor al, al ; 30 c0 or AL, strict byte 001h ; 0c 01 @@ -7118,7 +7118,7 @@ _int16_function: ; 0xf4f8f LB 0x314 mov ax, word [bp+014h] ; 8b 46 14 xor al, al ; 30 c0 or AL, strict byte 030h ; 0c 30 - jmp short 05100h ; eb e9 + jmp short 05109h ; eb e9 mov byte [bp-002h], 002h ; c6 46 fe 02 xor cx, cx ; 31 c9 cli ; fa @@ -7131,40 +7131,40 @@ _int16_function: ; 0xf4f8f LB 0x314 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 0513eh ; 75 0d + jne short 05147h ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 0513eh ; 76 08 + jbe short 05147h ; 76 08 mov dx, 00080h ; ba 80 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 - jmp short 05127h ; eb e9 + jmp short 05130h ; eb e9 test bx, bx ; 85 db - jbe short 05182h ; 76 40 + jbe short 0518bh ; 76 40 mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp ax, 000fah ; 3d fa 00 - jne short 05182h ; 75 35 + jne short 0518bh ; 75 35 mov bx, strict word 0ffffh ; bb ff ff mov dx, strict word 00064h ; ba 64 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 05167h ; 75 0d + jne short 05170h ; 75 0d dec bx ; 4b test bx, bx ; 85 db - jbe short 05167h ; 76 08 + jbe short 05170h ; 76 08 mov dx, 00080h ; ba 80 00 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 - jmp short 05150h ; eb e9 + jmp short 05159h ; eb e9 test bx, bx ; 85 db - jbe short 05179h ; 76 0e + jbe short 05182h ; 76 0e shr cx, 008h ; c1 e9 08 mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec @@ -7174,7 +7174,7 @@ _int16_function: ; 0xf4f8f LB 0x314 or cx, ax ; 09 c1 dec byte [bp-002h] ; fe 4e fe cmp byte [bp-002h], 000h ; 80 7e fe 00 - jnbe short 0514dh ; 77 cb + jnbe short 05156h ; 77 cb mov word [bp+00eh], cx ; 89 4e 0e leave ; c9 pop di ; 5f @@ -7184,72 +7184,72 @@ _int16_function: ; 0xf4f8f LB 0x314 lea bx, [bp-006h] ; 8d 5e fa mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 04effh ; e8 68 fd + call 04f08h ; e8 68 fd test ax, ax ; 85 c0 - jne short 051a6h ; 75 0b - push 0057dh ; 68 7d 05 + jne short 051afh ; 75 0b + push 0057fh ; 68 7f 05 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 46 c7 + call 018e9h ; e8 3d c7 add sp, strict byte 00004h ; 83 c4 04 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je near 05075h ; 0f 84 c7 fe + je near 0507eh ; 0f 84 c7 fe cmp byte [bp-006h], 0f0h ; 80 7e fa f0 - je near 05071h ; 0f 84 bb fe - jmp near 05075h ; e9 bc fe + je near 0507ah ; 0f 84 bb fe + jmp near 0507eh ; e9 bc fe or word [bp+01eh], 00200h ; 81 4e 1e 00 02 push strict byte 00000h ; 6a 00 mov cx, ss ; 8c d1 lea bx, [bp-006h] ; 8d 5e fa mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 04effh ; e8 32 fd + call 04f08h ; e8 32 fd test ax, ax ; 85 c0 - je near 050a0h ; 0f 84 cd fe + je near 050a9h ; 0f 84 cd fe cmp byte [bp-004h], 000h ; 80 7e fc 00 - je near 050bdh ; 0f 84 e2 fe + je near 050c6h ; 0f 84 e2 fe cmp byte [bp-006h], 0f0h ; 80 7e fa f0 - je near 050b9h ; 0f 84 d6 fe - jmp near 050bdh ; e9 d7 fe + je near 050c2h ; 0f 84 d6 fe + jmp near 050c6h ; e9 d7 fe mov dx, strict word 00017h ; ba 17 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 11 c4 + call 01600h ; e8 08 c4 mov dx, word [bp+014h] ; 8b 56 14 mov dl, al ; 88 c2 mov word [bp+014h], dx ; 89 56 14 mov dx, strict word 00018h ; ba 18 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 00 c4 + call 01600h ; e8 f7 c3 mov bh, al ; 88 c7 and bh, 073h ; 80 e7 73 mov dx, 00096h ; ba 96 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 f2 c3 + call 01600h ; e8 e9 c3 and AL, strict byte 00ch ; 24 0c or bh, al ; 08 c7 mov dx, word [bp+014h] ; 8b 56 14 xor dh, dh ; 30 f6 movzx ax, bh ; 0f b6 c7 sal ax, 008h ; c1 e0 08 - jmp near 05080h ; e9 60 fe + jmp near 05089h ; e9 60 fe mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 or ah, 080h ; 80 cc 80 - jmp near 05100h ; e9 d5 fe - mov bx, 00cd6h ; bb d6 0c + jmp near 05109h ; e9 d5 fe + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 78 c6 + call 018aeh ; e8 6f c6 mov ax, word [bp+014h] ; 8b 46 14 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 005a1h ; 68 a1 05 + push 005a3h ; 68 a3 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 a4 c6 + call 018e9h ; e8 9b c6 add sp, strict byte 00006h ; 83 c4 06 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 5b c6 + call 018aeh ; e8 52 c6 mov ax, word [bp+010h] ; 8b 46 10 push ax ; 50 mov ax, word [bp+012h] ; 8b 46 12 @@ -7258,74 +7258,69 @@ _int16_function: ; 0xf4f8f LB 0x314 push ax ; 50 mov ax, word [bp+014h] ; 8b 46 14 push ax ; 50 - push 005c9h ; 68 c9 05 + push 005cbh ; 68 cb 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 7e c6 + call 018e9h ; e8 75 c6 add sp, strict byte 0000ch ; 83 c4 0c leave ; c9 pop di ; 5f retn ; c3 - sub dx, word [bp+di+04fh] ; 2b 53 4f + xor AL, strict byte 053h ; 34 53 + pop ax ; 58 push bx ; 53 - jl short 052cah ; 7c 53 - jl short 052cch ; 7c 53 - jl short 052ceh ; 7c 53 - push sp ; 54 - push bp ; 55 - db 082h, 056h, 082h, 056h - ; adc byte [bp-07eh], 056h ; 82 56 82 56 - insw ; 6d + test word [bp+di-07bh], dx ; 85 53 85 + push bx ; 53 + test word [bp+di+05dh], dx ; 85 53 5d push bp ; 55 - pop di ; 5f + mov dx, word [bp-075h] ; 8b 56 8b push si ; 56 - db 082h, 056h, 082h, 056h - ; adc byte [bp-07eh], 056h ; 82 56 82 56 - pop di ; 5f + jbe short 052e1h ; 76 55 + push 08b56h ; 68 56 8b push si ; 56 - pop di ; 5f + mov dx, word [bp+068h] ; 8b 56 68 push si ; 56 - db 082h, 056h, 082h, 056h - ; adc byte [bp-07eh], 056h ; 82 56 82 56 - jcxz 052e8h ; e3 55 - pop di ; 5f + push 08b56h ; 68 56 8b push si ; 56 - db 082h, 056h, 082h, 056h - ; adc byte [bp-07eh], 056h ; 82 56 82 56 - pop di ; 5f + mov dx, word [bp-014h] ; 8b 56 ec + push bp ; 55 + push 08b56h ; 68 56 8b push si ; 56 - adc dx, word [bp-07eh] ; 13 56 82 + mov dx, word [bp+068h] ; 8b 56 68 push si ; 56 - db 082h, 056h, 082h, 056h - ; adc byte [bp-07eh], 056h ; 82 56 82 56 -_int13_harddisk: ; 0xf52a3 LB 0x43c + sbb AL, strict byte 056h ; 1c 56 + mov dx, word [bp-075h] ; 8b 56 8b + push si ; 56 + db 08bh + push si ; 56 +_int13_harddisk: ; 0xf52ac LB 0x43c enter 00010h, 000h ; c8 10 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 6c c3 + call 0161ch ; e8 63 c3 mov si, 00122h ; be 22 01 mov word [bp-004h], ax ; 89 46 fc xor bx, bx ; 31 db mov dx, 0008eh ; ba 8e 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 4d c3 + call 0160eh ; e8 44 c3 mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 cmp ax, 00080h ; 3d 80 00 - jc short 052d0h ; 72 05 + jc short 052d9h ; 72 05 cmp ax, 00090h ; 3d 90 00 - jc short 052eeh ; 72 1e + jc short 052f7h ; 72 1e mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 push ax ; 50 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 005ech ; 68 ec 05 - push 005fbh ; 68 fb 05 + push 005eeh ; 68 ee 05 + push 005fdh ; 68 fd 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 01 c6 + call 018e9h ; e8 f8 c5 add sp, strict byte 0000ah ; 83 c4 0a - jmp near 0569dh ; e9 af 03 + jmp near 056a6h ; e9 af 03 mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 mov es, [bp-004h] ; 8e 46 fc @@ -7334,35 +7329,35 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c mov dl, byte [es:bx+0011fh] ; 26 8a 97 1f 01 mov byte [bp-002h], dl ; 88 56 fe cmp dl, 010h ; 80 fa 10 - jc short 05317h ; 72 10 + jc short 05320h ; 72 10 push ax ; 50 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 005ech ; 68 ec 05 - push 00626h ; 68 26 06 - jmp short 052e3h ; eb cc + push 005eeh ; 68 ee 05 + push 00628h ; 68 28 06 + jmp short 052ech ; eb cc mov bx, word [bp+016h] ; 8b 5e 16 shr bx, 008h ; c1 eb 08 cmp bx, strict byte 00018h ; 83 fb 18 - jnbe near 05682h ; 0f 87 5e 03 + jnbe near 0568bh ; 0f 87 5e 03 add bx, bx ; 01 db - jmp word [cs:bx+05271h] ; 2e ff a7 71 52 + jmp word [cs:bx+0527ah] ; 2e ff a7 7a 52 cmp byte [bp-002h], 008h ; 80 7e fe 08 - jnc near 0533ah ; 0f 83 07 00 + jnc near 05343h ; 0f 83 07 00 movzx ax, byte [bp-002h] ; 0f b6 46 fe - call 01be6h ; e8 ac c8 + call 01be6h ; e8 a3 c8 mov byte [bp+017h], 000h ; c6 46 17 00 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 c5 c2 + call 0160eh ; e8 bc c2 and byte [bp+01ch], 0feh ; 80 66 1c fe leave ; c9 retn ; c3 mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 a8 c2 + call 01600h ; e8 9f c2 mov cl, al ; 88 c1 mov dx, word [bp+016h] ; 8b 56 16 xor dh, dh ; 30 f6 @@ -7373,10 +7368,10 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 99 c2 + call 0160eh ; e8 90 c2 test cl, cl ; 84 c9 - je short 0533eh ; 74 c5 - jmp near 056b9h ; e9 3d 03 + je short 05347h ; 74 c5 + jmp near 056c2h ; e9 3d 03 mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 mov word [bp-00ch], ax ; 89 46 f4 @@ -7396,22 +7391,22 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c mov word [bp-008h], ax ; 89 46 f8 mov ax, word [bp-00ch] ; 8b 46 f4 cmp ax, 00080h ; 3d 80 00 - jnbe short 053b7h ; 77 04 + jnbe short 053c0h ; 77 04 test ax, ax ; 85 c0 - jne short 053dah ; 75 23 - mov bx, 00cd6h ; bb d6 0c + jne short 053e3h ; 75 23 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 ec c4 + call 018aeh ; e8 e3 c4 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 005ech ; 68 ec 05 - push 00658h ; 68 58 06 + push 005eeh ; 68 ee 05 + push 0065ah ; 68 5a 06 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 15 c5 + call 018e9h ; e8 0c c5 add sp, strict byte 00008h ; 83 c4 08 - jmp near 0569dh ; e9 c3 02 + jmp near 056a6h ; e9 c3 02 movzx ax, byte [bp-002h] ; 0f b6 46 fe imul ax, ax, strict byte 00018h ; 6b c0 18 mov es, [bp-004h] ; 8e 46 fc @@ -7422,16 +7417,16 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c mov dx, word [es:bx+02ah] ; 26 8b 57 2a mov word [bp-00ah], dx ; 89 56 f6 cmp di, ax ; 39 c7 - jnc short 05407h ; 73 0c + jnc short 05410h ; 73 0c cmp cx, word [bp-008h] ; 3b 4e f8 - jbe short 05407h ; 76 07 + jbe short 05410h ; 76 07 mov ax, word [bp-006h] ; 8b 46 fa cmp ax, dx ; 39 d0 - jbe short 05435h ; 76 2e - mov bx, 00cd6h ; bb d6 0c + jbe short 0543eh ; 76 2e + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 9c c4 + call 018aeh ; e8 93 c4 push dword [bp-008h] ; 66 ff 76 f8 push di ; 57 mov ax, word [bp+012h] ; 8b 46 12 @@ -7440,39 +7435,39 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 005ech ; 68 ec 05 - push 00680h ; 68 80 06 + push 005eeh ; 68 ee 05 + push 00682h ; 68 82 06 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 ba c4 + call 018e9h ; e8 b1 c4 add sp, strict byte 00010h ; 83 c4 10 - jmp near 0569dh ; e9 68 02 + jmp near 056a6h ; e9 68 02 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 cmp ax, strict word 00004h ; 3d 04 00 - jne short 05443h ; 75 03 - jmp near 0533ah ; e9 f7 fe + jne short 0544ch ; 75 03 + jmp near 05343h ; e9 f7 fe movzx bx, byte [bp-002h] ; 0f b6 5e fe imul bx, bx, strict byte 00018h ; 6b db 18 mov es, [bp-004h] ; 8e 46 fc add bx, si ; 01 f3 cmp cx, word [es:bx+02ch] ; 26 3b 4f 2c - jne short 05464h ; 75 0f + jne short 0546dh ; 75 0f mov ax, word [es:bx+030h] ; 26 8b 47 30 cmp ax, word [bp-00ah] ; 3b 46 f6 - jne short 05464h ; 75 06 + jne short 0546dh ; 75 06 cmp byte [bp-002h], 008h ; 80 7e fe 08 - jc short 05494h ; 72 30 + jc short 0549dh ; 72 30 mov ax, di ; 89 f8 xor dx, dx ; 31 d2 mov bx, cx ; 89 cb xor cx, cx ; 31 c9 - call 08c89h ; e8 1a 38 + call 08c99h ; e8 21 38 xor bx, bx ; 31 db add ax, word [bp-008h] ; 03 46 f8 adc dx, bx ; 11 da mov bx, word [bp-00ah] ; 8b 5e f6 xor cx, cx ; 31 c9 - call 08c89h ; e8 0b 38 + call 08c99h ; e8 12 38 xor bx, bx ; 31 db add ax, word [bp-006h] ; 03 46 fa db 011h, 0dah, 005h, 0ffh, 0ffh, 089h, 046h, 0f0h, 083h, 0d2h, 0ffh, 089h, 056h, 0f2h, 089h, 05eh @@ -7485,11 +7480,11 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c db 00fh, 0b6h, 047h, 01eh, 089h, 0c3h, 0c1h, 0e3h, 002h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h, 001h db 0c0h, 001h, 0c3h, 006h, 056h, 0ffh, 097h, 0fch, 0ffh, 089h, 0c2h, 08bh, 046h, 016h, 030h, 0c0h db 08eh, 046h, 0fch, 026h, 08bh, 05ch, 014h, 009h, 0c3h, 089h, 05eh, 016h, 084h, 0d2h, 00fh, 084h - db 015h, 0feh, 0bbh, 0d6h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 07eh, 0c3h, 00fh, 0b6h, 0c2h - db 050h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h, 050h, 068h, 0ech, 005h, 068h, 0c7h, 006h, 06ah, 004h - db 0e8h, 0a3h, 0c3h, 083h, 0c4h, 00ah, 08bh, 046h, 016h, 030h, 0e4h, 080h, 0cch, 00ch, 0e9h, 051h - db 001h, 0bbh, 0d6h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 04fh, 0c3h, 068h, 0e8h, 006h, 06ah - db 004h, 0e8h, 082h, 0c3h, 083h, 0c4h, 004h, 0e9h, 0cdh, 0fdh, 00fh, 0b6h, 046h, 0feh, 06bh, 0c0h + db 015h, 0feh, 0bbh, 0d8h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 075h, 0c3h, 00fh, 0b6h, 0c2h + db 050h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h, 050h, 068h, 0eeh, 005h, 068h, 0c9h, 006h, 06ah, 004h + db 0e8h, 09ah, 0c3h, 083h, 0c4h, 00ah, 08bh, 046h, 016h, 030h, 0e4h, 080h, 0cch, 00ch, 0e9h, 051h + db 001h, 0bbh, 0d8h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 046h, 0c3h, 068h, 0eah, 006h, 06ah + db 004h, 0e8h, 079h, 0c3h, 083h, 0c4h, 004h, 0e9h, 0cdh, 0fdh, 00fh, 0b6h, 046h, 0feh, 06bh, 0c0h db 018h, 08eh, 046h, 0fch, 089h, 0f3h, 001h, 0c3h, 026h, 08bh, 07fh, 028h, 026h, 08bh, 04fh, 026h db 026h, 08bh, 047h, 02ah, 089h, 046h, 0f6h, 026h, 00fh, 0b6h, 084h, 09eh, 001h, 089h, 046h, 0f4h db 0c6h, 046h, 016h, 000h, 08bh, 056h, 014h, 030h, 0f6h, 04fh, 089h, 0f8h, 030h, 0e4h, 0c1h, 0e0h @@ -7502,50 +7497,50 @@ _int13_harddisk: ; 0xf52a3 LB 0x43c db 075h, 003h, 0e9h, 032h, 0fdh, 08bh, 046h, 016h, 030h, 0e4h, 080h, 0cch, 0aah, 0e9h, 092h, 000h db 00fh, 0b6h, 046h, 0feh, 06bh, 0c0h, 018h, 08eh, 046h, 0fch, 001h, 0c6h, 026h, 08bh, 07ch, 02eh db 026h, 08bh, 044h, 02ch, 089h, 046h, 0f8h, 026h, 08bh, 044h, 030h, 089h, 046h, 0fah, 089h, 0f8h - db 031h, 0d2h, 08bh, 05eh, 0f8h, 031h, 0c9h, 0e8h, 04ch, 036h, 08bh, 05eh, 0fah, 031h, 0c9h, 0e8h - db 044h, 036h, 089h, 046h, 0f0h, 089h, 056h, 0f2h, 089h, 056h, 014h, 089h, 046h, 012h, 08bh, 046h - db 016h, 030h, 0e4h, 080h, 0cch, 003h, 089h, 046h, 016h, 0e9h, 0dfh, 0fch, 0bbh, 0d6h, 00ch, 08ch - db 0d9h, 0b8h, 004h, 000h, 0e8h, 044h, 0c2h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h, 050h, 068h, 0ech - db 005h, 068h, 002h, 007h, 06ah, 004h, 0e8h, 06dh, 0c2h, 083h, 0c4h, 008h, 0e9h, 0b8h, 0fch, 0bbh - db 0d6h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 021h, 0c2h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h - db 050h, 068h, 0ech, 005h, 068h, 035h, 007h, 0e9h, 032h, 0fdh, 08bh, 046h, 016h, 030h, 0e4h, 080h + db 031h, 0d2h, 08bh, 05eh, 0f8h, 031h, 0c9h, 0e8h, 053h, 036h, 08bh, 05eh, 0fah, 031h, 0c9h, 0e8h + db 04bh, 036h, 089h, 046h, 0f0h, 089h, 056h, 0f2h, 089h, 056h, 014h, 089h, 046h, 012h, 08bh, 046h + db 016h, 030h, 0e4h, 080h, 0cch, 003h, 089h, 046h, 016h, 0e9h, 0dfh, 0fch, 0bbh, 0d8h, 00ch, 08ch + db 0d9h, 0b8h, 004h, 000h, 0e8h, 03bh, 0c2h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h, 050h, 068h, 0eeh + db 005h, 068h, 004h, 007h, 06ah, 004h, 0e8h, 064h, 0c2h, 083h, 0c4h, 008h, 0e9h, 0b8h, 0fch, 0bbh + db 0d8h, 00ch, 08ch, 0d9h, 0b8h, 004h, 000h, 0e8h, 018h, 0c2h, 08bh, 046h, 016h, 0c1h, 0e8h, 008h + db 050h, 068h, 0eeh, 005h, 068h, 037h, 007h, 0e9h, 032h, 0fdh, 08bh, 046h, 016h, 030h, 0e4h, 080h db 0cch, 001h, 089h, 046h, 016h, 08bh, 05eh, 016h, 0c1h, 0ebh, 008h, 030h, 0ffh, 0bah, 074h, 000h - db 0b8h, 040h, 000h, 0e8h, 055h, 0bfh, 080h, 04eh, 01ch, 001h, 0c9h, 0c3h, 078h, 057h, 090h, 057h - db 090h, 057h, 090h, 057h, 03fh, 05bh, 0d3h, 058h, 090h, 057h, 0d9h, 058h, 03fh, 05bh, 08ch, 05bh - db 08ch, 05bh, 08ch, 05bh, 08ch, 05bh, 054h, 05bh, 08ch, 05bh, 08ch, 05bh -_int13_harddisk_ext: ; 0xf56df LB 0x4c8 + db 0b8h, 040h, 000h, 0e8h, 04ch, 0bfh, 080h, 04eh, 01ch, 001h, 0c9h, 0c3h, 081h, 057h, 099h, 057h + db 099h, 057h, 099h, 057h, 048h, 05bh, 0dch, 058h, 099h, 057h, 0e2h, 058h, 048h, 05bh, 095h, 05bh + db 095h, 05bh, 095h, 05bh, 095h, 05bh, 05dh, 05bh, 095h, 05bh, 095h, 05bh +_int13_harddisk_ext: ; 0xf56e8 LB 0x4c8 enter 00028h, 000h ; c8 28 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 30 bf + call 0161ch ; e8 27 bf mov word [bp-014h], ax ; 89 46 ec mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 24 bf + call 0161ch ; e8 1b bf mov si, 00122h ; be 22 01 mov word [bp-026h], ax ; 89 46 da xor bx, bx ; 31 db mov dx, 0008eh ; ba 8e 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 05 bf + call 0160eh ; e8 fc be mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 cmp ax, 00080h ; 3d 80 00 - jc short 05718h ; 72 05 + jc short 05721h ; 72 05 cmp ax, 00090h ; 3d 90 00 - jc short 05736h ; 72 1e + jc short 0573fh ; 72 1e mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 push ax ; 50 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 00763h ; 68 63 07 - push 005fbh ; 68 fb 05 + push 00765h ; 68 65 07 + push 005fdh ; 68 fd 05 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 b9 c1 + call 018e9h ; e8 b0 c1 add sp, strict byte 0000ah ; 83 c4 0a - jmp near 05b6ah ; e9 34 04 + jmp near 05b73h ; e9 34 04 mov ax, word [bp+00eh] ; 8b 46 0e xor ah, ah ; 30 e4 mov es, [bp-026h] ; 8e 46 da @@ -7553,30 +7548,30 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 add bx, ax ; 01 c3 mov cl, byte [es:bx+0011fh] ; 26 8a 8f 1f 01 cmp cl, 010h ; 80 f9 10 - jc short 0575ch ; 72 10 + jc short 05765h ; 72 10 push ax ; 50 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 00763h ; 68 63 07 - push 00626h ; 68 26 06 - jmp short 0572bh ; eb cf + push 00765h ; 68 65 07 + push 00628h ; 68 28 06 + jmp short 05734h ; eb cf mov bx, word [bp+016h] ; 8b 5e 16 shr bx, 008h ; c1 eb 08 sub bx, strict byte 00041h ; 83 eb 41 cmp bx, strict byte 0000fh ; 83 fb 0f - jnbe near 05b8ch ; 0f 87 20 04 + jnbe near 05b95h ; 0f 87 20 04 add bx, bx ; 01 db mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 - jmp word [cs:bx+056bfh] ; 2e ff a7 bf 56 + jmp word [cs:bx+056c8h] ; 2e ff a7 c8 56 mov word [bp+010h], 0aa55h ; c7 46 10 55 aa mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 or ah, 030h ; 80 cc 30 mov word [bp+016h], ax ; 89 46 16 mov word [bp+014h], strict word 00007h ; c7 46 14 07 00 - jmp near 05b43h ; e9 b3 03 + jmp near 05b4ch ; e9 b3 03 mov bx, word [bp+00ah] ; 8b 5e 0a mov es, [bp+004h] ; 8e 46 04 mov di, bx ; 89 df @@ -7591,14 +7586,14 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov word [bp-00ah], ax ; 89 46 f6 mov ax, word [es:bx+00eh] ; 26 8b 47 0e or ax, word [bp-00ah] ; 0b 46 f6 - je short 057d1h ; 74 11 + je short 057dah ; 74 11 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 00763h ; 68 63 07 - push 00776h ; 68 76 07 + push 00765h ; 68 65 07 + push 00778h ; 68 78 07 push strict byte 00007h ; 6a 07 - jmp short 0581bh ; eb 4a + jmp short 05824h ; eb 4a mov es, [bp-010h] ; 8e 46 f0 mov ax, word [es:di+008h] ; 26 8b 45 08 mov word [bp-00ah], ax ; 89 46 f6 @@ -7610,31 +7605,31 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 add bx, dx ; 01 d3 mov ch, byte [es:bx+01eh] ; 26 8a 6f 1e cmp ax, word [es:bx+034h] ; 26 3b 47 34 - jnbe short 05801h ; 77 0b - jne short 05824h ; 75 2c + jnbe short 0580ah ; 77 0b + jne short 0582dh ; 75 2c mov dx, word [bp-00ah] ; 8b 56 f6 cmp dx, word [es:bx+032h] ; 26 3b 57 32 - jc short 05824h ; 72 23 - mov bx, 00cd6h ; bb d6 0c + jc short 0582dh ; 72 23 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 a2 c0 + call 018aeh ; e8 99 c0 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 00763h ; 68 63 07 - push 0079fh ; 68 9f 07 + push 00765h ; 68 65 07 + push 007a1h ; 68 a1 07 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 cb c0 + call 018e9h ; e8 c2 c0 add sp, strict byte 00008h ; 83 c4 08 - jmp near 05b6ah ; e9 46 03 + jmp near 05b73h ; e9 46 03 mov dx, word [bp+016h] ; 8b 56 16 shr dx, 008h ; c1 ea 08 mov word [bp-00ch], dx ; 89 56 f4 cmp dx, strict byte 00044h ; 83 fa 44 - je near 05b3fh ; 0f 84 0b 03 + je near 05b48h ; 0f 84 0b 03 cmp dx, strict byte 00047h ; 83 fa 47 - je near 05b3fh ; 0f 84 04 03 + je near 05b48h ; 0f 84 04 03 mov es, [bp-026h] ; 8e 46 da db 066h, 026h, 0c7h, 044h, 014h, 000h, 000h, 000h, 000h ; mov dword [es:si+014h], strict dword 000000000h ; 66 26 c7 44 14 00 00 00 00 @@ -7666,25 +7661,25 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov es, [bp-010h] ; 8e 46 f0 mov word [es:di+002h], ax ; 26 89 45 02 test dl, dl ; 84 d2 - je near 05b3fh ; 0f 84 97 02 - mov bx, 00cd6h ; bb d6 0c + je near 05b48h ; 0f 84 97 02 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 fb bf + call 018aeh ; e8 f2 bf movzx ax, dl ; 0f b6 c2 push ax ; 50 push word [bp-00ch] ; ff 76 f4 - push 00763h ; 68 63 07 - push 006c7h ; 68 c7 06 + push 00765h ; 68 65 07 + push 006c9h ; 68 c9 06 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 24 c0 + call 018e9h ; e8 1b c0 add sp, strict byte 0000ah ; 83 c4 0a mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 or ah, 00ch ; 80 cc 0c - jmp near 05b72h ; e9 9f 02 + jmp near 05b7bh ; e9 9f 02 or ah, 0b2h ; 80 cc b2 - jmp near 05b72h ; e9 99 02 + jmp near 05b7bh ; e9 99 02 mov bx, word [bp+00ah] ; 8b 5e 0a mov ax, word [bp+004h] ; 8b 46 04 mov word [bp-006h], ax ; 89 46 fa @@ -7694,8 +7689,8 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov ax, word [es:di] ; 26 8b 05 mov word [bp-00eh], ax ; 89 46 f2 cmp ax, strict word 0001ah ; 3d 1a 00 - jc near 05b6ah ; 0f 82 74 02 - jc near 0597dh ; 0f 82 83 00 + jc near 05b73h ; 0f 82 74 02 + jc near 05986h ; 0f 82 83 00 movzx ax, cl ; 0f b6 c1 imul ax, ax, strict byte 00018h ; 6b c0 18 mov es, [bp-026h] ; 8e 46 da @@ -7733,7 +7728,7 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 db 066h, 026h, 0c7h, 045h, 014h, 000h, 000h, 000h, 000h ; mov dword [es:di+014h], strict dword 000000000h ; 66 26 c7 45 14 00 00 00 00 cmp word [bp-00eh], strict byte 0001eh ; 83 7e f2 1e - jc near 05a89h ; 0f 82 04 01 + jc near 05a92h ; 0f 82 04 01 mov es, [bp-004h] ; 8e 46 fc mov word [es:bx], strict word 0001eh ; 26 c7 07 1e 00 mov ax, word [bp-014h] ; 8b 46 ec @@ -7759,9 +7754,9 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov ah, byte [es:di+022h] ; 26 8a 65 22 mov al, byte [es:di+023h] ; 26 8a 45 23 test al, al ; 84 c0 - jne short 059dbh ; 75 04 + jne short 059e4h ; 75 04 xor dx, dx ; 31 d2 - jmp short 059deh ; eb 03 + jmp short 059e7h ; eb 03 mov dx, strict word 00008h ; ba 08 00 or dl, 010h ; 80 ca 10 mov word [bp-008h], dx ; 89 56 f8 @@ -7776,9 +7771,9 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 movzx dx, ah ; 0f b6 d4 or word [bp-008h], dx ; 09 56 f8 cmp AL, strict byte 003h ; 3c 03 - jne short 05a04h ; 75 05 + jne short 05a0dh ; 75 05 mov ax, strict word 00003h ; b8 03 00 - jmp short 05a06h ; eb 02 + jmp short 05a0fh ; eb 02 xor ax, ax ; 31 c0 or word [bp-008h], ax ; 09 46 f8 mov ax, word [bp-01ah] ; 8b 46 e6 @@ -7803,21 +7798,21 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov byte [es:si+001feh], 011h ; 26 c6 84 fe 01 11 xor ch, ch ; 30 ed mov byte [bp-002h], ch ; 88 6e fe - jmp short 05a6ah ; eb 06 + jmp short 05a73h ; eb 06 cmp byte [bp-002h], 00fh ; 80 7e fe 0f - jnc short 05a7fh ; 73 15 + jnc short 05a88h ; 73 15 movzx dx, byte [bp-002h] ; 0f b6 56 fe add dx, 00312h ; 81 c2 12 03 mov ax, word [bp-014h] ; 8b 46 ec - call 01600h ; e8 88 bb + call 01600h ; e8 7f bb add ch, al ; 00 c5 inc byte [bp-002h] ; fe 46 fe - jmp short 05a64h ; eb e5 + jmp short 05a6dh ; eb e5 neg ch ; f6 dd mov es, [bp-026h] ; 8e 46 da mov byte [es:si+001ffh], ch ; 26 88 ac ff 01 cmp word [bp-00eh], strict byte 00042h ; 83 7e f2 42 - jc near 05b3fh ; 0f 82 ae 00 + jc near 05b48h ; 0f 82 ae 00 movzx ax, cl ; 0f b6 c1 cwd ; 99 db 02bh, 0c2h @@ -7835,7 +7830,7 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 ; mov dword [es:bx+01eh], strict dword 00024beddh ; 66 26 c7 47 1e dd be 24 00 mov word [es:bx+022h], strict word 00000h ; 26 c7 47 22 00 00 test al, al ; 84 c0 - jne short 05ad1h ; 75 09 + jne short 05adah ; 75 09 db 066h, 026h, 0c7h, 047h, 024h, 049h, 053h, 041h, 020h ; mov dword [es:bx+024h], strict dword 020415349h ; 66 26 c7 47 24 49 53 41 20 mov es, [bp-004h] ; 8e 46 fc @@ -7844,7 +7839,7 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 db 066h, 026h, 0c7h, 047h, 02ch, 020h, 020h, 020h, 020h ; mov dword [es:bx+02ch], strict dword 020202020h ; 66 26 c7 47 2c 20 20 20 20 test al, al ; 84 c0 - jne short 05afdh ; 75 13 + jne short 05b06h ; 75 13 mov word [es:bx+030h], dx ; 26 89 57 30 db 066h, 026h, 0c7h, 047h, 032h, 000h, 000h, 000h, 000h ; mov dword [es:bx+032h], strict dword 000000000h ; 66 26 c7 47 32 00 00 00 00 @@ -7859,17 +7854,17 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 mov word [es:bx+03eh], strict word 00000h ; 26 c7 47 3e 00 00 xor cl, cl ; 30 c9 mov CH, strict byte 01eh ; b5 1e - jmp short 05b24h ; eb 05 + jmp short 05b2dh ; eb 05 cmp ch, 040h ; 80 fd 40 - jnc short 05b36h ; 73 12 + jnc short 05b3fh ; 73 12 movzx dx, ch ; 0f b6 d5 add dx, word [bp+00ah] ; 03 56 0a mov ax, word [bp+004h] ; 8b 46 04 - call 01600h ; e8 d0 ba + call 01600h ; e8 c7 ba add cl, al ; 00 c1 db 0feh, 0c5h ; inc ch ; fe c5 - jmp short 05b1fh ; eb e9 + jmp short 05b28h ; eb e9 neg cl ; f6 d9 mov es, [bp-004h] ; 8e 46 fc mov byte [es:bx+041h], cl ; 26 88 4f 41 @@ -7877,19 +7872,19 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 xor bx, bx ; 31 db mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 c0 ba + call 0160eh ; e8 b7 ba and byte [bp+01ch], 0feh ; 80 66 1c fe leave ; c9 retn ; c3 cmp ax, strict word 00006h ; 3d 06 00 - je short 05b3fh ; 74 e6 + je short 05b48h ; 74 e6 cmp ax, strict word 00001h ; 3d 01 00 - jc short 05b6ah ; 72 0c - jbe short 05b3fh ; 76 df + jc short 05b73h ; 72 0c + jbe short 05b48h ; 76 df cmp ax, strict word 00003h ; 3d 03 00 - jc short 05b6ah ; 72 05 + jc short 05b73h ; 72 05 cmp ax, strict word 00004h ; 3d 04 00 - jbe short 05b3fh ; 76 d5 + jbe short 05b48h ; 76 d5 mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 or ah, 001h ; 80 cc 01 @@ -7899,21 +7894,21 @@ _int13_harddisk_ext: ; 0xf56df LB 0x4c8 xor bh, bh ; 30 ff mov dx, strict word 00074h ; ba 74 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 88 ba + call 0160eh ; e8 7f ba or byte [bp+01ch], 001h ; 80 4e 1c 01 leave ; c9 retn ; c3 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 17 bd + call 018aeh ; e8 0e bd mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 push ax ; 50 - push 00763h ; 68 63 07 - push 00735h ; 68 35 07 - jmp near 05819h ; e9 72 fc -_int14_function: ; 0xf5ba7 LB 0x154 + push 00765h ; 68 65 07 + push 00737h ; 68 37 07 + jmp near 05822h ; e9 72 fc +_int14_function: ; 0xf5bb0 LB 0x154 push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -7921,29 +7916,29 @@ _int14_function: ; 0xf5ba7 LB 0x154 mov dx, word [bp+010h] ; 8b 56 10 add dx, dx ; 01 d2 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 65 ba + call 0161ch ; e8 5c ba mov si, ax ; 89 c6 mov bx, ax ; 89 c3 mov dx, word [bp+010h] ; 8b 56 10 add dx, strict byte 0007ch ; 83 c2 7c mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 39 ba + call 01600h ; e8 30 ba mov cl, al ; 88 c1 cmp word [bp+010h], strict byte 00004h ; 83 7e 10 04 - jnc near 05cf4h ; 0f 83 23 01 + jnc near 05cfdh ; 0f 83 23 01 test si, si ; 85 f6 - jbe near 05cf4h ; 0f 86 1d 01 + jbe near 05cfdh ; 0f 86 1d 01 mov al, byte [bp+015h] ; 8a 46 15 cmp AL, strict byte 001h ; 3c 01 - jc short 05befh ; 72 11 - jbe short 05c43h ; 76 63 + jc short 05bf8h ; 72 11 + jbe short 05c4ch ; 76 63 cmp AL, strict byte 003h ; 3c 03 - je near 05cdch ; 0f 84 f6 00 + je near 05ce5h ; 0f 84 f6 00 cmp AL, strict byte 002h ; 3c 02 - je near 05c91h ; 0f 84 a5 00 - jmp near 05cedh ; e9 fe 00 + je near 05c9ah ; 0f 84 a5 00 + jmp near 05cf6h ; e9 fe 00 test al, al ; 84 c0 - jne near 05cedh ; 0f 85 f8 00 + jne near 05cf6h ; 0f 85 f8 00 lea dx, [bx+003h] ; 8d 57 03 in AL, DX ; ec db 02ah, 0e4h @@ -7975,17 +7970,17 @@ _int14_function: ; 0xf5ba7 LB 0x154 db 02ah, 0e4h ; sub ah, ah ; 2a e4 mov byte [bp+014h], al ; 88 46 14 - jmp near 05ccdh ; e9 97 00 + jmp near 05cd6h ; e9 97 00 mov AL, strict byte 017h ; b0 17 mov dx, bx ; 89 da out DX, AL ; ee lea dx, [bx+001h] ; 8d 57 01 mov AL, strict byte 004h ; b0 04 out DX, AL ; ee - jmp short 05c18h ; eb d5 + jmp short 05c21h ; eb d5 mov dx, strict word 0006ch ; ba 6c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 d0 b9 + call 0161ch ; e8 c7 b9 mov si, ax ; 89 c6 lea dx, [bx+005h] ; 8d 57 05 in AL, DX ; ec @@ -7993,20 +7988,20 @@ _int14_function: ; 0xf5ba7 LB 0x154 ; sub ah, ah ; 2a e4 and ax, strict word 00060h ; 25 60 00 cmp ax, strict word 00060h ; 3d 60 00 - je short 05c73h ; 74 17 + je short 05c7ch ; 74 17 test cl, cl ; 84 c9 - je short 05c73h ; 74 13 + je short 05c7ch ; 74 13 mov dx, strict word 0006ch ; ba 6c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 b3 b9 + call 0161ch ; e8 aa b9 cmp ax, si ; 39 f0 - je short 05c4eh ; 74 e1 + je short 05c57h ; 74 e1 mov si, ax ; 89 c6 db 0feh, 0c9h ; dec cl ; fe c9 - jmp short 05c4eh ; eb db + jmp short 05c57h ; eb db test cl, cl ; 84 c9 - je short 05c7dh ; 74 06 + je short 05c86h ; 74 06 mov al, byte [bp+014h] ; 8a 46 14 mov dx, bx ; 89 da out DX, AL ; ee @@ -8016,33 +8011,33 @@ _int14_function: ; 0xf5ba7 LB 0x154 ; sub ah, ah ; 2a e4 mov byte [bp+015h], al ; 88 46 15 test cl, cl ; 84 c9 - jne short 05ccdh ; 75 43 + jne short 05cd6h ; 75 43 or AL, strict byte 080h ; 0c 80 mov byte [bp+015h], al ; 88 46 15 - jmp short 05ccdh ; eb 3c + jmp short 05cd6h ; eb 3c mov dx, strict word 0006ch ; ba 6c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 82 b9 + call 0161ch ; e8 79 b9 mov si, ax ; 89 c6 lea dx, [bx+005h] ; 8d 57 05 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 05cbdh ; 75 17 + jne short 05cc6h ; 75 17 test cl, cl ; 84 c9 - je short 05cbdh ; 74 13 + je short 05cc6h ; 74 13 mov dx, strict word 0006ch ; ba 6c 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 69 b9 + call 0161ch ; e8 60 b9 cmp ax, si ; 39 f0 - je short 05c9ch ; 74 e5 + je short 05ca5h ; 74 e5 mov si, ax ; 89 c6 db 0feh, 0c9h ; dec cl ; fe c9 - jmp short 05c9ch ; eb df + jmp short 05ca5h ; eb df test cl, cl ; 84 c9 - je short 05cd4h ; 74 13 + je short 05cddh ; 74 13 mov byte [bp+015h], 000h ; c6 46 15 00 mov dx, bx ; 89 da in AL, DX ; ec @@ -8057,7 +8052,7 @@ _int14_function: ; 0xf5ba7 LB 0x154 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 - jmp short 05c8ch ; eb b0 + jmp short 05c95h ; eb b0 lea dx, [si+005h] ; 8d 54 05 in AL, DX ; ec db 02ah, 0e4h @@ -8067,7 +8062,7 @@ _int14_function: ; 0xf5ba7 LB 0x154 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 - jmp short 05ccah ; eb dd + jmp short 05cd3h ; eb dd or byte [bp+01eh], 001h ; 80 4e 1e 01 pop bp ; 5d pop si ; 5e @@ -8076,7 +8071,7 @@ _int14_function: ; 0xf5ba7 LB 0x154 pop bp ; 5d pop si ; 5e retn ; c3 -set_enable_a20_: ; 0xf5cfb LB 0x29 +set_enable_a20_: ; 0xf5d04 LB 0x29 push bx ; 53 push cx ; 51 push dx ; 52 @@ -8089,10 +8084,10 @@ set_enable_a20_: ; 0xf5cfb LB 0x29 ; sub ah, ah ; 2a e4 mov cl, al ; 88 c1 test bx, bx ; 85 db - je short 05d14h ; 74 05 + je short 05d1dh ; 74 05 or AL, strict byte 002h ; 0c 02 out DX, AL ; ee - jmp short 05d17h ; eb 03 + jmp short 05d20h ; eb 03 and AL, strict byte 0fdh ; 24 fd out DX, AL ; ee test cl, 002h ; f6 c1 02 @@ -8104,7 +8099,7 @@ set_enable_a20_: ; 0xf5cfb LB 0x29 pop cx ; 59 pop bx ; 5b retn ; c3 -set_e820_range_: ; 0xf5d24 LB 0x8c +set_e820_range_: ; 0xf5d2d LB 0x8c push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -8133,51 +8128,50 @@ set_e820_range_: ; 0xf5d24 LB 0x8c pop si ; 5e retn 0000ah ; c2 0a 00 in AL, DX ; ec - jmp near 01f57h ; e9 d8 c1 + jmp near 01f60h ; e9 d8 c1 sar byte [bx-06f6fh], 089h ; c0 bf 91 90 89 mov byte [bx+05283h], al ; 88 87 83 52 dec di ; 4f inc cx ; 41 and AL, strict byte 000h ; 24 00 - dec bx ; 4b + push sp ; 54 db 062h - out DX, AL ; ee - pop bp ; 5d - add word [bp-06dh], bx ; 01 5e 93 + neg word [di+00ah] ; f7 5d 0a pop si ; 5e - cwd ; 99 + pushfw ; 9c + pop si ; 5e + mov byte [0a75eh], AL ; a2 5e a7 pop si ; 5e - sahf ; 9e + lodsb ; ac pop si ; 5e - mov word [0455eh], ax ; a3 5e 45 + dec si ; 4e pop di ; 5f - loop 05dfeh ; e2 60 - or byte [bx+di-071h], ah ; 08 61 8f + jmp short 05e07h ; eb 60 + adc word [bx+di-068h], sp ; 11 61 98 pop si ; 5e - db 08fh, 05eh, 0d5h - ; pop word [bp-02bh] ; 8f 5e d5 - popaw ; 61 - std ; fd - popaw ; 61 - adc byte [bp+si+01fh], ah ; 10 62 1f - bound dx, [bp+di+0265eh] ; 62 93 5e 26 + cbw ; 98 + pop si ; 5e + fisub word [bx+di+006h] ; de 61 06 + bound bx, [bx+di] ; 62 19 + bound bp, [bx+si] ; 62 28 + bound bx, [si+02f5eh] ; 62 9c 5e 2f db 062h -_int15_function: ; 0xf5db0 LB 0x4c9 +_int15_function: ; 0xf5db9 LB 0x4c9 push si ; 56 push di ; 57 enter 00004h, 000h ; c8 04 00 00 mov ax, word [bp+016h] ; 8b 46 16 shr ax, 008h ; c1 e8 08 cmp ax, 000ech ; 3d ec 00 - jnbe near 0624bh ; 0f 87 88 04 + jnbe near 06254h ; 0f 87 88 04 push CS ; 0e pop ES ; 07 mov cx, strict word 00012h ; b9 12 00 - mov di, 05d7bh ; bf 7b 5d + mov di, 05d84h ; bf 84 5d repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov si, word [cs:di+05d8ch] ; 2e 8b b5 8c 5d + mov si, word [cs:di+05d95h] ; 2e 8b b5 95 5d mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 mov cx, word [bp+01ch] ; 8b 4e 1c @@ -8190,30 +8184,30 @@ _int15_function: ; 0xf5db0 LB 0x4c9 mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 cmp ax, 000c0h ; 3d c0 00 - jne near 0624bh ; 0f 85 51 04 + jne near 06254h ; 0f 85 51 04 or byte [bp+01ch], 001h ; 80 4e 1c 01 - jmp near 061f4h ; e9 f3 03 + jmp near 061fdh ; e9 f3 03 mov dx, ax ; 89 c2 cmp ax, strict word 00001h ; 3d 01 00 - jc short 05e16h ; 72 0e - jbe short 05e2ah ; 76 20 + jc short 05e1fh ; 72 0e + jbe short 05e33h ; 76 20 cmp ax, strict word 00003h ; 3d 03 00 - je short 05e57h ; 74 48 + je short 05e60h ; 74 48 cmp ax, strict word 00002h ; 3d 02 00 - je short 05e3ah ; 74 26 - jmp short 05e64h ; eb 4e + je short 05e43h ; 74 26 + jmp short 05e6dh ; eb 4e test ax, ax ; 85 c0 - jne short 05e64h ; 75 4a + jne short 05e6dh ; 75 4a xor ax, ax ; 31 c0 - call 05cfbh ; e8 dc fe + call 05d04h ; e8 dc fe and byte [bp+01ch], 0feh ; 80 66 1c fe mov byte [bp+017h], 000h ; c6 46 17 00 - jmp near 05e8fh ; e9 65 00 + jmp near 05e98h ; e9 65 00 mov ax, strict word 00001h ; b8 01 00 - call 05cfbh ; e8 cb fe + call 05d04h ; e8 cb fe and byte [bp+01ch], 0feh ; 80 66 1c fe mov byte [bp+017h], dh ; 88 76 17 - jmp near 05e8fh ; e9 55 00 + jmp near 05e98h ; e9 55 00 mov dx, 00092h ; ba 92 00 in AL, DX ; ec db 02ah, 0e4h @@ -8225,21 +8219,21 @@ _int15_function: ; 0xf5db0 LB 0x4c9 mov word [bp+016h], dx ; 89 56 16 and byte [bp+01ch], 0feh ; 80 66 1c fe mov byte [bp+017h], ah ; 88 66 17 - jmp near 05e8fh ; e9 38 00 + jmp near 05e98h ; e9 38 00 and byte [bp+01ch], 0feh ; 80 66 1c fe mov byte [bp+017h], ah ; 88 66 17 mov word [bp+010h], ax ; 89 46 10 - jmp near 05e8fh ; e9 2b 00 - mov bx, 00cd6h ; bb d6 0c + jmp near 05e98h ; e9 2b 00 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 3f ba + call 018aeh ; e8 36 ba mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 push ax ; 50 - push 007c4h ; 68 c4 07 + push 007c6h ; 68 c6 07 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 6c ba + call 018e9h ; e8 63 ba add sp, strict byte 00006h ; 83 c4 06 or byte [bp+01ch], 001h ; 80 4e 1c 01 mov ax, word [bp+016h] ; 8b 46 16 @@ -8251,38 +8245,38 @@ _int15_function: ; 0xf5db0 LB 0x4c9 pop si ; 5e retn ; c3 mov word [bp+01ch], bx ; 89 5e 1c - jmp near 05f3fh ; e9 a6 00 + jmp near 05f48h ; e9 a6 00 mov word [bp+01ch], bx ; 89 5e 1c - jmp short 05e8fh ; eb f1 + jmp short 05e98h ; eb f1 mov word [bp+01ch], cx ; 89 4e 1c - jmp short 05e8ch ; eb e9 + jmp short 05e95h ; eb e9 test byte [bp+016h], 0ffh ; f6 46 16 ff - je short 05f15h ; 74 6c + je short 05f1eh ; 74 6c mov dx, 000a0h ; ba a0 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 4e b7 + call 01600h ; e8 45 b7 test AL, strict byte 001h ; a8 01 - jne near 061ebh ; 0f 85 33 03 + jne near 061f4h ; 0f 85 33 03 mov bx, strict word 00001h ; bb 01 00 mov dx, 000a0h ; ba a0 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 4a b7 + call 0160eh ; e8 41 b7 mov bx, word [bp+018h] ; 8b 5e 18 mov dx, 00098h ; ba 98 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 5a b7 + call 0162ah ; e8 51 b7 mov bx, word [bp+010h] ; 8b 5e 10 mov dx, 0009ah ; ba 9a 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 4e b7 + call 0162ah ; e8 45 b7 mov bx, word [bp+012h] ; 8b 5e 12 mov dx, 0009ch ; ba 9c 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 42 b7 + call 0162ah ; e8 39 b7 mov bx, word [bp+014h] ; 8b 5e 14 mov dx, 0009eh ; ba 9e 00 mov ax, strict word 00040h ; b8 40 00 - call 0162ah ; e8 36 b7 + call 0162ah ; e8 2d b7 and byte [bp+01ch], 0feh ; 80 66 1c fe mov dx, 000a1h ; ba a1 00 in AL, DX ; ec @@ -8291,23 +8285,23 @@ _int15_function: ; 0xf5db0 LB 0x4c9 and AL, strict byte 0feh ; 24 fe out DX, AL ; ee mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 55 b7 + call 0165ch ; e8 4c b7 or AL, strict byte 040h ; 0c 40 movzx dx, al ; 0f b6 d0 mov ax, strict word 0000bh ; b8 0b 00 - call 0166dh ; e8 5b b7 - jmp near 05e8fh ; e9 7a ff + call 0166dh ; e8 52 b7 + jmp near 05e98h ; e9 7a ff cmp ax, strict word 00001h ; 3d 01 00 - jne short 05f33h ; 75 19 + jne short 05f3ch ; 75 19 xor bx, bx ; 31 db mov dx, 000a0h ; ba a0 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 e9 b6 + call 0160eh ; e8 e0 b6 and byte [bp+01ch], 0feh ; 80 66 1c fe mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 2d b7 + call 0165ch ; e8 24 b7 and AL, strict byte 0bfh ; 24 bf - jmp short 05f09h ; eb d6 + jmp short 05f12h ; eb d6 mov word [bp+01ch], bx ; 89 5e 1c mov ax, dx ; 89 d0 xor ah, dh ; 30 f4 @@ -8315,10 +8309,10 @@ _int15_function: ; 0xf5db0 LB 0x4c9 dec ax ; 48 or dx, ax ; 09 c2 mov word [bp+016h], dx ; 89 56 16 - jmp near 05e8fh ; e9 4a ff + jmp near 05e98h ; e9 4a ff cli ; fa mov ax, strict word 00001h ; b8 01 00 - call 05cfbh ; e8 af fd + call 05d04h ; e8 af fd mov di, ax ; 89 c7 mov ax, word [bp+018h] ; 8b 46 18 sal ax, 004h ; c1 e0 04 @@ -8328,7 +8322,7 @@ _int15_function: ; 0xf5db0 LB 0x4c9 shr dx, 00ch ; c1 ea 0c mov byte [bp-002h], dl ; 88 56 fe cmp cx, ax ; 39 c1 - jnc short 05f6bh ; 73 05 + jnc short 05f74h ; 73 05 db 0feh, 0c2h ; inc dl ; fe c2 mov byte [bp-002h], dl ; 88 56 fe @@ -8336,52 +8330,52 @@ _int15_function: ; 0xf5db0 LB 0x4c9 add dx, strict byte 00008h ; 83 c2 08 mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0002fh ; bb 2f 00 - call 0162ah ; e8 b0 b6 + call 0162ah ; e8 a7 b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0000ah ; 83 c2 0a mov ax, word [bp+018h] ; 8b 46 18 mov bx, cx ; 89 cb - call 0162ah ; e8 a2 b6 + call 0162ah ; e8 99 b6 movzx bx, byte [bp-002h] ; 0f b6 5e fe mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0000ch ; 83 c2 0c mov ax, word [bp+018h] ; 8b 46 18 - call 0160eh ; e8 76 b6 + call 0160eh ; e8 6d b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0000dh ; 83 c2 0d mov ax, word [bp+018h] ; 8b 46 18 mov bx, 00093h ; bb 93 00 - call 0160eh ; e8 67 b6 + call 0160eh ; e8 5e b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0000eh ; 83 c2 0e mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 75 b6 + call 0162ah ; e8 6c b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00020h ; 83 c2 20 mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0ffffh ; bb ff ff - call 0162ah ; e8 66 b6 + call 0162ah ; e8 5d b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00022h ; 83 c2 22 mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 58 b6 + call 0162ah ; e8 4f b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00024h ; 83 c2 24 mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0000fh ; bb 0f 00 - call 0160eh ; e8 2d b6 + call 0160eh ; e8 24 b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00025h ; 83 c2 25 mov ax, word [bp+018h] ; 8b 46 18 mov bx, 0009bh ; bb 9b 00 - call 0160eh ; e8 1e b6 + call 0160eh ; e8 15 b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00026h ; 83 c2 26 mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 2c b6 + call 0162ah ; e8 23 b6 mov ax, ss ; 8c d0 mov cx, ax ; 89 c1 sal cx, 004h ; c1 e1 04 @@ -8391,27 +8385,27 @@ _int15_function: ; 0xf5db0 LB 0x4c9 add dx, strict byte 00028h ; 83 c2 28 mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0ffffh ; bb ff ff - call 0162ah ; e8 10 b6 + call 0162ah ; e8 07 b6 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0002ah ; 83 c2 2a mov ax, word [bp+018h] ; 8b 46 18 mov bx, cx ; 89 cb - call 0162ah ; e8 02 b6 + call 0162ah ; e8 f9 b5 movzx bx, byte [bp-004h] ; 0f b6 5e fc mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0002ch ; 83 c2 2c mov ax, word [bp+018h] ; 8b 46 18 - call 0160eh ; e8 d6 b5 + call 0160eh ; e8 cd b5 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0002dh ; 83 c2 2d mov ax, word [bp+018h] ; 8b 46 18 mov bx, 00093h ; bb 93 00 - call 0160eh ; e8 c7 b5 + call 0160eh ; e8 be b5 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0002eh ; 83 c2 2e mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 d5 b5 + call 0162ah ; e8 cc b5 mov si, word [bp+00ah] ; 8b 76 0a mov es, [bp+018h] ; 8e 46 18 mov cx, word [bp+014h] ; 8b 4e 14 @@ -8422,7 +8416,7 @@ _int15_function: ; 0xf5db0 LB 0x4c9 mov ds, ax ; 8e d8 mov word [00467h], sp ; 89 26 67 04 mov [00469h], ss ; 8c 16 69 04 - call 06071h ; e8 00 00 + call 0607ah ; e8 00 00 pop di ; 5f add di, strict byte 0001bh ; 83 c7 1b push strict byte 00020h ; 6a 20 @@ -8445,7 +8439,7 @@ _int15_function: ; 0xf5db0 LB 0x4c9 ; xor di, di ; 33 ff cld ; fc rep movsw ; f3 a5 - call 060a5h ; e8 00 00 + call 060aeh ; e8 00 00 pop ax ; 58 push 0f000h ; 68 00 f0 add ax, strict byte 00018h ; 83 c0 18 @@ -8466,53 +8460,53 @@ _int15_function: ; 0xf5db0 LB 0x4c9 pop eax ; 66 58 pop DS ; 1f mov ax, di ; 89 f8 - call 05cfbh ; e8 25 fc + call 05d04h ; e8 25 fc sti ; fb mov byte [bp+017h], 000h ; c6 46 17 00 and byte [bp+01ch], 0feh ; 80 66 1c fe - jmp near 05e8fh ; e9 ad fd + jmp near 05e98h ; e9 ad fd mov ax, strict word 00031h ; b8 31 00 - call 0165ch ; e8 74 b5 + call 0165ch ; e8 6b b5 xor ah, ah ; 30 e4 mov dx, ax ; 89 c2 sal dx, 008h ; c1 e2 08 mov ax, strict word 00030h ; b8 30 00 - call 0165ch ; e8 67 b5 + call 0165ch ; e8 5e b5 xor ah, ah ; 30 e4 or dx, ax ; 09 c2 mov word [bp+016h], dx ; 89 56 16 cmp dx, strict byte 0ffc0h ; 83 fa c0 - jbe short 060dbh ; 76 da + jbe short 060e4h ; 76 da mov word [bp+016h], strict word 0ffc0h ; c7 46 16 c0 ff - jmp short 060dbh ; eb d3 + jmp short 060e4h ; eb d3 cli ; fa mov ax, strict word 00001h ; b8 01 00 - call 05cfbh ; e8 ec fb + call 05d04h ; e8 ec fb mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 00038h ; 83 c2 38 mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0ffffh ; bb ff ff - call 0162ah ; e8 0c b5 + call 0162ah ; e8 03 b5 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0003ah ; 83 c2 3a mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 fe b4 + call 0162ah ; e8 f5 b4 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0003ch ; 83 c2 3c mov ax, word [bp+018h] ; 8b 46 18 mov bx, strict word 0000fh ; bb 0f 00 - call 0160eh ; e8 d3 b4 + call 0160eh ; e8 ca b4 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0003dh ; 83 c2 3d mov ax, word [bp+018h] ; 8b 46 18 mov bx, 0009bh ; bb 9b 00 - call 0160eh ; e8 c4 b4 + call 0160eh ; e8 bb b4 mov dx, word [bp+00ah] ; 8b 56 0a add dx, strict byte 0003eh ; 83 c2 3e mov ax, word [bp+018h] ; 8b 46 18 xor bx, bx ; 31 db - call 0162ah ; e8 d2 b4 + call 0162ah ; e8 c9 b4 mov AL, strict byte 011h ; b0 11 mov dx, strict word 00020h ; ba 20 00 out DX, AL ; ee @@ -8542,7 +8536,7 @@ _int15_function: ; 0xf5db0 LB 0x4c9 mov dx, 000a1h ; ba a1 00 out DX, AL ; ee mov si, word [bp+00ah] ; 8b 76 0a - call 06199h ; e8 00 00 + call 061a2h ; e8 00 00 pop di ; 5f add di, strict byte 00018h ; 83 c7 18 push strict byte 00038h ; 6a 38 @@ -8570,77 +8564,74 @@ _int15_function: ; 0xf5db0 LB 0x4c9 push ax ; 50 push cx ; 51 retf ; cb - jmp near 05e8fh ; e9 ba fc - mov bx, 00cd6h ; bb d6 0c + jmp near 05e98h ; e9 ba fc + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 ce b6 - push 00804h ; 68 04 08 + call 018aeh ; e8 c5 b6 + push 00806h ; 68 06 08 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 01 b7 + call 018e9h ; e8 f8 b6 add sp, strict byte 00004h ; 83 c4 04 or byte [bp+01ch], 001h ; 80 4e 1c 01 mov ax, word [bp+016h] ; 8b 46 16 xor ah, ah ; 30 e4 or ah, 086h ; 80 cc 86 mov word [bp+016h], ax ; 89 46 16 - jmp near 05e8fh ; e9 92 fc + jmp near 05e98h ; e9 92 fc mov word [bp+01ch], cx ; 89 4e 1c mov word [bp+016h], ax ; 89 46 16 mov word [bp+010h], 0e6f5h ; c7 46 10 f5 e6 mov word [bp+018h], 0f000h ; c7 46 18 00 f0 - jmp near 05e8fh ; e9 7f fc + jmp near 05e98h ; e9 7f fc mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 03 b4 + call 0161ch ; e8 fa b3 mov word [bp+018h], ax ; 89 46 18 - jmp near 060dbh ; e9 bc fe - push 00833h ; 68 33 08 + jmp near 060e4h ; e9 bc fe + push 00835h ; 68 35 08 push strict byte 00008h ; 6a 08 - jmp short 061e5h ; eb bf + jmp short 061eeh ; eb bf test byte [bp+016h], 0ffh ; f6 46 16 ff - jne short 0624bh ; 75 1f + jne short 06254h ; 75 1f mov word [bp+016h], ax ; 89 46 16 mov ax, word [bp+010h] ; 8b 46 10 xor ah, ah ; 30 e4 cmp ax, strict word 00001h ; 3d 01 00 - jc short 06244h ; 72 0b + jc short 0624dh ; 72 0b cmp ax, strict word 00003h ; 3d 03 00 - jnbe short 06244h ; 77 06 + jnbe short 0624dh ; 77 06 mov word [bp+01ch], cx ; 89 4e 1c - jmp near 05e8fh ; e9 4b fc + jmp near 05e98h ; e9 4b fc or byte [bp+01ch], 001h ; 80 4e 1c 01 - jmp near 05e8fh ; e9 44 fc - mov bx, 00cd6h ; bb d6 0c + jmp near 05e98h ; e9 44 fc + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 58 b6 + call 018aeh ; e8 4f b6 push word [bp+010h] ; ff 76 10 push word [bp+016h] ; ff 76 16 - push 0084ah ; 68 4a 08 + push 0084ch ; 68 4c 08 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 85 b6 + call 018e9h ; e8 7c b6 add sp, strict byte 00008h ; 83 c4 08 - jmp short 061ebh ; eb 82 - stosw ; ab - arpl cx, sp ; 63 e1 - arpl word [bp+di], ax ; 63 03 - db 064h, 024h, 064h - ; fs and AL, strict byte 064h ; 64 24 64 - inc bx ; 43 - bound sp, [fs:si-05ch] ; 64 62 64 a4 - db 064h - db 0d1h + jmp short 061f4h ; eb 82 + mov AH, strict byte 063h ; b4 63 + jmp far 02d64h:00c63h ; ea 63 0c 64 2d + db 064h, 04ch + ; fs dec sp ; 64 4c + imul sp, word [fs:si-053h], strict byte 00064h ; 64 6b 64 ad 64 + db 0dah db 064h -_int15_function32: ; 0xf6279 LB 0x309 +_int15_function32: ; 0xf6282 LB 0x309 push si ; 56 enter 00008h, 000h ; c8 08 00 00 mov ax, word [bp+022h] ; 8b 46 22 shr ax, 008h ; c1 e8 08 cmp ax, 000e8h ; 3d e8 00 - je short 062cah ; 74 41 + je short 062d3h ; 74 41 cmp ax, 00086h ; 3d 86 00 - jne near 06555h ; 0f 85 c5 02 + jne near 0655eh ; 0f 85 c5 02 sti ; fb mov ax, word [bp+01eh] ; 8b 46 1e mov dx, word [bp+01ah] ; 8b 56 1a @@ -8659,40 +8650,40 @@ _int15_function32: ; 0xf6279 LB 0x309 ; mov ah, al ; 8a e0 db 066h, 00bh, 0c9h ; or ecx, ecx ; 66 0b c9 - je near 062c7h ; 0f 84 0e 00 + je near 062d0h ; 0f 84 0e 00 in AL, strict byte 061h ; e4 61 and AL, strict byte 010h ; 24 10 db 03ah, 0c4h ; cmp al, ah ; 3a c4 - je short 062b9h ; 74 f8 + je short 062c2h ; 74 f8 db 08ah, 0e0h ; mov ah, al ; 8a e0 dec ecx ; 66 49 - jne short 062b9h ; 75 f2 + jne short 062c2h ; 75 f2 leave ; c9 pop si ; 5e retn ; c3 mov ax, word [bp+022h] ; 8b 46 22 xor ah, ah ; 30 e4 cmp ax, strict word 00020h ; 3d 20 00 - je short 062deh ; 74 0a + je short 062e7h ; 74 0a cmp ax, strict word 00001h ; 3d 01 00 - je near 06507h ; 0f 84 2c 02 - jmp near 06555h ; e9 77 02 + je near 06510h ; 0f 84 2c 02 + jmp near 0655eh ; e9 77 02 cmp word [bp+01ch], 0534dh ; 81 7e 1c 4d 53 - jne near 06555h ; 0f 85 6e 02 + jne near 0655eh ; 0f 85 6e 02 cmp word [bp+01ah], 04150h ; 81 7e 1a 50 41 - jne near 06555h ; 0f 85 65 02 + jne near 0655eh ; 0f 85 65 02 mov ax, strict word 00035h ; b8 35 00 - call 0165ch ; e8 66 b3 + call 0165ch ; e8 5d b3 movzx bx, al ; 0f b6 d8 xor dx, dx ; 31 d2 mov cx, strict word 00008h ; b9 08 00 sal bx, 1 ; d1 e3 rcl dx, 1 ; d1 d2 - loop 062feh ; e2 fa + loop 06307h ; e2 fa mov ax, strict word 00034h ; b8 34 00 - call 0165ch ; e8 52 b3 + call 0165ch ; e8 49 b3 xor ah, ah ; 30 e4 mov dx, bx ; 89 da or dx, ax ; 09 c2 @@ -8700,30 +8691,30 @@ _int15_function32: ; 0xf6279 LB 0x309 add bx, bx ; 01 db adc dx, 00100h ; 81 d2 00 01 cmp dx, 00100h ; 81 fa 00 01 - jc short 06324h ; 72 06 - jne short 06351h ; 75 31 + jc short 0632dh ; 72 06 + jne short 0635ah ; 75 31 test bx, bx ; 85 db - jnbe short 06351h ; 77 2d + jnbe short 0635ah ; 77 2d mov ax, strict word 00031h ; b8 31 00 - call 0165ch ; e8 32 b3 + call 0165ch ; e8 29 b3 movzx bx, al ; 0f b6 d8 xor dx, dx ; 31 d2 mov cx, strict word 00008h ; b9 08 00 sal bx, 1 ; d1 e3 rcl dx, 1 ; d1 d2 - loop 06332h ; e2 fa + loop 0633bh ; e2 fa mov ax, strict word 00030h ; b8 30 00 - call 0165ch ; e8 1e b3 + call 0165ch ; e8 15 b3 xor ah, ah ; 30 e4 or bx, ax ; 09 c3 mov cx, strict word 0000ah ; b9 0a 00 sal bx, 1 ; d1 e3 rcl dx, 1 ; d1 d2 - loop 06345h ; e2 fa + loop 0634eh ; e2 fa add bx, strict byte 00000h ; 83 c3 00 adc dx, strict byte 00010h ; 83 d2 10 mov ax, strict word 00062h ; b8 62 00 - call 0165ch ; e8 05 b3 + call 0165ch ; e8 fc b2 xor ah, ah ; 30 e4 mov word [bp-008h], ax ; 89 46 f8 xor al, al ; 30 c0 @@ -8731,28 +8722,28 @@ _int15_function32: ; 0xf6279 LB 0x309 mov cx, strict word 00008h ; b9 08 00 sal word [bp-008h], 1 ; d1 66 f8 rcl word [bp-006h], 1 ; d1 56 fa - loop 06364h ; e2 f8 + loop 0636dh ; e2 f8 mov ax, strict word 00061h ; b8 61 00 - call 0165ch ; e8 ea b2 + call 0165ch ; e8 e1 b2 xor ah, ah ; 30 e4 or word [bp-008h], ax ; 09 46 f8 mov ax, word [bp-008h] ; 8b 46 f8 mov word [bp-006h], ax ; 89 46 fa mov word [bp-008h], strict word 00000h ; c7 46 f8 00 00 mov ax, strict word 00063h ; b8 63 00 - call 0165ch ; e8 d4 b2 + call 0165ch ; e8 cb b2 mov byte [bp-004h], al ; 88 46 fc mov byte [bp-002h], al ; 88 46 fe mov ax, word [bp+016h] ; 8b 46 16 cmp ax, strict word 00007h ; 3d 07 00 - jnbe near 06555h ; 0f 87 bd 01 + jnbe near 0655eh ; 0f 87 bd 01 mov si, ax ; 89 c6 add si, ax ; 01 c6 mov ax, bx ; 89 d8 add ax, strict word 00000h ; 05 00 00 mov cx, dx ; 89 d1 adc cx, strict byte 0ffffh ; 83 d1 ff - jmp word [cs:si+06269h] ; 2e ff a4 69 62 + jmp word [cs:si+06272h] ; 2e ff a4 72 62 push strict byte 00001h ; 6a 01 push dword 000000000h ; 66 6a 00 push strict byte 00009h ; 6a 09 @@ -8761,7 +8752,7 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db xor cx, cx ; 31 c9 - call 05d24h ; e8 62 f9 + call 05d2dh ; e8 62 f9 mov dword [bp+016h], strict dword 000000001h ; 66 c7 46 16 01 00 00 00 mov dword [bp+022h], strict dword 0534d4150h ; 66 c7 46 22 50 41 4d 53 mov dword [bp+01eh], strict dword 000000014h ; 66 c7 46 1e 14 00 00 00 @@ -8777,9 +8768,9 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 mov bx, 0fc00h ; bb 00 fc mov cx, strict word 00009h ; b9 09 00 - call 05d24h ; e8 2b f9 + call 05d2dh ; e8 2b f9 mov dword [bp+016h], strict dword 000000002h ; 66 c7 46 16 02 00 00 00 - jmp short 063cah ; eb c7 + jmp short 063d3h ; eb c7 push strict byte 00002h ; 6a 02 push dword 000000000h ; 66 6a 00 push strict byte 00010h ; 6a 10 @@ -8788,9 +8779,9 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db mov cx, strict word 0000fh ; b9 0f 00 - call 05d24h ; e8 0a f9 + call 05d2dh ; e8 0a f9 mov dword [bp+016h], strict dword 000000003h ; 66 c7 46 16 03 00 00 00 - jmp short 063cah ; eb a6 + jmp short 063d3h ; eb a6 push strict byte 00001h ; 6a 01 push dword 000000000h ; 66 6a 00 push cx ; 51 @@ -8799,9 +8790,9 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db mov cx, strict word 00010h ; b9 10 00 - call 05d24h ; e8 eb f8 + call 05d2dh ; e8 eb f8 mov dword [bp+016h], strict dword 000000004h ; 66 c7 46 16 04 00 00 00 - jmp short 063cah ; eb 87 + jmp short 063d3h ; eb 87 push strict byte 00003h ; 6a 03 push dword 000000000h ; 66 6a 00 push dx ; 52 @@ -8810,9 +8801,9 @@ _int15_function32: ; 0xf6279 LB 0x309 mov si, word [bp+026h] ; 8b 76 26 mov bx, ax ; 89 c3 mov ax, si ; 89 f0 - call 05d24h ; e8 cd f8 + call 05d2dh ; e8 cd f8 mov dword [bp+016h], strict dword 000000005h ; 66 c7 46 16 05 00 00 00 - jmp near 063cah ; e9 68 ff + jmp near 063d3h ; e9 68 ff push strict byte 00002h ; 6a 02 push dword 000000000h ; 66 6a 00 push dword 000000000h ; 66 6a 00 @@ -8820,19 +8811,19 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db mov cx, strict word 0fffch ; b9 fc ff - call 05d24h ; e8 ac f8 + call 05d2dh ; e8 ac f8 cmp byte [bp-004h], 000h ; 80 7e fc 00 - jne short 06485h ; 75 07 + jne short 0648eh ; 75 07 mov ax, word [bp-006h] ; 8b 46 fa test ax, ax ; 85 c0 - je short 0649bh ; 74 16 + je short 064a4h ; 74 16 mov dword [bp+016h], strict dword 000000007h ; 66 c7 46 16 07 00 00 00 - jmp near 063cah ; e9 3a ff + jmp near 063d3h ; e9 3a ff mov dword [bp+016h], strict dword 000000006h ; 66 c7 46 16 06 00 00 00 - jmp near 063cah ; e9 2f ff + jmp near 063d3h ; e9 2f ff mov word [bp+016h], ax ; 89 46 16 mov word [bp+018h], ax ; 89 46 18 - jmp near 063cah ; e9 26 ff + jmp near 063d3h ; e9 26 ff push strict byte 00002h ; 6a 02 push dword 000000000h ; 66 6a 00 push dword 000000000h ; 66 6a 00 @@ -8840,20 +8831,20 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db xor cx, cx ; 31 c9 - call 05d24h ; e8 6b f8 + call 05d2dh ; e8 6b f8 cmp byte [bp-004h], 000h ; 80 7e fc 00 - jne short 064c6h ; 75 07 + jne short 064cfh ; 75 07 mov ax, word [bp-006h] ; 8b 46 fa test ax, ax ; 85 c0 - je short 064c8h ; 74 02 - jmp short 06485h ; eb bd + je short 064d1h ; 74 02 + jmp short 0648eh ; eb bd mov word [bp+016h], ax ; 89 46 16 mov word [bp+018h], ax ; 89 46 18 - jmp near 063cah ; e9 f9 fe + jmp near 063d3h ; e9 f9 fe cmp byte [bp-004h], 000h ; 80 7e fc 00 - jne short 064dfh ; 75 08 + jne short 064e8h ; 75 08 cmp word [bp-006h], strict byte 00000h ; 83 7e fa 00 - je near 063cah ; 0f 84 eb fe + je near 063d3h ; 0f 84 eb fe push strict byte 00001h ; 6a 01 mov al, byte [bp-002h] ; 8a 46 fe db 0feh, 0c0h @@ -8866,31 +8857,31 @@ _int15_function32: ; 0xf6279 LB 0x309 mov ax, word [bp+026h] ; 8b 46 26 xor bx, bx ; 31 db xor cx, cx ; 31 c9 - call 05d24h ; e8 28 f8 + call 05d2dh ; e8 28 f8 xor ax, ax ; 31 c0 mov word [bp+016h], ax ; 89 46 16 mov word [bp+018h], ax ; 89 46 18 - jmp near 063cah ; e9 c3 fe + jmp near 063d3h ; e9 c3 fe and byte [bp+02ah], 0feh ; 80 66 2a fe mov ax, strict word 00031h ; b8 31 00 - call 0165ch ; e8 4b b1 + call 0165ch ; e8 42 b1 xor ah, ah ; 30 e4 mov dx, ax ; 89 c2 sal dx, 008h ; c1 e2 08 mov ax, strict word 00030h ; b8 30 00 - call 0165ch ; e8 3e b1 + call 0165ch ; e8 35 b1 xor ah, ah ; 30 e4 or dx, ax ; 09 c2 mov word [bp+01eh], dx ; 89 56 1e cmp dx, 03c00h ; 81 fa 00 3c - jbe short 06530h ; 76 05 + jbe short 06539h ; 76 05 mov word [bp+01eh], 03c00h ; c7 46 1e 00 3c mov ax, strict word 00035h ; b8 35 00 - call 0165ch ; e8 26 b1 + call 0165ch ; e8 1d b1 movzx dx, al ; 0f b6 d0 sal dx, 008h ; c1 e2 08 mov ax, strict word 00034h ; b8 34 00 - call 0165ch ; e8 1a b1 + call 0165ch ; e8 11 b1 xor ah, ah ; 30 e4 or dx, ax ; 09 c2 mov word [bp+01ah], dx ; 89 56 1a @@ -8900,15 +8891,15 @@ _int15_function32: ; 0xf6279 LB 0x309 leave ; c9 pop si ; 5e retn ; c3 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 4e b3 + call 018aeh ; e8 45 b3 push word [bp+016h] ; ff 76 16 push word [bp+022h] ; ff 76 22 - push 0084ah ; 68 4a 08 + push 0084ch ; 68 4c 08 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 7b b3 + call 018e9h ; e8 72 b3 add sp, strict byte 00008h ; 83 c4 08 or byte [bp+02ah], 001h ; 80 4e 2a 01 mov ax, word [bp+022h] ; 8b 46 22 @@ -8918,34 +8909,34 @@ _int15_function32: ; 0xf6279 LB 0x309 leave ; c9 pop si ; 5e retn ; c3 -init_rtc_: ; 0xf6582 LB 0x25 +init_rtc_: ; 0xf658b LB 0x25 push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 mov dx, strict word 00026h ; ba 26 00 mov ax, strict word 0000ah ; b8 0a 00 - call 0166dh ; e8 de b0 + call 0166dh ; e8 d5 b0 mov dx, strict word 00002h ; ba 02 00 mov ax, strict word 0000bh ; b8 0b 00 - call 0166dh ; e8 d5 b0 + call 0166dh ; e8 cc b0 mov ax, strict word 0000ch ; b8 0c 00 - call 0165ch ; e8 be b0 + call 0165ch ; e8 b5 b0 mov ax, strict word 0000dh ; b8 0d 00 - call 0165ch ; e8 b8 b0 + call 0165ch ; e8 af b0 pop bp ; 5d pop dx ; 5a retn ; c3 -rtc_updating_: ; 0xf65a7 LB 0x1f +rtc_updating_: ; 0xf65b0 LB 0x1f push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 mov dx, 061a8h ; ba a8 61 dec dx ; 4a - je short 065c0h ; 74 0f + je short 065c9h ; 74 0f mov ax, strict word 0000ah ; b8 0a 00 - call 0165ch ; e8 a5 b0 + call 0165ch ; e8 9c b0 test AL, strict byte 080h ; a8 80 - jne short 065aeh ; 75 f3 + jne short 065b7h ; 75 f3 xor ax, ax ; 31 c0 pop bp ; 5d pop dx ; 5a @@ -8954,89 +8945,85 @@ rtc_updating_: ; 0xf65a7 LB 0x1f pop bp ; 5d pop dx ; 5a retn ; c3 -_int70_function: ; 0xf65c6 LB 0xbb +_int70_function: ; 0xf65cf LB 0xbb push si ; 56 enter 00002h, 000h ; c8 02 00 00 mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 8b b0 + call 0165ch ; e8 82 b0 mov dl, al ; 88 c2 mov byte [bp-002h], al ; 88 46 fe mov ax, strict word 0000ch ; b8 0c 00 - call 0165ch ; e8 80 b0 + call 0165ch ; e8 77 b0 mov dh, al ; 88 c6 test dl, 060h ; f6 c2 60 - je near 0666bh ; 0f 84 86 00 + je near 06674h ; 0f 84 86 00 test AL, strict byte 020h ; a8 20 - je short 065edh ; 74 04 + je short 065f6h ; 74 04 sti ; fb int 04ah ; cd 4a cli ; fa test dh, 040h ; f6 c6 40 - je near 0666bh ; 0f 84 77 00 + je near 06674h ; 0f 84 77 00 mov dx, 000a0h ; ba a0 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 03 b0 + call 01600h ; e8 fa af test al, al ; 84 c0 - je short 0666bh ; 74 6a + je short 06674h ; 74 6a mov dx, 0009ch ; ba 9c 00 mov ax, strict word 00040h ; b8 40 00 - call 01638h ; e8 2e b0 + call 01638h ; e8 25 b0 test dx, dx ; 85 d2 - jne short 06657h ; 75 49 + jne short 06660h ; 75 49 cmp ax, 003d1h ; 3d d1 03 - jnc short 06657h ; 73 44 + jnc short 06660h ; 73 44 mov dx, 00098h ; ba 98 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 00 b0 + call 0161ch ; e8 f7 af mov si, ax ; 89 c6 mov dx, 0009ah ; ba 9a 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 f5 af + call 0161ch ; e8 ec af mov cx, ax ; 89 c1 xor bx, bx ; 31 db mov dx, 000a0h ; ba a0 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 da af + call 0160eh ; e8 d1 af mov al, byte [bp-002h] ; 8a 46 fe and AL, strict byte 037h ; 24 37 movzx dx, al ; 0f b6 d0 mov ax, strict word 0000bh ; b8 0b 00 - call 0166dh ; e8 2b b0 + call 0166dh ; e8 22 b0 mov dx, cx ; 89 ca mov ax, si ; 89 f0 - call 01600h ; e8 b7 af + call 01600h ; e8 ae af or AL, strict byte 080h ; 0c 80 movzx bx, al ; 0f b6 d8 mov dx, cx ; 89 ca mov ax, si ; 89 f0 - call 0160eh ; e8 b9 af - jmp short 0666bh ; eb 14 + call 0160eh ; e8 b0 af + jmp short 06674h ; eb 14 mov bx, ax ; 89 c3 add bx, 0fc2fh ; 81 c3 2f fc mov cx, dx ; 89 d1 adc cx, strict byte 0ffffh ; 83 d1 ff mov dx, 0009ch ; ba 9c 00 mov ax, strict word 00040h ; b8 40 00 - call 0164ah ; e8 df af - call 0e03bh ; e8 cd 79 + call 0164ah ; e8 d6 af + call 0e03bh ; e8 c4 79 leave ; c9 pop si ; 5e retn ; c3 - cbw ; 98 - mov edi, strict dword 01666e466h ; 66 bf 66 e4 66 16 - db 067h, 064h, 067h, 09ah, 067h, 0dch, 067h, 031h - ; fs call far fs:03167h:0dc67h ; 67 64 67 9a 67 dc 67 31 - db 068h -_int1a_function: ; 0xf6681 LB 0x1c0 + db 0a1h, 066h, 0c8h, 066h, 0edh, 066h, 01fh, 067h, 06dh, 067h, 0a3h, 067h, 0e5h, 067h, 03ah, 068h +_int1a_function: ; 0xf668a LB 0x1c0 push bp ; 55 mov bp, sp ; 89 e5 sti ; fb mov al, byte [bp+013h] ; 8a 46 13 cmp AL, strict byte 007h ; 3c 07 - jnbe near 066bdh ; 0f 87 2f 00 + jnbe near 066c6h ; 0f 87 2f 00 movzx bx, al ; 0f b6 d8 add bx, bx ; 01 db - jmp word [cs:bx+06671h] ; 2e ff a7 71 66 + jmp word [cs:bx+0667ah] ; 2e ff a7 7a 66 cli ; fa mov bx, 0046eh ; bb 6e 04 xor ax, ax ; 31 c0 @@ -9068,41 +9055,41 @@ _int1a_function: ; 0xf6681 LB 0x1c0 mov byte [bp+013h], 000h ; c6 46 13 00 pop bp ; 5d retn ; c3 - call 065a7h ; e8 c0 fe + call 065b0h ; e8 c0 fe test ax, ax ; 85 c0 - je short 066edh ; 74 02 + je short 066f6h ; 74 02 pop bp ; 5d retn ; c3 xor ax, ax ; 31 c0 - call 0165ch ; e8 6a af + call 0165ch ; e8 61 af mov byte [bp+00fh], al ; 88 46 0f mov ax, strict word 00002h ; b8 02 00 - call 0165ch ; e8 61 af + call 0165ch ; e8 58 af mov byte [bp+010h], al ; 88 46 10 mov ax, strict word 00004h ; b8 04 00 - call 0165ch ; e8 58 af + call 0165ch ; e8 4f af mov bl, al ; 88 c3 mov byte [bp+011h], al ; 88 46 11 mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 4d af + call 0165ch ; e8 44 af and AL, strict byte 001h ; 24 01 mov byte [bp+00eh], al ; 88 46 0e - jmp short 0675bh ; eb 45 - call 065a7h ; e8 8e fe + jmp short 06764h ; eb 45 + call 065b0h ; e8 8e fe test ax, ax ; 85 c0 - je short 06720h ; 74 03 - call 06582h ; e8 62 fe + je short 06729h ; 74 03 + call 0658bh ; e8 62 fe movzx dx, byte [bp+00fh] ; 0f b6 56 0f xor ax, ax ; 31 c0 - call 0166dh ; e8 44 af + call 0166dh ; e8 3b af movzx dx, byte [bp+010h] ; 0f b6 56 10 mov ax, strict word 00002h ; b8 02 00 - call 0166dh ; e8 3a af + call 0166dh ; e8 31 af movzx dx, byte [bp+011h] ; 0f b6 56 11 mov ax, strict word 00004h ; b8 04 00 - call 0166dh ; e8 30 af + call 0166dh ; e8 27 af mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 19 af + call 0165ch ; e8 10 af mov bl, al ; 88 c3 and bl, 060h ; 80 e3 60 or bl, 002h ; 80 cb 02 @@ -9111,76 +9098,76 @@ _int1a_function: ; 0xf6681 LB 0x1c0 or bl, al ; 08 c3 movzx dx, bl ; 0f b6 d3 mov ax, strict word 0000bh ; b8 0b 00 - call 0166dh ; e8 12 af + call 0166dh ; e8 09 af mov byte [bp+013h], 000h ; c6 46 13 00 mov byte [bp+012h], bl ; 88 5e 12 pop bp ; 5d retn ; c3 mov byte [bp+013h], 000h ; c6 46 13 00 - call 065a7h ; e8 3c fe + call 065b0h ; e8 3c fe test ax, ax ; 85 c0 - je short 06771h ; 74 02 + je short 0677ah ; 74 02 pop bp ; 5d retn ; c3 mov ax, strict word 00009h ; b8 09 00 - call 0165ch ; e8 e5 ae + call 0165ch ; e8 dc ae mov byte [bp+010h], al ; 88 46 10 mov ax, strict word 00008h ; b8 08 00 - call 0165ch ; e8 dc ae + call 0165ch ; e8 d3 ae mov byte [bp+00fh], al ; 88 46 0f mov ax, strict word 00007h ; b8 07 00 - call 0165ch ; e8 d3 ae + call 0165ch ; e8 ca ae mov byte [bp+00eh], al ; 88 46 0e mov ax, strict word 00032h ; b8 32 00 - call 0165ch ; e8 ca ae + call 0165ch ; e8 c1 ae mov byte [bp+011h], al ; 88 46 11 mov byte [bp+012h], al ; 88 46 12 pop bp ; 5d retn ; c3 - call 065a7h ; e8 0a fe + call 065b0h ; e8 0a fe test ax, ax ; 85 c0 - je short 067a6h ; 74 05 - call 06582h ; e8 de fd + je short 067afh ; 74 05 + call 0658bh ; e8 de fd pop bp ; 5d retn ; c3 movzx dx, byte [bp+010h] ; 0f b6 56 10 mov ax, strict word 00009h ; b8 09 00 - call 0166dh ; e8 bd ae + call 0166dh ; e8 b4 ae movzx dx, byte [bp+00fh] ; 0f b6 56 0f mov ax, strict word 00008h ; b8 08 00 - call 0166dh ; e8 b3 ae + call 0166dh ; e8 aa ae movzx dx, byte [bp+00eh] ; 0f b6 56 0e mov ax, strict word 00007h ; b8 07 00 - call 0166dh ; e8 a9 ae + call 0166dh ; e8 a0 ae movzx dx, byte [bp+011h] ; 0f b6 56 11 mov ax, strict word 00032h ; b8 32 00 - call 0166dh ; e8 9f ae + call 0166dh ; e8 96 ae mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 88 ae + call 0165ch ; e8 7f ae mov bl, al ; 88 c3 and bl, 07fh ; 80 e3 7f - jmp near 06752h ; e9 76 ff + jmp near 0675bh ; e9 76 ff mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 7a ae + call 0165ch ; e8 71 ae mov bl, al ; 88 c3 mov word [bp+012h], strict word 00000h ; c7 46 12 00 00 test AL, strict byte 020h ; a8 20 - je short 067efh ; 74 02 + je short 067f8h ; 74 02 pop bp ; 5d retn ; c3 - call 065a7h ; e8 b5 fd + call 065b0h ; e8 b5 fd test ax, ax ; 85 c0 - je short 067f9h ; 74 03 - call 06582h ; e8 89 fd + je short 06802h ; 74 03 + call 0658bh ; e8 89 fd movzx dx, byte [bp+00fh] ; 0f b6 56 0f mov ax, strict word 00001h ; b8 01 00 - call 0166dh ; e8 6a ae + call 0166dh ; e8 61 ae movzx dx, byte [bp+010h] ; 0f b6 56 10 mov ax, strict word 00003h ; b8 03 00 - call 0166dh ; e8 60 ae + call 0166dh ; e8 57 ae movzx dx, byte [bp+011h] ; 0f b6 56 11 mov ax, strict word 00005h ; b8 05 00 - call 0166dh ; e8 56 ae + call 0166dh ; e8 4d ae mov dx, 000a1h ; ba a1 00 in AL, DX ; ec db 02ah, 0e4h @@ -9192,16 +9179,16 @@ _int1a_function: ; 0xf6681 LB 0x1c0 or AL, strict byte 020h ; 0c 20 movzx dx, al ; 0f b6 d0 mov ax, strict word 0000bh ; b8 0b 00 - call 0166dh ; e8 3e ae + call 0166dh ; e8 35 ae pop bp ; 5d retn ; c3 mov ax, strict word 0000bh ; b8 0b 00 - call 0165ch ; e8 25 ae + call 0165ch ; e8 1c ae mov bl, al ; 88 c3 and AL, strict byte 057h ; 24 57 movzx dx, al ; 0f b6 d0 - jmp near 06755h ; e9 14 ff -send_to_mouse_ctrl_: ; 0xf6841 LB 0x31 + jmp near 0675eh ; e9 14 ff +send_to_mouse_ctrl_: ; 0xf684a LB 0x31 push bx ; 53 push dx ; 52 push bp ; 55 @@ -9212,11 +9199,11 @@ send_to_mouse_ctrl_: ; 0xf6841 LB 0x31 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 06860h ; 74 0e - push 00884h ; 68 84 08 - push 0109eh ; 68 9e 10 + je short 06869h ; 74 0e + push 00886h ; 68 86 08 + push 010a0h ; 68 a0 10 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 8c b0 + call 018e9h ; e8 83 b0 add sp, strict byte 00006h ; 83 c4 06 mov AL, strict byte 0d4h ; b0 d4 mov dx, strict word 00064h ; ba 64 00 @@ -9229,7 +9216,7 @@ send_to_mouse_ctrl_: ; 0xf6841 LB 0x31 pop dx ; 5a pop bx ; 5b retn ; c3 -get_mouse_data_: ; 0xf6872 LB 0x38 +get_mouse_data_: ; 0xf687b LB 0x38 push bx ; 53 push cx ; 51 push bp ; 55 @@ -9243,15 +9230,15 @@ get_mouse_data_: ; 0xf6872 LB 0x38 ; sub ah, ah ; 2a e4 and ax, strict word 00021h ; 25 21 00 cmp ax, strict word 00021h ; 3d 21 00 - je short 06893h ; 74 07 + je short 0689ch ; 74 07 test cx, cx ; 85 c9 - je short 06893h ; 74 03 + je short 0689ch ; 74 03 dec cx ; 49 - jmp short 0687eh ; eb eb + jmp short 06887h ; eb eb test cx, cx ; 85 c9 - jne short 0689bh ; 75 04 + jne short 068a4h ; 75 04 mov AL, strict byte 001h ; b0 01 - jmp short 068a6h ; eb 0b + jmp short 068afh ; eb 0b mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h @@ -9262,7 +9249,7 @@ get_mouse_data_: ; 0xf6872 LB 0x38 pop cx ; 59 pop bx ; 5b retn ; c3 -set_kbd_command_byte_: ; 0xf68aa LB 0x2f +set_kbd_command_byte_: ; 0xf68b3 LB 0x2f push bx ; 53 push dx ; 52 push bp ; 55 @@ -9273,11 +9260,11 @@ set_kbd_command_byte_: ; 0xf68aa LB 0x2f db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 002h ; a8 02 - je short 068c9h ; 74 0e - push 0088eh ; 68 8e 08 - push 0109eh ; 68 9e 10 + je short 068d2h ; 74 0e + push 00890h ; 68 90 08 + push 010a0h ; 68 a0 10 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 23 b0 + call 018e9h ; e8 1a b0 add sp, strict byte 00006h ; 83 c4 06 mov AL, strict byte 060h ; b0 60 mov dx, strict word 00064h ; ba 64 00 @@ -9289,11 +9276,11 @@ set_kbd_command_byte_: ; 0xf68aa LB 0x2f pop dx ; 5a pop bx ; 5b retn ; c3 -_int74_function: ; 0xf68d9 LB 0xc6 +_int74_function: ; 0xf68e2 LB 0xc6 enter 00008h, 000h ; c8 08 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 36 ad + call 0161ch ; e8 2d ad mov cx, ax ; 89 c1 mov word [bp+004h], strict word 00000h ; c7 46 04 00 00 mov dx, strict word 00064h ; ba 64 00 @@ -9302,7 +9289,7 @@ _int74_function: ; 0xf68d9 LB 0xc6 ; sub ah, ah ; 2a e4 and AL, strict byte 021h ; 24 21 cmp AL, strict byte 021h ; 3c 21 - jne near 0698dh ; 0f 85 92 00 + jne near 06996h ; 0f 85 92 00 mov dx, strict word 00060h ; ba 60 00 in AL, DX ; ec db 02ah, 0e4h @@ -9310,14 +9297,14 @@ _int74_function: ; 0xf68d9 LB 0xc6 mov bl, al ; 88 c3 mov dx, strict word 00026h ; ba 26 00 mov ax, cx ; 89 c8 - call 01600h ; e8 f5 ac + call 01600h ; e8 ec ac mov byte [bp-006h], al ; 88 46 fa mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 01600h ; e8 ea ac + call 01600h ; e8 e1 ac mov byte [bp-008h], al ; 88 46 f8 test AL, strict byte 080h ; a8 80 - je short 0698dh ; 74 70 + je short 06996h ; 74 70 mov al, byte [bp-008h] ; 8a 46 f8 and AL, strict byte 007h ; 24 07 mov byte [bp-002h], al ; 88 46 fe @@ -9328,107 +9315,106 @@ _int74_function: ; 0xf68d9 LB 0xc6 movzx dx, al ; 0f b6 d0 add dx, strict byte 00028h ; 83 c2 28 mov ax, cx ; 89 c8 - call 0160eh ; e8 d4 ac + call 0160eh ; e8 cb ac mov al, byte [bp-004h] ; 8a 46 fc cmp al, byte [bp-002h] ; 3a 46 fe - jc short 0697eh ; 72 3c + jc short 06987h ; 72 3c mov dx, strict word 00028h ; ba 28 00 mov ax, cx ; 89 c8 - call 01600h ; e8 b6 ac + call 01600h ; e8 ad ac xor ah, ah ; 30 e4 mov word [bp+00ch], ax ; 89 46 0c mov dx, strict word 00029h ; ba 29 00 mov ax, cx ; 89 c8 - call 01600h ; e8 a9 ac + call 01600h ; e8 a0 ac xor ah, ah ; 30 e4 mov word [bp+00ah], ax ; 89 46 0a mov dx, strict word 0002ah ; ba 2a 00 mov ax, cx ; 89 c8 - call 01600h ; e8 9c ac + call 01600h ; e8 93 ac xor ah, ah ; 30 e4 mov word [bp+008h], ax ; 89 46 08 xor al, al ; 30 c0 mov word [bp+006h], ax ; 89 46 06 mov byte [bp-006h], ah ; 88 66 fa test byte [bp-008h], 080h ; f6 46 f8 80 - je short 06981h ; 74 0a + je short 0698ah ; 74 0a mov word [bp+004h], strict word 00001h ; c7 46 04 01 00 - jmp short 06981h ; eb 03 + jmp short 0698ah ; eb 03 inc byte [bp-006h] ; fe 46 fa movzx bx, byte [bp-006h] ; 0f b6 5e fa mov dx, strict word 00026h ; ba 26 00 mov ax, cx ; 89 c8 - call 0160eh ; e8 81 ac + call 0160eh ; e8 78 ac leave ; c9 retn ; c3 - loope 069fah ; e1 69 - push di ; 57 - push strict byte 0ffdah ; 6a da - push strict byte 0006bh ; 6a 6b - imul bx, cx, strict byte 0006bh ; 6b d9 6b - sub ax, 0016ah ; 2d 6a 01 + jmp far 0e36ah:06069h ; ea 69 60 6a e3 + push strict byte 00074h ; 6a 74 + imul sp, dx, strict byte 0006bh ; 6b e2 6b + db 036h, 06ah, 00ah + ; ss push strict byte 0000ah ; 36 6a 0a insb ; 6c - db 0c6h + iret ; cf insb ; 6c -_int15_function_mouse: ; 0xf699f LB 0x386 +_int15_function_mouse: ; 0xf69a8 LB 0x386 push si ; 56 enter 00006h, 000h ; c8 06 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 6f ac + call 0161ch ; e8 66 ac mov cx, ax ; 89 c1 cmp byte [bp+014h], 007h ; 80 7e 14 07 - jbe short 069c0h ; 76 0b + jbe short 069c9h ; 76 0b or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 001h ; c6 46 15 01 leave ; c9 pop si ; 5e retn ; c3 mov ax, strict word 00065h ; b8 65 00 - call 068aah ; e8 e4 fe + call 068b3h ; e8 e4 fe and word [bp+01ah], strict byte 0fffeh ; 83 66 1a fe mov byte [bp+015h], 000h ; c6 46 15 00 mov al, byte [bp+014h] ; 8a 46 14 cmp AL, strict byte 007h ; 3c 07 - jnbe near 06d09h ; 0f 87 32 03 + jnbe near 06d12h ; 0f 87 32 03 movzx si, al ; 0f b6 f0 add si, si ; 01 f6 - jmp word [cs:si+0698fh] ; 2e ff a4 8f 69 + jmp word [cs:si+06998h] ; 2e ff a4 98 69 cmp byte [bp+00fh], 001h ; 80 7e 0f 01 - jnbe near 06d14h ; 0f 87 2b 03 + jnbe near 06d1dh ; 0f 87 2b 03 mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 01600h ; e8 0f ac + call 01600h ; e8 06 ac test AL, strict byte 080h ; a8 80 - jne short 06a00h ; 75 0b + jne short 06a09h ; 75 0b or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 005h ; c6 46 15 05 - jmp near 06d1ch ; e9 1c 03 + jmp near 06d25h ; e9 1c 03 cmp byte [bp+00fh], 000h ; 80 7e 0f 00 db 00fh, 094h, 0c0h ; sete al ; 0f 94 c0 add AL, strict byte 0f4h ; 04 f4 xor ah, ah ; 30 e4 - call 06841h ; e8 33 fe + call 0684ah ; e8 33 fe test al, al ; 84 c0 - jne near 06ca2h ; 0f 85 8e 02 + jne near 06cabh ; 0f 85 8e 02 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 56 fe + call 0687bh ; e8 56 fe test al, al ; 84 c0 - je near 06d1ch ; 0f 84 fa 02 + je near 06d25h ; 0f 84 fa 02 cmp byte [bp-006h], 0fah ; 80 7e fa fa - jne near 06ca2h ; 0f 85 78 02 - jmp near 06d1ch ; e9 ef 02 + jne near 06cabh ; 0f 85 78 02 + jmp near 06d25h ; e9 ef 02 mov al, byte [bp+00fh] ; 8a 46 0f cmp AL, strict byte 001h ; 3c 01 - jc short 06a38h ; 72 04 + jc short 06a41h ; 72 04 cmp AL, strict byte 008h ; 3c 08 - jbe short 06a3bh ; 76 03 - jmp near 06bceh ; e9 93 01 + jbe short 06a44h ; 76 03 + jmp near 06bd7h ; e9 93 01 mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 01600h ; e8 bd ab + call 01600h ; e8 b4 ab mov ah, byte [bp+00fh] ; 8a 66 0f db 0feh, 0cch ; dec ah ; fe cc @@ -9437,271 +9423,271 @@ _int15_function_mouse: ; 0xf699f LB 0x386 movzx bx, al ; 0f b6 d8 mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 0160eh ; e8 b7 ab + call 0160eh ; e8 ae ab mov dx, strict word 00026h ; ba 26 00 mov ax, cx ; 89 c8 - call 01600h ; e8 a1 ab + call 01600h ; e8 98 ab and AL, strict byte 0f8h ; 24 f8 movzx bx, al ; 0f b6 d8 mov dx, strict word 00026h ; ba 26 00 mov ax, cx ; 89 c8 - call 0160eh ; e8 a2 ab + call 0160eh ; e8 99 ab mov ax, 000ffh ; b8 ff 00 - call 06841h ; e8 cf fd + call 0684ah ; e8 cf fd test al, al ; 84 c0 - jne near 06ca2h ; 0f 85 2a 02 + jne near 06cabh ; 0f 85 2a 02 mov dx, ss ; 8c d2 lea ax, [bp-002h] ; 8d 46 fe - call 06872h ; e8 f2 fd + call 0687bh ; e8 f2 fd mov cl, al ; 88 c1 cmp byte [bp-002h], 0feh ; 80 7e fe fe - jne short 06a93h ; 75 0b + jne short 06a9ch ; 75 0b or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 004h ; c6 46 15 04 - jmp near 06d1ch ; e9 89 02 + jmp near 06d25h ; e9 89 02 cmp byte [bp-002h], 0fah ; 80 7e fe fa - je short 06aa9h ; 74 10 + je short 06ab2h ; 74 10 movzx ax, byte [bp-002h] ; 0f b6 46 fe push ax ; 50 - push 00899h ; 68 99 08 + push 0089bh ; 68 9b 08 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 43 ae + call 018e9h ; e8 3a ae add sp, strict byte 00006h ; 83 c4 06 test cl, cl ; 84 c9 - jne near 06ca2h ; 0f 85 f3 01 + jne near 06cabh ; 0f 85 f3 01 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 bb fd + call 0687bh ; e8 bb fd test al, al ; 84 c0 - jne near 06ca2h ; 0f 85 e5 01 + jne near 06cabh ; 0f 85 e5 01 mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 06872h ; e8 ad fd + call 0687bh ; e8 ad fd test al, al ; 84 c0 - jne near 06ca2h ; 0f 85 d7 01 + jne near 06cabh ; 0f 85 d7 01 mov al, byte [bp-006h] ; 8a 46 fa mov byte [bp+00eh], al ; 88 46 0e mov al, byte [bp-004h] ; 8a 46 fc mov byte [bp+00fh], al ; 88 46 0f - jmp near 06d1ch ; e9 42 02 + jmp near 06d25h ; e9 42 02 mov al, byte [bp+00fh] ; 8a 46 0f cmp AL, strict byte 003h ; 3c 03 - jc short 06af1h ; 72 10 - jbe short 06b0fh ; 76 2c + jc short 06afah ; 72 10 + jbe short 06b18h ; 76 2c cmp AL, strict byte 006h ; 3c 06 - je short 06b21h ; 74 3a + je short 06b2ah ; 74 3a cmp AL, strict byte 005h ; 3c 05 - je short 06b1bh ; 74 30 + je short 06b24h ; 74 30 cmp AL, strict byte 004h ; 3c 04 - je short 06b15h ; 74 26 - jmp short 06b27h ; eb 36 + je short 06b1eh ; 74 26 + jmp short 06b30h ; eb 36 cmp AL, strict byte 002h ; 3c 02 - je short 06b09h ; 74 14 + je short 06b12h ; 74 14 cmp AL, strict byte 001h ; 3c 01 - je short 06b03h ; 74 0a + je short 06b0ch ; 74 0a test al, al ; 84 c0 - jne short 06b27h ; 75 2a + jne short 06b30h ; 75 2a mov byte [bp-006h], 00ah ; c6 46 fa 0a - jmp short 06b2bh ; eb 28 + jmp short 06b34h ; eb 28 mov byte [bp-006h], 014h ; c6 46 fa 14 - jmp short 06b2bh ; eb 22 + jmp short 06b34h ; eb 22 mov byte [bp-006h], 028h ; c6 46 fa 28 - jmp short 06b2bh ; eb 1c + jmp short 06b34h ; eb 1c mov byte [bp-006h], 03ch ; c6 46 fa 3c - jmp short 06b2bh ; eb 16 + jmp short 06b34h ; eb 16 mov byte [bp-006h], 050h ; c6 46 fa 50 - jmp short 06b2bh ; eb 10 + jmp short 06b34h ; eb 10 mov byte [bp-006h], 064h ; c6 46 fa 64 - jmp short 06b2bh ; eb 0a + jmp short 06b34h ; eb 0a mov byte [bp-006h], 0c8h ; c6 46 fa c8 - jmp short 06b2bh ; eb 04 + jmp short 06b34h ; eb 04 mov byte [bp-006h], 000h ; c6 46 fa 00 cmp byte [bp-006h], 000h ; 80 7e fa 00 - jbe short 06b60h ; 76 2f + jbe short 06b69h ; 76 2f mov ax, 000f3h ; b8 f3 00 - call 06841h ; e8 0a fd + call 0684ah ; e8 0a fd test al, al ; 84 c0 - jne short 06b55h ; 75 1a + jne short 06b5eh ; 75 1a mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 06872h ; e8 2f fd + call 0687bh ; e8 2f fd movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 06841h ; e8 f7 fc + call 0684ah ; e8 f7 fc mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 06872h ; e8 20 fd - jmp near 06d1ch ; e9 c7 01 + call 0687bh ; e8 20 fd + jmp near 06d25h ; e9 c7 01 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 003h ; c6 46 15 03 - jmp near 06d1ch ; e9 bc 01 + jmp near 06d25h ; e9 bc 01 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 002h ; c6 46 15 02 - jmp near 06d1ch ; e9 b1 01 + jmp near 06d25h ; e9 b1 01 cmp byte [bp+00fh], 004h ; 80 7e 0f 04 - jnc short 06bceh ; 73 5d + jnc short 06bd7h ; 73 5d mov ax, 000e8h ; b8 e8 00 - call 06841h ; e8 ca fc + call 0684ah ; e8 ca fc test al, al ; 84 c0 - jne short 06bc3h ; 75 48 + jne short 06bcch ; 75 48 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 ef fc + call 0687bh ; e8 ef fc cmp byte [bp-006h], 0fah ; 80 7e fa fa - je short 06b99h ; 74 10 + je short 06ba2h ; 74 10 movzx ax, byte [bp-006h] ; 0f b6 46 fa push ax ; 50 - push 008c4h ; 68 c4 08 + push 008c6h ; 68 c6 08 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 53 ad + call 018e9h ; e8 4a ad add sp, strict byte 00006h ; 83 c4 06 movzx ax, byte [bp+00fh] ; 0f b6 46 0f - call 06841h ; e8 a1 fc + call 0684ah ; e8 a1 fc mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 ca fc + call 0687bh ; e8 ca fc cmp byte [bp-006h], 0fah ; 80 7e fa fa - je near 06d1ch ; 0f 84 6c 01 + je near 06d25h ; 0f 84 6c 01 movzx ax, byte [bp-006h] ; 0f b6 46 fa push ax ; 50 - push 008c4h ; 68 c4 08 + push 008c6h ; 68 c6 08 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 2c ad + call 018e9h ; e8 23 ad add sp, strict byte 00006h ; 83 c4 06 - jmp near 06d1ch ; e9 59 01 + jmp near 06d25h ; e9 59 01 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 003h ; c6 46 15 03 - jmp near 06d1ch ; e9 4e 01 + jmp near 06d25h ; e9 4e 01 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 002h ; c6 46 15 02 - jmp near 06d1ch ; e9 43 01 + jmp near 06d25h ; e9 43 01 mov ax, 000f2h ; b8 f2 00 - call 06841h ; e8 62 fc + call 0684ah ; e8 62 fc test al, al ; 84 c0 - jne short 06bf6h ; 75 13 + jne short 06bffh ; 75 13 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 87 fc + call 0687bh ; e8 87 fc mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 06872h ; e8 7f fc - jmp near 06ad1h ; e9 db fe + call 0687bh ; e8 7f fc + jmp near 06adah ; e9 db fe or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 003h ; c6 46 15 03 - jmp near 06d1ch ; e9 1b 01 + jmp near 06d25h ; e9 1b 01 mov al, byte [bp+00fh] ; 8a 46 0f test al, al ; 84 c0 - jbe short 06c0fh ; 76 07 + jbe short 06c18h ; 76 07 cmp AL, strict byte 002h ; 3c 02 - jbe short 06c78h ; 76 6c - jmp near 06cach ; e9 9d 00 + jbe short 06c81h ; 76 6c + jmp near 06cb5h ; e9 9d 00 mov ax, 000e9h ; b8 e9 00 - call 06841h ; e8 2c fc + call 0684ah ; e8 2c fc test al, al ; 84 c0 - jne near 06ca2h ; 0f 85 87 00 + jne near 06cabh ; 0f 85 87 00 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 4f fc + call 0687bh ; e8 4f fc mov cl, al ; 88 c1 cmp byte [bp-006h], 0fah ; 80 7e fa fa - je short 06c3bh ; 74 10 + je short 06c44h ; 74 10 movzx ax, byte [bp-006h] ; 0f b6 46 fa push ax ; 50 - push 008c4h ; 68 c4 08 + push 008c6h ; 68 c6 08 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 b1 ac + call 018e9h ; e8 a8 ac add sp, strict byte 00006h ; 83 c4 06 test cl, cl ; 84 c9 - jne short 06ca2h ; 75 63 + jne short 06cabh ; 75 63 mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 2b fc + call 0687bh ; e8 2b fc test al, al ; 84 c0 - jne short 06ca2h ; 75 57 + jne short 06cabh ; 75 57 mov dx, ss ; 8c d2 lea ax, [bp-004h] ; 8d 46 fc - call 06872h ; e8 1f fc + call 0687bh ; e8 1f fc test al, al ; 84 c0 - jne short 06ca2h ; 75 4b + jne short 06cabh ; 75 4b mov dx, ss ; 8c d2 lea ax, [bp-002h] ; 8d 46 fe - call 06872h ; e8 13 fc + call 0687bh ; e8 13 fc test al, al ; 84 c0 - jne short 06ca2h ; 75 3f + jne short 06cabh ; 75 3f mov al, byte [bp-006h] ; 8a 46 fa mov byte [bp+00eh], al ; 88 46 0e mov al, byte [bp-004h] ; 8a 46 fc mov byte [bp+012h], al ; 88 46 12 mov al, byte [bp-002h] ; 8a 46 fe mov byte [bp+010h], al ; 88 46 10 - jmp near 06d1ch ; e9 a4 00 + jmp near 06d25h ; e9 a4 00 cmp AL, strict byte 001h ; 3c 01 - jne short 06c81h ; 75 05 + jne short 06c8ah ; 75 05 mov ax, 000e6h ; b8 e6 00 - jmp short 06c84h ; eb 03 + jmp short 06c8dh ; eb 03 mov ax, 000e7h ; b8 e7 00 - call 06841h ; e8 ba fb + call 0684ah ; e8 ba fb mov cl, al ; 88 c1 test cl, cl ; 84 c9 - jne short 06c9ch ; 75 0f + jne short 06ca5h ; 75 0f mov dx, ss ; 8c d2 lea ax, [bp-006h] ; 8d 46 fa - call 06872h ; e8 dd fb + call 0687bh ; e8 dd fb cmp byte [bp-006h], 0fah ; 80 7e fa fa db 00fh, 095h, 0c1h ; setne cl ; 0f 95 c1 test cl, cl ; 84 c9 - je near 06d1ch ; 0f 84 7a 00 + je near 06d25h ; 0f 84 7a 00 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 003h ; c6 46 15 03 - jmp short 06d1ch ; eb 70 + jmp short 06d25h ; eb 70 movzx ax, byte [bp+00fh] ; 0f b6 46 0f push ax ; 50 - push 008f0h ; 68 f0 08 + push 008f2h ; 68 f2 08 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 30 ac + call 018e9h ; e8 27 ac add sp, strict byte 00006h ; 83 c4 06 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 001h ; c6 46 15 01 - jmp short 06d1ch ; eb 56 + jmp short 06d25h ; eb 56 mov si, word [bp+00eh] ; 8b 76 0e mov bx, si ; 89 f3 mov dx, strict word 00022h ; ba 22 00 mov ax, cx ; 89 c8 - call 0162ah ; e8 57 a9 + call 0162ah ; e8 4e a9 mov bx, word [bp+016h] ; 8b 5e 16 mov dx, strict word 00024h ; ba 24 00 mov ax, cx ; 89 c8 - call 0162ah ; e8 4c a9 + call 0162ah ; e8 43 a9 mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 01600h ; e8 1a a9 + call 01600h ; e8 11 a9 mov ah, al ; 88 c4 test si, si ; 85 f6 - jne short 06cfah ; 75 0e + jne short 06d03h ; 75 0e cmp word [bp+016h], strict byte 00000h ; 83 7e 16 00 - jne short 06cfah ; 75 08 + jne short 06d03h ; 75 08 test AL, strict byte 080h ; a8 80 - je short 06cfch ; 74 06 + je short 06d05h ; 74 06 and AL, strict byte 07fh ; 24 7f - jmp short 06cfch ; eb 02 + jmp short 06d05h ; eb 02 or AL, strict byte 080h ; 0c 80 movzx bx, al ; 0f b6 d8 mov dx, strict word 00027h ; ba 27 00 mov ax, cx ; 89 c8 - call 0160eh ; e8 07 a9 - jmp short 06d1ch ; eb 13 - push 0090ah ; 68 0a 09 + call 0160eh ; e8 fe a8 + jmp short 06d25h ; eb 13 + push 0090ch ; 68 0c 09 push strict byte 00007h ; 6a 07 - call 018e9h ; e8 d8 ab + call 018e9h ; e8 cf ab add sp, strict byte 00004h ; 83 c4 04 or word [bp+01ah], strict byte 00001h ; 83 4e 1a 01 mov byte [bp+015h], 001h ; c6 46 15 01 mov ax, strict word 00047h ; b8 47 00 - call 068aah ; e8 88 fb + call 068b3h ; e8 88 fb leave ; c9 pop si ; 5e retn ; c3 -_int17_function: ; 0xf6d25 LB 0xb1 +_int17_function: ; 0xf6d2e LB 0xb1 push si ; 56 enter 00002h, 000h ; c8 02 00 00 sti ; fb @@ -9709,24 +9695,24 @@ _int17_function: ; 0xf6d25 LB 0xb1 add dx, dx ; 01 d2 add dx, strict byte 00008h ; 83 c2 08 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 e3 a8 + call 0161ch ; e8 da a8 mov bx, ax ; 89 c3 mov si, ax ; 89 c6 cmp byte [bp+015h], 003h ; 80 7e 15 03 - jnc near 06dcfh ; 0f 83 8a 00 + jnc near 06dd8h ; 0f 83 8a 00 mov ax, word [bp+010h] ; 8b 46 10 cmp ax, strict word 00003h ; 3d 03 00 - jnc near 06dcfh ; 0f 83 80 00 + jnc near 06dd8h ; 0f 83 80 00 test bx, bx ; 85 db - jbe near 06dcfh ; 0f 86 7a 00 + jbe near 06dd8h ; 0f 86 7a 00 mov dx, ax ; 89 c2 add dx, strict byte 00078h ; 83 c2 78 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 a0 a8 + call 01600h ; e8 97 a8 movzx cx, al ; 0f b6 c8 sal cx, 008h ; c1 e1 08 cmp byte [bp+015h], 000h ; 80 7e 15 00 - jne short 06d99h ; 75 2d + jne short 06da2h ; 75 2d mov al, byte [bp+014h] ; 8a 46 14 mov dx, bx ; 89 da out DX, AL ; ee @@ -9746,13 +9732,13 @@ _int17_function: ; 0xf6d25 LB 0xb1 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 040h ; a8 40 - je short 06d99h ; 74 07 + je short 06da2h ; 74 07 test cx, cx ; 85 c9 - je short 06d99h ; 74 03 + je short 06da2h ; 74 03 dec cx ; 49 - jmp short 06d88h ; eb ef + jmp short 06d91h ; eb ef cmp byte [bp+015h], 001h ; 80 7e 15 01 - jne short 06db5h ; 75 16 + jne short 06dbeh ; 75 16 lea dx, [si+002h] ; 8d 54 02 in AL, DX ; ec db 02ah, 0e4h @@ -9771,7 +9757,7 @@ _int17_function: ; 0xf6d25 LB 0xb1 xor AL, strict byte 048h ; 34 48 mov byte [bp+015h], al ; 88 46 15 test cx, cx ; 85 c9 - jne short 06dc8h ; 75 04 + jne short 06dd1h ; 75 04 or byte [bp+015h], 001h ; 80 4e 15 01 and byte [bp+01eh], 0feh ; 80 66 1e fe leave ; c9 @@ -9781,7 +9767,7 @@ _int17_function: ; 0xf6d25 LB 0xb1 leave ; c9 pop si ; 5e retn ; c3 -wait_: ; 0xf6dd6 LB 0xad +wait_: ; 0xf6ddf LB 0xad push bx ; 53 push cx ; 51 push si ; 56 @@ -9797,28 +9783,28 @@ wait_: ; 0xf6dd6 LB 0xad xor cx, cx ; 31 c9 mov dx, 0046ch ; ba 6c 04 xor ax, ax ; 31 c0 - call 01638h ; e8 41 a8 + call 01638h ; e8 38 a8 mov word [bp-006h], ax ; 89 46 fa mov bx, dx ; 89 d3 hlt ; f4 mov dx, 0046ch ; ba 6c 04 xor ax, ax ; 31 c0 - call 01638h ; e8 33 a8 + call 01638h ; e8 2a a8 mov word [bp-00ah], ax ; 89 46 f6 mov di, dx ; 89 d7 cmp dx, bx ; 39 da - jnbe short 06e15h ; 77 07 - jne short 06e1ch ; 75 0c + jnbe short 06e1eh ; 77 07 + jne short 06e25h ; 75 0c cmp ax, word [bp-006h] ; 3b 46 fa - jbe short 06e1ch ; 76 07 + jbe short 06e25h ; 76 07 sub ax, word [bp-006h] ; 2b 46 fa sbb dx, bx ; 19 da - jmp short 06e27h ; eb 0b + jmp short 06e30h ; eb 0b cmp dx, bx ; 39 da - jc short 06e27h ; 72 07 - jne short 06e2bh ; 75 09 + jc short 06e30h ; 72 07 + jne short 06e34h ; 75 09 cmp ax, word [bp-006h] ; 3b 46 fa - jnc short 06e2bh ; 73 04 + jnc short 06e34h ; 73 04 sub si, ax ; 29 c6 sbb cx, dx ; 19 d1 mov ax, word [bp-00ah] ; 8b 46 f6 @@ -9826,13 +9812,13 @@ wait_: ; 0xf6dd6 LB 0xad mov bx, di ; 89 fb mov ax, 00100h ; b8 00 01 int 016h ; cd 16 - je near 06e41h ; 0f 84 05 00 + je near 06e4ah ; 0f 84 05 00 mov AL, strict byte 001h ; b0 01 - jmp near 06e43h ; e9 02 00 + jmp near 06e4ch ; e9 02 00 db 032h, 0c0h ; xor al, al ; 32 c0 test al, al ; 84 c0 - je short 06e6bh ; 74 24 + je short 06e74h ; 74 24 db 033h, 0c0h ; xor ax, ax ; 33 c0 int 016h ; cd 16 @@ -9841,19 +9827,19 @@ wait_: ; 0xf6dd6 LB 0xad mov byte [bp-002h], al ; 88 46 fe movzx ax, dl ; 0f b6 c2 push ax ; 50 - push 0092ch ; 68 2c 09 + push 0092eh ; 68 2e 09 push strict byte 00004h ; 6a 04 - call 018e9h ; e8 8b aa + call 018e9h ; e8 82 aa add sp, strict byte 00006h ; 83 c4 06 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je short 06e6bh ; 74 04 + je short 06e74h ; 74 04 mov al, dl ; 88 d0 - jmp short 06e7dh ; eb 12 + jmp short 06e86h ; eb 12 test cx, cx ; 85 c9 - jnle short 06dfch ; 7f 8d - jne short 06e75h ; 75 04 + jnle short 06e05h ; 7f 8d + jne short 06e7eh ; 75 04 test si, si ; 85 f6 - jnbe short 06dfch ; 77 87 + jnbe short 06e05h ; 77 87 mov ax, word [bp-008h] ; 8b 46 f8 push ax ; 50 popfw ; 9d @@ -9864,7 +9850,7 @@ wait_: ; 0xf6dd6 LB 0xad pop cx ; 59 pop bx ; 5b retn ; c3 -read_logo_byte_: ; 0xf6e83 LB 0x13 +read_logo_byte_: ; 0xf6e8c LB 0x13 push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 @@ -9878,7 +9864,7 @@ read_logo_byte_: ; 0xf6e83 LB 0x13 pop bp ; 5d pop dx ; 5a retn ; c3 -read_logo_word_: ; 0xf6e96 LB 0x11 +read_logo_word_: ; 0xf6e9f LB 0x11 push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 @@ -9890,7 +9876,7 @@ read_logo_word_: ; 0xf6e96 LB 0x11 pop bp ; 5d pop dx ; 5a retn ; c3 -print_detected_harddisks_: ; 0xf6ea7 LB 0x12c +print_detected_harddisks_: ; 0xf6eb0 LB 0x12c push bx ; 53 push cx ; 51 push dx ; 52 @@ -9899,77 +9885,77 @@ print_detected_harddisks_: ; 0xf6ea7 LB 0x12c enter 00004h, 000h ; c8 04 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 63 a7 + call 0161ch ; e8 5a a7 mov si, ax ; 89 c6 mov byte [bp-002h], 000h ; c6 46 fe 00 xor cl, cl ; 30 c9 xor ch, ch ; 30 ed mov dx, 002c0h ; ba c0 02 - call 01600h ; e8 37 a7 + call 01600h ; e8 2e a7 mov byte [bp-004h], al ; 88 46 fc xor bl, bl ; 30 db cmp bl, byte [bp-004h] ; 3a 5e fc - jnc near 06fa8h ; 0f 83 d3 00 + jnc near 06fb1h ; 0f 83 d3 00 movzx dx, bl ; 0f b6 d3 add dx, 002c1h ; 81 c2 c1 02 mov ax, si ; 89 f0 - call 01600h ; e8 1f a7 + call 01600h ; e8 16 a7 mov bh, al ; 88 c7 cmp AL, strict byte 00ch ; 3c 0c - jc short 06f0bh ; 72 24 + jc short 06f14h ; 72 24 test cl, cl ; 84 c9 - jne short 06ef8h ; 75 0d - push 0093dh ; 68 3d 09 + jne short 06f01h ; 75 0d + push 0093fh ; 68 3f 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 f6 a9 + call 018e9h ; e8 ed a9 add sp, strict byte 00004h ; 83 c4 04 mov CL, strict byte 001h ; b1 01 movzx ax, bl ; 0f b6 c3 inc ax ; 40 push ax ; 50 - push 00951h ; 68 51 09 + push 00953h ; 68 53 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 e4 a9 + call 018e9h ; e8 db a9 add sp, strict byte 00006h ; 83 c4 06 - jmp near 06fa3h ; e9 98 00 + jmp near 06fach ; e9 98 00 cmp AL, strict byte 008h ; 3c 08 - jc short 06f22h ; 72 13 + jc short 06f2bh ; 72 13 test ch, ch ; 84 ed - jne short 06f20h ; 75 0d - push 00964h ; 68 64 09 + jne short 06f29h ; 75 0d + push 00966h ; 68 66 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 ce a9 + call 018e9h ; e8 c5 a9 add sp, strict byte 00004h ; 83 c4 04 mov CH, strict byte 001h ; b5 01 - jmp short 06ef8h ; eb d6 + jmp short 06f01h ; eb d6 cmp AL, strict byte 004h ; 3c 04 - jnc short 06f3dh ; 73 17 + jnc short 06f46h ; 73 17 cmp byte [bp-002h], 000h ; 80 7e fe 00 - jne short 06f3dh ; 75 11 - push 00978h ; 68 78 09 + jne short 06f46h ; 75 11 + push 0097ah ; 68 7a 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 b5 a9 + call 018e9h ; e8 ac a9 add sp, strict byte 00004h ; 83 c4 04 mov byte [bp-002h], 001h ; c6 46 fe 01 - jmp short 06f53h ; eb 16 + jmp short 06f5ch ; eb 16 cmp bh, 004h ; 80 ff 04 - jc short 06f53h ; 72 11 + jc short 06f5ch ; 72 11 test cl, cl ; 84 c9 - jne short 06f53h ; 75 0d - push 0093dh ; 68 3d 09 + jne short 06f5ch ; 75 0d + push 0093fh ; 68 3f 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 9b a9 + call 018e9h ; e8 92 a9 add sp, strict byte 00004h ; 83 c4 04 mov CL, strict byte 001h ; b1 01 movzx ax, bl ; 0f b6 c3 inc ax ; 40 push ax ; 50 - push 00989h ; 68 89 09 + push 0098bh ; 68 8b 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 89 a9 + call 018e9h ; e8 80 a9 add sp, strict byte 00006h ; 83 c4 06 cmp bh, 004h ; 80 ff 04 - jc short 06f6bh ; 72 03 + jc short 06f74h ; 72 03 sub bh, 004h ; 80 ef 04 movzx ax, bh ; 0f b6 c7 cwd ; 99 @@ -9977,41 +9963,41 @@ print_detected_harddisks_: ; 0xf6ea7 LB 0x12c ; sub ax, dx ; 2b c2 sar ax, 1 ; d1 f8 test ax, ax ; 85 c0 - je short 06f7ch ; 74 05 - push 00993h ; 68 93 09 - jmp short 06f7fh ; eb 03 - push 0099eh ; 68 9e 09 + je short 06f85h ; 74 05 + push 00995h ; 68 95 09 + jmp short 06f88h ; eb 03 + push 009a0h ; 68 a0 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 65 a9 + call 018e9h ; e8 5c a9 add sp, strict byte 00004h ; 83 c4 04 movzx ax, bh ; 0f b6 c7 mov di, strict word 00002h ; bf 02 00 cwd ; 99 idiv di ; f7 ff test dx, dx ; 85 d2 - je short 06f99h ; 74 05 - push 009a7h ; 68 a7 09 - jmp short 06f9ch ; eb 03 - push 009adh ; 68 ad 09 + je short 06fa2h ; 74 05 + push 009a9h ; 68 a9 09 + jmp short 06fa5h ; eb 03 + push 009afh ; 68 af 09 push di ; 57 - call 018e9h ; e8 49 a9 + call 018e9h ; e8 40 a9 add sp, strict byte 00004h ; 83 c4 04 db 0feh, 0c3h ; inc bl ; fe c3 - jmp near 06eceh ; e9 26 ff + jmp near 06ed7h ; e9 26 ff cmp byte [bp-002h], 000h ; 80 7e fe 00 - jne short 06fc1h ; 75 13 + jne short 06fcah ; 75 13 test cl, cl ; 84 c9 - jne short 06fc1h ; 75 0f + jne short 06fcah ; 75 0f test ch, ch ; 84 ed - jne short 06fc1h ; 75 0b - push 009b4h ; 68 b4 09 + jne short 06fcah ; 75 0b + push 009b6h ; 68 b6 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 2b a9 + call 018e9h ; e8 22 a9 add sp, strict byte 00004h ; 83 c4 04 - push 009c8h ; 68 c8 09 + push 009cah ; 68 ca 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 20 a9 + call 018e9h ; e8 17 a9 add sp, strict byte 00004h ; 83 c4 04 leave ; c9 pop di ; 5f @@ -10020,7 +10006,7 @@ print_detected_harddisks_: ; 0xf6ea7 LB 0x12c pop cx ; 59 pop bx ; 5b retn ; c3 -get_boot_drive_: ; 0xf6fd3 LB 0x25 +get_boot_drive_: ; 0xf6fdc LB 0x25 push bx ; 53 push dx ; 52 push bp ; 55 @@ -10028,19 +10014,19 @@ get_boot_drive_: ; 0xf6fd3 LB 0x25 mov bl, al ; 88 c3 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 39 a6 + call 0161ch ; e8 30 a6 mov dx, 002c0h ; ba c0 02 - call 01600h ; e8 17 a6 + call 01600h ; e8 0e a6 sub bl, 002h ; 80 eb 02 cmp bl, al ; 38 c3 - jc short 06ff2h ; 72 02 + jc short 06ffbh ; 72 02 mov BL, strict byte 0ffh ; b3 ff mov al, bl ; 88 d8 pop bp ; 5d pop dx ; 5a pop bx ; 5b retn ; c3 -show_logo_: ; 0xf6ff8 LB 0x21f +show_logo_: ; 0xf7001 LB 0x21f push bx ; 53 push cx ; 51 push dx ; 52 @@ -10049,7 +10035,7 @@ show_logo_: ; 0xf6ff8 LB 0x21f enter 0000ch, 000h ; c8 0c 00 00 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 12 a6 + call 0161ch ; e8 09 a6 mov si, ax ; 89 c6 xor cl, cl ; 30 c9 xor dx, dx ; 31 d2 @@ -10060,9 +10046,9 @@ show_logo_: ; 0xf6ff8 LB 0x21f mov AL, strict byte 048h ; b0 48 out strict byte 040h, AL ; e6 40 movzx ax, dl ; 0f b6 c2 - call 06e96h ; e8 74 fe + call 06e9fh ; e8 74 fe cmp ax, 066bbh ; 3d bb 66 - jne near 070fah ; 0f 85 d1 00 + jne near 07103h ; 0f 85 d1 00 push SS ; 16 pop ES ; 07 lea di, [bp-00ch] ; 8d 7e f4 @@ -10070,119 +10056,119 @@ show_logo_: ; 0xf6ff8 LB 0x21f int 010h ; cd 10 mov word [es:di], bx ; 26 89 1d cmp ax, strict word 0004fh ; 3d 4f 00 - jne near 070fah ; 0f 85 bd 00 + jne near 07103h ; 0f 85 bd 00 mov al, dl ; 88 d0 add AL, strict byte 004h ; 04 04 xor ah, ah ; 30 e4 - call 06e83h ; e8 3d fe + call 06e8ch ; e8 3d fe mov ch, al ; 88 c5 mov byte [bp-002h], al ; 88 46 fe mov al, dl ; 88 d0 add AL, strict byte 005h ; 04 05 xor ah, ah ; 30 e4 - call 06e83h ; e8 2f fe + call 06e8ch ; e8 2f fe mov dh, al ; 88 c6 mov byte [bp-006h], al ; 88 46 fa mov al, dl ; 88 d0 add AL, strict byte 002h ; 04 02 xor ah, ah ; 30 e4 - call 06e96h ; e8 34 fe + call 06e9fh ; e8 34 fe mov bx, ax ; 89 c3 mov word [bp-00ah], ax ; 89 46 f6 mov al, dl ; 88 d0 add AL, strict byte 006h ; 04 06 xor ah, ah ; 30 e4 - call 06e83h ; e8 13 fe + call 06e8ch ; e8 13 fe mov byte [bp-008h], al ; 88 46 f8 test ch, ch ; 84 ed - jne short 07081h ; 75 0a + jne short 0708ah ; 75 0a test dh, dh ; 84 f6 - jne short 07081h ; 75 06 + jne short 0708ah ; 75 06 test bx, bx ; 85 db - je near 070fah ; 0f 84 79 00 + je near 07103h ; 0f 84 79 00 mov bx, 00142h ; bb 42 01 mov ax, 04f02h ; b8 02 4f int 010h ; cd 10 cmp byte [bp-002h], 000h ; 80 7e fe 00 - je short 070b2h ; 74 23 + je short 070bbh ; 74 23 xor bx, bx ; 31 db - jmp short 07099h ; eb 06 + jmp short 070a2h ; eb 06 inc bx ; 43 cmp bx, strict byte 00010h ; 83 fb 10 - jnbe short 070b9h ; 77 20 + jnbe short 070c2h ; 77 20 mov ax, bx ; 89 d8 or ah, 002h ; 80 cc 02 mov dx, 003b8h ; ba b8 03 out DX, ax ; ef xor dx, dx ; 31 d2 mov ax, strict word 00001h ; b8 01 00 - call 06dd6h ; e8 2c fd + call 06ddfh ; e8 2c fd cmp AL, strict byte 086h ; 3c 86 - jne short 07093h ; 75 e5 + jne short 0709ch ; 75 e5 mov CL, strict byte 001h ; b1 01 - jmp short 070b9h ; eb 07 + jmp short 070c2h ; eb 07 mov ax, 00210h ; b8 10 02 mov dx, 003b8h ; ba b8 03 out DX, ax ; ef test cl, cl ; 84 c9 - jne short 070cfh ; 75 12 + jne short 070d8h ; 75 12 mov ax, word [bp-00ah] ; 8b 46 f6 shr ax, 004h ; c1 e8 04 mov dx, strict word 00001h ; ba 01 00 - call 06dd6h ; e8 0d fd + call 06ddfh ; e8 0d fd cmp AL, strict byte 086h ; 3c 86 - jne short 070cfh ; 75 02 + jne short 070d8h ; 75 02 mov CL, strict byte 001h ; b1 01 cmp byte [bp-006h], 000h ; 80 7e fa 00 - je short 070fah ; 74 25 + je short 07103h ; 74 25 test cl, cl ; 84 c9 - jne short 070fah ; 75 21 + jne short 07103h ; 75 21 mov bx, strict word 00010h ; bb 10 00 - jmp short 070e3h ; eb 05 + jmp short 070ech ; eb 05 dec bx ; 4b test bx, bx ; 85 db - jbe short 070fah ; 76 17 + jbe short 07103h ; 76 17 mov ax, bx ; 89 d8 or ah, 002h ; 80 cc 02 mov dx, 003b8h ; ba b8 03 out DX, ax ; ef xor dx, dx ; 31 d2 mov ax, strict word 00001h ; b8 01 00 - call 06dd6h ; e8 e2 fc + call 06ddfh ; e8 e2 fc cmp AL, strict byte 086h ; 3c 86 - jne short 070deh ; 75 e6 + jne short 070e7h ; 75 e6 mov CL, strict byte 001h ; b1 01 xor bx, bx ; 31 db mov dx, 00339h ; ba 39 03 mov ax, si ; 89 f0 - call 0160eh ; e8 0a a5 + call 0160eh ; e8 01 a5 mov AL, strict byte 003h ; b0 03 mov AH, strict byte 000h ; b4 00 int 010h ; cd 10 cmp byte [bp-008h], 000h ; 80 7e f8 00 - je near 071fbh ; 0f 84 e9 00 + je near 07204h ; 0f 84 e9 00 cmp byte [bp-002h], 000h ; 80 7e fe 00 - jne short 07148h ; 75 30 + jne short 07151h ; 75 30 cmp byte [bp-006h], 000h ; 80 7e fa 00 - jne short 07148h ; 75 2a + jne short 07151h ; 75 2a cmp word [bp-00ah], strict byte 00000h ; 83 7e f6 00 - jne short 07148h ; 75 24 + jne short 07151h ; 75 24 cmp byte [bp-008h], 002h ; 80 7e f8 02 - jne short 07135h ; 75 0b - push 009cah ; 68 ca 09 + jne short 0713eh ; 75 0b + push 009cch ; 68 cc 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 b7 a7 + call 018e9h ; e8 ae a7 add sp, strict byte 00004h ; 83 c4 04 test cl, cl ; 84 c9 - jne short 07148h ; 75 0f + jne short 07151h ; 75 0f mov dx, strict word 00001h ; ba 01 00 mov ax, 000c0h ; b8 c0 00 - call 06dd6h ; e8 94 fc + call 06ddfh ; e8 94 fc cmp AL, strict byte 086h ; 3c 86 - jne short 07148h ; 75 02 + jne short 07151h ; 75 02 mov CL, strict byte 001h ; b1 01 test cl, cl ; 84 c9 - je near 071fbh ; 0f 84 ad 00 + je near 07204h ; 0f 84 ad 00 mov byte [bp-004h], 000h ; c6 46 fc 00 mov ax, 00100h ; b8 00 01 mov cx, 01000h ; b9 00 10 @@ -10199,56 +10185,56 @@ show_logo_: ; 0xf6ff8 LB 0x21f db 033h, 0d2h ; xor dx, dx ; 33 d2 int 010h ; cd 10 - push 009ech ; 68 ec 09 + push 009eeh ; 68 ee 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 72 a7 + call 018e9h ; e8 69 a7 add sp, strict byte 00004h ; 83 c4 04 - call 06ea7h ; e8 2a fd - push 00a30h ; 68 30 0a + call 06eb0h ; e8 2a fd + push 00a32h ; 68 32 0a push strict byte 00002h ; 6a 02 - call 018e9h ; e8 64 a7 + call 018e9h ; e8 5b a7 add sp, strict byte 00004h ; 83 c4 04 mov dx, strict word 00001h ; ba 01 00 mov ax, strict word 00040h ; b8 40 00 - call 06dd6h ; e8 45 fc + call 06ddfh ; e8 45 fc mov bl, al ; 88 c3 test al, al ; 84 c0 - je short 07188h ; 74 f1 + je short 07191h ; 74 f1 cmp AL, strict byte 030h ; 3c 30 - je short 071e9h ; 74 4e + je short 071f2h ; 74 4e cmp bl, 002h ; 80 fb 02 - jc short 071c2h ; 72 22 + jc short 071cbh ; 72 22 cmp bl, 009h ; 80 fb 09 - jnbe short 071c2h ; 77 1d + jnbe short 071cbh ; 77 1d movzx ax, bl ; 0f b6 c3 - call 06fd3h ; e8 28 fe + call 06fdch ; e8 28 fe cmp AL, strict byte 0ffh ; 3c ff - jne short 071b1h ; 75 02 - jmp short 07188h ; eb d7 + jne short 071bah ; 75 02 + jmp short 07191h ; eb d7 movzx bx, al ; 0f b6 d8 mov dx, 00338h ; ba 38 03 mov ax, si ; 89 f0 - call 0160eh ; e8 52 a4 + call 0160eh ; e8 49 a4 mov byte [bp-004h], 002h ; c6 46 fc 02 - jmp short 071e9h ; eb 27 + jmp short 071f2h ; eb 27 cmp bl, 02eh ; 80 fb 2e - je short 071d7h ; 74 10 + je short 071e0h ; 74 10 cmp bl, 026h ; 80 fb 26 - je short 071ddh ; 74 11 + je short 071e6h ; 74 11 cmp bl, 021h ; 80 fb 21 - jne short 071e3h ; 75 12 + jne short 071ech ; 75 12 mov byte [bp-004h], 001h ; c6 46 fc 01 - jmp short 071e9h ; eb 12 + jmp short 071f2h ; eb 12 mov byte [bp-004h], 003h ; c6 46 fc 03 - jmp short 071e9h ; eb 0c + jmp short 071f2h ; eb 0c mov byte [bp-004h], 004h ; c6 46 fc 04 - jmp short 071e9h ; eb 06 + jmp short 071f2h ; eb 06 cmp byte [bp-004h], 000h ; 80 7e fc 00 - je short 07188h ; 74 9f + je short 07191h ; 74 9f movzx bx, byte [bp-004h] ; 0f b6 5e fc mov dx, 00339h ; ba 39 03 mov ax, si ; 89 f0 - call 0160eh ; e8 19 a4 + call 0160eh ; e8 10 a4 mov AL, strict byte 003h ; b0 03 mov AH, strict byte 000h ; b4 00 int 010h ; cd 10 @@ -10261,7 +10247,7 @@ show_logo_: ; 0xf6ff8 LB 0x21f pushad ; 66 60 push DS ; 1e mov ds, ax ; 8e d8 - call 0edbfh ; e8 b2 7b + call 0edbfh ; e8 a9 7b pop DS ; 1f popad ; 66 61 leave ; c9 @@ -10271,14 +10257,14 @@ show_logo_: ; 0xf6ff8 LB 0x21f pop cx ; 59 pop bx ; 5b retn ; c3 -delay_boot_: ; 0xf7217 LB 0x64 +delay_boot_: ; 0xf7220 LB 0x64 push bx ; 53 push dx ; 52 push bp ; 55 mov bp, sp ; 89 e5 mov dx, ax ; 89 c2 test ax, ax ; 85 c0 - je short 07277h ; 74 55 + je short 07280h ; 74 55 mov AL, strict byte 034h ; b0 34 out strict byte 043h, AL ; e6 43 mov AL, strict byte 0d3h ; b0 d3 @@ -10286,26 +10272,26 @@ delay_boot_: ; 0xf7217 LB 0x64 mov AL, strict byte 048h ; b0 48 out strict byte 040h, AL ; e6 40 push dx ; 52 - push 00a7ah ; 68 7a 0a + push 00a7ch ; 68 7c 0a push strict byte 00002h ; 6a 02 - call 018e9h ; e8 b2 a6 + call 018e9h ; e8 a9 a6 add sp, strict byte 00006h ; 83 c4 06 mov bx, dx ; 89 d3 test bx, bx ; 85 db - jbe short 07257h ; 76 17 + jbe short 07260h ; 76 17 push bx ; 53 - push 00a98h ; 68 98 0a + push 00a9ah ; 68 9a 0a push strict byte 00002h ; 6a 02 - call 018e9h ; e8 a0 a6 + call 018e9h ; e8 97 a6 add sp, strict byte 00006h ; 83 c4 06 xor dx, dx ; 31 d2 mov ax, strict word 00040h ; b8 40 00 - call 06dd6h ; e8 82 fb + call 06ddfh ; e8 82 fb dec bx ; 4b - jmp short 0723ch ; eb e5 - push 009c8h ; 68 c8 09 + jmp short 07245h ; eb e5 + push 009cah ; 68 ca 09 push strict byte 00002h ; 6a 02 - call 018e9h ; e8 8a a6 + call 018e9h ; e8 81 a6 add sp, strict byte 00004h ; 83 c4 04 mov AL, strict byte 034h ; b0 34 out strict byte 043h, AL ; e6 43 @@ -10316,14 +10302,14 @@ delay_boot_: ; 0xf7217 LB 0x64 pushad ; 66 60 push DS ; 1e mov ds, ax ; 8e d8 - call 0edbfh ; e8 4b 7b + call 0edbfh ; e8 42 7b pop DS ; 1f popad ; 66 61 pop bp ; 5d pop dx ; 5a pop bx ; 5b retn ; c3 -scsi_cmd_data_in_: ; 0xf727b LB 0x63 +scsi_cmd_data_in_: ; 0xf7284 LB 0x63 push si ; 56 push di ; 57 enter 00004h, 000h ; c8 04 00 00 @@ -10335,7 +10321,7 @@ scsi_cmd_data_in_: ; 0xf727b LB 0x63 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 07289h ; 75 f7 + jne short 07292h ; 75 f7 mov al, byte [bp-002h] ; 8a 46 fe out DX, AL ; ee xor al, al ; 30 c0 @@ -10350,7 +10336,7 @@ scsi_cmd_data_in_: ; 0xf727b LB 0x63 xor bx, bx ; 31 db movzx ax, byte [bp+008h] ; 0f b6 46 08 cmp bx, ax ; 39 c3 - jnc short 072c2h ; 73 10 + jnc short 072cbh ; 73 10 mov es, cx ; 8e c1 mov di, word [bp-004h] ; 8b 7e fc add di, bx ; 01 df @@ -10358,13 +10344,13 @@ scsi_cmd_data_in_: ; 0xf727b LB 0x63 mov dx, si ; 89 f2 out DX, AL ; ee inc bx ; 43 - jmp short 072aah ; eb e8 + jmp short 072b3h ; eb e8 mov dx, si ; 89 f2 in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 072c2h ; 75 f7 + jne short 072cbh ; 75 f7 lea dx, [si+001h] ; 8d 54 01 mov cx, word [bp+00eh] ; 8b 4e 0e les di, [bp+00ah] ; c4 7e 0a @@ -10374,7 +10360,7 @@ scsi_cmd_data_in_: ; 0xf727b LB 0x63 pop di ; 5f pop si ; 5e retn 00008h ; c2 08 00 -scsi_cmd_data_out_: ; 0xf72de LB 0x64 +scsi_cmd_data_out_: ; 0xf72e7 LB 0x64 push si ; 56 push di ; 57 enter 00004h, 000h ; c8 04 00 00 @@ -10386,7 +10372,7 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 072ech ; 75 f7 + jne short 072f5h ; 75 f7 mov al, byte [bp-002h] ; 8a 46 fe out DX, AL ; ee mov AL, strict byte 001h ; b0 01 @@ -10401,7 +10387,7 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 xor bx, bx ; 31 db movzx ax, byte [bp+008h] ; 0f b6 46 08 cmp bx, ax ; 39 c3 - jnc short 07325h ; 73 10 + jnc short 0732eh ; 73 10 mov es, cx ; 8e c1 mov si, word [bp-004h] ; 8b 76 fc add si, bx ; 01 de @@ -10409,7 +10395,7 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 mov dx, di ; 89 fa out DX, AL ; ee inc bx ; 43 - jmp short 0730dh ; eb e8 + jmp short 07316h ; eb e8 lea dx, [di+001h] ; 8d 55 01 mov cx, word [bp+00eh] ; 8b 4e 0e les si, [bp+00ah] ; c4 76 0a @@ -10420,13 +10406,13 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 db 02ah, 0e4h ; sub ah, ah ; 2a e4 test AL, strict byte 001h ; a8 01 - jne short 07331h ; 75 f7 + jne short 0733ah ; 75 f7 xor ax, ax ; 31 c0 leave ; c9 pop di ; 5f pop si ; 5e retn 00008h ; c2 08 00 -@scsi_read_sectors: ; 0xf7342 LB 0xa2 +@scsi_read_sectors: ; 0xf734b LB 0xa2 push si ; 56 push di ; 57 enter 0000ch, 000h ; c8 0c 00 00 @@ -10435,12 +10421,12 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 mov bl, byte [es:si+008h] ; 26 8a 5c 08 sub bl, 008h ; 80 eb 08 cmp bl, 004h ; 80 fb 04 - jbe short 07369h ; 76 0f + jbe short 07372h ; 76 0f movzx ax, bl ; 0f b6 c3 push ax ; 50 - push 00a9ch ; 68 9c 0a + push 00a9eh ; 68 9e 0a push strict byte 00007h ; 6a 07 - call 018e9h ; e8 83 a5 + call 018e9h ; e8 7a a5 add sp, strict byte 00006h ; 83 c4 06 mov es, [bp+00ah] ; 8e 46 0a mov di, word [es:si+00ah] ; 26 8b 7c 0a @@ -10472,10 +10458,10 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 xor dh, dh ; 30 f6 mov cx, ss ; 8c d1 lea bx, [bp-00ch] ; 8d 5e f4 - call 0727bh ; e8 ba fe + call 07284h ; e8 ba fe mov ah, al ; 88 c4 test al, al ; 84 c0 - jne short 073dbh ; 75 14 + jne short 073e4h ; 75 14 mov es, [bp+00ah] ; 8e 46 0a mov word [es:si+014h], di ; 26 89 7c 14 mov dx, word [bp-002h] ; 8b 56 fe @@ -10486,7 +10472,7 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 pop di ; 5f pop si ; 5e retn 00004h ; c2 04 00 -@scsi_write_sectors: ; 0xf73e4 LB 0xa2 +@scsi_write_sectors: ; 0xf73ed LB 0xa2 push si ; 56 push di ; 57 enter 0000ch, 000h ; c8 0c 00 00 @@ -10495,12 +10481,12 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 mov bl, byte [es:si+008h] ; 26 8a 5c 08 sub bl, 008h ; 80 eb 08 cmp bl, 004h ; 80 fb 04 - jbe short 0740bh ; 76 0f + jbe short 07414h ; 76 0f movzx ax, bl ; 0f b6 c3 push ax ; 50 - push 00acah ; 68 ca 0a + push 00acch ; 68 cc 0a push strict byte 00007h ; 6a 07 - call 018e9h ; e8 e1 a4 + call 018e9h ; e8 d8 a4 add sp, strict byte 00006h ; 83 c4 06 mov es, [bp+00ah] ; 8e 46 0a mov di, word [es:si+00ah] ; 26 8b 7c 0a @@ -10532,10 +10518,10 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 xor dh, dh ; 30 f6 mov cx, ss ; 8c d1 lea bx, [bp-00ch] ; 8d 5e f4 - call 072deh ; e8 7b fe + call 072e7h ; e8 7b fe mov ah, al ; 88 c4 test al, al ; 84 c0 - jne short 0747dh ; 75 14 + jne short 07486h ; 75 14 mov es, [bp+00ah] ; 8e 46 0a mov word [es:si+014h], di ; 26 89 7c 14 mov dx, word [bp-002h] ; 8b 56 fe @@ -10546,7 +10532,7 @@ scsi_cmd_data_out_: ; 0xf72de LB 0x64 pop di ; 5f pop si ; 5e retn 00004h ; c2 04 00 -scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 +scsi_enumerate_attached_devices_: ; 0xf748f LB 0x285 push bx ; 53 push cx ; 51 push dx ; 52 @@ -10556,19 +10542,19 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 push ax ; 50 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 83 a1 + call 0161ch ; e8 7a a1 mov si, 00122h ; be 22 01 mov word [bp-006h], ax ; 89 46 fa mov word [bp-008h], strict word 00000h ; c7 46 f8 00 00 - jmp near 076b3h ; e9 0c 02 + jmp near 076bch ; e9 0c 02 mov es, [bp-006h] ; 8e 46 fa cmp byte [es:si+001e8h], 004h ; 26 80 bc e8 01 04 - jnc near 07704h ; 0f 83 50 02 + jnc near 0770dh ; 0f 83 50 02 mov cx, strict word 0000ah ; b9 0a 00 xor bx, bx ; 31 db mov dx, ss ; 8c d2 lea ax, [bp-01ah] ; 8d 46 e6 - call 08cbah ; e8 f9 17 + call 08ccah ; e8 00 18 mov byte [bp-01ah], 025h ; c6 46 e6 25 push strict byte 00008h ; 6a 08 lea dx, [bp-0021ah] ; 8d 96 e6 fd @@ -10579,12 +10565,12 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov ax, word [bp-0021ch] ; 8b 86 e4 fd - call 0727bh ; e8 9c fd + call 07284h ; e8 9c fd test al, al ; 84 c0 - je short 074eeh ; 74 0b - push 00b2fh ; 68 2f 0b + je short 074f7h ; 74 0b + push 00b31h ; 68 31 0b push strict byte 00007h ; 6a 07 - call 018e9h ; e8 fe a3 + call 018e9h ; e8 f5 a3 add sp, strict byte 00004h ; 83 c4 04 movzx dx, byte [bp-00219h] ; 0f b6 96 e7 fd movzx di, byte [bp-0021ah] ; 0f b6 be e6 fd @@ -10596,7 +10582,7 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov cx, strict word 00008h ; b9 08 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 07509h ; e2 fa + loop 07512h ; e2 fa or bx, ax ; 09 c3 or di, dx ; 09 d7 movzx ax, byte [bp-00217h] ; 0f b6 86 e9 fd @@ -10612,7 +10598,7 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov cx, strict word 00008h ; b9 08 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 0753bh ; e2 fa + loop 07544h ; e2 fa mov cx, word [bp-010h] ; 8b 4e f0 or cx, ax ; 09 c1 or dx, bx ; 09 da @@ -10621,38 +10607,38 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 or bx, ax ; 09 c3 mov word [bp-00ch], bx ; 89 5e f4 test dx, dx ; 85 d2 - jne short 0755eh ; 75 06 + jne short 07567h ; 75 06 cmp bx, 00200h ; 81 fb 00 02 - je short 0757eh ; 74 20 - mov bx, 00cd6h ; bb d6 0c + je short 07587h ; 74 20 + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 45 a3 + call 018aeh ; e8 3c a3 push dx ; 52 push word [bp-00ch] ; ff 76 f4 push word [bp-008h] ; ff 76 f8 - push 00b6bh ; 68 6b 0b + push 00b6dh ; 68 6d 0b push strict byte 00004h ; 6a 04 - call 018e9h ; e8 71 a3 + call 018e9h ; e8 68 a3 add sp, strict byte 0000ah ; 83 c4 0a - jmp near 076aah ; e9 2c 01 + jmp near 076b3h ; e9 2c 01 cmp di, strict byte 00040h ; 83 ff 40 - jnbe short 07585h ; 77 02 - jne short 0758fh ; 75 0a + jnbe short 0758eh ; 77 02 + jne short 07598h ; 75 0a mov dword [bp-004h], strict dword 000ff003fh ; 66 c7 46 fc 3f 00 ff 00 - jmp short 075a8h ; eb 19 + jmp short 075b1h ; eb 19 cmp di, strict byte 00020h ; 83 ff 20 - jnbe short 07596h ; 77 02 - jne short 075a0h ; 75 0a + jnbe short 0759fh ; 77 02 + jne short 075a9h ; 75 0a mov dword [bp-004h], strict dword 000800020h ; 66 c7 46 fc 20 00 80 00 - jmp short 075a8h ; eb 08 + jmp short 075b1h ; eb 08 mov dword [bp-004h], strict dword 000400020h ; 66 c7 46 fc 20 00 40 00 mov bx, word [bp-002h] ; 8b 5e fe imul bx, word [bp-004h] ; 0f af 5e fc mov ax, word [bp-00ah] ; 8b 46 f6 mov dx, di ; 89 fa xor cx, cx ; 31 c9 - call 08c50h ; e8 97 16 + call 08c60h ; e8 9e 16 mov word [bp-00eh], dx ; 89 56 f2 mov es, [bp-006h] ; 8e 46 fa mov cl, byte [es:si+001e8h] ; 26 8a 8c e8 01 @@ -10680,11 +10666,11 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov dx, word [bp-004h] ; 8b 56 fc mov word [es:bx+02ah], dx ; 26 89 57 2a cmp word [bp-00eh], strict byte 00000h ; 83 7e f2 00 - jne short 0761ch ; 75 05 + jne short 07625h ; 75 05 cmp ax, 00400h ; 3d 00 04 - jbe short 07624h ; 76 08 + jbe short 0762dh ; 76 08 mov word [es:bx+028h], 00400h ; 26 c7 47 28 00 04 - jmp short 07628h ; eb 04 + jmp short 07631h ; eb 04 mov word [es:bx+028h], ax ; 26 89 47 28 movzx bx, ch ; 0f b6 dd imul bx, bx, strict byte 00018h ; 6b db 18 @@ -10695,11 +10681,11 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov dx, word [bp-004h] ; 8b 56 fc mov word [es:bx+030h], dx ; 26 89 57 30 cmp word [bp-00eh], strict byte 00000h ; 83 7e f2 00 - jne short 0764ch ; 75 05 + jne short 07655h ; 75 05 cmp ax, 00400h ; 3d 00 04 - jbe short 07654h ; 76 08 + jbe short 0765dh ; 76 08 mov word [es:bx+02eh], 00400h ; 26 c7 47 2e 00 04 - jmp short 07658h ; eb 04 + jmp short 07661h ; eb 04 mov word [es:bx+02eh], ax ; 26 89 47 2e movzx bx, ch ; 0f b6 dd imul bx, bx, strict byte 00018h ; 6b db 18 @@ -10719,20 +10705,20 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov byte [es:si+0019eh], al ; 26 88 84 9e 01 mov dx, strict word 00075h ; ba 75 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 6e 9f + call 01600h ; e8 65 9f db 0feh, 0c0h ; inc al ; fe c0 movzx bx, al ; 0f b6 d8 mov dx, strict word 00075h ; ba 75 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 6e 9f + call 0160eh ; e8 65 9f db 0feh, 0c1h ; inc cl ; fe c1 mov es, [bp-006h] ; 8e 46 fa mov byte [es:si+001e8h], cl ; 26 88 8c e8 01 inc word [bp-008h] ; ff 46 f8 cmp word [bp-008h], strict byte 00010h ; 83 7e f8 10 - jnl short 07704h ; 7d 51 + jnl short 0770dh ; 7d 51 mov byte [bp-01ah], 012h ; c6 46 e6 12 xor al, al ; 30 c0 mov byte [bp-019h], al ; 88 46 e7 @@ -10749,18 +10735,18 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 mov cx, ss ; 8c d1 lea bx, [bp-01ah] ; 8d 5e e6 mov ax, word [bp-0021ch] ; 8b 86 e4 fd - call 0727bh ; e8 98 fb + call 07284h ; e8 98 fb test al, al ; 84 c0 - je short 076f2h ; 74 0b - push 00af9h ; 68 f9 0a + je short 076fbh ; 74 0b + push 00afbh ; 68 fb 0a push strict byte 00007h ; 6a 07 - call 018e9h ; e8 fa a1 + call 018e9h ; e8 f1 a1 add sp, strict byte 00004h ; 83 c4 04 test byte [bp-0021ah], 0e0h ; f6 86 e6 fd e0 - jne short 076aah ; 75 b1 + jne short 076b3h ; 75 b1 test byte [bp-0021ah], 01fh ; f6 86 e6 fd 1f - je near 074a7h ; 0f 84 a5 fd - jmp short 076aah ; eb a6 + je near 074b0h ; 0f 84 a5 fd + jmp short 076b3h ; eb a6 leave ; c9 pop di ; 5f pop si ; 5e @@ -10768,12 +10754,12 @@ scsi_enumerate_attached_devices_: ; 0xf7486 LB 0x285 pop cx ; 59 pop bx ; 5b retn ; c3 -_scsi_init: ; 0xf770b LB 0x64 +_scsi_init: ; 0xf7714 LB 0x64 push bp ; 55 mov bp, sp ; 89 e5 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 05 9f + call 0161ch ; e8 fc 9e mov bx, 00122h ; bb 22 01 mov es, ax ; 8e c0 mov byte [es:bx+001e8h], 000h ; 26 c6 87 e8 01 00 @@ -10784,12 +10770,12 @@ _scsi_init: ; 0xf770b LB 0x64 db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp AL, strict byte 055h ; 3c 55 - jne short 0773bh ; 75 0c + jne short 07744h ; 75 0c xor al, al ; 30 c0 mov dx, 00333h ; ba 33 03 out DX, AL ; ee mov ax, 00330h ; b8 30 03 - call 07486h ; e8 4b fd + call 0748fh ; e8 4b fd mov AL, strict byte 055h ; b0 55 mov dx, 00342h ; ba 42 03 out DX, AL ; ee @@ -10797,12 +10783,12 @@ _scsi_init: ; 0xf770b LB 0x64 db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp AL, strict byte 055h ; 3c 55 - jne short 07754h ; 75 0c + jne short 0775dh ; 75 0c xor al, al ; 30 c0 mov dx, 00343h ; ba 43 03 out DX, AL ; ee mov ax, 00340h ; b8 40 03 - call 07486h ; e8 32 fd + call 0748fh ; e8 32 fd mov AL, strict byte 055h ; b0 55 mov dx, 00352h ; ba 52 03 out DX, AL ; ee @@ -10810,15 +10796,15 @@ _scsi_init: ; 0xf770b LB 0x64 db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp AL, strict byte 055h ; 3c 55 - jne short 0776dh ; 75 0c + jne short 07776h ; 75 0c xor al, al ; 30 c0 mov dx, 00353h ; ba 53 03 out DX, AL ; ee mov ax, 00350h ; b8 50 03 - call 07486h ; e8 19 fd + call 0748fh ; e8 19 fd pop bp ; 5d retn ; c3 -high_bits_save_: ; 0xf776f LB 0x14 +high_bits_save_: ; 0xf7778 LB 0x14 push bx ; 53 push bp ; 55 mov bp, sp ; 89 e5 @@ -10829,7 +10815,7 @@ high_bits_save_: ; 0xf776f LB 0x14 pop bp ; 5d pop bx ; 5b retn ; c3 -high_bits_restore_: ; 0xf7783 LB 0x14 +high_bits_restore_: ; 0xf778c LB 0x14 push bx ; 53 push bp ; 55 mov bp, sp ; 89 e5 @@ -10840,7 +10826,7 @@ high_bits_restore_: ; 0xf7783 LB 0x14 pop bp ; 5d pop bx ; 5b retn ; c3 -ahci_ctrl_set_bits_: ; 0xf7797 LB 0x40 +ahci_ctrl_set_bits_: ; 0xf77a0 LB 0x40 push si ; 56 push di ; 57 enter 00002h, 000h ; c8 02 00 00 @@ -10875,7 +10861,7 @@ ahci_ctrl_set_bits_: ; 0xf7797 LB 0x40 pop di ; 5f pop si ; 5e retn ; c3 -ahci_ctrl_clear_bits_: ; 0xf77d7 LB 0x44 +ahci_ctrl_clear_bits_: ; 0xf77e0 LB 0x44 push si ; 56 push di ; 57 enter 00002h, 000h ; c8 02 00 00 @@ -10912,7 +10898,7 @@ ahci_ctrl_clear_bits_: ; 0xf77d7 LB 0x44 pop di ; 5f pop si ; 5e retn ; c3 -ahci_ctrl_is_bit_set_: ; 0xf781b LB 0x36 +ahci_ctrl_is_bit_set_: ; 0xf7824 LB 0x36 push si ; 56 push di ; 57 push bp ; 55 @@ -10934,17 +10920,17 @@ ahci_ctrl_is_bit_set_: ; 0xf781b LB 0x36 shr eax, 010h ; 66 c1 e8 10 xchg dx, ax ; 92 test dx, di ; 85 fa - jne short 07847h ; 75 04 + jne short 07850h ; 75 04 test ax, bx ; 85 d8 - je short 0784bh ; 74 04 + je short 07854h ; 74 04 mov AL, strict byte 001h ; b0 01 - jmp short 0784dh ; eb 02 + jmp short 07856h ; eb 02 xor al, al ; 30 c0 pop bp ; 5d pop di ; 5f pop si ; 5e retn ; c3 -ahci_ctrl_extract_bits_: ; 0xf7851 LB 0x1b +ahci_ctrl_extract_bits_: ; 0xf785a LB 0x1b push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -10952,14 +10938,14 @@ ahci_ctrl_extract_bits_: ; 0xf7851 LB 0x1b and ax, bx ; 21 d8 and dx, cx ; 21 ca movzx cx, byte [bp+006h] ; 0f b6 4e 06 - jcxz 07867h ; e3 06 + jcxz 07870h ; e3 06 shr dx, 1 ; d1 ea rcr ax, 1 ; d1 d8 - loop 07861h ; e2 fa + loop 0786ah ; e2 fa pop bp ; 5d pop si ; 5e retn 00002h ; c2 02 00 -ahci_addr_to_phys_: ; 0xf786c LB 0x1e +ahci_addr_to_phys_: ; 0xf7875 LB 0x1e push bx ; 53 push cx ; 51 push bp ; 55 @@ -10970,7 +10956,7 @@ ahci_addr_to_phys_: ; 0xf786c LB 0x1e mov cx, strict word 00004h ; b9 04 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 0787ah ; e2 fa + loop 07883h ; e2 fa xor cx, cx ; 31 c9 add ax, bx ; 01 d8 adc dx, cx ; 11 ca @@ -10978,7 +10964,7 @@ ahci_addr_to_phys_: ; 0xf786c LB 0x1e pop cx ; 59 pop bx ; 5b retn ; c3 -ahci_port_cmd_sync_: ; 0xf788a LB 0xd0 +ahci_port_cmd_sync_: ; 0xf7893 LB 0xd0 push cx ; 51 push si ; 56 push di ; 57 @@ -10990,7 +10976,7 @@ ahci_port_cmd_sync_: ; 0xf788a LB 0xd0 mov byte [bp-002h], al ; 88 46 fe mov di, word [es:si+00260h] ; 26 8b bc 60 02 cmp AL, strict byte 0ffh ; 3c ff - je near 07955h ; 0f 84 aa 00 + je near 0795eh ; 0f 84 aa 00 movzx cx, byte [es:si+00263h] ; 26 0f b6 8c 63 02 xor dx, dx ; 31 d2 or dl, 080h ; 80 ca 80 @@ -11002,7 +10988,7 @@ ahci_port_cmd_sync_: ; 0xf788a LB 0xd0 ; mov dword [es:si+004h], strict dword 000000000h ; 66 26 c7 44 04 00 00 00 00 lea ax, [si+00080h] ; 8d 84 80 00 mov dx, es ; 8c c2 - call 0786ch ; e8 98 ff + call 07875h ; e8 98 ff mov es, [bp-004h] ; 8e 46 fc mov word [es:si+008h], ax ; 26 89 44 08 mov word [es:si+00ah], dx ; 26 89 54 0a @@ -11012,7 +10998,7 @@ ahci_port_cmd_sync_: ; 0xf788a LB 0xd0 mov bx, strict word 00011h ; bb 11 00 xor cx, cx ; 31 c9 mov ax, di ; 89 f8 - call 07797h ; e8 a3 fe + call 077a0h ; e8 a3 fe lea ax, [si+00138h] ; 8d 84 38 01 cwd ; 99 mov cx, dx ; 89 d1 @@ -11039,26 +11025,26 @@ ahci_port_cmd_sync_: ; 0xf788a LB 0xd0 mov cx, 04000h ; b9 00 40 mov dx, si ; 89 f2 mov ax, di ; 89 f8 - call 0781bh ; e8 e7 fe + call 07824h ; e8 e7 fe test al, al ; 84 c0 - je short 07917h ; 74 df + je short 07920h ; 74 df mov bx, strict word 00001h ; bb 01 00 xor cx, cx ; 31 c9 mov dx, si ; 89 f2 mov ax, di ; 89 f8 - call 07797h ; e8 53 fe + call 077a0h ; e8 53 fe mov dx, word [bp-006h] ; 8b 56 fa add dx, 00118h ; 81 c2 18 01 mov bx, strict word 00001h ; bb 01 00 xor cx, cx ; 31 c9 mov ax, di ; 89 f8 - call 077d7h ; e8 82 fe + call 077e0h ; e8 82 fe leave ; c9 pop di ; 5f pop si ; 5e pop cx ; 59 retn ; c3 -ahci_cmd_data_: ; 0xf795a LB 0x1c5 +ahci_cmd_data_: ; 0xf7963 LB 0x1c5 push cx ; 51 push si ; 56 push di ; 57 @@ -11080,7 +11066,7 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 xor bx, bx ; 31 db mov ax, 00080h ; b8 80 00 mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 23 13 + call 08ccah ; e8 2a 13 mov es, [bp-004h] ; 8e 46 fc mov word [es:si+00080h], 08027h ; 26 c7 84 80 00 27 80 mov al, byte [bp-002h] ; 8a 46 fe @@ -11096,7 +11082,7 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 mov cx, strict word 00008h ; b9 08 00 shr bx, 1 ; d1 eb rcr ax, 1 ; d1 d8 - loop 079cah ; e2 fa + loop 079d3h ; e2 fa mov es, [bp-004h] ; 8e 46 fc mov byte [es:si+00085h], al ; 26 88 84 85 00 mov es, [bp-00ch] ; 8e 46 f4 @@ -11121,7 +11107,7 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 xor dx, dx ; 31 d2 mov bx, word [bp-010h] ; 8b 5e f0 xor cx, cx ; 31 c9 - call 08c89h ; e8 56 12 + call 08c99h ; e8 5d 12 push dx ; 52 push ax ; 50 mov es, [bp-00ch] ; 8e 46 f4 @@ -11129,7 +11115,7 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 mov cx, word [es:di+006h] ; 26 8b 4d 06 mov ax, 0026ah ; b8 6a 02 mov dx, word [bp-004h] ; 8b 56 fc - call 08ba7h ; e8 5e 11 + call 08bb0h ; e8 5e 11 mov es, [bp-004h] ; 8e 46 fc movzx ax, byte [es:si+00263h] ; 26 0f b6 84 63 02 mov dx, word [es:si+0027eh] ; 26 8b 94 7e 02 @@ -11149,7 +11135,7 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 inc ax ; 40 mov es, [bp-00ch] ; 8e 46 f4 cmp word [es:di+01ch], strict byte 00000h ; 26 83 7d 1c 00 - je short 07ac2h ; 74 2c + je short 07acbh ; 74 2c mov dx, word [es:di+01ch] ; 26 8b 55 1c dec dx ; 4a mov di, ax ; 89 c7 @@ -11168,35 +11154,35 @@ ahci_cmd_data_: ; 0xf795a LB 0x1c5 les bx, [bp-008h] ; c4 5e f8 movzx dx, byte [es:bx+00263h] ; 26 0f b6 97 63 02 cmp ax, dx ; 39 d0 - jnc short 07adch ; 73 03 + jnc short 07ae5h ; 73 03 inc ax ; 40 - jmp short 07acch ; eb f0 + jmp short 07ad5h ; eb f0 mov al, byte [bp-002h] ; 8a 46 fe cmp AL, strict byte 035h ; 3c 35 - jne short 07ae9h ; 75 06 + jne short 07af2h ; 75 06 mov byte [bp-002h], 040h ; c6 46 fe 40 - jmp short 07afdh ; eb 14 + jmp short 07b06h ; eb 14 cmp AL, strict byte 0a0h ; 3c a0 - jne short 07af9h ; 75 0c + jne short 07b02h ; 75 0c or byte [bp-002h], 020h ; 80 4e fe 20 or byte [es:bx+00083h], 001h ; 26 80 8f 83 00 01 - jmp short 07afdh ; eb 04 + jmp short 07b06h ; eb 04 mov byte [bp-002h], 000h ; c6 46 fe 00 or byte [bp-002h], 005h ; 80 4e fe 05 movzx bx, byte [bp-002h] ; 0f b6 5e fe mov ax, word [bp-008h] ; 8b 46 f8 mov dx, word [bp-006h] ; 8b 56 fa - call 0788ah ; e8 7c fd + call 07893h ; e8 7c fd mov ax, word [bp-008h] ; 8b 46 f8 add ax, 0026ah ; 05 6a 02 mov dx, word [bp-006h] ; 8b 56 fa - call 08c1dh ; e8 03 11 + call 08c26h ; e8 03 11 leave ; c9 pop di ; 5f pop si ; 5e pop cx ; 59 retn ; c3 -ahci_port_deinit_current_: ; 0xf7b1f LB 0x13f +ahci_port_deinit_current_: ; 0xf7b28 LB 0x13f push bx ; 53 push cx ; 51 push si ; 56 @@ -11209,14 +11195,14 @@ ahci_port_deinit_current_: ; 0xf7b1f LB 0x13f mov al, byte [es:di+00262h] ; 26 8a 85 62 02 mov byte [bp-002h], al ; 88 46 fe cmp AL, strict byte 0ffh ; 3c ff - je near 07c58h ; 0f 84 17 01 + je near 07c61h ; 0f 84 17 01 movzx dx, al ; 0f b6 d0 sal dx, 007h ; c1 e2 07 add dx, 00118h ; 81 c2 18 01 mov bx, strict word 00011h ; bb 11 00 xor cx, cx ; 31 c9 mov ax, si ; 89 f0 - call 077d7h ; e8 82 fc + call 077e0h ; e8 82 fc movzx ax, byte [bp-002h] ; 0f b6 46 fe sal ax, 007h ; c1 e0 07 mov word [bp-006h], ax ; 89 46 fa @@ -11225,24 +11211,24 @@ ahci_port_deinit_current_: ; 0xf7b1f LB 0x13f mov bx, 0c011h ; bb 11 c0 xor cx, cx ; 31 c9 mov ax, si ; 89 f0 - call 0781bh ; e8 ac fc + call 07824h ; e8 ac fc cmp AL, strict byte 001h ; 3c 01 - je short 07b55h ; 74 e2 + je short 07b5eh ; 74 e2 mov cx, strict word 00020h ; b9 20 00 xor bx, bx ; 31 db mov ax, di ; 89 f8 mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 3a 11 + call 08ccah ; e8 41 11 lea ax, [di+00080h] ; 8d 85 80 00 mov cx, strict word 00040h ; b9 40 00 xor bx, bx ; 31 db mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 2b 11 + call 08ccah ; e8 32 11 lea ax, [di+00200h] ; 8d 85 00 02 mov cx, strict word 00060h ; b9 60 00 xor bx, bx ; 31 db mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 1c 11 + call 08ccah ; e8 23 11 mov ax, word [bp-006h] ; 8b 46 fa add ax, 00108h ; 05 08 01 cwd ; 99 @@ -11343,7 +11329,7 @@ ahci_port_deinit_current_: ; 0xf7b1f LB 0x13f pop cx ; 59 pop bx ; 5b retn ; c3 -ahci_port_init_: ; 0xf7c5e LB 0x201 +ahci_port_init_: ; 0xf7c67 LB 0x201 push cx ; 51 push si ; 56 push di ; 57 @@ -11351,7 +11337,7 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 mov si, ax ; 89 c6 mov word [bp-004h], dx ; 89 56 fc mov byte [bp-002h], bl ; 88 5e fe - call 07b1fh ; e8 af fe + call 07b28h ; e8 af fe movzx dx, bl ; 0f b6 d3 sal dx, 007h ; c1 e2 07 add dx, 00118h ; 81 c2 18 01 @@ -11359,7 +11345,7 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 mov ax, word [es:si+00260h] ; 26 8b 84 60 02 mov bx, strict word 00011h ; bb 11 00 xor cx, cx ; 31 c9 - call 077d7h ; e8 4d fb + call 077e0h ; e8 4d fb movzx di, byte [bp-002h] ; 0f b6 7e fe sal di, 007h ; c1 e7 07 lea dx, [di+00118h] ; 8d 95 18 01 @@ -11367,26 +11353,26 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 mov ax, word [es:si+00260h] ; 26 8b 84 60 02 mov bx, 0c011h ; bb 11 c0 xor cx, cx ; 31 c9 - call 0781bh ; e8 76 fb + call 07824h ; e8 76 fb cmp AL, strict byte 001h ; 3c 01 - je short 07c8ah ; 74 e1 + je short 07c93h ; 74 e1 mov cx, strict word 00020h ; b9 20 00 xor bx, bx ; 31 db mov ax, si ; 89 f0 mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 04 10 + call 08ccah ; e8 0b 10 lea ax, [si+00080h] ; 8d 84 80 00 mov cx, strict word 00040h ; b9 40 00 xor bx, bx ; 31 db mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 f5 0f + call 08ccah ; e8 fc 0f mov ax, si ; 89 f0 add ah, 002h ; 80 c4 02 mov word [bp-006h], ax ; 89 46 fa mov cx, strict word 00060h ; b9 60 00 xor bx, bx ; 31 db mov dx, word [bp-004h] ; 8b 56 fc - call 08cbah ; e8 e2 0f + call 08ccah ; e8 e9 0f lea ax, [di+00108h] ; 8d 85 08 01 cwd ; 99 mov es, [bp-004h] ; 8e 46 fc @@ -11400,7 +11386,7 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 out DX, eax ; 66 ef mov ax, word [bp-006h] ; 8b 46 fa mov dx, word [bp-004h] ; 8b 56 fc - call 0786ch ; e8 71 fb + call 07875h ; e8 71 fb mov es, [bp-004h] ; 8e 46 fc mov bx, word [es:si+00260h] ; 26 8b 9c 60 02 add bx, strict byte 00004h ; 83 c3 04 @@ -11445,7 +11431,7 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 out DX, eax ; 66 ef mov ax, si ; 89 f0 mov dx, word [bp-004h] ; 8b 56 fc - call 0786ch ; e8 05 fb + call 07875h ; e8 05 fb mov es, [bp-004h] ; 8e 46 fc mov bx, word [es:si+00260h] ; 26 8b 9c 60 02 add bx, strict byte 00004h ; 83 c3 04 @@ -11549,7 +11535,7 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 pop si ; 5e pop cx ; 59 retn ; c3 -@ahci_read_sectors: ; 0xf7e5f LB 0x91 +@ahci_read_sectors: ; 0xf7e68 LB 0x91 push si ; 56 push di ; 57 push bp ; 55 @@ -11558,28 +11544,28 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 movzx di, byte [es:di+008h] ; 26 0f b6 7d 08 sub di, strict byte 0000ch ; 83 ef 0c cmp di, strict byte 00004h ; 83 ff 04 - jbe short 07e83h ; 76 0f + jbe short 07e8ch ; 76 0f push di ; 57 - push 00b9ah ; 68 9a 0b - push 00bach ; 68 ac 0b + push 00b9ch ; 68 9c 0b + push 00baeh ; 68 ae 0b push strict byte 00007h ; 6a 07 - call 018e9h ; e8 69 9a + call 018e9h ; e8 60 9a add sp, strict byte 00008h ; 83 c4 08 les bx, [bp+008h] ; c4 5e 08 mov dx, word [es:bx+001eeh] ; 26 8b 97 ee 01 xor ax, ax ; 31 c0 - call 0776fh ; e8 df f8 + call 07778h ; e8 df f8 mov es, [bp+00ah] ; 8e 46 0a add di, bx ; 01 df movzx bx, byte [es:di+001e9h] ; 26 0f b6 9d e9 01 mov di, word [bp+008h] ; 8b 7e 08 mov dx, word [es:di+001eeh] ; 26 8b 95 ee 01 xor ax, ax ; 31 c0 - call 07c5eh ; e8 b6 fd + call 07c67h ; e8 b6 fd mov bx, strict word 00025h ; bb 25 00 mov ax, di ; 89 f8 mov dx, word [bp+00ah] ; 8b 56 0a - call 0795ah ; e8 a7 fa + call 07963h ; e8 a7 fa mov es, [bp+00ah] ; 8e 46 0a mov bx, di ; 89 fb mov ax, word [es:bx+00ah] ; 26 8b 47 0a @@ -11599,13 +11585,13 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 mov es, [bp+00ah] ; 8e 46 0a mov dx, word [es:bx+001eeh] ; 26 8b 97 ee 01 xor ax, ax ; 31 c0 - call 07783h ; e8 9b f8 + call 0778ch ; e8 9b f8 xor ax, ax ; 31 c0 pop bp ; 5d pop di ; 5f pop si ; 5e retn 00004h ; c2 04 00 -@ahci_write_sectors: ; 0xf7ef0 LB 0x6d +@ahci_write_sectors: ; 0xf7ef9 LB 0x6d push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -11615,38 +11601,38 @@ ahci_port_init_: ; 0xf7c5e LB 0x201 movzx bx, byte [es:si+008h] ; 26 0f b6 5c 08 sub bx, strict byte 0000ch ; 83 eb 0c cmp bx, strict byte 00004h ; 83 fb 04 - jbe short 07f18h ; 76 0f + jbe short 07f21h ; 76 0f push bx ; 53 - push 00bcbh ; 68 cb 0b - push 00bach ; 68 ac 0b + push 00bcdh ; 68 cd 0b + push 00baeh ; 68 ae 0b push strict byte 00007h ; 6a 07 - call 018e9h ; e8 d4 99 + call 018e9h ; e8 cb 99 add sp, strict byte 00008h ; 83 c4 08 mov es, cx ; 8e c1 mov dx, word [es:si+001eeh] ; 26 8b 94 ee 01 xor ax, ax ; 31 c0 - call 0776fh ; e8 4b f8 + call 07778h ; e8 4b f8 mov es, cx ; 8e c1 add bx, si ; 01 f3 movzx bx, byte [es:bx+001e9h] ; 26 0f b6 9f e9 01 mov dx, word [es:si+001eeh] ; 26 8b 94 ee 01 xor ax, ax ; 31 c0 - call 07c5eh ; e8 26 fd + call 07c67h ; e8 26 fd mov bx, strict word 00035h ; bb 35 00 mov ax, si ; 89 f0 mov dx, cx ; 89 ca - call 0795ah ; e8 18 fa + call 07963h ; e8 18 fa mov es, cx ; 8e c1 mov dx, word [es:si+00ah] ; 26 8b 54 0a mov word [es:si+014h], dx ; 26 89 54 14 mov dx, word [es:si+001eeh] ; 26 8b 94 ee 01 xor ax, ax ; 31 c0 - call 07783h ; e8 2d f8 + call 0778ch ; e8 2d f8 xor ax, ax ; 31 c0 pop bp ; 5d pop si ; 5e retn 00004h ; c2 04 00 -ahci_cmd_packet_: ; 0xf7f5d LB 0x16e +ahci_cmd_packet_: ; 0xf7f66 LB 0x16e push si ; 56 push di ; 57 enter 0000eh, 000h ; c8 0e 00 00 @@ -11656,30 +11642,30 @@ ahci_cmd_packet_: ; 0xf7f5d LB 0x16e mov word [bp-00ch], cx ; 89 4e f4 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 a6 96 + call 0161ch ; e8 9d 96 mov si, 00122h ; be 22 01 mov word [bp-004h], ax ; 89 46 fc cmp byte [bp+00eh], 002h ; 80 7e 0e 02 - jne short 07fa1h ; 75 1f - mov bx, 00cd6h ; bb d6 0c + jne short 07faah ; 75 1f + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 21 99 - push 00bdeh ; 68 de 0b - push 00beeh ; 68 ee 0b + call 018aeh ; e8 18 99 + push 00be0h ; 68 e0 0b + push 00bf0h ; 68 f0 0b push strict byte 00004h ; 6a 04 - call 018e9h ; e8 51 99 + call 018e9h ; e8 48 99 add sp, strict byte 00006h ; 83 c4 06 mov ax, strict word 00001h ; b8 01 00 - jmp near 080c5h ; e9 24 01 + jmp near 080ceh ; e9 24 01 test byte [bp+008h], 001h ; f6 46 08 01 - jne short 07f9bh ; 75 f4 + jne short 07fa4h ; 75 f4 mov ax, word [bp+00ah] ; 8b 46 0a mov dx, word [bp+00ch] ; 8b 56 0c mov cx, strict word 00008h ; b9 08 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 07fb0h ; e2 fa + loop 07fb9h ; e2 fa mov es, [bp-004h] ; 8e 46 fc mov word [es:si], ax ; 26 89 04 mov word [es:si+002h], dx ; 26 89 54 02 @@ -11691,7 +11677,7 @@ ahci_cmd_packet_: ; 0xf7f5d LB 0x16e mov ax, word [bp+00ah] ; 8b 46 0a mov dx, word [bp+00ch] ; 8b 56 0c xor cx, cx ; 31 c9 - call 08c50h ; e8 73 0c + call 08c60h ; e8 7a 0c mov word [es:si+00ah], ax ; 26 89 44 0a xor di, di ; 31 ff mov ax, word [es:si+001eeh] ; 26 8b 84 ee 01 @@ -11701,28 +11687,28 @@ ahci_cmd_packet_: ; 0xf7f5d LB 0x16e sub word [bp-010h], strict byte 0000ch ; 83 6e f0 0c xor ax, ax ; 31 c0 mov dx, word [bp-006h] ; 8b 56 fa - call 0776fh ; e8 72 f7 + call 07778h ; e8 72 f7 mov es, [bp-004h] ; 8e 46 fc mov bx, word [bp-010h] ; 8b 5e f0 add bx, si ; 01 f3 movzx bx, byte [es:bx+001e9h] ; 26 0f b6 9f e9 01 mov dx, word [es:si+001eeh] ; 26 8b 94 ee 01 xor ax, ax ; 31 c0 - call 07c5eh ; e8 49 fc + call 07c67h ; e8 49 fc movzx ax, byte [bp-002h] ; 0f b6 46 fe push ax ; 50 mov bx, word [bp-00eh] ; 8b 5e f2 mov cx, word [bp-00ch] ; 8b 4e f4 mov ax, 000c0h ; b8 c0 00 mov dx, word [bp-006h] ; 8b 56 fa - call 08cc7h ; e8 9e 0c + call 08cd7h ; e8 a5 0c mov es, [bp-004h] ; 8e 46 fc mov word [es:si+014h], di ; 26 89 7c 14 mov word [es:si+016h], di ; 26 89 7c 16 mov word [es:si+018h], di ; 26 89 7c 18 mov ax, word [es:si+01ah] ; 26 8b 44 1a test ax, ax ; 85 c0 - je short 08067h ; 74 27 + je short 08070h ; 74 27 dec ax ; 48 mov es, [bp-006h] ; 8e 46 fa mov word [es:di+0010ch], ax ; 26 89 85 0c 01 @@ -11735,7 +11721,7 @@ ahci_cmd_packet_: ; 0xf7f5d LB 0x16e mov bx, 000a0h ; bb a0 00 mov ax, si ; 89 f0 mov dx, word [bp-004h] ; 8b 56 fc - call 0795ah ; e8 e8 f8 + call 07963h ; e8 e8 f8 les bx, [bp-00ah] ; c4 5e f6 mov ax, word [es:bx+004h] ; 26 8b 47 04 mov dx, word [es:bx+006h] ; 26 8b 57 06 @@ -11758,19 +11744,19 @@ ahci_cmd_packet_: ; 0xf7f5d LB 0x16e pop DS ; 1f mov ax, word [bp-00ah] ; 8b 46 f6 mov dx, word [bp-008h] ; 8b 56 f8 - call 07783h ; e8 d2 f6 + call 0778ch ; e8 d2 f6 les bx, [bp-00ah] ; c4 5e f6 mov ax, word [es:bx+006h] ; 26 8b 47 06 or ax, word [es:bx+004h] ; 26 0b 47 04 - jne short 080c3h ; 75 05 + jne short 080cch ; 75 05 mov ax, strict word 00004h ; b8 04 00 - jmp short 080c5h ; eb 02 + jmp short 080ceh ; eb 02 xor ax, ax ; 31 c0 leave ; c9 pop di ; 5f pop si ; 5e retn 0000ch ; c2 0c 00 -ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 +ahci_port_detect_device_: ; 0xf80d4 LB 0x3c3 push cx ; 51 push si ; 56 push di ; 57 @@ -11780,10 +11766,10 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov byte [bp-002h], bl ; 88 5e fe movzx cx, bl ; 0f b6 cb mov bx, cx ; 89 cb - call 07c5eh ; e8 7c fb + call 07c67h ; e8 7c fb mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 31 95 + call 0161ch ; e8 28 95 mov word [bp-01eh], ax ; 89 46 e2 mov si, 00122h ; be 22 01 mov word [bp-008h], ax ; 89 46 f8 @@ -11856,21 +11842,21 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 push strict byte 00000h ; 6a 00 mov bx, strict word 0000fh ; bb 0f 00 xor cx, cx ; 31 c9 - call 07851h ; e8 b2 f6 + call 0785ah ; e8 b2 f6 cmp ax, strict word 00003h ; 3d 03 00 - jne near 08489h ; 0f 85 e3 02 + jne near 08492h ; 0f 85 e3 02 mov es, [bp-008h] ; 8e 46 f8 mov al, byte [es:si+001edh] ; 26 8a 84 ed 01 mov byte [bp-004h], al ; 88 46 fc cmp AL, strict byte 004h ; 3c 04 - jnc near 08489h ; 0f 83 d2 02 + jnc near 08492h ; 0f 83 d2 02 mov dx, word [bp-012h] ; 8b 56 ee add dx, 00118h ; 81 c2 18 01 mov es, [bp-00ah] ; 8e 46 f6 mov ax, word [es:di+00260h] ; 26 8b 85 60 02 mov bx, strict word 00010h ; bb 10 00 xor cx, cx ; 31 c9 - call 07797h ; e8 c9 f5 + call 077a0h ; e8 c9 f5 mov ax, word [bp-012h] ; 8b 46 ee add ax, 00124h ; 05 24 01 cwd ; 99 @@ -11895,9 +11881,9 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov cl, byte [bp-004h] ; 8a 4e fc add cl, 00ch ; 80 c1 0c test dx, dx ; 85 d2 - jne near 083e3h ; 0f 85 d7 01 + jne near 083ech ; 0f 85 d7 01 cmp bx, 00101h ; 81 fb 01 01 - jne near 083e3h ; 0f 85 cf 01 + jne near 083ech ; 0f 85 cf 01 mov es, [bp-008h] ; 8e 46 f8 db 066h, 026h, 0c7h, 004h, 000h, 000h, 000h, 000h ; mov dword [es:si], strict dword 000000000h ; 66 26 c7 04 00 00 00 00 @@ -11909,7 +11895,7 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov bx, 000ech ; bb ec 00 mov ax, si ; 89 f0 mov dx, word [bp-01eh] ; 8b 56 e2 - call 0795ah ; e8 1b f7 + call 07963h ; e8 1b f7 mov byte [bp-006h], cl ; 88 4e fa test byte [bp-00220h], 080h ; f6 86 e0 fd 80 db 00fh, 095h, 0c0h @@ -11925,9 +11911,9 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov word [bp-010h], dx ; 89 56 f0 mov di, word [bp-001a6h] ; 8b be 5a fe cmp di, 00fffh ; 81 ff ff 0f - jne short 08282h ; 75 10 + jne short 0828bh ; 75 10 cmp dx, strict byte 0ffffh ; 83 fa ff - jne short 08282h ; 75 0b + jne short 0828bh ; 75 0b mov dx, word [bp-00158h] ; 8b 96 a8 fe mov word [bp-010h], dx ; 89 56 f0 mov di, word [bp-00156h] ; 8b be aa fe @@ -11956,61 +11942,61 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov word [es:si+030h], ax ; 26 89 44 30 mov al, byte [bp-004h] ; 8a 46 fc cmp AL, strict byte 001h ; 3c 01 - jc short 082edh ; 72 0c - jbe short 082f5h ; 76 12 + jc short 082f6h ; 72 0c + jbe short 082feh ; 76 12 cmp AL, strict byte 003h ; 3c 03 - je short 082fdh ; 74 16 + je short 08306h ; 74 16 cmp AL, strict byte 002h ; 3c 02 - je short 082f9h ; 74 0e - jmp short 08344h ; eb 57 + je short 08302h ; 74 0e + jmp short 0834dh ; eb 57 test al, al ; 84 c0 - jne short 08344h ; 75 53 + jne short 0834dh ; 75 53 mov DL, strict byte 040h ; b2 40 - jmp short 082ffh ; eb 0a + jmp short 08308h ; eb 0a mov DL, strict byte 048h ; b2 48 - jmp short 082ffh ; eb 06 + jmp short 08308h ; eb 06 mov DL, strict byte 050h ; b2 50 - jmp short 082ffh ; eb 02 + jmp short 08308h ; eb 02 mov DL, strict byte 058h ; b2 58 mov al, dl ; 88 d0 add AL, strict byte 007h ; 04 07 movzx bx, al ; 0f b6 d8 mov ax, bx ; 89 d8 - call 0165ch ; e8 51 93 + call 0165ch ; e8 48 93 test al, al ; 84 c0 - je short 08344h ; 74 35 + je short 0834dh ; 74 35 mov al, dl ; 88 d0 db 0feh, 0c0h ; inc al ; fe c0 xor ah, ah ; 30 e4 - call 0165ch ; e8 44 93 + call 0165ch ; e8 3b 93 xor ah, ah ; 30 e4 mov cx, ax ; 89 c1 sal cx, 008h ; c1 e1 08 movzx ax, dl ; 0f b6 c2 - call 0165ch ; e8 37 93 + call 0165ch ; e8 2e 93 xor ah, ah ; 30 e4 add ax, cx ; 01 c8 mov word [bp-01ch], ax ; 89 46 e4 mov al, dl ; 88 d0 add AL, strict byte 002h ; 04 02 xor ah, ah ; 30 e4 - call 0165ch ; e8 27 93 + call 0165ch ; e8 1e 93 xor ah, ah ; 30 e4 mov word [bp-016h], ax ; 89 46 ea mov ax, bx ; 89 d8 - call 0165ch ; e8 1d 93 + call 0165ch ; e8 14 93 movzx dx, al ; 0f b6 d0 - jmp short 08353h ; eb 0f + jmp short 0835ch ; eb 0f mov ax, word [bp-018h] ; 8b 46 e8 mov word [bp-01ch], ax ; 89 46 e4 mov ax, word [bp-014h] ; 8b 46 ec mov word [bp-016h], ax ; 89 46 ea mov dx, word [bp-01ah] ; 8b 56 e6 - mov bx, 00cd6h ; bb d6 0c + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 50 95 + call 018aeh ; e8 47 95 push di ; 57 push word [bp-010h] ; ff 76 f0 push dx ; 52 @@ -12023,9 +12009,9 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 push ax ; 50 movzx ax, byte [bp-004h] ; 0f b6 46 fc push ax ; 50 - push 00c0eh ; 68 0e 0c + push 00c10h ; 68 10 0c push strict byte 00004h ; 6a 04 - call 018e9h ; e8 65 95 + call 018e9h ; e8 5c 95 add sp, strict byte 00018h ; 83 c4 18 movzx ax, byte [bp-006h] ; 0f b6 46 fa imul ax, ax, strict byte 00018h ; 6b c0 18 @@ -12049,19 +12035,19 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov byte [es:bx+0019eh], dl ; 26 88 97 9e 01 mov dx, strict word 00075h ; ba 75 00 mov ax, strict word 00040h ; b8 40 00 - call 01600h ; e8 30 92 + call 01600h ; e8 27 92 mov dl, al ; 88 c2 db 0feh, 0c2h ; inc dl ; fe c2 movzx bx, dl ; 0f b6 da mov dx, strict word 00075h ; ba 75 00 mov ax, strict word 00040h ; b8 40 00 - call 0160eh ; e8 2e 92 - jmp near 0847bh ; e9 98 00 + call 0160eh ; e8 25 92 + jmp near 08484h ; e9 98 00 cmp dx, 0eb14h ; 81 fa 14 eb - jne near 0847bh ; 0f 85 90 00 + jne near 08484h ; 0f 85 90 00 cmp bx, 00101h ; 81 fb 01 01 - jne near 0847bh ; 0f 85 88 00 + jne near 08484h ; 0f 85 88 00 mov es, [bp-008h] ; 8e 46 f8 db 066h, 026h, 0c7h, 004h, 000h, 000h, 000h, 000h ; mov dword [es:si], strict dword 000000000h ; 66 26 c7 04 00 00 00 00 @@ -12073,7 +12059,7 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 mov bx, 000a1h ; bb a1 00 mov ax, si ; 89 f0 mov dx, word [bp-01eh] ; 8b 56 e2 - call 0795ah ; e8 3c f5 + call 07963h ; e8 3c f5 test byte [bp-00220h], 080h ; f6 86 e0 fd 80 db 00fh, 095h, 0c0h ; setne al ; 0f 95 c0 @@ -12111,7 +12097,7 @@ ahci_port_detect_device_: ; 0xf80cb LB 0x3c3 pop si ; 5e pop cx ; 59 retn ; c3 -ahci_mem_alloc_: ; 0xf848e LB 0x40 +ahci_mem_alloc_: ; 0xf8497 LB 0x40 push bx ; 53 push cx ; 51 push dx ; 52 @@ -12121,25 +12107,25 @@ ahci_mem_alloc_: ; 0xf848e LB 0x40 mov bp, sp ; 89 e5 mov dx, 00413h ; ba 13 04 xor ax, ax ; 31 c0 - call 0161ch ; e8 7e 91 + call 0161ch ; e8 75 91 test ax, ax ; 85 c0 - je short 084c7h ; 74 25 + je short 084d0h ; 74 25 dec ax ; 48 mov bx, ax ; 89 c3 xor dx, dx ; 31 d2 mov cx, strict word 0000ah ; b9 0a 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 084aah ; e2 fa + loop 084b3h ; e2 fa mov si, ax ; 89 c6 mov di, dx ; 89 d7 mov cx, strict word 00004h ; b9 04 00 shr di, 1 ; d1 ef rcr si, 1 ; d1 de - loop 084b7h ; e2 fa + loop 084c0h ; e2 fa mov dx, 00413h ; ba 13 04 xor ax, ax ; 31 c0 - call 0162ah ; e8 65 91 + call 0162ah ; e8 5c 91 mov ax, si ; 89 f0 pop bp ; 5d pop di ; 5f @@ -12148,7 +12134,7 @@ ahci_mem_alloc_: ; 0xf848e LB 0x40 pop cx ; 59 pop bx ; 5b retn ; c3 -ahci_hba_init_: ; 0xf84ce LB 0x120 +ahci_hba_init_: ; 0xf84d7 LB 0x120 push bx ; 53 push cx ; 51 push dx ; 52 @@ -12158,7 +12144,7 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 mov si, ax ; 89 c6 mov dx, strict word 0000eh ; ba 0e 00 mov ax, strict word 00040h ; b8 40 00 - call 0161ch ; e8 3a 91 + call 0161ch ; e8 31 91 mov bx, 00122h ; bb 22 01 mov word [bp-006h], ax ; 89 46 fa mov ax, strict word 00010h ; b8 10 00 @@ -12175,10 +12161,10 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 ; mov dx, ax ; 8b d0 shr eax, 010h ; 66 c1 e8 10 xchg dx, ax ; 92 - call 0848eh ; e8 87 ff + call 08497h ; e8 87 ff mov di, ax ; 89 c7 test ax, ax ; 85 c0 - je near 085d0h ; 0f 84 c1 00 + je near 085d9h ; 0f 84 c1 00 mov es, [bp-006h] ; 8e 46 fa mov word [es:bx+001eeh], di ; 26 89 bf ee 01 mov byte [es:bx+001edh], 000h ; 26 c6 87 ed 01 00 @@ -12192,7 +12178,7 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 xor cx, cx ; 31 c9 mov dx, strict word 00004h ; ba 04 00 mov ax, si ; 89 f0 - call 07797h ; e8 54 f2 + call 077a0h ; e8 54 f2 mov ax, strict word 00004h ; b8 04 00 xor cx, cx ; 31 c9 mov dx, si ; 89 f2 @@ -12209,7 +12195,7 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 shr eax, 010h ; 66 c1 e8 10 xchg dx, ax ; 92 test AL, strict byte 001h ; a8 01 - jne short 08543h ; 75 de + jne short 0854ch ; 75 de xor ax, ax ; 31 c0 xor cx, cx ; 31 c9 mov dx, si ; 89 f2 @@ -12227,35 +12213,35 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 push strict byte 00000h ; 6a 00 mov bx, strict word 0001fh ; bb 1f 00 xor cx, cx ; 31 c9 - call 07851h ; e8 c8 f2 + call 0785ah ; e8 c8 f2 db 0feh, 0c0h ; inc al ; fe c0 mov byte [bp-004h], al ; 88 46 fc mov byte [bp-002h], 000h ; c6 46 fe 00 - jmp short 0859dh ; eb 09 + jmp short 085a6h ; eb 09 inc byte [bp-002h] ; fe 46 fe cmp byte [bp-002h], 020h ; 80 7e fe 20 - jnc short 085ceh ; 73 31 + jnc short 085d7h ; 73 31 movzx cx, byte [bp-002h] ; 0f b6 4e fe mov ax, strict word 00001h ; b8 01 00 xor dx, dx ; 31 d2 - jcxz 085aeh ; e3 06 + jcxz 085b7h ; e3 06 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 085a8h ; e2 fa + loop 085b1h ; e2 fa mov bx, ax ; 89 c3 mov cx, dx ; 89 d1 mov dx, strict word 0000ch ; ba 0c 00 mov ax, si ; 89 f0 - call 0781bh ; e8 61 f2 + call 07824h ; e8 61 f2 test al, al ; 84 c0 - je short 08594h ; 74 d6 + je short 0859dh ; 74 d6 movzx bx, byte [bp-002h] ; 0f b6 5e fe xor ax, ax ; 31 c0 mov dx, di ; 89 fa - call 080cbh ; e8 02 fb + call 080d4h ; e8 02 fb dec byte [bp-004h] ; fe 4e fc - jne short 08594h ; 75 c6 + jne short 0859dh ; 75 c6 xor ax, ax ; 31 c0 leave ; c9 pop di ; 5f @@ -12267,21 +12253,22 @@ ahci_hba_init_: ; 0xf84ce LB 0x120 or ax, word [di] ; 0b 05 add AL, strict byte 003h ; 04 03 add al, byte [bx+di] ; 02 01 - add byte [bp+di-0667ah], bh ; 00 bb 86 99 - xchg byte [bx-05a7ah], bl ; 86 9f 86 a5 - xchg byte [bp+di-04e7ah], ch ; 86 ab 86 b1 - xchg byte [bx-0447ah], dh ; 86 b7 86 bb + add ah, al ; 00 c4 + xchg byte [bp+si-0577ah], ah ; 86 a2 86 a8 + xchg byte [bp-04b7ah], ch ; 86 ae 86 b4 + xchg byte [bp+si-03f7ah], bh ; 86 ba 86 c0 + xchg ah, al ; 86 c4 db 086h -_ahci_init: ; 0xf85ee LB 0xf9 +_ahci_init: ; 0xf85f7 LB 0xf9 push si ; 56 push di ; 57 enter 00006h, 000h ; c8 06 00 00 mov ax, 00601h ; b8 01 06 mov dx, strict word 00001h ; ba 01 00 - call 08ae0h ; e8 e3 04 + call 08ae9h ; e8 e3 04 mov dx, ax ; 89 c2 cmp ax, strict word 0ffffh ; 3d ff ff - je near 086e3h ; 0f 84 dd 00 + je near 086ech ; 0f 84 dd 00 xor al, al ; 30 c0 shr ax, 008h ; c1 e8 08 mov byte [bp-006h], al ; 88 46 fa @@ -12289,119 +12276,107 @@ _ahci_init: ; 0xf85ee LB 0xf9 xor dh, dh ; 30 f6 xor ah, ah ; 30 e4 mov bx, strict word 00034h ; bb 34 00 - call 08b08h ; e8 ed 04 + call 08b11h ; e8 ed 04 mov cl, al ; 88 c1 test cl, cl ; 84 c9 - je short 08644h ; 74 23 + je short 0864dh ; 74 23 movzx bx, cl ; 0f b6 d9 movzx di, byte [bp-004h] ; 0f b6 7e fc movzx si, byte [bp-006h] ; 0f b6 76 fa mov dx, di ; 89 fa mov ax, si ; 89 f0 - call 08b08h ; e8 d5 04 + call 08b11h ; e8 d5 04 cmp AL, strict byte 012h ; 3c 12 - je short 08644h ; 74 0d + je short 0864dh ; 74 0d mov al, cl ; 88 c8 db 0feh, 0c0h ; inc al ; fe c0 movzx bx, al ; 0f b6 d8 mov dx, di ; 89 fa mov ax, si ; 89 f0 - jmp short 08618h ; eb d4 + jmp short 08621h ; eb d4 test cl, cl ; 84 c9 - je near 086e3h ; 0f 84 99 00 + je near 086ech ; 0f 84 99 00 add cl, 002h ; 80 c1 02 movzx bx, cl ; 0f b6 d9 movzx di, byte [bp-004h] ; 0f b6 7e fc movzx si, byte [bp-006h] ; 0f b6 76 fa mov dx, di ; 89 fa mov ax, si ; 89 f0 - call 08b08h ; e8 a9 04 + call 08b11h ; e8 a9 04 cmp AL, strict byte 010h ; 3c 10 - jne near 086e3h ; 0f 85 7e 00 + jne near 086ech ; 0f 85 7e 00 mov byte [bp-002h], 000h ; c6 46 fe 00 mov al, cl ; 88 c8 add AL, strict byte 002h ; 04 02 movzx bx, al ; 0f b6 d8 mov dx, di ; 89 fa mov ax, si ; 89 f0 - call 08b29h ; e8 b2 04 + call 08b32h ; e8 b2 04 mov dx, ax ; 89 c2 and ax, strict word 0000fh ; 25 0f 00 sub ax, strict word 00004h ; 2d 04 00 cmp ax, strict word 0000bh ; 3d 0b 00 - jnbe short 086bbh ; 77 37 + jnbe short 086c4h ; 77 37 push CS ; 0e pop ES ; 07 mov cx, strict word 00008h ; b9 08 00 - mov di, 085d7h ; bf d7 85 + mov di, 085e0h ; bf e0 85 repne scasb ; f2 ae sal cx, 1 ; d1 e1 mov di, cx ; 89 cf - mov ax, word [cs:di-07a22h] ; 2e 8b 85 de 85 + mov ax, word [cs:di-07a19h] ; 2e 8b 85 e7 85 jmp ax ; ff e0 mov byte [bp-002h], 010h ; c6 46 fe 10 - jmp short 086bbh ; eb 1c + jmp short 086c4h ; eb 1c mov byte [bp-002h], 014h ; c6 46 fe 14 - jmp short 086bbh ; eb 16 + jmp short 086c4h ; eb 16 mov byte [bp-002h], 018h ; c6 46 fe 18 - jmp short 086bbh ; eb 10 + jmp short 086c4h ; eb 10 mov byte [bp-002h], 01ch ; c6 46 fe 1c - jmp short 086bbh ; eb 0a + jmp short 086c4h ; eb 0a mov byte [bp-002h], 020h ; c6 46 fe 20 - jmp short 086bbh ; eb 04 + jmp short 086c4h ; eb 04 mov byte [bp-002h], 024h ; c6 46 fe 24 mov si, dx ; 89 d6 shr si, 004h ; c1 ee 04 sal si, 002h ; c1 e6 02 mov al, byte [bp-002h] ; 8a 46 fe test al, al ; 84 c0 - je short 086e3h ; 74 19 + je short 086ech ; 74 19 movzx bx, al ; 0f b6 d8 movzx dx, byte [bp-004h] ; 0f b6 56 fc movzx ax, byte [bp-006h] ; 0f b6 46 fa - call 08b48h ; e8 70 04 + call 08b51h ; e8 70 04 test AL, strict byte 001h ; a8 01 - je short 086e3h ; 74 07 + je short 086ech ; 74 07 and AL, strict byte 0f0h ; 24 f0 add ax, si ; 01 f0 - call 084ceh ; e8 eb fd + call 084d7h ; e8 eb fd leave ; c9 pop di ; 5f pop si ; 5e retn ; c3 -apm_out_str_: ; 0xf86e7 LB 0x36 +apm_out_str_: ; 0xf86f0 LB 0x36 push bx ; 53 push bp ; 55 mov bp, sp ; 89 e5 mov bx, ax ; 89 c3 cmp byte [bx], 000h ; 80 3f 00 - je short 086fch ; 74 0a + je short 08705h ; 74 0a mov al, byte [bx] ; 8a 07 out DX, AL ; ee inc bx ; 43 mov al, byte [bx] ; 8a 07 db 00ah, 0c0h ; or al, al ; 0a c0 - jne short 086f4h ; 75 f8 + jne short 086fdh ; 75 f8 pop bp ; 5d pop bx ; 5b retn ; c3 - inc ax ; 40 - xchg word [bx], cx ; 87 0f - mov byte [bp+si-079h], dl ; 88 52 87 - insw ; 6d - xchg word [bx], cx ; 87 0f - mov byte [bx+si+00f87h], bl ; 88 98 87 0f - mov byte [di-01b79h], bl ; 88 9d 87 e4 - xchg sp, sp ; 87 e4 - xchg sp, sp ; 87 e4 - xchg di, bx ; 87 df - xchg sp, sp ; 87 e4 - xchg sp, sp ; 87 e4 - xchg di, dx ; 87 d7 - db 087h -_apm_function: ; 0xf871d LB 0xf5 + db 049h, 087h, 018h, 088h, 05bh, 087h, 076h, 087h, 018h, 088h, 0a1h, 087h, 018h, 088h, 0a6h, 087h + db 0edh, 087h, 0edh, 087h, 0edh, 087h, 0e8h, 087h, 0edh, 087h, 0edh, 087h, 0e0h, 087h +_apm_function: ; 0xf8726 LB 0xf5 push si ; 56 push bp ; 55 mov bp, sp ; 89 e5 @@ -12409,12 +12384,12 @@ _apm_function: ; 0xf871d LB 0xf5 mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 cmp ax, strict word 0000eh ; 3d 0e 00 - jnbe near 087e4h ; 0f 87 b3 00 + jnbe near 087edh ; 0f 87 b3 00 mov bx, ax ; 89 c3 add bx, ax ; 01 c3 mov dx, word [bp+01ah] ; 8b 56 1a or dl, 001h ; 80 ca 01 - jmp word [cs:bx-07901h] ; 2e ff a7 ff 86 + jmp word [cs:bx-078f8h] ; 2e ff a7 08 87 mov word [bp+014h], 00102h ; c7 46 14 02 01 mov word [bp+00eh], 0504dh ; c7 46 0e 4d 50 mov word [bp+012h], strict word 00003h ; c7 46 12 03 00 @@ -12422,7 +12397,7 @@ _apm_function: ; 0xf871d LB 0xf5 pop si ; 5e retn ; c3 mov word [bp+014h], 0f000h ; c7 46 14 00 f0 - mov word [bp+00eh], 08d34h ; c7 46 0e 34 8d + mov word [bp+00eh], 08d44h ; c7 46 0e 44 8d mov word [bp+012h], 0f000h ; c7 46 12 00 f0 mov ax, strict word 0fff0h ; b8 f0 ff mov word [bp+008h], ax ; 89 46 08 @@ -12451,23 +12426,23 @@ _apm_function: ; 0xf871d LB 0xf5 pop si ; 5e retn ; c3 cmp word [bp+012h], strict byte 00003h ; 83 7e 12 03 - je short 087c3h ; 74 20 + je short 087cch ; 74 20 cmp word [bp+012h], strict byte 00002h ; 83 7e 12 02 - je short 087bbh ; 74 12 + je short 087c4h ; 74 12 cmp word [bp+012h], strict byte 00001h ; 83 7e 12 01 - jne short 087cbh ; 75 1c + jne short 087d4h ; 75 1c mov dx, 08900h ; ba 00 89 - mov ax, 00c46h ; b8 46 0c - call 086e7h ; e8 2f ff + mov ax, 00c48h ; b8 48 0c + call 086f0h ; e8 2f ff pop bp ; 5d pop si ; 5e retn ; c3 mov dx, 08900h ; ba 00 89 - mov ax, 00c4eh ; b8 4e 0c - jmp short 087b5h ; eb f2 + mov ax, 00c50h ; b8 50 0c + jmp short 087beh ; eb f2 mov dx, 08900h ; ba 00 89 - mov ax, 00c56h ; b8 56 0c - jmp short 087b5h ; eb ea + mov ax, 00c58h ; b8 58 0c + jmp short 087beh ; eb ea or ah, 00ah ; 80 cc 0a mov word [bp+014h], ax ; 89 46 14 mov word [bp+01ah], dx ; 89 56 1a @@ -12479,16 +12454,16 @@ _apm_function: ; 0xf871d LB 0xf5 pop si ; 5e retn ; c3 or ah, 080h ; 80 cc 80 - jmp short 087ceh ; eb ea - mov bx, 00cd6h ; bb d6 0c + jmp short 087d7h ; eb ea + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 bf 90 + call 018aeh ; e8 b6 90 push word [bp+00eh] ; ff 76 0e push word [bp+014h] ; ff 76 14 - push 00c5fh ; 68 5f 0c + push 00c61h ; 68 61 0c push strict byte 00004h ; 6a 04 - call 018e9h ; e8 ec 90 + call 018e9h ; e8 e3 90 add sp, strict byte 00008h ; 83 c4 08 mov ax, word [bp+014h] ; 8b 46 14 xor ah, ah ; 30 e4 @@ -12498,7 +12473,7 @@ _apm_function: ; 0xf871d LB 0xf5 pop bp ; 5d pop si ; 5e retn ; c3 -pci16_select_reg_: ; 0xf8812 LB 0x21 +pci16_select_reg_: ; 0xf881b LB 0x21 push bx ; 53 push bp ; 55 mov bp, sp ; 89 e5 @@ -12514,7 +12489,7 @@ pci16_select_reg_: ; 0xf8812 LB 0x21 pop bp ; 5d pop bx ; 5b retn ; c3 -pci16_find_device_: ; 0xf8833 LB 0xf2 +pci16_find_device_: ; 0xf883c LB 0xf2 push si ; 56 push di ; 57 enter 0000ch, 000h ; c8 0c 00 00 @@ -12526,49 +12501,49 @@ pci16_find_device_: ; 0xf8833 LB 0xf2 xor bx, bx ; 31 db mov byte [bp-004h], 000h ; c6 46 fc 00 test bl, 007h ; f6 c3 07 - jne short 08879h ; 75 2d + jne short 08882h ; 75 2d mov dx, strict word 0000eh ; ba 0e 00 mov ax, bx ; 89 d8 - call 08812h ; e8 be ff + call 0881bh ; e8 be ff mov dx, 00cfeh ; ba fe 0c in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 mov byte [bp-002h], al ; 88 46 fe cmp AL, strict byte 0ffh ; 3c ff - jne short 08867h ; 75 06 + jne short 08870h ; 75 06 add bx, strict byte 00008h ; 83 c3 08 - jmp near 088fah ; e9 93 00 + jmp near 08903h ; e9 93 00 test byte [bp-002h], 080h ; f6 46 fe 80 - je short 08874h ; 74 07 + je short 0887dh ; 74 07 mov word [bp-006h], strict word 00001h ; c7 46 fa 01 00 - jmp short 08879h ; eb 05 + jmp short 08882h ; eb 05 mov word [bp-006h], strict word 00008h ; c7 46 fa 08 00 mov al, byte [bp-002h] ; 8a 46 fe and AL, strict byte 007h ; 24 07 cmp AL, strict byte 001h ; 3c 01 - jne short 088a1h ; 75 1f + jne short 088aah ; 75 1f mov ax, bx ; 89 d8 shr ax, 008h ; c1 e8 08 test ax, ax ; 85 c0 - jne short 088a1h ; 75 16 + jne short 088aah ; 75 16 mov dx, strict word 0001ah ; ba 1a 00 mov ax, bx ; 89 d8 - call 08812h ; e8 7f ff + call 0881bh ; e8 7f ff mov dx, 00cfeh ; ba fe 0c in AL, DX ; ec db 02ah, 0e4h ; sub ah, ah ; 2a e4 cmp al, byte [bp-004h] ; 3a 46 fc - jbe short 088a1h ; 76 03 + jbe short 088aah ; 76 03 mov byte [bp-004h], al ; 88 46 fc test di, di ; 85 ff - je short 088aah ; 74 05 + je short 088b3h ; 74 05 mov dx, strict word 00008h ; ba 08 00 - jmp short 088ach ; eb 02 + jmp short 088b5h ; eb 02 xor dx, dx ; 31 d2 mov ax, bx ; 89 d8 - call 08812h ; e8 61 ff + call 0881bh ; e8 61 ff mov dx, 00cfch ; ba fc 0c in eax, DX ; 66 ed db 08bh, 0d0h @@ -12579,45 +12554,45 @@ pci16_find_device_: ; 0xf8833 LB 0xf2 mov word [bp-008h], dx ; 89 56 f8 mov word [bp-00ch], strict word 00000h ; c7 46 f4 00 00 test di, di ; 85 ff - je short 088dbh ; 74 0f + je short 088e4h ; 74 0f mov cx, strict word 00008h ; b9 08 00 shr dx, 1 ; d1 ea rcr ax, 1 ; d1 d8 - loop 088cfh ; e2 fa + loop 088d8h ; e2 fa mov word [bp-00ah], ax ; 89 46 f6 mov word [bp-008h], dx ; 89 56 f8 mov ax, word [bp-008h] ; 8b 46 f8 cmp ax, word [bp-010h] ; 3b 46 f0 - jne short 088ebh ; 75 08 + jne short 088f4h ; 75 08 mov ax, word [bp-00ah] ; 8b 46 f6 cmp ax, word [bp-00eh] ; 3b 46 f2 - je short 088f1h ; 74 06 + je short 088fah ; 74 06 cmp word [bp-00ch], strict byte 00000h ; 83 7e f4 00 - je short 088f7h ; 74 06 + je short 08900h ; 74 06 dec si ; 4e cmp si, strict byte 0ffffh ; 83 fe ff - je short 08909h ; 74 12 + je short 08912h ; 74 12 add bx, word [bp-006h] ; 03 5e fa mov dx, bx ; 89 da shr dx, 008h ; c1 ea 08 movzx ax, byte [bp-004h] ; 0f b6 46 fc cmp dx, ax ; 39 c2 - jbe near 08847h ; 0f 86 3e ff + jbe near 08850h ; 0f 86 3e ff cmp si, strict byte 0ffffh ; 83 fe ff - jne short 08912h ; 75 04 + jne short 0891bh ; 75 04 mov ax, bx ; 89 d8 - jmp short 08915h ; eb 03 + jmp short 0891eh ; eb 03 mov ax, strict word 0ffffh ; b8 ff ff leave ; c9 pop di ; 5f pop si ; 5e retn ; c3 - add ax, 01f8ah ; 05 8a 1f - mov dh, byte [bp+si] ; 8a 32 - mov al, byte [bx-076h] ; 8a 47 8a - pop dx ; 5a - mov ch, byte [si-076h] ; 8a 6c 8a -_pci16_function: ; 0xf8925 LB 0x1bb + push CS ; 0e + mov ch, byte [bx+si] ; 8a 28 + mov bh, byte [bp+di] ; 8a 3b + mov dl, byte [bx+si-076h] ; 8a 50 8a + arpl word [bp+si-0758bh], cx ; 63 8a 75 8a +_pci16_function: ; 0xf892e LB 0x1bb push si ; 56 push di ; 57 push bp ; 55 @@ -12629,69 +12604,69 @@ _pci16_function: ; 0xf8925 LB 0x1bb mov ax, word [bp+024h] ; 8b 46 24 xor ah, ah ; 30 e4 cmp bx, strict byte 00003h ; 83 fb 03 - jc short 0895ch ; 72 1a - jbe short 089b4h ; 76 70 + jc short 08965h ; 72 1a + jbe short 089bdh ; 76 70 cmp bx, strict byte 0000eh ; 83 fb 0e - je near 08a80h ; 0f 84 35 01 + je near 08a89h ; 0f 84 35 01 cmp bx, strict byte 00008h ; 83 fb 08 - jc near 08aafh ; 0f 82 5d 01 + jc near 08ab8h ; 0f 82 5d 01 cmp bx, strict byte 0000dh ; 83 fb 0d - jbe near 089d9h ; 0f 86 80 00 - jmp near 08aafh ; e9 53 01 + jbe near 089e2h ; 0f 86 80 00 + jmp near 08ab8h ; e9 53 01 cmp bx, strict byte 00002h ; 83 fb 02 - je short 08984h ; 74 23 + je short 0898dh ; 74 23 cmp bx, strict byte 00001h ; 83 fb 01 - jne near 08aafh ; 0f 85 47 01 + jne near 08ab8h ; 0f 85 47 01 mov word [bp+024h], strict word 00001h ; c7 46 24 01 00 mov word [bp+018h], 00210h ; c7 46 18 10 02 mov word [bp+020h], strict word 00000h ; c7 46 20 00 00 mov word [bp+01ch], 04350h ; c7 46 1c 50 43 mov word [bp+01eh], 02049h ; c7 46 1e 49 20 - jmp near 08adch ; e9 58 01 + jmp near 08ae5h ; e9 58 01 cmp word [bp+01ch], strict byte 0ffffh ; 83 7e 1c ff - jne short 08990h ; 75 06 + jne short 08999h ; 75 06 or ah, 083h ; 80 cc 83 - jmp near 08ad5h ; e9 45 01 + jmp near 08adeh ; e9 45 01 mov bx, word [bp+00ch] ; 8b 5e 0c mov dx, word [bp+020h] ; 8b 56 20 mov ax, word [bp+01ch] ; 8b 46 1c xor cx, cx ; 31 c9 - call 08833h ; e8 95 fe + call 0883ch ; e8 95 fe cmp ax, strict word 0ffffh ; 3d ff ff - jne short 089aeh ; 75 0b + jne short 089b7h ; 75 0b mov ax, word [bp+024h] ; 8b 46 24 xor ah, ah ; 30 e4 or ah, 086h ; 80 cc 86 - jmp near 08ad5h ; e9 27 01 + jmp near 08adeh ; e9 27 01 mov word [bp+018h], ax ; 89 46 18 - jmp near 08adch ; e9 28 01 + jmp near 08ae5h ; e9 28 01 mov bx, word [bp+00ch] ; 8b 5e 0c mov ax, word [bp+020h] ; 8b 46 20 mov dx, word [bp+022h] ; 8b 56 22 mov cx, strict word 00001h ; b9 01 00 - call 08833h ; e8 70 fe + call 0883ch ; e8 70 fe cmp ax, strict word 0ffffh ; 3d ff ff - jne short 089d3h ; 75 0b + jne short 089dch ; 75 0b mov ax, word [bp+024h] ; 8b 46 24 xor ah, ah ; 30 e4 or ah, 086h ; 80 cc 86 - jmp near 08ad5h ; e9 02 01 + jmp near 08adeh ; e9 02 01 mov word [bp+018h], ax ; 89 46 18 - jmp near 08adch ; e9 03 01 + jmp near 08ae5h ; e9 03 01 cmp word [bp+008h], 00100h ; 81 7e 08 00 01 - jc short 089e6h ; 72 06 + jc short 089efh ; 72 06 or ah, 087h ; 80 cc 87 - jmp near 08ad5h ; e9 ef 00 + jmp near 08adeh ; e9 ef 00 mov dx, word [bp+008h] ; 8b 56 08 mov ax, word [bp+018h] ; 8b 46 18 - call 08812h ; e8 23 fe + call 0881bh ; e8 23 fe mov bx, word [bp+024h] ; 8b 5e 24 xor bh, bh ; 30 ff sub bx, strict byte 00008h ; 83 eb 08 cmp bx, strict byte 00005h ; 83 fb 05 - jnbe near 08adch ; 0f 87 de 00 + jnbe near 08ae5h ; 0f 87 de 00 add bx, bx ; 01 db - jmp word [cs:bx-076e7h] ; 2e ff a7 19 89 + jmp word [cs:bx-076deh] ; 2e ff a7 22 89 mov bx, word [bp+020h] ; 8b 5e 20 xor bl, bl ; 30 db mov dx, word [bp+008h] ; 8b 56 08 @@ -12702,14 +12677,14 @@ _pci16_function: ; 0xf8925 LB 0x1bb ; sub ah, ah ; 2a e4 or bx, ax ; 09 c3 mov word [bp+020h], bx ; 89 5e 20 - jmp near 08adch ; e9 bd 00 + jmp near 08ae5h ; e9 bd 00 mov dx, word [bp+008h] ; 8b 56 08 xor dh, dh ; 30 f6 and dl, 002h ; 80 e2 02 add dx, 00cfch ; 81 c2 fc 0c in ax, DX ; ed mov word [bp+020h], ax ; 89 46 20 - jmp near 08adch ; e9 aa 00 + jmp near 08ae5h ; e9 aa 00 mov dx, 00cfch ; ba fc 0c in eax, DX ; 66 ed db 08bh, 0d0h @@ -12718,21 +12693,21 @@ _pci16_function: ; 0xf8925 LB 0x1bb xchg dx, ax ; 92 mov word [bp+020h], ax ; 89 46 20 mov word [bp+022h], dx ; 89 56 22 - jmp near 08adch ; e9 95 00 + jmp near 08ae5h ; e9 95 00 mov ax, word [bp+020h] ; 8b 46 20 mov dx, word [bp+008h] ; 8b 56 08 xor dh, dh ; 30 f6 and dl, 003h ; 80 e2 03 add dx, 00cfch ; 81 c2 fc 0c out DX, AL ; ee - jmp near 08adch ; e9 82 00 + jmp near 08ae5h ; e9 82 00 mov ax, word [bp+020h] ; 8b 46 20 mov dx, word [bp+008h] ; 8b 56 08 xor dh, dh ; 30 f6 and dl, 002h ; 80 e2 02 add dx, 00cfch ; 81 c2 fc 0c out DX, ax ; ef - jmp short 08adch ; eb 70 + jmp short 08ae5h ; eb 70 mov ax, word [bp+020h] ; 8b 46 20 mov cx, word [bp+022h] ; 8b 4e 22 mov dx, 00cfch ; ba fc 0c @@ -12741,16 +12716,16 @@ _pci16_function: ; 0xf8925 LB 0x1bb db 08bh, 0c1h ; mov ax, cx ; 8b c1 out DX, eax ; 66 ef - jmp short 08adch ; eb 5c + jmp short 08ae5h ; eb 5c mov bx, word [bp+008h] ; 8b 5e 08 mov es, [bp+028h] ; 8e 46 28 mov cx, word [word 00000h] ; 8b 0e 00 00 cmp cx, word [es:bx] ; 26 3b 0f - jbe short 08a99h ; 76 0a + jbe short 08aa2h ; 76 0a mov ax, word [bp+024h] ; 8b 46 24 xor ah, ah ; 30 e4 or ah, 089h ; 80 cc 89 - jmp short 08ad5h ; eb 3c + jmp short 08adeh ; eb 3c les di, [es:bx+002h] ; 26 c4 7f 02 mov si, 0f2c0h ; be c0 f2 mov dx, ds ; 8c da @@ -12759,18 +12734,18 @@ _pci16_function: ; 0xf8925 LB 0x1bb rep movsb ; f3 a4 pop DS ; 1f mov word [bp+018h], 00a00h ; c7 46 18 00 0a - jmp short 08adch ; eb 2d - mov bx, 00cd6h ; bb d6 0c + jmp short 08ae5h ; eb 2d + mov bx, 00cd8h ; bb d8 0c mov cx, ds ; 8c d9 mov ax, strict word 00004h ; b8 04 00 - call 018aeh ; e8 f4 8d + call 018aeh ; e8 eb 8d mov ax, word [bp+018h] ; 8b 46 18 push ax ; 50 mov ax, word [bp+024h] ; 8b 46 24 push ax ; 50 - push 00c92h ; 68 92 0c + push 00c94h ; 68 94 0c push strict byte 00004h ; 6a 04 - call 018e9h ; e8 1f 8e + call 018e9h ; e8 16 8e add sp, strict byte 00008h ; 83 c4 08 mov ax, word [bp+024h] ; 8b 46 24 xor ah, ah ; 30 e4 @@ -12781,7 +12756,7 @@ _pci16_function: ; 0xf8925 LB 0x1bb pop di ; 5f pop si ; 5e retn ; c3 -pci_find_classcode_: ; 0xf8ae0 LB 0x28 +pci_find_classcode_: ; 0xf8ae9 LB 0x28 push bx ; 53 push cx ; 51 push si ; 56 @@ -12796,7 +12771,7 @@ pci_find_classcode_: ; 0xf8ae0 LB 0x28 ; mov cx, dx ; 8b ca int 01ah ; cd 1a cmp ah, 000h ; 80 fc 00 - je near 08b01h ; 0f 84 03 00 + je near 08b0ah ; 0f 84 03 00 mov bx, strict word 0ffffh ; bb ff ff mov ax, bx ; 89 d8 pop bp ; 5d @@ -12804,7 +12779,7 @@ pci_find_classcode_: ; 0xf8ae0 LB 0x28 pop cx ; 59 pop bx ; 5b retn ; c3 -pci_read_config_byte_: ; 0xf8b08 LB 0x21 +pci_read_config_byte_: ; 0xf8b11 LB 0x21 push cx ; 51 push di ; 57 push bp ; 55 @@ -12822,7 +12797,7 @@ pci_read_config_byte_: ; 0xf8b08 LB 0x21 pop di ; 5f pop cx ; 59 retn ; c3 -pci_read_config_word_: ; 0xf8b29 LB 0x1f +pci_read_config_word_: ; 0xf8b32 LB 0x1f push cx ; 51 push di ; 57 push bp ; 55 @@ -12840,7 +12815,7 @@ pci_read_config_word_: ; 0xf8b29 LB 0x1f pop di ; 5f pop cx ; 59 retn ; c3 -pci_read_config_dword_: ; 0xf8b48 LB 0x24 +pci_read_config_dword_: ; 0xf8b51 LB 0x24 push cx ; 51 push di ; 57 push bp ; 55 @@ -12860,7 +12835,7 @@ pci_read_config_dword_: ; 0xf8b48 LB 0x24 pop di ; 5f pop cx ; 59 retn ; c3 -vds_is_present_: ; 0xf8b6c LB 0x1d +vds_is_present_: ; 0xf8b75 LB 0x1d push bx ; 53 push bp ; 55 mov bp, sp ; 89 e5 @@ -12868,7 +12843,7 @@ vds_is_present_: ; 0xf8b6c LB 0x1d mov ax, strict word 00040h ; b8 40 00 mov es, ax ; 8e c0 test byte [es:bx], 020h ; 26 f6 07 20 - je short 08b84h ; 74 06 + je short 08b8dh ; 74 06 mov ax, strict word 00001h ; b8 01 00 pop bp ; 5d pop bx ; 5b @@ -12877,7 +12852,7 @@ vds_is_present_: ; 0xf8b6c LB 0x1d pop bp ; 5d pop bx ; 5b retn ; c3 -vds_real_to_lin_: ; 0xf8b89 LB 0x1e +vds_real_to_lin_: ; 0xf8b92 LB 0x1e push bx ; 53 push cx ; 51 push bp ; 55 @@ -12888,7 +12863,7 @@ vds_real_to_lin_: ; 0xf8b89 LB 0x1e mov cx, strict word 00004h ; b9 04 00 sal ax, 1 ; d1 e0 rcl dx, 1 ; d1 d2 - loop 08b97h ; e2 fa + loop 08ba0h ; e2 fa xor cx, cx ; 31 c9 add ax, bx ; 01 d8 adc dx, cx ; 11 ca @@ -12896,7 +12871,7 @@ vds_real_to_lin_: ; 0xf8b89 LB 0x1e pop cx ; 59 pop bx ; 5b retn ; c3 -vds_build_sg_list_: ; 0xf8ba7 LB 0x76 +vds_build_sg_list_: ; 0xf8bb0 LB 0x76 push si ; 56 push di ; 57 push bp ; 55 @@ -12910,23 +12885,23 @@ vds_build_sg_list_: ; 0xf8ba7 LB 0x76 mov word [es:di], bx ; 26 89 1d mov bx, word [bp+00ah] ; 8b 5e 0a mov word [es:di+002h], bx ; 26 89 5d 02 - call 08b89h ; e8 c3 ff + call 08b92h ; e8 c3 ff mov es, si ; 8e c6 mov word [es:di+004h], ax ; 26 89 45 04 mov word [es:di+006h], dx ; 26 89 55 06 mov word [es:di+008h], strict word 00000h ; 26 c7 45 08 00 00 - call 08b6ch ; e8 93 ff + call 08b75h ; e8 93 ff test ax, ax ; 85 c0 - je short 08bf0h ; 74 13 + je short 08bf9h ; 74 13 mov es, si ; 8e c6 mov ax, 08105h ; b8 05 81 mov dx, strict word 00000h ; ba 00 00 int 04bh ; cd 4b - jc near 08bedh ; 0f 82 02 00 + jc near 08bf6h ; 0f 82 02 00 db 032h, 0c0h ; xor al, al ; 32 c0 cbw ; 98 - jmp short 08c17h ; eb 27 + jmp short 08c20h ; eb 27 mov es, si ; 8e c6 mov word [es:di+00eh], strict word 00001h ; 26 c7 45 0e 01 00 mov dx, word [es:di+004h] ; 26 8b 55 04 @@ -12942,21 +12917,21 @@ vds_build_sg_list_: ; 0xf8ba7 LB 0x76 pop di ; 5f pop si ; 5e retn 00004h ; c2 04 00 -vds_free_sg_list_: ; 0xf8c1d LB 0x33 +vds_free_sg_list_: ; 0xf8c26 LB 0x3a push bx ; 53 push di ; 57 push bp ; 55 mov bp, sp ; 89 e5 mov bx, ax ; 89 c3 - call 08b6ch ; e8 45 ff + call 08b75h ; e8 45 ff test ax, ax ; 85 c0 - je short 08c3eh ; 74 13 + je short 08c47h ; 74 13 mov di, bx ; 89 df mov es, dx ; 8e c2 mov ax, 08106h ; b8 06 81 mov dx, strict word 00000h ; ba 00 00 int 04bh ; cd 4b - jc near 08c3dh ; 0f 82 02 00 + jc near 08c46h ; 0f 82 02 00 db 032h, 0c0h ; xor al, al ; 32 c0 cbw ; 98 @@ -12966,8 +12941,8 @@ vds_free_sg_list_: ; 0xf8c1d LB 0x33 pop di ; 5f pop bx ; 5b retn ; c3 - times 0x6 db 0 -__U4D: ; 0xf8c50 LB 0x39 + times 0xd db 0 +__U4D: ; 0xf8c60 LB 0x39 pushfw ; 9c push eax ; 66 50 push edx ; 66 52 @@ -12997,7 +12972,7 @@ __U4D: ; 0xf8c50 LB 0x39 rol eax, 010h ; 66 c1 c0 10 popfw ; 9d retn ; c3 -__U4M: ; 0xf8c89 LB 0x31 +__U4M: ; 0xf8c99 LB 0x31 pushfw ; 9c push eax ; 66 50 push edx ; 66 52 @@ -13022,7 +12997,7 @@ __U4M: ; 0xf8c89 LB 0x31 rol eax, 010h ; 66 c1 c0 10 popfw ; 9d retn ; c3 -_fmemset_: ; 0xf8cba LB 0xd +_fmemset_: ; 0xf8cca LB 0xd push di ; 57 mov es, dx ; 8e c2 db 08bh, 0f8h @@ -13032,7 +13007,7 @@ _fmemset_: ; 0xf8cba LB 0xd xchg al, bl ; 86 d8 pop di ; 5f retn ; c3 -_fmemcpy_: ; 0xf8cc7 LB 0x33 +_fmemcpy_: ; 0xf8cd7 LB 0x33 push bp ; 55 db 08bh, 0ech ; mov bp, sp ; 8b ec @@ -13052,18 +13027,18 @@ _fmemcpy_: ; 0xf8cc7 LB 0x33 pop di ; 5f leave ; c9 retn ; c3 - add byte [bx+si], dl ; 00 10 - lea dx, [bp+si] ; 8d 12 - lea dx, [0168dh] ; 8d 16 8d 16 - lea dx, [0188dh] ; 8d 16 8d 18 - lea bx, [bx+si] ; 8d 18 - lea bx, [bp+si] ; 8d 1a - lea bx, [01e8dh] ; 8d 1e 8d 1e - lea sp, [bx+si] ; 8d 20 - lea sp, [di] ; 8d 25 - lea sp, [bx] ; 8d 27 + add byte [bx+si], ah ; 00 20 + lea sp, [bp+si] ; 8d 22 + lea sp, [0268dh] ; 8d 26 8d 26 + lea sp, [0288dh] ; 8d 26 8d 28 + lea bp, [bx+si] ; 8d 28 + lea bp, [bp+si] ; 8d 2a + lea bp, [02e8dh] ; 8d 2e 8d 2e + lea si, [bx+si] ; 8d 30 + lea si, [di] ; 8d 35 + lea si, [bx] ; 8d 37 db 08dh -apm_worker: ; 0xf8cfa LB 0x3a +apm_worker: ; 0xf8d0a LB 0x3a sti ; fb push ax ; 50 db 032h, 0e4h @@ -13075,29 +13050,29 @@ apm_worker: ; 0xf8cfa LB 0x3a cmp AL, strict byte 00dh ; 3c 0d pop ax ; 58 mov AH, strict byte 053h ; b4 53 - jnc short 08d30h ; 73 25 - jmp word [cs:bp-07320h] ; 2e ff a6 e0 8c - jmp short 08d2eh ; eb 1c + jnc short 08d40h ; 73 25 + jmp word [cs:bp-07310h] ; 2e ff a6 f0 8c + jmp short 08d3eh ; eb 1c sti ; fb hlt ; f4 - jmp short 08d2eh ; eb 18 - jmp short 08d2eh ; eb 16 - jmp short 08d30h ; eb 16 + jmp short 08d3eh ; eb 18 + jmp short 08d3eh ; eb 16 + jmp short 08d40h ; eb 16 mov AH, strict byte 080h ; b4 80 - jmp short 08d32h ; eb 14 - jmp short 08d30h ; eb 10 + jmp short 08d42h ; eb 14 + jmp short 08d40h ; eb 10 mov ax, 00102h ; b8 02 01 - jmp short 08d2eh ; eb 09 - jmp short 08d2eh ; eb 07 + jmp short 08d3eh ; eb 09 + jmp short 08d3eh ; eb 07 mov BL, strict byte 000h ; b3 00 mov cx, strict word 00000h ; b9 00 00 - jmp short 08d2eh ; eb 00 + jmp short 08d3eh ; eb 00 clc ; f8 retn ; c3 mov AH, strict byte 009h ; b4 09 stc ; f9 retn ; c3 -apm_pm16_entry: ; 0xf8d34 LB 0x11 +apm_pm16_entry: ; 0xf8d44 LB 0x11 mov AH, strict byte 002h ; b4 02 push DS ; 1e push bp ; 55 @@ -13105,13 +13080,13 @@ apm_pm16_entry: ; 0xf8d34 LB 0x11 pop bp ; 5d add bp, strict byte 00008h ; 83 c5 08 mov ds, bp ; 8e dd - call 08cfah ; e8 b8 ff + call 08d0ah ; e8 b8 ff pop bp ; 5d pop DS ; 1f retf ; cb - ; Padding 0x4cbb bytes at 0xf8d45 - times 19643 db 0 + ; Padding 0x4cab bytes at 0xf8d55 + times 19627 db 0 section BIOS32 progbits vstart=0xda00 align=1 ; size=0x3aa class=CODE group=AUTO bios32_service: ; 0xfda00 LB 0x26 @@ -13158,7 +13133,7 @@ apm_pm32_entry: ; 0xfda40 LB 0x21 pop bp ; 5d add bp, strict byte 00008h ; 83 c5 08 push ebp ; 66 55 - mov bp, 08d36h ; bd 36 8d + mov bp, 08d46h ; bd 46 8d add byte [bx+si], al ; 00 00 push ebp ; 66 55 mov AH, strict byte 003h ; b4 03 @@ -13746,7 +13721,7 @@ normal_post: ; 0xfe098 LB 0x22b push CS ; 0e pop DS ; 1f cld ; fc - call 0489dh ; e8 e4 66 + call 048a6h ; e8 ed 66 pop DS ; 1f mov AL, strict byte 014h ; b0 14 out strict byte 070h, AL ; e6 70 @@ -13835,8 +13810,8 @@ normal_post: ; 0xfe098 LB 0x22b cld ; fc call 01b25h ; e8 89 38 call 01f23h ; e8 84 3c - call 085eeh ; e8 4c a3 - call 0770bh ; e8 66 94 + call 085f7h ; e8 55 a3 + call 07714h ; e8 6f 94 call 0ed2fh ; e8 87 0a call 0e2d2h ; e8 27 00 push CS ; 0e @@ -13968,7 +13943,7 @@ int19_handler: ; 0xfe6f2 LB 0x61 push CS ; 0e pop DS ; 1f cld ; fc - call 05ba7h ; e8 65 74 + call 05bb0h ; e8 6e 74 popaw ; 61 pop ES ; 07 pop DS ; 1f @@ -14084,7 +14059,7 @@ ebda_post: ; 0xfe7c0 LB 0xa4 push CS ; 0e pop DS ; 1f cld ; fc - call 04f8fh ; e8 4d 67 + call 04f98h ; e8 56 67 popaw ; 61 pop DS ; 1f pop ES ; 07 @@ -14101,7 +14076,7 @@ ebda_post: ; 0xfe7c0 LB 0xa4 push CS ; 0e pop DS ; 1f cld ; fc - call 04f8fh ; e8 2f 67 + call 04f98h ; e8 38 67 popaw ; 61 pop DS ; 1f pop ES ; 07 @@ -14200,7 +14175,7 @@ pmode_setup: ; 0xfe8e0 LB 0x37b push CS ; 0e pop DS ; 1f cld ; fc - call 04ba7h ; e8 d8 61 + call 04bb0h ; e8 e1 61 pop ES ; 07 popaw ; 61 pop DS ; 1f @@ -14253,7 +14228,7 @@ int13_relocated: ; 0xfec5b LB 0x55 pop DS ; 1f cld ; fc push 0ece9h ; 68 e9 ec - jmp near 03ba9h ; e9 12 4f + jmp near 03bb2h ; e9 1b 4f and dl, 0e0h ; 80 e2 e0 db 03ah, 0c2h ; cmp al, dl ; 3a c2 @@ -14299,16 +14274,16 @@ int13_notfloppy: ; 0xfecc8 LB 0x14 jc short 0ecdch ; 72 0f shr ebx, 010h ; 66 c1 eb 10 push bx ; 53 - call 03fd2h ; e8 fd 52 + call 03fdbh ; e8 06 53 pop bx ; 5b sal ebx, 010h ; 66 c1 e3 10 jmp short 0ece9h ; eb 0d int13_disk: ; 0xfecdc LB 0xd cmp ah, 040h ; 80 fc 40 jnbe short 0ece6h ; 77 05 - call 052a3h ; e8 bf 65 + call 052ach ; e8 c8 65 jmp short 0ece9h ; eb 03 - call 056dfh ; e8 f6 69 + call 056e8h ; e8 ff 69 int13_out: ; 0xfece9 LB 0x4 pop DS ; 1f pop ES ; 07 @@ -14521,7 +14496,7 @@ int17_handler: ; 0xfefd4 LB 0xd push CS ; 0e pop DS ; 1f cld ; fc - call 06d25h ; e8 48 7d + call 06d2eh ; e8 51 7d popaw ; 61 pop ES ; 07 pop DS ; 1f @@ -14569,28 +14544,28 @@ int19_relocated: ; 0xff0ac LB 0x90 ; mov bp, sp ; 8b ec mov ax, strict word 00001h ; b8 01 00 push ax ; 50 - call 0463bh ; e8 6b 55 + call 04644h ; e8 74 55 inc sp ; 44 inc sp ; 44 test ax, ax ; 85 c0 jne short 0f0feh ; 75 28 mov ax, strict word 00002h ; b8 02 00 push ax ; 50 - call 0463bh ; e8 5e 55 + call 04644h ; e8 67 55 inc sp ; 44 inc sp ; 44 test ax, ax ; 85 c0 jne short 0f0feh ; 75 1b mov ax, strict word 00003h ; b8 03 00 push strict byte 00003h ; 6a 03 - call 0463bh ; e8 50 55 + call 04644h ; e8 59 55 inc sp ; 44 inc sp ; 44 test ax, ax ; 85 c0 jne short 0f0feh ; 75 0d mov ax, strict word 00004h ; b8 04 00 push ax ; 50 - call 0463bh ; e8 43 55 + call 04644h ; e8 4c 55 inc sp ; 44 inc sp ; 44 test ax, ax ; 85 c0 @@ -14934,20 +14909,20 @@ int15_handler: ; 0xff859 LB 0x29 je short 0f87dh ; 74 0e cmp ah, 0c2h ; 80 fc c2 je short 0f882h ; 74 0e - call 05db0h ; e8 39 65 + call 05db9h ; e8 42 65 popaw ; 61 pop ES ; 07 pop DS ; 1f popfw ; 9d jmp short 0f890h ; eb 13 - call 0871dh ; e8 9d 8e + call 08726h ; e8 a6 8e jmp short 0f877h ; eb f5 int15_handler_mouse: ; 0xff882 LB 0x5 - call 0699fh ; e8 1a 71 + call 069a8h ; e8 23 71 jmp short 0f877h ; eb f0 int15_handler32: ; 0xff887 LB 0x9 pushad ; 66 60 - call 06279h ; e8 ed 69 + call 06282h ; e8 f6 69 popad ; 66 61 jmp short 0f878h ; eb e8 iret_modify_cf: ; 0xff890 LB 0x14 @@ -14977,7 +14952,7 @@ int74_handler: ; 0xff8a4 LB 0x2e push CS ; 0e pop DS ; 1f cld ; fc - call 068d9h ; e8 21 70 + call 068e2h ; e8 2a 70 pop cx ; 59 jcxz 0f8c7h ; e3 0c push strict byte 00000h ; 6a 00 @@ -15069,8 +15044,8 @@ font8x8: ; 0xffa6e LB 0x421 db 000h, 000h, 0fch, 098h, 030h, 064h, 0fch, 000h, 01ch, 030h, 030h, 0e0h, 030h, 030h, 01ch, 000h db 018h, 018h, 018h, 000h, 018h, 018h, 018h, 000h, 0e0h, 030h, 030h, 01ch, 030h, 030h, 0e0h, 000h db 076h, 0dch, 000h, 000h, 000h, 000h, 000h, 000h, 000h, 010h, 038h, 06ch, 0c6h, 0c6h, 0feh, 000h - db 080h, 0fch, 0b1h, 075h, 00fh, 006h, 01eh, 00eh, 01fh, 0fch, 066h, 060h, 0e8h, 0a8h, 08ah, 066h - db 061h, 01fh, 007h, 0cfh, 006h, 01eh, 060h, 00eh, 01fh, 0fch, 0e8h, 0f6h, 067h, 061h, 01fh, 007h + db 080h, 0fch, 0b1h, 075h, 00fh, 006h, 01eh, 00eh, 01fh, 0fch, 066h, 060h, 0e8h, 0b1h, 08ah, 066h + db 061h, 01fh, 007h, 0cfh, 006h, 01eh, 060h, 00eh, 01fh, 0fch, 0e8h, 0ffh, 067h, 061h, 01fh, 007h db 0cfh int70_handler: ; 0xffe8f LB 0x16 push ES ; 06 @@ -15079,7 +15054,7 @@ int70_handler: ; 0xffe8f LB 0x16 push CS ; 0e pop DS ; 1f cld ; fc - call 065c6h ; e8 2e 67 + call 065cfh ; e8 37 67 popaw ; 61 pop DS ; 1f pop ES ; 07 @@ -15174,4 +15149,4 @@ dummy_iret: ; 0xfff53 LB 0x9d db 'XM' cpu_reset: ; 0xffff0 LB 0x10 jmp far 0f000h:0e05bh ; ea 5b e0 00 f0 - db 030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 016h + db 030h, 036h, 02fh, 032h, 033h, 02fh, 039h, 039h, 000h, 0fch, 0efh diff --git a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum index f898075da..099137661 100644 --- a/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum +++ b/src/VBox/Devices/PC/BIOS/VBoxBiosAlternative.md5sum @@ -1 +1 @@ -d4a2d1ee388a49dfec870bfdc305f293 *VBoxPcBios.rom +2307c93a8ec36f280e9eb5eeebf81181 *VBoxPcBios.rom diff --git a/src/VBox/Devices/PC/BIOS/ahci.c b/src/VBox/Devices/PC/BIOS/ahci.c index 4c12038c8..67c8f42e6 100644 --- a/src/VBox/Devices/PC/BIOS/ahci.c +++ b/src/VBox/Devices/PC/BIOS/ahci.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/ata.c b/src/VBox/Devices/PC/BIOS/ata.c index 5290edeaf..3ce822772 100644 --- a/src/VBox/Devices/PC/BIOS/ata.c +++ b/src/VBox/Devices/PC/BIOS/ata.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/bios.c b/src/VBox/Devices/PC/BIOS/bios.c index 83a98d200..f703b0a65 100644 --- a/src/VBox/Devices/PC/BIOS/bios.c +++ b/src/VBox/Devices/PC/BIOS/bios.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/biosint.h b/src/VBox/Devices/PC/BIOS/biosint.h index 17cc6912c..67acffc74 100644 --- a/src/VBox/Devices/PC/BIOS/biosint.h +++ b/src/VBox/Devices/PC/BIOS/biosint.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/boot.c b/src/VBox/Devices/PC/BIOS/boot.c index 57212fa67..10d6bed0e 100644 --- a/src/VBox/Devices/PC/BIOS/boot.c +++ b/src/VBox/Devices/PC/BIOS/boot.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/eltorito.c b/src/VBox/Devices/PC/BIOS/eltorito.c index 38c0c242b..0a0f51ee4 100644 --- a/src/VBox/Devices/PC/BIOS/eltorito.c +++ b/src/VBox/Devices/PC/BIOS/eltorito.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -145,11 +145,11 @@ void BIOSCALL int13_eltorito(disk_regs_t r) switch (GET_AH()) { - // FIXME ElTorito Various. Should be implemented + // FIXME ElTorito Various. Not implemented in many real BIOSes. case 0x4a: // ElTorito - Initiate disk emu case 0x4c: // ElTorito - Initiate disk emu and boot case 0x4d: // ElTorito - Return Boot catalog - BX_PANIC("%s: call with AX=%04x. Please report\n", __func__, AX); + BX_INFO("%s: call with AX=%04x not implemented.\n", __func__, AX); goto int13_fail; break; diff --git a/src/VBox/Devices/PC/BIOS/inlines.h b/src/VBox/Devices/PC/BIOS/inlines.h index 75a3b6a31..c21ce8260 100644 --- a/src/VBox/Devices/PC/BIOS/inlines.h +++ b/src/VBox/Devices/PC/BIOS/inlines.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/keyboard.c b/src/VBox/Devices/PC/BIOS/keyboard.c index 67b7a8b57..b0051fa10 100644 --- a/src/VBox/Devices/PC/BIOS/keyboard.c +++ b/src/VBox/Devices/PC/BIOS/keyboard.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/logo.c b/src/VBox/Devices/PC/BIOS/logo.c index c36b87788..73f9ccfdf 100644 --- a/src/VBox/Devices/PC/BIOS/logo.c +++ b/src/VBox/Devices/PC/BIOS/logo.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2004-2011 Oracle Corporation + * Copyright (C) 2004-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/parallel.c b/src/VBox/Devices/PC/BIOS/parallel.c index d86612d59..e6e42bab9 100644 --- a/src/VBox/Devices/PC/BIOS/parallel.c +++ b/src/VBox/Devices/PC/BIOS/parallel.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/scsi.c b/src/VBox/Devices/PC/BIOS/scsi.c index 10a143bde..bde81c665 100644 --- a/src/VBox/Devices/PC/BIOS/scsi.c +++ b/src/VBox/Devices/PC/BIOS/scsi.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2004-2011 Oracle Corporation + * Copyright (C) 2004-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/serial.c b/src/VBox/Devices/PC/BIOS/serial.c index 6a401ac00..234088c3c 100644 --- a/src/VBox/Devices/PC/BIOS/serial.c +++ b/src/VBox/Devices/PC/BIOS/serial.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/system.c b/src/VBox/Devices/PC/BIOS/system.c index bcc9f3d6b..52a4896d4 100644 --- a/src/VBox/Devices/PC/BIOS/system.c +++ b/src/VBox/Devices/PC/BIOS/system.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/BIOS/timepci.c b/src/VBox/Devices/PC/BIOS/timepci.c index 2e0015638..ff87bb4f9 100644 --- a/src/VBox/Devices/PC/BIOS/timepci.c +++ b/src/VBox/Devices/PC/BIOS/timepci.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevACPI.cpp b/src/VBox/Devices/PC/DevACPI.cpp index 3557081bc..88f5b3ea2 100644 --- a/src/VBox/Devices/PC/DevACPI.cpp +++ b/src/VBox/Devices/PC/DevACPI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevAPIC.cpp b/src/VBox/Devices/PC/DevAPIC.cpp index 9c01c68a4..1627be060 100644 --- a/src/VBox/Devices/PC/DevAPIC.cpp +++ b/src/VBox/Devices/PC/DevAPIC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevDMA.cpp b/src/VBox/Devices/PC/DevDMA.cpp index ebcefdd5b..94e24d2c8 100644 --- a/src/VBox/Devices/PC/DevDMA.cpp +++ b/src/VBox/Devices/PC/DevDMA.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevFwCommon.cpp b/src/VBox/Devices/PC/DevFwCommon.cpp index 0efef3e9b..c454a9c7d 100644 --- a/src/VBox/Devices/PC/DevFwCommon.cpp +++ b/src/VBox/Devices/PC/DevFwCommon.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevFwCommon.h b/src/VBox/Devices/PC/DevFwCommon.h index 43f575c16..12f9aef9b 100644 --- a/src/VBox/Devices/PC/DevFwCommon.h +++ b/src/VBox/Devices/PC/DevFwCommon.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevHPET.cpp b/src/VBox/Devices/PC/DevHPET.cpp index 645f99f13..43638bbaa 100644 --- a/src/VBox/Devices/PC/DevHPET.cpp +++ b/src/VBox/Devices/PC/DevHPET.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevIoApic.cpp b/src/VBox/Devices/PC/DevIoApic.cpp index c19701435..dd1ed7eea 100644 --- a/src/VBox/Devices/PC/DevIoApic.cpp +++ b/src/VBox/Devices/PC/DevIoApic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevLPC.cpp b/src/VBox/Devices/PC/DevLPC.cpp index 6d2385e01..ec4df14a8 100644 --- a/src/VBox/Devices/PC/DevLPC.cpp +++ b/src/VBox/Devices/PC/DevLPC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevPIC.cpp b/src/VBox/Devices/PC/DevPIC.cpp index a95f0bad8..ca858f5f9 100644 --- a/src/VBox/Devices/PC/DevPIC.cpp +++ b/src/VBox/Devices/PC/DevPIC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevPcArch.c b/src/VBox/Devices/PC/DevPcArch.c index accaf4230..bee706dde 100644 --- a/src/VBox/Devices/PC/DevPcArch.c +++ b/src/VBox/Devices/PC/DevPcArch.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevPcBios.cpp b/src/VBox/Devices/PC/DevPcBios.cpp index 5e0e866f7..7a35f8716 100644 --- a/src/VBox/Devices/PC/DevPcBios.cpp +++ b/src/VBox/Devices/PC/DevPcBios.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevPcBios.h b/src/VBox/Devices/PC/DevPcBios.h index fbc66a5de..894072120 100644 --- a/src/VBox/Devices/PC/DevPcBios.h +++ b/src/VBox/Devices/PC/DevPcBios.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DevPit-i8254.cpp b/src/VBox/Devices/PC/DevPit-i8254.cpp index e4b098d4c..767cd1059 100644 --- a/src/VBox/Devices/PC/DevPit-i8254.cpp +++ b/src/VBox/Devices/PC/DevPit-i8254.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DrvACPI.cpp b/src/VBox/Devices/PC/DrvACPI.cpp index 250a8a402..55525e6c6 100644 --- a/src/VBox/Devices/PC/DrvACPI.cpp +++ b/src/VBox/Devices/PC/DrvACPI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/DrvAcpiCpu.cpp b/src/VBox/Devices/PC/DrvAcpiCpu.cpp index a69ac838f..be5f1a734 100644 --- a/src/VBox/Devices/PC/DrvAcpiCpu.cpp +++ b/src/VBox/Devices/PC/DrvAcpiCpu.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl index 9da7063c4..5c60c5b8e 100644 --- a/src/VBox/Devices/PC/vbox-cpuhotplug.dsl +++ b/src/VBox/Devices/PC/vbox-cpuhotplug.dsl @@ -3,7 +3,7 @@ // // VirtualBox ACPI // -// Copyright (C) 2006-2007 Oracle Corporation +// Copyright (C) 2006-2010 Oracle Corporation // // This file is part of VirtualBox Open Source Edition (OSE), as // available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/vbox-standard.dsl b/src/VBox/Devices/PC/vbox-standard.dsl index a7bec34c7..536113295 100644 --- a/src/VBox/Devices/PC/vbox-standard.dsl +++ b/src/VBox/Devices/PC/vbox-standard.dsl @@ -3,7 +3,7 @@ // // VirtualBox ACPI // -// Copyright (C) 2006-2007 Oracle Corporation +// Copyright (C) 2006-2010 Oracle Corporation // // This file is part of VirtualBox Open Source Edition (OSE), as // available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/PC/vbox.dsl b/src/VBox/Devices/PC/vbox.dsl index 20e0649fa..bc0e0920e 100644 --- a/src/VBox/Devices/PC/vbox.dsl +++ b/src/VBox/Devices/PC/vbox.dsl @@ -3,7 +3,7 @@ // // VirtualBox ACPI // -// Copyright (C) 2006-2007 Oracle Corporation +// Copyright (C) 2006-2011 Oracle Corporation // // This file is part of VirtualBox Open Source Edition (OSE), as // available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Parallel/DevParallel.cpp b/src/VBox/Devices/Parallel/DevParallel.cpp index e67d0e3cb..185673308 100644 --- a/src/VBox/Devices/Parallel/DevParallel.cpp +++ b/src/VBox/Devices/Parallel/DevParallel.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp index 926d0277f..bc0031df3 100644 --- a/src/VBox/Devices/Samples/VBoxSampleDevice.cpp +++ b/src/VBox/Devices/Samples/VBoxSampleDevice.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Serial/DevSerial.cpp b/src/VBox/Devices/Serial/DevSerial.cpp index f15312f0a..515c9f8ed 100644 --- a/src/VBox/Devices/Serial/DevSerial.cpp +++ b/src/VBox/Devices/Serial/DevSerial.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Serial/DrvChar.cpp b/src/VBox/Devices/Serial/DrvChar.cpp index f0b60afb6..bd382de64 100644 --- a/src/VBox/Devices/Serial/DrvChar.cpp +++ b/src/VBox/Devices/Serial/DrvChar.cpp @@ -10,7 +10,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Serial/DrvHostSerial.cpp b/src/VBox/Devices/Serial/DrvHostSerial.cpp index 09f6b05b9..2e198a7d8 100644 --- a/src/VBox/Devices/Serial/DrvHostSerial.cpp +++ b/src/VBox/Devices/Serial/DrvHostSerial.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Serial/DrvNamedPipe.cpp b/src/VBox/Devices/Serial/DrvNamedPipe.cpp index 4145d99d0..be9bebe2f 100644 --- a/src/VBox/Devices/Serial/DrvNamedPipe.cpp +++ b/src/VBox/Devices/Serial/DrvNamedPipe.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Serial/DrvRawFile.cpp b/src/VBox/Devices/Serial/DrvRawFile.cpp index 92d284081..5683faef6 100644 --- a/src/VBox/Devices/Serial/DrvRawFile.cpp +++ b/src/VBox/Devices/Serial/DrvRawFile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/ATAController.cpp b/src/VBox/Devices/Storage/ATAController.cpp index ca1ee31bd..e13d0a02f 100644 --- a/src/VBox/Devices/Storage/ATAController.cpp +++ b/src/VBox/Devices/Storage/ATAController.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/Debug.cpp b/src/VBox/Devices/Storage/Debug.cpp index 2b6678d53..1fb479e9c 100644 --- a/src/VBox/Devices/Storage/Debug.cpp +++ b/src/VBox/Devices/Storage/Debug.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h index d04a4e834..7ebd27c3f 100644 --- a/src/VBox/Devices/Storage/DevLsiLogicSCSI.h +++ b/src/VBox/Devices/Storage/DevLsiLogicSCSI.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvBlock.cpp b/src/VBox/Devices/Storage/DrvBlock.cpp index 8353d805d..0ebb13d8d 100644 --- a/src/VBox/Devices/Storage/DrvBlock.cpp +++ b/src/VBox/Devices/Storage/DrvBlock.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp index fa63d0503..e77e7ddc7 100644 --- a/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp +++ b/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvHostBase.cpp b/src/VBox/Devices/Storage/DrvHostBase.cpp index cf2cbdd1a..f708e1f1f 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.cpp +++ b/src/VBox/Devices/Storage/DrvHostBase.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvHostBase.h b/src/VBox/Devices/Storage/DrvHostBase.h index c999fc059..04a560b50 100644 --- a/src/VBox/Devices/Storage/DrvHostBase.h +++ b/src/VBox/Devices/Storage/DrvHostBase.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvHostFloppy.cpp b/src/VBox/Devices/Storage/DrvHostFloppy.cpp index a65185b62..c3fbf7f64 100644 --- a/src/VBox/Devices/Storage/DrvHostFloppy.cpp +++ b/src/VBox/Devices/Storage/DrvHostFloppy.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvMediaISO.cpp b/src/VBox/Devices/Storage/DrvMediaISO.cpp index f5fc8d24f..451f247fa 100644 --- a/src/VBox/Devices/Storage/DrvMediaISO.cpp +++ b/src/VBox/Devices/Storage/DrvMediaISO.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvRawImage.cpp b/src/VBox/Devices/Storage/DrvRawImage.cpp index 72d96bb9f..87474f935 100644 --- a/src/VBox/Devices/Storage/DrvRawImage.cpp +++ b/src/VBox/Devices/Storage/DrvRawImage.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvSCSI.cpp b/src/VBox/Devices/Storage/DrvSCSI.cpp index e7ff7068c..e9b646189 100644 --- a/src/VBox/Devices/Storage/DrvSCSI.cpp +++ b/src/VBox/Devices/Storage/DrvSCSI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvSCSIHost.cpp b/src/VBox/Devices/Storage/DrvSCSIHost.cpp index ac4b32c54..f2ddd25d9 100644 --- a/src/VBox/Devices/Storage/DrvSCSIHost.cpp +++ b/src/VBox/Devices/Storage/DrvSCSIHost.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/DrvVD.cpp b/src/VBox/Devices/Storage/DrvVD.cpp index 59f9f22e4..6659f40be 100644 --- a/src/VBox/Devices/Storage/DrvVD.cpp +++ b/src/VBox/Devices/Storage/DrvVD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/PIIX3ATABmDma.h b/src/VBox/Devices/Storage/PIIX3ATABmDma.h index 652a2d1fc..af7059a4c 100644 --- a/src/VBox/Devices/Storage/PIIX3ATABmDma.h +++ b/src/VBox/Devices/Storage/PIIX3ATABmDma.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/UsbMsd.cpp b/src/VBox/Devices/Storage/UsbMsd.cpp index d41b929ac..0c0745342 100644 --- a/src/VBox/Devices/Storage/UsbMsd.cpp +++ b/src/VBox/Devices/Storage/UsbMsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -309,7 +309,9 @@ static const VUSBDESCINTERFACEEX g_UsbMsdInterfaceDesc = /* .pvMore = */ NULL, /* .pvClass = */ NULL, /* .cbClass = */ 0, - &g_aUsbMsdEndpointDescs[0] + &g_aUsbMsdEndpointDescs[0], + /* .pIAD = */ NULL, + /* .cbIAD = */ 0 }; static const VUSBINTERFACE g_aUsbMsdInterfaces[2] = diff --git a/src/VBox/Devices/Storage/VBoxSCSI.cpp b/src/VBox/Devices/Storage/VBoxSCSI.cpp index 6351a8d35..f70e7c941 100644 --- a/src/VBox/Devices/Storage/VBoxSCSI.cpp +++ b/src/VBox/Devices/Storage/VBoxSCSI.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/VBoxSCSI.h b/src/VBox/Devices/Storage/VBoxSCSI.h index c30749a5e..13ef7e62a 100644 --- a/src/VBox/Devices/Storage/VBoxSCSI.h +++ b/src/VBox/Devices/Storage/VBoxSCSI.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp index 9a2f1f7ce..1438ffaf8 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILun.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp index 6da3833be..2a535b5ef 100644 --- a/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp +++ b/src/VBox/Devices/Storage/VSCSI/VSCSILunMmc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/fdc.c b/src/VBox/Devices/Storage/fdc.c index 703639e36..56cf395b6 100644 --- a/src/VBox/Devices/Storage/fdc.c +++ b/src/VBox/Devices/Storage/fdc.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/Storage/swab.h b/src/VBox/Devices/Storage/swab.h index 66086fd4b..32c80a2ed 100644 --- a/src/VBox/Devices/Storage/swab.h +++ b/src/VBox/Devices/Storage/swab.h @@ -14,7 +14,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/DevOHCI.cpp b/src/VBox/Devices/USB/DevOHCI.cpp index 2520da63f..033ae0ec6 100644 --- a/src/VBox/Devices/USB/DevOHCI.cpp +++ b/src/VBox/Devices/USB/DevOHCI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp index 236b023a4..ce7c8b2a1 100644 --- a/src/VBox/Devices/USB/USBProxyDevice-stub.cpp +++ b/src/VBox/Devices/USB/USBProxyDevice-stub.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/USBProxyDevice.cpp b/src/VBox/Devices/USB/USBProxyDevice.cpp index 77e79ae87..32a251465 100644 --- a/src/VBox/Devices/USB/USBProxyDevice.cpp +++ b/src/VBox/Devices/USB/USBProxyDevice.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/USBProxyDevice.h b/src/VBox/Devices/USB/USBProxyDevice.h index d9aa68493..7d0566fc0 100644 --- a/src/VBox/Devices/USB/USBProxyDevice.h +++ b/src/VBox/Devices/USB/USBProxyDevice.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/VUSBDevice.cpp b/src/VBox/Devices/USB/VUSBDevice.cpp index 49ffcb47f..0578a4ad4 100644 --- a/src/VBox/Devices/USB/VUSBDevice.cpp +++ b/src/VBox/Devices/USB/VUSBDevice.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -715,6 +715,7 @@ static void ReadCachedConfigDesc(PCVUSBDESCCONFIGEX pCfgDesc, uint8_t *pbBuf, ui PCVUSBINTERFACE pIf = &pCfgDesc->paIfs[i]; for (uint32_t j = 0; j < pIf->cSettings; j++) { + cbTotal += pIf->paSettings[j].cbIAD; cbTotal += pIf->paSettings[j].Core.bLength; cbTotal += pIf->paSettings[j].cbClass; for (unsigned k = 0; k < pIf->paSettings[j].Core.bNumEndpoints; k++) @@ -742,6 +743,7 @@ static void ReadCachedConfigDesc(PCVUSBDESCCONFIGEX pCfgDesc, uint8_t *pbBuf, ui { PCVUSBDESCINTERFACEEX pIfDesc = &pIf->paSettings[j]; + COPY_DATA(pbBuf, cbLeft, pIfDesc->pIAD, pIfDesc->cbIAD); COPY_DATA(pbBuf, cbLeft, pIfDesc, VUSB_DT_INTERFACE_MIN_LEN); COPY_DATA(pbBuf, cbLeft, pIfDesc->pvMore, pIfDesc->Core.bLength - VUSB_DT_INTERFACE_MIN_LEN); COPY_DATA(pbBuf, cbLeft, pIfDesc->pvClass, pIfDesc->cbClass); diff --git a/src/VBox/Devices/USB/VUSBInternal.h b/src/VBox/Devices/USB/VUSBInternal.h index c325a7ab1..44c68dda4 100644 --- a/src/VBox/Devices/USB/VUSBInternal.h +++ b/src/VBox/Devices/USB/VUSBInternal.h @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/VUSBReadAhead.cpp b/src/VBox/Devices/USB/VUSBReadAhead.cpp index 69ba7f566..b60f392f5 100644 --- a/src/VBox/Devices/USB/VUSBReadAhead.cpp +++ b/src/VBox/Devices/USB/VUSBReadAhead.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/VUSBUrb.cpp b/src/VBox/Devices/USB/VUSBUrb.cpp index 017e5a7e6..d0b2875ed 100644 --- a/src/VBox/Devices/USB/VUSBUrb.cpp +++ b/src/VBox/Devices/USB/VUSBUrb.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp index 79102d085..c9b410abc 100644 --- a/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp +++ b/src/VBox/Devices/USB/darwin/USBProxyDevice-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp index 6a7aade8b..d1f412eb7 100644 --- a/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp +++ b/src/VBox/Devices/USB/freebsd/USBProxyDevice-freebsd.cpp @@ -6,7 +6,7 @@ /* * Includes contributions from Hans Petter Selasky * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp index 9aa2f7e52..28e91fd59 100644 --- a/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp +++ b/src/VBox/Devices/USB/linux/USBProxyDevice-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp index 58074a429..22f753459 100644 --- a/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp +++ b/src/VBox/Devices/USB/os2/USBProxyDevice-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp index 7cc31bdf4..77e399ba5 100644 --- a/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp +++ b/src/VBox/Devices/USB/solaris/USBProxyDevice-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/testcase/tstPalmOne.c b/src/VBox/Devices/USB/testcase/tstPalmOne.c index 136c5d2ce..2bbbbf7d1 100644 --- a/src/VBox/Devices/USB/testcase/tstPalmOne.c +++ b/src/VBox/Devices/USB/testcase/tstPalmOne.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c index 22c857725..75416093a 100644 --- a/src/VBox/Devices/USB/testcase/tstTrekStorGo.c +++ b/src/VBox/Devices/USB/testcase/tstTrekStorGo.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp index 9aeb0e4e2..27b6eb188 100644 --- a/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp +++ b/src/VBox/Devices/USB/vrdp/USBProxyDevice-vrdp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp index 3031a38e3..948369100 100644 --- a/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp +++ b/src/VBox/Devices/USB/win/USBProxyDevice-win.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VMMDev/VMMDev.cpp b/src/VBox/Devices/VMMDev/VMMDev.cpp index e4328151f..088a90d62 100644 --- a/src/VBox/Devices/VMMDev/VMMDev.cpp +++ b/src/VBox/Devices/VMMDev/VMMDev.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp index 4a531a892..284f3bae9 100644 --- a/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp +++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VMMDev/VMMDevHGCM.h b/src/VBox/Devices/VMMDev/VMMDevHGCM.h index 0cc2b95fb..6ec1cd379 100644 --- a/src/VBox/Devices/VMMDev/VMMDevHGCM.h +++ b/src/VBox/Devices/VMMDev/VMMDevHGCM.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VMMDev/VMMDevState.h b/src/VBox/Devices/VMMDev/VMMDevState.h index c62995563..b4ebaa30f 100644 --- a/src/VBox/Devices/VMMDev/VMMDevState.h +++ b/src/VBox/Devices/VMMDev/VMMDevState.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VirtIO/Virtio.cpp b/src/VBox/Devices/VirtIO/Virtio.cpp index 3621c3389..93b3397f2 100644 --- a/src/VBox/Devices/VirtIO/Virtio.cpp +++ b/src/VBox/Devices/VirtIO/Virtio.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/VirtIO/Virtio.h b/src/VBox/Devices/VirtIO/Virtio.h index 75e914ff2..45feed0bf 100644 --- a/src/VBox/Devices/VirtIO/Virtio.h +++ b/src/VBox/Devices/VirtIO/Virtio.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/build/VBoxDD.cpp b/src/VBox/Devices/build/VBoxDD.cpp index 9f30b2e40..9e74cdb5c 100644 --- a/src/VBox/Devices/build/VBoxDD.cpp +++ b/src/VBox/Devices/build/VBoxDD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/build/VBoxDD.h b/src/VBox/Devices/build/VBoxDD.h index a72150949..6c184f606 100644 --- a/src/VBox/Devices/build/VBoxDD.h +++ b/src/VBox/Devices/build/VBoxDD.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/build/vl_vbox.h b/src/VBox/Devices/build/vl_vbox.h index 2d7f82632..891cb87c9 100644 --- a/src/VBox/Devices/build/vl_vbox.h +++ b/src/VBox/Devices/build/vl_vbox.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp index a704627cd..d51673b3b 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSize.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSize.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp index 608e86fde..35c1bee5e 100644 --- a/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp +++ b/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstAsm.mac b/src/VBox/Disassembler/testcase/tstAsm.mac index 0854d8615..bc64a1a44 100644 --- a/src/VBox/Disassembler/testcase/tstAsm.mac +++ b/src/VBox/Disassembler/testcase/tstAsm.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm index 533592011..218477cbc 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-1.asm @@ -8,7 +8,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm index f692b7e14..10ea65678 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-2.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-2.asm @@ -11,7 +11,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm index ece8485a4..f7fa171c4 100644 --- a/src/VBox/Disassembler/testcase/tstAsmLock-3.asm +++ b/src/VBox/Disassembler/testcase/tstAsmLock-3.asm @@ -7,7 +7,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm index daba0fadb..1cc28ae97 100644 --- a/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm +++ b/src/VBox/Disassembler/testcase/tstAsmRegs-1.asm @@ -8,7 +8,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstDisasm-1A.asm b/src/VBox/Disassembler/testcase/tstDisasm-1A.asm index 89829c85c..1146d986d 100644 --- a/src/VBox/Disassembler/testcase/tstDisasm-1A.asm +++ b/src/VBox/Disassembler/testcase/tstDisasm-1A.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2010 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp index d2c50d609..a83586055 100644 --- a/src/VBox/Disassembler/testcase/tstDisasm-2.cpp +++ b/src/VBox/Disassembler/testcase/tstDisasm-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile index 0227c0f3b..492eab4cd 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/Makefile +++ b/src/VBox/Frontends/Common/VBoxKeyboard/Makefile @@ -6,7 +6,7 @@ # Note that for reasons of convenience, VirtualBox builds this library # from inside its own build system rather than using this file. -# Copyright (C) 2007-2008 Oracle Corporation +# Copyright (C) 2007-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h b/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h index f9f346b3d..04d515ade 100644 --- a/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h +++ b/src/VBox/Frontends/Common/VBoxKeyboard/xkbtoscan.h @@ -87,6 +87,7 @@ struct { "AC09", 0x26 }, { "AC10", 0x27 }, { "AC11", 0x28 }, + { "AC12", 0x2b }, { "TLDE", 0x29 }, /* { "LFSH", 0x2a }, */ { "BKSL", 0x2b }, @@ -130,6 +131,7 @@ struct { "KP3", 0x51 }, { "KP0", 0x52 }, { "KPDL", 0x53 }, + { "KPPT", 0x7e }, { "LVL3", 0x138 }, */ { "LSGT", 0x56 }, /* { "FK11", 0x57 }, @@ -140,12 +142,14 @@ struct { "HENK", 0x79 }, { "HKTG", 0x70 }, { "MUHE", 0x7b }, + { "HZTG", 0x29 }, { "JPCM", 0x0 }, { "KPEN", 0x11c }, { "RCTL", 0x11d }, { "KPDV", 0x135 }, { "PRSC", 0x137 }, { "RALT", 0x138 }, + { "ALGR", 0x138 }, { "LNFD", 0x0 }, { "HOME", 0x147 }, { "UP", 0x148 }, @@ -167,12 +171,16 @@ struct { "PAUS", 0x45 }, { "I128", 0x0 }, { "I129", 0x7e }, + { "KPPT", 0x7e }, { "HNGL", 0xf2 }, { "HJCV", 0xf1 }, */ { "AE13", 0x7d }, /* { "LWIN", 0x15b }, + { "LMTA", 0x15b }, { "RWIN", 0x15c }, + { "RMTA", 0x15c }, { "COMP", 0x15d }, + { "MENU", 0x15d }, { "STOP", 0x168 }, { "AGAI", 0x105 }, { "PROP", 0x106 }, diff --git a/src/VBox/Frontends/VBoxBFE/AutoCaller.h b/src/VBox/Frontends/VBoxBFE/AutoCaller.h index a9818f821..d46ff2c3b 100644 --- a/src/VBox/Frontends/VBoxBFE/AutoCaller.h +++ b/src/VBox/Frontends/VBoxBFE/AutoCaller.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/COMDefs.h b/src/VBox/Frontends/VBoxBFE/COMDefs.h index e9fa6a905..70132eac2 100644 --- a/src/VBox/Frontends/VBoxBFE/COMDefs.h +++ b/src/VBox/Frontends/VBoxBFE/COMDefs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h b/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h index e1caace6e..5a45f791c 100644 --- a/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h +++ b/src/VBox/Frontends/VBoxBFE/ConsoleImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp b/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp index 010f31a5b..56fc637cb 100644 --- a/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/DisplayImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/DisplayImpl.h b/src/VBox/Frontends/VBoxBFE/DisplayImpl.h index d5658b2dd..cddcd9eac 100644 --- a/src/VBox/Frontends/VBoxBFE/DisplayImpl.h +++ b/src/VBox/Frontends/VBoxBFE/DisplayImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/EmulCpp.cpp b/src/VBox/Frontends/VBoxBFE/EmulCpp.cpp index 8b7f2f4a5..19b3441e8 100644 --- a/src/VBox/Frontends/VBoxBFE/EmulCpp.cpp +++ b/src/VBox/Frontends/VBoxBFE/EmulCpp.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/Framebuffer.h b/src/VBox/Frontends/VBoxBFE/Framebuffer.h index 67d640c4b..291ba18ff 100644 --- a/src/VBox/Frontends/VBoxBFE/Framebuffer.h +++ b/src/VBox/Frontends/VBoxBFE/Framebuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCM.cpp b/src/VBox/Frontends/VBoxBFE/HGCM.cpp index 856f7edb1..8658f5aa6 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCM.cpp +++ b/src/VBox/Frontends/VBoxBFE/HGCM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCM.h b/src/VBox/Frontends/VBoxBFE/HGCM.h index b52d906b1..cb237f799 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCM.h +++ b/src/VBox/Frontends/VBoxBFE/HGCM.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCMObjects.cpp b/src/VBox/Frontends/VBoxBFE/HGCMObjects.cpp index 74e6893e9..561a26ed8 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCMObjects.cpp +++ b/src/VBox/Frontends/VBoxBFE/HGCMObjects.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCMObjects.h b/src/VBox/Frontends/VBoxBFE/HGCMObjects.h index 397b60067..8857c123d 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCMObjects.h +++ b/src/VBox/Frontends/VBoxBFE/HGCMObjects.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp b/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp index 9a13f236b..b6b32edf2 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp +++ b/src/VBox/Frontends/VBoxBFE/HGCMThread.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/HGCMThread.h b/src/VBox/Frontends/VBoxBFE/HGCMThread.h index 06a2ce6d3..da50a574b 100644 --- a/src/VBox/Frontends/VBoxBFE/HGCMThread.h +++ b/src/VBox/Frontends/VBoxBFE/HGCMThread.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp index 62f6333e4..c4c62bfef 100644 --- a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h index 434da9f14..14e68b83e 100644 --- a/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h +++ b/src/VBox/Frontends/VBoxBFE/KeyboardImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/Logging.h b/src/VBox/Frontends/VBoxBFE/Logging.h index 6f9a7cda5..7ab07ea94 100644 --- a/src/VBox/Frontends/VBoxBFE/Logging.h +++ b/src/VBox/Frontends/VBoxBFE/Logging.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp b/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp index dc8309727..cd77d9668 100644 --- a/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.h b/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.h index 78ac9ca6c..665d86af6 100644 --- a/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.h +++ b/src/VBox/Frontends/VBoxBFE/MachineDebuggerImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp b/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp index 83924c0a9..7b150b7d2 100644 --- a/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h b/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h index b0f14a384..379e7a819 100644 --- a/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h +++ b/src/VBox/Frontends/VBoxBFE/NetworkAdapterImpl.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp b/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp index 2c650ba54..a2f6f6165 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp +++ b/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/SDLConsole.h b/src/VBox/Frontends/VBoxBFE/SDLConsole.h index 622572c08..f0a792f8c 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLConsole.h +++ b/src/VBox/Frontends/VBoxBFE/SDLConsole.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp b/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp index dc3e3f688..3671c4159 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp +++ b/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h b/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h index 160de2699..5296f5975 100644 --- a/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h +++ b/src/VBox/Frontends/VBoxBFE/SDLFramebuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp b/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp index c4bc449c5..d45a0318a 100644 --- a/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp +++ b/src/VBox/Frontends/VBoxBFE/StatusImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/StatusImpl.h b/src/VBox/Frontends/VBoxBFE/StatusImpl.h index 83347d4a1..52f8c562b 100644 --- a/src/VBox/Frontends/VBoxBFE/StatusImpl.h +++ b/src/VBox/Frontends/VBoxBFE/StatusImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp index 06c948b88..a51cfb96e 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFE.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFE.h b/src/VBox/Frontends/VBoxBFE/VBoxBFE.h index 37a2cb654..d11f2b867 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFE.h +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFE.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp index 62635e487..69a418e3d 100644 --- a/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp +++ b/src/VBox/Frontends/VBoxBFE/VBoxBFEHardened.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VMControl.cpp b/src/VBox/Frontends/VBoxBFE/VMControl.cpp index 774baf1aa..201cc3b39 100644 --- a/src/VBox/Frontends/VBoxBFE/VMControl.cpp +++ b/src/VBox/Frontends/VBoxBFE/VMControl.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VMControl.h b/src/VBox/Frontends/VBoxBFE/VMControl.h index bd3356726..79030e881 100644 --- a/src/VBox/Frontends/VBoxBFE/VMControl.h +++ b/src/VBox/Frontends/VBoxBFE/VMControl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VMMDev.h b/src/VBox/Frontends/VBoxBFE/VMMDev.h index c414139bc..a55d6450d 100644 --- a/src/VBox/Frontends/VBoxBFE/VMMDev.h +++ b/src/VBox/Frontends/VBoxBFE/VMMDev.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp index 74a10c06d..3924be009 100644 --- a/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp +++ b/src/VBox/Frontends/VBoxBFE/VMMDevInterface.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h b/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h index 9f1b05252..3927d1768 100644 --- a/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h +++ b/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp index 7bcddf635..47071b80b 100644 --- a/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp +++ b/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011-2012 Oracle Corporation + * Copyright (C) 2011-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -24,6 +24,7 @@ #endif /* !VBOX_ONLY_DOCS */ #include "VBoxWatchdogInternal.h" +#include <iprt/system.h> using namespace com; @@ -34,10 +35,11 @@ using namespace com; */ enum GETOPTDEF_BALLOONCTRL { - GETOPTDEF_BALLOONCTRL_BALLOOINC = 2000, + GETOPTDEF_BALLOONCTRL_BALLOONINC = 2000, GETOPTDEF_BALLOONCTRL_BALLOONDEC, GETOPTDEF_BALLOONCTRL_BALLOONLOWERLIMIT, GETOPTDEF_BALLOONCTRL_BALLOONMAX, + GETOPTDEF_BALLOONCTRL_BALLOONSAFETY, GETOPTDEF_BALLOONCTRL_TIMEOUTMS, GETOPTDEF_BALLOONCTRL_GROUPS }; @@ -48,10 +50,11 @@ enum GETOPTDEF_BALLOONCTRL static const RTGETOPTDEF g_aBalloonOpts[] = { { "--balloon-dec", GETOPTDEF_BALLOONCTRL_BALLOONDEC, RTGETOPT_REQ_UINT32 }, { "--balloon-groups", GETOPTDEF_BALLOONCTRL_GROUPS, RTGETOPT_REQ_STRING }, - { "--balloon-inc", GETOPTDEF_BALLOONCTRL_BALLOOINC, RTGETOPT_REQ_UINT32 }, + { "--balloon-inc", GETOPTDEF_BALLOONCTRL_BALLOONINC, RTGETOPT_REQ_UINT32 }, { "--balloon-interval", GETOPTDEF_BALLOONCTRL_TIMEOUTMS, RTGETOPT_REQ_UINT32 }, { "--balloon-lower-limit", GETOPTDEF_BALLOONCTRL_BALLOONLOWERLIMIT, RTGETOPT_REQ_UINT32 }, - { "--balloon-max", GETOPTDEF_BALLOONCTRL_BALLOONMAX, RTGETOPT_REQ_UINT32 } + { "--balloon-max", GETOPTDEF_BALLOONCTRL_BALLOONMAX, RTGETOPT_REQ_UINT32 }, + { "--balloon-safety-margin", GETOPTDEF_BALLOONCTRL_BALLOONSAFETY, RTGETOPT_REQ_UINT32 } }; static unsigned long g_ulMemoryBalloonTimeoutMS = 0; @@ -61,6 +64,7 @@ static unsigned long g_ulMemoryBalloonDecrementMB = 0; * "VBoxInternal/Guest/BalloonSizeMax" value. */ static unsigned long g_ulMemoryBalloonMaxMB = 0; static unsigned long g_ulMemoryBalloonLowerLimitMB = 0; +static unsigned long g_ulMemoryBalloonSafetyMB = _1K; /** The ballooning module's payload. */ typedef struct VBOXWATCHDOG_BALLOONCTRL_PAYLOAD @@ -111,6 +115,25 @@ static long balloonGetDelta(unsigned long ulCurrentDesktopBalloonSize, } if (ulCurrentDesktopBalloonSize + lBalloonDelta > ulMaxBalloonSize) lBalloonDelta = (ulMaxBalloonSize - ulCurrentDesktopBalloonSize); + + /* Limit the ballooning to the available memory, leaving some free. + * If anything fails clamp the delta to 0. */ + if (lBalloonDelta < 0) + { + uint64_t cbSafety = (uint64_t)g_ulMemoryBalloonSafetyMB * _1M; + uint64_t cbHostRamAvail = 0; + int vrc = RTSystemQueryAvailableRam(&cbHostRamAvail); + if (RT_SUCCESS(vrc)) + { + if (cbHostRamAvail < cbSafety) + lBalloonDelta = 0; + else if ((uint64_t)(-lBalloonDelta) > (cbHostRamAvail - cbSafety) / _1M) + lBalloonDelta = -(long)((cbHostRamAvail - cbSafety) / _1M); + } + else + lBalloonDelta = 0; + } + return lBalloonDelta; } @@ -372,7 +395,7 @@ static DECLCALLBACK(int) VBoxModBallooningOption(int argc, char *argv[], int *pi g_ulMemoryBalloonDecrementMB = ValueUnion.u32; break; - case GETOPTDEF_BALLOONCTRL_BALLOOINC: + case GETOPTDEF_BALLOONCTRL_BALLOONINC: g_ulMemoryBalloonIncrementMB = ValueUnion.u32; break; @@ -388,6 +411,10 @@ static DECLCALLBACK(int) VBoxModBallooningOption(int argc, char *argv[], int *pi g_ulMemoryBalloonMaxMB = ValueUnion.u32; break; + case GETOPTDEF_BALLOONCTRL_BALLOONSAFETY: + g_ulMemoryBalloonSafetyMB = ValueUnion.u32; + break; + /** @todo This option is a common module option! Put * this into a utility function! */ case GETOPTDEF_BALLOONCTRL_TIMEOUTMS: @@ -547,6 +574,7 @@ VBOXMODULE g_ModBallooning = /* (Legacy) note. */ "Set \"VBoxInternal/Guest/BalloonSizeMax\" for a per-VM maximum ballooning size.\n" #endif + "--balloon-safety-margin Free memory when deflating a balloon in MB (1024 MB).\n" , /* methods. */ VBoxModBallooningPreInit, diff --git a/src/VBox/Frontends/VBoxFB/Framebuffer.cpp b/src/VBox/Frontends/VBoxFB/Framebuffer.cpp index e9fa6aae0..e04282379 100644 --- a/src/VBox/Frontends/VBoxFB/Framebuffer.cpp +++ b/src/VBox/Frontends/VBoxFB/Framebuffer.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxFB/Framebuffer.h b/src/VBox/Frontends/VBoxFB/Framebuffer.h index 158b77090..49e81febd 100644 --- a/src/VBox/Frontends/VBoxFB/Framebuffer.h +++ b/src/VBox/Frontends/VBoxFB/Framebuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxFB/Helper.cpp b/src/VBox/Frontends/VBoxFB/Helper.cpp index 99ef8e2c5..dd552ff79 100644 --- a/src/VBox/Frontends/VBoxFB/Helper.cpp +++ b/src/VBox/Frontends/VBoxFB/Helper.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxFB/Helper.h b/src/VBox/Frontends/VBoxFB/Helper.h index 4426b727f..ffad3f93b 100644 --- a/src/VBox/Frontends/VBoxFB/Helper.h +++ b/src/VBox/Frontends/VBoxFB/Helper.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxFB/VBoxFB.cpp b/src/VBox/Frontends/VBoxFB/VBoxFB.cpp index 76e0ac61a..d9af54dbc 100644 --- a/src/VBox/Frontends/VBoxFB/VBoxFB.cpp +++ b/src/VBox/Frontends/VBoxFB/VBoxFB.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxHeadless/Framebuffer.h b/src/VBox/Frontends/VBoxHeadless/Framebuffer.h index 525852c3c..7928cc44a 100644 --- a/src/VBox/Frontends/VBoxHeadless/Framebuffer.h +++ b/src/VBox/Frontends/VBoxHeadless/Framebuffer.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h b/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h index 2c0822342..4056870c7 100644 --- a/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h +++ b/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp index 0061c4308..17129e08f 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1275,6 +1275,11 @@ extern "C" DECLEXPORT(int) TrustedMain(int argc, char **argv, char **envp) vboxListener = listener; com::SafeArray<VBoxEventType_T> eventTypes; eventTypes.push_back(VBoxEventType_OnGuestPropertyChanged); + + /* Set the notification pattern to not cause too much load. + * Remove (or extend) this pattern when more guest properties need to be handled. */ + CHECK_ERROR(machine, COMSETTER(GuestPropertyNotificationPatterns)(Bstr("/VirtualBox/GuestInfo/OS/*Logged*").raw())); + CHECK_ERROR(es, RegisterListener(vboxListener, ComSafeArrayAsInParam(eventTypes), true)); } diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.h b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.h index c241f5b5f..03a3e5764 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.h +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp index abb18eea8..2d05ed74d 100644 --- a/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp +++ b/src/VBox/Frontends/VBoxHeadless/VBoxHeadlessHardened.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp b/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp index 4d94438a1..018b12b0b 100644 --- a/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp +++ b/src/VBox/Frontends/VBoxHeadless/testcase/tstHeadless.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxManage/Makefile.kmk b/src/VBox/Frontends/VBoxManage/Makefile.kmk index 02427bf69..4f7c9e8aa 100644 --- a/src/VBox/Frontends/VBoxManage/Makefile.kmk +++ b/src/VBox/Frontends/VBoxManage/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -74,6 +74,7 @@ VBoxManage_DEFS += \ $(if $(VBOX_WITH_VBOXSDL), VBOX_WITH_VBOXSDL) \ $(if $(VBOX_WITH_VIDEOHWACCEL), VBOX_WITH_VIDEOHWACCEL) \ $(if $(VBOX_WITH_VIRTIO),VBOX_WITH_VIRTIO) \ + $(if $(VBOX_WITH_USB_VIDEO),VBOX_WITH_USB_VIDEO) \ $(if $(VBOX_WITH_USB_CARDREADER),VBOX_WITH_USB_CARDREADER) \ $(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH) \ $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX) diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp index 76c8be190..c8dfb4223 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageAppliance.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp index 6e708f9c9..c6e09abdb 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageBandwidthControl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp index e75310f1f..e59d64a0e 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageControlVM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -993,12 +993,18 @@ int handleControlVM(HandlerArg *a) domain = a->argv[5]; } - ComPtr<IGuest> guest; - CHECK_ERROR_BREAK(console, COMGETTER(Guest)(guest.asOutParam())); - CHECK_ERROR_BREAK(guest, SetCredentials(Bstr(a->argv[2]).raw(), - Bstr(passwd).raw(), - Bstr(domain).raw(), - fAllowLocalLogon)); + ComPtr<IGuest> pGuest; + CHECK_ERROR_BREAK(console, COMGETTER(Guest)(pGuest.asOutParam())); + if (!pGuest) + { + RTMsgError("Guest not running"); + rc = E_FAIL; + break; + } + CHECK_ERROR_BREAK(pGuest, SetCredentials(Bstr(a->argv[2]).raw(), + Bstr(passwd).raw(), + Bstr(domain).raw(), + fAllowLocalLogon)); } #if 0 /* TODO: review & remove */ else if (!strcmp(a->argv[1], "dvdattach")) @@ -1232,6 +1238,12 @@ int handleControlVM(HandlerArg *a) } ComPtr<IDisplay> pDisplay; CHECK_ERROR_BREAK(console, COMGETTER(Display)(pDisplay.asOutParam())); + if (!pDisplay) + { + RTMsgError("Cannot take a screenshot without a display"); + rc = E_FAIL; + break; + } ULONG width, height, bpp; CHECK_ERROR_BREAK(pDisplay, GetScreenResolution(displayIdx, &width, &height, &bpp)); com::SafeArray<BYTE> saScreenshot; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp index d072a4eaa..64214e319 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageGuestProp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp index 627714ca4..d81e8a308 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -355,6 +355,9 @@ void printUsage(USAGECATEGORY u64Cmd, PRTSTREAM pStrm) " [--faulttolerancesyncinterval <msec>]\n" " [--faulttolerancepassword <password>]\n" #endif +#ifdef VBOX_WITH_USB_VIDEO + " [--usbwebcam on|off]\n" +#endif #ifdef VBOX_WITH_USB_CARDREADER " [--usbcardreader on|off]\n" #endif diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp index a53b88fa5..d6099b1be 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageMetrics.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp index b660c57a9..9c05be8f6 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageModifyVM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -184,6 +184,9 @@ enum MODIFYVM_ATTACH_PCI, MODIFYVM_DETACH_PCI, #endif +#ifdef VBOX_WITH_USB_VIDEO + MODIFYVM_USBWEBCAM, +#endif #ifdef VBOX_WITH_USB_CARDREADER MODIFYVM_USBCARDREADER, #endif @@ -342,6 +345,9 @@ static const RTGETOPTDEF g_aModifyVMOptions[] = { "--pciattach", MODIFYVM_ATTACH_PCI, RTGETOPT_REQ_STRING }, { "--pcidetach", MODIFYVM_DETACH_PCI, RTGETOPT_REQ_STRING }, #endif +#ifdef VBOX_WITH_USB_VIDEO + { "--usbwebcam", MODIFYVM_USBWEBCAM, RTGETOPT_REQ_BOOL_ONOFF }, +#endif #ifdef VBOX_WITH_USB_CARDREADER { "--usbcardreader", MODIFYVM_USBCARDREADER, RTGETOPT_REQ_BOOL_ONOFF }, #endif @@ -2490,6 +2496,15 @@ int handleModifyVM(HandlerArg *a) break; } #endif + +#ifdef VBOX_WITH_USB_VIDEO + case MODIFYVM_USBWEBCAM: + { + CHECK_ERROR(machine, COMSETTER(EmulatedUSBWebcameraEnabled)(ValueUnion.f)); + break; + } +#endif /* VBOX_WITH_USB_VIDEO */ + #ifdef VBOX_WITH_USB_CARDREADER case MODIFYVM_USBCARDREADER: { diff --git a/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp b/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp index b379b2216..50dd71dbf 100644 --- a/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp +++ b/src/VBox/Frontends/VBoxManage/VBoxManageSnapshot.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/Framebuffer.h b/src/VBox/Frontends/VBoxSDL/Framebuffer.h index 69de07ebe..a9dfa9534 100644 --- a/src/VBox/Frontends/VBoxSDL/Framebuffer.h +++ b/src/VBox/Frontends/VBoxSDL/Framebuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/Helper.cpp b/src/VBox/Frontends/VBoxSDL/Helper.cpp index a2f4e275b..7340ce73a 100644 --- a/src/VBox/Frontends/VBoxSDL/Helper.cpp +++ b/src/VBox/Frontends/VBoxSDL/Helper.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/Helper.h b/src/VBox/Frontends/VBoxSDL/Helper.h index caf48f4f1..6b7252005 100644 --- a/src/VBox/Frontends/VBoxSDL/Helper.h +++ b/src/VBox/Frontends/VBoxSDL/Helper.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp index 64bcd25fb..cf80966f9 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h index 04b739559..038ab10ce 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDL.h +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDL.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp index f2ae76400..40dd494e1 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLHardened.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxSDL/VBoxSDLTest.cpp b/src/VBox/Frontends/VBoxSDL/VBoxSDLTest.cpp index bfd5524ba..650a6437d 100644 --- a/src/VBox/Frontends/VBoxSDL/VBoxSDLTest.cpp +++ b/src/VBox/Frontends/VBoxSDL/VBoxSDLTest.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VBoxShell/vboxinfo.vbs b/src/VBox/Frontends/VBoxShell/vboxinfo.vbs index c62659549..7808e7227 100644 --- a/src/VBox/Frontends/VBoxShell/vboxinfo.vbs +++ b/src/VBox/Frontends/VBoxShell/vboxinfo.vbs @@ -1,5 +1,5 @@ '
-' Copyright (C) 2009 Oracle Corporation
+' Copyright (C) 2009-2010 Oracle Corporation
'
' This file is part of VirtualBox Open Source Edition (OSE), as
' available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/Frontends/VirtualBox/VBoxUI.pro b/src/VBox/Frontends/VirtualBox/VBoxUI.pro index ffeb41027..72d747ba0 100644 --- a/src/VBox/Frontends/VirtualBox/VBoxUI.pro +++ b/src/VBox/Frontends/VirtualBox/VBoxUI.pro @@ -6,7 +6,7 @@ # # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk index e30279b3d..e8cb14e38 100644 --- a/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk +++ b/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2007-2008 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts index c513bd459..4e92cbd56 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts @@ -5828,7 +5828,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Enable USB 2.0 (E&HCI) Controller</source> - <translation>Habilita el controlador USB &2.0 (E&HCI)</translation> + <translation>Habilita el controlador USB 2.0 (E&HCI)</translation> </message> <message> <source>USB Device &Filters</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts index fcee02605..6b8ebd6af 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts @@ -5828,7 +5828,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source>Enable USB 2.0 (E&HCI) Controller</source> - <translation>Habilita el controlador USB &2.0 (E&HCI)</translation> + <translation>Habilita el controlador USB 2.0 (E&HCI)</translation> </message> <message> <source>USB Device &Filters</source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts index 1f32357a0..ba59f8b63 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_en.ts @@ -4,7 +4,7 @@ <context> <name>UIGChooserItemGroup</name> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="629"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="664"/> <source>%n group(s)</source> <comment>Group item tool-tip / Group info</comment> <translation> @@ -13,7 +13,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="645"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="680"/> <source>%n machine(s)</source> <comment>Group item tool-tip / Machine info</comment> <translation> @@ -22,7 +22,7 @@ </translation> </message> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="646"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="681"/> <source>(%n running)</source> <comment>Group item tool-tip / Running machine info</comment> <translation type="unfinished"> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts index 733cd1dfc..39232ac0e 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts @@ -6339,7 +6339,7 @@ </message> <message> <source><p>You are about to restore snapshot <nobr><b>%1</b></nobr>.</p><p>You can create a snapshot of the current state of the virtual machine first by checking the box below; if you do not do this the current state will be permanently lost. Do you wish to proceed?</p></source> - <translation><p>Vous êtes sur le point de restaurer l'instantané <nobr><b>%1</b></nobr>.</p><p> Vous pouvez créer un instantané de l'état actuel de la machine virtuelle en vérifiant d'abord la boîte ci-dessous. Si vous ne le faites pas, l'état actuel sera définitivement perdu. Souhaitez-vous procéder ?</p></translation> + <translation><p>Vous êtes sur le point de restaurer l'instantané <nobr><b>%1</b></nobr>.</p><p> Vous pouvez créer un instantané de l'état actuel de la machine virtuelle en cochant d'abord la boîte ci-dessous. Si vous ne le faites pas, l'état actuel sera définitivement perdu. Souhaitez-vous procéder ?</p></translation> </message> <message> <source><p>Are you sure you want to restore snapshot <nobr><b>%1</b></nobr>?</p></source> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts index e8571425a..f7472ca35 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts @@ -1270,17 +1270,17 @@ <translation>構æˆ</translation> </message> <message> - <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="42"/> + <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="48"/> <source>When checked a new unique MAC address will assigned to all configured network cards.</source> <translation>æ–°ã—ã„一æ„ã®MACアドレスãŒã™ã¹ã¦ã®è¨å®šã—ã¦ã‚ã‚‹ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚«ãƒ¼ãƒ‰ã«ä»˜ä¸Žã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="45"/> + <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="51"/> <source>&Reinitialize the MAC address of all network cards</source> <translation>ã™ã¹ã¦ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚«ãƒ¼ãƒ‰ã®MACアドレスをå†åˆæœŸåŒ–(&R)</translation> </message> <message> - <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="67"/> + <location filename="../src/widgets/UIApplianceEditorWidget.ui" line="76"/> <source>Warnings:</source> <translation>è¦å‘Š:</translation> </message> @@ -2556,13 +2556,13 @@ p, li { white-space: pre-wrap; } <context> <name>UIGChooserItemGroup</name> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="619"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="654"/> <source><b>%1</b></source> <comment>Group item tool-tip / Group name</comment> <translation><b>%1</b></translation> </message> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="629"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="664"/> <source>%n group(s)</source> <comment>Group item tool-tip / Group info</comment> <translation> @@ -2570,13 +2570,13 @@ p, li { white-space: pre-wrap; } </translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="632"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="667"/> <source><nobr>%1</nobr></source> <comment>Group item tool-tip / Group info wrapper</comment> <translation><nobr>%1</nobr></translation> </message> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="645"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="680"/> <source>%n machine(s)</source> <comment>Group item tool-tip / Machine info</comment> <translation> @@ -2584,7 +2584,7 @@ p, li { white-space: pre-wrap; } </translation> </message> <message numerus="yes"> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="646"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="681"/> <source>(%n running)</source> <comment>Group item tool-tip / Running machine info</comment> <translation> @@ -2592,34 +2592,34 @@ p, li { white-space: pre-wrap; } </translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="650"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="685"/> <source><nobr>%1</nobr></source> <comment>Group item tool-tip / Machine info wrapper</comment> <translation><nobr>%1</nobr></translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="651"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="686"/> <source><nobr>%1 %2</nobr></source> <comment>Group item tool-tip / Machine info wrapper, including running</comment> <translation><nobr>%1</nobr> {1 %2<?}</translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="666"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="701"/> <source>Collapse group</source> <translation>グループをãŸãŸã‚€</translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="666"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="701"/> <source>Expand group</source> <translation>グループを広ã’ã‚‹</translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="676"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="711"/> <source>Enter group</source> <translation>グループã«å…¥ã‚‹</translation> </message> <message> - <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="678"/> + <location filename="../src/selector/graphics/chooser/UIGChooserItemGroup.cpp" line="713"/> <source>Exit group</source> <translation>グループを出る</translation> </message> @@ -2647,68 +2647,68 @@ p, li { white-space: pre-wrap; } <translation>グループ</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="269"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="359"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="283"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="380"/> <source>%1 MB</source> <comment>details</comment> <translation>%1 MB</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="274"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="288"/> <source>Processors</source> <comment>details (system)</comment> <translation>プãƒã‚»ãƒƒã‚µãƒ¼</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="281"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="295"/> <source>%1%</source> <comment>details</comment> <translation>%1%</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="303"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="317"/> <source>VT-x/AMD-V</source> <comment>details (system)</comment> <translation>VT-x/AMD-V</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="310"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="324"/> <source>PAE/NX</source> <comment>details (system)</comment> <translation>PAE/NX</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="312"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="326"/> <source>Acceleration</source> <comment>details (system)</comment> <translation>アクセラレーション</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="364"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="385"/> <source>Screens</source> <comment>details (display)</comment> <translation>スクリーン</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="375"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="396"/> <source>3D</source> <comment>details (display)</comment> <translation>3D</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="377"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="398"/> <source>Acceleration</source> <comment>details (display)</comment> <translation>アクセラレーション</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="389"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="410"/> <source>Disabled</source> <comment>details (display/vrde/VRDE server)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="457"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="485"/> <source>[CD/DVD]</source> <comment>details (storage)</comment> <translation>[CD/DVD]</translation> @@ -2719,13 +2719,13 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">未割り当ã¦</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="522"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="557"/> <source>Controller</source> <comment>details (audio)</comment> <translation>コントãƒãƒ¼ãƒ©ãƒ¼</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="526"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="561"/> <source>Disabled</source> <comment>details (audio)</comment> <translation>無効</translation> @@ -2753,184 +2753,184 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="139"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="316"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="393"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="474"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="530"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="625"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="703"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="761"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="823"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="871"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="919"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="330"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="414"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="502"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="565"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="667"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="752"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="817"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="886"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="941"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="996"/> <source>Information Inaccessible</source> <comment>details</comment> <translation>å–å¾—ä¸å¯èƒ½ãªæƒ…å ±</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="268"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="282"/> <source>Base Memory</source> <comment>details (system)</comment> <translation>メインメモリー</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="280"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="294"/> <source>Execution Cap</source> <comment>details (system)</comment> <translation>使用率制é™</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="294"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="308"/> <source>Boot Order</source> <comment>details (system)</comment> <translation>èµ·å‹•é †åº</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="306"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="320"/> <source>Nested Paging</source> <comment>details (system)</comment> <translation>ãƒã‚¹ãƒ†ãƒƒãƒ‰ãƒšãƒ¼ã‚¸ãƒ³ã‚°</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="358"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="379"/> <source>Video Memory</source> <comment>details (display)</comment> <translation>ビデオメモリー</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="371"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="392"/> <source>2D Video</source> <comment>details (display)</comment> <translation>2D ビデオ</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="385"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="406"/> <source>Remote Desktop Server Port</source> <comment>details (display/vrde)</comment> <translation>リモートデスクトップサーãƒãƒ¼ãƒãƒ¼ãƒˆ</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="388"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="409"/> <source>Remote Desktop Server</source> <comment>details (display/vrde)</comment> <translation>リモートデスクトップサーãƒãƒ¼</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="471"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="499"/> <source>Not Attached</source> <comment>details (storage)</comment> <translation>未割り当ã¦</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="518"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="553"/> <source>Host Driver</source> <comment>details (audio)</comment> <translation>ホストドライãƒãƒ¼</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="586"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="628"/> <source>Bridged Adapter, %1</source> <comment>details (network)</comment> <translation>ブリッジアダプター, '%1'</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="592"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="634"/> <source>Internal Network, '%1'</source> <comment>details (network)</comment> <translation>内部ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯, '%1'</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="598"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="640"/> <source>Host-only Adapter, '%1'</source> <comment>details (network)</comment> <translation>ホストオンリーアダプター, '%1'</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="606"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="648"/> <source>Generic Driver, '%1'</source> <comment>details (network)</comment> <translation>汎用ドライãƒãƒ¼, '%1' </translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="607"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="649"/> <source>Generic Driver, '%1' {&nbsp;%2&nbsp;}</source> <comment>details (network)</comment> <translation>汎用ドライãƒãƒ¼, '%1' {&nbsp;%2&nbsp;} </translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="617"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="659"/> <source>Adapter %1</source> <comment>details (network)</comment> <translation>アダプター %1</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="622"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="664"/> <source>Disabled</source> <comment>details (network/adapter)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="695"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="744"/> <source>Port %1</source> <comment>details (serial)</comment> <translation>ãƒãƒ¼ãƒˆ %1</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="700"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="749"/> <source>Disabled</source> <comment>details (serial)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="753"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="809"/> <source>Port %1</source> <comment>details (parallel)</comment> <translation>ãƒãƒ¼ãƒˆ %1</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="758"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="814"/> <source>Disabled</source> <comment>details (parallel)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="813"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="876"/> <source>Device Filters</source> <comment>details (usb)</comment> <translation>デãƒã‚¤ã‚¹ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="820"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="883"/> <source>USB Controller Inaccessible</source> <comment>details (usb)</comment> <translation>USB コントãƒãƒ¼ãƒ©ãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="866"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="936"/> <source>Shared Folders</source> <comment>details (shared folders)</comment> <translation>共有フォルダー</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="814"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="877"/> <source>%1 (%2 active)</source> <comment>details (usb)</comment> <translation>%1 (%2 アクティブ)</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="817"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="880"/> <source>Disabled</source> <comment>details (usb)</comment> <translation>無効</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="868"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="938"/> <source>None</source> <comment>details (shared folders)</comment> <translation>ãªã—</translation> </message> <message> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="916"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="993"/> <source>None</source> <comment>details (description)</comment> <translation>ãªã—</translation> @@ -4412,37 +4412,37 @@ p, li { white-space: pre-wrap; } <translation type="obsolete">フãƒãƒƒãƒ”ーデãƒã‚¤ã‚¹ã®ãƒžã‚¦ãƒ³ãƒˆè§£é™¤</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1033"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1043"/> <source>Select a filename for the screenshot ...</source> <translation>スクリーンショットã®åå‰ã‚’é¸æŠž...</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1342"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1363"/> <source>No CD/DVD Devices Attached</source> <translation>CD/DVD デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1343"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1364"/> <source>No CD/DVD devices attached to that VM</source> <translation>CD/DVD デãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1346"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1367"/> <source>No Floppy Devices Attached</source> <translation>フãƒãƒƒãƒ”ーデãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1347"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1368"/> <source>No floppy devices attached to that VM</source> <translation>フãƒãƒƒãƒ”ーデãƒã‚¤ã‚¹ 未割り当ã¦</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1526"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1547"/> <source>No USB Devices Connected</source> <translation>USB デãƒã‚¤ã‚¹ 未接続</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1527"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1548"/> <source>No supported devices connected to the host PC</source> <translation>ホストマシンã«æŽ¥ç¶šã•ã‚ŒãŸãƒ‡ãƒã‚¤ã‚¹ã¯ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„ã¾ã›ã‚“</translation> </message> @@ -6010,21 +6010,21 @@ p, li { white-space: pre-wrap; } <translation>仮想ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãƒ•ã‚¡ã‚¤ãƒ«ã®é¸æŠž...</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1316"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1337"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2639"/> <source>Choose a virtual CD/DVD disk file...</source> <translation>仮想CD/DVDディスクファイルã®é¸æŠž...</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1317"/> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1323"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1338"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1344"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2646"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2663"/> <source>Remove disk from virtual drive</source> <translation>仮想ドライブã‹ã‚‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’除去</translation> </message> <message> - <location filename="../src/runtime/UIMachineLogic.cpp" line="1322"/> + <location filename="../src/runtime/UIMachineLogic.cpp" line="1343"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="2656"/> <source>Choose a virtual floppy disk file...</source> <translation>仮想フãƒãƒƒãƒ”ーディスクファイルã®é¸æŠž...</translation> @@ -6210,7 +6210,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../src/VBoxVMInformationDlg.cpp" line="546"/> <location filename="../src/globals/VBoxGlobal.cpp" line="1455"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="438"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="466"/> <location filename="../src/settings/machine/UIMachineSettingsStorage.cpp" line="543"/> <source>Controller: %1</source> <translation>コントãƒãƒ¼ãƒ©ãƒ¼: %1</translation> @@ -10389,17 +10389,17 @@ step and attach hard disks later using the VM Settings dialog.</p></source <context> <name>UIWizardCloneVM</name> <message> - <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="81"/> + <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="80"/> <source>Linked Base for %1 and %2</source> <translation>%1 㨠%2 を基準ã«ãƒªãƒ³ã‚¯ã™ã‚‹</translation> </message> <message> - <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="166"/> + <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="165"/> <source>Clone Virtual Machine</source> <translation>仮想マシンã®ã‚¯ãƒãƒ¼ãƒ³</translation> </message> <message> - <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="167"/> + <location filename="../src/wizards/clonevm/UIWizardCloneVM.cpp" line="166"/> <source>Clone</source> <translation>クãƒãƒ¼ãƒ³</translation> </message> @@ -13255,14 +13255,14 @@ Version %1</source> <translation type="obsolete"><hr><img src=%1/>&nbsp;ã“ã®ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã®å‰²ã‚Šå½“ã¦ã¯ã€æ–°è¦ä½œæˆã•ã‚ŒãŸå·®åˆ†ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã®ä½¿ç”¨ã«ã‚ˆã‚Šã€é–“接的ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="453"/> + <location filename="../src/medium/UIMedium.cpp" line="460"/> <source>Checking...</source> <comment>medium</comment> <translation>確èªä¸...</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="457"/> - <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="451"/> + <location filename="../src/medium/UIMedium.cpp" line="464"/> + <location filename="../src/selector/graphics/details/UIGDetailsElements.cpp" line="479"/> <source>Inaccessible</source> <comment>medium</comment> <translation>アクセスã§ãã¾ã›ã‚“</translation> @@ -14026,71 +14026,71 @@ Version %1</source> <translation>ホストドライブ %1 (%2)</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="255"/> + <location filename="../src/medium/UIMedium.cpp" line="262"/> <source><p style=white-space:pre>Type (Format): %1 (%2)</p></source> <comment>medium</comment> <translation><p style=white-space:pre>タイプ (å½¢å¼): %1 (%2)</p></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="259"/> + <location filename="../src/medium/UIMedium.cpp" line="266"/> <source><p>Attached to: %1</p></source> <comment>image</comment> <translation><p>割り当ã¦: %1</p></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="260"/> + <location filename="../src/medium/UIMedium.cpp" line="267"/> <source><i>Not Attached</i></source> <comment>image</comment> <translation><i>未割り当ã¦</i></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="266"/> + <location filename="../src/medium/UIMedium.cpp" line="273"/> <source><i>Checking accessibility...</i></source> <comment>medium</comment> <translation><i>アクセスå¯å¦ã‚’確èªä¸...</i></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="279"/> + <location filename="../src/medium/UIMedium.cpp" line="286"/> <source>Failed to check media accessibility.</source> <comment>medium</comment> <translation>メディアã®ã‚¢ã‚¯ã‚»ã‚¹å¯å¦ã®ç¢ºèªã«å¤±æ•—ã—ã¾ã—ãŸã€‚</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="324"/> + <location filename="../src/medium/UIMedium.cpp" line="331"/> <source><b>No medium selected</b></source> <comment>medium</comment> <translation><b>メディア 未é¸æŠž</b></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="325"/> + <location filename="../src/medium/UIMedium.cpp" line="332"/> <source>You can also change this while the machine is running.</source> <translation>仮想マシンã®å‹•ä½œä¸ã€ã“れを変更ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="326"/> + <location filename="../src/medium/UIMedium.cpp" line="333"/> <source><b>No media available</b></source> <comment>medium</comment> <translation><b>メディア 利用ä¸å¯</b></translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="327"/> + <location filename="../src/medium/UIMedium.cpp" line="334"/> <source>You can create media images using the virtual media manager.</source> <translation>仮想メディアマãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã‚’使ã£ã¦ãƒ¡ãƒ‡ã‚£ã‚¢ã®ã‚¤ãƒ¡ãƒ¼ã‚¸ã‚’作æˆã§ãã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="337"/> + <location filename="../src/medium/UIMedium.cpp" line="344"/> <source>Attaching this hard disk will be performed indirectly using a newly created differencing hard disk.</source> <comment>medium</comment> <translation>ã“ã®ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã®å‰²ã‚Šå½“ã¦ã¯ã€æ–°è¦ä½œæˆã•ã‚ŒãŸå·®åˆ†ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã®ä½¿ç”¨ã«ã‚ˆã‚Šã€é–“接的ã«å®Ÿè¡Œã•ã‚Œã¾ã™ã€‚</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="492"/> + <location filename="../src/medium/UIMedium.cpp" line="499"/> <source>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> <comment>medium</comment> <translation>ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ãƒã‚§ãƒ¼ãƒ³ä¸ã®ã„ãã¤ã‹ã®ãƒ¡ãƒ‡ã‚£ã‚¢ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。仮想メディアマãƒãƒ¼ã‚¸ãƒ£ãƒ¼ã®<b>[差分ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’表示]</b>を使用ã—ã¦ã€ã“れらã®ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’確èªã—ã¦ãã ã•ã„。</translation> </message> <message> - <location filename="../src/medium/UIMedium.cpp" line="509"/> + <location filename="../src/medium/UIMedium.cpp" line="516"/> <source>This base hard disk is indirectly attached using the following differencing hard disk:</source> <comment>medium</comment> <translation>ã“ã®ãƒ™ãƒ¼ã‚¹ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã¯ä»¥ä¸‹ã®å·®åˆ†ãƒãƒ¼ãƒ‰ãƒ‡ã‚£ã‚¹ã‚¯ã‚’使用ã—ã¦é–“接的ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¾ã™:</translation> diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts index 135b009b1..86f3eddf4 100644 --- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts +++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts @@ -6784,7 +6784,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source> Would you like to force mounting of this medium?</source> - <translation> Ðе желаете ли произвеÑти Ñиловое подключение данного уÑтройÑтва?</translation> + <translation> Желаете принудительно подключить данное уÑтройÑтво?</translation> </message> <message> <source>Unable to unmount the %1 <nobr><b>%2</b></nobr> from the machine <b>%3</b>.</source> @@ -6792,7 +6792,7 @@ p, li { white-space: pre-wrap; } </message> <message> <source> Would you like to force unmounting of this medium?</source> - <translation> Ðе желаете ли произвеÑти Ñиловое отключение данного уÑтройÑтва?</translation> + <translation> Желаете принудительно отключить данное уÑтройÑтво?</translation> </message> <message> <source>Force Unmount</source> diff --git a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp index d86e4f7fc..c78fe8779 100644 --- a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h index 086e208e4..953c22cbd 100644 --- a/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/UIMediumTypeChangeDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp b/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp index fa2098dbc..0949aeec0 100644 --- a/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h b/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h index dc9ce4e4e..4af8e8140 100644 --- a/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h +++ b/src/VBox/Frontends/VirtualBox/src/UIVMLogViewer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp index 543bb3595..06234ba11 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxAboutDlg.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp index 0960b3797..dddc635e1 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h index 7bc8c78b2..2f248c933 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h index ba345f60b..70eda2ae9 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlayCommon.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp index 793e3854e..9aca17c85 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxFBQGL.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp index 67d603d5b..baaf46a82 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxGLSupportInfo.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp index 0ba9d9af5..1e68570c7 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp index 1e6d537dc..ebf627cb9 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxLicenseViewer.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp index ba54ca745..c9c8acaa1 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h index 9337f3ded..674b64f53 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h +++ b/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotDetailsDlg.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp index 76cfac240..5d1930214 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.h b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.h index 586dd872d..8a9cde577 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.h +++ b/src/VBox/Frontends/VirtualBox/src/VBoxTakeSnapshotDlg.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h b/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h index c63e4bd85..a048681b6 100644 --- a/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h +++ b/src/VBox/Frontends/VirtualBox/src/VBoxVMInformationDlg.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp index 773adb8c6..231f8a7e3 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h index 7e1767c14..14cd1c56a 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonPress.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp index 062cefb99..532fce730 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h index 590545b40..883798ef1 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowButtonSwitch.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp index 15d82dcc9..01ef29bef 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h index 9aabda6f9..b00e921cc 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIArrowSplitter.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp index 187cb5b1f..2481c7eed 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h index 769c69208..0664db57f 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp index 84cfca887..43a430525 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h index 1bb1631de..6d1298525 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIDialogButtonBox.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp index d1f06fefe..c3921a035 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.h index c2782359e..f83dba47e 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIFileDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp index dd034d1b0..aa45601ea 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.h b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.h index 499d294af..8f2b045cb 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabel.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp index a0ebcfb7f..89d2771be 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h index 3b230cd5a..157961ec1 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILabelSeparator.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp index 42eaf8e20..33f03bd10 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h index fa9d66f9c..13ce7f08e 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QILineEdit.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h index 13b4f600e..6e646aab0 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIListView.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp index 8a64d8bc9..e651b55b9 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h index 5dc4b6b78..222a2a1df 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIMainDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h index 6be96f6f4..a6f3aa7ac 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIMessageBox.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp index fe776077d..79ca046c0 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h index 0854536ca..ed457c09e 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIRichToolButton.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h index 24429ec96..3fe8adabb 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIStateIndicator.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp index 6aa7bde06..fc7a25b48 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.h index dc0bfc22e..e756684e5 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIStatusBar.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp index 7c42e72bf..45673a950 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.h b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.h index 1a313f263..a9ecd6ecd 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeView.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp index e03966a78..6f9262a9c 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h index 88de169e0..c6cdb60dd 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QITreeWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp index a6481d12a..125ae24b8 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h index 4960e90cc..2f6754ded 100644 --- a/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h +++ b/src/VBox/Frontends/VirtualBox/src/extensions/QIWidgetValidator.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/CIShared.h b/src/VBox/Frontends/VirtualBox/src/globals/CIShared.h index b303f5050..19080240b 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/CIShared.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/CIShared.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp index 2e08a980a..85595389c 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h index 2e4e8769e..5321dd6ef 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/COMDefs.h @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h b/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h index 07e8aa2a2..a96ab6ae2 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/QIWithRetranslateUI.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp index 21ee45bda..ed20a53e4 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h index c20a94163..e35d9da88 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIExtraDataEventHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp index 2c44d4133..fd0494ac2 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.h b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.h index 29a47dd18..d57f634e8 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIImageTools.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp index 5bf63d094..37f8defe9 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h index 46808ae4b..59930ceb5 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp index 8af9597b8..30bfcf40d 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h index f017b3c23..ced99f3fb 100644 --- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h +++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp index a36825f96..1dd38952d 100644 --- a/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp +++ b/src/VBox/Frontends/VirtualBox/src/hardenedmain.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/main.cpp b/src/VBox/Frontends/VirtualBox/src/main.cpp index b103f6726..156190f9f 100644 --- a/src/VBox/Frontends/VirtualBox/src/main.cpp +++ b/src/VBox/Frontends/VirtualBox/src/main.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp b/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp index 35f8dac39..5980c3625 100644 --- a/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp +++ b/src/VBox/Frontends/VirtualBox/src/medium/UIMedium.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp index 36c471795..2589d6b09 100644 --- a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp +++ b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h index ea428c66d..5ea05250b 100644 --- a/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h +++ b/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp index b802d1c85..e26d3ad5a 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.h index 8acf2ddbc..4a17787fb 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/DarwinKeyboard.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp index f2391f87f..8517b22e1 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h index 8c4c46fd2..12ca44dc4 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h index 7bfe2d76a..45745a6d8 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaDockIconPreview.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm index e7688a9ff..878f016b0 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/UICocoaSpecialControls.mm @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h index 7b645ef97..459fc5d20 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxCocoaHelper.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h index 235bc0a29..7b2c99926 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m index 1fd2792e8..bf485a4f2 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxIChatTheaterWrapper.m @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm index cf4195177..f34c19717 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin-cocoa.mm @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h index 528c8cbef..3798cf8b4 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/VBoxUtils-darwin.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp b/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp index 148161301..85e7d5615 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/darwin/tstDarwinKeyboard.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm index f82fac0b6..c7ea93296 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm +++ b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.asm @@ -8,7 +8,7 @@ ; ; -; Copyright (C) 2008 Oracle Corporation +; Copyright (C) 2008-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp index 87244dc56..4ef084d7f 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.h b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.h index beffab6ca..709b7e144 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/os2/VBoxHlp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp index 45b2e5c85..1740e88cc 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h index 2633ec39d..aa2e1351a 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp index cb9728efb..30adb35ee 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard-new.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard.h b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard.h index c9b5ed4e3..0500f1b26 100644 --- a/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard.h +++ b/src/VBox/Frontends/VirtualBox/src/platform/x11/XKeyboard.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/precomp.h b/src/VBox/Frontends/VirtualBox/src/precomp.h index 779980d8c..66de013ff 100644 --- a/src/VBox/Frontends/VirtualBox/src/precomp.h +++ b/src/VBox/Frontends/VirtualBox/src/precomp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp index cb034cfde..75c190191 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h index f5a638940..d68e203dd 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp index bf0b2d295..edb129474 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h index 29cfd5dd6..d5ce42a1b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIConsoleEventHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h index 1fd5c91f7..0a34bf582 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIDnDHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp index 037f84d49..97928f2c4 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h index 9a72fdf7b..353c66104 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp index 650cb5bfd..05f20b508 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferDirectDraw.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp index fa20bf7a1..a7563a6f1 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h index b74ccc283..827b270bd 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp index c82411473..c027273ee 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h index 3139669c5..8f68e5d78 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp index 7f5632d17..57ea512ff 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferSDL.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp index 0a947c02c..0c4874ea4 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIIndicatorsPool.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h index 1d33156f7..73817f0af 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIKeyboardHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h index 448686d04..211cd1721 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h index a1c8b42be..e67d6627a 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineDefs.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp index 675b9cc1d..e3dde5e67 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2012 Oracle Corporation + * Copyright (C) 2010-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1021,6 +1021,16 @@ void UIMachineLogic::sltTakeScreenshot() filters.prepend(filters.takeAt(i)); strFilter = filters.first(); } + +#ifdef Q_WS_WIN + /* Due to Qt bug, modal QFileDialog appeared above the active machine-window + * does not retreive the focus from the currently focused machine-view, + * as the result guest keyboard remains captured, so we should + * clear the focus from this machine-view initially: */ + if (activeMachineWindow()) + activeMachineWindow()->machineView()->clearFocus(); +#endif /* Q_WS_WIN */ + /* Request the filename from the user. */ const CMachine &machine = session().GetMachine(); QFileInfo fi(machine.GetSettingsFilePath()); @@ -1034,6 +1044,17 @@ void UIMachineLogic::sltTakeScreenshot() &strFilter, true /* resolve symlinks */, true /* confirm overwrite */); + +#ifdef Q_WS_WIN + /* Due to Qt bug, modal QFileDialog appeared above the active machine-window + * does not retreive the focus from the currently focused machine-view, + * as the result guest keyboard remains captured, so we already + * cleared the focus from this machine-view and should return + * that focus finally: */ + if (activeMachineWindow()) + activeMachineWindow()->machineView()->setFocus(); +#endif /* Q_WS_WIN */ + /* Do the screenshot. */ if (!strFilename.isEmpty()) takeScreenshot(strFilename, strFilter.split(" ").value(0, "png")); diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp index dd888370d..b98cfbcf1 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h index d60378746..49fbbd03b 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp index 2eb8f6bbb..e011abb2c 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.h index 779dced11..a8aac8eb4 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineShortcuts.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h index 33554e441..5e5c49071 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMouseHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp index 6f8de96ef..da971450d 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.h index c841e23b9..c0c3b7f6d 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp index 9f53ecb86..240fb05e0 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h index d78cf0e65..4d3cfa379 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h index e3cf01c28..7413b23b9 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h index e90a0448e..0f8904478 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h index 8851d73eb..b9b9446d6 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h index c711e34f3..77e3c29c7 100644 --- a/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h +++ b/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h index 4be022a95..ae3efa53c 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIActionPoolSelector.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp index baa696ef7..400708dcf 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.h b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.h index 39efd6e75..b95ae62b5 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UISelectorShortcuts.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp index 1939c119d..f61412e6d 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h index 9a212af35..c38c60e54 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMDesktop.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h b/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h index ca36f1dd4..8df6aab66 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMItem.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h b/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h index f3519869d..fb967cead 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMListView.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp index fd4b840a9..49f66405e 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.h b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.h index 46190e42d..9afa0eaf8 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVMPreviewWindow.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp index fdfa67cdb..ff989c7b0 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h index dd292a3d9..828e159d6 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/UIVirtualBoxEventHandler.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp index e731ff76c..72449b6a7 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.h b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.h index 2784f5fbb..32fd3876d 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp b/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp index 1b3fa8be5..eafca140a 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.h b/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.h index e03b911c1..16b0506c0 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/VBoxTrayIcon.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp index 642bf91da..90c3e7801 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -58,11 +58,6 @@ UIGChooserItemGroup::UIGChooserItemGroup(QGraphicsScene *pScene) model(), SIGNAL(sigRootItemMinimumWidthHintChanged(int))); connect(this, SIGNAL(sigMinimumHeightHintChanged(int)), model(), SIGNAL(sigRootItemMinimumHeightHintChanged(int))); - - /* Init: */ - updateVisibleName(); - updateItemCountInfo(); - updateToolTip(); } UIGChooserItemGroup::UIGChooserItemGroup(QGraphicsScene *pScene, @@ -87,8 +82,8 @@ UIGChooserItemGroup::UIGChooserItemGroup(QGraphicsScene *pScene, retranslateUi(); /* Init: */ - updateVisibleName(); updateItemCountInfo(); + updateVisibleName(); updateToolTip(); } @@ -115,8 +110,8 @@ UIGChooserItemGroup::UIGChooserItemGroup(UIGChooserItem *pParent, retranslateUi(); /* Init: */ - updateVisibleName(); updateItemCountInfo(); + updateVisibleName(); updateToolTip(); } @@ -145,8 +140,8 @@ UIGChooserItemGroup::UIGChooserItemGroup(UIGChooserItem *pParent, retranslateUi(); /* Init: */ - updateVisibleName(); updateItemCountInfo(); + updateVisibleName(); updateToolTip(); } @@ -212,9 +207,8 @@ void UIGChooserItemGroup::setName(const QString &strName) /* Remember new name: */ m_strName = strName; - /* Update visible name: */ + /* Update linked values: */ updateVisibleName(); - /* Update minimum header size: */ updateMinimumHeaderSize(); } @@ -457,9 +451,8 @@ void UIGChooserItemGroup::copyContent(UIGChooserItemGroup *pFrom, UIGChooserItem void UIGChooserItemGroup::handleRootStatusChange() { - /* Update visible name: */ + /* Update linked values: */ updateVisibleName(); - /* Update minimum header size: */ updateMinimumHeaderSize(); } @@ -512,27 +505,64 @@ void UIGChooserItemGroup::updateVisibleName() iMaximumWidth -= iHorizontalMargin; if (isRoot()) iMaximumWidth -= iRootIndent; - - /* Recache visible name: */ + /* Calculate new visible name and name-size: */ QPaintDevice *pPaintDevice = model()->paintDevice(); - m_strVisibleName = isMainRoot() ? QString() : compressText(m_nameFont, pPaintDevice, name(), iMaximumWidth); - m_visibleNameSize = isMainRoot() ? QSize(0, 0) : textSize(m_nameFont, pPaintDevice, m_strVisibleName); + QString strVisibleName = compressText(m_nameFont, pPaintDevice, name(), iMaximumWidth); + QSize visibleNameSize = textSize(m_nameFont, pPaintDevice, strVisibleName); - /* Repaint item: */ - update(); + /* Update linked values: */ + if (m_visibleNameSize != visibleNameSize) + { + m_visibleNameSize = visibleNameSize; + updateGeometry(); + } + if (m_strVisibleName != strVisibleName) + { + m_strVisibleName = strVisibleName; + update(); + } } void UIGChooserItemGroup::updateItemCountInfo() { + /* Not for main root: */ + if (isMainRoot()) + return; + /* Update item info attributes: */ QPaintDevice *pPaintDevice = model()->paintDevice(); - m_strInfoGroups = isMainRoot() || m_groupItems.isEmpty() ? QString() : QString::number(m_groupItems.size()); - m_strInfoMachines = isMainRoot() || m_machineItems.isEmpty() ? QString() : QString::number(m_machineItems.size()); - m_infoSizeGroups = isMainRoot() ? QSize(0, 0) : textSize(m_infoFont, pPaintDevice, m_strInfoGroups); - m_infoSizeMachines = isMainRoot() ? QSize(0, 0) : textSize(m_infoFont, pPaintDevice, m_strInfoMachines); + QString strInfoGroups = m_groupItems.isEmpty() ? QString() : QString::number(m_groupItems.size()); + QString strInfoMachines = m_machineItems.isEmpty() ? QString() : QString::number(m_machineItems.size()); + QSize infoSizeGroups = textSize(m_infoFont, pPaintDevice, strInfoGroups); + QSize infoSizeMachines = textSize(m_infoFont, pPaintDevice, strInfoMachines); /* Update linked values: */ - updateMinimumHeaderSize(); + bool fSomethingChanged = false; + if (m_strInfoGroups != strInfoGroups) + { + m_strInfoGroups = strInfoGroups; + fSomethingChanged = true; + } + if (m_strInfoMachines != strInfoMachines) + { + m_strInfoMachines = strInfoMachines; + fSomethingChanged = true; + } + if (m_infoSizeGroups != infoSizeGroups) + { + m_infoSizeGroups = infoSizeGroups; + fSomethingChanged = true; + } + if (m_infoSizeMachines != infoSizeMachines) + { + m_infoSizeMachines = infoSizeMachines; + fSomethingChanged = true; + } + if (fSomethingChanged) + { + updateVisibleName(); + updateMinimumHeaderSize(); + } } void UIGChooserItemGroup::updateMinimumHeaderSize() @@ -576,7 +606,7 @@ void UIGChooserItemGroup::updateMinimumHeaderSize() if (!isRoot()) iHeaderWidth += (iMinorSpacing + m_enterButtonSize.width()); - /* Search for maximum height: */ + /* Calculate maximum height: */ QList<int> heights; /* Button height: */ if (isRoot()) @@ -596,10 +626,15 @@ void UIGChooserItemGroup::updateMinimumHeaderSize() foreach (int iHeight, heights) iHeaderHeight = qMax(iHeaderHeight, iHeight); - /* Recache minimum header size: */ - m_minimumHeaderSize = QSize(iHeaderWidth, iHeaderHeight); + /* Calculate new minimum header size: */ + QSize minimumHeaderSize = QSize(iHeaderWidth, iHeaderHeight); + + /* Is there something changed? */ + if (m_minimumHeaderSize == minimumHeaderSize) + return; /* Update linked values: */ + m_minimumHeaderSize = minimumHeaderSize; updateGeometry(); } @@ -746,10 +781,10 @@ void UIGChooserItemGroup::addItem(UIGChooserItem *pItem, int iPosition) } } - /* Update: */ - updateVisibleName(); + /* Update linked values: */ updateItemCountInfo(); updateToolTip(); + updateGeometry(); } void UIGChooserItemGroup::removeItem(UIGChooserItem *pItem) @@ -778,10 +813,10 @@ void UIGChooserItemGroup::removeItem(UIGChooserItem *pItem) } } - /* Update: */ - updateVisibleName(); + /* Update linked values: */ updateItemCountInfo(); updateToolTip(); + updateGeometry(); } void UIGChooserItemGroup::setItems(const QList<UIGChooserItem*> &items, UIGChooserItemType type) @@ -794,10 +829,10 @@ void UIGChooserItemGroup::setItems(const QList<UIGChooserItem*> &items, UIGChoos default: AssertMsgFailed(("Invalid item type!")); break; } - /* Update: */ - updateVisibleName(); + /* Update linked values: */ updateItemCountInfo(); updateToolTip(); + updateGeometry(); } QList<UIGChooserItem*> UIGChooserItemGroup::items(UIGChooserItemType type /* = UIGChooserItemType_Any */) const @@ -850,10 +885,10 @@ void UIGChooserItemGroup::clearItems(UIGChooserItemType type /* = UIGChooserItem } } - /* Update: */ - updateVisibleName(); + /* Update linked values: */ updateItemCountInfo(); updateToolTip(); + updateGeometry(); } void UIGChooserItemGroup::updateAll(const QString &strId) @@ -1459,7 +1494,7 @@ void UIGChooserItemGroup::hoverMoveEvent(QGraphicsSceneHoverEvent *pEvent) /* Call to base-class: */ UIGChooserItem::hoverMoveEvent(pEvent); - /* Update visible name: */ + /* Update linked values: */ updateVisibleName(); } @@ -1472,7 +1507,7 @@ void UIGChooserItemGroup::hoverLeaveEvent(QGraphicsSceneHoverEvent *pEvent) /* Call to base-class: */ UIGChooserItem::hoverLeaveEvent(pEvent); - /* Update visible name: */ + /* Update linked values: */ updateVisibleName(); } diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp index 5941d2f83..46544023d 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -205,74 +205,78 @@ QVariant UIGChooserItemMachine::data(int iKey) const void UIGChooserItemMachine::updatePixmaps() { - /* First row update required? */ - bool fFirstRowUpdateRequired = false; - bool fSecondRowUpdateRequired = false; - /* Update pixmap: */ + updatePixmap(); + + /* Update state-pixmap: */ + updateStatePixmap(); +} + +void UIGChooserItemMachine::updatePixmap() +{ + /* Get new pixmap and pixmap-size: */ QIcon icon = osIcon(); QSize iconSize = icon.availableSizes().first(); QPixmap pixmap = icon.pixmap(iconSize); + /* Update linked values: */ + if (m_pixmapSize != iconSize) + { + m_pixmapSize = iconSize; + updateFirstRowMaximumWidth(); + updateGeometry(); + } if (m_pixmap.toImage() != pixmap.toImage()) { m_pixmap = pixmap; update(); } - if (m_pixmapSize != iconSize) - { - m_pixmapSize = iconSize; - fFirstRowUpdateRequired = true; - } +} - /* Update state-pixmap: */ +void UIGChooserItemMachine::updateStatePixmap() +{ + /* Get new state-pixmap and state-pixmap size: */ QIcon stateIcon = machineStateIcon(); QSize stateIconSize = stateIcon.availableSizes().first(); - m_statePixmap = stateIcon.pixmap(stateIconSize); QPixmap statePixmap = stateIcon.pixmap(stateIconSize); + /* Update linked values: */ + if (m_statePixmapSize != stateIconSize) + { + m_statePixmapSize = stateIconSize; + updateGeometry(); + } if (m_statePixmap.toImage() != statePixmap.toImage()) { m_statePixmap = statePixmap; update(); } - if (m_statePixmapSize != stateIconSize) - { - m_statePixmapSize = stateIconSize; - fSecondRowUpdateRequired = true; - } - - /* Update linked values: */ - if (fFirstRowUpdateRequired || fSecondRowUpdateRequired) - updateGeometry(); - if (fFirstRowUpdateRequired) - updateFirstRowMaximumWidth(); } void UIGChooserItemMachine::updateName() { - /* Something changed? */ + /* Get new name: */ QString strName = name(); + + /* Is there something changed? */ if (m_strName == strName) return; - /* Remember new name: */ - m_strName = strName; - /* Update linked values: */ + m_strName = strName; updateMinimumNameWidth(); updateVisibleName(); } void UIGChooserItemMachine::updateSnapshotName() { - /* Something changed? */ + /* Get new snapshot-name: */ QString strSnapshotName = snapshotName(); + + /* Is there something changed? */ if (m_strSnapshotName == strSnapshotName) return; - /* Remember new snapshot name: */ - m_strSnapshotName = strSnapshotName; - /* Update linked values: */ + m_strSnapshotName = strSnapshotName; updateMinimumSnapshotNameWidth(); updateVisibleSnapshotName(); } @@ -281,79 +285,108 @@ void UIGChooserItemMachine::updateFirstRowMaximumWidth() { /* Prepare variables: */ int iMargin = data(MachineItemData_Margin).toInt(); - int iPixmapWidth = m_pixmapSize.width(); - int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); - int iMachineItemMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); + int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); int iToolBarWidth = data(MachineItemData_ToolBarSize).toSize().width(); - /* Calculate maximum width for the first row: */ - m_iFirstRowMaximumWidth = geometry().width(); - m_iFirstRowMaximumWidth -= iMargin; /* left margin */ - m_iFirstRowMaximumWidth -= iPixmapWidth; /* pixmap width */ - m_iFirstRowMaximumWidth -= iMachineItemMajorSpacing; /* spacing between pixmap and name */ - if (!snapshotName().isEmpty()) - m_iFirstRowMaximumWidth -= iMachineItemMinorSpacing; /* spacing between name and snapshot name */ + /* Calculate new maximum width for the first row: */ + int iFirstRowMaximumWidth = geometry().width(); + iFirstRowMaximumWidth -= iMargin; /* left margin */ + iFirstRowMaximumWidth -= m_pixmapSize.width(); /* pixmap width */ + iFirstRowMaximumWidth -= iMajorSpacing; /* spacing between pixmap and name(s) */ if (m_pToolBar) { - m_iFirstRowMaximumWidth -= iMachineItemMajorSpacing; /* spacing before toolbar */ - m_iFirstRowMaximumWidth -= iToolBarWidth; /* toolbar width */ + iFirstRowMaximumWidth -= iMajorSpacing; /* spacing before toolbar */ + iFirstRowMaximumWidth -= iToolBarWidth; /* toolbar width */ } - m_iFirstRowMaximumWidth -= iMargin; /* right margin */ + iFirstRowMaximumWidth -= iMargin; /* right margin */ + + /* Is there something changed? */ + if (m_iFirstRowMaximumWidth == iFirstRowMaximumWidth) + return; /* Update linked values: */ + m_iFirstRowMaximumWidth = iFirstRowMaximumWidth; updateMaximumNameWidth(); updateMaximumSnapshotNameWidth(); } void UIGChooserItemMachine::updateMinimumNameWidth() { - /* Calculate minimum name width: */ + /* Calculate new minimum name width: */ QPaintDevice *pPaintDevice = model()->paintDevice(); QFontMetrics fm(m_nameFont, pPaintDevice); - m_iMinimumNameWidth = fm.width(compressText(m_nameFont, pPaintDevice, m_strName, textWidth(m_nameFont, pPaintDevice, 15))); + int iMinimumNameWidth = fm.width(compressText(m_nameFont, pPaintDevice, m_strName, textWidth(m_nameFont, pPaintDevice, 15))); + + /* Is there something changed? */ + if (m_iMinimumNameWidth == iMinimumNameWidth) + return; /* Update linked values: */ + m_iMinimumNameWidth = iMinimumNameWidth; updateGeometry(); } void UIGChooserItemMachine::updateMinimumSnapshotNameWidth() { - /* Do we have a snapshot? */ - if (m_strSnapshotName.isEmpty()) - { - /* Clear minimum snapshot name width: */ - m_iMinimumSnapshotNameWidth = 0; - } - else + /* Calculate new minimum snapshot-name width: */ + int iMinimumSnapshotNameWidth = 0; + /* Is there any snapshot exists? */ + if (!m_strSnapshotName.isEmpty()) { - /* Calculate minimum snapshot name width: */ QFontMetrics fm(m_snapshotNameFont, model()->paintDevice()); int iBracketWidth = fm.width("()"); /* bracket width */ - int iActualTextWidth = fm.width(m_strSnapshotName); /* snapshot name width */ + int iActualTextWidth = fm.width(m_strSnapshotName); /* snapshot-name width */ int iMinimumTextWidth = fm.width("..."); /* ellipsis width */ - m_iMinimumSnapshotNameWidth = iBracketWidth + qMin(iActualTextWidth, iMinimumTextWidth); + iMinimumSnapshotNameWidth = iBracketWidth + qMin(iActualTextWidth, iMinimumTextWidth); } + /* Is there something changed? */ + if (m_iMinimumSnapshotNameWidth == iMinimumSnapshotNameWidth) + return; + /* Update linked values: */ - updateGeometry(); + m_iMinimumSnapshotNameWidth = iMinimumSnapshotNameWidth; updateMaximumNameWidth(); + updateGeometry(); } void UIGChooserItemMachine::updateMaximumNameWidth() { - /* Calculate maximum name width: */ - m_iMaximumNameWidth = m_iFirstRowMaximumWidth - m_iMinimumSnapshotNameWidth; + /* Calculate new maximum name width: */ + int iMaximumNameWidth = m_iFirstRowMaximumWidth; + /* Do we have a minimum snapshot-name width? */ + if (m_iMinimumSnapshotNameWidth != 0) + { + /* Prepare variables: */ + int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); + /* Take spacing and snapshot-name into account: */ + iMaximumNameWidth -= (iMinorSpacing + m_iMinimumSnapshotNameWidth); + } - /* Calculate linked values: */ + /* Is there something changed? */ + if (m_iMaximumNameWidth == iMaximumNameWidth) + return; + + /* Update linked values: */ + m_iMaximumNameWidth = iMaximumNameWidth; updateVisibleName(); } void UIGChooserItemMachine::updateMaximumSnapshotNameWidth() { - /* Calculate maximum snapshot name width: */ - m_iMaximumSnapshotNameWidth = m_iFirstRowMaximumWidth - m_visibleNameSize.width(); + /* Prepare variables: */ + int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); + + /* Calculate new maximum snapshot-name width: */ + int iMaximumSnapshotNameWidth = m_iFirstRowMaximumWidth; + iMaximumSnapshotNameWidth -= (iMinorSpacing + m_visibleNameSize.width()); + + /* Is there something changed? */ + if (m_iMaximumSnapshotNameWidth == iMaximumSnapshotNameWidth) + return; /* Update linked values: */ + m_iMaximumSnapshotNameWidth = iMaximumSnapshotNameWidth; updateVisibleSnapshotName(); } @@ -362,14 +395,22 @@ void UIGChooserItemMachine::updateVisibleName() /* Prepare variables: */ QPaintDevice *pPaintDevice = model()->paintDevice(); - /* Calculate visible name: */ - m_strVisibleName = compressText(m_nameFont, pPaintDevice, m_strName, m_iMaximumNameWidth); - m_visibleNameSize = textSize(m_nameFont, pPaintDevice, m_strVisibleName); + /* Calculate new visible name and name-size: */ + QString strVisibleName = compressText(m_nameFont, pPaintDevice, m_strName, m_iMaximumNameWidth); + QSize visibleNameSize = textSize(m_nameFont, pPaintDevice, strVisibleName); /* Update linked values: */ - updateGeometry(); - updateMaximumSnapshotNameWidth(); - update(); + if (m_visibleNameSize != visibleNameSize) + { + m_visibleNameSize = visibleNameSize; + updateMaximumSnapshotNameWidth(); + updateGeometry(); + } + if (m_strVisibleName != strVisibleName) + { + m_strVisibleName = strVisibleName; + update(); + } } void UIGChooserItemMachine::updateVisibleSnapshotName() @@ -377,32 +418,43 @@ void UIGChooserItemMachine::updateVisibleSnapshotName() /* Prepare variables: */ QPaintDevice *pPaintDevice = model()->paintDevice(); - /* Calculate visible snapshot name: */ + /* Calculate new visible snapshot-name: */ int iBracketWidth = QFontMetrics(m_snapshotNameFont, pPaintDevice).width("()"); QString strVisibleSnapshotName = compressText(m_snapshotNameFont, pPaintDevice, m_strSnapshotName, m_iMaximumSnapshotNameWidth - iBracketWidth); - m_strVisibleSnapshotName = QString("(%1)").arg(strVisibleSnapshotName); - m_visibleSnapshotNameSize = textSize(m_snapshotNameFont, pPaintDevice, m_strVisibleSnapshotName); + strVisibleSnapshotName = QString("(%1)").arg(strVisibleSnapshotName); + QSize visibleSnapshotNameSize = textSize(m_snapshotNameFont, pPaintDevice, strVisibleSnapshotName); /* Update linked values: */ - updateGeometry(); - update(); + if (m_visibleSnapshotNameSize != visibleSnapshotNameSize) + { + m_visibleSnapshotNameSize = visibleSnapshotNameSize; + updateGeometry(); + } + if (m_strVisibleSnapshotName != strVisibleSnapshotName) + { + m_strVisibleSnapshotName = strVisibleSnapshotName; + update(); + } } void UIGChooserItemMachine::updateStateText() { - /* Something changed? */ + /* Get new state-text and state-text size: */ QString strStateText = machineStateName(); - if (m_strStateText == strStateText) - return; - - /* Update state text: */ - m_strStateText = strStateText; - m_stateTextSize = textSize(m_stateTextFont, model()->paintDevice(), m_strStateText); + QSize stateTextSize = textSize(m_stateTextFont, model()->paintDevice(), m_strStateText); /* Update linked values: */ - updateGeometry(); - update(); + if (m_stateTextSize != stateTextSize) + { + m_stateTextSize = stateTextSize; + updateGeometry(); + } + if (m_strStateText != strStateText) + { + m_strStateText = strStateText; + update(); + } } void UIGChooserItemMachine::retranslateUi() @@ -552,29 +604,30 @@ void UIGChooserItemMachine::updateLayout() int UIGChooserItemMachine::minimumWidthHint() const { /* Prepare variables: */ - int iMachineItemMargin = data(MachineItemData_Margin).toInt(); - int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); - int iMachineItemMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); + int iMargin = data(MachineItemData_Margin).toInt(); + int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); + int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); int iToolBarWidth = data(MachineItemData_ToolBarSize).toSize().width(); /* Calculating proposed width: */ int iProposedWidth = 0; /* Two margins: */ - iProposedWidth += 2 * iMachineItemMargin; + iProposedWidth += 2 * iMargin; /* And machine-item content to take into account: */ - int iTopLineWidth = m_iMinimumNameWidth + - iMachineItemMinorSpacing + - m_iMinimumSnapshotNameWidth; + int iTopLineWidth = m_iMinimumNameWidth; + if (!m_strSnapshotName.isEmpty()) + iTopLineWidth += (iMinorSpacing + + m_iMinimumSnapshotNameWidth); int iBottomLineWidth = m_statePixmapSize.width() + - iMachineItemMinorSpacing + + iMinorSpacing + m_stateTextSize.width(); int iRightColumnWidth = qMax(iTopLineWidth, iBottomLineWidth); int iMachineItemWidth = m_pixmapSize.width() + - iMachineItemMajorSpacing + + iMajorSpacing + iRightColumnWidth; if (m_pToolBar) - iMachineItemWidth += (iMachineItemMajorSpacing + iToolBarWidth); + iMachineItemWidth += (iMajorSpacing + iToolBarWidth); iProposedWidth += iMachineItemWidth; /* Return result: */ @@ -584,7 +637,7 @@ int UIGChooserItemMachine::minimumWidthHint() const int UIGChooserItemMachine::minimumHeightHint() const { /* Prepare variables: */ - int iMachineItemMargin = data(MachineItemData_Margin).toInt(); + int iMargin = data(MachineItemData_Margin).toInt(); int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt(); int iToolBarHeight = data(MachineItemData_ToolBarSize).toSize().height(); @@ -592,7 +645,7 @@ int UIGChooserItemMachine::minimumHeightHint() const int iProposedHeight = 0; /* Two margins: */ - iProposedHeight += 2 * iMachineItemMargin; + iProposedHeight += 2 * iMargin; /* And machine-item content to take into account: */ int iTopLineHeight = qMax(m_visibleNameSize.height(), m_visibleSnapshotNameSize.height()); int iBottomLineHeight = qMax(m_statePixmapSize.height(), m_stateTextSize.height()); @@ -864,8 +917,8 @@ void UIGChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOpt QRect fullRect = pOption->rect; int iFullHeight = fullRect.height(); int iMargin = data(MachineItemData_Margin).toInt(); - int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); - int iMachineItemMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); + int iMajorSpacing = data(MachineItemData_MajorSpacing).toInt(); + int iMinorSpacing = data(MachineItemData_MinorSpacing).toInt(); int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt(); /* Selected item foreground: */ @@ -907,7 +960,7 @@ void UIGChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOpt /* Calculate indents: */ int iRightColumnIndent = iLeftColumnIndent + m_pixmapSize.width() + - iMachineItemMajorSpacing; + iMajorSpacing; /* Paint right column: */ { @@ -940,7 +993,7 @@ void UIGChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOpt /* Calculate indents: */ int iSnapshotNameIndent = iRightColumnIndent + m_visibleNameSize.width() + - iMachineItemMinorSpacing; + iMinorSpacing; /* Paint right element: */ if (!snapshotName().isEmpty()) @@ -948,7 +1001,7 @@ void UIGChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOpt /* Prepare variables: */ int iSnapshotNameX = iSnapshotNameIndent; int iSnapshotNameY = iTopLineIndent; - /* Paint snapshot name: */ + /* Paint snapshot-name: */ paintText(/* Painter: */ pPainter, /* Point to paint in: */ @@ -984,7 +1037,7 @@ void UIGChooserItemMachine::paintMachineInfo(QPainter *pPainter, const QStyleOpt /* Calculate indents: */ int iMachineStateTextIndent = iRightColumnIndent + m_statePixmapSize.width() + - iMachineItemMinorSpacing; + iMinorSpacing; /* Paint right element: */ { diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h index 20155c297..5ba484f2f 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -92,6 +92,8 @@ private: /* Helpers: Update stuff: */ void updatePixmaps(); + void updatePixmap(); + void updateStatePixmap(); void updateName(); void updateSnapshotName(); void updateFirstRowMaximumWidth(); diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp index 450bb417a..0bfc279ee 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserView.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -84,8 +84,6 @@ void UIGChooserView::sltFocusChanged(UIGChooserItem *pFocusItem) void UIGChooserView::resizeEvent(QResizeEvent*) { - /* Update scene-rect: */ - updateSceneRect(); /* Notify listeners: */ emit sigResized(); } diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp index 7f2290218..c4271a705 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -148,9 +148,16 @@ void UIGDetailsUpdateThreadGeneral::run() UIGDetailsElementGeneral::UIGDetailsElementGeneral(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_General, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_General)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/machine_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementGeneral::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_General)); } UIGDetailsUpdateThread* UIGDetailsElementGeneral::createUpdateThread() @@ -162,8 +169,7 @@ UIGDetailsUpdateThread* UIGDetailsElementGeneral::createUpdateThread() UIGDetailsElementPreview::UIGDetailsElementPreview(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElement(pParent, DetailsElementType_Preview, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Preview)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/machine_16px.png")); /* Prepare variables: */ @@ -177,6 +183,14 @@ UIGDetailsElementPreview::UIGDetailsElementPreview(UIGDetailsSet *pParent, bool m_pPreview = new UIGMachinePreview(this); pLayout->addItem(m_pPreview); setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementPreview::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Preview)); } int UIGDetailsElementPreview::minimumWidthHint() const @@ -228,12 +242,6 @@ int UIGDetailsElementPreview::minimumHeightHint(bool fClosed) const return iProposedHeight; } -void UIGDetailsElementPreview::updateAppearance() -{ - m_pPreview->setMachine(machine()); - emit sigBuildDone(); -} - void UIGDetailsElementPreview::updateLayout() { /* Call to base-class: */ @@ -246,6 +254,12 @@ void UIGDetailsElementPreview::updateLayout() m_pPreview->show(); } +void UIGDetailsElementPreview::updateAppearance() +{ + m_pPreview->setMachine(machine()); + emit sigBuildDone(); +} + UIGDetailsUpdateThreadSystem::UIGDetailsUpdateThreadSystem(const CMachine &machine) : UIGDetailsUpdateThread(machine) @@ -326,9 +340,16 @@ void UIGDetailsUpdateThreadSystem::run() UIGDetailsElementSystem::UIGDetailsElementSystem(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_System, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_System)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/chipset_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementSystem::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_System)); } UIGDetailsUpdateThread* UIGDetailsElementSystem::createUpdateThread() @@ -402,9 +423,16 @@ void UIGDetailsUpdateThreadDisplay::run() UIGDetailsElementDisplay::UIGDetailsElementDisplay(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Display, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Display)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/vrdp_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementDisplay::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Display)); } UIGDetailsUpdateThread* UIGDetailsElementDisplay::createUpdateThread() @@ -483,9 +511,16 @@ void UIGDetailsUpdateThreadStorage::run() UIGDetailsElementStorage::UIGDetailsElementStorage(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Storage, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Storage)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/attachment_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementStorage::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Storage)); } UIGDetailsUpdateThread* UIGDetailsElementStorage::createUpdateThread() @@ -540,9 +575,16 @@ void UIGDetailsUpdateThreadAudio::run() UIGDetailsElementAudio::UIGDetailsElementAudio(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Audio, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Audio)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/sound_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementAudio::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Audio)); } UIGDetailsUpdateThread* UIGDetailsElementAudio::createUpdateThread() @@ -650,9 +692,16 @@ QString UIGDetailsUpdateThreadNetwork::summarizeGenericProperties(const CNetwork UIGDetailsElementNetwork::UIGDetailsElementNetwork(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Network, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Network)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/nw_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementNetwork::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Network)); } UIGDetailsUpdateThread* UIGDetailsElementNetwork::createUpdateThread() @@ -712,9 +761,16 @@ void UIGDetailsUpdateThreadSerial::run() UIGDetailsElementSerial::UIGDetailsElementSerial(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Serial, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Serial)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/serial_port_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementSerial::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Serial)); } UIGDetailsUpdateThread* UIGDetailsElementSerial::createUpdateThread() @@ -770,9 +826,16 @@ void UIGDetailsUpdateThreadParallel::run() UIGDetailsElementParallel::UIGDetailsElementParallel(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Parallel, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Parallel)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/parallel_port_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementParallel::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Parallel)); } UIGDetailsUpdateThread* UIGDetailsElementParallel::createUpdateThread() @@ -832,9 +895,16 @@ void UIGDetailsUpdateThreadUSB::run() UIGDetailsElementUSB::UIGDetailsElementUSB(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_USB, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_USB)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/usb_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementUSB::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_USB)); } UIGDetailsUpdateThread* UIGDetailsElementUSB::createUpdateThread() @@ -880,9 +950,16 @@ void UIGDetailsUpdateThreadSF::run() UIGDetailsElementSF::UIGDetailsElementSF(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_SF, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_SF)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/shared_folder_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementSF::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_SF)); } UIGDetailsUpdateThread* UIGDetailsElementSF::createUpdateThread() @@ -928,9 +1005,16 @@ void UIGDetailsUpdateThreadDescription::run() UIGDetailsElementDescription::UIGDetailsElementDescription(UIGDetailsSet *pParent, bool fOpened) : UIGDetailsElementInterface(pParent, DetailsElementType_Description, fOpened) { - /* Name/icon: */ - setName(gpConverter->toString(DetailsElementType_Description)); + /* Icon: */ setIcon(UIIconPool::iconSet(":/description_16px.png")); + + /* Translate: */ + retranslateUi(); +} + +void UIGDetailsElementDescription::retranslateUi() +{ + setName(gpConverter->toString(DetailsElementType_Description)); } UIGDetailsUpdateThread* UIGDetailsElementDescription::createUpdateThread() diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h index d126990d7..81dea6a02 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElements.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -118,7 +118,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -135,16 +138,17 @@ public: private: + /* Helper: Translate stuff: */ + void retranslateUi(); + /* Helpers: Layout stuff: */ int minimumWidthHint() const; int minimumHeightHint(bool fClosed) const; + void updateLayout(); - /* Helpers: Update stuff: */ + /* Helper: Update stuff: */ void updateAppearance(); - /* Helpers: Layout stuff: */ - void updateLayout(); - /* Variables: */ UIGMachinePreview *m_pPreview; }; @@ -178,7 +182,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -211,7 +218,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -244,7 +254,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -277,7 +290,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -311,7 +327,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -344,7 +363,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -378,7 +400,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; #endif /* VBOX_WITH_PARALLEL_PORTS */ @@ -412,7 +437,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -445,7 +473,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; @@ -478,7 +509,10 @@ public: private: - /* Helpers: Update stuff: */ + /* Helper: Translate stuff: */ + void retranslateUi(); + + /* Helper: Update stuff: */ UIGDetailsUpdateThread* createUpdateThread(); }; diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp index a4e28f4dc..dab9e84bf 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -30,7 +30,7 @@ #include "UIGDetailsModel.h" UIGDetailsItem::UIGDetailsItem(UIGDetailsItem *pParent) - : QIGraphicsWidget(pParent) + : QIWithRetranslateUI4<QIGraphicsWidget>(pParent) , m_pParent(pParent) { /* Basic item setup: */ diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h index ca4dafda5..65f5925f3 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -21,6 +21,7 @@ /* GUI includes: */ #include "QIGraphicsWidget.h" +#include "QIWithRetranslateUI.h" /* Forward declaration: */ class UIGDetailsModel; @@ -42,7 +43,7 @@ enum UIGDetailsItemType /* Details item interface * for graphics details model/view architecture: */ -class UIGDetailsItem : public QIGraphicsWidget +class UIGDetailsItem : public QIWithRetranslateUI4<QIGraphicsWidget> { Q_OBJECT; @@ -89,6 +90,9 @@ protected slots: protected: + /* Helper: Translate stuff: */ + void retranslateUi() {} + /* Helpers: Paint stuff: */ static void configurePainterShape(QPainter *pPainter, const QStyleOptionGraphicsItem *pOption, int iRadius); static void paintFrameRect(QPainter *pPainter, const QRect &rect, int iRadius); diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp index 9db5e16d0..0df3051ee 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsView.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -23,7 +23,6 @@ /* GUI includes: */ #include "UIGDetailsView.h" -#include "UIGChooserModel.h" UIGDetailsView::UIGDetailsView(QWidget *pParent) : QGraphicsView(pParent) @@ -84,8 +83,6 @@ void UIGDetailsView::preparePalette() void UIGDetailsView::resizeEvent(QResizeEvent*) { - /* Update scene-rect: */ - updateSceneRect(); /* Notify listeners: */ emit sigResized(); } diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp index f4fd4edc5..1bc2e6ebb 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010-2012 Oracle Corporation + * Copyright (C) 2010-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -47,7 +47,7 @@ UpdateIntervalMap CreateUpdateIntervalMap() UpdateIntervalMap UIGMachinePreview::m_intervals = CreateUpdateIntervalMap(); UIGMachinePreview::UIGMachinePreview(QIGraphicsWidget *pParent) - : QIGraphicsWidget(pParent) + : QIWithRetranslateUI4<QIGraphicsWidget>(pParent) , m_machineState(KMachineState_Null) , m_pUpdateTimer(new QTimer(this)) , m_pUpdateTimerMenu(0) diff --git a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h index 450c61273..d447e99e2 100644 --- a/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h +++ b/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010-2012 Oracle Corporation + * Copyright (C) 2010-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -24,6 +24,7 @@ /* GUI includes: */ #include "UIGDetailsItem.h" +#include "QIWithRetranslateUI.h" /* COM includes: */ #include "COMEnums.h" @@ -50,7 +51,7 @@ enum UpdateInterval typedef QMap<UpdateInterval, QString> UpdateIntervalMap; /* Preview window class: */ -class UIGMachinePreview : public QIGraphicsWidget +class UIGMachinePreview : public QIWithRetranslateUI4<QIGraphicsWidget> { Q_OBJECT; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp index 8ce289674..be10c1688 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h index 7734dcfbf..595186c5f 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDefs.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp index 2e15711f1..14563f56b 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h index f2af7f0c4..4d2779290 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp index 654d75c0e..2bf2533c0 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h index c77a2b307..d5f82017f 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialogSpecific.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h index e41411cd1..0753fbe8d 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h index 566014362..da2f5cdaf 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/VBoxSettingsSelector.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp index 7df2f379a..2c5473708 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h index 18df82a70..547d82b82 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp index 280628dea..925d3f87b 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h index 9a091379a..84dc40612 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsInput.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp index 378cb37d8..1c8c1fea6 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsLanguage.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h index d98c115ef..ef05e2931 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsNetwork.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp index d3ed3206c..41435dd25 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h index b0dc89c48..1f00cb66a 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsUpdate.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp index b58bfd64f..40ef4a929 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h index 90352cb34..5c378e545 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsAudio.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp index 59749bef0..03159994c 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h index c7efbf52e..093c75fbf 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp index 48ec997ec..78bba87be 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h index a945065dc..93b0204a9 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsParallel.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp index 2aa8f0bb3..a0a7d6570 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h index 075d77f90..158173a38 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsPortForwardingDlg.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h index 99c77dfbf..65043d9b1 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSF.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp index 01c6e655e..f9a9f59df 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h index 577bc17fb..c97000f92 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSerial.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp index 30d59837d..0d0d408bd 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h index 7d88e223d..ba976f758 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsStorage.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h index d3e830ca4..1486b6a0b 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsSystem.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h index 8b1f07905..cbd2def02 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSB.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp index 15fa39752..720e26793 100644 --- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp +++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsUSBFilterDetails.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp index c4e4c5b45..7c9e605f6 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h index 9d7710af0..28a704017 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui index ca40ccbdd..e6d724cfe 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceEditorWidget.ui @@ -2,7 +2,7 @@ <comment> VBox frontends: Qt4 GUI ("VirtualBox"): - Copyright (C) 2009-2012 Oracle Corporation + Copyright (C) 2009-2013 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; @@ -27,23 +27,32 @@ <number>0</number> </property> <item> - <widget class="QTreeView" name="m_pTvSettings"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - </widget> - </item> - <item> - <widget class="QCheckBox" name="m_pReinitMACsCheckBox"> - <property name="toolTip"> - <string>When checked a new unique MAC address will assigned to all configured network cards.</string> - </property> - <property name="text"> - <string>&Reinitialize the MAC address of all network cards</string> - </property> + <widget class="QWidget" name="m_pInfoWidget" native="true"> + <layout class="QVBoxLayout" name="m_pInfoPaneLayout"> + <property name="margin"> + <number>0</number> + </property> + <item> + <widget class="QTreeView" name="m_pTvSettings"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + </widget> + </item> + <item> + <widget class="QCheckBox" name="m_pReinitMACsCheckBox"> + <property name="toolTip"> + <string>When checked a new unique MAC address will assigned to all configured network cards.</string> + </property> + <property name="text"> + <string>&Reinitialize the MAC address of all network cards</string> + </property> + </widget> + </item> + </layout> </widget> </item> <item> diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp index cd935dae7..30b6ec8d8 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h index f56cfe0dd..951f12726 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceExportEditorWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp index 9d20f20b9..f5f2fb02d 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h index ea0319434..59c777756 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIApplianceImportEditorWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp index 5fe7f4b28..080f59b67 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h index 0dff7a0bc..e9faa5a37 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBar.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp index bb9025d4e..a4e0125a3 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h index c6be2ff5a..f69012d80 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIBootTable.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp index bf5eabe3a..02f84f282 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIHotKeyEditor.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h index d17393b46..9cb503edd 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp index 3ef1cd2a9..fe492d469 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h index 2f3595e1d..c9c78095d 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/UISpecialControls.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h index d86a3c273..3be743155 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxFilePathSelectorWidget.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp index 8699878b2..92f026349 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.h index 2f1759a62..b2abb5238 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxGuestRAMSlider.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp index 6c1032d7e..070c39d84 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h index 964432021..b8986fc32 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxMediaComboBox.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp index 6253d4c62..d0c3e539d 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.h index 04591bbca..f9e4f6a5f 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxOSTypeSelectorButton.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.h b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.h index 89613402e..84dc79c58 100644 --- a/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.h +++ b/src/VBox/Frontends/VirtualBox/src/widgets/VBoxWarningPane.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp index d0ed1a43c..4c1de05d7 100644 --- a/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp +++ b/src/VBox/Frontends/VirtualBox/src/wizards/clonevm/UIWizardCloneVM.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011-2012 Oracle Corporation + * Copyright (C) 2011-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -38,7 +38,6 @@ UIWizardCloneVM::UIWizardCloneVM(QWidget *pParent, const CMachine &machine, CSna /* Assign watermark: */ assignWatermark(":/vmw_clone.png"); #else /* Q_WS_MAC */ - setMinimumSize(QSize(600, 400)); /* Assign background image: */ assignBackground(":/vmw_clone_bg.png"); #endif /* Q_WS_MAC */ diff --git a/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp b/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp index db78000a3..83cfeb8e0 100644 --- a/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp +++ b/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h b/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h index f41158875..f65c28271 100644 --- a/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h +++ b/src/VBox/GuestHost/OpenGL/include/state/cr_framebuffer.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h b/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h index 2713c4346..76bd31097 100644 --- a/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h +++ b/src/VBox/GuestHost/OpenGL/include/state/cr_glsl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c b/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c index ab904d370..bc1ab5434 100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_framebuffer.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c b/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c index 36fc6beaf..ed3db8e43 100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_shaders.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c index 32ee91790..ed185788c 100644 --- a/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c +++ b/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c index ecebf73f9..75dbc4b42 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_framebuffer.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c index 7741007b6..f5dbe2857 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c index 7f7b85472..58718c986 100644 --- a/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c +++ b/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c index fbf353043..64167e387 100644 --- a/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c +++ b/src/VBox/GuestHost/OpenGL/util/vboxhgcm.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c b/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c index 60d5ce21f..3da3496a9 100644 --- a/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c +++ b/src/VBox/GuestHost/OpenGL/util/vboxhgsmi.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp index 3834683b3..9d640b218 100644 --- a/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp +++ b/src/VBox/GuestHost/SharedClipboard/clipboard-helper.cpp @@ -6,7 +6,7 @@ /* * Includes contributions from François Revol * - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp index 2dbfc859b..d1fd7803e 100644 --- a/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp +++ b/src/VBox/GuestHost/SharedClipboard/x11-clipboard.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPDrvIDC.h b/src/VBox/HostDrivers/Support/SUPDrvIDC.h index ca9fe3148..5c0854f90 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIDC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIDC.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPDrvIOC.h b/src/VBox/HostDrivers/Support/SUPDrvIOC.h index dceca008b..2cbf89fc7 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvIOC.h +++ b/src/VBox/HostDrivers/Support/SUPDrvIOC.h @@ -1,10 +1,10 @@ -/* $Revision: 78601 $ */ +/* $Revision: 83687 $ */ /** @file * VirtualBox Support Driver - IOCtl definitions. */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPDrvInternal.h b/src/VBox/HostDrivers/Support/SUPDrvInternal.h index bc9149820..32a5720d4 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvInternal.h +++ b/src/VBox/HostDrivers/Support/SUPDrvInternal.h @@ -1,10 +1,10 @@ -/* $Revision: 80003 $ */ +/* $Revision: 83687 $ */ /** @file * VirtualBox Support Driver - Internal header. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPDrvSem.c b/src/VBox/HostDrivers/Support/SUPDrvSem.c index f546f56fb..79718ef80 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvSem.c +++ b/src/VBox/HostDrivers/Support/SUPDrvSem.c @@ -1,10 +1,10 @@ -/* $Revision: 66703 $ */ +/* $Revision: 83687 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Common OS agnostic. */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp index 45c622ef2..d03f6c599 100644 --- a/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp +++ b/src/VBox/HostDrivers/Support/SUPDrvTracer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -635,7 +635,6 @@ static int supdrvVtgValidate(PVTGOBJHDR pVtgHdr, RTUINTPTR uVtgHdrAddr, const ui MY_CHECK_RET(paProbeLocs[i].uLine < _1G, VERR_SUPDRV_VTG_BAD_PROBE_LOC); MY_CHECK_RET(paProbeLocs[i].fEnabled == false, VERR_SUPDRV_VTG_BAD_PROBE_LOC); MY_CHECK_RET(paProbeLocs[i].idProbe == 0, VERR_SUPDRV_VTG_BAD_PROBE_LOC); - MY_WITHIN_IMAGE(paProbeLocs[i].pszFunction, VERR_SUPDRV_VTG_BAD_PROBE_LOC); offTmp = (uintptr_t)paProbeLocs[i].pProbe - (uintptr_t)pVtgHdr->offProbes - (uintptr_t)pVtgHdr; #ifdef RT_OS_DARWIN /* See header validation code. */ if ( offTmp >= pVtgHdr->cbProbes @@ -645,12 +644,17 @@ static int supdrvVtgValidate(PVTGOBJHDR pVtgHdr, RTUINTPTR uVtgHdrAddr, const ui && !fUmod ) { uint64_t offDelta = uVtgHdrAddr - pVtgHdr->u64VtgObjSectionStart; + paProbeLocs[i].pProbe = (PVTGDESCPROBE)((uintptr_t)paProbeLocs[i].pProbe + offDelta); + if ((uintptr_t)paProbeLocs[i].pszFunction < _4M) + paProbeLocs[i].pszFunction = (const char *)((uintptr_t)paProbeLocs[i].pszFunction + offDelta); + offTmp += offDelta; } #endif MY_CHECK_RET(offTmp < pVtgHdr->cbProbes, VERR_SUPDRV_VTG_BAD_PROBE_LOC); MY_CHECK_RET(offTmp / sizeof(VTGDESCPROBE) * sizeof(VTGDESCPROBE) == offTmp, VERR_SUPDRV_VTG_BAD_PROBE_LOC); + MY_WITHIN_IMAGE(paProbeLocs[i].pszFunction, VERR_SUPDRV_VTG_BAD_PROBE_LOC); } } diff --git a/src/VBox/HostDrivers/Support/SUPLib.cpp b/src/VBox/HostDrivers/Support/SUPLib.cpp index c7878bcda..8bc564a99 100644 --- a/src/VBox/HostDrivers/Support/SUPLib.cpp +++ b/src/VBox/HostDrivers/Support/SUPLib.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPLibInternal.h b/src/VBox/HostDrivers/Support/SUPLibInternal.h index 0f37d7b79..abf119518 100644 --- a/src/VBox/HostDrivers/Support/SUPLibInternal.h +++ b/src/VBox/HostDrivers/Support/SUPLibInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPLibSem.cpp b/src/VBox/HostDrivers/Support/SUPLibSem.cpp index e835f599c..7df189169 100644 --- a/src/VBox/HostDrivers/Support/SUPLibSem.cpp +++ b/src/VBox/HostDrivers/Support/SUPLibSem.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c index d867a37e1..43926072b 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientComponent.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h index 29ada07f1..dc165ddef 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c index 595d24740..0bccc5f78 100644 --- a/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c +++ b/src/VBox/HostDrivers/Support/SUPR0IdcClientStubs.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp index 3b5c08e83..ef00d485f 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedIPRT.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp index ec64e52a3..8413f2e04 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedMain.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp index 01a803685..f4da6a613 100644 --- a/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp +++ b/src/VBox/HostDrivers/Support/SUPR3HardenedVerify.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPSvc.cpp b/src/VBox/HostDrivers/Support/SUPSvc.cpp index de087be52..c3921bcf1 100644 --- a/src/VBox/HostDrivers/Support/SUPSvc.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp index f58a03adb..fe67b7fc8 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGlobal.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp index 50a9cdef8..e4ec5c036 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp +++ b/src/VBox/HostDrivers/Support/SUPSvcGrant.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/SUPSvcInternal.h b/src/VBox/HostDrivers/Support/SUPSvcInternal.h index afdc78f40..b510c8ff9 100644 --- a/src/VBox/HostDrivers/Support/SUPSvcInternal.h +++ b/src/VBox/HostDrivers/Support/SUPSvcInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp index d91f34de4..fc6656290 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPDrv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp index 5d5b03d39..6ca954c67 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp +++ b/src/VBox/HostDrivers/Support/darwin/SUPLib-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c index 128a6907c..14e6a8c28 100644 --- a/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c +++ b/src/VBox/HostDrivers/Support/darwin/SUPR0IdcClient-darwin.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp index 6c16f5e9e..79c9e4def 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp +++ b/src/VBox/HostDrivers/Support/freebsd/SUPLib-freebsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c index b0e39038d..ed0808868 100644 --- a/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c +++ b/src/VBox/HostDrivers/Support/freebsd/SUPR0IdcClient-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c index 80066ce8e..3702a3a13 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c @@ -1,10 +1,10 @@ -/* $Rev: 77635 $ */ +/* $Rev: 83687 $ */ /** @file * VBoxDrv - The VirtualBox Support Driver - Linux specifics. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c index 0aaea1a1c..209305200 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c +++ b/src/VBox/HostDrivers/Support/linux/SUPDrv-linux.mod.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp index 462814424..d40f0d83c 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp +++ b/src/VBox/HostDrivers/Support/linux/SUPLib-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c index 15d9761fe..7bc8e6d00 100644 --- a/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c +++ b/src/VBox/HostDrivers/Support/linux/SUPR0IdcClient-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def index 420bfd619..18550ae16 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def +++ b/src/VBox/HostDrivers/Support/os2/SUPDrv-os2.def @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2007 Oracle Corporation +; Copyright (C) 2007-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp index c502b7c4b..ba03c87af 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp +++ b/src/VBox/HostDrivers/Support/os2/SUPLib-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c index a20af4603..9f06939dc 100644 --- a/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c +++ b/src/VBox/HostDrivers/Support/os2/SUPR0IdcClient-os2.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c index 6916c8bc0..1c459b60f 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPDrv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp index 0cb71dcaa..3799d043f 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp +++ b/src/VBox/HostDrivers/Support/solaris/SUPLib-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c index 033fcdec5..c7ca7b3f0 100644 --- a/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c +++ b/src/VBox/HostDrivers/Support/solaris/SUPR0IdcClient-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp index f2f2b81c2..81205d31a 100644 --- a/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp +++ b/src/VBox/HostDrivers/Support/testcase/SUPLoggerCtl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp index a0030808c..be9f72cbe 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstContiguous.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp index 97ace8c7e..d8691bace 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGIP-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp index 1af3d73b6..15274cf7d 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstGetPagingMode.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp index bdbe4613d..bcb4028c0 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInit.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInit.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp index 9a5226017..27e426ae5 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstInt.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstInt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp index 39058924f..8394762c0 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstLow.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstLow.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp index 263827224..759d86c09 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstPage.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstPage.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp index 508ba292c..131fa2d9e 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstPin.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstPin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp index 0f15f4006..dca7c4222 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupLoadModule.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -105,7 +105,7 @@ int main(int argc, char **argv) return 1; case 'V': - RTPrintf("$Revision: 77327 $\n"); + RTPrintf("$Revision: 83687 $\n"); return 0; default: diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp index 2b0d2d8fb..9358cb059 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem-Zombie.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp index 6f37c63ca..b5e0e6e2d 100644 --- a/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp +++ b/src/VBox/HostDrivers/Support/testcase/tstSupSem.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp index 65ce0b316..1a5586bad 100644 --- a/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPDrv-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm index f7d5e9539..11fdcf389 100644 --- a/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm +++ b/src/VBox/HostDrivers/Support/win/SUPDrvA-win.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp index d12ea3c35..a01ca3803 100644 --- a/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPLib-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c index 536982d5e..16099838a 100644 --- a/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c +++ b/src/VBox/HostDrivers/Support/win/SUPR0IdcClient-win.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp index 1682f5ce4..435226b2f 100644 --- a/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp +++ b/src/VBox/HostDrivers/Support/win/SUPSvc-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf index 4a5b8661d..b7ad3e91e 100644 --- a/src/VBox/HostDrivers/Support/win/VBoxDrv.inf +++ b/src/VBox/HostDrivers/Support/win/VBoxDrv.inf @@ -4,7 +4,7 @@ ;
;
-; Copyright (C) 2006-2007 Oracle Corporation
+; Copyright (C) 2006-2010 Oracle Corporation
;
; This file is part of VirtualBox Open Source Edition (OSE), as
; available from http://www.virtualbox.org. This file is free software;
diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c index 2bd280295..f3c0aaf31 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdp.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h index 5c7f7a031..5c16bd3f8 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h +++ b/src/VBox/HostDrivers/VBoxNetAdp/VBoxNetAdpInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp index 0412d530a..ad8c06a72 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxNetAdp/darwin/VBoxNetAdp-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh b/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh index 360d053ce..4f556f3e3 100755 --- a/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh +++ b/src/VBox/HostDrivers/VBoxNetAdp/darwin/loadnetadp.sh @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile index 24bf01bd1..6cc429677 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile +++ b/src/VBox/HostDrivers/VBoxNetAdp/freebsd/Makefile @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile index ae7a4a5c6..e8a5461ed 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/Makefile @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c index 96405368c..c6b21a9cc 100644 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/VBoxNetAdp-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp index acdae40c8..13e9f3270 100755 --- a/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp +++ b/src/VBox/HostDrivers/VBoxNetAdp/linux/files_vboxnetadp @@ -1,11 +1,11 @@ #!/bin/sh -# $Revision: 72877 $ +# $Revision: 83687 $ ## @files # Shared file between Makefile.kmk and export_modules # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c index 3aca286a7..fd26e8319 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFlt.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h index 90182a993..e869f4689 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/VBoxNetFltInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp index a07c93234..2618097a6 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/darwin/VBoxNetFlt-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile index a6792b019..d3868458a 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile +++ b/src/VBox/HostDrivers/VBoxNetFlt/freebsd/Makefile @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile index 7f3b5f37b..95c15704b 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/Makefile @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c index 28e2ae84b..c06e029ae 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/VBoxNetFlt-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -795,7 +795,7 @@ static int vboxNetFltLinuxPacketHandler(struct sk_buff *pBuf, if (pDev != pSkbDev) { Log(("vboxNetFltLinuxPacketHandler: Devices do not match, pThis may be wrong! pThis=%p\n", pThis)); - dev_kfree_skb(pBuf); + kfree_skb(pBuf); /* This is a failure, so we use kfree_skb instead of dev_kfree_skb. */ return 0; } @@ -814,7 +814,7 @@ static int vboxNetFltLinuxPacketHandler(struct sk_buff *pBuf, */ unsigned int uMacLen = pBuf->mac_len; struct sk_buff *pCopy = skb_copy(pBuf, GFP_ATOMIC); - kfree_skb(pBuf); + dev_kfree_skb(pBuf); if (!pCopy) { LogRel(("VBoxNetFlt: Failed to allocate packet buffer, dropping the packet.\n")); diff --git a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt index 8e22c249a..49008be30 100755 --- a/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt +++ b/src/VBox/HostDrivers/VBoxNetFlt/linux/files_vboxnetflt @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp index 239068846..306844f23 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp @@ -3,7 +3,7 @@ * VBoxNetCfg.cpp - Network Configuration API. */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp index ab2560881..91936f5e8 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp @@ -4,7 +4,7 @@ * Miniport edge */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h index 956b99204..4e82bbad9 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp index ab45e91c1..3fea0a395 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp @@ -4,7 +4,7 @@ * Protocol edge */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp index f5e3b2ef8..5aa2e7db6 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp @@ -4,7 +4,7 @@ * NetFlt Runtime */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h index 1a1881527..7d02493fa 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.h @@ -4,7 +4,7 @@ * NetFlt Runtime API */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def index c11bf3956..8aea0b69b 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.def @@ -4,7 +4,7 @@ ; Library def file ; ; -; Copyright (C) 2011 Oracle Corporation +; Copyright (C) 2011-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp index f5b1b7807..bbc7b91c6 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp index f8e93be0c..d89d60dbb 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp index 7c0169458..0c8ca4091 100644 --- a/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxPci/VBoxPci.c b/src/VBox/HostDrivers/VBoxPci/VBoxPci.c index 97f405b68..6149f97f0 100644 --- a/src/VBox/HostDrivers/VBoxPci/VBoxPci.c +++ b/src/VBox/HostDrivers/VBoxPci/VBoxPci.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h index f5f33b867..6b435d606 100644 --- a/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h +++ b/src/VBox/HostDrivers/VBoxPci/VBoxPciInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp index fd1882835..b0c33c350 100644 --- a/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/USBFilter.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp index e404a396f..0f4309e8e 100644 --- a/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/USBLib.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp index 368eed7d4..872213ee9 100644 --- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h index eec6bb6eb..5ae85acfe 100644 --- a/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h +++ b/src/VBox/HostDrivers/VBoxUSB/VBoxUSBFilterMgr.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp index c55829726..2443eda24 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/USBLib-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp index 64945f997..580f4dc34 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSB.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h index 6b39bcfd5..23530437d 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/VBoxUSBInterface.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp index 49929216f..889e5bc86 100644 --- a/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/darwin/testcase/tstOpenUSBDev.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -206,7 +206,7 @@ int main(int argc, char **argv) case 'h': return tstSyntax(argv[0]); case 'V': - RTPrintf("$Revision: 73843 $\n"); + RTPrintf("$Revision: 83687 $\n"); return 0; default: diff --git a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp index f4751a81d..26cffac29 100644 --- a/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/solaris/USBLib-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp index 955dce559..cd2d575bd 100644 --- a/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/testcase/tstUSBFilter.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp index ee3f18afe..8526558f9 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp @@ -4,7 +4,7 @@ * * Installation code * - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp index f4690a74b..704cd7009 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp @@ -4,7 +4,7 @@ * * Installation code * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h index 8686f951b..8267a29a0 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h +++ b/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbDev.h @@ -3,7 +3,7 @@ * VBoxUsbDev.h - USB device. */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp index 22ca4fcd0..026f851e0 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/lib/VBoxUsbLib-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp index 393dbd470..cf0a2df86 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp +++ b/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp @@ -4,7 +4,7 @@ * * Installation code * - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def b/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def index cf5c02b72..d6977bb1b 100644 --- a/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def +++ b/src/VBox/HostDrivers/VBoxUSB/win/usbd/usbd.def @@ -1,7 +1,7 @@ ; ; Export definitions ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/freebsd/Makefile b/src/VBox/HostDrivers/freebsd/Makefile index b5c9b727e..870dd1c38 100644 --- a/src/VBox/HostDrivers/freebsd/Makefile +++ b/src/VBox/HostDrivers/freebsd/Makefile @@ -4,7 +4,7 @@ # # -# Copyright (C) 2008-2009 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/Makefile b/src/VBox/HostDrivers/linux/Makefile index b569e68e6..8c5fa1cb4 100644 --- a/src/VBox/HostDrivers/linux/Makefile +++ b/src/VBox/HostDrivers/linux/Makefile @@ -4,7 +4,7 @@ # # -# Copyright (C) 2008-2010 Oracle Corporation +# Copyright (C) 2008-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/build_in_tmp b/src/VBox/HostDrivers/linux/build_in_tmp index 87fbac85c..d7ddfb5a0 100755 --- a/src/VBox/HostDrivers/linux/build_in_tmp +++ b/src/VBox/HostDrivers/linux/build_in_tmp @@ -4,7 +4,7 @@ # Script to build a kernel module in /tmp. Useful if the module sources # are installed in read-only directory. Not for DKMS! # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/do_Module.symvers b/src/VBox/HostDrivers/linux/do_Module.symvers index 36be428de..a4a80fc97 100755 --- a/src/VBox/HostDrivers/linux/do_Module.symvers +++ b/src/VBox/HostDrivers/linux/do_Module.symvers @@ -4,7 +4,7 @@ # This script is used when building kernel modules from DKMS. I don't # know how to solve the problem of inter-module dependencies better. # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/export_modules b/src/VBox/HostDrivers/linux/export_modules index 36307bf64..5233ca395 100755 --- a/src/VBox/HostDrivers/linux/export_modules +++ b/src/VBox/HostDrivers/linux/export_modules @@ -3,7 +3,7 @@ # # Create a tar archive containing the sources of the vboxdrv kernel module # -# Copyright (C) 2007 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/load.sh b/src/VBox/HostDrivers/linux/load.sh index b08bb46af..f1668ddfe 100755 --- a/src/VBox/HostDrivers/linux/load.sh +++ b/src/VBox/HostDrivers/linux/load.sh @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010-2011 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/linux/loadall.sh b/src/VBox/HostDrivers/linux/loadall.sh index 48a7960c7..f5d87b9cb 100755 --- a/src/VBox/HostDrivers/linux/loadall.sh +++ b/src/VBox/HostDrivers/linux/loadall.sh @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010-2011 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp index 0173563d1..6b7ebde52 100644 --- a/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp +++ b/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp @@ -3,7 +3,7 @@ * VBoxDrvCfg.cpp - Windows Driver Manipulation API implementation */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/win/load.sh b/src/VBox/HostDrivers/win/load.sh index 3e76d34b6..8ba1dc441 100755 --- a/src/VBox/HostDrivers/win/load.sh +++ b/src/VBox/HostDrivers/win/load.sh @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010-2011 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostDrivers/win/loadall.sh b/src/VBox/HostDrivers/win/loadall.sh index 24743c043..446cd47de 100755 --- a/src/VBox/HostDrivers/win/loadall.sh +++ b/src/VBox/HostDrivers/win/loadall.sh @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010-2011 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/GuestProperties/service.cpp b/src/VBox/HostServices/GuestProperties/service.cpp index addcbec5e..bd3a1626d 100644 --- a/src/VBox/HostServices/GuestProperties/service.cpp +++ b/src/VBox/HostServices/GuestProperties/service.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -138,18 +138,20 @@ struct GuestCall VBOXHGCMCALLHANDLE mHandle; /** The function that was requested */ uint32_t mFunction; + /** Number of call parameters. */ + uint32_t mParmsCnt; /** The call parameters */ VBOXHGCMSVCPARM *mParms; /** The default return value, used for passing warnings */ int mRc; /** The standard constructor */ - GuestCall() : u32ClientId(0), mFunction(0) {} + GuestCall(void) : u32ClientId(0), mFunction(0), mParmsCnt(0) {} /** The normal constructor */ GuestCall(uint32_t aClientId, VBOXHGCMCALLHANDLE aHandle, uint32_t aFunction, - VBOXHGCMSVCPARM aParms[], int aRc) - : u32ClientId(aClientId), mHandle(aHandle), mFunction(aFunction), mParms(aParms), - mRc(aRc) {} + uint32_t aParmsCnt, VBOXHGCMSVCPARM aParms[], int aRc) + : u32ClientId(aClientId), mHandle(aHandle), mFunction(aFunction), + mParmsCnt(aParmsCnt), mParms(aParms), mRc(aRc) {} }; /** The guest call list type */ typedef std::list <GuestCall> CallList; @@ -170,7 +172,8 @@ private: RTSTRSPACE mhProperties; /** The number of properties. */ unsigned mcProperties; - /** The list of property changes for guest notifications */ + /** The list of property changes for guest notifications; + * only used for timestamp tracking in notifications at the moment */ PropertyList mGuestNotifications; /** The list of outstanding guest notification calls */ CallList mGuestWaiters; @@ -375,8 +378,8 @@ private: VBOXHGCMSVCPARM paParms[]); int getOldNotificationInternal(const char *pszPattern, uint64_t u64Timestamp, Property *pProp); - int getNotificationWriteOut(VBOXHGCMSVCPARM paParms[], Property prop); - void doNotifications(const char *pszProperty, uint64_t u64Timestamp); + int getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property prop); + int doNotifications(const char *pszProperty, uint64_t u64Timestamp); int notifyHost(const char *pszName, const char *pszValue, uint64_t u64Timestamp, const char *pszFlags); @@ -701,35 +704,41 @@ int Service::setProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGues } else if (mcProperties < MAX_PROPS) { - /* Create a new string space record. */ - pProp = new Property(pcszName, pcszValue, u64TimeNano, fFlags); - if (pProp) + try { + /* Create a new string space record. */ + pProp = new Property(pcszName, pcszValue, u64TimeNano, fFlags); + AssertPtr(pProp); + if (RTStrSpaceInsert(&mhProperties, &pProp->mStrCore)) mcProperties++; else { AssertFailed(); delete pProp; - rc = VERR_INTERNAL_ERROR_3; + + rc = VERR_ALREADY_EXISTS; } } - else + catch (std::bad_alloc) + { rc = VERR_NO_MEMORY; + } } else rc = VERR_TOO_MUCH_DATA; /* - * Send a notification to the host and return. + * Send a notification to the guest and host and return. */ // if (isGuest) /* Notify the host even for properties that the host // * changed. Less efficient, but ensures consistency. */ - doNotifications(pcszName, u64TimeNano); - Log2(("Set string %s, rc=%Rrc, value=%s\n", pcszName, rc, pcszValue)); + int rc2 = doNotifications(pcszName, u64TimeNano); + if (RT_SUCCESS(rc)) + rc = rc2; } - LogFlowThisFunc(("rc = %Rrc (%s = %s)\n", rc, pcszName, pcszValue)); + LogFlowThisFunc(("%s=%s, rc=%Rrc\n", pcszName, pcszValue, rc)); return rc; } @@ -763,7 +772,7 @@ int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGues rc = VERR_INVALID_PARAMETER; if (RT_FAILURE(rc)) { - LogFlowThisFunc(("rc = %Rrc\n", rc)); + LogFlowThisFunc(("rc=%Rrc\n", rc)); return rc; } @@ -787,10 +796,12 @@ int Service::delProperty(uint32_t cParms, VBOXHGCMSVCPARM paParms[], bool isGues delete pProp; // if (isGuest) /* Notify the host even for properties that the host // * changed. Less efficient, but ensures consistency. */ - doNotifications(pcszName, u64Timestamp); + int rc2 = doNotifications(pcszName, u64Timestamp); + if (RT_SUCCESS(rc)) + rc = rc2; } - LogFlowThisFunc(("rc = %Rrc (%s)\n", rc, pcszName)); + LogFlowThisFunc(("%s: rc=%Rrc\n", pcszName, rc)); return rc; } @@ -967,15 +978,17 @@ int Service::getOldNotificationInternal(const char *pszPatterns, /** Helper query used by getNotification */ -int Service::getNotificationWriteOut(VBOXHGCMSVCPARM paParms[], Property prop) +int Service::getNotificationWriteOut(uint32_t cParms, VBOXHGCMSVCPARM paParms[], Property prop) { - int rc = VINF_SUCCESS; + AssertReturn(cParms == 4, VERR_INVALID_PARAMETER); /* Basic sanity checking. */ + /* Format the data to write to the buffer. */ std::string buffer; uint64_t u64Timestamp; char *pchBuf; uint32_t cbBuf; - rc = paParms[2].getBuffer((void **)&pchBuf, &cbBuf); + + int rc = paParms[2].getBuffer((void **)&pchBuf, &cbBuf); if (RT_SUCCESS(rc)) { char szFlags[MAX_FLAGS_LEN]; @@ -1014,8 +1027,8 @@ int Service::getNotificationWriteOut(VBOXHGCMSVCPARM paParms[], Property prop) * @thread HGCM * @throws can throw std::bad_alloc */ -int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, uint32_t cParms, - VBOXHGCMSVCPARM paParms[]) +int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle, + uint32_t cParms, VBOXHGCMSVCPARM paParms[]) { int rc = VINF_SUCCESS; char *pszPatterns = NULL; /* shut up gcc */ @@ -1034,9 +1047,9 @@ int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle || RT_FAILURE(paParms[2].getBuffer((void **)&pchBuf, &cbBuf)) /* return buffer */ ) rc = VERR_INVALID_PARAMETER; + if (RT_SUCCESS(rc)) - LogFlow((" pszPatterns=%s, u64Timestamp=%llu\n", pszPatterns, - u64Timestamp)); + LogFlow(("pszPatterns=%s, u64Timestamp=%llu\n", pszPatterns, u64Timestamp)); /* * If no timestamp was supplied or no notification was found in the queue @@ -1045,45 +1058,50 @@ int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle Property prop; if (RT_SUCCESS(rc) && u64Timestamp != 0) rc = getOldNotification(pszPatterns, u64Timestamp, &prop); - if (RT_SUCCESS(rc) && prop.isNull()) + if (RT_SUCCESS(rc)) { - /* - * Check if the client already had the same request. - * Complete the old request with an error in this case. - * Protection against clients, which cancel and resubmits requests. - */ - CallList::iterator it = mGuestWaiters.begin(); - while (it != mGuestWaiters.end()) + if (prop.isNull()) { - const char *pszPatternsExisting; - uint32_t cchPatternsExisting; - int rc3 = it->mParms[0].getString(&pszPatternsExisting, &cchPatternsExisting); - - if ( RT_SUCCESS(rc3) - && u32ClientId == it->u32ClientId - && RTStrCmp(pszPatterns, pszPatternsExisting) == 0) + /* + * Check if the client already had the same request. + * Complete the old request with an error in this case. + * Protection against clients, which cancel and resubmits requests. + */ + CallList::iterator it = mGuestWaiters.begin(); + while (it != mGuestWaiters.end()) { - /* Complete the old request. */ - mpHelpers->pfnCallComplete(it->mHandle, VERR_INTERRUPTED); - it = mGuestWaiters.erase(it); + const char *pszPatternsExisting; + uint32_t cchPatternsExisting; + int rc3 = it->mParms[0].getString(&pszPatternsExisting, &cchPatternsExisting); + + if ( RT_SUCCESS(rc3) + && u32ClientId == it->u32ClientId + && RTStrCmp(pszPatterns, pszPatternsExisting) == 0) + { + /* Complete the old request. */ + mpHelpers->pfnCallComplete(it->mHandle, VERR_INTERRUPTED); + it = mGuestWaiters.erase(it); + } + else + ++it; } - else - ++it; - } - mGuestWaiters.push_back(GuestCall(u32ClientId, callHandle, GET_NOTIFICATION, - paParms, rc)); - rc = VINF_HGCM_ASYNC_EXECUTE; - } - /* - * Otherwise reply at once with the enqueued notification we found. - */ - else - { - int rc2 = getNotificationWriteOut(paParms, prop); - if (RT_FAILURE(rc2)) - rc = rc2; + mGuestWaiters.push_back(GuestCall(u32ClientId, callHandle, GET_NOTIFICATION, + cParms, paParms, rc)); + rc = VINF_HGCM_ASYNC_EXECUTE; + } + /* + * Otherwise reply at once with the enqueued notification we found. + */ + else + { + int rc2 = getNotificationWriteOut(cParms, paParms, prop); + if (RT_FAILURE(rc2)) + rc = rc2; + } } + + LogFlowThisFunc(("returning rc=%Rrc\n", rc)); return rc; } @@ -1096,10 +1114,10 @@ int Service::getNotification(uint32_t u32ClientId, VBOXHGCMCALLHANDLE callHandle * * @thread HGCM service */ -void Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp) +int Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp) { - AssertPtrReturnVoid(pszProperty); - LogFlowThisFunc (("pszProperty=%s, u64Timestamp=%llu\n", pszProperty, u64Timestamp)); + AssertPtrReturn(pszProperty, VERR_INVALID_POINTER); + LogFlowThisFunc(("pszProperty=%s, u64Timestamp=%llu\n", pszProperty, u64Timestamp)); /* Ensure that our timestamp is different to the last one. */ if ( !mGuestNotifications.empty() && u64Timestamp == mGuestNotifications.back().mTimestamp) @@ -1121,8 +1139,8 @@ void Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp) prop.mFlags = pProp->mFlags; } - /* Release waiters if applicable and add the event to the queue for - * guest notifications */ + /* Release guest waiters if applicable and add the event + * to the queue for guest notifications */ int rc = VINF_SUCCESS; try { @@ -1135,7 +1153,7 @@ void Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp) if (prop.Matches(pszPatterns)) { GuestCall curCall = *it; - int rc2 = getNotificationWriteOut(curCall.mParms, prop); + int rc2 = getNotificationWriteOut(curCall.mParmsCnt, curCall.mParms, prop); if (RT_SUCCESS(rc2)) rc2 = curCall.mRc; mpHelpers->pfnCallComplete(curCall.mHandle, rc2); @@ -1144,41 +1162,48 @@ void Service::doNotifications(const char *pszProperty, uint64_t u64Timestamp) else ++it; } + mGuestNotifications.push_back(prop); + + /** @todo r=andy This list does not have a purpose but for tracking + * the timestamps ... */ + if (mGuestNotifications.size() > MAX_GUEST_NOTIFICATIONS) + mGuestNotifications.pop_front(); } catch (std::bad_alloc) { rc = VERR_NO_MEMORY; } - if (mGuestNotifications.size() > MAX_GUEST_NOTIFICATIONS) - mGuestNotifications.pop_front(); - /* - * Host notifications - first case: if the property exists then send its - * current value - */ - if (pProp && mpfnHostCallback != NULL) + if ( RT_SUCCESS(rc) + && mpfnHostCallback) { - char szFlags[MAX_FLAGS_LEN]; - /* Send out a host notification */ - const char *pszValue = prop.mValue.c_str(); - if (RT_SUCCESS(rc)) + /* + * Host notifications - first case: if the property exists then send its + * current value + */ + if (pProp) + { + char szFlags[MAX_FLAGS_LEN]; + /* Send out a host notification */ + const char *pszValue = prop.mValue.c_str(); rc = writeFlags(prop.mFlags, szFlags); - if (RT_SUCCESS(rc)) - rc = notifyHost(pszProperty, pszValue, u64Timestamp, szFlags); - } - - /* - * Host notifications - second case: if the property does not exist then - * send the host an empty value - */ - if (!pProp && mpfnHostCallback != NULL) - { - /* Send out a host notification */ - if (RT_SUCCESS(rc)) + if (RT_SUCCESS(rc)) + rc = notifyHost(pszProperty, pszValue, u64Timestamp, szFlags); + } + /* + * Host notifications - second case: if the property does not exist then + * send the host an empty value + */ + else + { + /* Send out a host notification */ rc = notifyHost(pszProperty, "", u64Timestamp, ""); + } } - LogFlowThisFunc(("returning\n")); + + LogFlowThisFunc(("returning rc=%Rrc\n", rc)); + return rc; } /** @@ -1200,10 +1225,10 @@ int Service::notifyHost(const char *pszName, const char *pszValue, HostCallbackData.pcszValue = pszValue; HostCallbackData.u64Timestamp = u64Timestamp; HostCallbackData.pcszFlags = pszFlags; - int rc = mpfnHostCallback (mpvHostData, 0 /*u32Function*/, - (void *)(&HostCallbackData), - sizeof(HostCallbackData)); - LogFlowFunc (("returning %Rrc\n", rc)); + int rc = mpfnHostCallback(mpvHostData, 0 /*u32Function*/, + (void *)(&HostCallbackData), + sizeof(HostCallbackData)); + LogFlowFunc(("returning rc=%Rrc\n", rc)); return rc; } diff --git a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp index 782fd87a1..a58c2cd0d 100644 --- a/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp +++ b/src/VBox/HostServices/GuestProperties/testcase/tstGuestPropSvc.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp b/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp index e10be7464..153a19927 100644 --- a/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp +++ b/src/VBox/HostServices/SharedClipboard/VBoxClipboard-win.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h b/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h index 81f184be8..df38bbed8 100644 --- a/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h +++ b/src/VBox/HostServices/SharedClipboard/VBoxClipboard.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h index 4e36ff1a5..704d778ef 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h +++ b/src/VBox/HostServices/SharedClipboard/darwin-pasteboard.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/darwin.cpp b/src/VBox/HostServices/SharedClipboard/darwin.cpp index 1f7fe0ba2..46442a466 100644 --- a/src/VBox/HostServices/SharedClipboard/darwin.cpp +++ b/src/VBox/HostServices/SharedClipboard/darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/service.cpp b/src/VBox/HostServices/SharedClipboard/service.cpp index 3070a032b..413e772ac 100644 --- a/src/VBox/HostServices/SharedClipboard/service.cpp +++ b/src/VBox/HostServices/SharedClipboard/service.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp b/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp index 30633ec8c..c37002567 100644 --- a/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp +++ b/src/VBox/HostServices/SharedClipboard/x11-clipboard.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp index 45d681e0c..bb9280940 100644 --- a/src/VBox/HostServices/SharedClipboard/x11-stub.cpp +++ b/src/VBox/HostServices/SharedClipboard/x11-stub.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/mappings.cpp b/src/VBox/HostServices/SharedFolders/mappings.cpp index da3c0c637..303109091 100644 --- a/src/VBox/HostServices/SharedFolders/mappings.cpp +++ b/src/VBox/HostServices/SharedFolders/mappings.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/mappings.h b/src/VBox/HostServices/SharedFolders/mappings.h index c15d29e2d..c0a2989fc 100644 --- a/src/VBox/HostServices/SharedFolders/mappings.h +++ b/src/VBox/HostServices/SharedFolders/mappings.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/service.cpp b/src/VBox/HostServices/SharedFolders/service.cpp index f30a5dbb2..0c724f33b 100644 --- a/src/VBox/HostServices/SharedFolders/service.cpp +++ b/src/VBox/HostServices/SharedFolders/service.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/shflhandle.cpp b/src/VBox/HostServices/SharedFolders/shflhandle.cpp index cd67057bf..1a5f71bd9 100644 --- a/src/VBox/HostServices/SharedFolders/shflhandle.cpp +++ b/src/VBox/HostServices/SharedFolders/shflhandle.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/shflhandle.h b/src/VBox/HostServices/SharedFolders/shflhandle.h index 625c01023..59638b919 100644 --- a/src/VBox/HostServices/SharedFolders/shflhandle.h +++ b/src/VBox/HostServices/SharedFolders/shflhandle.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp b/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp index b72e724bf..ad6d54909 100644 --- a/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp +++ b/src/VBox/HostServices/SharedFolders/testcase/tstSharedFolderService.cpp @@ -11,7 +11,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp b/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp index 96d27cfaf..ce94fdb44 100644 --- a/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp +++ b/src/VBox/HostServices/SharedFolders/testcase/tstShflSizes.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/teststubs.h b/src/VBox/HostServices/SharedFolders/teststubs.h index 3be52fcc6..54c9ef4ae 100644 --- a/src/VBox/HostServices/SharedFolders/teststubs.h +++ b/src/VBox/HostServices/SharedFolders/teststubs.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/vbsf.cpp b/src/VBox/HostServices/SharedFolders/vbsf.cpp index 617239b8a..d290e50c9 100644 --- a/src/VBox/HostServices/SharedFolders/vbsf.cpp +++ b/src/VBox/HostServices/SharedFolders/vbsf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedFolders/vbsf.h b/src/VBox/HostServices/SharedFolders/vbsf.h index 76979681c..0151a2230 100644 --- a/src/VBox/HostServices/SharedFolders/vbsf.h +++ b/src/VBox/HostServices/SharedFolders/vbsf.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp index 2ed4a5a3f..fb83b0508 100644 --- a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp +++ b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp index a4b3a40f0..9d5945816 100644 --- a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp +++ b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestApp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp index 2f50de629..a2cdd51ae 100644 --- a/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp +++ b/src/VBox/HostServices/SharedOpenGL/OpenGLTest/OpenGLTestDarwin.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp index fa27add29..a7a74a938 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp +++ b/src/VBox/HostServices/SharedOpenGL/crserver/crservice.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c index b7c19e568..d323dd836 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_framebuffer.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c index 12677f84c..853a87c07 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_getshaders.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c index c11d2d009..1bc1049dd 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_glsl.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c index 6e6061ead..e09276953 100644 --- a/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c +++ b/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa.c b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa.c index a3b7b1575..4d7389e63 100644 --- a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa.c +++ b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h index 2380f2897..867509130 100644 --- a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h +++ b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m index eb2e5787b..cb611f73d 100644 --- a/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m +++ b/src/VBox/HostServices/SharedOpenGL/render/renderspu_cocoa_helper.m @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2011 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c index ca4d82b30..cdf0591b6 100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_framebuffer.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c index 6b3204ce4..26ae12695 100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_shaders.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c index 4bae17d19..961f7ac0c 100644 --- a/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c +++ b/src/VBox/HostServices/SharedOpenGL/unpacker/unpack_visibleregion.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c b/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c index 633c9400b..d80395f27 100644 --- a/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c +++ b/src/VBox/HostServices/auth/pam/VBoxAuthPAM.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/HostServices/testcase/tstHGCMSvc.cpp b/src/VBox/HostServices/testcase/tstHGCMSvc.cpp index 6adf1a28c..fcd396140 100644 --- a/src/VBox/HostServices/testcase/tstHGCMSvc.cpp +++ b/src/VBox/HostServices/testcase/tstHGCMSvc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp b/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp index c7a311e1b..f394524a2 100644 --- a/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp +++ b/src/VBox/ImageMounter/VBoxFUSE/VBoxFUSE.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/freebsd/Makefile.kmk b/src/VBox/Installer/freebsd/Makefile.kmk index 159a04cc1..79c672ad2 100644 --- a/src/VBox/Installer/freebsd/Makefile.kmk +++ b/src/VBox/Installer/freebsd/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -202,14 +202,14 @@ ifdef VBOX_WITH_HEADLESS VBoxHeadless endif -# BFE -ifdef VBOX_WITH_VBOXBFE - VBOX_FBSD_STRIP_BIN += \ - VBoxBFE \ - $(if $(VBOX_WITH_HARDENING),VBoxBFE.so) - VBOX_FBSD_SYMLINKS += \ - VBoxBFE -endif +## VBoxBFE - Follow the example set by Windows and Linux. +#ifdef VBOX_WITH_VBOXBFE +# VBOX_FBSD_STRIP_BIN += \ +# VBoxBFE \ +# $(if $(VBOX_WITH_HARDENING),VBoxBFE.so) +# VBOX_FBSD_SYMLINKS += \ +# VBoxBFE +#endif # Webservices ifdef VBOX_WITH_WEBSERVICES @@ -322,6 +322,7 @@ $(VBOX_FBSD_INST_OUT_DIR)/pkg_plist: \ $(QUIET)$(SED) \ -e "s;_VBOX_REM_32BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM32.so,);g" \ -e "s;_VBOX_REM_64BIT_MODULE_;$(if $(eq $(KBUILD_TARGET_ARCH),x86),VBoxREM64.so,);g" \ + -e "/VBoxBFE/d" \ --output $@ \ $< diff --git a/src/VBox/Installer/freebsd/postdeinstall.sh b/src/VBox/Installer/freebsd/postdeinstall.sh index 394d5d4a7..69ef19039 100755 --- a/src/VBox/Installer/freebsd/postdeinstall.sh +++ b/src/VBox/Installer/freebsd/postdeinstall.sh @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/freebsd/postinstall.sh b/src/VBox/Installer/freebsd/postinstall.sh index 7bb905b75..0a5090146 100755 --- a/src/VBox/Installer/freebsd/postinstall.sh +++ b/src/VBox/Installer/freebsd/postinstall.sh @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2010 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/Makefile.kmk b/src/VBox/Installer/linux/Makefile.kmk index a6c662f6a..ddde1ba1a 100644 --- a/src/VBox/Installer/linux/Makefile.kmk +++ b/src/VBox/Installer/linux/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -291,12 +291,12 @@ ifdef VBOX_WITH_HEADLESS $(if $(VBOX_WITH_HARDENING),VBoxHeadless.so) endif -# BFE -ifdef VBOX_WITH_BFE - VBOX_LNX_STRIP_BIN += \ - VBoxBFE \ - $(if $(VBOX_WITH_HARDENING),VBoxBFE.so) -endif +## VBoxBFE - Not shipped on linux due to a typo (VBOX_WITH_BFE), let's keep it that way as it doesn't get enough testing. +#ifdef VBOX_WITH_VBOXBFE +# VBOX_LNX_STRIP_BIN += \ +# VBoxBFE \ +# $(if $(VBOX_WITH_HARDENING),VBoxBFE.so) +#endif # Webservices ifdef VBOX_WITH_WEBSERVICES diff --git a/src/VBox/Installer/linux/VBox.sh b/src/VBox/Installer/linux/VBox.sh index 2243798ff..648a69e58 100755 --- a/src/VBox/Installer/linux/VBox.sh +++ b/src/VBox/Installer/linux/VBox.sh @@ -2,7 +2,7 @@ # # Oracle VM VirtualBox startup script, Linux hosts. # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh index 9c9a8df9e..ebf6254bc 100755 --- a/src/VBox/Installer/linux/VBoxCreateUSBNode.sh +++ b/src/VBox/Installer/linux/VBoxCreateUSBNode.sh @@ -6,7 +6,7 @@ # # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/VBoxSysInfo.sh b/src/VBox/Installer/linux/VBoxSysInfo.sh index 8166b2881..cf1f326be 100755 --- a/src/VBox/Installer/linux/VBoxSysInfo.sh +++ b/src/VBox/Installer/linux/VBoxSysInfo.sh @@ -5,7 +5,7 @@ # Installer (Unix-like) # Information about the host system/Linux distribution -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2011 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/install.sh b/src/VBox/Installer/linux/install.sh index 6cbf18d8b..e75d61dc4 100755 --- a/src/VBox/Installer/linux/install.sh +++ b/src/VBox/Installer/linux/install.sh @@ -4,7 +4,7 @@ # VirtualBox linux installation script # -# Copyright (C) 2007-2011 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/install_service/install_service.sh b/src/VBox/Installer/linux/install_service/install_service.sh index a77b0a219..3a2ac6df9 100755 --- a/src/VBox/Installer/linux/install_service/install_service.sh +++ b/src/VBox/Installer/linux/install_service/install_service.sh @@ -12,6 +12,7 @@ # 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. +# # Clean up before we start. cr=" diff --git a/src/VBox/Installer/linux/routines.sh b/src/VBox/Installer/linux/routines.sh index 5cf42bb21..656b5e77c 100644 --- a/src/VBox/Installer/linux/routines.sh +++ b/src/VBox/Installer/linux/routines.sh @@ -2,7 +2,7 @@ # VirtualBox installer shell routines # -# Copyright (C) 2007-2011 Oracle Corporation +# Copyright (C) 2007-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -620,3 +620,4 @@ maybe_run_python_bindings_installer() { return 0 } + diff --git a/src/VBox/Installer/linux/rpm/LocalConfig.kmk b/src/VBox/Installer/linux/rpm/LocalConfig.kmk index 921b63fb8..a9bebf87b 100644 --- a/src/VBox/Installer/linux/rpm/LocalConfig.kmk +++ b/src/VBox/Installer/linux/rpm/LocalConfig.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/run-inst.sh b/src/VBox/Installer/linux/run-inst.sh index 44c11835b..b23957fe8 100755 --- a/src/VBox/Installer/linux/run-inst.sh +++ b/src/VBox/Installer/linux/run-inst.sh @@ -1,10 +1,11 @@ #!/bin/sh # # Oracle VM VirtualBox -# VirtualBox Makeself installation starter script for Linux +# VirtualBox Makeself installation starter script +# for Linux Guest Additions # -# Copyright (C) 2006-2009 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -20,7 +21,6 @@ # the package into the filesystem (by default under /opt) and starts the real # installation script. # - PATH=$PATH:/bin:/sbin:/usr/sbin # Note: These variable names must *not* clash with variables in $CONFIG_DIR/$CONFIG! @@ -48,10 +48,15 @@ check_root create_log "$LOGFILE" +## @todo r=andy: Explain options like "force" and "no_setup" -- not self-explanatory +# to the user. usage() { info "" - info "Usage: install [<installation directory>] | uninstall [force] [no_setup]" + info "Usage: $SELF install [<installation directory>]" + info " [--with-<module>] |" + info " uninstall" + info " [--force] [--no-setup]" info "" info "Example:" info "$SELF install" @@ -194,41 +199,85 @@ ACTION="install" DO_SETUP="true" NO_CLEANUP="" FORCE_UPGRADE="" -while true + +while [ $# -ge 2 ]; do - if [ "$2" = "" ]; then - break - fi + ARG=$2 shift - case "$1" in - install) - ACTION="install" - ;; - - uninstall) - ACTION="uninstall" - ;; - force) - FORCE_UPGRADE="force" - ;; - no_setup) - DO_SETUP="" - ;; - no_cleanup) - # Do not do cleanup of old modules when removing them. For - # testing purposes only. - DO_SETUP="" - NO_CLEANUP="no_cleanup" - ;; - *) - if [ "`echo $1|cut -c1`" != "/" ]; then - info "Please specify an absolute path" - usage - fi - INSTALLATION_DIR="$1" - ;; - esac + if [ -z "$MY_END_OF_OPTIONS" ]; then + case "$ARG" in + + install) + ACTION="install" + ;; + + uninstall) + ACTION="uninstall" + ;; + + ## @todo Add per-module options handling, e.g. --lightdm-greeter-dir + # or --lightdm-config + + ## @todo Add listing all available modules (+ their options, e.g. + # with callback mod_mymod_show_options?) + + --with-*) + MODULE_CUR=$(expr "$ARG" : '--with-\(.*\)') + # Check if corresponding module in installer/module-$1 exists. + # Note: Module names may not contain spaces or other funny things. + if [ ! -f "./installer/module-${MODULE_CUR}" ]; then + info "Error: Module \"${MODULE_CUR}\" does not exist." + usage + fi + # Give the module the chance of doing initialization work / checks. + . "./installer/module-${MODULE_CUR}" + mod_${MODULE_CUR}_init + if test $? -ne 0; then + echo 1>&2 "Module '${CUR_MODULE}' failed to initialize" + if ! test "$FORCE_UPGRADE" = "force"; then + return 1 + fi + # Continue initialization. + fi + # Add module to the list of modules to handle later. + if test -z "${INSTALLATION_MODULES_LIST}"; then + INSTALLATION_MODULES_LIST="${MODULE_CUR}" + else + INSTALLATION_MODULES_LIST="${INSTALLATION_MODULES_LIST} ${MODULE_CUR}" + fi + shift + ;; + + --force|force) # Keep "force" for backwards compatibility. + FORCE_UPGRADE="force" + ;; + + --no-setup|no_setup) # Keep "no_setup" for backwards compatibility. + DO_SETUP="" + ;; + + --no-cleanup|no_cleanup) # Keep "no_cleanup" for backwards compatibility. + # Do not do cleanup of old modules when removing them. For + # testing purposes only. + DO_SETUP="" + NO_CLEANUP="no_cleanup" + ;; + + --) + MY_END_OF_OPTIONS="1" + ;; + + *) + if [ "`echo $1|cut -c1`" != "/" ]; then + info "Please specify an absolute path" + usage + fi + INSTALLATION_DIR="$1" + shift + ;; + esac + fi done # uninstall any previous installation @@ -247,6 +296,22 @@ rm -f "$CONFIG_DIR/$CONFIG_FILES" rmdir "$CONFIG_DIR" 2>/dev/null test "$ACTION" = "install" || exit 0 +# Set installer modules directory +INSTALLATION_MODULES_DIR="$INSTALLATION_DIR/installer/" + +# install and load installer modules +info "Copying additional installer modules ..." +mkdir -p -m 755 "$INSTALLATION_MODULES_DIR" +for CUR_FILE in installer/*; do + install -p -m 755 "$CUR_FILE" "$INSTALLATION_MODULES_DIR" + if [ $? -ne 0 ]; then + info "Error: Failed to copy installer module \"$CUR_FILE\"" + if ! test "$FORCE_UPGRADE" = "force"; then + exit 1 + fi + fi +done + # install the new version mkdir -p -m 755 "$CONFIG_DIR" test ! -d "$INSTALLATION_DIR" && REMOVE_INSTALLATION_DIR=1 @@ -275,11 +340,31 @@ link_into_fs "lib" "$lib_path" link_into_fs "share" "/usr/share" link_into_fs "src" "/usr/src" +info "Installing additional modules ..." +for CUR_MODULE in $(find "$INSTALLATION_MODULES_DIR") + do + echo "$CUR_MODULE" >> "$CONFIG_DIR/$CONFIG_FILES" + done + +for CUR_MODULE in ${INSTALLATION_MODULES_LIST} +do + mod_${CUR_MODULE}_install + if [ $? -ne 0 ]; then + info "Error: Failed to install module \"$CUR_MODULE\"" + if ! test "$FORCE_UPGRADE" = "force"; then + exit 1 + fi + fi +done + # Remember our installation configuration before we call any init scripts cat > "$CONFIG_DIR/$CONFIG" << EOF # $PACKAGE installation record. # Package installation directory INSTALL_DIR='$INSTALLATION_DIR' +# Additional installation modules +INSTALL_MODULES_DIR='$INSTALLATION_MODULES_DIR' +INSTALL_MODULES_LIST='$INSTALLATION_MODULES_LIST' # Package uninstaller. If you repackage this software, please make sure # that this prints a message and returns an error so that the default # uninstaller does not attempt to delete the files installed by your @@ -293,6 +378,14 @@ BUILD_TYPE='$BUILD_TYPE' USERNAME='$USERNAME' EOF +# Give the modules the chance to write their stuff +# to the installation config as well. +info "Saving modules configuration ..." +for CUR_MODULE in ${INSTALLATION_MODULES_LIST} +do + echo "$(mod_${CUR_MODULE}_config_save)" >> "$CONFIG_DIR/$CONFIG" +done + # Install, set up and start init scripts for i in "$INSTALLATION_DIR/init/"*; do if test -r "$i"; then @@ -342,6 +435,44 @@ for i in "$INSTALLATION_DIR/init/"*; do fi done +# Load all modules +# Important: This needs to be done before loading the configuration +# value below to not override values which are set to a default +# value in the modules itself. +for CUR_MODULE in \$(find "$INSTALLATION_MODULES_DIR" -name "module-*") + do + . "\$CUR_MODULE" + done + +# Load configuration values +test -r "$CONFIG_DIR/$CONFIG" && . "$CONFIG_DIR/$CONFIG" + +# Call uninstallation initialization of all modules +for CUR_MODULE in "$INSTALLATION_MODULES_LIST" + do + if test -z "\$CUR_MODULE"; then + continue + fi + mod_\${CUR_MODULE}_pre_uninstall + if [ $? -ne 0 ]; then + echo 1>&2 "Module \"\$CUR_MODULE\" failed to initialize uninstallation" + # Continue initialization. + fi + done + +# Call uninstallation of all modules +for CUR_MODULE in "$INSTALLATION_MODULES_LIST" + do + if test -z "\$CUR_MODULE"; then + continue + fi + mod_\${CUR_MODULE}_uninstall + if [ $? -ne 0 ]; then + echo 1>&2 "Module \"\$CUR_MODULE\" failed to uninstall" + # Continue uninstallation. + fi + done + # And remove all files and empty installation directories # Remove any non-directory entries cat "$CONFIG_DIR/$CONFIG_FILES" | xargs rm 2>/dev/null @@ -355,6 +486,8 @@ cat "$CONFIG_DIR/$CONFIG_FILES" | ;; esac done + +# Remove configuration files rm "$CONFIG_DIR/$CONFIG_FILES" 2>/dev/null rm "$CONFIG_DIR/$CONFIG" 2>/dev/null rmdir "$CONFIG_DIR" 2>/dev/null @@ -364,3 +497,4 @@ chmod 0755 $INSTALLATION_DIR/$UNINSTALL echo $INSTALLATION_DIR/$UNINSTALL >> "$CONFIG_DIR/$CONFIG_FILES" test -n "$REMOVE_INSTALLATION_DIR" && echo "$INSTALLATION_DIR/" >> "$CONFIG_DIR/$CONFIG_FILES" + diff --git a/src/VBox/Installer/linux/scripts/check_module_dependencies.sh b/src/VBox/Installer/linux/scripts/check_module_dependencies.sh index 25884af3a..a2a571027 100755 --- a/src/VBox/Installer/linux/scripts/check_module_dependencies.sh +++ b/src/VBox/Installer/linux/scripts/check_module_dependencies.sh @@ -4,7 +4,7 @@ # VirtualBox linux installation script # -# Copyright (C) 2007-2011 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/uninstall.sh b/src/VBox/Installer/linux/uninstall.sh index 947f34352..86300c438 100755 --- a/src/VBox/Installer/linux/uninstall.sh +++ b/src/VBox/Installer/linux/uninstall.sh @@ -4,7 +4,7 @@ # VirtualBox linux uninstallation script # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in b/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in index 3f0b8ea8d..abc43a7c1 100755 --- a/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in +++ b/src/VBox/Installer/linux/vboxballoonctrl-service.sh.in @@ -2,7 +2,7 @@ # # VirtualBox balloon control daemon init script. # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -294,13 +294,14 @@ start() { exit 0 } PARAMS="--background" - [ -n "$VBOXBALLOONCTRL_INTERVAL" ] && PARAMS="$PARAMS --balloon-interval $VBOXBALLOONCTRL_INTERVAL" - [ -n "$VBOXBALLOONCTRL_INCREMENT" ] && PARAMS="$PARAMS --balloon-inc $VBOXBALLOONCTRL_INCREMENT" - [ -n "$VBOXBALLOONCTRL_DECREMENT" ] && PARAMS="$PARAMS --balloon-dec $VBOXBALLOONCTRL_DECREMENT" - [ -n "$VBOXBALLOONCTRL_LOWERLIMIT" ] && PARAMS="$PARAMS --balloon-lower-limit $VBOXBALLOONCTRL_LOWERLIMIT" - [ -n "$VBOXBALLOONCTRL_ROTATE" ] && PARAMS="$PARAMS -R $VBOXBALLOONCTRL_ROTATE" - [ -n "$VBOXBALLOONCTRL_LOGSIZE" ] && PARAMS="$PARAMS -S $VBOXBALLOONCTRL_LOGSIZE" - [ -n "$VBOXBALLOONCTRL_LOGINTERVAL" ] && PARAMS="$PARAMS -I $VBOXBALLOONCTRL_LOGINTERVAL" + [ -n "$VBOXBALLOONCTRL_INTERVAL" ] && PARAMS="$PARAMS --balloon-interval \"$VBOXBALLOONCTRL_INTERVAL\"" + [ -n "$VBOXBALLOONCTRL_INCREMENT" ] && PARAMS="$PARAMS --balloon-inc \"$VBOXBALLOONCTRL_INCREMENT\"" + [ -n "$VBOXBALLOONCTRL_DECREMENT" ] && PARAMS="$PARAMS --balloon-dec \"$VBOXBALLOONCTRL_DECREMENT\"" + [ -n "$VBOXBALLOONCTRL_LOWERLIMIT" ] && PARAMS="$PARAMS --balloon-lower-limit \"$VBOXBALLOONCTRL_LOWERLIMIT\"" + [ -n "$VBOXBALLOONCTRL_SAFETYMARGIN" ] && PARAMS="$PARAMS --balloon-safety-margin \"$VBOXBALLOONCTRL_SAFETYMARGIN\"" + [ -n "$VBOXBALLOONCTRL_ROTATE" ] && PARAMS="$PARAMS -R \"$VBOXBALLOONCTRL_ROTATE\"" + [ -n "$VBOXBALLOONCTRL_LOGSIZE" ] && PARAMS="$PARAMS -S \"$VBOXBALLOONCTRL_LOGSIZE\"" + [ -n "$VBOXBALLOONCTRL_LOGINTERVAL" ] && PARAMS="$PARAMS -I \"$VBOXBALLOONCTRL_LOGINTERVAL\"" # prevent inheriting this setting to VBoxSVC unset VBOX_RELEASE_LOG_DEST start_daemon $VBOXBALLOONCTRL_USER $binary $PARAMS > /dev/null 2>&1 diff --git a/src/VBox/Installer/linux/vboxdrv.sh.in b/src/VBox/Installer/linux/vboxdrv.sh.in index 6e33f233e..1c8591fad 100755 --- a/src/VBox/Installer/linux/vboxdrv.sh.in +++ b/src/VBox/Installer/linux/vboxdrv.sh.in @@ -3,7 +3,7 @@ # Linux kernel module init script # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/Makefile.kmk b/src/VBox/Installer/solaris/Makefile.kmk index a94d1bb41..7ff9771b5 100644 --- a/src/VBox/Installer/solaris/Makefile.kmk +++ b/src/VBox/Installer/solaris/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2007-2012 Oracle Corporation +# Copyright (C) 2007-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -206,7 +206,6 @@ SOLARIS_STRIP_EXES = \ VBoxZoneAccess \ $(if $(VBOX_WITH_QTGUI),VirtualBox,) \ VBoxManage \ - $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,) \ $(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \ $(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \ VBoxNetDHCP \ @@ -215,6 +214,9 @@ SOLARIS_STRIP_EXES = \ $(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \ VBoxXPCOMIPCD \ $(if $(VBOX_WITH_KCHMVIEWER),kchmviewer,) +## Follow the Windows + Linux example of not shipping VBoxBFE. +#SOLARIS_STRIP_EXES = \ +# $(if $(VBOX_WITH_VBOXBFE),VBoxBFE,) SOLARIS_DRIVER_BINS = \ vboxdrv \ @@ -269,9 +271,11 @@ SOLARIS_STRIP_BINS = \ ifdef VBOX_WITH_HARDENING SOLARIS_STRIP_BINS += \ VBoxNetDHCP.so \ - $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so,) \ $(if $(VBOX_WITH_VBOXSDL),VBoxSDL.so,) \ $(if $(VBOX_WITH_QTGUI),VirtualBox.so,) +## Follow the Windows + Linux example of not shipping VBoxBFE. +#SOLARIS_STRIP_BINS += \ +# $(if $(VBOX_WITH_VBOXBFE),VBoxBFE.so,) endif # Do not remove relocation information of these binaries diff --git a/src/VBox/Installer/solaris/VBox.sh b/src/VBox/Installer/solaris/VBox.sh index 50a682608..5fa988356 100755 --- a/src/VBox/Installer/solaris/VBox.sh +++ b/src/VBox/Installer/solaris/VBox.sh @@ -2,7 +2,7 @@ # # Oracle VM VirtualBox startup script, Solaris hosts. # -# Copyright (C) 2006-2011 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/VBoxISAExec.c b/src/VBox/Installer/solaris/VBoxISAExec.c index 97f8ad9fc..ed33f198c 100644 --- a/src/VBox/Installer/solaris/VBoxISAExec.c +++ b/src/VBox/Installer/solaris/VBoxISAExec.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/VBoxZoneAccess.c b/src/VBox/Installer/solaris/VBoxZoneAccess.c index a77f32cb4..c296779ec 100644 --- a/src/VBox/Installer/solaris/VBoxZoneAccess.c +++ b/src/VBox/Installer/solaris/VBoxZoneAccess.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/checkinstall.sh b/src/VBox/Installer/solaris/checkinstall.sh index 92c186ce7..54400a0ee 100755 --- a/src/VBox/Installer/solaris/checkinstall.sh +++ b/src/VBox/Installer/solaris/checkinstall.sh @@ -5,7 +5,7 @@ # # -# Copyright (C) 2009-2010 Oracle Corporation +# Copyright (C) 2009-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -187,5 +187,22 @@ if test -x "$BIN_IFCONFIG"; then fi fi +# If we are using SVR4 packages then make sure that SMF has finished +# disabling any services left over from a previous installation which +# may interfere with installing new ones. Should only be relevant on +# Solaris 11. +if test -x "$BIN_PKGINFO"; then + for i in 1 2 3 4 5 6 7 8 9 10; do + svcs -a | grep virtualbox >/dev/null || break + if test "${i}" = "1"; then + printf "Waiting for services from previous installation to be removed." + else + printf "." + fi + sleep 1 + done + test "${i}" = "1" || printf "\n" +fi + exit 0 diff --git a/src/VBox/Installer/solaris/makepackage.sh b/src/VBox/Installer/solaris/makepackage.sh index 439923d13..9ec230cd7 100755 --- a/src/VBox/Installer/solaris/makepackage.sh +++ b/src/VBox/Installer/solaris/makepackage.sh @@ -5,7 +5,7 @@ # # -# Copyright (C) 2007-2011 Oracle Corporation +# Copyright (C) 2007-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh index a01b46816..5a50357c0 100755 --- a/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh +++ b/src/VBox/Installer/solaris/smf-vboxballoonctrl.sh @@ -1,7 +1,7 @@ #!/sbin/sh # $Id: smf-vboxballoonctrl.sh $ -# Copyright (C) 2008-2012 Oracle Corporation +# Copyright (C) 2008-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -45,6 +45,8 @@ case $VW_OPT in [ $? != 0 ] && VW_DECREMENT= VW_LOWERLIMIT=`/usr/bin/svcprop -p config/lowerlimit $SMF_FMRI 2>/dev/null` [ $? != 0 ] && VW_LOWERLIMIT= + VW_SAFETYMARGIN=`/usr/bin/svcprop -p config/safetymargin $SMF_FMRI 2>/dev/null` + [ $? != 0 ] && VW_SAFETYMARGIN= VW_ROTATE=`/usr/bin/svcprop -p config/logrotate $SMF_FMRI 2>/dev/null` [ $? != 0 ] && VW_ROTATE= VW_LOGSIZE=`/usr/bin/svcprop -p config/logsize $SMF_FMRI 2>/dev/null` @@ -54,14 +56,19 @@ case $VW_OPT in # Provide sensible defaults [ -z "$VW_USER" ] && VW_USER=root - [ -z "$VW_INTERVAL" ] && VW_INTERVAL=10000 - [ -z "$VW_INCREMENT" ] && VW_INCREMENT=256 - [ -z "$VW_DECREMENT" ] && VW_DECREMENT=128 - [ -z "$VW_LOWERLIMIT" ] && VW_LOWERLIMIT=64 - [ -z "$VW_ROTATE" ] && VW_ROTATE=10 - [ -z "$VW_LOGSIZE" ] && VW_LOGSIZE=104857600 - [ -z "$VW_LOGINTERVAL" ] && VW_LOGINTERVAL=86400 - exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxBalloonCtrl --background --balloon-interval \"$VW_INTERVAL\" --balloon-inc \"$VW_INCREMENT\" --balloon-dec \"$VW_DECREMENT\" --balloon-lower-limit \"$VW_LOWERLIMIT\" --logrotate \"$VW_ROTATE\" --logsize \"$VW_LOGSIZE\" --loginterval \"$VW_LOGINTERVAL\"" + + # Assemble the parameter list + PARAMS="--background" + [ -n "$VW_INTERVAL" ] && PARAMS="$PARAMS --balloon-interval \"$VW_INTERVAL\"" + [ -n "$VW_INCREMENT" ] && PARAMS="$PARAMS --balloon-inc \"$VW_INCREMENT\"" + [ -n "$VW_DECREMENT" ] && PARAMS="$PARAMS --balloon-dec \"$VW_DECREMENT\"" + [ -n "$VW_LOWERLIMIT" ] && PARAMS="$PARAMS --balloon-lower-limit \"$VW_LOWERLIMIT\"" + [ -n "$VW_SAFETYMARGIN" ] && PARAMS="$PARAMS --balloon-safety-margin \"$VW_SAFETYMARGIN\"" + [ -n "$VW_ROTATE" ] && PARAMS="$PARAMS -R \"$VW_ROTATE\"" + [ -n "$VW_LOGSIZE" ] && PARAMS="$PARAMS -S \"$VW_LOGSIZE\"" + [ -n "$VW_LOGINTERVAL" ] && PARAMS="$PARAMS -I \"$VW_LOGINTERVAL\"" + + exec su - "$VW_USER" -c "/opt/VirtualBox/VBoxBalloonCtrl $PARAMS" VW_EXIT=$? if [ $VW_EXIT != 0 ]; then diff --git a/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml b/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml index 4156d3f78..5150f0553 100644 --- a/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml +++ b/src/VBox/Installer/solaris/virtualbox-balloonctrl.xml @@ -2,9 +2,9 @@ <!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1"> <!-- # Solaris SMF service manifest for VirtualBox balloon control service. -# $Id$ +# $Id: virtualbox-balloonctrl.xml $ - Copyright (C) 2008-2012 Oracle Corporation + Copyright (C) 2008-2013 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml b/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml index 3efc6a2bb..9ca612231 100644 --- a/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml +++ b/src/VBox/Installer/solaris/virtualbox-zoneaccess.xml @@ -3,7 +3,7 @@ # # Solaris SMF service manifest for Solaris Zone Access. # - Copyright (C) 2008-2010 Oracle Corporation + Copyright (C) 2008-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/Resources/resource.h b/src/VBox/Installer/win/Resources/resource.h index e2ea716ee..ddc26153c 100644 --- a/src/VBox/Installer/win/Resources/resource.h +++ b/src/VBox/Installer/win/Resources/resource.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/Stub/VBoxStub.cpp b/src/VBox/Installer/win/Stub/VBoxStub.cpp index 22b9bccb7..67cda43f8 100644 --- a/src/VBox/Installer/win/Stub/VBoxStub.cpp +++ b/src/VBox/Installer/win/Stub/VBoxStub.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/Stub/VBoxStub.h b/src/VBox/Installer/win/Stub/VBoxStub.h index 455023a67..e50bca067 100644 --- a/src/VBox/Installer/win/Stub/VBoxStub.h +++ b/src/VBox/Installer/win/Stub/VBoxStub.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/Stub/resource.h b/src/VBox/Installer/win/Stub/resource.h index fbffe2268..54f76ba70 100644 --- a/src/VBox/Installer/win/Stub/resource.h +++ b/src/VBox/Installer/win/Stub/resource.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp index 862b088da..b0ad0cb9a 100644 --- a/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp +++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/StubBld/VBoxStubBld.h b/src/VBox/Installer/win/StubBld/VBoxStubBld.h index 67005674c..81b712d21 100644 --- a/src/VBox/Installer/win/StubBld/VBoxStubBld.h +++ b/src/VBox/Installer/win/StubBld/VBoxStubBld.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Installer/win/VirtualBox_TypeLib.xsl b/src/VBox/Installer/win/VirtualBox_TypeLib.xsl index c0ccf6de7..282cf9c71 100644 --- a/src/VBox/Installer/win/VirtualBox_TypeLib.xsl +++ b/src/VBox/Installer/win/VirtualBox_TypeLib.xsl @@ -5,7 +5,7 @@ * type library definitions for VirtualBox COM components * from the generic interface definition expressed in XML. - Copyright (C) 2007-2010 Oracle Corporation + Copyright (C) 2007-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/cbinding/VBoxXPCOMC.cpp b/src/VBox/Main/cbinding/VBoxXPCOMC.cpp index 63c6ab4f6..201d54568 100644 --- a/src/VBox/Main/cbinding/VBoxXPCOMC.cpp +++ b/src/VBox/Main/cbinding/VBoxXPCOMC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue b/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue index 07838aba6..a3049e2bf 100644 --- a/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue +++ b/src/VBox/Main/cbinding/makefile.tstXPCOMCGlue @@ -1,10 +1,10 @@ -# $Revision: 60692 $ +# $Revision: 83687 $ ## @file makefile.tstLinuxC # Makefile for sample program illustrating use of C binding for XPCOM. # # -# Copyright (C) 2009 Oracle Corporation +# Copyright (C) 2009-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/cbinding/tstXPCOMCCall.c b/src/VBox/Main/cbinding/tstXPCOMCCall.c index a2311829f..3cb15993c 100644 --- a/src/VBox/Main/cbinding/tstXPCOMCCall.c +++ b/src/VBox/Main/cbinding/tstXPCOMCCall.c @@ -1,4 +1,4 @@ -/* $Revision: 60692 $ */ +/* $Revision: 83687 $ */ /** @file tstXPCOMCGlue.c * Demonstrator program to illustrate use of C bindings of Main API. * @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/cbinding/tstXPCOMCGlue.c b/src/VBox/Main/cbinding/tstXPCOMCGlue.c index 751bb1acd..f608ed7a1 100644 --- a/src/VBox/Main/cbinding/tstXPCOMCGlue.c +++ b/src/VBox/Main/cbinding/tstXPCOMCGlue.c @@ -1,4 +1,4 @@ -/* $Revision: 66862 $ */ +/* $Revision: 83687 $ */ /** @file tstXPCOMCGlue.c * Demonstrator program to illustrate use of C bindings of Main API. * @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/ErrorInfo.cpp b/src/VBox/Main/glue/ErrorInfo.cpp index 13cdee83b..36dfc008a 100644 --- a/src/VBox/Main/glue/ErrorInfo.cpp +++ b/src/VBox/Main/glue/ErrorInfo.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/EventQueue.cpp b/src/VBox/Main/glue/EventQueue.cpp index d5a09c690..efe20f527 100644 --- a/src/VBox/Main/glue/EventQueue.cpp +++ b/src/VBox/Main/glue/EventQueue.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/constants-python.xsl b/src/VBox/Main/glue/constants-python.xsl index df18f43b2..ab6460142 100644 --- a/src/VBox/Main/glue/constants-python.xsl +++ b/src/VBox/Main/glue/constants-python.xsl @@ -8,7 +8,7 @@ XSLT stylesheet that generates VirtualBox_constants.py from VirtualBox.xidl. - Copyright (C) 2009 Oracle Corporation + Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/errorprint.cpp b/src/VBox/Main/glue/errorprint.cpp index 45979d629..b1b53ee8b 100644 --- a/src/VBox/Main/glue/errorprint.cpp +++ b/src/VBox/Main/glue/errorprint.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/glue-java.xsl b/src/VBox/Main/glue/glue-java.xsl index 0bcc4398f..96e3f80c5 100644 --- a/src/VBox/Main/glue/glue-java.xsl +++ b/src/VBox/Main/glue/glue-java.xsl @@ -10,7 +10,7 @@ XSLT stylesheet that generates Java glue code for XPCOM, MSCOM and JAX-WS from VirtualBox.xidl. - Copyright (C) 2010-2011 Oracle Corporation + Copyright (C) 2010-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/initterm.cpp b/src/VBox/Main/glue/initterm.cpp index 6e9e1c6e1..195c91dcf 100644 --- a/src/VBox/Main/glue/initterm.cpp +++ b/src/VBox/Main/glue/initterm.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/string.cpp b/src/VBox/Main/glue/string.cpp index dc15bddcb..9865af538 100644 --- a/src/VBox/Main/glue/string.cpp +++ b/src/VBox/Main/glue/string.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/tests/Makefile b/src/VBox/Main/glue/tests/Makefile index e1f0cb204..0b6f9096a 100644 --- a/src/VBox/Main/glue/tests/Makefile +++ b/src/VBox/Main/glue/tests/Makefile @@ -2,7 +2,7 @@ # Makefile for a sample/testcase using the 'glue' Java API bindings # -# Copyright (C) 2010-2011 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/glue/xpcom/helpers.cpp b/src/VBox/Main/glue/xpcom/helpers.cpp index 38ce71297..5f5dc94d2 100644 --- a/src/VBox/Main/glue/xpcom/helpers.cpp +++ b/src/VBox/Main/glue/xpcom/helpers.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/idl/docstrip.xsl b/src/VBox/Main/idl/docstrip.xsl index 0cbdac4a5..9efb49ae7 100644 --- a/src/VBox/Main/idl/docstrip.xsl +++ b/src/VBox/Main/idl/docstrip.xsl @@ -9,7 +9,7 @@ original XIDL should not cause a full recompile of nearly all of VirtualBox. - Copyright (C) 2009-2010 Oracle Corporation + Copyright (C) 2009-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/idl/doxygen.xsl b/src/VBox/Main/idl/doxygen.xsl index bc55d3d91..df12cd209 100644 --- a/src/VBox/Main/idl/doxygen.xsl +++ b/src/VBox/Main/idl/doxygen.xsl @@ -5,7 +5,7 @@ * definition expressed in XML. The generated file is intended solely to * generate the documentation using Doxygen. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/idl/xpidl.xsl b/src/VBox/Main/idl/xpidl.xsl index 18796ba63..4ad453863 100644 --- a/src/VBox/Main/idl/xpidl.xsl +++ b/src/VBox/Main/idl/xpidl.xsl @@ -5,7 +5,7 @@ * A template to generate a XPCOM IDL compatible interface definition file * from the generic interface definition expressed in XML. - Copyright (C) 2006-2009 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ApplianceImpl.h b/src/VBox/Main/include/ApplianceImpl.h index 16c96893b..a058b0983 100644 --- a/src/VBox/Main/include/ApplianceImpl.h +++ b/src/VBox/Main/include/ApplianceImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ApplianceImplPrivate.h b/src/VBox/Main/include/ApplianceImplPrivate.h index ee2f39d8a..4f0ab3823 100644 --- a/src/VBox/Main/include/ApplianceImplPrivate.h +++ b/src/VBox/Main/include/ApplianceImplPrivate.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/AudioAdapterImpl.h b/src/VBox/Main/include/AudioAdapterImpl.h index d2c91b307..157664fae 100644 --- a/src/VBox/Main/include/AudioAdapterImpl.h +++ b/src/VBox/Main/include/AudioAdapterImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/AudioSnifferInterface.h b/src/VBox/Main/include/AudioSnifferInterface.h index 3c467bc7e..e7461f5f8 100644 --- a/src/VBox/Main/include/AudioSnifferInterface.h +++ b/src/VBox/Main/include/AudioSnifferInterface.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/AutoCaller.h b/src/VBox/Main/include/AutoCaller.h index 207d35891..9b155c5b9 100644 --- a/src/VBox/Main/include/AutoCaller.h +++ b/src/VBox/Main/include/AutoCaller.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/BIOSSettingsImpl.h b/src/VBox/Main/include/BIOSSettingsImpl.h index dffff1d00..2263ab0e9 100644 --- a/src/VBox/Main/include/BIOSSettingsImpl.h +++ b/src/VBox/Main/include/BIOSSettingsImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/BandwidthGroupImpl.h b/src/VBox/Main/include/BandwidthGroupImpl.h index 98a6b86ce..dbcf1591d 100644 --- a/src/VBox/Main/include/BandwidthGroupImpl.h +++ b/src/VBox/Main/include/BandwidthGroupImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ConsoleEvents.h b/src/VBox/Main/include/ConsoleEvents.h index 8e82338ca..a4718acd6 100644 --- a/src/VBox/Main/include/ConsoleEvents.h +++ b/src/VBox/Main/include/ConsoleEvents.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ConsoleImpl.h b/src/VBox/Main/include/ConsoleImpl.h index 2b2f19d0f..c9c94f1fd 100644 --- a/src/VBox/Main/include/ConsoleImpl.h +++ b/src/VBox/Main/include/ConsoleImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2005-2012 Oracle Corporation + * Copyright (C) 2005-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -35,7 +35,7 @@ class VRDEServerInfo; class AudioSniffer; class Nvram; #ifdef VBOX_WITH_USB_VIDEO -class UsbWebcamInterface; +class EmWebcam; #endif #ifdef VBOX_WITH_USB_CARDREADER class UsbCardReader; @@ -228,6 +228,9 @@ public: #ifdef VBOX_WITH_USB_CARDREADER UsbCardReader *getUsbCardReader() { return mUsbCardReader; } #endif +#ifdef VBOX_WITH_USB_VIDEO + EmWebcam *getEmWebcam() { return mEmWebcam; } +#endif int VRDPClientLogon(uint32_t u32ClientId, const char *pszUser, const char *pszPassword, const char *pszDomain); void VRDPClientStatusChange(uint32_t u32ClientId, const char *pszStatus); @@ -775,7 +778,7 @@ private: AudioSniffer * const mAudioSniffer; Nvram * const mNvram; #ifdef VBOX_WITH_USB_VIDEO - UsbWebcamInterface * const mUsbWebcamInterface; + EmWebcam * const mEmWebcam; #endif #ifdef VBOX_WITH_USB_CARDREADER UsbCardReader * const mUsbCardReader; diff --git a/src/VBox/Main/include/ConsoleVRDPServer.h b/src/VBox/Main/include/ConsoleVRDPServer.h index 30980d9c1..7b6cf0d8c 100644 --- a/src/VBox/Main/include/ConsoleVRDPServer.h +++ b/src/VBox/Main/include/ConsoleVRDPServer.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -27,6 +27,8 @@ #include <VBox/RemoteDesktop/VRDEMousePtr.h> #include <VBox/RemoteDesktop/VRDESCard.h> #include <VBox/RemoteDesktop/VRDETSMF.h> +#define VRDE_VIDEOIN_WITH_VRDEINTERFACE /* Get the VRDE interface definitions. */ +#include <VBox/RemoteDesktop/VRDEVideoIn.h> #include <VBox/HostServices/VBoxClipboardExt.h> #include <VBox/HostServices/VBoxHostChannel.h> @@ -147,6 +149,12 @@ public: int SCardRequest(void *pvUser, uint32_t u32Function, const void *pvData, uint32_t cbData); + int VideoInDeviceAttach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, void *pvDeviceCtx); + int VideoInDeviceDetach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle); + int VideoInGetDeviceDesc(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle); + int VideoInControl(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, + const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq); + private: /* Note: This is not a ComObjPtr here, because the ConsoleVRDPServer object * is actually just a part of the Console. @@ -304,6 +312,31 @@ private: int tsmfLock(void); void tsmfUnlock(void); RTCRITSECT mTSMFLock; + + /* Video input interface. */ + VRDEVIDEOININTERFACE m_interfaceVideoIn; + VRDEVIDEOINCALLBACKS m_interfaceCallbacksVideoIn; + static DECLCALLBACK(void) VRDECallbackVideoInNotify(void *pvCallback, + uint32_t u32Id, + const void *pvData, + uint32_t cbData); + static DECLCALLBACK(void) VRDECallbackVideoInDeviceDesc(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINDEVICEDESC *pDeviceDesc, + uint32_t cbDevice); + static DECLCALLBACK(void) VRDECallbackVideoInControl(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINCTRLHDR *pControl, + uint32_t cbControl); + static DECLCALLBACK(void) VRDECallbackVideoInFrame(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + const VRDEVIDEOINPAYLOADHDR *pFrame, + uint32_t cbFrame); }; diff --git a/src/VBox/Main/include/DHCPServerImpl.h b/src/VBox/Main/include/DHCPServerImpl.h index 0773d7bfe..b1029b078 100644 --- a/src/VBox/Main/include/DHCPServerImpl.h +++ b/src/VBox/Main/include/DHCPServerImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/DHCPServerRunner.h b/src/VBox/Main/include/DHCPServerRunner.h index b13084555..a352e8056 100644 --- a/src/VBox/Main/include/DHCPServerRunner.h +++ b/src/VBox/Main/include/DHCPServerRunner.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/DisplayImpl.h b/src/VBox/Main/include/DisplayImpl.h index 1f7837007..913b0e8c9 100644 --- a/src/VBox/Main/include/DisplayImpl.h +++ b/src/VBox/Main/include/DisplayImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -282,7 +282,7 @@ public: static int displayTakeScreenshotEMT(Display *pDisplay, ULONG aScreenId, uint8_t **ppu8Data, size_t *pcbData, uint32_t *pu32Width, uint32_t *pu32Height); private: - static void InvalidateAndUpdateEMT(Display *pDisplay); + static void InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll); static int drawToScreenEMT(Display *pDisplay, ULONG aScreenId, BYTE *address, ULONG x, ULONG y, ULONG width, ULONG height); int videoAccelRefreshProcess(void); diff --git a/src/VBox/Main/include/DisplayUtils.h b/src/VBox/Main/include/DisplayUtils.h index 6c4a9b163..7b8d9f86f 100644 --- a/src/VBox/Main/include/DisplayUtils.h +++ b/src/VBox/Main/include/DisplayUtils.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ExtPackManagerImpl.h b/src/VBox/Main/include/ExtPackManagerImpl.h index c3f9a78d8..6d8a7983a 100644 --- a/src/VBox/Main/include/ExtPackManagerImpl.h +++ b/src/VBox/Main/include/ExtPackManagerImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ExtPackUtil.h b/src/VBox/Main/include/ExtPackUtil.h index 0fd97bf03..5b09fe6fe 100644 --- a/src/VBox/Main/include/ExtPackUtil.h +++ b/src/VBox/Main/include/ExtPackUtil.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HGCM.h b/src/VBox/Main/include/HGCM.h index f96d84321..acf1528bb 100644 --- a/src/VBox/Main/include/HGCM.h +++ b/src/VBox/Main/include/HGCM.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HGCMObjects.h b/src/VBox/Main/include/HGCMObjects.h index f7f51884d..27c9c967e 100644 --- a/src/VBox/Main/include/HGCMObjects.h +++ b/src/VBox/Main/include/HGCMObjects.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HGCMThread.h b/src/VBox/Main/include/HGCMThread.h index fb01cebca..ab0abcc73 100644 --- a/src/VBox/Main/include/HGCMThread.h +++ b/src/VBox/Main/include/HGCMThread.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HostHardwareLinux.h b/src/VBox/Main/include/HostHardwareLinux.h index 6469ced15..b30da8a2d 100644 --- a/src/VBox/Main/include/HostHardwareLinux.h +++ b/src/VBox/Main/include/HostHardwareLinux.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HostImpl.h b/src/VBox/Main/include/HostImpl.h index 56decbfc3..b40d6e25c 100644 --- a/src/VBox/Main/include/HostImpl.h +++ b/src/VBox/Main/include/HostImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HostPower.h b/src/VBox/Main/include/HostPower.h index 0d7ba548a..9998feea3 100644 --- a/src/VBox/Main/include/HostPower.h +++ b/src/VBox/Main/include/HostPower.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/HostUSBDeviceImpl.h b/src/VBox/Main/include/HostUSBDeviceImpl.h index e04f17277..57023e1e9 100644 --- a/src/VBox/Main/include/HostUSBDeviceImpl.h +++ b/src/VBox/Main/include/HostUSBDeviceImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/KeyboardImpl.h b/src/VBox/Main/include/KeyboardImpl.h index 4b8446f48..f7498fe7e 100644 --- a/src/VBox/Main/include/KeyboardImpl.h +++ b/src/VBox/Main/include/KeyboardImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/MachineDebuggerImpl.h b/src/VBox/Main/include/MachineDebuggerImpl.h index d92cbe286..3a1eb7804 100644 --- a/src/VBox/Main/include/MachineDebuggerImpl.h +++ b/src/VBox/Main/include/MachineDebuggerImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/MachineImpl.h b/src/VBox/Main/include/MachineImpl.h index 7d6203ec3..0d139acd2 100644 --- a/src/VBox/Main/include/MachineImpl.h +++ b/src/VBox/Main/include/MachineImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -238,8 +238,6 @@ public: * Data structure to hold information about a guest property. */ struct GuestProperty { - /** Property name */ - Utf8Str strName; /** Property value */ Utf8Str strValue; /** Property timestamp */ @@ -290,14 +288,15 @@ public: ClipboardMode_T mClipboardMode; DragAndDropMode_T mDragAndDropMode; - typedef std::list<GuestProperty> GuestPropertyList; - GuestPropertyList mGuestProperties; + typedef std::map<Utf8Str, GuestProperty> GuestPropertyMap; + GuestPropertyMap mGuestProperties; Utf8Str mGuestPropertyNotificationPatterns; FirmwareType_T mFirmwareType; KeyboardHIDType_T mKeyboardHIDType; PointingHIDType_T mPointingHIDType; ChipsetType_T mChipsetType; + BOOL mEmulatedUSBWebcamEnabled; BOOL mEmulatedUSBCardReaderEnabled; BOOL mIOCacheEnabled; diff --git a/src/VBox/Main/include/Matching.h b/src/VBox/Main/include/Matching.h index 0f5bbc4f1..2f01f6921 100644 --- a/src/VBox/Main/include/Matching.h +++ b/src/VBox/Main/include/Matching.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/MediumImpl.h b/src/VBox/Main/include/MediumImpl.h index 33bff7b66..cb8c85983 100644 --- a/src/VBox/Main/include/MediumImpl.h +++ b/src/VBox/Main/include/MediumImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2012 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -231,6 +231,9 @@ public: HRESULT markLockedForDeletion(); HRESULT unmarkLockedForDeletion(); + HRESULT queryPreferredMergeDirection(const ComObjPtr<Medium> &pOther, + bool &fMergeForward); + HRESULT prepareMergeTo(const ComObjPtr<Medium> &pTarget, const Guid *aMachineId, const Guid *aSnapshotId, diff --git a/src/VBox/Main/include/MediumLock.h b/src/VBox/Main/include/MediumLock.h index eaa12f8b4..7d9ba35a2 100644 --- a/src/VBox/Main/include/MediumLock.h +++ b/src/VBox/Main/include/MediumLock.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/MouseImpl.h b/src/VBox/Main/include/MouseImpl.h index 4bbb6a182..103bb19d3 100644 --- a/src/VBox/Main/include/MouseImpl.h +++ b/src/VBox/Main/include/MouseImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/Performance.h b/src/VBox/Main/include/Performance.h index 74f7a250d..78ea5f450 100644 --- a/src/VBox/Main/include/Performance.h +++ b/src/VBox/Main/include/Performance.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -472,6 +472,7 @@ namespace pm HostCpuLoadRaw(CollectorHAL *hal, ComPtr<IUnknown> object, SubMetric *user, SubMetric *kernel, SubMetric *idle) : HostCpuLoad(hal, object, user, kernel, idle), mUserPrev(0), mKernelPrev(0), mIdlePrev(0) {}; + void init(ULONG period, ULONG length); void preCollect(CollectorHints& hints, uint64_t iTick); void collect(); private: @@ -521,11 +522,12 @@ namespace pm class HostNetworkSpeed : public BaseMetric { public: - HostNetworkSpeed(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str /* shortname */, com::Utf8Str /* ifname */, uint32_t speed, SubMetric *linkspeed) - : BaseMetric(hal, name, object), mSpeed(speed), mLinkSpeed(linkspeed) {}; + HostNetworkSpeed(CollectorHAL *hal, ComPtr<IUnknown> object, com::Utf8Str name, com::Utf8Str shortname, com::Utf8Str /* ifname */, uint32_t speed, SubMetric *linkspeed) + : BaseMetric(hal, name, object), mShortName(shortname), mSpeed(speed), mLinkSpeed(linkspeed) {}; ~HostNetworkSpeed() { delete mLinkSpeed; }; - void init(ULONG period, ULONG length) { mPeriod = period; mLength = length; mLinkSpeed->init(length); }; + void init(ULONG period, ULONG length); + void preCollect(CollectorHints& /* hints */, uint64_t /* iTick */) {}; void collect() { if (mSpeed) mLinkSpeed->put(mSpeed); }; const char *getUnit() { return "mbit/s"; }; @@ -533,8 +535,9 @@ namespace pm ULONG getMaxValue() { return INT32_MAX; }; ULONG getScale() { return 1; } private: - ULONG mSpeed; - SubMetric *mLinkSpeed; + com::Utf8Str mShortName; + uint32_t mSpeed; + SubMetric *mLinkSpeed; }; class HostNetworkLoadRaw : public BaseMetric diff --git a/src/VBox/Main/include/PerformanceImpl.h b/src/VBox/Main/include/PerformanceImpl.h index 26e83b4df..4ffbe77ad 100644 --- a/src/VBox/Main/include/PerformanceImpl.h +++ b/src/VBox/Main/include/PerformanceImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ProgressCombinedImpl.h b/src/VBox/Main/include/ProgressCombinedImpl.h index c6454d6eb..00bcdc1ee 100644 --- a/src/VBox/Main/include/ProgressCombinedImpl.h +++ b/src/VBox/Main/include/ProgressCombinedImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ProgressImpl.h b/src/VBox/Main/include/ProgressImpl.h index a04d4b06f..4d2da9522 100644 --- a/src/VBox/Main/include/ProgressImpl.h +++ b/src/VBox/Main/include/ProgressImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ProgressProxyImpl.h b/src/VBox/Main/include/ProgressProxyImpl.h index 87ebd7089..66f2b31ca 100644 --- a/src/VBox/Main/include/ProgressProxyImpl.h +++ b/src/VBox/Main/include/ProgressProxyImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/RemoteUSBBackend.h b/src/VBox/Main/include/RemoteUSBBackend.h index dd6685c91..baf47a483 100644 --- a/src/VBox/Main/include/RemoteUSBBackend.h +++ b/src/VBox/Main/include/RemoteUSBBackend.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/RemoteUSBDeviceImpl.h b/src/VBox/Main/include/RemoteUSBDeviceImpl.h index 2285ee93d..e92552e65 100644 --- a/src/VBox/Main/include/RemoteUSBDeviceImpl.h +++ b/src/VBox/Main/include/RemoteUSBDeviceImpl.h @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/SharedFolderImpl.h b/src/VBox/Main/include/SharedFolderImpl.h index a4ee94acb..5d4e7bd76 100644 --- a/src/VBox/Main/include/SharedFolderImpl.h +++ b/src/VBox/Main/include/SharedFolderImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/StorageControllerImpl.h b/src/VBox/Main/include/StorageControllerImpl.h index 98e8d473f..1292804ac 100644 --- a/src/VBox/Main/include/StorageControllerImpl.h +++ b/src/VBox/Main/include/StorageControllerImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/USBDeviceFilterImpl.h b/src/VBox/Main/include/USBDeviceFilterImpl.h index 562d76931..94632dc5e 100644 --- a/src/VBox/Main/include/USBDeviceFilterImpl.h +++ b/src/VBox/Main/include/USBDeviceFilterImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/USBDeviceImpl.h b/src/VBox/Main/include/USBDeviceImpl.h index 162fb6e8c..2ea81ef6d 100644 --- a/src/VBox/Main/include/USBDeviceImpl.h +++ b/src/VBox/Main/include/USBDeviceImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/USBGetDevices.h b/src/VBox/Main/include/USBGetDevices.h index fd0b29ff0..2b0e35f64 100644 --- a/src/VBox/Main/include/USBGetDevices.h +++ b/src/VBox/Main/include/USBGetDevices.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/UsbWebcamInterface.h b/src/VBox/Main/include/UsbWebcamInterface.h new file mode 100644 index 000000000..56abc671c --- /dev/null +++ b/src/VBox/Main/include/UsbWebcamInterface.h @@ -0,0 +1,65 @@ +/* $Id: UsbWebcamInterface.h $ */ +/** @file + * VirtualBox PDM Driver for Emulated USB Webcam + */ + +/* + * Copyright (C) 2011-2013 Oracle Corporation + * + * 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. + */ + +#ifndef ____H_USBWEBCAMINTERFACE +#define ____H_USBWEBCAMINTERFACE + +#include <VBox/vmm/pdmdrv.h> +#define VRDE_VIDEOIN_WITH_VRDEINTERFACE /* Get the VRDE interface definitions. */ +#include <VBox/RemoteDesktop/VRDEVideoIn.h> + +class Console; +typedef struct EMWEBCAMDRV EMWEBCAMDRV; +typedef struct EMWEBCAMREMOTE EMWEBCAMREMOTE; + +class EmWebcam +{ + public: + EmWebcam(Console *console); + virtual ~EmWebcam(); + + static const PDMDRVREG DrvReg; + EMWEBCAMDRV *mpDrv; + + void EmWebcamDestruct(EMWEBCAMDRV *pDrv); + + /* Callbacks. */ + void EmWebcamCbNotify(uint32_t u32Id, const void *pvData, uint32_t cbData); + void EmWebcamCbDeviceDesc(int rcRequest, void *pDeviceCtx, void *pvUser, + const VRDEVIDEOINDEVICEDESC *pDeviceDesc, uint32_t cbDeviceDesc); + void EmWebcamCbControl(int rcRequest, void *pDeviceCtx, void *pvUser, + const VRDEVIDEOINCTRLHDR *pControl, uint32_t cbControl); + void EmWebcamCbFrame(int rcRequest, void *pDeviceCtx, + const VRDEVIDEOINPAYLOADHDR *pFrame, uint32_t cbFrame); + + /* Methods for the PDM driver. */ + int SendControl(EMWEBCAMDRV *pDrv, void *pvUser, uint64_t u64DeviceId, + const VRDEVIDEOINCTRLHDR *pControl, uint32_t cbControl); + + private: + static DECLCALLBACK(void *) drvQueryInterface(PPDMIBASE pInterface, const char *pszIID); + static DECLCALLBACK(int) drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags); + static DECLCALLBACK(void) drvDestruct(PPDMDRVINS pDrvIns); + + Console * const mParent; + + EMWEBCAMREMOTE *mpRemote; + uint64_t volatile mu64DeviceIdSrc; +}; + +#endif /* !____H_USBWEBCAMINTERFACE */ +/* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/include/VFSExplorerImpl.h b/src/VBox/Main/include/VFSExplorerImpl.h index 958714320..71980f760 100644 --- a/src/VBox/Main/include/VFSExplorerImpl.h +++ b/src/VBox/Main/include/VFSExplorerImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/VMMDev.h b/src/VBox/Main/include/VMMDev.h index 3258bdfed..fe2b52d5c 100644 --- a/src/VBox/Main/include/VMMDev.h +++ b/src/VBox/Main/include/VMMDev.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/VRDEServerImpl.h b/src/VBox/Main/include/VRDEServerImpl.h index 84ceaa527..7907b623e 100644 --- a/src/VBox/Main/include/VRDEServerImpl.h +++ b/src/VBox/Main/include/VRDEServerImpl.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/VirtualBoxClientImpl.h b/src/VBox/Main/include/VirtualBoxClientImpl.h index 8a4d973d8..e2e1b8a3c 100644 --- a/src/VBox/Main/include/VirtualBoxClientImpl.h +++ b/src/VBox/Main/include/VirtualBoxClientImpl.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h b/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h index bb47dc54d..80ca0aeba 100644 --- a/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h +++ b/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/VirtualBoxImpl.h b/src/VBox/Main/include/VirtualBoxImpl.h index 3bf748a99..9ba58131c 100644 --- a/src/VBox/Main/include/VirtualBoxImpl.h +++ b/src/VBox/Main/include/VirtualBoxImpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -301,6 +301,8 @@ public: int decryptSetting(Utf8Str *aPlaintext, const Utf8Str &aCiphertext); void storeSettingsKey(const Utf8Str &aKey); + bool isMediaUuidInUse(const Guid &aId, DeviceType_T deviceType); + private: static HRESULT setErrorStatic(HRESULT aResultCode, diff --git a/src/VBox/Main/include/netif.h b/src/VBox/Main/include/netif.h index b1ab8901f..4b765992f 100644 --- a/src/VBox/Main/include/netif.h +++ b/src/VBox/Main/include/netif.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/objectslist.h b/src/VBox/Main/include/objectslist.h index a506a1616..7b9ca04dd 100644 --- a/src/VBox/Main/include/objectslist.h +++ b/src/VBox/Main/include/objectslist.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h index e1e21d5cb..d4cc60cc8 100644 --- a/src/VBox/Main/include/ovfreader.h +++ b/src/VBox/Main/include/ovfreader.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/vbox-libhal.h b/src/VBox/Main/include/vbox-libhal.h index 5f67a4d23..5697b20ff 100644 --- a/src/VBox/Main/include/vbox-libhal.h +++ b/src/VBox/Main/include/vbox-libhal.h @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/include/win/resource.h b/src/VBox/Main/include/win/resource.h index 173a49b8e..160e47341 100644 --- a/src/VBox/Main/include/win/resource.h +++ b/src/VBox/Main/include/win/resource.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/DisplayPNGUtil.cpp b/src/VBox/Main/src-all/DisplayPNGUtil.cpp index 345becfcc..6515845b4 100644 --- a/src/VBox/Main/src-all/DisplayPNGUtil.cpp +++ b/src/VBox/Main/src-all/DisplayPNGUtil.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/DisplayResampleImage.cpp b/src/VBox/Main/src-all/DisplayResampleImage.cpp index 85c29d652..d46bffae0 100644 --- a/src/VBox/Main/src-all/DisplayResampleImage.cpp +++ b/src/VBox/Main/src-all/DisplayResampleImage.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/DisplayUtils.cpp b/src/VBox/Main/src-all/DisplayUtils.cpp index efc994f3a..70e15559d 100644 --- a/src/VBox/Main/src-all/DisplayUtils.cpp +++ b/src/VBox/Main/src-all/DisplayUtils.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/ExtPackManagerImpl.cpp b/src/VBox/Main/src-all/ExtPackManagerImpl.cpp index 5b1a69293..68e56b612 100644 --- a/src/VBox/Main/src-all/ExtPackManagerImpl.cpp +++ b/src/VBox/Main/src-all/ExtPackManagerImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/Logging.cpp b/src/VBox/Main/src-all/Logging.cpp index 5b4095e6c..21f9de65b 100644 --- a/src/VBox/Main/src-all/Logging.cpp +++ b/src/VBox/Main/src-all/Logging.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/SharedFolderImpl.cpp b/src/VBox/Main/src-all/SharedFolderImpl.cpp index 2edf2a2ee..c05106bd7 100644 --- a/src/VBox/Main/src-all/SharedFolderImpl.cpp +++ b/src/VBox/Main/src-all/SharedFolderImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl b/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl index 0b2e4ba93..08dc63fd1 100644 --- a/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl +++ b/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl @@ -5,7 +5,7 @@ * registry definitions necessary to properly register * VirtualBox Main API COM components. - Copyright (C) 2007 Oracle Corporation + Copyright (C) 2007-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/AudioSnifferInterface.cpp b/src/VBox/Main/src-client/AudioSnifferInterface.cpp index f1b642086..42f124fb2 100644 --- a/src/VBox/Main/src-client/AudioSnifferInterface.cpp +++ b/src/VBox/Main/src-client/AudioSnifferInterface.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/ConsoleImpl.cpp b/src/VBox/Main/src-client/ConsoleImpl.cpp index 5102e7fbd..6bfffe871 100644 --- a/src/VBox/Main/src-client/ConsoleImpl.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2005-2012 Oracle Corporation + * Copyright (C) 2005-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -379,7 +379,7 @@ Console::Console() , mAudioSniffer(NULL) , mNvram(NULL) #ifdef VBOX_WITH_USB_VIDEO - , mUsbWebcamInterface(NULL) + , mEmWebcam(NULL) #endif #ifdef VBOX_WITH_USB_CARDREADER , mUsbCardReader(NULL) @@ -549,8 +549,8 @@ HRESULT Console::init(IMachine *aMachine, IInternalMachineControl *aControl, Loc } #ifdef VBOX_WITH_USB_VIDEO - unconst(mUsbWebcamInterface) = new UsbWebcamInterface(this); - AssertReturn(mUsbWebcamInterface, E_FAIL); + unconst(mEmWebcam) = new EmWebcam(this); + AssertReturn(mEmWebcam, E_FAIL); #endif #ifdef VBOX_WITH_USB_CARDREADER unconst(mUsbCardReader) = new UsbCardReader(this); @@ -650,10 +650,10 @@ void Console::uninit() } #ifdef VBOX_WITH_USB_VIDEO - if (mUsbWebcamInterface) + if (mEmWebcam) { - delete mUsbWebcamInterface; - unconst(mUsbWebcamInterface) = NULL; + delete mEmWebcam; + unconst(mEmWebcam) = NULL; } #endif @@ -1697,8 +1697,8 @@ DECLCALLBACK(int) Console::doGuestPropNotification(void *pvExtension, PHOSTCALLBACKDATA pCBData = reinterpret_cast<PHOSTCALLBACKDATA>(pvParms); AssertReturn(sizeof(HOSTCALLBACKDATA) == cbParms, VERR_INVALID_PARAMETER); AssertReturn(HOSTCALLBACKMAGIC == pCBData->u32Magic, VERR_INVALID_PARAMETER); - Log5(("Console::doGuestPropNotification: pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n", - pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags)); + LogFlow(("Console::doGuestPropNotification: pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n", + pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags)); int rc; Bstr name(pCBData->pcszName); @@ -1713,7 +1713,7 @@ DECLCALLBACK(int) Console::doGuestPropNotification(void *pvExtension, rc = VINF_SUCCESS; else { - LogFunc(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n", + LogFlow(("Console::doGuestPropNotification: hrc=%Rhrc pCBData={.pcszName=%s, .pcszValue=%s, .pcszFlags=%s}\n", hrc, pCBData->pcszName, pCBData->pcszValue, pCBData->pcszFlags)); rc = Global::vboxStatusCodeFromCOM(hrc); } @@ -5498,6 +5498,7 @@ HRESULT Console::setGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags) return E_INVALIDARG; if ((aFlags != NULL) && !VALID_PTR(aFlags)) return E_INVALIDARG; + bool fDelete = (!aValue || !aValue[0]); AutoCaller autoCaller(this); AssertComRCReturnRC(autoCaller.rc()); @@ -5521,7 +5522,7 @@ HRESULT Console::setGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags) /* The + 1 is the null terminator */ parm[0].u.pointer.size = (uint32_t)Utf8Name.length() + 1; Utf8Str Utf8Value = aValue; - if (aValue != NULL) + if (!fDelete) { parm[1].type = VBOX_HGCM_SVC_PARM_PTR; parm[1].u.pointer.addr = (void*)Utf8Value.c_str(); @@ -5536,10 +5537,10 @@ HRESULT Console::setGuestProperty(IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags) /* The + 1 is the null terminator */ parm[2].u.pointer.size = (uint32_t)Utf8Flags.length() + 1; } - if ((aValue != NULL) && (aFlags != NULL)) + if (!fDelete && (aFlags != NULL)) vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", SET_PROP_HOST, 3, &parm[0]); - else if (aValue != NULL) + else if (!fDelete) vrc = m_pVMMDev->hgcmHostCall("VBoxGuestPropSvc", SET_PROP_VALUE_HOST, 2, &parm[0]); else diff --git a/src/VBox/Main/src-client/ConsoleImpl2.cpp b/src/VBox/Main/src-client/ConsoleImpl2.cpp index 3b62f1628..64639d340 100644 --- a/src/VBox/Main/src-client/ConsoleImpl2.cpp +++ b/src/VBox/Main/src-client/ConsoleImpl2.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2316,24 +2316,26 @@ int Console::configConstructorInner(PVM pVM, AutoWriteLock *pAlock) #endif #ifdef VBOX_WITH_USB_VIDEO - - InsertConfigNode(pUsbDevices, "Webcam", &pDev); - InsertConfigNode(pDev, "0", &pInst); - InsertConfigNode(pInst, "Config", &pCfg); -# if 0 /* Experiments with attaching */ - InsertConfigInteger(pCfg, "USBVER", RT_BIT(2)); -# endif - InsertConfigNode(pInst, "LUN#0", &pLunL0); + BOOL aEmulatedUSBWebcamEnabled = FALSE; + hrc = pMachine->COMGETTER(EmulatedUSBWebcameraEnabled)(&aEmulatedUSBWebcamEnabled); H(); + if (aEmulatedUSBWebcamEnabled) + { + InsertConfigNode(pUsbDevices, "Webcam", &pDev); + InsertConfigNode(pDev, "0", &pInst); + InsertConfigNode(pInst, "Config", &pCfg); + InsertConfigNode(pInst, "LUN#0", &pLunL0); # ifdef VBOX_WITH_USB_VIDEO_TEST - InsertConfigString(pLunL0, "Driver", "WebcamFileFeeder"); - InsertConfigNode(pLunL0, "Config", &pCfg); - InsertConfigString(pCfg, "DirToFeed", "out"); + InsertConfigString(pLunL0, "Driver", "WebcamFileFeeder"); + InsertConfigNode(pLunL0, "Config", &pCfg); + InsertConfigString(pCfg, "DirToFeed", "out"); # else - InsertConfigString(pLunL0, "Driver", "UsbWebcamInterface"); - InsertConfigNode(pLunL0, "Config", &pCfg); - InsertConfigInteger(pCfg, "Object", mUsbWebcamInterface); + InsertConfigString(pLunL0, "Driver", "EmWebcam"); + InsertConfigNode(pLunL0, "Config", &pCfg); + InsertConfigInteger(pCfg, "Object", (uintptr_t)mEmWebcam); # endif + } #endif + #ifdef VBOX_WITH_USB_CARDREADER BOOL aEmulatedUSBCardReaderEnabled = FALSE; hrc = pMachine->COMGETTER(EmulatedUSBCardReaderEnabled)(&aEmulatedUSBCardReaderEnabled); H(); diff --git a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp index 4ba75ad65..d95c4b1c0 100644 --- a/src/VBox/Main/src-client/ConsoleVRDPServer.cpp +++ b/src/VBox/Main/src-client/ConsoleVRDPServer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -28,6 +28,9 @@ #ifdef VBOX_WITH_USB_CARDREADER # include "UsbCardReader.h" #endif +#ifdef VBOX_WITH_USB_VIDEO +# include "UsbWebcamInterface.h" +#endif #include "Global.h" #include "AutoCaller.h" @@ -1380,6 +1383,8 @@ ConsoleVRDPServer::ConsoleVRDPServer(Console *console) RT_ZERO(m_interfaceCallbacksSCard); RT_ZERO(m_interfaceTSMF); RT_ZERO(m_interfaceCallbacksTSMF); + RT_ZERO(m_interfaceVideoIn); + RT_ZERO(m_interfaceCallbacksVideoIn); rc = RTCritSectInit(&mTSMFLock); AssertRC(rc); @@ -1663,6 +1668,31 @@ int ConsoleVRDPServer::Launch(void) RT_ZERO(m_interfaceTSMF); } + /* VideoIn interface. */ + m_interfaceVideoIn.header.u64Version = 1; + m_interfaceVideoIn.header.u64Size = sizeof(m_interfaceVideoIn); + + m_interfaceCallbacksVideoIn.header.u64Version = 1; + m_interfaceCallbacksVideoIn.header.u64Size = sizeof(m_interfaceCallbacksVideoIn); + m_interfaceCallbacksVideoIn.VRDECallbackVideoInNotify = VRDECallbackVideoInNotify; + m_interfaceCallbacksVideoIn.VRDECallbackVideoInDeviceDesc = VRDECallbackVideoInDeviceDesc; + m_interfaceCallbacksVideoIn.VRDECallbackVideoInControl = VRDECallbackVideoInControl; + m_interfaceCallbacksVideoIn.VRDECallbackVideoInFrame = VRDECallbackVideoInFrame; + + vrc = mpEntryPoints->VRDEGetInterface(mhServer, + VRDE_VIDEOIN_INTERFACE_NAME, + &m_interfaceVideoIn.header, + &m_interfaceCallbacksVideoIn.header, + this); + if (RT_SUCCESS(vrc)) + { + LogRel(("VRDE: [%s]\n", VRDE_VIDEOIN_INTERFACE_NAME)); + } + else + { + RT_ZERO(m_interfaceVideoIn); + } + /* Since these interfaces are optional, it is always a success here. */ vrc = VINF_SUCCESS; } @@ -2541,6 +2571,149 @@ void ConsoleVRDPServer::setupTSMF(void) } } +/* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInNotify(void *pvCallback, + uint32_t u32Id, + const void *pvData, + uint32_t cbData) +{ +#ifdef VBOX_WITH_USB_VIDEO + ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback); + EmWebcam *pWebcam = pThis->mConsole->getEmWebcam(); + pWebcam->EmWebcamCbNotify(u32Id, pvData, cbData); +#else + NOREF(pvCallback); + NOREF(u32Id); + NOREF(pvData); + NOREF(cbData); +#endif +} + +/* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInDeviceDesc(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINDEVICEDESC *pDeviceDesc, + uint32_t cbDevice) +{ +#ifdef VBOX_WITH_USB_VIDEO + ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback); + EmWebcam *pWebcam = pThis->mConsole->getEmWebcam(); + pWebcam->EmWebcamCbDeviceDesc(rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDevice); +#else + NOREF(pvCallback); + NOREF(rcRequest); + NOREF(pDeviceCtx); + NOREF(pvUser); + NOREF(pDeviceDesc); + NOREF(cbDevice); +#endif +} + +/* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInControl(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + void *pvUser, + const VRDEVIDEOINCTRLHDR *pControl, + uint32_t cbControl) +{ +#ifdef VBOX_WITH_USB_VIDEO + ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback); + EmWebcam *pWebcam = pThis->mConsole->getEmWebcam(); + pWebcam->EmWebcamCbControl(rcRequest, pDeviceCtx, pvUser, pControl, cbControl); +#else + NOREF(pvCallback); + NOREF(rcRequest); + NOREF(pDeviceCtx); + NOREF(pvUser); + NOREF(pControl); + NOREF(cbControl); +#endif +} + +/* static */ DECLCALLBACK(void) ConsoleVRDPServer::VRDECallbackVideoInFrame(void *pvCallback, + int rcRequest, + void *pDeviceCtx, + const VRDEVIDEOINPAYLOADHDR *pFrame, + uint32_t cbFrame) +{ +#ifdef VBOX_WITH_USB_VIDEO + ConsoleVRDPServer *pThis = static_cast<ConsoleVRDPServer*>(pvCallback); + EmWebcam *pWebcam = pThis->mConsole->getEmWebcam(); + pWebcam->EmWebcamCbFrame(rcRequest, pDeviceCtx, pFrame, cbFrame); +#else + NOREF(pvCallback); + NOREF(rcRequest); + NOREF(pDeviceCtx); + NOREF(pFrame); + NOREF(cbFrame); +#endif +} + +int ConsoleVRDPServer::VideoInDeviceAttach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, void *pvDeviceCtx) +{ + int rc; + + if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInDeviceAttach) + { + rc = m_interfaceVideoIn.VRDEVideoInDeviceAttach(mhServer, pDeviceHandle, pvDeviceCtx); + } + else + { + rc = VERR_NOT_SUPPORTED; + } + + return rc; +} + +int ConsoleVRDPServer::VideoInDeviceDetach(const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle) +{ + int rc; + + if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInDeviceDetach) + { + rc = m_interfaceVideoIn.VRDEVideoInDeviceDetach(mhServer, pDeviceHandle); + } + else + { + rc = VERR_NOT_SUPPORTED; + } + + return rc; +} + +int ConsoleVRDPServer::VideoInGetDeviceDesc(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle) +{ + int rc; + + if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInGetDeviceDesc) + { + rc = m_interfaceVideoIn.VRDEVideoInGetDeviceDesc(mhServer, pvUser, pDeviceHandle); + } + else + { + rc = VERR_NOT_SUPPORTED; + } + + return rc; +} + +int ConsoleVRDPServer::VideoInControl(void *pvUser, const VRDEVIDEOINDEVICEHANDLE *pDeviceHandle, + const VRDEVIDEOINCTRLHDR *pReq, uint32_t cbReq) +{ + int rc; + + if (mhServer && mpEntryPoints && m_interfaceVideoIn.VRDEVideoInControl) + { + rc = m_interfaceVideoIn.VRDEVideoInControl(mhServer, pvUser, pDeviceHandle, pReq, cbReq); + } + else + { + rc = VERR_NOT_SUPPORTED; + } + + return rc; +} + void ConsoleVRDPServer::EnableConnections(void) { if (mpEntryPoints && mhServer) diff --git a/src/VBox/Main/src-client/DisplayImpl.cpp b/src/VBox/Main/src-client/DisplayImpl.cpp index fc2610194..a9ab957a4 100644 --- a/src/VBox/Main/src-client/DisplayImpl.cpp +++ b/src/VBox/Main/src-client/DisplayImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2773,11 +2773,11 @@ STDMETHODIMP Display::DrawToScreen (ULONG aScreenId, BYTE *address, ULONG x, ULO return rc; } -void Display::InvalidateAndUpdateEMT(Display *pDisplay) +void Display::InvalidateAndUpdateEMT(Display *pDisplay, unsigned uId, bool fUpdateAll) { pDisplay->vbvaLock(); unsigned uScreenId; - for (uScreenId = 0; uScreenId < pDisplay->mcMonitors; uScreenId++) + for (uScreenId = (fUpdateAll ? 0 : uId); uScreenId < pDisplay->mcMonitors; uScreenId++) { DISPLAYFBINFO *pFBInfo = &pDisplay->maFramebuffers[uScreenId]; @@ -2788,7 +2788,8 @@ void Display::InvalidateAndUpdateEMT(Display *pDisplay) else { if ( !pFBInfo->pFramebuffer.isNull() - && !(pFBInfo->fDisabled)) + && !(pFBInfo->fDisabled) + && pFBInfo->u32ResizeStatus == ResizeStatus_Void) { /* Render complete VRAM screen to the framebuffer. * When framebuffer uses VRAM directly, just notify it to update. @@ -2796,6 +2797,10 @@ void Display::InvalidateAndUpdateEMT(Display *pDisplay) if (pFBInfo->fDefaultFormat) { BYTE *address = NULL; + ULONG uWidth = 0; + ULONG uHeight = 0; + pFBInfo->pFramebuffer->COMGETTER(Width) (&uWidth); + pFBInfo->pFramebuffer->COMGETTER(Height) (&uHeight); HRESULT hrc = pFBInfo->pFramebuffer->COMGETTER(Address) (&address); if (SUCCEEDED(hrc) && address != NULL) { @@ -2819,22 +2824,32 @@ void Display::InvalidateAndUpdateEMT(Display *pDisplay) uint32_t u32DstLineSize = u32DstWidth * 4; uint32_t u32DstBitsPerPixel = 32; - pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort, - width, height, - pu8Src, - xSrc, ySrc, - u32SrcWidth, u32SrcHeight, - u32SrcLineSize, u32SrcBitsPerPixel, - pu8Dst, - xDst, yDst, - u32DstWidth, u32DstHeight, - u32DstLineSize, u32DstBitsPerPixel); + /* if uWidth != pFBInfo->w and uHeight != pFBInfo->h + * implies resize of Framebuffer is in progress and + * copyrect should not be called. + */ + if (uWidth == pFBInfo->w && uHeight == pFBInfo->h) + { + + pDisplay->mpDrv->pUpPort->pfnCopyRect(pDisplay->mpDrv->pUpPort, + width, height, + pu8Src, + xSrc, ySrc, + u32SrcWidth, u32SrcHeight, + u32SrcLineSize, u32SrcBitsPerPixel, + pu8Dst, + xDst, yDst, + u32DstWidth, u32DstHeight, + u32DstLineSize, u32DstBitsPerPixel); + } } } pDisplay->handleDisplayUpdate (uScreenId, 0, 0, pFBInfo->w, pFBInfo->h); } } + if (!fUpdateAll) + break; } pDisplay->vbvaUnlock(); } @@ -2868,7 +2883,8 @@ STDMETHODIMP Display::InvalidateAndUpdate() /* pdm.h says that this has to be called from the EMT thread */ int rcVBox = VMR3ReqCallVoidWait(pVM, VMCPUID_ANY, (PFNRT)Display::InvalidateAndUpdateEMT, - 1, this); + 3, this, 0, true); + alock.acquire(); if (RT_FAILURE(rcVBox)) @@ -3226,7 +3242,7 @@ DECLCALLBACK(void) Display::displayRefreshCallback(PPDMIDISPLAYCONNECTOR pInterf /* Continue with normal processing because the status here is ResizeStatus_Void. * Repaint all displays because VM continued to run during the framebuffer resize. */ - pDisplay->InvalidateAndUpdateEMT(pDisplay); + pDisplay->InvalidateAndUpdateEMT(pDisplay, uScreenId, false); } else if (u32ResizeStatus == ResizeStatus_InProgress) { diff --git a/src/VBox/Main/src-client/HGCM.cpp b/src/VBox/Main/src-client/HGCM.cpp index abc74a27b..5decb298c 100644 --- a/src/VBox/Main/src-client/HGCM.cpp +++ b/src/VBox/Main/src-client/HGCM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/HGCMThread.cpp b/src/VBox/Main/src-client/HGCMThread.cpp index 49c3db18e..1ec18e2bb 100644 --- a/src/VBox/Main/src-client/HGCMThread.cpp +++ b/src/VBox/Main/src-client/HGCMThread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/KeyboardImpl.cpp b/src/VBox/Main/src-client/KeyboardImpl.cpp index 43c2776cb..afd299ae2 100644 --- a/src/VBox/Main/src-client/KeyboardImpl.cpp +++ b/src/VBox/Main/src-client/KeyboardImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp index 11dd820ac..bbec7225f 100644 --- a/src/VBox/Main/src-client/MachineDebuggerImpl.cpp +++ b/src/VBox/Main/src-client/MachineDebuggerImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/MouseImpl.cpp b/src/VBox/Main/src-client/MouseImpl.cpp index 641f1ad8d..5e532bb2f 100644 --- a/src/VBox/Main/src-client/MouseImpl.cpp +++ b/src/VBox/Main/src-client/MouseImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/RemoteUSBBackend.cpp b/src/VBox/Main/src-client/RemoteUSBBackend.cpp index c8d7811f9..125783f89 100644 --- a/src/VBox/Main/src-client/RemoteUSBBackend.cpp +++ b/src/VBox/Main/src-client/RemoteUSBBackend.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp index 92a2338cb..999866900 100644 --- a/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp +++ b/src/VBox/Main/src-client/RemoteUSBDeviceImpl.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/USBDeviceImpl.cpp b/src/VBox/Main/src-client/USBDeviceImpl.cpp index a927d64fe..f5c3c0b18 100644 --- a/src/VBox/Main/src-client/USBDeviceImpl.cpp +++ b/src/VBox/Main/src-client/USBDeviceImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/UsbWebcamInterface.cpp b/src/VBox/Main/src-client/UsbWebcamInterface.cpp new file mode 100644 index 000000000..4f28c9231 --- /dev/null +++ b/src/VBox/Main/src-client/UsbWebcamInterface.cpp @@ -0,0 +1,393 @@ +/* $Id: UsbWebcamInterface.cpp $ */ +/** @file + * UsbWebcamInterface - Driver Interface for USB Webcam emulation. + */ + +/* + * Copyright (C) 2011-2013 Oracle Corporation + * + * 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. + */ + + +#define LOG_GROUP LOG_GROUP_USB_WEBCAM +#include "UsbWebcamInterface.h" +#include "ConsoleImpl.h" +#include "ConsoleVRDPServer.h" + +#include <VBox/vmm/pdmwebcaminfs.h> + + +typedef struct EMWEBCAMDRV *PEMWEBCAMDRV; + +struct EMWEBCAMDRV +{ + EmWebcam *pEmWebcam; + PDMIWEBCAMDOWN IWebcamDown; + PPDMIWEBCAMUP pIWebcamUp; + +}; + +struct EMWEBCAMREMOTE +{ + EmWebcam *pEmWebcam; + + /* The remote identifier. */ + VRDEVIDEOINDEVICEHANDLE deviceHandle; + + /* The device identifier for the PDM device.*/ + uint64_t u64DeviceId; +}; + +typedef struct EMWEBCAMREQCTX +{ + EMWEBCAMREMOTE *pRemote; + void *pvUser; +} EMWEBCAMREQCTX; + + +static DECLCALLBACK(int) drvEmWebcamControl(PPDMIWEBCAMDOWN pInterface, + void *pvUser, + uint64_t u64DeviceId, + const PDMIWEBCAM_CTRLHDR *pCtrl, + uint32_t cbCtrl) +{ + LogFlowFunc(("pInterface:%p\n", pInterface)); + + PEMWEBCAMDRV pThis = RT_FROM_MEMBER(pInterface, EMWEBCAMDRV, IWebcamDown); + + return pThis->pEmWebcam->SendControl(pThis, pvUser, u64DeviceId, (const VRDEVIDEOINCTRLHDR *)pCtrl, cbCtrl); +} + + +EmWebcam::EmWebcam(Console *console) + : mpDrv(NULL), + mParent(console), + mpRemote(NULL), + mu64DeviceIdSrc(0) +{ +} + +EmWebcam::~EmWebcam() +{ + if (mpDrv) + { + mpDrv->pEmWebcam = NULL; + mpDrv = NULL; + } +} + +void EmWebcam::EmWebcamDestruct(EMWEBCAMDRV *pDrv) +{ + AssertReturnVoid(pDrv == mpDrv); + + if (mpRemote) + { + mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle); + RTMemFree(mpRemote); + mpRemote = NULL; + } +} + +void EmWebcam::EmWebcamCbNotify(uint32_t u32Id, const void *pvData, uint32_t cbData) +{ + int rc = VINF_SUCCESS; + + switch (u32Id) + { + case VRDE_VIDEOIN_NOTIFY_ATTACH: + { + VRDEVIDEOINNOTIFYATTACH *p = (VRDEVIDEOINNOTIFYATTACH *)pvData; + Assert(cbData == sizeof(VRDEVIDEOINNOTIFYATTACH)); + + LogFlowFunc(("ATTACH[%d,%d]\n", p->deviceHandle.u32ClientId, p->deviceHandle.u32DeviceId)); + + /* Currently only one device is allowed. */ + if (mpRemote) + { + AssertFailed(); + rc = VERR_NOT_SUPPORTED; + break; + } + + EMWEBCAMREMOTE *pRemote = (EMWEBCAMREMOTE *)RTMemAllocZ(sizeof(EMWEBCAMREMOTE)); + if (pRemote == NULL) + { + rc = VERR_NO_MEMORY; + break; + } + + pRemote->pEmWebcam = this; + pRemote->deviceHandle = p->deviceHandle; + pRemote->u64DeviceId = ASMAtomicIncU64(&mu64DeviceIdSrc); + + mpRemote = pRemote; + + /* Tell the server that this webcam will be used. */ + rc = mParent->consoleVRDPServer()->VideoInDeviceAttach(&mpRemote->deviceHandle, mpRemote); + if (RT_FAILURE(rc)) + { + RTMemFree(mpRemote); + mpRemote = NULL; + break; + } + + /* Get the device description. */ + rc = mParent->consoleVRDPServer()->VideoInGetDeviceDesc(NULL, &mpRemote->deviceHandle); + + if (RT_FAILURE(rc)) + { + mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle); + RTMemFree(mpRemote); + mpRemote = NULL; + break; + } + + LogFlowFunc(("sent DeviceDesc\n")); + } break; + + case VRDE_VIDEOIN_NOTIFY_DETACH: + { + VRDEVIDEOINNOTIFYDETACH *p = (VRDEVIDEOINNOTIFYDETACH *)pvData; + Assert(cbData == sizeof(VRDEVIDEOINNOTIFYDETACH)); + + LogFlowFunc(("DETACH[%d,%d]\n", p->deviceHandle.u32ClientId, p->deviceHandle.u32DeviceId)); + + /* @todo */ + if (mpRemote) + { + if (mpDrv->pIWebcamUp) + { + mpDrv->pIWebcamUp->pfnWebcamUpDetached(mpDrv->pIWebcamUp, + mpRemote->u64DeviceId); + } + + /* No need to tell the server by calling VideoInDeviceDetach because the server is telling. */ + RTMemFree(mpRemote); + mpRemote = NULL; + } + } break; + + default: + rc = VERR_INVALID_PARAMETER; + AssertFailed(); + break; + } + + return; +} + +void EmWebcam::EmWebcamCbDeviceDesc(int rcRequest, void *pDeviceCtx, void *pvUser, + const VRDEVIDEOINDEVICEDESC *pDeviceDesc, uint32_t cbDeviceDesc) +{ + EMWEBCAMREMOTE *pRemote = (EMWEBCAMREMOTE *)pDeviceCtx; + Assert(pRemote == mpRemote); + + LogFlowFunc(("rcRequest %Rrc %p %p %p %d\n", + rcRequest, pDeviceCtx, pvUser, pDeviceDesc, cbDeviceDesc)); + + if (RT_SUCCESS(rcRequest)) + { + if (mpDrv->pIWebcamUp) + { + mpDrv->pIWebcamUp->pfnWebcamUpAttached(mpDrv->pIWebcamUp, + pRemote->u64DeviceId, + (const PDMIWEBCAM_DEVICEDESC *)pDeviceDesc, + cbDeviceDesc); + } + } + else + { + mParent->consoleVRDPServer()->VideoInDeviceDetach(&mpRemote->deviceHandle); + RTMemFree(mpRemote); + mpRemote = NULL; + } +} + +void EmWebcam::EmWebcamCbControl(int rcRequest, void *pDeviceCtx, void *pvUser, + const VRDEVIDEOINCTRLHDR *pControl, uint32_t cbControl) +{ + EMWEBCAMREMOTE *pRemote = (EMWEBCAMREMOTE *)pDeviceCtx; + Assert(pRemote == mpRemote); + + LogFlowFunc(("rcRequest %Rrc %p %p %p %d\n", + rcRequest, pDeviceCtx, pvUser, pControl, cbControl)); + + bool fResponse = (pvUser != NULL); + + if (mpDrv->pIWebcamUp) + { + mpDrv->pIWebcamUp->pfnWebcamUpControl(mpDrv->pIWebcamUp, + fResponse, + pvUser, + mpRemote->u64DeviceId, + (const PDMIWEBCAM_CTRLHDR *)pControl, + cbControl); + } + + RTMemFree(pvUser); +} + +void EmWebcam::EmWebcamCbFrame(int rcRequest, void *pDeviceCtx, + const VRDEVIDEOINPAYLOADHDR *pFrame, uint32_t cbFrame) +{ + LogFlowFunc(("rcRequest %Rrc %p %p %d\n", + rcRequest, pDeviceCtx, pFrame, cbFrame)); + + if (mpDrv->pIWebcamUp) + { + mpDrv->pIWebcamUp->pfnWebcamUpFrame(mpDrv->pIWebcamUp, + mpRemote->u64DeviceId, + (const uint8_t *)pFrame, + cbFrame); + } +} + +int EmWebcam::SendControl(EMWEBCAMDRV *pDrv, void *pvUser, uint64_t u64DeviceId, + const VRDEVIDEOINCTRLHDR *pControl, uint32_t cbControl) +{ + AssertReturn(pDrv == mpDrv, VERR_NOT_SUPPORTED); + + int rc = VINF_SUCCESS; + + EMWEBCAMREQCTX *pCtx = NULL; + + /* Verify that there is a remote device. */ + if ( !mpRemote + || mpRemote->u64DeviceId != u64DeviceId) + { + rc = VERR_NOT_SUPPORTED; + } + + if (RT_SUCCESS(rc)) + { + pCtx = (EMWEBCAMREQCTX *)RTMemAlloc(sizeof(EMWEBCAMREQCTX)); + if (!pCtx) + { + rc = VERR_NO_MEMORY; + } + } + + if (RT_SUCCESS(rc)) + { + pCtx->pRemote = mpRemote; + pCtx->pvUser = pvUser; + + rc = mParent->consoleVRDPServer()->VideoInControl(pCtx, &mpRemote->deviceHandle, pControl, cbControl); + + if (RT_FAILURE(rc)) + { + RTMemFree(pCtx); + } + } + + return rc; +} + +/* static */ DECLCALLBACK(void *) EmWebcam::drvQueryInterface(PPDMIBASE pInterface, const char *pszIID) +{ + LogFlowFunc(("pInterface:%p, pszIID:%s\n", __FUNCTION__, pInterface, pszIID)); + PPDMDRVINS pDrvIns = PDMIBASE_2_PDMDRV(pInterface); + PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV); + + PDMIBASE_RETURN_INTERFACE(pszIID, PDMIBASE, &pDrvIns->IBase); + PDMIBASE_RETURN_INTERFACE(pszIID, PDMIWEBCAMDOWN, &pThis->IWebcamDown); + return NULL; +} + +/* static */ DECLCALLBACK(int) EmWebcam::drvConstruct(PPDMDRVINS pDrvIns, PCFGMNODE pCfg, uint32_t fFlags) +{ + LogFlow(("%s: iInstance/#d, pCfg:%p, fFlags:%x\n", __FUNCTION__, pDrvIns->iInstance, pCfg, fFlags)); + + PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV); + + if (!CFGMR3AreValuesValid(pCfg, "Object\0")) + return VERR_PDM_DRVINS_UNKNOWN_CFG_VALUES; + + AssertMsgReturn(PDMDrvHlpNoAttach(pDrvIns) == VERR_PDM_NO_ATTACHED_DRIVER, + ("Configuration error: Not possible to attach anything to this driver!\n"), + VERR_PDM_DRVINS_NO_ATTACH); + + void *pv = NULL; + int rc = CFGMR3QueryPtr(pCfg, "Object", &pv); + AssertMsgRCReturn(rc, ("Configuration error: No/bad \"Object\" value! rc=%Rrc\n", rc), rc); + + pThis->pEmWebcam = (EmWebcam *)pv; + pThis->pEmWebcam->mpDrv = pThis; + + pDrvIns->IBase.pfnQueryInterface = drvQueryInterface; + + pThis->IWebcamDown.pfnWebcamDownControl = drvEmWebcamControl; + + pThis->pIWebcamUp = PDMIBASE_QUERY_INTERFACE(pDrvIns->pUpBase, PDMIWEBCAMUP); + + AssertReturn(pThis->pIWebcamUp, VERR_PDM_MISSING_INTERFACE); + + return VINF_SUCCESS; +} + +/* static */ DECLCALLBACK(void) EmWebcam::drvDestruct(PPDMDRVINS pDrvIns) +{ + LogFlow(("%s: iInstance/#d\n", __FUNCTION__, pDrvIns->iInstance)); + PEMWEBCAMDRV pThis = PDMINS_2_DATA(pDrvIns, PEMWEBCAMDRV); + if (pThis->pEmWebcam) + { + pThis->pEmWebcam->EmWebcamDestruct(pThis); + pThis->pEmWebcam = NULL; + } +} + +/* static */ const PDMDRVREG EmWebcam::DrvReg = +{ + /* u32Version */ + PDM_DRVREG_VERSION, + /* szName[32] */ + "EmWebcam", + /* szRCMod[32] */ + "", + /* szR0Mod[32] */ + "", + /* pszDescription */ + "Main Driver communicating with VRDE", + /* fFlags */ + PDM_DRVREG_FLAGS_HOST_BITS_DEFAULT, + /* fClass */ + PDM_DRVREG_CLASS_USB, + /* cMaxInstances */ + 1, + /* cbInstance */ + sizeof(EMWEBCAMDRV), + /* pfnConstruct */ + EmWebcam::drvConstruct, + /* pfnDestruct */ + EmWebcam::drvDestruct, + /* pfnRelocate */ + NULL, + /* pfnIOCtl */ + NULL, + /* pfnPowerOn */ + NULL, + /* pfnReset */ + NULL, + /* pfnSuspend */ + NULL, + /* pfnResume */ + NULL, + /* pfnAttach */ + NULL, + /* pfnDetach */ + NULL, + /* pfnPowerOff */ + NULL, + /* pfnSoftReset */ + NULL, + /* u32VersionEnd */ + PDM_DRVREG_VERSION +}; +/* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/src-client/VBoxDriversRegister.cpp b/src/VBox/Main/src-client/VBoxDriversRegister.cpp index b98babe24..38448ffad 100644 --- a/src/VBox/Main/src-client/VBoxDriversRegister.cpp +++ b/src/VBox/Main/src-client/VBoxDriversRegister.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -78,7 +78,7 @@ extern "C" DECLEXPORT(int) VBoxDriversRegister(PCPDMDRVREGCB pCallbacks, uint32_ return rc; #ifdef VBOX_WITH_USB_VIDEO - rc = pCallbacks->pfnRegister(pCallbacks, &UsbWebcamInterface::DrvReg); + rc = pCallbacks->pfnRegister(pCallbacks, &EmWebcam::DrvReg); if (RT_FAILURE(rc)) return rc; #endif diff --git a/src/VBox/Main/src-client/VMMDevInterface.cpp b/src/VBox/Main/src-client/VMMDevInterface.cpp index 5c3809fe7..285a2e59e 100644 --- a/src/VBox/Main/src-client/VMMDevInterface.cpp +++ b/src/VBox/Main/src-client/VMMDevInterface.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp b/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp index 94ed652d5..58ec6d5ac 100644 --- a/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp +++ b/src/VBox/Main/src-client/VirtualBoxClientImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/win/VBoxC.def b/src/VBox/Main/src-client/win/VBoxC.def index 360d0f8e3..250b93726 100644 --- a/src/VBox/Main/src-client/win/VBoxC.def +++ b/src/VBox/Main/src-client/win/VBoxC.def @@ -3,7 +3,7 @@ ; VBoxC DLL Definition File. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-client/win/dllmain.cpp b/src/VBox/Main/src-client/win/dllmain.cpp index db1181cb5..1fbce74f1 100644 --- a/src/VBox/Main/src-client/win/dllmain.cpp +++ b/src/VBox/Main/src-client/win/dllmain.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/ApplianceImplExport.cpp b/src/VBox/Main/src-server/ApplianceImplExport.cpp index cc47b4d1c..9b2d12196 100644 --- a/src/VBox/Main/src-server/ApplianceImplExport.cpp +++ b/src/VBox/Main/src-server/ApplianceImplExport.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/AudioAdapterImpl.cpp b/src/VBox/Main/src-server/AudioAdapterImpl.cpp index 9b6dbf178..089359b21 100644 --- a/src/VBox/Main/src-server/AudioAdapterImpl.cpp +++ b/src/VBox/Main/src-server/AudioAdapterImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/BIOSSettingsImpl.cpp b/src/VBox/Main/src-server/BIOSSettingsImpl.cpp index bc40820ba..e21ea5892 100644 --- a/src/VBox/Main/src-server/BIOSSettingsImpl.cpp +++ b/src/VBox/Main/src-server/BIOSSettingsImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/DHCPServerImpl.cpp b/src/VBox/Main/src-server/DHCPServerImpl.cpp index 45f21370b..b2a921d8f 100644 --- a/src/VBox/Main/src-server/DHCPServerImpl.cpp +++ b/src/VBox/Main/src-server/DHCPServerImpl.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/DHCPServerRunner.cpp b/src/VBox/Main/src-server/DHCPServerRunner.cpp index aab7c8a9f..4c0862be5 100644 --- a/src/VBox/Main/src-server/DHCPServerRunner.cpp +++ b/src/VBox/Main/src-server/DHCPServerRunner.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/HostPower.cpp b/src/VBox/Main/src-server/HostPower.cpp index 830729a00..8972599b5 100644 --- a/src/VBox/Main/src-server/HostPower.cpp +++ b/src/VBox/Main/src-server/HostPower.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/MachineImpl.cpp b/src/VBox/Main/src-server/MachineImpl.cpp index 100f696e6..2086e3e29 100644 --- a/src/VBox/Main/src-server/MachineImpl.cpp +++ b/src/VBox/Main/src-server/MachineImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2004-2012 Oracle Corporation + * Copyright (C) 2004-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -208,6 +208,7 @@ Machine::HWData::HWData() mKeyboardHIDType = KeyboardHIDType_PS2Keyboard; mPointingHIDType = PointingHIDType_PS2Mouse; mChipsetType = ChipsetType_PIIX3; + mEmulatedUSBWebcamEnabled = FALSE; mEmulatedUSBCardReaderEnabled = FALSE; for (size_t i = 0; i < RT_ELEMENTS(mCPUAttached); i++) @@ -1622,14 +1623,42 @@ STDMETHODIMP Machine::COMSETTER(EmulatedUSBCardReaderEnabled)(BOOL enabled) STDMETHODIMP Machine::COMGETTER(EmulatedUSBWebcameraEnabled)(BOOL *enabled) { +#ifdef VBOX_WITH_USB_VIDEO + CheckComArgOutPointerValid(enabled); + + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + + AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); + + *enabled = mHWData->mEmulatedUSBWebcamEnabled; + + return S_OK; +#else NOREF(enabled); return E_NOTIMPL; +#endif } STDMETHODIMP Machine::COMSETTER(EmulatedUSBWebcameraEnabled)(BOOL enabled) { +#ifdef VBOX_WITH_USB_VIDEO + AutoCaller autoCaller(this); + if (FAILED(autoCaller.rc())) return autoCaller.rc(); + AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); + + HRESULT rc = checkStateDependency(MutableStateDep); + if (FAILED(rc)) return rc; + + setModified(IsModified_MachineData); + mHWData.backup(); + mHWData->mEmulatedUSBWebcamEnabled = enabled; + + return S_OK; +#else NOREF(enabled); return E_NOTIMPL; +#endif } STDMETHODIMP Machine::COMGETTER(HPETEnabled)(BOOL *enabled) @@ -5441,21 +5470,18 @@ HRESULT Machine::getGuestPropertyFromService(IN_BSTR aName, AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); Utf8Str strName(aName); - HWData::GuestPropertyList::const_iterator it; + HWData::GuestPropertyMap::const_iterator it = + mHWData->mGuestProperties.find(strName); - for (it = mHWData->mGuestProperties.begin(); - it != mHWData->mGuestProperties.end(); ++it) + if (it != mHWData->mGuestProperties.end()) { - if (it->strName == strName) - { - char szFlags[MAX_FLAGS_LEN + 1]; - it->strValue.cloneTo(aValue); - *aTimestamp = it->mTimestamp; - writeFlags(it->mFlags, szFlags); - Bstr(szFlags).cloneTo(aFlags); - break; - } + char szFlags[MAX_FLAGS_LEN + 1]; + it->second.strValue.cloneTo(aValue); + *aTimestamp = it->second.mTimestamp; + writeFlags(it->second.mFlags, szFlags); + Bstr(szFlags).cloneTo(aFlags); } + return S_OK; } @@ -5538,7 +5564,6 @@ HRESULT Machine::setGuestPropertyToService(IN_BSTR aName, IN_BSTR aValue, HRESULT rc = S_OK; HWData::GuestProperty property; property.mFlags = NILFLAG; - bool found = false; rc = checkStateDependency(MutableStateDep); if (FAILED(rc)) return rc; @@ -5548,64 +5573,62 @@ HRESULT Machine::setGuestPropertyToService(IN_BSTR aName, IN_BSTR aValue, Utf8Str utf8Name(aName); Utf8Str utf8Flags(aFlags); uint32_t fFlags = NILFLAG; - if ( (aFlags != NULL) - && RT_FAILURE(validateFlags(utf8Flags.c_str(), &fFlags)) + if ( (aFlags != NULL) + && RT_FAILURE(validateFlags(utf8Flags.c_str(), &fFlags)) ) return setError(E_INVALIDARG, - tr("Invalid flag values: '%ls'"), + tr("Invalid guest property flag values: '%ls'"), aFlags); - /** @todo r=bird: see efficiency rant in PushGuestProperty. (Yeah, I - * know, this is simple and do an OK job atm.) */ - HWData::GuestPropertyList::iterator it; - for (it = mHWData->mGuestProperties.begin(); - it != mHWData->mGuestProperties.end(); ++it) - if (it->strName == utf8Name) + HWData::GuestPropertyMap::iterator it = + mHWData->mGuestProperties.find(utf8Name); + + if (it == mHWData->mGuestProperties.end()) + { + setModified(IsModified_MachineData); + mHWData.backupEx(); + + RTTIMESPEC time; + HWData::GuestProperty prop; + prop.strValue = aValue; + prop.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time)); + prop.mFlags = fFlags; + + mHWData->mGuestProperties[Utf8Str(aName)] = prop; + } + else + { + if (it->second.mFlags & (RDONLYHOST)) { - property = *it; - if (it->mFlags & (RDONLYHOST)) - rc = setError(E_ACCESSDENIED, - tr("The property '%ls' cannot be changed by the host"), - aName); + rc = setError(E_ACCESSDENIED, + tr("The property '%ls' cannot be changed by the host"), + aName); + } + else + { + setModified(IsModified_MachineData); + mHWData.backupEx(); + + /* The backupEx() operation invalidates our iterator, + * so get a new one. */ + it = mHWData->mGuestProperties.find(utf8Name); + Assert(it != mHWData->mGuestProperties.end()); + + if (RT_VALID_PTR(aValue) && *(aValue) != '\0') + { + RTTIMESPEC time; + it->second.strValue = aValue; + it->second.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time)); + if (aFlags != NULL) + it->second.mFlags = fFlags; + } else { - setModified(IsModified_MachineData); - mHWData.backup(); // @todo r=dj backup in a loop?!? - - /* The backup() operation invalidates our iterator, so - * get a new one. */ - for (it = mHWData->mGuestProperties.begin(); - it->strName != utf8Name; - ++it) - ; mHWData->mGuestProperties.erase(it); } - found = true; - break; } - if (found && SUCCEEDED(rc)) - { - if (aValue) - { - RTTIMESPEC time; - property.strValue = aValue; - property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time)); - if (aFlags != NULL) - property.mFlags = fFlags; - mHWData->mGuestProperties.push_back(property); - } - } - else if (SUCCEEDED(rc) && aValue) - { - RTTIMESPEC time; - setModified(IsModified_MachineData); - mHWData.backup(); - property.strName = aName; - property.strValue = aValue; - property.mTimestamp = RTTimeSpecGetNano(RTTimeNow(&time)); - property.mFlags = fFlags; - mHWData->mGuestProperties.push_back(property); } + if ( SUCCEEDED(rc) && ( mHWData->mGuestPropertyNotificationPatterns.isEmpty() || RTStrSimplePatternMultiMatch(mHWData->mGuestPropertyNotificationPatterns.c_str(), @@ -5616,8 +5639,8 @@ HRESULT Machine::setGuestPropertyToService(IN_BSTR aName, IN_BSTR aValue, ) ) { - /** @todo r=bird: Why aren't we leaving the lock here? The - * same code in PushGuestProperty does... */ + alock.release(); + mParent->onGuestPropertyChange(mData->mUuid, aName, aValue ? aValue : Bstr("").raw(), aFlags ? aFlags : Bstr("").raw()); @@ -5713,42 +5736,50 @@ HRESULT Machine::enumerateGuestPropertiesInService AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); Utf8Str strPatterns(aPatterns); + HWData::GuestPropertyMap propMap; + /* * Look for matching patterns and build up a list. */ - HWData::GuestPropertyList propList; - for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin(); - it != mHWData->mGuestProperties.end(); - ++it) + HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.begin(); + while (it != mHWData->mGuestProperties.end()) + { if ( strPatterns.isEmpty() || RTStrSimplePatternMultiMatch(strPatterns.c_str(), RTSTR_MAX, - it->strName.c_str(), + it->first.c_str(), RTSTR_MAX, NULL) ) - propList.push_back(*it); + { + propMap.insert(*it); + } + + it++; + } + + alock.release(); /* * And build up the arrays for returning the property information. */ - size_t cEntries = propList.size(); + size_t cEntries = propMap.size(); SafeArray<BSTR> names(cEntries); SafeArray<BSTR> values(cEntries); SafeArray<LONG64> timestamps(cEntries); SafeArray<BSTR> flags(cEntries); size_t iProp = 0; - for (HWData::GuestPropertyList::iterator it = propList.begin(); - it != propList.end(); - ++it) + + it = propMap.begin(); + while (it != propMap.end()) { char szFlags[MAX_FLAGS_LEN + 1]; - it->strName.cloneTo(&names[iProp]); - it->strValue.cloneTo(&values[iProp]); - timestamps[iProp] = it->mTimestamp; - writeFlags(it->mFlags, szFlags); - Bstr(szFlags).cloneTo(&flags[iProp]); - ++iProp; + it->first.cloneTo(&names[iProp]); + it->second.strValue.cloneTo(&values[iProp]); + timestamps[iProp] = it->second.mTimestamp; + writeFlags(it->second.mFlags, szFlags); + Bstr(szFlags).cloneTo(&flags[iProp++]); + it++; } names.detachTo(ComSafeArrayOutArg(aNames)); values.detachTo(ComSafeArrayOutArg(aValues)); @@ -8530,6 +8561,7 @@ HRESULT Machine::loadHardware(const settings::Hardware &data, const settings::De mHWData->mPointingHIDType = data.pointingHIDType; mHWData->mKeyboardHIDType = data.keyboardHIDType; mHWData->mChipsetType = data.chipsetType; + mHWData->mEmulatedUSBWebcamEnabled = data.fEmulatedUSBWebcam; mHWData->mEmulatedUSBCardReaderEnabled = data.fEmulatedUSBCardReader; mHWData->mHPETEnabled = data.fHPETEnabled; @@ -8671,8 +8703,8 @@ HRESULT Machine::loadHardware(const settings::Hardware &data, const settings::De const settings::GuestProperty &prop = *it; uint32_t fFlags = guestProp::NILFLAG; guestProp::validateFlags(prop.strFlags.c_str(), &fFlags); - HWData::GuestProperty property = { prop.strName, prop.strValue, (LONG64) prop.timestamp, fFlags }; - mHWData->mGuestProperties.push_back(property); + HWData::GuestProperty property = { prop.strValue, (LONG64) prop.timestamp, fFlags }; + mHWData->mGuestProperties[prop.strName] = property; } mHWData->mGuestPropertyNotificationPatterns = data.strNotificationPatterns; @@ -9715,6 +9747,7 @@ HRESULT Machine::saveHardware(settings::Hardware &data, settings::Debugging *pDb // chipset data.chipsetType = mHWData->mChipsetType; + data.fEmulatedUSBWebcam = !!mHWData->mEmulatedUSBWebcamEnabled; data.fEmulatedUSBCardReader = !!mHWData->mEmulatedUSBCardReaderEnabled; // HPET @@ -9854,11 +9887,11 @@ HRESULT Machine::saveHardware(settings::Hardware &data, settings::Debugging *pDb // guest properties data.llGuestProperties.clear(); #ifdef VBOX_WITH_GUEST_PROPS - for (HWData::GuestPropertyList::const_iterator it = mHWData->mGuestProperties.begin(); + for (HWData::GuestPropertyMap::const_iterator it = mHWData->mGuestProperties.begin(); it != mHWData->mGuestProperties.end(); ++it) { - HWData::GuestProperty property = *it; + HWData::GuestProperty property = it->second; /* Remove transient guest properties at shutdown unless we * are saving state */ @@ -9869,7 +9902,7 @@ HRESULT Machine::saveHardware(settings::Hardware &data, settings::Debugging *pDb || property.mFlags & guestProp::TRANSRESET)) continue; settings::GuestProperty prop; - prop.strName = property.strName; + prop.strName = it->first; prop.strValue = property.strValue; prop.timestamp = property.mTimestamp; char szFlags[guestProp::MAX_FLAGS_LEN + 1]; @@ -10372,6 +10405,30 @@ HRESULT Machine::deleteImplicitDiffs(bool aOnline) /* We absolutely must have backed up state. */ AssertReturn(mMediaData.isBackedUp(), E_FAIL); + /* Check if there are any implicitly created diff images. */ + bool fImplicitDiffs = false; + for (MediaData::AttachmentList::const_iterator it = mMediaData->mAttachments.begin(); + it != mMediaData->mAttachments.end(); + ++it) + { + const ComObjPtr<MediumAttachment> &pAtt = *it; + if (pAtt->isImplicit()) + { + fImplicitDiffs = true; + break; + } + } + /* If there is nothing to do, leave early. This saves lots of image locking + * effort. It also avoids a MachineStateChanged event without real reason. + * This is important e.g. when loading a VM config, because there should be + * no events. Otherwise API clients can become thoroughly confused for + * inaccessible VMs (the code for loading VM configs uses this method for + * cleanup if the config makes no sense), as they take such events as an + * indication that the VM is alive, and they would force the VM config to + * be reread, leading to an endless loop. */ + if (!fImplicitDiffs) + return S_OK; + HRESULT rc = S_OK; MachineState_T oldState = mData->mMachineState; @@ -12742,18 +12799,18 @@ STDMETHODIMP SessionMachine::PullGuestProperties(ComSafeArrayOut(BSTR, aNames), com::SafeArray<LONG64> timestamps(cEntries); com::SafeArray<BSTR> flags(cEntries); unsigned i = 0; - for (HWData::GuestPropertyList::iterator it = mHWData->mGuestProperties.begin(); + for (HWData::GuestPropertyMap::iterator it = mHWData->mGuestProperties.begin(); it != mHWData->mGuestProperties.end(); ++it) { char szFlags[MAX_FLAGS_LEN + 1]; - it->strName.cloneTo(&names[i]); - it->strValue.cloneTo(&values[i]); - timestamps[i] = it->mTimestamp; + it->first.cloneTo(&names[i]); + it->second.strValue.cloneTo(&values[i]); + timestamps[i] = it->second.mTimestamp; /* If it is NULL, keep it NULL. */ - if (it->mFlags) + if (it->second.mFlags) { - writeFlags(it->mFlags, szFlags); + writeFlags(it->second.mFlags, szFlags); Bstr(szFlags).cloneTo(&flags[i]); } else @@ -12830,29 +12887,18 @@ STDMETHODIMP SessionMachine::PushGuestProperty(IN_BSTR aName, setModified(IsModified_MachineData); mHWData.backup(); - /** @todo r=bird: The careful memory handling doesn't work out here because - * the catch block won't undo any damage we've done. So, if push_back throws - * bad_alloc then you've lost the value. - * - * Another thing. Doing a linear search here isn't extremely efficient, esp. - * since values that changes actually bubbles to the end of the list. Using - * something that has an efficient lookup and can tolerate a bit of updates - * would be nice. RTStrSpace is one suggestion (it's not perfect). Some - * combination of RTStrCache (for sharing names and getting uniqueness into - * the bargain) and hash/tree is another. */ - for (HWData::GuestPropertyList::iterator iter = mHWData->mGuestProperties.begin(); - iter != mHWData->mGuestProperties.end(); - ++iter) - if (utf8Name == iter->strName) + HWData::GuestPropertyMap::iterator it = mHWData->mGuestProperties.find(utf8Name); + if (it != mHWData->mGuestProperties.end()) + { + if (RT_VALID_PTR(aValue) && *(aValue) != '\0') { - mHWData->mGuestProperties.erase(iter); - mData->mGuestPropertiesModified = TRUE; - break; + it->second.strValue = aValue; + it->second.mFlags = fFlags; + it->second.mTimestamp = aTimestamp; } - if (aValue != NULL) - { - HWData::GuestProperty property = { aName, aValue, aTimestamp, fFlags }; - mHWData->mGuestProperties.push_back(property); + else + mHWData->mGuestProperties.erase(it); + mData->mGuestPropertiesModified = TRUE; } @@ -13918,13 +13964,13 @@ HRESULT SessionMachine::setMachineState(MachineState_T aMachineState) /* Make sure any transient guest properties get removed from the * property store on shutdown. */ - HWData::GuestPropertyList::iterator it; + HWData::GuestPropertyMap::const_iterator it; BOOL fNeedsSaving = mData->mGuestPropertiesModified; if (!fNeedsSaving) for (it = mHWData->mGuestProperties.begin(); it != mHWData->mGuestProperties.end(); ++it) - if ( (it->mFlags & guestProp::TRANSIENT) - || (it->mFlags & guestProp::TRANSRESET)) + if ( (it->second.mFlags & guestProp::TRANSIENT) + || (it->second.mFlags & guestProp::TRANSRESET)) { fNeedsSaving = true; break; diff --git a/src/VBox/Main/src-server/MediumImpl.cpp b/src/VBox/Main/src-server/MediumImpl.cpp index e942227e7..85c36fefd 100644 --- a/src/VBox/Main/src-server/MediumImpl.cpp +++ b/src/VBox/Main/src-server/MediumImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2012 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -973,8 +973,29 @@ HRESULT Medium::init(VirtualBox *aVirtualBox, AutoWriteLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS); ComObjPtr<Medium> pMedium; + + /* + * Check whether the UUID is taken already and create a new one + * if required. + * Try this only a limited amount of times in case the PRNG is broken + * in some way to prevent an endless loop. + */ + for (unsigned i = 0; i < 5; i++) + { + bool fInUse; + + fInUse = m->pVirtualBox->isMediaUuidInUse(m->id, DeviceType_HardDisk); + if (fInUse) + { + // create new UUID + unconst(m->id).create(); + } + else + break; + } + rc = m->pVirtualBox->registerMedium(this, &pMedium, DeviceType_HardDisk); - Assert(this == pMedium); + Assert(this == pMedium || FAILED(rc)); } /* Confirm a successful initialization when it's the case */ @@ -4452,6 +4473,112 @@ HRESULT Medium::unmarkLockedForDeletion() } /** + * Queries the preferred merge direction from this to the other medium, i.e. + * the one which requires the least amount of I/O and therefore time and + * disk consumption. + * + * @returns Status code. + * @retval E_FAIL in case determining the merge direction fails for some reason, + * for example if getting the size of the media fails. There is no + * error set though and the caller is free to continue to find out + * what was going wrong later. Leaves fMergeForward unset. + * @retval VBOX_E_INVALID_OBJECT_STATE if both media are not related to each other + * An error is set. + * @param pOther The other medium to merge with. + * @param fMergeForward Resulting preferred merge direction (out). + */ +HRESULT Medium::queryPreferredMergeDirection(const ComObjPtr<Medium> &pOther, + bool &fMergeForward) +{ + AssertReturn(pOther != NULL, E_FAIL); + AssertReturn(pOther != this, E_FAIL); + + AutoCaller autoCaller(this); + AssertComRCReturnRC(autoCaller.rc()); + + AutoCaller otherCaller(pOther); + AssertComRCReturnRC(otherCaller.rc()); + + HRESULT rc = S_OK; + bool fThisParent = false; /**<< Flag whether this medium is the parent of pOther. */ + + try + { + // locking: we need the tree lock first because we access parent pointers + AutoWriteLock treeLock(m->pVirtualBox->getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS); + + /* more sanity checking and figuring out the current merge direction */ + ComObjPtr<Medium> pMedium = getParent(); + while (!pMedium.isNull() && pMedium != pOther) + pMedium = pMedium->getParent(); + if (pMedium == pOther) + fThisParent = false; + else + { + pMedium = pOther->getParent(); + while (!pMedium.isNull() && pMedium != this) + pMedium = pMedium->getParent(); + if (pMedium == this) + fThisParent = true; + else + { + Utf8Str tgtLoc; + { + AutoReadLock alock(pOther COMMA_LOCKVAL_SRC_POS); + tgtLoc = pOther->getLocationFull(); + } + + AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS); + throw setError(VBOX_E_INVALID_OBJECT_STATE, + tr("Media '%s' and '%s' are unrelated"), + m->strLocationFull.c_str(), tgtLoc.c_str()); + } + } + + /* + * Figure out the preferred merge direction. The current way is to + * get the current sizes of file based images and select the merge + * direction depending on the size. + * + * Can't use the VD API to get current size here as the media might + * be write locked by a running VM. Resort to RTFileQuerySize(). + */ + int vrc = VINF_SUCCESS; + uint64_t cbMediumThis = 0; + uint64_t cbMediumOther = 0; + + if (isMediumFormatFile() && pOther->isMediumFormatFile()) + { + vrc = RTFileQuerySize(this->getLocationFull().c_str(), &cbMediumThis); + if (RT_SUCCESS(vrc)) + { + vrc = RTFileQuerySize(pOther->getLocationFull().c_str(), + &cbMediumOther); + } + + if (RT_FAILURE(vrc)) + rc = E_FAIL; + else + { + /* + * Check which merge direction might be more optimal. + * This method is not bullet proof of course as there might + * be overlapping blocks in the images so the file size is + * not the best indicator but it is good enough for our purpose + * and everything else is too complicated, especially when the + * media are used by a running VM. + */ + bool fMergeIntoThis = cbMediumThis > cbMediumOther; + fMergeForward = fMergeIntoThis ^ fThisParent; + } + } + } + catch (HRESULT aRC) { rc = aRC; } + + return rc; +} + +/** * Prepares this (source) medium, target medium and all intermediate media * for the merge operation. * @@ -5534,7 +5661,12 @@ HRESULT Medium::queryInfo(bool fSetImageId, bool fSetParentId) alock.acquire(); vrc = VDSetUuid(hdd, 0, m->uuidImage.raw()); alock.release(); - ComAssertRCThrow(vrc, E_FAIL); + if (RT_FAILURE(vrc)) + { + lastAccessError = Utf8StrFmt(tr("Could not update the UUID of medium '%s'%s"), + location.c_str(), vdError(vrc).c_str()); + throw S_OK; + } mediumId = m->uuidImage; } if (fSetParentId) @@ -5542,7 +5674,12 @@ HRESULT Medium::queryInfo(bool fSetImageId, bool fSetParentId) alock.acquire(); vrc = VDSetParentUuid(hdd, 0, m->uuidParentImage.raw()); alock.release(); - ComAssertRCThrow(vrc, E_FAIL); + if (RT_FAILURE(vrc)) + { + lastAccessError = Utf8StrFmt(tr("Could not update the parent UUID of medium '%s'%s"), + location.c_str(), vdError(vrc).c_str()); + throw S_OK; + } } /* zap the information, these are no long-term members */ alock.acquire(); diff --git a/src/VBox/Main/src-server/ParallelPortImpl.cpp b/src/VBox/Main/src-server/ParallelPortImpl.cpp index 56743a089..e9ce1d0d7 100644 --- a/src/VBox/Main/src-server/ParallelPortImpl.cpp +++ b/src/VBox/Main/src-server/ParallelPortImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/Performance.cpp b/src/VBox/Main/src-server/Performance.cpp index 1ee789be6..b544f086f 100644 --- a/src/VBox/Main/src-server/Performance.cpp +++ b/src/VBox/Main/src-server/Performance.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -28,6 +28,8 @@ #include "AutoCaller.h" #endif #include "Performance.h" +#include "HostNetworkInterfaceImpl.h" +#include "netif.h" #include <VBox/com/array.h> #include <VBox/com/ptr.h> @@ -637,6 +639,12 @@ void HostCpuLoad::collect() } } +void HostCpuLoadRaw::init(ULONG period, ULONG length) +{ + HostCpuLoad::init(period, length); + mHAL->getRawHostCpuLoad(&mUserPrev, &mKernelPrev, &mIdlePrev); +} + void HostCpuLoadRaw::preCollect(CollectorHints& hints, uint64_t /* iTick */) { hints.collectHostCpuLoad(); @@ -677,12 +685,49 @@ void HostCpuLoadRaw::collect() } } +#ifndef VBOX_COLLECTOR_TEST_CASE +static bool getLinkSpeed(const char *szShortName, uint32_t *pSpeed) +{ + /* + * Note that we do not need the full name in the info, so we do not + * allocate the space for it and we rely on the fact that + * NetIfGetConfigByName() never fills it. + */ + NETIFINFO Info; + memset(&Info, 0, sizeof(Info)); + strcpy(Info.szShortName, szShortName); + int rc = NetIfGetConfigByName(&Info); + if (RT_FAILURE(rc)) + return false; + *pSpeed = Info.enmStatus == NETIF_S_UP ? Info.uSpeedMbits : 0; + return true; +} + +void HostNetworkSpeed::init(ULONG period, ULONG length) +{ + mPeriod = period; + mLength = length; + mLinkSpeed->init(length); + /* + * Retrieve the link speed now as it may be wrong if the metric was + * registered at boot (see @bugref{6613}). + */ + getLinkSpeed(mShortName.c_str(), &mSpeed); +} + void HostNetworkLoadRaw::init(ULONG period, ULONG length) { mPeriod = period; mLength = length; mRx->init(mLength); mTx->init(mLength); + /* + * Retrieve the link speed now as it may be wrong if the metric was + * registered at boot (see @bugref{6613}). + */ + uint32_t uSpeedMbit = 65535; + if (getLinkSpeed(mShortName.c_str(), &uSpeedMbit)) + mSpeed = (uint64_t)uSpeedMbit * (1000000/8); /* Convert to bytes/sec */ /*int rc =*/ mHAL->getRawHostNetworkLoad(mShortName.c_str(), &mRxPrev, &mTxPrev); //AssertRC(rc); } @@ -729,6 +774,7 @@ void HostNetworkLoadRaw::collect() LogFlowThisFunc(("Failed to collect data: %Rrc (%d)." " Will update the list of interfaces...\n", mRc,mRc)); } +#endif /* !VBOX_COLLECTOR_TEST_CASE */ void HostDiskLoadRaw::init(ULONG period, ULONG length) { diff --git a/src/VBox/Main/src-server/PerformanceImpl.cpp b/src/VBox/Main/src-server/PerformanceImpl.cpp index b233f0a7a..87ad1c4ca 100644 --- a/src/VBox/Main/src-server/PerformanceImpl.cpp +++ b/src/VBox/Main/src-server/PerformanceImpl.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/ProgressProxyImpl.cpp b/src/VBox/Main/src-server/ProgressProxyImpl.cpp index a6628760a..60750d6f8 100644 --- a/src/VBox/Main/src-server/ProgressProxyImpl.cpp +++ b/src/VBox/Main/src-server/ProgressProxyImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/SerialPortImpl.cpp b/src/VBox/Main/src-server/SerialPortImpl.cpp index 81234c490..5bbf4ba36 100644 --- a/src/VBox/Main/src-server/SerialPortImpl.cpp +++ b/src/VBox/Main/src-server/SerialPortImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/SnapshotImpl.cpp b/src/VBox/Main/src-server/SnapshotImpl.cpp index d8aa7a795..c45f7eb68 100644 --- a/src/VBox/Main/src-server/SnapshotImpl.cpp +++ b/src/VBox/Main/src-server/SnapshotImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2449,7 +2449,6 @@ void SessionMachine::deleteSnapshotHandler(DeleteSnapshotTask &aTask) // then do a backward merge, i.e. merge its only child onto the // base disk. Here we need then to update the attachment that // refers to the child and have it point to the parent instead - Assert(pHD->getParent().isNull()); Assert(pHD->getChildren().size() == 1); ComObjPtr<Medium> pReplaceHD = pHD->getChildren().front(); @@ -2887,9 +2886,30 @@ HRESULT SessionMachine::prepareDeleteSnapshotMedium(const ComObjPtr<Medium> &aHD } else { - /* forward merge */ - aSource = aHD; - aTarget = pChild; + /* Determine best merge direction. */ + bool fMergeForward = true; + + childLock.release(); + alock.release(); + HRESULT rc = aHD->queryPreferredMergeDirection(pChild, fMergeForward); + alock.acquire(); + childLock.acquire(); + + if (FAILED(rc) && rc != E_FAIL) + return rc; + + if (fMergeForward) + { + aSource = aHD; + aTarget = pChild; + LogFlowFunc(("Forward merging selected\n")); + } + else + { + aSource = pChild; + aTarget = aHD; + LogFlowFunc(("Backward merging selected\n")); + } } HRESULT rc; diff --git a/src/VBox/Main/src-server/StorageControllerImpl.cpp b/src/VBox/Main/src-server/StorageControllerImpl.cpp index 100c5b227..b56869330 100644 --- a/src/VBox/Main/src-server/StorageControllerImpl.cpp +++ b/src/VBox/Main/src-server/StorageControllerImpl.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp index 0c8046e96..b56f53e53 100644 --- a/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp +++ b/src/VBox/Main/src-server/USBDeviceFilterImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/VFSExplorerImpl.cpp b/src/VBox/Main/src-server/VFSExplorerImpl.cpp index e94b7225d..892e00bb5 100644 --- a/src/VBox/Main/src-server/VFSExplorerImpl.cpp +++ b/src/VBox/Main/src-server/VFSExplorerImpl.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/VRDEServerImpl.cpp b/src/VBox/Main/src-server/VRDEServerImpl.cpp index 5862545a4..0653b2c19 100644 --- a/src/VBox/Main/src-server/VRDEServerImpl.cpp +++ b/src/VBox/Main/src-server/VRDEServerImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -72,7 +72,7 @@ void VRDEServer::FinalRelease() * * @param aParent Handle of the parent object. */ -HRESULT VRDEServer::init (Machine *aParent) +HRESULT VRDEServer::init(Machine *aParent) { LogFlowThisFunc(("aParent=%p\n", aParent)); @@ -111,7 +111,7 @@ HRESULT VRDEServer::init (Machine *aParent) * * @note Locks @a aThat object for reading. */ -HRESULT VRDEServer::init (Machine *aParent, VRDEServer *aThat) +HRESULT VRDEServer::init(Machine *aParent, VRDEServer *aThat) { LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat)); @@ -124,11 +124,11 @@ HRESULT VRDEServer::init (Machine *aParent, VRDEServer *aThat) unconst(mParent) = aParent; unconst(mPeer) = aThat; - AutoCaller thatCaller (aThat); + AutoCaller thatCaller(aThat); AssertComRCReturnRC(thatCaller.rc()); AutoReadLock thatLock(aThat COMMA_LOCKVAL_SRC_POS); - mData.share (aThat->mData); + mData.share(aThat->mData); /* Confirm a successful initialization */ autoInitSpan.setSucceeded(); @@ -143,7 +143,7 @@ HRESULT VRDEServer::init (Machine *aParent, VRDEServer *aThat) * * @note Locks @a aThat object for reading. */ -HRESULT VRDEServer::initCopy (Machine *aParent, VRDEServer *aThat) +HRESULT VRDEServer::initCopy(Machine *aParent, VRDEServer *aThat) { LogFlowThisFunc(("aParent=%p, aThat=%p\n", aParent, aThat)); @@ -156,11 +156,11 @@ HRESULT VRDEServer::initCopy (Machine *aParent, VRDEServer *aThat) unconst(mParent) = aParent; /* mPeer is left null */ - AutoCaller thatCaller (aThat); + AutoCaller thatCaller(aThat); AssertComRCReturnRC(thatCaller.rc()); AutoReadLock thatLock(aThat COMMA_LOCKVAL_SRC_POS); - mData.attachCopy (aThat->mData); + mData.attachCopy(aThat->mData); /* Confirm a successful initialization */ autoInitSpan.setSucceeded(); @@ -245,7 +245,7 @@ HRESULT VRDEServer::saveSettings(settings::VRDESettings &data) // IVRDEServer properties ///////////////////////////////////////////////////////////////////////////// -STDMETHODIMP VRDEServer::COMGETTER(Enabled) (BOOL *aEnabled) +STDMETHODIMP VRDEServer::COMGETTER(Enabled)(BOOL *aEnabled) { CheckComArgOutPointerValid(aEnabled); @@ -257,13 +257,13 @@ STDMETHODIMP VRDEServer::COMGETTER(Enabled) (BOOL *aEnabled) return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(Enabled) (BOOL aEnabled) +STDMETHODIMP VRDEServer::COMSETTER(Enabled)(BOOL aEnabled) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); /* the machine can also be in saved state for this property to change */ - AutoMutableOrSavedStateDependency adep (mParent); + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -373,15 +373,15 @@ static int vrdpServerVerifyPortsString(Bstr ports) return VINF_SUCCESS; } -STDMETHODIMP VRDEServer::SetVRDEProperty (IN_BSTR aKey, IN_BSTR aValue) +STDMETHODIMP VRDEServer::SetVRDEProperty(IN_BSTR aKey, IN_BSTR aValue) { LogFlowThisFunc(("\n")); AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* The machine needs to be mutable. */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); Bstr key = aKey; @@ -460,7 +460,7 @@ STDMETHODIMP VRDEServer::SetVRDEProperty (IN_BSTR aKey, IN_BSTR aValue) return S_OK; } -STDMETHODIMP VRDEServer::GetVRDEProperty (IN_BSTR aKey, BSTR *aValue) +STDMETHODIMP VRDEServer::GetVRDEProperty(IN_BSTR aKey, BSTR *aValue) { CheckComArgOutPointerValid(aValue); @@ -627,7 +627,7 @@ STDMETHODIMP VRDEServer::COMGETTER(VRDEProperties)(ComSafeArrayOut(BSTR, aProper return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(AuthType) (AuthType_T *aType) +STDMETHODIMP VRDEServer::COMGETTER(AuthType)(AuthType_T *aType) { CheckComArgOutPointerValid(aType); @@ -641,13 +641,13 @@ STDMETHODIMP VRDEServer::COMGETTER(AuthType) (AuthType_T *aType) return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(AuthType) (AuthType_T aType) +STDMETHODIMP VRDEServer::COMSETTER(AuthType)(AuthType_T aType) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -670,7 +670,7 @@ STDMETHODIMP VRDEServer::COMSETTER(AuthType) (AuthType_T aType) return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(AuthTimeout) (ULONG *aTimeout) +STDMETHODIMP VRDEServer::COMGETTER(AuthTimeout)(ULONG *aTimeout) { CheckComArgOutPointerValid(aTimeout); @@ -684,13 +684,13 @@ STDMETHODIMP VRDEServer::COMGETTER(AuthTimeout) (ULONG *aTimeout) return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(AuthTimeout) (ULONG aTimeout) +STDMETHODIMP VRDEServer::COMSETTER(AuthTimeout)(ULONG aTimeout) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -717,7 +717,7 @@ STDMETHODIMP VRDEServer::COMSETTER(AuthTimeout) (ULONG aTimeout) return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(AuthLibrary) (BSTR *aLibrary) +STDMETHODIMP VRDEServer::COMGETTER(AuthLibrary)(BSTR *aLibrary) { CheckComArgOutPointerValid(aLibrary); @@ -748,13 +748,13 @@ STDMETHODIMP VRDEServer::COMGETTER(AuthLibrary) (BSTR *aLibrary) return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(AuthLibrary) (IN_BSTR aLibrary) +STDMETHODIMP VRDEServer::COMSETTER(AuthLibrary)(IN_BSTR aLibrary) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); Bstr bstrLibrary(aLibrary); @@ -779,8 +779,7 @@ STDMETHODIMP VRDEServer::COMSETTER(AuthLibrary) (IN_BSTR aLibrary) return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(AllowMultiConnection) ( - BOOL *aAllowMultiConnection) +STDMETHODIMP VRDEServer::COMGETTER(AllowMultiConnection)(BOOL *aAllowMultiConnection) { CheckComArgOutPointerValid(aAllowMultiConnection); @@ -794,14 +793,13 @@ STDMETHODIMP VRDEServer::COMGETTER(AllowMultiConnection) ( return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(AllowMultiConnection) ( - BOOL aAllowMultiConnection) +STDMETHODIMP VRDEServer::COMSETTER(AllowMultiConnection)(BOOL aAllowMultiConnection) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -824,8 +822,7 @@ STDMETHODIMP VRDEServer::COMSETTER(AllowMultiConnection) ( return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(ReuseSingleConnection) ( - BOOL *aReuseSingleConnection) +STDMETHODIMP VRDEServer::COMGETTER(ReuseSingleConnection)(BOOL *aReuseSingleConnection) { CheckComArgOutPointerValid(aReuseSingleConnection); @@ -839,14 +836,13 @@ STDMETHODIMP VRDEServer::COMGETTER(ReuseSingleConnection) ( return S_OK; } -STDMETHODIMP VRDEServer::COMSETTER(ReuseSingleConnection) ( - BOOL aReuseSingleConnection) +STDMETHODIMP VRDEServer::COMSETTER(ReuseSingleConnection)(BOOL aReuseSingleConnection) { AutoCaller autoCaller(this); if (FAILED(autoCaller.rc())) return autoCaller.rc(); - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); if (FAILED(adep.rc())) return adep.rc(); AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS); @@ -869,7 +865,7 @@ STDMETHODIMP VRDEServer::COMSETTER(ReuseSingleConnection) ( return S_OK; } -STDMETHODIMP VRDEServer::COMGETTER(VRDEExtPack) (BSTR *aExtPack) +STDMETHODIMP VRDEServer::COMGETTER(VRDEExtPack)(BSTR *aExtPack) { CheckComArgOutPointerValid(aExtPack); @@ -919,8 +915,8 @@ STDMETHODIMP VRDEServer::COMSETTER(VRDEExtPack)(IN_BSTR aExtPack) HRESULT hrc = autoCaller.rc(); if (SUCCEEDED(hrc)) { - /* the machine needs to be mutable */ - AutoMutableStateDependency adep(mParent); + /* the machine can also be in saved state for this property to change */ + AutoMutableOrSavedStateDependency adep(mParent); hrc = adep.rc(); if (SUCCEEDED(hrc)) { @@ -994,11 +990,11 @@ void VRDEServer::commit() { /* sanity */ AutoCaller autoCaller(this); - AssertComRCReturnVoid (autoCaller.rc()); + AssertComRCReturnVoid(autoCaller.rc()); /* sanity too */ - AutoCaller peerCaller (mPeer); - AssertComRCReturnVoid (peerCaller.rc()); + AutoCaller peerCaller(mPeer); + AssertComRCReturnVoid(peerCaller.rc()); /* lock both for writing since we modify both (mPeer is "master" so locked * first) */ @@ -1010,7 +1006,7 @@ void VRDEServer::commit() if (mPeer) { /* attach new data to the peer and reshare it */ - mPeer->mData.attach (mData); + mPeer->mData.attach(mData); } } } @@ -1019,17 +1015,17 @@ void VRDEServer::commit() * @note Locks this object for writing, together with the peer object * represented by @a aThat (locked for reading). */ -void VRDEServer::copyFrom (VRDEServer *aThat) +void VRDEServer::copyFrom(VRDEServer *aThat) { - AssertReturnVoid (aThat != NULL); + AssertReturnVoid(aThat != NULL); /* sanity */ AutoCaller autoCaller(this); - AssertComRCReturnVoid (autoCaller.rc()); + AssertComRCReturnVoid(autoCaller.rc()); /* sanity too */ - AutoCaller thatCaller (aThat); - AssertComRCReturnVoid (thatCaller.rc()); + AutoCaller thatCaller(aThat); + AssertComRCReturnVoid(thatCaller.rc()); /* peer is not modified, lock it for reading (aThat is "master" so locked * first) */ @@ -1037,6 +1033,6 @@ void VRDEServer::copyFrom (VRDEServer *aThat) AutoWriteLock wl(this COMMA_LOCKVAL_SRC_POS); /* this will back up current data */ - mData.assignCopy (aThat->mData); + mData.assignCopy(aThat->mData); } /* vi: set tabstop=4 shiftwidth=4 expandtab: */ diff --git a/src/VBox/Main/src-server/VirtualBoxImpl.cpp b/src/VBox/Main/src-server/VirtualBoxImpl.cpp index d90b0b0b2..9789a2bd0 100644 --- a/src/VBox/Main/src-server/VirtualBoxImpl.cpp +++ b/src/VBox/Main/src-server/VirtualBoxImpl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1514,13 +1514,13 @@ void sanitiseMachineFilename(Utf8Str &strName) * *nix, or be otherwise difficult for shells to handle (I would have * preferred to remove the space and brackets too). We also remove all * characters which need UTF-16 surrogate pairs for Windows's benefit. */ -#ifdef RT_STRICT RTUNICP aCpSet[] = { ' ', ' ', '(', ')', '-', '.', '0', '9', 'A', 'Z', 'a', 'z', '_', '_', 0xa0, 0xd7af, '\0' }; -#endif char *pszName = strName.mutableRaw(); - Assert(RTStrPurgeComplementSet(pszName, aCpSet, '_') >= 0); + int cReplacements = RTStrPurgeComplementSet(pszName, aCpSet, '_'); + Assert(cReplacements >= 0); + NOREF(cReplacements); /* No leading dot or dash. */ if (pszName[0] == '.' || pszName[0] == '-') pszName[0] = '_'; @@ -3877,6 +3877,48 @@ HRESULT VirtualBox::checkMediaForConflicts(const Guid &aId, } /** + * Checks whether the given UUID is already in use by one medium for the + * given device type. + * + * @returns true if the UUID is already in use + * fale otherwise + * @param aId The UUID to check. + * @param deviceType The device type the UUID is going to be checked for + * conflicts. + */ +bool VirtualBox::isMediaUuidInUse(const Guid &aId, DeviceType_T deviceType) +{ + AssertReturn(!aId.isEmpty(), E_FAIL); + + AutoReadLock alock(getMediaTreeLockHandle() COMMA_LOCKVAL_SRC_POS); + + HRESULT rc = S_OK; + bool fInUse = false; + + ComObjPtr<Medium> pMediumFound; + + switch (deviceType) + { + case DeviceType_HardDisk: + rc = findHardDiskById(aId, false /* aSetError */, &pMediumFound); + break; + case DeviceType_DVD: + rc = findDVDOrFloppyImage(DeviceType_DVD, &aId, Utf8Str::Empty, false /* aSetError */, &pMediumFound); + break; + case DeviceType_Floppy: + rc = findDVDOrFloppyImage(DeviceType_Floppy, &aId, Utf8Str::Empty, false /* aSetError */, &pMediumFound); + break; + default: + AssertMsgFailed(("Invalid device type %d\n", deviceType)); + } + + if (SUCCEEDED(rc) && pMediumFound) + fInUse = true; + + return fInUse; +} + +/** * Called from Machine::prepareSaveSettings() when it has detected * that a machine has been renamed. Such renames will require * updating the global media registry during the diff --git a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp index a83297e40..f9e9cdc5d 100644 --- a/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/HostPowerDarwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp index 99cf52e2f..1e40064d5 100644 --- a/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp +++ b/src/VBox/Main/src-server/darwin/NetIf-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp index f02581bb0..86f1cc678 100644 --- a/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp +++ b/src/VBox/Main/src-server/darwin/PerformanceDarwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -24,6 +24,7 @@ #include <sys/errno.h> #include <iprt/err.h> #include <iprt/log.h> +#include <iprt/mp.h> #include <iprt/param.h> #include "Performance.h" @@ -64,6 +65,7 @@ public: virtual int getProcessMemoryUsage(RTPROCESS process, ULONG *used); private: ULONG totalRAM; + uint32_t nCpus; }; CollectorHAL *createHAL() @@ -86,6 +88,13 @@ CollectorDarwin::CollectorDarwin() hostMemory = 0; } totalRAM = (ULONG)(hostMemory / 1024); + nCpus = RTMpGetOnlineCount(); + Assert(nCpus); + if (nCpus == 0) + { + /* It is rather unsual to have no CPUs, but the show must go on. */ + nCpus = 1; + } } int CollectorDarwin::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64_t *idle) @@ -156,8 +165,12 @@ int CollectorDarwin::getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, uin int rc = getProcessInfo(process, &tinfo); if (RT_SUCCESS(rc)) { - *user = tinfo.pti_total_user; - *kernel = tinfo.pti_total_system; + /* + * Adjust user and kernel values so 100% is when ALL cores are fully + * utilized (see @bugref{6345}). + */ + *user = tinfo.pti_total_user / nCpus; + *kernel = tinfo.pti_total_system / nCpus; *total = mach_absolute_time(); } return rc; diff --git a/src/VBox/Main/src-server/darwin/iokit.cpp b/src/VBox/Main/src-server/darwin/iokit.cpp index 0045e7c0b..cbf32fc62 100644 --- a/src/VBox/Main/src-server/darwin/iokit.cpp +++ b/src/VBox/Main/src-server/darwin/iokit.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/darwin/iokit.h b/src/VBox/Main/src-server/darwin/iokit.h index 8cb80a52f..ff81b3c78 100644 --- a/src/VBox/Main/src-server/darwin/iokit.h +++ b/src/VBox/Main/src-server/darwin/iokit.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp index b654f5a63..f2e93bebf 100644 --- a/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/HostHardwareFreeBSD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp index 7066dab96..91895460b 100644 --- a/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp +++ b/src/VBox/Main/src-server/freebsd/NetIf-freebsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp b/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp index 0b8178423..77ec3169b 100644 --- a/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp +++ b/src/VBox/Main/src-server/freebsd/PerformanceFreeBSD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp b/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp index 923e75fea..fe33bcf43 100644 --- a/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp +++ b/src/VBox/Main/src-server/generic/AutostartDb-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/generic/NetIf-generic.cpp b/src/VBox/Main/src-server/generic/NetIf-generic.cpp index fdf72d6fc..9fc3b6b8d 100644 --- a/src/VBox/Main/src-server/generic/NetIf-generic.cpp +++ b/src/VBox/Main/src-server/generic/NetIf-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp b/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp index 2dc722cce..c1d4995fa 100644 --- a/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp +++ b/src/VBox/Main/src-server/linux/HostHardwareLinux.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/linux/NetIf-linux.cpp b/src/VBox/Main/src-server/linux/NetIf-linux.cpp index e6dbc3f97..79f85d20d 100644 --- a/src/VBox/Main/src-server/linux/NetIf-linux.cpp +++ b/src/VBox/Main/src-server/linux/NetIf-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp index 63116c149..4eff670c3 100644 --- a/src/VBox/Main/src-server/linux/PerformanceLinux.cpp +++ b/src/VBox/Main/src-server/linux/PerformanceLinux.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/linux/USBGetDevices.cpp b/src/VBox/Main/src-server/linux/USBGetDevices.cpp index d824a0178..964d86cc8 100644 --- a/src/VBox/Main/src-server/linux/USBGetDevices.cpp +++ b/src/VBox/Main/src-server/linux/USBGetDevices.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/linux/vbox-libhal.cpp b/src/VBox/Main/src-server/linux/vbox-libhal.cpp index 2e7c2716e..ade8f072b 100644 --- a/src/VBox/Main/src-server/linux/vbox-libhal.cpp +++ b/src/VBox/Main/src-server/linux/vbox-libhal.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/os2/NetIf-os2.cpp b/src/VBox/Main/src-server/os2/NetIf-os2.cpp index d0c287b52..49fd9c1df 100644 --- a/src/VBox/Main/src-server/os2/NetIf-os2.cpp +++ b/src/VBox/Main/src-server/os2/NetIf-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/os2/PerformanceOs2.cpp b/src/VBox/Main/src-server/os2/PerformanceOs2.cpp index 19e804a93..27c812536 100644 --- a/src/VBox/Main/src-server/os2/PerformanceOs2.cpp +++ b/src/VBox/Main/src-server/os2/PerformanceOs2.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp index 4bd864f16..a38b7654d 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h index 4fc35b8ac..e306dac0e 100644 --- a/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h +++ b/src/VBox/Main/src-server/solaris/DynLoadLibSolaris.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp index bc7008206..5b1574d7e 100644 --- a/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp +++ b/src/VBox/Main/src-server/solaris/NetIf-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -73,10 +73,10 @@ static uint32_t getInstance(const char *pszIfaceName, char *pszDevName) return uInstance; } -static uint64_t kstatGet(const char *name) +static uint32_t kstatGet(const char *name) { kstat_ctl_t *kc; - uint64_t uSpeed = 0; + uint32_t uSpeed = 0; if ((kc = kstat_open()) == 0) { @@ -103,15 +103,21 @@ static uint64_t kstatGet(const char *name) if ((kn = (kstat_named_t *)kstat_data_lookup(ksAdapter, (char *)"ifspeed")) == 0) LogRel(("kstat_data_lookup(ifspeed) -> %d, name=%s\n", errno, name)); else - uSpeed = kn->value.ul; + uSpeed = kn->value.ul / 1000000; /* bits -> Mbits */ } kstat_close(kc); + LogFlow(("kstatGet(%s) -> %u Mbit/s\n", name, uSpeed)); return uSpeed; } static void queryIfaceSpeed(PNETIFINFO pInfo) { - pInfo->uSpeedMbits = kstatGet(pInfo->szShortName) / 1000000; /* bits -> Mbits */ + /* Don't query interface speed for inactive interfaces (see @bugref{6345}). */ + if (pInfo->enmStatus == NETIF_S_UP) + pInfo->uSpeedMbits = kstatGet(pInfo->szShortName); + else + pInfo->uSpeedMbits = 0; + LogFlow(("queryIfaceSpeed(%s) -> %u\n", pInfo->szShortName, pInfo->uSpeedMbits)); } static void vboxSolarisAddHostIface(char *pszIface, int Instance, void *pvHostNetworkInterfaceList) diff --git a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp index 6b66393cc..82defd768 100644 --- a/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp +++ b/src/VBox/Main/src-server/solaris/PerformanceSolaris.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -99,6 +99,7 @@ private: PFNZPOOLVDEVNAME mZpoolVdevName; FsMap mFsMap; + uint32_t mCpus; }; CollectorHAL *createHAL() @@ -113,7 +114,8 @@ CollectorSolaris::CollectorSolaris() : mKC(0), mSysPages(0), mZFSCache(0), - mZfsLib(0) + mZfsLib(0), + mCpus(0) { if ((mKC = kstat_open()) == 0) { @@ -154,6 +156,7 @@ CollectorSolaris::CollectorSolaris() } updateFilesystemMap(); + /* Notice that mCpus member will be initialized by HostCpuLoadRaw::init() */ } CollectorSolaris::~CollectorSolaris() @@ -195,6 +198,8 @@ int CollectorSolaris::getRawHostCpuLoad(uint64_t *user, uint64_t *kernel, uint64 Log(("no cpu stats found!\n")); return VERR_INTERNAL_ERROR; } + else + mCpus = cpus; if (user) *user = tmpUser; if (kernel) *kernel = tmpKernel; @@ -220,8 +225,18 @@ int CollectorSolaris::getRawProcessCpuLoad(RTPROCESS process, uint64_t *user, ui { //Assert((pid_t)process == pstatus.pr_pid); //Log(("user=%u kernel=%u total=%u\n", prusage.pr_utime.tv_sec, prusage.pr_stime.tv_sec, prusage.pr_tstamp.tv_sec)); - *user = (uint64_t)prusage.pr_utime.tv_sec * 1000000000 + prusage.pr_utime.tv_nsec; - *kernel = (uint64_t)prusage.pr_stime.tv_sec * 1000000000 + prusage.pr_stime.tv_nsec; + /* + * The CPU time spent must be adjusted by the number of cores for compatibility with + * other platforms (see @bugref{6345}). + */ + Assert(mCpus); + if (mCpus) + { + *user = ((uint64_t)prusage.pr_utime.tv_sec * 1000000000 + prusage.pr_utime.tv_nsec) / mCpus; + *kernel = ((uint64_t)prusage.pr_stime.tv_sec * 1000000000 + prusage.pr_stime.tv_nsec) / mCpus; + } + else + *user = *kernel = 0; *total = (uint64_t)prusage.pr_tstamp.tv_sec * 1000000000 + prusage.pr_tstamp.tv_nsec; //Log(("user=%llu kernel=%llu total=%llu\n", *user, *kernel, *total)); } diff --git a/src/VBox/Main/src-server/win/HostPowerWin.cpp b/src/VBox/Main/src-server/win/HostPowerWin.cpp index ae806fd75..da314d848 100644 --- a/src/VBox/Main/src-server/win/HostPowerWin.cpp +++ b/src/VBox/Main/src-server/win/HostPowerWin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/win/NetIf-win.cpp b/src/VBox/Main/src-server/win/NetIf-win.cpp index cce820da1..87fb021ff 100644 --- a/src/VBox/Main/src-server/win/NetIf-win.cpp +++ b/src/VBox/Main/src-server/win/NetIf-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/win/PerformanceWin.cpp b/src/VBox/Main/src-server/win/PerformanceWin.cpp index 2fc96b5d8..a50b2a57c 100644 --- a/src/VBox/Main/src-server/win/PerformanceWin.cpp +++ b/src/VBox/Main/src-server/win/PerformanceWin.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/win/svchlp.cpp b/src/VBox/Main/src-server/win/svchlp.cpp index 2191f3faa..a3c07ff6d 100644 --- a/src/VBox/Main/src-server/win/svchlp.cpp +++ b/src/VBox/Main/src-server/win/svchlp.cpp @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/win/svchlp.h b/src/VBox/Main/src-server/win/svchlp.h index 0e8b8b800..a5df8dba7 100644 --- a/src/VBox/Main/src-server/win/svchlp.h +++ b/src/VBox/Main/src-server/win/svchlp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/src-server/xpcom/server.h b/src/VBox/Main/src-server/xpcom/server.h index f14977af9..4fbaa2316 100644 --- a/src/VBox/Main/src-server/xpcom/server.h +++ b/src/VBox/Main/src-server/xpcom/server.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/makefile.tstVBoxAPILinux b/src/VBox/Main/testcase/makefile.tstVBoxAPILinux index 4239d50e5..c4d89cf29 100644 --- a/src/VBox/Main/testcase/makefile.tstVBoxAPILinux +++ b/src/VBox/Main/testcase/makefile.tstVBoxAPILinux @@ -2,7 +2,7 @@ # tstVBoxAPILinux makefile # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/tstCollector.cpp b/src/VBox/Main/testcase/tstCollector.cpp index 81525ec9e..227003824 100644 --- a/src/VBox/Main/testcase/tstCollector.cpp +++ b/src/VBox/Main/testcase/tstCollector.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp b/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp index 64dda8543..93019a8cb 100644 --- a/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp +++ b/src/VBox/Main/testcase/tstGuestCtrlParseBuffer.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/tstOVF.cpp b/src/VBox/Main/testcase/tstOVF.cpp index 9265b1e83..590a019ff 100644 --- a/src/VBox/Main/testcase/tstOVF.cpp +++ b/src/VBox/Main/testcase/tstOVF.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/tstUSBLinux.h b/src/VBox/Main/testcase/tstUSBLinux.h index 5a9491a4c..e5e0eb56c 100644 --- a/src/VBox/Main/testcase/tstUSBLinux.h +++ b/src/VBox/Main/testcase/tstUSBLinux.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/testcase/tstVBoxAPIWin.cpp b/src/VBox/Main/testcase/tstVBoxAPIWin.cpp index d3c0839c0..6211e4284 100644 --- a/src/VBox/Main/testcase/tstVBoxAPIWin.cpp +++ b/src/VBox/Main/testcase/tstVBoxAPIWin.cpp @@ -12,7 +12,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/platform-xidl.xsl b/src/VBox/Main/webservice/platform-xidl.xsl index 48dce42a7..066a5fe9c 100644 --- a/src/VBox/Main/webservice/platform-xidl.xsl +++ b/src/VBox/Main/webservice/platform-xidl.xsl @@ -8,7 +8,7 @@ is identical to the original except that all <if...> sections are resolved (for easier processing). - Copyright (C) 2006-2011 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/samples/java/jax-ws/Makefile b/src/VBox/Main/webservice/samples/java/jax-ws/Makefile index fd8d79217..97cbb6edb 100644 --- a/src/VBox/Main/webservice/samples/java/jax-ws/Makefile +++ b/src/VBox/Main/webservice/samples/java/jax-ws/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/samples/java/jax-ws/Makefile.glue b/src/VBox/Main/webservice/samples/java/jax-ws/Makefile.glue index c7aea553b..2a9f95bc0 100644 --- a/src/VBox/Main/webservice/samples/java/jax-ws/Makefile.glue +++ b/src/VBox/Main/webservice/samples/java/jax-ws/Makefile.glue @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/samples/python/Makefile b/src/VBox/Main/webservice/samples/python/Makefile index 7aa5cb3bb..5e8a15bb0 100644 --- a/src/VBox/Main/webservice/samples/python/Makefile +++ b/src/VBox/Main/webservice/samples/python/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/samples/python/Makefile.glue b/src/VBox/Main/webservice/samples/python/Makefile.glue index 8465ca7b9..102d5fb42 100644 --- a/src/VBox/Main/webservice/samples/python/Makefile.glue +++ b/src/VBox/Main/webservice/samples/python/Makefile.glue @@ -1,5 +1,5 @@ # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/split-soapC.cpp b/src/VBox/Main/webservice/split-soapC.cpp index 10f5ee1b9..d491235b1 100644 --- a/src/VBox/Main/webservice/split-soapC.cpp +++ b/src/VBox/Main/webservice/split-soapC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/vboxweb.h b/src/VBox/Main/webservice/vboxweb.h index 0309c3932..1b9da99d3 100644 --- a/src/VBox/Main/webservice/vboxweb.h +++ b/src/VBox/Main/webservice/vboxweb.h @@ -2,7 +2,7 @@ * vboxweb.h: * header file for "real" web server code. * - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-nsmap.xsl b/src/VBox/Main/webservice/websrv-nsmap.xsl index d9524ea0d..78e6a1ff7 100644 --- a/src/VBox/Main/webservice/websrv-nsmap.xsl +++ b/src/VBox/Main/webservice/websrv-nsmap.xsl @@ -9,7 +9,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-php.xsl b/src/VBox/Main/webservice/websrv-php.xsl index 287735028..6c1d5bb27 100644 --- a/src/VBox/Main/webservice/websrv-php.xsl +++ b/src/VBox/Main/webservice/websrv-php.xsl @@ -11,7 +11,7 @@ Contributed by James Lucas (mjlucas at eng.uts.edu.au). - Copyright (C) 2008-2010 Oracle Corporation + Copyright (C) 2008-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-python.xsl b/src/VBox/Main/webservice/websrv-python.xsl index d1dcff79d..ac6363e5d 100644 --- a/src/VBox/Main/webservice/websrv-python.xsl +++ b/src/VBox/Main/webservice/websrv-python.xsl @@ -9,7 +9,7 @@ VirtualBox.xidl. This Python file represents our web service API. Depends on WSDL file for actual SOAP bindings. - Copyright (C) 2008-2010 Oracle Corporation + Copyright (C) 2008-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-shared.inc.xsl b/src/VBox/Main/webservice/websrv-shared.inc.xsl index b31eb72c1..11b38b2c3 100644 --- a/src/VBox/Main/webservice/websrv-shared.inc.xsl +++ b/src/VBox/Main/webservice/websrv-shared.inc.xsl @@ -6,7 +6,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-typemap.xsl b/src/VBox/Main/webservice/websrv-typemap.xsl index 97efefa1e..9839ab2d3 100644 --- a/src/VBox/Main/webservice/websrv-typemap.xsl +++ b/src/VBox/Main/webservice/websrv-typemap.xsl @@ -8,7 +8,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-wsdl-service.xsl b/src/VBox/Main/webservice/websrv-wsdl-service.xsl index e9d6e66c0..042c596dc 100644 --- a/src/VBox/Main/webservice/websrv-wsdl-service.xsl +++ b/src/VBox/Main/webservice/websrv-wsdl-service.xsl @@ -9,7 +9,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-wsdl.xsl b/src/VBox/Main/webservice/websrv-wsdl.xsl index 2791c3b86..bc9d7eb9e 100644 --- a/src/VBox/Main/webservice/websrv-wsdl.xsl +++ b/src/VBox/Main/webservice/websrv-wsdl.xsl @@ -9,7 +9,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/webservice/websrv-wsdl2gsoapH.xsl b/src/VBox/Main/webservice/websrv-wsdl2gsoapH.xsl index d40ba83c7..cc701a8e3 100644 --- a/src/VBox/Main/webservice/websrv-wsdl2gsoapH.xsl +++ b/src/VBox/Main/webservice/websrv-wsdl2gsoapH.xsl @@ -9,7 +9,7 @@ See webservice/Makefile.kmk for an overview of all the things generated for the webservice. - Copyright (C) 2006-2010 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/SchemaDefs.xsl b/src/VBox/Main/xml/SchemaDefs.xsl index 3d91dea85..56b121e71 100644 --- a/src/VBox/Main/xml/SchemaDefs.xsl +++ b/src/VBox/Main/xml/SchemaDefs.xsl @@ -8,7 +8,7 @@ * This template depends on XML Schema structure (type names and constraints) * and should be reviewed on every Schema change. - Copyright (C) 2006-2011 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp index 8cb1e1269..97375c6e0 100644 --- a/src/VBox/Main/xml/Settings.cpp +++ b/src/VBox/Main/xml/Settings.cpp @@ -54,7 +54,7 @@ */ /* - * Copyright (C) 2007-2012 Oracle Corporation + * Copyright (C) 2007-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1614,6 +1614,7 @@ Hardware::Hardware() pointingHIDType(PointingHIDType_PS2Mouse), keyboardHIDType(KeyboardHIDType_PS2Keyboard), chipsetType(ChipsetType_PIIX3), + fEmulatedUSBWebcam(false), fEmulatedUSBCardReader(false), clipboardMode(ClipboardMode_Disabled), dragAndDropMode(DragAndDropMode_Disabled), @@ -1682,6 +1683,7 @@ bool Hardware::operator==(const Hardware& h) const && (pointingHIDType == h.pointingHIDType) && (keyboardHIDType == h.keyboardHIDType) && (chipsetType == h.chipsetType) + && (fEmulatedUSBWebcam == h.fEmulatedUSBWebcam) && (fEmulatedUSBCardReader == h.fEmulatedUSBCardReader) && (vrdeSettings == h.vrdeSettings) && (biosSettings == h.biosSettings) @@ -2870,12 +2872,17 @@ void MachineConfigFile::readHardware(const xml::ElementNode &elmHardware, } else if (pelmHwChild->nameEquals("EmulatedUSB")) { - const xml::ElementNode *pelmCardReader; + const xml::ElementNode *pelmCardReader, *pelmWebcam; if ((pelmCardReader = pelmHwChild->findChildElement("CardReader"))) { pelmCardReader->getAttributeValue("enabled", hw.fEmulatedUSBCardReader); } + + if ((pelmWebcam = pelmHwChild->findChildElement("Webcam"))) + { + pelmWebcam->getAttributeValue("enabled", hw.fEmulatedUSBWebcam); + } } } @@ -4181,9 +4188,15 @@ void MachineConfigFile::buildHardwareXML(xml::ElementNode &elmParent, if (m->sv >= SettingsVersion_v1_12) { xml::ElementNode *pelmEmulatedUSB = pelmHardware->createChild("EmulatedUSB"); - xml::ElementNode *pelmCardReader = pelmEmulatedUSB->createChild("CardReader"); + xml::ElementNode *pelmCardReader = pelmEmulatedUSB->createChild("CardReader"); pelmCardReader->setAttribute("enabled", hw.fEmulatedUSBCardReader); + + if (m->sv >= SettingsVersion_v1_13) + { + xml::ElementNode *pelmWebcam = pelmEmulatedUSB->createChild("Webcam"); + pelmWebcam->setAttribute("enabled", hw.fEmulatedUSBWebcam); + } } xml::ElementNode *pelmGuest = pelmHardware->createChild("Guest"); @@ -4870,6 +4883,13 @@ void MachineConfigFile::bumpSettingsVersionIfNeeded() } } + if (m->sv < SettingsVersion_v1_13) + { + /* 4.2: Emulated USB Webcam. */ + if (hardwareMachine.fEmulatedUSBWebcam) + m->sv = SettingsVersion_v1_13; + } + if (m->sv < SettingsVersion_v1_12) { // 4.1: Emulated USB devices. diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl index 9a31a4ccc..604370816 100644 --- a/src/VBox/Main/xml/SettingsConverter.xsl +++ b/src/VBox/Main/xml/SettingsConverter.xsl @@ -6,7 +6,7 @@ * * Template to convert old VirtualBox settings files to the most recent format. - Copyright (C) 2006-2009 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd b/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd index d874c9c97..f650cb18d 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-freebsd.xsd @@ -5,7 +5,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-freebsd - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-linux.xsd b/src/VBox/Main/xml/VirtualBox-settings-linux.xsd index 461521eb6..683509774 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-linux.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-linux.xsd @@ -5,7 +5,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-linux - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd b/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd index 1d2efa760..914dde41b 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-macosx.xsd @@ -5,7 +5,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-macosx - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-os2.xsd b/src/VBox/Main/xml/VirtualBox-settings-os2.xsd index 771a97385..7d19fa731 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-os2.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-os2.xsd @@ -6,7 +6,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-os2 * - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd b/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd index 6e504e5a2..a68c7bd8b 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-solaris.xsd @@ -5,7 +5,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-solaris - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/VirtualBox-settings-windows.xsd b/src/VBox/Main/xml/VirtualBox-settings-windows.xsd index 8bdae19ef..aae1352e4 100644 --- a/src/VBox/Main/xml/VirtualBox-settings-windows.xsd +++ b/src/VBox/Main/xml/VirtualBox-settings-windows.xsd @@ -5,7 +5,7 @@ * * Oracle VM VirtualBox Settings Schema Version 1.0-windows - Copyright (C) 2004-2010 Oracle Corporation + Copyright (C) 2004-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Main/xml/ovfreader.cpp b/src/VBox/Main/xml/ovfreader.cpp index 3d2455700..71e553936 100644 --- a/src/VBox/Main/xml/ovfreader.cpp +++ b/src/VBox/Main/xml/ovfreader.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp index 2ea54b665..1a028946a 100644 --- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp +++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCP.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp index 7d0e1bef3..3142bbd7f 100644 --- a/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp +++ b/src/VBox/NetworkServices/DHCP/VBoxNetDHCPHardened.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp b/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp index d031777c8..72764a16e 100644 --- a/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp +++ b/src/VBox/NetworkServices/NAT/VBoxNetNAT.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp index b0d74e735..8ff8ef58b 100644 --- a/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp +++ b/src/VBox/NetworkServices/NAT/VBoxNetNATHardened.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp index ec5ed275f..8611e158a 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetARP.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h index eab9a5152..02ef1661b 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h +++ b/src/VBox/NetworkServices/NetLib/VBoxNetBaseService.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp index 74a3998a4..f9f7388f6 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetIntIf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h index e1150bfb1..2f7f699d8 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetLib.h +++ b/src/VBox/NetworkServices/NetLib/VBoxNetLib.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp index 79c40c277..9501a6744 100644 --- a/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp +++ b/src/VBox/NetworkServices/NetLib/VBoxNetUDP.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/RDP/client/vrdp/rdpusb.c b/src/VBox/RDP/client/vrdp/rdpusb.c index 028af77d1..013a579bb 100644 --- a/src/VBox/RDP/client/vrdp/rdpusb.c +++ b/src/VBox/RDP/client/vrdp/rdpusb.c @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/RDP/client/vrdp/vrdpusb.h b/src/VBox/RDP/client/vrdp/vrdpusb.h index c1a9ba049..f8469706c 100644 --- a/src/VBox/RDP/client/vrdp/vrdpusb.h +++ b/src/VBox/RDP/client/vrdp/vrdpusb.h @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/.scm-settings b/src/VBox/Runtime/.scm-settings index cc03358c1..84ef39a92 100644 --- a/src/VBox/Runtime/.scm-settings +++ b/src/VBox/Runtime/.scm-settings @@ -4,7 +4,7 @@ # # -# Copyright (C) 2010 Oracle Corporation +# Copyright (C) 2010-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/Makefile.kmk b/src/VBox/Runtime/Makefile.kmk index fb0c5e1fc..d8e5c0f9d 100644 --- a/src/VBox/Runtime/Makefile.kmk +++ b/src/VBox/Runtime/Makefile.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2012 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -179,6 +179,7 @@ RuntimeWin64ASM_SOURCES = \ win/amd64/ASMGetDR7.asm \ common/asm/ASMAtomicCmpXchgU8.asm \ common/asm/ASMMultU64ByU32DivByU32.asm \ + common/asm/ASMCpuId_Idx_ECX.asm \ common/asm/ASMNopPause.asm # @@ -186,7 +187,8 @@ RuntimeWin64ASM_SOURCES = \ # RuntimeWin32ASM_SOURCES = \ common/asm/ASMAtomicCmpXchgU8.asm \ - common/asm/ASMMultU64ByU32DivByU32.asm + common/asm/ASMMultU64ByU32DivByU32.asm \ + common/asm/ASMCpuId_Idx_ECX.asm # # NoCRT sources (minus math stuff). @@ -343,6 +345,7 @@ RuntimeR3_SOURCES = \ common/path/RTPathAbsExDup.cpp \ common/path/RTPathAppend.cpp \ common/path/RTPathAppendEx.cpp \ + common/path/RTPathCalcRelative.cpp \ common/path/RTPathChangeToDosSlashes.cpp \ common/path/RTPathChangeToUnixSlashes.cpp \ common/path/RTPathCopyComponents.cpp \ diff --git a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp index a0d6476e9..d6712e293 100644 --- a/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp +++ b/src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/VBox/VBoxRTImp.def b/src/VBox/Runtime/VBox/VBoxRTImp.def index 70637b438..80b330c30 100644 --- a/src/VBox/Runtime/VBox/VBoxRTImp.def +++ b/src/VBox/Runtime/VBox/VBoxRTImp.def @@ -3,7 +3,7 @@ ; VirtualBox Runtime DLL - Stable Interface Definition file. ; -; Copyright (C) 2010 Oracle Corporation +; Copyright (C) 2010-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/VBox/dbus.cpp b/src/VBox/Runtime/VBox/dbus.cpp index 1e8ce8442..70e6374e2 100644 --- a/src/VBox/Runtime/VBox/dbus.cpp +++ b/src/VBox/Runtime/VBox/dbus.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl index 718545218..03dea8bf4 100644 --- a/src/VBox/Runtime/VBox/errmsgvboxcom.xsl +++ b/src/VBox/Runtime/VBox/errmsgvboxcom.xsl @@ -6,7 +6,7 @@ * %Rhrc format specifier) as they are defined in the VirtualBox interface * definition file (src/VBox/Main/idl/VirtualBox.xidl). - Copyright (C) 2006-2008 Oracle Corporation + Copyright (C) 2006-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/VBox/log-vbox.cpp b/src/VBox/Runtime/VBox/log-vbox.cpp index 4403648d1..f27c4cbbd 100644 --- a/src/VBox/Runtime/VBox/log-vbox.cpp +++ b/src/VBox/Runtime/VBox/log-vbox.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/VBox/logbackdoor.cpp b/src/VBox/Runtime/VBox/logbackdoor.cpp index 99d4485db..956d8a49b 100644 --- a/src/VBox/Runtime/VBox/logbackdoor.cpp +++ b/src/VBox/Runtime/VBox/logbackdoor.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/alloc/alloc.cpp b/src/VBox/Runtime/common/alloc/alloc.cpp index 585a22f67..d47094466 100644 --- a/src/VBox/Runtime/common/alloc/alloc.cpp +++ b/src/VBox/Runtime/common/alloc/alloc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/alloc/heapoffset.cpp b/src/VBox/Runtime/common/alloc/heapoffset.cpp index 2cd8697a9..f593b66f0 100644 --- a/src/VBox/Runtime/common/alloc/heapoffset.cpp +++ b/src/VBox/Runtime/common/alloc/heapoffset.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/alloc/heapsimple.cpp b/src/VBox/Runtime/common/alloc/heapsimple.cpp index 7e680132d..015be0435 100644 --- a/src/VBox/Runtime/common/alloc/heapsimple.cpp +++ b/src/VBox/Runtime/common/alloc/heapsimple.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/alloc/memcache.cpp b/src/VBox/Runtime/common/alloc/memcache.cpp index 57282102d..4a9cb8235 100644 --- a/src/VBox/Runtime/common/alloc/memcache.cpp +++ b/src/VBox/Runtime/common/alloc/memcache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm index 0c57b29d3..55c92c8da 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicCmpXchgU8.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm index 60d01e32a..c7e86e8a3 100644 --- a/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm +++ b/src/VBox/Runtime/common/asm/ASMAtomicReadU64.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm b/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm new file mode 100644 index 000000000..ca7f1fbb0 --- /dev/null +++ b/src/VBox/Runtime/common/asm/ASMCpuId_Idx_ECX.asm @@ -0,0 +1,116 @@ +; $Id: ASMCpuId_Idx_ECX.asm $ +;; @file +; IPRT - ASMCpuId_Idx_ECX(). +; + +; +; Copyright (C) 2012-2013 Oracle Corporation +; +; 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. +; +; 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. +; + +;******************************************************************************* +;* Header Files * +;******************************************************************************* +%include "iprt/asmdefs.mac" + +BEGINCODE + +;; +; CPUID with EAX and ECX inputs, returning ALL output registers. +; +; @param uOperator x86:ebp+8 gcc:rdi msc:rcx +; @param uIdxECX x86:ebp+c gcc:rsi msc:rdx +; @param pvEAX x86:ebp+10 gcc:rcx msc:r8 +; @param pvEBX x86:ebp+14 gcc:rdx msc:r9 +; @param pvECX x86:ebp+18 gcc:r8 msc:rsp+28h +; @param pvEDX x86:ebp+1c gcc:r9 msc:rsp+30h +; +; @returns void +; +BEGINPROC_EXPORTED ASMCpuId_Idx_ECX +%ifdef RT_ARCH_AMD64 + mov r10, rbx + + %ifdef ASM_CALL64_MSC + + mov eax, ecx + mov ecx, edx + xor ebx, ebx + xor edx, edx + + cpuid + + mov [r8], eax + mov [r9], ebx + mov rax, [rsp + 28h] + mov rbx, [rsp + 30h] + mov [rax], ecx + mov [rbx], edx + + %else + mov eax, edi + xchg rcx, rsi + mov ecx, ecx ; paranoia: clear upper bits + mov r11, rdx + xor ebx, ebx + xor edx, edx + + cpuid + + mov [rsi], eax + mov [r11], ebx + mov [r8], ecx + mov [r9], edx + + %endif + + mov rbx, r10 + ret + +%elifdef RT_ARCH_X86 + push ebp + mov ebp, esp + push ebx + push edi + + xor edx, edx + xor ebx, ebx + mov eax, [ebp + 08h] + mov ecx, [ebp + 0ch] + + cpuid + + mov edi, [ebp + 10h] + mov [edi], eax + mov edi, [ebp + 14h] + mov [edi], ebx + mov edi, [ebp + 18h] + mov [edi], ecx + mov edi, [ebp + 1ch] + mov [edi], edx + + pop edi + pop ebx + leave + ret +%else + %error unsupported arch +%endif +ENDPROC ASMCpuId_Idx_ECX + diff --git a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm index 6155e869a..4308631a2 100644 --- a/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm +++ b/src/VBox/Runtime/common/asm/ASMMultU64ByU32DivByU32.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/asm/ASMNopPause.asm b/src/VBox/Runtime/common/asm/ASMNopPause.asm index 455bd14d0..8447a87f6 100644 --- a/src/VBox/Runtime/common/asm/ASMNopPause.asm +++ b/src/VBox/Runtime/common/asm/ASMNopPause.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2009 Oracle Corporation +; Copyright (C) 2009-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/asm/asm-fake.cpp b/src/VBox/Runtime/common/asm/asm-fake.cpp index c2edb702f..b737ffe3d 100644 --- a/src/VBox/Runtime/common/asm/asm-fake.cpp +++ b/src/VBox/Runtime/common/asm/asm-fake.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/adler32.cpp b/src/VBox/Runtime/common/checksum/adler32.cpp index d9e54985b..5ab8a55fc 100644 --- a/src/VBox/Runtime/common/checksum/adler32.cpp +++ b/src/VBox/Runtime/common/checksum/adler32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp index 650a959b2..0ba474b30 100644 --- a/src/VBox/Runtime/common/checksum/crc32-zlib.cpp +++ b/src/VBox/Runtime/common/checksum/crc32-zlib.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/crc32.cpp b/src/VBox/Runtime/common/checksum/crc32.cpp index c43b2cbbd..0ea4f0924 100644 --- a/src/VBox/Runtime/common/checksum/crc32.cpp +++ b/src/VBox/Runtime/common/checksum/crc32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/crc64.cpp b/src/VBox/Runtime/common/checksum/crc64.cpp index 74c60070d..0904031f0 100644 --- a/src/VBox/Runtime/common/checksum/crc64.cpp +++ b/src/VBox/Runtime/common/checksum/crc64.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/ipv4.cpp b/src/VBox/Runtime/common/checksum/ipv4.cpp index c757be218..0200e7443 100644 --- a/src/VBox/Runtime/common/checksum/ipv4.cpp +++ b/src/VBox/Runtime/common/checksum/ipv4.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/ipv6.cpp b/src/VBox/Runtime/common/checksum/ipv6.cpp index d33438a0f..3364d19fa 100644 --- a/src/VBox/Runtime/common/checksum/ipv6.cpp +++ b/src/VBox/Runtime/common/checksum/ipv6.cpp @@ -60,7 +60,7 @@ DECLINLINE(uint32_t) rtNetIPv6PseudoChecksumBits(PCRTNETADDRIPV6 pSrcAddr, PCRTN + RT_H2BE_U16(RT_HIWORD(cbPkt)) + RT_H2BE_U16(RT_LOWORD(cbPkt)) + 0 - + RT_H2BE_U16(RT_MAKE_U16(0, bProtocol)); + + RT_H2BE_U16(RT_MAKE_U16(bProtocol, 0)); return u32Sum; } diff --git a/src/VBox/Runtime/common/checksum/manifest.cpp b/src/VBox/Runtime/common/checksum/manifest.cpp index b16a8f6a8..a30e97971 100644 --- a/src/VBox/Runtime/common/checksum/manifest.cpp +++ b/src/VBox/Runtime/common/checksum/manifest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/manifest2.cpp b/src/VBox/Runtime/common/checksum/manifest2.cpp index a64506271..84cdb0392 100644 --- a/src/VBox/Runtime/common/checksum/manifest2.cpp +++ b/src/VBox/Runtime/common/checksum/manifest2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/manifest3.cpp b/src/VBox/Runtime/common/checksum/manifest3.cpp index c0b5e8554..9ff67f236 100644 --- a/src/VBox/Runtime/common/checksum/manifest3.cpp +++ b/src/VBox/Runtime/common/checksum/manifest3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/md5.cpp b/src/VBox/Runtime/common/checksum/md5.cpp index 0bd8afb61..98136aa65 100644 --- a/src/VBox/Runtime/common/checksum/md5.cpp +++ b/src/VBox/Runtime/common/checksum/md5.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/md5str.cpp b/src/VBox/Runtime/common/checksum/md5str.cpp index 40dbb8ba9..288d6eb7f 100644 --- a/src/VBox/Runtime/common/checksum/md5str.cpp +++ b/src/VBox/Runtime/common/checksum/md5str.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha1.cpp b/src/VBox/Runtime/common/checksum/sha1.cpp index e448a479b..9db75a2b6 100644 --- a/src/VBox/Runtime/common/checksum/sha1.cpp +++ b/src/VBox/Runtime/common/checksum/sha1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha1str.cpp b/src/VBox/Runtime/common/checksum/sha1str.cpp index 730d0bee9..22261034f 100644 --- a/src/VBox/Runtime/common/checksum/sha1str.cpp +++ b/src/VBox/Runtime/common/checksum/sha1str.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha256.cpp b/src/VBox/Runtime/common/checksum/sha256.cpp index c78e22e22..da2a70ed7 100644 --- a/src/VBox/Runtime/common/checksum/sha256.cpp +++ b/src/VBox/Runtime/common/checksum/sha256.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha256str.cpp b/src/VBox/Runtime/common/checksum/sha256str.cpp index 43e668e18..4ca92a2e4 100644 --- a/src/VBox/Runtime/common/checksum/sha256str.cpp +++ b/src/VBox/Runtime/common/checksum/sha256str.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha512.cpp b/src/VBox/Runtime/common/checksum/sha512.cpp index ee38f3686..570c0a7e4 100644 --- a/src/VBox/Runtime/common/checksum/sha512.cpp +++ b/src/VBox/Runtime/common/checksum/sha512.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/checksum/sha512str.cpp b/src/VBox/Runtime/common/checksum/sha512str.cpp index 133734217..5329f4d2c 100644 --- a/src/VBox/Runtime/common/checksum/sha512str.cpp +++ b/src/VBox/Runtime/common/checksum/sha512str.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbg.cpp b/src/VBox/Runtime/common/dbg/dbg.cpp index 4198ddafe..b5ae1d9f3 100644 --- a/src/VBox/Runtime/common/dbg/dbg.cpp +++ b/src/VBox/Runtime/common/dbg/dbg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbgas.cpp b/src/VBox/Runtime/common/dbg/dbgas.cpp index 947fffaae..19709e14c 100644 --- a/src/VBox/Runtime/common/dbg/dbgas.cpp +++ b/src/VBox/Runtime/common/dbg/dbgas.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbgmod.cpp b/src/VBox/Runtime/common/dbg/dbgmod.cpp index 13c677fa6..80566f0b5 100644 --- a/src/VBox/Runtime/common/dbg/dbgmod.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmod.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp index 233256988..199690300 100644 --- a/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmodcontainer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp b/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp index b17578777..0cd32dcaa 100644 --- a/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmoddwarf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp index 8a908fc4d..de02edc1c 100644 --- a/src/VBox/Runtime/common/dbg/dbgmodnm.cpp +++ b/src/VBox/Runtime/common/dbg/dbgmodnm.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dvm/dvm.cpp b/src/VBox/Runtime/common/dvm/dvm.cpp index 10011f303..fad942268 100644 --- a/src/VBox/Runtime/common/dvm/dvm.cpp +++ b/src/VBox/Runtime/common/dvm/dvm.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp index 66b41b90a..d6274fc96 100644 --- a/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp +++ b/src/VBox/Runtime/common/dvm/dvmbsdlabel.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dvm/dvmgpt.cpp b/src/VBox/Runtime/common/dvm/dvmgpt.cpp index a63c9ac58..866229d70 100644 --- a/src/VBox/Runtime/common/dvm/dvmgpt.cpp +++ b/src/VBox/Runtime/common/dvm/dvmgpt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/dvm/dvmmbr.cpp b/src/VBox/Runtime/common/dvm/dvmmbr.cpp index 43a1561a3..91314dee3 100644 --- a/src/VBox/Runtime/common/dvm/dvmmbr.cpp +++ b/src/VBox/Runtime/common/dvm/dvmmbr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp index 6371f0a6c..0e90b2027 100644 --- a/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp +++ b/src/VBox/Runtime/common/err/RTErrConvertToErrno.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2009 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/err/errinfo.cpp b/src/VBox/Runtime/common/err/errinfo.cpp index 7b43ee850..4d50db5f0 100644 --- a/src/VBox/Runtime/common/err/errinfo.cpp +++ b/src/VBox/Runtime/common/err/errinfo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/err/errmsg.cpp b/src/VBox/Runtime/common/err/errmsg.cpp index b5d223c66..31cd4370f 100644 --- a/src/VBox/Runtime/common/err/errmsg.cpp +++ b/src/VBox/Runtime/common/err/errmsg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/err/errmsgcom.sed b/src/VBox/Runtime/common/err/errmsgcom.sed index b101ad7c9..bd47a60d3 100644 --- a/src/VBox/Runtime/common/err/errmsgcom.sed +++ b/src/VBox/Runtime/common/err/errmsgcom.sed @@ -3,7 +3,7 @@ # IPRT - SED script for converting COM errors # -# Copyright (C) 2006-2009 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/err/errmsgxpcom.cpp b/src/VBox/Runtime/common/err/errmsgxpcom.cpp index 74071989c..8d9903f03 100644 --- a/src/VBox/Runtime/common/err/errmsgxpcom.cpp +++ b/src/VBox/Runtime/common/err/errmsgxpcom.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldr.cpp b/src/VBox/Runtime/common/ldr/ldr.cpp index fda1e4372..4a9932ca7 100644 --- a/src/VBox/Runtime/common/ldr/ldr.cpp +++ b/src/VBox/Runtime/common/ldr/ldr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrELF.cpp b/src/VBox/Runtime/common/ldr/ldrELF.cpp index 47b45f618..befe603bf 100644 --- a/src/VBox/Runtime/common/ldr/ldrELF.cpp +++ b/src/VBox/Runtime/common/ldr/ldrELF.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h index 73741d4b0..713c1387e 100644 --- a/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h +++ b/src/VBox/Runtime/common/ldr/ldrELFRelocatable.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrEx.cpp b/src/VBox/Runtime/common/ldr/ldrEx.cpp index 8bc6b9bd0..17d4861c6 100644 --- a/src/VBox/Runtime/common/ldr/ldrEx.cpp +++ b/src/VBox/Runtime/common/ldr/ldrEx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrFile.cpp b/src/VBox/Runtime/common/ldr/ldrFile.cpp index 65f408d49..b3bcc9165 100644 --- a/src/VBox/Runtime/common/ldr/ldrFile.cpp +++ b/src/VBox/Runtime/common/ldr/ldrFile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrNative.cpp b/src/VBox/Runtime/common/ldr/ldrNative.cpp index ad94d1cff..aa5e639ad 100644 --- a/src/VBox/Runtime/common/ldr/ldrNative.cpp +++ b/src/VBox/Runtime/common/ldr/ldrNative.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrPE.cpp b/src/VBox/Runtime/common/ldr/ldrPE.cpp index 259f8e935..a7ce415aa 100644 --- a/src/VBox/Runtime/common/ldr/ldrPE.cpp +++ b/src/VBox/Runtime/common/ldr/ldrPE.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp index 61b366638..e1133d84c 100644 --- a/src/VBox/Runtime/common/ldr/ldrkStuff.cpp +++ b/src/VBox/Runtime/common/ldr/ldrkStuff.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/log.cpp b/src/VBox/Runtime/common/log/log.cpp index 56e36c436..b3a036347 100644 --- a/src/VBox/Runtime/common/log/log.cpp +++ b/src/VBox/Runtime/common/log/log.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/logcom.cpp b/src/VBox/Runtime/common/log/logcom.cpp index 3ca78857b..62400b7b2 100644 --- a/src/VBox/Runtime/common/log/logcom.cpp +++ b/src/VBox/Runtime/common/log/logcom.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/logellipsis.cpp b/src/VBox/Runtime/common/log/logellipsis.cpp index dde4a0966..008889216 100644 --- a/src/VBox/Runtime/common/log/logellipsis.cpp +++ b/src/VBox/Runtime/common/log/logellipsis.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/logformat.cpp b/src/VBox/Runtime/common/log/logformat.cpp index 38cdfd325..f17f4a0f1 100644 --- a/src/VBox/Runtime/common/log/logformat.cpp +++ b/src/VBox/Runtime/common/log/logformat.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/logrel.cpp b/src/VBox/Runtime/common/log/logrel.cpp index 64f7eb2a7..c72f5fafa 100644 --- a/src/VBox/Runtime/common/log/logrel.cpp +++ b/src/VBox/Runtime/common/log/logrel.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/log/logrelellipsis.cpp b/src/VBox/Runtime/common/log/logrelellipsis.cpp index 5f1806c6b..652399454 100644 --- a/src/VBox/Runtime/common/log/logrelellipsis.cpp +++ b/src/VBox/Runtime/common/log/logrelellipsis.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/ceill.asm b/src/VBox/Runtime/common/math/ceill.asm index 502181cdd..98af6ef40 100644 --- a/src/VBox/Runtime/common/math/ceill.asm +++ b/src/VBox/Runtime/common/math/ceill.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/cosl.asm b/src/VBox/Runtime/common/math/cosl.asm index c37c3c6af..d57869679 100644 --- a/src/VBox/Runtime/common/math/cosl.asm +++ b/src/VBox/Runtime/common/math/cosl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/fabs.asm b/src/VBox/Runtime/common/math/fabs.asm index 18ca01151..f5218bf48 100644 --- a/src/VBox/Runtime/common/math/fabs.asm +++ b/src/VBox/Runtime/common/math/fabs.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/fabsf.asm b/src/VBox/Runtime/common/math/fabsf.asm index c58d2fc4d..a0cab62df 100644 --- a/src/VBox/Runtime/common/math/fabsf.asm +++ b/src/VBox/Runtime/common/math/fabsf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/fabsl.asm b/src/VBox/Runtime/common/math/fabsl.asm index 1302b00dd..5c42b931c 100644 --- a/src/VBox/Runtime/common/math/fabsl.asm +++ b/src/VBox/Runtime/common/math/fabsl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/floor.asm b/src/VBox/Runtime/common/math/floor.asm index 7d98b4b4f..452796c48 100644 --- a/src/VBox/Runtime/common/math/floor.asm +++ b/src/VBox/Runtime/common/math/floor.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/floorf.asm b/src/VBox/Runtime/common/math/floorf.asm index b54919190..a191ae764 100644 --- a/src/VBox/Runtime/common/math/floorf.asm +++ b/src/VBox/Runtime/common/math/floorf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/floorl.asm b/src/VBox/Runtime/common/math/floorl.asm index c27ada71f..15fea93e7 100644 --- a/src/VBox/Runtime/common/math/floorl.asm +++ b/src/VBox/Runtime/common/math/floorl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/ldexpl.asm b/src/VBox/Runtime/common/math/ldexpl.asm index f53a4e439..2de9b3c17 100644 --- a/src/VBox/Runtime/common/math/ldexpl.asm +++ b/src/VBox/Runtime/common/math/ldexpl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/llrint.asm b/src/VBox/Runtime/common/math/llrint.asm index c870b9136..528bdf090 100644 --- a/src/VBox/Runtime/common/math/llrint.asm +++ b/src/VBox/Runtime/common/math/llrint.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/llrintf.asm b/src/VBox/Runtime/common/math/llrintf.asm index d0c23db7b..fcffd9ce4 100644 --- a/src/VBox/Runtime/common/math/llrintf.asm +++ b/src/VBox/Runtime/common/math/llrintf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/llrintl.asm b/src/VBox/Runtime/common/math/llrintl.asm index a0ce49125..b6b745501 100644 --- a/src/VBox/Runtime/common/math/llrintl.asm +++ b/src/VBox/Runtime/common/math/llrintl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/logl.asm b/src/VBox/Runtime/common/math/logl.asm index 83e7de969..b4294f378 100644 --- a/src/VBox/Runtime/common/math/logl.asm +++ b/src/VBox/Runtime/common/math/logl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/lrint.asm b/src/VBox/Runtime/common/math/lrint.asm index 270a79f82..130598ab6 100644 --- a/src/VBox/Runtime/common/math/lrint.asm +++ b/src/VBox/Runtime/common/math/lrint.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/lrintf.asm b/src/VBox/Runtime/common/math/lrintf.asm index 997294971..7bc70032a 100644 --- a/src/VBox/Runtime/common/math/lrintf.asm +++ b/src/VBox/Runtime/common/math/lrintf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/lrintl.asm b/src/VBox/Runtime/common/math/lrintl.asm index f336af6ac..1b702f565 100644 --- a/src/VBox/Runtime/common/math/lrintl.asm +++ b/src/VBox/Runtime/common/math/lrintl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/remainder.asm b/src/VBox/Runtime/common/math/remainder.asm index 117aa502e..774191391 100644 --- a/src/VBox/Runtime/common/math/remainder.asm +++ b/src/VBox/Runtime/common/math/remainder.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/remainderf.asm b/src/VBox/Runtime/common/math/remainderf.asm index c9b079b70..d6f87aae8 100644 --- a/src/VBox/Runtime/common/math/remainderf.asm +++ b/src/VBox/Runtime/common/math/remainderf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/remainderl.asm b/src/VBox/Runtime/common/math/remainderl.asm index 922f93a74..d5d531985 100644 --- a/src/VBox/Runtime/common/math/remainderl.asm +++ b/src/VBox/Runtime/common/math/remainderl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/sinl.asm b/src/VBox/Runtime/common/math/sinl.asm index 57f5ab8b1..d80d18e94 100644 --- a/src/VBox/Runtime/common/math/sinl.asm +++ b/src/VBox/Runtime/common/math/sinl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/tanl.asm b/src/VBox/Runtime/common/math/tanl.asm index 85e61d04f..bfdb2948b 100644 --- a/src/VBox/Runtime/common/math/tanl.asm +++ b/src/VBox/Runtime/common/math/tanl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/trunc.asm b/src/VBox/Runtime/common/math/trunc.asm index 9ea36820f..913f7f54c 100644 --- a/src/VBox/Runtime/common/math/trunc.asm +++ b/src/VBox/Runtime/common/math/trunc.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/truncf.asm b/src/VBox/Runtime/common/math/truncf.asm index 9fb8166c7..3b868d772 100644 --- a/src/VBox/Runtime/common/math/truncf.asm +++ b/src/VBox/Runtime/common/math/truncf.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/math/truncl.asm b/src/VBox/Runtime/common/math/truncl.asm index 45576833e..9d852e95c 100644 --- a/src/VBox/Runtime/common/math/truncl.asm +++ b/src/VBox/Runtime/common/math/truncl.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp index ef0f35ee7..06d6afa19 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg1Weak.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp index 401baac80..69fbd049c 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp index e0f3fb23f..f8bd63ec3 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Add.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp index 297e60d99..a36a30acf 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeak.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp index 99bc5e64c..8ffe97e28 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2AddWeakV.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp index 2b5b9cf6b..7a40d265d 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2Weak.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp index 2d9b5eff7..f54b0446c 100644 --- a/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp +++ b/src/VBox/Runtime/common/misc/RTAssertMsg2WeakV.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp index e2737bf6b..73837369c 100644 --- a/src/VBox/Runtime/common/misc/RTFileOpenF.cpp +++ b/src/VBox/Runtime/common/misc/RTFileOpenF.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp index 43214e067..b8ed619eb 100644 --- a/src/VBox/Runtime/common/misc/RTFileOpenV.cpp +++ b/src/VBox/Runtime/common/misc/RTFileOpenV.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/assert.cpp b/src/VBox/Runtime/common/misc/assert.cpp index d69a12b42..574256957 100644 --- a/src/VBox/Runtime/common/misc/assert.cpp +++ b/src/VBox/Runtime/common/misc/assert.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/buildconfig.cpp b/src/VBox/Runtime/common/misc/buildconfig.cpp index 54e87b39b..3509a949c 100644 --- a/src/VBox/Runtime/common/misc/buildconfig.cpp +++ b/src/VBox/Runtime/common/misc/buildconfig.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/cidr.cpp b/src/VBox/Runtime/common/misc/cidr.cpp index d64d8e436..712e0de7d 100644 --- a/src/VBox/Runtime/common/misc/cidr.cpp +++ b/src/VBox/Runtime/common/misc/cidr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/getopt.cpp b/src/VBox/Runtime/common/misc/getopt.cpp index f43214045..85bd1fd01 100644 --- a/src/VBox/Runtime/common/misc/getopt.cpp +++ b/src/VBox/Runtime/common/misc/getopt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/getoptargv.cpp b/src/VBox/Runtime/common/misc/getoptargv.cpp index 651b6f43e..8f749e17e 100644 --- a/src/VBox/Runtime/common/misc/getoptargv.cpp +++ b/src/VBox/Runtime/common/misc/getoptargv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/handletable.cpp b/src/VBox/Runtime/common/misc/handletable.cpp index 80eb2387e..6a1f59e5e 100644 --- a/src/VBox/Runtime/common/misc/handletable.cpp +++ b/src/VBox/Runtime/common/misc/handletable.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/handletable.h b/src/VBox/Runtime/common/misc/handletable.h index 654483977..f6f25fdd0 100644 --- a/src/VBox/Runtime/common/misc/handletable.h +++ b/src/VBox/Runtime/common/misc/handletable.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/handletablectx.cpp b/src/VBox/Runtime/common/misc/handletablectx.cpp index 9da5b1441..b4d5bfcd0 100644 --- a/src/VBox/Runtime/common/misc/handletablectx.cpp +++ b/src/VBox/Runtime/common/misc/handletablectx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/handletablesimple.cpp b/src/VBox/Runtime/common/misc/handletablesimple.cpp index 36f2a8fc7..2969dacca 100644 --- a/src/VBox/Runtime/common/misc/handletablesimple.cpp +++ b/src/VBox/Runtime/common/misc/handletablesimple.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/lockvalidator.cpp b/src/VBox/Runtime/common/misc/lockvalidator.cpp index 245d5b646..bd1780e2b 100644 --- a/src/VBox/Runtime/common/misc/lockvalidator.cpp +++ b/src/VBox/Runtime/common/misc/lockvalidator.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/message.cpp b/src/VBox/Runtime/common/misc/message.cpp index e36574269..643121af7 100644 --- a/src/VBox/Runtime/common/misc/message.cpp +++ b/src/VBox/Runtime/common/misc/message.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/once.cpp b/src/VBox/Runtime/common/misc/once.cpp index 0ac8fe42f..31b07e958 100644 --- a/src/VBox/Runtime/common/misc/once.cpp +++ b/src/VBox/Runtime/common/misc/once.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/reqpool.cpp b/src/VBox/Runtime/common/misc/reqpool.cpp index e7ab2be20..bf63d1105 100644 --- a/src/VBox/Runtime/common/misc/reqpool.cpp +++ b/src/VBox/Runtime/common/misc/reqpool.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/sanity-c.c b/src/VBox/Runtime/common/misc/sanity-c.c index 042cf3839..61b1dddb0 100644 --- a/src/VBox/Runtime/common/misc/sanity-c.c +++ b/src/VBox/Runtime/common/misc/sanity-c.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/sanity-cpp.cpp b/src/VBox/Runtime/common/misc/sanity-cpp.cpp index ea0202d9f..e6464288f 100644 --- a/src/VBox/Runtime/common/misc/sanity-cpp.cpp +++ b/src/VBox/Runtime/common/misc/sanity-cpp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/sanity.h b/src/VBox/Runtime/common/misc/sanity.h index f0461c425..891513895 100644 --- a/src/VBox/Runtime/common/misc/sanity.h +++ b/src/VBox/Runtime/common/misc/sanity.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/semspingpong.cpp b/src/VBox/Runtime/common/misc/semspingpong.cpp index e13bed820..10633147b 100644 --- a/src/VBox/Runtime/common/misc/semspingpong.cpp +++ b/src/VBox/Runtime/common/misc/semspingpong.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/setjmp.asm b/src/VBox/Runtime/common/misc/setjmp.asm index 9bacbbc4e..f4960d984 100644 --- a/src/VBox/Runtime/common/misc/setjmp.asm +++ b/src/VBox/Runtime/common/misc/setjmp.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/sg.cpp b/src/VBox/Runtime/common/misc/sg.cpp index 4adf55c24..46f507e33 100644 --- a/src/VBox/Runtime/common/misc/sg.cpp +++ b/src/VBox/Runtime/common/misc/sg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/term.cpp b/src/VBox/Runtime/common/misc/term.cpp index 7b789df84..f698e1a2d 100644 --- a/src/VBox/Runtime/common/misc/term.cpp +++ b/src/VBox/Runtime/common/misc/term.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/misc/thread.cpp b/src/VBox/Runtime/common/misc/thread.cpp index f1d4b1d2f..fb051b00f 100644 --- a/src/VBox/Runtime/common/misc/thread.cpp +++ b/src/VBox/Runtime/common/misc/thread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp index b9f217f99..337ce128b 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsDup.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp index c647b5473..86ce86a02 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsEx.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsEx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp index 8bb8cd176..9247d8992 100644 --- a/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathAbsExDup.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathAppend.cpp b/src/VBox/Runtime/common/path/RTPathAppend.cpp index 5bad6483e..af3e5917c 100644 --- a/src/VBox/Runtime/common/path/RTPathAppend.cpp +++ b/src/VBox/Runtime/common/path/RTPathAppend.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp index e5de4ffec..ebed3864e 100644 --- a/src/VBox/Runtime/common/path/RTPathAppendEx.cpp +++ b/src/VBox/Runtime/common/path/RTPathAppendEx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp b/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp new file mode 100644 index 000000000..fbb6b64ce --- /dev/null +++ b/src/VBox/Runtime/common/path/RTPathCalcRelative.cpp @@ -0,0 +1,130 @@ +/* $Id: RTPathCalcRelative.cpp $ */ +/** @file + * IPRT - RTPathCreateRelative. + */ + +/* + * Copyright (C) 2013 Oracle Corporation + * + * 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. + * + * 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. + */ + + +/******************************************************************************* +* Header Files * +*******************************************************************************/ +#include "internal/iprt.h" +#include <iprt/path.h> +#include <iprt/assert.h> +#include <iprt/err.h> +#include <iprt/string.h> +#include "internal/path.h" + + + +RTDECL(int) RTPathCalcRelative(char *pszPathDst, size_t cbPathDst, + const char *pszPathFrom, + const char *pszPathTo) +{ + int rc = VINF_SUCCESS; + + AssertPtrReturn(pszPathDst, VERR_INVALID_POINTER); + AssertReturn(cbPathDst, VERR_INVALID_PARAMETER); + AssertPtrReturn(pszPathFrom, VERR_INVALID_POINTER); + AssertPtrReturn(pszPathTo, VERR_INVALID_POINTER); + AssertReturn(RTPathStartsWithRoot(pszPathFrom), VERR_INVALID_PARAMETER); + AssertReturn(RTPathStartsWithRoot(pszPathTo), VERR_INVALID_PARAMETER); + AssertReturn(RTStrCmp(pszPathFrom, pszPathTo), VERR_INVALID_PARAMETER); + + /* + * Check for different root specifiers (drive letters), creating a relative path doesn't work here. + * @todo: How to handle case insensitive root specifiers correctly? + */ + size_t offRootFrom = rtPathRootSpecLen(pszPathFrom); + size_t offRootTo = rtPathRootSpecLen(pszPathTo); + + if ( offRootFrom != offRootTo + || RTStrNCmp(pszPathFrom, pszPathTo, offRootFrom)) + return VERR_NOT_SUPPORTED; + + /* Filter out the parent path which is equal to both paths. */ + while ( *pszPathFrom == *pszPathTo + && *pszPathFrom != '\0' + && *pszPathTo != '\0') + { + pszPathFrom++; + pszPathTo++; + } + + /* + * Because path components can start with an equal string but differ afterwards we + * need to go back to the beginning of the current component. + */ + while (!RTPATH_IS_SEP(*pszPathFrom)) + pszPathFrom--; + + pszPathFrom++; /* Skip path separator. */ + + while (!RTPATH_IS_SEP(*pszPathTo)) + pszPathTo--; + + pszPathTo++; /* Skip path separator. */ + + /* Paths point to the first non equal component now. */ + char aszPathTmp[RTPATH_MAX + 1]; + unsigned offPathTmp = 0; + + /* Create the part to go up from pszPathFrom. */ + while (*pszPathFrom != '\0') + { + while ( !RTPATH_IS_SEP(*pszPathFrom) + && *pszPathFrom != '\0') + pszPathFrom++; + + if (RTPATH_IS_SEP(*pszPathFrom)) + { + if (offPathTmp + 3 >= sizeof(aszPathTmp) - 1) + return VERR_FILENAME_TOO_LONG; + aszPathTmp[offPathTmp++] = '.'; + aszPathTmp[offPathTmp++] = '.'; + aszPathTmp[offPathTmp++] = RTPATH_SLASH; + pszPathFrom++; + } + } + + aszPathTmp[offPathTmp] = '\0'; + + /* Now append the rest of pszPathTo to the final path. */ + char *pszPathTmp = &aszPathTmp[offPathTmp]; + size_t cbPathTmp = sizeof(aszPathTmp) - offPathTmp - 1; + rc = RTStrCatP(&pszPathTmp, &cbPathTmp, pszPathTo); + if (RT_SUCCESS(rc)) + { + *pszPathTmp = '\0'; + + size_t cchPathTmp = strlen(aszPathTmp); + if (cchPathTmp >= cbPathDst) + return VERR_BUFFER_OVERFLOW; + memcpy(pszPathDst, aszPathTmp, cchPathTmp + 1); + } + else + rc = VERR_FILENAME_TOO_LONG; + + return rc; +} + diff --git a/src/VBox/Runtime/common/path/RTPathExt.cpp b/src/VBox/Runtime/common/path/RTPathExt.cpp index 292c5f2f7..bb2ee52e4 100644 --- a/src/VBox/Runtime/common/path/RTPathExt.cpp +++ b/src/VBox/Runtime/common/path/RTPathExt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathFilename.cpp b/src/VBox/Runtime/common/path/RTPathFilename.cpp index 2eeaba5ec..851da53ff 100644 --- a/src/VBox/Runtime/common/path/RTPathFilename.cpp +++ b/src/VBox/Runtime/common/path/RTPathFilename.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathParse.cpp b/src/VBox/Runtime/common/path/RTPathParse.cpp index ce42e3309..f5eebb6a6 100644 --- a/src/VBox/Runtime/common/path/RTPathParse.cpp +++ b/src/VBox/Runtime/common/path/RTPathParse.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathRealDup.cpp b/src/VBox/Runtime/common/path/RTPathRealDup.cpp index 18ce0a821..c0d84e402 100644 --- a/src/VBox/Runtime/common/path/RTPathRealDup.cpp +++ b/src/VBox/Runtime/common/path/RTPathRealDup.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathStripExt.cpp b/src/VBox/Runtime/common/path/RTPathStripExt.cpp index 789bb3e99..8156f6a0f 100644 --- a/src/VBox/Runtime/common/path/RTPathStripExt.cpp +++ b/src/VBox/Runtime/common/path/RTPathStripExt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp index 3db34165d..b26478332 100644 --- a/src/VBox/Runtime/common/path/RTPathStripFilename.cpp +++ b/src/VBox/Runtime/common/path/RTPathStripFilename.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp index daa88dcec..361b0f822 100644 --- a/src/VBox/Runtime/common/path/RTPathTraverseList.cpp +++ b/src/VBox/Runtime/common/path/RTPathTraverseList.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/comparepaths.cpp b/src/VBox/Runtime/common/path/comparepaths.cpp index 402713623..bfa5e71c3 100644 --- a/src/VBox/Runtime/common/path/comparepaths.cpp +++ b/src/VBox/Runtime/common/path/comparepaths.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp index c80c79766..5e95e5d94 100644 --- a/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp +++ b/src/VBox/Runtime/common/path/rtPathVolumeSpecLen.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/rand/rand.cpp b/src/VBox/Runtime/common/rand/rand.cpp index beb195e47..d1b9f4c5d 100644 --- a/src/VBox/Runtime/common/rand/rand.cpp +++ b/src/VBox/Runtime/common/rand/rand.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/rand/randadv.cpp b/src/VBox/Runtime/common/rand/randadv.cpp index e4506c0a6..feff33561 100644 --- a/src/VBox/Runtime/common/rand/randadv.cpp +++ b/src/VBox/Runtime/common/rand/randadv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/rand/randparkmiller.cpp b/src/VBox/Runtime/common/rand/randparkmiller.cpp index 4c0f3fd1e..4a4290453 100644 --- a/src/VBox/Runtime/common/rand/randparkmiller.cpp +++ b/src/VBox/Runtime/common/rand/randparkmiller.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrCmp.cpp b/src/VBox/Runtime/common/string/RTStrCmp.cpp index 779675f0b..598a18697 100644 --- a/src/VBox/Runtime/common/string/RTStrCmp.cpp +++ b/src/VBox/Runtime/common/string/RTStrCmp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrNCmp.cpp b/src/VBox/Runtime/common/string/RTStrNCmp.cpp index 5070218aa..c64d20020 100644 --- a/src/VBox/Runtime/common/string/RTStrNCmp.cpp +++ b/src/VBox/Runtime/common/string/RTStrNCmp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrNLen.cpp b/src/VBox/Runtime/common/string/RTStrNLen.cpp index d30c9ed51..777c75093 100644 --- a/src/VBox/Runtime/common/string/RTStrNLen.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLen.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp index 3764ce353..19e181526 100644 --- a/src/VBox/Runtime/common/string/RTStrNLenEx.cpp +++ b/src/VBox/Runtime/common/string/RTStrNLenEx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp index f00298e5f..492f2f499 100644 --- a/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp +++ b/src/VBox/Runtime/common/string/RTStrPrintHexBytes.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/RTStrStr.cpp b/src/VBox/Runtime/common/string/RTStrStr.cpp index 903826e10..a6555bf58 100644 --- a/src/VBox/Runtime/common/string/RTStrStr.cpp +++ b/src/VBox/Runtime/common/string/RTStrStr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/base64.cpp b/src/VBox/Runtime/common/string/base64.cpp index 514d44742..962696445 100644 --- a/src/VBox/Runtime/common/string/base64.cpp +++ b/src/VBox/Runtime/common/string/base64.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memchr.asm b/src/VBox/Runtime/common/string/memchr.asm index 0ee2968d5..95fd16545 100644 --- a/src/VBox/Runtime/common/string/memchr.asm +++ b/src/VBox/Runtime/common/string/memchr.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memchr.cpp b/src/VBox/Runtime/common/string/memchr.cpp index ba2de0958..abfa379d0 100644 --- a/src/VBox/Runtime/common/string/memchr.cpp +++ b/src/VBox/Runtime/common/string/memchr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memchr_alias.c b/src/VBox/Runtime/common/string/memchr_alias.c index 0d009c7da..909295499 100644 --- a/src/VBox/Runtime/common/string/memchr_alias.c +++ b/src/VBox/Runtime/common/string/memchr_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcmp.asm b/src/VBox/Runtime/common/string/memcmp.asm index afadf923e..5176dfedc 100644 --- a/src/VBox/Runtime/common/string/memcmp.asm +++ b/src/VBox/Runtime/common/string/memcmp.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcmp.cpp b/src/VBox/Runtime/common/string/memcmp.cpp index 3dea769e6..6ccf9b1f2 100644 --- a/src/VBox/Runtime/common/string/memcmp.cpp +++ b/src/VBox/Runtime/common/string/memcmp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcmp_alias.c b/src/VBox/Runtime/common/string/memcmp_alias.c index 30f786375..6a4337b88 100644 --- a/src/VBox/Runtime/common/string/memcmp_alias.c +++ b/src/VBox/Runtime/common/string/memcmp_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcpy.asm b/src/VBox/Runtime/common/string/memcpy.asm index 6f1bed22a..b8f94df5c 100644 --- a/src/VBox/Runtime/common/string/memcpy.asm +++ b/src/VBox/Runtime/common/string/memcpy.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcpy.cpp b/src/VBox/Runtime/common/string/memcpy.cpp index 56ccdfb28..d04cfe04a 100644 --- a/src/VBox/Runtime/common/string/memcpy.cpp +++ b/src/VBox/Runtime/common/string/memcpy.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memcpy_alias.c b/src/VBox/Runtime/common/string/memcpy_alias.c index 5ddc7b8c9..ecea9ae3b 100644 --- a/src/VBox/Runtime/common/string/memcpy_alias.c +++ b/src/VBox/Runtime/common/string/memcpy_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memmove.asm b/src/VBox/Runtime/common/string/memmove.asm index b10ede777..c52d988e3 100644 --- a/src/VBox/Runtime/common/string/memmove.asm +++ b/src/VBox/Runtime/common/string/memmove.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2008 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memmove_alias.c b/src/VBox/Runtime/common/string/memmove_alias.c index f30c91497..1fc2e0ce7 100644 --- a/src/VBox/Runtime/common/string/memmove_alias.c +++ b/src/VBox/Runtime/common/string/memmove_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/mempcpy.asm b/src/VBox/Runtime/common/string/mempcpy.asm index b47c43682..157a63dbc 100644 --- a/src/VBox/Runtime/common/string/mempcpy.asm +++ b/src/VBox/Runtime/common/string/mempcpy.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memset.asm b/src/VBox/Runtime/common/string/memset.asm index 96cc48ec8..a2d562bac 100644 --- a/src/VBox/Runtime/common/string/memset.asm +++ b/src/VBox/Runtime/common/string/memset.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memset.cpp b/src/VBox/Runtime/common/string/memset.cpp index 9bf358936..9935bef52 100644 --- a/src/VBox/Runtime/common/string/memset.cpp +++ b/src/VBox/Runtime/common/string/memset.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/memset_alias.c b/src/VBox/Runtime/common/string/memset_alias.c index 49d4abd35..64793471a 100644 --- a/src/VBox/Runtime/common/string/memset_alias.c +++ b/src/VBox/Runtime/common/string/memset_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/simplepattern.cpp b/src/VBox/Runtime/common/string/simplepattern.cpp index f54d4ce02..6f6bdd2b5 100644 --- a/src/VBox/Runtime/common/string/simplepattern.cpp +++ b/src/VBox/Runtime/common/string/simplepattern.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/straprintf.cpp b/src/VBox/Runtime/common/string/straprintf.cpp index a0ee03502..a09abd33a 100644 --- a/src/VBox/Runtime/common/string/straprintf.cpp +++ b/src/VBox/Runtime/common/string/straprintf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcache.cpp b/src/VBox/Runtime/common/string/strcache.cpp index 642d5836d..13259c39b 100644 --- a/src/VBox/Runtime/common/string/strcache.cpp +++ b/src/VBox/Runtime/common/string/strcache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strchr.asm b/src/VBox/Runtime/common/string/strchr.asm index 7163f28c5..e890e9c8e 100644 --- a/src/VBox/Runtime/common/string/strchr.asm +++ b/src/VBox/Runtime/common/string/strchr.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strchr_alias.c b/src/VBox/Runtime/common/string/strchr_alias.c index 4b4fe4b10..63a9a598a 100644 --- a/src/VBox/Runtime/common/string/strchr_alias.c +++ b/src/VBox/Runtime/common/string/strchr_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcmp.asm b/src/VBox/Runtime/common/string/strcmp.asm index 574e5d140..31de02d86 100644 --- a/src/VBox/Runtime/common/string/strcmp.asm +++ b/src/VBox/Runtime/common/string/strcmp.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcmp_alias.c b/src/VBox/Runtime/common/string/strcmp_alias.c index 3c5f7f839..9347aff3e 100644 --- a/src/VBox/Runtime/common/string/strcmp_alias.c +++ b/src/VBox/Runtime/common/string/strcmp_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcpy.asm b/src/VBox/Runtime/common/string/strcpy.asm index bee8738ba..85f7edecd 100644 --- a/src/VBox/Runtime/common/string/strcpy.asm +++ b/src/VBox/Runtime/common/string/strcpy.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcpy.cpp b/src/VBox/Runtime/common/string/strcpy.cpp index 55da775db..3ea6cf006 100644 --- a/src/VBox/Runtime/common/string/strcpy.cpp +++ b/src/VBox/Runtime/common/string/strcpy.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strcpy_alias.c b/src/VBox/Runtime/common/string/strcpy_alias.c index 517cd801a..d703d4cda 100644 --- a/src/VBox/Runtime/common/string/strcpy_alias.c +++ b/src/VBox/Runtime/common/string/strcpy_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strformat.cpp b/src/VBox/Runtime/common/string/strformat.cpp index 56dc5ec58..335d30333 100644 --- a/src/VBox/Runtime/common/string/strformat.cpp +++ b/src/VBox/Runtime/common/string/strformat.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strformatnum.cpp b/src/VBox/Runtime/common/string/strformatnum.cpp index f5b687404..d4ef90f2b 100644 --- a/src/VBox/Runtime/common/string/strformatnum.cpp +++ b/src/VBox/Runtime/common/string/strformatnum.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strformatrt.cpp b/src/VBox/Runtime/common/string/strformatrt.cpp index b5d23853e..6202bf9ba 100644 --- a/src/VBox/Runtime/common/string/strformatrt.cpp +++ b/src/VBox/Runtime/common/string/strformatrt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strformattype.cpp b/src/VBox/Runtime/common/string/strformattype.cpp index e9e3611a3..fe1883655 100644 --- a/src/VBox/Runtime/common/string/strformattype.cpp +++ b/src/VBox/Runtime/common/string/strformattype.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strlen.asm b/src/VBox/Runtime/common/string/strlen.asm index e3ff2f378..b34e57699 100644 --- a/src/VBox/Runtime/common/string/strlen.asm +++ b/src/VBox/Runtime/common/string/strlen.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2008 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strlen.cpp b/src/VBox/Runtime/common/string/strlen.cpp index 173ba2cbc..792b040ce 100644 --- a/src/VBox/Runtime/common/string/strlen.cpp +++ b/src/VBox/Runtime/common/string/strlen.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strlen_alias.c b/src/VBox/Runtime/common/string/strlen_alias.c index 8fab3d167..da4716068 100644 --- a/src/VBox/Runtime/common/string/strlen_alias.c +++ b/src/VBox/Runtime/common/string/strlen_alias.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strncmp.cpp b/src/VBox/Runtime/common/string/strncmp.cpp index 16faf4b1b..24d3fe432 100644 --- a/src/VBox/Runtime/common/string/strncmp.cpp +++ b/src/VBox/Runtime/common/string/strncmp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strpbrk.cpp b/src/VBox/Runtime/common/string/strpbrk.cpp index e8d49a811..4e341ee9f 100644 --- a/src/VBox/Runtime/common/string/strpbrk.cpp +++ b/src/VBox/Runtime/common/string/strpbrk.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strprintf.cpp b/src/VBox/Runtime/common/string/strprintf.cpp index 13bfd4b7a..5e96e253c 100644 --- a/src/VBox/Runtime/common/string/strprintf.cpp +++ b/src/VBox/Runtime/common/string/strprintf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strspace.cpp b/src/VBox/Runtime/common/string/strspace.cpp index a27a417d0..d76c1c196 100644 --- a/src/VBox/Runtime/common/string/strspace.cpp +++ b/src/VBox/Runtime/common/string/strspace.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strstrip.cpp b/src/VBox/Runtime/common/string/strstrip.cpp index 3f1b28096..9e930c8ae 100644 --- a/src/VBox/Runtime/common/string/strstrip.cpp +++ b/src/VBox/Runtime/common/string/strstrip.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strtonum.cpp b/src/VBox/Runtime/common/string/strtonum.cpp index beb9b082f..4d49a307a 100644 --- a/src/VBox/Runtime/common/string/strtonum.cpp +++ b/src/VBox/Runtime/common/string/strtonum.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/strversion.cpp b/src/VBox/Runtime/common/string/strversion.cpp index 7a93bc8d6..8c38c864f 100644 --- a/src/VBox/Runtime/common/string/strversion.cpp +++ b/src/VBox/Runtime/common/string/strversion.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/uni.cpp b/src/VBox/Runtime/common/string/uni.cpp index 1fe613ecb..d1bdb8b08 100644 --- a/src/VBox/Runtime/common/string/uni.cpp +++ b/src/VBox/Runtime/common/string/uni.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/unidata.cpp b/src/VBox/Runtime/common/string/unidata.cpp index ea5ce4edc..aa2679e24 100644 --- a/src/VBox/Runtime/common/string/unidata.cpp +++ b/src/VBox/Runtime/common/string/unidata.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/uniread.cpp b/src/VBox/Runtime/common/string/uniread.cpp index e532482f3..f34ecae54 100644 --- a/src/VBox/Runtime/common/string/uniread.cpp +++ b/src/VBox/Runtime/common/string/uniread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/utf-16.cpp b/src/VBox/Runtime/common/string/utf-16.cpp index 3c89a3b0f..9386b5d75 100644 --- a/src/VBox/Runtime/common/string/utf-16.cpp +++ b/src/VBox/Runtime/common/string/utf-16.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/string/utf-8.cpp b/src/VBox/Runtime/common/string/utf-8.cpp index 0e486e97a..fdeb505e4 100644 --- a/src/VBox/Runtime/common/string/utf-8.cpp +++ b/src/VBox/Runtime/common/string/utf-8.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_Base.cpp.h b/src/VBox/Runtime/common/table/avl_Base.cpp.h index 6ea6d0ef2..3fc89cb35 100644 --- a/src/VBox/Runtime/common/table/avl_Base.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Base.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2002 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2012 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h index 0e0174b40..d0c53bd3b 100644 --- a/src/VBox/Runtime/common/table/avl_Destroy.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Destroy.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 1999-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2011 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h index 25c9e82d1..82554fc04 100644 --- a/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h +++ b/src/VBox/Runtime/common/table/avl_DoWithAll.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 1999-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2011 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_Enum.cpp.h b/src/VBox/Runtime/common/table/avl_Enum.cpp.h index 1d6e53655..6cde86a17 100644 --- a/src/VBox/Runtime/common/table/avl_Enum.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Enum.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_Get.cpp.h b/src/VBox/Runtime/common/table/avl_Get.cpp.h index 36c8713bd..9b2459235 100644 --- a/src/VBox/Runtime/common/table/avl_Get.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Get.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 1999-2002 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2012 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h index d15f167f3..ad217498d 100644 --- a/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_GetBestFit.cpp.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 1999-2002 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2012 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_Range.cpp.h b/src/VBox/Runtime/common/table/avl_Range.cpp.h index 3e66c2062..be4de7b4d 100644 --- a/src/VBox/Runtime/common/table/avl_Range.cpp.h +++ b/src/VBox/Runtime/common/table/avl_Range.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 1999-2006 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2011 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h index 77825f828..45f9bc38c 100644 --- a/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h +++ b/src/VBox/Runtime/common/table/avl_RemoveBestFit.cpp.h @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 1999-2002 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 1999-2011 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avl_RemoveNode.cpp.h b/src/VBox/Runtime/common/table/avl_RemoveNode.cpp.h index 179e1359b..b2eff4336 100644 --- a/src/VBox/Runtime/common/table/avl_RemoveNode.cpp.h +++ b/src/VBox/Runtime/common/table/avl_RemoveNode.cpp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2002 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2012 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlgcphys.cpp b/src/VBox/Runtime/common/table/avlgcphys.cpp index 7f8566b12..6f3eb2b63 100644 --- a/src/VBox/Runtime/common/table/avlgcphys.cpp +++ b/src/VBox/Runtime/common/table/avlgcphys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlgcptr.cpp b/src/VBox/Runtime/common/table/avlgcptr.cpp index 426668609..28678299e 100644 --- a/src/VBox/Runtime/common/table/avlgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlgcptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2003 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlhcphys.cpp b/src/VBox/Runtime/common/table/avlhcphys.cpp index 499c55534..a136a722d 100644 --- a/src/VBox/Runtime/common/table/avlhcphys.cpp +++ b/src/VBox/Runtime/common/table/avlhcphys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avllu32.cpp b/src/VBox/Runtime/common/table/avllu32.cpp index 45bc2a2f0..23fde28e7 100644 --- a/src/VBox/Runtime/common/table/avllu32.cpp +++ b/src/VBox/Runtime/common/table/avllu32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2006 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2012 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlogcphys.cpp b/src/VBox/Runtime/common/table/avlogcphys.cpp index 01cb5f0ef..108b6c644 100644 --- a/src/VBox/Runtime/common/table/avlogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlogcphys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlogcptr.cpp b/src/VBox/Runtime/common/table/avlogcptr.cpp index 6602c3097..5a70b50e5 100644 --- a/src/VBox/Runtime/common/table/avlogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlogcptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlohcphys.cpp b/src/VBox/Runtime/common/table/avlohcphys.cpp index 9f6dabae7..17d43a17f 100644 --- a/src/VBox/Runtime/common/table/avlohcphys.cpp +++ b/src/VBox/Runtime/common/table/avlohcphys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avloioport.cpp b/src/VBox/Runtime/common/table/avloioport.cpp index 38aa69066..01624a9f8 100644 --- a/src/VBox/Runtime/common/table/avloioport.cpp +++ b/src/VBox/Runtime/common/table/avloioport.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlou32.cpp b/src/VBox/Runtime/common/table/avlou32.cpp index c01cafa1e..5ddcf73b5 100644 --- a/src/VBox/Runtime/common/table/avlou32.cpp +++ b/src/VBox/Runtime/common/table/avlou32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlpv.cpp b/src/VBox/Runtime/common/table/avlpv.cpp index c30680700..a88700f78 100644 --- a/src/VBox/Runtime/common/table/avlpv.cpp +++ b/src/VBox/Runtime/common/table/avlpv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2003 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlrfoff.cpp b/src/VBox/Runtime/common/table/avlrfoff.cpp index dd6391b62..0b01cb784 100644 --- a/src/VBox/Runtime/common/table/avlrfoff.cpp +++ b/src/VBox/Runtime/common/table/avlrfoff.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlrgcptr.cpp b/src/VBox/Runtime/common/table/avlrgcptr.cpp index 4ea64fd2d..b1b22886c 100644 --- a/src/VBox/Runtime/common/table/avlrgcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrgcptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlrogcphys.cpp b/src/VBox/Runtime/common/table/avlrogcphys.cpp index f52acdbb2..2a5aefd4f 100644 --- a/src/VBox/Runtime/common/table/avlrogcphys.cpp +++ b/src/VBox/Runtime/common/table/avlrogcphys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlrogcptr.cpp b/src/VBox/Runtime/common/table/avlrogcptr.cpp index 2f4559473..ef52f785c 100644 --- a/src/VBox/Runtime/common/table/avlrogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlrogcptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlroioport.cpp b/src/VBox/Runtime/common/table/avlroioport.cpp index 9aa583411..dab3e7268 100644 --- a/src/VBox/Runtime/common/table/avlroioport.cpp +++ b/src/VBox/Runtime/common/table/avlroioport.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlroogcptr.cpp b/src/VBox/Runtime/common/table/avlroogcptr.cpp index 6c425d5b5..ec0dac971 100644 --- a/src/VBox/Runtime/common/table/avlroogcptr.cpp +++ b/src/VBox/Runtime/common/table/avlroogcptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlrpv.cpp b/src/VBox/Runtime/common/table/avlrpv.cpp index f7e00339f..287e09eb5 100644 --- a/src/VBox/Runtime/common/table/avlrpv.cpp +++ b/src/VBox/Runtime/common/table/avlrpv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2003 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlru64.cpp b/src/VBox/Runtime/common/table/avlru64.cpp index a7476ea5d..722b0d13d 100644 --- a/src/VBox/Runtime/common/table/avlru64.cpp +++ b/src/VBox/Runtime/common/table/avlru64.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2003 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlruintptr.cpp b/src/VBox/Runtime/common/table/avlruintptr.cpp index c267284a9..4459fd897 100644 --- a/src/VBox/Runtime/common/table/avlruintptr.cpp +++ b/src/VBox/Runtime/common/table/avlruintptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlu32.cpp b/src/VBox/Runtime/common/table/avlu32.cpp index 3bf1283b5..0ff2d69f4 100644 --- a/src/VBox/Runtime/common/table/avlu32.cpp +++ b/src/VBox/Runtime/common/table/avlu32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2006 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avluintptr.cpp b/src/VBox/Runtime/common/table/avluintptr.cpp index 08d3eb455..68cc12f86 100644 --- a/src/VBox/Runtime/common/table/avluintptr.cpp +++ b/src/VBox/Runtime/common/table/avluintptr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2006-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/avlul.cpp b/src/VBox/Runtime/common/table/avlul.cpp index 62b94f97e..9cf522df9 100644 --- a/src/VBox/Runtime/common/table/avlul.cpp +++ b/src/VBox/Runtime/common/table/avlul.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2003 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/table/table.cpp b/src/VBox/Runtime/common/table/table.cpp index b2d7c8b03..6c0a9a2e1 100644 --- a/src/VBox/Runtime/common/table/table.cpp +++ b/src/VBox/Runtime/common/table/table.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2001-2006 knut st. osmundsen (bird-src-spam@anduin.net) + * Copyright (C) 2001-2010 knut st. osmundsen (bird-src-spam@anduin.net) * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/time.cpp b/src/VBox/Runtime/common/time/time.cpp index bbeeeb7d9..c8c6079ea 100644 --- a/src/VBox/Runtime/common/time/time.cpp +++ b/src/VBox/Runtime/common/time/time.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timeprog.cpp b/src/VBox/Runtime/common/time/timeprog.cpp index fefe40820..13e810cf9 100644 --- a/src/VBox/Runtime/common/time/timeprog.cpp +++ b/src/VBox/Runtime/common/time/timeprog.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timesup.cpp b/src/VBox/Runtime/common/time/timesup.cpp index 6a51fd6de..b95c4f374 100644 --- a/src/VBox/Runtime/common/time/timesup.cpp +++ b/src/VBox/Runtime/common/time/timesup.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timesupA.asm b/src/VBox/Runtime/common/time/timesupA.asm index 9c0449304..2cee44cff 100644 --- a/src/VBox/Runtime/common/time/timesupA.asm +++ b/src/VBox/Runtime/common/time/timesupA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timesupA.mac b/src/VBox/Runtime/common/time/timesupA.mac index b146c5a6e..54c920006 100644 --- a/src/VBox/Runtime/common/time/timesupA.mac +++ b/src/VBox/Runtime/common/time/timesupA.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timesupref.h b/src/VBox/Runtime/common/time/timesupref.h index e7b345132..60438983d 100644 --- a/src/VBox/Runtime/common/time/timesupref.h +++ b/src/VBox/Runtime/common/time/timesupref.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/time/timesysalias.cpp b/src/VBox/Runtime/common/time/timesysalias.cpp index 37f65d392..3b5e47a44 100644 --- a/src/VBox/Runtime/common/time/timesysalias.cpp +++ b/src/VBox/Runtime/common/time/timesysalias.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/vfs/vfsbase.cpp b/src/VBox/Runtime/common/vfs/vfsbase.cpp index 49984513c..8e38715b9 100644 --- a/src/VBox/Runtime/common/vfs/vfsbase.cpp +++ b/src/VBox/Runtime/common/vfs/vfsbase.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/vfs/vfschain.cpp b/src/VBox/Runtime/common/vfs/vfschain.cpp index 0017cf381..5f2001ff8 100644 --- a/src/VBox/Runtime/common/vfs/vfschain.cpp +++ b/src/VBox/Runtime/common/vfs/vfschain.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/vfs/vfsmisc.cpp b/src/VBox/Runtime/common/vfs/vfsmisc.cpp index f35005d31..1f353fb0e 100644 --- a/src/VBox/Runtime/common/vfs/vfsmisc.cpp +++ b/src/VBox/Runtime/common/vfs/vfsmisc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp index 8b01af673..d223426a3 100644 --- a/src/VBox/Runtime/common/vfs/vfsstdfile.cpp +++ b/src/VBox/Runtime/common/vfs/vfsstdfile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/zip/tar.cpp b/src/VBox/Runtime/common/zip/tar.cpp index cb342d234..03ed89193 100644 --- a/src/VBox/Runtime/common/zip/tar.cpp +++ b/src/VBox/Runtime/common/zip/tar.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/zip/tarvfs.cpp b/src/VBox/Runtime/common/zip/tarvfs.cpp index 740c1397e..67200fe82 100644 --- a/src/VBox/Runtime/common/zip/tarvfs.cpp +++ b/src/VBox/Runtime/common/zip/tarvfs.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/common/zip/zip.cpp b/src/VBox/Runtime/common/zip/zip.cpp index 8abc26021..7ee4c85d9 100644 --- a/src/VBox/Runtime/common/zip/zip.cpp +++ b/src/VBox/Runtime/common/zip/zip.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp index b1d40a4e3..361b25d96 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp index 19663e7d5..9759529e1 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinCOM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp index 2bf4fe7da..daabeafd9 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinIO.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp index caeceb245..9f32e09c4 100644 --- a/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp +++ b/src/VBox/Runtime/darwin/RTErrConvertFromDarwinKern.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/gc/initterm-gc.cpp b/src/VBox/Runtime/gc/initterm-gc.cpp index b35ca578b..adb07cc95 100644 --- a/src/VBox/Runtime/gc/initterm-gc.cpp +++ b/src/VBox/Runtime/gc/initterm-gc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp index 52ea2eef2..7c359ff28 100644 --- a/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp +++ b/src/VBox/Runtime/generic/RTAssertShouldPanic-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTDirExists-generic.cpp b/src/VBox/Runtime/generic/RTDirExists-generic.cpp index 0b5f04a98..186160d32 100644 --- a/src/VBox/Runtime/generic/RTDirExists-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirExists-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp index a01a8d80d..8e92bf142 100644 --- a/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirQueryInfo-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp index b5b781e24..1616c4f43 100644 --- a/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp +++ b/src/VBox/Runtime/generic/RTDirSetTimes-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp index ea55290cf..a87ecb49d 100644 --- a/src/VBox/Runtime/generic/RTFileCopy-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileCopy-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileExists-generic.cpp b/src/VBox/Runtime/generic/RTFileExists-generic.cpp index f81988165..e238361dc 100644 --- a/src/VBox/Runtime/generic/RTFileExists-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileExists-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileMove-generic.cpp b/src/VBox/Runtime/generic/RTFileMove-generic.cpp index 21556ec70..3b4e98979 100644 --- a/src/VBox/Runtime/generic/RTFileMove-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileMove-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp index a561eea67..8ff41f465 100644 --- a/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileQuerySize-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp index 71c0af124..1eb3f3670 100644 --- a/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAll-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp index 2d94160f1..05a32e66b 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandle-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp index 0c41126c6..5d5f01f17 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllByHandleEx-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp index 2046d7319..98f92a81a 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllEx-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp index 1f1dd2920..2bdcc5c79 100644 --- a/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp +++ b/src/VBox/Runtime/generic/RTFileReadAllFree-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp index 5a1e122c5..7a44173bb 100644 --- a/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogDefaultInit-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp index 116900b57..a295fd05d 100644 --- a/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteDebugger-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp index fc7af9816..0f72f31b3 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp index 4a42187a7..946df0ea0 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdErr-stub-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp index a358c08d4..cb5377fc1 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp index 99b6b2bb3..a154edebb 100644 --- a/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteStdOut-stub-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp index 2fe4d0dfb..a9cdab7fa 100644 --- a/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp +++ b/src/VBox/Runtime/generic/RTLogWriteUser-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp index 591d8318c..59a7e33a5 100644 --- a/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuId-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp index 2fec3382a..91842c08c 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdFromSetIndex-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp index 894f8f4f7..6cda69fba 100644 --- a/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpCpuIdToSetIndex-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp index c65eeb2ec..085049760 100644 --- a/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetArraySize-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp index f8625e183..af5cb9fcd 100644 --- a/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCount-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp index 04c9a68dc..f4509e0e2 100644 --- a/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetCurFrequency-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp index a3c176689..e0c8cb7b8 100644 --- a/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp +++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic-stub.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp index dccd40583..95a1e5acf 100644 --- a/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetDescription-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp index e79633014..8c385471e 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxCpuId-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp index 4f468d882..197928f3d 100644 --- a/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetMaxFrequency-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp index e11543e04..40be3d005 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineCount-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp index 753ee62dc..b3a4fee4e 100644 --- a/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetOnlineSet-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp index 01b724965..debd0524c 100644 --- a/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpGetSet-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp index b53c13ae9..987b60a68 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuOnline-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp index 7c57ae831..672563124 100644 --- a/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp +++ b/src/VBox/Runtime/generic/RTMpIsCpuPossible-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp index 3ee4d28be..8f4bda7bf 100644 --- a/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp +++ b/src/VBox/Runtime/generic/RTProcDaemonize-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp index 1682369a1..56eb51912 100644 --- a/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp +++ b/src/VBox/Runtime/generic/RTProcIsRunningByName-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp b/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp index 9fcba42c6..cd7790b69 100644 --- a/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp +++ b/src/VBox/Runtime/generic/RTProcessQueryUsernameA-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp index 0b05fa5e8..1aaab2d27 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemFaster-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp index 375757a77..402ccb801 100644 --- a/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp +++ b/src/VBox/Runtime/generic/RTRandAdvCreateSystemTruer-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp index 437be6be1..af7933eca 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-2-ex-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp index 16a9580bf..46ee3c6b0 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWait-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp index c3eb88db0..19175a78a 100644 --- a/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventMultiWaitNoResume-2-ex-generic.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp index b2e78807d..650d25e5c 100644 --- a/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWait-2-ex-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp index ade778085..b24fe9dc0 100644 --- a/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWait-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp index 3dbe66cdc..2c8181eff 100644 --- a/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemEventWaitNoResume-2-ex-generic.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp index 32c3f8760..0ef65f43e 100644 --- a/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemMutexRequest-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp index 4ba150392..a26b4af19 100644 --- a/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp +++ b/src/VBox/Runtime/generic/RTSemMutexRequestDebug-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp index ec52c77d9..7ba8e781c 100644 --- a/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp +++ b/src/VBox/Runtime/generic/RTSystemQueryOSInfo-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp index 92826f0e5..c24b5f38f 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalDeltaNano-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp index ae760602d..b7b4e567f 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalExplode-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp b/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp index f3d268ebb..f26124e78 100644 --- a/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimeLocalNow-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp index 6af2c79a5..415fcd055 100644 --- a/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTTimerLRCreate-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp index e88ab1ff8..439bf7bc1 100644 --- a/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp +++ b/src/VBox/Runtime/generic/RTUuidCreate-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/critsect-generic.cpp b/src/VBox/Runtime/generic/critsect-generic.cpp index ed2764514..4258fcff1 100644 --- a/src/VBox/Runtime/generic/critsect-generic.cpp +++ b/src/VBox/Runtime/generic/critsect-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/env-generic.cpp b/src/VBox/Runtime/generic/env-generic.cpp index c4de04712..325997aea 100644 --- a/src/VBox/Runtime/generic/env-generic.cpp +++ b/src/VBox/Runtime/generic/env-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/fs-stubs-generic.cpp b/src/VBox/Runtime/generic/fs-stubs-generic.cpp index 4d4403ad8..9f07d41a6 100644 --- a/src/VBox/Runtime/generic/fs-stubs-generic.cpp +++ b/src/VBox/Runtime/generic/fs-stubs-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/mempool-generic.cpp b/src/VBox/Runtime/generic/mempool-generic.cpp index 3ec826104..d9bdf3572 100644 --- a/src/VBox/Runtime/generic/mempool-generic.cpp +++ b/src/VBox/Runtime/generic/mempool-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/mppresent-generic.cpp b/src/VBox/Runtime/generic/mppresent-generic.cpp index 2d345f771..7f4a2d74d 100644 --- a/src/VBox/Runtime/generic/mppresent-generic.cpp +++ b/src/VBox/Runtime/generic/mppresent-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/sched-generic.cpp b/src/VBox/Runtime/generic/sched-generic.cpp index f272b4d77..fb5cd97c7 100644 --- a/src/VBox/Runtime/generic/sched-generic.cpp +++ b/src/VBox/Runtime/generic/sched-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/semfastmutex-generic.cpp b/src/VBox/Runtime/generic/semfastmutex-generic.cpp index 69de1410e..299162f20 100644 --- a/src/VBox/Runtime/generic/semfastmutex-generic.cpp +++ b/src/VBox/Runtime/generic/semfastmutex-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/semrw-generic.cpp b/src/VBox/Runtime/generic/semrw-generic.cpp index 929c14e3c..9078619e8 100644 --- a/src/VBox/Runtime/generic/semrw-generic.cpp +++ b/src/VBox/Runtime/generic/semrw-generic.cpp @@ -7,7 +7,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp index 3da9d6fe1..e878b1ab2 100644 --- a/src/VBox/Runtime/generic/semrw-lockless-generic.cpp +++ b/src/VBox/Runtime/generic/semrw-lockless-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/semxroads-generic.cpp b/src/VBox/Runtime/generic/semxroads-generic.cpp index 55f9670a3..6e3ea2eb6 100644 --- a/src/VBox/Runtime/generic/semxroads-generic.cpp +++ b/src/VBox/Runtime/generic/semxroads-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp index 0b358a461..af684a32d 100644 --- a/src/VBox/Runtime/generic/strcache-stubs-generic.cpp +++ b/src/VBox/Runtime/generic/strcache-stubs-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/tls-generic.cpp b/src/VBox/Runtime/generic/tls-generic.cpp index 7729c77ac..cbcbe4b68 100644 --- a/src/VBox/Runtime/generic/tls-generic.cpp +++ b/src/VBox/Runtime/generic/tls-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/utf16locale-generic.cpp b/src/VBox/Runtime/generic/utf16locale-generic.cpp index b75ec9d15..7f9f4439c 100644 --- a/src/VBox/Runtime/generic/utf16locale-generic.cpp +++ b/src/VBox/Runtime/generic/utf16locale-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/generic/uuid-generic.cpp b/src/VBox/Runtime/generic/uuid-generic.cpp index 0b4b17ddf..c6df68fd1 100644 --- a/src/VBox/Runtime/generic/uuid-generic.cpp +++ b/src/VBox/Runtime/generic/uuid-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/alignmentchecks.h b/src/VBox/Runtime/include/internal/alignmentchecks.h index 96e96e88e..38f69153d 100644 --- a/src/VBox/Runtime/include/internal/alignmentchecks.h +++ b/src/VBox/Runtime/include/internal/alignmentchecks.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/assert.h b/src/VBox/Runtime/include/internal/assert.h index ef6334a65..0db64e046 100644 --- a/src/VBox/Runtime/include/internal/assert.h +++ b/src/VBox/Runtime/include/internal/assert.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/dbgmod.h b/src/VBox/Runtime/include/internal/dbgmod.h index 577da5c09..694f14a28 100644 --- a/src/VBox/Runtime/include/internal/dbgmod.h +++ b/src/VBox/Runtime/include/internal/dbgmod.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/dir.h b/src/VBox/Runtime/include/internal/dir.h index 987fe32a0..44083b68c 100644 --- a/src/VBox/Runtime/include/internal/dir.h +++ b/src/VBox/Runtime/include/internal/dir.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/dvm.h b/src/VBox/Runtime/include/internal/dvm.h index 0970900bb..1064a128c 100644 --- a/src/VBox/Runtime/include/internal/dvm.h +++ b/src/VBox/Runtime/include/internal/dvm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/file.h b/src/VBox/Runtime/include/internal/file.h index c8efe1b76..c6e0e15cd 100644 --- a/src/VBox/Runtime/include/internal/file.h +++ b/src/VBox/Runtime/include/internal/file.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/fileaio.h b/src/VBox/Runtime/include/internal/fileaio.h index 81172acc6..b5beb86d3 100644 --- a/src/VBox/Runtime/include/internal/fileaio.h +++ b/src/VBox/Runtime/include/internal/fileaio.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/fs.h b/src/VBox/Runtime/include/internal/fs.h index f5ba04293..00af45a4d 100644 --- a/src/VBox/Runtime/include/internal/fs.h +++ b/src/VBox/Runtime/include/internal/fs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/initterm.h b/src/VBox/Runtime/include/internal/initterm.h index 044729039..a7eebd6f1 100644 --- a/src/VBox/Runtime/include/internal/initterm.h +++ b/src/VBox/Runtime/include/internal/initterm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/iprt.h b/src/VBox/Runtime/include/internal/iprt.h index e408958ed..3cadf9dea 100644 --- a/src/VBox/Runtime/include/internal/iprt.h +++ b/src/VBox/Runtime/include/internal/iprt.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldr.h b/src/VBox/Runtime/include/internal/ldr.h index f0c17eaa1..3cf587a97 100644 --- a/src/VBox/Runtime/include/internal/ldr.h +++ b/src/VBox/Runtime/include/internal/ldr.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldrELF.h b/src/VBox/Runtime/include/internal/ldrELF.h index c52cd816a..ecb354bd0 100644 --- a/src/VBox/Runtime/include/internal/ldrELF.h +++ b/src/VBox/Runtime/include/internal/ldrELF.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldrELF32.h b/src/VBox/Runtime/include/internal/ldrELF32.h index 0873357ec..a6f789e85 100644 --- a/src/VBox/Runtime/include/internal/ldrELF32.h +++ b/src/VBox/Runtime/include/internal/ldrELF32.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldrELF64.h b/src/VBox/Runtime/include/internal/ldrELF64.h index 8a60fd9c5..30e1b555b 100644 --- a/src/VBox/Runtime/include/internal/ldrELF64.h +++ b/src/VBox/Runtime/include/internal/ldrELF64.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldrMZ.h b/src/VBox/Runtime/include/internal/ldrMZ.h index c6c15c163..2feab758f 100644 --- a/src/VBox/Runtime/include/internal/ldrMZ.h +++ b/src/VBox/Runtime/include/internal/ldrMZ.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/ldrPE.h b/src/VBox/Runtime/include/internal/ldrPE.h index 6b973a2cf..21c58e6f0 100644 --- a/src/VBox/Runtime/include/internal/ldrPE.h +++ b/src/VBox/Runtime/include/internal/ldrPE.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/lockvalidator.h b/src/VBox/Runtime/include/internal/lockvalidator.h index 793e3ffff..a40a09816 100644 --- a/src/VBox/Runtime/include/internal/lockvalidator.h +++ b/src/VBox/Runtime/include/internal/lockvalidator.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/magics.h b/src/VBox/Runtime/include/internal/magics.h index 239c45cf2..df98cec5e 100644 --- a/src/VBox/Runtime/include/internal/magics.h +++ b/src/VBox/Runtime/include/internal/magics.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/path.h b/src/VBox/Runtime/include/internal/path.h index a1cdb1eed..3f6a5a9d3 100644 --- a/src/VBox/Runtime/include/internal/path.h +++ b/src/VBox/Runtime/include/internal/path.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/process.h b/src/VBox/Runtime/include/internal/process.h index cf2c07999..ab00fb952 100644 --- a/src/VBox/Runtime/include/internal/process.h +++ b/src/VBox/Runtime/include/internal/process.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/rand.h b/src/VBox/Runtime/include/internal/rand.h index a68de6582..88c8fba6a 100644 --- a/src/VBox/Runtime/include/internal/rand.h +++ b/src/VBox/Runtime/include/internal/rand.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/sched.h b/src/VBox/Runtime/include/internal/sched.h index bab1a0639..075a583de 100644 --- a/src/VBox/Runtime/include/internal/sched.h +++ b/src/VBox/Runtime/include/internal/sched.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/socket.h b/src/VBox/Runtime/include/internal/socket.h index 8ebfd7e17..699171bdd 100644 --- a/src/VBox/Runtime/include/internal/socket.h +++ b/src/VBox/Runtime/include/internal/socket.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/strhash.h b/src/VBox/Runtime/include/internal/strhash.h index a7399d061..e8684c0f4 100644 --- a/src/VBox/Runtime/include/internal/strhash.h +++ b/src/VBox/Runtime/include/internal/strhash.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/strict.h b/src/VBox/Runtime/include/internal/strict.h index eed9a33c2..09bda348b 100644 --- a/src/VBox/Runtime/include/internal/strict.h +++ b/src/VBox/Runtime/include/internal/strict.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/include/internal/thread.h b/src/VBox/Runtime/include/internal/thread.h index ed6412d05..651b81712 100644 --- a/src/VBox/Runtime/include/internal/thread.h +++ b/src/VBox/Runtime/include/internal/thread.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp index fcb3bc21c..5da37811d 100644 --- a/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp +++ b/src/VBox/Runtime/nt/NtProcessStartup-stub.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp index 0f74823bd..79017e951 100644 --- a/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp +++ b/src/VBox/Runtime/nt/RTErrConvertFromNtStatus.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp index edbfb3315..e8b61f2e8 100644 --- a/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp +++ b/src/VBox/Runtime/os2/RTErrConvertFromOS2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp index 51b194d8d..9a45eb215 100644 --- a/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp +++ b/src/VBox/Runtime/os2/rtSemWaitOs2ConvertTimeout.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/os2/sys0.asm b/src/VBox/Runtime/os2/sys0.asm index 476a5b50b..32b431c5b 100644 --- a/src/VBox/Runtime/os2/sys0.asm +++ b/src/VBox/Runtime/os2/sys0.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp index 8444838fa..1ac9c1149 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/alloc-r0drv.h b/src/VBox/Runtime/r0drv/alloc-r0drv.h index 10350fb57..bf790c1fc 100644 --- a/src/VBox/Runtime/r0drv/alloc-r0drv.h +++ b/src/VBox/Runtime/r0drv/alloc-r0drv.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp index 9a65df825..6b8953530 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteDebugger-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp index 57da5a760..bf5e5906f 100644 --- a/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/RTLogWriteStdOut-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp index 15aebedbf..c221df414 100644 --- a/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/assert-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp index 9cf01463f..98ba22abc 100644 --- a/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/initterm-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp index edd6c6713..c4e81130c 100644 --- a/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/memuserkernel-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp index f5a731661..48d0e097c 100644 --- a/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/mp-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp index 355420304..71ce84de5 100644 --- a/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/process-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp index cf57135a8..9a216f4a7 100644 --- a/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semevent-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp index a77d41d0d..9239860b4 100644 --- a/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semeventmulti-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp index 2b01e760a..ef0f9d87d 100644 --- a/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/semmutex-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp index 26d934a8e..bc744dac2 100644 --- a/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/spinlock-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h index cad8dc955..91f52168c 100644 --- a/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h +++ b/src/VBox/Runtime/r0drv/darwin/the-darwin-kernel.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp index e603e9e18..0bce605b9 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp index 64cabf79c..139c01566 100644 --- a/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/thread2-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp index 23b28a100..6fc7c0525 100644 --- a/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/threadpreempt-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp index 913fa711e..4d9ef8066 100644 --- a/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp +++ b/src/VBox/Runtime/r0drv/darwin/time-r0drv-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c index be8006b35..b2cb6964d 100644 --- a/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/memuserkernel-r0drv-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c index 87e82ff2c..e696143d5 100644 --- a/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/mp-r0drv-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c index b20b9603f..addd9d01c 100644 --- a/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/semmutex-r0drv-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h index 2d0201d9c..6cdacb965 100644 --- a/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h +++ b/src/VBox/Runtime/r0drv/freebsd/sleepqueue-r0drv-freebsd.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c index d61e6f0b3..de14e764a 100644 --- a/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c +++ b/src/VBox/Runtime/r0drv/freebsd/thread-r0drv-freebsd.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2009 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp index 925842eb4..c8d93f534 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpIsCpuWorkPending-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp index a9844aceb..ba352a637 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpOn-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp index 01835679e..52db8375a 100644 --- a/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTMpPokeCpu-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp index 0d943b3b2..3a81521fa 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptDisable-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp index 0e00439d0..107971a36 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsEnabled-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp index 1fc9b894f..3eaf98a14 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPending-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp index fe94d0226..44057f0b3 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptIsPendingTrusty-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp index 9fa8461e1..ef2c2dc1a 100644 --- a/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/RTThreadPreemptRestore-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp index 5310c13b3..9a1406cff 100644 --- a/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp +++ b/src/VBox/Runtime/r0drv/generic/mpnotification-r0drv-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c index 69f29f24a..7044961c5 100644 --- a/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c +++ b/src/VBox/Runtime/r0drv/generic/semspinmutex-r0drv-generic.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp index 099291423..6e467eeae 100644 --- a/src/VBox/Runtime/r0drv/initterm-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/initterm-r0drv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c index 144d637ea..c34f85435 100644 --- a/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/RTLogWriteDebugger-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c index 2f5976513..7a731ddbd 100644 --- a/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/alloc-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c index 2a7fef9f3..11b3a27ed 100644 --- a/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/assert-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c index 5cf9ad664..fda6e35ff 100644 --- a/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/initterm-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c index e21af78c4..48c675456 100644 --- a/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/memobj-r0drv-linux.c @@ -1,10 +1,10 @@ -/* $Revision: 81432 $ */ +/* $Revision: 83687 $ */ /** @file * IPRT - Ring-0 Memory Objects, Linux. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c index 55431c99c..211fc361d 100644 --- a/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/memuserkernel-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c index 32ab12345..88971ac5e 100644 --- a/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mp-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c index b2a6ab9cb..687f3bbd5 100644 --- a/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/mpnotification-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c index e69aeace2..ce2fe3137 100644 --- a/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/process-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c index 2506adc87..9c4c131fe 100644 --- a/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semevent-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c index 74cc39002..702e1d007 100644 --- a/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semeventmulti-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c index 8297d6dd0..25f076541 100644 --- a/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/semmutex-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c index 714bc35f0..b37aace73 100644 --- a/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/spinlock-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -93,6 +93,7 @@ RTDECL(int) RTSpinlockCreate(PRTSPINLOCK pSpinlock, uint32_t fFlags, const char pThis->idCpuOwner = NIL_RTCPUID; pThis->idAssertCpu = NIL_RTCPUID; #endif + spin_lock_init(&pThis->Spinlock); *pSpinlock = pThis; @@ -129,6 +130,9 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock) AssertMsg(pThis && pThis->u32Magic == RTSPINLOCK_MAGIC, ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0)); +#ifdef CONFIG_PROVE_LOCKING + lockdep_off(); +#endif if (pThis->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE) { unsigned long fIntSaved; @@ -137,6 +141,9 @@ RTDECL(void) RTSpinlockAcquire(RTSPINLOCK Spinlock) } else spin_lock(&pThis->Spinlock); +#ifdef CONFIG_PROVE_LOCKING + lockdep_on(); +#endif RT_ASSERT_PREEMPT_CPUID_SPIN_ACQUIRED(pThis); } @@ -151,6 +158,9 @@ RTDECL(void) RTSpinlockRelease(RTSPINLOCK Spinlock) ("pThis=%p u32Magic=%08x\n", pThis, pThis ? (int)pThis->u32Magic : 0)); RT_ASSERT_PREEMPT_CPUID_SPIN_RELEASE(pThis); +#ifdef CONFIG_PROVE_LOCKING + lockdep_off(); +#endif if (pThis->fFlags & RTSPINLOCK_FLAGS_INTERRUPT_SAFE) { unsigned long fIntSaved = pThis->fIntSaved; @@ -159,6 +169,9 @@ RTDECL(void) RTSpinlockRelease(RTSPINLOCK Spinlock) } else spin_unlock(&pThis->Spinlock); +#ifdef CONFIG_PROVE_LOCKING + lockdep_on(); +#endif RT_ASSERT_PREEMPT_CPUID(); } diff --git a/src/VBox/Runtime/r0drv/linux/string.h b/src/VBox/Runtime/r0drv/linux/string.h index f2f319411..2314d13cc 100644 --- a/src/VBox/Runtime/r0drv/linux/string.h +++ b/src/VBox/Runtime/r0drv/linux/string.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h index eebf6734d..8abe6431b 100644 --- a/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h +++ b/src/VBox/Runtime/r0drv/linux/the-linux-kernel.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c index ecd53717d..0e9ab56a2 100644 --- a/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c index a9561c422..01956565a 100644 --- a/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/thread2-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c index c0fb357f2..cd2e70f1b 100644 --- a/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/time-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c index 1e7087b66..b5c875d3e 100644 --- a/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c +++ b/src/VBox/Runtime/r0drv/linux/timer-r0drv-linux.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp index 622406e46..4766a148d 100644 --- a/src/VBox/Runtime/r0drv/memobj-r0drv.cpp +++ b/src/VBox/Runtime/r0drv/memobj-r0drv.cpp @@ -1,10 +1,10 @@ -/* $Revision: 77489 $ */ +/* $Revision: 83687 $ */ /** @file * IPRT - Ring-0 Memory Objects, Common Code. */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -264,6 +264,12 @@ RT_EXPORT_SYMBOL(RTR0MemObjSize); * @param MemObj The ring-0 memory object handle. * @param iPage The page number within the object. */ +/* Work around gcc bug 55940 */ +#if defined(__GNUC__) && defined(RT_ARCH_X86) +# if (__GNUC__ * 100 + __GNUC_MINOR__) == 407 + __attribute__((__optimize__ ("no-shrink-wrap"))) +# endif +#endif RTR0DECL(RTHCPHYS) RTR0MemObjGetPagePhysAddr(RTR0MEMOBJ MemObj, size_t iPage) { /* Validate the object handle. */ diff --git a/src/VBox/Runtime/r0drv/mp-r0drv.h b/src/VBox/Runtime/r0drv/mp-r0drv.h index 807ef642e..0166cef34 100644 --- a/src/VBox/Runtime/r0drv/mp-r0drv.h +++ b/src/VBox/Runtime/r0drv/mp-r0drv.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c index b42be8c91..612ca01b2 100644 --- a/src/VBox/Runtime/r0drv/mpnotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/mpnotification-r0drv.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -276,7 +276,7 @@ RT_EXPORT_SYMBOL(RTMpNotificationDeregister); DECLHIDDEN(int) rtR0MpNotificationInit(void) { - int rc = RTSpinlockCreate((PRTSPINLOCK)&g_hRTMpNotifySpinLock, RTSPINLOCK_FLAGS_INTERRUPT_UNSAFE, "RTR0Mp"); + int rc = RTSpinlockCreate((PRTSPINLOCK)&g_hRTMpNotifySpinLock, RTSPINLOCK_FLAGS_INTERRUPT_SAFE, "RTR0Mp"); if (RT_SUCCESS(rc)) { rc = rtR0MpNotificationNativeInit(); diff --git a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp index 95d6a112b..0342dbd75 100644 --- a/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/RTLogWriteDebugger-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp index 10b15115e..e8720347e 100644 --- a/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/alloc-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp index 637286632..df6b54834 100644 --- a/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/assert-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp index 7f0d21531..63e315908 100644 --- a/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h index e04230faf..e0cb9dca7 100644 --- a/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h +++ b/src/VBox/Runtime/r0drv/nt/internal-r0drv-nt.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp index a1cbd1b5f..a1c0d8654 100644 --- a/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/memobj-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp index 05c359d5a..982afb8fd 100644 --- a/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/memuserkernel-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp index c606861ff..643c34a18 100644 --- a/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mp-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp index e334c3536..56506d276 100644 --- a/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/mpnotification-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp index 934887659..ac45498b8 100644 --- a/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/process-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp index 8cda329eb..46cd1d7ac 100644 --- a/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semevent-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp index 50830f754..3d253c55d 100644 --- a/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semeventmulti-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp index bd3efc87c..eabbc3e16 100644 --- a/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semfastmutex-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp index 71e02e35c..f7b68c4b3 100644 --- a/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/semmutex-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h index f84e515b7..44a805ba7 100644 --- a/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h +++ b/src/VBox/Runtime/r0drv/nt/the-nt-kernel.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp index 6bd175588..bd25f4a9f 100644 --- a/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp index 855a8549e..4863194b9 100644 --- a/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/thread2-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp index 965f2cbb9..6c6ea7037 100644 --- a/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/time-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp index ee014310d..e5b4e99c6 100644 --- a/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp +++ b/src/VBox/Runtime/r0drv/nt/timer-r0drv-nt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp index ea58e623c..0a596bbd4 100644 --- a/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp +++ b/src/VBox/Runtime/r0drv/os2/memuserkernel-r0drv-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/power-r0drv.h b/src/VBox/Runtime/r0drv/power-r0drv.h index a10c4c1e3..ba1ada041 100644 --- a/src/VBox/Runtime/r0drv/power-r0drv.h +++ b/src/VBox/Runtime/r0drv/power-r0drv.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/powernotification-r0drv.c b/src/VBox/Runtime/r0drv/powernotification-r0drv.c index 138e5c4bf..87d73d0f9 100644 --- a/src/VBox/Runtime/r0drv/powernotification-r0drv.c +++ b/src/VBox/Runtime/r0drv/powernotification-r0drv.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c index 0414bcd49..0622c6bf9 100644 --- a/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/RTLogWriteDebugger-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c index 60e757655..eb49b6257 100644 --- a/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/RTMpPokeCpu-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c index 83013b8b7..37e71cb65 100644 --- a/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/alloc-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c index ce6fe0dda..823c18aae 100644 --- a/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/assert-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c index 3fa8dbea6..e5bd82e1c 100644 --- a/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/initterm-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c index bb16c9b09..4e1e8183c 100644 --- a/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/memuserkernel-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c index fb3b8c281..9371c8f75 100644 --- a/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/mp-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c index fcfb286dd..a7c1f9b65 100644 --- a/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/mpnotification-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c index f5c461217..2b4a96af0 100644 --- a/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/process-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c index f52bd57ce..5c902bfac 100644 --- a/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semevent-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c index bec1b4efc..00aa7f00f 100644 --- a/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semeventmulti-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h index 2e68644ad..042cfd8d9 100644 --- a/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h +++ b/src/VBox/Runtime/r0drv/solaris/semeventwait-r0drv-solaris.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c index baeaec2f5..3329a5621 100644 --- a/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semfastmutex-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c index ceb0f21f7..2a7925d5e 100644 --- a/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c index 3b671ffb8..bae81d1dd 100644 --- a/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/spinlock-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h index 2ab935f5e..910fc41aa 100644 --- a/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h +++ b/src/VBox/Runtime/r0drv/solaris/the-solaris-kernel.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c index c495133b6..9983ba280 100644 --- a/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/thread-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c index 4200aaefa..d8f04b112 100644 --- a/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/thread2-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c index 263c59ac8..d4113aced 100644 --- a/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/time-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c b/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c index 2fec4db6c..266449da7 100644 --- a/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c +++ b/src/VBox/Runtime/r0drv/solaris/timer-r0drv-solaris.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp index 7aa128804..eb8614e30 100644 --- a/src/VBox/Runtime/r3/alloc-ef-cpp.cpp +++ b/src/VBox/Runtime/r3/alloc-ef-cpp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/alloc-ef.cpp b/src/VBox/Runtime/r3/alloc-ef.cpp index 16892e291..570800be0 100644 --- a/src/VBox/Runtime/r3/alloc-ef.cpp +++ b/src/VBox/Runtime/r3/alloc-ef.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/alloc.cpp b/src/VBox/Runtime/r3/alloc.cpp index 94889c109..9509d01ca 100644 --- a/src/VBox/Runtime/r3/alloc.cpp +++ b/src/VBox/Runtime/r3/alloc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp index 9942686a5..976e35efa 100644 --- a/src/VBox/Runtime/r3/darwin/mp-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/mp-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp index 103e70b44..9cfb601f8 100644 --- a/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/rtProcInitExePath-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp index ad47cdbbe..3879db8ca 100644 --- a/src/VBox/Runtime/r3/darwin/sched-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/sched-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/darwin/time-darwin.cpp b/src/VBox/Runtime/r3/darwin/time-darwin.cpp index 38878c634..a737d01b1 100644 --- a/src/VBox/Runtime/r3/darwin/time-darwin.cpp +++ b/src/VBox/Runtime/r3/darwin/time-darwin.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/dir.cpp b/src/VBox/Runtime/r3/dir.cpp index 16f2577ed..1528b7b4e 100644 --- a/src/VBox/Runtime/r3/dir.cpp +++ b/src/VBox/Runtime/r3/dir.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/dir2.cpp b/src/VBox/Runtime/r3/dir2.cpp index bec029de0..f01f42c1b 100644 --- a/src/VBox/Runtime/r3/dir2.cpp +++ b/src/VBox/Runtime/r3/dir2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/fileio.cpp b/src/VBox/Runtime/r3/fileio.cpp index 5b4e88731..f574d0b10 100644 --- a/src/VBox/Runtime/r3/fileio.cpp +++ b/src/VBox/Runtime/r3/fileio.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp index 1d47c7597..a5b6cea11 100644 --- a/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/fileaio-freebsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp index 8296025b0..8475dd04f 100644 --- a/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/mp-freebsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp index 55112775d..216c10043 100644 --- a/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp +++ b/src/VBox/Runtime/r3/freebsd/rtProcInitExePath-freebsd.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/fs.cpp b/src/VBox/Runtime/r3/fs.cpp index dac1a5cc6..171f84832 100644 --- a/src/VBox/Runtime/r3/fs.cpp +++ b/src/VBox/Runtime/r3/fs.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp index 1c0e46037..e6edca4f7 100644 --- a/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp +++ b/src/VBox/Runtime/r3/generic/semspinmutex-r3-generic.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/init.cpp b/src/VBox/Runtime/r3/init.cpp index 8c3699d10..3fee71902 100644 --- a/src/VBox/Runtime/r3/init.cpp +++ b/src/VBox/Runtime/r3/init.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -92,6 +92,9 @@ DECLHIDDEN(size_t) g_cchrtProcDir; /** The offset of the process name into g_szrtProcExePath. */ DECLHIDDEN(size_t) g_offrtProcName; +/** The IPRT init flags. */ +static uint32_t g_fInitFlags; + /** The argument count of the program. */ static int g_crtArgs = -1; /** The arguments of the program (UTF-8). This is "leaked". */ @@ -340,6 +343,11 @@ static int rtR3InitBody(uint32_t fFlags, int cArgs, char ***papszArgs, const cha DosError(FERR_DISABLEHARDERR); #endif + /* + * Save the init flags. + */ + g_fInitFlags |= fFlags; + #if !defined(IN_GUEST) && !defined(RT_NO_GIP) # ifdef VBOX /* @@ -483,7 +491,9 @@ static int rtR3InitBody(uint32_t fFlags, int cArgs, char ***papszArgs, const cha static int rtR3Init(uint32_t fFlags, int cArgs, char ***papszArgs, const char *pszProgramPath) { /* no entry log flow, because prefixes and thread may freak out. */ - Assert(!(fFlags & ~(RTR3INIT_FLAGS_DLL | RTR3INIT_FLAGS_SUPLIB))); + Assert(!(fFlags & ~( RTR3INIT_FLAGS_DLL + | RTR3INIT_FLAGS_SUPLIB + | RTR3INIT_FLAGS_UNOBTRUSIVE))); Assert(!(fFlags & RTR3INIT_FLAGS_DLL) || cArgs == 0); /* @@ -499,7 +509,10 @@ static int rtR3Init(uint32_t fFlags, int cArgs, char ***papszArgs, const char *p Assert(!g_fInitializing); #if !defined(IN_GUEST) && !defined(RT_NO_GIP) if (fFlags & RTR3INIT_FLAGS_SUPLIB) + { SUPR3Init(NULL); + g_fInitFlags |= RTR3INIT_FLAGS_SUPLIB; + } #endif if (!pszProgramPath) return VINF_SUCCESS; @@ -557,6 +570,10 @@ RTR3DECL(int) RTR3InitEx(uint32_t iVersion, uint32_t fFlags, int cArgs, char *** return rtR3Init(fFlags, cArgs, papszArgs, pszProgramPath); } +RTR3DECL(bool) RTR3InitIsUnobtrusive(void) +{ + return RT_BOOL(g_fInitFlags & RTR3INIT_FLAGS_UNOBTRUSIVE); +} #if 0 /** @todo implement RTR3Term. */ RTR3DECL(void) RTR3Term(void) diff --git a/src/VBox/Runtime/r3/isofs.cpp b/src/VBox/Runtime/r3/isofs.cpp index 05f5da9d9..16d0334fc 100644 --- a/src/VBox/Runtime/r3/isofs.cpp +++ b/src/VBox/Runtime/r3/isofs.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp index 5582cef91..64edf958f 100644 --- a/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp +++ b/src/VBox/Runtime/r3/linux/RTProcIsRunningByName-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/fileaio-linux.cpp b/src/VBox/Runtime/r3/linux/fileaio-linux.cpp index 51215de65..09b68c3f0 100644 --- a/src/VBox/Runtime/r3/linux/fileaio-linux.cpp +++ b/src/VBox/Runtime/r3/linux/fileaio-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/mp-linux.cpp b/src/VBox/Runtime/r3/linux/mp-linux.cpp index 54304abad..9fc9df758 100644 --- a/src/VBox/Runtime/r3/linux/mp-linux.cpp +++ b/src/VBox/Runtime/r3/linux/mp-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp index 3ab0860b0..cb43d9d0b 100644 --- a/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp +++ b/src/VBox/Runtime/r3/linux/rtProcInitExePath-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/sched-linux.cpp b/src/VBox/Runtime/r3/linux/sched-linux.cpp index 3972a6af9..1e85af5b4 100644 --- a/src/VBox/Runtime/r3/linux/sched-linux.cpp +++ b/src/VBox/Runtime/r3/linux/sched-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp index 010941870..b623c846e 100644 --- a/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semeventmulti-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp index 1be76f4e7..60abc1ed1 100644 --- a/src/VBox/Runtime/r3/linux/semmutex-linux.cpp +++ b/src/VBox/Runtime/r3/linux/semmutex-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/sysfs.cpp b/src/VBox/Runtime/r3/linux/sysfs.cpp index aa1060ac3..f5dfc6a57 100644 --- a/src/VBox/Runtime/r3/linux/sysfs.cpp +++ b/src/VBox/Runtime/r3/linux/sysfs.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/linux/time-linux.cpp b/src/VBox/Runtime/r3/linux/time-linux.cpp index a9de927e7..ab9c0e5a2 100644 --- a/src/VBox/Runtime/r3/linux/time-linux.cpp +++ b/src/VBox/Runtime/r3/linux/time-linux.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/filelock-os2.cpp b/src/VBox/Runtime/r3/os2/filelock-os2.cpp index 8646ecba2..21839947e 100644 --- a/src/VBox/Runtime/r3/os2/filelock-os2.cpp +++ b/src/VBox/Runtime/r3/os2/filelock-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/mp-os2.cpp b/src/VBox/Runtime/r3/os2/mp-os2.cpp index 00260ca01..78e22a87c 100644 --- a/src/VBox/Runtime/r3/os2/mp-os2.cpp +++ b/src/VBox/Runtime/r3/os2/mp-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/pipe-os2.cpp b/src/VBox/Runtime/r3/os2/pipe-os2.cpp index 729f09b3d..2e2f27e92 100644 --- a/src/VBox/Runtime/r3/os2/pipe-os2.cpp +++ b/src/VBox/Runtime/r3/os2/pipe-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp index 26ee5b49f..3ee59bfce 100644 --- a/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp +++ b/src/VBox/Runtime/r3/os2/rtProcInitExePath-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/sched-os2.cpp b/src/VBox/Runtime/r3/os2/sched-os2.cpp index 02a4bbd3a..d6e5bce71 100644 --- a/src/VBox/Runtime/r3/os2/sched-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sched-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/sems-os2.cpp b/src/VBox/Runtime/r3/os2/sems-os2.cpp index d19a3246d..a7ca3097d 100644 --- a/src/VBox/Runtime/r3/os2/sems-os2.cpp +++ b/src/VBox/Runtime/r3/os2/sems-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/os2/thread-os2.cpp b/src/VBox/Runtime/r3/os2/thread-os2.cpp index e2efa01f8..29ce3615d 100644 --- a/src/VBox/Runtime/r3/os2/thread-os2.cpp +++ b/src/VBox/Runtime/r3/os2/thread-os2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp index 591f0556d..e43f5d95b 100644 --- a/src/VBox/Runtime/r3/path.cpp +++ b/src/VBox/Runtime/r3/path.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp index 1536d2cbc..1e74477f6 100644 --- a/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTFileQueryFsSizes-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp index 4e2e116dd..12fff20f5 100644 --- a/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTMpGetCount-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp index d39fd6c6b..144f54a76 100644 --- a/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTPathUserHome-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp index b37d921e0..6fe59a63b 100644 --- a/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTSystemQueryOSInfo-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp index 96915feac..5f75e60ed 100644 --- a/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp +++ b/src/VBox/Runtime/r3/posix/RTTimeNow-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/dir-posix.cpp b/src/VBox/Runtime/r3/posix/dir-posix.cpp index d12cee311..0dddd0662 100644 --- a/src/VBox/Runtime/r3/posix/dir-posix.cpp +++ b/src/VBox/Runtime/r3/posix/dir-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/env-posix.cpp b/src/VBox/Runtime/r3/posix/env-posix.cpp index 3134d7644..9b099f77e 100644 --- a/src/VBox/Runtime/r3/posix/env-posix.cpp +++ b/src/VBox/Runtime/r3/posix/env-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/fileio-posix.cpp b/src/VBox/Runtime/r3/posix/fileio-posix.cpp index b77ff0501..800748a1b 100644 --- a/src/VBox/Runtime/r3/posix/fileio-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileio-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp index 47c136970..c3aa230fb 100644 --- a/src/VBox/Runtime/r3/posix/fileio2-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fileio2-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/fs-posix.cpp b/src/VBox/Runtime/r3/posix/fs-posix.cpp index fdb991b13..9efa66ba0 100644 --- a/src/VBox/Runtime/r3/posix/fs-posix.cpp +++ b/src/VBox/Runtime/r3/posix/fs-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp index 61ce35783..04635079f 100644 --- a/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp +++ b/src/VBox/Runtime/r3/posix/ldrNative-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/path-posix.cpp b/src/VBox/Runtime/r3/posix/path-posix.cpp index 7ad6b028d..0d48252d2 100644 --- a/src/VBox/Runtime/r3/posix/path-posix.cpp +++ b/src/VBox/Runtime/r3/posix/path-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp index 5390fe574..c4be3cb62 100644 --- a/src/VBox/Runtime/r3/posix/pathhost-posix.cpp +++ b/src/VBox/Runtime/r3/posix/pathhost-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/pipe-posix.cpp b/src/VBox/Runtime/r3/posix/pipe-posix.cpp index 2e006cb3d..1bb7b547c 100644 --- a/src/VBox/Runtime/r3/posix/pipe-posix.cpp +++ b/src/VBox/Runtime/r3/posix/pipe-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp index 2f8841c4a..bf8c16037 100644 --- a/src/VBox/Runtime/r3/posix/process-creation-posix.cpp +++ b/src/VBox/Runtime/r3/posix/process-creation-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -462,20 +462,30 @@ RTR3DECL(int) RTProcCreateEx(const char *pszExec, const char * const *papszArg rc = posix_spawnattr_init(&Attr); if (!rc) { -# ifndef RT_OS_OS2 /* We don't need this on OS/2 and I don't recall if it's actually implemented. */ - rc = posix_spawnattr_setflags(&Attr, POSIX_SPAWN_SETPGROUP); + /* Indicate that process group and signal mask are to be changed, + and that the child should use default signal actions. */ + rc = posix_spawnattr_setflags(&Attr, POSIX_SPAWN_SETPGROUP | POSIX_SPAWN_SETSIGMASK | POSIX_SPAWN_SETSIGDEF); Assert(rc == 0); + + /* The child starts in its own process group. */ if (!rc) { rc = posix_spawnattr_setpgroup(&Attr, 0 /* pg == child pid */); Assert(rc == 0); } -# endif + + /* Unmask all signals. */ + if (!rc) + { + sigset_t SigMask; + sigemptyset(&SigMask); + rc = posix_spawnattr_setsigmask(&Attr, &SigMask); Assert(rc == 0); + } /* File changes. */ posix_spawn_file_actions_t FileActions; posix_spawn_file_actions_t *pFileActions = NULL; - if (aStdFds[0] != -1 || aStdFds[1] != -1 || aStdFds[2] != -1) + if ((aStdFds[0] != -1 || aStdFds[1] != -1 || aStdFds[2] != -1) && !rc) { rc = posix_spawn_file_actions_init(&FileActions); if (!rc) @@ -525,7 +535,7 @@ RTR3DECL(int) RTProcCreateEx(const char *pszExec, const char * const *papszArg /* For a detached process this happens in the temp process, so * it's not worth doing anything as this process must exit. */ if (fFlags & RTPROC_FLAGS_DETACHED) - _Exit(0); + _Exit(0); if (phProcess) *phProcess = pid; return VINF_SUCCESS; @@ -581,6 +591,14 @@ RTR3DECL(int) RTProcCreateEx(const char *pszExec, const char * const *papszArg #endif /* + * Unset the signal mask. + */ + sigset_t SigMask; + sigemptyset(&SigMask); + rc = sigprocmask(SIG_SETMASK, &SigMask, NULL); + Assert(rc == 0); + + /* * Apply changes to the standard file descriptor and stuff. */ for (int i = 0; i < 3; i++) diff --git a/src/VBox/Runtime/r3/posix/process-posix.cpp b/src/VBox/Runtime/r3/posix/process-posix.cpp index 7b8231631..13a8308fa 100644 --- a/src/VBox/Runtime/r3/posix/process-posix.cpp +++ b/src/VBox/Runtime/r3/posix/process-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/rand-posix.cpp b/src/VBox/Runtime/r3/posix/rand-posix.cpp index f394d149e..9a93d9a89 100644 --- a/src/VBox/Runtime/r3/posix/rand-posix.cpp +++ b/src/VBox/Runtime/r3/posix/rand-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/sched-posix.cpp b/src/VBox/Runtime/r3/posix/sched-posix.cpp index 6fbf2f9f0..4fa2bb9aa 100644 --- a/src/VBox/Runtime/r3/posix/sched-posix.cpp +++ b/src/VBox/Runtime/r3/posix/sched-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/semevent-posix.cpp b/src/VBox/Runtime/r3/posix/semevent-posix.cpp index f2c40f3f2..e5cd0e2dc 100644 --- a/src/VBox/Runtime/r3/posix/semevent-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semevent-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp index 8a1d066bd..b6319b5cd 100644 --- a/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semeventmulti-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp index e1e82558e..acb25d56a 100644 --- a/src/VBox/Runtime/r3/posix/semmutex-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semmutex-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/semrw-posix.cpp b/src/VBox/Runtime/r3/posix/semrw-posix.cpp index 81f71ef1d..c6dfeb2f0 100644 --- a/src/VBox/Runtime/r3/posix/semrw-posix.cpp +++ b/src/VBox/Runtime/r3/posix/semrw-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/symlink-posix.cpp b/src/VBox/Runtime/r3/posix/symlink-posix.cpp index f2c05da23..b3e108770 100644 --- a/src/VBox/Runtime/r3/posix/symlink-posix.cpp +++ b/src/VBox/Runtime/r3/posix/symlink-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/thread-posix.cpp b/src/VBox/Runtime/r3/posix/thread-posix.cpp index d99ecb74d..61a359ad7 100644 --- a/src/VBox/Runtime/r3/posix/thread-posix.cpp +++ b/src/VBox/Runtime/r3/posix/thread-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -59,6 +59,7 @@ #include <iprt/assert.h> #include <iprt/asm.h> #include <iprt/err.h> +#include <iprt/initterm.h> #include <iprt/string.h> #include "internal/thread.h" @@ -145,31 +146,34 @@ DECLHIDDEN(int) rtThreadNativeInit(void) }; g_iSigPokeThread = -1; - for (unsigned iSig = 0; iSig < RT_ELEMENTS(s_aiSigCandidates); iSig++) + if (!RTR3InitIsUnobtrusive()) { - struct sigaction SigActOld; - if (!sigaction(s_aiSigCandidates[iSig], NULL, &SigActOld)) + for (unsigned iSig = 0; iSig < RT_ELEMENTS(s_aiSigCandidates); iSig++) { - if ( SigActOld.sa_handler == SIG_DFL - || SigActOld.sa_handler == rtThreadPosixPokeSignal) + struct sigaction SigActOld; + if (!sigaction(s_aiSigCandidates[iSig], NULL, &SigActOld)) { - struct sigaction SigAct; - RT_ZERO(SigAct); - SigAct.sa_handler = rtThreadPosixPokeSignal; - SigAct.sa_flags = 0; - sigfillset(&SigAct.sa_mask); - - /* ASSUMES no sigaction race... (lazy bird) */ - if (!sigaction(s_aiSigCandidates[iSig], &SigAct, NULL)) + if ( SigActOld.sa_handler == SIG_DFL + || SigActOld.sa_handler == rtThreadPosixPokeSignal) { - g_iSigPokeThread = s_aiSigCandidates[iSig]; - break; + struct sigaction SigAct; + RT_ZERO(SigAct); + SigAct.sa_handler = rtThreadPosixPokeSignal; + SigAct.sa_flags = 0; + sigfillset(&SigAct.sa_mask); + + /* ASSUMES no sigaction race... (lazy bird) */ + if (!sigaction(s_aiSigCandidates[iSig], &SigAct, NULL)) + { + g_iSigPokeThread = s_aiSigCandidates[iSig]; + break; + } + AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno)); } - AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno)); } + else + AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno)); } - else - AssertMsgFailed(("rc=%Rrc errno=%d\n", RTErrConvertFromErrno(errno), errno)); } #endif /* RTTHREAD_POSIX_WITH_POKE */ @@ -227,10 +231,13 @@ DECLHIDDEN(int) rtThreadNativeAdopt(PRTTHREADINT pThread) * This is done to limit harm done by OSes which doesn't do special SIGALRM scheduling. * It will not help much if someone creates threads directly using pthread_create. :/ */ - sigset_t SigSet; - sigemptyset(&SigSet); - sigaddset(&SigSet, SIGALRM); - sigprocmask(SIG_BLOCK, &SigSet, NULL); + if (!RTR3InitIsUnobtrusive()) + { + sigset_t SigSet; + sigemptyset(&SigSet); + sigaddset(&SigSet, SIGALRM); + sigprocmask(SIG_BLOCK, &SigSet, NULL); + } #ifdef RTTHREAD_POSIX_WITH_POKE if (g_iSigPokeThread != -1) siginterrupt(g_iSigPokeThread, 1); diff --git a/src/VBox/Runtime/r3/posix/time-posix.cpp b/src/VBox/Runtime/r3/posix/time-posix.cpp index bdb3dcb72..6f313afda 100644 --- a/src/VBox/Runtime/r3/posix/time-posix.cpp +++ b/src/VBox/Runtime/r3/posix/time-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/timelocal-posix.cpp b/src/VBox/Runtime/r3/posix/timelocal-posix.cpp index d65c0167b..ce60f7513 100644 --- a/src/VBox/Runtime/r3/posix/timelocal-posix.cpp +++ b/src/VBox/Runtime/r3/posix/timelocal-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/timer-posix.cpp b/src/VBox/Runtime/r3/posix/timer-posix.cpp index f6e75492b..e2f8ced25 100644 --- a/src/VBox/Runtime/r3/posix/timer-posix.cpp +++ b/src/VBox/Runtime/r3/posix/timer-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -57,6 +57,7 @@ #include <iprt/string.h> #include <iprt/once.h> #include <iprt/err.h> +#include <iprt/initterm.h> #include <iprt/critsect.h> #include "internal/magics.h" @@ -406,6 +407,13 @@ RTDECL(int) RTTimerCreateEx(PRTTIMER *ppTimer, uint64_t u64NanoInterval, uint32_ if (fFlags & RTTIMER_FLAGS_CPU_SPECIFIC) return VERR_NOT_SUPPORTED; + /* + * We need the signal masks to be set correctly, which they won't be in + * unobtrusive mode. + */ + if (RTR3InitIsUnobtrusive()) + return VERR_NOT_SUPPORTED; + #ifndef IPRT_WITH_POSIX_TIMERS /* * Check if timer is busy. diff --git a/src/VBox/Runtime/r3/posix/tls-posix.cpp b/src/VBox/Runtime/r3/posix/tls-posix.cpp index c8005a59f..c79e6e220 100644 --- a/src/VBox/Runtime/r3/posix/tls-posix.cpp +++ b/src/VBox/Runtime/r3/posix/tls-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/posix/utf8-posix.cpp b/src/VBox/Runtime/r3/posix/utf8-posix.cpp index 35ae6f3d6..99cc0c199 100644 --- a/src/VBox/Runtime/r3/posix/utf8-posix.cpp +++ b/src/VBox/Runtime/r3/posix/utf8-posix.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp index 7be307f32..9f47814dd 100644 --- a/src/VBox/Runtime/r3/process.cpp +++ b/src/VBox/Runtime/r3/process.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp index 39726eda5..540d2cd0f 100644 --- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h index 127fd9bef..662effc61 100644 --- a/src/VBox/Runtime/r3/solaris/coredumper-solaris.h +++ b/src/VBox/Runtime/r3/solaris/coredumper-solaris.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp index 2b6d60b86..18d968d83 100644 --- a/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/fileaio-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp index 0f2c6fdf0..5f0f02e3e 100644 --- a/src/VBox/Runtime/r3/solaris/mp-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/mp-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp index 40baf8c25..ffaad258f 100644 --- a/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp +++ b/src/VBox/Runtime/r3/solaris/rtProcInitExePath-solaris.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/stream.cpp b/src/VBox/Runtime/r3/stream.cpp index e220e5c7c..c9a056922 100644 --- a/src/VBox/Runtime/r3/stream.cpp +++ b/src/VBox/Runtime/r3/stream.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/tcp.cpp b/src/VBox/Runtime/r3/tcp.cpp index 151dee86f..cf0b9dd3c 100644 --- a/src/VBox/Runtime/r3/tcp.cpp +++ b/src/VBox/Runtime/r3/tcp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/test.cpp b/src/VBox/Runtime/r3/test.cpp index 6c9abcc35..1c6baa4b6 100644 --- a/src/VBox/Runtime/r3/test.cpp +++ b/src/VBox/Runtime/r3/test.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/testi.cpp b/src/VBox/Runtime/r3/testi.cpp index e143e3c1e..b0c788286 100644 --- a/src/VBox/Runtime/r3/testi.cpp +++ b/src/VBox/Runtime/r3/testi.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/udp.cpp b/src/VBox/Runtime/r3/udp.cpp index a5a2cc226..5e46b959c 100644 --- a/src/VBox/Runtime/r3/udp.cpp +++ b/src/VBox/Runtime/r3/udp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp index 683d6ee4e..8c3d86b58 100644 --- a/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp +++ b/src/VBox/Runtime/r3/win/RTHandleGetStandard-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp index 2f3c16c03..69d028a04 100644 --- a/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp +++ b/src/VBox/Runtime/r3/win/RTLogWriteDebugger-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp index 578319106..2a0e3b5d1 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp index 50dee1aa4..8124bcf4d 100644 --- a/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp +++ b/src/VBox/Runtime/r3/win/RTSystemQueryOSInfo-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp index 8083f98de..7792b7949 100644 --- a/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp +++ b/src/VBox/Runtime/r3/win/RTUuidCreate-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win32.def b/src/VBox/Runtime/r3/win/VBoxRT-win32.def index 8764142aa..e36769fdf 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win32.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win32.def @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/VBoxRT-win64.def b/src/VBox/Runtime/r3/win/VBoxRT-win64.def index 4a1eb1de5..434c7be3b 100644 --- a/src/VBox/Runtime/r3/win/VBoxRT-win64.def +++ b/src/VBox/Runtime/r3/win/VBoxRT-win64.def @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/alloc-win.cpp b/src/VBox/Runtime/r3/win/alloc-win.cpp index 7e052673e..25879154f 100644 --- a/src/VBox/Runtime/r3/win/alloc-win.cpp +++ b/src/VBox/Runtime/r3/win/alloc-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/dir-win.cpp b/src/VBox/Runtime/r3/win/dir-win.cpp index 2494b8b42..1023e9a10 100644 --- a/src/VBox/Runtime/r3/win/dir-win.cpp +++ b/src/VBox/Runtime/r3/win/dir-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/dllmain-win.cpp b/src/VBox/Runtime/r3/win/dllmain-win.cpp index 1646b39e0..6efb702a4 100644 --- a/src/VBox/Runtime/r3/win/dllmain-win.cpp +++ b/src/VBox/Runtime/r3/win/dllmain-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/fileaio-win.cpp b/src/VBox/Runtime/r3/win/fileaio-win.cpp index 95e20e120..1f9df6ce2 100644 --- a/src/VBox/Runtime/r3/win/fileaio-win.cpp +++ b/src/VBox/Runtime/r3/win/fileaio-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/fs-win.cpp b/src/VBox/Runtime/r3/win/fs-win.cpp index c0fa65c32..ca3ee409b 100644 --- a/src/VBox/Runtime/r3/win/fs-win.cpp +++ b/src/VBox/Runtime/r3/win/fs-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/ldrNative-win.cpp b/src/VBox/Runtime/r3/win/ldrNative-win.cpp index 540169588..02a31775b 100644 --- a/src/VBox/Runtime/r3/win/ldrNative-win.cpp +++ b/src/VBox/Runtime/r3/win/ldrNative-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/localipc-win.cpp b/src/VBox/Runtime/r3/win/localipc-win.cpp index 15ff6f8bb..89041703d 100644 --- a/src/VBox/Runtime/r3/win/localipc-win.cpp +++ b/src/VBox/Runtime/r3/win/localipc-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/mp-win.cpp b/src/VBox/Runtime/r3/win/mp-win.cpp index fed1152ba..d18e1fe94 100644 --- a/src/VBox/Runtime/r3/win/mp-win.cpp +++ b/src/VBox/Runtime/r3/win/mp-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/path-win.cpp b/src/VBox/Runtime/r3/win/path-win.cpp index aacf7d5f8..5f9ec3345 100644 --- a/src/VBox/Runtime/r3/win/path-win.cpp +++ b/src/VBox/Runtime/r3/win/path-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/pipe-win.cpp b/src/VBox/Runtime/r3/win/pipe-win.cpp index 5abe809e2..7e5adc50c 100644 --- a/src/VBox/Runtime/r3/win/pipe-win.cpp +++ b/src/VBox/Runtime/r3/win/pipe-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp index 3b056cde1..ab7ff7fc0 100644 --- a/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp +++ b/src/VBox/Runtime/r3/win/rtProcInitExePath-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/sched-win.cpp b/src/VBox/Runtime/r3/win/sched-win.cpp index 935bd6517..54b8154b1 100644 --- a/src/VBox/Runtime/r3/win/sched-win.cpp +++ b/src/VBox/Runtime/r3/win/sched-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/semmutex-win.cpp b/src/VBox/Runtime/r3/win/semmutex-win.cpp index 7cdab20b8..e3ec555e5 100644 --- a/src/VBox/Runtime/r3/win/semmutex-win.cpp +++ b/src/VBox/Runtime/r3/win/semmutex-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/symlink-win.cpp b/src/VBox/Runtime/r3/win/symlink-win.cpp index 30332539f..9f79bf106 100644 --- a/src/VBox/Runtime/r3/win/symlink-win.cpp +++ b/src/VBox/Runtime/r3/win/symlink-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/timer-win.cpp b/src/VBox/Runtime/r3/win/timer-win.cpp index 08ed4ec1f..a23aa17ac 100644 --- a/src/VBox/Runtime/r3/win/timer-win.cpp +++ b/src/VBox/Runtime/r3/win/timer-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/tls-win.cpp b/src/VBox/Runtime/r3/win/tls-win.cpp index 2bc332b76..51e0b23b9 100644 --- a/src/VBox/Runtime/r3/win/tls-win.cpp +++ b/src/VBox/Runtime/r3/win/tls-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/utf16locale-win.cpp b/src/VBox/Runtime/r3/win/utf16locale-win.cpp index 40d99bb2b..ccb51adee 100644 --- a/src/VBox/Runtime/r3/win/utf16locale-win.cpp +++ b/src/VBox/Runtime/r3/win/utf16locale-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/win/uuid-win.cpp b/src/VBox/Runtime/r3/win/uuid-win.cpp index 0d91df790..ef1a42bcd 100644 --- a/src/VBox/Runtime/r3/win/uuid-win.cpp +++ b/src/VBox/Runtime/r3/win/uuid-win.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/r3/xml.cpp b/src/VBox/Runtime/r3/xml.cpp index 23f538d93..6c62c7bbb 100644 --- a/src/VBox/Runtime/r3/xml.cpp +++ b/src/VBox/Runtime/r3/xml.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/ioctl.h b/src/VBox/Runtime/testcase/ioctl.h index f9a5273ec..edf7ddae0 100644 --- a/src/VBox/Runtime/testcase/ioctl.h +++ b/src/VBox/Runtime/testcase/ioctl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp index 7e12327c6..96ccfa636 100644 --- a/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp +++ b/src/VBox/Runtime/testcase/ntGetTimerResolution.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstDir-2.cpp b/src/VBox/Runtime/testcase/tstDir-2.cpp index a8213cf51..aea861fe4 100644 --- a/src/VBox/Runtime/testcase/tstDir-2.cpp +++ b/src/VBox/Runtime/testcase/tstDir-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstDir-3.cpp b/src/VBox/Runtime/testcase/tstDir-3.cpp index 45aa691cb..5b453d0b7 100644 --- a/src/VBox/Runtime/testcase/tstDir-3.cpp +++ b/src/VBox/Runtime/testcase/tstDir-3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstDir.cpp b/src/VBox/Runtime/testcase/tstDir.cpp index fe9907db2..c843fab70 100644 --- a/src/VBox/Runtime/testcase/tstDir.cpp +++ b/src/VBox/Runtime/testcase/tstDir.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstEnv.cpp b/src/VBox/Runtime/testcase/tstEnv.cpp index 6c7ea9f3b..2ffa30d8b 100644 --- a/src/VBox/Runtime/testcase/tstEnv.cpp +++ b/src/VBox/Runtime/testcase/tstEnv.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstFile.cpp b/src/VBox/Runtime/testcase/tstFile.cpp index f2f675d39..61d57a78c 100644 --- a/src/VBox/Runtime/testcase/tstFile.cpp +++ b/src/VBox/Runtime/testcase/tstFile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp index 7ffd7fe1a..25ab780e6 100644 --- a/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp +++ b/src/VBox/Runtime/testcase/tstFileAppendWin-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstFileLock.cpp b/src/VBox/Runtime/testcase/tstFileLock.cpp index fc4c0bfc4..63942450c 100644 --- a/src/VBox/Runtime/testcase/tstFileLock.cpp +++ b/src/VBox/Runtime/testcase/tstFileLock.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstFork.cpp b/src/VBox/Runtime/testcase/tstFork.cpp index 8d511f7c2..61ccb48f6 100644 --- a/src/VBox/Runtime/testcase/tstFork.cpp +++ b/src/VBox/Runtime/testcase/tstFork.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstHandleTable.cpp b/src/VBox/Runtime/testcase/tstHandleTable.cpp index ab0dce0fc..185d8fe54 100644 --- a/src/VBox/Runtime/testcase/tstHandleTable.cpp +++ b/src/VBox/Runtime/testcase/tstHandleTable.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstIoCtl.cpp b/src/VBox/Runtime/testcase/tstIoCtl.cpp index 31e901ef8..abe7be993 100644 --- a/src/VBox/Runtime/testcase/tstIoCtl.cpp +++ b/src/VBox/Runtime/testcase/tstIoCtl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr-2.cpp b/src/VBox/Runtime/testcase/tstLdr-2.cpp index d52bcbeb4..7253680f9 100644 --- a/src/VBox/Runtime/testcase/tstLdr-2.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr-3.cpp b/src/VBox/Runtime/testcase/tstLdr-3.cpp index acf0e9816..90856bfd0 100644 --- a/src/VBox/Runtime/testcase/tstLdr-3.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr-4.cpp b/src/VBox/Runtime/testcase/tstLdr-4.cpp index 9b6db4898..cf65551d8 100644 --- a/src/VBox/Runtime/testcase/tstLdr-4.cpp +++ b/src/VBox/Runtime/testcase/tstLdr-4.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def b/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def index 1dd8d2afe..9d92af4b2 100644 --- a/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def +++ b/src/VBox/Runtime/testcase/tstLdr-4Imp-os2.def @@ -2,7 +2,7 @@ ; tstLdr-4 fake DLL - Definition file. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def b/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def index 7508275cd..e58384a10 100644 --- a/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def +++ b/src/VBox/Runtime/testcase/tstLdr-4Imp-win.def @@ -2,7 +2,7 @@ ; tstLdr-4 fake DLL - Definition file. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdr.cpp b/src/VBox/Runtime/testcase/tstLdr.cpp index 9a02f67f8..96c4e8a9f 100644 --- a/src/VBox/Runtime/testcase/tstLdr.cpp +++ b/src/VBox/Runtime/testcase/tstLdr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp index 1cb7654fc..bc14072d2 100644 --- a/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp +++ b/src/VBox/Runtime/testcase/tstLdrDisasmTest.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdrLoad.cpp b/src/VBox/Runtime/testcase/tstLdrLoad.cpp index 5be78da82..57b2bb70a 100644 --- a/src/VBox/Runtime/testcase/tstLdrLoad.cpp +++ b/src/VBox/Runtime/testcase/tstLdrLoad.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdrObj.cpp b/src/VBox/Runtime/testcase/tstLdrObj.cpp index 26435222c..2424e9dad 100644 --- a/src/VBox/Runtime/testcase/tstLdrObj.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObj.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp index 5471d4e6b..94e6edafb 100644 --- a/src/VBox/Runtime/testcase/tstLdrObjR0.cpp +++ b/src/VBox/Runtime/testcase/tstLdrObjR0.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstLog.cpp b/src/VBox/Runtime/testcase/tstLog.cpp index 758136041..348aa2cf3 100644 --- a/src/VBox/Runtime/testcase/tstLog.cpp +++ b/src/VBox/Runtime/testcase/tstLog.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp index 1c6de939b..7dc9def29 100644 --- a/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp +++ b/src/VBox/Runtime/testcase/tstMemAutoPtr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstMove.cpp b/src/VBox/Runtime/testcase/tstMove.cpp index 981178009..e92dde7ea 100644 --- a/src/VBox/Runtime/testcase/tstMove.cpp +++ b/src/VBox/Runtime/testcase/tstMove.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstMp-1.cpp b/src/VBox/Runtime/testcase/tstMp-1.cpp index 6039762b0..28bc4284c 100644 --- a/src/VBox/Runtime/testcase/tstMp-1.cpp +++ b/src/VBox/Runtime/testcase/tstMp-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp index 9131b6c14..52e2099ab 100644 --- a/src/VBox/Runtime/testcase/tstNoCrt-1.cpp +++ b/src/VBox/Runtime/testcase/tstNoCrt-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstOnce.cpp b/src/VBox/Runtime/testcase/tstOnce.cpp index b6c055512..f84231180 100644 --- a/src/VBox/Runtime/testcase/tstOnce.cpp +++ b/src/VBox/Runtime/testcase/tstOnce.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstPrfRT.cpp b/src/VBox/Runtime/testcase/tstPrfRT.cpp index 27a26e9a0..05a088361 100644 --- a/src/VBox/Runtime/testcase/tstPrfRT.cpp +++ b/src/VBox/Runtime/testcase/tstPrfRT.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp index ad2dccda7..0547038c0 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h index f37376428..b6c4f102e 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemption.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp b/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp index 921269391..cd6fb4474 100644 --- a/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp +++ b/src/VBox/Runtime/testcase/tstR0ThreadPreemptionDriver.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp index 4749e4951..a14f86e3b 100644 --- a/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp +++ b/src/VBox/Runtime/testcase/tstRTAssertCompile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTAvl.cpp b/src/VBox/Runtime/testcase/tstRTAvl.cpp index e77f68113..b460946d2 100644 --- a/src/VBox/Runtime/testcase/tstRTAvl.cpp +++ b/src/VBox/Runtime/testcase/tstRTAvl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp index a38f389e2..d45bfcd7e 100644 --- a/src/VBox/Runtime/testcase/tstRTBitOperations.cpp +++ b/src/VBox/Runtime/testcase/tstRTBitOperations.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTCidr.cpp b/src/VBox/Runtime/testcase/tstRTCidr.cpp index 48c5ed375..6867f2697 100644 --- a/src/VBox/Runtime/testcase/tstRTCidr.cpp +++ b/src/VBox/Runtime/testcase/tstRTCidr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp index 60b2c1776..be82ed569 100644 --- a/src/VBox/Runtime/testcase/tstRTCircBuf.cpp +++ b/src/VBox/Runtime/testcase/tstRTCircBuf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTDigest.cpp b/src/VBox/Runtime/testcase/tstRTDigest.cpp index bd5798929..dd214f3c2 100644 --- a/src/VBox/Runtime/testcase/tstRTDigest.cpp +++ b/src/VBox/Runtime/testcase/tstRTDigest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp index 448c52e54..076a3c854 100644 --- a/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp +++ b/src/VBox/Runtime/testcase/tstRTDirCreateUniqueNumbered.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTDvm.cpp b/src/VBox/Runtime/testcase/tstRTDvm.cpp index 7b2cc1321..561b4ee1b 100644 --- a/src/VBox/Runtime/testcase/tstRTDvm.cpp +++ b/src/VBox/Runtime/testcase/tstRTDvm.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp index 5a6640c51..e14109395 100644 --- a/src/VBox/Runtime/testcase/tstRTFsQueries.cpp +++ b/src/VBox/Runtime/testcase/tstRTFsQueries.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp index 467619a2a..255742391 100644 --- a/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp +++ b/src/VBox/Runtime/testcase/tstRTHeapOffset.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp index ef763466f..930e48be1 100644 --- a/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp +++ b/src/VBox/Runtime/testcase/tstRTHeapSimple.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp index 925b23b51..8ac599ae3 100644 --- a/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp +++ b/src/VBox/Runtime/testcase/tstRTInlineAsm.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -209,24 +209,49 @@ void tstASMCpuId(void) RTTestIPrintf(RTTESTLVL_ALWAYS, "%08x %08x %08x %08x %08x%s\n", iStd, s.uEAX, s.uEBX, s.uECX, s.uEDX, iStd <= cFunctions ? "" : "*"); - if (iStd == 0x04 || iStd == 0x0b || iStd == 0x0d || iStd > cFunctions) - continue; /* Leaf 04 and leaf 0d output depend on the initial value of ECX - * The same seems to apply to invalid standard functions */ - - u32 = ASMCpuId_EAX(iStd); - CHECKVAL(u32, s.uEAX, "%x"); - u32 = ASMCpuId_EBX(iStd); - CHECKVAL(u32, s.uEBX, "%x"); - u32 = ASMCpuId_ECX(iStd); - CHECKVAL(u32, s.uECX, "%x"); - u32 = ASMCpuId_EDX(iStd); - CHECKVAL(u32, s.uEDX, "%x"); - - uECX2 = s.uECX - 1; - uEDX2 = s.uEDX - 1; - ASMCpuId_ECX_EDX(iStd, &uECX2, &uEDX2); - CHECKVAL(uECX2, s.uECX, "%x"); - CHECKVAL(uEDX2, s.uEDX, "%x"); + /* Leaf 04 and leaf 0d output depend on the initial value of ECX + * The same seems to apply to invalid standard functions */ + if (iStd > cFunctions) + continue; + if (iStd != 0x04 && iStd != 0x0b && iStd != 0x0d) + { + u32 = ASMCpuId_EAX(iStd); + CHECKVAL(u32, s.uEAX, "%x"); + u32 = ASMCpuId_EBX(iStd); + CHECKVAL(u32, s.uEBX, "%x"); + u32 = ASMCpuId_ECX(iStd); + CHECKVAL(u32, s.uECX, "%x"); + u32 = ASMCpuId_EDX(iStd); + CHECKVAL(u32, s.uEDX, "%x"); + + uECX2 = s.uECX - 1; + uEDX2 = s.uEDX - 1; + ASMCpuId_ECX_EDX(iStd, &uECX2, &uEDX2); + CHECKVAL(uECX2, s.uECX, "%x"); + CHECKVAL(uEDX2, s.uEDX, "%x"); + } + + if (iStd == 0x04) + for (uint32_t uECX = 1; s.uEAX & 0x1f; uECX++) + { + ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX); + RTTestIPrintf(RTTESTLVL_ALWAYS, " [%02x] %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX); + RTTESTI_CHECK_BREAK(uECX < 128); + } + else if (iStd == 0x0b) + for (uint32_t uECX = 1; (s.uEAX & 0x1f) && (s.uEBX & 0xffff); uECX++) + { + ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX); + RTTestIPrintf(RTTESTLVL_ALWAYS, " [%02x] %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX); + RTTESTI_CHECK_BREAK(uECX < 128); + } + else if (iStd == 0x0d) + for (uint32_t uECX = 1; s.uEAX != 0 || s.uEBX != 0 || s.uECX != 0 || s.uEDX != 0; uECX++) + { + ASMCpuId_Idx_ECX(iStd, uECX, &s.uEAX, &s.uEBX, &s.uECX, &s.uEDX); + RTTestIPrintf(RTTESTLVL_ALWAYS, " [%02x] %08x %08x %08x %08x\n", uECX, s.uEAX, s.uEBX, s.uECX, s.uEDX); + RTTESTI_CHECK_BREAK(uECX < 128); + } } /* @@ -1519,6 +1544,7 @@ int main(int argc, char *argv[]) #if !defined(GCC44_32BIT_PIC) && (defined(RT_ARCH_AMD64) || defined(RT_ARCH_X86)) tstASMCpuId(); #endif +#if 1 tstASMAtomicXchgU8(); tstASMAtomicXchgU16(); tstASMAtomicXchgU32(); @@ -1549,6 +1575,7 @@ int main(int argc, char *argv[]) tstASMByteSwap(); tstASMBench(); +#endif /* * Show the result. diff --git a/src/VBox/Runtime/testcase/tstRTList.cpp b/src/VBox/Runtime/testcase/tstRTList.cpp index 12f317515..bfa8884cb 100644 --- a/src/VBox/Runtime/testcase/tstRTList.cpp +++ b/src/VBox/Runtime/testcase/tstRTList.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp index 7a3238335..bda751952 100644 --- a/src/VBox/Runtime/testcase/tstRTLockValidator.cpp +++ b/src/VBox/Runtime/testcase/tstRTLockValidator.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTManifest.cpp b/src/VBox/Runtime/testcase/tstRTManifest.cpp index 65e5c26e9..766d36f48 100644 --- a/src/VBox/Runtime/testcase/tstRTManifest.cpp +++ b/src/VBox/Runtime/testcase/tstRTManifest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTMemEf.cpp b/src/VBox/Runtime/testcase/tstRTMemEf.cpp index e47eb5b81..904c6ed1c 100644 --- a/src/VBox/Runtime/testcase/tstRTMemEf.cpp +++ b/src/VBox/Runtime/testcase/tstRTMemEf.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTMemPool.cpp b/src/VBox/Runtime/testcase/tstRTMemPool.cpp index 2956eb0f4..fc59a8bdf 100644 --- a/src/VBox/Runtime/testcase/tstRTMemPool.cpp +++ b/src/VBox/Runtime/testcase/tstRTMemPool.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTPipe.cpp b/src/VBox/Runtime/testcase/tstRTPipe.cpp index 6944aef3a..f03489930 100644 --- a/src/VBox/Runtime/testcase/tstRTPipe.cpp +++ b/src/VBox/Runtime/testcase/tstRTPipe.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp index 7e36c64a6..4ba3be834 100644 --- a/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcCreateEx.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp index c846f5878..f784d9491 100644 --- a/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcIsRunningByName.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTProcWait.cpp b/src/VBox/Runtime/testcase/tstRTProcWait.cpp index a4f453466..fb5556780 100644 --- a/src/VBox/Runtime/testcase/tstRTProcWait.cpp +++ b/src/VBox/Runtime/testcase/tstRTProcWait.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp index 7b9a63f32..49c61d39e 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h index 7efbeed55..c4795b1f0 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernel.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp index dddcb775c..7da84f134 100644 --- a/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0MemUserKernelDriver.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp index 8c17a095d..b33ba5003 100644 --- a/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0SemMutex.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp index 62bfaabf5..29c145cf7 100644 --- a/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0SemMutexDriver.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp index 8e12602e1..cf7a9d064 100644 --- a/src/VBox/Runtime/testcase/tstRTR0Timer.cpp +++ b/src/VBox/Runtime/testcase/tstRTR0Timer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009-2010 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTS3.cpp b/src/VBox/Runtime/testcase/tstRTS3.cpp index 6dda00540..3b5b05144 100644 --- a/src/VBox/Runtime/testcase/tstRTS3.cpp +++ b/src/VBox/Runtime/testcase/tstRTS3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp index bd5f31a41..a6759a6f9 100644 --- a/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp +++ b/src/VBox/Runtime/testcase/tstRTSemXRoads.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTStrCache.cpp b/src/VBox/Runtime/testcase/tstRTStrCache.cpp index ef466554b..21b0cd467 100644 --- a/src/VBox/Runtime/testcase/tstRTStrCache.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrCache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp index 7af97859d..b87c9924b 100644 --- a/src/VBox/Runtime/testcase/tstRTStrFormat.cpp +++ b/src/VBox/Runtime/testcase/tstRTStrFormat.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTSymlink.cpp b/src/VBox/Runtime/testcase/tstRTSymlink.cpp index 259d522f1..9801b0825 100644 --- a/src/VBox/Runtime/testcase/tstRTSymlink.cpp +++ b/src/VBox/Runtime/testcase/tstRTSymlink.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp index d2febda33..780314f21 100644 --- a/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp +++ b/src/VBox/Runtime/testcase/tstRTSystemQueryOsInfo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTTemp.cpp b/src/VBox/Runtime/testcase/tstRTTemp.cpp index 8eb66206f..c4d29c937 100644 --- a/src/VBox/Runtime/testcase/tstRTTemp.cpp +++ b/src/VBox/Runtime/testcase/tstRTTemp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp index 08f5cc90b..450041f63 100644 --- a/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp +++ b/src/VBox/Runtime/testcase/tstRTTimeSpec.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRTUuid.cpp b/src/VBox/Runtime/testcase/tstRTUuid.cpp index 692bcb941..a2fd7e08d 100644 --- a/src/VBox/Runtime/testcase/tstRTUuid.cpp +++ b/src/VBox/Runtime/testcase/tstRTUuid.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstRand.cpp b/src/VBox/Runtime/testcase/tstRand.cpp index 5205ceaee..88edf856d 100644 --- a/src/VBox/Runtime/testcase/tstRand.cpp +++ b/src/VBox/Runtime/testcase/tstRand.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstSemMutex.cpp b/src/VBox/Runtime/testcase/tstSemMutex.cpp index 373c2b612..1bdb4a915 100644 --- a/src/VBox/Runtime/testcase/tstSemMutex.cpp +++ b/src/VBox/Runtime/testcase/tstSemMutex.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstSemPingPong.cpp b/src/VBox/Runtime/testcase/tstSemPingPong.cpp index 37db163be..0be9f7ef5 100644 --- a/src/VBox/Runtime/testcase/tstSemPingPong.cpp +++ b/src/VBox/Runtime/testcase/tstSemPingPong.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp index f9f11cc64..756b84319 100644 --- a/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp +++ b/src/VBox/Runtime/testcase/tstStrSimplePattern.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstStrToNum.cpp b/src/VBox/Runtime/testcase/tstStrToNum.cpp index 43f899238..53b92275c 100644 --- a/src/VBox/Runtime/testcase/tstStrToNum.cpp +++ b/src/VBox/Runtime/testcase/tstStrToNum.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTSC.cpp b/src/VBox/Runtime/testcase/tstTSC.cpp index 2ebed4feb..71adfba86 100644 --- a/src/VBox/Runtime/testcase/tstTSC.cpp +++ b/src/VBox/Runtime/testcase/tstTSC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp index e72e16b55..ea33f889d 100644 --- a/src/VBox/Runtime/testcase/tstTermCallbacks.cpp +++ b/src/VBox/Runtime/testcase/tstTermCallbacks.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstThread-1.cpp b/src/VBox/Runtime/testcase/tstThread-1.cpp index 715fa491b..e4cfebe82 100644 --- a/src/VBox/Runtime/testcase/tstThread-1.cpp +++ b/src/VBox/Runtime/testcase/tstThread-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTime-2.cpp b/src/VBox/Runtime/testcase/tstTime-2.cpp index aa8288e4f..8d2405d90 100644 --- a/src/VBox/Runtime/testcase/tstTime-2.cpp +++ b/src/VBox/Runtime/testcase/tstTime-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTime-3.cpp b/src/VBox/Runtime/testcase/tstTime-3.cpp index 45985c0f1..dbc60606c 100644 --- a/src/VBox/Runtime/testcase/tstTime-3.cpp +++ b/src/VBox/Runtime/testcase/tstTime-3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTime-4.cpp b/src/VBox/Runtime/testcase/tstTime-4.cpp index 305ce7ce0..08fcd3282 100644 --- a/src/VBox/Runtime/testcase/tstTime-4.cpp +++ b/src/VBox/Runtime/testcase/tstTime-4.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTime.cpp b/src/VBox/Runtime/testcase/tstTime.cpp index 63841e99a..e50975281 100644 --- a/src/VBox/Runtime/testcase/tstTime.cpp +++ b/src/VBox/Runtime/testcase/tstTime.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTimer.cpp b/src/VBox/Runtime/testcase/tstTimer.cpp index 2ac2c1592..6fdee70bc 100644 --- a/src/VBox/Runtime/testcase/tstTimer.cpp +++ b/src/VBox/Runtime/testcase/tstTimer.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstTimerLR.cpp b/src/VBox/Runtime/testcase/tstTimerLR.cpp index 8bba23397..b179ed79e 100644 --- a/src/VBox/Runtime/testcase/tstTimerLR.cpp +++ b/src/VBox/Runtime/testcase/tstTimerLR.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/testcase/tstUtf8.cpp b/src/VBox/Runtime/testcase/tstUtf8.cpp index 890c644b9..90959366e 100644 --- a/src/VBox/Runtime/testcase/tstUtf8.cpp +++ b/src/VBox/Runtime/testcase/tstUtf8.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/tools/RTGzip.cpp b/src/VBox/Runtime/tools/RTGzip.cpp index a30c5871c..44cf854dc 100644 --- a/src/VBox/Runtime/tools/RTGzip.cpp +++ b/src/VBox/Runtime/tools/RTGzip.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/tools/RTLdrFlt.cpp b/src/VBox/Runtime/tools/RTLdrFlt.cpp index 2f56c3b16..42a4071d2 100644 --- a/src/VBox/Runtime/tools/RTLdrFlt.cpp +++ b/src/VBox/Runtime/tools/RTLdrFlt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -176,7 +176,7 @@ int main(int argc, char **argv) return RTEXITCODE_SUCCESS; case 'V': - RTPrintf("$Revision: 78250 $\n"); + RTPrintf("$Revision: 83687 $\n"); return RTEXITCODE_SUCCESS; case VINF_GETOPT_NOT_OPTION: diff --git a/src/VBox/Runtime/tools/RTManifest.cpp b/src/VBox/Runtime/tools/RTManifest.cpp index ba67df46d..828204d0a 100644 --- a/src/VBox/Runtime/tools/RTManifest.cpp +++ b/src/VBox/Runtime/tools/RTManifest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/tools/RTTar.cpp b/src/VBox/Runtime/tools/RTTar.cpp index d204db2bb..784dfe9b9 100644 --- a/src/VBox/Runtime/tools/RTTar.cpp +++ b/src/VBox/Runtime/tools/RTTar.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp index 4164eefef..41275fe4b 100644 --- a/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp +++ b/src/VBox/Runtime/win/RTErrConvertFromWin32.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm index 781d29337..4cba3892f 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitClear.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm index d50ac6211..c84ccd351 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitTestAndToggle.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm b/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm index c1dbb74f1..21790e05a 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicBitToggle.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm b/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm index d166f69e2..b20128551 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicReadU64.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm index 9689047ce..d4e85be52 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU16.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm index 467feb323..a7abc347f 100644 --- a/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm +++ b/src/VBox/Runtime/win/amd64/ASMAtomicXchgU8.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm b/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm index 63d7dbf6b..acff245cd 100644 --- a/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm +++ b/src/VBox/Runtime/win/amd64/ASMBitFirstClear.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm b/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm index ebd5df349..4d48d2e97 100644 --- a/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm +++ b/src/VBox/Runtime/win/amd64/ASMBitFirstSet.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetCS.asm b/src/VBox/Runtime/win/amd64/ASMGetCS.asm index 7541e3c75..b07e9e2bf 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetCS.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetCS.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR0.asm b/src/VBox/Runtime/win/amd64/ASMGetDR0.asm index bb66d7b95..9fdd308ff 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR0.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR0.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR1.asm b/src/VBox/Runtime/win/amd64/ASMGetDR1.asm index ca02acbbb..7c4d091ce 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR1.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR1.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR2.asm b/src/VBox/Runtime/win/amd64/ASMGetDR2.asm index 6e3b45ef8..be74bff3c 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR2.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR2.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR3.asm b/src/VBox/Runtime/win/amd64/ASMGetDR3.asm index 8d0ab5e0b..68f378879 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR3.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR3.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR6.asm b/src/VBox/Runtime/win/amd64/ASMGetDR6.asm index 04d512a1a..7125ff0ef 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR6.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR6.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDR7.asm b/src/VBox/Runtime/win/amd64/ASMGetDR7.asm index e961f68e0..b97eceb3f 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDR7.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDR7.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetDS.asm b/src/VBox/Runtime/win/amd64/ASMGetDS.asm index 0135c1ad9..3c155fc6d 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetDS.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetDS.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetES.asm b/src/VBox/Runtime/win/amd64/ASMGetES.asm index 06f502ca2..a13dc06bf 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetES.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetES.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetFS.asm b/src/VBox/Runtime/win/amd64/ASMGetFS.asm index 01750c96d..107b9cce8 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetFS.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetFS.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetFlags.asm b/src/VBox/Runtime/win/amd64/ASMGetFlags.asm index f6dd30330..6a2790d21 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetFlags.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetFlags.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetGDTR.asm b/src/VBox/Runtime/win/amd64/ASMGetGDTR.asm index 0356e3c50..d8cd548b6 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetGDTR.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetGDTR.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetGS.asm b/src/VBox/Runtime/win/amd64/ASMGetGS.asm index 6b958c46c..ea50571b2 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetGS.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetGS.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetIDTR.asm b/src/VBox/Runtime/win/amd64/ASMGetIDTR.asm index 7f098fe4f..bc97a87b6 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetIDTR.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetIDTR.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetSS.asm b/src/VBox/Runtime/win/amd64/ASMGetSS.asm index c297d41dd..206e35c3b 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetSS.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetSS.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMGetTR.asm b/src/VBox/Runtime/win/amd64/ASMGetTR.asm index 8a3f5ce89..6b40e05bb 100644 --- a/src/VBox/Runtime/win/amd64/ASMGetTR.asm +++ b/src/VBox/Runtime/win/amd64/ASMGetTR.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm b/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm index 06ab2c04f..bfc6a53ae 100644 --- a/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm +++ b/src/VBox/Runtime/win/amd64/ASMProbeReadByte.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Runtime/win/amd64/ASMSetFlags.asm b/src/VBox/Runtime/win/amd64/ASMSetFlags.asm index 22280c2c4..8744def80 100644 --- a/src/VBox/Runtime/win/amd64/ASMSetFlags.asm +++ b/src/VBox/Runtime/win/amd64/ASMSetFlags.asm @@ -3,7 +3,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/DMG.cpp b/src/VBox/Storage/DMG.cpp index 39fe15875..3dc37d443 100644 --- a/src/VBox/Storage/DMG.cpp +++ b/src/VBox/Storage/DMG.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1996,7 +1996,9 @@ static int dmgSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pThis || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL))) + if (!pThis || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL + | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/Debug/VDDbgIoLog.cpp b/src/VBox/Storage/Debug/VDDbgIoLog.cpp index 956b368a3..5aa4cffab 100644 --- a/src/VBox/Storage/Debug/VDDbgIoLog.cpp +++ b/src/VBox/Storage/Debug/VDDbgIoLog.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/ISCSI.cpp b/src/VBox/Storage/ISCSI.cpp index 76b244445..7b4e1dd86 100644 --- a/src/VBox/Storage/ISCSI.cpp +++ b/src/VBox/Storage/ISCSI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -256,7 +256,7 @@ typedef enum ISCSISTATE } ISCSISTATE; /** - * iSCSI PDU send flags (and maybe more in the future). */ + * iSCSI PDU send/receive flags (and maybe more in the future). */ typedef enum ISCSIPDUFLAGS { /** No special flags */ @@ -671,7 +671,7 @@ static const VDCONFIGINFO s_iscsiConfigInfo[] = /* iSCSI low-level functions (only to be used from the iSCSI high-level functions). */ static uint32_t iscsiNewITT(PISCSIIMAGE pImage); static int iscsiSendPDU(PISCSIIMAGE pImage, PISCSIREQ paReq, uint32_t cnReq, uint32_t uFlags); -static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint32_t cnRes); +static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint32_t cnRes, uint32_t fFlags); static int iscsiRecvPDUAsync(PISCSIIMAGE pImage); static int iscsiSendPDUAsync(PISCSIIMAGE pImage); static int iscsiValidatePDU(PISCSIRES paRes, uint32_t cnRes); @@ -1204,6 +1204,7 @@ static int iscsiAttach(void *pvUser) uint32_t cnISCSIRes; ISCSIRES aISCSIRes[2]; uint32_t aResBHS[12]; + unsigned cRetries = 5; char *pszNext; PISCSIIMAGE pImage = (PISCSIIMAGE)pvUser; @@ -1240,6 +1241,20 @@ static int iscsiAttach(void *pvUser) iscsiTransportClose(pImage); restart: + if (!cRetries) + { + /* + * Prevent the iSCSI initiator to go into normal state if we are here, + * even if there is no error code set. + */ + if (RT_SUCCESS(rc)) + { + AssertMsgFailed(("Success status code set while out of retries\n")); + rc = VERR_IPE_UNEXPECTED_STATUS; + } + goto out; + } + if (!iscsiIsClientConnected(pImage)) { rc = iscsiTransportOpen(pImage); @@ -1379,8 +1394,17 @@ restart: aISCSIRes[cnISCSIRes].cbSeg = sizeof(bBuf); cnISCSIRes++; - rc = iscsiRecvPDU(pImage, itt, aISCSIRes, cnISCSIRes); - if (RT_FAILURE(rc)) + rc = iscsiRecvPDU(pImage, itt, aISCSIRes, cnISCSIRes, ISCSIPDU_NO_REATTACH); + if (rc == VERR_BROKEN_PIPE || rc == VERR_NET_CONNECTION_REFUSED) + { + /* + * We lost connection to the target while receiving the answer, + * start from the beginning. + */ + cRetries--; + goto restart; + } + else if (RT_FAILURE(rc)) break; /** @todo collect partial login responses with Continue bit set. */ Assert(aISCSIRes[0].pvSeg == aResBHS); @@ -1716,7 +1740,7 @@ static int iscsiDetach(void *pvUser) aISCSIRes.pvSeg = aResBHS; aISCSIRes.cbSeg = sizeof(aResBHS); - rc = iscsiRecvPDU(pImage, itt, &aISCSIRes, 1); + rc = iscsiRecvPDU(pImage, itt, &aISCSIRes, 1, ISCSIPDU_NO_REATTACH); if (RT_SUCCESS(rc)) { if (RT_N2H_U32(aResBHS[0]) != (ISCSI_FINAL_BIT | ISCSIOP_LOGOUT_RES)) @@ -1877,7 +1901,7 @@ static int iscsiCommand(PISCSIIMAGE pImage, PSCSIREQ pRequest) aISCSIRes[cnISCSIRes].cbSeg = sizeof(aStatus); cnISCSIRes++; - rc = iscsiRecvPDU(pImage, itt, aISCSIRes, cnISCSIRes); + rc = iscsiRecvPDU(pImage, itt, aISCSIRes, cnISCSIRes, ISCSIPDU_DEFAULT); if (RT_FAILURE(rc)) break; @@ -2056,8 +2080,10 @@ static int iscsiSendPDU(PISCSIIMAGE pImage, PISCSIREQ paReq, uint32_t cnReq, * @param pImage The iSCSI connection state to be used. * @param paRes Pointer to array of iSCSI response sections. * @param cnRes Number of valid iSCSI response sections in the array. + * @param fRecvFlags PDU receive flags. */ -static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint32_t cnRes) +static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint32_t cnRes, + uint32_t fRecvFlags) { int rc = VINF_SUCCESS; ISCSIRES aResBuf; @@ -2078,19 +2104,21 @@ static int iscsiRecvPDU(PISCSIIMAGE pImage, uint32_t itt, PISCSIRES paRes, uint3 * try to restart by re-sending the original request (if any). * This also handles the connection reestablishment (login etc.). */ RTThreadSleep(500); - if (pImage->state != ISCSISTATE_IN_LOGIN) + if ( pImage->state != ISCSISTATE_IN_LOGIN + && !(fRecvFlags & ISCSIPDU_NO_REATTACH)) { /* Attempt to re-login when a connection fails, but only when not * currently logging in. */ rc = iscsiAttach(pImage); if (RT_FAILURE(rc)) break; - } - if (pImage->paCurrReq != NULL) - { - rc = iscsiSendPDU(pImage, pImage->paCurrReq, pImage->cnCurrReq, ISCSIPDU_DEFAULT); - if (RT_FAILURE(rc)) - break; + + if (pImage->paCurrReq != NULL) + { + rc = iscsiSendPDU(pImage, pImage->paCurrReq, pImage->cnCurrReq, ISCSIPDU_DEFAULT); + if (RT_FAILURE(rc)) + break; + } } } else @@ -4934,7 +4962,9 @@ static int iscsiSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/Parallels.cpp b/src/VBox/Storage/Parallels.cpp index d0393871c..64ec397d5 100644 --- a/src/VBox/Storage/Parallels.cpp +++ b/src/VBox/Storage/Parallels.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -965,7 +965,9 @@ static int parallelsSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_ASYNC_IO))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/QCOW.cpp b/src/VBox/Storage/QCOW.cpp index 9572e1dcb..ecbcfb7d4 100644 --- a/src/VBox/Storage/QCOW.cpp +++ b/src/VBox/Storage/QCOW.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2194,7 +2194,8 @@ static int qcowSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/QED.cpp b/src/VBox/Storage/QED.cpp index f27957d0d..4c47fcbd0 100644 --- a/src/VBox/Storage/QED.cpp +++ b/src/VBox/Storage/QED.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2208,7 +2208,8 @@ static int qedSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/RAW.cpp b/src/VBox/Storage/RAW.cpp index 801e1ceae..5cdf757ad 100644 --- a/src/VBox/Storage/RAW.cpp +++ b/src/VBox/Storage/RAW.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -905,7 +905,9 @@ static int rawSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/VCICache.cpp b/src/VBox/Storage/VCICache.cpp index 1cc792ea8..bcce952e5 100644 --- a/src/VBox/Storage/VCICache.cpp +++ b/src/VBox/Storage/VCICache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/VD.cpp b/src/VBox/Storage/VD.cpp index 1ad8a0f60..3a9a3d03c 100644 --- a/src/VBox/Storage/VD.cpp +++ b/src/VBox/Storage/VD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -6652,7 +6652,11 @@ VBOXDDU_DECL(int) VDMerge(PVBOXHDD pDisk, unsigned nImageFrom, unsigned uOpenFlags = pImageTo->Backend->pfnGetOpenFlags(pImageTo->pBackendData); if (uOpenFlags & VD_OPEN_FLAGS_READONLY) { - uOpenFlags &= ~VD_OPEN_FLAGS_READONLY; + /* + * Clear skip consistency checks because the image is made writable now and + * skipping consistency checks is only possible for readonly images. + */ + uOpenFlags &= ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS); rc = pImageTo->Backend->pfnSetOpenFlags(pImageTo->pBackendData, uOpenFlags); if (RT_FAILURE(rc)) @@ -7604,6 +7608,8 @@ VBOXDDU_DECL(int) VDResize(PVBOXHDD pDisk, uint64_t cbSize, { if (pIfProgress && pIfProgress->pfnProgress) pIfProgress->pfnProgress(pIfProgress->Core.pvUser, 100); + + pDisk->cbSize = cbSize; } LogFlowFunc(("returns %Rrc\n", rc)); diff --git a/src/VBox/Storage/VDI.cpp b/src/VBox/Storage/VDI.cpp index f20f18743..5c1ac8466 100644 --- a/src/VBox/Storage/VDI.cpp +++ b/src/VBox/Storage/VDI.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2036,7 +2036,10 @@ static int vdiSetOpenFlags(void *pBackendData, unsigned uOpenFlags) const char *pszFilename; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_DISCARD))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_DISCARD + | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; @@ -2931,8 +2934,6 @@ static int vdiResize(void *pBackendData, uint64_t cbSize, void *pvBuf = NULL, *pvZero = NULL; do { - VDIIMAGEBLOCKPOINTER uBlock = 0; - /* Allocate data buffer. */ pvBuf = RTMemAllocZ(pImage->cbTotalBlockData); if (!pvBuf) @@ -2954,7 +2955,7 @@ static int vdiResize(void *pBackendData, uint64_t cbSize, /* Search the index in the block table. */ for (unsigned idxBlock = 0; idxBlock < cBlocksOld; idxBlock++) { - if (pImage->paBlocks[idxBlock] == uBlock) + if (!pImage->paBlocks[idxBlock]) { /* Read data and append to the end of the image. */ rc = vdIfIoIntFileReadSync(pImage->pIfIo, pImage->pStorage, @@ -3006,7 +3007,6 @@ static int vdiResize(void *pBackendData, uint64_t cbSize, if (RT_FAILURE(rc)) break; - uBlock++; offStartDataNew += pImage->cbTotalBlockData; } } while (0); @@ -3055,6 +3055,7 @@ static int vdiResize(void *pBackendData, uint64_t cbSize, setImageBlocks(&pImage->Header, cBlocksNew); /* Update geometry. */ pImage->PCHSGeometry = *pPCHSGeometry; + pImage->cbImage = cbSize; PVDIDISKGEOMETRY pGeometry = getImageLCHSGeometry(&pImage->Header); if (pGeometry) diff --git a/src/VBox/Storage/VDICore.h b/src/VBox/Storage/VDICore.h index 4931adb17..10b9ed76a 100644 --- a/src/VBox/Storage/VDICore.h +++ b/src/VBox/Storage/VDICore.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/VHD.cpp b/src/VBox/Storage/VHD.cpp index c246727e8..9a4d3a958 100644 --- a/src/VBox/Storage/VHD.cpp +++ b/src/VBox/Storage/VHD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -304,37 +304,68 @@ static int vhdLocatorUpdate(PVHDIMAGE pImage, PVHDPLE pLocator, const char *pszF char *pszTmp; if (!pvBuf) - { - rc = VERR_NO_MEMORY; - goto out; - } + return VERR_NO_MEMORY; switch (RT_BE2H_U32(pLocator->u32Code)) { case VHD_PLATFORM_CODE_WI2R: - /* Update plain relative name. */ - cb = (uint32_t)strlen(pszFilename); - if (cb > cbMaxLen) + { + if (RTPathStartsWithRoot(pszFilename)) { - rc = VERR_FILENAME_TOO_LONG; - goto out; + /* Convert to relative path. */ + char szPath[RTPATH_MAX]; + rc = RTPathCalcRelative(szPath, sizeof(szPath), pImage->pszFilename, + pszFilename); + if (RT_SUCCESS(rc)) + { + /* Update plain relative name. */ + cb = (uint32_t)strlen(szPath); + if (cb > cbMaxLen) + { + rc = VERR_FILENAME_TOO_LONG; + break; + } + memcpy(pvBuf, szPath, cb); + } + } + else + { + /* Update plain relative name. */ + cb = (uint32_t)strlen(pszFilename); + if (cb > cbMaxLen) + { + rc = VERR_FILENAME_TOO_LONG; + break; + } + memcpy(pvBuf, pszFilename, cb); } - memcpy(pvBuf, pszFilename, cb); pLocator->u32DataLength = RT_H2BE_U32(cb); break; + } case VHD_PLATFORM_CODE_WI2K: /* Update plain absolute name. */ rc = RTPathAbs(pszFilename, (char *)pvBuf, cbMaxLen); - if (RT_FAILURE(rc)) - goto out; - pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf)); + if (RT_SUCCESS(rc)) + pLocator->u32DataLength = RT_H2BE_U32((uint32_t)strlen((const char *)pvBuf)); break; case VHD_PLATFORM_CODE_W2RU: - /* Update unicode relative name. */ - rc = vhdFilenameToUtf16(pszFilename, (uint16_t *)pvBuf, cbMaxLen, &cb, false); - if (RT_FAILURE(rc)) - goto out; - pLocator->u32DataLength = RT_H2BE_U32(cb); + if (RTPathStartsWithRoot(pszFilename)) + { + /* Convert to relative path. */ + char szPath[RTPATH_MAX]; + rc = RTPathCalcRelative(szPath, sizeof(szPath), pImage->pszFilename, + pszFilename); + if (RT_SUCCESS(rc)) + rc = vhdFilenameToUtf16(szPath, (uint16_t *)pvBuf, cbMaxLen, &cb, false); + } + else + { + /* Update unicode relative name. */ + rc = vhdFilenameToUtf16(pszFilename, (uint16_t *)pvBuf, cbMaxLen, &cb, false); + } + + if (RT_SUCCESS(rc)) + pLocator->u32DataLength = RT_H2BE_U32(cb); break; case VHD_PLATFORM_CODE_W2KU: /* Update unicode absolute name. */ @@ -342,30 +373,30 @@ static int vhdLocatorUpdate(PVHDIMAGE pImage, PVHDPLE pLocator, const char *pszF if (!pszTmp) { rc = VERR_NO_MEMORY; - goto out; + break; } rc = RTPathAbs(pszFilename, pszTmp, cbMaxLen); if (RT_FAILURE(rc)) { RTMemTmpFree(pszTmp); - goto out; + break; } rc = vhdFilenameToUtf16(pszTmp, (uint16_t *)pvBuf, cbMaxLen, &cb, false); RTMemTmpFree(pszTmp); - if (RT_FAILURE(rc)) - goto out; - pLocator->u32DataLength = RT_H2BE_U32(cb); + if (RT_SUCCESS(rc)) + pLocator->u32DataLength = RT_H2BE_U32(cb); break; default: rc = VERR_NOT_IMPLEMENTED; - goto out; + break; } - rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage, - RT_BE2H_U64(pLocator->u64DataOffset), - pvBuf, RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE, - NULL); -out: + if (RT_SUCCESS(rc)) + rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pImage->pStorage, + RT_BE2H_U64(pLocator->u64DataOffset), + pvBuf, RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE, + NULL); + if (pvBuf) RTMemTmpFree(pvBuf); return rc; @@ -958,29 +989,26 @@ static void vhdSetDiskGeometry(PVHDIMAGE pImage, uint64_t cbSize) static uint32_t vhdAllocateParentLocators(PVHDIMAGE pImage, VHDDynamicDiskHeader *pDDH, uint64_t u64Offset) { PVHDPLE pLocator = pDDH->ParentLocatorEntry; - /* Relative Windows path. */ - pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_WI2R); - pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH / VHD_SECTOR_SIZE); - pLocator->u64DataOffset = RT_H2BE_U64(u64Offset); - u64Offset += VHD_RELATIVE_MAX_PATH; - pLocator++; - /* Absolute Windows path. */ - pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_WI2K); - pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH / VHD_SECTOR_SIZE); + + /* + * The VHD spec states that the DataSpace field holds the number of sectors + * required to store the parent locator path. + * As it turned out VPC and Hyper-V store the amount of bytes reserved for the + * path and not the number of sectors. + */ + + /* Unicode absolute Windows path. */ + pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2KU); + pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16)); pLocator->u64DataOffset = RT_H2BE_U64(u64Offset); - u64Offset += VHD_ABSOLUTE_MAX_PATH; pLocator++; + u64Offset += VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16); /* Unicode relative Windows path. */ pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2RU); - pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16) / VHD_SECTOR_SIZE); + pLocator->u32DataSpace = RT_H2BE_U32(VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16)); pLocator->u64DataOffset = RT_H2BE_U64(u64Offset); u64Offset += VHD_RELATIVE_MAX_PATH * sizeof(RTUTF16); - pLocator++; - /* Unicode absolute Windows path. */ - pLocator->u32Code = RT_H2BE_U32(VHD_PLATFORM_CODE_W2KU); - pLocator->u32DataSpace = RT_H2BE_U32(VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16) / VHD_SECTOR_SIZE); - pLocator->u64DataOffset = RT_H2BE_U64(u64Offset); - return u64Offset + VHD_ABSOLUTE_MAX_PATH * sizeof(RTUTF16); + return u64Offset; } /** @@ -1924,7 +1952,9 @@ static int vhdSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/VHDX.cpp b/src/VBox/Storage/VHDX.cpp index 035f3d04c..e521e9376 100644 --- a/src/VBox/Storage/VHDX.cpp +++ b/src/VBox/Storage/VHDX.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2012 Oracle Corporation + * Copyright (C) 2012-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -2161,7 +2161,7 @@ static int vhdxSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc = VINF_SUCCESS; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO))) + if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) rc = VERR_INVALID_PARAMETER; else { diff --git a/src/VBox/Storage/VMDK.cpp b/src/VBox/Storage/VMDK.cpp index 6eabea0ed..4d6fad19b 100644 --- a/src/VBox/Storage/VMDK.cpp +++ b/src/VBox/Storage/VMDK.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -6535,7 +6535,9 @@ static int vmdkSetOpenFlags(void *pBackendData, unsigned uOpenFlags) int rc; /* Image must be opened and the new flags must be valid. */ - if (!pImage || (uOpenFlags & ~(VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE | VD_OPEN_FLAGS_SEQUENTIAL))) + if (!pImage || (uOpenFlags & ~( VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO + | VD_OPEN_FLAGS_ASYNC_IO | VD_OPEN_FLAGS_SHAREABLE + | VD_OPEN_FLAGS_SEQUENTIAL | VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))) { rc = VERR_INVALID_PARAMETER; goto out; diff --git a/src/VBox/Storage/testcase/VDIoBackendMem.cpp b/src/VBox/Storage/testcase/VDIoBackendMem.cpp index a3ab17936..481180ad8 100644 --- a/src/VBox/Storage/testcase/VDIoBackendMem.cpp +++ b/src/VBox/Storage/testcase/VDIoBackendMem.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVD-2.cpp b/src/VBox/Storage/testcase/tstVD-2.cpp index 13821789d..7e81ffc93 100644 --- a/src/VBox/Storage/testcase/tstVD-2.cpp +++ b/src/VBox/Storage/testcase/tstVD-2.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVD.cpp b/src/VBox/Storage/testcase/tstVD.cpp index c858e96ce..953b5c34f 100644 --- a/src/VBox/Storage/testcase/tstVD.cpp +++ b/src/VBox/Storage/testcase/tstVD.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVDCopy.cpp b/src/VBox/Storage/testcase/tstVDCopy.cpp index ef8a37e27..6d73560be 100644 --- a/src/VBox/Storage/testcase/tstVDCopy.cpp +++ b/src/VBox/Storage/testcase/tstVDCopy.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVDIo.cpp b/src/VBox/Storage/testcase/tstVDIo.cpp index d492c50a4..b89321947 100644 --- a/src/VBox/Storage/testcase/tstVDIo.cpp +++ b/src/VBox/Storage/testcase/tstVDIo.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVDShareable.cpp b/src/VBox/Storage/testcase/tstVDShareable.cpp index 98957fb7e..834f6a967 100644 --- a/src/VBox/Storage/testcase/tstVDShareable.cpp +++ b/src/VBox/Storage/testcase/tstVDShareable.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/tstVDSnap.cpp b/src/VBox/Storage/testcase/tstVDSnap.cpp index 83313e1f9..d32fa5bed 100644 --- a/src/VBox/Storage/testcase/tstVDSnap.cpp +++ b/src/VBox/Storage/testcase/tstVDSnap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/Storage/testcase/vbox-img.cpp b/src/VBox/Storage/testcase/vbox-img.cpp index 8fb9e0bf0..a366ad20c 100644 --- a/src/VBox/Storage/testcase/vbox-img.cpp +++ b/src/VBox/Storage/testcase/vbox-img.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/Docs-CodingGuidelines.cpp b/src/VBox/VMM/Docs-CodingGuidelines.cpp index e35ae72f9..f45804840 100644 --- a/src/VBox/VMM/Docs-CodingGuidelines.cpp +++ b/src/VBox/VMM/Docs-CodingGuidelines.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/Docs-RawMode.cpp b/src/VBox/VMM/Docs-RawMode.cpp index 662ea93d6..9b60d27d7 100644 --- a/src/VBox/VMM/Docs-RawMode.cpp +++ b/src/VBox/VMM/Docs-RawMode.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/CPUMAllA.asm b/src/VBox/VMM/VMMAll/CPUMAllA.asm index ac050d063..b0dcd8505 100644 --- a/src/VBox/VMM/VMMAll/CPUMAllA.asm +++ b/src/VBox/VMM/VMMAll/CPUMAllA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/CPUMStack.cpp b/src/VBox/VMM/VMMAll/CPUMStack.cpp index 31506e4b7..2d9ba0079 100644 --- a/src/VBox/VMM/VMMAll/CPUMStack.cpp +++ b/src/VBox/VMM/VMMAll/CPUMStack.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/CSAMAll.cpp b/src/VBox/VMM/VMMAll/CSAMAll.cpp index db9143d9f..b06d9138a 100644 --- a/src/VBox/VMM/VMMAll/CSAMAll.cpp +++ b/src/VBox/VMM/VMMAll/CSAMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/DBGFAll.cpp b/src/VBox/VMM/VMMAll/DBGFAll.cpp index 716b61897..5b1bbc1d8 100644 --- a/src/VBox/VMM/VMMAll/DBGFAll.cpp +++ b/src/VBox/VMM/VMMAll/DBGFAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/EMAllA.asm b/src/VBox/VMM/VMMAll/EMAllA.asm index bb1eee820..46c9d3f8f 100644 --- a/src/VBox/VMM/VMMAll/EMAllA.asm +++ b/src/VBox/VMM/VMMAll/EMAllA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/FTMAll.cpp b/src/VBox/VMM/VMMAll/FTMAll.cpp index e47c3fce8..3cbc927a3 100644 --- a/src/VBox/VMM/VMMAll/FTMAll.cpp +++ b/src/VBox/VMM/VMMAll/FTMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/IOMAll.cpp b/src/VBox/VMM/VMMAll/IOMAll.cpp index 7c6e5cc17..5edb1d942 100644 --- a/src/VBox/VMM/VMMAll/IOMAll.cpp +++ b/src/VBox/VMM/VMMAll/IOMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp index ba4133e64..eec8dd31f 100644 --- a/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp +++ b/src/VBox/VMM/VMMAll/IOMAllMMIO.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/MMAll.cpp b/src/VBox/VMM/VMMAll/MMAll.cpp index b34d0c5e5..67f5f024c 100644 --- a/src/VBox/VMM/VMMAll/MMAll.cpp +++ b/src/VBox/VMM/VMMAll/MMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/MMAllHyper.cpp b/src/VBox/VMM/VMMAll/MMAllHyper.cpp index 4d12895b9..4dc2d1a7c 100644 --- a/src/VBox/VMM/VMMAll/MMAllHyper.cpp +++ b/src/VBox/VMM/VMMAll/MMAllHyper.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp index 642442293..8f915b24f 100644 --- a/src/VBox/VMM/VMMAll/MMAllPagePool.cpp +++ b/src/VBox/VMM/VMMAll/MMAllPagePool.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PATMAll.cpp b/src/VBox/VMM/VMMAll/PATMAll.cpp index 60a9642d2..d5545f908 100644 --- a/src/VBox/VMM/VMMAll/PATMAll.cpp +++ b/src/VBox/VMM/VMMAll/PATMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PDMAll.cpp b/src/VBox/VMM/VMMAll/PDMAll.cpp index b61beabeb..360181279 100644 --- a/src/VBox/VMM/VMMAll/PDMAll.cpp +++ b/src/VBox/VMM/VMMAll/PDMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp index 55099ecb3..341035ee8 100644 --- a/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllCritSect.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp index ddc5ff423..9810db871 100644 --- a/src/VBox/VMM/VMMAll/PDMAllQueue.cpp +++ b/src/VBox/VMM/VMMAll/PDMAllQueue.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PGMAll.cpp b/src/VBox/VMM/VMMAll/PGMAll.cpp index 84f80021c..31ad044a0 100644 --- a/src/VBox/VMM/VMMAll/PGMAll.cpp +++ b/src/VBox/VMM/VMMAll/PGMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PGMAllGst.h b/src/VBox/VMM/VMMAll/PGMAllGst.h index 9d8d63170..0b94e510f 100644 --- a/src/VBox/VMM/VMMAll/PGMAllGst.h +++ b/src/VBox/VMM/VMMAll/PGMAllGst.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp index faa827f80..7588bd2d9 100644 --- a/src/VBox/VMM/VMMAll/PGMAllHandler.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllHandler.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp index 0bb156e68..1f1ec44ab 100644 --- a/src/VBox/VMM/VMMAll/PGMAllPhys.cpp +++ b/src/VBox/VMM/VMMAll/PGMAllPhys.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/PGMAllShw.h b/src/VBox/VMM/VMMAll/PGMAllShw.h index be2fff7f8..edccab115 100644 --- a/src/VBox/VMM/VMMAll/PGMAllShw.h +++ b/src/VBox/VMM/VMMAll/PGMAllShw.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/REMAll.cpp b/src/VBox/VMM/VMMAll/REMAll.cpp index d119ab874..61a151c70 100644 --- a/src/VBox/VMM/VMMAll/REMAll.cpp +++ b/src/VBox/VMM/VMMAll/REMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/TMAll.cpp b/src/VBox/VMM/VMMAll/TMAll.cpp index 41eff3397..3c7341885 100644 --- a/src/VBox/VMM/VMMAll/TMAll.cpp +++ b/src/VBox/VMM/VMMAll/TMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/TMAllCpu.cpp b/src/VBox/VMM/VMMAll/TMAllCpu.cpp index f41adfa4d..7158f3121 100644 --- a/src/VBox/VMM/VMMAll/TMAllCpu.cpp +++ b/src/VBox/VMM/VMMAll/TMAllCpu.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/TMAllReal.cpp b/src/VBox/VMM/VMMAll/TMAllReal.cpp index 7c2e5a72f..a68a441c6 100644 --- a/src/VBox/VMM/VMMAll/TMAllReal.cpp +++ b/src/VBox/VMM/VMMAll/TMAllReal.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp index 0fb69fb9a..2c044c525 100644 --- a/src/VBox/VMM/VMMAll/TMAllVirtual.cpp +++ b/src/VBox/VMM/VMMAll/TMAllVirtual.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/TRPMAll.cpp b/src/VBox/VMM/VMMAll/TRPMAll.cpp index b7a93301f..c4cc67003 100644 --- a/src/VBox/VMM/VMMAll/TRPMAll.cpp +++ b/src/VBox/VMM/VMMAll/TRPMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/VMAll.cpp b/src/VBox/VMM/VMMAll/VMAll.cpp index 157406269..2d6a5ad97 100644 --- a/src/VBox/VMM/VMMAll/VMAll.cpp +++ b/src/VBox/VMM/VMMAll/VMAll.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMAll/VMMAllA.asm b/src/VBox/VMM/VMMAll/VMMAllA.asm index dae37ada3..7d07774c1 100644 --- a/src/VBox/VMM/VMMAll/VMMAllA.asm +++ b/src/VBox/VMM/VMMAll/VMMAllA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2009 Oracle Corporation +; Copyright (C) 2009-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/CPUMR0.cpp b/src/VBox/VMM/VMMR0/CPUMR0.cpp index 146278f7a..039b9e38a 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0.cpp +++ b/src/VBox/VMM/VMMR0/CPUMR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/CPUMR0A.asm b/src/VBox/VMM/VMMR0/CPUMR0A.asm index aa09beac7..b2548b456 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0A.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0A.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm index 1a4b58683..d61db9126 100644 --- a/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm +++ b/src/VBox/VMM/VMMR0/CPUMR0UnusedA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/GMMR0.cpp b/src/VBox/VMM/VMMR0/GMMR0.cpp index 54b7a732a..efa76196f 100644 --- a/src/VBox/VMM/VMMR0/GMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GMMR0.cpp @@ -2380,12 +2380,13 @@ static uint32_t gmmR0AllocatePagesInBoundMode(PGVM pGVM, uint32_t iPage, uint32_ /** - * Checks if we should start picking pages from chunks of other VMs. + * Checks if we should start picking pages from chunks of other VMs because + * we're getting close to the system memory or reserved limit. * * @returns @c true if we should, @c false if we should first try allocate more * chunks. */ -static bool gmmR0ShouldAllocatePagesInOtherChunks(PGVM pGVM) +static bool gmmR0ShouldAllocatePagesInOtherChunksBecauseOfLimits(PGVM pGVM) { /* * Don't allocate a new chunk if we're @@ -2413,6 +2414,24 @@ static bool gmmR0ShouldAllocatePagesInOtherChunks(PGVM pGVM) /** + * Checks if we should start picking pages from chunks of other VMs because + * there is a lot of free pages around. + * + * @returns @c true if we should, @c false if we should first try allocate more + * chunks. + */ +static bool gmmR0ShouldAllocatePagesInOtherChunksBecauseOfLotsFree(PGMM pGMM) +{ + /* + * Setting the limit at 16 chunks (32 MB) at the moment. + */ + if (pGMM->PrivateX.cFreePages >= GMM_CHUNK_NUM_PAGES * 16) + return true; + return false; +} + + +/** * Common worker for GMMR0AllocateHandyPages and GMMR0AllocatePages. * * @returns VBox status code: @@ -2536,8 +2555,12 @@ static int gmmR0AllocatePagesNew(PGMM pGMM, PGVM pGVM, uint32_t cPages, PGMMPAGE { /* Maybe we should try getting pages from chunks "belonging" to other VMs before allocating more chunks? */ - if (gmmR0ShouldAllocatePagesInOtherChunks(pGVM)) + bool fTriedOnSameAlready = false; + if (gmmR0ShouldAllocatePagesInOtherChunksBecauseOfLimits(pGVM)) + { iPage = gmmR0AllocatePagesFromSameNode(&pGMM->PrivateX, pGVM, iPage, cPages, paPages); + fTriedOnSameAlready = true; + } /* Allocate memory from empty chunks. */ if (iPage < cPages) @@ -2547,6 +2570,16 @@ static int gmmR0AllocatePagesNew(PGMM pGMM, PGVM pGVM, uint32_t cPages, PGMMPAGE if (iPage < cPages) iPage = gmmR0AllocatePagesFromEmptyChunksOnSameNode(&pGMM->Shared, pGVM, iPage, cPages, paPages); + /* If there is a lof of free pages spread around, try not waste + system memory on more chunks. (Should trigger defragmentation.) */ + if ( !fTriedOnSameAlready + && gmmR0ShouldAllocatePagesInOtherChunksBecauseOfLotsFree(pGMM)) + { + iPage = gmmR0AllocatePagesFromSameNode(&pGMM->PrivateX, pGVM, iPage, cPages, paPages); + if (iPage < cPages) + iPage = gmmR0AllocatePagesIndiscriminately(&pGMM->PrivateX, pGVM, iPage, cPages, paPages); + } + /* * Ok, try allocate new chunks. */ diff --git a/src/VBox/VMM/VMMR0/GMMR0Internal.h b/src/VBox/VMM/VMMR0/GMMR0Internal.h index ca6f5e16d..0ce8986bd 100644 --- a/src/VBox/VMM/VMMR0/GMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GMMR0Internal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/GVMMR0.cpp b/src/VBox/VMM/VMMR0/GVMMR0.cpp index ed0d6035d..0fa9046d4 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0.cpp +++ b/src/VBox/VMM/VMMR0/GVMMR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/GVMMR0Internal.h b/src/VBox/VMM/VMMR0/GVMMR0Internal.h index 40b1b0003..7e937f043 100644 --- a/src/VBox/VMM/VMMR0/GVMMR0Internal.h +++ b/src/VBox/VMM/VMMR0/GVMMR0Internal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/HWACCMR0.cpp b/src/VBox/VMM/VMMR0/HWACCMR0.cpp index e4c1d79aa..358098812 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0.cpp +++ b/src/VBox/VMM/VMMR0/HWACCMR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/HWACCMR0A.asm b/src/VBox/VMM/VMMR0/HWACCMR0A.asm index f60986198..1e7aa6e38 100644 --- a/src/VBox/VMM/VMMR0/HWACCMR0A.asm +++ b/src/VBox/VMM/VMMR0/HWACCMR0A.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/HWVMXR0.cpp b/src/VBox/VMM/VMMR0/HWVMXR0.cpp index 7e88e8fb8..3f882b1ed 100644 --- a/src/VBox/VMM/VMMR0/HWVMXR0.cpp +++ b/src/VBox/VMM/VMMR0/HWVMXR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -910,7 +910,7 @@ static int hmR0VmxInjectEvent(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx, uint32_t int { uint32_t intInfo2; - intInfo2 = (iGate == X86_XCPT_GP) ? (uint32_t)X86_XCPT_DF : iGate; + intInfo2 = (iGate == X86_XCPT_GP) ? (uint32_t)X86_XCPT_DF : (uint32_t)X86_XCPT_GP; intInfo2 |= (1 << VMX_EXIT_INTERRUPTION_INFO_VALID_SHIFT); intInfo2 |= VMX_EXIT_INTERRUPTION_INFO_ERROR_CODE_VALID; intInfo2 |= (VMX_EXIT_INTERRUPTION_INFO_TYPE_HWEXCPT << VMX_EXIT_INTERRUPTION_INFO_TYPE_SHIFT); @@ -1355,7 +1355,6 @@ VMMR0DECL(int) VMXR0SaveHostState(PVM pVM, PVMCPU pVCpu) uint32_t u32HostExtFeatures = ASMCpuId_EDX(0x80000001); if (u32HostExtFeatures & (X86_CPUID_EXT_FEATURE_EDX_NX | X86_CPUID_EXT_FEATURE_EDX_LONG_MODE)) { -#if 0 pMsr->u32IndexMSR = MSR_K6_EFER; pMsr->u32Reserved = 0; # if HC_ARCH_BITS == 32 && defined(VBOX_ENABLE_64_BITS_GUESTS) && !defined(VBOX_WITH_HYBRID_32BIT_KERNEL) @@ -1368,7 +1367,6 @@ VMMR0DECL(int) VMXR0SaveHostState(PVM pVM, PVMCPU pVCpu) # endif pMsr->u64Value = ASMRdMsr(MSR_K6_EFER); pMsr++; idxMsr++; -#endif } # if HC_ARCH_BITS == 64 || defined(VBOX_WITH_HYBRID_32BIT_KERNEL) @@ -2154,7 +2152,6 @@ VMMR0DECL(int) VMXR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) if (u32GstExtFeatures & (X86_CPUID_EXT_FEATURE_EDX_NX | X86_CPUID_EXT_FEATURE_EDX_LONG_MODE)) { -#if 0 pMsr->u32IndexMSR = MSR_K6_EFER; pMsr->u32Reserved = 0; pMsr->u64Value = pCtx->msrEFER; @@ -2162,7 +2159,6 @@ VMMR0DECL(int) VMXR0LoadGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) if (!CPUMIsGuestInLongModeEx(pCtx)) pMsr->u64Value &= ~(MSR_K6_EFER_LMA | MSR_K6_EFER_LME); pMsr++; idxMsr++; -#endif if (u32GstExtFeatures & X86_CPUID_EXT_FEATURE_EDX_LONG_MODE) { @@ -2423,12 +2419,12 @@ DECLINLINE(int) VMXR0SaveGuestState(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx) case MSR_K8_TSC_AUX: CPUMSetGuestMsr(pVCpu, MSR_K8_TSC_AUX, pMsr->u64Value); break; -#if 0 + case MSR_K6_EFER: /* EFER can't be changed without causing a VM-exit. */ /* Assert(pCtx->msrEFER == pMsr->u64Value); */ break; -#endif + default: AssertFailed(); return VERR_HM_UNEXPECTED_LD_ST_MSR; diff --git a/src/VBox/VMM/VMMR0/PDMR0Device.cpp b/src/VBox/VMM/VMMR0/PDMR0Device.cpp index 474558092..89cc8a593 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Device.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Device.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp index 90cf31e78..fb9781fcd 100644 --- a/src/VBox/VMM/VMMR0/PDMR0Driver.cpp +++ b/src/VBox/VMM/VMMR0/PDMR0Driver.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/PGMR0.cpp b/src/VBox/VMM/VMMR0/PGMR0.cpp index 371aec254..69ef6c753 100644 --- a/src/VBox/VMM/VMMR0/PGMR0.cpp +++ b/src/VBox/VMM/VMMR0/PGMR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2011 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/PGMR0Bth.h b/src/VBox/VMM/VMMR0/PGMR0Bth.h index 6c0bb8de3..ca4a5a896 100644 --- a/src/VBox/VMM/VMMR0/PGMR0Bth.h +++ b/src/VBox/VMM/VMMR0/PGMR0Bth.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/TRPMR0A.asm b/src/VBox/VMM/VMMR0/TRPMR0A.asm index 64da5a371..55adbccc5 100644 --- a/src/VBox/VMM/VMMR0/TRPMR0A.asm +++ b/src/VBox/VMM/VMMR0/TRPMR0A.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/VMMR0.cpp b/src/VBox/VMM/VMMR0/VMMR0.cpp index d8f32addc..8d6c21443 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.cpp +++ b/src/VBox/VMM/VMMR0/VMMR0.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/VMMR0.def b/src/VBox/VMM/VMMR0/VMMR0.def index bf8ffcdfb..cbdffd7d7 100644 --- a/src/VBox/VMM/VMMR0/VMMR0.def +++ b/src/VBox/VMM/VMMR0/VMMR0.def @@ -3,7 +3,7 @@ ; VMM Ring 0 DLL - Definition file. ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm index 31c565b65..6c3116fd1 100644 --- a/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm +++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-amd64.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm index dd657f385..8a1c9db9b 100644 --- a/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm +++ b/src/VBox/VMM/VMMR0/VMMR0JmpA-x86.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm index 1ab44d621..eff2e3a06 100644 --- a/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm +++ b/src/VBox/VMM/VMMR0/VMMR0TripleFaultHackA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2011 Oracle Corporation +; Copyright (C) 2011-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/CFGM.cpp b/src/VBox/VMM/VMMR3/CFGM.cpp index b0dcb508a..c77a547bd 100644 --- a/src/VBox/VMM/VMMR3/CFGM.cpp +++ b/src/VBox/VMM/VMMR3/CFGM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/CPUMDbg.cpp b/src/VBox/VMM/VMMR3/CPUMDbg.cpp index cf791ee27..fa2ed1903 100644 --- a/src/VBox/VMM/VMMR3/CPUMDbg.cpp +++ b/src/VBox/VMM/VMMR3/CPUMDbg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGF.cpp b/src/VBox/VMM/VMMR3/DBGF.cpp index 994c5f817..84885285d 100644 --- a/src/VBox/VMM/VMMR3/DBGF.cpp +++ b/src/VBox/VMM/VMMR3/DBGF.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFAddr.cpp b/src/VBox/VMM/VMMR3/DBGFAddr.cpp index 89cd0ca0e..76a22f372 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddr.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp index 3861be8f6..d33b414af 100644 --- a/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp +++ b/src/VBox/VMM/VMMR3/DBGFAddrSpace.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFBp.cpp b/src/VBox/VMM/VMMR3/DBGFBp.cpp index f0a553ff3..70b25949d 100644 --- a/src/VBox/VMM/VMMR3/DBGFBp.cpp +++ b/src/VBox/VMM/VMMR3/DBGFBp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp index b4ca067fe..7c14500c5 100644 --- a/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCoreWrite.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFCpu.cpp b/src/VBox/VMM/VMMR3/DBGFCpu.cpp index 0aff31004..f55d665f0 100644 --- a/src/VBox/VMM/VMMR3/DBGFCpu.cpp +++ b/src/VBox/VMM/VMMR3/DBGFCpu.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFDisas.cpp b/src/VBox/VMM/VMMR3/DBGFDisas.cpp index e4ac0476a..f364993af 100644 --- a/src/VBox/VMM/VMMR3/DBGFDisas.cpp +++ b/src/VBox/VMM/VMMR3/DBGFDisas.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFInfo.cpp b/src/VBox/VMM/VMMR3/DBGFInfo.cpp index d3ffe1e1a..1f1c74e54 100644 --- a/src/VBox/VMM/VMMR3/DBGFInfo.cpp +++ b/src/VBox/VMM/VMMR3/DBGFInfo.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFLog.cpp b/src/VBox/VMM/VMMR3/DBGFLog.cpp index e5b4047bd..b8d5db8eb 100644 --- a/src/VBox/VMM/VMMR3/DBGFLog.cpp +++ b/src/VBox/VMM/VMMR3/DBGFLog.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFMem.cpp b/src/VBox/VMM/VMMR3/DBGFMem.cpp index db93d7334..fb75fdb48 100644 --- a/src/VBox/VMM/VMMR3/DBGFMem.cpp +++ b/src/VBox/VMM/VMMR3/DBGFMem.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007-2010 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFModule.cpp b/src/VBox/VMM/VMMR3/DBGFModule.cpp index d17cbf650..2813a6193 100644 --- a/src/VBox/VMM/VMMR3/DBGFModule.cpp +++ b/src/VBox/VMM/VMMR3/DBGFModule.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFOS.cpp b/src/VBox/VMM/VMMR3/DBGFOS.cpp index 0cc90a6a5..2b8cba195 100644 --- a/src/VBox/VMM/VMMR3/DBGFOS.cpp +++ b/src/VBox/VMM/VMMR3/DBGFOS.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFReg.cpp b/src/VBox/VMM/VMMR3/DBGFReg.cpp index a5990ddaf..0a910302f 100644 --- a/src/VBox/VMM/VMMR3/DBGFReg.cpp +++ b/src/VBox/VMM/VMMR3/DBGFReg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010-2011 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFStack.cpp b/src/VBox/VMM/VMMR3/DBGFStack.cpp index f01a64381..e5ee0ced4 100644 --- a/src/VBox/VMM/VMMR3/DBGFStack.cpp +++ b/src/VBox/VMM/VMMR3/DBGFStack.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/DBGFSym.cpp b/src/VBox/VMM/VMMR3/DBGFSym.cpp index 0ee582cce..a39584026 100644 --- a/src/VBox/VMM/VMMR3/DBGFSym.cpp +++ b/src/VBox/VMM/VMMR3/DBGFSym.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/EM.cpp b/src/VBox/VMM/VMMR3/EM.cpp index acc62c932..3c4df9806 100644 --- a/src/VBox/VMM/VMMR3/EM.cpp +++ b/src/VBox/VMM/VMMR3/EM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/FTM.cpp b/src/VBox/VMM/VMMR3/FTM.cpp index ef9e468ac..c0963d3de 100644 --- a/src/VBox/VMM/VMMR3/FTM.cpp +++ b/src/VBox/VMM/VMMR3/FTM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2010 Oracle Corporation + * Copyright (C) 2010-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/HWACCM.cpp b/src/VBox/VMM/VMMR3/HWACCM.cpp index 4fb089b5b..f15817da9 100644 --- a/src/VBox/VMM/VMMR3/HWACCM.cpp +++ b/src/VBox/VMM/VMMR3/HWACCM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2012 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1203,6 +1203,11 @@ static int hwaccmR3InitFinalizeR0(PVM pVM) CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_SYSCALL); /* 64 bits only on Intel CPUs */ CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_LAHF); CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX); +# if RT_ARCH_X86 + if ( !CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE) + || !(pVM->hwaccm.s.vmx.hostEFER & MSR_K6_EFER_NXE)) + LogRel(("NX is only supported for 64-bit guests!\n")); +# endif } else /* Turn on NXE if PAE has been enabled *and* the host has turned on NXE (we reuse the host EFER in the switcher) */ @@ -1210,6 +1215,8 @@ static int hwaccmR3InitFinalizeR0(PVM pVM) if ( CPUMGetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_PAE) && (pVM->hwaccm.s.vmx.hostEFER & MSR_K6_EFER_NXE)) CPUMSetGuestCpuIdFeature(pVM, CPUMCPUIDFEATURE_NX); + else + LogRel(("HM: NX not supported by the host\n")); LogRel((pVM->hwaccm.s.fAllow64BitGuests ? "HWACCM: 32-bit and 64-bit guests supported.\n" diff --git a/src/VBox/VMM/VMMR3/IEMR3.cpp b/src/VBox/VMM/VMMR3/IEMR3.cpp index e383e06f9..095217aa9 100644 --- a/src/VBox/VMM/VMMR3/IEMR3.cpp +++ b/src/VBox/VMM/VMMR3/IEMR3.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/IOM.cpp b/src/VBox/VMM/VMMR3/IOM.cpp index 6654fda80..2613fd95c 100644 --- a/src/VBox/VMM/VMMR3/IOM.cpp +++ b/src/VBox/VMM/VMMR3/IOM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/MM.cpp b/src/VBox/VMM/VMMR3/MM.cpp index b317c29cd..a59873954 100644 --- a/src/VBox/VMM/VMMR3/MM.cpp +++ b/src/VBox/VMM/VMMR3/MM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/MMHeap.cpp b/src/VBox/VMM/VMMR3/MMHeap.cpp index 39e3249ee..9c52ac6ad 100644 --- a/src/VBox/VMM/VMMR3/MMHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMHeap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/MMHyper.cpp b/src/VBox/VMM/VMMR3/MMHyper.cpp index 86db83a8e..9b97172d3 100644 --- a/src/VBox/VMM/VMMR3/MMHyper.cpp +++ b/src/VBox/VMM/VMMR3/MMHyper.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/MMPagePool.cpp b/src/VBox/VMM/VMMR3/MMPagePool.cpp index 9491fafef..e40bb3d4e 100644 --- a/src/VBox/VMM/VMMR3/MMPagePool.cpp +++ b/src/VBox/VMM/VMMR3/MMPagePool.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/MMUkHeap.cpp b/src/VBox/VMM/VMMR3/MMUkHeap.cpp index 255b43dec..2c60d01dd 100644 --- a/src/VBox/VMM/VMMR3/MMUkHeap.cpp +++ b/src/VBox/VMM/VMMR3/MMUkHeap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMA.asm b/src/VBox/VMM/VMMR3/PATMA.asm index cab836a80..344701268 100644 --- a/src/VBox/VMM/VMMR3/PATMA.asm +++ b/src/VBox/VMM/VMMR3/PATMA.asm @@ -3,7 +3,7 @@ ; PATM Assembly Routines. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMA.mac b/src/VBox/VMM/VMMR3/PATMA.mac index d6e0d3c63..7dd31852f 100644 --- a/src/VBox/VMM/VMMR3/PATMA.mac +++ b/src/VBox/VMM/VMMR3/PATMA.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMGuest.cpp b/src/VBox/VMM/VMMR3/PATMGuest.cpp index 932853fe8..62663becc 100644 --- a/src/VBox/VMM/VMMR3/PATMGuest.cpp +++ b/src/VBox/VMM/VMMR3/PATMGuest.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMPatch.cpp b/src/VBox/VMM/VMMR3/PATMPatch.cpp index db64a0b44..2155fe8f5 100644 --- a/src/VBox/VMM/VMMR3/PATMPatch.cpp +++ b/src/VBox/VMM/VMMR3/PATMPatch.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMPatch.h b/src/VBox/VMM/VMMR3/PATMPatch.h index 8df1b79c3..42cf0f2a0 100644 --- a/src/VBox/VMM/VMMR3/PATMPatch.h +++ b/src/VBox/VMM/VMMR3/PATMPatch.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PATMSSM.cpp b/src/VBox/VMM/VMMR3/PATMSSM.cpp index 2692a8375..fed5ef922 100644 --- a/src/VBox/VMM/VMMR3/PATMSSM.cpp +++ b/src/VBox/VMM/VMMR3/PATMSSM.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp index caced7435..a27e0aeb3 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletion.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp index d9786d379..f98fbc2a5 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFile.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp index a32f77e5e..4105e0c01 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileFailsafe.cpp @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp index 7d629d8ff..d429d83c6 100644 --- a/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp +++ b/src/VBox/VMM/VMMR3/PDMAsyncCompletionFileNormal.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp index 9bbee6521..39bea3051 100644 --- a/src/VBox/VMM/VMMR3/PDMBlkCache.cpp +++ b/src/VBox/VMM/VMMR3/PDMBlkCache.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMCritSect.cpp b/src/VBox/VMM/VMMR3/PDMCritSect.cpp index 06321b777..d14b7d71f 100644 --- a/src/VBox/VMM/VMMR3/PDMCritSect.cpp +++ b/src/VBox/VMM/VMMR3/PDMCritSect.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp index 33853d075..20977c3e3 100644 --- a/src/VBox/VMM/VMMR3/PDMDevHlp.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevHlp.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMDevice.cpp b/src/VBox/VMM/VMMR3/PDMDevice.cpp index 23c39ccbe..0fb1696e9 100644 --- a/src/VBox/VMM/VMMR3/PDMDevice.cpp +++ b/src/VBox/VMM/VMMR3/PDMDevice.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMLdr.cpp b/src/VBox/VMM/VMMR3/PDMLdr.cpp index 2e1969ac1..9a34c8c66 100644 --- a/src/VBox/VMM/VMMR3/PDMLdr.cpp +++ b/src/VBox/VMM/VMMR3/PDMLdr.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMQueue.cpp b/src/VBox/VMM/VMMR3/PDMQueue.cpp index 9b8fc12b0..6cc214e59 100644 --- a/src/VBox/VMM/VMMR3/PDMQueue.cpp +++ b/src/VBox/VMM/VMMR3/PDMQueue.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMThread.cpp b/src/VBox/VMM/VMMR3/PDMThread.cpp index f3cb3bdbd..7e7b4959a 100644 --- a/src/VBox/VMM/VMMR3/PDMThread.cpp +++ b/src/VBox/VMM/VMMR3/PDMThread.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PDMUsb.cpp b/src/VBox/VMM/VMMR3/PDMUsb.cpp index 179ba44d5..6e1c481a5 100644 --- a/src/VBox/VMM/VMMR3/PDMUsb.cpp +++ b/src/VBox/VMM/VMMR3/PDMUsb.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGM.cpp b/src/VBox/VMM/VMMR3/PGM.cpp index b0487c629..0bcb5cc2b 100644 --- a/src/VBox/VMM/VMMR3/PGM.cpp +++ b/src/VBox/VMM/VMMR3/PGM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMBth.h b/src/VBox/VMM/VMMR3/PGMBth.h index 1ce957b6a..65a0f5681 100644 --- a/src/VBox/VMM/VMMR3/PGMBth.h +++ b/src/VBox/VMM/VMMR3/PGMBth.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMDbg.cpp b/src/VBox/VMM/VMMR3/PGMDbg.cpp index 4b14520a5..214f3cab6 100644 --- a/src/VBox/VMM/VMMR3/PGMDbg.cpp +++ b/src/VBox/VMM/VMMR3/PGMDbg.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMGst.h b/src/VBox/VMM/VMMR3/PGMGst.h index a5bfe728d..4aac093c5 100644 --- a/src/VBox/VMM/VMMR3/PGMGst.h +++ b/src/VBox/VMM/VMMR3/PGMGst.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMHandler.cpp b/src/VBox/VMM/VMMR3/PGMHandler.cpp index 5de793d95..7e4535ad8 100644 --- a/src/VBox/VMM/VMMR3/PGMHandler.cpp +++ b/src/VBox/VMM/VMMR3/PGMHandler.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMMap.cpp b/src/VBox/VMM/VMMR3/PGMMap.cpp index 0e6ee4dca..12a9acc63 100644 --- a/src/VBox/VMM/VMMR3/PGMMap.cpp +++ b/src/VBox/VMM/VMMR3/PGMMap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h b/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h index 4a9388e38..790e9f0d0 100644 --- a/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h +++ b/src/VBox/VMM/VMMR3/PGMPhysRWTmpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMPool.cpp b/src/VBox/VMM/VMMR3/PGMPool.cpp index 2744dd7fd..4d52ac403 100644 --- a/src/VBox/VMM/VMMR3/PGMPool.cpp +++ b/src/VBox/VMM/VMMR3/PGMPool.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMSavedState.cpp b/src/VBox/VMM/VMMR3/PGMSavedState.cpp index 781c48e06..fe1636b01 100644 --- a/src/VBox/VMM/VMMR3/PGMSavedState.cpp +++ b/src/VBox/VMM/VMMR3/PGMSavedState.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp index bae1afb4e..4aa9ea9cb 100644 --- a/src/VBox/VMM/VMMR3/PGMSharedPage.cpp +++ b/src/VBox/VMM/VMMR3/PGMSharedPage.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/PGMShw.h b/src/VBox/VMM/VMMR3/PGMShw.h index b40796129..08b4e33c8 100644 --- a/src/VBox/VMM/VMMR3/PGMShw.h +++ b/src/VBox/VMM/VMMR3/PGMShw.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/SSM.cpp b/src/VBox/VMM/VMMR3/SSM.cpp index e303d0a65..ee1c6d1a9 100644 --- a/src/VBox/VMM/VMMR3/SSM.cpp +++ b/src/VBox/VMM/VMMR3/SSM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/STAM.cpp b/src/VBox/VMM/VMMR3/STAM.cpp index 3d68f2f71..d229c6275 100644 --- a/src/VBox/VMM/VMMR3/STAM.cpp +++ b/src/VBox/VMM/VMMR3/STAM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/TM.cpp b/src/VBox/VMM/VMMR3/TM.cpp index 49390dd7c..35446579a 100644 --- a/src/VBox/VMM/VMMR3/TM.cpp +++ b/src/VBox/VMM/VMMR3/TM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/TRPM.cpp b/src/VBox/VMM/VMMR3/TRPM.cpp index 41bdd2f0e..e29a830d3 100644 --- a/src/VBox/VMM/VMMR3/TRPM.cpp +++ b/src/VBox/VMM/VMMR3/TRPM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VM.cpp b/src/VBox/VMM/VMMR3/VM.cpp index 0b280f659..fa2d38d5b 100644 --- a/src/VBox/VMM/VMMR3/VM.cpp +++ b/src/VBox/VMM/VMMR3/VM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VMEmt.cpp b/src/VBox/VMM/VMMR3/VMEmt.cpp index 481dbcf12..f9fd75a56 100644 --- a/src/VBox/VMM/VMMR3/VMEmt.cpp +++ b/src/VBox/VMM/VMMR3/VMEmt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VMM.cpp b/src/VBox/VMM/VMMR3/VMM.cpp index fae8a37be..0996b4f27 100644 --- a/src/VBox/VMM/VMMR3/VMM.cpp +++ b/src/VBox/VMM/VMMR3/VMM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp index 528561bf2..66957162e 100644 --- a/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp +++ b/src/VBox/VMM/VMMR3/VMMGuruMeditation.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VMMTests.cpp b/src/VBox/VMM/VMMR3/VMMTests.cpp index 04dac35a6..2970a07f4 100644 --- a/src/VBox/VMM/VMMR3/VMMTests.cpp +++ b/src/VBox/VMM/VMMR3/VMMTests.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMR3/VMReq.cpp b/src/VBox/VMM/VMMR3/VMReq.cpp index 11ac3eadd..98732d46d 100644 --- a/src/VBox/VMM/VMMR3/VMReq.cpp +++ b/src/VBox/VMM/VMMR3/VMReq.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/CSAMRC.cpp b/src/VBox/VMM/VMMRC/CSAMRC.cpp index 1d697b0ba..1aaea9757 100644 --- a/src/VBox/VMM/VMMRC/CSAMRC.cpp +++ b/src/VBox/VMM/VMMRC/CSAMRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/EMRCA.asm b/src/VBox/VMM/VMMRC/EMRCA.asm index f295c55aa..8f22bf3d2 100644 --- a/src/VBox/VMM/VMMRC/EMRCA.asm +++ b/src/VBox/VMM/VMMRC/EMRCA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/MMRamRC.cpp b/src/VBox/VMM/VMMRC/MMRamRC.cpp index d1283ef36..45e1270e9 100644 --- a/src/VBox/VMM/VMMRC/MMRamRC.cpp +++ b/src/VBox/VMM/VMMRC/MMRamRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/MMRamRCA.asm b/src/VBox/VMM/VMMRC/MMRamRCA.asm index ad89ca2e0..f46ecd8cc 100644 --- a/src/VBox/VMM/VMMRC/MMRamRCA.asm +++ b/src/VBox/VMM/VMMRC/MMRamRCA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp index 5d2a33871..850beef68 100644 --- a/src/VBox/VMM/VMMRC/PDMRCDevice.cpp +++ b/src/VBox/VMM/VMMRC/PDMRCDevice.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/PGMRC.cpp b/src/VBox/VMM/VMMRC/PGMRC.cpp index b0c7185c2..4137ee045 100644 --- a/src/VBox/VMM/VMMRC/PGMRC.cpp +++ b/src/VBox/VMM/VMMRC/PGMRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/PGMRCBth.h b/src/VBox/VMM/VMMRC/PGMRCBth.h index fd0060354..8abd7db02 100644 --- a/src/VBox/VMM/VMMRC/PGMRCBth.h +++ b/src/VBox/VMM/VMMRC/PGMRCBth.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/PGMRCGst.h b/src/VBox/VMM/VMMRC/PGMRCGst.h index bf06afd26..82200f24f 100644 --- a/src/VBox/VMM/VMMRC/PGMRCGst.h +++ b/src/VBox/VMM/VMMRC/PGMRCGst.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/PGMRCShw.h b/src/VBox/VMM/VMMRC/PGMRCShw.h index 265f1687d..f7c1b54fb 100644 --- a/src/VBox/VMM/VMMRC/PGMRCShw.h +++ b/src/VBox/VMM/VMMRC/PGMRCShw.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/SELMRC.cpp b/src/VBox/VMM/VMMRC/SELMRC.cpp index 2fd3e7afa..f9dcf5bb4 100644 --- a/src/VBox/VMM/VMMRC/SELMRC.cpp +++ b/src/VBox/VMM/VMMRC/SELMRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/TRPMRC.cpp b/src/VBox/VMM/VMMRC/TRPMRC.cpp index d19aaeca3..0654c7e91 100644 --- a/src/VBox/VMM/VMMRC/TRPMRC.cpp +++ b/src/VBox/VMM/VMMRC/TRPMRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRC.cpp b/src/VBox/VMM/VMMRC/VMMRC.cpp index fb2a2c62f..7f3fce43e 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.cpp +++ b/src/VBox/VMM/VMMRC/VMMRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRC.def b/src/VBox/VMM/VMMRC/VMMRC.def index c8179edad..5016545d4 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.def +++ b/src/VBox/VMM/VMMRC/VMMRC.def @@ -3,7 +3,7 @@ ; VMM Raw-mode Context DLL - Definition file. ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRC.mac b/src/VBox/VMM/VMMRC/VMMRC.mac index 2fe1e4f5c..1584bcf7e 100644 --- a/src/VBox/VMM/VMMRC/VMMRC.mac +++ b/src/VBox/VMM/VMMRC/VMMRC.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRC0.asm b/src/VBox/VMM/VMMRC/VMMRC0.asm index ce8bb078f..bd3cf694d 100644 --- a/src/VBox/VMM/VMMRC/VMMRC0.asm +++ b/src/VBox/VMM/VMMRC/VMMRC0.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRC99.asm b/src/VBox/VMM/VMMRC/VMMRC99.asm index c34479da1..6dd4454aa 100644 --- a/src/VBox/VMM/VMMRC/VMMRC99.asm +++ b/src/VBox/VMM/VMMRC/VMMRC99.asm @@ -3,7 +3,7 @@ ; VMMGC99 - The last object module in the link. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def index 47e876621..374a81acc 100644 --- a/src/VBox/VMM/VMMRC/VMMRCBuiltin.def +++ b/src/VBox/VMM/VMMRC/VMMRCBuiltin.def @@ -3,7 +3,7 @@ ; VMM Raw-mode Context Builtin DLL - Definition file for generating import library. ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp index 82819207c..374af5dce 100644 --- a/src/VBox/VMM/VMMRC/VMMRCDeps.cpp +++ b/src/VBox/VMM/VMMRC/VMMRCDeps.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp index c9fc40196..4c4ea596d 100644 --- a/src/VBox/VMM/VMMRZ/DBGFRZ.cpp +++ b/src/VBox/VMM/VMMRZ/DBGFRZ.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp index 8e43064d5..548317b10 100644 --- a/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp +++ b/src/VBox/VMM/VMMRZ/PGMRZDynMap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2008-2011 Oracle Corporation + * Copyright (C) 2008-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/VMMRZ/VMMRZ.cpp b/src/VBox/VMM/VMMRZ/VMMRZ.cpp index 9a86cfb6a..f9b066d37 100644 --- a/src/VBox/VMM/VMMRZ/VMMRZ.cpp +++ b/src/VBox/VMM/VMMRZ/VMMRZ.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/CFGMInternal.h b/src/VBox/VMM/include/CFGMInternal.h index 2d33bc6d5..7abced2fa 100644 --- a/src/VBox/VMM/include/CFGMInternal.h +++ b/src/VBox/VMM/include/CFGMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/CPUMInternal.mac b/src/VBox/VMM/include/CPUMInternal.mac index 6206a3ae2..88696887b 100644 --- a/src/VBox/VMM/include/CPUMInternal.mac +++ b/src/VBox/VMM/include/CPUMInternal.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2010 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/CSAMInternal.h b/src/VBox/VMM/include/CSAMInternal.h index 66f89344c..7e6f4fb7d 100644 --- a/src/VBox/VMM/include/CSAMInternal.h +++ b/src/VBox/VMM/include/CSAMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/DBGFInternal.h b/src/VBox/VMM/include/DBGFInternal.h index 55c147de7..29a3959af 100644 --- a/src/VBox/VMM/include/DBGFInternal.h +++ b/src/VBox/VMM/include/DBGFInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/EMHandleRCTmpl.h b/src/VBox/VMM/include/EMHandleRCTmpl.h index 306e434c6..01f3b3eba 100644 --- a/src/VBox/VMM/include/EMHandleRCTmpl.h +++ b/src/VBox/VMM/include/EMHandleRCTmpl.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2009 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/EMInternal.h b/src/VBox/VMM/include/EMInternal.h index 34606b33c..a65866111 100644 --- a/src/VBox/VMM/include/EMInternal.h +++ b/src/VBox/VMM/include/EMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/HWACCMInternal.mac b/src/VBox/VMM/include/HWACCMInternal.mac index f8eb76d05..0c7285e04 100644 --- a/src/VBox/VMM/include/HWACCMInternal.mac +++ b/src/VBox/VMM/include/HWACCMInternal.mac @@ -3,7 +3,7 @@ ; HWACCM - Internal header file. ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/IOMInline.h b/src/VBox/VMM/include/IOMInline.h index 3804e9e14..36e380b99 100644 --- a/src/VBox/VMM/include/IOMInline.h +++ b/src/VBox/VMM/include/IOMInline.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/IOMInternal.h b/src/VBox/VMM/include/IOMInternal.h index 1d7a828ca..b0a9f54cd 100644 --- a/src/VBox/VMM/include/IOMInternal.h +++ b/src/VBox/VMM/include/IOMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/MMInternal.h b/src/VBox/VMM/include/MMInternal.h index c058a1441..950debe76 100644 --- a/src/VBox/VMM/include/MMInternal.h +++ b/src/VBox/VMM/include/MMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PATMA.h b/src/VBox/VMM/include/PATMA.h index f7d5435a4..0afb0b5ea 100644 --- a/src/VBox/VMM/include/PATMA.h +++ b/src/VBox/VMM/include/PATMA.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h index a9f6ee81a..0674579bb 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionFileInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h index 2180c128f..a5e7581a6 100644 --- a/src/VBox/VMM/include/PDMAsyncCompletionInternal.h +++ b/src/VBox/VMM/include/PDMAsyncCompletionInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PDMBlkCacheInternal.h b/src/VBox/VMM/include/PDMBlkCacheInternal.h index b2be57b88..47af634f7 100644 --- a/src/VBox/VMM/include/PDMBlkCacheInternal.h +++ b/src/VBox/VMM/include/PDMBlkCacheInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2008 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PDMInternal.h b/src/VBox/VMM/include/PDMInternal.h index ba8c64451..7aebffcf7 100644 --- a/src/VBox/VMM/include/PDMInternal.h +++ b/src/VBox/VMM/include/PDMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PGMGstDefs.h b/src/VBox/VMM/include/PGMGstDefs.h index 5fe79db5d..c531a4e3e 100644 --- a/src/VBox/VMM/include/PGMGstDefs.h +++ b/src/VBox/VMM/include/PGMGstDefs.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PGMInline.h b/src/VBox/VMM/include/PGMInline.h index a3efcf524..d81b851ae 100644 --- a/src/VBox/VMM/include/PGMInline.h +++ b/src/VBox/VMM/include/PGMInline.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/PGMInternal.h b/src/VBox/VMM/include/PGMInternal.h index c708b5f01..776cf9da5 100644 --- a/src/VBox/VMM/include/PGMInternal.h +++ b/src/VBox/VMM/include/PGMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/REMInternal.h b/src/VBox/VMM/include/REMInternal.h index bfe629091..391f06a25 100644 --- a/src/VBox/VMM/include/REMInternal.h +++ b/src/VBox/VMM/include/REMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/SELMInternal.h b/src/VBox/VMM/include/SELMInternal.h index ffaebbcdb..062290005 100644 --- a/src/VBox/VMM/include/SELMInternal.h +++ b/src/VBox/VMM/include/SELMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/SSMInternal.h b/src/VBox/VMM/include/SSMInternal.h index d1f8752ad..975094b11 100644 --- a/src/VBox/VMM/include/SSMInternal.h +++ b/src/VBox/VMM/include/SSMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/STAMInternal.h b/src/VBox/VMM/include/STAMInternal.h index 62b11bfc2..74cc0ef6e 100644 --- a/src/VBox/VMM/include/STAMInternal.h +++ b/src/VBox/VMM/include/STAMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/TMInternal.h b/src/VBox/VMM/include/TMInternal.h index 06894900b..306a4b857 100644 --- a/src/VBox/VMM/include/TMInternal.h +++ b/src/VBox/VMM/include/TMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/VMInternal.h b/src/VBox/VMM/include/VMInternal.h index 3a1a3ffea..850e7f1d5 100644 --- a/src/VBox/VMM/include/VMInternal.h +++ b/src/VBox/VMM/include/VMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/VMMInternal.h b/src/VBox/VMM/include/VMMInternal.h index 38b45a723..e70ee56d9 100644 --- a/src/VBox/VMM/include/VMMInternal.h +++ b/src/VBox/VMM/include/VMMInternal.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/VMMInternal.mac b/src/VBox/VMM/include/VMMInternal.mac index e306790d6..f330ffea3 100644 --- a/src/VBox/VMM/include/VMMInternal.mac +++ b/src/VBox/VMM/include/VMMInternal.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2009 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/VMMSwitcher.h b/src/VBox/VMM/include/VMMSwitcher.h index 19fe15070..50d7bc070 100644 --- a/src/VBox/VMM/include/VMMSwitcher.h +++ b/src/VBox/VMM/include/VMMSwitcher.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/VMMSwitcher.mac b/src/VBox/VMM/include/VMMSwitcher.mac index dbb4ed704..3d5c40698 100644 --- a/src/VBox/VMM/include/VMMSwitcher.mac +++ b/src/VBox/VMM/include/VMMSwitcher.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/include/internal/pgm.h b/src/VBox/VMM/include/internal/pgm.h index 207050e41..c9991d3d8 100644 --- a/src/VBox/VMM/include/internal/pgm.h +++ b/src/VBox/VMM/include/internal/pgm.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/mkdsk.sh b/src/VBox/VMM/testcase/mkdsk.sh index 0e55746de..bf28fc325 100755 --- a/src/VBox/VMM/testcase/mkdsk.sh +++ b/src/VBox/VMM/testcase/mkdsk.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstAnimate.cpp b/src/VBox/VMM/testcase/tstAnimate.cpp index a80404cfd..b1e732e4f 100644 --- a/src/VBox/VMM/testcase/tstAnimate.cpp +++ b/src/VBox/VMM/testcase/tstAnimate.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2011 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm index 95747e6d7..7b6fe2083 100644 --- a/src/VBox/VMM/testcase/tstAsmStructsAsm.asm +++ b/src/VBox/VMM/testcase/tstAsmStructsAsm.asm @@ -7,7 +7,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstCFGM.cpp b/src/VBox/VMM/testcase/tstCFGM.cpp index d34174c08..de17f8e56 100644 --- a/src/VBox/VMM/testcase/tstCFGM.cpp +++ b/src/VBox/VMM/testcase/tstCFGM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp index cee7fa724..ee8f3794d 100644 --- a/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp +++ b/src/VBox/VMM/testcase/tstCompressionBenchmark.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstGlobalConfig.cpp b/src/VBox/VMM/testcase/tstGlobalConfig.cpp index 9b051d27b..8e1b85dfd 100644 --- a/src/VBox/VMM/testcase/tstGlobalConfig.cpp +++ b/src/VBox/VMM/testcase/tstGlobalConfig.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstHelp.h b/src/VBox/VMM/testcase/tstHelp.h index f4403d840..669ee09ca 100644 --- a/src/VBox/VMM/testcase/tstHelp.h +++ b/src/VBox/VMM/testcase/tstHelp.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp index bee7fae78..b7b5a313b 100644 --- a/src/VBox/VMM/testcase/tstIEMCheckMc.cpp +++ b/src/VBox/VMM/testcase/tstIEMCheckMc.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2011 Oracle Corporation + * Copyright (C) 2011-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstInstrEmul.cpp b/src/VBox/VMM/testcase/tstInstrEmul.cpp index 5c74b9d2e..dd662038b 100644 --- a/src/VBox/VMM/testcase/tstInstrEmul.cpp +++ b/src/VBox/VMM/testcase/tstInstrEmul.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp index d4366be26..d57b69999 100644 --- a/src/VBox/VMM/testcase/tstMMHyperHeap.cpp +++ b/src/VBox/VMM/testcase/tstMMHyperHeap.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicro.cpp b/src/VBox/VMM/testcase/tstMicro.cpp index 5a3524c2f..42d006623 100644 --- a/src/VBox/VMM/testcase/tstMicro.cpp +++ b/src/VBox/VMM/testcase/tstMicro.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicro.h b/src/VBox/VMM/testcase/tstMicro.h index 3473c365a..dcdcb7bf9 100644 --- a/src/VBox/VMM/testcase/tstMicro.h +++ b/src/VBox/VMM/testcase/tstMicro.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicro.mac b/src/VBox/VMM/testcase/tstMicro.mac index 92e50ca31..6ff7519df 100644 --- a/src/VBox/VMM/testcase/tstMicro.mac +++ b/src/VBox/VMM/testcase/tstMicro.mac @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicroRC.cpp b/src/VBox/VMM/testcase/tstMicroRC.cpp index a1a719363..ce5936b02 100644 --- a/src/VBox/VMM/testcase/tstMicroRC.cpp +++ b/src/VBox/VMM/testcase/tstMicroRC.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicroRC.def b/src/VBox/VMM/testcase/tstMicroRC.def index 7455a2e77..3ea7f018c 100644 --- a/src/VBox/VMM/testcase/tstMicroRC.def +++ b/src/VBox/VMM/testcase/tstMicroRC.def @@ -2,7 +2,7 @@ ; ; VMM Guest Context Micro Benchmark - Definition file. -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstMicroRCA.asm b/src/VBox/VMM/testcase/tstMicroRCA.asm index 785cf4b1d..b56066889 100644 --- a/src/VBox/VMM/testcase/tstMicroRCA.asm +++ b/src/VBox/VMM/testcase/tstMicroRCA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2012 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp index bf554bea3..4b7c79b45 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletion.cpp @@ -9,7 +9,7 @@ */ /* - * Copyright (C) 2008-2010 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp index 04b7fb672..fbd0ed823 100644 --- a/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp +++ b/src/VBox/VMM/testcase/tstPDMAsyncCompletionStress.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2008-2009 Oracle Corporation + * Copyright (C) 2008-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstSSM.cpp b/src/VBox/VMM/testcase/tstSSM.cpp index 3bfc54717..0c5c7d48e 100644 --- a/src/VBox/VMM/testcase/tstSSM.cpp +++ b/src/VBox/VMM/testcase/tstSSM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp index fbecb43bc..511773766 100644 --- a/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp +++ b/src/VBox/VMM/testcase/tstVMM-HwAccm.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMM.cpp b/src/VBox/VMM/testcase/tstVMM.cpp index e5ed29a01..30a5565b3 100644 --- a/src/VBox/VMM/testcase/tstVMM.cpp +++ b/src/VBox/VMM/testcase/tstVMM.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -234,7 +234,7 @@ int main(int argc, char **argv) return 1; case 'V': - RTPrintf("$Revision: 78835 $\n"); + RTPrintf("$Revision: 83687 $\n"); return 0; default: diff --git a/src/VBox/VMM/testcase/tstVMMFork.cpp b/src/VBox/VMM/testcase/tstVMMFork.cpp index f1a702c1a..997a507ec 100644 --- a/src/VBox/VMM/testcase/tstVMMFork.cpp +++ b/src/VBox/VMM/testcase/tstVMMFork.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp index 92cb58cc5..ec432df42 100644 --- a/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp +++ b/src/VBox/VMM/testcase/tstVMMR0CallHost-1.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMREQ.cpp b/src/VBox/VMM/testcase/tstVMREQ.cpp index 0f557e29b..28055a7e1 100644 --- a/src/VBox/VMM/testcase/tstVMREQ.cpp +++ b/src/VBox/VMM/testcase/tstVMREQ.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMStructRC.cpp b/src/VBox/VMM/testcase/tstVMStructRC.cpp index 7f1d17943..4ca7523f5 100644 --- a/src/VBox/VMM/testcase/tstVMStructRC.cpp +++ b/src/VBox/VMM/testcase/tstVMStructRC.cpp @@ -8,7 +8,7 @@ */ /* - * Copyright (C) 2006-2010 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/VBox/VMM/testcase/tstVMStructSize.cpp b/src/VBox/VMM/testcase/tstVMStructSize.cpp index 8bc677e02..06485d346 100644 --- a/src/VBox/VMM/testcase/tstVMStructSize.cpp +++ b/src/VBox/VMM/testcase/tstVMStructSize.cpp @@ -6,7 +6,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/apps/adpctl/VBoxNetAdpCtl.cpp b/src/apps/adpctl/VBoxNetAdpCtl.cpp index 6d06c0a62..b3c396982 100644 --- a/src/apps/adpctl/VBoxNetAdpCtl.cpp +++ b/src/apps/adpctl/VBoxNetAdpCtl.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/apps/svnsync-vbox/Makefile b/src/apps/svnsync-vbox/Makefile index d5b4c19c5..aaf4e4603 100644 --- a/src/apps/svnsync-vbox/Makefile +++ b/src/apps/svnsync-vbox/Makefile @@ -2,7 +2,7 @@ # Makefile # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/bldprogs/bin2c.c b/src/bldprogs/bin2c.c index a0a973ce8..23e07496e 100644 --- a/src/bldprogs/bin2c.c +++ b/src/bldprogs/bin2c.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/bldprogs/biossums.c b/src/bldprogs/biossums.c index e179f6493..aa02a2f9f 100644 --- a/src/bldprogs/biossums.c +++ b/src/bldprogs/biossums.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/bldprogs/checkUndefined.sh b/src/bldprogs/checkUndefined.sh index aeca4f9d8..389ddf75f 100755 --- a/src/bldprogs/checkUndefined.sh +++ b/src/bldprogs/checkUndefined.sh @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2013 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; @@ -14,11 +14,12 @@ # # Compare undefined symbols in a shared or static object against a new-line -# separated list of grep patterns in a text file. +# separated list of grep patterns in a set of text files and complain if +# symbols are found which aren't in the files. # -# Usage: /bin/sh <script name> <object> <allowed undefined symbols> [--static] +# Usage: /bin/sh <script name> <object> [--static] <undefined symbol file...> # -# Currently only works for native objects on Linux platforms +# Currently only works for native objects on Linux (and Solaris?) platforms. # echoerr() @@ -26,28 +27,31 @@ echoerr() echo $* 1>&2 } -hostos=$1 -target=$2 -symbols=$3 -static=$4 - -if test $# -lt 3 || test $# -gt 4 || test ! -r "$target" || test ! -r "$symbols"; then - if test ! -r "$target"; then - echoerr "$0: '$target' not readable" - elif test ! -r "$symbols"; then - echoerr "$0: '$symbols' not readable" - else - echoerr "$0: Wrong number of arguments" - fi - args_ok="no" +hostos="${1}" +target="${2}" +shift 2 +if test "${1}" = "--static"; then + static="${1}" + shift fi -if test $# -eq 4 && test "$static" != "--static"; then - args_ok="no" +if test $# -lt 1; then + echoerr "${0}: Wrong number of arguments" + args_ok="no" +fi +if test ! -r "${target}"; then + echoerr "${0}: '${target}' not readable" + args_ok="no" fi +for i in "${@}"; do + if test ! -r "${i}"; then + echoerr "${0}: '${i}' not readable" + args_ok="no" + fi +done if test "$args_ok" = "no"; then - echoerr "Usage: $0 <object> <allowed undefined symbols> [--static]" + echoerr "Usage: $0 <object> [--static] <undefined symbol file...>" exit 1 fi @@ -67,17 +71,20 @@ if test "$static" = "--static"; then command="-t" fi -if test ! -x "$objdumpbin"; then - echoerr "$0: '$objdumpbin' not found or not executable." +if test ! -x "${objdumpbin}"; then + echoerr "${0}: '${objdumpbin}' not found or not executable." exit 1 fi -undefined=`$objdumpbin $command $target | $grepbin '*UND*' | $grepbin -v -f $symbols | kmk_sed -e 's/^.*[[:blank:]]\(.*\)/\1/'` +undefined=`"${objdumpbin}" ${command} "${target}" | kmk_sed -n 's/.*\*UND\*.*\s\([:graph:]*\)/\1/p'` +for i in "${@}"; do + undefined=`echo "${undefined}" | "${grepbin}" -w -v -f "${i}"` +done num_undef=`echo $undefined | wc -w` if test $num_undef -ne 0; then - echoerr "$0: following symbols not defined in $symbols:" - echoerr "$undefined" + echoerr "${0}: following symbols not defined in the files ${@}:" + echoerr "${undefined}" exit 1 fi # Return code diff --git a/src/bldprogs/preload.cpp b/src/bldprogs/preload.cpp index 07def9a04..1a24e231c 100644 --- a/src/bldprogs/preload.cpp +++ b/src/bldprogs/preload.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -146,7 +146,7 @@ int main(int argc, char **argv) if ( !strcmp(argv[i], "--version") || !strcmp(argv[i], "-V")) { - printf("$Revision: 60692 $\n"); + printf("$Revision: 83687 $\n"); return 0; } fprintf(stderr, "syntax error: unknown option '%s'\n", argv[i]); diff --git a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp index 6684bf33e..7bf8cc3c2 100644 --- a/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpAlloc-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp b/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp index 406bc3e85..2dc3ba7db 100644 --- a/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpAssert-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp index 17661ca7c..105c75c96 100644 --- a/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpEnv-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp index b808d9978..a9a1c69bd 100644 --- a/src/libs/kStuff/iprt/kHlpPage-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpPage-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/kStuff/iprt/kHlpString-iprt.cpp b/src/libs/kStuff/iprt/kHlpString-iprt.cpp index 0c74fa55a..d71053412 100644 --- a/src/libs/kStuff/iprt/kHlpString-iprt.cpp +++ b/src/libs/kStuff/iprt/kHlpString-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp index 2d8907332..0b95962d7 100644 --- a/src/libs/kStuff/iprt/kRdrFile-iprt.cpp +++ b/src/libs/kStuff/iprt/kRdrFile-iprt.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2007 Oracle Corporation + * Copyright (C) 2007-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/xpcom18a4/Config.kmk b/src/libs/xpcom18a4/Config.kmk index fb9c1afe3..ce10c905a 100644 --- a/src/libs/xpcom18a4/Config.kmk +++ b/src/libs/xpcom18a4/Config.kmk @@ -4,7 +4,7 @@ # # -# Copyright (C) 2006-2010 Oracle Corporation +# Copyright (C) 2006-2012 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/xpcom18a4/java/tools/genjifaces.xsl b/src/libs/xpcom18a4/java/tools/genjifaces.xsl index 9dc7901be..70a1e588c 100644 --- a/src/libs/xpcom18a4/java/tools/genjifaces.xsl +++ b/src/libs/xpcom18a4/java/tools/genjifaces.xsl @@ -9,7 +9,7 @@ genjifaces.xsl: XSLT stylesheet that generates Java XPCOM bridge intreface code from VirtualBox.xidl. - Copyright (C) 2010 Oracle Corporation + Copyright (C) 2010-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h b/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h index 949604978..fd5ce6101 100644 --- a/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h +++ b/src/libs/xpcom18a4/nsprpub/pr/include/md/_iprt_atomic.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2009 Oracle Corporation + * Copyright (C) 2009-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/xpcom18a4/python/vboxxpcom.py b/src/libs/xpcom18a4/python/vboxxpcom.py index 47b11d0f3..c94815224 100755 --- a/src/libs/xpcom18a4/python/vboxxpcom.py +++ b/src/libs/xpcom18a4/python/vboxxpcom.py @@ -1,5 +1,5 @@ """ -Copyright (C) 2008 Oracle Corporation +Copyright (C) 2008-2012 Oracle Corporation This file is part of VirtualBox Open Source Edition (OSE), as available from http://www.virtualbox.org. This file is free software; diff --git a/src/libs/xpcom18a4/xpcom-namespace-cleanup.map b/src/libs/xpcom18a4/xpcom-namespace-cleanup.map index 3ad053fcf..408673529 100644 --- a/src/libs/xpcom18a4/xpcom-namespace-cleanup.map +++ b/src/libs/xpcom18a4/xpcom-namespace-cleanup.map @@ -4,7 +4,7 @@ # the Mozilla project. VirtualBox shouldn't pollute the namespace. # -# Copyright (C) 2008 Oracle Corporation +# Copyright (C) 2008-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/Sun/config-host.h b/src/recompiler/Sun/config-host.h index 6768e9474..7091bdf64 100644 --- a/src/recompiler/Sun/config-host.h +++ b/src/recompiler/Sun/config-host.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/Sun/config.h b/src/recompiler/Sun/config.h index 79276c59b..cd4f4f91e 100644 --- a/src/recompiler/Sun/config.h +++ b/src/recompiler/Sun/config.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/Sun/crt/stdio.h b/src/recompiler/Sun/crt/stdio.h index ae14a4a14..35f93261b 100644 --- a/src/recompiler/Sun/crt/stdio.h +++ b/src/recompiler/Sun/crt/stdio.h @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2010 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/Sun/deftoimp.sed b/src/recompiler/Sun/deftoimp.sed index 089a0d99b..4c7557f7b 100644 --- a/src/recompiler/Sun/deftoimp.sed +++ b/src/recompiler/Sun/deftoimp.sed @@ -5,7 +5,7 @@ # # -# Copyright (C) 2006-2007 Oracle Corporation +# Copyright (C) 2006-2010 Oracle Corporation # # This file is part of VirtualBox Open Source Edition (OSE), as # available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/VBoxREM.def b/src/recompiler/VBoxREM.def index 3d6d07b96..d87690fb5 100644 --- a/src/recompiler/VBoxREM.def +++ b/src/recompiler/VBoxREM.def @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2011 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/VBoxREMWrapper.cpp b/src/recompiler/VBoxREMWrapper.cpp index e27674ddd..a2c089dfb 100644 --- a/src/recompiler/VBoxREMWrapper.cpp +++ b/src/recompiler/VBoxREMWrapper.cpp @@ -4,7 +4,7 @@ * VBoxREM Win64 DLL Wrapper. */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2012 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/VBoxREMWrapperA.asm b/src/recompiler/VBoxREMWrapperA.asm index ba7cc770a..6b2c817e6 100644 --- a/src/recompiler/VBoxREMWrapperA.asm +++ b/src/recompiler/VBoxREMWrapperA.asm @@ -4,7 +4,7 @@ ; ; -; Copyright (C) 2006-2007 Oracle Corporation +; Copyright (C) 2006-2010 Oracle Corporation ; ; This file is part of VirtualBox Open Source Edition (OSE), as ; available from http://www.virtualbox.org. This file is free software; diff --git a/src/recompiler/VBoxRecompiler.c b/src/recompiler/VBoxRecompiler.c index 5fe8e7b0a..2a5cb0fef 100644 --- a/src/recompiler/VBoxRecompiler.c +++ b/src/recompiler/VBoxRecompiler.c @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2013 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; @@ -1684,37 +1684,37 @@ bool remR3CanExecuteRaw(CPUX86State *env, RTGCPTR eip, unsigned fFlags, int *piE { Log2(("raw mode refused: stale CS (%#x)\n", env->segs[R_CS].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_CS]); - return EMSTATE_REM; + return false; } if (env->segs[R_SS].fVBoxFlags & CPUMSELREG_FLAGS_STALE) { Log2(("raw mode refused: stale SS (%#x)\n", env->segs[R_SS].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_SS]); - return EMSTATE_REM; + return false; } if (env->segs[R_DS].fVBoxFlags & CPUMSELREG_FLAGS_STALE) { Log2(("raw mode refused: stale DS (%#x)\n", env->segs[R_DS].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_DS]); - return EMSTATE_REM; + return false; } if (env->segs[R_ES].fVBoxFlags & CPUMSELREG_FLAGS_STALE) { Log2(("raw mode refused: stale ES (%#x)\n", env->segs[R_ES].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_ES]); - return EMSTATE_REM; + return false; } if (env->segs[R_FS].fVBoxFlags & CPUMSELREG_FLAGS_STALE) { Log2(("raw mode refused: stale FS (%#x)\n", env->segs[R_FS].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_FS]); - return EMSTATE_REM; + return false; } if (env->segs[R_GS].fVBoxFlags & CPUMSELREG_FLAGS_STALE) { Log2(("raw mode refused: stale GS (%#x)\n", env->segs[R_GS].selector)); STAM_COUNTER_INC(&gaStatRefuseStale[R_GS]); - return EMSTATE_REM; + return false; } /* Assert(env->pVCpu && PGMPhysIsA20Enabled(env->pVCpu));*/ diff --git a/src/testcase/tstRunTestcases.cpp b/src/testcase/tstRunTestcases.cpp index ee6b9067f..9d23b64b4 100644 --- a/src/testcase/tstRunTestcases.cpp +++ b/src/testcase/tstRunTestcases.cpp @@ -4,7 +4,7 @@ */ /* - * Copyright (C) 2006-2007 Oracle Corporation + * Copyright (C) 2006-2011 Oracle Corporation * * This file is part of VirtualBox Open Source Edition (OSE), as * available from http://www.virtualbox.org. This file is free software; |