[commit] r2317 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Aug 30 09:04:53 2013
New Revision: 2317

Log:
MgaRegistrar::RegisterParadigm: accept BSTR guid

Modified:
   trunk/GME/MgaUtil/MgaRegistrar.cpp

Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp	Thu Aug 29 16:30:51 2013	(r2316)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp	Fri Aug 30 09:04:53 2013	(r2317)
@@ -1310,14 +1310,20 @@
 {
 	CString cver(version); 
 
-	if( guid.vt != (VT_UI1 | VT_ARRAY) || GetArrayLength(guid) != sizeof(GUID) )
-	COMRETURN(E_INVALIDARG);
-
 	COMTRY
 	{
-		
 		GUID guid2;
-		CopyTo(guid, guid2);
+		if (guid.vt == (VT_UI1 | VT_ARRAY) && GetArrayLength(guid) == sizeof(GUID))
+		{
+			CopyTo(guid, guid2);
+		}
+		else if (guid.vt == VT_BSTR)
+		{
+			CopyTo(guid.bstrVal, guid2);
+		}
+		else
+			COMTHROW(E_INVALIDARG);
+
 		CComBstrObj guid3;
 		CopyTo(guid2, guid3);