[frontierkernel-commits] Frontier/FrontierSDK/Toolkits/AppletToolkit/Source appletfrontier.c,1.3.6.1,1.3.6.2,pre_int64_branch

[Karsten W. <kar...@us...>]

Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/AppletToolkit/Source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2899/FrontierSDK/Toolkits/AppletToolkit/Source

Modified Files:
      Tag: pre_int64_branch
	appletfrontier.c 
Log Message:
long overdue commit update

Index: appletfrontier.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/Toolkits/AppletToolkit/Source/appletfrontier.c,v
retrieving revision 1.3.6.1
retrieving revision 1.3.6.2
diff -C2 -d -r1.3.6.1 -r1.3.6.2
*** appletfrontier.c	31 Jan 2006 16:47:55 -0000	1.3.6.1
--- appletfrontier.c	10 Mar 2006 22:26:56 -0000	1.3.6.2
***************
*** 211,216 ****
  	return (false);
  	} /*FrontierDoScript*/
! 	
! 	
  boolean FrontierDoHandleScript (Handle hscript, boolean flfast, boolean flgetreturn, bigstring errorstring, Handle *hreturns) {
  	
--- 211,216 ----
  	return (false);
  	} /*FrontierDoScript*/
! 
! 
  boolean FrontierDoHandleScript (Handle hscript, boolean flfast, boolean flgetreturn, bigstring errorstring, Handle *hreturns) {
  	
***************
*** 226,258 ****
  	Card Editor/Runner is running.
  	*/
! 	
! 	static AEAddressDesc selfAddress; 
  	static boolean inited = false;
  	AppleEvent event, reply;
  	boolean flhavereply = false;
  	OSErr ec;
! 	
  	*hreturns = nil;
! 	
  	setstringlength (errorstring, 0);
! 	
  	if (flfast) {
! 	
  		if (!IAChandlerinstalled ('fast', 'dosc', true)) {
! 			
  			/*copystring ("\pFrontier 2.0 or greater isnÕt running.", errorstring);*/
! 			
  			return (true);
  			}
  		}
! 		
  	if ((!inited) && flfast) {
! 	
  		ProcessSerialNumber psn;
! 	
  		psn.highLongOfPSN = 0;
! 	
  		psn.lowLongOfPSN = kCurrentProcess;
! 	
  		ec = AECreateDesc (typeProcessSerialNumber, (Ptr) &psn, sizeof (psn), &selfAddress);
  		
--- 226,258 ----
  	Card Editor/Runner is running.
  	*/
! 
! 	static AEAddressDesc selfAddress;
  	static boolean inited = false;
  	AppleEvent event, reply;
  	boolean flhavereply = false;
  	OSErr ec;
! 
  	*hreturns = nil;
! 
  	setstringlength (errorstring, 0);
! 
  	if (flfast) {
! 
  		if (!IAChandlerinstalled ('fast', 'dosc', true)) {
! 
  			/*copystring ("\pFrontier 2.0 or greater isnÕt running.", errorstring);*/
! 
  			return (true);
  			}
  		}
! 
  	if ((!inited) && flfast) {
! 
  		ProcessSerialNumber psn;
! 
  		psn.highLongOfPSN = 0;
! 
  		psn.lowLongOfPSN = kCurrentProcess;
! 
  		ec = AECreateDesc (typeProcessSerialNumber, (Ptr) &psn, sizeof (psn), &selfAddress);
  		
***************
*** 267,282 ****
  		}
  	
! 	/*create the Apple Event*/ {
! 		
  		AEAddressDesc *pdesc;
  		AEAddressDesc targetappdesc;
! 		
  		if (flfast)
  			pdesc = &selfAddress;
  		else {
  			ec = AECreateDesc (
! 				typeApplSignature, (Ptr) &idFrontier, 
! 				sizeof (idFrontier), &targetappdesc);
! 				
  			if (ec != noErr) {
  			
--- 267,284 ----
  		}
  	
! 	/*create the Apple Event*/
! 	{
  		AEAddressDesc *pdesc;
  		AEAddressDesc targetappdesc;
! 
  		if (flfast)
  			pdesc = &selfAddress;
  		else {
  			ec = AECreateDesc (
! 						typeApplSignature,
! 						(Ptr) &idFrontier,
! 						sizeof (idFrontier),
! 						&targetappdesc);
! 
  			if (ec != noErr) {
  			
***************
*** 300,372 ****
  			
  			return (false);
- 			}
  		}
! 	
! 	/*push the script on the event*/ {
! 	
  		AEDesc desc;
! 		
  		desc.descriptorType = typeChar;
! 		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			AEReplaceDescData (typeChar, *hscript, gethandlesize (hscript), &desc);
! 			
! 		#else
! 	
! 			desc.dataHandle = hscript;
! 	
! 		#endif
! 		
  		ec = AEPutParamDesc (&event, keyDirectObject, &desc);
! 	
  		if (ec != noErr)
  			goto error;
! 		
  		DisposeHandle (hscript); 
  		
  		hscript = nil; 
! 		}
! 	
! 	/*send the event*/ {
! 	
  		ec = AESend (
! 			&event, &reply, 
! 			kAEWaitReply + kAENeverInteract, 
! 			kAENormalPriority, kNoTimeOut, 
! 			nil, nil);
! 		
  		if (ec != noErr)
  			goto error;
! 			
  		flhavereply = true;
! 		}
! 		
! 	/*did Frontier report an error?*/ {
! 	
  		AEDesc numDesc;
! 		
  		ec = AEGetParamDesc (&reply, keyErrorNumber, typeSMInt, &numDesc);
! 		
  		if (ec == noErr) { /*the reply is an error*/
! 			
  			AEDesc strDesc;
! 			
  			ec = AEGetParamDesc (&reply, keyErrorString, typeChar, &strDesc);
- 			
- 			if (ec == noErr) {
  
! 				#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 				
! 					datahandletostring (&strDesc, errorstring);
  
! 				#else
! 				
! 					texthandletostring (strDesc.dataHandle, errorstring);
! 				
! 				#endif
! 				
  				AEDisposeDesc (&strDesc);
! 				}
  			else 
  				copystring ("\pThe script generated an error, but no message was provided.", errorstring);
--- 302,365 ----
  			
  			return (false);
  		}
! 	}
! 
! 	/*push the script on the event*/
! 	{
  		AEDesc desc;
! 
  		desc.descriptorType = typeChar;
! 
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		AEReplaceDescData (typeChar, *hscript, gethandlesize (hscript), &desc);
! #else
! 		desc.dataHandle = hscript;
! #endif
  		ec = AEPutParamDesc (&event, keyDirectObject, &desc);
! 
  		if (ec != noErr)
  			goto error;
! 
  		DisposeHandle (hscript); 
  		
  		hscript = nil; 
! 	}
! 
! 	/*send the event*/
! 	{
  		ec = AESend (
! 				&event, &reply, 
! 				kAEWaitReply + kAENeverInteract, 
! 				kAENormalPriority,
! 				kNoTimeOut, 
! 				nil, nil);
! 
  		if (ec != noErr)
  			goto error;
! 
  		flhavereply = true;
! 	}
! 
! 	/*did Frontier report an error?*/
! 	{
  		AEDesc numDesc;
! 
  		ec = AEGetParamDesc (&reply, keyErrorNumber, typeSMInt, &numDesc);
! 
  		if (ec == noErr) { /*the reply is an error*/
! 
  			AEDesc strDesc;
! 
  			ec = AEGetParamDesc (&reply, keyErrorString, typeChar, &strDesc);
  
! 			if (ec == noErr) {
  
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 				datahandletostring (&strDesc, errorstring);
! #else
! 				texthandletostring (strDesc.dataHandle, errorstring);
! #endif
  				AEDisposeDesc (&strDesc);
! 			}
  			else 
  				copystring ("\pThe script generated an error, but no message was provided.", errorstring);
***************
*** 379,383 ****
  	
  	if (flgetreturn) {
! 		
  		AEDesc desc;
  		Handle h;
--- 372,376 ----
  	
  	if (flgetreturn) {
! 
  		AEDesc desc;
  		Handle h;
***************
*** 392,412 ****
  		*/
  		
! 		#if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		
! 			if (!copydatahandle (&desc, &h))
! 				goto error;
! 		
! 		#else
! 		
! 			if (!copyhandle (desc.dataHandle, &h))
! 				goto error;
! 		
! 		#endif
! 		
  		AEDisposeDesc (&desc);
! 		
  		*hreturns = h; 
! 		}
! 	
  	AEDisposeDesc (&event);	
  	
--- 385,401 ----
  		*/
  		
! #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/
! 		if (!copydatahandle (&desc, &h))
! 			goto error;
! #else
! 		if (!copyhandle (desc.dataHandle, &h))
! 			goto error;
! #endif
! 
  		AEDisposeDesc (&desc);
! 
  		*hreturns = h; 
! 	}
! 
  	AEDisposeDesc (&event);