Remove typdefs for pointer types in fx_system.h

core/src/fpdfapi/fpdf_edit/fpdf_edit_create.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/fpdfapi/fpdf_serial.h"
 #include "editint.h"
 #define PDF_OBJECTSTREAM_MAXLENGTH      (256 * 1024)
 #define PDF_XREFSTREAM_MAXSIZE          10000
-extern void FlateEncode(const uint8_t* src_buf, FX_DWORD src_data, FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
-extern void FlateEncode(FX_LPCBYTE src_buf, FX_DWORD src_size, int predictor, int Colors, int BitsPerComponent, int Columns,
-                        FX_LPBYTE& dest_buf, FX_DWORD& dest_size);
+extern void FlateEncode(const uint8_t* src_buf, FX_DWORD src_data, uint8_t*& dest_buf, FX_DWORD& dest_size);
+extern void FlateEncode(const uint8_t* src_buf, FX_DWORD src_size, int predictor, int Colors, int BitsPerComponent, int Columns,
+                        uint8_t*& dest_buf, FX_DWORD& dest_size);
 extern FX_BOOL IsSignatureDict(const CPDF_Dictionary* pDict);
 int32_t PDF_CreatorAppendObject(const CPDF_Object* pObj, CFX_FileBufferArchive *pFile, FX_FILESIZE& offset)
 {
     int32_t len = 0;
     if (pObj == NULL) {
         if (pFile->AppendString(FX_BSTRC(" null")) < 0) {
             return -1;
         }
         offset += 5;
         return 1;
@@ skipping 252 matching lines @@
     }
     if ((len = pFile->AppendDWord(dwObjNum)) < 0) {
         return -1;
     }
     if (pFile->AppendString(FX_BSTRC(" 0 R ")) < 0) {
         return -1;
     }
     offset += len + 6;
     return offset;
 }
-FX_BOOL PDF_GenerateFileID(FX_DWORD dwSeed1, FX_DWORD dwSeed2, FX_LPDWORD pBuffer)
+FX_BOOL PDF_GenerateFileID(FX_DWORD dwSeed1, FX_DWORD dwSeed2, FX_DWORD* pBuffer)
 {
     if (!pBuffer) {
         return FALSE;
     }
-    FX_LPVOID pContext = FX_Random_MT_Start(dwSeed1);
+    void* pContext = FX_Random_MT_Start(dwSeed1);
     int32_t i = 0;
     for (i = 0; i < 2; i++) {
         *pBuffer++ = FX_Random_MT_Generate(pContext);
     }
     FX_Random_MT_Close(pContext);
     pContext = FX_Random_MT_Start(dwSeed2);
     for (i = 0; i < 2; i++) {
         *pBuffer++ = FX_Random_MT_Generate(pContext);
     }
     FX_Random_MT_Close(pContext);
     return TRUE;
 }
 class CPDF_FlateEncoder
 {
 public:
     CPDF_FlateEncoder();
     ~CPDF_FlateEncoder();
     FX_BOOL             Initialize(CPDF_Stream* pStream, FX_BOOL bFlateEncode);
-    FX_BOOL             Initialize(FX_LPCBYTE pBuffer, FX_DWORD size, FX_BOOL bFlateEncode, FX_BOOL bXRefStream = FALSE);
+    FX_BOOL             Initialize(const uint8_t* pBuffer, FX_DWORD size, FX_BOOL bFlateEncode, FX_BOOL bXRefStream = FALSE);
     void                CloneDict();
-    FX_LPBYTE                   m_pData;
+    uint8_t*                    m_pData;
     FX_DWORD                    m_dwSize;
     CPDF_Dictionary*    m_pDict;
     FX_BOOL                             m_bCloned;
     FX_BOOL                             m_bNewData;
     CPDF_StreamAcc              m_Acc;
 };
 CPDF_FlateEncoder::CPDF_FlateEncoder()
 {
     m_pData = NULL;
     m_dwSize = 0;
     m_pDict = NULL;
     m_bCloned = FALSE;
     m_bNewData = FALSE;
 }
 void CPDF_FlateEncoder::CloneDict()
 {
     if (!m_bCloned) {
         m_pDict = (CPDF_Dictionary*)m_pDict->Clone();
         m_bCloned = TRUE;
     }
 }
 FX_BOOL CPDF_FlateEncoder::Initialize(CPDF_Stream* pStream, FX_BOOL bFlateEncode)
 {
     m_Acc.LoadAllData(pStream, TRUE);
     if ((pStream && pStream->GetDict() && pStream->GetDict()->KeyExist("Filter")) || !bFlateEncode) {
         if (pStream->GetDict()->KeyExist("Filter") && !bFlateEncode) {
             CPDF_StreamAcc destAcc;
             destAcc.LoadAllData(pStream);
             m_dwSize = destAcc.GetSize();
-            m_pData = (FX_LPBYTE)destAcc.DetachData();
+            m_pData = (uint8_t*)destAcc.DetachData();
             m_pDict = (CPDF_Dictionary*)pStream->GetDict()->Clone();
             m_pDict->RemoveAt(FX_BSTRC("Filter"));
             m_bNewData = TRUE;
             m_bCloned = TRUE;
         } else {
-            m_pData = (FX_LPBYTE)m_Acc.GetData();
+            m_pData = (uint8_t*)m_Acc.GetData();
             m_dwSize = m_Acc.GetSize();
             m_pDict = pStream->GetDict();
         }
         return TRUE;
     }
     m_pData = NULL;
     m_dwSize = 0;
     m_bNewData = TRUE;
     m_bCloned = TRUE;
     ::FlateEncode(m_Acc.GetData(), m_Acc.GetSize(), m_pData, m_dwSize);
     m_pDict = (CPDF_Dictionary*)pStream->GetDict()->Clone();
     m_pDict->SetAtInteger("Length", m_dwSize);
     m_pDict->SetAtName("Filter", "FlateDecode");
     m_pDict->RemoveAt("DecodeParms");
     return TRUE;
 }
-FX_BOOL CPDF_FlateEncoder::Initialize(FX_LPCBYTE pBuffer, FX_DWORD size, FX_BOOL bFlateEncode, FX_BOOL bXRefStream)
+FX_BOOL CPDF_FlateEncoder::Initialize(const uint8_t* pBuffer, FX_DWORD size, FX_BOOL bFlateEncode, FX_BOOL bXRefStream)
 {
     if (!bFlateEncode) {
-        m_pData = (FX_LPBYTE)pBuffer;
+        m_pData = (uint8_t*)pBuffer;
         m_dwSize = size;
         return TRUE;
     }
     m_bNewData = TRUE;
     if (bXRefStream) {
         ::FlateEncode(pBuffer, size, 12, 1, 8, 7, m_pData, m_dwSize);
     } else {
         ::FlateEncode(pBuffer, size, m_pData, m_dwSize);
     }
     return TRUE;
 }
 CPDF_FlateEncoder::~CPDF_FlateEncoder()
 {
     if (m_bCloned && m_pDict) {
         m_pDict->Release();
     }
     if (m_bNewData && m_pData) {
         FX_Free(m_pData);
     }
 }
 class CPDF_Encryptor
 {
 public:
     CPDF_Encryptor();
     ~CPDF_Encryptor();
-    FX_BOOL             Initialize(CPDF_CryptoHandler* pHandler, int objnum, FX_LPBYTE src_data, FX_DWORD src_size);
-    FX_LPBYTE                   m_pData;
+    FX_BOOL             Initialize(CPDF_CryptoHandler* pHandler, int objnum, uint8_t* src_data, FX_DWORD src_size);
+    uint8_t*                    m_pData;
     FX_DWORD                    m_dwSize;
     FX_BOOL                             m_bNewBuf;
 };
 CPDF_Encryptor::CPDF_Encryptor()
 {
     m_pData = NULL;
     m_dwSize = 0;
     m_bNewBuf = FALSE;
 }
-FX_BOOL CPDF_Encryptor::Initialize(CPDF_CryptoHandler* pHandler, int objnum, FX_LPBYTE src_data, FX_DWORD src_size)
+FX_BOOL CPDF_Encryptor::Initialize(CPDF_CryptoHandler* pHandler, int objnum, uint8_t* src_data, FX_DWORD src_size)
 {
     if (src_size == 0) {
         return TRUE;
     }
     if (pHandler == NULL) {
-        m_pData = (FX_LPBYTE)src_data;
+        m_pData = (uint8_t*)src_data;
         m_dwSize = src_size;
         m_bNewBuf = FALSE;
         return TRUE;
     }
     m_dwSize = pHandler->EncryptGetSize(objnum, 0, src_data, src_size);
     m_pData = FX_Alloc(uint8_t, m_dwSize);
     pHandler->EncryptContent(objnum, 0, src_data, src_size, m_pData, m_dwSize);
     m_bNewBuf = TRUE;
     return TRUE;
 }
@@ skipping 17 matching lines @@
     m_index = 0;
     return TRUE;
 }
 int32_t CPDF_ObjectStream::CompressIndirectObject(FX_DWORD dwObjNum, const CPDF_Object *pObj)
 {
     m_ObjNumArray.Add(dwObjNum);
     m_OffsetArray.Add(m_Buffer.GetLength());
     m_Buffer << pObj;
     return 1;
 }
