diff options
| author | Fredrik Orderud <forderud@gmail.com> | 2018-08-08 21:09:51 +0200 |
|---|---|---|
| committer | Fredrik Orderud <forderud@gmail.com> | 2018-08-13 06:09:08 +0000 |
| commit | b09610e10592af6224b64507f1d6d209d4baf6c9 (patch) | |
| tree | abde03883d2ebef87b7333a5f1cca8b461e1109c | |
| parent | e977cfd5d9d3eddca7c7daba29e54899fd77133b (diff) | |
Replace CoInitialize calls with CoInitializeEx
Done to make single-threaded apartment (STA) usage more explicit.
CoInitializeEx(0, COINIT_APARTMENTTHREADED) does exactly the same as
CoInitialize(0), so there is no change in behavior.
REF: https://docs.microsoft.com/nb-no/windows/desktop/api/combaseapi/nf-combaseapi-coinitializeex
Change-Id: I2e2f77745b4360b1da1e6c284551d0f709aba546
Reviewed-by: Andre de la Rocha <andre.rocha@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/activeqt/control/qaxservermain.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/qaxscript/tst_qaxscript.cpp | 2 | ||||
| -rw-r--r-- | tools/dumpcpp/main.cpp | 4 | ||||
| -rw-r--r-- | tools/dumpdoc/main.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/activeqt/control/qaxservermain.cpp b/src/activeqt/control/qaxservermain.cpp index 7e7bb3e..5ad97d8 100644 --- a/src/activeqt/control/qaxservermain.cpp +++ b/src/activeqt/control/qaxservermain.cpp @@ -287,7 +287,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, } if (run) { - if (SUCCEEDED(CoInitialize(0))) { + if (SUCCEEDED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { #ifdef Q_CC_MINGW // define GlobalOptions class ID locally for MinGW, since it's missing from the distribution static const CLSID CLSID_GlobalOptions = @@ -314,7 +314,7 @@ EXTERN_C int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */, } CoUninitialize(); } else { - qErrnoWarning("CoInitialize() failed."); + qErrnoWarning("CoInitializeEx() failed."); nRet = -1; } } diff --git a/tests/auto/qaxscript/tst_qaxscript.cpp b/tests/auto/qaxscript/tst_qaxscript.cpp index 3ba4d7f..3b3ab88 100644 --- a/tests/auto/qaxscript/tst_qaxscript.cpp +++ b/tests/auto/qaxscript/tst_qaxscript.cpp @@ -49,7 +49,7 @@ void tst_QAxScript::scriptReturnValue() QAxScript *script = scriptManager.load(QLatin1String(scriptCode), QStringLiteral("Test"), QStringLiteral("JScript")); - QVERIFY2(script, "Unable to load script (CoInitialize() called?)"); + QVERIFY2(script, "Unable to load script (CoInitializeEx() called?)"); const QVariant result = script->call("foo()"); QCOMPARE(result, QVariant(QStringLiteral("test"))); } diff --git a/tools/dumpcpp/main.cpp b/tools/dumpcpp/main.cpp index 60a1d56..2baad0e 100644 --- a/tools/dumpcpp/main.cpp +++ b/tools/dumpcpp/main.cpp @@ -1519,8 +1519,8 @@ static void parseOptions(Options *options) int main(int argc, char **argv) { - if (FAILED(CoInitialize(0))) { - qErrnoWarning("CoInitialize() failed."); + if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { + qErrnoWarning("CoInitializeEx() failed."); return -1; } QCoreApplication app(argc, argv); diff --git a/tools/dumpdoc/main.cpp b/tools/dumpdoc/main.cpp index 7a87d8f..3f3dbd7 100644 --- a/tools/dumpdoc/main.cpp +++ b/tools/dumpdoc/main.cpp @@ -35,8 +35,8 @@ QT_USE_NAMESPACE int main(int argc, char **argv) { - if (FAILED(CoInitialize(0))) { - qErrnoWarning("CoInitialize() failed."); + if (FAILED(CoInitializeEx(0, COINIT_APARTMENTTHREADED))) { + qErrnoWarning("CoInitializeEx() failed."); return -1; } |