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

fpdfsdk/src/fsdk_baseform.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 "../../third_party/base/nonstd_unique_ptr.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_util.h"
@@ skipping 266 matching lines @@
                                         if (IXFA_Widget* hGroupWidget = GetGroupMixXFAWidget())
                                         {
                                                 CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hGroupWidget);
                                                 param.m_pTarget = pAcc;
                                                 pXFAWidgetHandler->ProcessEvent(pAcc, &param);  
                                         }
 
                                         {
                                                 CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
                                                 param.m_pTarget = pAcc;
-                                                FX_INT32 nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);  
+                                                int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);   
                                                 return nRet == XFA_EVENTERROR_Sucess;
                                         }
                                 }
                                 else
                                 {
                                         CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
                                         param.m_pTarget = pAcc;
-                                        FX_INT32 nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);  
+                                        int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);   
                                         return nRet == XFA_EVENTERROR_Sucess;
                                 }
 
                                 if (IXFA_DocView* pDocView = pDoc->GetXFADocView())
                                 {
                                         pDocView->UpdateDocView();
                                 }
                         }
                 }
         }
@@ skipping 780 matching lines @@
         ASSERT(m_pInterForm != NULL);
  
         int nFieldType = GetFieldType();
         if (m_pInterForm->IsNeedHighLight(nFieldType))
         {
  
 //              if (nFieldType != FIELDTYPE_PUSHBUTTON)
 //              {
                         CPDF_Rect rc  = GetRect();
                         FX_COLORREF color = m_pInterForm->GetHighlightColor(nFieldType);
-                        FX_BYTE alpha = m_pInterForm->GetHighlightAlpha();
+                        uint8_t alpha = m_pInterForm->GetHighlightAlpha();
 
                         CFX_FloatRect rcDevice;
                         ASSERT(m_pInterForm->GetDocument());
                         CPDFDoc_Environment* pEnv = m_pInterForm->GetDocument()->GetEnv();
                         if(!pEnv)
                                 return;
                         CFX_AffineMatrix page2device;
                         pPageView->GetCurrentMatrix(page2device);
                         page2device.Transform(((FX_FLOAT)rc.left), ((FX_FLOAT)rc.bottom), rcDevice.left, rcDevice.bottom);
 //                      pEnv->FFI_PageToDevice(m_pPageView->GetPDFPage(), rc.left, rc.bottom, &rcDevice.left, &rcDevice.bottom);
@@ skipping 11 matching lines @@
 
 void CPDFSDK_Widget::ResetAppearance_PushButton()
 {
         CPDF_FormControl* pControl = GetFormControl();
         ASSERT(pControl != NULL);
 
 
         
         CPDF_Rect rcWindow = GetRotatedRect();  
 
-        FX_INT32 nLayout = 0;
+        int32_t nLayout = 0;
 
         switch (pControl->GetTextPosition())
         {
         case TEXTPOS_ICON:
                 nLayout = PPBL_ICON;
                 break;
         case TEXTPOS_BELOW:
                 nLayout = PPBL_ICONTOPLABELBOTTOM;
                 break;
         case TEXTPOS_ABOVE:
@@ skipping 20 matching lines @@
 
         pControl->GetOriginalBackgroundColor(iColorType, fc);
         if (iColorType > 0)
                 crBackground = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         pControl->GetOriginalBorderColor(iColorType, fc);
         if (iColorType > 0)
                 crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
-        FX_INT32 nBorderStyle = 0;
+        int32_t nBorderStyle = 0;
         CPWL_Dash dsBorder(3,0,0);
         CPWL_Color crLeftTop,crRightBottom;
 
         switch (GetBorderStyle())
         {
         case BBS_DASH:
                 nBorderStyle = PBS_DASH;
                 dsBorder = CPWL_Dash(3, 3, 0);
                 break;
         case BBS_BEVELED:
@@ skipping 185 matching lines @@
 
         pControl->GetOriginalBackgroundColor(iColorType, fc);
         if (iColorType > 0)
                 crBackground = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         pControl->GetOriginalBorderColor(iColorType, fc);
         if (iColorType > 0)
                 crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
-        FX_INT32 nBorderStyle = 0;
+        int32_t nBorderStyle = 0;
         CPWL_Dash dsBorder(3,0,0);
         CPWL_Color crLeftTop,crRightBottom;
 
         switch (GetBorderStyle())
         {
         case BBS_DASH:
                 nBorderStyle = PBS_DASH;
                 dsBorder = CPWL_Dash(3, 3, 0);
                 break;
         case BBS_BEVELED:
@@ skipping 19 matching lines @@
         CPDF_Rect rcWindow = GetRotatedRect();
         CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow,fBorderWidth);
 
         CPDF_DefaultAppearance da = pControl->GetDefaultAppearance();
         if (da.HasColor())
         {
                 da.GetColor(iColorType, fc);
                 crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
         }
 
-        FX_INT32 nStyle = 0;
+        int32_t nStyle = 0;
 
         CFX_WideString csWCaption = pControl->GetNormalCaption();
         if (csWCaption.GetLength() > 0)
         {
                 switch (csWCaption[0])
                 {
                 case L'l':
                         nStyle = PCS_CIRCLE;                    
                         break;
                 case L'8':
@@ skipping 71 matching lines @@
 
         pControl->GetOriginalBackgroundColor(iColorType, fc);
         if (iColorType > 0)
                 crBackground = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         pControl->GetOriginalBorderColor(iColorType, fc);
         if (iColorType > 0)
                 crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
-        FX_INT32 nBorderStyle = 0;
+        int32_t nBorderStyle = 0;
         CPWL_Dash dsBorder(3,0,0);
         CPWL_Color crLeftTop,crRightBottom;
 
         switch (GetBorderStyle())
         {
         case BBS_DASH:
                 nBorderStyle = PBS_DASH;
                 dsBorder = CPWL_Dash(3, 3, 0);
                 break;
         case BBS_BEVELED:
@@ skipping 19 matching lines @@
         CPDF_Rect rcWindow = GetRotatedRect();
         CPDF_Rect rcClient = CPWL_Utils::DeflateRect(rcWindow, fBorderWidth);
 
         CPDF_DefaultAppearance da = pControl->GetDefaultAppearance();
         if (da.HasColor())
         {
                 da.GetColor(iColorType, fc);
                 crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
         }
 
-        FX_INT32 nStyle = 0;
+        int32_t nStyle = 0;
 
         CFX_WideString csWCaption = pControl->GetNormalCaption();
         if (csWCaption.GetLength() > 0)
         {
                 switch (csWCaption[0])
                 {
                 default: //L'l':
                         nStyle = PCS_CIRCLE;                    
                         break;
                 case L'8':
@@ skipping 141 matching lines @@
                         pEdit->SetAutoFontSize(TRUE);
                 else
                         pEdit->SetFontSize(fFontSize);
                 
                 pEdit->Initialize();
                 
                 if (sValue)
                         pEdit->SetText(sValue);
                 else
                 {
-                        FX_INT32 nCurSel = pField->GetSelectedIndex(0);
+                        int32_t nCurSel = pField->GetSelectedIndex(0);
 
                         if (nCurSel < 0)
                                 pEdit->SetText(pField->GetValue().c_str());
                         else
                                 pEdit->SetText(pField->GetOptionLabel(nCurSel).c_str());
                 }
 
                 CPDF_Rect rcContent = pEdit->GetContentRect();
 
                 CFX_ByteString sEdit = CPWL_Utils::GetEditAppStream(pEdit,CPDF_Point(0.0f,0.0f));
@@ skipping 53 matching lines @@
                 if (IsFloatZero(fFontSize))
                         pEdit->SetFontSize(12.0f);
                 else
                         pEdit->SetFontSize(fFontSize);
                 
                 pEdit->Initialize();
 
                 CFX_ByteTextBuf sList;
                 FX_FLOAT fy = rcClient.top;
 
-                FX_INT32 nTop = pField->GetTopVisibleIndex();
-                FX_INT32 nCount = pField->CountOptions();
-                FX_INT32 nSelCount = pField->CountSelectedItems();
+                int32_t nTop = pField->GetTopVisibleIndex();
+                int32_t nCount = pField->CountOptions();
+                int32_t nSelCount = pField->CountSelectedItems();
 
-                for (FX_INT32 i=nTop; i<nCount; i++)
+                for (int32_t i=nTop; i<nCount; i++)
                 {
                         FX_BOOL bSelected = FALSE;                              
-                        for (FX_INT32 j=0; j<nSelCount; j++)
+                        for (int32_t j=0; j<nSelCount; j++)
                         {
                                 if (pField->GetSelectedIndex(j) == i)
                                 {
                                         bSelected = TRUE;
                                         break;
                                 }
                         }
 
                         pEdit->SetText(pField->GetOptionLabel(i).c_str());
 
@@ skipping 146 matching lines @@
                         switch (GetBorderStyle())
                         {
                         case BBS_SOLID:
                                 {
                                         CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE);
                                         if (sColor.GetLength() > 0)
                                         {
                                                 sLines << "q\n" << GetBorderWidth() << " w\n" 
                                                         << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE) << " 2 J 0 j\n";                                    
 
-                                                for (FX_INT32 i=1;i<nMaxLen;i++)
+                                                for (int32_t i=1;i<nMaxLen;i++)
                                                 {
                                                         sLines << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                                                 << rcClient.bottom << " m\n"
                                                                 << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                                                 << rcClient.top << " l S\n";                                            
                                                 }
 
                                                 sLines << "Q\n";                
                                         }
                                 }
                                 break;
                         case BBS_DASH:
                                 {
                                         CFX_ByteString sColor = CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE);
                                         if (sColor.GetLength() > 0)
                                         {
                                                 CPWL_Dash dsBorder = CPWL_Dash(3, 3, 0);
 
                                                 sLines << "q\n" << GetBorderWidth() << " w\n" 
                                                         << CPWL_Utils::GetColorAppStream(GetBorderPWLColor(),FALSE)
                                                         << "[" << dsBorder.nDash << " " 
                                                         << dsBorder.nGap << "] " 
                                                         << dsBorder.nPhase << " d\n";
 
-                                                for (FX_INT32 i=1;i<nMaxLen;i++)                                        
+                                                for (int32_t i=1;i<nMaxLen;i++)                                 
                                                 {
                                                         sLines << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                                                 << rcClient.bottom << " m\n"
                                                                 << rcClient.left + ((rcClient.right - rcClient.left)/nMaxLen)*i << " "
                                                                 << rcClient.top << " l S\n";    
                                                 }
 
                                                 sLines << "Q\n";
                                         }
                                 }
@@ skipping 59 matching lines @@
 }
 
 CFX_ByteString CPDFSDK_Widget::GetBorderAppStream() const
 {
         CPDF_Rect rcWindow = GetRotatedRect();
         CPWL_Color crBorder = GetBorderPWLColor();
         CPWL_Color crBackground = GetFillPWLColor();
         CPWL_Color crLeftTop, crRightBottom;
 
         FX_FLOAT fBorderWidth = (FX_FLOAT)GetBorderWidth();
-        FX_INT32 nBorderStyle = 0;
+        int32_t nBorderStyle = 0;
         CPWL_Dash dsBorder(3,0,0);
 
         switch (GetBorderStyle())
         {
         case BBS_DASH:
                 nBorderStyle = PBS_DASH;
                 dsBorder = CPWL_Dash(3, 3, 0);
                 break;
         case BBS_BEVELED:
                 nBorderStyle = PBS_BEVELED;
@@ skipping 54 matching lines @@
 CPWL_Color CPDFSDK_Widget::GetTextPWLColor() const
 {
         CPWL_Color crText = CPWL_Color(COLORTYPE_GRAY, 0);
 
         CPDF_FormControl* pFormCtrl = GetFormControl();
         ASSERT(pFormCtrl != NULL);
 
         CPDF_DefaultAppearance da = pFormCtrl->GetDefaultAppearance();
         if (da.HasColor())
         {
-                FX_INT32 iColorType;
+                int32_t iColorType;
                 FX_FLOAT fc[4];
                 da.GetColor(iColorType, fc);
                 crText = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
         }
 
         return crText;
 }
 
 CPWL_Color CPDFSDK_Widget::GetBorderPWLColor() const
 {
         CPWL_Color crBorder;
 
         CPDF_FormControl* pFormCtrl = GetFormControl();
         ASSERT(pFormCtrl != NULL);
 
-        FX_INT32 iColorType;
+        int32_t iColorType;
         FX_FLOAT fc[4];
         pFormCtrl->GetOriginalBorderColor(iColorType, fc);
         if (iColorType > 0)
                 crBorder = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         return crBorder;
 }
 
 CPWL_Color CPDFSDK_Widget::GetFillPWLColor() const
 {
         CPWL_Color crFill;
 
         CPDF_FormControl* pFormCtrl = GetFormControl();
         ASSERT(pFormCtrl != NULL);
 
-        FX_INT32 iColorType;
+        int32_t iColorType;
         FX_FLOAT fc[4];
         pFormCtrl->GetOriginalBackgroundColor(iColorType, fc);
         if (iColorType > 0)
                 crFill = CPWL_Color(iColorType, fc[0], fc[1], fc[2], fc[3]);
 
         return crFill;
 }
 
 void CPDFSDK_Widget::AddImageToAppearance(const CFX_ByteString& sAPType, CPDF_Stream* pImage)
 {
@@ skipping 74 matching lines @@
                                 param.m_bModifier = data.bModifier;
                                 param.m_wsNewText = data.sValue;
                                 if (data.nSelEnd > data.nSelStart)
                                         param.m_wsNewText.Delete(data.nSelStart, data.nSelEnd - data.nSelStart);
                                 for (int i=data.sChange.GetLength() - 1; i>=0; i--)
                                         param.m_wsNewText.Insert(data.nSelStart, data.sChange[i]);
                                 param.m_wsPrevText = data.sValue;
 
                                 CXFA_WidgetAcc* pAcc = pXFAWidgetHandler->GetDataAcc(hWidget);
                                 param.m_pTarget = pAcc;
-                                FX_INT32 nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
+                                int32_t nRet = pXFAWidgetHandler->ProcessEvent(pAcc, &param);
 
                                 if (IXFA_DocView* pDocView = pDoc->GetXFADocView())
                                 {
                                         pDocView->UpdateDocView();
                                 }
 
                                 if (nRet == XFA_EVENTERROR_Sucess)
                                         return TRUE;
                         }
                 }
@@ skipping 47 matching lines @@
 
 
 CFX_WideString CPDFSDK_Widget::GetAlternateName() const
 {
         CPDF_FormField* pFormField = GetFormField();
         ASSERT(pFormField != NULL);
 
         return pFormField->GetAlternateName();
 }
 
-FX_INT32        CPDFSDK_Widget::GetAppearanceAge() const
+int32_t CPDFSDK_Widget::GetAppearanceAge() const
 {
         return m_nAppAge;
 }
 
-FX_INT32 CPDFSDK_Widget::GetValueAge() const
+int32_t CPDFSDK_Widget::GetValueAge() const
 {
         return m_nValueAge;
 }
 
 
 FX_BOOL CPDFSDK_Widget::HitTest(FX_FLOAT pageX, FX_FLOAT pageY)
 {
         CPDF_Annot* pAnnot = GetPDFAnnot();
         CFX_FloatRect annotRect;
         pAnnot->GetRect(annotRect);
@@ skipping 311 matching lines @@
                         pStreamDict->SetAt("BBox", pBBox);
                         pBBox->AddInteger(0);
                         pBBox->AddInteger(0);
                         pBBox->AddInteger(nWidth);
                         pBBox->AddInteger(nHeight);
                         pStreamDict->SetAtInteger("FormType", 1);
 
                         pRetStream = new CPDF_Stream(NULL, 0, NULL);
                         CFX_ByteString csStream;
                         csStream.Format("q\n%d 0 0 %d 0 0 cm\n/Img Do\nQ", nWidth, nHeight);
-                        pRetStream->InitStream((FX_BYTE*)csStream.c_str(), csStream.GetLength(), pStreamDict);
+                        pRetStream->InitStream((uint8_t*)csStream.c_str(), csStream.GetLength(), pStreamDict);
                         pDocument->AddIndirectObject(pRetStream);
                 }
 
                 delete pBmp;
         }
 
         return pRetStream;
 }
 #endif
 
@@ skipping 426 matching lines @@
                         fdfEncodedData = fdfEncodedData<<name_b.GetBuffer(name_b.GetLength());
                         name_b.ReleaseBuffer();
                         fdfEncodedData = fdfEncodedData<<"=";
                         fdfEncodedData = fdfEncodedData<<csValue_b.GetBuffer(csValue_b.GetLength());
                         csValue_b.ReleaseBuffer();
                         if(i != pFields->GetCount()-1)
                                 fdfEncodedData = fdfEncodedData<<"&";
                 }
 
                 nBufSize = fdfEncodedData.GetLength();
-                pBuf = FX_Alloc(FX_BYTE, nBufSize);
+                pBuf = FX_Alloc(uint8_t, nBufSize);
                 FXSYS_memcpy(pBuf, fdfEncodedData.GetBuffer(), nBufSize);
         }
         return TRUE;
 }
 
 FX_BOOL CPDFSDK_InterForm::ExportFieldsToFDFTextBuf(const CFX_PtrArray& fields,FX_BOOL bIncludeOrExclude, CFX_ByteTextBuf& textBuf)
 {
         ASSERT(m_pDocument != NULL);
         ASSERT(m_pInterForm != NULL);
         
@@ skipping 649 matching lines @@
 
         CPDF_Annot* pPDFAnnot = pAnnot->GetPDFAnnot();
         ASSERT(pPDFAnnot != NULL);
 
         CPDF_Rect rcAnnot;
         pPDFAnnot->GetRect(rcAnnot);
 
         return rcAnnot;
 }