Changeset 54120 in vbox for trunk/src/VBox/Additions/WINNT/Installer

Timestamp:

Feb 10, 2015 10:19:48 AM (10 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

98131

Message:

Windows guest additions: cleanup, removed obsolete MMR code.

Location:

trunk/src/VBox/Additions/WINNT/Installer

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxGuestAdditions.nsi (modified) (5 diffs)
• VBoxGuestAdditionsVista.nsh (modified) (4 diffs)

trunk/src/VBox/Additions/WINNT/Installer/Makefile.kmk

@@ -170 +170 @@
  endif
 endif
-ifdef VBOX_WITH_MMR
-DRIVER_FILES += \
-        $(PATH_STAGE_BIN)/additions/VBoxMMR.exe \
-        $(PATH_STAGE_BIN)/additions/VBoxMMRHook.dll
-  ifeq ($(KBUILD_TARGET_ARCH),amd64)
-        DRIVER_FILES += \
-                $(PATH_STAGE_BIN)/additions/VBoxMMR-x86.exe \
-                $(PATH_STAGE_BIN)/additions/VBoxMMRHook-x86.dll
-  endif
-endif
 
 
@@ -205 +195 @@
         -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
         -E 'VBOX_WITH_WDDM_W8=$(if $(VBOX_WITH_WDDM_W8),1,0)' \
-        -E 'VBOX_WITH_MMR=$(if $(VBOX_WITH_MMR),1,0)' \
         -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
         -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditions.nsi

@@ -235 +235 @@
 Var g_bNoMouseDrv                       ; Cmd line: Do not install the VBoxMouse driver
 Var g_bWithAutoLogon                    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
-Var g_bWithVBoxMMR                      ; Cmd line: Install VBoxMMR for media redirection support
 Var g_bWithD3D                          ; Cmd line: Install Direct3D support
 Var g_bOnlyExtract                      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
@@ -382 +381 @@
         StrCpy $g_bWithAutoLogon "true"
         ${Break}
-
-!if $%VBOX_WITH_MMR% == "1"
-      ${Case} '/with_vboxmmr'
-        StrCpy $g_bWithVBoxMMR "true"
-        ${Break}
-!endif
 
 !if $%VBOX_WITH_CROGL% == "1"
@@ -445 +438 @@
                     /with_autologon$\tInstalls auto-logon support$\r$\n \
                     /with_d3d$\tInstalls D3D support$\r$\n \
-                    /with_vboxmmr$\tInstalls multimedia redirection (MMR) support$\r$\n \
                     /with_wddm$\tInstalls the WDDM instead of the XPDM graphics driver$\r$\n \
                     /xres=X$\t$\tSets the guest's display resolution (width in pixels)$\r$\n \
@@ -589 +581 @@
   ${Else}
     ${LogVerbose} "Auto-logon support was not installed previously"
-  ${EndIf}
-
-  ; Check for installed MMR support and enable updating
-  ; those modules if needed
-  ${If}    ${FileExists} "$g_strSystemDir\VBoxMMR.exe"
-!if $%BUILD_TARGET_ARCH% == "amd64"
-  ${AndIf} ${FileExists} "$g_strSysWow64\VBoxMMRHook.dll"
-!else
-  ${AndIf} ${FileExists} "$g_strSystemDir\VBoxMMRHook.dll"
-!endif
-    ${LogVerbose} "MultiMedia Redirection support (MMR) was installed previously"
-    StrCpy $g_bWithVBoxMMR "true" ; Force update
-  ${Else}
-    ${LogVerbose} "MultiMedia Redirection support (MMR) support was not installed previously"
   ${EndIf}
 
@@ -1106 +1084 @@
   StrCpy $g_bNoMouseDrv "false"
   StrCpy $g_bWithAutoLogon "false"
-  StrCpy $g_bWithVBoxMMR "false"
   StrCpy $g_bWithD3D "false"
   StrCpy $g_bOnlyExtract "false"

trunk/src/VBox/Additions/WINNT/Installer/VBoxGuestAdditionsVista.nsh

@@ -67 +67 @@
 Function Vista_Prepare
 
-  ${If} $g_bWithVBoxMMR == "true"
-     Call StopVBoxMMR
-  ${Else}
-     Call VBoxMMR_Uninstall
-  ${EndIf}
+  Call VBoxMMR_Uninstall
 
 FunctionEnd
@@ -86 +82 @@
   ;FILE "$%PATH_OUT%\bin\additions\VBoxNET.sys"
 
-!if $%VBOX_WITH_MMR% == "1"
-  ${If} $g_bWithVBoxMMR == "true"
-    !if $%BUILD_TARGET_ARCH% == "amd64"
-      FILE "$%PATH_OUT%\bin\additions\VBoxMMR-x86.exe"
-      FILE "$%PATH_OUT%\bin\additions\VBoxMMRHook-x86.dll"
-    !else
-      FILE "$%PATH_OUT%\bin\additions\VBoxMMR.exe"
-      FILE "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll"
-    !endif
-  ${EndIf}
-!endif
-
 FunctionEnd
 
@@ -106 +90 @@
   SetOutPath "$INSTDIR"
   ; Nothing here yet
-
-!if $%VBOX_WITH_MMR% == "1"
-
-  ${If} $g_bWithVBoxMMR == "true"
-
-    !if $%BUILD_TARGET_ARCH% == "amd64"
-
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMR-x86.exe" "$g_strSystemDir\VBoxMMR.exe" "$INSTDIR"
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMRHook-x86.dll" "$g_strSysWow64\VBoxMMRHook.dll" "$INSTDIR"
-      AccessControl::GrantOnFile "$g_strSysWow64\VBoxMMRHook.dll" "(BU)" "GenericRead"
-
-    !else
-
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMR.exe" "$g_strSystemDir\VBoxMMR.exe" "$INSTDIR"
-      !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll" "$g_strSystemDir\VBoxMMRHook.dll" "$INSTDIR"
-      AccessControl::GrantOnFile "$g_strSystemDir\VBoxMMRHook.dll" "(BU)" "GenericRead"
-
-    !endif
-
-    AccessControl::GrantOnFile "$g_strSystemDir\VBoxMMR.exe" "(BU)" "GenericRead"
-
-    WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxMMR" '"$SYSDIR\VBoxMMR.exe"'
-
-  ${EndIf}
-
-!endif
 
   Goto done
@@ -184 +142 @@
 Function ${un}VBoxMMR_Uninstall
 
-  ; Remove VBoxMMR even if VBOX_WITH_MMR is not defined
+  ; Remove VBoxMMR always
 
   DetailPrint "Uninstalling VBoxMMR."