You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ar...@locus.apache.org on 2000/09/30 01:07:09 UTC
cvs commit: xml-xerces/c/src/com IXMLDOMNodeImpl.inl NodeContainerImpl.h README.txt XMLDOMAttribute.cpp XMLDOMAttribute.h XMLDOMDocument.cpp XMLDOMDocumentType.cpp XMLDOMElement.cpp XMLDOMEntity.cpp XMLDOMNamedNodeMap.cpp XMLDOMNodeList.cpp XMLDOMNotation.cpp XMLDOMProcessingInstruction.cpp XMLDOMUtil.cpp XMLDOMUtil.h XMLDOMXMLDecl.cpp xml4com.aps xml4com.idl xml4com.rc xmldocument.rgs xmlhttprequest.rgs
aruna1 00/09/29 16:07:08
Modified: c/Projects/Win32/VC6/xerces-all/xerces-com xerces-com.dsp
c/src/com IXMLDOMNodeImpl.inl NodeContainerImpl.h README.txt
XMLDOMAttribute.cpp XMLDOMAttribute.h
XMLDOMDocument.cpp XMLDOMDocumentType.cpp
XMLDOMElement.cpp XMLDOMEntity.cpp
XMLDOMNamedNodeMap.cpp XMLDOMNodeList.cpp
XMLDOMNotation.cpp XMLDOMProcessingInstruction.cpp
XMLDOMUtil.cpp XMLDOMUtil.h XMLDOMXMLDecl.cpp
xml4com.aps xml4com.idl xml4com.rc xmldocument.rgs
xmlhttprequest.rgs
Log:
com update sent by Arnold Curt
Revision Changes Path
1.7 +6 -198 xml-xerces/c/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp
Index: xerces-com.dsp
===================================================================
RCS file: /home/cvs/xml-xerces/c/Projects/Win32/VC6/xerces-all/xerces-com/xerces-com.dsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xerces-com.dsp 2000/08/18 21:29:11 1.6
+++ xerces-com.dsp 2000/09/29 23:06:59 1.7
@@ -18,11 +18,7 @@
!MESSAGE Possible choices for configuration are:
!MESSAGE
!MESSAGE "xml4com - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml4com - Win32 Unicode Debug" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml4com - Win32 Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE "xml4com - Win32 Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml4com - Win32 Unicode Release MinSize" (based on "Win32 (x86) Dynamic-Link Library")
-!MESSAGE "xml4com - Win32 Unicode Release MinDependency" (based on "Win32 (x86) Dynamic-Link Library")
!MESSAGE
# Begin Project
@@ -55,12 +51,12 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1D.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1D.lib /nologo /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\xml4com\Debug/xerces13-com.dll" /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
# Begin Custom Build - Performing registration
OutDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
TargetDir=.\..\..\..\..\..\Build\Win32\xml4com\Debug
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces-com.dll
+TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces13-com.dll
+InputPath=.\..\..\..\..\..\Build\Win32\xml4com\Debug\xerces13-com.dll
SOURCE="$(InputPath)"
"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -71,91 +67,7 @@
# End Custom Build
-!ELSEIF "$(CFG)" == "xml4com - Win32 Unicode Debug"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "DebugU"
-# PROP BASE Intermediate_Dir "DebugU"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "..\..\..\..\..\Build\Win32\xml4com\DebugU"
-# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\xml4com\DebugU"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MTd /W3 /Gm /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\com" /D "_DEBUG" /D "_UNICODE" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /GZ /c
-# ADD BASE RSC /l 0x409 /d "_DEBUG"
-# ADD RSC /l 0x409 /d "_DEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept /libpath:"..\..\..\..\..\Build\Win32\VC6\Debug"
-# Begin Custom Build - Performing registration
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\DebugU
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\DebugU\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\DebugU\xerces-com.dll
-SOURCE="$(InputPath)"
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- if "%OS%"=="" goto NOTNT
- if not "%OS%"=="Windows_NT" goto NOTNT
- regsvr32 /s /c "$(TargetPath)"
- echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg"
- goto end
- :NOTNT
- echo Warning : Cannot register Unicode DLL on Windows 95
- :end
-
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml4com - Win32 Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseMinSize"
-# PROP BASE Intermediate_Dir "ReleaseMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize"
-# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\com" /D "NDEBUG" /D "_MBCS" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
-# Begin Custom Build - Performing registration
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize
-TargetDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinSize\xerces-com.dll
-SOURCE="$(InputPath)"
-
-BuildCmds= \
- echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- regsvr32 /s /c "$(TargetPath)" \
- echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
-
-
-"$(TargetDir)\xerces-c_1_3.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
!ELSEIF "$(CFG)" == "xml4com - Win32 Release MinDependency"
# PROP BASE Use_MFC 0
@@ -178,119 +90,19 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /machine:I386 /out:"..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency/xerces13-com.dll" /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
# Begin Custom Build - Performing registration
OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
TargetDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\xerces-com.dll
-SOURCE="$(InputPath)"
-
-BuildCmds= \
- echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- regsvr32 /s /c "$(TargetPath)" \
- echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
-
-
-"$(TargetDir)\xerces-c_1_3.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml4com - Win32 Unicode Release MinSize"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUMinSize"
-# PROP BASE Intermediate_Dir "ReleaseUMinSize"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize"
-# PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_DLL" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\com" /D "NDEBUG" /D "_UNICODE" /D "_ATL_DLL" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /machine:I386 /libpath:"..\..\..\..\..\Build\Win32\VC6\Release"
-# Begin Custom Build - Performing registration
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize
-TargetDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinSize\xerces-com.dll
-SOURCE="$(InputPath)"
-
-BuildCmds= \
- if "%OS%"=="" goto NOTNT \
- if not "%OS%"=="Windows_NT" goto NOTNT \
- echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
- regsvr32 /s /c "$(TargetPath)" \
- echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
- goto end \
- :NOTNT \
- echo Warning : Cannot register Unicode DLL on Windows 95 \
- :end \
-
-
-"$(TargetDir)\xerces-c_1_3.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-
-"$(OutDir)\regsvr32.trg" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
- $(BuildCmds)
-# End Custom Build
-
-!ELSEIF "$(CFG)" == "xml4com - Win32 Unicode Release MinDependency"
-
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ReleaseUMinDependency"
-# PROP BASE Intermediate_Dir "ReleaseUMinDependency"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency"
-# PROP Intermediate_Dir ".\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency"
-# PROP Ignore_Export_Lib 0
-# PROP Target_Dir ""
-# ADD BASE CPP /nologo /MT /W3 /O1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_USRDLL" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "_ATL_MIN_CRT" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MT /W3 /GX /O1 /I "..\..\..\..\..\src" /I "..\..\..\..\..\src\com" /D "NDEBUG" /D "_UNICODE" /D "_ATL_STATIC_REGISTRY" /D "WIN32" /D "_WINDOWS" /D "_USRDLL" /D "DEVENV_VCPP" /D "XML_SINGLEDLL" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /Yu"stdafx.h" /FD /c
-# ADD BASE RSC /l 0x409 /d "NDEBUG"
-# ADD RSC /l 0x409 /d "NDEBUG"
-BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-LINK32=link.exe
-# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wininet.lib shlwapi.lib xerces-c_1.lib /nologo /subsystem:windows /dll /machine:I386
-# Begin Custom Build - Performing registration
-OutDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency
-TargetDir=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency
-TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency\xerces-com.dll
-InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseUMinDependency\xerces-com.dll
+TargetPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\xerces13-com.dll
+InputPath=.\..\..\..\..\..\Build\Win32\xml4com\ReleaseMinDependency\xerces13-com.dll
SOURCE="$(InputPath)"
BuildCmds= \
- if "%OS%"=="" goto NOTNT \
- if not "%OS%"=="Windows_NT" goto NOTNT \
echo copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
copy ..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_1_3.dll $(TargetDir) \
regsvr32 /s /c "$(TargetPath)" \
echo regsvr32 exec. time > "$(OutDir)\regsvr32.trg" \
- goto end \
- :NOTNT \
- echo Warning : Cannot register Unicode DLL on Windows 95 \
- :end \
"$(TargetDir)\xerces-c_1_3.dll" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
@@ -305,11 +117,7 @@
# Begin Target
# Name "xml4com - Win32 Debug"
-# Name "xml4com - Win32 Unicode Debug"
-# Name "xml4com - Win32 Release MinSize"
# Name "xml4com - Win32 Release MinDependency"
-# Name "xml4com - Win32 Unicode Release MinSize"
-# Name "xml4com - Win32 Unicode Release MinDependency"
# Begin Group "com"
# PROP Default_Filter "h;hpp;hxx;hm;inl;cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
1.6 +16 -29 xml-xerces/c/src/com/IXMLDOMNodeImpl.inl
Index: IXMLDOMNodeImpl.inl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/IXMLDOMNodeImpl.inl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- IXMLDOMNodeImpl.inl 2000/07/07 00:13:29 1.5
+++ IXMLDOMNodeImpl.inl 2000/09/29 23:07:01 1.6
@@ -55,20 +55,7 @@
*/
/*
- * $Log: IXMLDOMNodeImpl.inl,v $
- * Revision 1.5 2000/07/07 00:13:29 jpolast
- * bug fixes for better DOM level 1 spec conformance.
- *
- * Revision 1.4 2000/06/19 20:05:56 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.3 2000/06/03 00:28:54 andyh
- * COM Wrapper changes from Curt Arnold
- *
- * Revision 1.2 2000/03/30 02:00:12 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: IXMLDOMNodeImpl.inl,v 1.6 2000/09/29 23:07:01 aruna1 Exp $
*/
@@ -91,7 +78,8 @@
try
{
- *pVal = SysAllocString(get_DOM_Node().getNodeName().rawBuffer());
+ DOMString val = get_DOM_Node().getNodeName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -115,10 +103,12 @@
try
{
- if (get_DOM_Node().getNodeValue() != 0)
+ DOMString val = get_DOM_Node().getNodeValue();
+ if (val != 0)
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(get_DOM_Node().getNodeValue().rawBuffer());
+
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
else
V_VT(pVal) = VT_NULL;
@@ -176,7 +166,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
@@ -242,7 +231,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
@@ -274,7 +262,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
@@ -303,7 +290,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
@@ -331,7 +317,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
@@ -682,14 +667,10 @@
if (NULL == pVal)
return E_POINTER;
-
- *pVal = NULL;
- _bstr_t text;
- GetText(get_DOM_Node(), text);
+ DOMString val = GetText(get_DOM_Node());
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
- *pVal = text.copy();
-
return S_OK;
}
@@ -870,7 +851,8 @@
*pVal = NULL;
try {
- *pVal = SysAllocString(get_DOM_Node().getNamespaceURI().rawBuffer());
+ DOMString val = get_DOM_Node().getNamespaceURI();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -892,7 +874,8 @@
*pVal = NULL;
try {
- *pVal = SysAllocString(get_DOM_Node().getPrefix().rawBuffer());
+ DOMString val = get_DOM_Node().getPrefix();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -914,7 +897,8 @@
*pVal = NULL;
try {
- *pVal = SysAllocString(get_DOM_Node().getLocalName().rawBuffer());
+ DOMString val = get_DOM_Node().getLocalName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -931,4 +915,4 @@
ATLTRACE(_T("IXMLDOMNodeImpl::transformNodeToObject\n"));
return E_NOTIMPL;
-}
+}
\ No newline at end of file
1.3 +21 -2 xml-xerces/c/src/com/NodeContainerImpl.h
Index: NodeContainerImpl.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/NodeContainerImpl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeContainerImpl.h 2000/03/30 02:00:12 1.2
+++ NodeContainerImpl.h 2000/09/29 23:07:02 1.3
@@ -55,10 +55,7 @@
*/
/*
- * $Log: NodeContainerImpl.h,v $
- * Revision 1.2 2000/03/30 02:00:12 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: NodeContainerImpl.h,v 1.3 2000/09/29 23:07:02 aruna1 Exp $
*/
#ifndef ___nodecontainerimpl_h___
@@ -82,7 +79,7 @@
}
iterator(const T& container,int idx,IXMLDOMDocument *p)
- :m_container(m_container)
+ :m_container(container)
,m_NextNodeIndex(idx)
,m_pIXMLDOMDocument(p)
{
@@ -104,6 +101,25 @@
return (m_NextNodeIndex != rhs.m_NextNodeIndex);
}
+ iterator& operator=(const iterator& rhs)
+ {
+ if (this != &rhs) {
+ if (m_pIXMLDOMDocument != NULL) {
+ m_pIXMLDOMDocument->Release() ;
+ m_pIXMLDOMDocument = NULL ;
+ }
+ m_container = rhs.m_container ;
+ m_NextNodeIndex = rhs.m_NextNodeIndex ;
+ m_NextVar = rhs.m_NextVar ;
+ m_pIXMLDOMDocument = rhs.m_pIXMLDOMDocument ;
+ if (m_pIXMLDOMDocument != NULL) {
+ m_pIXMLDOMDocument->AddRef() ;
+ }
+ }
+ return *this ;
+ }
+
+
VARIANT& operator*()
{
if (m_container == 0)
1.2 +14 -3 xml-xerces/c/src/com/README.txt
Index: README.txt
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.txt 2000/06/28 22:30:16 1.1
+++ README.txt 2000/09/29 23:07:02 1.2
@@ -1,3 +1,7 @@
+
+COM Wrapper
+-----------
+
xerces-com.dll needs to be registered before its first use. This can be done using either through the References Dialog in Microsoft(r) Visual Basic (tm) or Microsoft(r) Excel or using REGSVR32.EXE,
provided with many Windows development environments.
@@ -23,11 +27,18 @@
Dim xmlparser as new Xerces.DOMDocument
Dim xmlparser as new DOMDocument
Set object = CreateObject("Xerces.DOMDocument")
-set object = CreateObject("Xerces.DOMDocument.1.2")
+set object = CreateObject("Xerces.DOMDocument.1.3")
If you leave both MSXML and Xerces in the same project, you may need to disambiguate interfaces by prepending MSXML or Xerces.
For many applications, MSXML and Xerces will be interchangable. However, there may be documents that MSXML rejects and Xerces accepts and vice versa and the DOM presented to the application may be
-slightly different.
+slightly different. Specific examples include:
+
+MSXML represents entity references as entity reference elements,
+Xerces expands the entity references.
+
+MSXML represents the XML declaration as a processing instruction node,
+Xerces does not represent the XML declaration.
-Xerces conforms more closely to the XML 1.0 Standard than MSXML 2.0 in independent tests. DOM conformance is typically better with MSXML 2.0.
+MSXML will suppress whitespace nodes regardless of validation setting when preserveWhitespace = false,
+Xerces will only suppress whitespace when validation = true.
1.4 +30 -6 xml-xerces/c/src/com/XMLDOMAttribute.cpp
Index: XMLDOMAttribute.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMAttribute.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDOMAttribute.cpp 2000/06/19 20:05:57 1.3
+++ XMLDOMAttribute.cpp 2000/09/29 23:07:02 1.4
@@ -55,14 +55,7 @@
*/
/*
- * $Log: XMLDOMAttribute.cpp,v $
- * Revision 1.3 2000/06/19 20:05:57 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.2 2000/03/30 02:00:12 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMAttribute.cpp,v 1.4 2000/09/29 23:07:02 aruna1 Exp $
*/
#include "stdafx.h"
@@ -79,7 +72,8 @@
try
{
- *pVal = SysAllocString(attr.getName().rawBuffer());
+ DOMString val = attr.getName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -102,7 +96,8 @@
try
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(attr.getValue().rawBuffer());
+ DOMString val = attr.getValue();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -146,6 +141,31 @@
return E_FAIL;
}
+ return S_OK;
+}
+
+
+STDMETHODIMP CXMLDOMAttribute::get_nodeValue(VARIANT *pVal)
+{
+ ATLTRACE(_T("CXMLDOMAttribute::get_nodeValue\n"));
+
+ if (NULL == pVal)
+ return E_POINTER;
+
+ ::VariantInit(pVal);
+
+ try
+ {
+ V_VT(pVal) = VT_BSTR;
+ DOMString val = attr.getValue();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
+ }
+ catch(...)
+ {
+ return E_FAIL;
+ }
+
+
return S_OK;
}
1.5 +7 -7 xml-xerces/c/src/com/XMLDOMAttribute.h
Index: XMLDOMAttribute.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMAttribute.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMAttribute.h 2000/06/19 20:05:57 1.4
+++ XMLDOMAttribute.h 2000/09/29 23:07:03 1.5
@@ -55,17 +55,7 @@
*/
/*
- * $Log: XMLDOMAttribute.h,v $
- * Revision 1.4 2000/06/19 20:05:57 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.3 2000/06/03 00:28:55 andyh
- * COM Wrapper changes from Curt Arnold
- *
- * Revision 1.2 2000/03/30 02:00:12 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMAttribute.h,v 1.5 2000/09/29 23:07:03 aruna1 Exp $
*/
#ifndef ___xmldomattribute_h___
@@ -108,6 +98,12 @@
STDMETHOD(get_name)(BSTR *pVal);
STDMETHOD(get_value)(VARIANT *pVal);
STDMETHOD(put_value)(VARIANT newVal);
+
+ //
+ // override IXMLDOMNodeImpl to always return a string
+ // even when empty
+ //
+ STDMETHOD(get_nodeValue)(VARIANT* pVal);
DOM_Attr attr;
};
1.5 +8 -9 xml-xerces/c/src/com/XMLDOMDocument.cpp
Index: XMLDOMDocument.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMDocument.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMDocument.cpp 2000/06/19 20:05:57 1.4
+++ XMLDOMDocument.cpp 2000/09/29 23:07:03 1.5
@@ -55,17 +55,7 @@
*/
/*
- * $Log: XMLDOMDocument.cpp,v $
- * Revision 1.4 2000/06/19 20:05:57 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.3 2000/06/03 00:28:57 andyh
- * COM Wrapper changes from Curt Arnold
- *
- * Revision 1.2 2000/03/30 02:00:11 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMDocument.cpp,v 1.5 2000/09/29 23:07:03 aruna1 Exp $
*/
#include "stdafx.h"
@@ -264,7 +254,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
DOM_DocumentType doctype = m_Document.getDoctype();
@@ -1345,8 +1334,14 @@
- if (!pThis->m_bParseError && !pThis->m_bAbort)
+ if (!pThis->m_bParseError && !pThis->m_bAbort) {
parser.setDoValidation(pThis->m_bThreadValidate);
+ //
+ // this brings the COM component into better mimicry to MSXML
+ // by not throwing a validation error when there is no DOCTYPE
+ //
+ parser.setValidationScheme(pThis->m_bThreadValidate ? DOMParser::Val_Auto : DOMParser::Val_Never);
+ }
if (!pThis->m_bParseError && !pThis->m_bAbort)
parser.setErrorHandler(pThis);
1.3 +3 -2 xml-xerces/c/src/com/XMLDOMDocumentType.cpp
Index: XMLDOMDocumentType.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMDocumentType.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDOMDocumentType.cpp 2000/03/30 02:00:11 1.2
+++ XMLDOMDocumentType.cpp 2000/09/29 23:07:04 1.3
@@ -55,10 +55,7 @@
*/
/*
- * $Log: XMLDOMDocumentType.cpp,v $
- * Revision 1.2 2000/03/30 02:00:11 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMDocumentType.cpp,v 1.3 2000/09/29 23:07:04 aruna1 Exp $
*/
#include "stdafx.h"
@@ -78,7 +75,8 @@
try
{
- *pVal = SysAllocString(documentType.getName().rawBuffer());
+ DOMString val = documentType.getName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
1.5 +45 -44 xml-xerces/c/src/com/XMLDOMElement.cpp
Index: XMLDOMElement.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMElement.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMElement.cpp 2000/07/07 00:14:12 1.4
+++ XMLDOMElement.cpp 2000/09/29 23:07:04 1.5
@@ -55,17 +55,7 @@
*/
/*
- * $Log: XMLDOMElement.cpp,v $
- * Revision 1.4 2000/07/07 00:14:12 jpolast
- * bug fix
- *
- * Revision 1.3 2000/06/19 20:05:58 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.2 2000/03/30 02:00:11 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMElement.cpp,v 1.5 2000/09/29 23:07:04 aruna1 Exp $
*/
#include "stdafx.h"
@@ -86,7 +76,8 @@
try
{
- *pVal = SysAllocString(element.getTagName().rawBuffer());
+ DOMString val = element.getTagName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -110,7 +101,7 @@
try {
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(a.rawBuffer());
+ V_BSTR(pVal) = SysAllocStringLen(a.rawBuffer(),a.length());
}
catch(...) {
return E_FAIL;
@@ -162,7 +153,6 @@
if (NULL == attr)
return E_POINTER;
- if(*attr) (*attr)->Release();
*attr = NULL;
DOM_Attr attrNode(element.getAttributeNode(name));
if(attrNode.isNull())
@@ -202,52 +192,60 @@
if (NULL == attr || NULL == attributeNode)
return E_POINTER;
- if(*attributeNode) (*attributeNode)->Release();
*attributeNode = NULL;
- long id = 0;
+ DOM_Attr* newAttr = NULL;
IIBMXMLDOMNodeIdentity* nodeID = NULL;
- if(SUCCEEDED(attr->QueryInterface(IID_IIBMXMLDOMNodeIdentity,(void**) &nodeID))) {
- nodeID->get_NodeId(&id);
+ HRESULT sc = attr->QueryInterface(IID_IIBMXMLDOMNodeIdentity,(void**) &nodeID);
+ if(SUCCEEDED(sc)) {
+ long id = 0;
+ sc = nodeID->get_NodeId(&id);
nodeID->Release();
- }
-
- DOM_Attr attrNode;
- try {
- attrNode = (element.setAttributeNode(*((DOM_Attr*) id)));
- if(attrNode.isNull())
- return S_OK;
- }
- catch(...) {
- return E_FAIL;
- }
-
-
+ if(SUCCEEDED(sc)) {
+ //
+ // any subsequent failure will be reported as an invalid arg
+ //
+ sc = E_INVALIDARG;
+ try {
+ DOM_Node* newNode = (DOM_Node*) id;
+ if(newNode->getNodeType() == DOM_Node::ATTRIBUTE_NODE) {
+ newAttr = (DOM_Attr*) newNode;
+ }
+ }
+ catch(...) {
+ }
+ }
+ }
+
+ //
+ // if we couldn't extract an attribute out of the
+ // argument, then return with a failure code
+ if(newAttr == NULL) return sc;
- CXMLDOMAttributeObj *pObj = NULL;
- HRESULT hr = CXMLDOMAttributeObj::CreateInstance(&pObj);
- if (S_OK != hr)
- return hr;
-
- pObj->AddRef();
- pObj->SetOwnerDoc(m_pIXMLDOMDocument);
-
+ sc = S_OK;
try
{
- pObj->attr = element.setAttributeNode(attrNode);
+ DOM_Attr& oldAttr = element.setAttributeNode(*newAttr);
+ if(!oldAttr.isNull()) {
+ CXMLDOMAttributeObj *pObj = NULL;
+ sc = CXMLDOMAttributeObj::CreateInstance(&pObj);
+ if (SUCCEEDED(sc)) {
+ pObj->attr = oldAttr;
+ pObj->AddRef();
+ pObj->SetOwnerDoc(m_pIXMLDOMDocument);
+
+ sc = pObj->QueryInterface(IID_IXMLDOMAttribute, reinterpret_cast<LPVOID*> (attributeNode));
+ pObj->Release();
+ }
+ }
}
catch(...)
{
- pObj->Release();
return E_FAIL;
}
-
- hr = pObj->QueryInterface(IID_IXMLDOMAttribute, reinterpret_cast<LPVOID*> (attributeNode));
- if (S_OK != hr)
- *attributeNode = NULL;
- pObj->Release();
- return hr;
+
+ return sc;
}
STDMETHODIMP CXMLDOMElement::removeAttributeNode(IXMLDOMAttribute *attr, IXMLDOMAttribute * *attributeNode)
1.3 +7 -4 xml-xerces/c/src/com/XMLDOMEntity.cpp
Index: XMLDOMEntity.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMEntity.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDOMEntity.cpp 2000/03/30 02:00:11 1.2
+++ XMLDOMEntity.cpp 2000/09/29 23:07:05 1.3
@@ -55,10 +55,7 @@
*/
/*
- * $Log: XMLDOMEntity.cpp,v $
- * Revision 1.2 2000/03/30 02:00:11 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMEntity.cpp,v 1.3 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -78,7 +75,8 @@
try
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(entity.getPublicId().rawBuffer());
+ DOMString val = entity.getPublicId();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -100,7 +98,8 @@
try
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(entity.getSystemId().rawBuffer());
+ DOMString val = entity.getSystemId();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -121,7 +120,8 @@
try
{
- *pVal = SysAllocString(entity.getNotationName().rawBuffer());
+ DOMString val = entity.getNotationName();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
1.4 +5 -6 xml-xerces/c/src/com/XMLDOMNamedNodeMap.cpp
Index: XMLDOMNamedNodeMap.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMNamedNodeMap.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDOMNamedNodeMap.cpp 2000/06/19 20:05:58 1.3
+++ XMLDOMNamedNodeMap.cpp 2000/09/29 23:07:05 1.4
@@ -55,14 +55,7 @@
*/
/*
- * $Log: XMLDOMNamedNodeMap.cpp,v $
- * Revision 1.3 2000/06/19 20:05:58 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.2 2000/03/30 01:59:11 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMNamedNodeMap.cpp,v 1.4 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -131,8 +124,10 @@
try
{
DOMString name = pNewItemNode->getNodeName();
- m_container.setNamedItem(*pNewItemNode);
- DOM_Node n = m_container.getNamedItem(name);
+ //
+ // returns old node
+ //
+ DOM_Node n = m_container.setNamedItem(*pNewItemNode);
if(!n.isNull())
hr = wrapNode(m_pIXMLDOMDocument,n,IID_IXMLDOMNode, reinterpret_cast<LPVOID *> (pVal));
}
1.4 +1 -5 xml-xerces/c/src/com/XMLDOMNodeList.cpp
Index: XMLDOMNodeList.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMNodeList.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XMLDOMNodeList.cpp 2000/06/19 20:05:58 1.3
+++ XMLDOMNodeList.cpp 2000/09/29 23:07:05 1.4
@@ -55,14 +55,7 @@
*/
/*
- * $Log: XMLDOMNodeList.cpp,v $
- * Revision 1.3 2000/06/19 20:05:58 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.2 2000/03/30 02:00:10 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMNodeList.cpp,v 1.4 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -80,7 +73,6 @@
if (NULL == pVal)
return E_POINTER;
- if(*pVal) (*pVal)->Release();
*pVal = NULL;
HRESULT hr = S_OK;
1.3 +5 -3 xml-xerces/c/src/com/XMLDOMNotation.cpp
Index: XMLDOMNotation.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMNotation.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDOMNotation.cpp 2000/03/30 02:00:10 1.2
+++ XMLDOMNotation.cpp 2000/09/29 23:07:05 1.3
@@ -55,10 +55,7 @@
*/
/*
- * $Log: XMLDOMNotation.cpp,v $
- * Revision 1.2 2000/03/30 02:00:10 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMNotation.cpp,v 1.3 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -77,7 +74,8 @@
try
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(notation.getPublicId().rawBuffer());
+ DOMString val = notation.getPublicId();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -100,7 +98,8 @@
try
{
V_VT(pVal) = VT_BSTR;
- V_BSTR(pVal) = SysAllocString(notation.getSystemId().rawBuffer());
+ DOMString val = notation.getSystemId();
+ V_BSTR(pVal) = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
1.3 +5 -3 xml-xerces/c/src/com/XMLDOMProcessingInstruction.cpp
Index: XMLDOMProcessingInstruction.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMProcessingInstruction.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLDOMProcessingInstruction.cpp 2000/03/30 02:00:09 1.2
+++ XMLDOMProcessingInstruction.cpp 2000/09/29 23:07:05 1.3
@@ -55,10 +55,7 @@
*/
/*
- * $Log: XMLDOMProcessingInstruction.cpp,v $
- * Revision 1.2 2000/03/30 02:00:09 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMProcessingInstruction.cpp,v 1.3 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -77,7 +74,8 @@
try
{
- *pVal = SysAllocString(processingInstruction.getTarget().rawBuffer());
+ DOMString val = processingInstruction.getTarget();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
@@ -98,7 +96,8 @@
try
{
- *pVal = SysAllocString(processingInstruction.getData().rawBuffer());
+ DOMString val = processingInstruction.getData();
+ *pVal = SysAllocStringLen(val.rawBuffer(),val.length());
}
catch(...)
{
1.5 +13 -15 xml-xerces/c/src/com/XMLDOMUtil.cpp
Index: XMLDOMUtil.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMUtil.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMUtil.cpp 2000/06/19 20:05:59 1.4
+++ XMLDOMUtil.cpp 2000/09/29 23:07:05 1.5
@@ -55,17 +55,7 @@
*/
/*
- * $Log: XMLDOMUtil.cpp,v $
- * Revision 1.4 2000/06/19 20:05:59 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.3 2000/06/03 00:29:02 andyh
- * COM Wrapper changes from Curt Arnold
- *
- * Revision 1.2 2000/03/30 02:00:09 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMUtil.cpp,v 1.5 2000/09/29 23:07:05 aruna1 Exp $
*/
#include "stdafx.h"
@@ -85,6 +75,7 @@
#include "XMLDOMXMLDecl.h"
#include "XMLDOMUtil.h"
#include <util/PlatformUtils.hpp>
+#include <util/XMLUniDefs.hpp>
const OLECHAR* g_DomNodeName[] =
@@ -106,30 +97,33 @@
const int g_DomNodeNameSize = sizeof(g_DomNodeName) / sizeof(OLECHAR*);
-void GetText(const DOM_Node& node, _bstr_t &text)
+DOMString GetText(const DOM_Node& node)
{
DOM_Node::NodeType type = static_cast<DOM_Node::NodeType> (node.getNodeType());
-
+ DOMString val;
+
if (DOM_Node::DOCUMENT_TYPE_NODE == type ||
DOM_Node::NOTATION_NODE == type)
- return;
+ return val;
if (DOM_Node::CDATA_SECTION_NODE == type ||
DOM_Node::COMMENT_NODE == type ||
DOM_Node::PROCESSING_INSTRUCTION_NODE == type ||
DOM_Node::TEXT_NODE == type) {
- text += node.getNodeValue().rawBuffer();
- return;
+ val = node.getNodeValue();
+ return val;
}
DOM_NodeList l = node.getChildNodes();
int length = l.getLength();
if (length > 0) {
for (int i = 0; i < length; ++i)
- GetText(l.item(i), text);
+ val.appendData(GetText(l.item(i)));
+ }
+ else {
+ val = node.getNodeValue();
}
- else
- text += node.getNodeValue().rawBuffer();
+ return val;
}
1.5 +2 -8 xml-xerces/c/src/com/XMLDOMUtil.h
Index: XMLDOMUtil.h
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMUtil.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLDOMUtil.h 2000/06/19 20:05:59 1.4
+++ XMLDOMUtil.h 2000/09/29 23:07:05 1.5
@@ -55,17 +55,7 @@
*/
/*
- * $Log: XMLDOMUtil.h,v $
- * Revision 1.4 2000/06/19 20:05:59 rahulj
- * Changes for increased conformance and stability. Submitted by
- * Curt.Arnold@hyprotech.com. Verified by Joe Polastre.
- *
- * Revision 1.3 2000/06/03 00:29:03 andyh
- * COM Wrapper changes from Curt Arnold
- *
- * Revision 1.2 2000/03/30 02:00:09 abagchi
- * Initial checkin of working code with Copyright Notice
- *
+ * $Id: XMLDOMUtil.h,v 1.5 2000/09/29 23:07:05 aruna1 Exp $
*/
#ifndef ___wrapnode_h___
@@ -77,7 +67,7 @@
extern const int g_DomNodeNameSize;
void GetXML (const DOM_Node &node, _bstr_t &text);
-void GetText(const DOM_Node& node, _bstr_t &text);
+DOMString GetText(const DOM_Node& node);
HRESULT wrapNode(IXMLDOMDocument *pDoc, DOM_Node& node, REFIID iid, LPVOID *pVal);
1.2 +6 -4 xml-xerces/c/src/com/XMLDOMXMLDecl.cpp
Index: XMLDOMXMLDecl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/XMLDOMXMLDecl.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLDOMXMLDecl.cpp 2000/06/19 20:05:59 1.1
+++ XMLDOMXMLDecl.cpp 2000/09/29 23:07:05 1.2
@@ -53,8 +53,10 @@
* on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
+/*
+ * $Id: XMLDOMXMLDecl.cpp,v 1.2 2000/09/29 23:07:05 aruna1 Exp $
+ */
-
#include "stdafx.h"
#include "xml4com.h"
#include "XMLDOMXMLDecl.h"
@@ -123,7 +125,7 @@
totalLen = len;
if(len > 0) {
wcscpy(*pVal,OLESTR("version=\""));
- wcscat(*pVal,version.rawBuffer());
+ wcsncat(*pVal,version.rawBuffer(),len);
wcscat(*pVal,OLESTR("\""));
}
@@ -133,7 +135,7 @@
wcscat(*pVal,OLESTR(" standalone=\""));
else
wcscat(*pVal,OLESTR("standalone=\""));
- wcscat(*pVal,standalone.rawBuffer());
+ wcsncat(*pVal,standalone.rawBuffer(),len);
wcscat(*pVal,OLESTR("\""));
totalLen += len;
}
@@ -144,7 +146,7 @@
wcscat(*pVal,OLESTR(" encoding=\""));
else
wcscat(*pVal,OLESTR("encoding=\""));
- wcscat(*pVal,encoding.rawBuffer());
+ wcsncat(*pVal,encoding.rawBuffer(),len);
wcscat(*pVal,OLESTR("\""));
}
1.3 +16 -17 xml-xerces/c/src/com/xml4com.aps
<<Binary file>>
1.4 +8 -9 xml-xerces/c/src/com/xml4com.idl
Index: xml4com.idl
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/xml4com.idl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xml4com.idl 2000/06/19 20:05:59 1.3
+++ xml4com.idl 2000/09/29 23:07:05 1.4
@@ -54,10 +54,9 @@
* <http://www.apache.org/>.
*/
-
-
-// xml4com.idl : IDL source
-//
+/*
+ * $Id: xml4com.idl,v 1.4 2000/09/29 23:07:05 aruna1 Exp $
+ */
// This file will be processed by the MIDL tool to
// produce the type library (xml4com.tlb) and marshalling code.
@@ -65,9 +64,9 @@
import "oaidl.idl";
[
- uuid(79516F60-3AEA-11D3-BC47-0004ACB7DBEB),
- version(1.0),
- helpstring("Xerces XML Parser")
+ uuid(C58E1141-26F6-4d3a-AF76-6214CA435238),
+ version(1.3),
+ helpstring("Xerces XML Parser 1.3")
]
library Xerces
{
@@ -122,7 +121,7 @@
};
[
- uuid(79516F6F-3AEA-11D3-BC47-0004ACB7DBEB),
+ uuid(988AE1AE-12FF-4c11-8847-BDD79C1B6B59),
helpstring("DOMDocument Class")
]
coclass DOMDocument
@@ -132,7 +131,7 @@
};
[
- uuid(1C598E82-9AB9-456b-9C24-D711F08F3584),
+ uuid(3A725053-15FB-4065-9171-BC02BCF3876C),
helpstring("XMLHTTPRequest class.")
]
coclass XMLHTTPRequest
1.3 +5 -5 xml-xerces/c/src/com/xml4com.rc
Index: xml4com.rc
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/xml4com.rc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xml4com.rc 2000/06/03 00:29:06 1.2
+++ xml4com.rc 2000/09/29 23:07:05 1.3
@@ -111,8 +111,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,0,0,1
- PRODUCTVERSION 1,0,0,1
+ FILEVERSION 1,3,0,0
+ PRODUCTVERSION 1,3,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -130,15 +130,15 @@
VALUE "Comments", "\0"
VALUE "CompanyName", "Apache Software Foundation\0"
VALUE "FileDescription", "Xerces XML Parser for COM\0"
- VALUE "FileVersion", "1, 2, 0\0"
+ VALUE "FileVersion", "1, 3, 0\0"
VALUE "InternalName", "Xerces XML Parser for COM \0"
VALUE "LegalCopyright", "Copyright � Apache Software Foundation 2000 subject to licensing terms\0"
VALUE "LegalTrademarks", "\0"
VALUE "OLESelfRegister", "\0"
- VALUE "OriginalFilename", "xerces-com.dll\0"
+ VALUE "OriginalFilename", "xerces13-com.dll\0"
VALUE "PrivateBuild", "\0"
VALUE "ProductName", "Xerces XML Parser for COM\0"
- VALUE "ProductVersion", "1, 2, 0\0"
+ VALUE "ProductVersion", "1, 3, 0\0"
VALUE "SpecialBuild", "\0"
END
END
1.3 +7 -7 xml-xerces/c/src/com/xmldocument.rgs
Index: xmldocument.rgs
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/xmldocument.rgs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmldocument.rgs 2000/06/19 20:06:00 1.2
+++ xmldocument.rgs 2000/09/29 23:07:06 1.3
@@ -1,26 +1,26 @@
HKCR
{
- Xerces.DOMDocument.1.2 = s 'Apache Xerces Parser for COM'
+ Xerces.DOMDocument.1.3 = s 'Apache Xerces Parser for COM'
{
- CLSID = s '{79516F6F-3AEA-11D3-BC47-0004ACB7DBEB}'
+ CLSID = s '{988AE1AE-12FF-4c11-8847-BDD79C1B6B59}'
}
Xerces.DOMDocument = s 'Apache Xerces Parser For COM'
{
- CLSID = s '{79516F6F-3AEA-11D3-BC47-0004ACB7DBEB}'
- CurVer = s 'Xerces.DOMDocument.1.2'
+ CLSID = s '{988AE1AE-12FF-4c11-8847-BDD79C1B6B59}'
+ CurVer = s 'Xerces.DOMDocument.1.3'
}
NoRemove CLSID
{
- ForceRemove {79516F6F-3AEA-11D3-BC47-0004ACB7DBEB} = s 'Apache Xerces Parser for COM'
+ ForceRemove = '{988AE1AE-12FF-4c11-8847-BDD79C1B6B59}' = s 'Apache Xerces Parser for COM'
{
- ProgID = s 'Xerces.DOMDocument.1.2'
+ ProgID = s 'Xerces.DOMDocument.1.3'
VersionIndependentProgID = s 'Xerces.DOMDocument'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'
{
val ThreadingModel = s 'Apartment'
}
- 'TypeLib' = s '{79516F60-3AEA-11D3-BC47-0004ACB7DBEB}'
+ 'TypeLib' = s '{C58E1141-26F6-4d3a-AF76-6214CA435238}'
}
}
}
1.3 +7 -7 xml-xerces/c/src/com/xmlhttprequest.rgs
Index: xmlhttprequest.rgs
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/com/xmlhttprequest.rgs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xmlhttprequest.rgs 2000/06/19 20:06:00 1.2
+++ xmlhttprequest.rgs 2000/09/29 23:07:06 1.3
@@ -1,26 +1,26 @@
HKCR
{
- IBMXML.XMLHttpRequest.1.2 = s 'Apache Xerces XML Http Request'
+ IBMXML.XMLHttpRequest.1.3 = s 'Apache Xerces XML Http Request'
{
- CLSID = s '{1C598E82-9AB9-456b-9C24-D711F08F3584}'
+ CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
}
IBMXML.XMLHttpRequest = s 'Apache Xerces XML Http Request'
{
- CLSID = s '{1C598E82-9AB9-456b-9C24-D711F08F3584}'
- CurVer = s 'Xerces.XMLHttpRequest.1.2'
+ CLSID = s '{3A725053-15FB-4065-9171-BC02BCF3876C}'
+ CurVer = s 'Xerces.XMLHttpRequest.1.3'
}
NoRemove CLSID
{
- ForceRemove {1C598E82-9AB9-456b-9C24-D711F08F3584} = s 'Apache Xerces XML Http Request'
+ ForceRemove {3A725053-15FB-4065-9171-BC02BCF3876C} = s 'Apache Xerces XML Http Request'
{
- ProgID = s 'Xerces.XMLHttpRequest.1.2'
+ ProgID = s 'Xerces.XMLHttpRequest.1.3'
VersionIndependentProgID = s 'Xerces.XMLHttpRequest'
ForceRemove 'Programmable'
InprocServer32 = s '%XMLMODULE%'
{
val ThreadingModel = s 'Apartment'
}
- 'TypeLib' = s '{79516F60-3AEA-11D3-BC47-0004ACB7DBEB}'
+ 'TypeLib' = s '{C58E1141-26F6-4d3a-AF76-6214CA435238}'
}
}
}