diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp index cefe396a7b0676edd36570fe77f787e75669dc22..b8e871988813d1bdc641bc3ac565d9e5f183c256 100644 --- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp +++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.dsp @@ -7,21 +7,21 @@ CFG=XercesLib - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "XercesLib.mak". -!MESSAGE +!MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "XercesLib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE +!MESSAGE # Begin Project # PROP AllowPerConfigDependencies 0 @@ -44,18 +44,16 @@ RSC=rc.exe # PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Release\obj" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c -# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE CPP /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c +# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 -# ADD BSC32 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 /subsystem:windows /dll /machine:I386 -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.2.0 +# 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 /subsystem:windows /dll /machine:I386 +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Release/xerces-c_2.lib" /version:2.2.0 # SUBTRACT LINK32 /pdb:none /incremental:yes !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" @@ -71,19 +69,17 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\..\..\..\Build\Win32\VC6\Debug\obj" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c -# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c +# ADD BASE CPP /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c +# ADD CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c # SUBTRACT CPP /Fr /YX -# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 -# ADD BSC32 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 +# 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 /subsystem:windows /dll /debug /machine:I386 /pdbtype:sept +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:I386 /out:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win32\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 # SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" @@ -100,21 +96,19 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Debug\obj" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c +# ADD BASE CPP /G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c # SUBTRACT BASE CPP /Fr /YX # ADD CPP /MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c -# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /D "_DEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 -# ADD BSC32 LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 # SUBTRACT BASE LINK32 /pdb:none -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 /machine:IA64 -# SUBTRACT LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /debug /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2_2_0D.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Debug/xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 /machine:IA64 +# SUBTRACT LINK32 /pdb:none !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" @@ -130,22 +124,20 @@ LINK32=link.exe # PROP Intermediate_Dir "..\..\..\..\..\Build\Win64\VC6\Release\obj" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c +# ADD BASE CPP /G6 /MD /Za /W3 /GX /O2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c # ADD CPP /MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /FD /c -# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 -# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD BASE MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 +# ADD MTL /D "NDEBUG" /mktyplib203 /o "NUL" /win32 # ADD BASE RSC /l 0x409 /d "NDEBUG" # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe -# ADD BASE BSC32 -# ADD BSC32 LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.2.0 +# ADD BASE LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.2.0 # SUBTRACT BASE LINK32 /pdb:none /incremental:yes -# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.2.0 /machine:IA64 -# SUBTRACT LINK32 /pdb:none +# ADD LINK32 kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /map /machine:IX86 /out:"..\..\..\..\..\Build\Win64\VC6\Release\xerces-c_2_2_0.dll" /implib:"..\..\..\..\..\Build\Win64\VC6\Release/xerces-c_2.lib" /version:2.2.0 /machine:IA64 +# SUBTRACT LINK32 /pdb:none -!ENDIF +!ENDIF # Begin Target @@ -182,10 +174,6 @@ SOURCE=..\..\..\..\..\src\xercesc\util\XMLRegisterCleanup.hpp # PROP Default_Filter ".cpp,.hpp" # Begin Source File -SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory\XercesMessages_en_US.hpp -# End Source File -# Begin Source File - SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp # ADD CPP /Ze # End Source File @@ -193,6 +181,10 @@ SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.hpp # End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\InMemory\XercesMessages_en_US.hpp +# End Source File # End Group # Begin Group "Transcoders" @@ -467,6 +459,10 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Base64.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\util\BaseRefVectorOf.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\util\BinFileInputStream.cpp # End Source File # Begin Source File @@ -507,6 +503,14 @@ SOURCE=..\..\..\..\..\src\xercesc\util\CountedPointer.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\util\DefaultPanicHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\src\xercesc\util\DefaultPanicHandler.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\util\EmptyStackException.hpp # End Source File # Begin Source File @@ -615,6 +619,14 @@ SOURCE=..\..\..\..\..\src\xercesc\util\NullPointerException.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\util\PanicHandler.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\src\xercesc\util\PanicHandler.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\util\PlatformUtils.cpp # End Source File # Begin Source File @@ -635,6 +647,10 @@ SOURCE=..\..\..\..\..\src\xercesc\util\RefArrayOf.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\util\RefArrayVectorOf.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\util\RefHash2KeysTableOf.hpp # End Source File # Begin Source File @@ -655,14 +671,6 @@ SOURCE=..\..\..\..\..\src\xercesc\util\RefVectorOf.hpp # End Source File # Begin Source File -SOURCE=..\..\..\..\..\src\xercesc\util\RefArrayVectorOf.hpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\src\xercesc\util\BaseRefVectorOf.hpp -# End Source File -# Begin Source File - SOURCE=..\..\..\..\..\src\xercesc\util\RuntimeException.hpp # End Source File # Begin Source File @@ -2230,14 +2238,6 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMElementImpl.hpp # End Source File # Begin Source File -SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.cpp -# End Source File -# Begin Source File - -SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.hpp -# End Source File -# Begin Source File - SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMElementNSImpl.cpp # End Source File # Begin Source File @@ -2394,6 +2394,14 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTreeWalkerImpl.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMTypeInfoImpl.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\dom\impl\DOMWriterImpl.cpp # End Source File # Begin Source File @@ -2939,10 +2947,6 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMElement.hpp # End Source File # Begin Source File -SOURCE=..\..\..\..\..\src\xercesc\dom\DOMTypeInfo.hpp -# End Source File -# Begin Source File - SOURCE=..\..\..\..\..\src\xercesc\dom\DOMEntity.hpp # End Source File # Begin Source File @@ -3043,6 +3047,10 @@ SOURCE=..\..\..\..\..\src\xercesc\dom\DOMTreeWalker.hpp # End Source File # Begin Source File +SOURCE=..\..\..\..\..\src\xercesc\dom\DOMTypeInfo.hpp +# End Source File +# Begin Source File + SOURCE=..\..\..\..\..\src\xercesc\dom\DOMUserDataHandler.hpp # End Source File # Begin Source File diff --git a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak index 5ad5fa85ad2b7e6a723f482dddab09a1de3335b8..c1cd1234acde1a56068a1b007623f7c0628064eb 100644 --- a/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak +++ b/Projects/Win32/VC6/xerces-all/XercesLib/XercesLib.mak @@ -2,30 +2,30 @@ !IF "$(CFG)" == "" CFG=XercesLib - Win32 Debug !MESSAGE No configuration specified. Defaulting to XercesLib - Win32 Debug. -!ENDIF +!ENDIF !IF "$(CFG)" != "XercesLib - Win32 Release" && "$(CFG)" != "XercesLib - Win32 Debug" && "$(CFG)" != "XercesLib - Win64 Debug" && "$(CFG)" != "XercesLib - Win64 Release" !MESSAGE Invalid configuration "$(CFG)" specified. !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: -!MESSAGE +!MESSAGE !MESSAGE NMAKE /f "XercesLib.mak" CFG="XercesLib - Win32 Debug" -!MESSAGE +!MESSAGE !MESSAGE Possible choices for configuration are: -!MESSAGE +!MESSAGE !MESSAGE "XercesLib - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win64 Debug" (based on "Win32 (x86) Dynamic-Link Library") !MESSAGE "XercesLib - Win64 Release" (based on "Win32 (x86) Dynamic-Link Library") -!MESSAGE +!MESSAGE !ERROR An invalid configuration is specified. -!ENDIF +!ENDIF !IF "$(OS)" == "Windows_NT" NULL= -!ELSE +!ELSE NULL=nul -!ENDIF +!ENDIF !IF "$(CFG)" == "XercesLib - Win32 Release" @@ -82,6 +82,7 @@ CLEAN : -@erase "$(INTDIR)\DayDatatypeValidator.obj" -@erase "$(INTDIR)\DecimalDatatypeValidator.obj" -@erase "$(INTDIR)\DeepNodeListImpl.obj" + -@erase "$(INTDIR)\DefaultPanicHandler.obj" -@erase "$(INTDIR)\DFAContentModel.obj" -@erase "$(INTDIR)\DGXMLScanner.obj" -@erase "$(INTDIR)\DocumentFragmentImpl.obj" @@ -215,6 +216,7 @@ CLEAN : -@erase "$(INTDIR)\NotationImpl.obj" -@erase "$(INTDIR)\Op.obj" -@erase "$(INTDIR)\OpFactory.obj" + -@erase "$(INTDIR)\PanicHandler.obj" -@erase "$(INTDIR)\ParentNode.obj" -@erase "$(INTDIR)\ParenToken.obj" -@erase "$(INTDIR)\ParserForXMLSchema.obj" @@ -344,48 +346,48 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=$(CPP) -CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/G6 /MD /Za /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 +MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" BSC32=bscmake.exe -BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" +BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_2_0.pdb" /map:"$(INTDIR)\xerces-c_2_2_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_2_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.2.0 +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\xerces-c_2_2_0.pdb" /map:"$(INTDIR)\xerces-c_2_2_0.map" /machine:I386 /out:"$(OUTDIR)\xerces-c_2_2_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.2.0 LINK32_OBJS= \ "$(INTDIR)\Win32PlatformUtils.obj" \ "$(INTDIR)\Win32MsgLoader.obj" \ @@ -423,6 +425,7 @@ LINK32_OBJS= \ "$(INTDIR)\BinInputStream.obj" \ "$(INTDIR)\BinMemInputStream.obj" \ "$(INTDIR)\BitSet.obj" \ + "$(INTDIR)\DefaultPanicHandler.obj" \ "$(INTDIR)\EncodingValidator.obj" \ "$(INTDIR)\HashPtr.obj" \ "$(INTDIR)\HashXMLCh.obj" \ @@ -430,6 +433,7 @@ LINK32_OBJS= \ "$(INTDIR)\HexBin.obj" \ "$(INTDIR)\KVStringPair.obj" \ "$(INTDIR)\Mutexes.obj" \ + "$(INTDIR)\PanicHandler.obj" \ "$(INTDIR)\PlatformUtils.obj" \ "$(INTDIR)\QName.obj" \ "$(INTDIR)\StringPool.obj" \ @@ -595,7 +599,6 @@ LINK32_OBJS= \ "$(INTDIR)\DOMDocumentImpl.obj" \ "$(INTDIR)\DOMDocumentTypeImpl.obj" \ "$(INTDIR)\DOMElementImpl.obj" \ - "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMElementNSImpl.obj" \ "$(INTDIR)\DOMEntityImpl.obj" \ "$(INTDIR)\DOMEntityReferenceImpl.obj" \ @@ -616,6 +619,7 @@ LINK32_OBJS= \ "$(INTDIR)\DOMStringPool.obj" \ "$(INTDIR)\DOMTextImpl.obj" \ "$(INTDIR)\DOMTreeWalkerImpl.obj" \ + "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMWriterImpl.obj" \ "$(INTDIR)\XSDElementNSImpl.obj" \ "$(INTDIR)\AttrImpl.obj" \ @@ -740,6 +744,7 @@ CLEAN : -@erase "$(INTDIR)\DayDatatypeValidator.obj" -@erase "$(INTDIR)\DecimalDatatypeValidator.obj" -@erase "$(INTDIR)\DeepNodeListImpl.obj" + -@erase "$(INTDIR)\DefaultPanicHandler.obj" -@erase "$(INTDIR)\DFAContentModel.obj" -@erase "$(INTDIR)\DGXMLScanner.obj" -@erase "$(INTDIR)\DocumentFragmentImpl.obj" @@ -873,6 +878,7 @@ CLEAN : -@erase "$(INTDIR)\NotationImpl.obj" -@erase "$(INTDIR)\Op.obj" -@erase "$(INTDIR)\OpFactory.obj" + -@erase "$(INTDIR)\PanicHandler.obj" -@erase "$(INTDIR)\ParentNode.obj" -@erase "$(INTDIR)\ParenToken.obj" -@erase "$(INTDIR)\ParserForXMLSchema.obj" @@ -1004,48 +1010,48 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=$(CPP) -CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/G6 /MDd /Za /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 +MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" BSC32=bscmake.exe -BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" +BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_2_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0D.pdb" /debug /machine:I386 /out:"$(OUTDIR)\xerces-c_2_2_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 LINK32_OBJS= \ "$(INTDIR)\Win32PlatformUtils.obj" \ "$(INTDIR)\Win32MsgLoader.obj" \ @@ -1083,6 +1089,7 @@ LINK32_OBJS= \ "$(INTDIR)\BinInputStream.obj" \ "$(INTDIR)\BinMemInputStream.obj" \ "$(INTDIR)\BitSet.obj" \ + "$(INTDIR)\DefaultPanicHandler.obj" \ "$(INTDIR)\EncodingValidator.obj" \ "$(INTDIR)\HashPtr.obj" \ "$(INTDIR)\HashXMLCh.obj" \ @@ -1090,6 +1097,7 @@ LINK32_OBJS= \ "$(INTDIR)\HexBin.obj" \ "$(INTDIR)\KVStringPair.obj" \ "$(INTDIR)\Mutexes.obj" \ + "$(INTDIR)\PanicHandler.obj" \ "$(INTDIR)\PlatformUtils.obj" \ "$(INTDIR)\QName.obj" \ "$(INTDIR)\StringPool.obj" \ @@ -1255,7 +1263,6 @@ LINK32_OBJS= \ "$(INTDIR)\DOMDocumentImpl.obj" \ "$(INTDIR)\DOMDocumentTypeImpl.obj" \ "$(INTDIR)\DOMElementImpl.obj" \ - "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMElementNSImpl.obj" \ "$(INTDIR)\DOMEntityImpl.obj" \ "$(INTDIR)\DOMEntityReferenceImpl.obj" \ @@ -1276,6 +1283,7 @@ LINK32_OBJS= \ "$(INTDIR)\DOMStringPool.obj" \ "$(INTDIR)\DOMTextImpl.obj" \ "$(INTDIR)\DOMTreeWalkerImpl.obj" \ + "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMWriterImpl.obj" \ "$(INTDIR)\XSDElementNSImpl.obj" \ "$(INTDIR)\AttrImpl.obj" \ @@ -1400,6 +1408,7 @@ CLEAN : -@erase "$(INTDIR)\DayDatatypeValidator.obj" -@erase "$(INTDIR)\DecimalDatatypeValidator.obj" -@erase "$(INTDIR)\DeepNodeListImpl.obj" + -@erase "$(INTDIR)\DefaultPanicHandler.obj" -@erase "$(INTDIR)\DFAContentModel.obj" -@erase "$(INTDIR)\DGXMLScanner.obj" -@erase "$(INTDIR)\DocumentFragmentImpl.obj" @@ -1533,6 +1542,7 @@ CLEAN : -@erase "$(INTDIR)\NotationImpl.obj" -@erase "$(INTDIR)\Op.obj" -@erase "$(INTDIR)\OpFactory.obj" + -@erase "$(INTDIR)\PanicHandler.obj" -@erase "$(INTDIR)\ParentNode.obj" -@erase "$(INTDIR)\ParenToken.obj" -@erase "$(INTDIR)\ParserForXMLSchema.obj" @@ -1664,48 +1674,48 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=$(CPP) -CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/MDd /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 +MTL_PROJ=/D "_DEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "_DEBUG" BSC32=bscmake.exe -BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" +BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_2_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 /machine:IA64 +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0D.pdb" /debug /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_2_0D.dll" /implib:"$(OUTDIR)\xerces-c_2D.lib" /pdbtype:sept /version:2.2.0 /machine:IA64 LINK32_OBJS= \ "$(INTDIR)\Win32PlatformUtils.obj" \ "$(INTDIR)\Win32MsgLoader.obj" \ @@ -1743,6 +1753,7 @@ LINK32_OBJS= \ "$(INTDIR)\BinInputStream.obj" \ "$(INTDIR)\BinMemInputStream.obj" \ "$(INTDIR)\BitSet.obj" \ + "$(INTDIR)\DefaultPanicHandler.obj" \ "$(INTDIR)\EncodingValidator.obj" \ "$(INTDIR)\HashPtr.obj" \ "$(INTDIR)\HashXMLCh.obj" \ @@ -1750,6 +1761,7 @@ LINK32_OBJS= \ "$(INTDIR)\HexBin.obj" \ "$(INTDIR)\KVStringPair.obj" \ "$(INTDIR)\Mutexes.obj" \ + "$(INTDIR)\PanicHandler.obj" \ "$(INTDIR)\PlatformUtils.obj" \ "$(INTDIR)\QName.obj" \ "$(INTDIR)\StringPool.obj" \ @@ -1915,7 +1927,6 @@ LINK32_OBJS= \ "$(INTDIR)\DOMDocumentImpl.obj" \ "$(INTDIR)\DOMDocumentTypeImpl.obj" \ "$(INTDIR)\DOMElementImpl.obj" \ - "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMElementNSImpl.obj" \ "$(INTDIR)\DOMEntityImpl.obj" \ "$(INTDIR)\DOMEntityReferenceImpl.obj" \ @@ -1936,6 +1947,7 @@ LINK32_OBJS= \ "$(INTDIR)\DOMStringPool.obj" \ "$(INTDIR)\DOMTextImpl.obj" \ "$(INTDIR)\DOMTreeWalkerImpl.obj" \ + "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMWriterImpl.obj" \ "$(INTDIR)\XSDElementNSImpl.obj" \ "$(INTDIR)\AttrImpl.obj" \ @@ -2060,6 +2072,7 @@ CLEAN : -@erase "$(INTDIR)\DayDatatypeValidator.obj" -@erase "$(INTDIR)\DecimalDatatypeValidator.obj" -@erase "$(INTDIR)\DeepNodeListImpl.obj" + -@erase "$(INTDIR)\DefaultPanicHandler.obj" -@erase "$(INTDIR)\DFAContentModel.obj" -@erase "$(INTDIR)\DGXMLScanner.obj" -@erase "$(INTDIR)\DocumentFragmentImpl.obj" @@ -2193,6 +2206,7 @@ CLEAN : -@erase "$(INTDIR)\NotationImpl.obj" -@erase "$(INTDIR)\Op.obj" -@erase "$(INTDIR)\OpFactory.obj" + -@erase "$(INTDIR)\PanicHandler.obj" -@erase "$(INTDIR)\ParentNode.obj" -@erase "$(INTDIR)\ParenToken.obj" -@erase "$(INTDIR)\ParserForXMLSchema.obj" @@ -2323,48 +2337,48 @@ CLEAN : if not exist "$(INTDIR)/$(NULL)" mkdir "$(INTDIR)" CPP=$(CPP) -CPP_PROJ=/MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_PROJ=/MD /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c .c{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.obj:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .c{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cpp{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << .cxx{$(INTDIR)}.sbr:: $(CPP) @<< - $(CPP_PROJ) $< + $(CPP_PROJ) $< << MTL=midl.exe -MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 +MTL_PROJ=/D "NDEBUG" /mktyplib203 /o "NUL" /win32 RSC=rc.exe -RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" +RSC_PROJ=/l 0x409 /fo"$(INTDIR)\Version.res" /d "NDEBUG" BSC32=bscmake.exe -BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" +BSC32_FLAGS=/o"$(OUTDIR)\XercesLib.bsc" BSC32_SBRS= \ LINK32=link.exe -LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0.pdb" /map:"$(INTDIR)\xerces-c_2_2_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_2_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.2.0 /machine:IA64 +LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib ws2_32.lib /base:"0x12000000" /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\xerces-c_2_2_0.pdb" /map:"$(INTDIR)\xerces-c_2_2_0.map" /machine:IX86 /out:"$(OUTDIR)\xerces-c_2_2_0.dll" /implib:"$(OUTDIR)\xerces-c_2.lib" /version:2.2.0 /machine:IA64 LINK32_OBJS= \ "$(INTDIR)\Win32PlatformUtils.obj" \ "$(INTDIR)\Win32MsgLoader.obj" \ @@ -2402,6 +2416,7 @@ LINK32_OBJS= \ "$(INTDIR)\BinInputStream.obj" \ "$(INTDIR)\BinMemInputStream.obj" \ "$(INTDIR)\BitSet.obj" \ + "$(INTDIR)\DefaultPanicHandler.obj" \ "$(INTDIR)\EncodingValidator.obj" \ "$(INTDIR)\HashPtr.obj" \ "$(INTDIR)\HashXMLCh.obj" \ @@ -2409,6 +2424,7 @@ LINK32_OBJS= \ "$(INTDIR)\HexBin.obj" \ "$(INTDIR)\KVStringPair.obj" \ "$(INTDIR)\Mutexes.obj" \ + "$(INTDIR)\PanicHandler.obj" \ "$(INTDIR)\PlatformUtils.obj" \ "$(INTDIR)\QName.obj" \ "$(INTDIR)\StringPool.obj" \ @@ -2574,7 +2590,6 @@ LINK32_OBJS= \ "$(INTDIR)\DOMDocumentImpl.obj" \ "$(INTDIR)\DOMDocumentTypeImpl.obj" \ "$(INTDIR)\DOMElementImpl.obj" \ - "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMElementNSImpl.obj" \ "$(INTDIR)\DOMEntityImpl.obj" \ "$(INTDIR)\DOMEntityReferenceImpl.obj" \ @@ -2595,6 +2610,7 @@ LINK32_OBJS= \ "$(INTDIR)\DOMStringPool.obj" \ "$(INTDIR)\DOMTextImpl.obj" \ "$(INTDIR)\DOMTreeWalkerImpl.obj" \ + "$(INTDIR)\DOMTypeInfoImpl.obj" \ "$(INTDIR)\DOMWriterImpl.obj" \ "$(INTDIR)\XSDElementNSImpl.obj" \ "$(INTDIR)\AttrImpl.obj" \ @@ -2664,16 +2680,16 @@ LINK32_OBJS= \ $(LINK32_FLAGS) $(LINK32_OBJS) << -!ENDIF +!ENDIF !IF "$(NO_EXTERNAL_DEPS)" != "1" !IF EXISTS("XercesLib.dep") !INCLUDE "XercesLib.dep" -!ELSE +!ELSE !MESSAGE Warning: cannot find "XercesLib.dep" -!ENDIF -!ENDIF +!ENDIF +!ENDIF !IF "$(CFG)" == "XercesLib - Win32 Release" || "$(CFG)" == "XercesLib - Win32 Debug" || "$(CFG)" == "XercesLib - Win64 Debug" || "$(CFG)" == "XercesLib - Win64 Release" @@ -2681,7 +2697,7 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Win32PlatformUtils.cpp !IF "$(CFG)" == "XercesLib - Win32 Release" -CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2691,7 +2707,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" -CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2701,7 +2717,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" -CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2711,7 +2727,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" -CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32PlatformUtils.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2719,13 +2735,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" << -!ENDIF +!ENDIF SOURCE=..\..\..\..\..\src\xercesc\util\MsgLoaders\Win32\Win32MsgLoader.cpp !IF "$(CFG)" == "XercesLib - Win32 Release" -CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2735,7 +2751,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" -CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2745,7 +2761,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" -CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2755,7 +2771,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" -CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32MsgLoader.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2763,13 +2779,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" << -!ENDIF +!ENDIF SOURCE=..\..\..\..\..\src\xercesc\util\Transcoders\Win32\Win32TransService.cpp !IF "$(CFG)" == "XercesLib - Win32 Release" -CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2779,7 +2795,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" -CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2789,7 +2805,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" -CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2799,7 +2815,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" -CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\Win32TransService.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2807,13 +2823,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" << -!ENDIF +!ENDIF SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\BinHTTPURLInputStream.cpp !IF "$(CFG)" == "XercesLib - Win32 Release" -CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2823,7 +2839,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" -CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2833,7 +2849,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" -CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2843,7 +2859,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" -CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\BinHTTPURLInputStream.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2851,13 +2867,13 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" << -!ENDIF +!ENDIF SOURCE=..\..\..\..\..\src\xercesc\util\NetAccessors\WinSock\WinSockNetAccessor.cpp !IF "$(CFG)" == "XercesLib - Win32 Release" -CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2867,7 +2883,7 @@ CPP_SWITCHES=/G6 /MD /Ze /W3 /GX /O2 /Ob2 /I "..\..\..\..\..\src" /D "NDEBUG" /D !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" -CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2877,7 +2893,7 @@ CPP_SWITCHES=/G6 /MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "_CRTDB !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" -CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_SAX2" /D "_DEBUG" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2887,7 +2903,7 @@ CPP_SWITCHES=/MDd /Ze /W3 /Gm /GX /Zi /Od /I "..\..\..\..\..\src" /D "WIN64" /D !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" -CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c +CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" /D "PLATFORM_WIN32" /D "_CRTDBG_MAP_ALLOC" /D "PROJ_XMLPARSER" /D "PROJ_XMLUTIL" /D "PROJ_PARSERS" /D "PROJ_SAX4C" /D "PROJ_SAX2" /D "PROJ_DOM" /D "PROJ_VALIDATORS" /D "XML_SINGLEDLL" /D "WIN32" /D "_WINDOWS" /D "XML_USE_WIN32_TRANSCODER" /D "XML_USE_WIN32_MSGLOADER" /D "XML_USE_NETACCESSOR_WINSOCK" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c "$(INTDIR)\WinSockNetAccessor.obj" : $(SOURCE) "$(INTDIR)" $(CPP) @<< @@ -2895,7 +2911,7 @@ CPP_SWITCHES=/MD /Ze /W3 /GX /O2 /I "..\..\..\..\..\src" /D "WIN64" /D "NDEBUG" << -!ENDIF +!ENDIF SOURCE=..\..\..\..\..\src\xercesc\util\regx\ASCIIRangeFactory.cpp @@ -3083,6 +3099,12 @@ SOURCE=..\..\..\..\..\src\xercesc\util\BitSet.cpp $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=..\..\..\..\..\src\xercesc\util\DefaultPanicHandler.cpp + +"$(INTDIR)\DefaultPanicHandler.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=..\..\..\..\..\src\xercesc\util\EncodingValidator.cpp "$(INTDIR)\EncodingValidator.obj" : $(SOURCE) "$(INTDIR)" @@ -3125,6 +3147,12 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Mutexes.cpp $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE=..\..\..\..\..\src\xercesc\util\PanicHandler.cpp + +"$(INTDIR)\PanicHandler.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=..\..\..\..\..\src\xercesc\util\PlatformUtils.cpp "$(INTDIR)\PlatformUtils.obj" : $(SOURCE) "$(INTDIR)" @@ -4619,32 +4647,32 @@ SOURCE=..\..\..\..\..\src\xercesc\util\Platforms\Win32\Version.rc "$(INTDIR)\Version.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Testing\src\xercesc\util\Platforms\Win32" /d "NDEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Working\src\xercesc\util\Platforms\Win32" /d "NDEBUG" $(SOURCE) !ELSEIF "$(CFG)" == "XercesLib - Win32 Debug" "$(INTDIR)\Version.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Testing\src\xercesc\util\Platforms\Win32" /d "_DEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Working\src\xercesc\util\Platforms\Win32" /d "_DEBUG" $(SOURCE) !ELSEIF "$(CFG)" == "XercesLib - Win64 Debug" "$(INTDIR)\Version.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Testing\src\xercesc\util\Platforms\Win32" /d "_DEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Working\src\xercesc\util\Platforms\Win32" /d "_DEBUG" $(SOURCE) !ELSEIF "$(CFG)" == "XercesLib - Win64 Release" "$(INTDIR)\Version.res" : $(SOURCE) "$(INTDIR)" - $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Testing\src\xercesc\util\Platforms\Win32" /d "NDEBUG" $(SOURCE) + $(RSC) /l 0x409 /fo"$(INTDIR)\Version.res" /i "\Xerces-Working\src\xercesc\util\Platforms\Win32" /d "NDEBUG" $(SOURCE) -!ENDIF +!ENDIF -!ENDIF +!ENDIF diff --git a/src/xercesc/dom/deprecated/DOMString.cpp b/src/xercesc/dom/deprecated/DOMString.cpp index b8ace31d3745b4c9ebb14441b72e7f145e69b84f..c23d09841581f70a9caffb88df21807246ed5627 100644 --- a/src/xercesc/dom/deprecated/DOMString.cpp +++ b/src/xercesc/dom/deprecated/DOMString.cpp @@ -103,7 +103,7 @@ XMLLCPTranscoder* getDomConverter() { XMLLCPTranscoder* transcoder = XMLPlatformUtils::fgTransService->makeNewLCPTranscoder(); if (!transcoder) - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_NoDefTranscoder + XMLPlatformUtils::panic(PanicHandler::Panic_NoDefTranscoder ); if (XMLPlatformUtils::compareAndSwap((void **)&gDomConverter, transcoder, 0) != 0) diff --git a/src/xercesc/dom/impl/DOMImplementationImpl.cpp b/src/xercesc/dom/impl/DOMImplementationImpl.cpp index e781a9f7dfa50900b79aa629c18c165ea45f15bb..435be872f72d64f04b56b754ea2d8eec9b04ed12 100644 --- a/src/xercesc/dom/impl/DOMImplementationImpl.cpp +++ b/src/xercesc/dom/impl/DOMImplementationImpl.cpp @@ -122,7 +122,7 @@ XMLMsgLoader* DOMImplementationImpl::getMsgLoader4DOM() { { XMLMsgLoader* t = XMLPlatformUtils::loadMsgSet(XMLUni::fgXMLDOMMsgDomain); if (!t) - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); else { if (XMLPlatformUtils::compareAndSwap((void **)&gMsgLoader4DOM, t, 0) != 0) { diff --git a/src/xercesc/framework/XMLValidator.cpp b/src/xercesc/framework/XMLValidator.cpp index db934500f2ccff52c2cc6d183bbad6beef7a18b2..52ae4068766551b805b782885b31e9d908744973 100644 --- a/src/xercesc/framework/XMLValidator.cpp +++ b/src/xercesc/framework/XMLValidator.cpp @@ -56,6 +56,9 @@ /** * $Log$ + * Revision 1.3 2003/03/09 16:38:04 peiyongz + * PanicHandler + * * Revision 1.2 2002/11/04 15:00:21 tng * C++ Namespace Support. * @@ -174,7 +177,7 @@ static XMLMsgLoader& getMsgLoader() { sMsgLoader = XMLPlatformUtils::loadMsgSet(XMLUni::fgValidityDomain); if (!sMsgLoader) - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); // // Register this XMLMsgLoader for cleanup at Termination. diff --git a/src/xercesc/internal/XMLScanner.cpp b/src/xercesc/internal/XMLScanner.cpp index a9a746ac6bd02f072ef5f0b10491b68d804ca73c..1817b433f2b58be164ad1a92e86fdbca4f41c8f1 100644 --- a/src/xercesc/internal/XMLScanner.cpp +++ b/src/xercesc/internal/XMLScanner.cpp @@ -153,7 +153,7 @@ static XMLMsgLoader& gScannerMsgLoader() { gMsgLoader = XMLPlatformUtils::loadMsgSet(XMLUni::fgXMLErrDomain); if (!gMsgLoader) - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); // Register this object to be cleaned up at termination cleanupMsgLoader.registerCleanup(XMLScanner::reinitMsgLoader); diff --git a/src/xercesc/util/Makefile.in b/src/xercesc/util/Makefile.in index 4fae572c9b62e206291adaf1943337c15a1724b4..b406a91cf8a92cccd40084fb6cffb96e45e2d57d 100644 --- a/src/xercesc/util/Makefile.in +++ b/src/xercesc/util/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.28 2003/03/09 16:40:47 peiyongz +# PanicHandler +# # Revision 1.27 2003/02/20 18:06:55 peiyongz # Bug#7077: build error message shared library for ICUMsgLoader # @@ -431,6 +434,7 @@ UTIL_CPP_PUBHEADERS = \ BitOps.hpp \ BitSet.hpp \ CountedPointer.hpp \ + DefaultPanicHandler.hpp \ EmptyStackException.hpp \ EncodingValidator.hpp \ FlagJanitor.hpp \ @@ -452,6 +456,7 @@ UTIL_CPP_PUBHEADERS = \ NoSuchElementException.hpp \ NullPointerException.hpp \ NumberFormatException.hpp \ + PanicHandler.hpp \ ParseException.hpp \ PlatformUtils.hpp \ QName.hpp \ @@ -541,6 +546,7 @@ UTIL_CPP_OBJECTS = \ BinInputStream.$(TO) \ BinMemInputStream.$(TO) \ BitSet.$(TO) \ + DefaultPanicHandler.$(TO) \ EncodingValidator.$(TO) \ HashPtr.$(TO) \ HashXMLCh.$(TO) \ @@ -548,6 +554,7 @@ UTIL_CPP_OBJECTS = \ HexBin.$(TO) \ KVStringPair.$(TO) \ Mutexes.$(TO) \ + PanicHandler.$(TO) \ PlatformUtils.$(TO) \ QName.$(TO) \ StringPool.$(TO) \ diff --git a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp index a33b94b54239b32a39a64a2e3ab8aec519e8a3ca..fc8aeeddbf7dd6e83f6713068665536d76812690 100644 --- a/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp +++ b/src/xercesc/util/MsgLoaders/ICU/ICUMsgLoader.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.15 2003/03/09 16:41:20 peiyongz + * PanicHandler + * * Revision 1.14 2003/02/20 18:07:46 peiyongz * Bug#7077: build error message shared library for ICUMsgLoader * @@ -205,7 +208,7 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain) !XMLString::equals(msgDomain, XMLUni::fgXMLDOMMsgDomain) && !XMLString::equals(msgDomain, XMLUni::fgValidityDomain) ) { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_UnknownMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_UnknownMsgDomain); } /*** @@ -286,12 +289,12 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain) fLocaleBundle = ures_open("XercesMessages", XMLMsgLoader::getLocale(), &err); if (!U_SUCCESS(err) || fLocaleBundle == NULL) { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); } } else { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); } } @@ -303,7 +306,7 @@ ICUMsgLoader::ICUMsgLoader(const XMLCh* const msgDomain) fDomainBundle = ures_getByKey(fLocaleBundle, domainName, NULL, &err); if (!U_SUCCESS(err) || fDomainBundle == NULL) { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); } } diff --git a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp index 503a0a69e2bc41f12fcc2621de26105c5ffe3878..82e31a2b8e4f8738ca998cb04953fac9830b1494 100644 --- a/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp +++ b/src/xercesc/util/MsgLoaders/InMemory/InMemMsgLoader.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.7 2003/03/09 16:41:40 peiyongz + * PanicHandler + * * Revision 1.6 2002/12/12 19:14:00 peiyongz * InMem Message file name changed. * @@ -123,7 +126,7 @@ InMemMsgLoader::InMemMsgLoader(const XMLCh* const msgDomain) && !XMLString::equals(msgDomain, XMLUni::fgXMLDOMMsgDomain) && !XMLString::equals(msgDomain, XMLUni::fgValidityDomain)) { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_UnknownMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_UnknownMsgDomain); } fMsgDomain = XMLString::replicate(msgDomain); diff --git a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp index d438e4969e6e8773254ee07d40aa249a522d9998..c438f95c0a66918b915e7bc0d18fcb9ed2edea46 100644 --- a/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp +++ b/src/xercesc/util/MsgLoaders/MsgCatalog/MsgCatalogLoader.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.13 2003/03/09 16:42:05 peiyongz + * PanicHandler + * * Revision 1.12 2003/02/20 20:20:11 peiyongz * Allow set user specified error message file location in PlatformUtils::Initialize(). * @@ -153,7 +156,7 @@ MsgCatalogLoader::MsgCatalogLoader(const XMLCh* const msgDomain) && !XMLString::equals(msgDomain, XMLUni::fgXMLDOMMsgDomain) && !XMLString::equals(msgDomain, XMLUni::fgValidityDomain)) { - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_UnknownMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_UnknownMsgDomain); } // Prepare the path info diff --git a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp index fdd2f7bef7775dee8935ad98fa7f00f702ff82a9..90bf9cf443bedc80c23308ea9020c4285c5e5943 100644 --- a/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp +++ b/src/xercesc/util/MsgLoaders/Win32/Win32MsgLoader.cpp @@ -137,7 +137,7 @@ Win32MsgLoader::Win32MsgLoader(const XMLCh* const msgDomain) : else if (XMLString::equals(fMsgDomain, XMLUni::fgXMLDOMMsgDomain)) fDomainOfs = 0x6000; else - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_UnknownMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_UnknownMsgDomain); } Win32MsgLoader::~Win32MsgLoader() diff --git a/src/xercesc/util/PlatformUtils.cpp b/src/xercesc/util/PlatformUtils.cpp index 703ed0be8f636d607fc843aa75743e103bfbe404..513624684c385c3ec167feb8ac4dbbb1f048a00b 100644 --- a/src/xercesc/util/PlatformUtils.cpp +++ b/src/xercesc/util/PlatformUtils.cpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.8 2003/03/09 16:40:47 peiyongz + * PanicHandler + * * Revision 1.7 2003/02/17 19:54:47 peiyongz * Allow set user specified error message file location in PlatformUtils::Initialize(). * @@ -158,6 +161,8 @@ #include <xercesc/internal/XMLReader.hpp> #include <xercesc/util/RuntimeException.hpp> #include <xercesc/util/XMLRegisterCleanup.hpp> +#include <xercesc/util/DefaultPanicHandler.hpp> + #include <limits.h> XERCES_CPP_NAMESPACE_BEGIN @@ -185,7 +190,7 @@ static long gInitFlag = 0; // static data cleanup list // --------------------------------------------------------------------------- XMLRegisterCleanup* gXMLCleanupList = 0; -XMLMutex* gXMLCleanupListMutex = 0; +XMLMutex* gXMLCleanupListMutex = 0; // --------------------------------------------------------------------------- @@ -193,14 +198,15 @@ XMLMutex* gXMLCleanupListMutex = 0; // --------------------------------------------------------------------------- XMLNetAccessor* XMLPlatformUtils::fgNetAccessor = 0; XMLTransService* XMLPlatformUtils::fgTransService = 0; - - +PanicHandler* XMLPlatformUtils::fgUserPanicHandler = 0; +PanicHandler* XMLPlatformUtils::fgDefaultPanicHandler = 0; // --------------------------------------------------------------------------- // XMLPlatformUtils: Init/term methods // --------------------------------------------------------------------------- -void XMLPlatformUtils::Initialize(const char* const locale - , const char* const nlsHome) +void XMLPlatformUtils::Initialize(const char* const locale + , const char* const nlsHome + , PanicHandler* const panicHandler) { // // Effects of overflow: @@ -225,6 +231,19 @@ void XMLPlatformUtils::Initialize(const char* const locale if (gInitFlag > 1) return; + /*** + * Panic Handler: + * + ***/ + if (!panicHandler) + { + fgDefaultPanicHandler = new DefaultPanicHandler(); + } + else + { + fgUserPanicHandler = panicHandler; + } + // // Call the platform init method, which is implemented in each of the // per-platform implementation cpp files. This one does the very low @@ -253,7 +272,7 @@ void XMLPlatformUtils::Initialize(const char* const locale fgTransService = makeTransService(); if (!fgTransService) - panic(Panic_NoTransService); + panic(PanicHandler::Panic_NoTransService); // Initialize the transcoder service fgTransService->initTransService(); @@ -265,7 +284,7 @@ void XMLPlatformUtils::Initialize(const char* const locale // XMLLCPTranscoder* defXCode = XMLPlatformUtils::fgTransService->makeNewLCPTranscoder(); if (!defXCode) - panic(Panic_NoDefTranscoder); + panic(PanicHandler::Panic_NoDefTranscoder); XMLString::initString(defXCode); // @@ -283,6 +302,7 @@ void XMLPlatformUtils::Initialize(const char* const locale ***/ XMLMsgLoader::setLocale(locale); XMLMsgLoader::setNLSHome(nlsHome); + } @@ -347,6 +367,11 @@ void XMLPlatformUtils::Terminate() XMLMsgLoader::setLocale(0); XMLMsgLoader::setNLSHome(0); + if (fgDefaultPanicHandler) + { + delete fgDefaultPanicHandler; + } + // And say we are no longer initialized gInitFlag = 0; diff --git a/src/xercesc/util/PlatformUtils.hpp b/src/xercesc/util/PlatformUtils.hpp index a6801fcf623ee7912f8216d7d64ed70d7b172af4..be50836c1b258f6278d1cfce0d7560798e2a70f3 100644 --- a/src/xercesc/util/PlatformUtils.hpp +++ b/src/xercesc/util/PlatformUtils.hpp @@ -64,6 +64,7 @@ #include <xercesc/util/XercesDefs.hpp> #include <xercesc/util/XMLException.hpp> +#include <xercesc/util/PanicHandler.hpp> XERCES_CPP_NAMESPACE_BEGIN @@ -71,7 +72,6 @@ class XMLMsgLoader; class XMLNetAccessor; class XMLTransService; - // // For internal use only // @@ -103,21 +103,6 @@ private : class XMLUTIL_EXPORT XMLPlatformUtils { public : - /** @name Public Types */ - //@{ - enum PanicReasons - { - Panic_NoTransService - , Panic_NoDefTranscoder - , Panic_CantFindLib - , Panic_UnknownMsgDomain - , Panic_CantLoadMsgDomain - , Panic_SynchronizationErr - , Panic_SystemInit - - , PanicReasons_Count - }; - //@} /** @name Public Static Data */ //@{ @@ -148,6 +133,18 @@ public : */ static XMLTransService* fgTransService; + /** The Panic Handler + * + * This is the application provided panic handler. + */ + static PanicHandler* fgUserPanicHandler; + + /** The Panic Handler + * + * This is the default panic handler. + */ + static PanicHandler* fgDefaultPanicHandler; + //@} @@ -175,9 +172,14 @@ public : * the discussion above with regard to locale, applies to this nlsHome * as well. * + * panicHandler: application's panic handler, application owns this handler. + * Application shall make sure that the plugged panic handler persists + * through the call to XMLPlatformUtils::terminate(). + * */ - static void Initialize(const char* const locale = XMLUni::fgXercescDefaultLocale - , const char* const nlsHome = 0); + static void Initialize(const char* const locale = XMLUni::fgXercescDefaultLocale + , const char* const nlsHome = 0 + , PanicHandler* const panicHandler = 0); /** Perform per-process parser termination * @@ -193,17 +195,21 @@ public : * to get transcoding up or get message loading working, we call * this method.</p> * - * Each platform can implement it however they want. This method is - * expected to display something meaningful and end the process. The - * enum indicates why its being called, to allow the per-platform code - * to display or log something more specific if desired.</p> + * Each platform can implement it however they want. This method will + * delegate the panic handling to a user specified panic handler or + * in the absence of it, the default panic handler. * + * In case the default panic handler does not support a particular + * platform, the platform specific panic hanlding shall be implemented + * here </p>. + * * @param reason The enumeration that defines the cause of the failure */ static void panic ( - const PanicReasons reason + const PanicHandler::PanicReasons reason ); + //@} /** @name File Methods */ diff --git a/src/xercesc/util/XMLException.cpp b/src/xercesc/util/XMLException.cpp index 3211432007a0b19459eccb9212c27c189ddb0283..2cd58d9ffcd09afc20a8cdf9f79648fd2a496f31 100644 --- a/src/xercesc/util/XMLException.cpp +++ b/src/xercesc/util/XMLException.cpp @@ -144,7 +144,7 @@ static XMLMsgLoader& gGetMsgLoader() { sMsgLoader = XMLPlatformUtils::loadMsgSet(XMLUni::fgExceptDomain); if (!sMsgLoader) - XMLPlatformUtils::panic(XMLPlatformUtils::Panic_CantLoadMsgDomain); + XMLPlatformUtils::panic(PanicHandler::Panic_CantLoadMsgDomain); // // Register this XMLMsgLoader for cleanup at Termination.