[commit] r1250 - trunk/GME/Gme

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Apr  5 10:06:22 2011
New Revision: 1250

Log:
Change "Could not find paradigm x" to "Could not find paradigm x with GUID y" when opening an mga file with a different paradigm GUID than registered. (Dont say we couldnt find it, since we could; the problem is that it is a different version)

Modified:
   trunk/GME/Gme/GMEApp.cpp

Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp	Tue Apr  5 10:02:58 2011	(r1249)
+++ trunk/GME/Gme/GMEApp.cpp	Tue Apr  5 10:06:22 2011	(r1250)
@@ -1352,9 +1352,18 @@
 					}
 				}
 				if(hr == E_MGA_PARADIGM_NOTREG) {
-					CString msg = _T("Could not find paradigm paradigm '") + CString(parn);
+					CString msg = _T("Could not find paradigm '") + CString(parn) + "'";
+					if (parv != "") {
+						msg += CString(" version ") + static_cast<const wchar_t*>(parv);
+					} else if (parg.vt == (VT_UI1 | VT_ARRAY)) {
+						GUID guid;
+						CopyTo(parg, guid);
+						CComBSTR strGuid;
+						CopyTo(guid, &strGuid);
+						msg += CString(" with GUID ") + static_cast<const wchar_t*>(strGuid);
+					}
 					if (CString(parn) == _T("MetaGME2000"))
-						msg += _T("'\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
+						msg += _T("\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
 					msg += _T("\nDo you want to import with an other registered paradigm ?");
 					if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {
 					
@@ -1787,7 +1796,7 @@
 		COMTHROW( launcher.CoCreateInstance(CComBSTR(L"Mga.MgaLauncher")) );
 
 	meta_label:
-		HRESULT hr = launcher->MetaDlg(METADLG_NONE);
+		HRESULT hr = launcher->MetaDlg(METADLG_NEWFILE);
 		if( hr == S_FALSE )
 			return;
 		COMTHROW( hr );
@@ -2049,9 +2058,9 @@
 					TCHAR buf[300];
 					if(h2 != S_OK) {
 						ASSERT(h1 != S_OK);
-						CString msg = _T("Could not find paradigm paradigm '") + CString(paradigm);
+						CString msg = _T("Could not find paradigm paradigm '") + CString(paradigm) + "'";
 						if (CString(paradigm) == _T("MetaGME2000"))
-							msg += _T("'\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
+							msg += _T("\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
 						msg += _T("\nDo you want to import with an other registered paradigm ?");
 						if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {	
 							CComObjPtr<IMgaLauncher> launcher;
@@ -2757,9 +2766,9 @@
 					TCHAR buf[300];
 					if (h2 != S_OK) {
 						ASSERT(h1 != S_OK);
-						CString msg = _T("Could not find paradigm paradigm '") + CString(paradigm);
+						CString msg = _T("Could not find paradigm paradigm '") + CString(paradigm) + "'";
 						if (CString(paradigm) == _T("MetaGME2000"))
-							msg += _T("'\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
+							msg += _T("\n (In GME3 the MetaGME2000 paradigm was renamed to MetaGME)");
 						msg += _T("\nDo you want to import with an other registered paradigm ?");
 						if (AfxMessageBox(msg ,MB_OKCANCEL) == IDOK) {	
 							CComObjPtr<IMgaLauncher> launcher;