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

Timestamp:

Jan 18, 2016 5:37:59 PM (9 years ago)

Author:

vboxsync

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

105078

Message:

VBoxProxyStub,comregister,glue: Added a second proxy dll for older 64-bit windows versions since we're having trouble convincing MIDL to produce code that works with XP64/W2K3 without indicating that we're targetting windows 2000 and dropping the ndr64/all protocol option. Using the legacy proxy stub for vista and windows server 2008 too, since there was some potentially interesting changes introduced with windows 7 that we might benefit from.

Location:

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

Files:

• VBoxProxyStub.c (modified) (5 diffs)
• comregister.cmd (modified) (4 diffs)

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

@@ -69 +69 @@
 # define VBSP_LOG_DEL_KEY(a)        do { } while (0)
 #endif
+
+/**
+ * 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.
+ */
+#define VBPS_PROXY_STUB_FILE(a_fIs32On64) \
+    ( (a_fIs32On64) ? "x86\\VBoxProxyStub-x86.dll" \
+      : 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" )
 
 
@@ -142 +155 @@
             /* Init IPRT. */
             RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+
+#ifdef VBOX_STRICT
+            {
+                /*
+                 * Check that no interface has more than 256 methods in the stub vtable.
+                 */
+                const ProxyFileInfo **ppProxyFile = &g_apProxyFiles[0];
+                const ProxyFileInfo  *pProxyFile;
+                while ((pProxyFile = *ppProxyFile++) != NULL)
+                {
+                    const PCInterfaceStubVtblList * const   papStubVtbls  = pProxyFile->pStubVtblList;
+                    const char * const                     *papszNames    = pProxyFile->pNamesArray;
+                    unsigned                                iIf           = pProxyFile->TableSize;
+                    AssertStmt(iIf < 1024, iIf = 0);
+                    Assert(pProxyFile->TableVersion == 2);
+
+                    while (iIf-- > 0)
+                        AssertMsg(papStubVtbls[iIf]->header.DispatchTableCount <= 256,
+                                  ("%s: DispatchTableCount=%d\n", papszNames[iIf], papStubVtbls[iIf]->header.DispatchTableCount));
+                }
+            }
+#endif
             break;
 
@@ -1107 +1142 @@
         unsigned i = pState->cAltDeletes;
         while (i-- > 0)
-            vbpsDeleteKeyRecursiveA(pState, pState->aAltDeletes[i].hkeyClsid, szClsId, __LINE__);
+            if (pState->aAltDeletes[i].hkeyClsid != NULL)
+                vbpsDeleteKeyRecursiveA(pState, pState->aAltDeletes[i].hkeyClsid, szClsId, __LINE__);
         vbpsDeleteKeyRecursiveA(pState, pState->hkeyClsidRootDst, szClsId, __LINE__);
     }
@@ -1232 +1268 @@
 static void vbpsUpdateTypeLibRegistration(VBPSREGSTATE *pState, PCRTUTF16 pwszVBoxDir, bool fIs32On64)
 {
-    const char * const pszTypeLibDll = !fIs32On64 ? "VBoxProxyStub.dll" : "x86\\VBoxProxyStub-x86.dll";
+    const char * const pszTypeLibDll = VBPS_PROXY_STUB_FILE(fIs32On64);
     const char * const pszWinXx      = !fIs32On64 ? "win64"             : "win32";
     const char * const pszDescription = "VirtualBox Type Library";
@@ -1316 +1352 @@
      * It's simple compared to the VBox classes, thus all the NULL parameters.
      */
-    const char *pszPsDll = !fIs32On64 ? "VBoxProxyStub.dll" : "x86\\VBoxProxyStub-x86.dll";
+    const char *pszPsDll = VBPS_PROXY_STUB_FILE(fIs32On64);
     Assert(pState->fUpdate && !pState->fDelete);
     VbpsRegisterClassId(pState, &g_ProxyClsId, "PSFactoryBuffer", NULL /*pszAppId*/,

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

@@ -7 +7 @@
 
 REM
-REM Copyright (C) 2006-2015 Oracle Corporation
+REM Copyright (C) 2006-2016 Oracle Corporation
 REM
 REM This file is part of VirtualBox Open Source Edition (OSE), as
@@ -121 +121 @@
 REM
 set fNoProxy=0
-if "%WinVerMajor%" == "5" set fNoProxy=1
-if "%WinVerMajor%" == "4" set fNoProxy=1
 set fUninstallOnly=0
 
@@ -173 +171 @@
 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
 %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%VBoxProxyStub.dll"
+%windir%\system32\regsvr32 /s /u "%_VBOX_DIR%%s64BitProxyStub%"
 %windir%\syswow64\regsvr32 /s /u "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll"
 if %fUninstallOnly% == 1 goto end
@@ -184 +192 @@
 %windir%\syswow64\regsvr32 /s    "%_VBOX_DIR%x86\VBoxClient-x86.dll"
 if %fNoProxy% == 1 goto end
-if exist "%_VBOX_DIR%VBoxProxyStub.dll"         %windir%\system32\regsvr32 /s "%_VBOX_DIR%VBoxProxyStub.dll"
+if exist "%_VBOX_DIR%%s64BitProxyStub%"         %windir%\system32\regsvr32 /s "%_VBOX_DIR%%s64BitProxyStub%"
 if exist "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll" %windir%\syswow64\regsvr32 /s "%_VBOX_DIR%x86\VBoxProxyStub-x86.dll"
 @echo off