From 8c8e80d1976700200f1ddb6efe921d206d6bc4cc Mon Sep 17 00:00:00 2001
From: Joseph Spiros <joseph.spiros@ithinksw.com>
Date: Tue, 4 Feb 2003 11:42:45 +0000
Subject: [PATCH] Some Error Checking. Also, added a method for sending
 non-returning AppleEvents.

---
 ITAppleEventCenter.h |  3 ++-
 ITAppleEventCenter.m | 56 ++++++++++++++++++--------------------------
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/ITAppleEventCenter.h b/ITAppleEventCenter.h
index 4a71835..20873ab 100755
--- a/ITAppleEventCenter.h
+++ b/ITAppleEventCenter.h
@@ -23,6 +23,7 @@
 
 }
 + (id)sharedCenter;
-- (NSString*)runAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+- (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
+- (void)sendAEWithEventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn;
 - (void)printCarbonDesc:(AEDesc*)desc;
 @end
diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index ceaf358..06e65b2 100755
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -29,35 +29,28 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     }
 }
 
-- (NSString*)runAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
+- (NSString*)sendAEWithRequestedKey:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
 {
+    if ( (!key) || (!eventClass) || (!eventID) || (!psn) ) {
+        return @"";
+    } else {
     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;
     
-    // Variables for building and sending the event    
     AppleEvent sendEvent, replyEvent;
-    //AEDesc replyDesc;
     AEIdleUPP upp = NewAEIdleUPP(&MyAEIdleCallback);
     
-    // Variables for getting the result
     char *charResult;
     DescType resultType;
     Size resultSize, charResultSize;
     int pid;
     
-    // Variables for error checking
     AEBuildError buildError;
     OSStatus err;
     OSErr err2, err3;
-    //Ptr buffer;
-    //Size length;
-    
-    // Start Code
-    // ^ Most pointless comment EVAR!
-    // ^^ Nope, that one is
     
     if (GetProcessPID(&psn, &pid) == noErr) {
         if (pid ==0) {
@@ -71,7 +64,6 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     
     NSLog(@"_sendString: %s", sendString);
     
-    // The problem is, if I use eClass and eID in place of 'core' and 'getd' respectively, It won't build a valid AppleEvent :'(
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
     
     [self printCarbonDesc:&sendEvent];
@@ -92,44 +84,42 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         
         err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
         result=malloc(resultSize);
-        //err2 = AEGetParamDesc(&replyEvent, keyDirectObject, typeWildCard, &replyDesc);
         
         if (err2) { NSLog(@"Error After AESizeOfParam: %i", err2); } else {
-        //if (err2) { NSLog(@"Error After AEGetParamDesc: %i", err2); } else {
         
         err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
-        //length = AEGetDescDataSize(&replyDesc);
-        //buffer = malloc(length);
-    
-        //err3 = AEGetDescData(&replyDesc, buffer, length);
         
         if (err3) { NSLog(@"Error After AEGetParamPtr: %i", err3); } else {
         
-        // if (err3) { NSLog(@"Error After AEGetDescData: %i", err3); } else {
-        
         _finalString = [[NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)] copy];
         
-        /* _finalString = [NSString stringWithCString:buffer length:length];
-        
-        if ( (! [_finalString isEqualToString:@""])      &&
-            ([_finalString characterAtIndex:0] == '\"') &&
-            ([_finalString characterAtIndex:[_finalString length] - 1] == '\"') ) {
-            _finalString = [_finalString substringWithRange:NSMakeRange(1, [_finalString length] - 2)];
-        }
-        free(buffer);
-        buffer = nil; */
-
         }
         }
     }
     
-    //NSLog(@"Result Size: %i", charResultSize);
-    //NSLog(@"Result: %c", charResult);
-    
     AEDisposeDesc(&sendEvent);
     AEDisposeDesc(&replyEvent);
     
     return _finalString;
+    }
+}
+
+- (void)sendAEWithEventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
+{
+    if ( (!eventClass) || (!eventID) || (!psn) ) {
+        return;
+    } else {
+        AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
+        AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+        AppleEvent event, reply;
+    
+        AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
+    
+        AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, nil, nil);
+    
+        AEDisposeDesc(&event);
+        AEDisposeDesc(&reply);
+    }
 }
 
 - (void)printCarbonDesc:(AEDesc*)desc {
-- 
2.20.1