Changeset 59385 in vbox for trunk/src/VBox/Main/glue

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.

File:

• trunk/src/VBox/Main/glue/initterm.cpp (modified) (2 diffs)

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

@@ -19 +19 @@
 #if !defined(VBOX_WITH_XPCOM)
 
+# include <iprt/nt/nt-and-windows.h>
 # include <objbase.h>
 
@@ -254 +255 @@
         int vrc = RTPathAppPrivateArch(szPath, sizeof(szPath));
         if (RT_SUCCESS(vrc))
+        {
 #  ifndef VBOX_IN_32_ON_64_MAIN_API
-            rc = RTPathAppend(szPath, sizeof(szPath), "VBoxProxyStub.dll");
+            rc = RTPathAppend(szPath, sizeof(szPath),
+#   if ARCH_BITS == 64
+                                 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"
+#   else
+                              "VBoxProxyStub.dll"
+#   endif
+                              );
 #  else
             rc = RTPathAppend(szPath, sizeof(szPath), "x86\\VBoxProxyStub-x86.dll");
 #  endif
+        }
         if (RT_SUCCESS(vrc))
         {