diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-05-22 14:33:24 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-05-22 22:22:15 +0200 |
| commit | b587de60d4e6aa96238766272d94f1499b22f696 (patch) | |
| tree | 87c816f7d444f79aceb81aca6969adf8c0a14f98 /extensions/source | |
| parent | 7f264f4beec931833b390ae1bbb93b2e22b4ad8a (diff) | |
Prefer CoInitializeEx instead of CoInitialize
As https://docs.microsoft.com/fr-fr/windows/win32/api/objbase/nf-objbase-coinitialize?redirectedfrom=MSDN
advised.
Moreover, it'll make concurrency model explicit
Change-Id: I247a49248bf45beb64a7985a7c0d078ee48efe2d
Change-Id: I6e755fd516d9fb2dd2a9df0c66d9afd6070447ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94669
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'extensions/source')
| -rw-r--r-- | extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx index a7732fa196fd..f9ebaca1edd7 100644 --- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx +++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx @@ -92,7 +92,7 @@ public: { CoInitializeGuard() { - if (FAILED(CoInitialize(nullptr))) + if (FAILED(CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED))) throw css::uno::RuntimeException(); } ~CoInitializeGuard() { CoUninitialize(); } diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index ad7251da2c3d..a4e18c193046 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -585,7 +585,7 @@ DownloadThread::run() #ifdef _WIN32 CoUninitialize(); - CoInitialize( nullptr ); + CoInitializeEx( nullptr, COINIT_APARTMENTTHREADED ); #endif while( schedule() ) |