[Vm-dev] [commit][2844] VMMaker 4.12.13

commits at squeakvm.org commits at squeakvm.org
Fri Jan 10 23:00:32 UTC 2014


Revision: 2844
Author:   lewis
Date:     2014-01-10 15:00:31 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
VMMaker 4.12.13
FT2Plugin updates, move SqueakSSL to VMMaker with pragmatizing.

FT2Plugin is separate from VMMaker, changes include pragmatizing (cosmetic impact
only) and some functional update from Eliot. The SqueakSSL change is a package
change (move to VMMaker) plus pragmatizing (cosmetic change only).

Modified Paths:
--------------
    trunk/src/ckformat.c
    trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
    trunk/src/plugins/AioPlugin/AioPlugin.c
    trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
    trunk/src/plugins/B2DPlugin/B2DPlugin.c
    trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
    trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
    trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
    trunk/src/plugins/CameraPlugin/CameraPlugin.c
    trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
    trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
    trunk/src/plugins/DBusPlugin/DBusPlugin.c
    trunk/src/plugins/DSAPrims/DSAPrims.c
    trunk/src/plugins/DropPlugin/DropPlugin.c
    trunk/src/plugins/FFTPlugin/FFTPlugin.c
    trunk/src/plugins/FT2Plugin/FT2Plugin.c
    trunk/src/plugins/FileCopyPlugin/FileCopyPlugin.c
    trunk/src/plugins/FilePlugin/FilePlugin.c
    trunk/src/plugins/FloatArrayPlugin/FloatArrayPlugin.c
    trunk/src/plugins/FloatMathPlugin/FloatMathPlugin.c
    trunk/src/plugins/GeniePlugin/GeniePlugin.c
    trunk/src/plugins/HostWindowPlugin/HostWindowPlugin.c
    trunk/src/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.c
    trunk/src/plugins/JPEGReaderPlugin/JPEGReaderPlugin.c
    trunk/src/plugins/JoystickTabletPlugin/JoystickTabletPlugin.c
    trunk/src/plugins/Klatt/Klatt.c
    trunk/src/plugins/LargeIntegers/LargeIntegers.c
    trunk/src/plugins/LocalePlugin/LocalePlugin.c
    trunk/src/plugins/MIDIPlugin/MIDIPlugin.c
    trunk/src/plugins/Matrix2x3Plugin/Matrix2x3Plugin.c
    trunk/src/plugins/MiscPrimitivePlugin/MiscPrimitivePlugin.c
    trunk/src/plugins/Mpeg3Plugin/Mpeg3Plugin.c
    trunk/src/plugins/RePlugin/RePlugin.c
    trunk/src/plugins/RomePlugin/RomePlugin.c
    trunk/src/plugins/ScratchPlugin/ScratchPlugin.c
    trunk/src/plugins/SecurityPlugin/SecurityPlugin.c
    trunk/src/plugins/SerialPlugin/SerialPlugin.c
    trunk/src/plugins/SocketPlugin/SocketPlugin.c
    trunk/src/plugins/SoundCodecPrims/SoundCodecPrims.c
    trunk/src/plugins/SoundGenerationPlugin/SoundGenerationPlugin.c
    trunk/src/plugins/SoundPlugin/SoundPlugin.c
    trunk/src/plugins/Squeak3D/Squeak3D.c
    trunk/src/plugins/SqueakFFIPrims/SqueakFFIPrims.c
    trunk/src/plugins/SqueakSSL/SqueakSSL.c
    trunk/src/plugins/StarSqueakPlugin/StarSqueakPlugin.c
    trunk/src/plugins/UUIDPlugin/UUIDPlugin.c
    trunk/src/plugins/UnicodePlugin/UnicodePlugin.c
    trunk/src/plugins/UnixOSProcessPlugin/UnixOSProcessPlugin.c
    trunk/src/plugins/WeDoPlugin/WeDoPlugin.c
    trunk/src/plugins/XDisplayControlPlugin/XDisplayControlPlugin.c
    trunk/src/plugins/ZipPlugin/ZipPlugin.c
    trunk/src/vm/interp.c
    trunk/src/vm/interp.h
    trunk/src/vm/sqNamedPrims.h

