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

fpdfsdk/src/fsdk_mgr.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 "../../public/fpdf_ext.h"
 #include "../include/fsdk_define.h"
 #include "../include/fpdfxfa/fpdfxfa_doc.h"
 #include "../include/fpdfxfa/fpdfxfa_page.h"
@@ skipping 16 matching lines @@
         CFX_SystemHandler(CPDFDoc_Environment* pEnv):m_pEnv(pEnv),m_nCharSet(-1) {}
 public:
         virtual void                            InvalidateRect(FX_HWND hWnd, FX_RECT rect) ;
         virtual void                            OutputSelectedRect(void* pFormFiller, CPDF_Rect& rect);
 
         virtual FX_BOOL                         IsSelectionImplemented();
 
         virtual CFX_WideString          GetClipboardText(FX_HWND hWnd){return L"";}
         virtual FX_BOOL                         SetClipboardText(FX_HWND hWnd, CFX_WideString string) {return FALSE;}
         
-        virtual void                            ClientToScreen(FX_HWND hWnd, FX_INT32& x, FX_INT32& y) {}
-        virtual void                            ScreenToClient(FX_HWND hWnd, FX_INT32& x, FX_INT32& y) {}
+        virtual void                            ClientToScreen(FX_HWND hWnd, int32_t& x, int32_t& y) {}
+        virtual void                            ScreenToClient(FX_HWND hWnd, int32_t& x, int32_t& y) {}
 
         /*cursor style
         FXCT_ARROW      
         FXCT_NESW               
         FXCT_NWSE               
         FXCT_VBEAM              
         FXCT_HBEAM              
         FXCT_HAND
         */
-        virtual void                            SetCursor(FX_INT32 nCursorType);
+        virtual void                            SetCursor(int32_t nCursorType);
 
         virtual FX_HMENU                        CreatePopupMenu() {return NULL;}
-        virtual FX_BOOL                         AppendMenuItem(FX_HMENU hMenu, FX_INT32 nIDNewItem, CFX_WideString string) {return FALSE;}
-        virtual FX_BOOL                         EnableMenuItem(FX_HMENU hMenu, FX_INT32 nIDItem, FX_BOOL bEnabled) {return FALSE;}
-        virtual FX_INT32                        TrackPopupMenu(FX_HMENU hMenu, FX_INT32 x, FX_INT32 y, FX_HWND hParent) {return -1;}
+        virtual FX_BOOL                         AppendMenuItem(FX_HMENU hMenu, int32_t nIDNewItem, CFX_WideString string) {return FALSE;}
+        virtual FX_BOOL                         EnableMenuItem(FX_HMENU hMenu, int32_t nIDItem, FX_BOOL bEnabled) {return FALSE;}
+        virtual int32_t                 TrackPopupMenu(FX_HMENU hMenu, int32_t x, int32_t y, FX_HWND hParent) {return -1;}
         virtual void                            DestroyMenu(FX_HMENU hMenu) {}
 
-        virtual CFX_ByteString          GetNativeTrueTypeFont(FX_INT32 nCharset);
-        virtual FX_BOOL                         FindNativeTrueTypeFont(FX_INT32 nCharset, CFX_ByteString sFontFaceName);
-        virtual CPDF_Font*                      AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, CFX_ByteString sFontFaceName, FX_BYTE nCharset);
+        virtual CFX_ByteString          GetNativeTrueTypeFont(int32_t nCharset);
+        virtual FX_BOOL                         FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteString sFontFaceName);
+        virtual CPDF_Font*                      AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, CFX_ByteString sFontFaceName, uint8_t nCharset);
 
-        virtual FX_INT32                        SetTimer(FX_INT32 uElapse, TimerCallback lpTimerFunc) ;
-        virtual void                            KillTimer(FX_INT32 nID) ;
+        virtual int32_t                 SetTimer(int32_t uElapse, TimerCallback lpTimerFunc) ;
+        virtual void                            KillTimer(int32_t nID) ;
 
 
         virtual FX_BOOL                         IsSHIFTKeyDown(FX_DWORD nFlag) {return m_pEnv->FFI_IsSHIFTKeyDown(nFlag);}
         virtual FX_BOOL                         IsCTRLKeyDown(FX_DWORD nFlag) {return m_pEnv->FFI_IsCTRLKeyDown(nFlag);}
         virtual FX_BOOL                         IsALTKeyDown(FX_DWORD nFlag) {return m_pEnv->FFI_IsALTKeyDown(nFlag);}
         virtual FX_BOOL                         IsINSERTKeyDown(FX_DWORD nFlag) {return m_pEnv->FFI_IsINSERTKeyDown(nFlag);}
 
         virtual FX_SYSTEMTIME           GetLocalTime();
 
