git.ithinksw.org / ITFoundation.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Adding ITDebug.h to the framework header.
[ITFoundation.git] / ITAppleEventCenter.m
diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 50c7b88..8ad8af5 100755 (executable)
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -24,7 +24,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
 - (id)init
 {
-    if (self = [super init]) {
+    if ( ( self = [super init] ) ) {
         idleUPP = NewAEIdleUPP(MyAEIdleCallback);
     }
     return self;
@@ -40,7 +40,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
-
+    int pid;
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
     NSString  *_finalString = nil;
@@ -52,7 +52,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     AEBuildError buildError;
     OSStatus err;
-    OSErr err2, err3;
+    OSErr berr, err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
            //NSLog(@"Error getting PID of application! Exiting.");
@@ -61,7 +61,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 //joe add the ITFDEBUG stuff back?
     //[self printCarbonDesc:&sendEvent];
 
@@ -95,8 +95,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -106,6 +106,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID   eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     const char *sendString = [nssendString UTF8String];
     NSString  *_finalString = nil;
@@ -116,7 +117,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,err;
     OSErr err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
@@ -126,17 +127,17 @@ static ITAppleEventCenter *_sharedAECenter = nil;
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+       NSLog(@"sending...");
+    if (!berr) [self printCarbonDesc:&sendEvent];
 
-    //[self printCarbonDesc:&sendEvent];
-
-    if (err) {
+    if (berr) {
         //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
     }
 
     err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
-
-    //[self printCarbonDesc:&replyEvent];
+    NSLog(@"replying...");
+    if (!err) [self printCarbonDesc:&replyEvent];
 
     if (err) {
         //NSLog(@"Send Error: %i",err);
@@ -160,8 +161,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -171,6 +172,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
@@ -183,7 +185,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     AEBuildError buildError;
     OSStatus err;
-    OSErr err2, err3;
+    OSErr berr, err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
            //NSLog(@"Error getting PID of application! Exiting.");
@@ -192,7 +194,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -220,8 +222,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         }
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
@@ -231,6 +233,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     NSString *nssendString = [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]];
     const char *sendString = [nssendString UTF8String];
@@ -242,7 +245,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,err;
     OSErr err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
@@ -252,7 +255,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -286,8 +289,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -303,12 +306,13 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     long result = 0;
 
     AppleEvent sendEvent, replyEvent;
+    int pid;
 
     DescType resultType;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
@@ -318,7 +322,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
        
     // //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -346,8 +350,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         }
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
@@ -358,6 +362,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     const char *sendString;
     int i;
     NSString  *_finalString = nil;
+    int pid;
 
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
@@ -368,7 +373,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
 
     for (i = 1; i < [array count]; i++) {
@@ -386,7 +391,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -418,6 +423,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         }
         free(result);
     }
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
     return _finalString;
 }
 
@@ -427,21 +434,23 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
     AEDesc dest;
-    AppleEvent event, reply;
+    int pid;
 
+    AppleEvent event, reply;
+    OSStatus cerr,cerr2,err;
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
     if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
-           //NSLog(@"Error getting PID of application! Exiting.");
-           return nil;
-       }
-       AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
-    AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
+        //NSLog(@"Error getting PID of application! Exiting.");
+       return;
+    }
+    cerr = AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+    cerr2 = AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
 //[self printCarbonDesc:&event];
-    AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
+    err = AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
 //[self printCarbonDesc:&reply];
-    AEDisposeDesc(&dest);
-    AEDisposeDesc(&event);
-    AEDisposeDesc(&reply);
+    if (!cerr2) AEDisposeDesc(&dest);
+    if (!cerr) AEDisposeDesc(&event);
+    if (!err) AEDisposeDesc(&reply);
 }
 
 - (void)printCarbonDesc:(AEDesc*)desc {
@@ -461,6 +470,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     NSString *nssendString = [NSString stringWithFormat:@"'----':obj { form:'indx', want:'%s', seld:abso($616C6C20$), from:'null'() }", [key UTF8String]];
     const char *sendString = [nssendString UTF8String];
     AEArrayDataPointer result = nil;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -512,6 +522,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 
     const char *sendString = [string UTF8String];
     SInt32 result = 0;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -519,7 +530,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     OSErr err2, err3;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
@@ -529,7 +540,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -558,8 +569,8 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
     }
 
 
-AEDisposeDesc(&sendEvent);
-AEDisposeDesc(&replyEvent);
+if (!berr) AEDisposeDesc(&sendEvent);
+if (!err) AEDisposeDesc(&replyEvent);
 //NSLog(@"waffles say %d",result);
 return result;
 }
@@ -569,6 +580,7 @@ return result;
     //Add error checking...
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
+    int pid;
 
     const char *sendString = [string UTF8String];
     AEArrayDataPointer result = NULL;
@@ -576,7 +588,7 @@ return result;
     AppleEvent sendEvent, replyEvent;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr, err;
     
        if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
            //NSLog(@"Error getting PID of application! Exiting.");
@@ -585,7 +597,7 @@ return result;
        
     //NSLog(@"_sendString: %s", sendString);
 
-    err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
 
@@ -609,8 +621,8 @@ return result;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return result;
 }
iThink Software's custom extensions to Apple's Foundation framework.