Modified: trunk/src/ckformat.c
===================================================================
--- trunk/src/ckformat.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/ckformat.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -5,7 +5,7 @@
 /* Usage: ckformat imageFileName */
 
 /* --- DO NOT EDIT THIS FILE --- */
-/* --- Automatically generated from class ImageFormat 2014-01-04T14:04:16.401+01:00--- */
+/* --- Automatically generated from class ImageFormat 2014-01-10T17:30:29.261+01:00--- */
 /* --- Source code is in package ImageFormat in the VMMaker repository --- */
 /* --- DO NOT EDIT THIS FILE --- */
 

Modified: trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c
===================================================================
--- trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/ADPCMCodecPlugin/ADPCMCodecPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:49 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "ADPCMCodecPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -70,9 +70,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"ADPCMCodecPlugin 4 January 2014 (i)"
+	"ADPCMCodecPlugin 10 January 2014 (i)"
 #else
-	"ADPCMCodecPlugin 4 January 2014 (e)"
+	"ADPCMCodecPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/AioPlugin/AioPlugin.c
===================================================================
--- trunk/src/plugins/AioPlugin/AioPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/AioPlugin/AioPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:14 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:26 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
 	UnixAioPlugin VMConstruction-Plugins-AioPlugin-eem.15 uuid: 0029df1c-3720-4b61-8579-4851417d24a7
  */
@@ -88,9 +88,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"AioPlugin 4 January 2014 (i)"
+	"AioPlugin 10 January 2014 (i)"
 #else
-	"AioPlugin 4 January 2014 (e)"
+	"AioPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c
===================================================================
--- trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/AsynchFilePlugin/AsynchFilePlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:35 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "AsynchFilePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -67,9 +67,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"AsynchFilePlugin 4 January 2014 (i)"
+	"AsynchFilePlugin 10 January 2014 (i)"
 #else
-	"AsynchFilePlugin 4 January 2014 (e)"
+	"AsynchFilePlugin 10 January 2014 (e)"
 #endif
 ;
 static void * sCOAFfn;

Modified: trunk/src/plugins/B2DPlugin/B2DPlugin.c
===================================================================
--- trunk/src/plugins/B2DPlugin/B2DPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/B2DPlugin/B2DPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:39 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:54 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "BalloonEnginePlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -447,9 +447,9 @@
 static void * loadBBFn;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"B2DPlugin 4 January 2014 (i)"
+	"B2DPlugin 10 January 2014 (i)"
 #else
-	"B2DPlugin 4 January 2014 (e)"
+	"B2DPlugin 10 January 2014 (e)"
 #endif
 ;
 static int* objBuffer;

Modified: trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c
===================================================================
--- trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/B3DAcceleratorPlugin/B3DAcceleratorPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:58 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:12 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "B3DAcceleratorPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -107,9 +107,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"B3DAcceleratorPlugin 4 January 2014 (i)"
+	"B3DAcceleratorPlugin 10 January 2014 (i)"
 #else
-	"B3DAcceleratorPlugin 4 January 2014 (e)"
+	"B3DAcceleratorPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c
===================================================================
--- trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/BMPReadWriterPlugin/BMPReadWriterPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:36 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:50 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "BMPReadWriterPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -58,9 +58,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"BMPReadWriterPlugin 4 January 2014 (i)"
+	"BMPReadWriterPlugin 10 January 2014 (i)"
 #else
-	"BMPReadWriterPlugin 4 January 2014 (e)"
+	"BMPReadWriterPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/BitBltPlugin/BitBltPlugin.c
===================================================================
--- trunk/src/plugins/BitBltPlugin/BitBltPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/BitBltPlugin/BitBltPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:41 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:56 pm */
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "BitBltSimulation VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -256,9 +256,9 @@
 };
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"BitBltPlugin 4 January 2014 (i)"
+	"BitBltPlugin 10 January 2014 (i)"
 #else
-	"BitBltPlugin 4 January 2014 (e)"
+	"BitBltPlugin 10 January 2014 (e)"
 #endif
 ;
 static sqInt nWords;

Modified: trunk/src/plugins/CameraPlugin/CameraPlugin.c
===================================================================
--- trunk/src/plugins/CameraPlugin/CameraPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/CameraPlugin/CameraPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:59 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "CameraPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "CameraPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -64,9 +64,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"CameraPlugin 4 January 2014 (i)"
+	"CameraPlugin 10 January 2014 (i)"
 #else
