whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QPA/Windows: misc cleanup of QShGetFileInfoThread 

Misc cleanup of QShGetFileInfoThread:
 - use QThread's interruption abilities instead custom one
 - use QMutexLocker instead manual lock/unlock

Task-number: QTBUG-90876
Change-Id: If0566e56ab765fb95e837cdfa09639c1622b6d4e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
bb10
Christian Ehrlicher 2023-12-17 11:28:27 +01:00
parent 03a4164206
commit 87f7d2c6b0
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/windows/qwindowstheme.cpp
View File

@ -180,8 +180,8 @@ public:
QComHelper comHelper(COINIT_MULTITHREADED);
QMutexLocker readyLocker(&m_readyMutex);
while (!m_cancelled.loadRelaxed()) {
if (!m_params && !m_cancelled.loadRelaxed()
while (!isInterruptionRequested()) {
if (!m_params && !isInterruptionRequested()
&& !m_readyCondition.wait(&m_readyMutex, QDeadlineTimer(1000ll)))
continue;
@ -191,15 +191,14 @@ public:
const bool result = SHGetFileInfo(reinterpret_cast<const wchar_t *>(fileName.utf16()),
m_params->attributes, &info, sizeof(SHFILEINFO),
m_params->flags);
m_doneMutex.lock();
if (!m_cancelled.loadRelaxed()) {
QMutexLocker doneLocker(&m_doneMutex);
if (!isInterruptionRequested()) {
*m_params->result = result;
memcpy(m_params->info, &info, sizeof(SHFILEINFO));
}
m_params = nullptr;
m_doneCondition.wakeAll();
m_doneMutex.unlock();
}
}
}
@ -219,13 +218,12 @@ public:
void cancel()
{
QMutexLocker doneLocker(&m_doneMutex);
m_cancelled.storeRelaxed(1);
requestInterruption();
m_readyCondition.wakeAll();
}
private:
QShGetFileInfoParams *m_params;
QAtomicInt m_cancelled;
QWaitCondition m_readyCondition;
QWaitCondition m_doneCondition;
QMutex m_readyMutex;