From: Kent Sutherland Date: Fri, 10 Sep 2004 13:47:00 +0000 (+0000) Subject: Added ITSendAEWithKey, need to fix up a small part of it though. X-Git-Tag: v1.0~15 X-Git-Url: http://git.ithinksw.org/ITFoundation.git/commitdiff_plain/ba38a33a2b82f8adb39fdd5b40e2da5d42913fbd Added ITSendAEWithKey, need to fix up a small part of it though. --- diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m index 5e463d3..9efe080 100755 --- a/ITAppleEventCenter.m +++ b/ITAppleEventCenter.m @@ -67,7 +67,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -134,7 +134,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); if (!err) [self printCarbonDesc:&replyEvent]; if (err) { @@ -202,7 +202,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -260,7 +260,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -328,7 +328,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -395,7 +395,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -444,7 +444,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; cerr = AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest); cerr2 = AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event); [self printCarbonDesc:&event]; - err = AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil); + err = AESend(&event, &reply, kAENoReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, nil); [self printCarbonDesc:&reply]; if (!cerr2) AEDisposeDesc(&dest); if (!cerr) AEDisposeDesc(&event); @@ -488,7 +488,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -546,7 +546,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -601,7 +601,7 @@ return result; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); [self printCarbonDesc:&replyEvent]; @@ -658,7 +658,7 @@ return result; ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } - err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, idleUPP, NULL); if (!err) [self printCarbonDesc:&replyEvent]; if (err) { diff --git a/ITAppleEventTools.m b/ITAppleEventTools.m index 7b897ee..fe76e1a 100755 --- a/ITAppleEventTools.m +++ b/ITAppleEventTools.m @@ -39,7 +39,7 @@ 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, kAEDefaultTimeout, NULL, NULL); + err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, NULL, NULL); err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); if (resultSize == 0 || err != 0) { @@ -86,7 +86,7 @@ NSAppleEventDescriptor *ITSendAEWithStringAndObject(NSString *sendString, const 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 = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, NULL, NULL); err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); if (resultSize == 0 || err != 0) { @@ -106,7 +106,52 @@ NSAppleEventDescriptor *ITSendAEWithStringAndObject(NSString *sendString, const NSAppleEventDescriptor *ITSendAEWithKey(FourCharCode reqKey, FourCharCode evClass, FourCharCode evID,const ProcessSerialNumber *psn) { - return nil; + //Add error checking... + pid_t pid; + + unsigned char *chr = (unsigned char *)malloc(4*sizeof(unsigned char)); + memcpy(chr, &reqKey, 4); + NSString *sendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", chr]; + 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 = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/30, 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) { + ITDebugLog(@"Send Error: %i",err); + } + return recv; } NSAppleEventDescriptor *ITSendAE(FourCharCode eClass, FourCharCode eID,const ProcessSerialNumber *psn) @@ -126,7 +171,7 @@ NSAppleEventDescriptor *ITSendAE(FourCharCode eClass, FourCharCode eID,const Pro 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); + err = AESend(&event, &reply, kAENoReply, kAENormalPriority, /*kAEDefaultTimeout*/30, NULL, NULL); nsr = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&reply] autorelease]; [nsr logDesc]; return nsr;