Remove typdefs for pointer types in fx_system.h

core/src/fpdfdoc/doc_form.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/fpdfdoc/fpdf_doc.h"
 #include "../../include/fxcrt/fx_xml.h"
 #include "doc_utils.h"
 
 const int nMaxRecursion = 32;
 
 class _CFieldNameExtractor 
 {
 public:
     _CFieldNameExtractor(const CFX_WideString& full_name)
     {
         m_pStart = full_name.c_str();
         m_pEnd = m_pStart + full_name.GetLength();
         m_pCur = m_pStart;
     }
-    void GetNext(FX_LPCWSTR &pSubName, FX_STRSIZE& size)
+    void GetNext(const FX_WCHAR* &pSubName, FX_STRSIZE& size)
     {
         pSubName = m_pCur;
         while (m_pCur < m_pEnd && m_pCur[0] != L'.') {
             m_pCur++;
         }
         size = (FX_STRSIZE)(m_pCur - pSubName);
         if (m_pCur < m_pEnd && m_pCur[0] == L'.') {
             m_pCur++;
         }
     }
 protected:
-    FX_LPCWSTR m_pStart;
-    FX_LPCWSTR m_pEnd;
-    FX_LPCWSTR m_pCur;
+    const FX_WCHAR* m_pStart;
+    const FX_WCHAR* m_pEnd;
+    const FX_WCHAR* m_pCur;
 };
 class CFieldTree 
 {
 public:
     struct _Node  {
         _Node *parent;
         CFX_PtrArray children;
         CFX_WideString short_name;
         CPDF_FormField *field_ptr;
         int CountFields(int nLevel = 0)
@@ skipping 105 matching lines @@
         _Node *pNode = (_Node *)ptr_array[i];
         RemoveNode(pNode);
     }
 }
 void CFieldTree::SetField(const CFX_WideString &full_name, CPDF_FormField *field_ptr)
 {
     if (full_name == L"") {
         return;
     }
     _CFieldNameExtractor name_extractor(full_name);
-    FX_LPCWSTR pName;
+    const FX_WCHAR* pName;
     FX_STRSIZE nLength;
     name_extractor.GetNext(pName, nLength);
     _Node *pNode = &m_Root, *pLast = NULL;
     while (nLength > 0) {
         pLast = pNode;
         CFX_WideString name = CFX_WideString(pName, nLength);
         pNode = _Lookup(pLast, name);
         if (pNode == NULL) {
             pNode = AddChild(pLast, name, NULL);
         }
         name_extractor.GetNext(pName, nLength);
     }
     if (pNode != &m_Root) {
         pNode->field_ptr = field_ptr;
     }
 }
 CPDF_FormField *CFieldTree::GetField(const CFX_WideString &full_name)
 {
     if (full_name == L"") {
         return NULL;
     }
     _CFieldNameExtractor name_extractor(full_name);
-    FX_LPCWSTR pName;
+    const FX_WCHAR* pName;
     FX_STRSIZE nLength;
     name_extractor.GetNext(pName, nLength);
     _Node *pNode = &m_Root, *pLast = NULL;
     while (nLength > 0 && pNode) {
         pLast = pNode;
         CFX_WideString name = CFX_WideString(pName, nLength);
         pNode = _Lookup(pLast, name);
         name_extractor.GetNext(pName, nLength);
     }
     return pNode ? pNode->field_ptr : NULL;
 }
 CPDF_FormField *CFieldTree::RemoveField(const CFX_WideString & full_name)
 {
     if (full_name == L"") {
         return NULL;
     }
     _CFieldNameExtractor name_extractor(full_name);
-    FX_LPCWSTR pName;
+    const FX_WCHAR* pName;
     FX_STRSIZE nLength;
     name_extractor.GetNext(pName, nLength);
     _Node *pNode = &m_Root, *pLast = NULL;
     while (nLength > 0 && pNode) {
         pLast = pNode;
         CFX_WideString name = CFX_WideString(pName, nLength);
         pNode = _Lookup(pLast, name);
         name_extractor.GetNext(pName, nLength);
     }
     if (pNode && pNode != &m_Root) {
         CFX_PtrArray& ptr_array = pLast->children;
         for (int i = 0; i < ptr_array.GetSize(); i ++) {
             if (pNode == (_Node *)ptr_array[i]) {
                 ptr_array.RemoveAt(i);
                 break;
             }
         }
         CPDF_FormField *pField = pNode->field_ptr;
         RemoveNode(pNode);
         return pField;
     }
     return NULL;
 }
 CFieldTree::_Node *CFieldTree::FindNode(const CFX_WideString& full_name)
 {
     if (full_name == L"") {
         return NULL;
     }
     _CFieldNameExtractor name_extractor(full_name);
-    FX_LPCWSTR pName;
+    const FX_WCHAR* pName;
     FX_STRSIZE nLength;
     name_extractor.GetNext(pName, nLength);
     _Node *pNode = &m_Root, *pLast = NULL;
     while (nLength > 0 && pNode) {
         pLast = pNode;
         CFX_WideString name = CFX_WideString(pName, nLength);
         pNode = _Lookup(pLast, name);
         name_extractor.GetNext(pName, nLength);
     }
     return pNode;
@@ skipping 16 matching lines @@
     }
     int count = pFields->GetCount();
     for (int i = 0; i < count; i ++) {
         LoadField(pFields->GetDict(i));
     }
 }
 CPDF_InterForm::~CPDF_InterForm()
 {
     FX_POSITION pos = m_ControlMap.GetStartPosition();
     while (pos) {
-        FX_LPVOID key, value;
+        void* key;
+        void* value;
         m_ControlMap.GetNextAssoc(pos, key, value);
         delete (CPDF_FormControl*)value;
     }
     if (m_pFieldTree != NULL) {
         int nCount = m_pFieldTree->m_Root.CountFields();
         for (int i = 0; i < nCount; i++) {
             CPDF_FormField *pField = m_pFieldTree->m_Root.GetField(i);
             delete pField;
         }
         delete m_pFieldTree;
     }
 }
 FX_BOOL CPDF_InterForm::m_bUpdateAP = TRUE;
 FX_BOOL CPDF_InterForm::UpdatingAPEnabled()
 {
     return m_bUpdateAP;
 }
 void CPDF_InterForm::EnableUpdateAP(FX_BOOL bUpdateAP)
 {
     m_bUpdateAP = bUpdateAP;
 }
