pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix mac version

Browse Source
This commit is contained in:
Oleg.Korshul
2022-05-25 21:08:28 +03:00
parent 9b2208b97d
commit 827fc16fbe
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Common/Network/FileTransporter/src/transport_external.h
View File

@ -43,6 +43,10 @@
#include <regex>
#include <atomic>
#ifdef _MAC
#include <signal.h>
#endif
namespace NSNetwork
{
namespace NSFileTransport
@ -59,7 +63,7 @@ namespace NSNetwork
return url.substr(pos);
}
int download_external(const std::wstring& sUrl, const std::wstring& sOutput, std::function<void(int)> func_onProgress, std::function<bool(void)> func_checkAborted = nullptr)
int download_external(const std::wstring& sUrl, const std::wstring& sOutput, std::function<void(int)> func_onProgress = nullptr, std::function<bool(void)> func_checkAborted = nullptr)
{
pid_t pid;
int nReturnCode = -1;

3
DesktopEditor/doctrenderer/js_internal/js_base.h
View File

@ -138,7 +138,10 @@ namespace NSJSBase
void Free()
{
if (Data)
{
NSAllocator::Free(Data, Len);
Data = NULL;
}
}
};

18
DesktopEditor/doctrenderer/js_internal/jsc/jsc_base.h
View File

@ -293,7 +293,6 @@ namespace NSJSBase
public:
CJSTypedArrayJSC(JSContext* _context, BYTE* data = NULL, int count = 0, const bool& isExternalize = true)
{
data_old_version = NULL;
context = _context;
if (0 >= count)
return;
@ -302,7 +301,7 @@ namespace NSJSBase
JSObjectRef object = JSObjectMakeTypedArrayWithBytesNoCopy(context.JSGlobalContextRef,
kJSTypedArrayTypeUint8Array,
(void*)data, (size_t)count,
isExternalize ? data_no_destroy_memory : data_destroy,
isExternalize ? data_no_destroy_memory : data_destroy_memory,
nullptr, nullptr);
if (object)
{
@ -328,7 +327,7 @@ namespace NSJSBase
static void data_destroy_memory(void* bytes, void* deallocatorContext)
{
NSJSBase::NSAllocator::Free(bytes, 0);
NSJSBase::NSAllocator::Free((unsigned char*)bytes, 0);
}
static void data_no_destroy_memory(void* bytes, void* deallocatorContext)
{
@ -367,9 +366,16 @@ namespace NSJSBase
JSValue* dataBase64 = [context[@"jsc_toBase64"] callWithArguments:arr];
std::string sBase64Data = [[dataBase64 toString] stdstring];
int nDstLen = 0;
buffer.IsExternalize = true;
NSFile::CBase64Converter::Decode(sBase64Data.c_str(), (int)sBase64Data.length(), data_old_version, nDstLen);
buffer.IsExternalize = true;
int nLenDst = NSBase64::Base64DecodeGetRequiredLength((int)sBase64Data.length());
buffer.Data = NSAllocator::Alloc(nLenDst);
if (FALSE == NSBase64::Base64Decode(sBase64Data.c_str(), (int)sBase64Data.length(), buffer.Data, &nLenDst))
{
buffer.Free();
return buffer;
}
return buffer;
}