X-Git-Url: http://git.ithinksw.org/ITFoundation.git/blobdiff_plain/65c2a944b9f6d3acc94b06dd73d4ca89ce03515d..3874de1f6137ae56ee5161d54ccc262b71eef884:/ITAppleEventCenter.m diff --git a/ITAppleEventCenter.m b/ITAppleEventCenter.m index 50c7b88..990e454 100755 --- a/ITAppleEventCenter.m +++ b/ITAppleEventCenter.m @@ -1,5 +1,6 @@ #import "ITAppleEventCenter.h" -//oh, wait, i forgot i had this open. +#import "ITDebug.h" + static Boolean MyAEIdleCallback ( EventRecord * theEvent, SInt32 * sleepTime, @@ -24,7 +25,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; - (id)init { - if (self = [super init]) { + if ( ( self = [super init] ) ) { idleUPP = NewAEIdleUPP(MyAEIdleCallback); } return self; @@ -40,7 +41,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; @@ -52,42 +53,43 @@ static ITAppleEventCenter *_sharedAECenter = nil; AEBuildError buildError; OSStatus err; - OSErr err2, err3; + OSErr berr, err2, err3; if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { - //NSLog(@"Error getting PID of application! Exiting."); + ITDebugLog(@"Error getting PID of application."); 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]; + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { unichar *result = 0; err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); - result = malloc(resultSize); + if (resultSize != 0) { + result = malloc(resultSize); + } else { + return nil; + } if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } else { _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)]; } @@ -95,8 +97,8 @@ static ITAppleEventCenter *_sharedAECenter = nil; free(result); } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return _finalString; } @@ -106,6 +108,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,43 +119,43 @@ 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."); + ITDebugLog(@"Error getting PID of application."); 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); + if (!berr) [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - - //[self printCarbonDesc:&replyEvent]; + if (!err) [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { unichar *result = 0; err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); - result = malloc(resultSize); + if (resultSize != 0) { + result = malloc(resultSize); + } else { + return nil; + } if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } else { _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)]; } @@ -160,8 +163,8 @@ static ITAppleEventCenter *_sharedAECenter = nil; free(result); } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return _finalString; } @@ -171,6 +174,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]; @@ -183,54 +187,52 @@ static ITAppleEventCenter *_sharedAECenter = nil; AEBuildError buildError; OSStatus err; - OSErr err2, err3; + OSErr berr, err2, err3; if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { - //NSLog(@"Error getting PID of application! Exiting."); + ITDebugLog(@"Error getting PID of application."); return nil; } - - //NSLog(@"_sendString: %s", sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } } } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return result; } - (NSString*)sendTwoTierAEWithRequestedKey:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn { - //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]; @@ -242,43 +244,45 @@ 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."); + ITDebugLog(@"Error getting PID of application."); return nil; } - //NSLog(@"_sendString: %s", sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + [self printCarbonDesc:&sendEvent]; - //[self printCarbonDesc:&sendEvent]; - - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { unichar *result = 0; err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); - result = malloc(resultSize); - + if (resultSize != 0) { + result = malloc(resultSize); + } else { + return nil; + } + if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } else { _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)]; } @@ -286,15 +290,14 @@ static ITAppleEventCenter *_sharedAECenter = nil; free(result); } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return _finalString; } - (long)sendTwoTierAEWithRequestedKeyForNumber:(NSString*)key fromObjectByKey:(NSString*)object eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn { - //Add error checking... AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]); AEEventID eID = *((unsigned long*)[eventID UTF8String]); @@ -303,51 +306,50 @@ static ITAppleEventCenter *_sharedAECenter = nil; long result = 0; AppleEvent sendEvent, replyEvent; + int pid; DescType resultType; 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."); + ITDebugLog(@"Error getting PID of application."); return nil; } - - // //NSLog(@"_sendString: %s", sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } } } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return result; } @@ -358,6 +360,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]); @@ -368,7 +371,7 @@ static ITAppleEventCenter *_sharedAECenter = nil; Size resultSize, charResultSize; AEBuildError buildError; - OSStatus err; + OSStatus berr, err; OSErr err2, err3; for (i = 1; i < [array count]; i++) { @@ -380,87 +383,91 @@ static ITAppleEventCenter *_sharedAECenter = nil; sendString = [buildString UTF8String]; if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { - //NSLog(@"Error getting PID of application! Exiting."); + ITDebugLog(@"Error getting PID of application."); return nil; } - - //NSLog(@"_sendString: %s", sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { unichar *result = 0; err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); - result=malloc(resultSize); - + if (resultSize != 0) { + result = malloc(resultSize); + } else { + return nil; + } if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } else { _finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)]; } } free(result); } + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return _finalString; } - (void)sendAEWithEventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn { - //Add error checking... AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]); AEEventID eID = *((unsigned long*)[eventID UTF8String]); AEDesc dest; - AppleEvent event, reply; + int pid; + AppleEvent event, reply; + OSStatus cerr,cerr2,err; //AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, ""); 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); -//[self printCarbonDesc:&reply]; - AEDisposeDesc(&dest); - AEDisposeDesc(&event); - AEDisposeDesc(&reply); + ITDebugLog(@"Error getting PID of application."); + return; + } + 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); + [self printCarbonDesc:&reply]; + if (!cerr2) AEDisposeDesc(&dest); + if (!cerr) AEDisposeDesc(&event); + if (!err) AEDisposeDesc(&reply); } - (void)printCarbonDesc:(AEDesc*)desc { Handle xx; AEPrintDescToHandle(desc,&xx); - NSLog(@"Handle: %s", *xx); + ITDebugLog(@"AE Descriptor: %s", *xx); DisposeHandle(xx); } - (AEArrayDataPointer)sendAEWithRequestedKeyForArray:(NSString*)key eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn { - //Add error checking... AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]); AEEventID eID = *((unsigned long*)[eventID UTF8String]); 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; @@ -468,31 +475,34 @@ static ITAppleEventCenter *_sharedAECenter = nil; AEBuildError buildError; OSStatus err; - //NSLog(@"_sendString: %s", sendString); if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { - //NSLog(@"Error getting PID of application! Exiting."); + ITDebugLog(@"Error getting PID of application."); return nil; } err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { SInt32 count, resultCount; AECountItems(&replyEvent,&count); - result=malloc(sizeof(AEDesc)*count); + if ((sizeof(AEDesc)*count) != 0) { + result=malloc(sizeof(AEDesc)*count); + } else { + return nil; + } AEGetArray(&replyEvent, kAEDescArray, result, sizeof(AEDesc)*count, NULL, NULL, &resultCount); free(result); @@ -512,6 +522,7 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { const char *sendString = [string UTF8String]; SInt32 result = 0; + int pid; AppleEvent sendEvent, replyEvent; @@ -519,48 +530,46 @@ if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { 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."); + ITDebugLog(@"Error getting PID of application."); return nil; } - - //NSLog(@"_sendString: %s", sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize); if (err2) { - //NSLog(@"Error After AESizeOfParam: %i", err2); + ITDebugLog(@"Error After AESizeOfParam: %i", err2); } else { err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize); if (err3) { - //NSLog(@"Error After AEGetParamPtr: %i", err3); + ITDebugLog(@"Error After AEGetParamPtr: %i", err3); } } } -AEDisposeDesc(&sendEvent); -AEDisposeDesc(&replyEvent); -//NSLog(@"waffles say %d",result); +if (!berr) AEDisposeDesc(&sendEvent); +if (!err) AEDisposeDesc(&replyEvent); +ITDebugLog(@"waffles say %d",result); return result; } @@ -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; @@ -576,41 +586,43 @@ return result; AppleEvent sendEvent, replyEvent; AEBuildError buildError; - OSStatus err; + OSStatus berr, err; if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) { - //NSLog(@"Error getting PID of application! Exiting."); + ITDebugLog(@"Error getting PID of application."); return nil; } - - //NSLog(@"_sendString: %s", sendString); - err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); + berr = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString); - //[self printCarbonDesc:&sendEvent]; + [self printCarbonDesc:&sendEvent]; - if (err) { - //NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); + if (berr) { + ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]); } err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL); - //[self printCarbonDesc:&replyEvent]; + [self printCarbonDesc:&replyEvent]; if (err) { - //NSLog(@"Send Error: %i",err); + ITDebugLog(@"Send Error: %i",err); } else { - SInt32 count, resultCount; - - AECountItems(&replyEvent,&count); - result=malloc(sizeof(AEDesc)*count); - AEGetArray(&replyEvent, kAEDescArray, result, sizeof(AEDesc)*count, NULL, NULL, &resultCount); - + SInt32 count, resultCount; + + AECountItems(&replyEvent,&count); + if ((sizeof(AEDesc)*count) != 0) { + result=malloc(sizeof(AEDesc)*count); + } else { + return nil; + } + AEGetArray(&replyEvent, kAEDescArray, result, sizeof(AEDesc)*count, NULL, NULL, &resultCount); + free(result); } - AEDisposeDesc(&sendEvent); - AEDisposeDesc(&replyEvent); + if (!berr) AEDisposeDesc(&sendEvent); + if (!err) AEDisposeDesc(&replyEvent); return result; }