[commit] r2424 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Wed Feb 12 10:47:17 2014
New Revision: 2424

Log:
Better error message when registering component fails

Modified:
   trunk/GME/MgaUtil/CompDlg.cpp
   trunk/GME/MgaUtil/MgaRegistrar.cpp
   trunk/GME/MgaUtil/StdAfx.cpp

Modified: trunk/GME/MgaUtil/CompDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/CompDlg.cpp	Mon Feb 10 10:23:02 2014	(r2423)
+++ trunk/GME/MgaUtil/CompDlg.cpp	Wed Feb 12 10:47:17 2014	(r2424)
@@ -479,10 +479,13 @@
 		DisplayError(_T("Unable to create component registrar"), hr);
 		return;
 	}
-	hr = registrar->RegisterComponentLibrary(PutInBstr(path), regacc_translate(m_accessmode));
-	if (FAILED(hr)) {
-		DisplayError(_T("Unable to register component"), hr);
+
+
+	MSGTRY
+	{
+		hr = registrar->__RegisterComponentLibrary(_bstr_t(path), regacc_translate(m_accessmode));
 	}
+	MSGCATCH(_T("Unable to register component"),;)
 }
 
 HRESULT CCompDlg::GetElevatedRegistrar(IMgaRegistrar** registrar)

Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp	Mon Feb 10 10:23:02 2014	(r2423)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp	Wed Feb 12 10:47:17 2014	(r2424)
@@ -5,7 +5,7 @@
 #include "Parser.h"
 
 #import "mscorlib.tlb"
-#import "libid:5f45c5d6-4e11-42fc-a558-cfa0b6c7bea6"
+#import "libid:5f45c5d6-4e11-42fc-a558-cfa0b6c7bea6" // MgaDotNetServices
 
 #include "atlsafe.h"
 

Modified: trunk/GME/MgaUtil/StdAfx.cpp
==============================================================================
--- trunk/GME/MgaUtil/StdAfx.cpp	Mon Feb 10 10:23:02 2014	(r2423)
+++ trunk/GME/MgaUtil/StdAfx.cpp	Wed Feb 12 10:47:17 2014	(r2424)
@@ -14,6 +14,7 @@
 #import "MgaLib.tlb" implementation_only no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
 #import "MetaLib.tlb" implementation_only no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
 #import "ParserLib.tlb" implementation_only no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
+#import "MgaUtilLib.tlb" implementation_only no_namespace raw_method_prefix("") high_method_prefix("__") no_registry
 
 #if defined(_M_IX86)
 #define PROCESSOR_ARCHITECTURE "x86"