Merge pull request #93 from saltosystems/feature/fix-generic-input-pa…

…rameters codegen: fix generic input parameters
saltosystems · May 9, 2024 · 45c2d7a · 45c2d7a
2 parents c45669f + 2be6f8e
commit 45c2d7a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 11 deletions.
diff --git a/internal/codegen/codegen.go b/internal/codegen/codegen.go
@@ -978,10 +978,12 @@ func (g *generator) elementType(ctx *types.Context, e types.Element) (*genParamT
 			defaultValue:       g.elementDefaultValue(ctx, e),
 		}, nil
 	case types.ELEMENT_TYPE_VAR:
-		// A class variable type modifier
+		// Generic types are not fully supported yet,
+		// so we will just pass the raw unsafe.Pointer up to the user.
 		return &genParamType{
 			namespace:    "unsafe",
 			name:         "Pointer",
+			IsGeneric:    true,
 			IsPointer:    false,
 			IsPrimitive:  false,
 			IsArray:      false,

diff --git a/internal/codegen/templates.go b/internal/codegen/templates.go
@@ -147,6 +147,7 @@ type genParamType struct {
 	name      string
 
 	IsPointer          bool
+	IsGeneric          bool
 	IsArray            bool
 	IsPrimitive        bool
 	IsEnum             bool

diff --git a/internal/codegen/templates/funcimpl.tmpl b/internal/codegen/templates/funcimpl.tmpl
@@ -63,6 +63,8 @@ hr, _, _ := syscall.SyscallN(
             {{else -}}
                 uintptr({{.GoVarName}}),   // in {{.GoTypeName}}
             {{end -}}
+        {{else if .Type.IsGeneric -}}
+            uintptr({{.GoVarName}}),   // in {{.GoTypeName}}
         {{else -}}
             uintptr(unsafe.Pointer(&{{.GoVarName}})),   // in {{.GoTypeName}}
         {{end -}}

diff --git a/windows/foundation/collections/ivector.go b/windows/foundation/collections/ivector.go
diff --git a/windows/foundation/collections/ivectorview.go b/windows/foundation/collections/ivectorview.go