SF.net SVN: frontierkernel: [1489] Frontier/branches/SQLite

[<dav...@us...>]

Revision: 1489
          http://svn.sourceforge.net/frontierkernel/?rev=1489&view=rev
Author:   davidgewirtz
Date:     2006-08-30 12:38:37 -0700 (Wed, 30 Aug 2006)

Log Message:
-----------
This is a refresh of the SQLite build, bringing all the trunk code into the SQLite build. After this refreshes the build, I'll add the SQLite changes back into this branch. -- DG

Modified Paths:
--------------
    Frontier/branches/SQLite/Common/IOAToolkit/ioabutton.c
    Frontier/branches/SQLite/Common/IOAToolkit/ioaicon.c
    Frontier/branches/SQLite/Common/IowaRuntime/Headers/iowacore.h
    Frontier/branches/SQLite/Common/IowaRuntime/Source/iowacore.c
    Frontier/branches/SQLite/Common/IowaRuntime/Source/iowaruntime.c
    Frontier/branches/SQLite/Common/Paige/libpaigemacho.a
    Frontier/branches/SQLite/Common/SystemHeaders/standard.h
    Frontier/branches/SQLite/Common/headers/claylinelayout.h
    Frontier/branches/SQLite/Common/headers/config.r
    Frontier/branches/SQLite/Common/headers/dialogs.h
    Frontier/branches/SQLite/Common/headers/file.h
    Frontier/branches/SQLite/Common/headers/frontierconfig.h
    Frontier/branches/SQLite/Common/headers/frontierdefs.h
    Frontier/branches/SQLite/Common/headers/icon.h
    Frontier/branches/SQLite/Common/headers/kernelverbdefs.h
    Frontier/branches/SQLite/Common/headers/kernelverbs.h
    Frontier/branches/SQLite/Common/headers/langinternal.h
    Frontier/branches/SQLite/Common/headers/macconv.h
    Frontier/branches/SQLite/Common/headers/osincludes.h
    Frontier/branches/SQLite/Common/headers/processinternal.h
    Frontier/branches/SQLite/Common/headers/shellprivate.h
    Frontier/branches/SQLite/Common/headers/stringdefs.h
    Frontier/branches/SQLite/Common/headers/strings.h
    Frontier/branches/SQLite/Common/headers/tablestructure.h
    Frontier/branches/SQLite/Common/headers/versions.h
    Frontier/branches/SQLite/Common/resources/Mac/kernelverbs.r
    Frontier/branches/SQLite/Common/resources/Mac/lang.r
    Frontier/branches/SQLite/Common/resources/Win32/WinLand.rc
    Frontier/branches/SQLite/Common/resources/Win32/kernelverbs.rc
    Frontier/branches/SQLite/Common/source/FrontierWinMain.c
    Frontier/branches/SQLite/Common/source/OpenTransportNetEvents.c
    Frontier/branches/SQLite/Common/source/WinSockNetEvents.c
    Frontier/branches/SQLite/Common/source/about.c
    Frontier/branches/SQLite/Common/source/cancoon.c
    Frontier/branches/SQLite/Common/source/cancoonwindow.c
    Frontier/branches/SQLite/Common/source/claybrowserstruc.c
    Frontier/branches/SQLite/Common/source/claybrowservalidate.c
    Frontier/branches/SQLite/Common/source/claycallbacks.c
    Frontier/branches/SQLite/Common/source/claylinelayout.c
    Frontier/branches/SQLite/Common/source/command.c
    Frontier/branches/SQLite/Common/source/db.c
    Frontier/branches/SQLite/Common/source/dockmenu.c
    Frontier/branches/SQLite/Common/source/filedialog.c
    Frontier/branches/SQLite/Common/source/filemp3.c
    Frontier/branches/SQLite/Common/source/fileops.c
    Frontier/branches/SQLite/Common/source/fileverbs.c
    Frontier/branches/SQLite/Common/source/findinfile.c
    Frontier/branches/SQLite/Common/source/font.c
    Frontier/branches/SQLite/Common/source/frontierconfig.c
    Frontier/branches/SQLite/Common/source/icon.c
    Frontier/branches/SQLite/Common/source/iso8859.c
    Frontier/branches/SQLite/Common/source/lang.c
    Frontier/branches/SQLite/Common/source/langcard.c
    Frontier/branches/SQLite/Common/source/langcrypt.c
    Frontier/branches/SQLite/Common/source/langdate.c
    Frontier/branches/SQLite/Common/source/langdll.c
    Frontier/branches/SQLite/Common/source/langexternal.c
    Frontier/branches/SQLite/Common/source/langhash.c
    Frontier/branches/SQLite/Common/source/langhtml.c
    Frontier/branches/SQLite/Common/source/langipc.c
    Frontier/branches/SQLite/Common/source/langlist.c
    Frontier/branches/SQLite/Common/source/langmath.c
    Frontier/branches/SQLite/Common/source/langops.c
    Frontier/branches/SQLite/Common/source/langpack.c
    Frontier/branches/SQLite/Common/source/langquicktime.c
    Frontier/branches/SQLite/Common/source/langregexp.c
    Frontier/branches/SQLite/Common/source/langscan.c
    Frontier/branches/SQLite/Common/source/langstartup.c
    Frontier/branches/SQLite/Common/source/langsystypes.c
    Frontier/branches/SQLite/Common/source/langtree.c
    Frontier/branches/SQLite/Common/source/langvalue.c
    Frontier/branches/SQLite/Common/source/langverbs.c
    Frontier/branches/SQLite/Common/source/langwinipc.c
    Frontier/branches/SQLite/Common/source/langxml.c
    Frontier/branches/SQLite/Common/source/memory.c
    Frontier/branches/SQLite/Common/source/menupack.c
    Frontier/branches/SQLite/Common/source/menuverbs.c
    Frontier/branches/SQLite/Common/source/odbengine.c
    Frontier/branches/SQLite/Common/source/opicons.c
    Frontier/branches/SQLite/Common/source/oplangtext.c
    Frontier/branches/SQLite/Common/source/oplist.c
    Frontier/branches/SQLite/Common/source/oppack.c
    Frontier/branches/SQLite/Common/source/oppopup.c
    Frontier/branches/SQLite/Common/source/oprefcon.c
    Frontier/branches/SQLite/Common/source/ops.c
    Frontier/branches/SQLite/Common/source/opstructure.c
    Frontier/branches/SQLite/Common/source/opvalidate.c
    Frontier/branches/SQLite/Common/source/opverbs.c
    Frontier/branches/SQLite/Common/source/opxml.c
    Frontier/branches/SQLite/Common/source/osacomponent.c
    Frontier/branches/SQLite/Common/source/osawindows.c
    Frontier/branches/SQLite/Common/source/pict.c
    Frontier/branches/SQLite/Common/source/player.c
    Frontier/branches/SQLite/Common/source/popup.c
    Frontier/branches/SQLite/Common/source/process.c
    Frontier/branches/SQLite/Common/source/progressbar.c
    Frontier/branches/SQLite/Common/source/quickdraw.c
    Frontier/branches/SQLite/Common/source/resources.c
    Frontier/branches/SQLite/Common/source/scripts.c
    Frontier/branches/SQLite/Common/source/search.c
    Frontier/branches/SQLite/Common/source/shell.c
    Frontier/branches/SQLite/Common/source/shellfile.c
    Frontier/branches/SQLite/Common/source/shelljuggler.c
    Frontier/branches/SQLite/Common/source/shellmenu.c
    Frontier/branches/SQLite/Common/source/shellprint.c
    Frontier/branches/SQLite/Common/source/shellsysverbs.c
    Frontier/branches/SQLite/Common/source/shellverbs.c
    Frontier/branches/SQLite/Common/source/shellwindow.c
    Frontier/branches/SQLite/Common/source/shellwindowverbs.c
    Frontier/branches/SQLite/Common/source/strings.c
    Frontier/branches/SQLite/Common/source/stringverbs.c
    Frontier/branches/SQLite/Common/source/tabledisplay.c
    Frontier/branches/SQLite/Common/source/tableexternal.c
    Frontier/branches/SQLite/Common/source/tableformats.c
    Frontier/branches/SQLite/Common/source/tableops.c
    Frontier/branches/SQLite/Common/source/tablepack.c
    Frontier/branches/SQLite/Common/source/tablepopup.c
    Frontier/branches/SQLite/Common/source/tablestructure.c
    Frontier/branches/SQLite/Common/source/tablevalidate.c
    Frontier/branches/SQLite/Common/source/winregistry.c
    Frontier/branches/SQLite/Common/source/wpengine.c
    Frontier/branches/SQLite/FrontierSDK/Toolkits/AppletToolkit/Headers/appleticons.h
    Frontier/branches/SQLite/README.txt
    Frontier/branches/SQLite/build_GNU/Makefile
    Frontier/branches/SQLite/build_VC2K3/Frontier.vcproj
    Frontier/branches/SQLite/build_VC2K5/Frontier.vcproj
    Frontier/branches/SQLite/build_XCode/Frontier.xcode/project.pbxproj

