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 | |
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')
-rw-r--r-- | extensions/source/config/WinUserInfo/WinUserInfoBe.cxx | 2 | ||||
-rw-r--r-- | extensions/source/update/check/updatecheck.cxx | 2 | ||||
-rw-r--r-- | extensions/test/ole/OleClient/clientTest.cxx | 4 | ||||
-rw-r--r-- | extensions/test/ole/OleConverterVar1/convTest.cxx | 4 | ||||
-rw-r--r-- | extensions/test/ole/cppToUno/testcppuno.cxx | 4 | ||||
-rw-r--r-- | extensions/test/ole/cpptest/cpptest.cxx | 2 | ||||
-rw-r--r-- | extensions/test/ole/unoTocomCalls/Test/Test.cpp | 4 |
7 files changed, 11 insertions, 11 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() ) diff --git a/extensions/test/ole/OleClient/clientTest.cxx b/extensions/test/ole/OleClient/clientTest.cxx index 675b2a66d09c..00a78034d1d9 100644 --- a/extensions/test/ole/OleClient/clientTest.cxx +++ b/extensions/test/ole/OleClient/clientTest.cxx @@ -72,9 +72,9 @@ void printSequence( Sequence<Any>& val); extern "C" int SAL_CALL main( int , char **) { HRESULT hr; - if( FAILED( hr=CoInitialize(NULL))) + if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { - _tprintf(_T("CoInitialize failed \n")); + _tprintf(_T("CoInitializeEx failed \n")); return -1; } diff --git a/extensions/test/ole/OleConverterVar1/convTest.cxx b/extensions/test/ole/OleConverterVar1/convTest.cxx index c0acc3152abf..8fc27177e56b 100644 --- a/extensions/test/ole/OleConverterVar1/convTest.cxx +++ b/extensions/test/ole/OleConverterVar1/convTest.cxx @@ -65,9 +65,9 @@ void printVariant( VARIANT & var); int SAL_CALL main( int argc, char* argv[] ) { HRESULT hr; - if( FAILED( hr=CoInitialize(NULL))) + if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { - printf("CoInitialize failed \n"); + printf("CoInitializeEx failed \n"); return -1; } diff --git a/extensions/test/ole/cppToUno/testcppuno.cxx b/extensions/test/ole/cppToUno/testcppuno.cxx index 563e2d0acc06..e64541ed2fc0 100644 --- a/extensions/test/ole/cppToUno/testcppuno.cxx +++ b/extensions/test/ole/cppToUno/testcppuno.cxx @@ -51,9 +51,9 @@ bool incrementMultidimensionalIndex( int SAL_CALL main( int /*argc*/, char** /*argv*/ ) { HRESULT hr; - if( FAILED( hr=CoInitialize(NULL))) + if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { - printf("CoInitialize failed \n"); + printf("CoInitializeEx failed \n"); return -1; } diff --git a/extensions/test/ole/cpptest/cpptest.cxx b/extensions/test/ole/cpptest/cpptest.cxx index d97489847399..ec1592587ee2 100644 --- a/extensions/test/ole/cpptest/cpptest.cxx +++ b/extensions/test/ole/cpptest/cpptest.cxx @@ -33,7 +33,7 @@ HRESULT doTest(); int main(int /*argc*/, char** /*argv*/) { HRESULT hr; - if( FAILED( hr=CoInitialize(NULL))) + if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { printf("CoInitialize failed \n"); return -1; diff --git a/extensions/test/ole/unoTocomCalls/Test/Test.cpp b/extensions/test/ole/unoTocomCalls/Test/Test.cpp index afed02a31d10..b10900dbcd63 100644 --- a/extensions/test/ole/unoTocomCalls/Test/Test.cpp +++ b/extensions/test/ole/unoTocomCalls/Test/Test.cpp @@ -32,9 +32,9 @@ HRESULT doTest(); int main(int argc, char* argv[]) { HRESULT hr; - if( FAILED( hr=CoInitialize(NULL))) + if( FAILED( hr=CoInitializeEx(NULL, COINIT_APARTMENTTHREADED))) { - _tprintf(_T("CoInitialize failed \n")); + _tprintf(_T("CoInitializeEx failed \n")); return -1; } |