diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-22 22:13:25 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-23 06:20:22 +0100 |
commit | ab0942240507e9be81dbe43e8d69b7f9273b124f (patch) | |
tree | 851f54873eb0be0b4d9f1c3b298908c9fda0f80e /desktop/win32/source/loader.hxx | |
parent | 5bbe2c9891c2d295ef77d0791cf3decf09c58c65 (diff) |
Make unopkg.com proper launcher for unopkg.bin on Windows
... like implemented in 506173a7f42f34821238a63f3f8c7362c9fae9d9 for
soffice.bin.
Previously unopkg.com prepared some communication pipes, and launched
unopkg.exe, which in turn launched unopkg.bin (both GUI subsystem apps),
and when the latter sent output to console, it was redirected to the
pipes, and finally sent to console by unopkg.com (details in dropped
desktop/win32/source/guistdio/guistdio.inc). The implementation made it
impossible to use standard console output function from c/c++ standard
libraries; WinAPI had to be used. Special API had been implemented for
that: dp_misc::writeConsole*, and still part of output was garbled.
Commit 015e9f780bc133788f79868bb7fb0b1d4e81f5f3 tried to workaround
that, effectively making loghandler unusable outside of unopkg.
This change makes unopkg.com a console subsystem clone of unopkg.exe,
and unopkg.bin is now also console application. This allows to cleanup
and unify its output in a follow-up commit.
Change-Id: I3b299e09f8a11a72883b06442b0e95131ffaac5f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87210
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'desktop/win32/source/loader.hxx')
-rw-r--r-- | desktop/win32/source/loader.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/desktop/win32/source/loader.hxx b/desktop/win32/source/loader.hxx index dfa8f0c971a0..aed76b168798 100644 --- a/desktop/win32/source/loader.hxx +++ b/desktop/win32/source/loader.hxx @@ -82,6 +82,9 @@ void extendLoaderEnvironment(WCHAR * binPath, WCHAR * iniDirectory); // Implementation of the process guarding soffice.bin int officeloader_impl(bool bAllowConsole); +// Implementation of the process guarding unopkg.bin +int unopkgloader_impl(bool bAllowConsole); + } #endif |