Changeset 107362 in vbox

Timestamp:

Dec 18, 2024 3:40:40 PM (6 weeks ago)

Author:

vboxsync

Message:

Main,Installer/win: Removed VBoxProxyStubLegacy.dll since we no longer support Vista and older 64-bit windows hosts.

Location:

trunk/src/VBox

Files:

• Installer/win/VBoxMergeApp.wxi (modified) (2 diffs)
• Installer/win/VirtualBox.wxs (modified) (1 diff)
• Main/Makefile.kmk (modified) (3 diffs)
• Main/glue/initterm.cpp (modified) (1 diff)
• Main/src-all/win/VBoxProxyStub.c (modified) (2 diffs)
• Main/src-all/win/VBoxProxyStubLegacy.rc (deleted)
• Main/src-all/win/comregister.cmd (modified) (4 diffs)

trunk/src/VBox/Installer/win/VBoxMergeApp.wxi

@@ -119 +119 @@
 
 <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?>
-
-    <Component Id="cp_ProxyStub" Guid="CDD09BA4-8D87-4383-DCA6-1CCCF9D11091" Bitness="$(var.Property_Bitness)" Condition="(VersionNT &gt;= 601)">
-        <!-- Only install this proxy stub DLL on Windows 7 and later (OLE32.ObjectStublessClientXX imports). -->
-
+    <Component Id="cp_ProxyStub" Guid="CDD09BA4-8D87-4383-DCA6-1CCCF9D11091" Bitness="$(var.Property_Bitness)">
         <File Id="file_VBoxProxyStub" Name="VBoxProxyStub.dll" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxProxyStub.dll">
             <Class Id="$(env.VBOX_MIDL_PROXY_CLSID)" Context="InprocServer32" Description="PSFactoryBuffer" ThreadingModel="both" />
@@ -128 +125 @@
         <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>
     </Component>
-
-    <?if $(env.KBUILD_TARGET_ARCH) = "amd64" ?>
-    <Component Id="cp_ProxyStubLegacy" Guid="97F12055-5B6D-481C-E8CD-F41D8C733280" Bitness="$(var.Property_Bitness)" Condition="(VersionNT &lt; 601)">
-        <!-- Only install this proxy stub DLL pre-Windows 7 (AMD64: legacy NDR stuff; Both: No ObjectStublessClientXX). -->
-        <File Id="file_VBoxProxyStubLegacy" Name="VBoxProxyStubLegacy.dll" KeyPath="yes" Source="$(env.PATH_OUT)\bin\VBoxProxyStubLegacy.dll">
-            <Class Id="$(env.VBOX_MIDL_PROXY_CLSID)" Context="InprocServer32" Description="PSFactoryBuffer" ThreadingModel="both" />
-        </File>
-        <?include $(env.PATH_TARGET)\VirtualBox_TypeLib.wxi ?>
-    </Component>
-    <?endif?>
-
 <?endif?>
 

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -276 +276 @@
     <?if $(env.VBOX_WITH_MIDL_PROXY_STUB) = "yes" ?>
         <ComponentRef Id="cp_ProxyStub" />
-        <?if $(env.VBOX_WITH_32_ON_64_MAIN_API) = "yes" ?>
-            <ComponentRef Id="cp_ProxyStubLegacy" />
-        <?endif?>
     <?endif?>
     <?if $(env.VBOX_WITH_DTRACE) = "yes" ?>

trunk/src/VBox/Main/Makefile.kmk

@@ -1535 +1535 @@
  # Experimental COM proxy + stub DLL w/ automatic registration updating.
  #
- # The Legacy stub is for older 64-bit windows versions (pre Windows 7) as we
- # were having various problems on windows server 2003 and 2008 with the code
- # MIDL generated.  Also, in windows 7 there are some potentially interesting
- # changes in the generated code where it uses new helpers from OLE32.
- #
  DLLS += VBoxProxyStub
  VBoxProxyStub_TEMPLATE = VBoxMainComp
@@ -1566 +1561 @@
  src-all/win/VBoxProxyStub.rc_DEPS = $(VBoxCOM_0_OUTDIR)/VirtualBox.tlb
  VBoxProxyStub_VirtualBox_p.c_CFLAGS.x86 = /Gz # Workaround for incorrect ObjectStublessClient* prototypes in SDK v7.1.
-
- ifn1of ($(KBUILD_TARGET_ARCH), arm64)
-  DLLS += VBoxProxyStubLegacy
-  VBoxProxyStubLegacy_TEMPLATE = VBoxMainComp
-  VBoxProxyStubLegacy_EXTENDS  = VBoxProxyStub
-  VBoxProxyStubLegacy_DEFS     = $(VBoxProxyStub_DEFS) VBOX_IN_PROXY_STUB_LEGACY
-  VBoxProxyStubLegacy_INCS     = $(VBoxCOM_0_OUTDIR)/legacy/
-  VBoxProxyStubLegacy_SOURCES  = \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_p.c \
-        $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox_i.c \
-        src-all/win/VBoxProxyStub.def \
-        src-all/win/VBoxProxyStubLegacy.rc \
-        src-all/win/VBoxProxyStub.c
-  src-all/win/VBoxProxyStubLegacy.rc_DEPS = $(VBoxCOM_0_OUTDIR)/legacy/VirtualBox.tlb
- endif
 
  ifdef VBOX_WITH_32_ON_64_MAIN_API
