Public-Mirror/LunaHook-mirror
1
0
Fork 0
mirror of https://github.com/HIllya51/LunaHook.git synced 2024-10-22 23:18:16 +08:00
Code Issues Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
恍兮惚兮 2024-04-23 20:01:57 +08:00
parent eebbbe62a6
commit 24ae167d1a
6 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -55,7 +55,7 @@ include(generate_product_version)
set(VERSION_MAJOR 3)
set(VERSION_MINOR 0)
set(VERSION_PATCH 2)
set(VERSION_PATCH 3)
set(VERSION_REVISION 0)
add_subdirectory(include)

6
LunaHost/GUI/LunaHost.cpp
View File

@ -574,7 +574,7 @@ Pluginwindow::Pluginwindow(mainwindow*p,Pluginmanager* pl):mainwindow(p),pluginm
if(idx!=-1)
{
menu.add(MenuRemovePlugin,[&,idx](){
pluginmanager->remove((LPCWSTR)listplugins->getdata(idx),false);
pluginmanager->remove((LPCWSTR)listplugins->getdata(idx));
listplugins->deleteitem(idx);
});
menu.add_sep();
@ -584,9 +584,9 @@ Pluginwindow::Pluginwindow(mainwindow*p,Pluginmanager* pl):mainwindow(p),pluginm
menu.add_checkable(MenuPluginEnable,pluginmanager->getenable(idx),[&,idx](bool check){
pluginmanager->setenable(idx,check);
if(check)
pluginmanager->addplugin((LPCWSTR)listplugins->getdata(idx),true);
pluginmanager->load((LPCWSTR)listplugins->getdata(idx));
else
pluginmanager->remove((LPCWSTR)listplugins->getdata(idx),true);
pluginmanager->unload((LPCWSTR)listplugins->getdata(idx));
});
}
return menu;

2
LunaHost/GUI/Plugin/copyclipboard.cpp
View File

