Imported from /home/lorry/working-area/delta_VirtualBox/VirtualBox-4.3.10.tar.bz2.HEADVirtualBox-4.3.10master

5 files changed, 16 insertions, 15 deletions

diff --git a/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc b/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc
index a308279a..20801c0a 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc
+++ b/src/VBox/Additions/WINNT/Mouse/NT4/VBoxPS2NT.rc
@@ -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/WINNT/Mouse/NT5/VBoxMF.h b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
index 3b72d551..593a0cff 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.h
+++ b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMF.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/WINNT/Mouse/NT5/VBoxMFInternal.cpp b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp
index f0b61383..e7b41aad 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.cpp
+++ b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMFInternal.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/Additions/WINNT/Mouse/NT5/VBoxMouse.inf b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf
index 927deda3..feac6e9b 100644
--- a/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf
+++ b/src/VBox/Additions/WINNT/Mouse/NT5/VBoxMouse.inf
@@ -2,7 +2,7 @@
 ; INF file for installing the VBox Guest Mouse
 ; (driver for Windows NT5+).
 ;
-; 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;
@@ -34,27 +34,28 @@ DefaultDestDir = 12	; DIRID_DRIVERS
 ;x86   %ORACLE%=VBoxMouse
 ;amd64 %ORACLE%=VBoxMouse, NTamd64
 
-[DefaultInstall]
-;
-; DefaultInstall section is used to install the class filter driver.
-;
+[VBoxMouse_Install]
 CopyFiles = @VBoxMouse.sys
-AddReg = VBoxMouse_AddReg
 
-[VBoxMouse_AddReg]
-HKLM, System\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}, UpperFilters, 0x00010000, "VBoxMouse", "mouclass"
+[VBoxMouse_Install.Services]
+AddService = VBoxMouse,,VBoxMouse.Service
+
+[DefaultInstall]
+CopyFiles = @VBoxMouse.sys
 
 [DefaultInstall.Services]
-AddService = VBoxMouse, , VBoxMouse_Service_Inst
+AddService = VBoxMouse,,VBoxMouse.Service
 
+[VBoxMouse.AddRegistry]
+HKLM, System\CurrentControlSet\Control\Class\{4D36E96F-E325-11CE-BFC1-08002BE10318}, UpperFilters, 0x00010000, "VBoxMouse", "mouclass"
 
-[VBoxMouse_Service_Inst]
+[VBoxMouse.Service]
 DisplayName    = %VBoxMouse.SvcDesc%
 ServiceType    = %SERVICE_KERNEL_DRIVER%
 StartType      = %SERVICE_DEMAND_START%
 ErrorControl   = %SERVICE_ERROR_IGNORE%
 ServiceBinary  = %12%\VBoxMouse.sys
-
+AddReg         = VBoxMouse.AddRegistry
 
 [Strings]
 VBoxMouse.SvcDesc       = "VirtualBox Guest Mouse Service"
diff --git a/src/VBox/Additions/WINNT/Mouse/common/VBoxMouseLog.h b/src/VBox/Additions/WINNT/Mouse/common/VBoxMouseLog.h
index 542e3b6c..d0b30d49 100644
--- a/src/VBox/Additions/WINNT/Mouse/common/VBoxMouseLog.h
+++ b/src/VBox/Additions/WINNT/Mouse/common/VBoxMouseLog.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;