shattered, el cap happy, still needs a lot of polish

firecore · Oct 22, 2015 · f21ded7 · f21ded7
1 parent 1e87b2d
commit f21ded7
Show file tree

Hide file tree

Showing 12 changed files with 16,370 additions and 1,607 deletions.
diff --git a/JSONKit.m b/JSONKit.m
@@ -677,7 +677,7 @@ + (id)allocWithZone:(NSZone *)zone
   NSCParameterAssert((objects != NULL) && (_JKArrayClass != NULL) && (_JKArrayInstanceSize > 0UL));
   JKArray *array = NULL;
   if(JK_EXPECT_T((array = (JKArray *)calloc(1UL, _JKArrayInstanceSize)) != NULL)) { // Directly allocate the JKArray instance via calloc.
-    array->isa      = _JKArrayClass;
+    object_setClass(array, _JKArrayClass);
     if((array = [array init]) == NULL) { return(NULL); }
     array->capacity = count;
     array->count    = count;
@@ -928,7 +928,7 @@ static void _JKDictionaryResizeIfNeccessary(JKDictionary *dictionary) {
   NSCParameterAssert((keys != NULL) && (keyHashes != NULL) && (objects != NULL) && (_JKDictionaryClass != NULL) && (_JKDictionaryInstanceSize > 0UL));
   JKDictionary *dictionary = NULL;
   if(JK_EXPECT_T((dictionary = (JKDictionary *)calloc(1UL, _JKDictionaryInstanceSize)) != NULL)) { // Directly allocate the JKDictionary instance via calloc.
-    dictionary->isa      = _JKDictionaryClass;
+    object_setClass(dictionary, _JKDictionaryClass);
     if((dictionary = [dictionary init]) == NULL) { return(NULL); }
     dictionary->capacity = _JKDictionaryCapacityForCount(count);
     dictionary->count    = 0UL;

diff --git a/NativeStuffs/Restore/iUSBKit/IPhoneUSB.m b/NativeStuffs/Restore/iUSBKit/IPhoneUSB.m
@@ -7,12 +7,12 @@
 //
 
 #import "IPhoneUSB.h"
-#import "ToolBox.h"
+//#import "ToolBox.h"
 #import "NSString+Extensions.h"
 
 static BOOL isListening = NO;
 
-void progressCallback(UKDevice *device, double progress)
+void progressCallback(SPDevice *device, double progress)
 {
 
     IPhoneUSB *theSelf = (IPhoneUSB *)(device->user_arg);
@@ -21,7 +21,7 @@ void progressCallback(UKDevice *device, double progress)
 
 }
 
-void usbEventHandler(UKDevice *device, int event, void *refCon){
+void usbEventHandler(SPDevice *device, int event, void *refCon){
 
     IPhoneUSB *theSelf = (IPhoneUSB *)refCon;
 

diff --git a/NativeStuffs/Restore/iUSBKit/libusb.h b/NativeStuffs/Restore/iUSBKit/libusb.h
@@ -107,7 +107,7 @@ void device_attached(void * refCon, io_iterator_t iterator);
 void device_detached(void * refCon, io_iterator_t iterator);
 void open_device(UKDevice * Device);
 void open_interface(UKDevice * Device, int interface, int alt_interface);
-void get_ids(UKDevice * Device);
+int get_ids(UKDevice * Device);
 
 int send_control_request(UKDevice * Device,
                          UInt8 bm_request_type,

diff --git a/NativeStuffs/libusbkit/SHAtter.h b/NativeStuffs/libusbkit/SHAtter.h