-int32_t CPDF_ObjectStream::CompressIndirectObject(FX_DWORD dwObjNum, FX_LPCBYTE pBuffer, FX_DWORD dwSize)
+int32_t CPDF_ObjectStream::CompressIndirectObject(FX_DWORD dwObjNum, const uint8_t* pBuffer, FX_DWORD dwSize)
 {
     m_ObjNumArray.Add(dwObjNum);
     m_OffsetArray.Add(m_Buffer.GetLength());
     m_Buffer.AppendBlock(pBuffer, dwSize);
     return 1;
 }
 FX_FILESIZE CPDF_ObjectStream::End(CPDF_Creator* pCreator)
 {
     FXSYS_assert(pCreator);
     if (m_ObjNumArray.GetSize() == 0) {
@@ skipping 97 matching lines @@
     if (!pCreator) {
         return 0;
     }
     m_ObjStream.CompressIndirectObject(dwObjNum, pObj);
     if (m_ObjStream.m_ObjNumArray.GetSize() < pCreator->m_ObjectStreamSize &&
             m_ObjStream.m_Buffer.GetLength() < PDF_OBJECTSTREAM_MAXLENGTH) {
         return 1;
     }
     return EndObjectStream(pCreator);
 }
-int32_t CPDF_XRefStream::CompressIndirectObject(FX_DWORD dwObjNum, FX_LPCBYTE pBuffer, FX_DWORD dwSize, CPDF_Creator *pCreator)
+int32_t CPDF_XRefStream::CompressIndirectObject(FX_DWORD dwObjNum, const uint8_t* pBuffer, FX_DWORD dwSize, CPDF_Creator *pCreator)
 {
     if (!pCreator) {
         return 0;
     }
     m_ObjStream.CompressIndirectObject(dwObjNum, pBuffer, dwSize);
     if (m_ObjStream.m_ObjNumArray.GetSize() < pCreator->m_ObjectStreamSize &&
             m_ObjStream.m_Buffer.GetLength() < PDF_OBJECTSTREAM_MAXLENGTH) {
         return 1;
     }
     return EndObjectStream(pCreator);
@@ skipping 373 matching lines @@
         return 0;
     }
     if (!m_pXRefStream->End(this)) {
         return -1;
     }
     if (!m_pXRefStream->Start()) {
         return -1;
     }
     return 0;
 }
