Menu
▾
▴
SF.net SVN: frontierkernel: [1266] Frontier/branches/Conversant/Common/source
|
From: <set...@us...> - 2006-04-13 18:36:17
|
Revision: 1266 Author: sethdill Date: 2006-04-13 11:34:30 -0700 (Thu, 13 Apr 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1266&view=rev Log Message: ----------- Merged trunk changes r1224:1260 into my Conversant branch. Modified Paths: -------------- Frontier/branches/Conversant/Common/IOAToolkit/ioabutton.c Frontier/branches/Conversant/Common/SystemHeaders/standard.h Frontier/branches/Conversant/Common/headers/claylinelayout.h Frontier/branches/Conversant/Common/headers/conversantverbs.h Frontier/branches/Conversant/Common/headers/dialogs.h Frontier/branches/Conversant/Common/headers/file.h Frontier/branches/Conversant/Common/headers/frontierdefs.h Frontier/branches/Conversant/Common/headers/langinternal.h Frontier/branches/Conversant/Common/headers/macconv.h Frontier/branches/Conversant/Common/headers/osincludes.h Frontier/branches/Conversant/Common/headers/stringdefs.h Frontier/branches/Conversant/Common/headers/versions.h Frontier/branches/Conversant/Common/resources/Mac/SHELL.R Frontier/branches/Conversant/Common/resources/Mac/kernelverbs.r Frontier/branches/Conversant/Common/resources/Win32/WinLand.rc Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c Frontier/branches/Conversant/Common/source/WinSockNetEvents.c Frontier/branches/Conversant/Common/source/about.c Frontier/branches/Conversant/Common/source/cancoon.c Frontier/branches/Conversant/Common/source/cancoonwindow.c Frontier/branches/Conversant/Common/source/claybrowserstruc.c Frontier/branches/Conversant/Common/source/claybrowservalidate.c Frontier/branches/Conversant/Common/source/claycallbacks.c Frontier/branches/Conversant/Common/source/claylinelayout.c Frontier/branches/Conversant/Common/source/command.c Frontier/branches/Conversant/Common/source/conversantverbs.c Frontier/branches/Conversant/Common/source/db.c Frontier/branches/Conversant/Common/source/dockmenu.c Frontier/branches/Conversant/Common/source/filedialog.c Frontier/branches/Conversant/Common/source/filemp3.c Frontier/branches/Conversant/Common/source/fileops.c Frontier/branches/Conversant/Common/source/fileverbs.c Frontier/branches/Conversant/Common/source/findinfile.c Frontier/branches/Conversant/Common/source/font.c Frontier/branches/Conversant/Common/source/icon.c Frontier/branches/Conversant/Common/source/iso8859.c Frontier/branches/Conversant/Common/source/langcrypt.c Frontier/branches/Conversant/Common/source/langdate.c Frontier/branches/Conversant/Common/source/langdll.c Frontier/branches/Conversant/Common/source/langexternal.c Frontier/branches/Conversant/Common/source/langhash.c Frontier/branches/Conversant/Common/source/langhtml.c Frontier/branches/Conversant/Common/source/langlist.c Frontier/branches/Conversant/Common/source/langops.c Frontier/branches/Conversant/Common/source/langpack.c Frontier/branches/Conversant/Common/source/langquicktime.c Frontier/branches/Conversant/Common/source/langregexp.c Frontier/branches/Conversant/Common/source/langscan.c Frontier/branches/Conversant/Common/source/langstartup.c Frontier/branches/Conversant/Common/source/langsystypes.c Frontier/branches/Conversant/Common/source/langtree.c Frontier/branches/Conversant/Common/source/langvalue.c Frontier/branches/Conversant/Common/source/langverbs.c Frontier/branches/Conversant/Common/source/langwinipc.c Frontier/branches/Conversant/Common/source/langxml.c Frontier/branches/Conversant/Common/source/memory.c Frontier/branches/Conversant/Common/source/menupack.c Frontier/branches/Conversant/Common/source/menuverbs.c Frontier/branches/Conversant/Common/source/odbengine.c Frontier/branches/Conversant/Common/source/oplangtext.c Frontier/branches/Conversant/Common/source/oplist.c Frontier/branches/Conversant/Common/source/oppack.c Frontier/branches/Conversant/Common/source/oppopup.c Frontier/branches/Conversant/Common/source/oprefcon.c Frontier/branches/Conversant/Common/source/ops.c Frontier/branches/Conversant/Common/source/opstructure.c Frontier/branches/Conversant/Common/source/opvalidate.c Frontier/branches/Conversant/Common/source/opverbs.c Frontier/branches/Conversant/Common/source/opxml.c Frontier/branches/Conversant/Common/source/pict.c Frontier/branches/Conversant/Common/source/player.c Frontier/branches/Conversant/Common/source/popup.c Frontier/branches/Conversant/Common/source/process.c Frontier/branches/Conversant/Common/source/progressbar.c Frontier/branches/Conversant/Common/source/quickdraw.c Frontier/branches/Conversant/Common/source/scripts.c Frontier/branches/Conversant/Common/source/search.c Frontier/branches/Conversant/Common/source/shellfile.c Frontier/branches/Conversant/Common/source/shellmenu.c Frontier/branches/Conversant/Common/source/shellprint.c Frontier/branches/Conversant/Common/source/shellsysverbs.c Frontier/branches/Conversant/Common/source/shellverbs.c Frontier/branches/Conversant/Common/source/shellwindow.c Frontier/branches/Conversant/Common/source/shellwindowverbs.c Frontier/branches/Conversant/Common/source/strings.c Frontier/branches/Conversant/Common/source/stringverbs.c Frontier/branches/Conversant/Common/source/tabledisplay.c Frontier/branches/Conversant/Common/source/tableexternal.c Frontier/branches/Conversant/Common/source/tableformats.c Frontier/branches/Conversant/Common/source/tableops.c Frontier/branches/Conversant/Common/source/tablepack.c Frontier/branches/Conversant/Common/source/tablepopup.c Frontier/branches/Conversant/Common/source/tablestructure.c Frontier/branches/Conversant/Common/source/tablevalidate.c Frontier/branches/Conversant/Common/source/winregistry.c Frontier/branches/Conversant/Common/source/wpengine.c Added Paths: ----------- Frontier/branches/Conversant/Common/headers/byteorder.h Modified: Frontier/branches/Conversant/Common/IOAToolkit/ioabutton.c =================================================================== --- Frontier/branches/Conversant/Common/IOAToolkit/ioabutton.c 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/IOAToolkit/ioabutton.c 2006-04-13 18:34:30 UTC (rev 1266) @@ -136,7 +136,7 @@ GetThemeFont (kThemePushButtonFont, smSystemScript, fontname, &fontsize, &fontstyle); - fontgetnumber (fontname, &idfont); + fontgetnumber (fontname, (short *)(&idfont)); pushstyle (geneva, 9, bold); Modified: Frontier/branches/Conversant/Common/SystemHeaders/standard.h =================================================================== --- Frontier/branches/Conversant/Common/SystemHeaders/standard.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/SystemHeaders/standard.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -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) Copied: Frontier/branches/Conversant/Common/headers/byteorder.h (from rev 1260, Frontier/trunk/Common/headers/byteorder.h) =================================================================== --- Frontier/branches/Conversant/Common/headers/byteorder.h (rev 0) +++ Frontier/branches/Conversant/Common/headers/byteorder.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -0,0 +1,162 @@ + +/* $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 + + +#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/Conversant/Common/headers/claylinelayout.h =================================================================== --- Frontier/branches/Conversant/Common/headers/claylinelayout.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/claylinelayout.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -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/Conversant/Common/headers/conversantverbs.h =================================================================== --- Frontier/branches/Conversant/Common/headers/conversantverbs.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/conversantverbs.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -1 +1 @@ -/****************************************************************************** Conversant Verbs Conversant-related verbs and functions for the Frontier Kernel Created by Seth Dillingham on 12/31/04. Copyright (C) 2004, 2005, 2006 Macrobyte Resources. 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 conversantinclude #define conversantinclude #define conversanterrorlist 270 #define notimplementederror 1 #define STR_textname ("\x05" "\ttext") #define STR_rezname ("\x09" "\trezdelim") #define STR_macroname ("\x06" "\tmacro") #define STR_paramname ("\x06" "\tparam") #define STR_rezdelim ("\x01" "|") #define STR_macro ("\x05" "macro") #define STR_ifmacro ("\x02" "if") #define STR_elseifmacro ("\x06" "elseif") #define STR_elsemacro ("\x04" "else") #define STR_endifmacro ("\x05" "endif") #define STR_conditional ("\x0b" "conditional") #define STR_endconditional ("\x0f" "end conditional") #define STR_name ("\x04" "name") #define STR_type ("\x04" "type") #define STR_condblock ("\x10" "conditionalBlock") #define STR_macrotype ("\x09" "macroType") #define STR_parenthetical ("\x0d" "parenthetical") #define STR_parameterless ("\x0d" "parameterless") #define STR_attvaluepairs ("\x13" "attributeValuePairs") #define STR_params ("\x06" "params") #define STR_convcompileerror ("\x39" "Error compiling string (^0). Problem seems to be here: ^1") #define STR_nearcharacteroffset ("\x16" " (Near character #^0.)") #define STR_badcharinmacroname ("\x26" "Illegal character found in macro name.") #define STR_badcharinparamname ("\x26" "Illegal character found in param name.") #define STR_badcharunquoted ("\x29" "Illegal character found in unquoted param") #define STR_seekingparamname ("\x19" "Searching for param name.") #define STR_endfoundseekingparamname ("\x33" "Reached end of string while seeking parameter name.") #define STR_missingequalsign ("\x14" "Missing equals sign.") #define STR_badparametervalue ("\x4c" "Bad parameter value. Only macros, resources, and quoted strings are allowed.") #define STR_illegalparamstart ("\x2f" "Illegal start of param value after equals sign.") #define STR_endfoundprocmacro ("\x2d" "Reached end of string while processing macro.") #define STR_endfoundquoteparam ("\x37" "Reached end of string while processing quoted parameter.") #define STR_endfoundrezparam ("\x39" "Reached end of string while processing resource parameter.") #define STR_missingcomma ("\x26" "Missing comma between parameter values") #define STR_extracomma ("\x11" "Found extra comma") typedef enum tyconversanttoken { /* verbs that are processed by conversantverbs.c */ compilestringfunc, cconversantverbs } tyconversanttoken; typedef enum tyconvitemtype { /* types that are found when looking for the next macro or resource */ CONV_NOTYPE, /* no macro or resource was found */ CONV_MACRO, /* macro was found */ CONV_RESOURCE, /* resource was found */ /* types of macros */ CONV_MACROTYPE_NOPARAM, /* regular macro */ CONV_MACROTYPE_COND_IF, /* if macro */ CONV_MACROTYPE_COND_ELSE, /* else macro */ CONV_MACROTYPE_COND_ELSEIF, /* elseif macro */ CONV_MACROTYPE_COND_ENDIF, /* endif macro */ CONV_MACROTYPE_AV, /* attribute-value pairs */ CONV_MACROTYPE_PAREN /* parenthetical macros */ } tyconvitemtype; typedef struct convaddress { /* name and table of an xml item */ long tblsize; hdlhashtable ht; bigstring bs; } convaddress, *ptrconvaddress; /* function declarations */ static void extractstringfromhandle( Handle, long, long, bigstring ); static boolean conv_addrezdelim( hdlhashtable ); static boolean conv_compilemacro( hdlhashtable *, Handle, long *, long, long * ); #endif /* conversantinclude */ \ No newline at end of file +/****************************************************************************** Conversant Verbs Conversant-related verbs and functions for the Frontier Kernel Created by Seth Dillingham on 12/31/04. Copyright (C) 2004, 2005, 2006 Macrobyte Resources. 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 conversantinclude #define conversantinclude #define conversanterrorlist 270 #define notimplementederror 1 #define STR_textname (BIGSTRING ("\x05" "\ttext")) #define STR_rezname (BIGSTRING ("\x09" "\trezdelim")) #define STR_macroname (BIGSTRING ("\x06" "\tmacro")) #define STR_paramname (BIGSTRING ("\x06" "\tparam")) #define STR_rezdelim (BIGSTRING ("\x01" "|")) #define STR_macro (BIGSTRING ("\x05" "macro")) #define STR_ifmacro (BIGSTRING ("\x02" "if")) #define STR_elseifmacro (BIGSTRING ("\x06" "elseif")) #define STR_elsemacro (BIGSTRING ("\x04" "else")) #define STR_endifmacro (BIGSTRING ("\x05" "endif")) #define STR_conditional (BIGSTRING ("\x0b" "conditional")) #define STR_endconditional (BIGSTRING ("\x0f" "end conditional")) #define STR_name (BIGSTRING ("\x04" "name")) #define STR_type (BIGSTRING ("\x04" "type")) #define STR_condblock (BIGSTRING ("\x10" "conditionalBlock")) #define STR_macrotype (BIGSTRING ("\x09" "macroType")) #define STR_parenthetical (BIGSTRING ("\x0d" "parenthetical")) #define STR_parameterless (BIGSTRING ("\x0d" "parameterless")) #define STR_attvaluepairs (BIGSTRING ("\x13" "attributeValuePairs")) #define STR_params (BIGSTRING ("\x06" "params")) #define STR_convcompileerror (BIGSTRING ("\x39" "Error compiling string (^0). Problem seems to be here: ^1")) #define STR_nearcharacteroffset (BIGSTRING ("\x16" " (Near character #^0.)")) #define STR_badcharinmacroname (BIGSTRING ("\x26" "Illegal character found in macro name.")) #define STR_badcharinparamname (BIGSTRING ("\x26" "Illegal character found in param name.")) #define STR_badcharunquoted (BIGSTRING ("\x29" "Illegal character found in unquoted param")) #define STR_seekingparamname (BIGSTRING ("\x19" "Searching for param name.")) #define STR_endfoundseekingparamname (BIGSTRING ("\x33" "Reached end of string while seeking parameter name.")) #define STR_missingequalsign (BIGSTRING ("\x14" "Missing equals sign.")) #define STR_badparametervalue (BIGSTRING ("\x4c" "Bad parameter value. Only macros, resources, and quoted strings are allowed.")) #define STR_illegalparamstart (BIGSTRING ("\x2f" "Illegal start of param value after equals sign.")) #define STR_endfoundprocmacro (BIGSTRING ("\x2d" "Reached end of string while processing macro.")) #define STR_endfoundquoteparam (BIGSTRING ("\x37" "Reached end of string while processing quoted parameter.")) #define STR_endfoundrezparam (BIGSTRING ("\x39" "Reached end of string while processing resource parameter.")) #define STR_missingcomma (BIGSTRING ("\x26" "Missing comma between parameter values")) #define STR_extracomma (BIGSTRING ("\x11" "Found extra comma")) typedef enum tyconversanttoken { /* verbs that are processed by conversantverbs.c */ compilestringfunc, cconversantverbs } tyconversanttoken; typedef enum tyconvitemtype { /* types that are found when looking for the next macro or resource */ CONV_NOTYPE, /* no macro or resource was found */ CONV_MACRO, /* macro was found */ CONV_RESOURCE, /* resource was found */ /* types of macros */ CONV_MACROTYPE_NOPARAM, /* regular macro */ CONV_MACROTYPE_COND_IF, /* if macro */ CONV_MACROTYPE_COND_ELSE, /* else macro */ CONV_MACROTYPE_COND_ELSEIF, /* elseif macro */ CONV_MACROTYPE_COND_ENDIF, /* endif macro */ CONV_MACROTYPE_AV, /* attribute-value pairs */ CONV_MACROTYPE_PAREN /* parenthetical macros */ } tyconvitemtype; typedef struct convaddress { /* name and table of an xml item */ long tblsize; hdlhashtable ht; bigstring bs; } convaddress, *ptrconvaddress; /* function declarations */ static void extractstringfromhandle( Handle, long, long, bigstring ); static boolean conv_addrezdelim( hdlhashtable ); static boolean conv_compilemacro( hdlhashtable *, Handle, long *, long, long * ); #endif /* conversantinclude */ \ No newline at end of file Modified: Frontier/branches/Conversant/Common/headers/dialogs.h =================================================================== --- Frontier/branches/Conversant/Common/headers/dialogs.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/dialogs.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -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/Conversant/Common/headers/file.h =================================================================== --- Frontier/branches/Conversant/Common/headers/file.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/file.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -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); Modified: Frontier/branches/Conversant/Common/headers/frontierdefs.h =================================================================== --- Frontier/branches/Conversant/Common/headers/frontierdefs.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/frontierdefs.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -34,7 +34,6 @@ #ifdef WIN95VERSION - #define PACKFLIPPED /* enable little endian / big endian conversion for database file functions */ #define FRONTIERCOM 1 #ifndef OPMLEDITOR #define FRONTIERWEB 0 Modified: Frontier/branches/Conversant/Common/headers/langinternal.h =================================================================== --- Frontier/branches/Conversant/Common/headers/langinternal.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/langinternal.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -219,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); Modified: Frontier/branches/Conversant/Common/headers/macconv.h =================================================================== --- Frontier/branches/Conversant/Common/headers/macconv.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/macconv.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -87,60 +87,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/Conversant/Common/headers/osincludes.h =================================================================== --- Frontier/branches/Conversant/Common/headers/osincludes.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/osincludes.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -307,4 +307,5 @@ #include <string.h> #include <assert.h> + #endif /* __osincludes_h__ */ Modified: Frontier/branches/Conversant/Common/headers/stringdefs.h =================================================================== --- Frontier/branches/Conversant/Common/headers/stringdefs.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/stringdefs.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -29,72 +29,72 @@ - #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_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 +118,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/Conversant/Common/headers/versions.h =================================================================== --- Frontier/branches/Conversant/Common/headers/versions.h 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/headers/versions.h 2006-04-13 18:34:30 UTC (rev 1266) @@ -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 */ @@ -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_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc." - #define bs_APP_URL "\x18" "http://support.opml.org/" + #define bs_APP_NAME BIGSTRING ("\x04" "OPML") + #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful OPML editing on your desktop") + #define bs_APP_COPYRIGHT BIGSTRING ("\x20" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Scripting News, Inc.") + #define bs_APP_URL BIGSTRING ("\x18" "http://support.opml.org/") #define APP_MAJOR_VERSION 10 #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */ @@ -108,10 +108,10 @@ #define APPNAME "Frontier-Conversant" #define APP_COPYRIGHT_HOLDER "Macrobyte Resources" - #define bs_APP_NAME "\x13" "Frontier-Conversant" - #define bs_APP_SLOGAN "\x25" "Powerful cross-platform web scripting" - #define bs_APP_COPYRIGHT "\x1F" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Macrobyte Resources" - #define bs_APP_URL "\x20" "http://conversant.macrobyte.net/" + #define bs_APP_NAME BIGSTRING ("\x13" "Frontier-Conversant") + #define bs_APP_SLOGAN BIGSTRING ("\x25" "Powerful cross-platform web scripting") + #define bs_APP_COPYRIGHT BIGSTRING ("\x1F" "\xA9 " APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " Macrobyte Resources") + #define bs_APP_URL BIGSTRING ("\x20" "http://conversant.macrobyte.net/") #define APP_MAJOR_VERSION 10 #define APP_MAJOR_VERSION_BCD 0x10 /* major version in BCD notation */ @@ -128,6 +128,7 @@ #endif +#define bs_APP_COPYRIGHT2 BIGSTRING ("\x22" "\xA9 1992-2004 UserLand Software, Inc") #define APP_COPYRIGHT APP_COPYRIGHT_FROM "-" APP_COPYRIGHT_TILL " " APP_COPYRIGHT_HOLDER #define APPNAME_SHORT APPNAME /* 2006-02-04 aradke */ Modified: Frontier/branches/Conversant/Common/resources/Mac/SHELL.R =================================================================== --- Frontier/branches/Conversant/Common/resources/Mac/SHELL.R 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/resources/Mac/SHELL.R 2006-04-13 18:34:30 UTC (rev 1266) @@ -4017,7 +4017,7 @@ plain, //302, 0, /*7.0b50 PBS: the About window has no buttons*/ - {40, 40, 100, 460}, + {40, 40, 114, 460}, }; resource 'cnfg' (138, "quick script") { Modified: Frontier/branches/Conversant/Common/resources/Mac/kernelverbs.r =================================================================== --- Frontier/branches/Conversant/Common/resources/Mac/kernelverbs.r 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/resources/Mac/kernelverbs.r 2006-04-13 18:34:30 UTC (rev 1266) @@ -691,7 +691,8 @@ "getpathchar", "freespaceonvolumedouble", "volumesizedouble", - "getmp3info" + "getmp3info", + "readwholefile" /* 2006-04-11 aradke */ } } }; Modified: Frontier/branches/Conversant/Common/resources/Win32/WinLand.rc =================================================================== --- Frontier/branches/Conversant/Common/resources/Win32/WinLand.rc 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/resources/Win32/WinLand.rc 2006-04-13 18:34:30 UTC (rev 1266) @@ -2027,7 +2027,7 @@ size12, plain, 0, - 40L, 40L, 460L, 100L + 40L, 40L, 460L, 114L END /*resource 'cnfg' (138, "quick script") {*/ Modified: Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc =================================================================== --- Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/resources/Win32/kernelverbs.rc 2006-04-13 18:34:30 UTC (rev 1266) @@ -664,7 +664,8 @@ "getpathchar\0", "freespaceonvolumedouble\0", "volumesizedouble\0", - "getmp3info\0" /*7.0b12 PBS: Andr\xE9's file.getMp3Info verb*/ + "getmp3info\0", /*7.0b12 PBS: Andr\xE9's file.getMp3Info verb*/ + "readwholefile\0" /* 2006-04-11 aradke */ END 1008 /*idrezverbs*/ EFP DISCARDABLE Modified: Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c =================================================================== --- Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c 2006-04-13 17:51:09 UTC (rev 1265) +++ Frontier/branches/Conversant/Common/source/OpenTransportNetEvents.c 2006-04-13 18:34:30 UTC (rev 1266) @@ -134,145 +134,145 @@ static unsigned char * xtierrorstrings [] = { - "", /* 3149 */ - "\x1B" "A Bad address was specified", /* 3150 */ - "\x1A" "A Bad option was specified", /* 3151 */ - "\x19" "Missing access permission", /* 3152 */ - "\x16" "Bad provider reference", /* 3153 */ - "\x18" "No address was specified", /* 3154 */ - "\x1A" "Call issued in wrong state", /* 3155 */ - "\x21" "Sequence specified does not exist", /* 3156 */ - "\x17" "A system error occurred", /* 3157 */ - "\x21" "An event occurred - call OTLook()", /* 3158 */ - "\x27" "An illegal amount of data was specified", /* 3159 */ - "\x1C" "Passed buffer not big enough", /* 3160 */ - "\x1B" "Provider is flow-controlled", /* 3161 */ - "\x1D" "No data available for reading", /* 3162 */ - "\x22" "No disconnect indication available", /* 3163 */ - "\x27" "No Unit Data Error indication available", /* 3164 */ - "\x1D" "A Bad flag value was supplied", /* 3165 */ - "\x27" "No orderly release indication available", /* 3166 */ - "\x18" "Command is not supported", /* 3167 */ - "\x23" "State is changing - try again later", /* 3168 */ - "\x28" "Bad structure type requested for OTAlloc", /* 3169 */ - "\x1A" "Host not found (DNS error)", /* 3170 */ - "\x29" "A Bind to an in-use address with qlen > 0", /* 3171 */ - "\x23" "Address requested is already in use", /* 3172 */ - "\x27" "Accept failed because of pending listen", /* 3173 */ - "\x28" "Tried to accept on incompatible endpoint", /* 3174 */ - "", /* 3175 */ - "", /* 3176 */ - "", /* 3177 */ - "\x26" "An unspecified provider error occurred", /* 3178 */ - "\x24" "A synchronous call at interrupt time", /* 3179 */ - "\x19" "The command was cancelled" /* 3180 */ + BIGSTRING (""), /* 3149 */ + BIGSTRING ("\x1B" "A Bad address was specified"), /* 3150 */ + BIGSTRING ("\x1A" "A Bad option was specified"), /* 3151 */ + BIGSTRING ("\x19" "Missing access permission"), /* 3152 */ + BIGSTRING ("\x16" "Bad provider reference"), /* 3153 */ + BIGSTRING ("\x18" "No address was specified"), /* 3154 */ + BIGSTRING ("\x1A" "Call issued in wrong state"), /* 3155 */ + BIGSTRING ("\x21" "Sequence specified does not exist"), /* 3156 */ + BIGSTRING ("\x17" "A system error occurred"), /* 3157 */ + BIGSTRING ("\x21" "An event occurred - call OTLook()"), /* 3158 */ + BIGSTRING ("\x27" "An illegal amount of data was specified"), /* 3159 */ + BIGSTRING ("\x1C" "Passed buffer not big enough"), /* 3160 */ + BIGSTRING ("\x1B" "Provider is flow-controlled"), /* 3161 */ + BIGSTRING ("\x1D" "No data available for reading"), /* 3162 */ + BIGSTRING ("\x22" "No disconnect indication available"), /* 3163 */ + BIGSTRING ("\x27" "No Unit Data Error indication available"), /* 3164 */ + BIGSTRING ("\x1D" "A Bad flag value was supplied"), /* 3165 */ + BIGSTRING ("\x27" "No orderly release indication available"), /* 3166 */ + BIGSTRING ("\x18" "Command is not supported"), /* 3167 */ + BIGSTRING ("\x23" "State is changing - try again later"), /* 3168 */ + BIGSTRING ("\x28" "Bad structure type requested for OTAlloc"), /* 3169 */ + BIGSTRING ("\x1A" "Host not found (DNS error)"), /* 3170 */ + BIGSTRING ("\x29" "A Bind to an in-use address with qlen > 0"), /* 3171 */ + BIGSTRING ("\x23" "Address requested is already in use"), /* 3172 */ + BIGSTRING ("\x27" "Accept failed because of pending listen"), /* 3173 */ + BIGSTRING ("\x28" "Tried to accept on incompatible endpoint"), /* 3174 */ + BIGSTRING (""), /* 3175 */ + BIGSTRING (""), /* 3176 */ + BIGSTRING (""), /* 3177 */ + BIGSTRING ("\x26" "An unspecified provider error occurred"), /* 3178 */ + BIGSTRING ("\x24" "A synchronous call at interrupt time"), /* 3179 */ + BIGSTRING ("\x19" "The command was cancelled") /* 3180 */ }; #if 0 static unsigned char * dnserrorstrings [5] = { - "", - "\x1b" "Host not found. (DNS error)", /* 1 */ - "\x37" "Non-authoritative host not found. (Temporary DNS error)", /* 2 */ - "\x22" "Non-recoverable error. (DNS error)", /* 3 */ - "\x39" "Valid name, no data record of requested type. (DNS error)", /* 4 */ + BIGSTRING (""), + BIGSTRING ("\x1b" "Host not found. (DNS error)"), /* 1 */ + BIGSTRING ("\x37" "Non-authoritative host not found. (Temporary DNS error)"), /* 2 */ + BIGSTRING ("\x22" "Non-recoverable error. (DNS error)"), /* 3 */ + BIGSTRING ("\x39" "Valid name, no data record of requested type. (DNS error)"), /* 4 */ }; #endif static unsigned char * stdcliberrorstrings [80] = { - "", - "\x1b" "Permission denied", /* 1 */ - "\x37" "No such file or directory", /* 2 */ - "\x22" "No such resource", /* 3 */ - "\x39" "Interrupted system service", /* 4 */ - "\x12" "Input/output error", /* 5 */ - "\x15" "Device not configured", /* 6 */ - "\x16" "Argument list too long", /* 7 */ - "\x11" "Exec format error", /* 8 */ - "\x13" "Bad file descriptor", /* 9 */ - "\x12" "No child processes", /* 10 */ - "\x19" "Resource deadlock avoided", /* 11 */ - "\x16" "Cannot allocate memory", /* 12 */ - "\x11" "Permission denied", /* 13 */ - "\x0b" "Bad address", /* 14 */ - "\x15" "Block device required", /* 15 */ - "\x0b" "Device busy", /* 16 */ - "\x0b" "File exists", /* 17 */ - "\x11" "Cross-device link", /* 18 */ - "\x21" "Operation not supported by device", /* 19 */ - "\x0f" "Not a directory", /* 20 */ - "\x0e" "Is a directory", /* 21 */ - "\x10" "Invalid argument", /* 22 */ - "\x1d" "Too many open files in system", /* 23 */ - "\x15" "Too many open sockets", /* 24 */ - "\x1e" "Inappropriate ioctl for device", /* 25 */ - "\x0e" "Text file busy", /* 26 */ - "\x0e" "File too large", /* 27 */ - "\x17" "No space left on device", /* 28 */ - "\x0d" "Illegal seek", /* 29 */ - "\x15" "Read-only file system", /* 30 */ - "\x0e" "Too many links", /* 31 */ - "\x0b" "Broken pipe", /* 32 */ - "", - "", + BIGSTRING (""), + BIGSTRING ("\x1b" "Permission denied"), /* 1 */ + BIGSTRING ("\x37" "No such file or directory"), /* 2 */ + BIGSTRING ("\x22" "No such resource"), /* 3 */ + BIGSTRING ("\x39" "Interrupted system service"), /* 4 */ + BIGSTRING ("\x12" "Input/output error"), /* 5 */ + BIGSTRING ("\x15" "Device not configured"), /* 6 */ + BIGSTRING ("\x16" "Argument list too long"), /* 7 */ + BIGSTRING ("\x11" "Exec format error"), /* 8 */ + BIGSTRING ("\x13" "Bad file descriptor"), /* 9 */ + BIGSTRING ("\x12" "No child processes"), /* 10 */ + BIGSTRING ("\x19" "Resource deadlock avoided"), /* 11 */ + BIGSTRING ("\x16" "Cannot allocate memory"), /* 12 */ + BIGSTRING ("\x11" "Permission denied"), /* 13 */ + BIGSTRING ("\x0b" "Bad address"), /* 14 */ + BIGSTRING ("\x15" "Block device required"), /* 15 */ + BIGSTRING ("\x0b" "Device busy"), /* 16 */ + BIGSTRING ("\x0b" "File exists"), /* 17 */ + BIGSTRING ("\x11" "Cross-device link"), /* 18 */ + BIGSTRING ("\x21" "Operation not supported by device"), /* 19 */ + BIGSTRING ("\x0f" "Not a directory"), /* 20 */ + BIGSTRING ("\x0e" "Is a directory"), /* 21 */ + BIGSTRING ("\x10" "Invalid argument"), /* 22 */ + BIGSTRING ("\x1d" "Too many open files in system"), /* 23 */ + BIGSTRING ("\x15" "Too many open sockets"), /* 24 */ + BIGSTRING ("\x1e" "Inappropriate ioctl for device"), /* 25 */ + BIGSTRING ("\x0e" "Text file busy"), /* 26 */ + BIGSTRING ("\x0e" "File too large"), /* 27 */ + BIGSTRING ("\x17" "No space left on device"), /* 28 */ + BIGSTRING ("\x0d" "Illegal seek"), /* 29 */ + BIGSTRING ("\x15" "Read-only file system"), /* 30 */ + BIGSTRING ("\x0e" "Too many links"), /* 31 */ + BIGSTRING ("\x0b" "Broken pipe"), /* 32 */ + BIGSTRING (""), + BIGSTRING (""), /* non-blocking and interrupt i/o */ - "\x20" "Resource temporarily unavailable", /* 35 */ + BIGSTRING ("\x20" "Resource temporarily unavailable"), /* 35 */ /* ipc/network software -- argument errors */ - "\x23" "A blocking operation is in progress", /* 36 */ - "\x20" "Operation is already in progress", /* 37 */ + BIGSTRING ("\x23" "A blocking operation is in progress"), /* 36 */ + BIGSTRING ("\x20" "Operation is already in progress"), /* 37 */ /* ipc/network software -- argument errors */ - "\x20" "Socket operation on a non-socket", /* 38 */ - "\x1f" "Destination address is required", /* 39 */ - "\x10" "Message too long", /* 40 */ - "\x1e" "Protocol wrong type for socket", /* 41 */ - "\x16" "Protocol not available", /* 42 */ - "\x16" "Protocol not supported", /* 43 */ - "\x19" "Socket type not supported", /* 44 */ - "\x21" "Operation not supported on socket", /* 45 */ - "\x1d" "Protocol family not supported", /* 46 */ - "\x2f" "Address family not supported by protocol family", /* 47 */ - "\x16" "Address already in use", /* 48 */ - "\x1e" "Can't assign requested address", /* 49 */ + BIGSTRING ("\x20" "Socket operation on a non-socket"), /* 38 */ + BIGSTRING ("\x1f" "Destination address is required"), /* 39 */ + BIGSTRING ("\x10" "Message too long"), /* 40 */ + BIGSTRING ("\x1e" "Protocol wrong type for socket"), /* 41 */ + BIGSTRING ("\x16" "Protocol not available"), /* 42 */ + BIGSTRING ("\x16" "Protocol not supported"), /* 43 */ + BIGSTRING ("\x19" "Socket type not supported"), /* 44 */ + BIGSTRING ("\x21" "Operation not supported on socket"), /* 45 */ + BIGSTRING ("\x1d" "Protocol family not supported"), /* 46 */ + BIGSTRING ("\x2f" "Address family not supported by protocol family"), /* 47 */ + BIGSTRING ("\x16" "Address already in use"), /* 48 */ + BIGSTRING ("\x1e" "Can't assign requested address"), /* 49 */ /* ipc/network software -- operational errors */ - "\x0f" "Network is down", /* 50 */ - "\x16" "Network is unreachable", /* 51 */ - "\x23" "Network dropped connection on reset", /* 52 */ - "\x20" "Software caused connection abort", /* 53 */ - "\x18" "Connection reset by peer", /* 54 */ - "\x19" "No buffer space available", /* 55 */ - "\x1b" "Socket is already connected", /* 56 */ - "\x17" "Socket is not connected", /* 57 */ - "\x20" "Can't send after socket shutdown", /* 58 */ - "\x21" "Too many references: can't splice", /* 59 */ - "\x14" "Connection timed out", /* 60 */ - "\x12" "Connection refused", /* 61 */ + BIGSTRING ("\x0f" "Network is down"), /* 50 */ + BIGSTRING ("\x16" "Network is unreachable"), /* 51 */ + BIGSTRING ("\x23" "Network dropped connection on reset"), /* 52 */ + BIGSTRING ("\x20" "Software caused connection abort"), /* 53 */ + BIGSTRING ("\x18" "Connection reset by peer"), /* 54 */ + BIGSTRING ("\x19" "No buffer space available"), /* 55 */ + BIGSTRING ("\x1b" "Socket is already connected"), /* 56 */ + BIGSTRING ("\x17" "Socket is not connected"), /* 57 */ + BIGSTRING ("\x20" "Can't send after socket shutdown"), /* 58 */ + BIGSTRING ("\x21" "Too many references: can't splice"), /* 59 */ + BIGSTRING ("\x14" "Connection timed out"), /* 60 */ + BIGSTRING ("\x12" "Connection refused"), /* 61 */ - "\x21" "Too many levels of symbolic links", /* 62 */ - "\x12" "File name too long", /* 63 */ + BIGSTRING ("\x21" "Too many levels of symbolic links"), /* 62 */ + BIGSTRING ("\x12" "File name too long"), /* 63 */ - "\x0c" "Host is down", /* 64 */ - "\x10" "No route to host", /* 65 */ - "\x13" "Directory not empty", /* 66 */ - "\x12" "Too many processes", /* 67 */ - "\x0e" "Too many users", /* 68 */ - "\x13" "Disc quota exceeded", /* 69 */ + BIGSTRING ("\x0c" "Host is down"), /* 64 */ + BIGSTRING ("\x10" "No route to host"), /* 65 */ + BIGSTRING ("\x13" "Directory not empty"), /* 66 */ + BIGSTRING ("\x12" "Too many processes"), /* 67 */ + BIGSTRING ("\x0e" "Too many users"), /* 68 */ + BIGSTRING ("\x13" "Disc quota exceeded"), /* 69 */ /* Network File System */ - "\x15" "Stale NFS file handle", /* 70 */ - "\x21" "Too many levels of remote in path", /* 71 */ - "\x11" "RPC struct is b... [truncated message content] |
