VirtualBox

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


Ignore:
Timestamp:
Jan 26, 2011 9:46:04 AM (14 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
69661
Message:

Windows Guest Additions: Removed VBCoInst (co installer), not needed.

Location:
trunk/src/VBox/Additions
Files:
3 deleted
6 edited

Legend:

Unmodified
Added
Removed

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

    r35381 r35719  
    8888        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
    8989        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
    90         $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
    91         $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
     90        $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
    9291  endif # signing
    9392  VBoxGuest-inf_CLEAN = $(VBoxGuest-inf_SOURCES)
    … …  
    108107        $(INSTALL) -m 755 $< $(@D)
    109108
    110   $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll:    $$(TARGET_VBCoInst) | $$(dir $$@)
    111         $(INSTALL) -m 644 $< $(@D)
    112 
    113109  $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.cat: \
    114110                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.inf \
    115111                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxGuest.sys \
    116112                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxControl.exe \
    117                 $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe \
    118                 $(PATH_TARGET)/VBoxGuestCat.dir/VBCoInst.dll
     113                $(PATH_TARGET)/VBoxGuestCat.dir/VBoxTray.exe
    119114        $(call MSG_TOOL,Inf2Cat,VBoxGuest-inf,$@,$<)
    120115        $(call VBOX_MAKE_CAT_FN, $(@D),$@)

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

    r35659 r35719  
    2929
    3030## @todo VBOX_WIN_ADD_INS_OUT_DIR := $(PATH_TARGET)/Additions/Installer/win
    31 
    32 DLLS += VBCoInst
    33 VBCoInst_TEMPLATE = VBOXGUESTR3DLL
    34 ifdef VBOX_SIGN_ADDITIONS # (See the parent makefile.)
    35  VBCoInst_NOINST  = true
    36 endif
    37 VBCoInst_DEFS     = _WIN32_WINNT=0x0400 WIN32_LEAN_AND_MEAN=1 UNICODE
    38 VBCoInst_LDFLAGS  = /subsystem:console,4.10
    39 VBCoInst_SOURCES  = \
    40         VBCoInst.cpp \
    41         VBCoInst.def \
    42         VBCoInst.rc
    4331
    4432PROGRAMS += VBoxDrvInst

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

    r35680 r35719  
    143143  FILE "$%PATH_OUT%\bin\additions\VBoxGuest.cat"
    144144!endif
    145   FILE "$%PATH_OUT%\bin\additions\VBCoInst.dll"
    146145  FILE "$%PATH_OUT%\bin\additions\VBoxTray.exe"
    147146  FILE "$%PATH_OUT%\bin\additions\VBoxHook.dll"

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

    r35703 r35719  
    191191
    192192  ; Guest driver files
    193   FILE "$%PATH_OUT%\bin\additions\VBCoInst.dll"
    194193  FILE "$%PATH_OUT%\bin\additions\VBoxTray.exe"
    195194  FILE "$%PATH_OUT%\bin\additions\VBoxControl.exe" ; Not used by W2K and up, but required by the .INF file
    … …  
    493492  Delete /REBOOTOK "$INSTDIR\VBoxGuest.cat"
    494493
    495   Delete /REBOOTOK "$INSTDIR\VBCoInst.dll"
     494  Delete /REBOOTOK "$INSTDIR\VBCoInst.dll" ; Deprecated, does not get installed anymore
    496495  Delete /REBOOTOK "$INSTDIR\VBoxControl.exe"
    497   Delete /REBOOTOK "$INSTDIR\VBoxService.exe" ; File from an older installation maybe, not present here anymore
     496  Delete /REBOOTOK "$INSTDIR\VBoxService.exe" ; Deprecated, does not get installed anymore
    498497
    499498!if $%VBOX_WITH_WDDM% == "1"
    … …  
    684683  Pop $0 ; Ret value
    685684  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxGuest.sys"
    686   Delete /REBOOTOK "$g_strSystemDir\vbcoinst.dll"
     685  Delete /REBOOTOK "$g_strSystemDir\VBCoInst.dll" ; Deprecated, does not get installed anymore
    687686  Delete /REBOOTOK "$g_strSystemDir\VBoxTray.exe"
    688687  Delete /REBOOTOK "$g_strSystemDir\VBoxHook.dll"
    … …  
    696695  nsExec::ExecToLog '"$INSTDIR\VBoxDrvInst.exe" service delete VBoxSF'
    697696  Pop $0 ; Ret value
    698   Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll"   ; The network provider DLL will be locked
     697  Delete /REBOOTOK "$g_strSystemDir\VBoxMRXNP.dll" ; The network provider DLL will be locked
    699698  Delete /REBOOTOK "$g_strSystemDir\drivers\VBoxSF.sys"
    700699

  • trunk/src/VBox/Additions/WINNT/SharedFolders/redirector/sys/VBoxSF.inf

    r32408 r35719  
    6464HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\Run, VBoxMRXNP, 0x00000000, %11%\VBoxMRXNP.exe
    6565
    66 [VBoxSF_Install.CoInstallers]
    67 AddReg = VBoxSF_Install_CoInstallers_reg
    68 CopyFiles = VBox_CoInstaller_CopyFiles
    69 
    70 [VBox_CoInstaller_CopyFiles]
    71 vbcoinst.dll
    72 
    73 [VBoxSF_Install_CoInstallers_reg]
    74 HKR,,CoInstallers32,0x00010000,"vbcoinst.dll,VBoxCoInstaller"
    75 
    7666[Strings]
    7767ORACLE = "Oracle Corporation"

  • trunk/src/VBox/Additions/common/VBoxGuest/win/VBoxGuest.inf

    r35711 r35719  
    26262 = %VBoxControl.MediaDesc%
    27273 = %VBoxTray.MediaDesc%
    28 4 = %vbcoinst.MediaDesc%
    2928
    3029[SourceDisksFiles]
    … …  
    3231VBoxControl.exe = 2
    3332VBoxTray.exe = 3
    34 vbcoinst.dll = 4
    3533
    3634[DestinationDirs]
    3735DefaultDestDir = 12 ; drivers
    38 VBox_CoInstaller_CopyFiles = 11 ; system32
    3936VBoxTray_CopyFiles = 11 ; system32
    4037
    … …  
    7370HKLM, SOFTWARE\Microsoft\Windows\CurrentVersion\Run, VBoxTray, 0x00000000, %11%\VBoxTray.exe
    7471
    75 [VBoxGuest_Install.CoInstallers]
    76 AddReg = VBoxGuest_Install_CoInstallers_reg
    77 CopyFiles = VBox_CoInstaller_CopyFiles
    78 
    79 [VBox_CoInstaller_CopyFiles]
    80 vbcoinst.dll
    81 
    82 [VBoxGuest_Install_CoInstallers_reg]
    83 HKR,,CoInstallers32,0x00010000,"vbcoinst.dll,VBoxCoInstaller"
    84 
    8572[ClassInstall32]
    8673; This should fix the error 0xe0000101 (The required section was not found in the INF).
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