Merge to XFA: Use stdint.h types throughout PDFium.
[pdfium.git] / xfa / src / fgas / src / crt / fx_stream.h
index 630a0fb..2273ab1 100644 (file)
@@ -17,7 +17,7 @@ class CFX_TextStream;
 class CFX_FileRead;\r
 class CFX_FileWrite;\r
 class CFX_BufferAccImp;\r
-class CFX_StreamImp : public CFX_ThreadLock, public CFX_Object\r
+class CFX_StreamImp : public CFX_ThreadLock\r
 {\r
 public:\r
     virtual void                       Release()\r
@@ -28,16 +28,16 @@ public:
     {\r
         return m_dwAccess;\r
     }\r
-    virtual FX_INT32           GetLength() const = 0;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset) = 0;\r
-    virtual FX_INT32           GetPosition() = 0;\r
+    virtual int32_t            GetLength() const = 0;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset) = 0;\r
+    virtual int32_t            GetPosition() = 0;\r
     virtual FX_BOOL                    IsEOF() const = 0;\r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize) = 0;\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS) = 0;\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize) = 0;\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength) = 0;\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize) = 0;\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS) = 0;\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize) = 0;\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength) = 0;\r
     virtual void                       Flush() = 0;\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength) = 0;\r
+    virtual FX_BOOL                    SetLength(int32_t iLength) = 0;\r
 protected:\r
     CFX_StreamImp();\r
     virtual ~CFX_StreamImp() {}\r
@@ -49,44 +49,44 @@ public:
     CFX_FileStreamImp();\r
     virtual ~CFX_FileStreamImp();\r
     FX_BOOL                    LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess);\r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition();\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition();\r
     virtual FX_BOOL                    IsEOF() const;\r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS);\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength);\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength);\r
     virtual void                       Flush();\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength);\r
+    virtual FX_BOOL                    SetLength(int32_t iLength);\r
 protected:\r
     FXSYS_FILE *m_hFile;\r
-    FX_INT32   m_iLength;\r
+    int32_t    m_iLength;\r
 };\r
 class CFX_BufferStreamImp : public CFX_StreamImp\r
 {\r
 public:\r
     CFX_BufferStreamImp();\r
     virtual ~CFX_BufferStreamImp() {}\r
-    FX_BOOL                    LoadBuffer(FX_LPBYTE pData, FX_INT32 iTotalSize, FX_DWORD dwAccess);\r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition();\r
+    FX_BOOL                    LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess);\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition();\r
     virtual FX_BOOL                    IsEOF() const;\r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS);\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength);\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength);\r
     virtual void                       Flush() {}\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength)\r
+    virtual FX_BOOL                    SetLength(int32_t iLength)\r
     {\r
         return FALSE;\r
     }\r
 protected:\r
     FX_LPBYTE  m_pData;\r
-    FX_INT32   m_iTotalSize;\r
-    FX_INT32   m_iPosition;\r
-    FX_INT32   m_iLength;\r
+    int32_t    m_iTotalSize;\r
+    int32_t    m_iPosition;\r
+    int32_t    m_iLength;\r
 };\r
 class CFX_FileReadStreamImp : public CFX_StreamImp\r
 {\r
@@ -94,69 +94,69 @@ public:
     CFX_FileReadStreamImp();\r
     virtual ~CFX_FileReadStreamImp() {}\r
     FX_BOOL                    LoadFileRead(IFX_FileRead *pFileRead, FX_DWORD dwAccess);\r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition()\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition()\r
     {\r
         return m_iPosition;\r
     }\r
     virtual FX_BOOL                    IsEOF() const;\r
 \r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS);\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize)\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize)\r
     {\r
         return 0;\r
     }\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength)\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength)\r
     {\r
         return 0;\r
     }\r
     virtual void                       Flush() {}\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength)\r
+    virtual FX_BOOL                    SetLength(int32_t iLength)\r
     {\r
         return FALSE;\r
     }\r
 protected:\r
     IFX_FileRead                       *m_pFileRead;\r
