X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/c897ec0f7d3b828be34304109ddc6814328c0ac1..01ba0b1f650b7696b4507400d5ffb541323bf650:/ITAppleEventTools.m diff --git a/ITAppleEventTools.m b/ITAppleEventTools.m index 217a1d1..7b897ee 100755 --- a/ITAppleEventTools.m +++ b/ITAppleEventTools.m @@ -19,7 +19,9 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev AppleEvent sendEvent, replyEvent; NSAppleEventDescriptor *send, *recv; - AEDesc nthDesc; + AEDesc resultDesc; + DescType resultType; + Size resultSize; AEBuildError buildError; OSStatus berr,err; @@ -37,12 +39,63 @@ NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, NULL, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kAEDefaultTimeout, NULL, NULL); - err = AEGetNthDesc(&replyEvent, 1, typeWildCard, nil, &nthDesc); - if (!err) ITDebugLog(@"Error getting Nth desc."); + 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, kAEDefaultTimeout, NULL, NULL); + + err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); + if (resultSize == 0 || err != 0) { + return nil; + } + + AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc); - recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&nthDesc] autorelease]; + recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease]; if (!err) [recv logDesc]; if (err) {