Added Paths:
-----------
    Frontier/branches/SQLite/Common/Paige/libpaigefat.a
    Frontier/branches/SQLite/Common/headers/byteorder.h
    Frontier/branches/SQLite/build_XCode/FrontierFat.xcodeproj/
    Frontier/branches/SQLite/build_XCode/FrontierFat.xcodeproj/project.pbxproj

Removed Paths:
-------------
    Frontier/branches/SQLite/Common/Paige/PaigePPC.lib
    Frontier/branches/SQLite/Common/headers/langsqlite.h
    Frontier/branches/SQLite/Common/source/langsqlite.c
    Frontier/branches/SQLite/Common/sqlite3/
    Frontier/branches/SQLite/build_XCode/FrontierFat.xcodeproj/project.pbxproj
    Frontier/branches/SQLite/build_XCode/FrontierMachO.mcp
    Frontier/branches/SQLite/build_XCode/frontier.osxmacho.debug.pch

Property Changed:
----------------
    Frontier/branches/SQLite/build_CWPro8/OPML.mcp
    Frontier/branches/SQLite/build_VC2K3/Frontier.sln
    Frontier/branches/SQLite/build_VC2K3/Frontier.vcproj
    Frontier/branches/SQLite/build_VC2K5/Frontier.sln
    Frontier/branches/SQLite/build_VC2K5/Frontier.vcproj
    Frontier/branches/SQLite/build_XCode/tools/
    Frontier/branches/SQLite/build_XCode/tools/postlinking.sh
    Frontier/branches/SQLite/resources/OPML/OPML.icns
    Frontier/branches/SQLite/resources/OPML/OPMLdoc.icns

Modified: Frontier/branches/SQLite/Common/IOAToolkit/ioabutton.c
===================================================================
--- Frontier/branches/SQLite/Common/IOAToolkit/ioabutton.c	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/IOAToolkit/ioabutton.c	2006-08-30 19:38:37 UTC (rev 1489)
@@ -136,7 +136,7 @@
 		
 		GetThemeFont (kThemePushButtonFont, smSystemScript, fontname, &fontsize, &fontstyle);
 		
-		fontgetnumber (fontname, &idfont);
+		fontgetnumber (fontname, (short *)(&idfont));
 		
 		pushstyle (geneva, 9, bold);
 

Modified: Frontier/branches/SQLite/Common/IOAToolkit/ioaicon.c
===================================================================
--- Frontier/branches/SQLite/Common/IOAToolkit/ioaicon.c	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/IOAToolkit/ioaicon.c	2006-08-30 19:38:37 UTC (rev 1489)
@@ -232,7 +232,7 @@
 	
 	(**h).haslabel = true;
 	
-	(**h).align = atVerticalCenter + atHorizontalCenter;
+	(**h).align = kAlignAbsoluteCenter;
 	
 	*hdata = h;
 	

Modified: Frontier/branches/SQLite/Common/IowaRuntime/Headers/iowacore.h
===================================================================
--- Frontier/branches/SQLite/Common/IowaRuntime/Headers/iowacore.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/IowaRuntime/Headers/iowacore.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -28,6 +28,7 @@
 #ifndef iowacoreinclude
 #define iowacoreinclude
 
+#include "byteorder.h"	/* 2006-04-17 aradke: for SWAP_BYTE_ORDER */
 
 #ifdef coderesource /*we're building into a UCMD*/
 	
@@ -105,8 +106,26 @@
 	short defaulttextcolor;
 	
 	short defaultframecolor;
+
+#ifdef SWAP_BYTE_ORDER
 	
+	unsigned short wastebits: 10; /*room for more booleans*/
+	
+	unsigned short floater: 1;
+	
+	unsigned short flinvisiblegrid: 1; 
+	
+	unsigned short flselection: 1;
+	
+	unsigned short flgrid: 1;
+	
+	unsigned short defaulttransparent: 1;
+
 	unsigned short defaulthasframe: 1;
+
+#else
+
+	unsigned short defaulthasframe: 1;
 	
 	unsigned short defaulttransparent: 1;
 	
@@ -119,7 +138,9 @@
 	unsigned short floater: 1;
 	
 	unsigned short wastebits: 10; /*room for more booleans*/
-	
+
+#endif
+
 	short gridunits;
 	
 	short rightborder, bottomborder;
@@ -163,9 +184,31 @@
 	short objectlinespacing;
 	
 	short objectindentation;
+
+#ifdef SWAP_BYTE_ORDER
 	
+	unsigned short wastebits1: 1;	/* room for more booleans */
+	
+	unsigned short objectdisabled: 1;
+	
+	unsigned short objectfastscript: 1;
+	
+	unsigned short objecttransparent: 1;
+	
+	unsigned short lastinlist: 1;
+	
+	unsigned short objectinvisible: 1;
+	
+	unsigned short objectflag: 1;
+
 	unsigned short objecthasframe: 1;
 	
+	unsigned short wastebits2: 8;	/* room for more booleans */
+
+#else
+
+	unsigned short objecthasframe: 1;
+	
 	unsigned short objectflag: 1;
 	
 	unsigned short objectinvisible: 1;
@@ -178,6 +221,10 @@
 	
 	unsigned short objectdisabled: 1;
 	
+	unsigned short wastebits: 9;	/* room for more booleans */
+
+#endif
+
 	long objecttype; /*room for lots of object types*/
 	
 	RGBColor objectfillcolor, objecttextcolor, objectframecolor;

Modified: Frontier/branches/SQLite/Common/IowaRuntime/Source/iowacore.c
===================================================================
--- Frontier/branches/SQLite/Common/IowaRuntime/Source/iowacore.c	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/IowaRuntime/Source/iowacore.c	2006-08-30 19:38:37 UTC (rev 1489)
@@ -29,6 +29,7 @@
 #include "standard.h"
 
 #include "shelltypes.h"
+#include "byteorder.h"
 
 #ifdef iowaRuntime
 