-    FX_INT32                           m_iPosition;\r
-    FX_INT32                           m_iLength;\r
+    int32_t                            m_iPosition;\r
+    int32_t                            m_iLength;\r
 };\r
 class CFX_BufferReadStreamImp : public CFX_StreamImp\r
 {\r
 public:\r
     CFX_BufferReadStreamImp();\r
     ~CFX_BufferReadStreamImp();\r
-    FX_BOOL                    LoadBufferRead(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_DWORD dwAccess, FX_BOOL bReleaseBufferRead);\r
+    FX_BOOL                    LoadBufferRead(IFX_BufferRead *pBufferRead, int32_t iFileSize, FX_DWORD dwAccess, FX_BOOL bReleaseBufferRead);\r
 \r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition()\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition()\r
     {\r
         return m_iPosition;\r
     }\r
     virtual FX_BOOL                    IsEOF() const;\r
 \r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS);\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize)\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize)\r
     {\r
         return 0;\r
     }\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength)\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength)\r
     {\r
         return 0;\r
     }\r
     virtual void                       Flush() {}\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength)\r
+    virtual FX_BOOL                    SetLength(int32_t iLength)\r
     {\r
         return FALSE;\r
     }\r
 private:\r
     IFX_BufferRead                     *m_pBufferRead;\r
     FX_BOOL                                    m_bReleaseBufferRead;\r
-    FX_INT32                           m_iPosition;\r
-    FX_INT32                           m_iBufferSize;\r
+    int32_t                            m_iPosition;\r
+    int32_t                            m_iBufferSize;\r
 };\r
 class CFX_FileWriteStreamImp : public CFX_StreamImp\r
 {\r
@@ -164,31 +164,31 @@ public:
     CFX_FileWriteStreamImp();\r
     virtual ~CFX_FileWriteStreamImp() {}\r
     FX_BOOL                    LoadFileWrite(IFX_FileWrite *pFileWrite, FX_DWORD dwAccess);\r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition()\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition()\r
     {\r
         return m_iPosition;\r
     }\r
     virtual FX_BOOL                    IsEOF() const;\r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize)\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize)\r
     {\r
         return 0;\r
     }\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS)\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS)\r
     {\r
         return 0;\r
     }\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength);\r
     virtual void                       Flush();\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength)\r
+    virtual FX_BOOL                    SetLength(int32_t iLength)\r
     {\r
         return FALSE;\r
     }\r
 protected:\r
     IFX_FileWrite                      *m_pFileWrite;\r
-    FX_INT32                           m_iPosition;\r
+    int32_t                            m_iPosition;\r
 };\r
 enum FX_STREAMTYPE {\r
     FX_SREAMTYPE_Unknown       =  0,\r
@@ -197,33 +197,33 @@ enum FX_STREAMTYPE {
     FX_STREAMTYPE_Stream               ,\r
     FX_STREAMTYPE_BufferRead   ,\r
 };\r
-class CFX_Stream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object\r
+class CFX_Stream : public IFX_Stream, public CFX_ThreadLock\r
 {\r
 public:\r
     CFX_Stream();\r
     ~CFX_Stream();\r
     FX_BOOL                    LoadFile(FX_LPCWSTR pszSrcFileName, FX_DWORD dwAccess);\r
-    FX_BOOL                    LoadBuffer(FX_LPBYTE pData, FX_INT32 iTotalSize, FX_DWORD dwAccess);\r
+    FX_BOOL                    LoadBuffer(FX_LPBYTE pData, int32_t iTotalSize, FX_DWORD dwAccess);\r
     FX_BOOL                    LoadFileRead(IFX_FileRead *pFileRead, FX_DWORD dwAccess);\r
     FX_BOOL                    LoadFileWrite(IFX_FileWrite *pFileWrite, FX_DWORD dwAccess);\r
-    FX_BOOL                    LoadBufferRead(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_DWORD dwAccess, FX_BOOL bReleaseBufferRead);\r
+    FX_BOOL                    LoadBufferRead(IFX_BufferRead *pBufferRead, int32_t iFileSize, FX_DWORD dwAccess, FX_BOOL bReleaseBufferRead);\r
     virtual void                       Release();\r
     virtual IFX_Stream*                Retain();\r
     virtual FX_DWORD           GetAccessModes() const\r
     {\r
         return m_dwAccess;\r
     }\r
-    virtual FX_INT32           GetLength() const;\r
-    virtual FX_INT32           Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32           GetPosition();\r
+    virtual int32_t            GetLength() const;\r
+    virtual int32_t            Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t            GetPosition();\r
     virtual FX_BOOL                    IsEOF() const;\r
-    virtual FX_INT32           ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS, FX_INT32 const *pByteSize = NULL);\r
-    virtual FX_INT32           WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32           WriteString(FX_LPCWSTR pStr, FX_INT32 iLength);\r
+    virtual int32_t            ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL);\r
+    virtual int32_t            WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t            WriteString(FX_LPCWSTR pStr, int32_t iLength);\r
     virtual void                       Flush();\r
