Support providing a custom symbol resolver

soywiz · soywiz · commit 6a700ace0d74 · 2022-03-24T06:41:40.000+01:00
diff --git a/src/com/sun/jna/Library.java b/src/com/sun/jna/Library.java
@@ -113,6 +113,8 @@ public interface Library {
      * conflict.
      */
     String OPTION_CLASSLOADER = "classloader";
+    /** Provides a custom symbol resolver. */
+    String OPTION_SYMBOL_RESOLVER = "symbol-resolver";
 
     static class Handler implements InvocationHandler {
 
diff --git a/src/com/sun/jna/NativeLibrary.java b/src/com/sun/jna/NativeLibrary.java
@@ -630,7 +630,12 @@ long getSymbolAddress(String name) {
         if (handle == 0) {
             throw new UnsatisfiedLinkError("Library has been unloaded");
         }
-        return Native.findSymbol(handle, name);
+        final SymbolResolver resolver = (SymbolResolver)options.get(Library.OPTION_SYMBOL_RESOLVER);
+        if (resolver != null) {
+            return resolver.getSymbolAddress(this, name);
+        } else {
+            return Native.findSymbol(handle, name);
+        }
     }
 
     @Override
diff --git a/src/com/sun/jna/SymbolResolver.java b/src/com/sun/jna/SymbolResolver.java
@@ -0,0 +1,5 @@
+package com.sun.jna;
+
+public interface SymbolResolver {
+    long getSymbolAddress(NativeLibrary library, String symbolName);
+}

Original file line number	Diff line number	Diff line change
`@@ -630,7 +630,12 @@ long getSymbolAddress(String name) {`
`630`	`630`	`if (handle == 0) {`
`631`	`631`	`throw new UnsatisfiedLinkError("Library has been unloaded");`
`632`	`632`	`}`
`633`		`- return Native.findSymbol(handle, name);`
	`633`	`+ final SymbolResolver resolver = (SymbolResolver)options.get(Library.OPTION_SYMBOL_RESOLVER);`
	`634`	`+ if (resolver != null) {`
	`635`	`+ return resolver.getSymbolAddress(this, name);`
	`636`	`+ } else {`
	`637`	`+ return Native.findSymbol(handle, name);`
	`638`	`+ }`
`634`	`639`	`}`
`635`	`640`
`636`	`641`	`@Override`