chenx221/Textractor
1
0
Fork 0
forked from Public-Mirror/Textractor
Code Pull Requests Activity

fix issues with extensions having dot in name

Browse Source
This commit is contained in:
Akash Mozumdar 2020-01-14 17:24:27 -07:00
parent 8e719b2964
commit 2482c26316
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GUI/extenwindow.cpp
View File

@ -34,7 +34,7 @@ namespace
// Extension is dll and exports "OnNewSentence" // Extension is dll and exports "OnNewSentence"
if (QTextFile(extenName + ".dll", QIODevice::ReadOnly).readAll().contains("OnNewSentence")) if (QTextFile(extenName + ".dll", QIODevice::ReadOnly).readAll().contains("OnNewSentence"))
{ {
if (HMODULE module = LoadLibraryW(S(extenName).c_str())) if (HMODULE module = LoadLibraryW(S(extenName + ".dll").c_str()))
{ {
if (auto callback = (decltype(Extension::callback))GetProcAddress(module, "OnNewSentence")) if (auto callback = (decltype(Extension::callback))GetProcAddress(module, "OnNewSentence"))
{ {
@ -51,7 +51,7 @@ namespace
void Unload(int index) void Unload(int index)
{ {
std::scoped_lock writeLock(extenMutex); std::scoped_lock writeLock(extenMutex);
FreeLibrary(GetModuleHandleW(extensions.at(index).name.c_str())); FreeLibrary(GetModuleHandleW((extensions.at(index).name + L".dll").c_str()));
extensions.erase(extensions.begin() + index); extensions.erase(extensions.begin() + index);
} }
@ -80,7 +80,7 @@ bool DispatchSentenceToExtensions(std::wstring& sentence, const InfoForExtension
void CleanupExtensions() void CleanupExtensions()
{ {
std::scoped_lock writeLock(extenMutex); std::scoped_lock writeLock(extenMutex);
for (auto extension : extensions) FreeLibrary(GetModuleHandleW(extension.name.c_str())); for (auto extension : extensions) FreeLibrary(GetModuleHandleW((extension.name + L".dll").c_str()));
extensions.clear(); extensions.clear();
} }