-    virtual FX_BOOL                    SetLength(FX_INT32 iLength);\r
-    virtual FX_INT32           GetBOM(FX_BYTE bom[4]) const;\r
+    virtual FX_BOOL                    SetLength(int32_t iLength);\r
+    virtual int32_t            GetBOM(uint8_t bom[4]) const;\r
     virtual FX_WORD                    GetCodePage() const;\r
     virtual FX_WORD                    SetCodePage(FX_WORD wCodePage);\r
     virtual void                       Lock()\r
@@ -234,18 +234,18 @@ public:
     {\r
         CFX_ThreadLock::Unlock();\r
     }\r
-    virtual IFX_Stream*                CreateSharedStream(FX_DWORD dwAccess, FX_INT32 iOffset, FX_INT32 iLength);\r
+    virtual IFX_Stream*                CreateSharedStream(FX_DWORD dwAccess, int32_t iOffset, int32_t iLength);\r
 protected:\r
     FX_STREAMTYPE                      m_eStreamType;\r
     CFX_StreamImp                      *m_pStreamImp;\r
     FX_DWORD                           m_dwAccess;\r
-    FX_INT32                           m_iTotalSize;\r
-    FX_INT32                           m_iPosition;\r
-    FX_INT32                           m_iStart;\r
-    FX_INT32                           m_iLength;\r
-    FX_INT32                           m_iRefCount;\r
+    int32_t                            m_iTotalSize;\r
+    int32_t                            m_iPosition;\r
+    int32_t                            m_iStart;\r
+    int32_t                            m_iLength;\r
+    int32_t                            m_iRefCount;\r
 };\r