-	"CameraPlugin 4 January 2014 (e)"
+	"CameraPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c
===================================================================
--- trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/ClipboardExtendedPlugin/ClipboardExtendedPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:14 pm */
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "ClipboardExtendedPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -61,9 +61,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"ClipboardExtendedPlugin 4 January 2014 (i)"
+	"ClipboardExtendedPlugin 10 January 2014 (i)"
 #else
-	"ClipboardExtendedPlugin 4 January 2014 (e)"
+	"ClipboardExtendedPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/CroquetPlugin/CroquetPlugin.c
===================================================================
--- trunk/src/plugins/CroquetPlugin/CroquetPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/CroquetPlugin/CroquetPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:57 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	CroquetPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "CroquetPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -73,9 +73,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"CroquetPlugin 4 January 2014 (i)"
+	"CroquetPlugin 10 January 2014 (i)"
 #else
-	"CroquetPlugin 4 January 2014 (e)"
+	"CroquetPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/DBusPlugin/DBusPlugin.c
===================================================================
--- trunk/src/plugins/DBusPlugin/DBusPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/DBusPlugin/DBusPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,6 +1,6 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:04:01 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30:15 pm */
 /* Automatically generated by
-	SmartSyntaxPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	SmartSyntaxPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
 	DBusPlugin DBus-Plugin-dtl.35 uuid: 2ae30f08-4793-4acb-876b-c443a5f5e665
  */
@@ -143,9 +143,9 @@
 static DBusMessageIter messageIter[DBUS_MAXIMUM_TYPE_RECURSION_DEPTH];
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"DBusPlugin 4 January 2014 (i)"
+	"DBusPlugin 10 January 2014 (i)"
 #else
-	"DBusPlugin 4 January 2014 (e)"
+	"DBusPlugin 10 January 2014 (e)"
 #endif
 ;
 static DBusMessage* writeMessage;

Modified: trunk/src/plugins/DSAPrims/DSAPrims.c
===================================================================
--- trunk/src/plugins/DSAPrims/DSAPrims.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/DSAPrims/DSAPrims.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:42 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:57 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	DSAPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "DSAPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "DSAPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -67,9 +67,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"DSAPrims 4 January 2014 (i)"
+	"DSAPrims 10 January 2014 (i)"
 #else
-	"DSAPrims 4 January 2014 (e)"
+	"DSAPrims 10 January 2014 (e)"
 #endif
 ;
 static sqInt remainderDigitCount;

Modified: trunk/src/plugins/DropPlugin/DropPlugin.c
===================================================================
--- trunk/src/plugins/DropPlugin/DropPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/DropPlugin/DropPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:59 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	DropPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "DropPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "DropPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -62,9 +62,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"DropPlugin 4 January 2014 (i)"
+	"DropPlugin 10 January 2014 (i)"
 #else
-	"DropPlugin 4 January 2014 (e)"
+	"DropPlugin 10 January 2014 (e)"
 #endif
 ;
 

Modified: trunk/src/plugins/FFTPlugin/FFTPlugin.c
===================================================================
--- trunk/src/plugins/FFTPlugin/FFTPlugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/FFTPlugin/FFTPlugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,10 +1,10 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:44 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:29:59 pm */
 /* Automatically generated by
-	VMPluginCodeGenerator VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	VMPluginCodeGenerator VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
    from
-	FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f
+	FFTPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83
  */
-static char __buildInfo[] = "FFTPlugin VMMaker-dtl.334 uuid: 61416154-73bc-45d7-9f3a-739a51ae816f " __DATE__ ;
+static char __buildInfo[] = "FFTPlugin VMMaker-dtl.337 uuid: 000f5b24-c747-4c6d-ba3e-ac1985565d83 " __DATE__ ;
 
 
 
@@ -68,9 +68,9 @@
 struct VirtualMachine* interpreterProxy;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FFTPlugin 4 January 2014 (i)"
+	"FFTPlugin 10 January 2014 (i)"
 #else
-	"FFTPlugin 4 January 2014 (e)"
+	"FFTPlugin 10 January 2014 (e)"
 #endif
 ;
 static sqInt nu;

