Revert "Project modernization (#630)"

This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.

This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.

1 files changed, 31 insertions, 30 deletions

diff --git a/Minecraft.Client/Durango/XML/ATGXmlParser.cpp b/Minecraft.Client/Durango/XML/ATGXmlParser.cpp
index 89ca7714..771ba268 100644
--- a/Minecraft.Client/Durango/XML/ATGXmlParser.cpp
+++ b/Minecraft.Client/Durango/XML/ATGXmlParser.cpp
@@ -27,7 +27,7 @@ XMLParser::XMLParser()
 {
     m_pWritePtr = m_pWriteBuf;
     m_pReadPtr = m_pReadBuf;
-    m_pISAXCallback = nullptr;
+    m_pISAXCallback = NULL;
     m_hFile = INVALID_HANDLE_VALUE;
 }
 
@@ -49,7 +49,7 @@ VOID XMLParser::FillBuffer()
 
     m_pReadPtr = m_pReadBuf;
 
-    if( m_hFile == nullptr )
+    if( m_hFile == NULL )
     {
         if( m_uInXMLBufferCharsLeft > XML_READ_BUFFER_SIZE )
             NChars = XML_READ_BUFFER_SIZE;
@@ -62,15 +62,15 @@ VOID XMLParser::FillBuffer()
     }
     else
     {
-        if( !ReadFile( m_hFile, m_pReadBuf, XML_READ_BUFFER_SIZE, &NChars, nullptr ))
+        if( !ReadFile( m_hFile, m_pReadBuf, XML_READ_BUFFER_SIZE, &NChars, NULL ))
         {
             return;
         }
     }
 
     m_dwCharsConsumed += NChars;
-    int64_t iProgress = m_dwCharsTotal ? (( static_cast<int64_t>(m_dwCharsConsumed) * 1000 ) / static_cast<int64_t>(m_dwCharsTotal)) : 0;
-    m_pISAXCallback->SetParseProgress( static_cast<DWORD>(iProgress) );
+    int64_t iProgress = m_dwCharsTotal ? (( (int64_t)m_dwCharsConsumed * 1000 ) / (int64_t)m_dwCharsTotal) : 0;
+    m_pISAXCallback->SetParseProgress( (DWORD)iProgress );
 
     m_pReadBuf[ NChars ] = '\0';
     m_pReadBuf[ NChars + 1] = '\0';
@@ -198,7 +198,7 @@ HRESULT XMLParser::ConvertEscape()
     if( FAILED( hr = AdvanceName() ) )
         return hr;
 
-    EntityRefLen = static_cast<UINT>(m_pWritePtr - pEntityRefVal);
+    EntityRefLen = (UINT)( m_pWritePtr - pEntityRefVal );
     m_pWritePtr = pEntityRefVal;
 
     if ( EntityRefLen == 0 )
@@ -359,7 +359,7 @@ HRESULT XMLParser::AdvanceCharacter( BOOL bOkToFail )
         // Read more from the file
         FillBuffer();
 
-        // We are at EOF if it is still nullptr
+        // We are at EOF if it is still NULL
         if ( ( m_pReadPtr[0] == '\0' ) && ( m_pReadPtr[1] == '\0' ) )
         {
             if( !bOkToFail )
@@ -497,8 +497,8 @@ HRESULT XMLParser::AdvanceElement()
         if( FAILED( hr = AdvanceName() ) )
             return hr;
 
-        if (FAILED(m_pISAXCallback->ElementEnd( pEntityRefVal,
-            static_cast<UINT>(m_pWritePtr - pEntityRefVal) )))
+        if( FAILED( m_pISAXCallback->ElementEnd( pEntityRefVal,
+                                                (UINT) ( m_pWritePtr - pEntityRefVal ) ) ) )
             return E_ABORT;
 
         if( FAILED( hr = ConsumeSpace() ) )
@@ -541,7 +541,7 @@ HRESULT XMLParser::AdvanceElement()
         if( FAILED( hr = AdvanceName() ) )
             return hr;
 
-        EntityRefLen = static_cast<UINT>(m_pWritePtr - pEntityRefVal);
+        EntityRefLen = (UINT)( m_pWritePtr - pEntityRefVal );
 
         if( FAILED( hr = ConsumeSpace() ) )
             return hr;
@@ -566,7 +566,7 @@ HRESULT XMLParser::AdvanceElement()
             if( FAILED( hr = AdvanceName() ) )
                 return hr;
 
-            Attributes[ NumAttrs ].NameLen = static_cast<UINT>(m_pWritePtr - Attributes[NumAttrs].strName);
+            Attributes[ NumAttrs ].NameLen = (UINT)( m_pWritePtr - Attributes[ NumAttrs ].strName );
 
             if( FAILED( hr = ConsumeSpace() ) )
                 return hr;
@@ -588,8 +588,8 @@ HRESULT XMLParser::AdvanceElement()
             if( FAILED( hr = AdvanceAttrVal() ) )
                 return hr;
 
-            Attributes[ NumAttrs ].ValueLen = static_cast<UINT>(m_pWritePtr -
-                                                                Attributes[NumAttrs].strValue);
+            Attributes[ NumAttrs ].ValueLen = (UINT)( m_pWritePtr -
+                Attributes[ NumAttrs ].strValue );
 
             ++NumAttrs;
 
@@ -663,13 +663,13 @@ HRESULT XMLParser::AdvanceCDATA()
 
         if( m_pWritePtr - m_pWriteBuf >= XML_WRITE_BUFFER_SIZE )
         {
-            if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, static_cast<UINT>(m_pWritePtr - m_pWriteBuf), TRUE ) ) )
+            if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), TRUE ) ) )
                 return E_ABORT;
             m_pWritePtr = m_pWriteBuf;
         }
     }
 
