Merge to XFA: Use stdint.h types throughout PDFium.

fpdfsdk/src/javascript/JS_GlobalData.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
  
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "../../include/javascript/JavaScript.h"
 #include "../../include/javascript/IJavaScript.h"
 #include "../../include/javascript/JS_GlobalData.h"
 
@@ skipping 87 matching lines @@
                 delete array.GetAt(i);
         array.RemoveAll();
 }
 
 /* -------------------------- CJS_GlobalData -------------------------- */
 
 #define READER_JS_GLOBALDATA_FILENAME                           L"Reader_JsGlobal.Data"
 #define PHANTOM_JS_GLOBALDATA_FILENAME                          L"Phantom_JsGlobal.Data"
 #define SDK_JS_GLOBALDATA_FILENAME                                      L"SDK_JsGlobal.Data"
 
-static const FX_BYTE JS_RC4KEY[] = {0x19,0xa8,0xe8,0x01,0xf6,0xa8,0xb6,0x4d,0x82,0x04,
+static const uint8_t JS_RC4KEY[] = {0x19,0xa8,0xe8,0x01,0xf6,0xa8,0xb6,0x4d,0x82,0x04,
                                                         0x45,0x6d,0xb4,0xcf,0xd7,0x77,0x67,0xf9,0x75,0x9f,
                                                         0xf0,0xe0,0x1e,0x51,0xee,0x46,0xfd,0x0b,0xc9,0x93,
                                                         0x25,0x55,0x4a,0xee,0xe0,0x16,0xd0,0xdf,0x8c,0xfa,
                                                         0x2a,0xa9,0x49,0xfd,0x97,0x1c,0x0e,0x22,0x13,0x28,
                                                         0x7c,0xaf,0xc4,0xfc,0x9c,0x12,0x65,0x8c,0x4e,0x5b,
                                                         0x04,0x75,0x89,0xc9,0xb1,0xed,0x50,0xca,0x96,0x6f,
                                                         0x1a,0x7a,0xfe,0x58,0x5d,0xec,0x19,0x4a,0xf6,0x35,
                                                         0x6a,0x97,0x14,0x00,0x0e,0xd0,0x6b,0xbb,0xd5,0x75,
                                                         0x55,0x8b,0x6e,0x6b,0x19,0xa0,0xf8,0x77,0xd5,0xa3
                                                         };
@@ skipping 212 matching lines @@
         if (nFind >= 0)
         {
                 delete m_arrayGlobalData.GetAt(nFind);
                 m_arrayGlobalData.RemoveAt(nFind);
                 return TRUE;
         }
 
         return FALSE;
 }
 
-FX_INT32 CJS_GlobalData::GetSize() const
+int32_t CJS_GlobalData::GetSize() const
 {
         return m_arrayGlobalData.GetSize();
 }
 
 CJS_GlobalData_Element* CJS_GlobalData::GetAt(int index) const
 {
         return m_arrayGlobalData.GetAt(index);
 }
 
 void CJS_GlobalData::LoadGlobalPersistentVariables()
 {
         FX_LPBYTE pBuffer = NULL;
-        FX_INT32 nLength = 0;
+        int32_t nLength = 0;
 
         LoadFileBuffer(m_sFilePath.c_str(), pBuffer, nLength);
         CRYPT_ArcFourCryptBlock(pBuffer, nLength, JS_RC4KEY, sizeof(JS_RC4KEY));
 
         if (pBuffer)
         {
                 FX_LPBYTE p = pBuffer;
                 FX_WORD wType = *((FX_WORD*)p);
                 p += sizeof(FX_WORD);
 
                 //FX_WORD wTemp = (FX_WORD)(('X' << 8) | 'F');
 
                 if (wType == (FX_WORD)(('X' << 8) | 'F'))
                 {
                         FX_WORD wVersion = *((FX_WORD*)p);
                         p += sizeof(FX_WORD);
 
                         ASSERT(wVersion <= 2);
 
                         FX_DWORD dwCount = *((FX_DWORD*)p);
                         p += sizeof(FX_DWORD);
 
                         FX_DWORD dwSize = *((FX_DWORD*)p);
                         p += sizeof(FX_DWORD);
 
                         if (dwSize == nLength - sizeof(FX_WORD) * 2 - sizeof(FX_DWORD)* 2)
                         {
-                                for (FX_INT32 i=0,sz=dwCount; i<sz; i++)
+                                for (int32_t i=0,sz=dwCount; i<sz; i++)
                                 {
                                         if (p > pBuffer + nLength)
                                                 break;
 
                                         FX_DWORD dwNameLen = *((FX_DWORD*)p);
                                         p += sizeof(FX_DWORD);
 
                                         if (p + dwNameLen > pBuffer + nLength)
                                                 break;
 
@@ skipping 111 matching lines @@
         sFile.AppendBlock(&nCount, sizeof(FX_DWORD));
         FX_DWORD dwSize = sData.GetSize();
         sFile.AppendBlock(&dwSize, sizeof(FX_DWORD));
 
         sFile.AppendBlock(sData.GetBuffer(), sData.GetSize());
 
         CRYPT_ArcFourCryptBlock(sFile.GetBuffer(), sFile.GetSize(), JS_RC4KEY, sizeof(JS_RC4KEY));
         WriteFileBuffer(m_sFilePath.c_str(), (FX_LPCSTR)sFile.GetBuffer(), sFile.GetSize());
 }
 
-void CJS_GlobalData::LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, FX_INT32& nLength)
+void CJS_GlobalData::LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, int32_t& nLength)
 {
 //UnSupport.
 }
 
-void CJS_GlobalData::WriteFileBuffer(FX_LPCWSTR sFilePath, FX_LPCSTR pBuffer, FX_INT32 nLength)
+void CJS_GlobalData::WriteFileBuffer(FX_LPCWSTR sFilePath, FX_LPCSTR pBuffer, int32_t nLength)
 {
 //UnSupport.
 }
 
 void CJS_GlobalData::MakeByteString(const CFX_ByteString& name, CJS_KeyValue* pData, CFX_BinaryBuf& sData)
 {
         ASSERT(pData != NULL);
 
         FX_WORD wType = (FX_WORD)pData->nType;
 
@@ skipping 41 matching lines @@
                         sData.AppendString(name);
 
                         sData.AppendBlock(&wType, sizeof(FX_DWORD));
                 }
                 break;
         default:
                 break;
         }
 }