X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/d0e2a23f6909335baea90af08491a5160026757b..32340246be408a32469e529da2363a4a142121ed:/ITAppleEventCenter.m

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 5f485e0..c02d09c 100755
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -1,5 +1,5 @@
 #import "ITAppleEventCenter.h"
-
+//oh, wait, i forgot i had this open.
 static Boolean MyAEIdleCallback (
 					 EventRecord * theEvent,
 					 SInt32 * sleepTime,
@@ -24,10 +24,9 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
 - (id)init
 {
-    if (self = [super init])
-	   {
-	   idleUPP = NewAEIdleUPP(MyAEIdleCallback);
-	   }
+    if (self = [super init]) {
+        idleUPP = NewAEIdleUPP(MyAEIdleCallback);
+    }
     return self;
 }
 
@@ -41,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;
@@ -54,16 +53,16 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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);
-
+//joe add the ITFDEBUG stuff back?
     //[self printCarbonDesc:&sendEvent];
 
     if (err) {
@@ -107,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;
@@ -117,27 +117,27 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     Size resultSize, charResultSize;
 
     AEBuildError buildError;
-    OSStatus err;
+    OSStatus berr,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];
+    berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+	NSLog(@"sending...");
+    if (!berr) [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);
@@ -161,8 +161,8 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         free(result);
     }
 
-    AEDisposeDesc(&sendEvent);
-    AEDisposeDesc(&replyEvent);
+    if (!berr) AEDisposeDesc(&sendEvent);
+    if (!err) AEDisposeDesc(&replyEvent);
 
     return _finalString;
 }
@@ -172,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];
@@ -185,12 +186,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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);
@@ -232,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];
@@ -245,11 +247,11 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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);
 
@@ -304,6 +306,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     long result = 0;
 
     AppleEvent sendEvent, replyEvent;
+    int pid;
 
     DescType resultType;
     Size resultSize, charResultSize;
@@ -311,12 +314,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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);
@@ -359,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]);
@@ -379,12 +383,12 @@ 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);
 
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@ -428,10 +432,16 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
     AEEventID    eID    = *((unsigned long*)[eventID UTF8String]);
     AEDesc dest;
+    int pid;
+
     AppleEvent event, reply;
 
     //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
-    AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+    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);
 //[self printCarbonDesc:&event];
     AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
@@ -458,6 +468,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;
 
@@ -466,7 +477,10 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     OSStatus err;
 
     //NSLog(@"_sendString: %s", sendString);
-
+if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+	    //NSLog(@"Error getting PID of application! Exiting.");
+	    return nil;
+	}
     err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
 
     //[self printCarbonDesc:&sendEvent];
@@ -475,6 +489,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
         //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];
@@ -505,6 +520,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
 
     const char *sendString = [string UTF8String];
     SInt32 result = 0;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -514,12 +530,12 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     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);
@@ -562,6 +578,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;
@@ -570,12 +587,12 @@ return result;
 
     AEBuildError buildError;
     OSStatus err;
-    /*
+    
 	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);