[commit] r1300 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue May 10 17:26:38 2011
New Revision: 1300

Log:
Try workaround for .NET 4 components: we need to try to load 4.0 before CCI MGA.DotNetRegistrar, since CCI MGA.DotNetRegistrar will load the 2.0 runtime

Modified:
   trunk/GME/MgaUtil/MgaRegistrar.cpp

Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp	Mon May  9 14:30:28 2011	(r1299)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp	Tue May 10 17:26:38 2011	(r1300)
@@ -2314,6 +2314,10 @@
 		{
 			FreeLibrary(hModule);
 			//CLR dll:
+			// If we're being hosted by dllhost.exe (e.g. via UACUtils::CreateElevatedInstance), GME.exe.config doesn't have any effect
+			// Try to load the v4 runtime
+			CComPtr<IUnknown> v4;
+			v4.CoCreateInstance(L"System.Management.Instrumentation.ManagedCommonProvider");
 			using namespace MgaDotNetServices;
 			CComPtr<_Registrar> reg;
 			COMTHROW(reg.CoCreateInstance(L"MGA.DotNetRegistrar"));