@@ -1765 +1745 @@
 
  if defined(VBOX_WITH_32_ON_64_MAIN_API) && !defined(VBOX_ONLY_EXTPACKS)
-  # The XP targetted 32-bit proxy stub works with all versions of windows (the
-  # issues leading to the VBoxProxyStubLegacy.dll are only on 64-bit windows).
+  # The XP targetted 32-bit proxy stub works with all versions of windows.
   $(call KB_FN_AUTO_CMD_DEPS,$(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c)
   $(VBoxCOM-x86_0_OUTDIR)/VirtualBox_i.c \

trunk/src/VBox/Main/glue/initterm.cpp

@@ -466 +466 @@
             if (RT_SUCCESS(vrc))
 #  ifndef VBOX_IN_32_ON_64_MAIN_API
-                vrc = RTPathAppend(szPath, sizeof(szPath),
-                                      RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion,
-                                                  ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion)
-                                   >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/)
-                                   ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll");
+                vrc = RTPathAppend(szPath, sizeof(szPath), "VBoxProxyStub.dll");
 #  else
                 vrc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -91 +91 @@
  * Selects the proxy stub DLL based on 32-on-64-bit and host OS version.
  *
- * The legacy DLL covers 64-bit pre Windows 7 versions of Windows. W2K3-amd64
- * has trouble parsing the result when MIDL /target NT51 or higher. Vista and
- * windows server 2008 seems to have trouble with newer IDL compilers.
+ * Note! We used to have a separate version of the 64-bit DLL for pre-win7.
  */
 #if ARCH_BITS == 64 || defined(VBOX_IN_32_ON_64_MAIN_API)
@@ -100 +98 @@
 # define VBPS_PROXY_STUB_FILE(a_fIs32On64) VBPS_PROXY_STUB_FILE_SUB()
 #endif
-#define VBPS_PROXY_STUB_FILE_SUB() \
-    ( RT_MAKE_U64(((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMinorVersion, \
-                  ((PKUSER_SHARED_DATA)MM_SHARED_USER_DATA_VA)->NtMajorVersion) >= RT_MAKE_U64(1/*Lo*/,6/*Hi*/) \
-      ? "VBoxProxyStub.dll" : "VBoxProxyStubLegacy.dll" )
+#define VBPS_PROXY_STUB_FILE_SUB()         "VBoxProxyStub.dll"
 
 /** For use with AssertLogRel except a_Expr1 from assertions but not LogRel. */

trunk/src/VBox/Main/src-all/win/comregister.cmd

@@ -113 +113 @@
 
 REM
-REM Figure out the Windows version as the proxy stub requires 6.0 or later (at least for 64-bit).
-REM
-set WinVer=Version 4.0.1381
-set WinVerMajor=4
-set WinVerMinor=0
-set WinVerBuild=1381
-for /f "tokens=2 delims=[]" %%a in ('ver') do set WinVer=%%a
-for /f "tokens=2,3,4 delims=. " %%a in ("%WinVer%") do (
-    set WinVerMajor=%%a
-    set WinVerMinor=%%b
-    set WinVerBuild=%%c
-)
-REM echo WinVerMajor=%WinVerMajor% WinVerMinor=%WinVerMinor% WinVerBuild=%WinVerBuild%  WinVer=%WinVer%
-
-REM
 REM Parse arguments.
 REM
@@ -182 +167 @@
 REM Unregister all first, then register them. The order matters here.
 :register_amd64
-if "%WinVerMajor%" == "5" goto register_amd64_legacy
-if not "%WinVerMajor%" == "6" goto register_amd64_not_legacy
-if not "%WinVerMinor%" == "0" goto register_amd64_not_legacy
-:register_amd64_legacy
-set s64BitProxyStub=VBoxProxyStubLegacy.dll
-goto register_amd64_begin
-:register_amd64_not_legacy
-set s64BitProxyStub=VBoxProxyStub.dll
-:register_amd64_begin
-echo s64BitProxyStub=%s64BitProxyStub%
 @echo on
 "%_VBOX_DIR%VBoxSVC.exe" /UnregServer
@@ -197 +172 @@
 %windir%\system32\regsvr32 /s /u "%_VBOX_DIR%VBoxC.dll"
 %windir%\syswow64\regsvr32 /s /u "%_VBOX_DIR%x86\VBoxClient-x86.dll"
-%windir%\system32\regsvr32 /s /u "%_VBOX_DIR%%s64BitProxyStub%"
+%windir%\system32\regsvr32 /s /u "%_VBOX_DIR%VBoxProxyStub.dll"
 %windir%\syswow64\regsvr32 /s /u "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll"
 if %fUninstallOnly% == 1 goto end
@@ -205 +180 @@
 %windir%\syswow64\regsvr32 /s    "%_VBOX_DIR%x86\VBoxClient-x86.dll"
 if %fNoProxy% == 1 goto end
-if exist "%_VBOX_DIR%%s64BitProxyStub%"         %windir%\system32\regsvr32 /s "%_VBOX_DIR%%s64BitProxyStub%"
+if exist "%_VBOX_DIR%VBoxProxyStub.dll"         %windir%\system32\regsvr32 /s "%_VBOX_DIR%VBoxProxyStub.dll"
 if exist "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll" %windir%\syswow64\regsvr32 /s "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll"
 @echo off