Merge pull request #1899 from estebanlm/22558-FFICalloutresolveType-i…

…gnores-class-side-definition

22558-FFICalloutresolveType-ignores-class-side-definition (v2)

src/UnifiedFFI/FFICallout.class.st

@@ -343,22 +343,28 @@ FFICallout >> resolveType: aTypeName [
 
 	newName := aTypeName.
 	ptrArity := 0.
-	"resolve aliases and pointers"	
-	[
-		name := newName asString trimRight.  
+	"resolve aliases and pointers"
+	[ 
+		name := newName asString trimRight.
 		newName := self aliasForType: name.
-		newName last = $* ifTrue: [
+		newName last = $* ifTrue: [ 
 			ptrArity := ptrArity + 1.
 			newName := newName allButLast ].
-		name = newName ] whileFalse.
-
-	resolver := requestor ifNil: [ self class ].
+		name = newName 
+	] whileFalse.
+
+	resolver := requestor 
+		ifNotNil: [ 
+			requestor isClass
+				ifTrue: [ requestor instanceSide ]
+				ifFalse: [ requestor ] ]
+		ifNil: [ self class ].
+
 	binding := resolver ffiBindingOf: name asSymbol.
-
 	binding ifNotNil: [ 
-		^ (binding value asExternalTypeOn: self) pointerArity: ptrArity ] .
+		^ (binding value asExternalTypeOn: self) pointerArity: ptrArity ].
 
-	^ self error: 'Unable to resolve external type: ', aTypeName
+	^ self error: 'Unable to resolve external type: ' , aTypeName
 ]
 
 { #category : #'spec parsing' }