Remove typdefs for pointer types in fx_system.h

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 120 matching lines @@
 CJS_GlobalData::~CJS_GlobalData()
 {
         SaveGlobalPersisitentVariables();
 
         for (int i=0,sz=m_arrayGlobalData.GetSize(); i<sz; i++)
                 delete m_arrayGlobalData.GetAt(i);
 
         m_arrayGlobalData.RemoveAll();
 }
 
-int     CJS_GlobalData::FindGlobalVariable(FX_LPCSTR propname)
+int     CJS_GlobalData::FindGlobalVariable(const FX_CHAR* propname)
 {
         ASSERT(propname != NULL);
 
         int nRet = -1;
 
         for (int i=0,sz=m_arrayGlobalData.GetSize(); i<sz; i++)
         {
                 CJS_GlobalData_Element* pTemp = m_arrayGlobalData.GetAt(i);
                 if (pTemp->data.sKey[0] == *propname && pTemp->data.sKey == propname)
                 {
                         nRet = i;
                         break;
                 }
         }
 
         return nRet;
 }
 
-CJS_GlobalData_Element* CJS_GlobalData::GetGlobalVariable(FX_LPCSTR propname)
+CJS_GlobalData_Element* CJS_GlobalData::GetGlobalVariable(const FX_CHAR* propname)
 {
         ASSERT(propname != NULL);
 
         int     nFind = FindGlobalVariable(propname);
 
         if (nFind >= 0)
                 return m_arrayGlobalData.GetAt(nFind);
         else
                 return NULL;
 }
 
-void CJS_GlobalData::SetGlobalVariableNumber(FX_LPCSTR propname, double dData)
+void CJS_GlobalData::SetGlobalVariableNumber(const FX_CHAR* propname, double dData)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return;
 
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->data.nType = JS_GLOBALDATA_TYPE_NUMBER;
                 pData->data.dData = dData;
         }
         else
         {
                 CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
                 pNewData->data.sKey = sPropName;
                 pNewData->data.nType = JS_GLOBALDATA_TYPE_NUMBER;
                 pNewData->data.dData = dData;
 
                 m_arrayGlobalData.Add(pNewData);
         }
 }
 
-void CJS_GlobalData::SetGlobalVariableBoolean(FX_LPCSTR propname, bool bData)
+void CJS_GlobalData::SetGlobalVariableBoolean(const FX_CHAR* propname, bool bData)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return;
 
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN;
                 pData->data.bData = bData;
         }
         else
         {
                 CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
                 pNewData->data.sKey = sPropName;
                 pNewData->data.nType = JS_GLOBALDATA_TYPE_BOOLEAN;
                 pNewData->data.bData = bData;
 
                 m_arrayGlobalData.Add(pNewData);
         }
 }
 
-void CJS_GlobalData::SetGlobalVariableString(FX_LPCSTR propname, const CFX_ByteString& sData)
+void CJS_GlobalData::SetGlobalVariableString(const FX_CHAR* propname, const CFX_ByteString& sData)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return;
 
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->data.nType = JS_GLOBALDATA_TYPE_STRING;
                 pData->data.sData = sData;
         }
         else
         {
                 CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
                 pNewData->data.sKey = sPropName;
                 pNewData->data.nType = JS_GLOBALDATA_TYPE_STRING;
                 pNewData->data.sData = sData;
 
                 m_arrayGlobalData.Add(pNewData);
         }
 }
 
-void CJS_GlobalData::SetGlobalVariableObject(FX_LPCSTR propname, const CJS_GlobalVariableArray& array)
+void CJS_GlobalData::SetGlobalVariableObject(const FX_CHAR* propname, const CJS_GlobalVariableArray& array)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return;
 
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->data.nType = JS_GLOBALDATA_TYPE_OBJECT;
                 pData->data.objData.Copy(array);
         }
         else
         {
                 CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
                 pNewData->data.sKey = sPropName;
                 pNewData->data.nType = JS_GLOBALDATA_TYPE_OBJECT;
                 pNewData->data.objData.Copy(array);
                 
                 m_arrayGlobalData.Add(pNewData);
         }
 }
 
-void CJS_GlobalData::SetGlobalVariableNull(FX_LPCSTR propname)
+void CJS_GlobalData::SetGlobalVariableNull(const FX_CHAR* propname)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
         
         sPropName.TrimLeft();
         sPropName.TrimRight();
         
         if (sPropName.GetLength() == 0) return;
         
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->data.nType = JS_GLOBALDATA_TYPE_NULL;
         }
         else
         {
                 CJS_GlobalData_Element* pNewData = new CJS_GlobalData_Element;
                 pNewData->data.sKey = sPropName;
                 pNewData->data.nType = JS_GLOBALDATA_TYPE_NULL;
                 
                 m_arrayGlobalData.Add(pNewData);
         }
 }
 
-FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(FX_LPCSTR propname, FX_BOOL bPersistent)
+FX_BOOL CJS_GlobalData::SetGlobalVariablePersistent(const FX_CHAR* propname, FX_BOOL bPersistent)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return FALSE;
 
         if (CJS_GlobalData_Element* pData = GetGlobalVariable(sPropName))
         {
                 pData->bPersistent = bPersistent;
                 return TRUE;
         }
 
         return FALSE;
 }
 
-FX_BOOL CJS_GlobalData::DeleteGlobalVariable(FX_LPCSTR propname)
+FX_BOOL CJS_GlobalData::DeleteGlobalVariable(const FX_CHAR* propname)
 {
         ASSERT(propname != NULL);
         CFX_ByteString sPropName = propname;
 
         sPropName.TrimLeft();
         sPropName.TrimRight();
 
         if (sPropName.GetLength() == 0) return FALSE;
 
         int     nFind = FindGlobalVariable(sPropName);
@@ skipping 13 matching lines @@
         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;
+        uint8_t* pBuffer = NULL;
         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;
+                uint8_t* 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);
 
@@ skipping 129 matching lines @@
         sFile.AppendBlock(&wType, sizeof(FX_WORD));
         FX_WORD wVersion = 2;
         sFile.AppendBlock(&wVersion, sizeof(FX_WORD));
         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());
+        WriteFileBuffer(m_sFilePath.c_str(), (const FX_CHAR*)sFile.GetBuffer(), sFile.GetSize());
 }
 
-void CJS_GlobalData::LoadFileBuffer(FX_LPCWSTR sFilePath, FX_LPBYTE& pBuffer, int32_t& nLength)
+void CJS_GlobalData::LoadFileBuffer(const FX_WCHAR* sFilePath, uint8_t*& pBuffer, int32_t& nLength)
 {
 //UnSupport.
 }
 
-void CJS_GlobalData::WriteFileBuffer(FX_LPCWSTR sFilePath, FX_LPCSTR pBuffer, int32_t nLength)
+void CJS_GlobalData::WriteFileBuffer(const FX_WCHAR* sFilePath, const FX_CHAR* 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;
         }
 }