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

diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m
index 50c7b88..c02d09c 100755
--- a/ITAppleEventCenter.m
+++ b/ITAppleEventCenter.m
@@ -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;
@@ -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);
-
-    //[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);
@@ -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];
@@ -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];
@@ -303,6 +306,7 @@ static ITAppleEventCenter *_sharedAECenter = nil;
     long result = 0;
 
     AppleEvent sendEvent, replyEvent;
+    int pid;
 
     DescType resultType;
     Size resultSize, charResultSize;
@@ -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]);
@@ -427,6 +432,8 @@ 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, "");
@@ -461,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;
 
@@ -512,6 +520,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
 
     const char *sendString = [string UTF8String];
     SInt32 result = 0;
+    int pid;
 
     AppleEvent sendEvent, replyEvent;
 
@@ -569,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;