-        virtual FX_INT32                        GetCharSet() {return m_nCharSet;}
-        virtual void                            SetCharSet(FX_INT32 nCharSet) {m_nCharSet = nCharSet;}
+        virtual int32_t                 GetCharSet() {return m_nCharSet;}
+        virtual void                            SetCharSet(int32_t nCharSet) {m_nCharSet = nCharSet;}
 private:
         CPDFDoc_Environment* m_pEnv;
         int             m_nCharSet;
 };
 
-void CFX_SystemHandler::SetCursor(FX_INT32 nCursorType)
+void CFX_SystemHandler::SetCursor(int32_t nCursorType)
 {
 
         m_pEnv->FFI_SetCursor(nCursorType);
 }
 
 void CFX_SystemHandler::InvalidateRect(FX_HWND hWnd, FX_RECT rect)
 {
         //g_pFormFillApp->FFI_Invalidate();
         CPDFSDK_Annot* pSDKAnnot = (CPDFSDK_Annot*)hWnd;
         CPDFXFA_Page* pPage = NULL;
@@ skipping 40 matching lines @@
 {
         if(m_pEnv)
         {
                 FPDF_FORMFILLINFO* pInfo = m_pEnv->GetFormFillInfo();
                 if(pInfo && pInfo->FFI_OutputSelectedRect)
                         return TRUE;
         }
         return FALSE;
 }
 
-CFX_ByteString CFX_SystemHandler::GetNativeTrueTypeFont(FX_INT32 nCharset)
+CFX_ByteString CFX_SystemHandler::GetNativeTrueTypeFont(int32_t nCharset)
 {
         return "";
 }
 
-FX_BOOL CFX_SystemHandler::FindNativeTrueTypeFont(FX_INT32 nCharset, CFX_ByteString sFontFaceName) 
+FX_BOOL CFX_SystemHandler::FindNativeTrueTypeFont(int32_t nCharset, CFX_ByteString sFontFaceName) 
 {
         CFX_FontMgr* pFontMgr = CFX_GEModule::Get()->GetFontMgr();
 //      FXFT_Face nFace = pFontMgr->FindSubstFont(sFontFaceName,TRUE,0,0,0,0,NULL);
 //      FXFT_Face nFace  = pFontMgr->m_pBuiltinMapper->FindSubstFont(sFontFaceName,TRUE,0,0,0,0,NULL);
 
         if(pFontMgr)
         {
                 CFX_FontMapper* pFontMapper = pFontMgr->m_pBuiltinMapper;
                 if(pFontMapper)
                 {       
@@ skipping 24 matching lines @@
                 return 932;
         else if(charset == 134)
                 return 936;
         else if(charset == 129)
                 return 949;
         else if(charset == 136)
                 return 950;
         return 0;
 }
 CPDF_Font* CFX_SystemHandler::AddNativeTrueTypeFontToPDF(CPDF_Document* pDoc, CFX_ByteString sFontFaceName, 
-                                                                                                                 FX_BYTE nCharset) 
+                                                                                                                 uint8_t nCharset) 
 {
         if(pDoc)
         {
                 CFX_Font* pFXFont = new CFX_Font();
                 pFXFont->LoadSubst(sFontFaceName,TRUE,0,0,0,CharSet2CP(nCharset),FALSE);
                 CPDF_Font* pFont = pDoc->AddFont(pFXFont,nCharset,FALSE);
                 delete pFXFont;
                 return pFont;
         }
 
         return NULL;
 }
 
 
-FX_INT32 CFX_SystemHandler::SetTimer(FX_INT32 uElapse, TimerCallback lpTimerFunc)
+int32_t CFX_SystemHandler::SetTimer(int32_t uElapse, TimerCallback lpTimerFunc)
 {
         return m_pEnv->FFI_SetTimer(uElapse, lpTimerFunc);
 }
-void CFX_SystemHandler::KillTimer(FX_INT32 nID)
+void CFX_SystemHandler::KillTimer(int32_t nID)
 {
         m_pEnv->FFI_KillTimer(nID);
 }
 
 FX_SYSTEMTIME CFX_SystemHandler::GetLocalTime()
 {
         return m_pEnv->FFI_GetLocalTime();
 }
 
 CPDFDoc_Environment::CPDFDoc_Environment(CPDFXFA_Document* pDoc) :
@@ skipping 1013 matching lines @@
         
         for(int i=0; i<m_fxAnnotArray.GetSize(); i++)
         {
                 CPDFSDK_Annot* pAnnot = (CPDFSDK_Annot*)m_fxAnnotArray.GetAt(i);
                 if(pAnnot == pFocusAnnot)
                         return pAnnot;
         }
         return NULL;
 }