@ -3,7 +3,7 @@
bool sendclipboarddata(const std::wstring&text,HWND hwnd);
bool ProcessSentence(std::wstring& sentence, SentenceInfo sentenceInfo)
{
if (sentenceInfo["current select"] && sentenceInfo["process id"] != 0 &&sentenceInfo["toclipboard"])
if (sentenceInfo["current select"] && sentenceInfo["toclipboard"])
{
sendclipboarddata(sentence,(HWND)sentenceInfo["HostHWND"]);
}

2
LunaHost/GUI/Plugin/extensions/qtcommon.h
View File

@ -32,7 +32,7 @@ struct Localizer { Localizer() { Localize(); } };
inline std::wstring S(const QString& s) {
//s.toStdWString will crash. unknown why.
std::wstring ws;
ws.resize(s.size()+1);
ws.resize(s.size());
s.toWCharArray(ws.data());
return ws;
}

54
LunaHost/GUI/pluginmanager.cpp
View File

@ -6,7 +6,6 @@
#include"LunaHost.h"
#include"Lang/Lang.h"
#include"host.h"
typedef wchar_t* (*OnNewSentence_t)(wchar_t*, const InfoForExtension*);
std::optional<std::wstring>SelectFile(HWND hwnd,LPCWSTR lpstrFilter){
OPENFILENAME ofn;
@ -68,7 +67,7 @@ HMODULE loadqtdllsX(const std::wstring&collectQtplugs){
void Pluginmanager::loadqtdlls(std::vector<std::wstring>&collectQtplugs){
auto modules=loadqtdllsX(collectQtplugs);
for(int i=0;i<collectQtplugs.size();i++){
OnNewSentenceS[collectQtplugs[i]]={true,GetProcAddress(modules[i],"OnNewSentence"),modules[i]};
OnNewSentenceS[collectQtplugs[i]]={true,modules[i]};
}
}
Pluginmanager::Pluginmanager(LunaHost* _host):host(_host),configs(_host->configs){
@ -80,19 +79,19 @@ Pluginmanager::Pluginmanager(LunaHost* _host):host(_host),configs(_host->configs
auto plg=get(i);
bool isqt=plg.isQt;
auto path=plg.wpath();
OnNewSentenceS[path]={false,0,0};
OnNewSentenceS[path]={};
if(isqt){
if(plg.enable==false)continue;
collectQtplugs.push_back((path));
}
else{
auto base=LoadLibraryW(path.c_str());
OnNewSentenceS[path]={false,GetProcAddress(base,"OnNewSentence"),base};
OnNewSentenceS[path]={false,base};
}
}
loadqtdlls(collectQtplugs);
OnNewSentenceS[L"InternalClipBoard"]={false,GetProcAddress(GetModuleHandle(0),"OnNewSentence"),GetModuleHandle(0)};//内部链接的剪贴板插件
OnNewSentenceS[L"InternalClipBoard"]={false,GetModuleHandle(0)};//内部链接的剪贴板插件
} catch (const std::exception& ex) {
@ -114,9 +113,9 @@ bool Pluginmanager::dispatch(TextThread& thread, std::wstring& sentence){
path=getname(i);
}
auto funptr=OnNewSentenceS[path].funcptr;
auto funptr=OnNewSentenceS[path].OnNewSentence;
if(funptr==0)continue;
if (!*(sentenceBuffer = ((OnNewSentence_t)funptr)(sentenceBuffer, sentenceInfo)))
if (!*(sentenceBuffer = funptr(sentenceBuffer, sentenceInfo)))
break;
}
@ -204,7 +203,7 @@ bool Pluginmanager::checkisdump(const std::wstring& dll){
}
return false;
}
void Pluginmanager::remove(const std::wstring& wss,bool onlyload){
void Pluginmanager::unload(const std::wstring& wss){
auto hm=OnNewSentenceS[wss].hmodule;
if(OnNewSentenceS[wss].isQt && hm){
((QtFreeLibrary_t)GetProcAddress(GetModuleHandle(0),"QtFreeLibrary"))(hm);
@ -212,11 +211,15 @@ void Pluginmanager::remove(const std::wstring& wss,bool onlyload){
else
FreeLibrary(hm);
if(onlyload){
OnNewSentenceS[wss].funcptr=OnNewSentenceS[wss].hmodule=0;
return;
OnNewSentenceS[wss].clear();
}
void plugindata::clear(){
hmodule=0;
OnNewSentence=0;
}
void Pluginmanager::remove(const std::wstring& wss){
unload(wss);
auto s=WideStringToString(wss);
auto &plgs=configs->configs["plugins"];
auto it=std::remove_if(plgs.begin(),plgs.end(),[&](auto&t){
@ -309,12 +312,11 @@ bool qtchecker(const std::set<std::string>& dll)
return true;
return false;
}
addpluginresult Pluginmanager::addplugin(const std::wstring& p,bool onlyload){
if(!onlyload)
if(checkisdump(p))return addpluginresult::dumplicate;
addpluginresult Pluginmanager::load(const std::wstring& p,bool*isqt){
auto importtable=getimporttable(p);
if(importtable.empty())return addpluginresult::invaliddll;
auto isQt=qtchecker(importtable);
if(isqt)*isqt=isQt;
HMODULE base;
if(isQt){
base=loadqtdllsX(p);
@ -324,15 +326,27 @@ addpluginresult Pluginmanager::addplugin(const std::wstring& p,bool onlyload){
}
if(base==0)return addpluginresult::invaliddll;
auto plugin=GetProcAddress(base,"OnNewSentence");
if(!plugin)return addpluginresult::isnotaplugins;
std::scoped_lock lock(OnNewSentenceSLock);
OnNewSentenceS[p]={isQt,plugin,base};
if(!onlyload)
OnNewSentenceS[p]={isQt,base};
if(!OnNewSentenceS[p].OnNewSentence)
return addpluginresult::isnotaplugins;
return addpluginresult::success;
}
plugindata::plugindata(bool _isQt,HMODULE hm){
hmodule=hm;
isQt=_isQt;
OnNewSentence=(OnNewSentence_t)GetProcAddress(hm,"OnNewSentence");
}
addpluginresult Pluginmanager::addplugin(const std::wstring& p){
if(checkisdump(p))return addpluginresult::dumplicate;
bool isQt;
auto ret=load(p,&isQt);
if(ret==addpluginresult::success)
add({p,isQt});
return addpluginresult::success;
return ret;
}

13
LunaHost/GUI/pluginmanager.h
View File

@ -22,9 +22,14 @@ struct pluginitem{
nlohmann::json dump() const;
};
struct plugindata{
typedef wchar_t* (*OnNewSentence_t)(wchar_t*, const InfoForExtension*);
bool isQt;
LPVOID funcptr;
OnNewSentence_t OnNewSentence;
HMODULE hmodule;
void clear();
plugindata(){};
plugindata(bool,HMODULE);
};
class Pluginmanager{
std::unordered_map<std::wstring,plugindata>OnNewSentenceS;
@ -38,7 +43,7 @@ class Pluginmanager{
public:
Pluginmanager(LunaHost*);
bool dispatch(TextThread&, std::wstring& sentence);
addpluginresult addplugin(const std::wstring&,bool onlyload=false);
addpluginresult addplugin(const std::wstring&);
std::optional<std::wstring>selectpluginfile();
pluginitem get(int);
@ -48,7 +53,9 @@ public:
void setenable(int ,bool);
int count();
void add(const pluginitem&);
void remove(const std::wstring&,bool);
void remove(const std::wstring&);
void unload(const std::wstring&);
addpluginresult load(const std::wstring&,bool*isqt=0);
void swaprank(int,int);
};