VirtualBox

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


Ignore:
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
Files:
3 deleted
8 edited

Legend:

Unmodified
Added
Removed

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

    r44864 r54120  
    170170 endif
    171171endif
    172 ifdef VBOX_WITH_MMR
    173 DRIVER_FILES += \
    174         $(PATH_STAGE_BIN)/additions/VBoxMMR.exe \
    175         $(PATH_STAGE_BIN)/additions/VBoxMMRHook.dll
    176   ifeq ($(KBUILD_TARGET_ARCH),amd64)
    177         DRIVER_FILES += \
    178                 $(PATH_STAGE_BIN)/additions/VBoxMMR-x86.exe \
    179                 $(PATH_STAGE_BIN)/additions/VBoxMMRHook-x86.dll
    180   endif
    181 endif
    182172
    183173
    … …  
    205195        -E 'VBOX_WITH_WDDM=$(if $(VBOX_WITH_WDDM),1,0)' \
    206196        -E 'VBOX_WITH_WDDM_W8=$(if $(VBOX_WITH_WDDM_W8),1,0)' \
    207         -E 'VBOX_WITH_MMR=$(if $(VBOX_WITH_MMR),1,0)' \
    208197        -E 'VBOX_BRAND_WIN_ADD_INST_DLGBMP=$(subst /,\,$(VBOX_BRAND_WIN_ADD_INST_DLGBMP))' \
    209198        -E 'VBOX_BRAND_LICENSE_RTF=$(subst /,\,$(VBOX_BRAND_LICENSE_RTF))' \

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

    r53129 r54120  
    235235Var g_bNoMouseDrv                       ; Cmd line: Do not install the VBoxMouse driver
    236236Var g_bWithAutoLogon                    ; Cmd line: Install VBoxGINA / VBoxCredProv for auto logon support
    237 Var g_bWithVBoxMMR                      ; Cmd line: Install VBoxMMR for media redirection support
    238237Var g_bWithD3D                          ; Cmd line: Install Direct3D support
    239238Var g_bOnlyExtract                      ; Cmd line: Only extract all files, do *not* install them. Only valid with param "/D" (target directory)
    … …  
    382381        StrCpy $g_bWithAutoLogon "true"
    383382        ${Break}
    384 
    385 !if $%VBOX_WITH_MMR% == "1"
    386       ${Case} '/with_vboxmmr'
    387         StrCpy $g_bWithVBoxMMR "true"
    388         ${Break}
    389 !endif
    390383
    391384!if $%VBOX_WITH_CROGL% == "1"
    … …  
    445438                    /with_autologon$\tInstalls auto-logon support$\r$\n \
    446439                    /with_d3d$\tInstalls D3D support$\r$\n \
    447                     /with_vboxmmr$\tInstalls multimedia redirection (MMR) support$\r$\n \
    448440                    /with_wddm$\tInstalls the WDDM instead of the XPDM graphics driver$\r$\n \
    449441                    /xres=X$\t$\tSets the guest's display resolution (width in pixels)$\r$\n \
    … …  
    589581  ${Else}
    590582    ${LogVerbose} "Auto-logon support was not installed previously"
    591   ${EndIf}
    592 
    593   ; Check for installed MMR support and enable updating
    594   ; those modules if needed
    595   ${If}    ${FileExists} "$g_strSystemDir\VBoxMMR.exe"
    596 !if $%BUILD_TARGET_ARCH% == "amd64"
    597   ${AndIf} ${FileExists} "$g_strSysWow64\VBoxMMRHook.dll"
    598 !else
    599   ${AndIf} ${FileExists} "$g_strSystemDir\VBoxMMRHook.dll"
    600 !endif
    601     ${LogVerbose} "MultiMedia Redirection support (MMR) was installed previously"
    602     StrCpy $g_bWithVBoxMMR "true" ; Force update
    603   ${Else}
    604     ${LogVerbose} "MultiMedia Redirection support (MMR) support was not installed previously"
    605583  ${EndIf}
    606584
    … …  
    11061084  StrCpy $g_bNoMouseDrv "false"
    11071085  StrCpy $g_bWithAutoLogon "false"
    1108   StrCpy $g_bWithVBoxMMR "false"
    11091086  StrCpy $g_bWithD3D "false"
    11101087  StrCpy $g_bOnlyExtract "false"

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

    r44864 r54120  
    6767Function Vista_Prepare
    6868
    69   ${If} $g_bWithVBoxMMR == "true"
    70      Call StopVBoxMMR
    71   ${Else}
    72      Call VBoxMMR_Uninstall
    73   ${EndIf}
     69  Call VBoxMMR_Uninstall
    7470
    7571FunctionEnd
    … …  
    8682  ;FILE "$%PATH_OUT%\bin\additions\VBoxNET.sys"
    8783
    88 !if $%VBOX_WITH_MMR% == "1"
    89   ${If} $g_bWithVBoxMMR == "true"
    90     !if $%BUILD_TARGET_ARCH% == "amd64"
    91       FILE "$%PATH_OUT%\bin\additions\VBoxMMR-x86.exe"
    92       FILE "$%PATH_OUT%\bin\additions\VBoxMMRHook-x86.dll"
    93     !else
    94       FILE "$%PATH_OUT%\bin\additions\VBoxMMR.exe"
    95       FILE "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll"
    96     !endif
    97   ${EndIf}
    98 !endif
    99 
    10084FunctionEnd
    10185
    … …  
    10690  SetOutPath "$INSTDIR"
    10791  ; Nothing here yet
    108 
    109 !if $%VBOX_WITH_MMR% == "1"
    110 
    111   ${If} $g_bWithVBoxMMR == "true"
    112 
    113     !if $%BUILD_TARGET_ARCH% == "amd64"
    114 
    115       !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMR-x86.exe" "$g_strSystemDir\VBoxMMR.exe" "$INSTDIR"
    116       !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMRHook-x86.dll" "$g_strSysWow64\VBoxMMRHook.dll" "$INSTDIR"
    117       AccessControl::GrantOnFile "$g_strSysWow64\VBoxMMRHook.dll" "(BU)" "GenericRead"
    118 
    119     !else
    120 
    121       !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMR.exe" "$g_strSystemDir\VBoxMMR.exe" "$INSTDIR"
    122       !insertmacro ReplaceDLL "$%PATH_OUT%\bin\additions\VBoxMMRHook.dll" "$g_strSystemDir\VBoxMMRHook.dll" "$INSTDIR"
    123       AccessControl::GrantOnFile "$g_strSystemDir\VBoxMMRHook.dll" "(BU)" "GenericRead"
    124 
    125     !endif
    126 
    127     AccessControl::GrantOnFile "$g_strSystemDir\VBoxMMR.exe" "(BU)" "GenericRead"
    128 
    129     WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Run" "VBoxMMR" '"$SYSDIR\VBoxMMR.exe"'
    130 
    131   ${EndIf}
    132 
    133 !endif
    13492
    13593  Goto done
    … …  
    184142Function ${un}VBoxMMR_Uninstall
    185143
    186   ; Remove VBoxMMR even if VBOX_WITH_MMR is not defined
     144  ; Remove VBoxMMR always
    187145
    188146  DetailPrint "Uninstalling VBoxMMR."

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

    r41477 r54120  
    3333endif
    3434
    35 ifdef VBOX_WITH_MMR
    36 include $(PATH_SUB_CURRENT)/VBoxMMR/Makefile.kmk
    37 endif
    38 
    3935include $(FILE_KBUILD_SUB_FOOTER)
    4036

  • trunk/src/VBox/Additions/WINNT/VBoxTray/Makefile.kmk

    r51224 r54120  
    6666        mpr.lib
    6767endif
    68 ifdef VBOX_WITH_MMR
    69  VBoxTray_DEFS     += VBOX_WITH_MMR
    70  VBoxTray_SOURCES  += \
    71         VBoxMMR.cpp
    72 endif
    7368ifdef VBOX_WITH_WDDM
    7469 VBoxTray_DEFS   += VBOX_WITH_WDDM

  • trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp

    r51473 r54120  
    3737#include "VBoxIPC.h"
    3838#include "VBoxLA.h"
    39 #include "VBoxMMR.h"
    4039#include <VBoxHook.h>
    4140#include "resource.h"
    … …  
    197196        VBoxLADestroy
    198197    },
    199 #ifdef VBOX_WITH_MMR
    200     {
    201         "Multimedia Redirection",
    202         VBoxMMRInit,
    203         VBoxMMRThread,
    204         NULL /* pfnStop */,
    205         VBoxMMRDestroy
    206     },
    207 #endif
    208198#ifdef VBOX_WITH_DRAG_AND_DROP
    209199    {

  • trunk/src/VBox/Additions/common/VBoxService/Makefile.kmk

    r52890 r54120  
    5353if1of ($(KBUILD_TARGET), win)
    5454 VBoxService_DEFS        += VBOXSERVICE_PAGE_SHARING
    55  ifdef VBOX_WITH_MMR
    56   VBoxService_DEFS       += VBOX_WITH_MMR
    57  endif
    5855endif
    5956if1of ($(KBUILD_TARGET), linux)

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

    r53764 r54120  
    12681268        { szSysDir, "VBoxGINA.dll" },
    12691269        { szSysDir, "VBoxCredProv.dll" },
    1270 # ifdef VBOX_WITH_MMR
    1271         { szSysDir, "VBoxMMR.exe" },
    1272 # endif /* VBOX_WITH_MMR */
    12731270
    12741271 /* On 64-bit we don't yet have the OpenGL DLLs in native format.
    12751272    So just enumerate the 32-bit files in the SYSWOW directory. */
    12761273# ifdef RT_ARCH_AMD64
    1277 #  ifdef VBOX_WITH_MMR
    1278         { szSysWowDir, "VBoxMMRHook.dll" },
    1279 #  endif /* VBOX_WITH_MMR */
    12801274        { szSysWowDir, "VBoxOGLarrayspu.dll" },
    12811275        { szSysWowDir, "VBoxOGLcrutil.dll" },
    … …  
    12861280        { szSysWowDir, "VBoxOGL.dll" },
    12871281# else  /* !RT_ARCH_AMD64 */
    1288 #  ifdef VBOX_WITH_MMR
    1289         { szSysDir, "VBoxMMRHook.dll" },
    1290 #  endif /* VBOX_WITH_MMR */
    12911282        { szSysDir, "VBoxOGLarrayspu.dll" },
    12921283        { szSysDir, "VBoxOGLcrutil.dll" },
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette