ctypes supports v2.1 and adds ctypes.struct.__Enum

thqby · Sep 25, 2023 · b2c3d10 · b2c3d10
1 parent 344f2fe
commit b2c3d10
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/Native/Native.ahk b/Native/Native.ahk
@@ -225,7 +225,7 @@ class Native extends Func {
 					if !mems.HasOwnProp(name)
 						t := mems.%name% := {}
 					else t := mems.%name%
-					t.%sub% := me := this.Method(pbase, method, mit, minparams, maxparams, id)
+					t.DefineProp sub, me := this.Method(pbase, method, mit, minparams, maxparams, id)
 					NumPut('ptr', pname, ObjPtr(me), 3 * A_PtrSize + 8)
 					pmem += A_PtrSize - 3
 				} else {
@@ -297,7 +297,7 @@ class Native extends Func {
 			NumPut('char', 1, NumPut('ptr', IsObject(prototype) ? ObjPtr(prototype) : prototype, p) + A_PtrSize + 3), ac := pc := MinParams := 1
 		IsVariadic := false, MaxResultTokens := 0
 		if sig is Array {
-			if sig.Length > 1
+			if sig.Length
 				ret := sig.RemoveAt(1), smdf.Size += sig.Length, ret is String && ret := mdtypes.%ret%
 			else ret := 0
 			opt := false, retval := false, out := 0

diff --git a/ctypes.ahk b/ctypes.ahk
@@ -1,8 +1,8 @@
 /************************************************************************
  * @description create struct, union, array and pointer binding, and use it like ahk object
  * @author thqby
- * @date 2023/07/19
- * @version 1.0.4
+ * @date 2023/09/25
+ * @version 1.0.5
  ***********************************************************************/
 
 class ctypes {
@@ -74,14 +74,14 @@ class ctypes {
 		 * @return {this}
 		 */
 		static from_ptr(ptr, size := 0, root := 0) {
-			static offset_ptr := 3 * A_PtrSize + 8
+			static offset_ptr := (VerCompare(A_AhkVersion, '2.1-alpha.3') >= 0 ? 5 : 3) * A_PtrSize + 8
 			if !ptr
 				return 0
-			NumPut('ptr', ptr, 'uptr', size || this.size, ObjPtr(obj := (Buffer.Call)(this)), offset_ptr)
+			NumPut('ptr', ptr, 'uptr', size || this.size, ObjPtr(obj := super()), offset_ptr)
 			obj.DefineProp('__Delete', { call: __del }), root && obj.DefineProp('__root', { value: root })
 			return obj
 			__del(this) {
-				try this.base.__Delete()
+				try (this.base.__Delete)(this)
 				NumPut('ptr', 0, ObjPtr(this), offset_ptr)
 			}
 		}
@@ -254,6 +254,11 @@ class ctypes {
 			return get_buf_size(this)
 		}
 
+		__Enum(n?) {
+			i := 0, n := (fields := this.__fields).Length
+			return (&k?, &v?, *) => (i < n ? (v := this.%k := fields[++i][2]%, true) : false)
+		}
+
 		static name => this.Prototype.__Class
 
 		static __max_align => 1