[commit] r1237 - trunk/GME/Gme
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Thu Mar 31 15:14:12 CDT 2011
Author: ksmyth
Date: Thu Mar 31 15:14:12 2011
New Revision: 1237
Log:
Pass wide strings to CComBSTR
Modified:
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Gme/GMEView.cpp
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Thu Mar 31 15:13:48 2011 (r1236)
+++ trunk/GME/Gme/GMEApp.cpp Thu Mar 31 15:14:12 2011 (r1237)
@@ -381,7 +381,7 @@
MSGTRY
{
CComPtr<IMgaRegistrar> registrar;
- COMTHROW(registrar.CoCreateInstance(CComBSTR("Mga.MgaRegistrar")));
+ COMTHROW(registrar.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar")));
VARIANT_BOOL enablelogging;
COMTHROW( registrar->get_EventLoggingEnabled(REGACCESS_USER, &enablelogging) );
if(enablelogging != VARIANT_FALSE)
@@ -867,7 +867,7 @@
// Obtaining ToolTip
HRESULT errCode;
CString toolTip;
- errCode = registrar->get_ComponentExtraInfo(REGACCESS_PRIORITY, componentName, CComBSTR("Tooltip"), PutOut(toolTip));
+ errCode = registrar->get_ComponentExtraInfo(REGACCESS_PRIORITY, componentName, CComBSTR(L"Tooltip"), PutOut(toolTip));
if(errCode != S_OK || toolTip.IsEmpty())
{
toolTip = componentName;
@@ -883,7 +883,7 @@
// Querying icon information
CString iconInfo;
- errCode = registrar->get_ComponentExtraInfo(REGACCESS_PRIORITY, componentName, CComBSTR("Icon"), PutOut(iconInfo));
+ errCode = registrar->get_ComponentExtraInfo(REGACCESS_PRIORITY, componentName, CComBSTR(L"Icon"), PutOut(iconInfo));
if(errCode != S_OK || iconInfo.IsEmpty())
{
continue;
@@ -974,7 +974,7 @@
CComBSTR b;
COMTHROW(mgaMetaProject->get_Name(&b));
CComPtr<IMgaRegistrar> reg;
- COMTHROW(reg.CoCreateInstance(CComBSTR("Mga.MgaRegistrar")));
+ COMTHROW(reg.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar")));
{
CComVariant v;
COMTHROW(reg->get_AssociatedComponents(b, COMPONENTTYPE_PLUGIN, REGACCESS_BOTH, &v));
@@ -1191,7 +1191,7 @@
bool DiagnoseParadigm(CString metaname, bool syscheck = false) {
CComPtr<IMgaRegistrar> reg;
try {
- HRESULT hr = reg.CoCreateInstance(CComBSTR("Mga.MgaRegistrar"));
+ HRESULT hr = reg.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar"));
if(hr != S_OK) {
throw CString("Cannot create the registrar component\n"
"We recommend you to reinstall GME");
@@ -2872,7 +2872,7 @@
{
CWaitCursor wait;
CComPtr<IMgaRegistrar> registrar;
- COMTHROW(registrar.CoCreateInstance(CComBSTR("Mga.MgaRegistrar")));
+ COMTHROW(registrar.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar")));
regaccessmode_enum reg_access = REGACCESS_USER; //REGACCESS_SYSTEM;
//REGACCESS_USER;
Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp Thu Mar 31 15:13:48 2011 (r1236)
+++ trunk/GME/Gme/GMEView.cpp Thu Mar 31 15:14:12 2011 (r1237)
@@ -599,7 +599,7 @@
ClearConnSpecs();
CComPtr<IMgaRegistrar> registrar;
- COMTHROW(registrar.CoCreateInstance(CComBSTR("Mga.MgaRegistrar")));
+ COMTHROW(registrar.CoCreateInstance(CComBSTR(L"Mga.MgaRegistrar")));
ASSERT(registrar != NULL);
edgesmoothmode_enum edgeSmoothMode;
COMTHROW(registrar->get_EdgeSmoothMode(REGACCESS_USER, &edgeSmoothMode));
More information about the gme-commit
mailing list