diff src/helper.cpp @ 45:ad02dff8ebfb

Merge from branch errorcode

--- a/src/helper.cpp	Wed Aug 29 12:06:56 2018 +0100
+++ b/src/helper.cpp	Fri Aug 31 15:14:57 2018 +0100
@@ -19,7 +19,17 @@
  * SUCCESS|/path/to/libname.so|
  * 
  * Output line for failed load of library libname.so:
- * FAILURE|/path/to/libname.so|Reason for failure if available
+ * FAILURE|/path/to/libname.so|Error message [failureCode]
+ *
+ * or:
+ * FAILURE|/path/to/libname.so|[failureCode]
+ *
+ * where the error message is an optional system-level message, such
+ * as may be returned from strerror or similar (which should be in the
+ * native language for the system ready to show the user), and the
+ * failureCode in square brackets is a mandatory number corresponding
+ * to one of the PluginCandidates::FailureCode values (requiring
+ * conversion to a translated string by the client).
  *
  * Although this program was written for use with Vamp audio analysis
  * plugins, it also works with other plugin formats. The program has
@@ -64,6 +74,8 @@
 
 #include "../version.h"
 
+#include "../checker/checkcode.h"
+
 static const char programName[] = "vamp-plugin-load-checker";
 
 #ifdef _WIN32
@@ -78,8 +90,10 @@
 #ifndef UNICODE
 #error "This must be compiled with UNICODE defined"
 #endif
+
 static std::string lastLibraryName = "";