-int32_t CPDF_Creator::WriteIndirectObjectToStream(FX_DWORD objnum, FX_LPCBYTE pBuffer, FX_DWORD dwSize)
+int32_t CPDF_Creator::WriteIndirectObjectToStream(FX_DWORD objnum, const uint8_t* pBuffer, FX_DWORD dwSize)
 {
     if (!m_pXRefStream) {
         return 1;
     }
     m_pXRefStream->AddObjectNumberToIndexArray(objnum);
     int32_t iRet = m_pXRefStream->CompressIndirectObject(objnum, pBuffer, dwSize, this);
     if (iRet < 1) {
         return iRet;
     }
     if (!_IsXRefNeedEnd(m_pXRefStream, m_dwFlags)) {
@@ skipping 125 matching lines @@
                 FX_BOOL bHex = ((CPDF_String*)pObj)->IsHex();
                 if (m_pCryptoHandler == NULL || !bEncrypt) {
                     CFX_ByteString content = PDF_EncodeString(str, bHex);
                     if ((len = m_File.AppendString(content)) < 0) {
                         return -1;
                     }
                     m_Offset += len;
                     break;
                 }
                 CPDF_Encryptor encryptor;
-                encryptor.Initialize(m_pCryptoHandler, objnum, (FX_LPBYTE)str.c_str(), str.GetLength());
-                CFX_ByteString content = PDF_EncodeString(CFX_ByteString((FX_LPCSTR)encryptor.m_pData, encryptor.m_dwSize), bHex);
+                encryptor.Initialize(m_pCryptoHandler, objnum, (uint8_t*)str.c_str(), str.GetLength());
+                CFX_ByteString content = PDF_EncodeString(CFX_ByteString((const FX_CHAR*)encryptor.m_pData, encryptor.m_dwSize), bHex);
                 if ((len = m_File.AppendString(content)) < 0) {
                     return -1;
                 }
                 m_Offset += len;
                 break;
             }
         case PDFOBJ_STREAM: {
                 CPDF_FlateEncoder encoder;
                 encoder.Initialize((CPDF_Stream*)pObj, m_bCompress);
                 CPDF_Encryptor encryptor;
@@ skipping 126 matching lines @@
             }
     }
     return 1;
 }
 int32_t CPDF_Creator::WriteOldIndirectObject(FX_DWORD objnum)
 {
     if(m_pParser->m_V5Type[objnum] == 0 || m_pParser->m_V5Type[objnum] == 255) {
         return 0;
     }
     m_ObjectOffset[objnum] = m_Offset;
-    FX_LPVOID valuetemp = NULL;
-    FX_BOOL bExistInMap = m_pDocument->m_IndirectObjs.Lookup((FX_LPVOID)(uintptr_t)objnum, valuetemp);
+    void* valuetemp = NULL;
+    FX_BOOL bExistInMap = m_pDocument->m_IndirectObjs.Lookup((void*)(uintptr_t)objnum, valuetemp);
     FX_BOOL bObjStm = (m_pParser->m_V5Type[objnum] == 2) && m_pEncryptDict && !m_pXRefStream;
     if(m_pParser->m_bVersionUpdated || m_bSecurityChanged || bExistInMap || bObjStm) {
         CPDF_Object* pObj = m_pDocument->GetIndirectObject(objnum);
         if (pObj == NULL) {
             m_ObjectOffset[objnum] = 0;
             m_ObjectSize[objnum] = 0;
             return 0;
         }
         if (WriteIndirectObj(pObj)) {
             return -1;
@@ skipping 52 matching lines @@
     for(; objnum < nOldSize; objnum ++) {
         int32_t iRet = WriteOldIndirectObject(objnum);
         if (!iRet) {
             continue;
         }
         if (iRet < 0) {
             return iRet;
         }
         m_ObjectSize[objnum] = (FX_DWORD)(m_Offset - m_ObjectOffset[objnum]);
         if (pPause && pPause->NeedToPauseNow()) {
-            m_Pos = (FX_LPVOID)(uintptr_t)(objnum + 1);
+            m_Pos = (void*)(uintptr_t)(objnum + 1);
             return 1;
         }
     }
     return 0;
 }
 int32_t CPDF_Creator::WriteNewObjs(FX_BOOL bIncremental, IFX_Pause *pPause)
 {
     int32_t iCount = m_NewObjNumArray.GetSize();
     int32_t index = (int32_t)(uintptr_t)m_Pos;
     while (index < iCount) {
         FX_DWORD objnum = m_NewObjNumArray.ElementAt(index);
         CPDF_Object *pObj = NULL;
-        m_pDocument->m_IndirectObjs.Lookup((FX_LPVOID)(uintptr_t)objnum, (FX_LPVOID&)pObj);
+        m_pDocument->m_IndirectObjs.Lookup((void*)(uintptr_t)objnum, (void*&)pObj);
         if (NULL == pObj) {
             ++index;
             continue;
         }
         m_ObjectOffset[objnum] = m_Offset;
         if (WriteIndirectObj(pObj)) {
             return -1;
         }
         m_ObjectSize[objnum] = (FX_DWORD)(m_Offset - m_ObjectOffset[objnum]);
         index++;
@@ skipping 30 matching lines @@
 }
 void CPDF_Creator::InitNewObjNumOffsets()
 {
     FX_BOOL bIncremental = (m_dwFlags & FPDFCREATE_INCREMENTAL) != 0;
     FX_BOOL bNoOriginal = (m_dwFlags & FPDFCREATE_NO_ORIGINAL) != 0;
     FX_DWORD nOldSize = m_pParser ? m_pParser->m_CrossRef.GetSize() : 0;
     FX_POSITION pos = m_pDocument->m_IndirectObjs.GetStartPosition();
     while (pos) {
         size_t key = 0;
         CPDF_Object* pObj;
-        m_pDocument->m_IndirectObjs.GetNextAssoc(pos, (FX_LPVOID&)key, (FX_LPVOID&)pObj);
+        m_pDocument->m_IndirectObjs.GetNextAssoc(pos, (void*&)key, (void*&)pObj);
         FX_DWORD objnum = (FX_DWORD)key;
         if (pObj->GetObjNum() == -1) {
             continue;
         }
         if (bIncremental) {
             if (!pObj->IsModified()) {
                 continue;
             }
         } else {
             if (objnum < nOldSize && m_pParser->m_V5Type[objnum] != 0) {
@@ skipping 106 matching lines @@
             m_Offset += len;
             if ((len = m_File.AppendString(FX_BSTRC("\r\n%\xA1\xB3\xC5\xD7\r\n"))) < 0) {
                 return -1;
             }
             m_Offset += len;
             InitOldObjNumOffsets();
             m_iStage = 20;
         } else {
             IFX_FileRead* pSrcFile = m_pParser->GetFileAccess();
             m_Offset = pSrcFile->GetSize();
-            m_Pos = (FX_LPVOID)(uintptr_t)m_Offset;
+            m_Pos = (void*)(uintptr_t)m_Offset;
             m_iStage = 15;
         }
     }
     if (m_iStage == 15) {
         if ((m_dwFlags & FPDFCREATE_NO_ORIGINAL) == 0 && m_Pos) {
             IFX_FileRead* pSrcFile = m_pParser->GetFileAccess();
             uint8_t buffer[4096];
             FX_DWORD src_size = (FX_DWORD)(uintptr_t)m_Pos;
             while (src_size) {
                 FX_DWORD block_size = src_size > 4096 ? 4096 : src_size;
                 if (!pSrcFile->ReadBlock(buffer, m_Offset - src_size, block_size)) {
                     return -1;
                 }
                 if (m_File.AppendBlock(buffer, block_size) < 0) {
                     return -1;
                 }
                 src_size -= block_size;
                 if (pPause && pPause->NeedToPauseNow()) {
-                    m_Pos = (FX_LPVOID)(uintptr_t)src_size;
+                    m_Pos = (void*)(uintptr_t)src_size;
                     return 1;
                 }
             }
         }
         if ((m_dwFlags & FPDFCREATE_NO_ORIGINAL) == 0 && m_pParser->GetLastXRefOffset() == 0) {
             InitOldObjNumOffsets();
             FX_DWORD dwEnd = m_pParser->GetLastObjNum();
             FX_BOOL bObjStm = (m_dwFlags & FPDFCREATE_OBJECTSTREAM) != 0;
             for (FX_DWORD objnum = 0; objnum <= dwEnd; objnum++) {
                 if (m_pParser->m_V5Type[objnum] == 0 || m_pParser->m_V5Type[objnum] == 255) {
@@ skipping 12 matching lines @@
         m_iStage = 20;
     }
     InitNewObjNumOffsets();
     return m_iStage;
 }
 int32_t CPDF_Creator::WriteDoc_Stage2(IFX_Pause *pPause)
 {
     FXSYS_assert(m_iStage >= 20 || m_iStage < 30);
     if (m_iStage == 20) {
         if ((m_dwFlags & FPDFCREATE_INCREMENTAL) == 0 && m_pParser) {
-            m_Pos = (FX_LPVOID)(uintptr_t)0;
+            m_Pos = (void*)(uintptr_t)0;
             m_iStage = 21;
         } else {
             m_iStage = 25;
         }
     }
     if (m_iStage == 21) {
         int32_t iRet = WriteOldObjs(pPause);
         if (iRet) {
             return iRet;
         }
         m_iStage = 25;
     }
     if (m_iStage == 25) {
-        m_Pos = (FX_LPVOID)(uintptr_t)0;
+        m_Pos = (void*)(uintptr_t)0;
         m_iStage = 26;
     }
     if (m_iStage == 26) {
         int32_t iRet = WriteNewObjs((m_dwFlags & FPDFCREATE_INCREMENTAL) != 0, pPause);
         if (iRet) {
             return iRet;
         }
         m_iStage = 27;
     }
     if (m_iStage == 27) {
@@ skipping 26 matching lines @@
             m_pXRefStream->End(this, TRUE);
             m_XrefStart = m_pXRefStream->m_PrevOffset;
             m_iStage = 90;
         } else if ((m_dwFlags & FPDFCREATE_INCREMENTAL) == 0 || !m_pParser->IsXRefStream()) {
             if ((m_dwFlags & FPDFCREATE_INCREMENTAL) == 0 || m_pParser->GetLastXRefOffset() == 0) {
                 CFX_ByteString str;
                 str = m_ObjectOffset.GetPtrAt(1) ? FX_BSTRC("xref\r\n") : FX_BSTRC("xref\r\n0 1\r\n0000000000 65536 f\r\n");
                 if (m_File.AppendString(str) < 0) {
                     return -1;
                 }
-                m_Pos = (FX_LPVOID)(uintptr_t)1;
+                m_Pos = (void*)(uintptr_t)1;
                 m_iStage = 81;
             } else {
                 if (m_File.AppendString(FX_BSTRC("xref\r\n")) < 0) {
                     return -1;
                 }
-                m_Pos = (FX_LPVOID)(uintptr_t)0;
+                m_Pos = (void*)(uintptr_t)0;
                 m_iStage = 82;
             }
         } else {
             m_iStage = 90;
         }
     }
     if (m_iStage == 81) {
         CFX_ByteString str;
         FX_DWORD i = (FX_DWORD)(uintptr_t)m_Pos, j;
         while (i <= dwLastObjNum) {
@@ skipping 18 matching lines @@
             while (i < j) {
                 str.Format("%010d 00000 n\r\n", m_ObjectOffset[i ++]);
                 if (m_File.AppendBlock(str.c_str(), str.GetLength()) < 0) {
                     return -1;
                 }
             }
             if (i > dwLastObjNum) {
                 break;
             }
             if (pPause && pPause->NeedToPauseNow()) {
-                m_Pos = (FX_LPVOID)(uintptr_t)i;
+                m_Pos = (void*)(uintptr_t)i;
                 return 1;
             }
         }
         m_iStage = 90;
     }
     if (m_iStage == 82) {
         CFX_ByteString str;
         int32_t iCount = m_NewObjNumArray.GetSize();
         int32_t i = (int32_t)(uintptr_t)m_Pos;
         while (i < iCount) {
@@ skipping 19 matching lines @@
                 return -1;
             }
             while (i < j) {
                 objnum = m_NewObjNumArray.ElementAt(i++);
                 str.Format("%010d 00000 n\r\n", m_ObjectOffset[objnum]);
                 if (m_File.AppendBlock(str.c_str(), str.GetLength()) < 0) {
                     return -1;
                 }
             }
             if (pPause && (i % 100) == 0 && pPause->NeedToPauseNow()) {
-                m_Pos = (FX_LPVOID)(uintptr_t)i;
+                m_Pos = (void*)(uintptr_t)i;
                 return 1;
             }
         }
         m_iStage = 90;
     }
     return m_iStage;
 }
 static int32_t _OutPutIndex(CFX_FileBufferArchive* pFile, FX_FILESIZE offset)
 {
     FXSYS_assert(pFile);
@@ skipping 240 matching lines @@
         delete m_pXRefStream;
         m_pXRefStream = NULL;
     }
     m_File.Clear();
     m_NewObjNumArray.RemoveAll();
     if (m_pIDArray) {
         m_pIDArray->Release();
         m_pIDArray = NULL;
     }
 }
-FX_BOOL CPDF_Creator::Create(FX_LPCSTR filename, FX_DWORD flags)
+FX_BOOL CPDF_Creator::Create(const FX_CHAR* filename, FX_DWORD flags)
 {
     if (!m_File.AttachFile(filename)) {
         return FALSE;
     }
     FX_BOOL bRet = Create(flags);
     if (!bRet || !(flags & FPDFCREATE_PROGRESSIVE)) {
         Clear();
     }
     return bRet;
 }
-FX_BOOL CPDF_Creator::Create(FX_LPCWSTR filename, FX_DWORD flags)
+FX_BOOL CPDF_Creator::Create(const FX_WCHAR* filename, FX_DWORD flags)
 {
     if (!m_File.AttachFile(filename)) {
         return FALSE;
     }
     FX_BOOL bRet = Create(flags);
     if (!bRet || !(flags & FPDFCREATE_PROGRESSIVE)) {
         Clear();
     }
     return bRet;
 }
@@ skipping 20 matching lines @@
     if (flags & FPDFCREATE_PROGRESSIVE) {
         return TRUE;
     }
     return Continue(NULL) > -1;
 }
 void CPDF_Creator::InitID(FX_BOOL bDefault )
 {
     CPDF_Array* pOldIDArray = m_pParser ? m_pParser->GetIDArray() : NULL;
     FX_BOOL bNewId = !m_pIDArray;
     if (!m_pIDArray) {
-        FX_LPDWORD pBuffer = NULL;
+        FX_DWORD* pBuffer = NULL;
         m_pIDArray = CPDF_Array::Create();
         CPDF_Object* pID1 = pOldIDArray ? pOldIDArray->GetElement(0) : NULL;
         if (pID1) {
             m_pIDArray->Add(pID1->Clone());
         } else {
             pBuffer = FX_Alloc(FX_DWORD, 4);
             PDF_GenerateFileID((FX_DWORD)(uintptr_t)this, m_dwLastObjNum, pBuffer);
-            CFX_ByteStringC bsBuffer((FX_LPCBYTE)pBuffer, 4 * sizeof(FX_DWORD));
+            CFX_ByteStringC bsBuffer((const uint8_t*)pBuffer, 4 * sizeof(FX_DWORD));
             m_pIDArray->Add(CPDF_String::Create(bsBuffer, TRUE), m_pDocument);
         }
         if (pBuffer) {
             FX_Free(pBuffer);
         }
     }
     if (!bDefault) {
         return;
     }
     if (pOldIDArray) {
         CPDF_Object* pID2 = pOldIDArray->GetElement(1);
         if ((m_dwFlags & FPDFCREATE_INCREMENTAL) && m_pEncryptDict && pID2) {
             m_pIDArray->Add(pID2->Clone());
             return;
         }
-        FX_LPDWORD pBuffer = FX_Alloc(FX_DWORD, 4);
+        FX_DWORD* pBuffer = FX_Alloc(FX_DWORD, 4);
         PDF_GenerateFileID((FX_DWORD)(uintptr_t)this, m_dwLastObjNum, pBuffer);
-        CFX_ByteStringC bsBuffer((FX_LPCBYTE)pBuffer, 4 * sizeof(FX_DWORD));
+        CFX_ByteStringC bsBuffer((const uint8_t*)pBuffer, 4 * sizeof(FX_DWORD));
         m_pIDArray->Add(CPDF_String::Create(bsBuffer, TRUE), m_pDocument);
         FX_Free(pBuffer);
         return;
     }
     m_pIDArray->Add(m_pIDArray->GetElement(0)->Clone());
     if (m_pEncryptDict && !pOldIDArray && m_pParser && bNewId) {
         if (m_pEncryptDict->GetString(FX_BSTRC("Filter")) == FX_BSTRC("Standard")) {
             CPDF_StandardSecurityHandler handler;
             CFX_ByteString user_pass = m_pParser->GetPassword();
             FX_DWORD flag = PDF_ENCRYPT_CONTENT;
-            handler.OnCreate(m_pEncryptDict, m_pIDArray, (FX_LPCBYTE)user_pass, user_pass.GetLength(), flag);
+            handler.OnCreate(m_pEncryptDict, m_pIDArray, (const uint8_t*)user_pass, user_pass.GetLength(), flag);
             if (m_pCryptoHandler && m_bNewCrypto) {
                 delete m_pCryptoHandler;
             }
             m_pCryptoHandler = new CPDF_StandardCryptoHandler;
             m_pCryptoHandler->Init(m_pEncryptDict, &handler);
             m_bNewCrypto = TRUE;
             m_bSecurityChanged = TRUE;
         }
     }
 }
@@ skipping 48 matching lines @@
     m_bNewCrypto = FALSE;
     if (!m_bStandardSecurity) {
         return;
     }
     if (m_pEncryptDict) {
         m_pEncryptDict->Release();
         m_pEncryptDict = NULL;
     }
     m_bStandardSecurity = FALSE;
 }