From 51114964fdb2a98f763318ce9affca906ed079e3 Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Wed, 12 Apr 2017 13:29:37 -0400 Subject: Fold CXFA_WideTextRead into IFGAS_Stream This Cl moves CXFA_WideTextRead to be in the anonymous namespace of IFGAS_Stream and adds a IFGAS_Stream::CreateWideStringReadStream() method. This is done so we have all the implementations of IFGAS_Stream centralized. Change-Id: I9fbbf0a493fc2dd05fcd544e344268214a75d8a1 Reviewed-on: https://pdfium-review.googlesource.com/4052 Commit-Queue: dsinclair Reviewed-by: Tom Sepez --- xfa/fgas/crt/ifgas_stream.cpp | 129 ++++++++++++++++++++++++++++++++++++++++-- xfa/fgas/crt/ifgas_stream.h | 2 + 2 files changed, 127 insertions(+), 4 deletions(-) (limited to 'xfa/fgas/crt') diff --git a/xfa/fgas/crt/ifgas_stream.cpp b/xfa/fgas/crt/ifgas_stream.cpp index dcd13b162e..f36ebb556b 100644 --- a/xfa/fgas/crt/ifgas_stream.cpp +++ b/xfa/fgas/crt/ifgas_stream.cpp @@ -15,7 +15,9 @@ #include #include +#include "core/fxcrt/fx_ext.h" #include "third_party/base/ptr_util.h" +#include "third_party/base/stl_util.h" #include "xfa/fgas/crt/fgas_codepage.h" namespace { @@ -67,7 +69,7 @@ class CFGAS_FileReadStreamImp : public IFGAS_StreamImp { void Flush() override {} bool SetLength(int32_t iLength) override { return false; } - protected: + private: CFX_RetainPtr m_pFileRead; int32_t m_iPosition; int32_t m_iLength; @@ -95,7 +97,7 @@ class CFGAS_FileWriteStreamImp : public IFGAS_StreamImp { void Flush() override; bool SetLength(int32_t iLength) override { return false; } - protected: + private: CFX_RetainPtr m_pFileWrite; int32_t m_iPosition; }; @@ -121,7 +123,7 @@ class CFGAS_Stream : public IFGAS_Stream { uint16_t GetCodePage() const override; uint16_t SetCodePage(uint16_t wCodePage) override; - protected: + private: CFGAS_Stream(std::unique_ptr imp, uint32_t dwAccess); ~CFGAS_Stream() override; @@ -155,7 +157,7 @@ class CFGAS_TextStream : public IFGAS_Stream { uint16_t GetCodePage() const override; uint16_t SetCodePage(uint16_t wCodePage) override; - protected: + private: explicit CFGAS_TextStream(const CFX_RetainPtr& pStream); ~CFGAS_TextStream() override; @@ -169,6 +171,35 @@ class CFGAS_TextStream : public IFGAS_Stream { CFX_RetainPtr m_pStreamImp; }; +class CFGAS_WideStringReadStream : public IFGAS_Stream { + public: + template + friend CFX_RetainPtr pdfium::MakeRetain(Args&&... args); + + // IFGAS_Stream + uint32_t GetAccessModes() const override; + int32_t GetLength() const override; + int32_t Seek(FX_STREAMSEEK eSeek, int32_t iOffset) override; + int32_t GetPosition() override; + bool IsEOF() const override; + int32_t ReadData(uint8_t* pBuffer, int32_t iBufferSize) override; + int32_t ReadString(wchar_t* pStr, int32_t iMaxLength, bool& bEOS) override; + int32_t WriteData(const uint8_t* pBuffer, int32_t iBufferSize) override; + int32_t WriteString(const wchar_t* pStr, int32_t iLength) override; + void Flush() override {} + bool SetLength(int32_t iLength) override; + int32_t GetBOM(uint8_t bom[4]) const override; + uint16_t GetCodePage() const override; + uint16_t SetCodePage(uint16_t wCodePage) override; + + private: + explicit CFGAS_WideStringReadStream(const CFX_WideString& wsBuffer); + ~CFGAS_WideStringReadStream() override; + + CFX_WideString m_wsBuffer; + int32_t m_iPosition; +}; + IFGAS_StreamImp::IFGAS_StreamImp() : m_dwAccess(0) {} CFGAS_FileReadStreamImp::CFGAS_FileReadStreamImp() @@ -186,6 +217,7 @@ bool CFGAS_FileReadStreamImp::LoadFileRead( int32_t CFGAS_FileReadStreamImp::GetLength() const { return m_iLength; } + int32_t CFGAS_FileReadStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) { switch (eSeek) { case FX_STREAMSEEK_Begin: @@ -205,6 +237,7 @@ int32_t CFGAS_FileReadStreamImp::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) { } return m_iPosition; } + bool CFGAS_FileReadStreamImp::IsEOF() const { return m_iPosition >= m_iLength; } @@ -650,6 +683,88 @@ uint16_t CFGAS_Stream::SetCodePage(uint16_t wCodePage) { #endif } +CFGAS_WideStringReadStream::CFGAS_WideStringReadStream( + const CFX_WideString& wsBuffer) + : m_wsBuffer(wsBuffer), m_iPosition(0) {} + +CFGAS_WideStringReadStream::~CFGAS_WideStringReadStream() {} + +uint32_t CFGAS_WideStringReadStream::GetAccessModes() const { + return 0; +} + +int32_t CFGAS_WideStringReadStream::GetLength() const { + return m_wsBuffer.GetLength() * sizeof(wchar_t); +} + +int32_t CFGAS_WideStringReadStream::Seek(FX_STREAMSEEK eSeek, int32_t iOffset) { + switch (eSeek) { + case FX_STREAMSEEK_Begin: + m_iPosition = iOffset; + break; + case FX_STREAMSEEK_Current: + m_iPosition += iOffset; + break; + case FX_STREAMSEEK_End: + m_iPosition = m_wsBuffer.GetLength() + iOffset; + break; + } + m_iPosition = pdfium::clamp(0, m_iPosition, m_wsBuffer.GetLength()); + return GetPosition(); +} + +int32_t CFGAS_WideStringReadStream::GetPosition() { + return m_iPosition * sizeof(wchar_t); +} + +bool CFGAS_WideStringReadStream::IsEOF() const { + return m_iPosition >= m_wsBuffer.GetLength(); +} + +int32_t CFGAS_WideStringReadStream::ReadData(uint8_t* pBuffer, + int32_t iBufferSize) { + return 0; +} + +int32_t CFGAS_WideStringReadStream::ReadString(wchar_t* pStr, + int32_t iMaxLength, + bool& bEOS) { + iMaxLength = std::min(iMaxLength, m_wsBuffer.GetLength() - m_iPosition); + if (iMaxLength == 0) + return 0; + + FXSYS_wcsncpy(pStr, m_wsBuffer.c_str() + m_iPosition, iMaxLength); + m_iPosition += iMaxLength; + bEOS = IsEOF(); + return iMaxLength; +} + +int32_t CFGAS_WideStringReadStream::WriteData(const uint8_t* pBuffer, + int32_t iBufferSize) { + return 0; +} + +int32_t CFGAS_WideStringReadStream::WriteString(const wchar_t* pStr, + int32_t iLength) { + return 0; +} + +bool CFGAS_WideStringReadStream::SetLength(int32_t iLength) { + return false; +} + +int32_t CFGAS_WideStringReadStream::GetBOM(uint8_t bom[4]) const { + return 0; +} + +uint16_t CFGAS_WideStringReadStream::GetCodePage() const { + return (sizeof(wchar_t) == 2) ? FX_CODEPAGE_UTF16LE : FX_CODEPAGE_UTF32LE; +} + +uint16_t CFGAS_WideStringReadStream::SetCodePage(uint16_t wCodePage) { + return GetCodePage(); +} + } // namespace // static @@ -684,3 +799,9 @@ CFX_RetainPtr IFGAS_Stream::CreateWriteStream( return pdfium::MakeRetain( pdfium::MakeRetain(std::move(pImp), FX_STREAMACCESS_Write)); } + +// static +CFX_RetainPtr IFGAS_Stream::CreateWideStringReadStream( + const CFX_WideString& buffer) { + return pdfium::MakeRetain(buffer); +} diff --git a/xfa/fgas/crt/ifgas_stream.h b/xfa/fgas/crt/ifgas_stream.h index d8efc41afd..df9d93afa3 100644 --- a/xfa/fgas/crt/ifgas_stream.h +++ b/xfa/fgas/crt/ifgas_stream.h @@ -27,6 +27,8 @@ class IFGAS_Stream : public CFX_Retainable { const CFX_RetainPtr& pFileRead); static CFX_RetainPtr CreateWriteStream( const CFX_RetainPtr& pFileWrite); + static CFX_RetainPtr CreateWideStringReadStream( + const CFX_WideString& buffer); virtual uint32_t GetAccessModes() const = 0; virtual int32_t GetLength() const = 0; -- cgit v1.2.3