-    if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, static_cast<UINT>(m_pWritePtr - m_pWriteBuf), FALSE ) ) )
+    if( FAILED( m_pISAXCallback->CDATAData( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) )
         return E_ABORT;
 
     m_pWritePtr = m_pWriteBuf;
@@ -782,10 +782,11 @@ HRESULT XMLParser::MainParseLoop()
     {
         if( FAILED( AdvanceCharacter( TRUE ) ) )
         {
-            if ( ( static_cast<UINT>(m_pWritePtr - m_pWriteBuf) != 0 ) && ( !bWhiteSpaceOnly ) )
+            if ( ( (UINT) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) )
             {
-                if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, static_cast<UINT>(m_pWritePtr - m_pWriteBuf), FALSE ) ) )
+                if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) )
                     return E_ABORT;
+
                 bWhiteSpaceOnly = TRUE;
             }
 
@@ -797,10 +798,9 @@ HRESULT XMLParser::MainParseLoop()
 
         if( m_Ch == '<' )
         {
-\
-            if( ( static_cast<UINT>(m_pWritePtr - m_pWriteBuf) != 0 ) && ( !bWhiteSpaceOnly ) )
+            if( ( (UINT) ( m_pWritePtr - m_pWriteBuf ) != 0 ) && ( !bWhiteSpaceOnly ) )
             {
-                if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, static_cast<UINT>(m_pWritePtr - m_pWriteBuf), FALSE ) ) )
+                if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf, (UINT)( m_pWritePtr - m_pWriteBuf ), FALSE ) ) )
                     return E_ABORT;
 
                 bWhiteSpaceOnly = TRUE;
@@ -838,7 +838,8 @@ HRESULT XMLParser::MainParseLoop()
                 if( !bWhiteSpaceOnly )
                 {
                     if( FAILED( m_pISAXCallback->ElementContent( m_pWriteBuf,
-                        static_cast<UINT>(m_pWritePtr - m_pWriteBuf), TRUE ) ) )
+                                                                    ( UINT ) ( m_pWritePtr - m_pWriteBuf ),
+                                                                    TRUE ) ) )
                     {
                         return E_ABORT;
                     }
@@ -860,7 +861,7 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename )
 {
     HRESULT hr;
 
-    if( m_pISAXCallback == nullptr )
+    if( m_pISAXCallback == NULL )
         return E_NOINTERFACE;
 
     m_pISAXCallback->m_LineNum = 1;
@@ -871,17 +872,16 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename )
     m_pReadPtr = m_pReadBuf;
 
     m_pReadBuf[ 0 ] = '\0';
-
     m_pReadBuf[ 1 ] = '\0';
 
-    m_pInXMLBuffer = nullptr;
+    m_pInXMLBuffer = NULL;
     m_uInXMLBufferCharsLeft = 0;
 
 	WCHAR wchFilename[ 64 ];
 
 	swprintf_s(wchFilename,64,L"%s",strFilename);
 
-    m_hFile = CreateFile(wchFilename, GENERIC_READ, FILE_SHARE_READ, nullptr, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
+    m_hFile = CreateFile( wchFilename, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, NULL );
 
     if( m_hFile == INVALID_HANDLE_VALUE )
     {
@@ -893,7 +893,7 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename )
     {
         LARGE_INTEGER iFileSize;
         GetFileSizeEx( m_hFile, &iFileSize );
-        m_dwCharsTotal = static_cast<DWORD>(iFileSize.QuadPart);
+        m_dwCharsTotal = (DWORD)iFileSize.QuadPart;
         m_dwCharsConsumed = 0;
         hr = MainParseLoop();
     }
@@ -904,7 +904,8 @@ HRESULT XMLParser::ParseXMLFile( CONST CHAR *strFilename )
     m_hFile = INVALID_HANDLE_VALUE;
 
     // we no longer own strFilename, so un-set it
-    m_pISAXCallback->m_strFilename = nullptr;  
+    m_pISAXCallback->m_strFilename = NULL;
+
     return hr;
 }
 
@@ -916,7 +917,7 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize )
 {
     HRESULT hr;
 
-    if( m_pISAXCallback == nullptr )
+    if( m_pISAXCallback == NULL )
         return E_NOINTERFACE;
 
     m_pISAXCallback->m_LineNum = 1;
@@ -929,7 +930,7 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize )
     m_pReadBuf[ 0 ] = '\0';
     m_pReadBuf[ 1 ] = '\0';
 
-    m_hFile = nullptr;
+    m_hFile = NULL;
     m_pInXMLBuffer = strBuffer;
     m_uInXMLBufferCharsLeft = uBufferSize;
     m_dwCharsTotal = uBufferSize;
@@ -938,7 +939,7 @@ HRESULT XMLParser::ParseXMLBuffer( CONST CHAR *strBuffer, UINT uBufferSize )
     hr = MainParseLoop();
 
     // we no longer own strFilename, so un-set it
-    m_pISAXCallback->m_strFilename = nullptr;  
+    m_pISAXCallback->m_strFilename = NULL;
 
     return hr;
 }