X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConfig%2FConfig_ModuleReader.cpp;h=d298a412c0b4282a6c4151049791aaa62fb4480e;hb=b6be33d3af5a10e204e3bd69708d49b8b9f1a127;hp=41ceda577b62f7b4bb1eb58cc767cabcde8e86f2;hpb=1d92b37c3a412e565c82b8dce640a035d9f554c2;p=modules%2Fshaper.git diff --git a/src/Config/Config_ModuleReader.cpp b/src/Config/Config_ModuleReader.cpp index 41ceda577..d298a412c 100644 --- a/src/Config/Config_ModuleReader.cpp +++ b/src/Config/Config_ModuleReader.cpp @@ -7,6 +7,8 @@ * Author: sbh */ +#include + #include #include #include @@ -190,14 +192,25 @@ void Config_ModuleReader::loadLibrary(const std::string& theLibName) 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;