Cleanups

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 78eb8f8..47913c8 100755 (executable)
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -24,8 +24,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     if( _sharedAECenter ) {
         return _sharedAECenter;
     } else {   
-        _sharedAECenter = [[ITAppleEventCenter alloc] init];
-        return _sharedAECenter;
+        return _sharedAECenter = [[ITAppleEventCenter alloc] init];
     }
 }
 
@@ -36,37 +35,36 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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;
+    NSString  *_finalString = nil;
     
     AppleEvent sendEvent, replyEvent;
     AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
     
     DescType resultType;
     Size resultSize, charResultSize;
-    int pid;
     
     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);
+    */
+    //NSLog(@"_sendString: %s", sendString);
     
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
     
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
     
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
     
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
     
     if (err) {
         NSLog(@"Send Error: %i",err);
@@ -110,25 +108,24 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     
     DescType resultType;
     Size resultSize, charResultSize;
-    int pid;
     
     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);
+    */
+    //NSLog(@"_sendString: %s", sendString);
     
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
     
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
     
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
@@ -166,37 +163,36 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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;
+    NSString  *_finalString = nil;
     
     AppleEvent sendEvent, replyEvent;
     AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
     
     DescType resultType;
     Size resultSize, charResultSize;
-    int pid;
     
     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);
+    //NSLog(@"_sendString: %s", sendString);
     
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
     
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
     
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
     
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
     
     if (err) {
         NSLog(@"Send Error: %i",err);
@@ -240,25 +236,24 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     
     DescType resultType;
     Size resultSize, charResultSize;
-    int pid;
     
     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);
+    */
+   // NSLog(@"_sendString: %s", sendString);
     
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
     
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
     
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
@@ -294,7 +289,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     NSString *buildString = [NSString stringWithFormat:@"{ form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [[array objectAtIndex:0] UTF8String]];
     const char *sendString;
     int i;
-    NSString  *_finalString;
+    NSString  *_finalString = nil;
     
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
@@ -304,7 +299,6 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     
     DescType resultType;
     Size resultSize, charResultSize;
-    int pid;
     
     AEBuildError buildError;
     OSStatus err;
@@ -317,25 +311,25 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     }
     buildString = [@"'----':obj " stringByAppendingString:buildString];
     sendString = [buildString UTF8String];
-    
+    /*
     if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
         NSLog(@"Error getting PID of application! Exiting.");
         return nil;
     }
-    
-    NSLog(@"_sendString: %s", sendString);
+    */
+    //NSLog(@"_sendString: %s", sendString);
     
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
-    [self printCarbonDesc:&sendEvent];
+    //[self printCarbonDesc:&sendEvent];
     
     if (err) {
-        NSLog(@"%d:%d at \"%@\"",buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
+        NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
     }
     
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, upp, NULL);
     
-    [self printCarbonDesc:&replyEvent];
+    //[self printCarbonDesc:&replyEvent];
     
     if (err) {
         NSLog(@"Send Error: %i",err);
@@ -365,12 +359,15 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    AEDesc dest;
     AppleEvent event, reply;
 
-    AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, 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);
     
+    AEDisposeDesc(&dest);
     AEDisposeDesc(&event);
     AEDisposeDesc(&reply);
 }
@@ -382,4 +379,70 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     DisposeHandle(xx);
 }
 
+- (NSArray*)sendAEWithRequestedKeyForArray:(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];
+    NSArray *_finalArray = 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;
+    }
+    */
+    //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);
+    
+    //[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 {
+                _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
+            }
+        }
+        free(result);
+    }
+    
+    AEDisposeDesc(&sendEvent);
+    AEDisposeDesc(&replyEvent);
+    
+    return _finalString;
+}
+
 @end