X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/ddce6e05f6b35573405f04e4545234105c6b4523..0a6a9cf24fddb279ed0157dcc93c1b45f2c3a56c:/gffi/proxy.lisp

diff --git a/gffi/proxy.lisp b/gffi/proxy.lisp
index 56225c9..12f6ec8 100644
--- a/gffi/proxy.lisp
+++ b/gffi/proxy.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: proxy.lisp,v 1.7 2007/04/06 14:29:42 espen Exp $
+;; $Id: proxy.lisp,v 1.10 2007/12/11 14:26:11 espen Exp $
 
 (in-package "GFFI")
 
@@ -167,6 +167,7 @@
 ;; :FINALZIE given to MAKE-PROXY-INSTANCE or non NIL if the proxy was
 ;; created with MAKE-INSTANCE
 (defmethod invalidate-instance ((instance proxy) &optional finalize-p)
+  #+clisp(declare (ignore finalize-p))
   (remove-cached-instance (foreign-location instance))
   #+(or sbcl cmu)
   (progn
@@ -301,6 +302,8 @@
 	  #'(lambda (value object)
  	      (unless writer
  		(setq writer (mkbinding setter nil 'pointer type)))
+	      ;; First argument in foreign setters is the object and second
+	      ;; is value
 	      (funcall writer (foreign-location object) value)))
       (call-next-method)))
   
@@ -596,7 +599,7 @@ object at the give location."))
 
 (define-type-method callback-wrapper ((type struct) var arg form)
   (let ((class (type-expand type)))
-    `(let ((,var (ensure-proxy-instance ',class ,arg :finalize nil)))
+    `(let ((,var (ensure-proxy-instance ',class ,arg :reference nil :finalize nil)))
        (unwind-protect
 	   ,form
 	 (invalidate-instance ,var)))))