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

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64491 954022d7-b5bf-4e40-9824-e11837661b57

Browse Source
This commit is contained in:
Oleg.Korshul
2015-09-03 07:49:44 +00:00
committed by Alexander Trofimov
parent 01b7e3c114
commit d2debc674a
3 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
DesktopEditor/Qt_build/graphics/project/graphics.pro
View File

@ -73,6 +73,7 @@ mac {
_LINUX \
_LINUX_QT \
_MAC \
MAC \
QT_MAC
message(mac)

38
DesktopEditor/common/File.h
View File

@ -1010,28 +1010,30 @@ namespace NSFile
#define NS_FILE_MAX_PATH 32768
static std::wstring GetProcessPath()
{
#if defined (_WIN64)
#if defined (_WIN64) || defined(_WIN32)
wchar_t buf [NS_FILE_MAX_PATH];
GetModuleFileNameW(GetModuleHandle(NULL), buf, NS_FILE_MAX_PATH);
//std::string str(buf);
//return std::wstring(str.begin(), str.end());
return std::wstring(buf);
#elif defined(_WIN32)
wchar_t buf[NS_FILE_MAX_PATH];
GetModuleFileNameW(GetModuleHandleW(NULL), buf, NS_FILE_MAX_PATH);
return std::wstring(buf);
#else
#if defined(__linux__) || defined(_MAC) && !defined(_IOS)
char buf[NS_FILE_MAX_PATH];
if (readlink ("/proc/self/exe", buf, NS_FILE_MAX_PATH) <= 0)
return L"";
#endif
#if defined(__linux__) || defined(_MAC) && !defined(_IOS)
char buf[NS_FILE_MAX_PATH];
if (readlink ("/proc/self/exe", buf, NS_FILE_MAX_PATH) <= 0)
{
#ifdef _MAC
getcwd(buf, sizeof(buf));
std::string sUTF8(buf);
std::wstring sRet = CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sUTF8.c_str(), sUTF8.length());
return sRet;
#endif
return L"";
}
std::string sUTF8(buf);
std::wstring sRet = CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sUTF8.c_str(), sUTF8.length());
return sRet;
#endif
std::string sUTF8(buf);
std::wstring sRet = CUtf8Converter::GetUnicodeStringFromUTF8((BYTE*)sUTF8.c_str(), sUTF8.length());
return sRet;
#endif
#endif
return L"";
}

1
DesktopEditor/common/Types.h
View File

@ -65,7 +65,6 @@ typedef T_ULONG64 ULONG64;
typedef T_LONG64 LONG64;
typedef T_ULONG64 UINT64;
#define BOOL int
#else
#if (!defined (_MAC) && (!defined(MIDL_PASS) || defined(__midl)) && (!defined(_M_IX86) || (defined(_INTEGRAL_MAX_BITS) && _INTEGRAL_MAX_BITS >= 64)))