[commit] r1125 - trunk/GME/MgaUtil

[GMESRC Repository Notifications]

Author: ksmyth
Date: Tue Jan 11 11:36:48 2011
New Revision: 1125

Log:
Remove REGACCESS_TEST kludge

Modified:
   trunk/GME/MgaUtil/CompDlg.cpp
   trunk/GME/MgaUtil/GmeDlg.cpp
   trunk/GME/MgaUtil/MetaDlg.cpp

Modified: trunk/GME/MgaUtil/CompDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/CompDlg.cpp	Tue Jan 11 11:21:10 2011	(r1124)
+++ trunk/GME/MgaUtil/CompDlg.cpp	Tue Jan 11 11:36:48 2011	(r1125)
@@ -77,12 +77,8 @@
 	MSGTRY
 	{
 		if( !CUACUtils::isVistaOrLater() ) {
-			CComPtr<IMgaRegistrar> registrar;
-			COMTHROW( registrar.CoCreateInstance(OLESTR("MGA.MgaRegistrar")) );
-			ASSERT( registrar != NULL );
-
-			if(registrar->RegisterComponent(CComBSTR("AAA"), 
-				componenttype_enum(COMPONENTTYPE_INTERPRETER+COMPONENTTYPE_PARADIGM_INDEPENDENT), CComBSTR("Dummy"), REGACCESS_TEST) != S_OK) {
+			CRegKey accessTest;
+			if (accessTest.Open(HKEY_LOCAL_MACHINE, "SOFTWARE\\GME", KEY_READ | KEY_WRITE) == ERROR_ACCESS_DENIED) {
 				GetDlgItem(IDC_RADIOSYS)->EnableWindow(false);
 				GetDlgItem(IDC_RADIOBOTH)->EnableWindow(false);
 			}

Modified: trunk/GME/MgaUtil/GmeDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/GmeDlg.cpp	Tue Jan 11 11:21:10 2011	(r1124)
+++ trunk/GME/MgaUtil/GmeDlg.cpp	Tue Jan 11 11:36:48 2011	(r1125)
@@ -273,7 +273,8 @@
 
 		m_isave = m_iconpath;
 		m_sysisave = m_sysiconpath;
-		if(registrar->put_IconPath(REGACCESS_TEST, CComBSTR("XXX")) != S_OK) {
+		CRegKey accessTest;
+		if (accessTest.Open(HKEY_LOCAL_MACHINE, "SOFTWARE\\GME", KEY_READ | KEY_WRITE) == ERROR_ACCESS_DENIED) {
 			GetDlgItem(IDC_SYSICONPATH)->EnableWindow(false);
 			GetDlgItem(IDC_ADDSYSICONPATH)->EnableWindow(false);
 		}

Modified: trunk/GME/MgaUtil/MetaDlg.cpp
==============================================================================
--- trunk/GME/MgaUtil/MetaDlg.cpp	Tue Jan 11 11:21:10 2011	(r1124)
+++ trunk/GME/MgaUtil/MetaDlg.cpp	Tue Jan 11 11:36:48 2011	(r1125)
@@ -75,10 +75,8 @@
 		}
 
 		{
-			GUID dummy;
-			CComVariant dummy2;
-			CopyTo(dummy, &dummy2);
-			if(registrar->RegisterParadigm(CComBSTR("AAA"), CComBSTR("AAA.MTA"), CComBSTR("1.0"), dummy2, REGACCESS_TEST) != S_OK) {
+			CRegKey accessTest;
+			if (accessTest.Open(HKEY_LOCAL_MACHINE, "SOFTWARE\\GME", KEY_READ | KEY_WRITE) == ERROR_ACCESS_DENIED) {
 				GetDlgItem(IDC_RADIOSYS)->EnableWindow(false);
 				GetDlgItem(IDC_RADIOUSER)->EnableWindow(false);
 				GetDlgItem(IDC_RADIOBOTH)->EnableWindow(false);