@@ -2728,12 +2729,60 @@
 
 boolean unpackobject (hdlobject *hobject, boolean *lastinlist) {
 	
+	/*
+	2006-04-17 aradke: must convert packed data to native byte-order on Intel Macs 
+	*/
+	
 	tydiskobject info;
 	tyobject obj;
 	hdlobject h;
 	
 	moveleft (unpack.p, &info, longsizeof (info));
 	
+	disktomemshort (info.versionnumber);
+	
+	disktomemshort (info.objectrect.top);
+	disktomemshort (info.objectrect.left);
+	disktomemshort (info.objectrect.bottom);
+	disktomemshort (info.objectrect.right);
+
+	disktomemlong (info.lenname);
+	disktomemlong (info.lenvalue);
+	disktomemlong (info.lenscript);
+	disktomemlong (info.lendata);
+	
+	disktomemshort (info.objectfontsize);
+	disktomemshort (info.objectstyle);
+	disktomemshort (info.objectjustification);
+	disktomemshort (info.objectrecalcstatus);
+	disktomemshort (info.objectrecalcperiod);
+	disktomemshort (info.unused1);
+	disktomemshort (info.objectdropshadowdepth);
+	disktomemshort (info.objectlinespacing);
+	disktomemshort (info.objectindentation);
+	
+	/* 
+	2006-04-17 aradke: The info.objecthasframe etc. bit-field doesn't need to be byte-swapped,
+		because this is already taken care of via the endian-specific definition in iowacore.h.
+	*/
+	
+	disktomemlong (info.objecttype);
+	
+	disktomemshort (info.objectfillcolor.red);
+	disktomemshort (info.objectfillcolor.green);
+	disktomemshort (info.objectfillcolor.blue);
+	
+	disktomemshort (info.objecttextcolor.red);
+	disktomemshort (info.objecttextcolor.green);
+	disktomemshort (info.objecttextcolor.blue);
+	
+	disktomemshort (info.objectframecolor.red);
+	disktomemshort (info.objectframecolor.green);
+	disktomemshort (info.objectframecolor.blue);
+	
+	disktomemlong (info.objectlanguage);
+	disktomemlong (info.lenrecalcscript);
+
 	if (info.versionnumber == 1) /*record format changed to allow 4 bytes for object type*/
 		info.objecttype = (unsigned long) info.v1objecttype;
 		
@@ -2898,6 +2947,10 @@
 	
 	
 boolean iowaunpack (Handle hpacked) {
+
+	/*
+	2006-04-17 aradke: must convert packed data to native byte-order on Intel Macs 
+	*/
 	
 	hdlcard hc = iowadata;
 	hdlobject newlist;
@@ -2917,6 +2970,8 @@
 	
 	unpack.p += longsizeof (header);
 	
+	disktomemshort (header.versionnumber);
+	
 	if (header.versionnumber < 4) { /*the header grew by 66 bytes in version 4*/
 		
 		header.lenwindowtitle = 0;
@@ -2924,6 +2979,30 @@
 		unpack.p -= 66;
 		}
 	
+	disktomemshort (header.v2backcolor);
+
+	disktomemlong (header.lenembeddedtable);
+
+	disktomemshort (header.defaultfillcolor);
+	disktomemshort (header.defaulttextcolor);
+	disktomemshort (header.defaultframecolor);
+	
+	/* 
+	2006-04-17 aradke: The header.defaulthasframe etc. bit-field doesn't need to be byte-swapped,
+		because this is already taken care of via the endian-specific definition in iowacore.h.
+	*/
+	
+	disktomemshort (header.gridunits);
+	disktomemshort (header.rightborder);
+	disktomemshort (header.bottomborder);
+
+	disktomemshort (header.backcolor.red);
+	disktomemshort (header.backcolor.green);
+	disktomemshort (header.backcolor.blue);
+
+	disktomemlong (header.idwindow);
+	disktomemlong (header.lenwindowtitle);
+	
 	if (header.versionnumber <= 2) /*back color was stored as an index, now stored as a RGBColor*/
 		oldclutconverter (header.v2backcolor, &header.backcolor);
 	

Modified: Frontier/branches/SQLite/Common/IowaRuntime/Source/iowaruntime.c
===================================================================
--- Frontier/branches/SQLite/Common/IowaRuntime/Source/iowaruntime.c	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/IowaRuntime/Source/iowaruntime.c	2006-08-30 19:38:37 UTC (rev 1489)
@@ -28,6 +28,8 @@
 #include "frontier.h"
 #include "standard.h"
 
+#include "byteorder.h"
+
 #include "shelltypes.h"
 #include <appletdefs.h>
 #include <iac.h>
@@ -56,6 +58,7 @@
 #define	copyCmd		4
 #define	pasteCmd	5
 #define clearCmd	6
+#define selectAllCmd	8
 #endif
 
 
@@ -1720,6 +1723,11 @@
 			
 			break;
 			
+		case selectAllCmd:  /* 2006-05-04 smd */
+			editselectall (hedit);
+			
+			break;
+			
 		} /*switch*/
 		
 	return (true);
@@ -2051,6 +2059,8 @@
 	
 	moveleft (*hpackedcard, &header, longsizeof (header));
 	
+	disktomemlong (header.idwindow);	/* 2006-04-17 aradke: for Mac Intel */
+	
 	switch (header.idwindow) {
 		
 		case 1024: case 1025:

Deleted: Frontier/branches/SQLite/Common/Paige/PaigePPC.lib
===================================================================
(Binary files differ)

Copied: Frontier/branches/SQLite/Common/Paige/libpaigefat.a (from rev 1488, Frontier/trunk/Common/Paige/libpaigefat.a)
===================================================================
(Binary files differ)

Modified: Frontier/branches/SQLite/Common/Paige/libpaigemacho.a
===================================================================
(Binary files differ)

Modified: Frontier/branches/SQLite/Common/SystemHeaders/standard.h
===================================================================
--- Frontier/branches/SQLite/Common/SystemHeaders/standard.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/SystemHeaders/standard.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -40,32 +40,6 @@
 	#include "FastTimes.h"
 #endif
 
-#ifdef PACKFLIPPED
-	#define conditionallongswap(x) dolongswap(x)
-	#define conditionalshortswap(x) doshortswap(x)
-	#define conditionalenumswap(x) doshortswap(x)
-	#define disklong(x) dolongswap(x)
-	#define memlong(x) dolongswap(x)
-	#define diskshort(x) doshortswap(x)
-	#define memshort(x) doshortswap(x)
-	#define disktomemshort(x) shortswap(x)
-	#define disktomemlong(x)  longswap(x)
-	#define memtodiskshort(x) shortswap(x)
-	#define memtodisklong(x) longswap(x)
-#else
-	#define conditionallongswap(x) x
-	#define conditionalshortswap(x) x
-	#define conditionalenumswap(x) x
-	#define disklong(x) x
-	#define memlong(x) x
-	#define diskshort(x) x
-	#define memshort(x) x
-	#define disktomemshort(x)
-	#define disktomemlong(x)
-	#define memtodiskshort(x)
-	#define memtodisklong(x)
-#endif
-
 #include "stringdefs.h"		/* embedded string definitions */
 
 #ifndef appletdefsinclude
@@ -352,6 +326,8 @@
 #define lastchar(bs) (bs [stringlength (bs)-1])
 #endif
 
+#define BIGSTRING(s) ((unsigned char *)(s))
+
 #define setemptystring(bs) (setstringlength(bs,0))
 
 #define isemptystring(bs) (stringlength(bs)==0)
@@ -461,6 +437,10 @@
 
 #define quickdrawglobal(x) qd.x
 
+extern boolean flcominitialized; /* set up in lang.c */
+extern boolean initCOM( void ); /* see FrontierWinMain.c */
+extern void shutdownCOM( void );
+
 #endif
 
 #endif

Copied: Frontier/branches/SQLite/Common/headers/byteorder.h (from rev 1488, Frontier/trunk/Common/headers/byteorder.h)
===================================================================
--- Frontier/branches/SQLite/Common/headers/byteorder.h	                        (rev 0)
+++ Frontier/branches/SQLite/Common/headers/byteorder.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -0,0 +1,192 @@
+
+/*	$Id$    */
+
+/******************************************************************************
+
+    UserLand Frontier(tm) -- High performance Web content management,
+    object database, system-level and Internet scripting environment,
+    including source code editing and debugging.
+
+    Copyright (C) 1992-2004 UserLand Software, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+******************************************************************************/
+
+#ifndef byteorderinclude
+#define byteorderinclude
+
+/*
+	2006-04-08 aradke: determine native byte order and define byte swapping macros
+*/
+
+#if (defined(WIN32) || defined(__i386) || defined(__i386__)) && !defined(__LITTLE_ENDIAN__)
+	#define __LITTLE_ENDIAN__	1
+#endif
+
+
+#if defined(__LITTLE_ENDIAN__) && ((__LITTLE_ENDIAN__ == 1) || !defined (__BIG_ENDIAN__))
+
+	#define SWAP_BYTE_ORDER	1
+
+	#define conditionallongswap(x) dolongswap(x)
+	#define conditionalshortswap(x) doshortswap(x)
+	#define conditionalenumswap(x) doshortswap(x)
+	#define disklong(x) dolongswap(x)
+	#define memlong(x) dolongswap(x)
+	#define diskshort(x) doshortswap(x)
+	#define memshort(x) doshortswap(x)
+	#define disktomemshort(x) shortswap(x)
+	#define disktomemlong(x)  longswap(x)
+	#define memtodiskshort(x) shortswap(x)
+	#define memtodisklong(x) longswap(x)
+
+#elif defined(__BIG_ENDIAN__) && ((__BIG_ENDIAN__ == 1) || !defined (__LITTLE_ENDIAN__))
+
+	#undef SWAP_BYTE_ORDER
+
+	#define conditionallongswap(x) x
+	#define conditionalshortswap(x) x
+	#define conditionalenumswap(x) x
+	#define disklong(x) x
+	#define memlong(x) x
+	#define diskshort(x) x
+	#define memshort(x) x
+	#define disktomemshort(x)
+	#define disktomemlong(x)
+	#define memtodiskshort(x)
+	#define memtodisklong(x)
+
+#else
+
+	#error "Couldn't determine byte order of target architecture, update osincludes.h"
+
+#endif
+
+
+/*
+	2006-04-16 aradke: Carbon resource manager resources are in big endian format.
+		If we are running on an Intel Mac, we need to perform byte order conversion.
+*/
+
+#if (defined(TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON == 1) && defined(SWAP_BYTE_ORDER))
+
+	#define SWAP_REZ_BYTE_ORDER	1
+
+	#define reztomemshort(x)	shortswap(x)
+	#define reztomemlong(x)		longswap(x)
+	#define reztomemrect(x)		do {shortswap((x).top); shortswap((x).left); shortswap((x).bottom); shortswap((x).right);} while(0)
+	#define memtorezshort(x)	shortswap(x)
+	#define memtorezlong(x)		longswap(x)
+	#define memtorezrect(x)		do {shortswap((x).top); shortswap((x).left); shortswap((x).bottom); shortswap((x).right);} while(0)
+
+#else
+
+	#undef SWAP_REZ_BYTE_ORDER
+
+	#define reztomemshort(x)
+	#define reztomemlong(x)
+	#define reztomemrect(x)
+	#define memtorezshort(x)
+	#define memtorezlong(x)
+	#define memtorezrect(x)
+
+#endif
+
+
+#define longswap(foo)	do {foo = dolongswap(foo);} while (0)
+#define shortswap(foo)	do {foo = doshortswap(foo);} while (0)
+
+
+#if (defined(TARGET_API_MAC_CARBON) && (TARGET_API_MAC_CARBON == 1) && defined(__GNUC__))
+
+	/* using system sdk functions from CFByteOrder.h */
+
+	#define dolongswap(foo)			CFSwapInt32(foo)
+	#define doshortswap(foo)		CFSwapInt16(foo)
+	
+#elif (defined(__i386__) && defined(__GNUC__))
+
+	/* using AT&T x86 assembly code syntax */
+
+	inline long dolongswap (long foo) {
+
+		__asm__("mov foo,%eax\nbswap %eax\nmov %eax,foo\n");
+
+		return (foo);
+		} /*dolongswap*/
+
+	inline short doshortswap (short foo) {
+
+		__asm__("mov foo,%ax\n mov %al,%bh\nmov %ah,%bl\nmov %bx,foo");
+
+		return (foo);
+		} /*doshortswap*/
+
+#elif defined(WIN32)
+
+	/* using Intel x86 assembly code syntax */
+	
+	__inline long dolongswap (long foo) {
+
+		_asm
+			{
+			mov eax,foo
+			bswap eax
+			mov foo,eax
+			}
+
+		return (foo);
+		} /*dolongswap*/
+
+	__inline short doshortswap (short foo) {
+
+		_asm
+			{
+			mov ax,foo
+			mov bh,al
+			mov bl,ah
+			mov foo,bx
+			}
+		
+		return (foo);
+		} /*doshortswap*/
+
+#else
+
+	/* portable code using only C operators */
+	
+	inline long dolongswap (long foo) {
+
+		foo = ((((foo) >> 24) & 0x000000ff)
+				| (((foo) & 0x00ff0000) >> 8)
+				| (((foo) & 0x0000ff00) << 8)
+				| (((foo) & 0x000000ff) << 24));
+		
+		return (foo);
+		} /*dolongswap*/
+
+	inline short doshortswap (short foo) {
+
+		foo = ((((foo) >> 8) & 0x00ff)
+				| (((foo) << 8) & 0xff00));
+
+		return (foo);
+		} /*doshortswap*/
+
+#endif
+
+
+#endif /* byteorderinclude */

Modified: Frontier/branches/SQLite/Common/headers/claylinelayout.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/claylinelayout.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/claylinelayout.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -79,24 +79,24 @@
 	} tycomputedlineinfo;
 
 
-#define str_claydisplay		("\x0b" "claydisplay")
-#define str_realicons		("\x09" "realicons")
-#define str_filenamebold	("\x0c" "filenamebold")
-#define str_includeline2	("\x0c" "includeline2")
-#define str_includedate		("\x0b" "includedate")
-#define str_includeframe	("\x0c" "includeframe")
-#define str_iconsize		("\x08" "iconsize")
-#define str_fillcolor		("\x09" "fillcolor")
-#define str_framecolor		("\x0a" "framecolor")
-#define str_cursorcolor		("\x0b" "cursorcolor")
-#define str_filenamecolor	("\x0d" "filenamecolor")
-#define str_othertextcolor	("\x0e" "othertextcolor")
-#define str_backcolor		("\x09" "backcolor")
-#define str_statuscolor		("\x0b" "statuscolor")
-#define str_filenamefont	("\x0c" "filenamefont")
-#define str_othertextfont	("\x0d" "othertextfont")
-#define str_filenamefontsize	("\x10" "filenamefontsize")
-#define str_othertextfontsize	("\x11" "othertextfontsize")
+#define str_claydisplay		(BIGSTRING ("\x0b" "claydisplay"))
+#define str_realicons		(BIGSTRING ("\x09" "realicons"))
+#define str_filenamebold	(BIGSTRING ("\x0c" "filenamebold"))
+#define str_includeline2	(BIGSTRING ("\x0c" "includeline2"))
+#define str_includedate		(BIGSTRING ("\x0b" "includedate"))
+#define str_includeframe	(BIGSTRING ("\x0c" "includeframe"))
+#define str_iconsize		(BIGSTRING ("\x08" "iconsize"))
+#define str_fillcolor		(BIGSTRING ("\x09" "fillcolor"))
+#define str_framecolor		(BIGSTRING ("\x0a" "framecolor"))
+#define str_cursorcolor		(BIGSTRING ("\x0b" "cursorcolor"))
+#define str_filenamecolor	(BIGSTRING ("\x0d" "filenamecolor"))
+#define str_othertextcolor	(BIGSTRING ("\x0e" "othertextcolor"))
+#define str_backcolor		(BIGSTRING ("\x09" "backcolor"))
+#define str_statuscolor		(BIGSTRING ("\x0b" "statuscolor"))
+#define str_filenamefont	(BIGSTRING ("\x0c" "filenamefont"))
+#define str_othertextfont	(BIGSTRING ("\x0d" "othertextfont"))
+#define str_filenamefontsize	(BIGSTRING ("\x10" "filenamefontsize"))
+#define str_othertextfontsize	(BIGSTRING ("\x11" "othertextfontsize"))
 
 extern void claybrowserinitdraw (void);
 
@@ -146,4 +146,4 @@
 
 #endif
 
-#endif
\ No newline at end of file
+#endif

Modified: Frontier/branches/SQLite/Common/headers/config.r
===================================================================
--- Frontier/branches/SQLite/Common/headers/config.r	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/config.r	2006-08-30 19:38:37 UTC (rev 1489)
@@ -27,37 +27,37 @@
 
 type'cnfg' {
 	
-	boolean nohorizscroll, horizscroll; /*window has horiz scrollbar?*/
+	integer nohorizscroll = 0, horizscroll = 1; /*window has horiz scrollbar?*/
 	
-	boolean novertscroll, vertscroll;
+	integer novertscroll = 0, vertscroll = 1;
 	
-	boolean dontfloat, windowfloats; /*is it a floating palette window?*/
+	integer dontfloat = 0, windowfloats = 1; /*is it a floating palette window?*/
 	
-	boolean nomessagearea, messagearea; /*allocate space for a message area?*/
+	integer nomessagearea = 0, messagearea = 1; /*allocate space for a message area?*/
 	
-	boolean dontinsetcontentrect, insetcontentrect; /*if true we inset by 3 pixels*/
+	integer dontinsetcontentrect = 0, insetcontentrect = 1; /*if true we inset by 3 pixels*/
 	
-	boolean nonewonlaunch, newonlaunch;
+	integer nonewonlaunch = 0, newonlaunch = 1;
 	
-	boolean dontopenresfile, openresfile;
+	integer dontopenresfile = 0, openresfile = 1;
 	
-	boolean normalwindow, dialogwindow; /*do a GetNewDialog on creating one of these windows?*/
+	integer normalwindow = 0, dialogwindow = 1; /*do a GetNewDialog on creating one of these windows?*/
 	
-	boolean notgrowable, isgrowable; /*provide a grow box for window*/
+	integer notgrowable = 0, isgrowable = 1; /*provide a grow box for window*/
 	
-	boolean dontcreateonnew, createonnew;
+	integer dontcreateonnew = 0, createonnew = 1;
 	
-	boolean nowindoidscrollbars, windoidscrollbars;
+	integer nowindoidscrollbars = 0, windoidscrollbars = 1;
 	
-	boolean notstoredindatabase, storedindatabase;
+	integer notstoredindatabase = 0, storedindatabase = 1;
 	
-	boolean handlesownsave, parentwindowhandlessave;
+	integer handlesownsave = 0, parentwindowhandlessave = 1;
 	
-	boolean donteraseonresize, eraseonresize;
+	integer donteraseonresize = 0, eraseonresize = 1;
 	
-	boolean consumefrontclicks, dontconsumefrontclicks;
+	integer consumefrontclicks = 0, dontconsumefrontclicks = 1;
 	
-	boolean monochromewindow, colorwindow;
+	integer monochromewindow = 0, colorwindow = 1;
 	
 	integer onehalf = 2, onethird = 3, onequarter = 4;
 	

Modified: Frontier/branches/SQLite/Common/headers/dialogs.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/dialogs.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/dialogs.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -96,15 +96,15 @@
 /* dialog button text */
 
 #ifdef MACVERSION
-	#define cancelbuttontext "\x06" "Cancel"
-	#define duplicatebuttontext "\x09" "Duplicate"
-	#define replacebuttontext "\x07" "Replace"
+	#define cancelbuttontext BIGSTRING ("\x06" "Cancel")
+	#define duplicatebuttontext BIGSTRING ("\x09" "Duplicate")
+	#define replacebuttontext BIGSTRING ("\x07" "Replace")
 #endif
 
 #ifdef WIN95VERSION
-	#define cancelbuttontext "\x07" "&Cancel"
-	#define duplicatebuttontext "\x0a" "&Duplicate"
-	#define replacebuttontext "\x08" "&Replace"
+	#define cancelbuttontext BIGSTRING ("\x07" "&Cancel")
+	#define duplicatebuttontext BIGSTRING ("\x0a" "&Duplicate")
+	#define replacebuttontext BIGSTRING ("\x08" "&Replace")
 #endif
 
 

Modified: Frontier/branches/SQLite/Common/headers/file.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/file.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/file.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -411,6 +411,8 @@
 
 extern boolean fifreadhandle (const tyfilespec *, long, Handle *);
 
+extern boolean fifreadfile (const tyfilespec *fs, Handle *x);	/* 2006-04-11 aradke */
+
 extern boolean fifwritehandle (const tyfilespec *, Handle);
 
 extern boolean fifsetposition (const tyfilespec *, long);
@@ -422,7 +424,7 @@
 extern boolean fifgetendoffile (const tyfilespec *fs, long *eof);
 
 
- /* filepath.c */
+#pragma mark === filepath.c ===
  
  extern boolean directorytopath (long, short, bigstring);
 
@@ -447,7 +449,7 @@
 extern void initfsdefault (void); /* 2005-07-18 creedon */
 
  
- /*fileverbs.c*/
+#pragma mark === fileverbs.c ===
  
  //extern filecheckdefaultpath (bigstring);
 
@@ -456,7 +458,7 @@
 extern boolean filestart (void); /*6.1b15 AR*/
 
 
-// filedialog.c
+#pragma mark === filedialog.c ===
 
 extern boolean sfdialog (tysfverb, bigstring, ptrsftypelist, tyfilespec *, OSType); /* 2005-10-06 creedon - added OSType */
 
@@ -480,9 +482,14 @@
                         
 #endif
 
-// filemp3.c
+#pragma mark === filemp3.c ===
 
 boolean getmp3info (const tyfilespec *, long *, long *, long *, long *, boolean *);
 
 
+#pragma mark === fileops.c ===
 
+extern short getfilelabelindex (const tyfilespec *, short *); /* 2006-04-23 creedon */
+
+extern boolean setfilelabelindex (const tyfilespec *, short, boolean); /* 2006-04-23 creedon */
+

Modified: Frontier/branches/SQLite/Common/headers/frontierconfig.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/frontierconfig.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/frontierconfig.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -71,41 +71,7 @@
 
 
 typedef struct tyconfigrecord {
-#ifdef MACVERSION	
-	boolean flhorizscroll: 1; /*window has horiz scrollbar?*/
-	
-	boolean flvertscroll: 1;
-	
-	boolean flwindowfloats: 1; /*is it a floating palette window?*/		// NOT USED
-	
-	boolean flmessagearea: 1; /*allocate space for a message area?*/
-	
-	boolean flinsetcontentrect: 1; /*if true we inset by 3 pixels*/
-	
-	boolean flnewonlaunch: 1;
-	
-	boolean flopenresfile: 1;
-	
-	boolean fldialog: 1; /*do a GetNewDialog on creating one of these windows?*/
-	
-	boolean flgrowable: 1; /*provide a grow box for window*/
-	
-	boolean flcreateonnew: 1;
-	
-	boolean flwindoidscrollbars: 1;
-	
-	boolean flstoredindatabase: 1;
-	
-	boolean flparentwindowhandlessave: 1;
-	
-	boolean fleraseonresize: 1;
-	
-	boolean fldontconsumefrontclicks: 1; 
-	
-	boolean flcolorwindow: 1; 
-#endif
-	
-#ifdef WIN95VERSION
+
 	short flhorizscroll; /*window has horiz scrollbar?*/
 	
 	short flvertscroll;
@@ -137,9 +103,7 @@
 	short fldontconsumefrontclicks; 
 	
 	short flcolorwindow; 
-#endif
 
-
 	short messageareafraction;
 	
 	OSType filecreator, filetype;

Modified: Frontier/branches/SQLite/Common/headers/frontierdefs.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/frontierdefs.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/frontierdefs.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -35,11 +35,13 @@
 
 #ifdef WIN95VERSION
 	#define FRONTIERCOM 1
-#ifndef OPMLEDITOR
-	#define FRONTIERWEB 0
-#else //OPMLEDITOR
-	#define FRONTIERWEB 1	/* 2006-02-05 aradke: enable HTML display in main window background */
-#endif // OPMLEDITOR
+
+	#ifndef OPMLEDITOR
+		#define FRONTIERWEB 0
+	#else //OPMLEDITOR
+		#define FRONTIERWEB 1	/* 2006-02-05 aradke: enable HTML display in main window background */
+	#endif // OPMLEDITOR
+
 	#undef winhybrid
 	#define fljustpacking 0
 	#undef flcomponent

Modified: Frontier/branches/SQLite/Common/headers/icon.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/icon.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/icon.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -32,6 +32,7 @@
 	#define atVerticalCenter	0x01
 	#define atHorizontalCenter	0x02
 	#define kTransformSelected	0x04
+	#define kAlignAbsoluteCenter	(atVerticalCenter | atHorizontalCenter)
 #endif
 
 #ifdef MACVERSION /*7.0b9 PBS: tycustomicontypeinfo is for Mac custom icons*/

Modified: Frontier/branches/SQLite/Common/headers/kernelverbdefs.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/kernelverbdefs.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/kernelverbdefs.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -51,5 +51,4 @@
 #define idregexpverbs		1023 /*2003-04-22 AR: regular expression verbs*/
 #define idmathverbs			1024 /*2004-12-29 SMD: extended math verbs*/
 #define idcryptverbs			1025 /* 2006-03-07 creedon: crypt verbs */
-#define idsqliteverbs		1026 /* 2006-03-15 gewirtz sqlite verbs */
 

Modified: Frontier/branches/SQLite/Common/headers/kernelverbs.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/kernelverbs.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/kernelverbs.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -56,4 +56,3 @@
 
 extern boolean cryptinitverbs (void); /* langcrypt.c */
 
-extern boolean sqliteinitverbs (void); /* langsqlite.c */
\ No newline at end of file

Modified: Frontier/branches/SQLite/Common/headers/langinternal.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/langinternal.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/langinternal.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -202,8 +202,6 @@
 #define frnonexistantgroupnameerror 160
 #define replaceitemerror 161 /* 2005-09-26 creedon */
 #define cmdshellnotfounderror 162 /* 2006-03-10 aradke */
-#define sqliteopenerror 163 /* 2006-03-17 gewirtz */
-#define sqlitedberror 164 /* 2006-03-17 gewirtz */
 
 #define langstacklist 137
 
@@ -221,16 +219,16 @@
 	} tystackid;
 
 
-#define machinePPC	"\x07" "PowerPC"
-#define machine68K	"\x03" "68K"
-#define machinex86	"\x03" "x86"
+#define machinePPC	BIGSTRING ("\x07" "PowerPC")
+#define machine68K	BIGSTRING ("\x03" "68K")
+#define machinex86	BIGSTRING ("\x03" "x86")
 
-#define osMacOS		"\x05" "MacOS"
-#define osWin95		"\x05" "Win95"
-#define osWinNT		"\x05" "WinNT"
+#define osMacOS		BIGSTRING ("\x05" "MacOS")
+#define osWin95		BIGSTRING ("\x05" "Win95")
+#define osWinNT		BIGSTRING ("\x05" "WinNT")
 //Code change by Timothy Paustian Tuesday, July 11, 2000 9:42:50 PM
 //Add a const to return for the carbon OS
-#define osCarbon	"\x05" "MacCn"
+#define osCarbon	BIGSTRING ("\x05" "MacCn")
 
 typedef boolean (*langtreevisitcallback) (hdltreenode, ptrvoid);
 

Deleted: Frontier/branches/SQLite/Common/headers/langsqlite.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/langsqlite.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/langsqlite.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -1,61 +0,0 @@
-
-/*	$Id: langsqlite.h,v 1.1.2.1 2006/03/24 01:31:35 davidgewirtz Exp $    */
-
-/******************************************************************************
-
-    UserLand Frontier(tm) -- High performance Web content management,
-    object database, system-level and Internet scripting environment,
-    including source code editing and debugging.
-
-    Copyright (C) 1992-2004 UserLand Software, Inc.
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-******************************************************************************/
-
-/* prototypes */
-
-extern boolean sqliteopenverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-03-15 gewirtz */
-
-extern boolean sqlitecloseverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-03-17 gewirtz */
-
-extern boolean sqlitecompilequeryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqliteclearqueryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqliteexecutequeryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumncountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumntypeverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnintverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumndoubleverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumntextverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnnameverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-18 gewirtz */
-
-extern boolean sqlitegetcolumnverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-20 gewirtz */
-
-extern boolean sqlitegeterrormessageverb (hdltreenode, tyvaluerecord *, bigstring); /* 2006-04-20 gewirtz */
-
-extern boolean sqliteinitverbs (void); /* 2006-03-15 gewirtz */
-
-/* boolean hmacmd5 (unsigned char *, int, unsigned char *, int, unsigned char *);*/ /* 2006-03-05 creedon */
-
-/* boolean hmacsha1 (unsigned char *, int, unsigned char *, int, unsigned char *);*/ /* 2006-03-12 creedon */
-

Modified: Frontier/branches/SQLite/Common/headers/macconv.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/macconv.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/macconv.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -67,7 +67,9 @@
 #define wmouseUp		38			//Windows Only
 #define zoomEvt			39			//Windows Only
 
-	
+#define suspendResumeMessage	0x0001
+#define resumeFlag				0x01
+
 #define everyEvent		-1
 #define activeFlag		256
 #define activMask		256
@@ -87,60 +89,6 @@
 #define HiWord(x) HIWORD(x)
 
 
-static long dolongswap(long foo)
-	{
-#if defined(__i386__) && defined(__GNUC__)
-	/*
-		10.0a5 - TRT - 29 Dec 2004
-		GNU by default uses the AT&T assembly code syntax;
-		MSC/MWERKS uses the Intel assembly code syntax;
-		some versions of 'gcc' accept -masm=att|intel to
-		specify which syntax to use; but for those that don't...
-	*/
-	__asm__("mov foo,%eax\nbswap %eax\nmov %eax,foo\n");
-#elif defined(__powerpc__) && defined(__GNUC__)
-	foo = Endian32_Swap(foo);
-#else
-	_asm
-		{
-		mov eax,foo
-		bswap eax
-		mov foo,eax
-		}
-#endif
-	return (foo);
-	}
-
-static short doshortswap(short foo)
-	{
-#if defined(__i386__) && defined(__GNUC__)
-	/*
-		10.0a5 - TRT - 29 Dec 2004
-		GNU by default uses the AT&T assembly code syntax;
-		MSC/MWERKS uses the Intel assembly code syntax;
-		some versions of 'gcc' accept -masm=att|intel to
-		specify which syntax to use; but for those that don't...
-	*/
-	__asm__("mov foo,%ax\n mov %al,%bh\nmov %ah,%bl\nmov %bx,foo");
-#elif defined(__powerpc__) && defined(__GNUC__)
-	foo = Endian16_Swap(foo);
-#else
-	_asm
-		{
-		mov ax,foo
-		mov bh,al
-		mov bl,ah
-		mov foo,bx
-		}
-#endif
-	return (foo);
-	}
-
-#define longswap(foo) do {foo = dolongswap(foo);} while (0)
-
-#define shortswap(foo) do {foo = doshortswap(foo);} while (0)
-
-
 enum {
 /* Apple event descriptor types */
 	typeBoolean					= 'bool',

Modified: Frontier/branches/SQLite/Common/headers/osincludes.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/osincludes.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/osincludes.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -37,6 +37,8 @@
 #ifdef WIN95VERSION
 
 	#define WIN32_LEAN_AND_MEAN 1
+	#define _WIN32_DCOM 1
+	#define CINTERFACE 1
 
 	#include <windows.h>
 
@@ -55,6 +57,10 @@
 	#include <winsock2.h>
 	#include <mswsock.h>
 
+	#undef __cplusplus
+	#include <objbase.h>
+	#include <mlang.h>
+
 #endif /* WIN95VERSION */
 
 
@@ -307,19 +313,5 @@
 #include <string.h>
 #include <assert.h>
 
-/*
-	2006-04-07 aradke: determine native byte order.
-		checking whether WIN32 is defined is rather crude,
-		but I haven't found a better way yet.
-*/
 
-#if defined(__LITTLE_ENDIAN__) || defined(WIN32)
-	#define PACKFLIPPED	1	/* enable little endian / big endian conversion for database file functions */
-#elif defined(__BIG_ENDIAN__)
-	#undef PACKFLIPPED		/* big endian is native database format, no need to convert */
-#else
-	#error Failed to determine native byte order of target architecture, update osincludes.h
-#endif
-
-
 #endif /* __osincludes_h__ */

Modified: Frontier/branches/SQLite/Common/headers/processinternal.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/processinternal.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/processinternal.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -195,6 +195,9 @@
 	ThreadEntryUPP threadEntryCallbackUPP;
 	
 	#endif
+
+	boolean flcominitialized;
+
 	} tythreadglobals, *ptrthreadglobals, **hdlthreadglobals;
 
 

Modified: Frontier/branches/SQLite/Common/headers/shellprivate.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/shellprivate.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/shellprivate.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -63,17 +63,6 @@
 	} tymenustate;
 
 
-typedef struct tyjugglermessage {
-	
-	long eventtype: 8; /*bits 24 -- 31*/
-	
-	long reservedbits: 22; /*bits 2 -- 23*/
-	
-	long flconvertclipboard: 1; /*bit 1*/
-	
-	long flresume: 1; /*bit 0*/
-	} tyjugglermessage;
-
 #ifdef version42orgreater
 	#define cteditors 14
 #else

Modified: Frontier/branches/SQLite/Common/headers/stringdefs.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/stringdefs.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/stringdefs.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -29,72 +29,73 @@
 
 
 
-	#define STR_Cant_delete_XXX_because_it_hasnt_been_defined	"\x31" "Can't delete \"^0\" because it hasn't been defined."
-	#define STR_The_name_XXX_hasnt_been_defined					"\x22" "The name \"^0\" hasn't been defined."
-	#define STR_Address_value_doesnt_refer_to_a_valid_table		"\x2d" "Address value doesn't refer to a valid table."
+	#define STR_Cant_delete_XXX_because_it_hasnt_been_defined	BIGSTRING ("\x31" "Can't delete \"^0\" because it hasn't been defined.")
+	#define STR_The_name_XXX_hasnt_been_defined					BIGSTRING ("\x22" "The name \"^0\" hasn't been defined.")
+	#define STR_Address_value_doesnt_refer_to_a_valid_table		BIGSTRING ("\x2d" "Address value doesn't refer to a valid table.")
 
-	#define STR_Assertion	"\x5e" "Assertion failed in file ^1, at line ^2.  Probably no big deal, but please tell Doug.  Thanks!"
+	#define STR_Assertion	BIGSTRING ("\x5e" "Assertion failed in file ^1, at line ^2.  Probably no big deal, but please tell Doug.  Thanks!")
 
-	#define STR_unknown		"\x07" "unknown"       
-	#define STR_char		"\x04" "char"
-	#define STR_int			"\x03" "int"
-	#define STR_long		"\x04" "long"
-	#define STR_unused1		"\x07" "unused1"
-	#define STR_binary		"\x06" "binary"
-	#define STR_boolean		"\x07" "boolean"
-	#define STR_token		"\x05" "token"
-	#define STR_date		"\x04" "date"
-	#define STR_address		"\x07" "address"
-	#define STR_compiled_code	"\x0d" "compiled code"
-	#define STR_string		"\x06" "string"
-	#define STR_external	"\x08" "external"
-	#define STR_direction	"\x09" "direction"
-	#define STR_unused2		"\x07" "unused2"
-	#define STR_string4		"\x07" "string4"
-	#define STR_unused3		"\x07" "unused3"	
-	#define STR_point		"\x05" "point"	
-	#define STR_rect		"\x04" "rect"	
-	#define STR_pattern		"\x07" "pattern"	
-	#define STR_rgb			"\x03" "rgb"	
-	#define STR_fixed		"\x05" "fixed"	
-	#define STR_single		"\x06" "single"	
-	#define STR_double		"\x06" "double"	
-	#define STR_objspec		"\x07" "objspec"	
-	#define STR_filespec	"\x08" "filespec"	
-	#define STR_alias		"\x05" "alias"	
-	#define STR_enumerator	"\x0a" "enumerator"	
-	#define STR_list		"\x04" "list"
-	#define STR_record		"\x06" "record"
-	#define STR_outline		"\x07" "outline"
-	#define STR_wptext		"\x06" "wptext"
-	#define STR_interface	"\x09" "interface"
-	#define STR_headline	"\x08" "headline"
-	#define STR_table		"\x05" "table"
-	#define STR_script		"\x06" "script"
+	#define STR_unknown		BIGSTRING ("\x07" "unknown")       
+	#define STR_char		BIGSTRING ("\x04" "char")
+	#define STR_int			BIGSTRING ("\x03" "int")
+	#define STR_long		BIGSTRING ("\x04" "long")
+	#define STR_unused1		BIGSTRING ("\x07" "unused1")
+	#define STR_binary		BIGSTRING ("\x06" "binary")
+	#define STR_boolean		BIGSTRING ("\x07" "boolean")
+	#define STR_token		BIGSTRING ("\x05" "token")
+	#define STR_date		BIGSTRING ("\x04" "date")
+	#define STR_address		BIGSTRING ("\x07" "address")
+	#define STR_compiled_code	BIGSTRING ("\x0d" "compiled code")
+	#define STR_string		BIGSTRING ("\x06" "string")
+	#define STR_external	BIGSTRING ("\x08" "external")
+	#define STR_direction	BIGSTRING ("\x09" "direction")
+	#define STR_unused2		BIGSTRING ("\x07" "unused2")
+	#define STR_string4		BIGSTRING ("\x07" "string4")
+	#define STR_unused3		BIGSTRING ("\x07" "unused3")	
+	#define STR_point		BIGSTRING ("\x05" "point")	
+	#define STR_rect		BIGSTRING ("\x04" "rect")	
+	#define STR_pattern		BIGSTRING ("\x07" "pattern")	
+	#define STR_rgb			BIGSTRING ("\x03" "rgb")	
+	#define STR_fixed		BIGSTRING ("\x05" "fixed")	
+	#define STR_single		BIGSTRING ("\x06" "single")	
+	#define STR_double		BIGSTRING ("\x06" "double")	
+	#define STR_objspec		BIGSTRING ("\x07" "objspec")	
+	#define STR_filespec	BIGSTRING ("\x08" "filespec")	
+	#define STR_alias		BIGSTRING ("\x05" "alias")	
+	#define STR_enumerator	BIGSTRING ("\x0a" "enumerator")	
+	#define STR_list		BIGSTRING ("\x04" "list")
+	#define STR_record		BIGSTRING ("\x06" "record")
+	#define STR_outline		BIGSTRING ("\x07" "outline")
+	#define STR_wptext		BIGSTRING ("\x06" "wptext")
+	#define STR_interface	BIGSTRING ("\x09" "interface")
+	#define STR_headline	BIGSTRING ("\x08" "headline")
+	#define STR_table		BIGSTRING ("\x05" "table")
+	#define STR_script		BIGSTRING ("\x06" "script")
 	#define STR_menubar		"\x07" "menubar"
-	#define STR_picture		"\x07" "picture"
+	#define STR_picture		BIGSTRING ("\x07" "picture")
 
-	#define STR_with		"\x04" "with"
-	#define STR_this		"\x04" "this"
+	#define STR_with		BIGSTRING ("\x04" "with")
+	#define STR_this		BIGSTRING ("\x04" "this")
 	#define STR_temp		"\x04" "temp"
 	#define STR_environment	"\x0b" "environment"
+	#define STR_charsets	"\x08" "charsets"
 
-	#define STR_Stack_overflow	"\x0f" "Stack overflow!"
+	#define STR_Stack_overflow	BIGSTRING ("\x0f" "Stack overflow!")
 
-	#define STR_too_many_pophashtables	"\x16" "too many pophashtables"
-	#define STR_trying_to_dispose_global_symbol_table	"\x26" "trying to dispose global symbol table!"
-	#define STR_pushpackstack_no_room_on_stack		"\x1f" "pushpackstack: no room on stack"
-	#define STR_poppackstack_nothing_on_stack		"\x1e" "poppackstack: nothing on stack"
-	#define STR_Error_unpacking		"\x11" "Error unpacking: "
+	#define STR_too_many_pophashtables	BIGSTRING ("\x16" "too many pophashtables")
+	#define STR_trying_to_dispose_global_symbol_table	BIGSTRING ("\x26" "trying to dispose global symbol table!")
+	#define STR_pushpackstack_no_room_on_stack		BIGSTRING ("\x1f" "pushpackstack: no room on stack")
+	#define STR_poppackstack_nothing_on_stack		BIGSTRING ("\x1e" "poppackstack: nothing on stack")
+	#define STR_Error_unpacking		BIGSTRING ("\x11" "Error unpacking: ")
 
-	#define STR_The_version_number_of_this_database_file_is_not_recognized_by_this_version_of_Frontier	"\x57" "The version number of this database file is not recognized by this version of Frontier."
+	#define STR_The_version_number_of_this_database_file_is_not_recognized_by_this_version_of_Frontier	BIGSTRING ("\x57" "The version number of this database file is not recognized by this version of Frontier.")
 
-	#define STR_move			"\x04" "move"
-	#define STR_copy			"\x04" "copy"
-	#define STR_rename			"\x06" "rename"
-	#define STR_moveandrename	"\x0d" "moveandrename"
-	#define STR_assign			"\x06" "assign"
-	#define STR_nil_table_address__Creating_empty_table		"\x2b" "nil table address.  (Creating empty table.)"
+	#define STR_move			BIGSTRING ("\x04" "move")
+	#define STR_copy			BIGSTRING ("\x04" "copy")
+	#define STR_rename			BIGSTRING ("\x06" "rename")
+	#define STR_moveandrename	BIGSTRING ("\x0d" "moveandrename")
+	#define STR_assign			BIGSTRING ("\x06" "assign")
+	#define STR_nil_table_address__Creating_empty_table		BIGSTRING ("\x2b" "nil table address.  (Creating empty table.)")
 
 
 	#define STR_compiler		"\x08" "compiler"
@@ -118,40 +119,40 @@
 	#define STR_resume			"\x06" "resume"
 	#define STR_shutdown		"\x08" "shutdown"
 	#define STR_system			"\x06" "system"
-	#define STR_menus			"\x05" "menus"
+	#define STR_menus			BIGSTRING ("\x05" "menus")
 	#define STR_menubars		"\x0b" "sharedmenus"
 	#define STR_macintosh		"\x09" "macintosh"
 	#define STR_objectmodel		"\x0b" "objectmodel"
 	#define STR_else			"\x04" "else"
 
 
-	#define STR_File_was_created_by_an_incompatible_version_of_this_program		"\x3c" "File was created by an incompatible version of this program."
-	#define STR_Internal_error_attempted_to_read_a_free_block					"\x30" "Internal error:  attempted to read a free block."
-	#define STR_Internal_error_unimplemented_function_call						"\x24" "Verb unimplemented on this platform."
-	#define STR_Internal_error_bad_type_for_temp_data							"\x28" "Internal error:  bad type for temp data."
-	#define STR_error							"\x05" "error"
-	#define STR_hash_table						"\x0a" "hash table"
-	#define STR_Stack_overflow_XXX_stack		"\x1a" "Stack overflow:  ^0 stack."
-	#define STR_outline_stack_overflow			"\x17" "outline stack overflow!"
-	#define	STR_wp_stack_overflow				"\x12" "wp stack overflow!"
-	#define STR_database_stack_overflow			"\x18" "database stack overflow!"
-	#define STR_bad_outline_version_number		"\x1a" "bad outline version number"
-	#define STR_bad_list_version_number			"\x17" "bad list version number"
-	#define STR_ourline_windowopen_inconsistency	"\x20" "outline windowopen inconsistency"
-	#define STR_increase_cteditors				"\x24" "increase cteditors in shellprivate.h"
-	#define STR_failed_to_load_a_button_list	"\x1c" "failed to load a button list"
-	#define STR_globals_stack_overflow			"\x17" "globals stack overflow!"
-	#define STR_increase_maxkeyboardhooks		"\x19" "increase maxkeyboardhooks"
-	#define STR_increase_maxdirtyhooks			"\x16" "increase maxdirtyhooks"
-	#define STR_increase_maxmenuhooks			"\x15" "increase maxmenuhooks"
-	#define STR_increase_maxeventhooks			"\x16" "increase maxeventhooks"
-	#define STR_increase_maxerrorhooks			"\x16" "increase maxerrorhooks"
-	#define STR_increase_maxscraphooks			"\x16" "increase maxscraphooks"
-	#define STR_increase_maxmemoryhooks			"\x17" "increase maxmemoryhooks"
-	#define STR_increase_maxfilehooks			"\x15" "increase maxfilehooks"
+	#define STR_File_was_created_by_an_incompatible_version_of_this_program		BIGSTRING ("\x3c" "File was created by an incompatible version of this program.")
+	#define STR_Internal_error_attempted_to_read_a_free_block					BIGSTRING ("\x30" "Internal error:  attempted to read a free block.")
+	#define STR_Internal_error_unimplemented_function_call						BIGSTRING ("\x24" "Verb unimplemented on this platform.")
+	#define STR_Internal_error_bad_type_for_temp_data							BIGSTRING ("\x28" "Internal error:  bad type for temp data.")
+	#define STR_error							BIGSTRING ("\x05" "error")
+	#define STR_hash_table						BIGSTRING ("\x0a" "hash table")
+	#define STR_Stack_overflow_XXX_stack		BIGSTRING ("\x1a" "Stack overflow:  ^0 stack.")
+	#define STR_outline_stack_overflow			BIGSTRING ("\x17" "outline stack overflow!")
+	#define	STR_wp_stack_overflow				BIGSTRING ("\x12" "wp stack overflow!")
+	#define STR_database_stack_overflow			BIGSTRING ("\x18" "database stack overflow!")
+	#define STR_bad_outline_version_number		BIGSTRING ("\x1a" "bad outline version number")
+	#define STR_bad_list_version_number			BIGSTRING ("\x17" "bad list version number")
+	#define STR_ourline_windowopen_inconsistency	BIGSTRING ("\x20" "outline windowopen inconsistency")
+	#define STR_increase_cteditors				BIGSTRING ("\x24" "increase cteditors in shellprivate.h")
+	#define STR_failed_to_load_a_button_list	BIGSTRING ("\x1c" "failed to load a button list")
+	#define STR_globals_stack_overflow			BIGSTRING ("\x17" "globals stack overflow!")
+	#define STR_increase_maxkeyboardhooks		BIGSTRING ("\x19" "increase maxkeyboardhooks")
+	#define STR_increase_maxdirtyhooks			BIGSTRING ("\x16" "increase maxdirtyhooks")
+	#define STR_increase_maxmenuhooks			BIGSTRING ("\x15" "increase maxmenuhooks")
+	#define STR_increase_maxeventhooks			BIGSTRING ("\x16" "increase maxeventhooks")
+	#define STR_increase_maxerrorhooks			BIGSTRING ("\x16" "increase maxerrorhooks")
+	#define STR_increase_maxscraphooks			BIGSTRING ("\x16" "increase maxscraphooks")
+	#define STR_increase_maxmemoryhooks			BIGSTRING ("\x17" "increase maxmemoryhooks")
+	#define STR_increase_maxfilehooks			BIGSTRING ("\x15" "increase maxfilehooks")
 
-	#define STR_Unknown_error					"\x0e" "Unknown error."
-	#define STR_Mac_OS_Error					"\x0e" "Mac OS Error: "
+	#define STR_Unknown_error					BIGSTRING ("\x0e" "Unknown error.")
+	#define STR_Mac_OS_Error					BIGSTRING ("\x0e" "Mac OS Error: ")
 
-	#define	STR_menuseparator					"\x02" "(-"
+	#define	STR_menuseparator					BIGSTRING ("\x02" "(-")
 	#define	STR_hexprefix						"\x02" "0x"

Modified: Frontier/branches/SQLite/Common/headers/strings.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/strings.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/strings.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -161,6 +161,8 @@
 extern void copyctopstring (const char *, bigstring);
 
 #ifdef WIN95VERSION
+extern boolean copyWideToPString (const wchar_t *, bigstring);
+extern boolean copyPStringToWide (bigstring, long *, wchar_t *);
 extern void copyrezstring (const bigstring, bigstring);
 #endif
 
@@ -266,5 +268,9 @@
 
 extern boolean utf8tomacroman (Handle, Handle); /* 2006-02-25 creedon */
 
+extern boolean convertCharset( Handle, Handle, bigstring, bigstring );
+
+extern boolean isTextEncodingAvailable( bigstring ); /* 2006-04-23 smd */
+
 #endif
 

Modified: Frontier/branches/SQLite/Common/headers/tablestructure.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/tablestructure.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/tablestructure.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -180,7 +180,9 @@
 
 extern hdlhashtable environmenttable;
 
+extern hdlhashtable charsetstable;
 
+
 extern byte nameinternaltable []; 
 
 extern byte namemenubar []; 
@@ -227,7 +229,9 @@
 
 extern byte nameenvironmenttable [];
 
+extern byte namecharsetstable [];
 
+
 /*prototypes*/
 
 extern boolean linksystemtablestructure (hdlhashtable); /*tablestructure.c*/

Modified: Frontier/branches/SQLite/Common/headers/versions.h
===================================================================
--- Frontier/branches/SQLite/Common/headers/versions.h	2006-08-30 18:53:23 UTC (rev 1488)
+++ Frontier/branches/SQLite/Common/headers/versions.h	2006-08-30 19:38:37 UTC (rev 1489)
@@ -56,10 +56,10 @@
 	#define APPNAME							"Radio"
 	#define APP_COPYRIGHT_HOLDER			"UserLand Software, Inc"
 	
-	#define bs_APP_NAME						"\x05" "Radio"
-	#define bs_APP_SLOGAN					"\x2b" "The power of Web publishing on your desktop"
-	#define bs_APP_COPYRIGHT				"\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc."
-	#define bs_APP_URL						"\x26" "http://frontierkernel.sourceforge.net/"
+	#define bs_APP_NAME						BIGSTRING ("\x05" "Radio")
+	#define bs_APP_SLOGAN					BIGSTRING ("\x2b" "The power of Web publishing on your desktop")
+	#define bs_APP_COPYRIGHT				BIGSTRING ("\x23" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " UserLand Software, Inc.")
+	#define bs_APP_URL						BIGSTRING ("\x26" "http://frontierkernel.sourceforge.net/")
 
 	#define	APP_MAJOR_VERSION				10
 	#define	APP_MAJOR_VERSION_BCD			0x10 	/* major version in BCD notation */
@@ -69,10 +69,10 @@
 	#define	APP_SUBMINOR_VERSION_BCD		0x10  	/* sub and minor version in BCD notation */
 
 	#define APP_STAGE_CODE					0x40	/* dev = 0x20, alpha = 0x40, beta = 0x60, final = 0x80 */
-	#define	APP_REVISION_LEVEL				9		/* for non-final releases only */
-	#define	APP_BUILD_NUMBER				9		/* increment by one for every release, final or not */
+	#define	APP_REVISION_LEVEL				10		/* for non-final releases only */
+	#define	APP_BUILD_NUMBER				10		/* increment by one for every release, final or not */
 
-	#define	APP_VERSION_STRING				"10.1a9"
+	#define	APP_VERSION_STRING				"10.1a10"
 
 #else
 
@@ -82,10 +82,10 @@
 
 	#define APP_COPYRIGHT_HOLDER			"Scripting News, Inc"
 
-	#define bs_APP_NAME						"\x04" "OPML"
-	#define bs_APP_SLOGAN					"\x25" "Powerful OPML editing on your desktop"
-	#define bs_APP_COPYRIGHT				"\x20" "\xA9 " APP_COPYRIG...
 
[truncated message content]