Miroirs/arabica
1
0
Fork 0
mirror of https://github.com/jezhiggins/arabica synced 2025-01-01 06:20:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

saxmsxml2.h

Browse source
This commit is contained in:
jez_higgins 2005-08-15 09:05:56 +00:00
parent a7824f2678
commit c78d918bce
1 changed files with 10 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
SAX/wrappers/saxmsxml2.h
View file

@ -20,15 +20,6 @@
// The initialization code will now try the 4.0 ID and // The initialization code will now try the 4.0 ID and
// then the older (version independant) name. [kas] // then the older (version independant) name. [kas]
// //
//
// Known issues:
// 1. The destructor (~msxml2_wrapper) should release the COM
// interfaces. It doesn't because of problem 2.
//
// 2. The classes don't handle non-initialization well. Failure
// to get the COM interfaces during instance construction will
// cause a crash at some later point.
//
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include <SAX/ArabicaConfig.h> #include <SAX/ArabicaConfig.h>
@ -46,10 +37,6 @@
// Include the MSXML definitions. // Include the MSXML definitions.
#include <msxml2.h> #include <msxml2.h>
// Declare the ProgID used in the version dependent MSXML 4.0 library
// up here rather then buried somewhere in the code.
#define MSXML_PROGID_NAME "Msxml2.SAXXMLReader.4.0"
// //
// Declare the 'smart pointer' type to simplify COM handling. // Declare the 'smart pointer' type to simplify COM handling.
#include <comdef.h> #include <comdef.h>
@ -856,21 +843,15 @@ class msxml2_wrapper : public SAX::basic_XMLReader<string_type>
template<class stringT, class COMInitializerT, class string_adaptorT> template<class stringT, class COMInitializerT, class string_adaptorT>
msxml2_wrapper<stringT, COMInitializerT, string_adaptorT>::msxml2_wrapper() msxml2_wrapper<stringT, COMInitializerT, string_adaptorT>::msxml2_wrapper()
{ {
reader_.CreateInstance("Msxml2.SAXXMLReader.4.0");
reader_.CreateInstance(MSXML_PROGID_NAME); if(reader_.GetInterfacePtr() == 0)
if (reader_.GetInterfacePtr() == NULL) reader_.CreateInstance("Msxml2.SAXXMLReader.3.0");
{ if(reader_.GetInterfacePtr() == 0)
std::cerr << "MSXML SAX Reader 4.0 not instanciated, trying older versions."
<< std::endl << std::flush;
reader_.CreateInstance(__uuidof(ISAXXMLReader)); reader_.CreateInstance(__uuidof(ISAXXMLReader));
if (reader_.GetInterfacePtr() == NULL)
{ if(reader_.GetInterfacePtr() == 0)
std::cerr << "MSXML SAX Reader (pre-4.0) not instanciated." throw SAXException("MSXML SAX Reader (pre-4.0) could not be instantiated");
<< std::endl << std::flush;
exit(1);
}
}
reader_.AddRef();
reader_->putContentHandler(&contentHandler_); reader_->putContentHandler(&contentHandler_);
reader_->putErrorHandler(&errorHandler_); reader_->putErrorHandler(&errorHandler_);
reader_->putDTDHandler(&dtdHandler_); reader_->putDTDHandler(&dtdHandler_);
@ -886,6 +867,8 @@ msxml2_wrapper<stringT, COMInitializerT, string_adaptorT>::msxml2_wrapper()
template<class stringT, class COMInitializerT, class string_adaptorT> template<class stringT, class COMInitializerT, class string_adaptorT>
msxml2_wrapper<stringT, COMInitializerT, string_adaptorT>::~msxml2_wrapper() msxml2_wrapper<stringT, COMInitializerT, string_adaptorT>::~msxml2_wrapper()
{ {
if(reader_.GetInterfacePtr())
reader_.Release();
} // ~msxml2_wrapper } // ~msxml2_wrapper
template<class stringT, class COMInitializerT, class string_adaptorT> template<class stringT, class COMInitializerT, class string_adaptorT>