diff options
| author | Julien Nabet <serval2412@yahoo.fr> | 2020-06-04 12:27:39 +0200 |
|---|---|---|
| committer | Julien Nabet <serval2412@yahoo.fr> | 2020-06-05 15:31:48 +0200 |
| commit | 08e02ae9606f6cb7ef49745ebe177089ed6d39fa (patch) | |
| tree | 5ea634d7cc258a62ccaf1558f3f5ded0b9efa7f3 /fpicker | |
| parent | 5a7dd1f3e0d95e67c44d36c20f8ba5c8791b3aa3 (diff) | |
Improve COM library management in fpicker
Inspired from:
author Julien Nabet <serval2412@yahoo.fr> 2020-05-29 23:58:59 +0200
committer Mike Kaganski <mike.kaganski@collabora.com> 2020-06-03 23:04:27 +0200
commit 95e5d37b6e62eb39f2d5337e124e86b3d0c3f399 (patch)
tree 5488826b390c04a2b32d2f9aa43f49a64f52db3d
parent 3d3cb4328ece843b3e31b8411f9d16bbedb57a7b (diff)
Improve COM library management in ADO
Change-Id: If0b136cdcc89baa6bc90912d42b3ba07fa6c0efb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95498
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/win32/VistaFilePickerImpl.cxx | 13 | ||||
| -rw-r--r-- | fpicker/source/win32/VistaFilePickerImpl.hxx | 4 |
2 files changed, 7 insertions, 10 deletions
diff --git a/fpicker/source/win32/VistaFilePickerImpl.cxx b/fpicker/source/win32/VistaFilePickerImpl.cxx index c84fe5f3a72d..3b8443a40c65 100644 --- a/fpicker/source/win32/VistaFilePickerImpl.cxx +++ b/fpicker/source/win32/VistaFilePickerImpl.cxx @@ -190,6 +190,7 @@ VistaFilePickerImpl::VistaFilePickerImpl() , m_hParentWindow(choose_parent_window()) , m_sDirectory () , m_sFilename () + , mnNbCallCoInitializeExForReinit(0) { } @@ -208,15 +209,7 @@ void VistaFilePickerImpl::before() // osl::Thread class initializes COm already in MTA mode because it's needed // by VCL and UNO so. There is no way to change that from outside... // but we need a STA environment... - // So we make it by try-and-error... - // If first CoInitializeEx will fail... we uninitialize COM initialize it new .-) - - m_hLastResult = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - if ( FAILED(m_hLastResult) ) - { - CoUninitialize(); - m_hLastResult = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); - } + m_hLastResult = o3tl::safeCoInitializeEx(COINIT_APARTMENTTHREADED, mnNbCallCoInitializeExForReinit); } @@ -324,7 +317,7 @@ void VistaFilePickerImpl::doRequest(const RequestRef& rRequest) void VistaFilePickerImpl::after() { - CoUninitialize(); + o3tl::safeCoUninitializeReinit(COINIT_MULTITHREADED, mnNbCallCoInitializeExForReinit); } diff --git a/fpicker/source/win32/VistaFilePickerImpl.hxx b/fpicker/source/win32/VistaFilePickerImpl.hxx index e5d2d88e4391..0fee8587c89e 100644 --- a/fpicker/source/win32/VistaFilePickerImpl.hxx +++ b/fpicker/source/win32/VistaFilePickerImpl.hxx @@ -36,6 +36,7 @@ #include <cppuhelper/basemutex.hxx> #include <osl/thread.hxx> #include <osl/conditn.hxx> +#include <o3tl/safeCoInitUninit.hxx> #include <rtl/ustring.hxx> namespace fpicker{ @@ -326,6 +327,9 @@ class VistaFilePickerImpl : private ::cppu::BaseMutex OUString m_sFilename; + + // to put back all the inits with COINIT_MULTITHREADED if needed + int mnNbCallCoInitializeExForReinit; }; } // namespace vista |