Remove FX_DWORD from XFA.

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>
 
 #include "xfa/fgas/crt/fgas_codepage.h"
 #include "xfa/fgas/crt/fgas_system.h"
 
 namespace {
 
 class CFX_StreamImp {
  public:
   virtual void Release() { delete this; }
-  virtual FX_DWORD GetAccessModes() const { return m_dwAccess; }
+  virtual uint32_t GetAccessModes() const { return m_dwAccess; }
   virtual int32_t GetLength() const = 0;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0;
   virtual int32_t GetPosition() = 0;
   virtual FX_BOOL IsEOF() const = 0;
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) = 0;
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
                              FX_BOOL& bEOS) = 0;
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) = 0;
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) = 0;
   virtual void Flush() = 0;
   virtual FX_BOOL SetLength(int32_t iLength) = 0;
 
  protected:
   CFX_StreamImp();
   virtual ~CFX_StreamImp() {}
-  FX_DWORD m_dwAccess;
+  uint32_t m_dwAccess;
 };
 
 class CFX_FileStreamImp : public CFX_StreamImp {
  public:
   CFX_FileStreamImp();
   virtual ~CFX_FileStreamImp();
-  FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess);
+  FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess);
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition();
   virtual FX_BOOL IsEOF() const;
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL& bEOS);
   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);
 
  protected:
   FXSYS_FILE* m_hFile;
   int32_t m_iLength;
 };
 
 class CFX_BufferStreamImp : public CFX_StreamImp {
  public:
   CFX_BufferStreamImp();
   virtual ~CFX_BufferStreamImp() {}
-  FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess);
+  FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess);
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition();
   virtual FX_BOOL IsEOF() const;
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL& bEOS);
   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) { return FALSE; }
 
  protected:
   uint8_t* m_pData;
   int32_t m_iTotalSize;
   int32_t m_iPosition;
   int32_t m_iLength;
 };
 
 class CFX_FileReadStreamImp : public CFX_StreamImp {
  public:
   CFX_FileReadStreamImp();
   virtual ~CFX_FileReadStreamImp() {}
-  FX_BOOL LoadFileRead(IFX_FileRead* pFileRead, FX_DWORD dwAccess);
+  FX_BOOL LoadFileRead(IFX_FileRead* pFileRead, uint32_t dwAccess);
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition() { return m_iPosition; }
   virtual FX_BOOL IsEOF() const;
 
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL& bEOS);
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
     return 0;
   }
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) {
     return 0;
   }
   virtual void Flush() {}
   virtual FX_BOOL SetLength(int32_t iLength) { return FALSE; }
 
  protected:
   IFX_FileRead* m_pFileRead;
   int32_t m_iPosition;
   int32_t m_iLength;
 };
 
 class CFX_BufferReadStreamImp : public CFX_StreamImp {
  public:
   CFX_BufferReadStreamImp();
   ~CFX_BufferReadStreamImp();
   FX_BOOL LoadBufferRead(IFX_BufferRead* pBufferRead,
                          int32_t iFileSize,
-                         FX_DWORD dwAccess,
+                         uint32_t dwAccess,
                          FX_BOOL bReleaseBufferRead);
 
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition() { return m_iPosition; }
   virtual FX_BOOL IsEOF() const;
 
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize);
   virtual int32_t ReadString(FX_WCHAR* pStr, int32_t iMaxLength, FX_BOOL& bEOS);
   virtual int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) {
     return 0;
   }
   virtual int32_t WriteString(const FX_WCHAR* pStr, int32_t iLength) {
     return 0;
   }
   virtual void Flush() {}
   virtual FX_BOOL SetLength(int32_t iLength) { return FALSE; }
 
  private:
   IFX_BufferRead* m_pBufferRead;
   FX_BOOL m_bReleaseBufferRead;
   int32_t m_iPosition;
   int32_t m_iBufferSize;
 };
 
 class CFX_FileWriteStreamImp : public CFX_StreamImp {
  public:
   CFX_FileWriteStreamImp();
   virtual ~CFX_FileWriteStreamImp() {}
-  FX_BOOL LoadFileWrite(IFX_FileWrite* pFileWrite, FX_DWORD dwAccess);
+  FX_BOOL LoadFileWrite(IFX_FileWrite* pFileWrite, uint32_t dwAccess);
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition() { return m_iPosition; }
   virtual FX_BOOL IsEOF() const;
   virtual int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) { return 0; }
   virtual int32_t ReadString(FX_WCHAR* pStr,
                              int32_t iMaxLength,
                              FX_BOOL& bEOS) {
     return 0;
   }
