Assert if CoUninitialize is called on wrong thread

Every call to CoInitialize on a thread must be paired up with a call to CoUninitialized on that same thread. QComHelper helps ensuring this, but if an object using QComHelper is not created and destroyed on the same thread, we end up in loosing this pairing. This patch helps detecting such issues. Task-number: QTBUG-121495 Change-Id: I07984437d1515d7ef61820d7152c339924b36e4b Reviewed-by: Tor Arne Vestbø <[email protected]>
snooter101 · Feb 21, 2024 · 751ca5e · 751ca5e
1 parent 974d791
commit 751ca5e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/src/corelib/kernel/qfunctions_win.cpp b/src/corelib/kernel/qfunctions_win.cpp
@@ -28,6 +28,7 @@ QComHelper::QComHelper(COINIT concurrencyModel)
 
 QComHelper::~QComHelper()
 {
+    Q_ASSERT(m_threadId == GetCurrentThreadId());
     if (SUCCEEDED(m_initResult))
         CoUninitialize();
 }

diff --git a/src/corelib/kernel/qfunctions_win_p.h b/src/corelib/kernel/qfunctions_win_p.h
@@ -39,6 +39,7 @@ class Q_CORE_EXPORT QComHelper
 
 private:
     HRESULT m_initResult = E_FAIL;
+    DWORD m_threadId{ GetCurrentThreadId() };
 };
 
 Q_CORE_EXPORT bool qt_win_hasPackageIdentity();