diff options
Diffstat (limited to 'src/VBox/Main/src-all/win')
| -rw-r--r-- | src/VBox/Main/src-all/win/VirtualBox_rgs.xsl | 2 | ||||
| -rw-r--r-- | src/VBox/Main/src-all/win/comregister.cmd | 26 |
2 files changed, 23 insertions, 5 deletions
diff --git a/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl b/src/VBox/Main/src-all/win/VirtualBox_rgs.xsl index 0b2e4ba9..08dc63fd 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-all/win/comregister.cmd b/src/VBox/Main/src-all/win/comregister.cmd index 1f8e312f..65f51c3b 100644 --- a/src/VBox/Main/src-all/win/comregister.cmd +++ b/src/VBox/Main/src-all/win/comregister.cmd @@ -6,7 +6,7 @@ REM (both inproc and out-of-process) REM
REM
-REM Copyright (C) 2006-2011 Oracle Corporation
+REM Copyright (C) 2006-2013 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;
@@ -94,13 +94,31 @@ cd "%_SCRIPT_CURDIR%" REM
REM Do the registrations.
REM
-:register
+if "%ProgramW6432%x" == "x" goto register_x86
+goto register_amd64
+
+:register_x86
@echo on
-%_VBOX_DIR%VBoxSVC.exe /ReregServer
+%_VBOX_DIR%VBoxSVC.exe /UnregServer
regsvr32 /s /u %_VBOX_DIR%VBoxC.dll
+@if "%1" == "-u" goto end
+%_VBOX_DIR%VBoxSVC.exe /RegServer
regsvr32 /s %_VBOX_DIR%VBoxC.dll
@echo off
+goto end
+
+REM Unregister both first, then register them. The order matters here.
+:register_amd64
+@echo on
+%_VBOX_DIR%VBoxSVC.exe /UnregServer
+%windir%\syswow64\regsvr32 /s /u %_VBOX_DIR%VBoxClient-x86.dll
+%windir%\system32\regsvr32 /s /u %_VBOX_DIR%VBoxC.dll
+@if "%1" == "-u" goto end
+%_VBOX_DIR%VBoxSVC.exe /RegServer
+%windir%\system32\regsvr32 /s %_VBOX_DIR%VBoxC.dll
+%windir%\syswow64\regsvr32 /s %_VBOX_DIR%VBoxClient-x86.dll
+@echo off
:end
-endlocal
+@endlocal
|