Modified: trunk/src/plugins/FT2Plugin/FT2Plugin.c
===================================================================
--- trunk/src/plugins/FT2Plugin/FT2Plugin.c	2014-01-10 21:57:32 UTC (rev 2843)
+++ trunk/src/plugins/FT2Plugin/FT2Plugin.c	2014-01-10 23:00:31 UTC (rev 2844)
@@ -1,4 +1,4 @@
-/* Smalltalk from Squeak4.4 with VMMaker 4.12.12 translated as C source on 4 January 2014 2:03:45 pm */
+/* Smalltalk from Squeak4.4 with VMMaker 4.12.13 translated as C source on 10 January 2014 5:30 pm */
 /* Automatically generated by
 	FT2PluginCodeGenerator * FreeType-nice.442 uuid: 9895a884-7d42-4783-9fb8-1a71ef244e16
    from
@@ -47,6 +47,7 @@
 #define FT2GlyphSlotInstSize 17
 #define FT2OutlineContoursIndex 4
 #define FT2OutlineContoursSizeIndex 0
+#define FT2OutlineFlagsIndex 5
 #define FT2OutlineInstSize 6
 #define FT2OutlinePointsIndex 2
 #define FT2OutlinePointsSizeIndex 1
@@ -77,7 +78,6 @@
 EXPORT(sqInt) primitiveDoneFacePreserveFields(void);
 EXPORT(sqInt) primitiveEmboldenFaceGlyphSlotOutline(void);
 EXPORT(sqInt) primitiveErrorCode(void);
-EXPORT(sqInt) primitiveErrorString(void);
 EXPORT(sqInt) primitiveFreeExternalMemory(void);
 EXPORT(sqInt) primitiveGetFaceCharIndex(void);
 EXPORT(sqInt) primitiveGetFaceCharMap(void);
@@ -121,9 +121,9 @@
 static FT_Library library;
 static const char *moduleName =
 #ifdef SQUEAK_BUILTIN_PLUGIN
-	"FT2Plugin 4 January 2014 (i)"
+	"FT2Plugin 10 January 2014 (i)"
 #else
-	"FT2Plugin 4 January 2014 (e)"
+	"FT2Plugin 10 January 2014 (e)"
 #endif
 ;
 
@@ -220,7 +220,7 @@
 	if (interpreterProxy->failed()) {
 		return null;
 	}
-	btw = BYTES_PER_WORD;
+	btw = wordSize();
 	return *(void**)(pointerForOop(oop + btw));
 }
 
@@ -378,12 +378,8 @@
 
 EXPORT(sqInt) initialiseModule(void) {
 
-	/*  not implemented?? commented out because of compilation errors 
-	
-	self ifDefined: 'macintoshSqueak' then: [
-		self fetchPreferences.
-	].
-	 */
+	/* not implemented?? commented out because of compilation errors */
+	/* self ifDefined: 'macintoshSqueak' then: [self fetchPreferences]. */
 
 	library = null;
 	errorCode = FT_Init_FreeType(&library);
