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

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

Browse Source
This commit is contained in:
Oleg.Korshul
2016-01-29 16:00:58 +00:00
committed by Alexander Trofimov
parent ec5f2b829a
commit f118b76b92
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
HtmlFile/HtmlFile.cpp
View File

@ -191,14 +191,39 @@ int CHtmlFile::Convert(const std::vector<std::wstring>& arFiles, const std::wstr
pCommandLine[sApp.length()] = (wchar_t)'\0';
}
#if 0
std::wstringstream ss;
ss << L"PATH=" << _wgetenv(L"PATH");
ss << L";" << NSFile::GetProcessDirectory();
ss << L";" << (NSFile::GetProcessDirectory() + L"\\..");
ss << L";" << (NSFile::GetProcessDirectory() + L"\\..\\..");
std::wstring env = ss.str();
wchar_t* pCommandLineEnv = NULL;
if (true)
{
pCommandLineEnv = new wchar_t[env.length() + 2];
memcpy(pCommandLineEnv, env.c_str(), sApp.length() * sizeof(wchar_t));
pCommandLineEnv[env.length()] = (wchar_t)'\0';
pCommandLineEnv[env.length() + 1] = (wchar_t)'\0';
}
PROCESS_INFORMATION processinfo;
ZeroMemory(&processinfo,sizeof(PROCESS_INFORMATION));
BOOL bResult = CreateProcessW(sInternal.c_str(), pCommandLine,
NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT, (LPVOID)pCommandLineEnv, NULL, &sturtupinfo, &processinfo);
#else
PROCESS_INFORMATION processinfo;
ZeroMemory(&processinfo,sizeof(PROCESS_INFORMATION));
BOOL bResult = CreateProcessW(sInternal.c_str(), pCommandLine,
NULL, NULL, TRUE, NULL, NULL, NULL, &sturtupinfo, &processinfo);
#endif
::WaitForSingleObject(processinfo.hProcess, INFINITE);
RELEASEARRAYOBJECTS(pCommandLine);
RELEASEARRAYOBJECTS(pCommandLine);
//get exit code
DWORD dwExitCode = 0;