X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/d7bcfef7e59d8076d8eaffdaea4debd202e74e7b..66f5b6df79892a68b1af28b6a1bfe7cf91f2cb56:/ITAppleEventTools.m diff --git a/ITAppleEventTools.m b/ITAppleEventTools.m index a236816..e28f222 100755 --- a/ITAppleEventTools.m +++ b/ITAppleEventTools.m @@ -19,6 +19,9 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev AppleEvent sendEvent, replyEvent; NSAppleEventDescriptor *send, *recv; + AEDesc resultDesc; + DescType resultType; + Size resultSize; AEBuildError buildError; OSStatus berr,err; @@ -28,7 +31,7 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev return nil; } - berr = AEBuildAppleEvent(evClass, evID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, usendString); + berr = AEBuildAppleEvent(evClass, evID, typeProcessSerialNumber,psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, usendString); send = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&sendEvent] autorelease]; if (!berr) [send logDesc]; @@ -37,7 +40,62 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, NULL, NULL); - recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&replyEvent] autorelease]; + + err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); + if (resultSize == 0 || err != 0) { + return nil; + } + + AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc); + + recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease]; + if (!err) [recv logDesc]; + + if (err) { + ITDebugLog(@"Send Error: %i",err); + } + return recv; +} + +NSAppleEventDescriptor *ITSendAEWithStringAndObject(NSString *sendString, const AEDesc *object, FourCharCode evClass, FourCharCode evID,const ProcessSerialNumber *psn) +{ + //Add error checking... + pid_t pid; + + const char *usendString = [sendString UTF8String]; + + AppleEvent sendEvent, replyEvent; + NSAppleEventDescriptor *send, *recv; + AEDesc resultDesc; + DescType resultType; + Size resultSize; + + AEBuildError buildError; + OSStatus berr,err; + + if ((GetProcessPID(psn, &pid) == noErr) && (pid == 0)) { + ITDebugLog(@"Error getting PID of application."); + return nil; + } + + berr = AEBuildAppleEvent(evClass, evID, typeProcessSerialNumber,psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, usendString); + send = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&sendEvent] autorelease]; + if (!berr) [send logDesc]; + + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]); + } + err = AEPutParamDesc(&sendEvent, keyDirectObject, object); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, NULL, NULL); + + err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); + if (resultSize == 0 || err != 0) { + return nil; + } + + AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc); + + recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease]; if (!err) [recv logDesc]; if (err) { @@ -48,10 +106,30 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev NSAppleEventDescriptor *ITSendAEWithKey(FourCharCode reqKey, FourCharCode evClass, FourCharCode evID,const ProcessSerialNumber *psn) { + return nil; } -NSAppleEventDescriptor *ITSendPlainAE(FourCharCode evClass, FourCharCode evID,const ProcessSerialNumber *psn) +NSAppleEventDescriptor *ITSendAE(FourCharCode eClass, FourCharCode eID,const ProcessSerialNumber *psn) { + AEDesc dest; + int pid; + + AppleEvent event, reply; + OSStatus cerr,cerr2,err; + NSAppleEventDescriptor *nsd, *nse, *nsr; + if ((GetProcessPID(psn, &pid) == noErr) && (pid == 0)) { + ITDebugLog(@"Error getting PID of application."); + return nil; + } + cerr = AECreateDesc(typeProcessSerialNumber,psn,sizeof(ProcessSerialNumber),&dest); + nsd = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&dest] autorelease]; + cerr2 = AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event); + nse = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&event] autorelease]; + if (!cerr2) [nse logDesc]; + err = AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, NULL, NULL); + nsr = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&reply] autorelease]; + [nsr logDesc]; + return nsr; } @implementation NSAppleEventDescriptor (ITAELogging)