@@ -395,13 +391,18 @@
 	sqInt rcvr;
 	size_t byteSize;
 	char *aByteArray;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(0)));
 	aByteArray = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0))));
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FreeTypeExternalMemory"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	;
@@ -415,8 +416,7 @@
 	memcpy(aPointer,aByteArray,byteSize);
 	ftAllocateHandleInReceiverForPointer(aPointer);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -430,11 +430,16 @@
 	sqInt rcvr;
 	sqInt i;
 	FT_Face face;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -452,8 +457,7 @@
 	}
 	interpreterProxy->success(errorCode == 0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -467,11 +471,16 @@
 EXPORT(sqInt) primitiveDoneFacePreserveFields(void) {
 	sqInt rcvr;
 	FT_Face face;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -487,8 +496,7 @@
 	interpreterProxy->storePointerofObjectwithValue(0, rcvr, interpreterProxy->nilObject());
 	interpreterProxy->success(errorCode == 0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -501,12 +509,17 @@
 	sqInt rcvr;
 	FT_Face face;
 	sqInt strength;
+	sqInt _return_value;
 
 	strength = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -520,8 +533,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -535,54 +547,25 @@
 
 	_return_value = interpreterProxy->positive32BitIntegerFor((FT_ERROR_BASE(errorCode)));
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, _return_value);
 	return null;
 }
 
-EXPORT(sqInt) primitiveErrorString(void) {
-	const char *str;
-	const struct ftError *ftError;
-
-	
-struct ftError { int errCode; const char* errMsg; };
-#undef __FTERRORS_H__
-#define FT_ERRORDEF( e, v, s )  { e, s },
-#define FT_ERROR_START_LIST     {
-#define FT_ERROR_END_LIST       { 0xFF, "Bad Squeak Method Parameter" }, { 0, NULL } };
-static const struct ftError ftErrors[] =
-#include FT_ERRORS_H
-;
-	ftError = ftErrors;
-	;
-	while (((str = ftError->errMsg)) && (FT_ERROR_BASE(errorCode) != ftError->errCode)) {
-		ftError++;
-	}
-	;
-	if (!(str)) {
-		interpreterProxy->success(0);
-	}
-	if (interpreterProxy->failed()) {
-		return null;
-	}
-	interpreterProxy->popthenPush(1, ftAllocateStringForPointer(str));
-	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
-	}
-	return null;
-}
-
 EXPORT(sqInt) primitiveFreeExternalMemory(void) {
 	sqInt rcvr;
 	void*memPointer;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FreeTypeExternalMemory"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	;
@@ -595,8 +578,7 @@
 		free(memPointer);
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -617,7 +599,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -629,8 +615,7 @@
 	result = FT_Get_Char_Index(face, charIndex);
 	_return_value = interpreterProxy->positive32BitIntegerFor(result);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(2, _return_value);
 	return null;
@@ -642,11 +627,16 @@
 	FT_CharMap charmap;
 	sqInt stringOop;
 	FT_Face face;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -669,8 +659,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -684,13 +673,18 @@
 	sqInt arrayOop;
 	sqInt rcvr;
 	sqInt *array;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isIndexable(interpreterProxy->stackValue(0)));
 	array = ((int *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(0))));
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -717,8 +711,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -733,12 +726,17 @@
 	sqInt string;
 	FT_Face face;
 	sqInt glyphIndex;
+	sqInt _return_value;
 
 	glyphIndex = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -753,8 +751,7 @@
 	}
 	string = ftAllocateStringForPointer(buffer);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(2, string);
 	return null;
@@ -768,6 +765,7 @@
 	FT_Face face;
 	sqInt leftGlyph;
 	sqInt rightGlyph;
+	sqInt _return_value;
 
 	leftGlyph = interpreterProxy->stackIntegerValue(1);
 	rightGlyph = interpreterProxy->stackIntegerValue(0);
@@ -778,7 +776,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -792,8 +794,7 @@
 	FT_Get_Kerning(face, leftGlyph, rightGlyph, kernMode, &result);;
 	pointOop = interpreterProxy->makePointwithxValueyValue(result.x, result.y);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(3, pointOop);
 	return null;
@@ -807,11 +808,16 @@
 	sqInt rcvr;
 	sqInt string;
 	FT_Face face;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	buffer = 0;
@@ -827,8 +833,7 @@
 	}
 	string = ftAllocateStringForPointer(buffer);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, string);
 	return null;
@@ -848,7 +853,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	buffer = 0;
@@ -861,8 +870,7 @@
 	if (buffer == 0) {
 		_return_value = interpreterProxy->integerObjectOf(-1);
 		if (interpreterProxy->failed()) {
-			ftParameterError();
-			return null;
+			return ftParameterError();
 		}
 		interpreterProxy->popthenPush(1, _return_value);
 		return null;
@@ -875,8 +883,7 @@
 	;
 	memcpy(extraByteArrayPtr, buffer, sizeof(TT_OS2));
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, returnedHandle);
 	return null;
@@ -887,10 +894,17 @@
 	FT_Face face;
 	sqInt _return_value;
 
+
+	/* ptr to struct */
+
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -901,8 +915,7 @@
 	}
 	_return_value = (((FT_HAS_KERNING( face )) << 1) | 1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, _return_value);
 	return null;
@@ -913,18 +926,22 @@
 
 EXPORT(sqInt) primitiveLibraryHandle(void) {
 	sqInt rcvr;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Library"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	errorCode = 0;
 	ftAllocateHandleInReceiverForPointer(library);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -938,13 +955,18 @@
 	FT_Face face;
 	sqInt index;
 	sqInt flags;
+	sqInt _return_value;
 
 	index = interpreterProxy->stackIntegerValue(1);
 	flags = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -958,8 +980,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -971,13 +992,18 @@
 	sqInt rectOop;
 	FT_Face face;
 	sqInt aRectangle;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "Rectangle"));
 	aRectangle = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	rectOop = aRectangle;