@@ skipping 12 matching lines @@
   FX_STREAMTYPE_File,
   FX_STREAMTYPE_Buffer,
   FX_STREAMTYPE_Stream,
   FX_STREAMTYPE_BufferRead,
 };
 
 class CFX_Stream : public IFX_Stream {
  public:
   CFX_Stream();
   ~CFX_Stream();
-  FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, FX_DWORD dwAccess);
-  FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, FX_DWORD dwAccess);
-  FX_BOOL LoadFileRead(IFX_FileRead* pFileRead, FX_DWORD dwAccess);
-  FX_BOOL LoadFileWrite(IFX_FileWrite* pFileWrite, FX_DWORD dwAccess);
+  FX_BOOL LoadFile(const FX_WCHAR* pszSrcFileName, uint32_t dwAccess);
+  FX_BOOL LoadBuffer(uint8_t* pData, int32_t iTotalSize, uint32_t dwAccess);
+  FX_BOOL LoadFileRead(IFX_FileRead* pFileRead, uint32_t dwAccess);
+  FX_BOOL LoadFileWrite(IFX_FileWrite* pFileWrite, uint32_t dwAccess);
   FX_BOOL LoadBufferRead(IFX_BufferRead* pBufferRead,
                          int32_t iFileSize,
-                         FX_DWORD dwAccess,
+                         uint32_t dwAccess,
                          FX_BOOL bReleaseBufferRead);
   virtual void Release();
   virtual IFX_Stream* Retain();
-  virtual FX_DWORD GetAccessModes() const { return m_dwAccess; }
+  virtual uint32_t GetAccessModes() const { return m_dwAccess; }
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition();
   virtual FX_BOOL IsEOF() const;
   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 uint16_t GetCodePage() const;
   virtual uint16_t SetCodePage(uint16_t wCodePage);
-  virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess,
+  virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess,
                                          int32_t iOffset,
                                          int32_t iLength);
 
  protected:
   FX_STREAMTYPE m_eStreamType;
   CFX_StreamImp* m_pStreamImp;
-  FX_DWORD m_dwAccess;
+  uint32_t m_dwAccess;
   int32_t m_iTotalSize;
   int32_t m_iPosition;
   int32_t m_iStart;
   int32_t m_iLength;
   int32_t m_iRefCount;
 };
 
 class CFX_TextStream : public IFX_Stream {
  public:
   CFX_TextStream(IFX_Stream* pStream, FX_BOOL bDelStream);
   ~CFX_TextStream();
   virtual void Release();
   virtual IFX_Stream* Retain();
 
-  virtual FX_DWORD GetAccessModes() const;
+  virtual uint32_t GetAccessModes() const;
   virtual int32_t GetLength() const;
   virtual int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset);
   virtual int32_t GetPosition();
   virtual FX_BOOL IsEOF() const;
 
   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 uint16_t GetCodePage() const;
   virtual uint16_t SetCodePage(uint16_t wCodePage);
 
