Skip to content

O
onlyoffice_core
Commit 2077c375 authored by konovalovsergey's avatar konovalovsergey
Browse files
Options

fix bug 33331

parent c1f923fc
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 267 deletions
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
View file @ 2077c375
......@@ -634,59 +634,7 @@ namespace NSBinPptxRW
}
void CBinaryFileWriter::WriteStringW(const WCHAR* sBuffer)
{
_INT32 lSize = __wstrlen(sBuffer);
_INT32 lSizeMem =0;
if (sizeof(wchar_t) == 4)
{
lSizeMem = lSize * sizeof(UTF16);
CheckBufferSize(UINT32_SIZEOF + lSizeMem);
#ifdef _IOS
memcpy(m_pStreamCur, &lSizeMem, sizeof(_UINT32));
#else
*((_UINT32*)m_pStreamCur) = lSizeMem; // EXC_ARM_DA_ALIGN on ios
#endif
m_lPosition += UINT32_SIZEOF;
m_pStreamCur += UINT32_SIZEOF;
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) sBuffer;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
}
else
{
lSizeMem = lSize * sizeof(wchar_t);
CheckBufferSize(UINT32_SIZEOF + lSizeMem);
#ifdef _IOS
memcpy(m_pStreamCur, &lSizeMem, sizeof(_UINT32));
#else
*((_UINT32*)m_pStreamCur) = lSizeMem; // EXC_ARM_DA_ALIGN on ios
#endif
m_lPosition += UINT32_SIZEOF;
m_pStreamCur += UINT32_SIZEOF;
memcpy(m_pStreamCur, sBuffer, lSizeMem);
}
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
_WriteStringWithLength(sBuffer, __wstrlen(sBuffer), true);
}
void CBinaryFileWriter::WriteStringWStd(const std::wstring& sBuffer)
{
......@@ -729,66 +677,7 @@ namespace NSBinPptxRW
}
void CBinaryFileWriter::WriteStringW2(const WCHAR* sBuffer)
{
if (sizeof(wchar_t) == 4)
{
WriteStringW2_4(sBuffer);
}else
{
WriteStringW2_2(sBuffer);
}
}
void CBinaryFileWriter::WriteStringW2_2(const WCHAR* sBuffer)
{
_INT32 lSize = __wstrlen(sBuffer);
_INT32 lSizeMem = lSize * sizeof(UTF16);
CheckBufferSize(UINT32_SIZEOF + lSizeMem);
#ifdef _IOS
memcpy(m_pStreamCur, &lSize, sizeof(_UINT32));
#else
*((_UINT32*)m_pStreamCur) = lSize; // EXC_ARM_DA_ALIGN on ios
#endif
m_lPosition += UINT32_SIZEOF;
m_pStreamCur += UINT32_SIZEOF;
memcpy(m_pStreamCur, sBuffer, lSizeMem);
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
}
void CBinaryFileWriter::WriteStringW2_4(const WCHAR* sBuffer)
{
_INT32 lSize = __wstrlen(sBuffer);
_INT32 lSizeMem = lSize * sizeof(wchar_t);
CheckBufferSize(UINT32_SIZEOF + lSizeMem);
#ifdef _IOS
memcpy(m_pStreamCur, &lSize, sizeof(_UINT32));
#else
*((_UINT32*)m_pStreamCur) = lSize; // EXC_ARM_DA_ALIGN on ios
#endif
m_lPosition += UINT32_SIZEOF;
m_pStreamCur += UINT32_SIZEOF;
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) sBuffer;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
_WriteStringWithLength(sBuffer, __wstrlen(sBuffer), false);
}
void CBinaryFileWriter::WriteStringW2(CString& sBuffer)
{
......@@ -796,54 +685,7 @@ namespace NSBinPptxRW
}
void CBinaryFileWriter::WriteStringW3(const WCHAR* sBuffer)
{
if (sizeof(wchar_t) == 4)
{
WriteStringW3_4(sBuffer);
}else
{
WriteStringW3_2(sBuffer);
}
}
void CBinaryFileWriter::WriteStringW3_2(const WCHAR* sBuffer)
{
_INT32 lSize = __wstrlen(sBuffer);
_INT32 lSizeMem = lSize * sizeof(wchar_t);
CheckBufferSize(lSizeMem);
memcpy(m_pStreamCur, sBuffer, lSizeMem);
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
}
void CBinaryFileWriter::WriteStringW3_4(const WCHAR* sBuffer)
{
_INT32 lSize = __wstrlen(sBuffer);
_INT32 lSizeMem = lSize * sizeof(UTF16);
CheckBufferSize(lSizeMem);
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) sBuffer;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
_WriteString(sBuffer, __wstrlen(sBuffer));
}
void CBinaryFileWriter::WriteStringW3(CString& sBuffer)
{
......@@ -928,42 +770,8 @@ namespace NSBinPptxRW
BYTE bType = (BYTE)type;
WriteBYTE(bType);
_UINT32 lSize = (_UINT32)val.GetLength() , len = lSize;
WriteULONG(lSize);
len <<= 1;
CString* s = const_cast<CString*>(&val);
CheckBufferSize(len);
WCHAR *buffer = s->GetBuffer();
if (sizeof(buffer[0]) == 4)
{
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) buffer;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
}else
{
memcpy(m_pStreamCur, s->GetBuffer(), len);
}
m_pStreamCur += len;
m_lPosition += len;
_WriteStringWithLength(s->GetBuffer(), s->GetLength(), false);
}
void CBinaryFileWriter::WriteString2(int type, const NSCommon::nullable_string& val)
{
......@@ -972,42 +780,8 @@ namespace NSBinPptxRW
}
void CBinaryFileWriter::WriteString(const CString& val)
{
_UINT32 lSize = (_UINT32)val.GetLength() , len = lSize;
WriteULONG(len);
len <<= 1;
CString* s = const_cast<CString*>(&val);
CheckBufferSize(len);
WCHAR *buffer = s->GetBuffer();
if (sizeof(buffer[0]) == 4)
{
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) buffer;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
}else
{
memcpy(m_pStreamCur, s->GetBuffer(), len);
}
m_pStreamCur += len;
m_lPosition += len;
_WriteStringWithLength(s->GetBuffer(), s->GetLength(), false);
}
void CBinaryFileWriter::WriteString1Data(int type, const WCHAR* pData, _UINT32 len)
......@@ -1015,38 +789,7 @@ namespace NSBinPptxRW
BYTE bType = (BYTE)type;
WriteBYTE(bType);
WriteULONG(len);
_UINT32 lSize = len;
len <<= 1;
CheckBufferSize(len);
if (sizeof(wchar_t) == 4)
{
UTF16* pStrUtf16 = (UTF16 *) m_pStreamCur;
UTF32 *pStrUtf32 = (UTF32 *) pData;
// this values will be modificated
UTF16 *pStrUtf16_Conv = pStrUtf16;
const UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF32toUTF16 (&pStrUtf32_Conv
, &pStrUtf32[lSize]
, &pStrUtf16_Conv
, &pStrUtf16 [lSize]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
}
}else
{
memcpy(m_pStreamCur, (BYTE*)pData, len);
}
m_pStreamCur += len;
m_lPosition += len;
_WriteStringWithLength(pData, len, false);
}
void CBinaryFileWriter::WriteBool1(int type, const bool& val)
......@@ -1194,6 +937,54 @@ namespace NSBinPptxRW
memcpy(*ppArray, this->GetBuffer(), lBinarySize);
return true;
}
_INT32 CBinaryFileWriter::_WriteString(const WCHAR* sBuffer, _UINT32 lCount)
{
_INT32 lSizeMem = 0;
if (sizeof(wchar_t) == 4)
{
_INT32 lSizeMemMax = 4 * lCount + 2;//2 - for null terminator
CheckBufferSize(lSizeMemMax);
NSFile::CUtf8Converter::GetUtf16StringFromUnicode_4bytes(sBuffer, lCount, m_pStreamCur, lSizeMem);
}
else
{
lSizeMem = 2 * lCount;
CheckBufferSize(lSizeMem);
memcpy(m_pStreamCur, sBuffer, lSizeMem);
}
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
return lSizeMem;
}
void CBinaryFileWriter::_WriteStringWithLength(const WCHAR* sBuffer, _UINT32 lCount, bool bByte)
{
CheckBufferSize(UINT32_SIZEOF);
//skip size
m_lPosition += UINT32_SIZEOF;
m_pStreamCur += UINT32_SIZEOF;
//write string
_INT32 lSizeMem = _WriteString(sBuffer, lCount);
//back to size
m_lPosition -= lSizeMem;
m_pStreamCur -= lSizeMem;
m_lPosition -= UINT32_SIZEOF;
m_pStreamCur -= UINT32_SIZEOF;
//write size
if (bByte)
{
//byte
WriteLONG(lSizeMem);
}
else
{
//length
WriteLONG(lSizeMem / 2);
}
//skip string
m_lPosition += lSizeMem;
m_pStreamCur += lSizeMem;
}
/*
LPSAFEARRAY CBinaryFileWriter::GetSafearray()
{
......
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.h
View file @ 2077c375
......@@ -294,13 +294,9 @@ namespace NSBinPptxRW
void WriteStringA(CStringA& sBuffer);
void WriteStringW(CString& sBuffer);
void WriteStringW2(const WCHAR* sBuffer);
void WriteStringW2_2(const WCHAR* sBuffer);
void WriteStringW2_4(const WCHAR* sBuffer);
void WriteStringW2(CString& sBuffer);
void WriteStringW3(const WCHAR* sBuffer);
void WriteStringW3(CString& sBuffer);
void WriteStringW3_2(const WCHAR* sBuffer);
void WriteStringW3_4(const WCHAR* sBuffer);
void WriteStringW4(const std::wstring& sBuffer);
// --------------------------------------------------------
void WriteLONG64(const _INT64& lValue);
......@@ -401,6 +397,9 @@ namespace NSBinPptxRW
bool Serialize(NSShapeImageGen::CImageManager* pManager, BYTE **ppArray, size_t& szCount);
bool GetSafearray(BYTE **ppArray, size_t& szCount);
private:
_INT32 _WriteString(const WCHAR* sBuffer, _UINT32 lCount);
void _WriteStringWithLength(const WCHAR* sBuffer, _UINT32 lCount, bool bByte);
};
class CSlideMasterInfo
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7