Menu
▾
▴
SF.net SVN: frontierkernel:[1794] Frontier/branches/Conversant/Common/ headers
|
From: <set...@us...> - 2009-05-23 20:22:36
|
Revision: 1794
http://frontierkernel.svn.sourceforge.net/frontierkernel/?rev=1794&view=rev
Author: sethdill
Date: 2009-05-23 20:22:26 +0000 (Sat, 23 May 2009)
Log Message:
-----------
Attempting to bring Conversant branch closer to sync with trunk.
Modified Paths:
--------------
Frontier/branches/Conversant/Common/headers/command.h
Frontier/branches/Conversant/Common/headers/file.h
Frontier/branches/Conversant/Common/headers/filealias.h
Frontier/branches/Conversant/Common/headers/fileloop.h
Frontier/branches/Conversant/Common/headers/frontierconfig.h
Frontier/branches/Conversant/Common/headers/kernelverbdefs.h
Frontier/branches/Conversant/Common/headers/kernelverbs.h
Frontier/branches/Conversant/Common/headers/lang.h
Frontier/branches/Conversant/Common/headers/langexternal.h
Frontier/branches/Conversant/Common/headers/langinternal.h
Frontier/branches/Conversant/Common/headers/langsystem7.h
Frontier/branches/Conversant/Common/headers/launch.h
Frontier/branches/Conversant/Common/headers/miniwindow.h
Frontier/branches/Conversant/Common/headers/osincludes.h
Frontier/branches/Conversant/Common/headers/player.h
Frontier/branches/Conversant/Common/headers/resources.h
Frontier/branches/Conversant/Common/headers/shell.h
Frontier/branches/Conversant/Common/headers/shelltypes.h
Frontier/branches/Conversant/Common/headers/versions.h
Added Paths:
-----------
Frontier/branches/Conversant/Common/headers/langmysql.h
Frontier/branches/Conversant/Common/headers/langsqlite.h
Modified: Frontier/branches/Conversant/Common/headers/command.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/command.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/command.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -25,15 +25,19 @@
******************************************************************************/
+
#define commandinclude
-/*prototypes*/
+// prototypes
-//extern cmdprocessstarted (void) ;
+// extern cmdprocessstarted (void) ;
-//extern cmdprocesskilled (void);
+// extern cmdprocesskilled (void);
extern boolean startcmddialog (void);
extern boolean cmdstart (void);
+
+extern boolean cmdsetstring ( Handle ); // 2007-07-25 creedon
+
Modified: Frontier/branches/Conversant/Common/headers/file.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/file.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/file.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -114,71 +114,72 @@
} tyfolderview;
-typedef struct tyfileinfo { /*flattens interface for getting file information*/
+typedef struct tyfileinfo { // flattens interface for getting file information
- OSErr errcode; /*if there was an error retrieving info about the file, this is the error number*/
+ OSErr errcode; // if there was an error retrieving info about the file, this is the error number
- short vnum; /*the volume that the file is on*/
+ short vnum; // the volume that the file is on
- long dirid; /*the folder that contains the file*/
+ long dirid; // the folder that contains the file
- boolean flfolder; /*true if it's a folder not a file*/
+ boolean flfolder; // true if it's a folder not a file
- boolean fllocked; /*true if the file is locked*/
+ boolean fllocked; // true if the file is locked
- boolean flbundle; /*true if the file has a BNDL resource*/
+ boolean flbundle; // true if the file has a BNDL resource
- boolean flbusy; /*true if the file is open in an application*/
+ boolean flbusy; // true if the file is open in an application
- boolean flalias; /*true if the file is an alias*/
+ boolean flalias; // true if the file is an alias
- boolean flinvisible; /*true if the file is invisible*/
+ boolean flinvisible; // true if the file is invisible
- boolean flvolume; /*true if it's a disk volume*/
+ boolean flvolume; // true if it's a disk volume
- boolean flejectable; /*true if it's an ejectable volume*/
+ boolean flejectable; // true if it's an ejectable volume
- boolean flstationery; /*true if the file is a stationery pad*/
+ boolean flstationery; // true if the file is a stationery pad
- boolean flshared; /*true if the file can the file be shared*/
+ boolean flshared; // true if the file can the file be shared
- boolean flnamelocked; /*true if the file's name is locked*/
+ boolean flnamelocked; // true if the file's name is locked
- boolean flcustomicon; /*true if the file has a custom icon*/
+ boolean flcustomicon; // true if the file has a custom icon
- boolean flhardwarelock; /*for volumes, if true, the device is readonly*/
+ boolean flhardwarelock; // for volumes, if true, the device is readonly
- boolean flremotevolume; /*for volumes, if true, it's a remote volume, accessed over the network*/
+ boolean flremotevolume; // for volumes, if true, it's a remote volume, accessed over the network
- boolean flsystem; /*Windows "system" file attribute*/
+ boolean flsystem; // Windows "system" file attribute
- boolean flarchive; /*Windows "srchive" file attribute*/
+ boolean flarchive; // Windows "srchive" file attribute
- boolean flcompressed; /*Windows "compressed" file attribute*/
+ boolean flcompressed; // Windows "compressed" file attribute
- boolean fltemp; /*Windows "temp" file attribute*/
+ boolean fltemp; // Windows "temp" file attribute
- OSType filecreator, filetype; /*the creator ID and file type*/
+ OSType filecreator, filetype; // the creator ID and file type
- long timecreated, timemodified, timeaccessed; /*the creation and modification date for the file*/
+ long timecreated, timemodified, timeaccessed; // the creation and modification date for the file
- long sizedataforkhigh, sizedatafork, sizeresourcefork; /*the size of the file's two forks*/
+ unsigned long long sizedataforkhigh, sizedatafork, sizeresourcefork; // the size of the file's two forks
- short ixlabel; /*the file's label, as displayed in the Finder*/
+ short ixlabel; // the file's label, as displayed in the Finder
- Point iconposition; /*the position of the file's icon, when viewing by icon in Finder*/
+ Point iconposition; // the position of the file's icon, when viewing by icon in Finder
- unsigned short ctfiles; /*for folders, the number of files in the folder*/
+ unsigned long ctfiles; // for folders, the number of files in the folder
- unsigned short ctfolders; /*for volumes, the number of folders on the disk*/
+ unsigned long ctfolders; // for volumes, the number of folders on the disk
- tyfolderview folderview; /*for folders, view by name, by date, etc.*/
+ tyfolderview folderview; // for folders, view by name, by date, etc.
- unsigned long ctfreebytes; /*for volumes*/
+ unsigned long ctfreebytes; // for volumes
- unsigned long cttotalbytes; /*for volumes*/
+ unsigned long cttotalbytes; // for volumes
- unsigned long blocksize;
+ unsigned long blocksize; // for volumes
+
} tyfileinfo;
@@ -186,17 +187,20 @@
/*prototypes*/
+
#ifdef WIN95VERSION
+
typedef int (WINAPI * tyGetDiskFreeSpaceEx) (unsigned short *, ULARGE_INTEGER *, ULARGE_INTEGER *, ULARGE_INTEGER *);
extern tyGetDiskFreeSpaceEx adrGetDiskFreeSpaceEx;
extern void winsetfileinfo (WIN32_FIND_DATA * fileinfo, tyfileinfo *info);
- extern boolean winfileerror (const tyfilespec *);
+ extern boolean winfileerror (const ptrfilespec );
+
#endif
-extern void setfserrorparam (const tyfilespec *);
+extern void setfserrorparam ( const ptrfilespec );
extern boolean endswithpathsep (bigstring bs);
@@ -204,25 +208,19 @@
extern boolean getmachinename (bigstring bsname);
-extern boolean equalfilespecs (const tyfilespec *, const tyfilespec *);
+extern boolean filegetinfo (const ptrfilespec, tyfileinfo *info); // 1/28/97 dmb for clay
-extern boolean filegetinfo (const tyfilespec *fs, tyfileinfo *info); // 1/28/97 dmb for clay
-
-extern void filegetinfofrompb (CInfoPBRec *pb, tyfileinfo *info);
-
extern boolean filegetvolumeinfo (short vnum, tyfileinfo *info);
extern boolean filegetvolumename (short vnum, bigstring volname);
-extern boolean getmacfileinfo (const tyfilespec *fs, CInfoPBRec *pb);
-
extern boolean filemakespec (short vnum, long dirid, bigstring fname, ptrfilespec pfs);
-extern boolean filegetfilename (const tyfilespec *pfs, bigstring name); // 1/28/97 dmb end for clay
+extern boolean getfsfile (const ptrfilespec pfs, bigstring name); // 1/28/97 dmb end for clay
extern void filenotfounderror (bigstring);
-extern boolean surefile (const tyfilespec *);
+extern boolean surefile (const ptrfilespec );
extern boolean filegeteof (hdlfilenum, long *);
@@ -230,12 +228,8 @@
extern boolean filesetposition (hdlfilenum, long);
-extern boolean filegetposition (hdlfilenum, long *);
-
extern long filegetsize (hdlfilenum);
-extern boolean filetruncate (hdlfilenum);
-
extern boolean filewrite (hdlfilenum, long, void *);
extern boolean filereaddata (hdlfilenum, long, long *, void *);
@@ -250,97 +244,91 @@
extern boolean filereadhandle (hdlfilenum, Handle *);
-#ifdef NEWFILESPECTYPE
-extern boolean fileparsevolname (bigstring, long *, bigstring);
-#else
-extern boolean fileparsevolname (bigstring, short *, bigstring);
-#endif
+extern boolean fileparsevolname (bigstring, ptrfilespec);
-extern boolean fileresolvealias (tyfilespec *);
+extern boolean fileresolvealias ( ptrfilespec );
extern boolean filefrompath (bigstring, bigstring);
extern boolean folderfrompath (bigstring, bigstring);
-extern boolean getfileparentfolder (const tyfilespec *, tyfilespec *);
+extern boolean getfileparentfolder (const ptrfilespec , ptrfilespec );
-extern boolean deletefile (const tyfilespec *);
+extern boolean deletefile ( const ptrfilespec );
-extern boolean renamefile (const tyfilespec *, bigstring);
+extern boolean renamefile (const ptrfilespec , bigstring);
-extern boolean movefile (const tyfilespec *, const tyfilespec *);
+extern boolean movefile (const ptrfilespec , const ptrfilespec );
-extern boolean lockfile (const tyfilespec *);
+extern boolean lockfile (const ptrfilespec );
-extern boolean unlockfile (const tyfilespec *);
+extern boolean unlockfile (const ptrfilespec );
-extern boolean newfolder (const tyfilespec *);
+extern boolean newfolder (const ptrfilespec );
-extern boolean newfile (const tyfilespec *, OSType, OSType);
+extern boolean newfile ( const ptrfilespec , OSType, OSType );
extern void fileinit (void);
extern void fileshutdown (void);
-extern boolean fileopenorcreate (const tyfilespec *, OSType, OSType, hdlfilenum *);
+extern boolean opennewfile ( ptrfilespec , OSType, OSType, hdlfilenum *);
-extern boolean opennewfile (const tyfilespec *, OSType, OSType, hdlfilenum *);
+extern boolean openfile ( const ptrfilespec , hdlfilenum *, boolean );
-extern boolean openfile (const tyfilespec *, hdlfilenum *, boolean);
-
extern boolean closefile (hdlfilenum);
-extern boolean flushvolumechanges (const tyfilespec * fsspec, hdlfilenum fnum);
+extern boolean flushvolumechanges (const ptrfilespec fsspec, hdlfilenum fnum);
extern boolean getfullfilepath (bigstring);
-extern boolean foldertest (CInfoPBRec *);
+extern boolean foldertest ( FSRefParamPtr );
-extern boolean getfiletype (const tyfilespec *, OSType *);
+extern boolean foldertestcipbr ( CInfoPBRec * );
-extern boolean getfilecreator (const tyfilespec *, OSType *);
+extern boolean getfiletype (const ptrfilespec , OSType *);
-extern boolean fileexists (const tyfilespec *, boolean *);
+extern boolean getfilecreator (const ptrfilespec , OSType *);
-extern boolean filesize (const tyfilespec *, long *);
+extern boolean filesize (const ptrfilespec , long *);
-extern boolean fileisfolder (const tyfilespec *, boolean *);
+extern boolean fileisfolder ( const ptrfilespec , boolean * );
-extern boolean fileisvolume (const tyfilespec *);
+extern boolean fileisvolume (const ptrfilespec );
-extern boolean fileislocked (const tyfilespec *, boolean *);
+extern boolean fileislocked (const ptrfilespec , boolean *);
-extern boolean fileisbusy (const tyfilespec *, boolean *);
+extern boolean fileisbusy (const ptrfilespec , boolean *);
-extern boolean filehasbundle (const tyfilespec *, boolean *);
+extern boolean filehasbundle (const ptrfilespec , boolean *);
-extern boolean filesetbundle (const tyfilespec *, boolean);
+extern boolean filesetbundle (const ptrfilespec , boolean);
-extern boolean fileisalias (const tyfilespec *, boolean *);
+extern boolean fileisalias (const ptrfilespec , boolean *);
-extern boolean fileisvisible (const tyfilespec *, boolean *);
+extern boolean fileisvisible (const ptrfilespec , boolean *);
-extern boolean filesetvisible (const tyfilespec *, boolean);
+extern boolean filesetvisible (const ptrfilespec , boolean);
-extern boolean getfiledates (const tyfilespec *, unsigned long *, unsigned long *);
+extern boolean getfiledates (const ptrfilespec , unsigned long *, unsigned long *);
-extern boolean setfiledates (const tyfilespec *, unsigned long, unsigned long);
+extern boolean setfiledates (const ptrfilespec , unsigned long, unsigned long);
+
+extern boolean getfilepos (const ptrfilespec , Point *);
-extern boolean getfilepos (const tyfilespec *, Point *);
+extern boolean setfilepos (const ptrfilespec , Point);
-extern boolean setfilepos (const tyfilespec *, Point);
+extern boolean setfilecreated (const ptrfilespec , long);
+
+extern boolean setfilemodified (const ptrfilespec , long);
-extern boolean setfilecreated (const tyfilespec *, long);
+extern boolean setfiletype (const ptrfilespec , OSType);
-extern boolean setfilemodified (const tyfilespec *, long);
+extern boolean setfilecreator (const ptrfilespec , OSType);
-extern boolean setfiletype (const tyfilespec *, OSType);
-
-extern boolean setfilecreator (const tyfilespec *, OSType);
-
extern boolean largefilebuffer (Handle *);
-extern boolean copyfile (const tyfilespec *, const tyfilespec *, boolean, boolean);
+extern boolean copyfile (const ptrfilespec , const ptrfilespec , boolean, boolean);
extern short filegetapplicationvnum (void);
@@ -348,148 +336,219 @@
extern short filegetsystemvnum (void);
-extern boolean getspecialfolderpath (bigstring, bigstring, boolean, tyfilespec *);
+extern boolean getspecialfolderpath (bigstring, bigstring, boolean, ptrfilespec );
-extern boolean ejectvol (const tyfilespec *);
+extern boolean ejectvol (const ptrfilespec );
-extern boolean isejectable (const tyfilespec *, boolean *);
+extern boolean isejectable (const ptrfilespec , boolean *);
-extern boolean langgetextendedvolumeinfo (const tyfilespec *, double *, double *);
+extern boolean langgetextendedvolumeinfo (const ptrfilespec , double *, double *);
-extern boolean getfreespace (const tyfilespec *, long *);
+extern boolean getfreespace (const ptrfilespec , long *);
-extern boolean getvolumesize (const tyfilespec *, long *);
+extern boolean getvolumesize (const ptrfilespec , long *);
-extern boolean getvolumeblocksize (const tyfilespec *, long *);
+extern boolean getvolumeblocksize (const ptrfilespec , long *);
-extern boolean filesonvolume (const tyfilespec *, long *);
+extern boolean filesonvolume (const ptrfilespec , long *);
-extern boolean foldersonvolume (const tyfilespec *, long *);
+extern boolean foldersonvolume (const ptrfilespec , long *);
-extern boolean isvolumelocked (const tyfilespec *, boolean *);
+extern boolean isvolumelocked (const ptrfilespec , boolean *);
-extern boolean volumecreated (const tyfilespec *, unsigned long *);
+extern boolean volumecreated (const ptrfilespec , unsigned long *);
-extern boolean lockvolume (const tyfilespec *, boolean);
+extern boolean lockvolume (const ptrfilespec , boolean);
-extern boolean unmountvolume (const tyfilespec *);
+extern boolean unmountvolume (const ptrfilespec );
extern boolean drivenumtovolname (short, bigstring);
-extern boolean findapplication (OSType, tyfilespec *);
+extern boolean findapplication (OSType, ptrfilespec );
-extern boolean getfilecomment (const tyfilespec *, bigstring);
+extern boolean getfilecomment (const ptrfilespec , bigstring);
-extern boolean setfilecomment (const tyfilespec *, bigstring);
+extern boolean setfilecomment (const ptrfilespec , bigstring);
-extern boolean getfilelabel (const tyfilespec *, bigstring);
+extern boolean getfilelabel (const ptrfilespec , bigstring);
-extern boolean setfilelabel (const tyfilespec *, bigstring);
+extern boolean setfilelabel (const ptrfilespec , bigstring);
extern boolean mountvolume (bigstring, bigstring, bigstring);
extern boolean initfile (void);
-extern boolean fiffindinfile (const tyfilespec *, bigstring, long *); /*findinfile.c*/
+extern boolean fiffindinfile (const ptrfilespec , bigstring, long *); /*findinfile.c*/
-extern boolean fifcomparefiles (const tyfilespec *, const tyfilespec *);
+extern boolean fifcomparefiles (const ptrfilespec , const ptrfilespec );
-extern boolean fifcharcounter (const tyfilespec *, char, long *);
+extern boolean fifcharcounter (const ptrfilespec , char, long *);
-extern boolean fifclosefile (const tyfilespec *);
+extern boolean fifclosefile (const ptrfilespec );
extern boolean fifcloseallfiles (long);
-extern boolean fifopenfile (const tyfilespec *, long);
+extern boolean fifopenfile (const ptrfilespec , long);
-extern boolean fifendoffile (const tyfilespec *);
+extern boolean fifendoffile (const ptrfilespec );
-extern boolean fifreadline (const tyfilespec *, Handle *);
+extern boolean fifreadline (const ptrfilespec , Handle *);
-extern boolean fifwriteline (const tyfilespec *, Handle);
+extern boolean fifwriteline (const ptrfilespec , Handle);
-extern boolean fifreadhandle (const tyfilespec *, long, Handle *);
+extern boolean fifreadhandle (const ptrfilespec , long, Handle *);
-extern boolean fifreadfile (const tyfilespec *fs, Handle *x); /* 2006-04-11 aradke */
+extern boolean fifreadfile (const ptrfilespec fs, Handle *x); /* 2006-04-11 aradke */
-extern boolean fifwritehandle (const tyfilespec *, Handle);
+extern boolean fifwritehandle (const ptrfilespec , Handle);
-extern boolean fifsetposition (const tyfilespec *, long);
+extern boolean fifsetposition (const ptrfilespec , long);
-extern boolean fifgetposition (const tyfilespec *, long *);
+extern boolean fifgetposition (const ptrfilespec , long *);
-extern boolean fifsetendoffile (const tyfilespec *fs, long eof);
+extern boolean fifsetendoffile (const ptrfilespec fs, long eof);
-extern boolean fifgetendoffile (const tyfilespec *fs, long *eof);
+extern boolean fifgetendoffile (const ptrfilespec fs, long *eof);
-#pragma mark === filepath.c ===
-
- extern boolean directorytopath (long, short, bigstring);
+#pragma mark === file.c ===
-extern boolean volumerefnumtopath (short, bigstring);
+extern boolean equalfilespecs ( const ptrfilespec, const ptrfilespec );
-extern boolean filesetdefaultpath (const tyfilespec *);
+extern boolean filegetposition (hdlfilenum, long *);
-extern boolean filegetdefaultpath (tyfilespec *);
+extern boolean fileexists ( const ptrfilespec , boolean * );
-extern boolean filespectopath (const tyfilespec *, bigstring);
+extern boolean filetruncate (hdlfilenum);
-extern boolean pathtofilespec (bigstring, tyfilespec *);
+#ifdef MACVERSION
-extern boolean filegetpath (const tyfilespec *, bigstring);
+ extern boolean CFStringRefToHFSUniStr255 ( CFStringRef, HFSUniStr255 * ); // 2006-06-07 creedon
+
+ extern boolean CFStringRefToStr255 ( CFStringRef, StringPtr ); // 2006-06-07 creedon
+
+ extern boolean FSRefGetNameStr255 ( const FSRef *, Str255 ); // 2006-06-07 creedon
+
+ extern boolean HFSUniStr255ToStr255 ( ConstHFSUniStr255Param, StringPtr ); // 2006-06-07 creedon
+
+ extern boolean bigstringToHFSUniStr255 ( const bigstring, HFSUniStr255 * ); // 2006-06-07 creedon
+
+ extern void filegetinfofrompb ( FSRefParam *, tyfileinfo * );
-extern boolean setfsfile (tyfilespec *, bigstring);
+ extern void filegetinfofrompbcipbr ( CInfoPBRec *, tyfileinfo * );
-extern boolean getfsfile (const tyfilespec *, bigstring);
+ extern boolean getmacfileinfo ( const ptrfilespec, FSRefParamPtr, FSCatalogInfoPtr );
-extern boolean getfsvolume (const tyfilespec *, long *);
+ extern boolean getmacfileinfocipbr ( const FSSpecPtr, CInfoPBRec * );
-extern void initfsdefault (void); /* 2005-07-18 creedon */
+/* 2006-08-11 creedon: cribbed from MoreFilesX.c and modded to work with Str255 */
-
-#pragma mark === fileverbs.c ===
-
- //extern filecheckdefaultpath (bigstring);
+OSErr
+HFSNameGetUnicodeName255 (
+ ConstStr255Param hfsName,
+ TextEncoding textEncodingHint,
+ HFSUniStr255 *unicodeName);
-extern boolean filegetprogramversion (bigstring);
+/*
+ The HFSNameGetUnicodeName function converts a Pascal Str255 string to an
+ Unicode HFSUniStr255 string using the same routines as the File Manager.
+
+ hfsName --> The Pascal string to convert.
+ textEncodingHint --> The text encoding hint used for the conversion.
+ You can pass kTextEncodingUnknown to use the
+ "default" textEncodingHint.
+ unicodeName <-- The Unicode string.
+
+ __________
+
+ Also see: HFSNameGetUnicodeName in MoreFilesX.c
+
+*/
-extern boolean filestart (void); /*6.1b15 AR*/
+#endif
#pragma mark === filedialog.c ===
-extern boolean sfdialog (tysfverb, bigstring, ptrsftypelist, tyfilespec *, OSType); /* 2005-10-06 creedon - added OSType */
+extern boolean sfdialog (tysfverb, bigstring, ptrsftypelist, ptrfilespec , OSType); /* 2005-10-06 creedon - added OSType */
extern boolean initfiledialog (void);
#ifdef MACVERSION
+
//Code change by Timothy Paustian Tuesday, June 20, 2000 2:22:02 PM
//Nav services code for Frontier.
- extern OSErr TimsPutFile(bigstring prompt, Str255 fileName, StandardFileReply * outReply);
+
+ extern OSErr TimsPutFile( bigstring, Str255, StandardFileReply *, OSType );
extern OSErr TimsGetFolderOrVolume(bigstring prompt, SInt16 dialogType, StandardFileReply * outReply);
extern pascal void NavEventProc(NavEventCallbackMessage callBackSelector,
- NavCBRecPtr callBackParms,
- NavCallBackUserData callBackUD);
+ NavCBRecPtr callBackParms,
+ NavCallBackUserData callBackUD);
-
extern OSErr getafile (bigstring prompt, ptrsftypelist filetypes, StandardFileReply * outReply, OSType); /* 2005-09-23 creedon */
#endif
#endif
+
#pragma mark === filemp3.c ===
-boolean getmp3info (const tyfilespec *, long *, long *, long *, long *, boolean *);
+boolean getmp3info (const ptrfilespec , long *, long *, long *, long *, boolean *);
#pragma mark === fileops.c ===
-extern short getfilelabelindex (const tyfilespec *, short *); /* 2006-04-23 creedon */
+extern boolean extendfilespec ( const ptrfilespec, ptrfilespec ); // 2006-06-23 creedon
-extern boolean setfilelabelindex (const tyfilespec *, short, boolean); /* 2006-04-23 creedon */
+extern boolean getfilespecparent ( ptrfilespec ); // 2006-06-17 creedon
+extern boolean setfilelabelindex (const ptrfilespec , short, boolean); // 2006-04-23 creedon */
+
+extern short getfilelabelindex (const ptrfilespec , short *); // 2006-04-23 creedon */
+
+#ifdef MACVERSION
+
+ extern OSStatus GetApplicationIconRef ( const ProcessSerialNumber * , const FSSpec* , IconRef * ); // 2006-06-04 creedon
+
+ extern OSStatus LSIsApplication( const FSRef *, Boolean *, Boolean * ); // 2006-05-25
+
+#endif // MACVERSION
+
+
+#pragma mark === filepath.c ===
+
+ extern boolean directorytopath ( const ptrfilespec, bigstring);
+
+extern boolean volumerefnumtopath (short, bigstring);
+
+extern boolean filesetdefaultpath ( const ptrfilespec );
+
+extern boolean filegetdefaultpath (ptrfilespec );
+
+extern boolean filespectopath (const ptrfilespec , bigstring);
+
+extern boolean pathtofilespec ( bigstring, ptrfilespec );
+
+extern boolean filegetpath (const ptrfilespec , bigstring);
+
+extern boolean setfsfile (ptrfilespec , bigstring);
+
+extern boolean getfsfile (const ptrfilespec , bigstring);
+
+extern boolean getfsvolume (const ptrfilespec, long *);
+
+extern void initfsdefault (void); /* 2005-07-18 creedon */
+
+
+#pragma mark === fileverbs.c ===
+
+ //extern filecheckdefaultpath (bigstring);
+
+extern boolean filegetprogramversion (bigstring);
+
+extern boolean filestart (void); /*6.1b15 AR*/
+
Modified: Frontier/branches/Conversant/Common/headers/filealias.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/filealias.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/filealias.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -54,5 +54,3 @@
boolean MakeAliasFile (const FSSpec* srcFile, const FSSpec* destFile);
-
-
Modified: Frontier/branches/Conversant/Common/headers/fileloop.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/fileloop.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/fileloop.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -41,15 +41,15 @@
extern boolean diskinitloop (tyfileloopcallback, Handle *);
-extern boolean fileinitloop (const tyfilespec *, tyfileloopcallback, Handle *);
+extern boolean fileinitloop ( const ptrfilespec, tyfileloopcallback, Handle * );
extern void fileendloop (Handle);
-extern boolean filenextloop (Handle, tyfilespec *, boolean *);
+extern boolean filenextloop ( Handle, ptrfilespec, boolean * );
extern boolean diskloop (tyfileloopcallback, long);
-extern boolean folderloop (const tyfilespec *, boolean, tyfileloopcallback, long);
+extern boolean folderloop ( const ptrfilespec, boolean, tyfileloopcallback, long );
Modified: Frontier/branches/Conversant/Common/headers/frontierconfig.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/frontierconfig.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/frontierconfig.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -27,7 +27,7 @@
#define configinclude /*so other includes can tell if we've been loaded*/
-#ifdef MACVERSION
+#ifdef MACVERSION
#include <standard.h>
#endif
Modified: Frontier/branches/Conversant/Common/headers/kernelverbdefs.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/kernelverbdefs.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/kernelverbdefs.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -26,12 +26,12 @@
******************************************************************************/
#define idopverbs 1000
-#define idtableverbs 1001
+#define idtableverbs 1001
#define idmenuverbs 1002
#define idwpverbs 1003
#define idpictverbs 1004
#define idlangverbs 1005
-#define idstringverbs 1006
+#define idstringverbs 1006
#define idfileverbs 1007
#define idrezverbs 1008
#define idwindowverbs 1009
@@ -47,8 +47,11 @@
#define iddbverbs 1019
#define idxmlverbs 1020
#define idhtmlverbs 1021
-#define idquicktimeverbs 1022 /*7.0b4 PBS: QuickTime Player window verbs*/
-#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 idconversantverbs 1026 /*2004-12-31 SMD: private, conversant verbs*/
+#define idquicktimeverbs 1022 // 7.0b4 PBS: QuickTime Player window verbs
+#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
+#define idmysqlverbs 1027 // 2007-04-08 gewirtz mysql verbs
+#define idconversantverbs 1028 // 2004-12-31 SMD: Conversant verbs
+
Modified: Frontier/branches/Conversant/Common/headers/kernelverbs.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/kernelverbs.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/kernelverbs.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -56,8 +56,12 @@
extern boolean cryptinitverbs (void); /* langcrypt.c */
+extern boolean sqliteinitverbs (void); /* langsqlite.c */
+
+extern boolean mysqlinitverbs (void); /* langmysql.c */
+
#ifdef flconversantverbs
extern boolean conversantinitverbs (void); /* conversantverbs.c */
-#endif
\ No newline at end of file
+#endif
Modified: Frontier/branches/Conversant/Common/headers/lang.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/lang.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/lang.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -1107,7 +1107,7 @@
extern boolean setdoublevalue (double, tyvaluerecord *);
-extern boolean setfilespecvalue (tyfilespec *, tyvaluerecord *);
+extern boolean setfilespecvalue (ptrfilespec, tyvaluerecord *);
extern boolean setexternalvalue (Handle, tyvaluerecord *);
@@ -1268,7 +1268,7 @@
extern boolean getostypevalue (hdltreenode, short, OSType *);
-extern boolean getfilespecvalue (hdltreenode, short, tyfilespec *);
+extern boolean getfilespecvalue ( hdltreenode, short, ptrfilespec );
extern boolean getpointvalue (hdltreenode, short, Point *);
Modified: Frontier/branches/Conversant/Common/headers/langexternal.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/langexternal.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/langexternal.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -245,7 +245,7 @@
extern boolean langexternalzoom (tyvaluerecord, hdlhashtable, bigstring);
-extern boolean langexternalzoomfilewindow (const tyvaluerecord *, tyfilespec *, boolean);
+extern boolean langexternalzoomfilewindow (const tyvaluerecord *, ptrfilespec, boolean);
extern boolean langexternalwindowopen (tyvaluerecord, hdlwindowinfo *);
Modified: Frontier/branches/Conversant/Common/headers/langinternal.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/langinternal.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/langinternal.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -200,13 +200,18 @@
#define frbadgroupnameerror 158
#define frnonexistantgroupnumbererror 159
#define frnonexistantgroupnameerror 160
-#define replaceitemerror 161 /* 2005-09-26 creedon */
-#define cmdshellnotfounderror 162 /* 2006-03-10 aradke */
+#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 sqlitecompileerror 165 // 2007-10-11 creedon
+
#define langstacklist 137
-typedef enum tystackid { /*stack names*/
-
+
+typedef enum tystackid { // stack names
+
idtablestack = 1,
iderrorcallbackstack,
@@ -216,6 +221,7 @@
idlocalsstack,
idprogramstack
+
} tystackid;
Added: Frontier/branches/Conversant/Common/headers/langmysql.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/langmysql.h (rev 0)
+++ Frontier/branches/Conversant/Common/headers/langmysql.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -0,0 +1,95 @@
+
+/* $Id: langmysql.h,v 1.1.2.1 2007/04/09 18:30:00 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 mysqlinitverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-08 gewirtz */
+
+extern boolean mysqlendverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-15 gewirtz */
+
+extern boolean mysqlconnectverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-08 gewirtz */
+
+extern boolean mysqlcompilequeryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-09 gewirtz */
+
+extern boolean mysqlclearqueryverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-09 gewirtz */
+
+extern boolean mysqlgetrowverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-09 gewirtz */
+
+extern boolean mysqlgeterrornumberverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgeterrormessageverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetclientinfoverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetclientversionverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgethostinfoverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetserverversionverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetprotocolinfoverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetserverinfoverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetqueryinfoverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-10 gewirtz */
+
+extern boolean mysqlgetaffectedrowcountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlgetselectedrowcountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlgetcolumncountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlgetserverstatusverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlgetquerywarningcountverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlpingserververb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlseekrowverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlselectdatabaseverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-11 gewirtz */
+
+extern boolean mysqlgetsqlstateverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-12 gewirtz */
+
+extern boolean mysqlescapestringverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-15 gewirtz */
+
+extern boolean mysqlisthreadsafeverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-15 gewirtz */
+
+extern boolean mysqlcloseverb (hdltreenode, tyvaluerecord *, bigstring); /* 2007-04-08 gewirtz */
+
+
+
+extern boolean mysqlinitverbs (void); /* 2007-04-08 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 */
+
+/* SQLITE MESSAGES */
+// #define SQLITE_COLUMN_ERROR_0 "\xe9""SQLite column error. Frontier uses a base-1 index. Columns must be specified with 1 indicating the first column. This is different from the SQLite API, which requires that columns must be specified with 0 indicating the first column."
+// #define SQLITE_COLUMN_ERROR_MAX "\x50""SQLite column error. An attempt was made to access a column that does not exist."
+// #define SQLITE_COLUMN_ERROR_UNDEFINED "\x29""SQLite returned an undefined column type."
\ No newline at end of file
Added: Frontier/branches/Conversant/Common/headers/langsqlite.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/langsqlite.h (rev 0)
+++ Frontier/branches/Conversant/Common/headers/langsqlite.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -0,0 +1,75 @@
+
+/* $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 sqliteresetqueryverb (hdltreenode, tyvaluerecord *, bigstring); // 2006-08-31 gewirtz
+
+extern boolean sqlitestepqueryverb (hdltreenode, tyvaluerecord *, bigstring); // 2006-08-31 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 sqlitegetrowverb (hdltreenode, tyvaluerecord *, bigstring); // 2006-08-31 gewirtz
+
+extern boolean sqlitegeterrormessageverb (hdltreenode, tyvaluerecord *, bigstring); // 2006-04-20 gewirtz
+
+extern boolean sqliteinitverbs (void); // 2006-03-15 gewirtz
+
+extern boolean sqlitesetcolumnblobverb ( hdltreenode, tyvaluerecord *, bigstring ); // 2007-08-25 creedon
+
+extern boolean getlastinsertrowidverb ( hdltreenode, tyvaluerecord *, bigstring ); // 2007-08-28 creedon
+
+
+// SQLITE MESSAGES
+
+#define SQLITE_COLUMN_ERROR_0 "\xe9""SQLite column error. Frontier uses a base-1 index. Columns must be specified with 1 indicating the first column. This is different from the SQLite API, which requires that columns must be specified with 0 indicating the first column."
+#define SQLITE_COLUMN_ERROR_MAX "\x50""SQLite column error. An attempt was made to access a column that does not exist."
+#define SQLITE_COLUMN_ERROR_UNDEFINED "\x29""SQLite returned an undefined column type."
+#define SQLITE_COLUMN_ERROR_ROW_OR_COLUMN "\x31" "SQLite invalid row or column number out of range." // 2007-08-25 creedon
+#define SQLITE_PARAMETER_ERROR_COUNT "\x1b" "SQLite parameter error. An attempt was made to access a parameter that does not exist." // 2007-08-26 creedon
+
Modified: Frontier/branches/Conversant/Common/headers/langsystem7.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/langsystem7.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/langsystem7.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -45,7 +45,7 @@
#ifdef MACVERSION
- #define filespecsize(fs) (sizeof (tyfilespec) - sizeof (Str63) + stringsize ((fs).name))
+ #define filespecsize(fs) (sizeof (tyfilespec)) // - sizeof (CFStringRef) + stringsize ((fs).name))
#endif
#ifdef WIN95VERSION
@@ -58,11 +58,11 @@
/*prototypes*/
-extern boolean filespectoalias (const tyfilespec *, boolean, AliasHandle *); /*landsystem7.c*/
+extern boolean filespectoalias (const ptrfilespec , boolean, AliasHandle *); /*landsystem7.c*/
extern boolean aliastostring (Handle, bigstring);
-extern boolean aliastofilespec (AliasHandle, tyfilespec *);
+extern boolean aliastofilespec (AliasHandle, ptrfilespec );
extern boolean coercetoalias (tyvaluerecord *);
Modified: Frontier/branches/Conversant/Common/headers/launch.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/launch.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/launch.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -48,7 +48,7 @@
/*prototypes*/
-extern boolean launchapplication (const tyfilespec *, const tyfilespec *, boolean flbringtofront);
+extern boolean launchapplication (const ptrfilespec, const ptrfilespec, boolean flbringtofront);
extern boolean findrunningapplication (OSType *, bigstring, typrocessid *);
@@ -60,7 +60,7 @@
extern boolean getnthapplication (short, bigstring);
-extern boolean getapplicationfilespec (bigstring, tyfilespec *);
+extern boolean getapplicationfilespec ( bigstring, ptrfilespec );
extern boolean executeresource (ResType, short, bigstring);
Modified: Frontier/branches/Conversant/Common/headers/miniwindow.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/miniwindow.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/miniwindow.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -129,7 +129,7 @@
} tyminirecord, *ptrminirecord, **hdlminirecord;
-/*globals*/
+// globals
extern WindowPtr miniwindow;
@@ -138,7 +138,7 @@
extern hdlminirecord minidata;
-/*prototypes*/
+// prototypes
extern boolean minisetstring (short, Handle);
@@ -158,6 +158,5 @@
extern boolean ministart (short);
+extern boolean minireloadstrings ( short ); // 2007-07-27 creedon
-
-
Modified: Frontier/branches/Conversant/Common/headers/osincludes.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/osincludes.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/osincludes.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -68,144 +68,140 @@
#define OTDEBUG 1 /* must define before including OpenTransport headers */
- #if TARGET_API_MAC_CARBON
+ #ifdef FRONTIER_FRAMEWORK_INCLUDES /* building for Mach-O with framework-style includes */
- #ifdef FRONTIER_FRAMEWORK_INCLUDES /* building for Mach-O with framework-style includes */
+ #ifdef FRONTIER_FLAT_HEADERS /* building for Mach-O with flat header-style includes */
- #ifdef FRONTIER_FLAT_HEADERS /* building for Mach-O with flat header-style includes */
+ #include <Carbon.h>
+ #include <ApplicationServices.h>
+ #include <Movies.h>
- #include <Carbon.h>
- #include <ApplicationServices.h>
- #include <Movies.h>
+ #else
+
+ #include <Carbon/Carbon.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <QuickTime/Movies.h>
- #else
-
- #include <Carbon/Carbon.h>
- #include <ApplicationServices/ApplicationServices.h>
- #include <QuickTime/Movies.h>
+ #endif
- #endif
+ #define ELASTERRNO ELAST
- #define ELASTERRNO ELAST
+ /* cribbed from pre-OSX StandardFile.h */
+ struct StandardFileReply {
+ Boolean sfGood;
+ Boolean sfReplacing;
+ OSType sfType;
+ FSSpec sfFile;
+ ScriptCode sfScript;
+ short sfFlags;
+ Boolean sfIsFolder;
+ Boolean sfIsVolume;
+ long sfReserved1;
+ short sfReserved2;
+ };
+ typedef struct StandardFileReply StandardFileReply;
- /* cribbed from pre-OSX StandardFile.h */
- struct StandardFileReply {
- Boolean sfGood;
- Boolean sfReplacing;
- OSType sfType;
- FSSpec sfFile;
- ScriptCode sfScript;
- short sfFlags;
- Boolean sfIsFolder;
- Boolean sfIsVolume;
- long sfReserved1;
- short sfReserved2;
- };
- typedef struct StandardFileReply StandardFileReply;
+ #else /*CFM*/
- #else /*CFM*/
+ #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
+ #define OPAQUE_TOOLBOX_STRUCTS 1
- #define ACCESSOR_CALLS_ARE_FUNCTIONS 1
- #define OPAQUE_TOOLBOX_STRUCTS 1
-
- #define OTUNIXERRORS 1
-
- #define OLDROUTINENAMES 0
- #define OLDROUTINELOCATIONS 0
- #define CGLUESUPPORTED 0
-
- #define PtoCstr p2cstr
- #define CtoPstr c2pstr
- #define PtoCString p2cstr
- #define CtoPString c2pstr
-
- #define TRUE true
- #define FALSE false
-
- #include <Carbon.h>
- #include <CFBundle.h>
- #include <MacHelp.h>
- #include <Movies.h>
-
- #endif
-
- /* cribbed from pre-OSX AppleTalk.h -- for TargetID */
- struct EntityName {
- Str32Field objStr;
- Str32Field typeStr;
- Str32Field zoneStr;
- };
- typedef struct EntityName EntityName;
-
- /* cribbed from pre-OSX PPCToolbox.h -- for TargetID */
- typedef SInt16 PPCLocationKind;
- typedef SInt16 PPCPortKinds;
- enum {
- ppcByCreatorAndType = 1, /* Port type is specified as colloquial Mac creator and type */
- ppcByString = 2 /* Port type is in pascal string format */
- };
- typedef SInt16 PPCXTIAddressType;
- struct PPCXTIAddress {
- PPCXTIAddressType fAddressType; /* A constant specifying what kind of network address this is */
- UInt8 fAddress[96]; /* The contents of the network address (variable length, NULL terminated). */
- };
- typedef struct PPCXTIAddress PPCXTIAddress;
- typedef PPCXTIAddress * PPCXTIAddressPtr;
- struct PPCAddrRec {
- UInt8 Reserved[3]; /* reserved - must be initialize to 0 */
- UInt8 xtiAddrLen; /* size of the xtiAddr field */
- PPCXTIAddress xtiAddr; /* the transport-independent network address */
- };
- typedef struct PPCAddrRec PPCAddrRec;
- typedef PPCAddrRec * PPCAddrRecPtr;
- struct LocationNameRec {
- PPCLocationKind locationKindSelector; /* which variant */
- union {
- EntityName nbpEntity; /* NBP name entity */
- Str32 nbpType; /* just the NBP type string, for PPCOpen */
- PPCAddrRec xtiType; /* an XTI-type network address record */
- } u;
- };
- typedef struct LocationNameRec LocationNameRec;
- typedef LocationNameRec * LocationNamePtr;
- struct PPCPortRec {
- ScriptCode nameScript; /* script of name */
- Str32Field name; /* name of port as seen in browser */
- PPCPortKinds portKindSelector; /* which variant */
- union {
- Str32 portTypeStr; /* pascal type string */
- struct {
- OSType portCreator;
- OSType portType;
- } port;
- } u;
- };
- typedef struct PPCPortRec PPCPortRec;
- typedef PPCPortRec * PPCPortPtr;
- struct PortInfoRec {
- SInt8 filler1;
- Boolean authRequired;
- PPCPortRec name;
- };
- typedef struct PortInfoRec PortInfoRec;
- typedef PortInfoRec * PortInfoPtr;
-
- /* cribbed from pre-OSX EPPC.h -- for TargetID */
- struct TargetID {
- long sessionID;
- PPCPortRec name;
- LocationNameRec location;
- PPCPortRec recvrName;
- };
- typedef struct TargetID TargetID;
- typedef TargetID * TargetIDPtr;
- typedef TargetIDPtr * TargetIDHandle;
- typedef TargetIDHandle TargetIDHdl;
- typedef TargetID SenderID;
- typedef SenderID * SenderIDPtr;
-
- #endif /*TARGET_API_MAC_CARBON*/
-
+ #define OTUNIXERRORS 1
+
+ #define OLDROUTINENAMES 0
+ #define OLDROUTINELOCATIONS 0
+ #define CGLUESUPPORTED 0
+
+ #define PtoCstr p2cstr
+ #define CtoPstr c2pstr
+ #define PtoCString p2cstr
+ #define CtoPString c2pstr
+
+ #define TRUE true
+ #define FALSE false
+
+ #include <Carbon.h>
+ #include <CFBundle.h>
+ #include <MacHelp.h>
+ #include <Movies.h>
+
+ #endif
+
+ /* cribbed from pre-OSX AppleTalk.h -- for TargetID */
+ struct EntityName {
+ Str32Field objStr;
+ Str32Field typeStr;
+ Str32Field zoneStr;
+ };
+ typedef struct EntityName EntityName;
+
+ /* cribbed from pre-OSX PPCToolbox.h -- for TargetID */
+ typedef SInt16 PPCLocationKind;
+ typedef SInt16 PPCPortKinds;
+ enum {
+ ppcByCreatorAndType = 1, /* Port type is specified as colloquial Mac creator and type */
+ ppcByString = 2 /* Port type is in pascal string format */
+ };
+ typedef SInt16 PPCXTIAddressType;
+ struct PPCXTIAddress {
+ PPCXTIAddressType fAddressType; /* A constant specifying what kind of network address this is */
+ UInt8 fAddress[96]; /* The contents of the network address (variable length, NULL terminated). */
+ };
+ typedef struct PPCXTIAddress PPCXTIAddress;
+ typedef PPCXTIAddress * PPCXTIAddressPtr;
+ struct PPCAddrRec {
+ UInt8 Reserved[3]; /* reserved - must be initialize to 0 */
+ UInt8 xtiAddrLen; /* size of the xtiAddr field */
+ PPCXTIAddress xtiAddr; /* the transport-independent network address */
+ };
+ typedef struct PPCAddrRec PPCAddrRec;
+ typedef PPCAddrRec * PPCAddrRecPtr;
+ struct LocationNameRec {
+ PPCLocationKind locationKindSelector; /* which variant */
+ union {
+ EntityName nbpEntity; /* NBP name entity */
+ Str32 nbpType; /* just the NBP type string, for PPCOpen */
+ PPCAddrRec xtiType; /* an XTI-type network address record */
+ } u;
+ };
+ typedef struct LocationNameRec LocationNameRec;
+ typedef LocationNameRec * LocationNamePtr;
+ struct PPCPortRec {
+ ScriptCode nameScript; /* script of name */
+ Str32Field name; /* name of port as seen in browser */
+ PPCPortKinds portKindSelector; /* which variant */
+ union {
+ Str32 portTypeStr; /* pascal type string */
+ struct {
+ OSType portCreator;
+ OSType portType;
+ } port;
+ } u;
+ };
+ typedef struct PPCPortRec PPCPortRec;
+ typedef PPCPortRec * PPCPortPtr;
+ struct PortInfoRec {
+ SInt8 filler1;
+ Boolean authRequired;
+ PPCPortRec name;
+ };
+ typedef struct PortInfoRec PortInfoRec;
+ typedef PortInfoRec * PortInfoPtr;
+
+ /* cribbed from pre-OSX EPPC.h -- for TargetID */
+ struct TargetID {
+ long sessionID;
+ PPCPortRec name;
+ LocationNameRec location;
+ PPCPortRec recvrName;
+ };
+ typedef struct TargetID TargetID;
+ typedef TargetID * TargetIDPtr;
+ typedef TargetIDPtr * TargetIDHandle;
+ typedef TargetIDHandle TargetIDHdl;
+ typedef TargetID SenderID;
+ typedef SenderID * SenderIDPtr;
+
#if TARGET_API_MAC_OS8
#define ACCESSOR_CALLS_ARE_FUNCTIONS 0
Modified: Frontier/branches/Conversant/Common/headers/player.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/player.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/player.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -27,6 +27,8 @@
#ifdef MACVERSION /*Mac-only feature*/
+#include "shelltypes.h"
+
#define playerinclude
@@ -40,7 +42,7 @@
boolean isplayerevent (void);
-boolean playeropenmovieinwindow (FSSpec *f);
+boolean playeropenmovieinwindow ( ptrfilespec );
boolean playerplaymovie (void);
Modified: Frontier/branches/Conversant/Common/headers/resources.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/resources.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/resources.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -48,7 +48,7 @@
extern boolean closeresourcefile (short);
-extern boolean openresourcefile (const tyfilespec *, short *, short);
+extern boolean openresourcefile ( const ptrfilespec, short *, short );
extern boolean writeresource (ResType, short, bigstring, long, void *);
@@ -66,27 +66,27 @@
extern boolean filewriteresource (short, ResType, short, bigstring, long, void *);
-extern boolean saveresource (const tyfilespec *, short, ResType, short, bigstring, long, void *, short);
+extern boolean saveresource (const ptrfilespec , short, ResType, short, bigstring, long, void *, short);
-extern boolean saveresourcehandle (const tyfilespec *, ResType, short, bigstring, Handle, short);
+extern boolean saveresourcehandle (const ptrfilespec, ResType, short, bigstring, Handle, short);
-extern boolean loadresource (const tyfilespec *, short, ResType, short, bigstring, long, void *, short);
+extern boolean loadresource (const ptrfilespec, short, ResType, short, bigstring, long, void *, short);
-extern boolean loadresourcehandle (const tyfilespec *, ResType, short, bigstring, Handle *, short);
+extern boolean loadresourcehandle (const ptrfilespec, ResType, short, bigstring, Handle *, short);
-extern boolean deleteresource (const tyfilespec *, ResType, short, bigstring, short);
+extern boolean deleteresource (const ptrfilespec, ResType, short, bigstring, short);
-extern boolean getnumresourcetypes (const tyfilespec *, short *, short);
+extern boolean getnumresourcetypes (const ptrfilespec, short *, short);
-extern boolean getnthresourcetype (const tyfilespec *, short, ResType *, short);
+extern boolean getnthresourcetype (const ptrfilespec, short, ResType *, short);
-extern boolean getnumresources (const tyfilespec *, ResType, short *, short);
+extern boolean getnumresources (const ptrfilespec, ResType, short *, short);
-extern boolean getnthresourcehandle (const tyfilespec *, ResType, short, short *, bigstring, Handle *, short);
+extern boolean getnthresourcehandle (const ptrfilespec, ResType, short, short *, bigstring, Handle *, short);
-extern boolean getresourceattributes (const tyfilespec *, ResType, short, bigstring, short *, short);
+extern boolean getresourceattributes (const ptrfilespec, ResType, short, bigstring, short *, short);
-extern boolean setresourceattributes (const tyfilespec *, ResType, short, bigstring, short, short);
+extern boolean setresourceattributes (const ptrfilespec, ResType, short, bigstring, short, short);
#endif
Modified: Frontier/branches/Conversant/Common/headers/shell.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/shell.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/shell.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -772,9 +772,9 @@
extern short windowgetvnum (WindowPtr);
-extern boolean windowsetfspec (WindowPtr, tyfilespec *);
+extern boolean windowsetfspec ( WindowPtr, ptrfilespec );
-extern boolean windowgetfspec (WindowPtr, tyfilespec *);
+extern boolean windowgetfspec ( WindowPtr, ptrfilespec );
extern boolean windowgetpath (WindowPtr, bigstring);
@@ -782,7 +782,7 @@
extern boolean newchildwindow (short, hdlwindowinfo, Rect *, const Rect *, bigstring, WindowPtr *);
-extern boolean newfilewindow (ptrfilespec, hdlfilenum, short, boolean, WindowPtr *);
+extern boolean newfilewindow ( const ptrfilespec, hdlfilenum, short, boolean, WindowPtr * ); // 2009-09-30 creedon: made first param const
extern boolean isfilewindow (WindowPtr);
Modified: Frontier/branches/Conversant/Common/headers/shelltypes.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/shelltypes.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/shelltypes.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -56,29 +56,6 @@
short blue;
} diskrgb;
-#ifdef NEWFILESPECTYPE
- typedef struct newtyfilespec {
-
- short fileTypeID;
-
- short lengthOfFileSpecifier;
-
- long volumeID;
-
- char fullSpecifier[258];
-
- Handle fileSpecifier;
-
- long macSpecifier;
- } tyfilespec, *ptrfilespec, **hdlfilespec;
-
- #define fsname(fs) (fs)->fullSpecifier
-
-#else
- typedef FSSpec tyfilespec, *ptrfilespec, **hdlfilespec;
-
- #define fsname(fs) (fs)->name
-#endif
#ifdef MACVERSION
typedef ControlHandle hdlscrollbar;
@@ -183,4 +160,32 @@
boolean flbold; /*if displayed, should text style be bold?*/
} tybuttonstatus;
+
+#ifdef MACVERSION
+
+ typedef struct ExtFSRef {
+
+ FSRef fsref;
+ CFStringRef path;
+
+ } ExtFSRef, *ExtFSRefPtr, **ExtFSRefHandle;
+
+ typedef ExtFSRef tyfilespec, *ptrfilespec, **hdlfilespec;
+
+ #endif // MACVERSION
+
+
+#ifdef WIN95VERSION
+
+ typedef struct tyfilespec {
+
+ char fullSpecifier [258];
+
+ } tyfilespec, *ptrfilespec, **hdlfilespec;
+
+ #define fsname( fs ) ( fs ) -> fullSpecifier
+
+ #endif // WIN95VERSION
+
#endif
+
Modified: Frontier/branches/Conversant/Common/headers/versions.h
===================================================================
--- Frontier/branches/Conversant/Common/headers/versions.h 2009-05-23 20:21:44 UTC (rev 1793)
+++ Frontier/branches/Conversant/Common/headers/versions.h 2009-05-23 20:22:26 UTC (rev 1794)
@@ -42,8 +42,8 @@
/* common strings for all targets */
-#define APP_COPYRIGHT_FROM "2000"
-#define APP_COPYRIGHT_TILL "2006"
+#define APP_COPYRIGHT_FROM "2004"
+#define APP_COPYRIGHT_TILL "2009"
/* target-specific strings and version info */
@@ -53,53 +53,53 @@
/* version info for RADIO ta...
[truncated message content] |
