strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mingwport03 (1.5.14); FILE MERGED

Browse source 
2006/11/08 13:42:26 vg 1.5.14.2: RESYNC: (1.5-1.6); FILE MERGED
2006/09/18 14:38:06 vg 1.5.14.1: #i53572# MinGW port
This commit is contained in:
Vladimir Glazounov 2007-03-26 13:23:21 +00:00
parent b8ccb45c73
commit ccc3c8e396
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sal/osl/w32/procimpl.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: procimpl.cxx,v $
*
* $Revision: 1.6 $
* $Revision: 1.7 $
*
* last change: $Author: obo $ $Date: 2006-09-17 08:47:44 $
* last change: $Author: vg $ $Date: 2007-03-26 14:23:21 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -167,7 +167,7 @@ namespace /* private */
while (size_t l = _tcslen(p))
{
environment->push_back(p);
environment->push_back(reinterpret_cast<const sal_Unicode*>(p));
p += l + 1;
}
FreeEnvironmentStrings(env);
@ -489,7 +489,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
if (ustrDirectory && ustrDirectory->length && (osl_File_E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd)))
return osl_Process_E_InvalidError;
LPCWSTR p_cwd = (cwd.getLength()) ? cwd.getStr() : NULL;
LPCWSTR p_cwd = (cwd.getLength()) ? reinterpret_cast<LPCWSTR>(cwd.getStr()) : NULL;
if ((Options & osl_Process_DETACHED) && !(flags & CREATE_NEW_CONSOLE))
flags |= DETACHED_PROCESS;
@ -551,14 +551,14 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO(
{
bRet = CreateProcessAsUser(
((oslSecurityImpl*)Security)->m_hToken,
NULL, const_cast<sal_Unicode*>(cmdline.getStr()), NULL, NULL,
NULL, const_cast<LPTSTR>(reinterpret_cast<LPCTSTR>(cmdline.getStr())), NULL, NULL,
b_inherit_handles, flags, p_environment, p_cwd,
&startup_info, &process_info);
}
else
{
bRet = CreateProcess(
NULL, const_cast<sal_Unicode*>(cmdline.getStr()), NULL, NULL,
NULL, const_cast<LPTSTR>(reinterpret_cast<LPCTSTR>(cmdline.getStr())), NULL, NULL,
b_inherit_handles, flags, p_environment, p_cwd,
&startup_info, &process_info);
}