rb-appscript 0.3.0 → 0.4.0

data/src/lib/_appscript/reservedkeywords.rb

@@ -28,6 +28,9 @@ ReservedKeywords = [
 	"any",
 	"app",
 	"before",
+	"begin_transaction",
+	"beginning",
+	"begins_with",
 	"by_aem_app",
 	"by_creator",
 	"by_id",
@@ -43,7 +46,7 @@ ReservedKeywords = [
 	"display",
 	"does_not_contain",
 	"does_not_end_with",
-	"does_not_start_with",
+	"does_not_begin_with",
 	"dup",
 	"elements",
 	"end",
@@ -98,9 +101,6 @@ ReservedKeywords = [
 	"result_type",
 	"send",
 	"singleton_methods",
-	"start",
-	"start_transaction",
-	"starts_with",
 	"taint",
 	"tainted?",
 	"timeout",

data/src/lib/_appscript/terminology.rb

@@ -8,6 +8,8 @@
 
 module TerminologyParser
 	
+	require "ae"
+	require "kae"
 	require "_appscript/reservedkeywords" # names of all existing methods on ASReference::Application
 	
 	class BigEndianParser
@@ -204,11 +206,10 @@ module TerminologyParser
 		
 		def parse(aetes)
 			aetes.each do |aete|
-				@_str = aete.data
-				@_ptr = 6 # version, language, script integers
-				_integer.times { parse_suite }
-				if not @_ptr == @_str.length
-					raise RuntimeError, "aete was not fully parsed."
+				if aete.is_a?(AE::AEDesc) and aete.type == KAE::TypeAETE and aete.data != ''
+					@_str = aete.data
+					@_ptr = 6 # version, language, script integers
+					_integer.times { parse_suite }
 				end
 			end
 			# singular names are normally used in the classes table and plural names in the elements table. However, if an aete defines a singular name but not a plural name then the missing plural name is substituted with the singular name; and vice-versa if there's no singular equivalent for a plural name.
@@ -322,7 +323,8 @@ module Terminology
 	def Terminology.tables_for_aetes(aetes)
 		# Build terminology tables from a list of unpacked aete byte strings.
 		# Result : list of hash -- [typebycode, typebyname, referencebycode, referencebyname]
-		classes, enums, properties, elements, commands = TerminologyParser.build_tables_for_aetes(aetes.delete_if { |aete| not (aete.is_a?(AE::AEDesc) and aete.type == KAE::TypeAETE) })
+		aetes = aetes.reject { |aete| not (aete.is_a?(AE::AEDesc) and aete.type == KAE::TypeAETE and aete.data != '') }
+		classes, enums, properties, elements, commands = TerminologyParser.build_tables_for_aetes(aetes)
 		return _make_type_table(classes, enums, properties) + _make_reference_table(properties, elements, commands)
 	end
 	
@@ -338,27 +340,30 @@ module Terminology
 			+ _make_reference_table(terms::Properties, terms::Elements, terms::Commands)
 	end
 	
+	def Terminology.aetes_for_app(aem_app)
+		begin
+			begin
+				aetes = aem_app.event('ascrgdte', {'----' => 0}).send(120 * 60)
+			rescue AEM::CommandError => e
+				if  e.number == -192 # aete resource not found
+					aetes = []
+				else
+					raise
+				end
+			end
+		rescue => err
+			raise RuntimeError, "Can't get terminology for application (#{aem_app}): #{err}"
+		end
+		aetes = [aetes] if not aetes.is_a?(Array)
+		return aetes
+	end
+	
 	def Terminology.tables_for_app(aem_app)
 		# Build terminology tables for an application.
 		# app : AEM::Application
 		# Result : list of hash -- [typebycode, typebyname, referencebycode, referencebyname]
 		if not @@_terminology_cache.has_key?(aem_app.identity)
-			begin
-				begin
-					aetes = aem_app.event('ascrgdte', {'----' => 0}).send(60 * 60)
-				rescue AEM::CommandError => e
-					if  e.number == -192 # aete resource not found
-						aetes = []
-					else
-						raise
-					end
-				end
-				if not aetes.is_a?(Array)
-					aetes = [aetes]
-				end
-			rescue => err
-				raise RuntimeError, "Can't get terminology for application (#{aem_app}): #{err}"
-			end
+			aetes = Terminology.aetes_for_app(aem_app)
 			@@_terminology_cache[aem_app.identity] = Terminology.tables_for_aetes(aetes)
 		end
 		return @@_terminology_cache[aem_app.identity]
@@ -375,22 +380,25 @@ module Terminology
 		if not /^[A-Z][A-Za-z0-9_]*$/ === module_name
 			raise RuntimeError, "Invalid module name."
 		end
-		# Write module
-		File.open(out_path, "w") do |f|
-			# Get aete(s)
+		# Get aete(s)
+		begin
 			begin
 				aetes = AEM::Codecs.new.unpack(AE.get_app_terminology(app_path).coerce(KAE::TypeAEList))
-			rescue AE::MacOSError => e
-				if  e.to_i == -192 # aete resource not found
-					raise RuntimeError, "No terminology found."
-				else
-					raise
-				end
+			rescue NotImplementedError # get_app_terminology is unavailable on 64-bit Leopard
+				aetes = Terminology.aetes_for_app(AEM::Application.by_path(app_path))
+			end
+		rescue AE::MacOSError => e
+			if  e.to_i == -192 # aete resource not found
+				raise RuntimeError, "No terminology found."
+			else
+				raise
 			end
-			aetes.delete_if { |aete| not (aete.is_a?(AE::AEDesc) and aete.type == KAE::TypeAETE) }
-			# Parse aete(s) into intermediate tables, suitable for use by Terminology#tables_for_module
-			tables = TerminologyParser.build_tables_for_aetes(aetes)
-			# Write module code
+		end
+		aetes.delete_if { |aete| not (aete.is_a?(AE::AEDesc) and aete.type == KAE::TypeAETE) }
+		# Parse aete(s) into intermediate tables, suitable for use by Terminology#tables_for_module
+		tables = TerminologyParser.build_tables_for_aetes(aetes)
+		# Write module
+		File.open(out_path, "w") do |f|
 			f.puts "module #{module_name}"
 			f.puts "\tVersion = 1.1"
 			f.puts "\tPath = #{app_path.inspect}"

data/src/lib/aem.rb

@@ -49,6 +49,10 @@ module AEM
 		return AEMReference::Its
 	end
 	
+	def AEM.custom_root(value)
+		return AEMReference::CustomRoot.new(value)
+	end
+	
 	#######
 	# Application class
 	
@@ -140,10 +144,10 @@ module AEM
 		
 		def inspect
 			if @identity[0] == :current
-				return 'AEM::Application.current'
+				return "#{self.class}.current"
 			else
 				con_name = {:path => 'by_path', :url => 'by_url', :pid => 'by_pid', :desc => 'by_desc'}[@identity[0]]
-				return "AEM::Application.#{con_name}(#{@identity[1].inspect})"
+				return "#{self.class}.#{con_name}(#{@identity[1].inspect})"
 			end
 		end
 		
@@ -180,8 +184,8 @@ module AEM
 			return self.class::Event.new(@address_desc, event, params, atts, @_transaction, return_id, codecs)
 		end
 		
-		def start_transaction(session=nil)
-			# Start a new transaction.
+		def begin_transaction(session=nil)
+			# Begin a new transaction.
 			if @_transaction != KAE::KAnyTransactionID
 				raise RuntimeError, "Transaction is already active."
 			end

data/src/lib/appscript.rb

@@ -11,6 +11,7 @@ module Appscript
 	
 	require "kae"
 	require "aem"
+	require "_aem/aemreference"
 	require "_appscript/referencerenderer"
 	require "_appscript/terminology"
 	require "_appscript/safeobject"
@@ -25,6 +26,8 @@ module Appscript
 	
 	class AppData < AEM::Codecs
 	
+		HelpAgentID = 'net.sourceforge.appscript.appscripthelpagent'
+	
 		attr_reader :constructor, :identifier, :reference_codecs
 		attr_writer :reference_codecs
 	
@@ -35,6 +38,7 @@ module Appscript
 			@constructor = constructor # name of AEM::Application constructor to use/:by_aem_app
 			@identifier = identifier # argument for AEM::Application constructor
 			@reference_codecs = AEM::Codecs.new # low-level Codecs object used to unpack references; used by AppData#unpack_object_specifier, AppData#unpack_insertion_loc. Note: this is a bit kludgy, and it's be better to use AppData for all unpacking, but it should be 'good enough' in practice.
+			@_help_agent = nil
 		end
 		
 		def connect # initialize AEM::Application instance and terminology tables the first time they are needed
@@ -63,6 +67,54 @@ module Appscript
 		
 		#######
 		
+		Constructors = {
+			:by_path => 'path',
+			:by_pid => 'pid',
+			:by_url => 'url',
+			:by_aem_app => 'aemapp',
+			:current => 'current',
+		}
+		
+		def _make_help_agent
+			begin
+				@_help_agent = AEM::Application.by_path(FindApp.by_id(HelpAgentID))
+				return true
+			rescue FindApp::ApplicationNotFoundError
+				puts "No help available: AppscriptHelpAgent.app not found."
+				return false
+			end
+		end
+		
+		def _display_help(flags, ref)
+			begin
+				puts @_help_agent.event('ASHAHelp', {
+						'Cons' => Constructors[@constructor],
+						'Iden' => @constructor == :by_aem_app ? @identifier.address_desc : @identifier,
+						'Styl' => 'rb-appscript',
+						'Flag' => flags,
+						'aRef' => pack(ref),
+					}).send
+				return nil
+			rescue AEM::CommandError => e
+				return e
+			end
+		end
+		
+		def help(flags, ref)
+			if not @_help_agent
+				return ref if not _make_help_agent
+			end
+			e = _display_help(flags, ref)
+			if e and [-600, -609].include?(e.number) # not running
+				return ref if not _make_help_agent
+				e = _display_help(flags, ref)
+			end
+			puts "No help available: AppscriptHelpAgent raised an error: #{e}." if e
+			return ref
+		end
+		
+		#######
+		
 		def target
 			connect
 			return @target
@@ -309,6 +361,10 @@ module Appscript
 		
 		#######
 		
+		def help(flags='-t')
+			return @AS_app_data.help(flags, self)
+		end
+		
 		def Reference._pack_uint32(n) # used to pack csig attributes
 			return AE::AEDesc.new(KAE::TypeUInt32, [n].pack('L'))
 		end
@@ -541,13 +597,18 @@ module Appscript
 				new_ref = @AS_aem_reference.by_range(
 						self._resolve_range_boundary(selector, 1),
 						self._resolve_range_boundary(end_range_selector, -1))
-			elsif selector.is_a?(String)
-				 new_ref = @AS_aem_reference.by_name(selector)
-			elsif selector.is_a?(Appscript::GenericReference)
-				new_ref = @AS_aem_reference.by_filter(
-						selector.AS_resolve(@AS_app_data).AS_aem_reference)
 			else
-				new_ref = @AS_aem_reference.by_index(selector)
+				case selector
+					when String
+						 new_ref = @AS_aem_reference.by_name(selector)
+					when Appscript::GenericReference
+						new_ref = @AS_aem_reference.by_filter(
+								selector.AS_resolve(@AS_app_data).AS_aem_reference)
+					when Appscript::Reference, AEMReference::Test
+						new_ref = @AS_aem_reference.by_filter(selector)
+				else
+					new_ref = @AS_aem_reference.by_index(selector)
+				end
 			end
 			return Reference.new(@AS_app_data, new_ref)
 		end
@@ -568,8 +629,8 @@ module Appscript
 			return Reference.new(@AS_app_data, @AS_aem_reference.any)
 		end
 		
-		def start
-			return Reference.new(@AS_app_data, @AS_aem_reference.start)
+		def beginning
+			return Reference.new(@AS_app_data, @AS_aem_reference.beginning)
 		end
 		
 		def end
@@ -625,8 +686,8 @@ module Appscript
 			return Reference.new(@AS_app_data, @AS_aem_reference.le(operand))
 		end
 		
-		def starts_with(operand)
-			return Reference.new(@AS_app_data, @AS_aem_reference.starts_with(operand))
+		def begins_with(operand)
+			return Reference.new(@AS_app_data, @AS_aem_reference.begins_with(operand))
 		end
 		
 		def ends_with(operand)
@@ -641,8 +702,8 @@ module Appscript
 			return Reference.new(@AS_app_data, @AS_aem_reference.is_in(operand))
 		end
 		
-		def does_not_start_with(operand)
-			return self.starts_with(operand).not
+		def does_not_begin_with(operand)
+			return self.begins_with(operand).not
 		end
 		
 		def does_not_end_with(operand)
@@ -722,13 +783,15 @@ module Appscript
 		def AS_new_reference(ref)
 			if ref.is_a?(Appscript::GenericReference)
 				return ref.AS_resolve(@AS_app_data)
-			else
+			elsif ref.is_a?(AEMReference::Base)
 				return Reference.new(@AS_app_data, ref)
+			else
+				return Reference.new(@AS_app_data, AEM.custom_root(ref))
 			end
 		end
 		
-		def start_transaction(session=nil)
-			@AS_app_data.target.start_transaction(session)
+		def begin_transaction(session=nil)
+			@AS_app_data.target.begin_transaction(session)
 		end
 		
 		def abort_transaction

data/src/lib/kae.rb

@@ -1481,4 +1481,8 @@ module KAE
 	TypeWhoseRange = 'wrng'
 	TypeWildCard = '****'
 	TypeYards = 'yard'
+	
+	# new in 10.5
+	TypeUInt16 = 'ushr'
+	TypeUInt64 = 'ucom'
 end

data/src/lib/osax.rb

@@ -5,6 +5,9 @@ require "appscript"
 module OSAX
 
 	# Allows scripting additions (a.k.a. OSAXen) to be called from Ruby.
+	#
+	# Note: currently 32-bit only; attempting to create a new ScriptingAddition instance
+	# in a 64-bit process will result in a NotImplementedError.
 	
 	######################################################################
 	# PRIVATE
@@ -131,13 +134,13 @@ module OSAX
 				if not path
 					raise ArgumentError, "Scripting addition not found: #{name.inspect}"
 				end
-				if terms
-					@_terms = terms
-				else
-					desc = AE.get_app_terminology(path).coerce(KAE::TypeAEList)
-					@_terms = OSAXCache[osax_name][1] = \
-							Terminology.tables_for_aetes(DefaultCodecs.unpack(desc))
+				if not terms
+					aetes_desc = AE.get_app_terminology(path) # will raise NotImplementedError in 64-bit processes
+					aetes = DefaultCodecs.unpack(aetes_desc.coerce(KAE::TypeAEList))
+					terms = Terminology.tables_for_aetes(aetes)
+					OSAXCache[osax_name][1] = terms
 				end
+				@_terms = terms
 				osax_data = OSAXData.new(:current, nil, @_terms)
 			end
 			super(osax_data, AEM.app)

data/src/rbae.c

@@ -1,11 +1,15 @@
 /*
  *  Copyright (C) 2006 HAS
  *
- *  Thanks to: FUJIMOTO Hisakuni, author of RubyAEOSA
+ *  Thanks to:
+ *  - FUJIMOTO Hisakuni, author of RubyAEOSA
+ *  - Jordan Breeding (64-bit support patch)
  */
 
 #include "osx_ruby.h"
 #include <Carbon/Carbon.h>
+#include <CoreFoundation/CoreFoundation.h>
+#include "SendThreadSafe.h"
 
 VALUE rb_ll2big(LONG_LONG); // keeps gcc happy
 
@@ -24,7 +28,11 @@ struct rbAE_AEDescWrapper {
 #define AEDESC_OF(o) (AEDESC_DATA_PTR(o)->desc)
 
 // Event handling
-typedef long refcontype;
+#if __LP64__
+	// SRefCon typedefed as void * by system headers
+#else
+	typedef long SRefCon;
+#endif
 
 AEEventHandlerUPP upp_GenericEventHandler;
 AECoercionHandlerUPP upp_GenericCoercionHandler;
@@ -60,7 +68,7 @@ rbAE_MacOSError_inspect(VALUE self)
 {
 	char s[32];
 	
-	sprintf(s, "#<AE::MacOSError %i>", NUM2INT(rb_iv_get(self, "@number")));
+	sprintf(s, "#<AE::MacOSError %li>", (long)NUM2INT(rb_iv_get(self, "@number")));
 	return rb_str_new2(s);
 }
 
@@ -175,6 +183,19 @@ rbAE_AEDesc_newAppleEvent(VALUE class, VALUE eventClass, VALUE eventID,
 }
 
 
+static VALUE
+rbAE_AEDesc_newUnflatten(VALUE class, VALUE data)
+{
+	OSErr err = noErr;
+	AEDesc desc;
+	
+	Check_Type(data, T_STRING);
+	err = AEUnflattenDesc(RSTRING(data)->ptr, &desc);
+	if (err != noErr) rbAE_raiseMacOSError("Can't create AEDesc.", err);
+	return rbAE_wrapAEDesc(&desc);
+}
+
+
 /**********************************************************************/
 // AEDesc methods
 
@@ -225,6 +246,24 @@ rbAE_AEDesc_data(VALUE self)
 }
 
 
+static VALUE
+rbAE_AEDesc_flatten(VALUE self)
+{
+	OSErr err = noErr;
+	Size dataSize;
+	void *data;
+	VALUE result;
+	
+	dataSize = AESizeOfFlattenedDesc(&(AEDESC_OF(self)));
+	data = malloc(dataSize);
+	err = AEFlattenDesc(&(AEDESC_OF(self)), data, dataSize, NULL);
+	if (err != noErr) rbAE_raiseMacOSError("Can't flatten AEDesc.", err);
+	result = rb_str_new(data, dataSize);
+	free(data);
+	return result;
+}
+
+
 /*******/
 
 static VALUE
@@ -328,9 +367,9 @@ rbAE_AEDesc_getParam(VALUE self, VALUE key, VALUE type)
 	AEDesc desc;
 	
 	err = AEGetParamDesc(&(AEDESC_OF(self)),
-					   rbStringToDescType(key),
-					   rbStringToDescType(type),
-					   &desc);
+						 rbStringToDescType(key),
+						 rbStringToDescType(type),
+						 &desc);
 	if (err != noErr) rbAE_raiseMacOSError("Can't get parameter from AEDesc.", err);
 	return rbAE_wrapAEDesc(&desc);
 }
@@ -343,9 +382,9 @@ rbAE_AEDesc_getAttr(VALUE self, VALUE key, VALUE type)
 	AEDesc desc;
 	
 	err = AEGetAttributeDesc(&(AEDESC_OF(self)),
-					   rbStringToDescType(key),
-					   rbStringToDescType(type),
-					   &desc);
+							 rbStringToDescType(key),
+							 rbStringToDescType(type),
+							 &desc);
 	if (err != noErr) rbAE_raiseMacOSError("Can't get attribute from AEDesc.", err);
 	return rbAE_wrapAEDesc(&desc);
 }
