[commit] r2229 - in trunk/GME: Mga MgaUtil

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Tue Jun 11 17:33:13 CDT 2013


Author: ksmyth
Date: Tue Jun 11 17:33:13 2013
New Revision: 2229

Log:
If a component doesnt support IGMEVersionInfo, dont care. COM versioning rules will be used.

Modified:
   trunk/GME/Mga/MgaProject.cpp
   trunk/GME/MgaUtil/MgaLauncher.cpp

Modified: trunk/GME/Mga/MgaProject.cpp
==============================================================================
--- trunk/GME/Mga/MgaProject.cpp	Tue Jun 11 17:32:51 2013	(r2228)
+++ trunk/GME/Mga/MgaProject.cpp	Tue Jun 11 17:33:13 2013	(r2229)
@@ -1233,11 +1233,14 @@
 				autoaddoncreate_progid = *i;
 				COMTHROW(CreateMgaComponent(addon, *i)); // Was: COMTHROW( addon.CoCreateInstance(*i) );
 				ASSERT( addon != NULL );
-				CComQIPtr<IGMEVersionInfo> vv=addon;
-				GMEInterfaceVersion_enum v = GMEInterfaceVersion_None;
-				if(vv) COMTHROW(vv->get_version(&v));
-				if(v != GMEInterfaceVersion_Current)
-					HR_THROW(E_MGA_COMPONENT_ERROR);
+				CComQIPtr<IGMEVersionInfo> vv = addon;
+				if (vv)
+				{
+					GMEInterfaceVersion_enum v;
+					COMTHROW(vv->get_version(&v));
+					if (v != GMEInterfaceVersion_Current)
+						HR_THROW(E_MGA_COMPONENT_ERROR);
+				}
 
 				COMTHROW( addon->Initialize(this));
 				autocomps.push_front(addon.Detach());

Modified: trunk/GME/MgaUtil/MgaLauncher.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaLauncher.cpp	Tue Jun 11 17:32:51 2013	(r2228)
+++ trunk/GME/MgaUtil/MgaLauncher.cpp	Tue Jun 11 17:33:13 2013	(r2229)
@@ -534,10 +534,8 @@
 		}
 		else {
 			IGMEVersionInfoPtr vi = (IMgaComponent*) component;
-			if(!vi) {
-				ThrowCOMError(E_NOINTERFACE, L"This component does not provide interface version information\n");
-			}
-			else {
+			if (vi)
+			{
 				GMEInterfaceVersion vv = vi->version;
 				if(vv != INTERFACE_VERSION) {
 					CString aa;


More information about the gme-commit mailing list