[commit] r2619 - in trunk: Doc GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan 22 17:42:42 2016
New Revision: 2619

Log:
Registrar: fix bug with querying .NET interpreter codebase

Modified:
   trunk/Doc/README_in.txt
   trunk/GME/MgaUtil/MgaRegistrar.cpp

Modified: trunk/Doc/README_in.txt
==============================================================================
--- trunk/Doc/README_in.txt	Mon Jan 18 10:13:05 2016	(r2618)
+++ trunk/Doc/README_in.txt	Fri Jan 22 17:42:42 2016	(r2619)
@@ -31,6 +31,7 @@
   - Fix GME Console for high-DPI displays
   - BON: add CBuilderFolder::SetName
   - Fix hotspots for quick connect mode when scrolled or zoomed
+  - Component window: fix bug where .NET interpreters with long paths would incorrectly be listed as GAC
   - Other bugfixes
   
 Release Notes of Release 15.5.8

Modified: trunk/GME/MgaUtil/MgaRegistrar.cpp
==============================================================================
--- trunk/GME/MgaUtil/MgaRegistrar.cpp	Mon Jan 18 10:13:05 2016	(r2618)
+++ trunk/GME/MgaUtil/MgaRegistrar.cpp	Fri Jan 22 17:42:42 2016	(r2619)
@@ -1572,7 +1572,7 @@
 					TCHAR name[512];
 					DWORD namesize = sizeof(name) / sizeof(name[0]);
 					TCHAR value[512];
-					DWORD valuesize = sizeof(value) / sizeof(value[0]);
+					DWORD valuesize = sizeof(value);
 					DWORD valtype;
 
 					LONG err = RegEnumValue(par, index, name, &namesize, NULL, &valtype, (LPBYTE)value, &valuesize);
@@ -2074,14 +2074,15 @@
 		if(res == ERROR_SUCCESS) {
 			m_strPath = QueryValue(comp, _T("") );
 			if (m_strPath == _T("mscoree.dll")) {
-				TCHAR data[MAX_PATH];
-				ULONG num_bytes = sizeof(data) / sizeof(data[0]);
-				if (comp.QueryValue(_T("CodeBase"), 0, data, &num_bytes) == ERROR_SUCCESS) {
+				CString data;
+				ULONG count = 1024;
+				if (comp.QueryStringValue(_T("CodeBase"), data.GetBufferSetLength(count), &count) == ERROR_SUCCESS) {
 					m_strPath = data;
 					m_strPath = m_strPath.Right(m_strPath.GetLength() - 8);
 					m_strPath.Replace('/', '\\');
 				} else {
-					if (comp.QueryValue(_T("Assembly"), 0, data, &num_bytes) == ERROR_SUCCESS) {
+					count = 1024;
+					if (comp.QueryStringValue(_T("Assembly"), data.GetBufferSetLength(count), &count) == ERROR_SUCCESS) {
 						m_strPath = _T("GAC: ");
 						m_strPath += data;
 					}