Merge pull request ajkhoury#34 from sfinktah/master

updated to tinyxml 5.0.1
zanzo420 · Oct 27, 2017 · e738a12 · e738a12
2 parents 6957778 + 077a9de
commit e738a12
Show file tree

Hide file tree

Showing 8 changed files with 858 additions and 4,442 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,3 +49,4 @@ DriverPlugin_dbg.rc-plugin64d
 *.sys
 /ReClass/plugins/TestPlugin.lib
 /ReClass/plugins/TestPlugin.rc-plugin64
+.vs
diff --git a/ReClass/ReClass 2016.vcxproj b/ReClass/ReClass 2016.vcxproj
@@ -465,7 +465,10 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
     </ClCompile>
     <ClCompile Include="Symbols.cpp" />
-    <ClCompile Include="tinyxml2.cpp" />
+    <ClCompile Include="tinyxml2.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
+    </ClCompile>
     <ClCompile Include="Utils.cpp" />
   </ItemGroup>
   <ItemGroup>

diff --git a/ReClass/ReClassEx.cpp b/ReClass/ReClassEx.cpp
@@ -739,7 +739,7 @@ void CReClassExApp::SaveXML( TCHAR* FileName )
 {
 	PrintOut( _T( "SaveXML(\"%s\") called" ), FileName );
 
-	TiXMLDocument doc;
+	XMLDocument doc;
 
 	XMLDeclaration* decl = doc.NewDeclaration(/*"xml version = \"1.0\" encoding=\"UTF-8\""*/ );
 	doc.LinkEndChild( decl );
@@ -966,7 +966,7 @@ void CReClassExApp::SaveXML( TCHAR* FileName )
 	XMLError err = doc.SaveFile( fp );
 	fclose( fp );
 
-	if (err == XML_NO_ERROR)
+	if (err == XML_SUCCESS)
 	{
 		PrintOut( _T( "ReClass files saved successfully to \"%s\"" ), FileName );
 		return;
@@ -1025,7 +1025,7 @@ void CReClassExApp::OnFileOpen( )
 	m_strNotes = _T( "" );
 	m_strCurrentFilePath = _T( "" );
 
-	TiXMLDocument doc;
+	XMLDocument doc;
 
 	#ifdef UNICODE
 	#define _CA2W(psz) CA2W(psz)
@@ -1042,7 +1042,7 @@ void CReClassExApp::OnFileOpen( )
 	XMLError ret = doc.LoadFile( fp );
 	fclose( fp );
 
-	if (ret != XML_NO_ERROR)
+	if (ret != XML_SUCCESS)
 		return;
 
 	m_strCurrentFilePath = pathName;

diff --git a/ReClass/stdafx.h b/ReClass/stdafx.h
@@ -70,6 +70,7 @@ const COLORREF purple = RGB( 128, 0, 255 );
 //#include "tinyxml2_unicode.h"
 #include "tinyxml2.h"
 using namespace tinyxml2;
+#define XMLDocument tinyxml2::XMLDocument
 
 //
 // Utilities
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,3 +49,4 @@ DriverPlugin_dbg.rc-plugin64d @@
     *.sys
     /ReClass/plugins/TestPlugin.lib
     /ReClass/plugins/TestPlugin.rc-plugin64
+    .vs