@@ -367,6 +406,20 @@ rbAE_AEDesc_send(VALUE self, VALUE sendMode, VALUE timeout)
 	return rbAE_wrapAEDesc(&reply);
 }
 
+static VALUE
+rbAE_AEDesc_sendThreadSafe(VALUE self, VALUE sendMode, VALUE timeout)
+{
+	OSErr err = noErr;
+	AppleEvent reply;
+	
+	err = SendMessageThreadSafe(&(AEDESC_OF(self)),
+								&reply,
+								(AESendMode)NUM2LONG(sendMode),
+								NUM2LONG(timeout));
+	if (err != noErr) rbAE_raiseMacOSError("Can't send Apple event.", err);
+	return rbAE_wrapAEDesc(&reply);
+}
+
 
 /**********************************************************************/
 // Find and launch applications
@@ -444,7 +497,9 @@ static VALUE
 rbAE_launchApplication(VALUE self, VALUE path, VALUE firstEvent, VALUE flags)
 {
 	FSRef appRef;
-	FSSpec fss;
+#if !defined(__LP64__)
+	FSSpec appFSS;
+#endif
 	AEDesc paraDesc;
 	Size paraSize;
 	AppParametersPtr paraData;
@@ -454,8 +509,10 @@ rbAE_launchApplication(VALUE self, VALUE path, VALUE firstEvent, VALUE flags)
 	
 	err = FSPathMakeRef((UInt8 *)StringValuePtr(path), &appRef, NULL);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't make FSRef for application.", err);
-	err = FSGetCatalogInfo(&appRef, kFSCatInfoNone, NULL, NULL, &fss, NULL);
+#if !defined(__LP64__)
+	err = FSGetCatalogInfo(&appRef, kFSCatInfoNone, NULL, NULL, &appFSS, NULL);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't make FSSpec for application.", err);
+#endif
 	err = AECoerceDesc(&(AEDESC_OF(firstEvent)), typeAppParameters, &paraDesc);
 	paraSize = AEGetDescDataSize(&paraDesc);
 	paraData = (AppParametersPtr)NewPtr(paraSize);
@@ -466,7 +523,11 @@ rbAE_launchApplication(VALUE self, VALUE path, VALUE firstEvent, VALUE flags)
 	launchParams.launchEPBLength = extendedBlockLen;
 	launchParams.launchFileFlags = 0;
 	launchParams.launchControlFlags = (LaunchFlags)NUM2UINT(flags);
-	launchParams.launchAppSpec = &fss;
+#if defined(__LP64__)
+	launchParams.launchAppRef = &appRef;
+#else
+	launchParams.launchAppSpec = &appFSS;
+#endif
 	launchParams.launchAppParameters = paraData;
 	err = LaunchApplication(&launchParams);
 	if (err != noErr) rbAE_raiseMacOSError("Can't launch application.", err);
@@ -507,6 +568,10 @@ rbAE_convertUnixSecondsToLongDateTime(VALUE self, VALUE secs)
 static VALUE
 rbAE_OSAGetAppTerminology(VALUE self, VALUE path)
 {
+#if defined(__LP64__)
+	rb_raise(rb_eNotImpError, "AE.get_app_terminology isn't available in 64-bit processes.\n");
+	return Qnil;
+#else
 	FSRef appRef;
 	FSSpec fss;
 	ComponentInstance defaultComponent;
@@ -514,6 +579,8 @@ rbAE_OSAGetAppTerminology(VALUE self, VALUE path)
 	AEDesc theDesc;
 	OSErr err = noErr;
 	
+	if (OSAGetAppTerminology == NULL)
+		rb_raise(rb_eNotImpError, "OSAGetAppTerminology unavailable.\n");
 	err = FSPathMakeRef((UInt8 *)StringValuePtr(path), &appRef, NULL);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't make FSRef.", err);
 	err = FSGetCatalogInfo(&appRef, kFSCatInfoNone, NULL, NULL, &fss, NULL);
@@ -529,6 +596,7 @@ rbAE_OSAGetAppTerminology(VALUE self, VALUE path)
 							   &theDesc);
 	if (err != 0) rbAE_raiseMacOSError("Couldn't get aete resource.", err);
 	return rbAE_wrapAEDesc(&theDesc);
+#endif
 }
 
 