@@ -1010,8 +1036,7 @@
 	rectOop = interpreterProxy->popRemappableOop();
 	interpreterProxy->storePointerofObjectwithValue(1, rectOop, pointOop);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1025,11 +1050,16 @@
 	sqInt rcvr;
 	sqInt strOop;
 	FT_Face face;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1068,8 +1098,7 @@
 		interpreterProxy->storeIntegerofObjectwithValue(20, rcvr, face->underline_thickness);
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -1079,13 +1108,18 @@
 	FT_Face face;
 	sqInt index;
 	sqInt flags;
+	sqInt _return_value;
 
 	index = interpreterProxy->stackIntegerValue(1);
 	flags = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1099,8 +1133,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -1117,13 +1150,18 @@
 	FT_Face face;
 	FT_Glyph_Format *gfPtr;
 	sqInt aFace;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	aFace = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2GlyphSlot"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -1150,7 +1188,7 @@
 	interpreterProxy->pushRemappableOop(rcvr);
 	gfOop = interpreterProxy->instantiateClassindexableSize(interpreterProxy->classByteArray(), sizeof(FT_Glyph_Format));
 	;
-	btw = BYTES_PER_WORD;
+	btw = wordSize();
 	gfPtr = (FT_Glyph_Format *) pointerForOop(gfOop + btw);
 	;
 	if (interpreterProxy->failed()) {
@@ -1170,8 +1208,7 @@
 	interpreterProxy->storeIntegerofObjectwithValue(14, rcvr, gs->metrics.vertBearingY);
 	interpreterProxy->storeIntegerofObjectwithValue(15, rcvr, gs->metrics.vertAdvance);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1191,6 +1228,7 @@
 	sqInt contoursSize;
 	long * points;
 	sqInt aFace;
+	sqInt _return_value;
 	sqInt array;
 	sqInt array1;
 	sqInt array2;
@@ -1204,7 +1242,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Outline"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -1266,8 +1308,7 @@
 		contours[i] = (gs->outline.contours[i]);
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1281,13 +1322,21 @@
 	FT_GlyphSlot gs;
 	FT_Face face;
 	sqInt aFace;
+	sqInt _return_value;
 
+
+	/* ptr to struct */
+
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Face"));
 	aFace = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Outline"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -1308,9 +1357,9 @@
 	;
 	interpreterProxy->storeIntegerofObjectwithValue(FT2OutlineContoursSizeIndex, rcvr, gs->outline.n_contours);
 	interpreterProxy->storeIntegerofObjectwithValue(FT2OutlinePointsSizeIndex, rcvr, gs->outline.n_points);
+	interpreterProxy->storeIntegerofObjectwithValue(FT2OutlineFlagsIndex, rcvr, gs->outline.flags);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1324,8 +1373,7 @@
 
 	_return_value = interpreterProxy->positive32BitIntegerFor((FT_ERROR_MODULE(errorCode)));
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, _return_value);
 	return null;
@@ -1342,6 +1390,7 @@
 	FT_Face face;
 	char *fontFilePath;
 	sqInt anInteger;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isBytes(interpreterProxy->stackValue(1)));
 	fontFilePath = ((char *) (interpreterProxy->firstIndexableField(interpreterProxy->stackValue(1))));
@@ -1349,7 +1398,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	;
@@ -1373,8 +1426,7 @@
 	}
 	ftAllocateHandleInReceiverForPointer(face);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -1391,6 +1443,7 @@
 	sqInt aFreeTypeExternalMemory;
 	sqInt byteSize;
 	sqInt anInteger;
+	sqInt _return_value;
 
 	aFreeTypeExternalMemory = interpreterProxy->stackValue(2);
 	byteSize = interpreterProxy->stackIntegerValue(1);
@@ -1398,7 +1451,11 @@
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(3), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(3);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(4, _return_value);
 		return null;
 	}
 	;
@@ -1417,8 +1474,7 @@
 	}
 	ftAllocateHandleInReceiverForPointer(face);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(3);
 	return null;
@@ -1435,10 +1491,17 @@
 	FT_Face face;
 	sqInt _return_value;
 
