diff options
| author | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-16 14:55:03 +0100 |
|---|---|---|
| committer | Stephan Bergmann <stephan.bergmann@allotropia.de> | 2024-01-17 11:03:10 +0100 |
| commit | 50b14f26de63d22b9ad05ca51d9edc53e024e75e (patch) | |
| tree | e258966528996b4b3f3c9162406b195101ee7107 | |
| parent | f4d376e9a10a8c66f7f6ecfe6a1f4763c1927b52 (diff) | |
Search for load-time variables in fundamental.override.ini
...instead of arbitrarily cramming them into bootstrap.ini. (And don't force
those ini-files to have an additional [Win32] section, when
include/rtl/bootstrap.h demands that "An ini-file is only allowed to have one
section, which must be named `[Bootstrap]` with the square brackets.")
Change-Id: I732bf9d771ea309eccd35b6db0f565a0c56a3c3e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162188
Tested-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
Reviewed-by: Stephan Bergmann <stephan.bergmann@allotropia.de>
| -rw-r--r-- | desktop/win32/source/loader.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/desktop/win32/source/loader.cxx b/desktop/win32/source/loader.cxx index 40cef9e3fd4f..98efde9ec823 100644 --- a/desktop/win32/source/loader.cxx +++ b/desktop/win32/source/loader.cxx @@ -164,11 +164,11 @@ int officeloader_impl(bool bAllowConsole) } std::vector<std::wstring> aEscapedArgs; - // read limit values from bootstrap.ini + // read limit values from fundamental.override.ini unsigned int nMaxMemoryInMB = 0; bool bExcludeChildProcesses = true; - const WCHAR* szIniFile = L"\\bootstrap.ini"; + const WCHAR* szIniFile = L"\\fundamental.override.ini"; const size_t nDirLen = wcslen(szIniDirectory); if (wcslen(szIniFile) + nDirLen < MAX_PATH) { @@ -181,8 +181,8 @@ int officeloader_impl(bool bAllowConsole) boost::property_tree::ptree pt; std::ifstream aFile(szBootstrapIni); boost::property_tree::ini_parser::read_ini(aFile, pt); - nMaxMemoryInMB = pt.get("Win32.LimitMaximumMemoryInMB", nMaxMemoryInMB); - bExcludeChildProcesses = pt.get("Win32.ExcludeChildProcessesFromLimit", bExcludeChildProcesses); + nMaxMemoryInMB = pt.get("Bootstrap.LimitMaximumMemoryInMB", nMaxMemoryInMB); + bExcludeChildProcesses = pt.get("Bootstrap.ExcludeChildProcessesFromLimit", bExcludeChildProcesses); } catch (...) { |