pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-07-20 03:08:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

compaund file stream in unicode

Browse Source
This commit is contained in:
ElenaSubbotina
2017-10-21 13:28:29 +03:00
parent c46cd9e6e5
commit 7ecc7fa1df
52 changed files with 801 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Common/OfficeFileFormatChecker2.cpp
View File

@ -133,13 +133,13 @@ bool COfficeFileFormatChecker::isDocFormatFile (POLE::Storage * storage)
{
if (storage == NULL) return false;
POLE::Stream stream(storage, "WordDocument");
POLE::Stream stream(storage, L"WordDocument");
unsigned char buffer[10];
if (stream.read(buffer,10) > 0)
{
//ms office 2007 encrypted contains stream WordDocument !!
std::list<std::string> entries = storage->entries("DataSpaces");
std::list<std::wstring> entries = storage->entries(L"DataSpaces");
if (entries.size() > 0)
return false;
@ -154,19 +154,29 @@ bool COfficeFileFormatChecker::isXlsFormatFile (POLE::Storage * storage)
unsigned char buffer[10];
POLE::Stream stream(storage, "Workbook");
POLE::Stream stream(storage, L"Workbook");
if (stream.read(buffer,10) >0)
return true;
POLE::Stream stream2(storage, "Book");
POLE::Stream stream2(storage, L"Book");
if (stream2.read(buffer,10) >0)
if (stream2.read(buffer,10) > 0)
return true;
POLE::Stream stream3(storage, "WORKBOOK");
POLE::Stream stream3(storage, L"WORKBOOK");
if (stream3.read(buffer,10) >0)
if (stream3.read(buffer,10) > 0)
return true;
POLE::Stream stream4(storage, L"BOOK");
if (stream4.read(buffer,10) > 0)
return true;
POLE::Stream stream5(storage, L"book");
if (stream5.read(buffer,10) > 0)
return true;
return false;
@ -175,7 +185,7 @@ bool COfficeFileFormatChecker::isPptFormatFile (POLE::Storage * storage)
{
if (storage == NULL) return false;
POLE::Stream stream(storage, "PowerPoint Document");
POLE::Stream stream(storage, L"PowerPoint Document");
unsigned char buffer[10];
if (stream.read(buffer,10) >0)
@ -187,12 +197,12 @@ bool COfficeFileFormatChecker::isMS_OFFCRYPTOFormatFile (POLE::Storage * storage
{
if (storage == NULL) return false;
std::list<std::string> entries = storage->entries("DataSpaces");
std::list<std::wstring> entries = storage->entries(L"DataSpaces");
if (entries.size() > 0)
return true;
if ( storage->exists("EncryptionInfo") &&
storage->exists("EncryptedPackage"))
if ( storage->exists(L"EncryptionInfo") &&
storage->exists(L"EncryptedPackage"))
return true;
return false;
}