Remove FX_WORD in favor of uint16_t.

xfa/fgas/crt/fgas_stream.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 "xfa/fgas/crt/fgas_stream.h"
 
 #include <algorithm>
 
@@ skipping 183 matching lines @@
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
                              FX_BOOL& bEOS,
                              int32_t const* pByteSize = NULL);
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength);
   virtual void Flush();
   virtual FX_BOOL SetLength(int32_t iLength);
   virtual int32_t GetBOM(uint8_t bom[4]) const;
-  virtual FX_WORD GetCodePage() const;
-  virtual FX_WORD SetCodePage(FX_WORD wCodePage);
+  virtual uint16_t GetCodePage() const;
+  virtual uint16_t SetCodePage(uint16_t wCodePage);
   virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess,
                                          int32_t iOffset,
                                          int32_t iLength);
 
  protected:
   FX_STREAMTYPE m_eStreamType;
   CFX_StreamImp* m_pStreamImp;
   FX_DWORD m_dwAccess;
   int32_t m_iTotalSize;
   int32_t m_iPosition;
@@ skipping 19 matching lines @@
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
                              FX_BOOL& bEOS,
                              int32_t const* pByteSize = NULL);
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength);
   virtual void Flush();
   virtual FX_BOOL SetLength(int32_t iLength);
 
   virtual int32_t GetBOM(uint8_t bom[4]) const;
-  virtual FX_WORD GetCodePage() const;
-  virtual FX_WORD SetCodePage(FX_WORD wCodePage);
+  virtual uint16_t GetCodePage() const;
+  virtual uint16_t SetCodePage(uint16_t wCodePage);
 
   virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess,
                                          int32_t iOffset,
                                          int32_t iLength);
 
  protected:
-  FX_WORD m_wCodePage;
+  uint16_t m_wCodePage;
   int32_t m_wBOMLength;
   FX_DWORD m_dwBOM;
   uint8_t* m_pBuf;
   int32_t m_iBufSize;
   FX_BOOL m_bDelStream;
   IFX_Stream* m_pStreamImp;
   int32_t m_iRefCount;
   void InitStream();
 };
 
@@ skipping 744 matching lines @@
 }
 int32_t CFX_TextStream::WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
   return m_pStreamImp->WriteData(pBuffer, iBufferSize);
 }
 void CFX_TextStream::Flush() {
   m_pStreamImp->Flush();
 }
 FX_BOOL CFX_TextStream::SetLength(int32_t iLength) {
   return m_pStreamImp->SetLength(iLength);
 }
-FX_WORD CFX_TextStream::GetCodePage() const {
+uint16_t CFX_TextStream::GetCodePage() const {
   return m_wCodePage;
 }
 IFX_Stream* CFX_TextStream::CreateSharedStream(FX_DWORD dwAccess,
                                                int32_t iOffset,
                                                int32_t iLength) {
   IFX_Stream* pSR =
       m_pStreamImp->CreateSharedStream(dwAccess, iOffset, iLength);
   if (pSR == NULL) {
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 int32_t CFX_TextStream::GetBOM(uint8_t bom[4]) const {
   if (m_wBOMLength < 1) {
     return 0;
   }
   *(FX_DWORD*)bom = m_dwBOM;
   return m_wBOMLength;
 }
-FX_WORD CFX_TextStream::SetCodePage(FX_WORD wCodePage) {
+uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
   if (m_wBOMLength > 0) {
     return m_wCodePage;
   }
-  FX_WORD v = m_wCodePage;
+  uint16_t v = m_wCodePage;
   m_wCodePage = wCodePage;
   return v;
 }
 int32_t CFX_TextStream::ReadString(FX_WCHAR* pStr,
                                    int32_t iMaxLength,
                                    FX_BOOL& bEOS,
                                    int32_t const* pByteSize) {
   FXSYS_assert(pStr != NULL && iMaxLength > 0);
   if (m_pStreamImp == NULL) {
     return -1;
@@ skipping 358 matching lines @@
     return FALSE;
   }
   return m_pStreamImp->SetLength(iLength);
 }
 int32_t CFX_Stream::GetBOM(uint8_t bom[4]) const {
   if (m_pStreamImp == NULL) {
     return -1;
   }
   return 0;
 }
-FX_WORD CFX_Stream::GetCodePage() const {
+uint16_t CFX_Stream::GetCodePage() const {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
-FX_WORD CFX_Stream::SetCodePage(FX_WORD wCodePage) {
+uint16_t CFX_Stream::SetCodePage(uint16_t wCodePage) {
 #if _FX_ENDIAN_ == _FX_LITTLE_ENDIAN_
   return FX_CODEPAGE_UTF16LE;
 #else
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
 IFX_Stream* CFX_Stream::CreateSharedStream(FX_DWORD dwAccess,
                                            int32_t iOffset,
                                            int32_t iLength) {
   FXSYS_assert(iLength > 0);
@@ skipping 175 matching lines @@
   return m_pStream->WriteData((const uint8_t*)pData, (int32_t)size) ==
          (int32_t)size;
 }
 FX_BOOL CFGAS_FileWrite::WriteBlock(const void* pData,
                                     FX_FILESIZE offset,
                                     size_t size) {
   m_pStream->Seek(FX_STREAMSEEK_Begin, offset);
   int32_t iLen = m_pStream->WriteData((uint8_t*)pData, (int32_t)size);
   return iLen == (int32_t)size;
 }