diff options
Diffstat (limited to 'sal/osl/w32/procimpl.cxx')
| -rw-r--r-- | sal/osl/w32/procimpl.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sal/osl/w32/procimpl.cxx b/sal/osl/w32/procimpl.cxx index 965db4a1360d..23c08a197040 100644 --- a/sal/osl/w32/procimpl.cxx +++ b/sal/osl/w32/procimpl.cxx @@ -124,7 +124,7 @@ namespace /* private */ while (size_t l = _tcslen(p)) { - environment->push_back(p); + environment->push_back(SAL_U(p)); p += l + 1; } FreeEnvironmentStrings(env); @@ -291,7 +291,7 @@ namespace /* private */ std::vector<sal_Unicode> vec(path.getLength() + 1); //GetShortPathNameW only works if the file can be found! const DWORD len = GetShortPathNameW( - path.getStr(), &vec[0], path.getLength() + 1); + SAL_W(path.getStr()), SAL_W(&vec[0]), path.getLength() + 1); if (!len && GetLastError() == ERROR_FILE_NOT_FOUND && extension.getLength()) @@ -300,7 +300,7 @@ namespace /* private */ std::vector<sal_Unicode> vec2( extPath.getLength() + 1); const DWORD len2 = GetShortPathNameW( - extPath.getStr(), &vec2[0], extPath.getLength() + 1); + SAL_W(extPath.getStr()), SAL_W(&vec2[0]), extPath.getLength() + 1); ret = rtl::OUString(&vec2[0], len2); } else @@ -479,7 +479,7 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( if (ustrDirectory && ustrDirectory->length && (osl::FileBase::E_None != osl::FileBase::getSystemPathFromFileURL(ustrDirectory, cwd))) return osl_Process_E_InvalidError; - LPCWSTR p_cwd = (cwd.getLength()) ? cwd.getStr() : nullptr; + LPCWSTR p_cwd = (cwd.getLength()) ? SAL_W(cwd.getStr()) : nullptr; if ((Options & osl_Process_DETACHED) && !(flags & CREATE_NEW_CONSOLE)) flags |= DETACHED_PROCESS; @@ -544,14 +544,14 @@ oslProcessError SAL_CALL osl_executeProcess_WithRedirectedIO( { bRet = CreateProcessAsUser( static_cast<oslSecurityImpl*>(Security)->m_hToken, - nullptr, const_cast<LPWSTR>(cmdline.getStr()), nullptr, nullptr, + nullptr, const_cast<LPWSTR>(SAL_W(cmdline.getStr())), nullptr, nullptr, b_inherit_handles, flags, p_environment, p_cwd, &startup_info, &process_info); } else { bRet = CreateProcess( - nullptr, const_cast<LPWSTR>(cmdline.getStr()), nullptr, nullptr, + nullptr, const_cast<LPWSTR>(SAL_W(cmdline.getStr())), nullptr, nullptr, b_inherit_handles, flags, p_environment, p_cwd, &startup_info, &process_info); } |