-CFX_ByteString CPDF_InterForm::GenerateNewResourceName(const CPDF_Dictionary* pResDict, FX_LPCSTR csType, int iMinLen, FX_LPCSTR csPrefix)
+CFX_ByteString CPDF_InterForm::GenerateNewResourceName(const CPDF_Dictionary* pResDict, const FX_CHAR* csType, int iMinLen, const FX_CHAR* csPrefix)
 {
     CFX_ByteString csStr = csPrefix;
     CFX_ByteString csBType = csType;
     if (csStr.IsEmpty()) {
         if (csBType == "ExtGState") {
             csStr = "GS";
         } else if (csBType == "ColorSpace") {
             csStr = "CS";
         } else if (csBType == "Font") {
             csStr = "ZiTi";
@@ skipping 163 matching lines @@
     }
     CPDF_Font* pFont = NULL;
     if (csFontName == "ZapfDingbats") {
         pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, NULL);
     } else {
         CPDF_FontEncoding encoding(PDFFONT_ENCODING_WINANSI);
         pFont = ((CPDF_Document*)pDocument)->AddStandardFont(csFontName, &encoding);
     }
     return pFont;
 }
-CFX_ByteString CPDF_InterForm::GetNativeFont(uint8_t charSet, FX_LPVOID pLogFont)
+CFX_ByteString CPDF_InterForm::GetNativeFont(uint8_t charSet, void* pLogFont)
 {
     CFX_ByteString csFontName;
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     LOGFONTA lf;
     FX_BOOL bRet;
     if (charSet == ANSI_CHARSET) {
         csFontName = "Helvetica";
         return csFontName;
     }
     bRet = FALSE;
@@ skipping 16 matching lines @@
     if (bRet) {
         if (pLogFont != NULL) {
             memcpy(pLogFont, &lf, sizeof(LOGFONTA));
         }
         csFontName = lf.lfFaceName;
         return csFontName;
     }
 #endif
     return csFontName;
 }
