| Index: core/include/fxcrt/fx_basic.h
|
| diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
|
| index 5e945e7aee74e66a2ec1b0bf6bd60e10bddca73e..7181b199427ce6ffbaa4a9edf2acc8f3c0460286 100644
|
| --- a/core/include/fxcrt/fx_basic.h
|
| +++ b/core/include/fxcrt/fx_basic.h
|
| @@ -25,1478 +25,1262 @@
|
| // Note that the function doesn't need an implementation, as we only
|
| // use its type.
|
| template <typename T, size_t N>
|
| -char (&ArraySizeHelper(T (&array)[N]))[N];
|
| +char(&ArraySizeHelper(T(&array)[N]))[N];
|
|
|
| -class CFX_BinaryBuf
|
| -{
|
| -public:
|
| - CFX_BinaryBuf();
|
| - CFX_BinaryBuf(FX_STRSIZE size);
|
| +class CFX_BinaryBuf {
|
| + public:
|
| + CFX_BinaryBuf();
|
| + CFX_BinaryBuf(FX_STRSIZE size);
|
|
|
| - ~CFX_BinaryBuf();
|
| + ~CFX_BinaryBuf();
|
|
|
| - void Clear();
|
| + void Clear();
|
|
|
| - void EstimateSize(FX_STRSIZE size, FX_STRSIZE alloc_step = 0);
|
| + void EstimateSize(FX_STRSIZE size, FX_STRSIZE alloc_step = 0);
|
|
|
| - void AppendBlock(const void* pBuf, FX_STRSIZE size);
|
| + void AppendBlock(const void* pBuf, FX_STRSIZE size);
|
|
|
| - void AppendFill(uint8_t byte, FX_STRSIZE count);
|
| + void AppendFill(uint8_t byte, FX_STRSIZE count);
|
|
|
| - void AppendString(const CFX_ByteStringC& str)
|
| - {
|
| - AppendBlock(str.GetPtr(), str.GetLength());
|
| - }
|
| + void AppendString(const CFX_ByteStringC& str) {
|
| + AppendBlock(str.GetPtr(), str.GetLength());
|
| + }
|
|
|
| - inline void AppendByte(uint8_t byte)
|
| - {
|
| - if (m_AllocSize <= m_DataSize) {
|
| - ExpandBuf(1);
|
| - }
|
| - m_pBuffer[m_DataSize++] = byte;
|
| + inline void AppendByte(uint8_t byte) {
|
| + if (m_AllocSize <= m_DataSize) {
|
| + ExpandBuf(1);
|
| }
|
| + m_pBuffer[m_DataSize++] = byte;
|
| + }
|
|
|
| - void InsertBlock(FX_STRSIZE pos, const void* pBuf, FX_STRSIZE size);
|
| + void InsertBlock(FX_STRSIZE pos, const void* pBuf, FX_STRSIZE size);
|
|
|
| - void AttachData(void* pBuf, FX_STRSIZE size);
|
| + void AttachData(void* pBuf, FX_STRSIZE size);
|
|
|
| - void CopyData(const void* pBuf, FX_STRSIZE size);
|
| + void CopyData(const void* pBuf, FX_STRSIZE size);
|
|
|
| - void TakeOver(CFX_BinaryBuf& other);
|
| + void TakeOver(CFX_BinaryBuf& other);
|
|
|
| - void Delete(int start_index, int count);
|
| + void Delete(int start_index, int count);
|
|
|
| - uint8_t* GetBuffer() const
|
| - {
|
| - return m_pBuffer;
|
| - }
|
| + uint8_t* GetBuffer() const { return m_pBuffer; }
|
|
|
| - FX_STRSIZE GetSize() const
|
| - {
|
| - return m_DataSize;
|
| - }
|
| + FX_STRSIZE GetSize() const { return m_DataSize; }
|
|
|
| - CFX_ByteStringC GetByteString() const;
|
| + CFX_ByteStringC GetByteString() const;
|
|
|
| - void DetachBuffer();
|
| -protected:
|
| + void DetachBuffer();
|
|
|
| - FX_STRSIZE m_AllocStep;
|
| + protected:
|
| + FX_STRSIZE m_AllocStep;
|
|
|
| - uint8_t* m_pBuffer;
|
| + uint8_t* m_pBuffer;
|
|
|
| - FX_STRSIZE m_DataSize;
|
| + FX_STRSIZE m_DataSize;
|
|
|
| - FX_STRSIZE m_AllocSize;
|
| + FX_STRSIZE m_AllocSize;
|
|
|
| - void ExpandBuf(FX_STRSIZE size);
|
| + void ExpandBuf(FX_STRSIZE size);
|
| };
|
| -class CFX_ByteTextBuf : public CFX_BinaryBuf
|
| -{
|
| -public:
|
| +class CFX_ByteTextBuf : public CFX_BinaryBuf {
|
| + public:
|
| + void operator=(const CFX_ByteStringC& str);
|
|
|
| - void operator = (const CFX_ByteStringC& str);
|
| + void AppendChar(int ch) { AppendByte((uint8_t)ch); }
|
|
|
| - void AppendChar(int ch)
|
| - {
|
| - AppendByte((uint8_t)ch);
|
| - }
|
| -
|
| - CFX_ByteTextBuf& operator << (int i);
|
| + CFX_ByteTextBuf& operator<<(int i);
|
|
|
| - CFX_ByteTextBuf& operator << (FX_DWORD i);
|
| + CFX_ByteTextBuf& operator<<(FX_DWORD i);
|
|
|
| - CFX_ByteTextBuf& operator << (double f);
|
| + CFX_ByteTextBuf& operator<<(double f);
|
|
|
| - CFX_ByteTextBuf& operator << (const CFX_ByteStringC& lpsz);
|
| + CFX_ByteTextBuf& operator<<(const CFX_ByteStringC& lpsz);
|
|
|
| - CFX_ByteTextBuf& operator << (const CFX_ByteTextBuf& buf);
|
| + CFX_ByteTextBuf& operator<<(const CFX_ByteTextBuf& buf);
|
|
|
| - FX_STRSIZE GetLength() const
|
| - {
|
| - return m_DataSize;
|
| - }
|
| + FX_STRSIZE GetLength() const { return m_DataSize; }
|
| };
|
| -class CFX_WideTextBuf : public CFX_BinaryBuf
|
| -{
|
| -public:
|
| +class CFX_WideTextBuf : public CFX_BinaryBuf {
|
| + public:
|
| + void operator=(const FX_WCHAR* lpsz);
|
|
|
| - void operator = (const FX_WCHAR* lpsz);
|
| + void operator=(const CFX_WideStringC& str);
|
|
|
| - void operator = (const CFX_WideStringC& str);
|
| + void AppendChar(FX_WCHAR wch);
|
|
|
| - void AppendChar(FX_WCHAR wch);
|
| + CFX_WideTextBuf& operator<<(int i);
|
|
|
| - CFX_WideTextBuf& operator << (int i);
|
| + CFX_WideTextBuf& operator<<(double f);
|
|
|
| - CFX_WideTextBuf& operator << (double f);
|
| + CFX_WideTextBuf& operator<<(const FX_WCHAR* lpsz);
|
|
|
| - CFX_WideTextBuf& operator << (const FX_WCHAR* lpsz);
|
| + CFX_WideTextBuf& operator<<(const CFX_WideStringC& str);
|
| + CFX_WideTextBuf& operator<<(const CFX_WideString& str);
|
|
|
| - CFX_WideTextBuf& operator << (const CFX_WideStringC& str);
|
| - CFX_WideTextBuf& operator << (const CFX_WideString &str);
|
| + CFX_WideTextBuf& operator<<(const CFX_WideTextBuf& buf);
|
|
|
| - CFX_WideTextBuf& operator << (const CFX_WideTextBuf& buf);
|
| + FX_STRSIZE GetLength() const { return m_DataSize / sizeof(FX_WCHAR); }
|
|
|
| - FX_STRSIZE GetLength() const
|
| - {
|
| - return m_DataSize / sizeof(FX_WCHAR);
|
| - }
|
| -
|
| - FX_WCHAR* GetBuffer() const
|
| - {
|
| - return (FX_WCHAR*)m_pBuffer;
|
| - }
|
| + FX_WCHAR* GetBuffer() const { return (FX_WCHAR*)m_pBuffer; }
|
|
|
| - void Delete(int start_index, int count)
|
| - {
|
| - CFX_BinaryBuf::Delete(start_index * sizeof(FX_WCHAR), count * sizeof(FX_WCHAR));
|
| - }
|
| + void Delete(int start_index, int count) {
|
| + CFX_BinaryBuf::Delete(start_index * sizeof(FX_WCHAR),
|
| + count * sizeof(FX_WCHAR));
|
| + }
|
|
|
| - CFX_WideStringC GetWideString() const;
|
| + CFX_WideStringC GetWideString() const;
|
| };
|
|
|
| -class IFX_BufferArchive
|
| -{
|
| -public:
|
| - IFX_BufferArchive(FX_STRSIZE size);
|
| - virtual ~IFX_BufferArchive() {}
|
| -
|
| - virtual void Clear();
|
| -
|
| - FX_BOOL Flush();
|
| +class IFX_BufferArchive {
|
| + public:
|
| + IFX_BufferArchive(FX_STRSIZE size);
|
| + virtual ~IFX_BufferArchive() {}
|
|
|
| - int32_t AppendBlock(const void* pBuf, size_t size);
|
| + virtual void Clear();
|
|
|
| - int32_t AppendByte(uint8_t byte);
|
| + FX_BOOL Flush();
|
|
|
| - int32_t AppendDWord(FX_DWORD i);
|
| + int32_t AppendBlock(const void* pBuf, size_t size);
|
|
|
| + int32_t AppendByte(uint8_t byte);
|
|
|
| - int32_t AppendString(const CFX_ByteStringC& lpsz);
|
| + int32_t AppendDWord(FX_DWORD i);
|
|
|
| -protected:
|
| + int32_t AppendString(const CFX_ByteStringC& lpsz);
|
|
|
| - virtual FX_BOOL DoWork(const void* pBuf, size_t size) = 0;
|
| + protected:
|
| + virtual FX_BOOL DoWork(const void* pBuf, size_t size) = 0;
|
|
|
| - FX_STRSIZE m_BufSize;
|
| + FX_STRSIZE m_BufSize;
|
|
|
| - uint8_t* m_pBuffer;
|
| + uint8_t* m_pBuffer;
|
|
|
| - FX_STRSIZE m_Length;
|
| + FX_STRSIZE m_Length;
|
| };
|
|
|
| -class CFX_FileBufferArchive : public IFX_BufferArchive
|
| -{
|
| -public:
|
| - CFX_FileBufferArchive(FX_STRSIZE size = 32768);
|
| - ~CFX_FileBufferArchive() override;
|
| +class CFX_FileBufferArchive : public IFX_BufferArchive {
|
| + public:
|
| + CFX_FileBufferArchive(FX_STRSIZE size = 32768);
|
| + ~CFX_FileBufferArchive() override;
|
|
|
| - void Clear() override;
|
| + void Clear() override;
|
|
|
| - FX_BOOL AttachFile(IFX_StreamWrite *pFile, FX_BOOL bTakeover = FALSE);
|
| + FX_BOOL AttachFile(IFX_StreamWrite* pFile, FX_BOOL bTakeover = FALSE);
|
|
|
| - FX_BOOL AttachFile(const FX_WCHAR* filename);
|
| + FX_BOOL AttachFile(const FX_WCHAR* filename);
|
|
|
| - FX_BOOL AttachFile(const FX_CHAR* filename);
|
| + FX_BOOL AttachFile(const FX_CHAR* filename);
|
|
|
| -private:
|
| - FX_BOOL DoWork(const void* pBuf, size_t size) override;
|
| + private:
|
| + FX_BOOL DoWork(const void* pBuf, size_t size) override;
|
|
|
| - IFX_StreamWrite* m_pFile;
|
| + IFX_StreamWrite* m_pFile;
|
|
|
| - FX_BOOL m_bTakeover;
|
| + FX_BOOL m_bTakeover;
|
| };
|
|
|
| struct CFX_CharMap {
|
| + static CFX_CharMap* GetDefaultMapper(int32_t codepage = 0);
|
|
|
| - static CFX_CharMap* GetDefaultMapper(int32_t codepage = 0);
|
| + CFX_WideString (*m_GetWideString)(CFX_CharMap* pMap,
|
| + const CFX_ByteString& bstr);
|
|
|
| + CFX_ByteString (*m_GetByteString)(CFX_CharMap* pMap,
|
| + const CFX_WideString& wstr);
|
|
|
| - CFX_WideString (*m_GetWideString)(CFX_CharMap* pMap, const CFX_ByteString& bstr);
|
| -
|
| - CFX_ByteString (*m_GetByteString)(CFX_CharMap* pMap, const CFX_WideString& wstr);
|
| -
|
| - int32_t (*m_GetCodePage)();
|
| + int32_t (*m_GetCodePage)();
|
| };
|
| -class CFX_UTF8Decoder
|
| -{
|
| -public:
|
| - CFX_UTF8Decoder()
|
| - {
|
| - m_PendingBytes = 0;
|
| - }
|
| +class CFX_UTF8Decoder {
|
| + public:
|
| + CFX_UTF8Decoder() { m_PendingBytes = 0; }
|
|
|
| - void Clear();
|
| + void Clear();
|
|
|
| - void Input(uint8_t byte);
|
| + void Input(uint8_t byte);
|
|
|
| - void AppendChar(FX_DWORD ch);
|
| + void AppendChar(FX_DWORD ch);
|
|
|
| - void ClearStatus()
|
| - {
|
| - m_PendingBytes = 0;
|
| - }
|
| + void ClearStatus() { m_PendingBytes = 0; }
|
|
|
| - CFX_WideStringC GetResult() const
|
| - {
|
| - return m_Buffer.GetWideString();
|
| - }
|
| -protected:
|
| + CFX_WideStringC GetResult() const { return m_Buffer.GetWideString(); }
|
|
|
| - int m_PendingBytes;
|
| + protected:
|
| + int m_PendingBytes;
|
|
|
| - FX_DWORD m_PendingChar;
|
| + FX_DWORD m_PendingChar;
|
|
|
| - CFX_WideTextBuf m_Buffer;
|
| + CFX_WideTextBuf m_Buffer;
|
| };
|
| -class CFX_UTF8Encoder
|
| -{
|
| -public:
|
| - CFX_UTF8Encoder()
|
| - {
|
| - m_UTF16First = 0;
|
| - }
|
| +class CFX_UTF8Encoder {
|
| + public:
|
| + CFX_UTF8Encoder() { m_UTF16First = 0; }
|
|
|
| - void Input(FX_WCHAR unicode);
|
| + void Input(FX_WCHAR unicode);
|
|
|
| - void AppendStr(const CFX_ByteStringC& str)
|
| - {
|
| - m_UTF16First = 0;
|
| - m_Buffer << str;
|
| - }
|
| + void AppendStr(const CFX_ByteStringC& str) {
|
| + m_UTF16First = 0;
|
| + m_Buffer << str;
|
| + }
|
|
|
| - CFX_ByteStringC GetResult() const
|
| - {
|
| - return m_Buffer.GetByteString();
|
| - }
|
| -protected:
|
| + CFX_ByteStringC GetResult() const { return m_Buffer.GetByteString(); }
|
|
|
| - CFX_ByteTextBuf m_Buffer;
|
| + protected:
|
| + CFX_ByteTextBuf m_Buffer;
|
|
|
| - FX_DWORD m_UTF16First;
|
| + FX_DWORD m_UTF16First;
|
| };
|
| CFX_ByteString FX_UrlEncode(const CFX_WideString& wsUrl);
|
| CFX_WideString FX_UrlDecode(const CFX_ByteString& bsUrl);
|
| CFX_ByteString FX_EncodeURI(const CFX_WideString& wsURI);
|
| CFX_WideString FX_DecodeURI(const CFX_ByteString& bsURI);
|
| -class CFX_BasicArray
|
| -{
|
| -protected:
|
| - CFX_BasicArray(int unit_size);
|
| +class CFX_BasicArray {
|
| + protected:
|
| + CFX_BasicArray(int unit_size);
|
|
|
| - ~CFX_BasicArray();
|
| + ~CFX_BasicArray();
|
|
|
| - FX_BOOL SetSize(int nNewSize);
|
| + FX_BOOL SetSize(int nNewSize);
|
|
|
| - FX_BOOL Append(const CFX_BasicArray& src);
|
| + FX_BOOL Append(const CFX_BasicArray& src);
|
|
|
| - FX_BOOL Copy(const CFX_BasicArray& src);
|
| + FX_BOOL Copy(const CFX_BasicArray& src);
|
|
|
| - uint8_t* InsertSpaceAt(int nIndex, int nCount);
|
| + uint8_t* InsertSpaceAt(int nIndex, int nCount);
|
|
|
| - FX_BOOL RemoveAt(int nIndex, int nCount);
|
| + FX_BOOL RemoveAt(int nIndex, int nCount);
|
|
|
| - FX_BOOL InsertAt(int nStartIndex, const CFX_BasicArray* pNewArray);
|
| + FX_BOOL InsertAt(int nStartIndex, const CFX_BasicArray* pNewArray);
|
|
|
| - const void* GetDataPtr(int index) const;
|
| -protected:
|
| + const void* GetDataPtr(int index) const;
|
|
|
| - uint8_t* m_pData;
|
| + protected:
|
| + uint8_t* m_pData;
|
|
|
| - int m_nSize;
|
| + int m_nSize;
|
|
|
| - int m_nMaxSize;
|
| + int m_nMaxSize;
|
|
|
| - int m_nUnitSize;
|
| + int m_nUnitSize;
|
| };
|
| -template<class TYPE>
|
| -class CFX_ArrayTemplate : public CFX_BasicArray
|
| -{
|
| -public:
|
| - CFX_ArrayTemplate() : CFX_BasicArray(sizeof(TYPE)) {}
|
| -
|
| - int GetSize() const
|
| - {
|
| - return m_nSize;
|
| - }
|
| +template <class TYPE>
|
| +class CFX_ArrayTemplate : public CFX_BasicArray {
|
| + public:
|
| + CFX_ArrayTemplate() : CFX_BasicArray(sizeof(TYPE)) {}
|
|
|
| - int GetUpperBound() const
|
| - {
|
| - return m_nSize - 1;
|
| - }
|
| + int GetSize() const { return m_nSize; }
|
|
|
| - FX_BOOL SetSize(int nNewSize)
|
| - {
|
| - return CFX_BasicArray::SetSize(nNewSize);
|
| - }
|
| + int GetUpperBound() const { return m_nSize - 1; }
|
|
|
| - void RemoveAll()
|
| - {
|
| - SetSize(0);
|
| - }
|
| + FX_BOOL SetSize(int nNewSize) { return CFX_BasicArray::SetSize(nNewSize); }
|
|
|
| - const TYPE GetAt(int nIndex) const
|
| - {
|
| - if (nIndex < 0 || nIndex >= m_nSize) {
|
| - return (const TYPE&)(*(volatile const TYPE*)NULL);
|
| - }
|
| - return ((const TYPE*)m_pData)[nIndex];
|
| - }
|
| + void RemoveAll() { SetSize(0); }
|
|
|
| - FX_BOOL SetAt(int nIndex, TYPE newElement)
|
| - {
|
| - if (nIndex < 0 || nIndex >= m_nSize) {
|
| - return FALSE;
|
| - }
|
| - ((TYPE*)m_pData)[nIndex] = newElement;
|
| - return TRUE;
|
| + const TYPE GetAt(int nIndex) const {
|
| + if (nIndex < 0 || nIndex >= m_nSize) {
|
| + return (const TYPE&)(*(volatile const TYPE*)NULL);
|
| }
|
| + return ((const TYPE*)m_pData)[nIndex];
|
| + }
|
|
|
| - TYPE& ElementAt(int nIndex)
|
| - {
|
| - if (nIndex < 0 || nIndex >= m_nSize) {
|
| - return *(TYPE*)NULL;
|
| - }
|
| - return ((TYPE*)m_pData)[nIndex];
|
| + FX_BOOL SetAt(int nIndex, TYPE newElement) {
|
| + if (nIndex < 0 || nIndex >= m_nSize) {
|
| + return FALSE;
|
| }
|
| + ((TYPE*)m_pData)[nIndex] = newElement;
|
| + return TRUE;
|
| + }
|
|
|
| - const TYPE* GetData() const
|
| - {
|
| - return (const TYPE*)m_pData;
|
| + TYPE& ElementAt(int nIndex) {
|
| + if (nIndex < 0 || nIndex >= m_nSize) {
|
| + return *(TYPE*)NULL;
|
| }
|
| + return ((TYPE*)m_pData)[nIndex];
|
| + }
|
|
|
| - TYPE* GetData()
|
| - {
|
| - return (TYPE*)m_pData;
|
| - }
|
| + const TYPE* GetData() const { return (const TYPE*)m_pData; }
|
|
|
| - FX_BOOL SetAtGrow(int nIndex, TYPE newElement)
|
| - {
|
| - if (nIndex < 0) {
|
| - return FALSE;
|
| - }
|
| - if (nIndex >= m_nSize)
|
| - if (!SetSize(nIndex + 1)) {
|
| - return FALSE;
|
| - }
|
| - ((TYPE*)m_pData)[nIndex] = newElement;
|
| - return TRUE;
|
| - }
|
| + TYPE* GetData() { return (TYPE*)m_pData; }
|
|
|
| - FX_BOOL Add(TYPE newElement)
|
| - {
|
| - if (m_nSize < m_nMaxSize) {
|
| - m_nSize ++;
|
| - } else if (!SetSize(m_nSize + 1)) {
|
| - return FALSE;
|
| - }
|
| - ((TYPE*)m_pData)[m_nSize - 1] = newElement;
|
| - return TRUE;
|
| + FX_BOOL SetAtGrow(int nIndex, TYPE newElement) {
|
| + if (nIndex < 0) {
|
| + return FALSE;
|
| }
|
| + if (nIndex >= m_nSize)
|
| + if (!SetSize(nIndex + 1)) {
|
| + return FALSE;
|
| + }
|
| + ((TYPE*)m_pData)[nIndex] = newElement;
|
| + return TRUE;
|
| + }
|
|
|
| - FX_BOOL Append(const CFX_ArrayTemplate& src)
|
| - {
|
| - return CFX_BasicArray::Append(src);
|
| + FX_BOOL Add(TYPE newElement) {
|
| + if (m_nSize < m_nMaxSize) {
|
| + m_nSize++;
|
| + } else if (!SetSize(m_nSize + 1)) {
|
| + return FALSE;
|
| }
|
| + ((TYPE*)m_pData)[m_nSize - 1] = newElement;
|
| + return TRUE;
|
| + }
|
|
|
| - FX_BOOL Copy(const CFX_ArrayTemplate& src)
|
| - {
|
| - return CFX_BasicArray::Copy(src);
|
| - }
|
| + FX_BOOL Append(const CFX_ArrayTemplate& src) {
|
| + return CFX_BasicArray::Append(src);
|
| + }
|
|
|
| - TYPE* GetDataPtr(int index)
|
| - {
|
| - return (TYPE*)CFX_BasicArray::GetDataPtr(index);
|
| - }
|
| + FX_BOOL Copy(const CFX_ArrayTemplate& src) {
|
| + return CFX_BasicArray::Copy(src);
|
| + }
|
|
|
| - TYPE* AddSpace()
|
| - {
|
| - return (TYPE*)CFX_BasicArray::InsertSpaceAt(m_nSize, 1);
|
| - }
|
| + TYPE* GetDataPtr(int index) {
|
| + return (TYPE*)CFX_BasicArray::GetDataPtr(index);
|
| + }
|
|
|
| - TYPE* InsertSpaceAt(int nIndex, int nCount)
|
| - {
|
| - return (TYPE*)CFX_BasicArray::InsertSpaceAt(nIndex, nCount);
|
| - }
|
| + TYPE* AddSpace() { return (TYPE*)CFX_BasicArray::InsertSpaceAt(m_nSize, 1); }
|
|
|
| - const TYPE operator[](int nIndex) const
|
| - {
|
| - if (nIndex < 0 || nIndex >= m_nSize) {
|
| - *(volatile char*)0 = '\0';
|
| - }
|
| - return ((const TYPE*)m_pData)[nIndex];
|
| - }
|
| + TYPE* InsertSpaceAt(int nIndex, int nCount) {
|
| + return (TYPE*)CFX_BasicArray::InsertSpaceAt(nIndex, nCount);
|
| + }
|
|
|
| - TYPE& operator[](int nIndex)
|
| - {
|
| - if (nIndex < 0 || nIndex >= m_nSize) {
|
| - *(volatile char*)0 = '\0';
|
| - }
|
| - return ((TYPE*)m_pData)[nIndex];
|
| + const TYPE operator[](int nIndex) const {
|
| + if (nIndex < 0 || nIndex >= m_nSize) {
|
| + *(volatile char*)0 = '\0';
|
| }
|
| + return ((const TYPE*)m_pData)[nIndex];
|
| + }
|
|
|
| - FX_BOOL InsertAt(int nIndex, TYPE newElement, int nCount = 1)
|
| - {
|
| - if (!InsertSpaceAt(nIndex, nCount)) {
|
| - return FALSE;
|
| - }
|
| - while (nCount--) {
|
| - ((TYPE*)m_pData)[nIndex++] = newElement;
|
| - }
|
| - return TRUE;
|
| + TYPE& operator[](int nIndex) {
|
| + if (nIndex < 0 || nIndex >= m_nSize) {
|
| + *(volatile char*)0 = '\0';
|
| }
|
| + return ((TYPE*)m_pData)[nIndex];
|
| + }
|
|
|
| - FX_BOOL RemoveAt(int nIndex, int nCount = 1)
|
| - {
|
| - return CFX_BasicArray::RemoveAt(nIndex, nCount);
|
| + FX_BOOL InsertAt(int nIndex, TYPE newElement, int nCount = 1) {
|
| + if (!InsertSpaceAt(nIndex, nCount)) {
|
| + return FALSE;
|
| }
|
| -
|
| - FX_BOOL InsertAt(int nStartIndex, const CFX_BasicArray* pNewArray)
|
| - {
|
| - return CFX_BasicArray::InsertAt(nStartIndex, pNewArray);
|
| + while (nCount--) {
|
| + ((TYPE*)m_pData)[nIndex++] = newElement;
|
| }
|
| + return TRUE;
|
| + }
|
|
|
| - int Find(TYPE data, int iStart = 0) const
|
| - {
|
| - if (iStart < 0) {
|
| - return -1;
|
| - }
|
| - for (; iStart < (int)m_nSize; iStart ++)
|
| - if (((TYPE*)m_pData)[iStart] == data) {
|
| - return iStart;
|
| - }
|
| - return -1;
|
| + FX_BOOL RemoveAt(int nIndex, int nCount = 1) {
|
| + return CFX_BasicArray::RemoveAt(nIndex, nCount);
|
| + }
|
| +
|
| + FX_BOOL InsertAt(int nStartIndex, const CFX_BasicArray* pNewArray) {
|
| + return CFX_BasicArray::InsertAt(nStartIndex, pNewArray);
|
| + }
|
| +
|
| + int Find(TYPE data, int iStart = 0) const {
|
| + if (iStart < 0) {
|
| + return -1;
|
| }
|
| + for (; iStart < (int)m_nSize; iStart++)
|
| + if (((TYPE*)m_pData)[iStart] == data) {
|
| + return iStart;
|
| + }
|
| + return -1;
|
| + }
|
| };
|
| -typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
|
| -typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
|
| -typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
|
| -typedef CFX_ArrayTemplate<void*> CFX_PtrArray;
|
| -typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
|
| -typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
|
| -typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
|
| +typedef CFX_ArrayTemplate<uint8_t> CFX_ByteArray;
|
| +typedef CFX_ArrayTemplate<FX_WORD> CFX_WordArray;
|
| +typedef CFX_ArrayTemplate<FX_DWORD> CFX_DWordArray;
|
| +typedef CFX_ArrayTemplate<void*> CFX_PtrArray;
|
| +typedef CFX_ArrayTemplate<FX_FILESIZE> CFX_FileSizeArray;
|
| +typedef CFX_ArrayTemplate<FX_FLOAT> CFX_FloatArray;
|
| +typedef CFX_ArrayTemplate<int32_t> CFX_Int32Array;
|
| template <class ObjectClass>
|
| -class CFX_ObjectArray : public CFX_BasicArray
|
| -{
|
| -public:
|
| - CFX_ObjectArray() : CFX_BasicArray(sizeof(ObjectClass)) {}
|
| -
|
| - ~CFX_ObjectArray()
|
| - {
|
| - RemoveAll();
|
| - }
|
| +class CFX_ObjectArray : public CFX_BasicArray {
|
| + public:
|
| + CFX_ObjectArray() : CFX_BasicArray(sizeof(ObjectClass)) {}
|
|
|
| - void Add(const ObjectClass& data)
|
| - {
|
| - new ((void*)InsertSpaceAt(m_nSize, 1)) ObjectClass(data);
|
| - }
|
| + ~CFX_ObjectArray() { RemoveAll(); }
|
|
|
| - ObjectClass& Add()
|
| - {
|
| - return *(ObjectClass*) new ((void*)InsertSpaceAt(m_nSize, 1)) ObjectClass();
|
| - }
|
| + void Add(const ObjectClass& data) {
|
| + new ((void*)InsertSpaceAt(m_nSize, 1)) ObjectClass(data);
|
| + }
|
|
|
| - void* AddSpace()
|
| - {
|
| - return InsertSpaceAt(m_nSize, 1);
|
| - }
|
| + ObjectClass& Add() {
|
| + return *(ObjectClass*)new ((void*)InsertSpaceAt(m_nSize, 1)) ObjectClass();
|
| + }
|
|
|
| - int32_t Append(const CFX_ObjectArray& src, int32_t nStart = 0, int32_t nCount = -1)
|
| - {
|
| - if (nCount == 0) {
|
| - return 0;
|
| - }
|
| - int32_t nSize = src.GetSize();
|
| - if (!nSize) {
|
| - return 0;
|
| - }
|
| - FXSYS_assert(nStart > -1 && nStart < nSize);
|
| - if (nCount < 0) {
|
| - nCount = nSize;
|
| - }
|
| - if (nStart + nCount > nSize) {
|
| - nCount = nSize - nStart;
|
| - }
|
| - if (nCount < 1) {
|
| - return 0;
|
| - }
|
| - nSize = m_nSize;
|
| - InsertSpaceAt(m_nSize, nCount);
|
| - ObjectClass* pStartObj = (ObjectClass*)GetDataPtr(nSize);
|
| - nSize = nStart + nCount;
|
| - for (int32_t i = nStart; i < nSize; i ++, pStartObj++) {
|
| - new ((void*)pStartObj) ObjectClass(src[i]);
|
| - }
|
| - return nCount;
|
| - }
|
| + void* AddSpace() { return InsertSpaceAt(m_nSize, 1); }
|
|
|
| - int32_t Copy(const CFX_ObjectArray& src, int32_t nStart = 0, int32_t nCount = -1)
|
| - {
|
| - if (nCount == 0) {
|
| - return 0;
|
| - }
|
| - int32_t nSize = src.GetSize();
|
| - if (!nSize) {
|
| - return 0;
|
| - }
|
| - FXSYS_assert(nStart > -1 && nStart < nSize);
|
| - if (nCount < 0) {
|
| - nCount = nSize;
|
| - }
|
| - if (nStart + nCount > nSize) {
|
| - nCount = nSize - nStart;
|
| - }
|
| - if (nCount < 1) {
|
| - return 0;
|
| - }
|
| - RemoveAll();
|
| - SetSize(nCount);
|
| - ObjectClass* pStartObj = (ObjectClass*)m_pData;
|
| - nSize = nStart + nCount;
|
| - for (int32_t i = nStart; i < nSize; i ++, pStartObj++) {
|
| - new ((void*)pStartObj) ObjectClass(src[i]);
|
| - }
|
| - return nCount;
|
| + int32_t Append(const CFX_ObjectArray& src,
|
| + int32_t nStart = 0,
|
| + int32_t nCount = -1) {
|
| + if (nCount == 0) {
|
| + return 0;
|
| }
|
| -
|
| - int GetSize() const
|
| - {
|
| - return m_nSize;
|
| + int32_t nSize = src.GetSize();
|
| + if (!nSize) {
|
| + return 0;
|
| }
|
| -
|
| - ObjectClass& operator[] (int index) const
|
| - {
|
| - FXSYS_assert(index < m_nSize);
|
| - return *(ObjectClass*)CFX_BasicArray::GetDataPtr(index);
|
| + FXSYS_assert(nStart > -1 && nStart < nSize);
|
| + if (nCount < 0) {
|
| + nCount = nSize;
|
| }
|
| -
|
| - ObjectClass* GetDataPtr(int index)
|
| - {
|
| - return (ObjectClass*)CFX_BasicArray::GetDataPtr(index);
|
| + if (nStart + nCount > nSize) {
|
| + nCount = nSize - nStart;
|
| }
|
| + if (nCount < 1) {
|
| + return 0;
|
| + }
|
| + nSize = m_nSize;
|
| + InsertSpaceAt(m_nSize, nCount);
|
| + ObjectClass* pStartObj = (ObjectClass*)GetDataPtr(nSize);
|
| + nSize = nStart + nCount;
|
| + for (int32_t i = nStart; i < nSize; i++, pStartObj++) {
|
| + new ((void*)pStartObj) ObjectClass(src[i]);
|
| + }
|
| + return nCount;
|
| + }
|
|
|
| - void RemoveAt(int index)
|
| - {
|
| - FXSYS_assert(index < m_nSize);
|
| - ((ObjectClass*)GetDataPtr(index))->~ObjectClass();
|
| - CFX_BasicArray::RemoveAt(index, 1);
|
| + int32_t Copy(const CFX_ObjectArray& src,
|
| + int32_t nStart = 0,
|
| + int32_t nCount = -1) {
|
| + if (nCount == 0) {
|
| + return 0;
|
| + }
|
| + int32_t nSize = src.GetSize();
|
| + if (!nSize) {
|
| + return 0;
|
| }
|
| + FXSYS_assert(nStart > -1 && nStart < nSize);
|
| + if (nCount < 0) {
|
| + nCount = nSize;
|
| + }
|
| + if (nStart + nCount > nSize) {
|
| + nCount = nSize - nStart;
|
| + }
|
| + if (nCount < 1) {
|
| + return 0;
|
| + }
|
| + RemoveAll();
|
| + SetSize(nCount);
|
| + ObjectClass* pStartObj = (ObjectClass*)m_pData;
|
| + nSize = nStart + nCount;
|
| + for (int32_t i = nStart; i < nSize; i++, pStartObj++) {
|
| + new ((void*)pStartObj) ObjectClass(src[i]);
|
| + }
|
| + return nCount;
|
| + }
|
|
|
| - void RemoveAll()
|
| - {
|
| - for (int i = 0; i < m_nSize; i ++) {
|
| - ((ObjectClass*)GetDataPtr(i))->~ObjectClass();
|
| - }
|
| - CFX_BasicArray::SetSize(0);
|
| + int GetSize() const { return m_nSize; }
|
| +
|
| + ObjectClass& operator[](int index) const {
|
| + FXSYS_assert(index < m_nSize);
|
| + return *(ObjectClass*)CFX_BasicArray::GetDataPtr(index);
|
| + }
|
| +
|
| + ObjectClass* GetDataPtr(int index) {
|
| + return (ObjectClass*)CFX_BasicArray::GetDataPtr(index);
|
| + }
|
| +
|
| + void RemoveAt(int index) {
|
| + FXSYS_assert(index < m_nSize);
|
| + ((ObjectClass*)GetDataPtr(index))->~ObjectClass();
|
| + CFX_BasicArray::RemoveAt(index, 1);
|
| + }
|
| +
|
| + void RemoveAll() {
|
| + for (int i = 0; i < m_nSize; i++) {
|
| + ((ObjectClass*)GetDataPtr(i))->~ObjectClass();
|
| }
|
| + CFX_BasicArray::SetSize(0);
|
| + }
|
| };
|
| typedef CFX_ObjectArray<CFX_ByteString> CFX_ByteStringArray;
|
| typedef CFX_ObjectArray<CFX_WideString> CFX_WideStringArray;
|
| -class CFX_BaseSegmentedArray
|
| -{
|
| -public:
|
| - CFX_BaseSegmentedArray(int unit_size = 1, int segment_units = 512, int index_size = 8);
|
| +class CFX_BaseSegmentedArray {
|
| + public:
|
| + CFX_BaseSegmentedArray(int unit_size = 1,
|
| + int segment_units = 512,
|
| + int index_size = 8);
|
|
|
| - ~CFX_BaseSegmentedArray();
|
| + ~CFX_BaseSegmentedArray();
|
|
|
| - void SetUnitSize(int unit_size, int segment_units, int index_size = 8);
|
| + void SetUnitSize(int unit_size, int segment_units, int index_size = 8);
|
|
|
| - void* Add();
|
| + void* Add();
|
|
|
| - void* GetAt(int index) const;
|
| + void* GetAt(int index) const;
|
|
|
| - void RemoveAll();
|
| + void RemoveAll();
|
|
|
| - void Delete(int index, int count = 1);
|
| + void Delete(int index, int count = 1);
|
|
|
| - int GetSize() const
|
| - {
|
| - return m_DataSize;
|
| - }
|
| + int GetSize() const { return m_DataSize; }
|
|
|
| - int GetSegmentSize() const
|
| - {
|
| - return m_SegmentSize;
|
| - }
|
| + int GetSegmentSize() const { return m_SegmentSize; }
|
|
|
| - int GetUnitSize() const
|
| - {
|
| - return m_UnitSize;
|
| - }
|
| + int GetUnitSize() const { return m_UnitSize; }
|
|
|
| - void* Iterate(FX_BOOL (*callback)(void* param, void* pData), void* param) const;
|
| -private:
|
| + void* Iterate(FX_BOOL (*callback)(void* param, void* pData),
|
| + void* param) const;
|
|
|
| - int m_UnitSize;
|
| + private:
|
| + int m_UnitSize;
|
|
|
| - short m_SegmentSize;
|
| + short m_SegmentSize;
|
|
|
| - uint8_t m_IndexSize;
|
| + uint8_t m_IndexSize;
|
|
|
| - uint8_t m_IndexDepth;
|
| + uint8_t m_IndexDepth;
|
|
|
| - int m_DataSize;
|
| + int m_DataSize;
|
|
|
| - void* m_pIndex;
|
| - void** GetIndex(int seg_index) const;
|
| - void* IterateIndex(int level, int& start, void** pIndex, FX_BOOL (*callback)(void* param, void* pData), void* param) const;
|
| - void* IterateSegment(const uint8_t* pSegment, int count, FX_BOOL (*callback)(void* param, void* pData), void* param) const;
|
| + void* m_pIndex;
|
| + void** GetIndex(int seg_index) const;
|
| + void* IterateIndex(int level,
|
| + int& start,
|
| + void** pIndex,
|
| + FX_BOOL (*callback)(void* param, void* pData),
|
| + void* param) const;
|
| + void* IterateSegment(const uint8_t* pSegment,
|
| + int count,
|
| + FX_BOOL (*callback)(void* param, void* pData),
|
| + void* param) const;
|
| };
|
| template <class ElementType>
|
| -class CFX_SegmentedArray : public CFX_BaseSegmentedArray
|
| -{
|
| -public:
|
| - CFX_SegmentedArray(int segment_units, int index_size = 8)
|
| - : CFX_BaseSegmentedArray(sizeof(ElementType), segment_units, index_size)
|
| - {}
|
| -
|
| - void Add(ElementType data)
|
| - {
|
| - *(ElementType*)CFX_BaseSegmentedArray::Add() = data;
|
| - }
|
| -
|
| - ElementType& operator [] (int index)
|
| - {
|
| - return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index);
|
| - }
|
| +class CFX_SegmentedArray : public CFX_BaseSegmentedArray {
|
| + public:
|
| + CFX_SegmentedArray(int segment_units, int index_size = 8)
|
| + : CFX_BaseSegmentedArray(sizeof(ElementType), segment_units, index_size) {
|
| + }
|
| +
|
| + void Add(ElementType data) {
|
| + *(ElementType*)CFX_BaseSegmentedArray::Add() = data;
|
| + }
|
| +
|
| + ElementType& operator[](int index) {
|
| + return *(ElementType*)CFX_BaseSegmentedArray::GetAt(index);
|
| + }
|
| };
|
| template <class DataType, int FixedSize>
|
| -class CFX_FixedBufGrow
|
| -{
|
| -public:
|
| - CFX_FixedBufGrow() : m_pData(NULL)
|
| - {}
|
| - CFX_FixedBufGrow(int data_size) : m_pData(NULL)
|
| - {
|
| - if (data_size > FixedSize) {
|
| - m_pData = FX_Alloc(DataType, data_size);
|
| - } else {
|
| - FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize);
|
| - }
|
| - }
|
| - void SetDataSize(int data_size)
|
| - {
|
| - if (m_pData) {
|
| - FX_Free(m_pData);
|
| - }
|
| - m_pData = NULL;
|
| - if (data_size > FixedSize) {
|
| - m_pData = FX_Alloc(DataType, data_size);
|
| - } else {
|
| - FXSYS_memset(m_Data, 0, sizeof(DataType)*FixedSize);
|
| - }
|
| - }
|
| - ~CFX_FixedBufGrow()
|
| - {
|
| - if (m_pData) {
|
| - FX_Free(m_pData);
|
| - }
|
| - }
|
| - operator DataType*()
|
| - {
|
| - return m_pData ? m_pData : m_Data;
|
| - }
|
| -private:
|
| - DataType m_Data[FixedSize];
|
| - DataType* m_pData;
|
| +class CFX_FixedBufGrow {
|
| + public:
|
| + CFX_FixedBufGrow() : m_pData(NULL) {}
|
| + CFX_FixedBufGrow(int data_size) : m_pData(NULL) {
|
| + if (data_size > FixedSize) {
|
| + m_pData = FX_Alloc(DataType, data_size);
|
| + } else {
|
| + FXSYS_memset(m_Data, 0, sizeof(DataType) * FixedSize);
|
| + }
|
| + }
|
| + void SetDataSize(int data_size) {
|
| + if (m_pData) {
|
| + FX_Free(m_pData);
|
| + }
|
| + m_pData = NULL;
|
| + if (data_size > FixedSize) {
|
| + m_pData = FX_Alloc(DataType, data_size);
|
| + } else {
|
| + FXSYS_memset(m_Data, 0, sizeof(DataType) * FixedSize);
|
| + }
|
| + }
|
| + ~CFX_FixedBufGrow() {
|
| + if (m_pData) {
|
| + FX_Free(m_pData);
|
| + }
|
| + }
|
| + operator DataType*() { return m_pData ? m_pData : m_Data; }
|
| +
|
| + private:
|
| + DataType m_Data[FixedSize];
|
| + DataType* m_pData;
|
| };
|
| -class CFX_MapPtrToPtr
|
| -{
|
| -protected:
|
| +class CFX_MapPtrToPtr {
|
| + protected:
|
| + struct CAssoc {
|
| + CAssoc* pNext;
|
|
|
| - struct CAssoc {
|
| + void* key;
|
|
|
| - CAssoc* pNext;
|
| + void* value;
|
| + };
|
|
|
| - void* key;
|
| + public:
|
| + CFX_MapPtrToPtr(int nBlockSize = 10);
|
|
|
| - void* value;
|
| - };
|
| -public:
|
| - CFX_MapPtrToPtr(int nBlockSize = 10);
|
| + ~CFX_MapPtrToPtr();
|
|
|
| - ~CFX_MapPtrToPtr();
|
| + int GetCount() const { return m_nCount; }
|
|
|
| - int GetCount() const
|
| - {
|
| - return m_nCount;
|
| - }
|
| + FX_BOOL IsEmpty() const { return m_nCount == 0; }
|
|
|
| - FX_BOOL IsEmpty() const
|
| - {
|
| - return m_nCount == 0;
|
| - }
|
| + FX_BOOL Lookup(void* key, void*& rValue) const;
|
|
|
| - FX_BOOL Lookup(void* key, void*& rValue) const;
|
| + void* GetValueAt(void* key) const;
|
|
|
| - void* GetValueAt(void* key) const;
|
| + void*& operator[](void* key);
|
|
|
| - void*& operator[](void* key);
|
| + void SetAt(void* key, void* newValue) { (*this)[key] = newValue; }
|
|
|
| - void SetAt(void* key, void* newValue)
|
| - {
|
| - (*this)[key] = newValue;
|
| - }
|
| + FX_BOOL RemoveKey(void* key);
|
|
|
| - FX_BOOL RemoveKey(void* key);
|
| + void RemoveAll();
|
|
|
| - void RemoveAll();
|
| + FX_POSITION GetStartPosition() const {
|
| + return (m_nCount == 0) ? NULL : (FX_POSITION)-1;
|
| + }
|
|
|
| - FX_POSITION GetStartPosition() const
|
| - {
|
| - return (m_nCount == 0) ? NULL : (FX_POSITION) - 1;
|
| - }
|
| -
|
| - void GetNextAssoc(FX_POSITION& rNextPosition, void*& rKey, void*& rValue) const;
|
| + void GetNextAssoc(FX_POSITION& rNextPosition,
|
| + void*& rKey,
|
| + void*& rValue) const;
|
|
|
| - FX_DWORD GetHashTableSize() const
|
| - {
|
| - return m_nHashTableSize;
|
| - }
|
| + FX_DWORD GetHashTableSize() const { return m_nHashTableSize; }
|
|
|
| - void InitHashTable(FX_DWORD hashSize, FX_BOOL bAllocNow = TRUE);
|
| -protected:
|
| + void InitHashTable(FX_DWORD hashSize, FX_BOOL bAllocNow = TRUE);
|
|
|
| - CAssoc** m_pHashTable;
|
| + protected:
|
| + CAssoc** m_pHashTable;
|
|
|
| - FX_DWORD m_nHashTableSize;
|
| + FX_DWORD m_nHashTableSize;
|
|
|
| - int m_nCount;
|
| + int m_nCount;
|
|
|
| - CAssoc* m_pFreeList;
|
| + CAssoc* m_pFreeList;
|
|
|
| - struct CFX_Plex* m_pBlocks;
|
| + struct CFX_Plex* m_pBlocks;
|
|
|
| - int m_nBlockSize;
|
| + int m_nBlockSize;
|
|
|
| - FX_DWORD HashKey(void* key) const;
|
| + FX_DWORD HashKey(void* key) const;
|
|
|
| - CAssoc* NewAssoc();
|
| + CAssoc* NewAssoc();
|
|
|
| - void FreeAssoc(CAssoc* pAssoc);
|
| + void FreeAssoc(CAssoc* pAssoc);
|
|
|
| - CAssoc* GetAssocAt(void* key, FX_DWORD& hash) const;
|
| + CAssoc* GetAssocAt(void* key, FX_DWORD& hash) const;
|
| };
|
|
|
| -class CFX_CMapDWordToDWord
|
| -{
|
| -public:
|
| +class CFX_CMapDWordToDWord {
|
| + public:
|
| + FX_BOOL Lookup(FX_DWORD key, FX_DWORD& value) const;
|
|
|
| - FX_BOOL Lookup(FX_DWORD key, FX_DWORD& value) const;
|
| + void SetAt(FX_DWORD key, FX_DWORD value);
|
|
|
| - void SetAt(FX_DWORD key, FX_DWORD value);
|
| + void EstimateSize(FX_DWORD size, FX_DWORD grow_by);
|
|
|
| - void EstimateSize(FX_DWORD size, FX_DWORD grow_by);
|
| + FX_POSITION GetStartPosition() const;
|
|
|
| - FX_POSITION GetStartPosition() const;
|
| + void GetNextAssoc(FX_POSITION& pos, FX_DWORD& key, FX_DWORD& value) const;
|
|
|
| - void GetNextAssoc(FX_POSITION& pos, FX_DWORD& key, FX_DWORD& value) const;
|
| -protected:
|
| -
|
| - CFX_BinaryBuf m_Buffer;
|
| + protected:
|
| + CFX_BinaryBuf m_Buffer;
|
| };
|
| -class CFX_MapByteStringToPtr
|
| -{
|
| -protected:
|
| +class CFX_MapByteStringToPtr {
|
| + protected:
|
| + struct CAssoc {
|
| + CAssoc* pNext;
|
|
|
| - struct CAssoc {
|
| + FX_DWORD nHashValue;
|
|
|
| - CAssoc* pNext;
|
| + CFX_ByteString key;
|
|
|
| - FX_DWORD nHashValue;
|
| + void* value;
|
| + };
|
|
|
| - CFX_ByteString key;
|
| + public:
|
| + CFX_MapByteStringToPtr(int nBlockSize = 10);
|
|
|
| - void* value;
|
| - };
|
| -public:
|
| - CFX_MapByteStringToPtr(int nBlockSize = 10);
|
| + int GetCount() const { return m_nCount; }
|
|
|
| - int GetCount() const
|
| - {
|
| - return m_nCount;
|
| - }
|
| + FX_BOOL IsEmpty() const { return m_nCount == 0; }
|
|
|
| - FX_BOOL IsEmpty() const
|
| - {
|
| - return m_nCount == 0;
|
| - }
|
| + FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
|
|
|
| - FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
|
| + void*& operator[](const CFX_ByteStringC& key);
|
|
|
| - void*& operator[](const CFX_ByteStringC& key);
|
| + void SetAt(const CFX_ByteStringC& key, void* newValue) {
|
| + (*this)[key] = newValue;
|
| + }
|
|
|
| - void SetAt(const CFX_ByteStringC& key, void* newValue)
|
| - {
|
| - (*this)[key] = newValue;
|
| - }
|
| + FX_BOOL RemoveKey(const CFX_ByteStringC& key);
|
|
|
| - FX_BOOL RemoveKey(const CFX_ByteStringC& key);
|
| + void RemoveAll();
|
|
|
| - void RemoveAll();
|
| + FX_POSITION GetStartPosition() const {
|
| + return (m_nCount == 0) ? NULL : (FX_POSITION)-1;
|
| + }
|
|
|
| - FX_POSITION GetStartPosition() const
|
| - {
|
| - return (m_nCount == 0) ? NULL : (FX_POSITION) - 1;
|
| - }
|
| + void GetNextAssoc(FX_POSITION& rNextPosition,
|
| + CFX_ByteString& rKey,
|
| + void*& rValue) const;
|
|
|
| - void GetNextAssoc(FX_POSITION& rNextPosition, CFX_ByteString& rKey, void*& rValue) const;
|
| + void* GetNextValue(FX_POSITION& rNextPosition) const;
|
|
|
| - void* GetNextValue(FX_POSITION& rNextPosition) const;
|
| + FX_DWORD GetHashTableSize() const { return m_nHashTableSize; }
|
|
|
| - FX_DWORD GetHashTableSize() const
|
| - {
|
| - return m_nHashTableSize;
|
| - }
|
| + void InitHashTable(FX_DWORD hashSize, FX_BOOL bAllocNow = TRUE);
|
|
|
| - void InitHashTable(FX_DWORD hashSize, FX_BOOL bAllocNow = TRUE);
|
| + FX_DWORD HashKey(const CFX_ByteStringC& key) const;
|
|
|
| - FX_DWORD HashKey(const CFX_ByteStringC& key) const;
|
| -protected:
|
| + protected:
|
| + CAssoc** m_pHashTable;
|
|
|
| - CAssoc** m_pHashTable;
|
| + FX_DWORD m_nHashTableSize;
|
|
|
| - FX_DWORD m_nHashTableSize;
|
| + int m_nCount;
|
|
|
| - int m_nCount;
|
| + CAssoc* m_pFreeList;
|
|
|
| - CAssoc* m_pFreeList;
|
| + struct CFX_Plex* m_pBlocks;
|
|
|
| - struct CFX_Plex* m_pBlocks;
|
| + int m_nBlockSize;
|
|
|
| - int m_nBlockSize;
|
| + CAssoc* NewAssoc();
|
|
|
| - CAssoc* NewAssoc();
|
| + void FreeAssoc(CAssoc* pAssoc);
|
|
|
| - void FreeAssoc(CAssoc* pAssoc);
|
| + CAssoc* GetAssocAt(const CFX_ByteStringC& key, FX_DWORD& hash) const;
|
|
|
| - CAssoc* GetAssocAt(const CFX_ByteStringC& key, FX_DWORD& hash) const;
|
| -public:
|
| -
|
| - ~CFX_MapByteStringToPtr();
|
| + public:
|
| + ~CFX_MapByteStringToPtr();
|
| };
|
| -class CFX_CMapByteStringToPtr
|
| -{
|
| -public:
|
| - CFX_CMapByteStringToPtr();
|
| +class CFX_CMapByteStringToPtr {
|
| + public:
|
| + CFX_CMapByteStringToPtr();
|
|
|
| - ~CFX_CMapByteStringToPtr();
|
| + ~CFX_CMapByteStringToPtr();
|
|
|
| - void RemoveAll();
|
| + void RemoveAll();
|
|
|
| - FX_POSITION GetStartPosition() const;
|
| + FX_POSITION GetStartPosition() const;
|
|
|
| - void GetNextAssoc(FX_POSITION& rNextPosition, CFX_ByteString& rKey, void*& rValue) const;
|
| + void GetNextAssoc(FX_POSITION& rNextPosition,
|
| + CFX_ByteString& rKey,
|
| + void*& rValue) const;
|
|
|
| - void* GetNextValue(FX_POSITION& rNextPosition) const;
|
| + void* GetNextValue(FX_POSITION& rNextPosition) const;
|
|
|
| - FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
|
| + FX_BOOL Lookup(const CFX_ByteStringC& key, void*& rValue) const;
|
|
|
| - void SetAt(const CFX_ByteStringC& key, void* value);
|
| + void SetAt(const CFX_ByteStringC& key, void* value);
|
|
|
| - void RemoveKey(const CFX_ByteStringC& key);
|
| + void RemoveKey(const CFX_ByteStringC& key);
|
|
|
| - int GetCount() const;
|
| + int GetCount() const;
|
|
|
| - void AddValue(const CFX_ByteStringC& key, void* pValue);
|
| -private:
|
| + void AddValue(const CFX_ByteStringC& key, void* pValue);
|
|
|
| - CFX_BaseSegmentedArray m_Buffer;
|
| + private:
|
| + CFX_BaseSegmentedArray m_Buffer;
|
| };
|
| -class CFX_PtrList
|
| -{
|
| -protected:
|
| -
|
| - struct CNode {
|
| +class CFX_PtrList {
|
| + protected:
|
| + struct CNode {
|
| + CNode* pNext;
|
|
|
| - CNode* pNext;
|
| + CNode* pPrev;
|
|
|
| - CNode* pPrev;
|
| + void* data;
|
| + };
|
|
|
| - void* data;
|
| - };
|
| -public:
|
| - CFX_PtrList(int nBlockSize = 10);
|
| + public:
|
| + CFX_PtrList(int nBlockSize = 10);
|
|
|
| - FX_POSITION GetHeadPosition() const
|
| - {
|
| - return (FX_POSITION)m_pNodeHead;
|
| - }
|
| + FX_POSITION GetHeadPosition() const { return (FX_POSITION)m_pNodeHead; }
|
|
|
| - FX_POSITION GetTailPosition() const
|
| - {
|
| - return (FX_POSITION)m_pNodeTail;
|
| - }
|
| + FX_POSITION GetTailPosition() const { return (FX_POSITION)m_pNodeTail; }
|
|
|
| - void* GetNext(FX_POSITION& rPosition) const
|
| - {
|
| - CNode* pNode = (CNode*) rPosition;
|
| - rPosition = (FX_POSITION) pNode->pNext;
|
| - return pNode->data;
|
| - }
|
| + void* GetNext(FX_POSITION& rPosition) const {
|
| + CNode* pNode = (CNode*)rPosition;
|
| + rPosition = (FX_POSITION)pNode->pNext;
|
| + return pNode->data;
|
| + }
|
|
|
| - void* GetPrev(FX_POSITION& rPosition) const
|
| - {
|
| - CNode* pNode = (CNode*) rPosition;
|
| - rPosition = (FX_POSITION) pNode->pPrev;
|
| - return pNode->data;
|
| - }
|
| + void* GetPrev(FX_POSITION& rPosition) const {
|
| + CNode* pNode = (CNode*)rPosition;
|
| + rPosition = (FX_POSITION)pNode->pPrev;
|
| + return pNode->data;
|
| + }
|
|
|
| - FX_POSITION GetNextPosition(FX_POSITION pos) const
|
| - {
|
| - return ((CNode*)pos)->pNext;
|
| - }
|
| + FX_POSITION GetNextPosition(FX_POSITION pos) const {
|
| + return ((CNode*)pos)->pNext;
|
| + }
|
|
|
| - FX_POSITION GetPrevPosition(FX_POSITION pos) const
|
| - {
|
| - return ((CNode*)pos)->pPrev;
|
| - }
|
| + FX_POSITION GetPrevPosition(FX_POSITION pos) const {
|
| + return ((CNode*)pos)->pPrev;
|
| + }
|
|
|
| - void* GetAt(FX_POSITION rPosition) const
|
| - {
|
| - CNode* pNode = (CNode*) rPosition;
|
| - return pNode->data;
|
| - }
|
| + void* GetAt(FX_POSITION rPosition) const {
|
| + CNode* pNode = (CNode*)rPosition;
|
| + return pNode->data;
|
| + }
|
|
|
| - int GetCount() const
|
| - {
|
| - return m_nCount;
|
| - }
|
| + int GetCount() const { return m_nCount; }
|
|
|
| - FX_POSITION AddTail(void* newElement);
|
| + FX_POSITION AddTail(void* newElement);
|
|
|
| - FX_POSITION AddHead(void* newElement);
|
| + FX_POSITION AddHead(void* newElement);
|
|
|
| - void SetAt(FX_POSITION pos, void* newElement)
|
| - {
|
| - CNode* pNode = (CNode*) pos;
|
| - pNode->data = newElement;
|
| - }
|
| + void SetAt(FX_POSITION pos, void* newElement) {
|
| + CNode* pNode = (CNode*)pos;
|
| + pNode->data = newElement;
|
| + }
|
|
|
| - FX_POSITION InsertAfter(FX_POSITION pos, void* newElement);
|
| + FX_POSITION InsertAfter(FX_POSITION pos, void* newElement);
|
|
|
| - FX_POSITION Find(void* searchValue, FX_POSITION startAfter = NULL ) const;
|
| + FX_POSITION Find(void* searchValue, FX_POSITION startAfter = NULL) const;
|
|
|
| - FX_POSITION FindIndex(int index) const;
|
| + FX_POSITION FindIndex(int index) const;
|
|
|
| - void RemoveAt(FX_POSITION pos);
|
| + void RemoveAt(FX_POSITION pos);
|
|
|
| - void RemoveAll();
|
| -protected:
|
| + void RemoveAll();
|
|
|
| - CNode* m_pNodeHead;
|
| + protected:
|
| + CNode* m_pNodeHead;
|
|
|
| - CNode* m_pNodeTail;
|
| + CNode* m_pNodeTail;
|
|
|
| - int m_nCount;
|
| + int m_nCount;
|
|
|
| - CNode* m_pNodeFree;
|
| + CNode* m_pNodeFree;
|
|
|
| - struct CFX_Plex* m_pBlocks;
|
| + struct CFX_Plex* m_pBlocks;
|
|
|
| - int m_nBlockSize;
|
| + int m_nBlockSize;
|
|
|
| - CNode* NewNode(CNode* pPrev, CNode* pNext);
|
| + CNode* NewNode(CNode* pPrev, CNode* pNext);
|
|
|
| - void FreeNode(CNode* pNode);
|
| -public:
|
| + void FreeNode(CNode* pNode);
|
|
|
| - ~CFX_PtrList();
|
| + public:
|
| + ~CFX_PtrList();
|
| };
|
| typedef void (*PD_CALLBACK_FREEDATA)(void* pData);
|
| struct FX_PRIVATEDATA {
|
| + void FreeData();
|
|
|
| - void FreeData();
|
| -
|
| - void* m_pModuleId;
|
| + void* m_pModuleId;
|
|
|
| - void* m_pData;
|
| + void* m_pData;
|
|
|
| - PD_CALLBACK_FREEDATA m_pCallback;
|
| + PD_CALLBACK_FREEDATA m_pCallback;
|
|
|
| - FX_BOOL m_bSelfDestruct;
|
| + FX_BOOL m_bSelfDestruct;
|
| };
|
| -class CFX_PrivateData
|
| -{
|
| -public:
|
| +class CFX_PrivateData {
|
| + public:
|
| + ~CFX_PrivateData();
|
|
|
| - ~CFX_PrivateData();
|
| + void ClearAll();
|
|
|
| - void ClearAll();
|
| + void SetPrivateData(void* module_id,
|
| + void* pData,
|
| + PD_CALLBACK_FREEDATA callback);
|
|
|
| - void SetPrivateData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback);
|
| + void SetPrivateObj(void* module_id, CFX_DestructObject* pObj);
|
|
|
| - void SetPrivateObj(void* module_id, CFX_DestructObject* pObj);
|
| + void* GetPrivateData(void* module_id);
|
|
|
| - void* GetPrivateData(void* module_id);
|
| -
|
| - FX_BOOL LookupPrivateData(void* module_id, void* &pData) const
|
| - {
|
| - if (!module_id) {
|
| - return FALSE;
|
| - }
|
| - FX_DWORD nCount = m_DataList.GetSize();
|
| - for (FX_DWORD n = 0; n < nCount; n ++) {
|
| - if (m_DataList[n].m_pModuleId == module_id) {
|
| - pData = m_DataList[n].m_pData;
|
| - return TRUE;
|
| - }
|
| - }
|
| - return FALSE;
|
| + FX_BOOL LookupPrivateData(void* module_id, void*& pData) const {
|
| + if (!module_id) {
|
| + return FALSE;
|
| + }
|
| + FX_DWORD nCount = m_DataList.GetSize();
|
| + for (FX_DWORD n = 0; n < nCount; n++) {
|
| + if (m_DataList[n].m_pModuleId == module_id) {
|
| + pData = m_DataList[n].m_pData;
|
| + return TRUE;
|
| + }
|
| }
|
| + return FALSE;
|
| + }
|
|
|
| - FX_BOOL RemovePrivateData(void* module_id);
|
| -protected:
|
| + FX_BOOL RemovePrivateData(void* module_id);
|
|
|
| - CFX_ArrayTemplate<FX_PRIVATEDATA> m_DataList;
|
| + protected:
|
| + CFX_ArrayTemplate<FX_PRIVATEDATA> m_DataList;
|
|
|
| - void AddData(void* module_id, void* pData, PD_CALLBACK_FREEDATA callback, FX_BOOL bSelfDestruct);
|
| + void AddData(void* module_id,
|
| + void* pData,
|
| + PD_CALLBACK_FREEDATA callback,
|
| + FX_BOOL bSelfDestruct);
|
| };
|
| -class CFX_BitStream
|
| -{
|
| -public:
|
| +class CFX_BitStream {
|
| + public:
|
| + void Init(const uint8_t* pData, FX_DWORD dwSize);
|
|
|
| - void Init(const uint8_t* pData, FX_DWORD dwSize);
|
| + FX_DWORD GetBits(FX_DWORD nBits);
|
|
|
| + void ByteAlign();
|
|
|
| - FX_DWORD GetBits(FX_DWORD nBits);
|
| + FX_BOOL IsEOF() { return m_BitPos >= m_BitSize; }
|
|
|
| - void ByteAlign();
|
| + void SkipBits(FX_DWORD nBits) { m_BitPos += nBits; }
|
|
|
| - FX_BOOL IsEOF()
|
| - {
|
| - return m_BitPos >= m_BitSize;
|
| - }
|
| -
|
| - void SkipBits(FX_DWORD nBits)
|
| - {
|
| - m_BitPos += nBits;
|
| - }
|
| + void Rewind() { m_BitPos = 0; }
|
|
|
| - void Rewind()
|
| - {
|
| - m_BitPos = 0;
|
| - }
|
| -protected:
|
| -
|
| - FX_DWORD m_BitPos;
|
| + protected:
|
| + FX_DWORD m_BitPos;
|
|
|
| - FX_DWORD m_BitSize;
|
| + FX_DWORD m_BitSize;
|
|
|
| - const uint8_t* m_pData;
|
| + const uint8_t* m_pData;
|
| };
|
| -template <class ObjClass> class CFX_CountRef
|
| -{
|
| -public:
|
| -
|
| - typedef CFX_CountRef<ObjClass> Ref;
|
| +template <class ObjClass>
|
| +class CFX_CountRef {
|
| + public:
|
| + typedef CFX_CountRef<ObjClass> Ref;
|
|
|
| - class CountedObj : public ObjClass
|
| - {
|
| - public:
|
| + class CountedObj : public ObjClass {
|
| + public:
|
| + CountedObj() {}
|
|
|
| - CountedObj() {}
|
| + CountedObj(const CountedObj& src) : ObjClass(src) {}
|
|
|
| - CountedObj(const CountedObj& src) : ObjClass(src) {}
|
| + int m_RefCount;
|
| + };
|
|
|
| - int m_RefCount;
|
| - };
|
| + CFX_CountRef() { m_pObject = NULL; }
|
|
|
| - CFX_CountRef()
|
| - {
|
| - m_pObject = NULL;
|
| + CFX_CountRef(const Ref& ref) {
|
| + m_pObject = ref.m_pObject;
|
| + if (m_pObject) {
|
| + m_pObject->m_RefCount++;
|
| }
|
| + }
|
|
|
| - CFX_CountRef(const Ref& ref)
|
| - {
|
| - m_pObject = ref.m_pObject;
|
| - if (m_pObject) {
|
| - m_pObject->m_RefCount ++;
|
| - }
|
| + ~CFX_CountRef() {
|
| + if (!m_pObject) {
|
| + return;
|
| }
|
| -
|
| - ~CFX_CountRef()
|
| - {
|
| - if (!m_pObject) {
|
| - return;
|
| - }
|
| - m_pObject->m_RefCount --;
|
| - if (m_pObject->m_RefCount <= 0) {
|
| - delete m_pObject;
|
| - }
|
| + m_pObject->m_RefCount--;
|
| + if (m_pObject->m_RefCount <= 0) {
|
| + delete m_pObject;
|
| }
|
| + }
|
|
|
| - ObjClass* New()
|
| - {
|
| - if (m_pObject) {
|
| - m_pObject->m_RefCount --;
|
| - if (m_pObject->m_RefCount <= 0) {
|
| - delete m_pObject;
|
| - }
|
| - }
|
| - m_pObject = new CountedObj;
|
| - m_pObject->m_RefCount = 1;
|
| - return m_pObject;
|
| + ObjClass* New() {
|
| + if (m_pObject) {
|
| + m_pObject->m_RefCount--;
|
| + if (m_pObject->m_RefCount <= 0) {
|
| + delete m_pObject;
|
| + }
|
| }
|
| + m_pObject = new CountedObj;
|
| + m_pObject->m_RefCount = 1;
|
| + return m_pObject;
|
| + }
|
|
|
| - void operator = (const Ref& ref)
|
| - {
|
| - if (ref.m_pObject) {
|
| - ref.m_pObject->m_RefCount ++;
|
| - }
|
| - if (m_pObject) {
|
| - m_pObject->m_RefCount --;
|
| - if (m_pObject->m_RefCount <= 0) {
|
| - delete m_pObject;
|
| - }
|
| - }
|
| - m_pObject = ref.m_pObject;
|
| + void operator=(const Ref& ref) {
|
| + if (ref.m_pObject) {
|
| + ref.m_pObject->m_RefCount++;
|
| }
|
| -
|
| - void operator = (void* p)
|
| - {
|
| - FXSYS_assert(p == 0);
|
| - if (m_pObject == NULL) {
|
| - return;
|
| - }
|
| - m_pObject->m_RefCount --;
|
| - if (m_pObject->m_RefCount <= 0) {
|
| - delete m_pObject;
|
| - }
|
| - m_pObject = NULL;
|
| + if (m_pObject) {
|
| + m_pObject->m_RefCount--;
|
| + if (m_pObject->m_RefCount <= 0) {
|
| + delete m_pObject;
|
| + }
|
| }
|
| + m_pObject = ref.m_pObject;
|
| + }
|
|
|
| - const ObjClass* GetObject() const
|
| - {
|
| - return m_pObject;
|
| + void operator=(void* p) {
|
| + FXSYS_assert(p == 0);
|
| + if (m_pObject == NULL) {
|
| + return;
|
| }
|
| -
|
| - operator const ObjClass*() const
|
| - {
|
| - return m_pObject;
|
| + m_pObject->m_RefCount--;
|
| + if (m_pObject->m_RefCount <= 0) {
|
| + delete m_pObject;
|
| }
|
| + m_pObject = NULL;
|
| + }
|
|
|
| - FX_BOOL IsNull() const
|
| - {
|
| - return m_pObject == NULL;
|
| - }
|
| + const ObjClass* GetObject() const { return m_pObject; }
|
|
|
| - FX_BOOL NotNull() const
|
| - {
|
| - return m_pObject != NULL;
|
| - }
|
| + operator const ObjClass*() const { return m_pObject; }
|
|
|
| - ObjClass* GetModify()
|
| - {
|
| - if (m_pObject == NULL) {
|
| - m_pObject = new CountedObj;
|
| - m_pObject->m_RefCount = 1;
|
| - } else if (m_pObject->m_RefCount > 1) {
|
| - m_pObject->m_RefCount --;
|
| - CountedObj* pOldObject = m_pObject;
|
| - m_pObject = new CountedObj(*pOldObject);
|
| - m_pObject->m_RefCount = 1;
|
| - }
|
| - return m_pObject;
|
| - }
|
| + FX_BOOL IsNull() const { return m_pObject == NULL; }
|
|
|
| - void SetNull()
|
| - {
|
| - if (m_pObject == NULL) {
|
| - return;
|
| - }
|
| - m_pObject->m_RefCount --;
|
| - if (m_pObject->m_RefCount <= 0) {
|
| - delete m_pObject;
|
| - }
|
| - m_pObject = NULL;
|
| + FX_BOOL NotNull() const { return m_pObject != NULL; }
|
| +
|
| + ObjClass* GetModify() {
|
| + if (m_pObject == NULL) {
|
| + m_pObject = new CountedObj;
|
| + m_pObject->m_RefCount = 1;
|
| + } else if (m_pObject->m_RefCount > 1) {
|
| + m_pObject->m_RefCount--;
|
| + CountedObj* pOldObject = m_pObject;
|
| + m_pObject = new CountedObj(*pOldObject);
|
| + m_pObject->m_RefCount = 1;
|
| }
|
| + return m_pObject;
|
| + }
|
|
|
| - FX_BOOL operator == (const Ref& ref) const
|
| - {
|
| - return m_pObject == ref.m_pObject;
|
| + void SetNull() {
|
| + if (m_pObject == NULL) {
|
| + return;
|
| }
|
| -protected:
|
| + m_pObject->m_RefCount--;
|
| + if (m_pObject->m_RefCount <= 0) {
|
| + delete m_pObject;
|
| + }
|
| + m_pObject = NULL;
|
| + }
|
| +
|
| + FX_BOOL operator==(const Ref& ref) const {
|
| + return m_pObject == ref.m_pObject;
|
| + }
|
|
|
| - CountedObj* m_pObject;
|
| + protected:
|
| + CountedObj* m_pObject;
|
| };
|
| -class IFX_Pause
|
| -{
|
| -public:
|
| - virtual ~IFX_Pause() { }
|
| - virtual FX_BOOL NeedToPauseNow() = 0;
|
| +class IFX_Pause {
|
| + public:
|
| + virtual ~IFX_Pause() {}
|
| + virtual FX_BOOL NeedToPauseNow() = 0;
|
| };
|
| -class CFX_DataFilter
|
| -{
|
| -public:
|
| -
|
| - virtual ~CFX_DataFilter();
|
| +class CFX_DataFilter {
|
| + public:
|
| + virtual ~CFX_DataFilter();
|
|
|
| - void SetDestFilter(CFX_DataFilter* pFilter);
|
| + void SetDestFilter(CFX_DataFilter* pFilter);
|
|
|
| - FX_BOOL IsEOF() const
|
| - {
|
| - return m_bEOF;
|
| - }
|
| + FX_BOOL IsEOF() const { return m_bEOF; }
|
|
|
| - FX_DWORD GetSrcPos()
|
| - {
|
| - return m_SrcPos;
|
| - }
|
| + FX_DWORD GetSrcPos() { return m_SrcPos; }
|
|
|
| - void FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf);
|
| + void FilterIn(const uint8_t* src_buf,
|
| + FX_DWORD src_size,
|
| + CFX_BinaryBuf& dest_buf);
|
|
|
| - void FilterFinish(CFX_BinaryBuf& dest_buf);
|
| -protected:
|
| + void FilterFinish(CFX_BinaryBuf& dest_buf);
|
|
|
| - CFX_DataFilter();
|
| - virtual void v_FilterIn(const uint8_t* src_buf, FX_DWORD src_size, CFX_BinaryBuf& dest_buf) = 0;
|
| - virtual void v_FilterFinish(CFX_BinaryBuf& dest_buf) = 0;
|
| - void ReportEOF(FX_DWORD left_input);
|
| + protected:
|
| + CFX_DataFilter();
|
| + virtual void v_FilterIn(const uint8_t* src_buf,
|
| + FX_DWORD src_size,
|
| + CFX_BinaryBuf& dest_buf) = 0;
|
| + virtual void v_FilterFinish(CFX_BinaryBuf& dest_buf) = 0;
|
| + void ReportEOF(FX_DWORD left_input);
|
|
|
| - FX_BOOL m_bEOF;
|
| + FX_BOOL m_bEOF;
|
|
|
| - FX_DWORD m_SrcPos;
|
| + FX_DWORD m_SrcPos;
|
|
|
| - CFX_DataFilter* m_pDestFilter;
|
| + CFX_DataFilter* m_pDestFilter;
|
| };
|
|
|
| -template<typename T>
|
| +template <typename T>
|
| class CFX_AutoRestorer {
|
| -public:
|
| - explicit CFX_AutoRestorer(T* location) {
|
| - m_Location = location;
|
| - m_OldValue = *location;
|
| - }
|
| - ~CFX_AutoRestorer() { *m_Location = m_OldValue; }
|
| -
|
| -private:
|
| + public:
|
| + explicit CFX_AutoRestorer(T* location) {
|
| + m_Location = location;
|
| + m_OldValue = *location;
|
| + }
|
| + ~CFX_AutoRestorer() { *m_Location = m_OldValue; }
|
| +
|
| + private:
|
| T* m_Location;
|
| T m_OldValue;
|
| };
|
|
|
| template <class T>
|
| -class CFX_SmartPointer
|
| -{
|
| -public:
|
| - CFX_SmartPointer(T *pObj) : m_pObj(pObj) {}
|
| - ~CFX_SmartPointer()
|
| - {
|
| - m_pObj->Release();
|
| - }
|
| - T* Get(void)
|
| - {
|
| - return m_pObj;
|
| - }
|
| - T& operator *(void)
|
| - {
|
| - return *m_pObj;
|
| - }
|
| - T* operator ->(void)
|
| - {
|
| - return m_pObj;
|
| - }
|
| -protected:
|
| - T *m_pObj;
|
| +class CFX_SmartPointer {
|
| + public:
|
| + CFX_SmartPointer(T* pObj) : m_pObj(pObj) {}
|
| + ~CFX_SmartPointer() { m_pObj->Release(); }
|
| + T* Get(void) { return m_pObj; }
|
| + T& operator*(void) { return *m_pObj; }
|
| + T* operator->(void) { return m_pObj; }
|
| +
|
| + protected:
|
| + T* m_pObj;
|
| };
|
| -#define FX_DATALIST_LENGTH 1024
|
| -template<size_t unit>
|
| -class CFX_SortListArray
|
| -{
|
| -protected:
|
| -
|
| - struct DataList {
|
| -
|
| - int32_t start;
|
| -
|
| - int32_t count;
|
| - uint8_t* data;
|
| - };
|
| -public:
|
| -
|
| - CFX_SortListArray() : m_CurList(0) {}
|
| -
|
| - ~CFX_SortListArray()
|
| - {
|
| - Clear();
|
| - }
|
| -
|
| -
|
| - void Clear()
|
| - {
|
| - for (int32_t i = m_DataLists.GetUpperBound(); i >= 0; i--) {
|
| - DataList list = m_DataLists.ElementAt(i);
|
| - if (list.data) {
|
| - FX_Free(list.data);
|
| - }
|
| - }
|
| - m_DataLists.RemoveAll();
|
| - m_CurList = 0;
|
| - }
|
| -
|
| - void Append(int32_t nStart, int32_t nCount)
|
| - {
|
| - if (nStart < 0) {
|
| - return;
|
| - }
|
| - while (nCount > 0) {
|
| - int32_t temp_count = FX_MIN(nCount, FX_DATALIST_LENGTH);
|
| - DataList list;
|
| - list.data = FX_Alloc2D(uint8_t, temp_count, unit);
|
| - list.start = nStart;
|
| - list.count = temp_count;
|
| - Append(list);
|
| - nCount -= temp_count;
|
| - nStart += temp_count;
|
| - }
|
| - }
|
| -
|
| - uint8_t* GetAt(int32_t nIndex)
|
| - {
|
| - if (nIndex < 0) {
|
| - return NULL;
|
| - }
|
| - if (m_CurList < 0 || m_CurList >= m_DataLists.GetSize()) {
|
| - return NULL;
|
| +#define FX_DATALIST_LENGTH 1024
|
| +template <size_t unit>
|
| +class CFX_SortListArray {
|
| + protected:
|
| + struct DataList {
|
| + int32_t start;
|
| +
|
| + int32_t count;
|
| + uint8_t* data;
|
| + };
|
| +
|
| + public:
|
| + CFX_SortListArray() : m_CurList(0) {}
|
| +
|
| + ~CFX_SortListArray() { Clear(); }
|
| +
|
| + void Clear() {
|
| + for (int32_t i = m_DataLists.GetUpperBound(); i >= 0; i--) {
|
| + DataList list = m_DataLists.ElementAt(i);
|
| + if (list.data) {
|
| + FX_Free(list.data);
|
| + }
|
| + }
|
| + m_DataLists.RemoveAll();
|
| + m_CurList = 0;
|
| + }
|
| +
|
| + void Append(int32_t nStart, int32_t nCount) {
|
| + if (nStart < 0) {
|
| + return;
|
| + }
|
| + while (nCount > 0) {
|
| + int32_t temp_count = FX_MIN(nCount, FX_DATALIST_LENGTH);
|
| + DataList list;
|
| + list.data = FX_Alloc2D(uint8_t, temp_count, unit);
|
| + list.start = nStart;
|
| + list.count = temp_count;
|
| + Append(list);
|
| + nCount -= temp_count;
|
| + nStart += temp_count;
|
| + }
|
| + }
|
| +
|
| + uint8_t* GetAt(int32_t nIndex) {
|
| + if (nIndex < 0) {
|
| + return NULL;
|
| + }
|
| + if (m_CurList < 0 || m_CurList >= m_DataLists.GetSize()) {
|
| + return NULL;
|
| + }
|
| + DataList* pCurList = m_DataLists.GetDataPtr(m_CurList);
|
| + if (!pCurList || nIndex < pCurList->start ||
|
| + nIndex >= pCurList->start + pCurList->count) {
|
| + pCurList = NULL;
|
| + int32_t iStart = 0;
|
| + int32_t iEnd = m_DataLists.GetUpperBound();
|
| + int32_t iMid = 0;
|
| + while (iStart <= iEnd) {
|
| + iMid = (iStart + iEnd) / 2;
|
| + DataList* list = m_DataLists.GetDataPtr(iMid);
|
| + if (nIndex < list->start) {
|
| + iEnd = iMid - 1;
|
| + } else if (nIndex >= list->start + list->count) {
|
| + iStart = iMid + 1;
|
| + } else {
|
| + pCurList = list;
|
| + m_CurList = iMid;
|
| + break;
|
| }
|
| - DataList *pCurList = m_DataLists.GetDataPtr(m_CurList);
|
| - if (!pCurList || nIndex < pCurList->start || nIndex >= pCurList->start + pCurList->count) {
|
| - pCurList = NULL;
|
| - int32_t iStart = 0;
|
| - int32_t iEnd = m_DataLists.GetUpperBound();
|
| - int32_t iMid = 0;
|
| - while (iStart <= iEnd) {
|
| - iMid = (iStart + iEnd) / 2;
|
| - DataList* list = m_DataLists.GetDataPtr(iMid);
|
| - if (nIndex < list->start) {
|
| - iEnd = iMid - 1;
|
| - } else if (nIndex >= list->start + list->count) {
|
| - iStart = iMid + 1;
|
| - } else {
|
| - pCurList = list;
|
| - m_CurList = iMid;
|
| - break;
|
| - }
|
| - }
|
| + }
|
| + }
|
| + return pCurList ? pCurList->data + (nIndex - pCurList->start) * unit : NULL;
|
| + }
|
| +
|
| + protected:
|
| + void Append(const DataList& list) {
|
| + int32_t iStart = 0;
|
| + int32_t iEnd = m_DataLists.GetUpperBound();
|
| + int32_t iFind = 0;
|
| + while (iStart <= iEnd) {
|
| + int32_t iMid = (iStart + iEnd) / 2;
|
| + DataList* cur_list = m_DataLists.GetDataPtr(iMid);
|
| + if (list.start < cur_list->start + cur_list->count) {
|
| + iEnd = iMid - 1;
|
| + } else {
|
| + if (iMid == iEnd) {
|
| + iFind = iMid + 1;
|
| + break;
|
| }
|
| - return pCurList ? pCurList->data + (nIndex - pCurList->start) * unit : NULL;
|
| - }
|
| -protected:
|
| - void Append(const DataList& list)
|
| - {
|
| - int32_t iStart = 0;
|
| - int32_t iEnd = m_DataLists.GetUpperBound();
|
| - int32_t iFind = 0;
|
| - while (iStart <= iEnd) {
|
| - int32_t iMid = (iStart + iEnd) / 2;
|
| - DataList* cur_list = m_DataLists.GetDataPtr(iMid);
|
| - if (list.start < cur_list->start + cur_list->count) {
|
| - iEnd = iMid - 1;
|
| - } else {
|
| - if (iMid == iEnd) {
|
| - iFind = iMid + 1;
|
| - break;
|
| - }
|
| - DataList* next_list = m_DataLists.GetDataPtr(iMid + 1);
|
| - if (list.start < next_list->start) {
|
| - iFind = iMid + 1;
|
| - break;
|
| - } else {
|
| - iStart = iMid + 1;
|
| - }
|
| - }
|
| + DataList* next_list = m_DataLists.GetDataPtr(iMid + 1);
|
| + if (list.start < next_list->start) {
|
| + iFind = iMid + 1;
|
| + break;
|
| + } else {
|
| + iStart = iMid + 1;
|
| }
|
| - m_DataLists.InsertAt(iFind, list);
|
| + }
|
| }
|
| - int32_t m_CurList;
|
| - CFX_ArrayTemplate<DataList> m_DataLists;
|
| + m_DataLists.InsertAt(iFind, list);
|
| + }
|
| + int32_t m_CurList;
|
| + CFX_ArrayTemplate<DataList> m_DataLists;
|
| };
|
| -template<typename T1, typename T2>
|
| -class CFX_ListArrayTemplate
|
| -{
|
| -public:
|
| -
|
| - void Clear()
|
| - {
|
| - m_Data.Clear();
|
| - }
|
| +template <typename T1, typename T2>
|
| +class CFX_ListArrayTemplate {
|
| + public:
|
| + void Clear() { m_Data.Clear(); }
|
|
|
| - void Add(int32_t nStart, int32_t nCount)
|
| - {
|
| - m_Data.Append(nStart, nCount);
|
| - }
|
| + void Add(int32_t nStart, int32_t nCount) { m_Data.Append(nStart, nCount); }
|
|
|
| - T2& operator [] (int32_t nIndex)
|
| - {
|
| - uint8_t* data = m_Data.GetAt(nIndex);
|
| - FXSYS_assert(data != NULL);
|
| - return (T2&)(*(volatile T2*)data);
|
| - }
|
| + T2& operator[](int32_t nIndex) {
|
| + uint8_t* data = m_Data.GetAt(nIndex);
|
| + FXSYS_assert(data != NULL);
|
| + return (T2&)(*(volatile T2*)data);
|
| + }
|
|
|
| - T2* GetPtrAt(int32_t nIndex)
|
| - {
|
| - return (T2*)m_Data.GetAt(nIndex);
|
| - }
|
| -protected:
|
| - T1 m_Data;
|
| + T2* GetPtrAt(int32_t nIndex) { return (T2*)m_Data.GetAt(nIndex); }
|
| +
|
| + protected:
|
| + T1 m_Data;
|
| };
|
| -typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>, FX_FILESIZE> CFX_FileSizeListArray;
|
| -typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_DWORD)>, FX_DWORD> CFX_DWordListArray;
|
| +typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_FILESIZE)>,
|
| + FX_FILESIZE> CFX_FileSizeListArray;
|
| +typedef CFX_ListArrayTemplate<CFX_SortListArray<sizeof(FX_DWORD)>, FX_DWORD>
|
| + CFX_DWordListArray;
|
| typedef enum {
|
| - Ready,
|
| - ToBeContinued,
|
| - Found,
|
| - NotFound,
|
| - Failed,
|
| - Done
|
| + Ready,
|
| + ToBeContinued,
|
| + Found,
|
| + NotFound,
|
| + Failed,
|
| + Done
|
| } FX_ProgressiveStatus;
|
| -#define ProgressiveStatus FX_ProgressiveStatus
|
| -#define FX_NAMESPACE_DECLARE(namespace, type) namespace::type
|
| -
|
| -class CFX_Vector_3by1
|
| -{
|
| -public:
|
| +#define ProgressiveStatus FX_ProgressiveStatus
|
| +#define FX_NAMESPACE_DECLARE(namespace, type) namespace ::type
|
|
|
| - CFX_Vector_3by1() :
|
| - a(0.0f), b(0.0f), c(0.0f)
|
| - {}
|
| +class CFX_Vector_3by1 {
|
| + public:
|
| + CFX_Vector_3by1() : a(0.0f), b(0.0f), c(0.0f) {}
|
|
|
| - CFX_Vector_3by1(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1):
|
| - a(a1), b(b1), c(c1)
|
| - {}
|
| + CFX_Vector_3by1(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1)
|
| + : a(a1), b(b1), c(c1) {}
|
|
|
| - FX_FLOAT a;
|
| - FX_FLOAT b;
|
| - FX_FLOAT c;
|
| + FX_FLOAT a;
|
| + FX_FLOAT b;
|
| + FX_FLOAT c;
|
| };
|
| -class CFX_Matrix_3by3
|
| -{
|
| -public:
|
| -
|
| - CFX_Matrix_3by3():
|
| - a(0.0f), b(0.0f), c(0.0f), d(0.0f), e(0.0f), f(0.0f), g(0.0f), h(0.0f), i(0.0f)
|
| - {}
|
| -
|
| - CFX_Matrix_3by3(FX_FLOAT a1, FX_FLOAT b1, FX_FLOAT c1, FX_FLOAT d1, FX_FLOAT e1, FX_FLOAT f1, FX_FLOAT g1, FX_FLOAT h1, FX_FLOAT i1) :
|
| - a(a1), b(b1), c(c1), d(d1), e(e1), f(f1), g(g1), h(h1), i(i1)
|
| - {}
|
| -
|
| - CFX_Matrix_3by3 Inverse();
|
| -
|
| - CFX_Matrix_3by3 Multiply(const CFX_Matrix_3by3 &m);
|
| -
|
| - CFX_Vector_3by1 TransformVector(const CFX_Vector_3by1 &v);
|
| -
|
| - FX_FLOAT a;
|
| - FX_FLOAT b;
|
| - FX_FLOAT c;
|
| - FX_FLOAT d;
|
| - FX_FLOAT e;
|
| - FX_FLOAT f;
|
| - FX_FLOAT g;
|
| - FX_FLOAT h;
|
| - FX_FLOAT i;
|
| +class CFX_Matrix_3by3 {
|
| + public:
|
| + CFX_Matrix_3by3()
|
| + : a(0.0f),
|
| + b(0.0f),
|
| + c(0.0f),
|
| + d(0.0f),
|
| + e(0.0f),
|
| + f(0.0f),
|
| + g(0.0f),
|
| + h(0.0f),
|
| + i(0.0f) {}
|
| +
|
| + CFX_Matrix_3by3(FX_FLOAT a1,
|
| + FX_FLOAT b1,
|
| + FX_FLOAT c1,
|
| + FX_FLOAT d1,
|
| + FX_FLOAT e1,
|
| + FX_FLOAT f1,
|
| + FX_FLOAT g1,
|
| + FX_FLOAT h1,
|
| + FX_FLOAT i1)
|
| + : a(a1), b(b1), c(c1), d(d1), e(e1), f(f1), g(g1), h(h1), i(i1) {}
|
| +
|
| + CFX_Matrix_3by3 Inverse();
|
| +
|
| + CFX_Matrix_3by3 Multiply(const CFX_Matrix_3by3& m);
|
| +
|
| + CFX_Vector_3by1 TransformVector(const CFX_Vector_3by1& v);
|
| +
|
| + FX_FLOAT a;
|
| + FX_FLOAT b;
|
| + FX_FLOAT c;
|
| + FX_FLOAT d;
|
| + FX_FLOAT e;
|
| + FX_FLOAT f;
|
| + FX_FLOAT g;
|
| + FX_FLOAT h;
|
| + FX_FLOAT i;
|
| };
|
|
|
| #endif // CORE_INCLUDE_FXCRT_FX_BASIC_H_
|
|
|