-class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock, public CFX_Object\r
+class CFX_TextStream : public IFX_Stream, public CFX_ThreadLock\r
 {\r
 public:\r
     CFX_TextStream(IFX_Stream *pStream, FX_BOOL bDelStream);\r
@@ -254,19 +254,19 @@ public:
     virtual IFX_Stream*                        Retain();\r
 \r
     virtual FX_DWORD                   GetAccessModes() const;\r
-    virtual FX_INT32                   GetLength() const;\r
-    virtual FX_INT32                   Seek(FX_STREAMSEEK eSeek, FX_INT32 iOffset);\r
-    virtual FX_INT32                   GetPosition();\r
+    virtual int32_t                    GetLength() const;\r
+    virtual int32_t                    Seek(FX_STREAMSEEK eSeek, int32_t iOffset);\r
+    virtual int32_t                    GetPosition();\r
     virtual FX_BOOL                            IsEOF() const;\r
 \r
-    virtual FX_INT32                   ReadData(FX_LPBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32                   ReadString(FX_LPWSTR pStr, FX_INT32 iMaxLength, FX_BOOL &bEOS, FX_INT32 const *pByteSize = NULL);\r
-    virtual FX_INT32                   WriteData(FX_LPCBYTE pBuffer, FX_INT32 iBufferSize);\r
-    virtual FX_INT32                   WriteString(FX_LPCWSTR pStr, FX_INT32 iLength);\r
+    virtual int32_t                    ReadData(FX_LPBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t                    ReadString(FX_LPWSTR pStr, int32_t iMaxLength, FX_BOOL &bEOS, int32_t const *pByteSize = NULL);\r
+    virtual int32_t                    WriteData(FX_LPCBYTE pBuffer, int32_t iBufferSize);\r
+    virtual int32_t                    WriteString(FX_LPCWSTR pStr, int32_t iLength);\r
     virtual void                               Flush();\r
-    virtual FX_BOOL                            SetLength(FX_INT32 iLength);\r
+    virtual FX_BOOL                            SetLength(int32_t iLength);\r
 \r
-    virtual FX_INT32                   GetBOM(FX_BYTE bom[4]) const;\r
+    virtual int32_t                    GetBOM(uint8_t bom[4]) const;\r
     virtual FX_WORD                            GetCodePage() const;\r
     virtual FX_WORD                            SetCodePage(FX_WORD wCodePage);\r
 \r
@@ -279,20 +279,20 @@ public:
         CFX_ThreadLock::Unlock();\r
     }\r
 \r
-    virtual IFX_Stream*                        CreateSharedStream(FX_DWORD dwAccess, FX_INT32 iOffset, FX_INT32 iLength);\r
+    virtual IFX_Stream*                        CreateSharedStream(FX_DWORD dwAccess, int32_t iOffset, int32_t iLength);\r
 protected:\r
     FX_WORD            m_wCodePage;\r
     FX_WORD            m_wBOMLength;\r
     FX_DWORD   m_dwBOM;\r
     FX_LPBYTE  m_pBuf;\r
-    FX_INT32   m_iBufSize;\r
+    int32_t    m_iBufSize;\r
     FX_BOOL            m_bDelStream;\r
     IFX_Stream *m_pStreamImp;\r
-    FX_INT32   m_iRefCount;\r
+    int32_t    m_iRefCount;\r
     void               InitStream();\r
 };\r
 #ifdef FX_FILESIZE\r
-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object\r
+class CFGAS_FileRead : public IFX_FileRead\r
 {\r
 public:\r
     CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);\r
@@ -308,7 +308,7 @@ protected:
     IFX_Stream                         *m_pStream;\r
 };\r
 #else\r
-class CFGAS_FileRead : public IFX_FileRead, public CFX_Object\r
+class CFGAS_FileRead : public IFX_FileRead\r
 {\r
 public:\r
     CFGAS_FileRead(IFX_Stream *pStream, FX_BOOL bReleaseStream);\r
@@ -327,7 +327,7 @@ protected:
 };\r
 #endif\r
 #ifdef FX_FILESIZE\r
-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object\r
+class CFX_BufferAccImp : public IFX_FileRead\r
 {\r
 public:\r
     CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_FILESIZE iFileSize, FX_BOOL bReleaseStream);\r
@@ -344,10 +344,10 @@ protected:
     FX_FILESIZE                                m_iBufSize;\r
 };\r
 #else\r
-class CFX_BufferAccImp : public IFX_FileRead, public CFX_Object\r
+class CFX_BufferAccImp : public IFX_FileRead\r
 {\r
 public:\r
-    CFX_BufferAccImp(IFX_BufferRead *pBufferRead, FX_INT32 iFileSize, FX_BOOL bReleaseStream);\r
+    CFX_BufferAccImp(IFX_BufferRead *pBufferRead, int32_t iFileSize, FX_BOOL bReleaseStream);\r
     virtual ~CFX_BufferAccImp();\r
 \r
     virtual void                       Release()\r
@@ -360,11 +360,11 @@ public:
 protected:\r
     IFX_BufferRead                     *m_pBufferRead;\r
     FX_BOOL                                    m_bReleaseStream;\r
-    FX_INT32                           m_iBufSize;\r
+    int32_t                            m_iBufSize;\r
 };\r
 #endif\r
 #ifdef FX_FILESIZE\r
-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object\r
+class CFGAS_FileWrite : public IFX_FileWrite\r
 {\r
 public:\r
     CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);\r
@@ -382,7 +382,7 @@ protected:
     FX_BOOL                                    m_bReleaseStream;\r
 };\r
 #else\r
-class CFGAS_FileWrite : public IFX_FileWrite, public CFX_Object\r
+class CFGAS_FileWrite : public IFX_FileWrite\r
 {\r
 public:\r
     CFGAS_FileWrite(IFX_Stream *pStream, FX_BOOL bReleaseStream);\r