comparison src/helper.cpp @ 18:7eff522b23ae

More useful reporting output

 #ifdef _WIN32
 #include <windows.h>
 #include <process.h>
 #include <string>
 #ifdef UNICODE
+static std::string lastLibraryName = "";
 static HMODULE LoadLibraryUTF8(std::string name) {
+    lastLibraryName = name;
     int n = name.size();
     int wn = MultiByteToWideChar(CP_UTF8, 0, name.c_str(), n, 0, 0);
     wchar_t *wname = new wchar_t[wn+1];
     wn = MultiByteToWideChar(CP_UTF8, 0, name.c_str(), n, wname, wn);
     wname[wn] = L'\0';

     for (int i = s.size(); i > 0; ) {
         --i;
         if (s[i] == '\n' || s[i] == '\r') {
             s.erase(i, 1);
         }
+    }
+    std::size_t pos = s.find("%1");
+    if (pos != std::string::npos && lastLibraryName != "") {
+        s.replace(pos, 2, lastLibraryName);
     }
     return s;
 }
 #define DLOPEN(a,b)  LoadLibraryUTF8(a)
 #else