git.ithinksw.org
/
ITFoundation.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5096b69
)
Alex's memory leak fixes and timeout changes.
author
Kent Sutherland
<ksuther@ithinksw.com>
Sat, 25 Sep 2004 23:52:16 +0000
(23:52 +0000)
committer
Kent Sutherland
<ksuther@ithinksw.com>
Sat, 25 Sep 2004 23:52:16 +0000
(23:52 +0000)
ITAppleEventTools.m
patch
|
blob
|
history
diff --git
a/ITAppleEventTools.m
b/ITAppleEventTools.m
index
5c02159
..
20c2413
100755
(executable)
--- 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]);
}
ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
}
- err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/
10
0, NULL, NULL);
+ err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/
6
0, NULL, NULL);
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
@@
-49,6
+49,7
@@
NSAppleEventDescriptor *ITSendAEWithString(NSString *sendString, FourCharCode ev
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
+ [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&replyEvent] autorelease];
if (!err) [recv logDesc];
if (err) {
if (!err) [recv logDesc];
if (err) {
@@
-86,7
+87,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);
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*/
10
0, NULL, NULL);
+ err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/
6
0, NULL, NULL);
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
@@
-96,6
+97,7
@@
NSAppleEventDescriptor *ITSendAEWithStringAndObject(NSString *sendString, const
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
+ [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&replyEvent] autorelease];
if (!err) [recv logDesc];
if (err) {
if (!err) [recv logDesc];
if (err) {
@@
-133,7
+135,7
@@
NSAppleEventDescriptor *ITSendAEWithKey(FourCharCode reqKey, FourCharCode evClas
ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
}
ITDebugLog(@"Error: %d:%d at \"%@\"",(int)buildError.fError,buildError.fErrorPos,[sendString substringToIndex:buildError.fErrorPos]);
}
- err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/
10
0, NULL, NULL);
+ err = AESend(&sendEvent, &replyEvent, kAEWaitReply, kAENormalPriority, /*kAEDefaultTimeout*/
6
0, NULL, NULL);
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
err = AESizeOfParam(&replyEvent, keyDirectObject, &resultType, &resultSize);
if (resultSize == 0 || err != 0) {
@@
-143,6
+145,7
@@
NSAppleEventDescriptor *ITSendAEWithKey(FourCharCode reqKey, FourCharCode evClas
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
AEGetParamDesc(&replyEvent, keyDirectObject, resultType, &resultDesc);
recv = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&resultDesc] autorelease];
+ [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&replyEvent] autorelease];
if (!err) [recv logDesc];
if (err) {
if (!err) [recv logDesc];
if (err) {
@@
-168,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];
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*/
10
0, NULL, NULL);
+ err = AESend(&event, &reply, kAENoReply, kAENormalPriority, /*kAEDefaultTimeout*/
6
0, NULL, NULL);
nsr = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&reply] autorelease];
[nsr logDesc];
return nsr;
nsr = [[[NSAppleEventDescriptor alloc] initWithAEDescNoCopy:&reply] autorelease];
[nsr logDesc];
return nsr;