GitHub/ipsw
1
0
Fork 0
mirror of https://github.com/blacktop/ipsw.git synced 2026-05-08 12:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: bools ageen and ageen and..

Browse Source
This commit is contained in:
blacktop
2022-12-10 02:18:03 -07:00
parent 18a12bc130
commit b7d63bd386
2 changed files with 72 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/objc/class.go
+11 -3
View File
@@ -3,10 +3,18 @@
package objc
/*
// #cgo CFLAGS: -Dqqq
// #cgo LDFLAGS: -lobjc -framework Foundation
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
#include <dlfcn.h>
#include <objc/objc-runtime.h>
static int objcBOOL2int(BOOL b) {
return (int)b;
}
*/
import "C"
import (
@@ -55,7 +63,7 @@ func (cls Class) Super() Class {
}
func (cls Class) IsMetaClass() bool {
return bool(C.class_isMetaClass(cls.cclass()))
return C.objcBOOL2int(C.class_isMetaClass(cls.cclass())) != 0
}
func (cls Class) InstanceSize() int {
@@ -112,7 +120,7 @@ func (cls Class) GetMethodImplementation(name Sel) C.IMP {
}
func (cls Class) RespondsToSelector(sel Sel) bool {
return bool(C.class_respondsToSelector(cls.cclass(), sel.csel()))
return C.objcBOOL2int(C.class_respondsToSelector(cls.cclass(), sel.csel())) != 0
}
func (cls Class) Methods() []Method {
@@ -236,7 +244,7 @@ func (cls Class) Properties() []Property {
// }
func (cls Class) ConformsToProtocol(prot Protocol) bool {
return bool(C.class_conformsToProtocol(cls.cclass(), prot.cprot()))
return C.objcBOOL2int(C.class_conformsToProtocol(cls.cclass(), prot.cprot())) != 0
}
func (cls Class) Version() int {
internal/objc/protocol.go
+61 -55
View File
@@ -2,8 +2,14 @@
package objc
// #include <stdlib.h>
// #include <objc/runtime.h>
/*
#include <stdlib.h>
#include <objc/runtime.h>
static int objcBOOL2int(BOOL b) {
return (int)b;
}
*/
import "C"
import "unsafe"
@@ -39,74 +45,74 @@ func (p Protocol) Name() string {
return C.GoString(C.protocol_getName(p.cprot()))
}
func (p Protocol) AddMethodDescription(name Sel, types string, isRequiredMethod bool, isInstanceMethod bool) {
ctypes := C.CString(types)
defer C.free(unsafe.Pointer(ctypes))
// func (p Protocol) AddMethodDescription(name Sel, types string, isRequiredMethod bool, isInstanceMethod bool) {
// ctypes := C.CString(types)
// defer C.free(unsafe.Pointer(ctypes))
C.protocol_addMethodDescription(p.cprot(), name.csel(), ctypes, C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod))
}
// C.protocol_addMethodDescription(p.cprot(), name.csel(), ctypes, C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod))
// }
func (p Protocol) AddProtocol(addition Protocol) {
C.protocol_addProtocol(p.cprot(), addition.cprot())
}
func (p Protocol) AddProperty(name string, attributes []PropertyAttribute, isRequiredProperty bool, isInstanceProperty bool) {
var cattributes *C.objc_property_attribute_t
// func (p Protocol) AddProperty(name string, attributes []PropertyAttribute, isRequiredProperty bool, isInstanceProperty bool) {
// var cattributes *C.objc_property_attribute_t
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
// cname := C.CString(name)
// defer C.free(unsafe.Pointer(cname))
attrSize := unsafe.Sizeof(*cattributes)
attributeCount := len(attributes)
// attrSize := unsafe.Sizeof(*cattributes)
// attributeCount := len(attributes)
if len(attributes) != 0 {
cattributes = (*C.objc_property_attribute_t)(C.calloc(C.size_t(attributeCount), C.size_t(attrSize)))
// if len(attributes) != 0 {
// cattributes = (*C.objc_property_attribute_t)(C.calloc(C.size_t(attributeCount), C.size_t(attrSize)))
defer func(cattributes *C.objc_property_attribute_t, attributeCount int) {
// defer func(cattributes *C.objc_property_attribute_t, attributeCount int) {
for i, elem := 0, cattributes; i < attributeCount; i++ {
C.free(unsafe.Pointer(elem.name))
C.free(unsafe.Pointer(elem.value))
// for i, elem := 0, cattributes; i < attributeCount; i++ {
// C.free(unsafe.Pointer(elem.name))
// C.free(unsafe.Pointer(elem.value))
elem = nextPropertyAttr(elem)
}
// elem = nextPropertyAttr(elem)
// }
C.free(unsafe.Pointer(cattributes))
}(cattributes, attributeCount)
// C.free(unsafe.Pointer(cattributes))
// }(cattributes, attributeCount)
for i, elem := 0, cattributes; i < attributeCount; i++ {
attr := attributes[i]
elem.name = C.CString(attr.Name)
elem.value = C.CString(attr.Value)
elem = nextPropertyAttr(elem)
}
}
// for i, elem := 0, cattributes; i < attributeCount; i++ {
// attr := attributes[i]
// elem.name = C.CString(attr.Name)
// elem.value = C.CString(attr.Value)
// elem = nextPropertyAttr(elem)
// }
// }
C.protocol_addProperty(p.cprot(), cname, cattributes, C.uint(attributeCount), C.BOOL(isRequiredProperty), C.BOOL(isInstanceProperty))
}
// C.protocol_addProperty(p.cprot(), cname, cattributes, C.uint(attributeCount), C.BOOL(isRequiredProperty), C.BOOL(isInstanceProperty))
// }
func (p Protocol) CopyMethodDescriptionList(isRequiredMethod bool, isInstanceMethod bool) (descriptions []MethodDescription) {
var coutCount C.uint
// func (p Protocol) CopyMethodDescriptionList(isRequiredMethod bool, isInstanceMethod bool) (descriptions []MethodDescription) {
// var coutCount C.uint
descriptionList := C.protocol_copyMethodDescriptionList(p.cprot(), C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod), &coutCount)
defer C.free(unsafe.Pointer(descriptionList))
// descriptionList := C.protocol_copyMethodDescriptionList(p.cprot(), C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod), &coutCount)
// defer C.free(unsafe.Pointer(descriptionList))
if outCount := uint(coutCount); outCount > 0 {
descriptions = make([]MethodDescription, outCount)
// if outCount := uint(coutCount); outCount > 0 {
// descriptions = make([]MethodDescription, outCount)
for i, elem := uint(0), descriptionList; i < outCount; i++ {
descriptions[i] = makeMethodDescription(*elem)
elem = nextMethodDescription(elem)
}
}
// for i, elem := uint(0), descriptionList; i < outCount; i++ {
// descriptions[i] = makeMethodDescription(*elem)
// elem = nextMethodDescription(elem)
// }
// }
return
}
// return
// }
func (p Protocol) MethodDescription(aSel Sel, isRequiredMethod bool, isInstanceMethod bool) MethodDescription {
cmethodDescription := C.protocol_getMethodDescription(p.cprot(), aSel.csel(), C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod))
return makeMethodDescription(cmethodDescription)
}
// func (p Protocol) MethodDescription(aSel Sel, isRequiredMethod bool, isInstanceMethod bool) MethodDescription {
// cmethodDescription := C.protocol_getMethodDescription(p.cprot(), aSel.csel(), C.BOOL(isRequiredMethod), C.BOOL(isInstanceMethod))
// return makeMethodDescription(cmethodDescription)
// }
func (p Protocol) CopyPropertyList() (properties []Property) {
var coutCount C.uint
@@ -126,12 +132,12 @@ func (p Protocol) CopyPropertyList() (properties []Property) {
return
}
func (p Protocol) Property(name string, isRequiredProperty bool, isInstanceProperty bool) Property {
cname := C.CString(name)
defer C.free(unsafe.Pointer(cname))
// func (p Protocol) Property(name string, isRequiredProperty bool, isInstanceProperty bool) Property {
// cname := C.CString(name)
// defer C.free(unsafe.Pointer(cname))
return (Property)(unsafe.Pointer(C.protocol_getProperty(p.cprot(), cname, C.BOOL(isRequiredProperty), C.BOOL(isInstanceProperty))))
}
// return (Property)(unsafe.Pointer(C.protocol_getProperty(p.cprot(), cname, C.BOOL(isRequiredProperty), C.BOOL(isInstanceProperty))))
// }
func (p Protocol) CopyProtocolList() (protocols []Protocol) {
var coutCount C.uint
@@ -152,7 +158,7 @@ func (p Protocol) CopyProtocolList() (protocols []Protocol) {
}
func (p Protocol) ConformsToProtocol(other Protocol) bool {
return bool(C.protocol_conformsToProtocol(p.cprot(), other.cprot()))
return C.objcBOOL2int(C.protocol_conformsToProtocol(p.cprot(), other.cprot())) != 0
}
func nextProtocol(list **C.Protocol) **C.Protocol {