backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-07-18 12:01:34 +08:00
Code Issues Projects Releases Wiki Activity

Improved plugin version logging for Windows #4866

Browse Source 
Conflicts:
	src/lib/arch/win32/ArchPluginWindows.cpp
This commit is contained in:
Nick Bolton
2015-07-23 18:02:05 -07:00
committed by Jerry (Xinyu Hou)
parent bfabd436d7
commit cb5f0f7b12
5 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/lib/arch/win32/ArchPluginWindows.cpp
View File

@@ -57,33 +57,42 @@ ArchPluginWindows::load()
std::vector<String>::iterator it;
for (it = plugins.begin(); it != plugins.end(); ++it) {
LOG((CLOG_DEBUG "loading plugin: %s", (*it).c_str()));
String path = String(dir).append("\\").append(*it);
HINSTANCE library = LoadLibrary(path.c_str());
String filename = *it;
String nameNoExt = synergy::string::removeFileExt(*it);
String path = synergy::string::sprintf(
"%s\\%s", dir.c_str(), filename.c_str());
LOG((CLOG_DEBUG "loading plugin: %s", filename.c_str()));
HINSTANCE handle = LoadLibrary(path.c_str());
void* voidHandle = reinterpret_cast<void*>(handle);
if (library == NULL) {
if (handle == NULL) {
String error = XArchEvalWindows().eval();
LOG((CLOG_ERR "failed to load plugin '%s', error: %s", (*it).c_str(), error.c_str()));
LOG((CLOG_ERR "failed to load plugin '%s', error: %s",
filename.c_str(), error.c_str()));
continue;
}
void* lib = reinterpret_cast<void*>(library);
String expectedVersion = getExpectedPluginVersion(nameNoExt.c_str());
String currentVersion = getCurrentVersion(nameNoExt.c_str(), voidHandle);
String pluginName = synergy::string::removeFileExt(*it);
char* version = (char*)invoke(pluginName.c_str(), "version", NULL, lib);
String expectedVersion(pluginVersion(pluginName.c_str()));
if (currentVersion.empty() || (expectedVersion != currentVersion)) {
LOG((CLOG_ERR
"failed to load plugin '%s', "
"expected version %s but was %s",
filename.c_str(),
expectedVersion.c_str(),
currentVersion.empty() ? "unknown" : currentVersion.c_str()));
if (version != NULL && expectedVersion.compare(version) == 0) {
LOG((CLOG_DEBUG "loaded plugin: %s (%s)", (*it).c_str(), version));
m_pluginTable.insert(std::make_pair(pluginName, lib));
}
else {
LOG((CLOG_ERR "plugin version doesn't match"));
LOG((CLOG_DEBUG "expected plugin version: %s actual plugin version: %s",
expectedVersion.c_str(), version));
LOG((CLOG_ERR "skip plugin: %s", (*it).c_str()));
FreeLibrary(library);
FreeLibrary(handle);
continue;
}
LOG((CLOG_DEBUG "plugin loaded: %s (version %s)",
filename.c_str(),
currentVersion.c_str()));
m_pluginTable.insert(std::make_pair(nameNoExt, voidHandle));
}
}
@@ -208,11 +217,24 @@ ArchPluginWindows::getFilenames(const String& pattern, std::vector<String>& file
FindClose(find);
}
String ArchPluginWindows::getPluginsDir()
String
ArchPluginWindows::getPluginsDir()
{
return ARCH->getPluginDirectory();
}
String
ArchPluginWindows::getCurrentVersion(const String& name, void* handle)
{
char* version = (char*)invoke(name.c_str(), "version", NULL, handle);
if (version == NULL) {
return "";
}
return version;
}
void
sendEvent(const char* eventName, void* data)
{