+
+	/* ptr to struct */
+
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2GlyphSlot"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -1461,8 +1524,7 @@
 	contoursSize = gs->outline.n_contours;
 	_return_value = ((contoursSize << 1) | 1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, _return_value);
 	return null;
@@ -1476,13 +1538,21 @@
 	sqInt faceOop;
 	FT_Face face;
 	sqInt formOop;
+	sqInt _return_value;
 
+
+	/* temp struct */
+
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "Form"));
 	formOop = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	faceOop = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(faceOop);
@@ -1497,8 +1567,7 @@
 	errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap);
 	interpreterProxy->success(errorCode == 0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1513,14 +1582,22 @@
 	FT_Face face;
 	sqInt formOop;
 	sqInt mode;
+	sqInt _return_value;
 
+
+	/* temp struct */
+
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "Form"));
 	formOop = interpreterProxy->stackValue(1);
 	mode = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	faceOop = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(faceOop);
@@ -1535,8 +1612,7 @@
 	errorCode = FT_Outline_Get_Bitmap(library, &face->glyph->outline, &bitmap);
 	interpreterProxy->success(errorCode == 0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -1550,8 +1626,7 @@
 	errorCode = 0;
 	_return_value = interpreterProxy->positive32BitIntegerFor(oldError);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->popthenPush(1, _return_value);
 	return null;
@@ -1562,12 +1637,17 @@
 	sqInt rcvr;
 	FT_Face face;
 	sqInt encodingString;
+	sqInt _return_value;
 
 	encodingString = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1586,8 +1666,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1598,13 +1677,18 @@
 	FT_Face face;
 	sqInt x;
 	sqInt y;
+	sqInt _return_value;
 
 	x = interpreterProxy->stackIntegerValue(1);
 	y = interpreterProxy->stackIntegerValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1618,8 +1702,7 @@
 		return null;
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -1634,13 +1717,18 @@
 	sqInt rcvr;
 	sqInt matrixWordArray;
 	sqInt deltaWordArray;
+	sqInt _return_value;
 
 	matrixWordArray = interpreterProxy->stackValue(1);
 	deltaWordArray = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(2), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(2);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(3, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1657,8 +1745,7 @@
 		FT_Set_Transform( face, &matrix, &delta);
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(2);
 	return null;
@@ -1670,12 +1757,17 @@
 	sqInt *matrixsqIntPtr;
 	FT_Face face;
 	sqInt matrixWordArray;
+	sqInt _return_value;
 
 	matrixWordArray = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1690,8 +1782,7 @@
 		FT_Outline_Transform( &face->glyph->outline, &matrix );
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1703,12 +1794,17 @@
 	sqInt *deltasqIntPtr;
 	FT_Face face;
 	sqInt deltaWordArray;
+	sqInt _return_value;
 
 	deltaWordArray = interpreterProxy->stackValue(0);
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(1), "FT2Face"));
 	rcvr = interpreterProxy->stackValue(1);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(2, _return_value);
 		return null;
 	}
 	face = ftHandleValueFromReceiver(rcvr);
@@ -1722,8 +1818,7 @@
 		FT_Outline_Translate( &face->glyph->outline, delta.x, delta.y );
 	}
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	interpreterProxy->pop(1);
 	return null;
@@ -1734,11 +1829,16 @@
 	int apatch;
 	sqInt rcvr;
 	int amajor;
+	sqInt _return_value;
 
 	interpreterProxy->success(interpreterProxy->isKindOf(interpreterProxy->stackValue(0), "FT2Version"));
 	rcvr = interpreterProxy->stackValue(0);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
+		_return_value = ftParameterError();
+		if (interpreterProxy->failed()) {
+			return ftParameterError();
+		}
+		interpreterProxy->popthenPush(1, _return_value);
 		return null;
 	}
 	errorCode = 0;
@@ -1750,8 +1850,7 @@
 	;
 	interpreterProxy->storeIntegerofObjectwithValue(2, rcvr, apatch);
 	if (interpreterProxy->failed()) {
-		ftParameterError();
-		return null;
+		return ftParameterError();
 	}
 	return null;
 }
@@ -1819,7 +1918,6 @@
 	{"FT2Plugin", "primitiveErrorCode", (void*)primitiveErrorCode},
 	{"FT2Plugin", "initialiseModule", (void*)initialiseModule},

@@ Diff output truncated at 50000 characters. @@


More information about the Vm-dev mailing list