@@ -540,7 +608,7 @@ rbAE_OSAGetAppTerminology(VALUE self, VALUE path)
 // TO DO: make sure GC won't collect handler objects while they're installed as event/coercion handlers
 
 static pascal OSErr
-rbAE_GenericEventHandler(const AppleEvent *request, AppleEvent *reply, refcontype refcon)
+rbAE_GenericEventHandler(const AppleEvent *request, AppleEvent *reply, SRefCon refcon)
 {
 	VALUE err;
 	
@@ -555,7 +623,7 @@ rbAE_GenericEventHandler(const AppleEvent *request, AppleEvent *reply, refcontyp
 /*******/
 
 static VALUE
-rbAE_AEInstallEventHandler(VALUE self, VALUE eventClass, VALUE eventID, VALUE handler)
+rbAE_AEInstallEventHandler(VALUE self, VALUE eventClass, VALUE eventID, SRefCon handler)
 {
 	/* 
 	 * eventClass and eventID must be four-character code strings
@@ -569,7 +637,7 @@ rbAE_AEInstallEventHandler(VALUE self, VALUE eventClass, VALUE eventID, VALUE ha
 	
 	err = AEInstallEventHandler(rbStringToDescType(eventClass),
 								rbStringToDescType(eventID),
-	                            upp_GenericEventHandler, (long)handler,
+	                            upp_GenericEventHandler, handler,
 	                            0);
 	if (err != noErr) rbAE_raiseMacOSError("Can't install event handler.", err);
 	return Qnil;
@@ -595,14 +663,14 @@ rbAE_AEGetEventHandler(VALUE self, VALUE eventClass, VALUE eventID)
 {
 	OSErr err = noErr;
 	AEEventHandlerUPP handlerUPP;
-	VALUE handler;
+	SRefCon handler;
 	
 	err = AEGetEventHandler(rbStringToDescType(eventClass),
 							 rbStringToDescType(eventID),
-	                         &handlerUPP, (long *)&handler,
+	                         &handlerUPP, &handler,
 	                         0);
 	if (err != noErr) rbAE_raiseMacOSError("Can't get event handler.", err);
-	return handler;
+	return (VALUE)handler;
 }
 
 
@@ -612,7 +680,7 @@ rbAE_AEGetEventHandler(VALUE self, VALUE eventClass, VALUE eventID)
 // TO DO: make sure GC won't collect handler objects while they're installed as event/coercion handlers
 
 static pascal OSErr
-rbAE_GenericCoercionHandler(const AEDesc *fromDesc, DescType toType, refcontype refcon, AEDesc *toDesc)
+rbAE_GenericCoercionHandler(const AEDesc *fromDesc, DescType toType, SRefCon refcon, AEDesc *toDesc)
 {
 	// handle_coercion method should return an AE::AEDesc, or nil if an error occurred
 	OSErr err = noErr;
@@ -632,7 +700,7 @@ rbAE_GenericCoercionHandler(const AEDesc *fromDesc, DescType toType, refcontype
 /*******/
 
 static VALUE
-rbAE_AEInstallCoercionHandler(VALUE self, VALUE fromType, VALUE toType, VALUE handler)
+rbAE_AEInstallCoercionHandler(VALUE self, VALUE fromType, VALUE toType, SRefCon handler)
 {
 	/* 
 	 * fromType and toType must be four-character code strings
@@ -647,7 +715,7 @@ rbAE_AEInstallCoercionHandler(VALUE self, VALUE fromType, VALUE toType, VALUE ha
 	
 	err = AEInstallCoercionHandler(rbStringToDescType(fromType),
 								   rbStringToDescType(toType),
-								   upp_GenericCoercionHandler, (long)handler,
+								   upp_GenericCoercionHandler, handler,
 								   1, 0);
 	if (err != noErr) rbAE_raiseMacOSError("Can't install coercion handler.", err);
 	return Qnil;
@@ -673,12 +741,12 @@ rbAE_AEGetCoercionHandler(VALUE self, VALUE fromType, VALUE toType)
 {
 	OSErr err = noErr;
 	AECoercionHandlerUPP handlerUPP;
-	VALUE handler;
+	SRefCon handler;
 	Boolean fromTypeIsDesc;
 	
 	err = AEGetCoercionHandler(rbStringToDescType(fromType),
 							   rbStringToDescType(toType),
-							   &handlerUPP, (long *)&handler,
+							   &handlerUPP, &handler,
 							   &fromTypeIsDesc,
 							   0);
 	if (err != noErr) rbAE_raiseMacOSError("Can't get coercion handler.", err);
@@ -694,14 +762,22 @@ rbAE_AEGetCoercionHandler(VALUE self, VALUE fromType, VALUE toType)
 static VALUE
 rbAE_RunApplicationEventLoop(VALUE self)
 {
+#if defined(__LP64__)
+	rb_raise(rb_eNotImpError, "AE.run_application_event_loop isn't available in 64-bit processes.\n");
+#else
 	RunApplicationEventLoop();
+#endif
 	return Qnil;
 }
 
 static VALUE
 rbAE_QuitApplicationEventLoop(VALUE self)
 {
+#if defined(__LP64__)
+	rb_raise(rb_eNotImpError, "AE.quit_application_event_loop isn't available in 64-bit processes.\n");
+#else
 	QuitApplicationEventLoop();
+#endif
 	return Qnil;
 }
 
@@ -733,11 +809,13 @@ Init_ae (void)
 	rb_define_singleton_method(cAEDesc, "new", rbAE_AEDesc_new, 2);
 	rb_define_singleton_method(cAEDesc, "new_list", rbAE_AEDesc_newList, 1);
 	rb_define_singleton_method(cAEDesc, "new_apple_event", rbAE_AEDesc_newAppleEvent, 5);
+	rb_define_singleton_method(cAEDesc, "unflatten", rbAE_AEDesc_newUnflatten, 1);
 	
 	rb_define_method(cAEDesc, "to_s", rbAE_AEDesc_inspect, 0);
 	rb_define_method(cAEDesc, "inspect", rbAE_AEDesc_inspect, 0);
 	rb_define_method(cAEDesc, "type", rbAE_AEDesc_type, 0);
 	rb_define_method(cAEDesc, "data", rbAE_AEDesc_data, 0);
+	rb_define_method(cAEDesc, "flatten", rbAE_AEDesc_flatten, 0);
 	rb_define_method(cAEDesc, "is_record?", rbAE_AEDesc_isRecord, 0);
 	rb_define_method(cAEDesc, "coerce", rbAE_AEDesc_coerce, 1);
 	rb_define_method(cAEDesc, "length", rbAE_AEDesc_length, 0);
@@ -748,6 +826,7 @@ Init_ae (void)
 	rb_define_method(cAEDesc, "get_param", rbAE_AEDesc_getParam, 2);
 	rb_define_method(cAEDesc, "get_attr", rbAE_AEDesc_getAttr, 2);
 	rb_define_method(cAEDesc, "send", rbAE_AEDesc_send, 2);
+	rb_define_method(cAEDesc, "send_thread_safe", rbAE_AEDesc_sendThreadSafe, 2);
 	
 	// AE::MacOSError