-CFX_ByteString CPDF_InterForm::GetNativeFont(FX_LPVOID pLogFont)
+CFX_ByteString CPDF_InterForm::GetNativeFont(void* pLogFont)
 {
 #if _FXM_PLATFORM_ == _FXM_PLATFORM_WINDOWS_
     uint8_t charSet = GetNativeCharSet();
     return GetNativeFont(charSet, pLogFont);
 #else
     return CFX_ByteString();
 #endif
 }
 uint8_t CPDF_InterForm::GetNativeCharSet()
 {
@@ skipping 164 matching lines @@
 FX_BOOL CPDF_InterForm::ValidateFieldName(const CPDF_FormControl* pControl, CFX_WideString& csNewFieldName)
 {
     if (pControl == NULL || csNewFieldName.IsEmpty()) {
         return FALSE;
     }
     CPDF_FormField* pField = ((CPDF_FormControl*)pControl)->GetField();
     return ValidateFieldName(csNewFieldName, pField->GetFieldType(), pField, pControl);
 }
 int CPDF_InterForm::CompareFieldName(const CFX_ByteString& name1, const CFX_ByteString& name2)
 {
-    FX_LPCSTR ptr1 = name1, ptr2 = name2;
+    const FX_CHAR* ptr1 = name1;
+    const FX_CHAR* ptr2 = name2;
     if (name1.GetLength() != name2.GetLength()) {
         int i = 0;
         while (ptr1[i] == ptr2[i]) {
             i ++;
         }
         if (i == name1.GetLength()) {
             return 2;
         }
         if (i == name2.GetLength()) {
             return 3;
         }
         return 0;
     } else {
         return name1 == name2 ? 1 : 0;
     }
 }
 int CPDF_InterForm::CompareFieldName(const CFX_WideString& name1, const CFX_WideString& name2)
 {
-    FX_LPCWSTR ptr1 = name1.c_str();
-    FX_LPCWSTR ptr2 = name2.c_str();
+    const FX_WCHAR* ptr1 = name1.c_str();
+    const FX_WCHAR* ptr2 = name2.c_str();
     if (name1.GetLength() != name2.GetLength()) {
         int i = 0;
         while (ptr1[i] == ptr2[i]) {
             i ++;
         }
         if (i == name1.GetLength()) {
             return 2;
         }
         if (i == name2.GetLength()) {
             return 3;
@@ skipping 83 matching lines @@
 }
 FX_BOOL CPDF_InterForm::IsValidFormControl(const void* pControl)
 {
     if (pControl == NULL) {
         return FALSE;
     }
     FX_POSITION pos = m_ControlMap.GetStartPosition();
     while (pos) {
         CPDF_Dictionary* pWidgetDict = NULL;
         void* pFormControl = NULL;
-        m_ControlMap.GetNextAssoc(pos, (FX_LPVOID&)pWidgetDict, pFormControl);
+        m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, pFormControl);
         if (pControl == pFormControl) {
             return TRUE;
         }
     }
     return FALSE;
 }
 int CPDF_InterForm::CountPageControls(CPDF_Page* pPage) const
 {
     CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
     if (pAnnotList == NULL) {
         return 0;
     }
     int count = 0;
     for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i ++) {
         CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
         if (pAnnot == NULL) {
             continue;
         }
         CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (FX_LPVOID&)pControl)) {
+        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
             continue;
         }
         count ++;
     }
     return count;
 }
 CPDF_FormControl* CPDF_InterForm::GetPageControl(CPDF_Page* pPage, int index) const
 {
     CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
     if (pAnnotList == NULL) {
         return NULL;
     }
     int count = 0;
     for (FX_DWORD i = 0; i < pAnnotList->GetCount(); i ++) {
         CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i);
         if (pAnnot == NULL) {
             continue;
         }
         CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (FX_LPVOID&)pControl)) {
+        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
             continue;
         }
         if (index == count) {
             return pControl;
         }
         count ++;
     }
     return NULL;
 }
 CPDF_FormControl* CPDF_InterForm::GetControlAtPoint(CPDF_Page* pPage, FX_FLOAT pdf_x, FX_FLOAT pdf_y) const
 {
     CPDF_Array* pAnnotList = pPage->m_pFormDict->GetArray("Annots");
     if (pAnnotList == NULL) {
         return NULL;
     }
     for (FX_DWORD i = pAnnotList->GetCount(); i > 0; i --) {
         CPDF_Dictionary* pAnnot = pAnnotList->GetDict(i - 1);
         if (pAnnot == NULL) {
             continue;
         }
         CPDF_FormControl* pControl;
-        if (!m_ControlMap.Lookup(pAnnot, (FX_LPVOID&)pControl)) {
+        if (!m_ControlMap.Lookup(pAnnot, (void*&)pControl)) {
             continue;
         }
         CFX_FloatRect rect = pControl->GetRect();
         if (rect.Contains(pdf_x, pdf_y)) {
             return pControl;
         }
     }
     return NULL;
 }
 CPDF_FormControl* CPDF_InterForm::GetControlByDict(CPDF_Dictionary* pWidgetDict) const
 {
     CPDF_FormControl* pControl = NULL;
-    m_ControlMap.Lookup(pWidgetDict, (FX_LPVOID&)pControl);
+    m_ControlMap.Lookup(pWidgetDict, (void*&)pControl);
     return pControl;
 }
 FX_DWORD CPDF_InterForm::CountInternalFields(const CFX_WideString& csFieldName) const
 {
     if (m_pFormDict == NULL) {
         return 0;
     }
     CPDF_Array* pArray = m_pFormDict->GetArray("Fields");
     if (pArray == NULL) {
         return 0;
@@ skipping 287 matching lines @@
         m_pFormNotify->AfterFormReset(this);
     }
     return TRUE;
 }
 void CPDF_InterForm::ReloadForm()
 {
     FX_POSITION pos = m_ControlMap.GetStartPosition();
     while (pos) {
         CPDF_Dictionary* pWidgetDict;
         CPDF_FormControl* pControl;
-        m_ControlMap.GetNextAssoc(pos, (FX_LPVOID&)pWidgetDict, (FX_LPVOID&)pControl);
+        m_ControlMap.GetNextAssoc(pos, (void*&)pWidgetDict, (void*&)pControl);
         delete pControl;
     }
     m_ControlMap.RemoveAll();
     int nCount = m_pFieldTree->m_Root.CountFields();
     for (int k = 0; k < nCount; k ++) {
         CPDF_FormField* pField = m_pFieldTree->m_Root.GetField(k);
         delete pField;
     }
     m_pFieldTree->RemoveAll();
     if (m_pFormDict == NULL) {
@@ skipping 242 matching lines @@
                 if (pV != NULL) {
                     pFieldDict->SetAt("V", pV->Clone(TRUE));
                 }
             }
             pFields->Add(pFieldDict);
         }
     }
     return pDoc;
 }
 const struct _SupportFieldEncoding {
-    FX_LPCSTR m_name;
+    const FX_CHAR* m_name;
     int32_t m_codePage;
 } g_fieldEncoding[] = {
     { "BigFive", 950 },
     { "GBK", 936 },
     { "Shift-JIS", 932 },
     { "UHC", 949 },
 };
 static void FPDFDOC_FDF_GetFieldValue(CPDF_Dictionary *pFieldDict, CFX_WideString &csValue, CFX_ByteString &bsEncoding)
 {
     ASSERT(pFieldDict != NULL);
@@ skipping 152 matching lines @@
                 continue;
             }
             CPDF_FormControl* pControl = NULL;
             if (m_ControlMap.Lookup(pAnnotDict, (void*&)pControl)) {
                 return iNewPage;
             }
         }
     } while (TRUE);
     return -1;
 }