Fixed a lot of memory leaks. The new array stuff has a better chance of working now

diff --git a/ITAppleEventCenter.h b/ITAppleEventCenter.h
index 82dac05..189c0cc 100755 (executable)
--- a/ITAppleEventCenter.h
+++ b/ITAppleEventCenter.h
@@ -18,12 +18,12 @@
 
 
 @interface ITAppleEventCenter : NSObject {
-
+    AEIdleUPP idleUPP;
 }
 + (id)sharedCenter;
 - (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
 - (long)sendAEWithRequestedKeyForNumber:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
-- (AEArrayDataPointer)sendAEWithRequestedKeyForArray:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
+- (AEArrayDataPointer)sendAEWithRequestedKeyForArray:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
 
 
 - (NSString*)sendTwoTierAEWithRequestedKey:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index ed1ad83..11671b5 100755 (executable)
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -23,62 +23,75 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 {
     if( _sharedAECenter ) {
         return _sharedAECenter;
-    } else {   
+    } else {
         return _sharedAECenter = [[ITAppleEventCenter alloc] init];
     }
 }
 
+- (id)init
+{
+    if (self = [super init])
+          {
+          idleUPP = NewAEIdleUPP(MyAEIdleCallback);
+          }
+    return self;
+}
+
+- (void)dealloc
+{
+    DisposeAEIdleUPP(idleUPP);
+}
+
 - (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
-    
+
     const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]] UTF8String];
     NSString  *_finalString = nil;
-    
+
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
-    
+
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
     /*
-    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-        NSLog(@"Error getting PID of application! Exiting.");
-        return nil;
-    }
-    */
+       if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
+       */
     //NSLog(@"_sendString: %s", sendString);
-    
+
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-    
+
     //[self printCarbonDesc:&sendEvent];
-    
+
     if (err) {
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
-    
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
-    
+
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
+
     //[self printCarbonDesc:&replyEvent];
-    
+
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
-        
+
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
         result = malloc(resultSize);
-        
+
         if (err2) {
             NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
-            
+
             if (err3) {
                 NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
@@ -87,10 +100,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         }
         free(result);
     }
-    
+
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
-    
+
     return _finalString;
 }
 
@@ -99,49 +112,48 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
-    
+
     const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]] UTF8String];
     long result = 0;
-    
+
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
-    
+
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
     /*
-    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-        NSLog(@"Error getting PID of application! Exiting.");
-        return nil;
-    }
-    */
+       if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
+       */
     //NSLog(@"_sendString: %s", sendString);
-    
+
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-    
+
     //[self printCarbonDesc:&sendEvent];
-    
+
     if (err) {
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
-    
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
-    
+
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
+
     [self printCarbonDesc:&replyEvent];
-    
+
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
-        
+
         if (err2) {
             NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
-            
+
             if (err3) {
                 NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
@@ -149,10 +161,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
             }
         }
     }
-    
+
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
-    
+
     return result;
 }
 
@@ -161,52 +173,51 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
-    
+
     const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() } }", [key UTF8String], [object UTF8String]] UTF8String];
     NSString  *_finalString = nil;
-    
+
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
-    
+
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
     /*
-    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-        NSLog(@"Error getting PID of application! Exiting.");
-        return nil;
-    }*/
-    
+       if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }*/
+
     //NSLog(@"_sendString: %s", sendString);
-    
+
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-    
+
     //[self printCarbonDesc:&sendEvent];
-    
+
     if (err) {
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
-    
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
-    
+
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
+
     //[self printCarbonDesc:&replyEvent];
-    
+
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
-        
+
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
         result = malloc(resultSize);
-        
+
         if (err2) {
             NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
-            
+
             if (err3) {
                 NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
@@ -215,10 +226,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         }
         free(result);
     }
-    
+
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
-    
+
     return _finalString;
 }
 
@@ -227,49 +238,48 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
-    
+
     const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() } }", [key UTF8String], [object UTF8String]] UTF8String];
     long result = 0;
-    
+
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
-    
+
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
     /*
-    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-        NSLog(@"Error getting PID of application! Exiting.");
-        return nil;
-    }
-    */
-   // NSLog(@"_sendString: %s", sendString);
-    
+       if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
+       */
+    // NSLog(@"_sendString: %s", sendString);
+
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-    
+
     //[self printCarbonDesc:&sendEvent];
-    
+
     if (err) {
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
-    
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
-    
+
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
+
     [self printCarbonDesc:&replyEvent];
-    
+
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
-        
+
         if (err2) {
             NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
             err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
-            
+
             if (err3) {
                 NSLog(@"Error After AEGetParamPtr: %i", err3);
             } else {
@@ -277,10 +287,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
             }
         }
     }
-    
+
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
-    
+
     return result;
 }
 
@@ -290,55 +300,54 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     const char *sendString;
     int i;
     NSString  *_finalString = nil;
-    
+
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
-    
+
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
-    
+
     DescType resultType;
     Size resultSize, charResultSize;
-    
+
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    
+
     for (i = 1; i < [array count]; i++) {
         NSString *from = [NSString stringWithFormat:@"{ form:'prop', want:type('prop'), seld:type('%s'), from:obj %@ }",
-                    [[array objectAtIndex:i] UTF8String], buildString];
+                 [[array objectAtIndex:i] UTF8String], buildString];
         buildString = from;
     }
     buildString = [@"'----':obj " stringByAppendingString:buildString];
     sendString = [buildString UTF8String];
     /*
-    if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-        NSLog(@"Error getting PID of application! Exiting.");
-        return nil;
-    }
-    */
+       if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+           NSLog(@"Error getting PID of application! Exiting.");
+           return nil;
+       }
+       */
     //NSLog(@"_sendString: %s", sendString);
-    
+
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
-    
+
     //[self printCarbonDesc:&sendEvent];
-    
+
     if (err) {
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
-    
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
-    
+
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
+
     //[self printCarbonDesc:&replyEvent];
-    
+
     if (err) {
         NSLog(@"Send Error: %i",err);
     } else {
         unichar *result = 0;
-        
+
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
         result=malloc(resultSize);
-        
+
         if (err2) {
             NSLog(@"Error After AESizeOfParam: %i", err2);
         } else {
@@ -365,8 +374,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
     AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
     AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
-    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
-    
+    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
+
     AEDisposeDesc(&dest);
     AEDisposeDesc(&event);
     AEDisposeDesc(&reply);
@@ -386,11 +395,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
 
-    const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]] UTF8String];
+    const char *sendString = [[NSString stringWithFormat:@"'----':obj { form:'indx', want:'%s', seld:abso($616C6C20$), from:'null'() }", [key UTF8String]] UTF8String];
     AEArrayDataPointer result = nil;
 
     AppleEvent sendEvent, replyEvent;
-    AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
 
     DescType resultType;
     Size resultSize, charResultSize;
@@ -409,7 +417,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
 
-    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
+    err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
 
     //[self printCarbonDesc:&replyEvent];