-  virtual IFX_Stream* CreateSharedStream(FX_DWORD dwAccess,
+  virtual IFX_Stream* CreateSharedStream(uint32_t dwAccess,
                                          int32_t iOffset,
                                          int32_t iLength);
 
  protected:
   uint16_t m_wCodePage;
   int32_t m_wBOMLength;
-  FX_DWORD m_dwBOM;
+  uint32_t m_dwBOM;
   uint8_t* m_pBuf;
   int32_t m_iBufSize;
   FX_BOOL m_bDelStream;
   IFX_Stream* m_pStreamImp;
   int32_t m_iRefCount;
   void InitStream();
 };
 
 class CFGAS_FileRead : public IFX_FileRead {
  public:
@@ skipping 37 matching lines @@
                              size_t size);
 
  protected:
   IFX_Stream* m_pStream;
   FX_BOOL m_bReleaseStream;
 };
 
 }  // namespace
 
 IFX_Stream* IFX_Stream::CreateStream(IFX_BufferRead* pBufferRead,
-                                     FX_DWORD dwAccess,
+                                     uint32_t dwAccess,
                                      int32_t iFileSize,
                                      FX_BOOL bReleaseBufferRead) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadBufferRead(pBufferRead, iFileSize, dwAccess,
                            bReleaseBufferRead)) {
     pSR->Release();
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 IFX_Stream* IFX_Stream::CreateStream(IFX_FileRead* pFileRead,
-                                     FX_DWORD dwAccess) {
+                                     uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileRead(pFileRead, dwAccess)) {
     pSR->Release();
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 IFX_Stream* IFX_Stream::CreateStream(IFX_FileWrite* pFileWrite,
-                                     FX_DWORD dwAccess) {
+                                     uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFileWrite(pFileWrite, dwAccess)) {
     pSR->Release();
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 IFX_Stream* IFX_Stream::CreateStream(const FX_WCHAR* pszFileName,
-                                     FX_DWORD dwAccess) {
+                                     uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadFile(pszFileName, dwAccess)) {
     pSR->Release();
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 IFX_Stream* IFX_Stream::CreateStream(uint8_t* pData,
                                      int32_t length,
-                                     FX_DWORD dwAccess) {
+                                     uint32_t dwAccess) {
   CFX_Stream* pSR = new CFX_Stream;
   if (!pSR->LoadBuffer(pData, length, dwAccess)) {
     pSR->Release();
     return NULL;
   }
   if (dwAccess & FX_STREAMACCESS_Text) {
     return new CFX_TextStream(pSR, TRUE);
   }
   return pSR;
 }
 
 CFX_StreamImp::CFX_StreamImp() : m_dwAccess(0) {}
 CFX_FileStreamImp::CFX_FileStreamImp()
     : CFX_StreamImp(), m_hFile(NULL), m_iLength(0) {}
 CFX_FileStreamImp::~CFX_FileStreamImp() {
   if (m_hFile != NULL) {
     FXSYS_fclose(m_hFile);
   }
 }
 FX_BOOL CFX_FileStreamImp::LoadFile(const FX_WCHAR* pszSrcFileName,
-                                    FX_DWORD dwAccess) {
+                                    uint32_t dwAccess) {
   FXSYS_assert(m_hFile == NULL);
   FXSYS_assert(pszSrcFileName != NULL && FXSYS_wcslen(pszSrcFileName) > 0);
 #if _FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN32_MOBILE_ || \
     _FX_OS_ == _FX_WIN64_
   CFX_WideString wsMode;
   if (dwAccess & FX_STREAMACCESS_Write) {
     if (dwAccess & FX_STREAMACCESS_Append) {
       wsMode = L"a+b";
     } else if (dwAccess & FX_STREAMACCESS_Truncate) {
       wsMode = L"w+b";
@@ skipping 143 matching lines @@
 }
 FX_BOOL CFX_FileStreamImp::SetLength(int32_t iLength) {
   FXSYS_assert(m_hFile != NULL && (m_dwAccess & FX_STREAMACCESS_Write) != 0);
   FX_BOOL bRet = FX_fsetsize(m_hFile, iLength);
   m_iLength = FX_filelength(m_hFile);
   return bRet;
 }
 CFX_FileReadStreamImp::CFX_FileReadStreamImp()
     : m_pFileRead(NULL), m_iPosition(0), m_iLength(0) {}
 FX_BOOL CFX_FileReadStreamImp::LoadFileRead(IFX_FileRead* pFileRead,
-                                            FX_DWORD dwAccess) {
+                                            uint32_t dwAccess) {
   FXSYS_assert(m_pFileRead == NULL && pFileRead != NULL);
   if (dwAccess & FX_STREAMACCESS_Write) {
     return FALSE;
   }
   m_pFileRead = pFileRead;
   m_iLength = m_pFileRead->GetSize();
   return TRUE;
 }
 int32_t CFX_FileReadStreamImp::GetLength() const {
   return m_iLength;
@@ skipping 53 matching lines @@
       m_bReleaseBufferRead(FALSE),
       m_iPosition(0),
       m_iBufferSize(0) {}
 CFX_BufferReadStreamImp::~CFX_BufferReadStreamImp() {
   if (m_bReleaseBufferRead && m_pBufferRead != NULL) {
     m_pBufferRead->Release();
   }
 }
 FX_BOOL CFX_BufferReadStreamImp::LoadBufferRead(IFX_BufferRead* pBufferRead,
                                                 int32_t iFileSize,
-                                                FX_DWORD dwAccess,
+                                                uint32_t dwAccess,
                                                 FX_BOOL bReleaseBufferRead) {
   FXSYS_assert(m_pBufferRead == NULL && pBufferRead != NULL);
   if (dwAccess & FX_STREAMACCESS_Write) {
     return FALSE;
   }
   m_bReleaseBufferRead = bReleaseBufferRead;
   m_pBufferRead = pBufferRead;
   m_iBufferSize = iFileSize;
   if (m_iBufferSize >= 0) {
     return TRUE;
@@ skipping 38 matching lines @@
                                           int32_t iBufferSize) {
   FXSYS_assert(m_pBufferRead != NULL);
   FXSYS_assert(pBuffer != NULL && iBufferSize > 0);
   int32_t iLength = GetLength();
   if (m_iPosition >= iLength) {
     return 0;
   }
   if (iBufferSize > iLength - m_iPosition) {
     iBufferSize = iLength - m_iPosition;
   }
-  FX_DWORD dwBlockOffset = m_pBufferRead->GetBlockOffset();
-  FX_DWORD dwBlockSize = m_pBufferRead->GetBlockSize();
+  uint32_t dwBlockOffset = m_pBufferRead->GetBlockOffset();
+  uint32_t dwBlockSize = m_pBufferRead->GetBlockSize();
   if (m_iPosition < (int32_t)dwBlockOffset) {
     if (!m_pBufferRead->ReadNextBlock(TRUE)) {
       return 0;
     }
     dwBlockOffset = m_pBufferRead->GetBlockOffset();
     dwBlockSize = m_pBufferRead->GetBlockSize();
   }
   while (m_iPosition < (int32_t)dwBlockOffset ||
          m_iPosition >= (int32_t)(dwBlockOffset + dwBlockSize)) {
     if (m_pBufferRead->IsEOF() || !m_pBufferRead->ReadNextBlock(FALSE)) {
       break;
     }
     dwBlockOffset = m_pBufferRead->GetBlockOffset();
     dwBlockSize = m_pBufferRead->GetBlockSize();
   }
   if (m_iPosition < (int32_t)dwBlockOffset ||
       m_iPosition >= (int32_t)(dwBlockOffset + dwBlockSize)) {
     return 0;
   }
   const uint8_t* pBufferTmp = m_pBufferRead->GetBlockBuffer();
-  FX_DWORD dwOffsetTmp = m_iPosition - dwBlockOffset;
-  FX_DWORD dwCopySize =
+  uint32_t dwOffsetTmp = m_iPosition - dwBlockOffset;
+  uint32_t dwCopySize =
       std::min(iBufferSize, (int32_t)(dwBlockSize - dwOffsetTmp));
   FXSYS_memcpy(pBuffer, pBufferTmp + dwOffsetTmp, dwCopySize);
   dwOffsetTmp = dwCopySize;
   iBufferSize -= dwCopySize;
   while (iBufferSize > 0) {
     if (!m_pBufferRead->ReadNextBlock(FALSE)) {
       break;
     }
     dwBlockOffset = m_pBufferRead->GetBlockOffset();
     dwBlockSize = m_pBufferRead->GetBlockSize();
     pBufferTmp = m_pBufferRead->GetBlockBuffer();
-    dwCopySize = std::min((FX_DWORD)iBufferSize, dwBlockSize);
+    dwCopySize = std::min((uint32_t)iBufferSize, dwBlockSize);
     FXSYS_memcpy(pBuffer + dwOffsetTmp, pBufferTmp, dwCopySize);
     dwOffsetTmp += dwCopySize;
     iBufferSize -= dwCopySize;
   }
   m_iPosition += dwOffsetTmp;
   return dwOffsetTmp;
 }
 int32_t CFX_BufferReadStreamImp::ReadString(FX_WCHAR* pStr,
                                             int32_t iMaxLength,
                                             FX_BOOL& bEOS) {
   FXSYS_assert(m_pBufferRead != NULL);
   FXSYS_assert(pStr != NULL && iMaxLength > 0);
   iMaxLength = ReadData((uint8_t*)pStr, iMaxLength * 2) / 2;
   if (iMaxLength <= 0) {
     return 0;
   }
   int32_t i = 0;
   while (i < iMaxLength && pStr[i] != L'\0') {
     ++i;
   }
   bEOS = (m_iPosition >= GetLength()) || pStr[i] == L'\0';
   return i;
 }
 CFX_FileWriteStreamImp::CFX_FileWriteStreamImp()
     : m_pFileWrite(NULL), m_iPosition(0) {}
 FX_BOOL CFX_FileWriteStreamImp::LoadFileWrite(IFX_FileWrite* pFileWrite,
-                                              FX_DWORD dwAccess) {
+                                              uint32_t dwAccess) {
   FXSYS_assert(m_pFileWrite == NULL && pFileWrite != NULL);
   if (dwAccess & FX_STREAMACCESS_Read) {
     return FALSE;
   }
   if (dwAccess & FX_STREAMACCESS_Append) {
     m_iPosition = pFileWrite->GetSize();
   }
   m_pFileWrite = pFileWrite;
   return TRUE;
 }
@@ skipping 46 matching lines @@
   }
 }
 CFX_BufferStreamImp::CFX_BufferStreamImp()
     : CFX_StreamImp(),
       m_pData(NULL),
       m_iTotalSize(0),
       m_iPosition(0),
       m_iLength(0) {}
 FX_BOOL CFX_BufferStreamImp::LoadBuffer(uint8_t* pData,
                                         int32_t iTotalSize,
-                                        FX_DWORD dwAccess) {
+                                        uint32_t dwAccess) {
   FXSYS_assert(m_pData == NULL);
   FXSYS_assert(pData != NULL && iTotalSize > 0);
   m_dwAccess = dwAccess;
   m_pData = pData;
   m_iTotalSize = iTotalSize;
   m_iPosition = 0;
   m_iLength = (dwAccess & FX_STREAMACCESS_Write) != 0 ? 0 : iTotalSize;
   return TRUE;
 }
 int32_t CFX_BufferStreamImp::GetLength() const {
@@ skipping 158 matching lines @@
 }
 void CFX_TextStream::Release() {
   if (--m_iRefCount < 1) {
     delete this;
   }
 }
 IFX_Stream* CFX_TextStream::Retain() {
   m_iRefCount++;
   return this;
 }
-FX_DWORD CFX_TextStream::GetAccessModes() const {
+uint32_t CFX_TextStream::GetAccessModes() const {
   return m_pStreamImp->GetAccessModes() | FX_STREAMACCESS_Text;
 }
 int32_t CFX_TextStream::GetLength() const {
   return m_pStreamImp->GetLength();
 }
 int32_t CFX_TextStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) {
   return m_pStreamImp->Seek(eSeek, iOffset);
 }
 int32_t CFX_TextStream::GetPosition() {
   return m_pStreamImp->GetPosition();
 }
 FX_BOOL CFX_TextStream::IsEOF() const {
   return m_pStreamImp->IsEOF();
 }
 int32_t CFX_TextStream::ReadData(uint8_t* pBuffer, int32_t iBufferSize) {
   return m_pStreamImp->ReadData(pBuffer, iBufferSize);
 }
 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);
 }
 uint16_t CFX_TextStream::GetCodePage() const {
   return m_wCodePage;
 }
-IFX_Stream* CFX_TextStream::CreateSharedStream(FX_DWORD dwAccess,
+IFX_Stream* CFX_TextStream::CreateSharedStream(uint32_t 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;
+  *(uint32_t*)bom = m_dwBOM;
   return m_wBOMLength;
 }
 uint16_t CFX_TextStream::SetCodePage(uint16_t wCodePage) {
   if (m_wBOMLength > 0) {
     return m_wCodePage;
   }
   uint16_t v = m_wCodePage;
   m_wCodePage = wCodePage;
   return v;
 }
@@ skipping 75 matching lines @@
       m_iPosition(0),
       m_iStart(0),
       m_iLength(0),
       m_iRefCount(1) {}
 CFX_Stream::~CFX_Stream() {
   if (m_eStreamType != FX_STREAMTYPE_Stream && m_pStreamImp != NULL) {
     m_pStreamImp->Release();
   }
 }
 FX_BOOL CFX_Stream::LoadFile(const FX_WCHAR* pszSrcFileName,
-                             FX_DWORD dwAccess) {
+                             uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) {
     return FALSE;
   }
   if (pszSrcFileName == NULL || FXSYS_wcslen(pszSrcFileName) < 1) {
     return FALSE;
   }
   m_pStreamImp = new CFX_FileStreamImp();
   FX_BOOL bRet =
       ((CFX_FileStreamImp*)m_pStreamImp)->LoadFile(pszSrcFileName, dwAccess);
   if (!bRet) {
     m_pStreamImp->Release();
     m_pStreamImp = NULL;
   } else {
     m_eStreamType = FX_STREAMTYPE_File;
     m_dwAccess = dwAccess;
     m_iLength = m_pStreamImp->GetLength();
   }
   return bRet;
 }
-FX_BOOL CFX_Stream::LoadFileRead(IFX_FileRead* pFileRead, FX_DWORD dwAccess) {
+FX_BOOL CFX_Stream::LoadFileRead(IFX_FileRead* pFileRead, uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) {
     return FALSE;
   }
   if (pFileRead == NULL) {
     return FALSE;
   }
   m_pStreamImp = new CFX_FileReadStreamImp();
   FX_BOOL bRet =
       ((CFX_FileReadStreamImp*)m_pStreamImp)->LoadFileRead(pFileRead, dwAccess);
   if (!bRet) {
     m_pStreamImp->Release();
     m_pStreamImp = NULL;
   } else {
     m_eStreamType = FX_STREAMTYPE_File;
     m_dwAccess = dwAccess;
     m_iLength = m_pStreamImp->GetLength();
   }
   return bRet;
 }
 FX_BOOL CFX_Stream::LoadFileWrite(IFX_FileWrite* pFileWrite,
-                                  FX_DWORD dwAccess) {
+                                  uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) {
     return FALSE;
   }
   if (pFileWrite == NULL) {
     return FALSE;
   }
   m_pStreamImp = new CFX_FileWriteStreamImp();
   FX_BOOL bRet = ((CFX_FileWriteStreamImp*)m_pStreamImp)
                      ->LoadFileWrite(pFileWrite, dwAccess);
   if (!bRet) {
     m_pStreamImp->Release();
     m_pStreamImp = NULL;
   } else {
     m_eStreamType = FX_STREAMTYPE_File;
     m_dwAccess = dwAccess;
     m_iLength = m_pStreamImp->GetLength();
   }
   return bRet;
 }
 FX_BOOL CFX_Stream::LoadBuffer(uint8_t* pData,
                                int32_t iTotalSize,
-                               FX_DWORD dwAccess) {
+                               uint32_t dwAccess) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) {
     return FALSE;
   }
   if (pData == NULL || iTotalSize < 1) {
     return FALSE;
   }
   m_pStreamImp = new CFX_BufferStreamImp();
   FX_BOOL bRet = ((CFX_BufferStreamImp*)m_pStreamImp)
                      ->LoadBuffer(pData, iTotalSize, dwAccess);
   if (!bRet) {
     m_pStreamImp->Release();
     m_pStreamImp = NULL;
   } else {
     m_eStreamType = FX_STREAMTYPE_Buffer;
     m_dwAccess = dwAccess;
     m_iLength = m_pStreamImp->GetLength();
   }
   return bRet;
 }
 FX_BOOL CFX_Stream::LoadBufferRead(IFX_BufferRead* pBufferRead,
                                    int32_t iFileSize,
-                                   FX_DWORD dwAccess,
+                                   uint32_t dwAccess,
                                    FX_BOOL bReleaseBufferRead) {
   if (m_eStreamType != FX_SREAMTYPE_Unknown || m_pStreamImp != NULL) {
     return FALSE;
   }
   if (!pBufferRead) {
     return FALSE;
   }
   m_pStreamImp = new CFX_BufferReadStreamImp;
   FX_BOOL bRet = ((CFX_BufferReadStreamImp*)m_pStreamImp)
                      ->LoadBufferRead(pBufferRead, iFileSize, dwAccess,
@@ skipping 198 matching lines @@
   return FX_CODEPAGE_UTF16BE;
 #endif
 }
 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,
+IFX_Stream* CFX_Stream::CreateSharedStream(uint32_t dwAccess,
                                            int32_t iOffset,
                                            int32_t iLength) {
   FXSYS_assert(iLength > 0);
   if (m_pStreamImp == NULL) {
     return NULL;
   }
   if ((m_dwAccess & FX_STREAMACCESS_Text) != 0 &&
       (dwAccess & FX_STREAMACCESS_Text) == 0) {
     return NULL;
   }
@@ skipping 168 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;
 }