[GME-commit] GMESRC/GME/Gme GMEOLEIt.h,1.4,1.5 GMEOLEIt.cpp,1.7,1.8

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/GME/Gme
In directory escher:/tmp/cvs-serv4043

Modified Files:
	GMEOLEIt.h GMEOLEIt.cpp 
Log Message:
Fixing the SetAttribute/GetAttibute dispatch signatures of IGMEOLEIt.


CVS User: Zoltan Molnar, ISIS (zolmol)

Index: GMEOLEIt.h
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEIt.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** GMEOLEIt.h	19 Oct 2006 02:18:23 -0000	1.4
--- GMEOLEIt.h	19 Oct 2006 16:26:03 -0000	1.5
***************
*** 132,139 ****
  	afx_msg LPDISPATCH NullFCO();
  
! 	afx_msg void SetAttribute( LPCTSTR, LPCTSTR, LPCTSTR);
  	afx_msg VARIANT GetAttribute( LPCTSTR, LPCTSTR);
  
! 	afx_msg void SetAttributeFCO( LPDISPATCH, LPCTSTR, LPCTSTR);
  	afx_msg VARIANT GetAttributeFCO( LPDISPATCH, LPCTSTR);
  
--- 132,139 ----
  	afx_msg LPDISPATCH NullFCO();
  
! 	afx_msg void SetAttribute( LPCTSTR, LPCTSTR, VARIANT&);
  	afx_msg VARIANT GetAttribute( LPCTSTR, LPCTSTR);
  
! 	afx_msg void SetAttributeFCO( LPDISPATCH, LPCTSTR, VARIANT&);
  	afx_msg VARIANT GetAttributeFCO( LPDISPATCH, LPCTSTR);
  
***************
*** 214,222 ****
  		STDMETHOD(NullFCO)(THIS_ IMgaFCO** nullobj);
  
! 		STDMETHOD(SetAttribute)(THIS_ BSTR name,  BSTR attr_name,  BSTR value);
! 		STDMETHOD(GetAttribute)(THIS_ BSTR name,  BSTR attr_name, BSTR* value);
  
! 		STDMETHOD(SetAttributeFCO)(THIS_ IMgaFCO* fco,  BSTR attr_name,  BSTR value);
! 		STDMETHOD(GetAttributeFCO)(THIS_ IMgaFCO* fco,  BSTR attr_name, BSTR* value);
  
  		STDMETHOD(SubType)( THIS_ BSTR base, BSTR name_of_subtype, IMgaFCO** subtype);	
--- 214,222 ----
  		STDMETHOD(NullFCO)(THIS_ IMgaFCO** nullobj);
  
! 		STDMETHOD(SetAttribute)(THIS_ BSTR name,  BSTR attr_name,  VARIANT value);
! 		STDMETHOD(GetAttribute)(THIS_ BSTR name,  BSTR attr_name, VARIANT* value);
  
! 		STDMETHOD(SetAttributeFCO)(THIS_ IMgaFCO* fco,  BSTR attr_name,  VARIANT value);
! 		STDMETHOD(GetAttributeFCO)(THIS_ IMgaFCO* fco,  BSTR attr_name, VARIANT* value);
  
  		STDMETHOD(SubType)( THIS_ BSTR base, BSTR name_of_subtype, IMgaFCO** subtype);	

Index: GMEOLEIt.cpp
===================================================================
RCS file: /project/gme-repository/GMESRC/GME/Gme/GMEOLEIt.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GMEOLEIt.cpp	19 Oct 2006 02:18:23 -0000	1.7
--- GMEOLEIt.cpp	19 Oct 2006 16:26:03 -0000	1.8
***************
*** 640,648 ****
  	DISP_FUNCTION(CGMEOLEIt, "NullFCO", NullFCO, VT_DISPATCH, VTS_NONE)
  
! 	DISP_FUNCTION(CGMEOLEIt, "SetAttribute", SetAttribute, VT_EMPTY, VTS_BSTR VTS_BSTR VTS_BSTR)
! 	DISP_FUNCTION(CGMEOLEIt, "GetAttribute", GetAttribute, VT_BSTR, VTS_BSTR VTS_BSTR)
  
! 	DISP_FUNCTION(CGMEOLEIt, "SetAttributeFCO", SetAttributeFCO, VT_EMPTY, VTS_DISPATCH VTS_BSTR VTS_BSTR)
! 	DISP_FUNCTION(CGMEOLEIt, "GetAttributeFCO", GetAttributeFCO, VT_BSTR, VTS_DISPATCH VTS_BSTR)
  	
  	DISP_FUNCTION(CGMEOLEIt, "SubType", SubType, VT_DISPATCH, VTS_BSTR VTS_BSTR)
