git.ithinksw.org
/
ITFoundation.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added more error checking. MT no longer crashes when you "Show iTunes", but I still...
[ITFoundation.git]
/
ITAppleEventCenter.m
diff --git
a/ITAppleEventCenter.m
b/ITAppleEventCenter.m
index
30d14b1
..
c02d09c
100755
(executable)
--- a/
ITAppleEventCenter.m
+++ b/
ITAppleEventCenter.m
@@
-1,12
+1,6
@@
#import "ITAppleEventCenter.h"
#import "ITAppleEventCenter.h"
-
-Boolean MyAEIdleCallback (
- EventRecord * theEvent,
- SInt32 * sleepTime,
- RgnHandle * mouseRgn
- );
-
-Boolean MyAEIdleCallback (
+//oh, wait, i forgot i had this open.
+static Boolean MyAEIdleCallback (
EventRecord * theEvent,
SInt32 * sleepTime,
RgnHandle * mouseRgn
EventRecord * theEvent,
SInt32 * sleepTime,
RgnHandle * mouseRgn
@@
-30,10
+24,9
@@
static ITAppleEventCenter *_sharedAECenter = nil;
- (id)init
{
- (id)init
{
- if (self = [super init])
- {
- idleUPP = NewAEIdleUPP(MyAEIdleCallback);
- }
+ if (self = [super init]) {
+ idleUPP = NewAEIdleUPP(MyAEIdleCallback);
+ }
return self;
}
return self;
}
@@
-47,7
+40,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//Add error checking...
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
//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;
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;
@@
-60,20
+53,20
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
+
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//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];
if (err) {
//[self printCarbonDesc:&sendEvent];
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
@@
-81,7
+74,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&replyEvent];
if (err) {
//[self printCarbonDesc:&replyEvent];
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
unichar *result = 0;
} else {
unichar *result = 0;
@@
-89,12
+82,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
result = malloc(resultSize);
if (err2) {
result = malloc(resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
@@
-113,6
+106,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//Add error checking...
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
//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;
const char *sendString = [nssendString UTF8String];
NSString *_finalString = nil;
@@
-123,30
+117,30
@@
static ITAppleEventCenter *_sharedAECenter = nil;
Size resultSize, charResultSize;
AEBuildError buildError;
Size resultSize, charResultSize;
AEBuildError buildError;
- OSStatus err;
+ OSStatus
berr,
err;
OSErr err2, err3;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
- NSLog(@"_sendString: %s", sendString);
-
- err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
+
+ //NSLog(@"_sendString: %s", 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) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+ if (
b
err) {
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
-
- [self printCarbonDesc:&replyEvent];
+ NSLog(@"replying...");
+
if (!err)
[self printCarbonDesc:&replyEvent];
if (err) {
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
unichar *result = 0;
} else {
unichar *result = 0;
@@
-154,12
+148,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
result = malloc(resultSize);
if (err2) {
result = malloc(resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
@@
-167,8
+161,8
@@
static ITAppleEventCenter *_sharedAECenter = nil;
free(result);
}
free(result);
}
- AEDisposeDesc(&sendEvent);
- AEDisposeDesc(&replyEvent);
+
if (!berr)
AEDisposeDesc(&sendEvent);
+
if (!err)
AEDisposeDesc(&replyEvent);
return _finalString;
}
return _finalString;
}
@@
-178,6
+172,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//Add error checking...
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
//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 *nssendString = [NSString stringWithFormat:@"'----':obj { form:'prop', want:type('prop'), seld:type('%s'), from:'null'() }", [key UTF8String]];
const char *sendString = [nssendString UTF8String];
@@
-191,12
+186,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
+
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@
-204,25
+199,25
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&sendEvent];
if (err) {
//[self printCarbonDesc:&sendEvent];
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
- [self printCarbonDesc:&replyEvent];
+
//
[self printCarbonDesc:&replyEvent];
if (err) {
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
}
}
}
}
}
}
@@
-238,6
+233,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//Add error checking...
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
//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];
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];
@@
-251,11
+247,11
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
return nil;
- }
*/
+ }
//NSLog(@"_sendString: %s", sendString);
//NSLog(@"_sendString: %s", sendString);
@@
-264,7
+260,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&sendEvent];
if (err) {
//[self printCarbonDesc:&sendEvent];
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[nssendString substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
@@
-272,7
+268,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&replyEvent];
if (err) {
//[self printCarbonDesc:&replyEvent];
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
unichar *result = 0;
} else {
unichar *result = 0;
@@
-280,12
+276,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
result = malloc(resultSize);
if (err2) {
result = malloc(resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
@@
-310,6
+306,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
long result = 0;
AppleEvent sendEvent, replyEvent;
long result = 0;
AppleEvent sendEvent, replyEvent;
+ int pid;
DescType resultType;
Size resultSize, charResultSize;
DescType resultType;
Size resultSize, charResultSize;
@@
-317,38
+314,38
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
- // NSLog(@"_sendString: %s", sendString);
+
+ //
//
NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//[self printCarbonDesc:&sendEvent];
if (err) {
err = 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]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
- [self printCarbonDesc:&replyEvent];
+
//
[self printCarbonDesc:&replyEvent];
if (err) {
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
}
}
}
}
}
}
@@
-365,6
+362,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
const char *sendString;
int i;
NSString *_finalString = nil;
const char *sendString;
int i;
NSString *_finalString = nil;
+ int pid;
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
@@
-385,12
+383,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
}
buildString = [@"'----':obj " stringByAppendingString:buildString];
sendString = [buildString UTF8String];
}
buildString = [@"'----':obj " stringByAppendingString:buildString];
sendString = [buildString UTF8String];
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
+
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@
-398,7
+396,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&sendEvent];
if (err) {
//[self printCarbonDesc:&sendEvent];
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[buildString substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
@@
-406,7
+404,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&replyEvent];
if (err) {
//[self printCarbonDesc:&replyEvent];
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
unichar *result = 0;
} else {
unichar *result = 0;
@@
-414,11
+412,11
@@
static ITAppleEventCenter *_sharedAECenter = nil;
result=malloc(resultSize);
if (err2) {
result=malloc(resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
} else {
_finalString = [NSString stringWithCharacters:result length:charResultSize/sizeof(unichar)];
}
@@
-434,23
+432,30
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
AEDesc dest;
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, "");
AppleEvent event, reply;
//AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, kAnyTransactionID, &event, nil, "");
- AECreateDesc(typeProcessSerialNumber,(ProcessSerialNumber*)&psn,sizeof(ProcessSerialNumber),&dest);
+ 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);
AECreateAppleEvent(eClass,eID,&dest,kAutoGenerateReturnID,kAnyTransactionID,&event);
+//[self printCarbonDesc:&event];
AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
AESend(&event, &reply, kAENoReply, kAENormalPriority, kAEDefaultTimeout, idleUPP, nil);
-
+//[self printCarbonDesc:&reply];
AEDisposeDesc(&dest);
AEDisposeDesc(&event);
AEDisposeDesc(&reply);
}
- (void)printCarbonDesc:(AEDesc*)desc {
AEDisposeDesc(&dest);
AEDisposeDesc(&event);
AEDisposeDesc(&reply);
}
- (void)printCarbonDesc:(AEDesc*)desc {
-
/*
Handle xx;
+ Handle xx;
AEPrintDescToHandle(desc,&xx);
NSLog(@"Handle: %s", *xx);
AEPrintDescToHandle(desc,&xx);
NSLog(@"Handle: %s", *xx);
- DisposeHandle(xx);
*/
+ DisposeHandle(xx);
}
}
@@
-463,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;
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;
AppleEvent sendEvent, replyEvent;
@@
-471,21
+477,25
@@
static ITAppleEventCenter *_sharedAECenter = nil;
OSStatus err;
//NSLog(@"_sendString: %s", sendString);
OSStatus err;
//NSLog(@"_sendString: %s", sendString);
-
+if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
+ //NSLog(@"Error getting PID of application! Exiting.");
+ return nil;
+ }
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//[self printCarbonDesc:&sendEvent];
if (err) {
err = 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]);
+
//
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];
if (err) {
err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, kNoTimeOut, idleUPP, NULL);
//[self printCarbonDesc:&replyEvent];
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
SInt32 count, resultCount;
} else {
SInt32 count, resultCount;
@@
-509,56
+519,58
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
const char *sendString = [string UTF8String];
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
const char *sendString = [string UTF8String];
- long result = 0;
+ SInt32 result = 0;
+ int pid;
AppleEvent sendEvent, replyEvent;
DescType resultType;
Size resultSize, charResultSize;
AppleEvent sendEvent, replyEvent;
DescType resultType;
Size resultSize, charResultSize;
-
+
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
AEBuildError buildError;
OSStatus err;
OSErr err2, err3;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
+
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
- [self printCarbonDesc:&sendEvent];
+
//
[self printCarbonDesc:&sendEvent];
if (err) {
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
- [self printCarbonDesc:&replyEvent];
+
//
[self printCarbonDesc:&replyEvent];
if (err) {
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
} else {
err2 = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (err2) {
- NSLog(@"Error After AESizeOfParam: %i", err2);
+
//
NSLog(@"Error After AESizeOfParam: %i", err2);
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
} else {
err3 = AEGetParamPtr(&replyEvent, keyDirectObject, resultType, NULL, &result, resultSize, &charResultSize);
if (err3) {
- NSLog(@"Error After AEGetParamPtr: %i", err3);
+
//
NSLog(@"Error After AEGetParamPtr: %i", err3);
}
}
}
}
}
}
- AEDisposeDesc(&sendEvent);
- AEDisposeDesc(&replyEvent);
- return result;
+AEDisposeDesc(&sendEvent);
+AEDisposeDesc(&replyEvent);
+//NSLog(@"waffles say %d",result);
+return result;
}
- (AEArrayDataPointer)sendAEWithSendStringForArray:(NSString*)string eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
}
- (AEArrayDataPointer)sendAEWithSendStringForArray:(NSString*)string eventClass:(NSString*)eventClass eventID:(NSString*)eventID appPSN:(ProcessSerialNumber)psn
@@
-566,6
+578,7
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//Add error checking...
AEEventClass eClass = *((unsigned long*)[eventClass UTF8String]);
AEEventID eID = *((unsigned long*)[eventID UTF8String]);
//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;
const char *sendString = [string UTF8String];
AEArrayDataPointer result = NULL;
@@
-574,12
+587,12
@@
static ITAppleEventCenter *_sharedAECenter = nil;
AEBuildError buildError;
OSStatus err;
AEBuildError buildError;
OSStatus err;
- /*
+
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
if ((GetProcessPID(&psn, &pid) == noErr) && (pid == 0)) {
- NSLog(@"Error getting PID of application! Exiting.");
+
//
NSLog(@"Error getting PID of application! Exiting.");
return nil;
}
return nil;
}
- */
+
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
//NSLog(@"_sendString: %s", sendString);
err = AEBuildAppleEvent(eClass, eID, typeProcessSerialNumber,(ProcessSerialNumber*)&psn, sizeof(ProcessSerialNumber), kAutoGenerateReturnID, 0, &sendEvent, &buildError, sendString);
@@
-587,15
+600,15
@@
static ITAppleEventCenter *_sharedAECenter = nil;
//[self printCarbonDesc:&sendEvent];
if (err) {
//[self printCarbonDesc:&sendEvent];
if (err) {
- NSLog(@"%d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[string substringToIndex:buildError.fErrorPos]);
+
//
NSLog(@"%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, kNoTimeOut, idleUPP, NULL);
- [self printCarbonDesc:&replyEvent];
+
//
[self printCarbonDesc:&replyEvent];
if (err) {
if (err) {
- NSLog(@"Send Error: %i",err);
+
//
NSLog(@"Send Error: %i",err);
} else {
SInt32 count, resultCount;
} else {
SInt32 count, resultCount;
@@
-611,4
+624,4
@@
static ITAppleEventCenter *_sharedAECenter = nil;
return result;
}
return result;
}
-@end
+@end
\ No newline at end of file