chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix extension thread safety

Browse Source
This commit is contained in:
Akash Mozumdar 2018-10-17 01:08:31 -04:00
parent 3ad311293f
commit 104f9a7b8c
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
GUI/extensions.cpp
View File

@ -51,3 +51,16 @@ bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std
HeapFree(GetProcessHeap(), 0, sentenceBuffer);
return success;
}
void UnloadExtension(int extenNumber)
{
std::unique_lock<std::shared_mutex> extenLock(extenMutex);
if (extensions.find({ extenNumber }) == extensions.end()) return;
QString extenFileName = QString::number(extenNumber) + "_" + extensions.find({ extenNumber })->name + ".dll";
FreeLibrary(GetModuleHandleW(extenFileName.toStdWString().c_str()));
QString removedFileName = extenFileName;
removedFileName.remove(0, removedFileName.indexOf("_"));
QFile::remove(removedFileName);
if (!QFile::rename(extenFileName, removedFileName)) QFile::remove(extenFileName);
extensions.erase(extensions.find({ extenNumber }));
}

1
GUI/extensions.h
View File

@ -22,5 +22,6 @@ struct Extension
std::set<Extension> LoadExtensions();
bool DispatchSentenceToExtensions(std::wstring& sentence, std::unordered_map<std::string, int64_t> miscInfo);
void UnloadExtension(int extenNumber);
#endif // EXTENSIONS_H

7
GUI/mainwindow.cpp
View File

@ -248,11 +248,6 @@ void MainWindow::on_addExtenButton_clicked()
void MainWindow::on_rmvExtenButton_clicked()
{
if (extenCombo->currentText().size() == 0) return;
QString extenFileName = extenCombo->currentText().split(":")[0] + "_" + extenCombo->currentText().split(": ")[1] + ".dll";
FreeLibrary(GetModuleHandleW(extenFileName.toStdWString().c_str()));
QString removedFileName = extenFileName;
removedFileName.remove(0, removedFileName.indexOf("_"));
QFile::remove(removedFileName);
QFile::rename(extenFileName, removedFileName);
UnloadExtension(extenCombo->currentText().split(":")[0].toInt());
ReloadExtensions();
}