--- 640,648 ----
  	DISP_FUNCTION(CGMEOLEIt, "NullFCO", NullFCO, VT_DISPATCH, VTS_NONE)
  
! 	DISP_FUNCTION(CGMEOLEIt, "SetAttribute", SetAttribute, VT_EMPTY, VTS_BSTR VTS_BSTR VTS_VARIANT)
! 	DISP_FUNCTION(CGMEOLEIt, "GetAttribute", GetAttribute, VT_VARIANT, VTS_BSTR VTS_BSTR)
  
! 	DISP_FUNCTION(CGMEOLEIt, "SetAttributeFCO", SetAttributeFCO, VT_EMPTY, VTS_DISPATCH VTS_BSTR VTS_VARIANT)
! 	DISP_FUNCTION(CGMEOLEIt, "GetAttributeFCO", GetAttributeFCO, VT_VARIANT, VTS_DISPATCH VTS_BSTR)
  	
  	DISP_FUNCTION(CGMEOLEIt, "SubType", SubType, VT_DISPATCH, VTS_BSTR VTS_BSTR)
***************
*** 2227,2232 ****
  }
  
! 
! void CGMEOLEIt::SetAttribute( LPCTSTR p_partName, LPCTSTR p_attrName, LPCTSTR p_attrValue)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::SetAttribute\r\n");
--- 2227,2231 ----
  }
  
! void CGMEOLEIt::SetAttribute( LPCTSTR p_partName, LPCTSTR p_attrName, VARIANT& p_attrValue)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::SetAttribute\r\n");
***************
*** 2254,2257 ****
--- 2253,2257 ----
  }
  
+ 
  VARIANT CGMEOLEIt::GetAttribute( LPCTSTR p_partName, LPCTSTR p_attrName)
  {
***************
*** 2282,2286 ****
  }
  
! void CGMEOLEIt::SetAttributeFCO( LPDISPATCH p_fco, LPCTSTR p_attrName, LPCTSTR p_attrValue)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::SetAttributeFCO\r\n");
--- 2282,2286 ----
  }
  
! void CGMEOLEIt::SetAttributeFCO( LPDISPATCH p_fco, LPCTSTR p_attrName, VARIANT& p_attrValue)
  {
  	CGMEEventLogger::LogGMEEvent("CGMEOLEIt::SetAttributeFCO\r\n");
***************
*** 3421,3425 ****
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::SetAttribute(THIS_ BSTR name,  BSTR attr_name,  BSTR value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
--- 3421,3425 ----
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::SetAttribute(THIS_ BSTR name,  BSTR attr_name,  VARIANT value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
***************
*** 3427,3436 ****
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->SetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name, (LPCTSTR) value );
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::GetAttribute(THIS_ BSTR name,  BSTR attr_name, BSTR* value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
--- 3427,3436 ----
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->SetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name, value );
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::GetAttribute(THIS_ BSTR name,  BSTR attr_name, VARIANT* value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
***************
*** 3439,3448 ****
  	{
  		CComVariant p = pThis->GetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name );
! 		*value = p.bstrVal;
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::SetAttributeFCO(THIS_ IMgaFCO* fco,  BSTR attr_name,  BSTR value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
--- 3439,3448 ----
  	{
  		CComVariant p = pThis->GetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name );
! 		*value = p;
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::SetAttributeFCO(THIS_ IMgaFCO* fco,  BSTR attr_name,  VARIANT value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
***************
*** 3450,3459 ****
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->SetAttributeFCO( fco, (LPCTSTR) attr_name, (LPCTSTR) value);
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::GetAttributeFCO(THIS_ IMgaFCO* fco,  BSTR attr_name, BSTR* value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
--- 3450,3459 ----
  	TRY_DUAL(IID_IGMEOLEIt)
  	{
! 		pThis->SetAttributeFCO( fco, (LPCTSTR) attr_name, value);
  	}
  	CATCH_ALL_DUAL
  }
  
! STDMETHODIMP CGMEOLEIt::XDual::GetAttributeFCO(THIS_ IMgaFCO* fco,  BSTR attr_name, VARIANT* value)
  {
  	METHOD_PROLOGUE(CGMEOLEIt, Dual)
***************
*** 3462,3466 ****
  	{
  		CComVariant p = pThis->GetAttributeFCO( fco, (LPCTSTR) attr_name );
! 		*value = p.bstrVal;
  	}
  	CATCH_ALL_DUAL
--- 3462,3466 ----
  	{
  		CComVariant p = pThis->GetAttributeFCO( fco, (LPCTSTR) attr_name );
! 		*value = p;
  	}
  	CATCH_ALL_DUAL