-static HMODULE LoadLibraryUTF8(std::string name) {
+
+static HMODULE loadLibraryUTF8(std::string name) {
     lastLibraryName = name;
     int n = name.size();
     int wn = MultiByteToWideChar(CP_UTF8, 0, name.c_str(), n, 0, 0);
@@ -90,18 +104,24 @@
     delete[] wname;
     return h;
 }
-static std::string GetErrorText() {
+
+static std::string getErrorText() {
     DWORD err = GetLastError();
-    wchar_t *buffer;
+    wchar_t *buffer = 0;
     FormatMessageW(
         FORMAT_MESSAGE_ALLOCATE_BUFFER |
         FORMAT_MESSAGE_FROM_SYSTEM |
         FORMAT_MESSAGE_IGNORE_INSERTS,
         NULL,
         err,
+        // the correct way to specify the user's default language,
+        // according to all resources I could find:
         MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
         (LPWSTR) &buffer,
         0, NULL );
+    if (!buffer) {
+        return "Unable to format error string (internal error)";
+    }
     int wn = wcslen(buffer);
     int n = WideCharToMultiByte(CP_UTF8, 0, buffer, wn, 0, 0, 0, 0);
     if (n < 0) {
@@ -114,6 +134,9 @@
     std::string s(text);
     LocalFree(&buffer);
     delete[] text;
+    if (s == "") {
+        return s;
+    }
     for (int i = s.size(); i > 0; ) {
         --i;
         if (s[i] == '\n' || s[i] == '\r') {
@@ -126,16 +149,48 @@
     }
     return s;
 }
-#define DLOPEN(a,b)  LoadLibraryUTF8(a)
+
+#define DLOPEN(a,b)  loadLibraryUTF8(a)
 #define DLSYM(a,b)   (void *)GetProcAddress((HINSTANCE)(a),(b).c_str())
 #define DLCLOSE(a)   (!FreeLibrary((HINSTANCE)(a)))
-#define DLERROR()    (GetErrorText())
+#define DLERROR()    (getErrorText())
+
+static bool libraryExists(std::string name) {
+    if (name == "") return false;
+    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';
+    FILE *f = _wfopen(wname, L"rb");
+    delete[] wname;
+    if (f) {
+        fclose(f);
+        return true;
+    } else {
+        return false;
+    }
+}
+
 #else
+
 #include <dlfcn.h>
 #define DLOPEN(a,b)  dlopen((a).c_str(),(b))
 #define DLSYM(a,b)   dlsym((a),(b).c_str())
 #define DLCLOSE(a)   dlclose((a))
 #define DLERROR()    dlerror()
+
+static bool libraryExists(std::string name) {
+    if (name == "") return false;
+    FILE *f = fopen(name.c_str(), "r");
+    if (f) {
+        fclose(f);
+        return true;
+    } else {
+        return false;
+    }
+}
+
 #endif
 
 //#include <unistd.h>
@@ -144,50 +199,70 @@
 
 string error()
 {
-    string e = DLERROR();
-    if (e == "") return "(unknown error)";
-    else return e;
+    return DLERROR();
 }
 
-string checkLADSPAStyleDescriptorFn(void *f)
+struct Result {
+    PluginCheckCode code;
+    string message;
+};
+
+Result checkLADSPAStyleDescriptorFn(void *f)
 {
     typedef const void *(*DFn)(unsigned long);
     DFn fn = DFn(f);
     unsigned long index = 0;
     while (fn(index)) ++index;
-    if (index == 0) return "Library contains no plugins";
-    return "";
+    if (index == 0) return { PluginCheckCode::FAIL_NO_PLUGINS, "" };
+    return { PluginCheckCode::SUCCESS, "" };
 }
 
-string checkVampDescriptorFn(void *f)
+Result checkVampDescriptorFn(void *f)
 {
     typedef const void *(*DFn)(unsigned int, unsigned int);
     DFn fn = DFn(f);
     unsigned int index = 0;
     while (fn(2, index)) ++index;
-    if (index == 0) return "Library contains no plugins";
-    return "";
+    if (index == 0) return { PluginCheckCode::FAIL_NO_PLUGINS, "" };
+    return { PluginCheckCode::SUCCESS, "" };
 }
 
-string check(string soname, string descriptor)
+Result check(string soname, string descriptor)
 {
     void *handle = DLOPEN(soname, RTLD_NOW | RTLD_LOCAL);
     if (!handle) {
-        return "Unable to open plugin library: " + error();
+        PluginCheckCode code = PluginCheckCode::FAIL_NOT_LOADABLE;
+        string message = error();
+#ifdef _WIN32
+        DWORD err = GetLastError();
+        if (err == ERROR_BAD_EXE_FORMAT) {
+            code = PluginCheckCode::FAIL_WRONG_ARCHITECTURE;
+        } else if (err == ERROR_MOD_NOT_FOUND) {
+            if (libraryExists(soname)) {
+                code = PluginCheckCode::FAIL_DEPENDENCY_MISSING;
+            } else {
+                code = PluginCheckCode::FAIL_LIBRARY_NOT_FOUND;
+            }
+        }
+#else
+        if (!libraryExists(soname)) {
+            code = PluginCheckCode::FAIL_LIBRARY_NOT_FOUND;
+        }
+#endif
+        return { code, message };
     }
 
-    string msg = "";
+    Result result { PluginCheckCode::SUCCESS, "" };
     
     void *fn = DLSYM(handle, descriptor);
     if (!fn) {
-        msg = "Failed to find plugin descriptor " + descriptor +
-            " in library: " + error();
+        result = { PluginCheckCode::FAIL_DESCRIPTOR_MISSING, error() };
     } else if (descriptor == "ladspa_descriptor") {
-        msg = checkLADSPAStyleDescriptorFn(fn);
+        result = checkLADSPAStyleDescriptorFn(fn);
     } else if (descriptor == "dssi_descriptor") {
-        msg = checkLADSPAStyleDescriptorFn(fn);
+        result = checkLADSPAStyleDescriptorFn(fn);
     } else if (descriptor == "vampGetPluginDescriptor") {
-        msg = checkVampDescriptorFn(fn);
+        result = checkVampDescriptorFn(fn);
     } else {
         cerr << "Note: no descriptor logic known for descriptor function \""
              << descriptor << "\"; not actually calling it" << endl;
@@ -195,7 +270,7 @@
 
     DLCLOSE(handle);
     
-    return msg;
+    return result;
 }
 
 int main(int argc, char **argv)
@@ -210,7 +285,7 @@
         if (opt == "-?" || opt == "-h" || opt == "--help") {
             showUsage = true;
         } else if (opt == "-v" || opt == "--version") {
-            cout << CHECKER_VERSION << endl;
+            cout << CHECKER_COMPATIBILITY_VERSION << endl;
             return 0;
         }
     } 
@@ -239,12 +314,19 @@
 #endif
 
     while (getline(cin, soname)) {
-        string report = check(soname, descriptor);
-        if (report != "") {
-            cout << "FAILURE|" << soname << "|" << report << endl;
+        Result result = check(soname, descriptor);
+        if (result.code == PluginCheckCode::SUCCESS) {
+            cout << "SUCCESS|" << soname << "|" << endl;
+        } else {
+            if (result.message == "") {
+                cout << "FAILURE|" << soname
+                     << "|[" << int(result.code) << "]" << endl;
+            } else {
+                cout << "FAILURE|" << soname
+                     << "|" << result.message << " ["
+                     << int(result.code) << "]" << endl;
+            }
             allGood = false;
-        } else {
-            cout << "SUCCESS|" << soname << "|" << endl;
         }
     }