return myFeaturesInFiles;
}
-/*
+const std::set<std::string>& Config_ModuleReader::modulePluginFiles() const
+{
+ return myPluginFiles;
+}
+
+/*!
* Get module name from plugins.xml
* (property "module")
*/
return getProperty(aRoot, PLUGINS_MODULE);
}
-/*
- *
- */
void Config_ModuleReader::processNode(xmlNodePtr theNode)
{
if (isNode(theNode, NODE_PLUGIN, NULL)) {
if (!hasRequiredModules(theNode))
return;
std::string aPluginConf = getProperty(theNode, PLUGIN_CONFIG);
+ if (!aPluginConf.empty()) myPluginFiles.insert(aPluginConf);
std::string aPluginLibrary = getProperty(theNode, PLUGIN_LIBRARY);
std::string aPluginScript = getProperty(theNode, PLUGIN_SCRIPT);
std::string aPluginName = addPlugin(aPluginLibrary, aPluginScript, aPluginConf);
if (aFileName.empty())
return;
-#ifdef WIN32
+ #ifdef WIN32
HINSTANCE aModLib = ::LoadLibrary(aFileName.c_str());
-#else
+ #else
void* aModLib = dlopen( aFileName.c_str(), RTLD_LAZY | RTLD_GLOBAL );
-#endif
+ #endif
if(!aModLib && theLibName != "DFBrowser") { // don't show error for internal debugging tool
std::string anErrorMsg = "Failed to load " + aFileName;
- #ifndef WIN32
+ #ifdef WIN32
+ DWORD dwLastError = ::GetLastError();
+ LPSTR messageBuffer = NULL;
+ size_t size = ::FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+ FORMAT_MESSAGE_FROM_SYSTEM |
+ FORMAT_MESSAGE_IGNORE_INSERTS,
+ NULL,
+ dwLastError,
+ MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
+ (LPSTR)&messageBuffer, 0, NULL);
+ anErrorMsg += ": " + std::string(messageBuffer, size);
+ #else
anErrorMsg += ": " + std::string(dlerror());
#endif
+ std::cerr << anErrorMsg << std::endl;
Events_Error::send(anErrorMsg);
}
}