Changeset 107362 in vbox for trunk/src/VBox/Main/src-all/win

Timestamp:

Dec 18, 2024 3:40:40 PM (3 months ago)

Author:

vboxsync

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

166400

Message:

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

Location:

trunk/src/VBox/Main/src-all/win

Files:

• VBoxProxyStub.c (modified) (2 diffs)
• VBoxProxyStubLegacy.rc (deleted)
• comregister.cmd (modified) (4 diffs)

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