Menu
▾
▴
frontierkernel-commits — Mailing list for Subversion commit messages.
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(447) |
Nov
(163) |
Dec
(57) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(172) |
Feb
|
Mar
(123) |
Apr
(64) |
May
(1) |
Jun
(278) |
Jul
(89) |
Aug
(97) |
Sep
(62) |
Oct
(53) |
Nov
(119) |
Dec
(60) |
| 2006 |
Jan
(76) |
Feb
(1094) |
Mar
(363) |
Apr
(163) |
May
(57) |
Jun
(43) |
Jul
(39) |
Aug
(15) |
Sep
(33) |
Oct
(62) |
Nov
(8) |
Dec
|
| 2007 |
Jan
(9) |
Feb
(34) |
Mar
(2) |
Apr
(14) |
May
(8) |
Jun
(40) |
Jul
(21) |
Aug
(1) |
Sep
(20) |
Oct
(15) |
Nov
(26) |
Dec
|
| 2008 |
Jan
(1) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(1) |
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(32) |
Jun
|
Jul
|
Aug
(3) |
Sep
(3) |
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
(1) |
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2011 |
Jan
|
Feb
|
Mar
(2) |
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <cre...@us...> - 2006-06-25 09:25:59
|
Revision: 1415 Author: creecode Date: 2006-06-25 02:25:52 -0700 (Sun, 25 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1415&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/headers/langsystem7.h Frontier/branches/FSRef_Migration/Common/headers/launch.h Frontier/branches/FSRef_Migration/Common/source/langipc.c Frontier/branches/FSRef_Migration/Common/source/langpack.c Frontier/branches/FSRef_Migration/Common/source/langsystypes.c Frontier/branches/FSRef_Migration/Common/source/langvalue.c Modified: Frontier/branches/FSRef_Migration/Common/headers/langsystem7.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/langsystem7.h 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/headers/langsystem7.h 2006-06-25 09:25:52 UTC (rev 1415) @@ -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/FSRef_Migration/Common/headers/launch.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/launch.h 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/headers/launch.h 2006-06-25 09:25:52 UTC (rev 1415) @@ -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/FSRef_Migration/Common/source/langipc.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/langipc.c 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/source/langipc.c 2006-06-25 09:25:52 UTC (rev 1415) @@ -1628,16 +1628,17 @@ static pascal boolean langipchandleverb (hdlverbrecord hverb) { - /* - 10/29/91 dmb: let traps have a chance at runscripttoken before executing - built-in code + // + // 2006-06-25 creedon: FSRef-ized + // + // 4.1b7 dmb: allow a specific root file to be targed with the "subject" + // event attribute. Bug: right now, langipcfindhandler doesn't have this + // logic. So if an event doesn't have a handler in this root, landsystem7 + // will return eventnothandled even if the target root does have a handler. + // + // 1991-10-29 dmb: let traps have a chance at runscripttoken before executing built-in code + // - 4.1b7 dmb: allow a specific root file to be targed with the "subject" - event attribute. Bug: right now, langipcfindhandler doesn't have this - logic. So if an event doesn't have a handler in this root, landsystem7 - will return eventnothandled even if the target root does have a handler. - */ - boolean fl; boolean flfoundhandler; AEDesc subject; @@ -1647,25 +1648,19 @@ if (landgetverbattr (hverb, 'subj', typeFSS, &subject) == noErr) { /*4.1b7 dmb*/ - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ + FSSpec fs; + Handle h; + tyfilespec fst; - FSSpec fs; - - Handle h; - - copydatahandle (&subject, &h); - - fs = **(FSSpec **) h; - - disposehandle (h); + copydatahandle (&subject, &h); - #else + fs = **(FSSpec **) h; - FSSpec fs = **(FSSpec **) subject.dataHandle; + disposehandle (h); - #endif + FSpMakeFSRef ( &fs, &fst.fsref ); - wroot = shellfindfilewindow (&fs); + wroot = shellfindfilewindow ( &fst ); if (wroot == nil) { @@ -1893,14 +1888,16 @@ static boolean getipcaddressvalue (hdltreenode hparam1, short pnum, tyipcaddress *ipcaddress) { - /* - 2/12/93 dmb: always use landglobals for find our own application id + // + // 2006-06-25 creedon: FSRef-ized + // + // 5.0d19 dmb: handle 'psn ' binary address values + // + // 1993-04-09 dmb: if the address parameter is zero, send to self + // + // 1993-02-12 dmb: always use landglobals for find our own application id + // - 4/9/93 dmb: if the address parameter is zero, send to self - - 5.0d19 dmb: handle 'psn ' binary address values - */ - register tyipcaddress *padr = ipcaddress; tyvaluerecord val; @@ -2002,12 +1999,16 @@ if (val.valuetype == filespecvaluetype) { /*4.1b7 dmb: send to another open root*/ - FSSpec fs = **val.data.filespecvalue; + tyfilespec fs = **val.data.filespecvalue; if (shellfindfilewindow (&fs) == nil) { + + bigstring bs; - langparamerror (dbnotopenederror, fs.name); + getfsfile ( &fs, bs ); + langparamerror (dbnotopenederror, bs ); + return (false); } @@ -2866,7 +2867,7 @@ if (ipcaddress.flrootval) { /*4.1b7 dmb*/ - FSSpec fs = **ipcaddress.val.data.filespecvalue; + tyfilespec fs = **ipcaddress.val.data.filespecvalue; landsetverbattr (hv, 'subj', typeFSS, &fs, sizeof (fs)); } @@ -4132,8 +4133,16 @@ static pascal OSErr langipcopendocroutine (FSSpec *fs) { + + // + // 2006-06-25 creedon: FSRef=ized + // + + tyfilespec fst; - if (!shellopenfile (fs, false, nil)) + FSpMakeFSRef ( fs, &fst.fsref ); + + if (!shellopenfile ( &fst, false, nil)) return (getoserror ()); return (noErr); Modified: Frontier/branches/FSRef_Migration/Common/source/langpack.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/langpack.c 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/source/langpack.c 2006-06-25 09:25:52 UTC (rev 1415) @@ -42,8 +42,12 @@ #include "tablestructure.h" #include "byteorder.h" /* 2006-04-08 aradke: endianness conversion macros */ +#ifdef MACVERSION + #include "MoreFilesX.h" +#endif + #define ctsigbytes 19 /*length of string + 1 byte for length*/ #define signaturestring (ptrstring) "\x12" "packed binary data" @@ -816,6 +820,10 @@ boolean langunpackwindowverb (hdltreenode hparam1, tyvaluerecord *vreturned) { + // + // 2006-06-24 creedon: FSRef-ized + // + tyvaluerecord val; tyfilespec fspec; ptrfilespec fs; @@ -843,10 +851,10 @@ fs = &fspec; - if (isemptystring (fsname (fs))) + if ( FSRefValid ( &( *fs ).fsref ) ) + langexternalsetdirty ((hdlexternalhandle) val.data.externalvalue, false); + else fs = nil; - else - langexternalsetdirty ((hdlexternalhandle) val.data.externalvalue, false); if (!langexternalzoomfilewindow (&val, fs, true)) { Modified: Frontier/branches/FSRef_Migration/Common/source/langsystypes.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/langsystypes.c 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/source/langsystypes.c 2006-06-25 09:25:52 UTC (rev 1415) @@ -508,19 +508,21 @@ static boolean stringtoalias (tyvaluerecord *val) { - /* - 10/7/91 dmb: make sure we're actually passing a full path to the NewAlias routine + // + // 2006-06-24 creedon: FSRef-ized + // + // 2.1b2 dmb: try converting to a filespec first to ensure that partial path or + // drive number if processed properly. also, in the filespec case, the alias isn't + // minimal + // + // 1992-07-23 dmb: OK, try to getfullfilepath, but with errors disabled + // + // 1992-07-02 dmb: don't call getfullfilepath; makes it impossible to create aliases of + // not-yet-existing files, or offline volumes + // + // 1991-10-07 dmb: make sure we're actually passing a full path to the NewAlias routine + // - 7/2/92 dmb: don't call getfullfilepath; makes it impossible to create aliases of - not-yet-existing files, or offline volumes - - 7/23/92 dmb: OK, try to getfullfilepath, but with errors disabled - - 2.1b2 dmb: try converting to a filespec first to ensure that partial path or - drive number if processed properly. also, in the filespec case, the alias isn't - minimal - */ - register Handle htext; bigstring bspath; tyfilespec fs; @@ -536,7 +538,7 @@ texthandletostring (htext, bspath); if (pathtofilespec (bspath, &fs) && fileexists (&fs, &flfolder)) - errcode = NewAlias (nil, &fs, &halias); + errcode = FSNewAlias (nil, &fs.fsref, &halias); else errcode = NewAliasMinimalFromFullPath (stringlength (bspath), bspath + 1, nil, nil, &halias); @@ -553,56 +555,78 @@ #endif -boolean filespectoalias (const tyfilespec *fs, boolean flminimal, AliasHandle *halias) { +boolean filespectoalias (const ptrfilespec fs, boolean flminimal, AliasHandle *halias) { + + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // -#ifdef MACVERSION - bigstring bs; - OSErr err; - - if (flminimal) - err = NewAliasMinimal (fs, halias); - else - err = NewAlias (nil, fs, halias); - - if (err == fnfErr) { /*alias manager isn't friendly enough to do anything for us here*/ + #ifdef MACVERSION + + boolean flcreatefrompath = FALSE; + // bigstring bs; + OSErr err; - if (filespectopath (fs, bs)) - err = NewAliasMinimalFromFullPath (stringlength (bs), bs + 1, nil, nil, halias); - } + if ( ( *fs ).path == NULL ) { + + if (flminimal) + err = FSNewAliasMinimal ( &( *fs ).fsref, halias); + else + err = FSNewAlias (nil, &( *fs ).fsref, halias); + } + else + flcreatefrompath = true; + + if ( ( err == fnfErr ) || flcreatefrompath ) { // alias manager isn't friendly enough to do anything for us here + + HFSUniStr255 name; + + CFStringRefToHFSUniStr255 ( ( *fs ).path, &name ); + + err = FSNewAliasMinimalUnicode ( &( *fs ).fsref, name.length, name.unicode, halias, NULL ); + } + + if (err == noErr) + return (true); + + if (langerrorenabled ()) { + + setfserrorparam ( fs ); + + oserror (err); + } + + return (false); + + #endif + + #ifdef WIN95VERSION - if (err == noErr) - return (true); - - if (langerrorenabled ()) { + langparamerror (unimplementedverberror, bsfunctionname); - setoserrorparam ((ptrstring) (*fs).name); + return (false); - oserror (err); - } + #endif - return (false); -#endif + } // filespectoalias -#ifdef WIN95VERSION - langparamerror (unimplementedverberror, bsfunctionname); - - return (false); -#endif - } /*filespectoalias*/ - #ifdef MACVERSION static boolean filespecvaltoalias (tyvaluerecord *val) { + + // + // 2006-06-24 creedon: FSRef-ized + // - register FSSpecHandle hfs; - FSSpec fs; + register hdlfilespec hfs; + tyfilespec fs; AliasHandle halias; if (!langcanusealiases ()) return (false); - hfs = (FSSpecHandle) (*val).data.filespecvalue; + hfs = (hdlfilespec) (*val).data.filespecvalue; fs = **hfs; @@ -624,20 +648,21 @@ #ifdef MACVERSION - /* - 10/4/91 dmb: if alias can't be resolved, just say what volume it's on. + // + // 2006-06-24 creedon: FSRef-ized + // + // 1996-04-26 dmb: restored FollowFinderAlias code; must use if we get fnfErr. + // + // 2.1b9 dmb: use FollowFinderAlias to avoid mounting volumes during alias resolution + // + // 1993-04-12 dmb: accept fnfErr result from ResolveAlias + // + // 1991-10-04 dmb: if alias can't be resolved, just say what volume it's on. + // - 4/12/93 dmb: accept fnfErr result from ResolveAlias - - 2.1b9 dmb: use FollowFinderAlias to avoid mounting volumes during - alias resolution - - 4.0b6 4/26/96 dmb: restored FollowFinderAlias code; must use if we get fnfErr. - */ - register AliasHandle h = (AliasHandle) halias; short flchanged; - FSSpec fs; + tyfilespec fs; bigstring bsinfo; AliasInfoType ix = asiAliasName; OSErr err; @@ -645,12 +670,12 @@ if (!langcanusealiases ()) return (false); - err = FollowFinderAlias (nil, h, false, &fs, (Boolean *) &flchanged); + err = FSFollowFinderAlias (nil, h, false, &fs.fsref, (Boolean *) &flchanged); if ((err == noErr) /*|| (err == fnfErr)*/ ) { if (flchanged) - UpdateAlias (nil, &fs, h, (Boolean *) &flchanged); + FSUpdateAlias (nil, &fs.fsref, h, (Boolean *) &flchanged); return (filespectopath (&fs, bs)); } @@ -705,74 +730,74 @@ } /*aliastostring*/ -boolean aliastofilespec (AliasHandle halias, tyfilespec *fs) { +boolean aliastofilespec ( AliasHandle halias, ptrfilespec fs ) { - /* - 2.1a6 dmb: ignore fnfErr + // + // 2006-06-17 creedon: for Mac FSRef-ized + // + // 7.0b34 PBS: Can't use ResolveAliasWithMountFlags on pre-Carbon Macs reliably, so fall back to FollowFinderAlias. + // + // 2.1b9 dmb: use FollowFinderAlias to avoid mounting volumes during alias resolution + // + // 2.1b2 dmb: on error, try to get as much info from the alias as possible, & just return false to caller + // + // 2.1a6 dmb: ignore fnfErr + // - 2.1b2 dmb: on error, try to get as much info from the alias as possible, - & just return false to caller + #ifdef MACVERSION - 2.1b9 dmb: use FollowFinderAlias to avoid mounting volumes during - alias resolution - - 7.0b34 PBS: Can't use ResolveAliasWithMountFlags on pre-Carbon Macs reliably, - so fall back to FollowFinderAlias. - */ - -#ifdef MACVERSION - Boolean flchanged; - bigstring bs; - OSErr err; - - if (!langcanusealiases ()) + boolean flchanged; + bigstring bs; + OSErr err; + + if (!langcanusealiases ()) + return (false); + + err = FSResolveAliasWithMountFlags ( NULL, halias, &( *fs ).fsref, &flchanged, kARMNoUI ); + + if ( ( err == noErr ) || ( err == fnfErr ) ) { + + HFSUniStr255 name; + OSStatus status; + + status = FSGetCatalogInfo ( &( *fs ).fsref, kFSCatInfoNone, NULL, &name, NULL, &( *fs ).fsref ); + + ( *fs ).path = CFStringCreateWithCharacters ( kCFAllocatorDefault, name.unicode, name.length ); + + return ( true ); + + } + + if (GetAliasInfo (halias, asiVolumeName, bs) == noErr) // try to get vol info + fileparsevolname (bs, fs); + + getfsfile ( fs, bs ); + + if (GetAliasInfo (halias, asiAliasName, bs ) != noErr) // try to set file name + langgetmiscstring (unknownstring, bs ); + + if (langerrorenabled ()) { + + setfserrorparam ( fs ); + + oserror (err); + } + return (false); - #if TARGET_API_MAC_CARBON == 1 + #endif + + #ifdef WIN95VERSION - err = ResolveAliasWithMountFlags(nil, halias, fs, &flchanged, kARMNoUI); - //old stupid code. - //Code change by Timothy Paustian Tuesday, May 16, 2000 8:54:03 PM - //why was this used. Maybe before there was the other APIs, anyhow, - //it breaks on OS X so use the above, correct routine instead - - #else /*7.0b32 PBS: fall back to FollowFinderAlias on pre-Carbon Macs*/ + langparamerror (unimplementedverberror, bsfunctionname); + + return (false); - err = FollowFinderAlias (nil, halias, false, fs, &flchanged); - #endif - if ((err == noErr) || (err == fnfErr)) - return (true); - - (*fs).parID = 0; - - (*fs).vRefNum = 0; - - if (GetAliasInfo (halias, asiVolumeName, bs) == noErr) /*try to get vol info*/ - fileparsevolname (bs, &(*fs).vRefNum, nil); - - if (GetAliasInfo (halias, asiAliasName, (*fs).name) != noErr) /*try to set file name*/ - langgetmiscstring (unknownstring, (*fs).name); - - if (langerrorenabled ()) { - - setoserrorparam ((*fs).name); - - oserror (err); - } - - return (false); -#endif + } // aliastofilespec -#ifdef WIN95VERSION - langparamerror (unimplementedverberror, bsfunctionname); - return (false); -#endif - } /*aliastofilespec*/ - - boolean coercetoalias (tyvaluerecord *v) { /* @@ -826,112 +851,113 @@ boolean filespecaddvalue (tyvaluerecord *v1, tyvaluerecord *v2, tyvaluerecord *vreturned) { - /* - add v2 to the filespec v1 by using it as a partial path. if anything bug a valid - fspec results, return a string value that is simple concatenation + // + // add v2 to the filespec v1 by using it as a partial path. if anything but a valid + // fspec results, return a string value that is simple concatenation + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // + // 2.1b6 dmb: if resulting specifier exists, but doesn't agree with bsadd as far as + // whether or not it's a folder, return a string. + // + // 2.1b3 dmb: if resulting path is to a non-existent folder, don't return a filespec + // - 2.1b3 dmb: if resulting path is to a non-existent folder, don't return a filespec - - 2.1b6 dmb: if resulting specifier exists, but doesn't agree with bsadd as far as - whether or not it's a folder, return a string. - */ - -#ifdef MACVERSION - tyfilespec fs; - bigstring bsadd; - boolean fl, flfolder; - boolean flfolderpath; - OSErr err; + #ifdef MACVERSION + + tyfilespec fs; + bigstring bs, bsadd, bsv1path; + boolean flfolder; // unused + OSErr status; + + fs = **(*v1).data.filespecvalue; - #if TARGET_API_MAC_CARBON == 1 - - fs.vRefNum = (**(*v1).data.filespecvalue).vRefNum; + ( void ) extendfilespec ( &fs, &fs ); + + filespectopath ( &fs, bs ); - fs.parID = (**(*v1).data.filespecvalue).parID; + copystring ( bs, bsv1path); - copystring ((**(*v1).data.filespecvalue).name, fs.name); + if (!coercetostring (v2)) + return (false); - #else - - fs = **(*v1).data.filespecvalue; + pullstringvalue (v2, bsadd); - #endif - - if (!coercetostring (v2)) - return (false); - -// fs = **(*v1).data.filespecvalue; - - pullstringvalue (v2, bsadd); - - if (fileexists (&fs, &flfolder)) { + /* + if (fileexists (&fs, &flfolder)) { + + // fileisfolder (&fs, &flfolder); + + if (flfolder) + pushchar (':', bs ); + } + */ - // fileisfolder (&fs, &flfolder); + insertstring ( bs, bsadd ); - if (flfolder) - pushchar (':', fs.name); - } - - insertstring (fs.name, bsadd); - - if (stringfindchar (':', bsadd)) /*will be interpreted as full path, so make it partial*/ - insertchar (':', bsadd); - - err = FSMakeFSSpec (fs.vRefNum, fs.parID, bsadd, &fs); - - flfolderpath = lastchar (bsadd) == ':'; - - switch (err) { + /* + if (stringfindchar (':', bsadd)) // will be interpreted as full path, so make it partial* + insertchar (':', bsadd); + */ - case noErr: /*valid spec, file exists*/ + copystring ( bsadd, bs ); + + insertstring ( BIGSTRING ( "\x09" ":Volumes:" ), bs ); + + stringreplaceall ( ':', '/', bs ); + + convertpstring ( bs ); + + status = FSPathMakeRef ( bs, &fs.fsref, &flfolder ); + + if ( status == noErr ) { + + HFSUniStr255 name; + + status = FSGetCatalogInfo ( &fs.fsref, kFSCatInfoNone, NULL, &name, NULL, &fs.fsref ); + + fs.path = CFStringCreateWithCharacters ( kCFAllocatorDefault, name.unicode, name.length ); - fileisfolder (&fs, &flfolder); + } - fl = flfolder == flfolderpath; /*make sure endings match*/ - - break; + else { // couldn't extend filespec - case fnfErr: /*valid spec, file doesn't exist*/ + ( void ) extendfilespec ( *( *v1 ).data.filespecvalue, *( *v1 ).data.filespecvalue ); - fl = !flfolderpath; + if ( ! coercetostring ( v1 ) ) + return ( false ); - break; + return ( addvalue ( *v1, *v2, vreturned ) ); + + } - default: - fl = false; - - break; - } + return ( setfilespecvalue ( &fs, vreturned ) ); + + #endif + + #ifdef WIN95VERSION - if (!fl) { /*couldn't extend filespec*/ + if (!coercetostring (v2)) + return (false); if (!coercetostring (v1)) return (false); return (addvalue (*v1, *v2, vreturned)); - } + + #endif - return (setfilespecvalue (&fs, vreturned)); -#endif + } // filespecaddvalue -#ifdef WIN95VERSION - if (!coercetostring (v2)) - return (false); - - if (!coercetostring (v1)) - return (false); - - return (addvalue (*v1, *v2, vreturned)); -#endif - } /*filespecaddvalue*/ - boolean filespecsubtractvalue (tyvaluerecord *v1, tyvaluerecord *v2, tyvaluerecord *vreturned) { - /* - subtract v2 from the filespec v1's file name, iff v2 is a simple string (no - colons). otherwise, return a string value that is simple string subtraction - */ + // + // subtract v2 from the filespec v1's file name, iff v2 is a simple string (no + // colons). otherwise, return a string value that is simple string subtraction + // + // 2006-06-24 creedon: FSRef-ized + // #ifdef MACVERSION tyfilespec fs; @@ -950,11 +976,14 @@ fl = !stringfindchar (':', bssub); if (fl) { + bigstring bs; - subtractstrings (fs.name, bssub, bsname); + getfsfile ( &fs, bs ); - err = FSMakeFSSpec (fs.vRefNum, fs.parID, bsname, &fs); + subtractstrings ( bs, bssub, bsname); + err = FSPathMakeRef ( bsname, &fs.fsref, NULL ); + fl = (err == noErr) || (err == fnfErr); } @@ -983,14 +1012,15 @@ boolean langpackfileval (const tyvaluerecord *vfile, Handle *hpacked) { - /* - 5.0a24 dmb: new format for storing filespec and alias values - in the odb. - - we create a record containing an alias to the file (Mac only), - the full path to the file (as a URL), and the machine name (for - future use). - */ + // + // we create a record containing an alias to the file (Mac only), + // the full path to the file (as a URL), and the machine name (for + // future use). + // + // 2006-06-24 creedon: FSRef-ized + // + // 5.0a24 dmb: new format for storing filespec and alias values in the odb. + // hdllistrecord hlist; bigstring bspath, bsmachine; @@ -1013,19 +1043,8 @@ case filespecvaluetype: { - #if TARGET_API_MAC_CARBON == 1 - - fs.vRefNum = (**(*vfile).data.filespecvalue).vRefNum; - fs.parID = (**(*vfile).data.filespecvalue).parID; - - copystring ((**(*vfile).data.filespecvalue).name, fs.name); - - #else + fs = **(*vfile).data.filespecvalue; - fs = **(*vfile).data.filespecvalue; - - #endif - disablelangerror (); if (!filespectoalias (&fs, true, (AliasHandle *) &halias)) @@ -1044,7 +1063,7 @@ goto exit; } - // *** should converr path to URL *** + // *** should convert path to URL *** if (!oppushstring (hlist, filerecordpath, bspath)) goto exit; @@ -1057,17 +1076,20 @@ //just indicating what platform the path is specific to. #ifdef MACVERSION + if (!oppushstring (hlist, filerecordplatform, bsplatformmac)) goto exit; + #endif #ifdef WIN95VERSION + if (!oppushstring (hlist, filerecordplatform, bsplatformwin)) goto exit; + #endif - // *** could push machine name too - if (getmachinename (bsmachine)) + if (getmachinename (bsmachine)) // *** could push machine name too if (!oppushstring (hlist, filerecordmachine, bsmachine)) goto exit; @@ -1078,20 +1100,24 @@ opdisposelist (hlist); return (fl); - } /*langpackfileval*/ + } // langpackfileval boolean langunpackfileval (Handle hpacked, tyvaluerecord *vfile) { - /* - 5.0fc2 dmb: unpacking an alias on the pc, go straight for the path string - */ + // + // 2006-06-24 creedon: for Mac, FSRef-zed + // + // 5.0fc2 dmb: unpacking an alias on the pc, go straight for the path string + // hdllistrecord hlist; Handle halias; bigstring bspath, bsplat; tyfilespec fs; boolean fl = false; + + clearbytes ( &fs, sizeof ( tyfilespec ) ); if (!opunpacklist (hpacked, &hlist)) return (false); @@ -1099,14 +1125,18 @@ switch ((*vfile).valuetype) { case aliasvaluetype: + #ifdef MACVERSION + fl = opgetlisthandle (hlist, -1, filerecordalias, &halias); if (fl) fl = copyhandle (halias, &(*vfile).data.aliasvalue); + #endif #ifdef WIN95VERSION + fl = opgetliststring (hlist, -1, filerecordpath, bspath); if (fl) { @@ -1115,6 +1145,7 @@ fl = newtexthandle (bspath, &(*vfile).data.stringvalue); } + #endif break; @@ -2431,13 +2462,6 @@ OSErr errcode = noErr; - #ifdef flsystem6 - - if (!langcanuseappleevents ()) - return (false); - - #endif - if (!getostypevalue (hparam1, 1, &class)) return (false); Modified: Frontier/branches/FSRef_Migration/Common/source/langvalue.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/langvalue.c 2006-06-25 06:32:01 UTC (rev 1414) +++ Frontier/branches/FSRef_Migration/Common/source/langvalue.c 2006-06-25 09:25:52 UTC (rev 1415) @@ -58,8 +58,14 @@ #include "timedate.h" #include "byteorder.h" /* 2006-04-08 aradke: endianness conversion macros */ +#ifdef MACVERSION + #include "MoreFilesX.h" +#endif + + + boolean flparamerrorenabled = true; boolean flnextparamislast = false; @@ -88,7 +94,6 @@ } tyfastflagsvaluerecord; - boolean langsymbolreference (hdlhashtable htable, bigstring bs, tyvaluerecord *val, hdlhashnode * hnode) { /* @@ -224,7 +229,7 @@ boolean setdatevalue (unsigned long x, tyvaluerecord *val) { - + /* set val to be a the date value x. can't fail. */ @@ -653,7 +658,7 @@ } /*setdoublevalue*/ -boolean setfilespecvalue (tyfilespec *x, tyvaluerecord *val) { +boolean setfilespecvalue (ptrfilespec x, tyvaluerecord *val) { /* turn val into a filespec value, allocated in the heap. @@ -1906,13 +1911,14 @@ boolean coercetoboolean (tyvaluerecord *v) { - /* - 2/7/92 dmb: binary to boolean is now true when non-empty, except when - it's the size of a boolean. + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // + // 2.1b4 dmb: handle filespec values + // + // 1992-02-07 dmb: binary to boolean is now true when non-empty, except when it's the size of a boolean. + // - 2.1b4 dmb: handle filespec values - */ - register boolean fl; switch ((*v).valuetype) { @@ -1990,16 +1996,17 @@ } case filespecvaluetype: { + bigstring bs; - filegetfilename(*(*v).data.filespecvalue, bs); // 3/7/97 dmb + getfsfile ( *( *v ).data.filespecvalue, bs ); // 3/7/97 dmb - fl = !isemptystring (bs); - } - // fl = !isemptystring ((**(*v).data.filespecvalue).name); + fl = ! isemptystring (bs); break; + } + case listvaluetype: case recordvaluetype: return (coercelistvalue (v, booleanvaluetype)); @@ -3003,23 +3010,26 @@ boolean coercetofilespec (tyvaluerecord *v) { - /* - 2.1b2 dmb: don't enforce any particular size when coercing from binary; - filespecs are now variable-length + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // + // 2.1b12 dmb: changed string->filespec error message to be filenotfounderror + // + // 2.1b3 dmb: coerce zero to nil filespec + // + // 2.1b2 dmb: don't enforce any particular size when coercing from binary; filespecs are now variable-length + // - 2.1b3 dmb: coerce zero to nil filespec - - 2.1b12 dmb: changed string->filespec error message to be filenotfounderror - */ - bigstring bs; byte fileurl [] = "\x08" "file:///"; tyfilespec fs; + clearbytes ( &fs, sizeof ( fs ) ); + switch ((*v).valuetype) { case filespecvaluetype: - return (true); + return ( true ); case novaluetype: if (flinhibitnilcoercion) @@ -3128,16 +3138,16 @@ boolean coercetostring (tyvaluerecord *val) { - /* - 8/10/92 dmb: added flcoerceexternaltostring flag to prevent external-to-string - coercion except when explicitly requested by stringfunc in langverbs.c + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // + // 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a reasonable display string for externals + // + // 2.1b3 dmb: don't ignore return value from objspectostring + // + // 1992-08-10 dmb: added flcoerceexternaltostring flag to prevent external-to-string coercion except when explicitly requested by stringfunc in langverbs.c + // - 2.1b3 dmb: don't ignore return value from objspectostring - - 4.1b4 dmb: if flcoerceexternaltostring is not enabled, create a - reasonable display string for externals - */ - register tyvaluerecord *v = val; bigstring bs; Handle h; @@ -3262,25 +3272,12 @@ case filespecvaluetype: { - tyfilespec fs; + tyfilespec fs = **(*v).data.filespecvalue; + + filespectopath ( &fs, bs ); - #if TARGET_API_MAC_CARBON == 1 - - fs.vRefNum = (**(*v).data.filespecvalue).vRefNum; - - fs.parID = (**(*v).data.filespecvalue).parID; - - copystring ((**(*v).data.filespecvalue).name, fs.name); - - #else - - fs = **(*v).data.filespecvalue; - - #endif - - filespectopath (&fs, bs); - break; + } case binaryvaluetype: @@ -5191,26 +5188,15 @@ } /*getostypevalue*/ -boolean getfilespecvalue (hdltreenode hfirst, short pnum, tyfilespec *fsval) { +boolean getfilespecvalue ( hdltreenode hfirst, short pnum, tyfilespec *fsval ) { tyvaluerecord val; if (!getfilespecparam (hfirst, pnum, &val)) return (false); - #if TARGET_API_MAC_CARBON == 1 + *fsval = **val.data.filespecvalue; - (*fsval).vRefNum = (**val.data.filespecvalue).vRefNum; - (*fsval).parID = (**val.data.filespecvalue).parID; - - copystring ((**val.data.filespecvalue).name, (*fsval).name); - - #else - - *fsval = **val.data.filespecvalue; - - #endif - return (true); } /*getfilespecvalue*/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-25 06:32:07
|
Revision: 1414 Author: creecode Date: 2006-06-24 23:32:01 -0700 (Sat, 24 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1414&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/launch.c Modified: Frontier/branches/FSRef_Migration/Common/source/launch.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/launch.c 2006-06-24 02:28:18 UTC (rev 1413) +++ Frontier/branches/FSRef_Migration/Common/source/launch.c 2006-06-25 06:32:01 UTC (rev 1414) @@ -29,8 +29,11 @@ #include "standard.h" #ifdef MACVERSION -#include <land.h> -#include "mac.h" + + #include <land.h> + #include "mac.h" + #include "MoreFilesX.h" + #endif #include "error.h" @@ -52,7 +55,7 @@ short nthprocess; ptrstring bsprocess; typrocessid *psnprocess; - tyfilespec *fsprocess; + ptrfilespec fsprocess; } typrocessvisitinfo; typedef struct typrocessvisitinfo *typrocessvisitinfoptr; @@ -73,26 +76,7 @@ #define maxwait 120 /*never wait more than 2 seconds for a stransition to occur*/ -#ifdef flsystem6 -typedef struct system6launchparamblock { - StringPtr name; - unsigned short reserved1; - unsigned short launchBlockID; - unsigned long launchEPBLength; - unsigned short launchFileFlags; - LaunchFlags launchControlFlags; - unsigned short launchVRefNum; -} system6launchparamblock; - -#endif - - -#ifdef MACVERSION -typedef AppParameters **AppParametersHandle; -#endif - - #ifdef WIN95VERSION typedef struct tyWINPROCESSINFO { @@ -892,460 +876,197 @@ #endif #ifdef MACVERSION -static OSErr getlaunchappparams (const tyfilespec *fsdoc, AppParametersHandle *appparams) { - - /* - 2.1a6 dmb: new feature, if bsdoc is the empty string, send ascr/noop event - instead of aevt/odoc. this should result in no empty document / standard file - dialog in most apps - */ - - AEDesc addrdesc; - AEDesc launchdesc; - AEDescList doclist; - AppleEvent event; - AEEventID eventid; - AEEventClass eventclass; - OSErr errcode; - AliasHandle halias; - AEDesc docdesc; - - if (!haveheapspace (0x0200)) /*512 bytes should be plenty to avoid lots of error checking*/ - return (memFullErr); - - if (isemptystring ((*fsdoc).name)) { - - eventclass = 'ascr'; - - eventid = 'noop'; - - /* - eventid = kAEOpenApplication; - */ - } - else { - - eventclass = kCoreEventClass; - - eventid = kAEOpenDocuments; - - errcode = NewAliasMinimal (fsdoc, &halias); - - if (errcode != noErr) - return (errcode); - } - - - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ - - newdescnull (&addrdesc, typeNull); - - #else - - addrdesc.descriptorType = typeNull; - - addrdesc.dataHandle = nil; - - #endif - - AECreateAppleEvent (eventclass, eventid, &addrdesc, kAutoGenerateReturnID, kAnyTransactionID, &event); - - if (eventid == kAEOpenDocuments) { /*need to add document list parameter*/ - - AECreateList (nil, 0, false, &doclist); /*create list for the fsspec*/ - - //AEPutPtr (&doclist, 0, typeFSS, (Ptr) &fs, sizeof (fs)); /* put filespec on the list%/ - - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ - - newdescwithhandle (&docdesc, typeAlias, (Handle) halias); - - #else - - docdesc.descriptorType = typeAlias; - - docdesc.dataHandle = (Handle) halias; - - #endif - - AEPutDesc (&doclist, 0, &docdesc); /*put alias on the list*/ - - AEDisposeDesc (&docdesc); - - AEPutParamDesc (&event, keyDirectObject, &doclist); /*put list on the event*/ - - AEDisposeDesc (&doclist); /*dispose list*/ - } - - errcode = AECoerceDesc (&event, typeAppParameters, &launchdesc); /*this is what Launch wants*/ - - AEDisposeDesc (&event); /*we're done with it*/ - - if (errcode != noErr) /*shouldn't fail, but...*/ - return (errcode); - - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ - - copydatahandle (&launchdesc, (Handle*) appparams); - #else + static boolean system7apprunning (OSType *, bigstring, typrocessid *); - *appparams = (AppParametersHandle) launchdesc.dataHandle; - - #endif - - return (noErr); - } /*getlaunchappparams*/ #endif +#ifdef WIN95VERSION -#ifdef MACVERSION -static boolean system7apprunning (OSType *, bigstring, typrocessid *); -#endif + static boolean systemWinLaunch (const ptrfilespec fsapp, const ptrfilespec fsdoc, boolean flbringtofront) { + char appname[258]; + char commandline [514]; + STARTUPINFO si; + // PROCESS_INFORMATION pi; -#ifdef MACVERSION -static boolean system7launch (tyfilespec *fsapp, const tyfilespec *fsdoc, boolean flbringtofront) { - - /* - 11/10/90 DW: comment out call to MakeFSSpec, the linker can't find it, wire - off routine. - - 3/27/91 dmb: re-enabled routine. no wonder file.launch didn't work! - - 12/9/91 dmb: check for oserrors - - 3/11/92 dmb: now accept bsdocument and set up launchAppParams - - 8/13/92 dmb: test bsdocument for emptyness as well as nil - - 9/4/92 dmb: wait for launch to happen - - 2002-11-13 AR: Only append ".app" to the filename if there's enough room in the name string - */ - - LaunchParamBlockRec sys7lpb; - AppParametersHandle docparams = nil; - OSErr errcode; - long startticks; - - clearbytes (&sys7lpb, longsizeof (sys7lpb)); - - #if TARGET_API_MAC_CARBON == 1 /*7.1b19 PBS: append ".app" to the filename if the file can't be found.*/ - { - boolean flfolder = false; - - if (!fileexists (fsapp, &flfolder)) { - unsigned char appext[] = ("\x04" ".app"); - const short oldlength = stringlength ((*fsapp).name); - const short newlength = oldlength + stringlength (appext); - const short maxlength = sizeof ((*fsapp).name) - 1; /*minus one for length byte*/ - - if (newlength <= maxlength) { + copystring (fsname (fsapp), appname); - pushstring (appext, (*fsapp).name); - - if (!fileexists (fsapp, &flfolder)) { + nullterminate (appname); - setstringlength ((*fsapp).name, oldlength); /*pop off the .app suffix*/ + if (fsdoc != nil) + copystring (fsname (fsdoc), commandline); + else + setemptystring (commandline); - } /*if*/ - } /*if*/ - } /*if*/ + nullterminate (commandline); + + si.cb = sizeof(STARTUPINFO); + si.lpReserved = NULL; + si.lpDesktop = NULL; + si.lpTitle = NULL; + si.dwFlags = 0; + si.cbReserved2 = 0; + si.lpReserved2 = NULL; + // return (CreateProcess (stringbaseaddress (appname), stringbaseaddress (commandline), NULL, NULL, false, CREATE_DEFAULT_ERROR_MODE, + // NULL, NULL, &si, &pi)); + + return (ShellExecute (NULL, "open", stringbaseaddress (appname), stringbaseaddress (commandline), "", SW_SHOWNORMAL) > (HINSTANCE)32); } - /* - { - boolean flfolder = false; - short lenname = (*fsapp).name [0]; - if (!fileexists (fsapp, &flfolder)) { - - (*fsapp).name [0] = (*fsapp).name [0] + 4; - - (*fsapp).name [lenname + 1] = '.'; - (*fsapp).name [lenname + 2] = 'a'; - (*fsapp).name [lenname + 3] = 'p'; - (*fsapp).name [lenname + 4] = 'p'; - - if (!fileexists (fsapp, &flfolder)) { - - (*fsapp).name [0] = lenname; /%pop off the .app suffix%/ - } /%if%/ - } /%if%/ - } - */ - #endif - - sys7lpb.launchAppSpec = (FSSpecPtr) fsapp; - - sys7lpb.launchBlockID = extendedBlock; - - sys7lpb.launchEPBLength = extendedBlockLen; - - sys7lpb.launchControlFlags = launchContinue | launchNoFileFlags; +#endif - if (!flbringtofront) - sys7lpb.launchControlFlags |= launchDontSwitch; + +boolean launchapplication ( const ptrfilespec fsapp, const ptrfilespec fsdoc, boolean flbringtofront ) { + + // + // 2006-06-24 creedon: for Mac, FSRef-ized + // - if (fsdoc != nil) { /*set up docparam with launch event*/ - - errcode = getlaunchappparams (fsdoc, &docparams); - - if (oserror (errcode)) - return (false); - - setoserrorparam ((ptrstring) (*fsapp).name); /*restore*/ - - lockhandle ((Handle) docparams); - - sys7lpb.launchAppParameters = *docparams; - } + setfserrorparam ( fsapp ); // in case error message takes a filename parameter - errcode = LaunchApplication (&sys7lpb); + #ifdef MACVERSION - disposehandle ((Handle) docparams); /*checks for nil*/ - - if ((fsdoc != nil) && isemptystring ((*fsdoc).name)) /*sent noop event*/ - if (errcode == errAEEventNotHandled) - errcode = noErr; - - if (oserror (errcode)) - return (false); - - startticks = gettickcount (); - - while (true) { /*wait for launch to happen*/ + LSLaunchFSRefSpec launchspec; + tyfilespec fsappt, fsdoct; + OSStatus status; - OSType id = 0; + if ( ! extendfilespec ( fsapp, &fsappt ) ) + return ( false ); - if (!(*launchcallbacks.waitcallback) ()) - return (false); + clearbytes ( &launchspec, longsizeof ( launchspec ) ); - if (system7apprunning (&id, (ptrstring) (*fsapp).name, nil)) - return (true); + launchspec.appRef = &fsappt.fsref; + + if ( fsdoc != NULL ) { - if (gettickcount () - startticks > maxwait) - return (false); - } - } /*system7launch*/ -#endif + ( void ) extendfilespec ( fsdoc, &fsdoct ); -#ifdef flsystem6 + if ( FSRefValid ( &fsdoct.fsref ) ) { + FSRef fsa [ 1 ]; + + launchspec.numDocs = 1; + + fsa [ 0 ] = fsdoct.fsref; + + launchspec.itemRefs = fsa; + + } // FSRefValid + + } // fsdoc + + if ( ! flbringtofront ) + launchspec.launchFlags |= kLSLaunchDontSwitch; + + status = LSOpenFromRefSpec ( &launchspec, NULL ); -static boolean system6launch (bigstring bsprogram) { + if ( status == noErr ) + return ( true ); + + return ( false ); - system6launchparamblock sys6lpb; - bigstring bsname; - bigstring bsfolder; - register OSErr errcode; - WDPBRec wdpb; - CInfoPBRec cipb; - short vnum; + #endif + + #ifdef WIN95VERSION - clearbytes (&sys6lpb, longsizeof (sys6lpb)); + return (systemWinLaunch (fsapp, fsdoc, flbringtofront)); + + #endif - copystring (bsprogram, bsname); - - /*get the volume and directory ids of the path*/ - - /* - if (!fileparsevolname (bsprogram, &vnum)) - return (false); - */ - - folderfrompath (bsprogram, bsfolder); - - cipb.hFileInfo.ioNamePtr = bsfolder; - - cipb.hFileInfo.ioVRefNum = 0; /*vnum;*/ - - cipb.hFileInfo.ioFDirIndex = 0; - - errcode = PBGetCatInfo (&cipb, false); - - if (oserror (errcode)) - return (false); - - /*now open a working directory there*/ - - wdpb.ioNamePtr = bsfolder; - - wdpb.ioVRefNum = 0; - - wdpb.ioWDProcID = 'ERIK'; - - wdpb.ioWDDirID = cipb.hFileInfo.ioDirID; - - errcode = PBOpenWD (&wdpb, false); - - if (oserror (errcode)) - return (false); - - vnum = wdpb.ioVRefNum; - - filefrompath (bsprogram, bsname); - - sys6lpb.launchFileFlags = cipb.hFileInfo.ioFlFndrInfo.fdFlags; - - /*make the (new) working directory the current one*/ - - errcode = SetVol (nil, vnum); - - sys6lpb.name = bsname; - - sys6lpb.launchVRefNum = vnum; - - sys6lpb.launchBlockID = extendedBlock; - - sys6lpb.launchEPBLength = extendedBlockLen; - - sys6lpb.launchControlFlags = 0xC000; - - return (!oserror (LaunchApplication ((LaunchPBPtr) &sys6lpb))); - } /*system6launch*/ + } // launchapplication -#endif -#ifdef WIN95VERSION -static boolean systemWinLaunch (const tyfilespec *fsapp, const tyfilespec *fsdoc, boolean flbringtofront) { - char appname[258]; - char commandline [514]; - STARTUPINFO si; -// PROCESS_INFORMATION pi; - - - copystring (fsname (fsapp), appname); - - nullterminate (appname); - - if (fsdoc != nil) - copystring (fsname (fsdoc), commandline); - else - setemptystring (commandline); - - nullterminate (commandline); - - si.cb = sizeof(STARTUPINFO); - si.lpReserved = NULL; - si.lpDesktop = NULL; - si.lpTitle = NULL; - si.dwFlags = 0; - si.cbReserved2 = 0; - si.lpReserved2 = NULL; -// return (CreateProcess (stringbaseaddress (appname), stringbaseaddress (commandline), NULL, NULL, false, CREATE_DEFAULT_ERROR_MODE, -// NULL, NULL, &si, &pi)); - - return (ShellExecute (NULL, "open", stringbaseaddress (appname), stringbaseaddress (commandline), "", SW_SHOWNORMAL) > (HINSTANCE)32); - } -#endif - -boolean launchapplication (const tyfilespec *fsapp, const tyfilespec *fsdoc, boolean flbringtofront) { - - setoserrorparam ((ptrstring) fsname(fsapp)); /*in case error message takes a filename parameter*/ - #ifdef MACVERSION - #ifdef flsystem6 - - flsystem7 = (gSystemVersion >= 0x0700); - - if (flsystem7) - return (system7launch (bs, bsdocument, flbringtofront)); - else - return (system6launch (bs)); - - #else - - return (system7launch ((ptrfilespec) fsapp, fsdoc, flbringtofront)); - - #endif -#endif - -#ifdef WIN95VERSION - return (systemWinLaunch (fsapp, fsdoc, flbringtofront)); -#endif - } /*launchapplication*/ -#ifdef MACVERSION -static boolean visitprocesses (boolean (*visitroutine) (typrocessvisitinfoptr, ProcessInfoRec *), typrocessvisitinfoptr visitinfo) { - - ProcessInfoRec processinfo; - ProcessSerialNumber psn; - bigstring bsname; - FSSpec fss; - - processinfo.processInfoLength = sizeof (processinfo); - - processinfo.processName = bsname; /*place to store process name*/ - - processinfo.processAppSpec = &fss; /*place to store process filespec*/ - - psn.highLongOfPSN = kNoProcess; - - psn.lowLongOfPSN = kNoProcess; - - while (GetNextProcess (&psn) == noErr) { + static boolean visitprocesses (boolean (*visitroutine) (typrocessvisitinfoptr, ProcessInfoRec *), typrocessvisitinfoptr visitinfo) { - processinfo.processInfoLength = sizeof (ProcessInfoRec); - - if (GetProcessInformation (&psn, &processinfo) != noErr) - continue; /*keep going -- ignore error*/ + ProcessInfoRec processinfo; + ProcessSerialNumber psn; + bigstring bsname; + FSSpec fss; - if (!(*visitroutine) (visitinfo, &processinfo)) - return (false); - } + processinfo.processInfoLength = sizeof (processinfo); + + processinfo.processName = bsname; /*place to store process name*/ + + processinfo.processAppSpec = &fss; /*place to store process filespec*/ + + psn.highLongOfPSN = kNoProcess; + + psn.lowLongOfPSN = kNoProcess; + + while (GetNextProcess (&psn) == noErr) { + + processinfo.processInfoLength = sizeof (ProcessInfoRec); + + if (GetProcessInformation (&psn, &processinfo) != noErr) + continue; /*keep going -- ignore error*/ + + if (!(*visitroutine) (visitinfo, &processinfo)) + return (false); + } + + return (true); + } /*visitprocesses*/ - return (true); - } /*visitprocesses*/ #endif #ifdef MACVERSION -static boolean matchprocess (bigstring bsprocess, ProcessInfoRec *processinfo) { - - /* - 9/4/92 dmb: see if bsprocess is the name or full path of the given process - - 10/2/92 dmb: if bsprocess is a string4, see if it matches the process id - - 7.1b37 PBS: deal with .app extensions on OS X. - */ - - bigstring bspath; - OSType id; - - if (stringfindchar (':', bsprocess)) { /*it's a path*/ + + static boolean matchprocess (bigstring bsprocess, ProcessInfoRec *processinfo) { - if (!filespectopath (processinfo->processAppSpec, bspath)) - return (false); + // + // 2006-06-24 creedon: FSRef-ized + // + // 7.1b37 PBS: deal with .app extensions on OS X. + // + // 1992-10-02 dmb: if bsprocess is a string4, see if it matches the process id + // + // 1992-09-04 dmb: see if bsprocess is the name or full path of the given process + // - return (equalidentifiers (bsprocess, bspath)); - } - - if (equalidentifiers (bsprocess, processinfo->processName)) - return (true); - - #if TARGET_API_MAC_CARBON - - { - bigstring bsprocessminussuffix; - bigstring bssuffix; + bigstring bspath; + OSType id; - copystring (bsprocess, bsprocessminussuffix); + if (stringfindchar (':', bsprocess)) { // it's a path - if (pullstringsuffix (bsprocessminussuffix, bssuffix, '.')) /*has suffix?*/ + tyfilespec fs; + + FSMakeFSRef ( ( *processinfo ).processAppSpec -> vRefNum, ( *processinfo ).processAppSpec -> parID, ( *processinfo ).processAppSpec -> name, &fs.fsref); - if (equalidentifiers (bssuffix, "\papp")) /*.app suffix?*/ + if (!filespectopath ( &fs, bspath)) + return (false); - if (equalidentifiers (bsprocessminussuffix, processinfo->processName)) /*match?*/ - return (true); - } + return (equalidentifiers (bsprocess, bspath)); + } + + if (equalidentifiers (bsprocess, ( *processinfo ).processName)) + return (true); + + #if TARGET_API_MAC_CARBON + + { + bigstring bsprocessminussuffix; + bigstring bssuffix; + + copystring (bsprocess, bsprocessminussuffix); + + if (pullstringsuffix (bsprocessminussuffix, bssuffix, '.')) // has suffix? + + if (equalidentifiers (bssuffix, "\papp")) // .app suffix? + + if (equalidentifiers (bsprocessminussuffix, ( *processinfo ).processName)) // match? + return (true); + } + + #endif + + if (stringtoostype (bsprocess, &id)) + return (id == ( *processinfo ).processSignature); + + return (false); + } // matchprocess - #endif - - if (stringtoostype (bsprocess, &id)) - return (id == processinfo->processSignature); - - return (false); - } /*matchprocess*/ #endif @@ -1698,68 +1419,54 @@ #ifdef MACVERSION -static boolean system7frontprogram (bigstring bsprogram, boolean flfullpath) { - - /* - 10/3/91 dmb: if flfullpath is true, return the full path instead of the - process name - */ - - ProcessInfoRec processinfo; - ProcessSerialNumber psn; - FSSpec fs; - - processinfo.processInfoLength = sizeof (processinfo); - - processinfo.processName = bsprogram; /*place to store process name*/ - - processinfo.processAppSpec = &fs; - - if (oserror (GetFrontProcess (&psn))) - return (false); - - if (oserror (GetProcessInformation (&psn, &processinfo))) - return (false); - - if (flfullpath) - filespectopath (&fs, bsprogram); - - return (true); - } /*system7frontprogram*/ -#endif - -#ifdef flsystem6 - -static boolean system6frontprogram (bigstring bsprogram) { + static boolean system7frontprogram (bigstring bsprogram, boolean flfullpath) { + + // + // 2006-06-24 creedon: FSRef-ized + // + // 1991-10-03 dmb: if flfullpath is true, return the full path instead of the process name + // + + ProcessInfoRec processinfo; + ProcessSerialNumber psn; + FSSpec fs; + + processinfo.processInfoLength = sizeof (processinfo); + + processinfo.processName = bsprogram; // place to store process name + + processinfo.processAppSpec = &fs; + + if (oserror (GetFrontProcess (&psn))) + return (false); + + if (oserror (GetProcessInformation (&psn, &processinfo))) + return (false); + + if (flfullpath) { + + tyfilespec fst = { { { 0 } }, 0 }; + + FSpMakeFSRef ( &fs, &fst.fsref ); + + filespectopath (&fst, bsprogram); + + } + + return (true); + + } // system7frontprogram - copystring ((ptrstring) CurApName, bsprogram); - - return (true); - } /*system6frontprogram*/ - #endif boolean getfrontapplication (bigstring bsprogram, boolean flfullpath) { #ifdef MACVERSION - #ifdef flsystem6 - - boolean flsystem7; - - flsystem7 = (macworld.systemVersion >= 0x0700); - - if (flsystem7) - return (system7frontprogram (bsprogram, flfullpath)); - else - return (system6frontprogram (bsprogram)); - - #else - + return (system7frontprogram (bsprogram, flfullpath)); - #endif #endif #ifdef WIN95VERSION @@ -1917,182 +1624,194 @@ #ifdef MACVERSION -static boolean getprocesspathvisit (typrocessvisitinfoptr visitinfo, ProcessInfoRec *processinfo) { - - /* - 7/14/92 dmb: created - */ - - if (matchprocess (visitinfo->bsprocess, processinfo)) { /*found the process*/ + + static boolean getprocesspathvisit (typrocessvisitinfoptr visitinfo, ProcessInfoRec *processinfo) { - *(visitinfo->fsprocess) = *(processinfo->processAppSpec); + // + // 2006-06-24 creedon: FSRef-ized + // + // 1992-07-14 dmb: created + // - return (false); /*stop visiting*/ - } - - return (true); /*keep visiting*/ - } /*getprocesspathvisit*/ + if (matchprocess (visitinfo->bsprocess, processinfo)) { // found the process + + FSMakeFSRef ( processinfo -> processAppSpec -> vRefNum, processinfo -> processAppSpec -> parID, + processinfo -> processAppSpec -> name, &visitinfo -> fsprocess -> fsref ); + + return (false); // stop visiting + } + + return (true); // keep visiting + + } // getprocesspathvisit + #endif -boolean getapplicationfilespec (bigstring bsprogram, tyfilespec *fs) { +boolean getapplicationfilespec (bigstring bsprogram, ptrfilespec fs) { - /* - 5.0.2b21 dmb: clear unused fields on Win - - 2000-06-09 Timothy Paustian: Changed because using SysEnvisons - and SysEnvRec is like Really old style. This was changed to Gestalt calls - with two new globals see mac.c initmacintosh. - - 2002-11-14 AR: Switch from using globals to a local struct for providing - context to the getprocesspathvisit callback routine - - 2004-10-26 aradke: New Carbon/Mach-O implementation for obtaining - a filespec to our application bundle, i.e. the Frontier.app "folder". - - 2006-02-17 aradke: Clear filespec before doing our thing on Mac too, - so the caller won't crash if he ignores a false return value and - tries to access the filespec anyway. Our only caller with a non-nil - bsprogram currently is sys.getAppPath (shellsysverbs.c) and it does - exactly that. - */ + // + // 2006-06-18 creedon: for Mac, FSRef-ized + // + // 2006-02-17 aradke: Clear filespec before doing our thing on Mac too, so the caller won't crash if he ignores a false + // return value and tries to access the filespec anyway. Our only caller with a non-nil bsprogram + // currently is sys.getAppPath (shellsysverbs.c) and it does exactly that. + // + // 5.0.2b21 dmb: clear unused fields on Win + // + // 2004-10-26 aradke: New Carbon/Mach-O implementation for obtaining a filespec to our application bundle, i.e. the + // Frontier.app "folder". + // + // 2002-11-14 AR: Switch from using globals to a local struct for providing context to the getprocesspathvisit callback + // routine + // + // 2000-06-09 Timothy Paustian: Changed because using SysEnvisons and SysEnvRec is like Really old style. This was + // changed to Gestalt calls with two new globals see mac.c initmacintosh. + // -#ifdef MACVERSION - typrocessvisitinfo info; - boolean flsystem7; + #ifdef MACVERSION - clearbytes (fs, sizeof (*fs)); /* 2006-02-17 aradke */ + typrocessvisitinfo info; + boolean flsystem7; + + clearbytes ( fs, sizeof ( *fs ) ); - flsystem7 = (gSystemVersion >= 0x0700); - - if (!flsystem7) - return (false); - - if (bsprogram == nil) { /*get path to this process*/ + flsystem7 = (gSystemVersion >= 0x0700); - #if TARGET_RT_MAC_MACHO - CFBundleRef mybundleref; - CFURLRef myurlref; - FSRef myfsref; - boolean res; - OSErr err; + if (!flsystem7) + return (false); + + if (bsprogram == nil) { // get path to this process - mybundleref = CFBundleGetMainBundle(); + #if TARGET_RT_MAC_MACHO - if (mybundleref == NULL) - return (false); - - myurlref = CFBundleCopyBundleURL(mybundleref); - - if (myurlref == NULL) - return (false); + CFBundleRef mybundleref; + CFURLRef myurlref; + boolean res; + + mybundleref = CFBundleGetMainBundle(); + + if (mybundleref == NULL) + return (false); + + myurlref = CFBundleCopyBundleURL(mybundleref); + + if (myurlref == NULL) + return (false); - res = CFURLGetFSRef(myurlref, &myfsref); + res = CFURLGetFSRef ( myurlref, &( *fs ).fsref ); + + getfilespecparent ( fs ); + + CFRelease(myurlref); + + if (!res) + return (false); + + return ( true ); + + #else - CFRelease(myurlref); + ProcessInfoRec processinfo; + ProcessSerialNumber psn; + + processinfo.processInfoLength = sizeof (processinfo); + + processinfo.processName = nil; // place to store process name + + processinfo.processAppSpec = fs; // place to store process filespec + + psn.highLongOfPSN = 0; + + psn.lowLongOfPSN = kCurrentProcess; + + if (GetProcessInformation (&psn, &processinfo) != noErr) + return (false); + + return (true); + + #endif - if (!res) - return (false); - - err = FSGetCatalogInfo(&myfsref, kFSCatInfoNone, NULL, NULL, fs, NULL); - - return (err == noErr); - #else - ProcessInfoRec processinfo; - ProcessSerialNumber psn; - - processinfo.processInfoLength = sizeof (processinfo); - - processinfo.processName = nil; /*place to store process name*/ - - processinfo.processAppSpec = fs; /*place to store process filespec*/ - - psn.highLongOfPSN = 0; - - psn.lowLongOfPSN = kCurrentProcess; - - if (GetProcessInformation (&psn, &processinfo) != noErr) - return (false); - - return (true); - #endif - } + } + + initprocessvisitinfo (&info); + + info.bsprocess = bsprogram; // point to caller's storage + + info.fsprocess = fs; // can be same storage as bsprogram -- or not + + return (!visitprocesses (&getprocesspathvisit, &info)); + + #endif + + #ifdef WIN95VERSION - initprocessvisitinfo (&info); - - info.bsprocess = bsprogram; /*point to caller's storage*/ - - info.fsprocess = fs; /*can be same storage as bsprogram -- or not*/ - - return (!visitprocesses (&getprocesspathvisit, &info)); -#endif + WINPROCESSHEADER listheader; + WINPROCESSINFO ** entry; + boolean res; + char curpath[256]; + short len; + // OSVERSIONINFO osinfo; -#ifdef WIN95VERSION - WINPROCESSHEADER listheader; - WINPROCESSINFO ** entry; - boolean res; - char curpath[256]; - short len; -// OSVERSIONINFO osinfo; + // osinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); -// osinfo.dwOSVersionInfoSize = sizeof (OSVERSIONINFO); + // GetVersionEx (&osinfo); -// GetVersionEx (&osinfo); + // if (osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) -// if (osinfo.dwPlatformId == VER_PLATFORM_WIN32_NT) + res = false; + + clearbytes (fs, sizeof (*fs)); - res = false; - - clearbytes (fs, sizeof (*fs)); + if ((bsprogram == NULL) || (stringlength (bsprogram) == 0)) { - if ((bsprogram == NULL) || (stringlength (bsprogram) == 0)) { + len = (short)GetModuleFileName (NULL, curpath, sizeof(curpath)); - len = (short)GetModuleFileName (NULL, curpath, sizeof(curpath)); + if (len > 0) { + curpath[len] = 0; //ensure null termination + copyctopstring (curpath, fsname(fs)); + res = true; + return (res); + } + } + + enumWinProcesses (&listheader); - if (len > 0) { - curpath[len] = 0; //ensure null termination - copyctopstring (curpath, fsname(fs)); - res = true; - return (res); + if ((bsprogram == NULL) || (stringlength (bsprogram) == 0)) { + entry = getprocessinfofrompid (&listheader, GetCurrentProcessId()); } - } + else + { + entry = getprocessinfofrommodname (&listheader, bsprogram); + if (entry == NULL) + entry = getprocessinfofromwintitle (&listheader, bsprogram); - enumWinProcesses (&listheader); + if (entry == NULL) + entry = getprocessinfofromexepath (&listheader, bsprogram); + } - if ((bsprogram == NULL) || (stringlength (bsprogram) == 0)) { - entry = getprocessinfofrompid (&listheader, GetCurrentProcessId()); - } - else - { - entry = getprocessinfofrommodname (&listheader, bsprogram); + setstringlength (fsname(fs), 0); - if (entry == NULL) - entry = getprocessinfofromwintitle (&listheader, bsprogram); + if (entry != NULL) { + copystring ((**entry).ExeName, fsname(fs)); + res = true; + } + // else { + // GetCurrentDirectory (256, curpath); + // strcat (curpath, "\\Frontier.exe"); + // copyctopstring (curpath, fsname(fs)); + // res = true; + // } - if (entry == NULL) - entry = getprocessinfofromexepath (&listheader, bsprogram); - } + cleanProcessHeader (&listheader); + return (res); + + #endif + + } // getapplicationfilespec - setstringlength (fsname(fs), 0); - if (entry != NULL) { - copystring ((**entry).ExeName, fsname(fs)); - res = true; - } -// else { -// GetCurrentDirectory (256, curpath); -// strcat (curpath, "\\Frontier.exe"); -// copyctopstring (curpath, fsname(fs)); -// res = true; -// } - - cleanProcessHeader (&listheader); - return (res); -#endif - } /*getapplicationfilespec*/ - - boolean executeresource (ResType type, short id, bigstring bsname) { #ifdef MACVERSION This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 02:28:23
|
Revision: 1413 Author: creecode Date: 2006-06-23 19:28:18 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1413&view=rev Log Message: ----------- FSRef-ized code cleanup Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/headers/osincludes.h Frontier/branches/FSRef_Migration/Common/headers/player.h Frontier/branches/FSRef_Migration/Common/source/mouse.c Frontier/branches/FSRef_Migration/Common/source/player.c Frontier/branches/FSRef_Migration/Common/stubs/megastubs.c Modified: Frontier/branches/FSRef_Migration/Common/headers/osincludes.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/osincludes.h 2006-06-24 02:15:20 UTC (rev 1412) +++ Frontier/branches/FSRef_Migration/Common/headers/osincludes.h 2006-06-24 02:28:18 UTC (rev 1413) @@ -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/FSRef_Migration/Common/headers/player.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/player.h 2006-06-24 02:15:20 UTC (rev 1412) +++ Frontier/branches/FSRef_Migration/Common/headers/player.h 2006-06-24 02:28:18 UTC (rev 1413) @@ -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/FSRef_Migration/Common/source/mouse.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/mouse.c 2006-06-24 02:15:20 UTC (rev 1412) +++ Frontier/branches/FSRef_Migration/Common/source/mouse.c 2006-06-24 02:28:18 UTC (rev 1413) @@ -28,7 +28,7 @@ #include "frontier.h" #include "standard.h" -#ifdef MACVERSION +#ifdef MACVERSION #define GetDoubleClickTime() GetDblTime() #endif Modified: Frontier/branches/FSRef_Migration/Common/source/player.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/player.c 2006-06-24 02:15:20 UTC (rev 1412) +++ Frontier/branches/FSRef_Migration/Common/source/player.c 2006-06-24 02:28:18 UTC (rev 1413) @@ -68,7 +68,13 @@ #include "lang.h" #include "langinternal.h" +#ifdef MACVERSION + #include "MoreFilesX.h" + +#endif + + #define moviestasktime 30 typedef struct typlayerrecord { @@ -502,39 +508,33 @@ } /*playermoviecontrollereventfilter*/ -boolean playeropenmovieinwindow (FSSpec *f) { +boolean playeropenmovieinwindow ( ptrfilespec f ) { - /* - 7.0b4 PBS: open a movie in the QuickTime Player window and display it. - If the window isn't already open, open it. - */ + // + // 2006-06-23 creedon: FSRef-zed + // + // 7.0b4 PBS: open a movie in the QuickTime Player window and display it. If the window isn't already open, open it. + // short movieresref; - OSErr err; - hdlwindowinfo hinfo; + FSSpec fs; + FSRefMakeFSSpec ( &( *f ).fsref, &fs ); + if (!findplayerwindow (&hinfo)) - playeropencommand (); /*If the Player window doesn't exist, create a new one.*/ + playeropencommand (); // If the Player window doesn't exist, create a new one. getwindowinfo (playerwindow, &playerwindowinfo); - playerdisposecurrentmovie (); /*make sure the current movie has been disposed*/ + playerdisposecurrentmovie (); // make sure the current movie has been disposed - #if TARGET_API_MAC_CARBON == 1 + SetGWorld (GetWindowPort (playerwindow), nil); - SetGWorld (GetWindowPort (playerwindow), nil); + err = OpenMovieFile ( &fs, &movieresref, fsRdPerm); - #else - - SetGWorld ((CGrafPtr) playerwindow, nil); - - #endif - - err = OpenMovieFile (f, &movieresref, fsRdPerm); - if (err != noErr) return (false); @@ -543,16 +543,8 @@ CloseMovieFile (movieresref); - #if TARGET_API_MAC_CARBON == 1 - - SetMovieGWorld (currentmovie, GetWindowPort (playerwindow), nil); + SetMovieGWorld (currentmovie, GetWindowPort (playerwindow), nil); - #else - - SetMovieGWorld (currentmovie, (CGrafPtr) playerwindow, nil); - - #endif - GetMovieBox (currentmovie, ¤tmovierect); OffsetRect (¤tmovierect, -currentmovierect.left, -currentmovierect.top); @@ -569,7 +561,7 @@ (**playerwindowinfo).contentrect = currentmovierect; - AlignWindow (playerwindow, false, nil, nil); /*position for optimal playback*/ + AlignWindow (playerwindow, false, nil, nil); // position for optimal playback //MCDoAction (currentcontroller, mcActionSetKeysEnabled, (void *) true); /*enable keyboard input*/ /*No!*/ @@ -578,7 +570,7 @@ MCIdle (currentcontroller); return (true); - } /*playeropenmovieinwindow*/ + } // playeropenmovieinwindow boolean playerplaymovie (void) { Modified: Frontier/branches/FSRef_Migration/Common/stubs/megastubs.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/stubs/megastubs.c 2006-06-24 02:15:20 UTC (rev 1412) +++ Frontier/branches/FSRef_Migration/Common/stubs/megastubs.c 2006-06-24 02:28:18 UTC (rev 1413) @@ -627,10 +627,10 @@ /* -extern boolean getfiletype (const tyfilespec *, OSType *); -extern boolean fileresolvealias (tyfilespec *); -extern boolean sfdialog (tysfverb, bigstring, ptrsftypelist, tyfilespec *); -extern boolean getapplicationfilespec (bigstring, tyfilespec *); +extern boolean getfiletype (const ptrfilespec , OSType *); +extern boolean fileresolvealias (ptrfilespec ); +extern boolean sfdialog (tysfverb, bigstring, ptrsftypelist, ptrfilespec ); +extern boolean getapplicationfilespec (bigstring, ptrfilespec ); */ boolean initmacintosh () This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 02:15:28
|
Revision: 1412 Author: creecode Date: 2006-06-23 19:15:20 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1412&view=rev Log Message: ----------- FSRef-ized code cleanup Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/headers/resources.h Frontier/branches/FSRef_Migration/Common/headers/shell.h Frontier/branches/FSRef_Migration/Common/source/resources.c Frontier/branches/FSRef_Migration/Common/source/search.c Frontier/branches/FSRef_Migration/Common/source/shell.c Modified: Frontier/branches/FSRef_Migration/Common/headers/resources.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/resources.h 2006-06-24 02:08:06 UTC (rev 1411) +++ Frontier/branches/FSRef_Migration/Common/headers/resources.h 2006-06-24 02:15:20 UTC (rev 1412) @@ -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/FSRef_Migration/Common/headers/shell.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/shell.h 2006-06-24 02:08:06 UTC (rev 1411) +++ Frontier/branches/FSRef_Migration/Common/headers/shell.h 2006-06-24 02:15:20 UTC (rev 1412) @@ -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); Modified: Frontier/branches/FSRef_Migration/Common/source/resources.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/resources.c 2006-06-24 02:08:06 UTC (rev 1411) +++ Frontier/branches/FSRef_Migration/Common/source/resources.c 2006-06-24 02:15:20 UTC (rev 1412) @@ -139,101 +139,76 @@ } /*closeresourcefile*/ -boolean openresourcefile (const tyfilespec *fs, short *rnum, short forktype) { -#ifdef MACVERSION +boolean openresourcefile ( const ptrfilespec fs, short *rnum, short forktype ) { + /* - 2006-01-30 creedon: added check for non-carbon OS and trying to access the data fork of a file, error message + 2006-01-30 creedon: on Mac added check for non-carbon OS and trying to access the data fork of a file, error message - 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile + 2005-09-02 creedon: on Mac added support for fork parameter, see resources.c: openresourcefile and pushresourcefile */ - - short resourcerefnum = -1; -#if TARGET_API_MAC_CARBON == 1 - HFSUniStr255 fork; - FSRef myRef; -#else - if (forktype == datafork) { // if we're not on carbon then trying to use the data fork for resources is an error - langerrormessage ("\x4A" "Can't open the data fork for use with resources on this version of the OS."); - return (false); - } -#endif - SetResLoad (false); + #ifdef MACVERSION -#if TARGET_API_MAC_CARBON == 1 - - FSpMakeFSRef (fs, &myRef); + short resourcerefnum = -1; + HFSUniStr255 fork; + OSErr err; + + SetResLoad (false); - switch (forktype) { - case resourcefork: - FSGetResourceForkName (&fork); - break; + switch (forktype) { + case resourcefork: + FSGetResourceForkName (&fork); + break; - case datafork: - FSGetDataForkName (&fork); - break; - } + case datafork: + FSGetDataForkName (&fork); + break; + } - /* - 2005-09-01 creedon - in my reading about the FSOpenResourceFile function someone mentioned - that it might not deal well with corrupted resources and that dropping back to FSpOpenResFile - seemed to do the trick. i've not done that here but could be tried if the problem is real - and manifests. - */ + /* + 2005-09-01 creedon - in my reading about the FSOpenResourceFile function someone mentioned + that it might not deal well with corrupted resources and that dropping back to FSpOpenResFile + seemed to do the trick. i've not done that here but could be tried if the problem is real + and manifests. + */ + + err = FSOpenResourceFile ( &( *fs ).fsref, fork.length, fork.unicode, fsRdWrPerm, &resourcerefnum ); - FSOpenResourceFile (&myRef, fork.length, fork.unicode, fsRdWrPerm, &resourcerefnum); + SetResLoad (true); -#else + if (ResError () == -39 ) { /*eof error, file has no resource fork, create one*/ - resourcerefnum = FSpOpenResFile (fs, fsRdWrPerm); - -#endif - - SetResLoad (true); - - if (ResError () == -39) { /*eof error, file has no resource fork, create one*/ - -#if ((TARGET_API_MAC_CARBON == 1) && !defined(__MWERKS__)) - - OSErr errcode = FSCreateResourceFork (&myRef, fork.length, fork.unicode, 0); - - if (errcode != noErr) /*failed to create resource fork*/ - goto error; + err = FSCreateResourceFork (&fs -> fsref, fork.length, fork.unicode, 0); - FSOpenResourceFile (&myRef, fork.length, fork.unicode, fsRdWrPerm, &resourcerefnum); -#else - HCreateResFile ((*fs).vRefNum, (*fs).parID, (StringPtr) (*fs).name); - - if (ResError () != noErr) /*failed to create resource fork*/ - goto error; - - resourcerefnum = FSpOpenResFile (fs, fsRdWrPerm); + if (err != noErr) /*failed to create resource fork*/ + goto error; + + FSOpenResourceFile (&fs -> fsref, fork.length, fork.unicode, fsRdWrPerm, &resourcerefnum); + } -#endif - } - - if (resourcerefnum != -1) /*it's open*/ { + if (resourcerefnum != -1) /*it's open*/ { + + UseResFile (resourcerefnum); /*in case it was already open*/ + + *rnum = resourcerefnum; + + return (true); + } - UseResFile (resourcerefnum); /*in case it was already open*/ - - *rnum = resourcerefnum; - - return (true); - } - -error: + error: - setoserrorparam ((ptrstring) (*fs).name); /*in case error message takes a filename parameter*/ + setfserrorparam ( fs ); /*in case error message takes a filename parameter*/ - oserror (ResError ()); + oserror (ResError ()); - closeresourcefile (resourcerefnum); /*checks for -1*/ + closeresourcefile (resourcerefnum); /*checks for -1*/ - *rnum = -1; + *rnum = -1; -#endif // MACVERSION + #endif // MACVERSION + return (false); - } /*openresourcefile*/ + } /* openresourcefile */ #ifdef MACVERSION @@ -541,7 +516,7 @@ #endif #ifdef MACVERSION -boolean saveresource (const tyfilespec *fs, short rnum, ResType type, short id, bigstring bsname, long sizedata, void *pdata, short forktype) { +boolean saveresource (const ptrfilespec fs, short rnum, ResType type, short id, bigstring bsname, long sizedata, void *pdata, short forktype) { /* open the file indicated by fname and vnum, and assign pdata to the resource @@ -586,7 +561,7 @@ #endif #ifdef MACVERSION -boolean saveresourcehandle (const tyfilespec *fs, ResType type, short id, bigstring bsname, Handle h, short forktype) { +boolean saveresourcehandle (const ptrfilespec fs, ResType type, short id, bigstring bsname, Handle h, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile @@ -607,36 +582,23 @@ /* static for push/popresourcefile */ - private short newrnum, oldrnum; +private short newrnum, oldrnum; + #ifdef MACVERSION -static boolean pushresourcefile (const tyfilespec *fs, char permission, short forktype) { - - /* - 2006-01-30 creedon: added check for non-carbon OS and trying to access the data fork of a file, error message - - 2005-09-02 creedon: added support for fork parameter, allows access to resources in data forks - 2.1b8 dmb: call SetResLoad (false) before opening a resource fork to - prevent all preload resources from being loaded into our heap - */ - - register OSErr errcode; -#if TARGET_API_MAC_CARBON == 1 - FSRef myRef; -#else - if (forktype == datafork) { // if we're not on carbon then trying to use the data fork for resources is an error - langerrormessage ("\x4A" "Can't open the data fork for use with resources on this version of the OS."); - return (false); - } -#endif + static boolean pushresourcefile (const ptrfilespec fs, char permission, short forktype) { + + /* + 2006-01-30 creedon: added check for non-carbon OS and trying to access the data fork of a file, error message + + 2005-09-02 creedon: added support for fork parameter, allows access to resources in data forks -#if TARGET_API_MAC_CARBON == 1 - - errcode = FSpMakeFSRef (fs, &myRef); - - if (!errcode) { - + 2.1b8 dmb: call SetResLoad (false) before opening a resource fork to + prevent all preload resources from being loaded into our heap + */ + + register OSErr errcode; HFSUniStr255 fork; switch (forktype) { @@ -648,7 +610,7 @@ FSGetDataForkName (&fork); break; } -#endif + oldrnum = CurResFile (); SetResLoad (false); @@ -660,75 +622,61 @@ and manifests. */ -#if TARGET_API_MAC_CARBON == 1 + errcode = FSOpenResourceFile (&fs -> fsref, fork.length, fork.unicode, permission, &newrnum); - errcode = FSOpenResourceFile (&myRef, fork.length, fork.unicode, permission, &newrnum); -#else - // kw 2005-12-17 - OS9 compliance - newrnum = FSpOpenResFile (fs, permission); - -#endif SetResLoad (true); -#if TARGET_API_MAC_CARBON == 1 if (errcode != -1) /*opened OK*/ return (true); -#else - if (newrnum != -1) /*opened OK*/ - return (true); -#endif + errcode = ResError (); -#if TARGET_API_MAC_CARBON == 1 - } -#endif + if (errcode != eofErr) { /*don't want an alert if there isn't a resource fork*/ + + setfserrorparam ( fs ); /*in case error message takes a filename parameter*/ + + oserror (errcode); + } + + return (false); + } /* pushresourcefile */ - if (errcode != eofErr) { /*don't want an alert if there isn't a resource fork*/ + static boolean pushresourcefilereadonly (const ptrfilespec fs, short forktype) { - setoserrorparam ((ptrstring) (*fs).name); /*in case error message takes a filename parameter*/ + /* + 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile + */ - oserror (errcode); - } - - return (false); - } /*pushresourcefile*/ + return (pushresourcefile (fs, fsRdPerm, forktype)); + } /*pushresourcefilereadonly*/ -static boolean pushresourcefilereadonly (const tyfilespec *fs, short forktype) { - - /* - 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile - */ - - return (pushresourcefile (fs, fsRdPerm, forktype)); - } /*pushresourcefilereadonly*/ + static boolean pushresourcefilereadwrite (const ptrfilespec fs, short forktype) { + + /* + 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile + */ + + return (pushresourcefile (fs, fsRdWrPerm, forktype)); + } /*pushresourcefilereadwrite*/ -static boolean pushresourcefilereadwrite (const tyfilespec *fs, short forktype) { - - /* - 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile - */ - - return (pushresourcefile (fs, fsRdWrPerm, forktype)); - } /*pushresourcefilereadwrite*/ - -static boolean popresourcefile (void) { - - if ((newrnum == oldrnum) || (newrnum == filegetapplicationrnum ())) { /*don't close active resource fork!*/ + static boolean popresourcefile (void) { - UpdateResFile (newrnum); + if ((newrnum == oldrnum) || (newrnum == filegetapplicationrnum ())) { /*don't close active resource fork!*/ + + UpdateResFile (newrnum); + + UseResFile (oldrnum); + } + else + closeresourcefile (newrnum); - UseResFile (oldrnum); - } - else - closeresourcefile (newrnum); - - return (true); - } /*popresourcefile*/ + return (true); + } /*popresourcefile*/ #endif -boolean loadresource (const tyfilespec *fs, short rnum, ResType type, short id, bigstring bsname, long sizedata, void *pdata, short forktype) { +boolean loadresource (const ptrfilespec fs, short rnum, ResType type, short id, bigstring bsname, long sizedata, void *pdata, short forktype) { /* the inverse of saveresource. we load in the indicated type and id from @@ -772,7 +720,7 @@ #ifdef MACVERSION -boolean loadresourcehandle (const tyfilespec *fs, ResType type, short id, bigstring bsname, Handle *hresource, short forktype) { +boolean loadresourcehandle (const ptrfilespec fs, ResType type, short id, bigstring bsname, Handle *hresource, short forktype) { /* load a resource into a handle. @@ -820,7 +768,7 @@ #ifdef MACVERSION -boolean deleteresource (const tyfilespec *fs, ResType type, short id, bigstring bsname, short forkttype) { +boolean deleteresource (const ptrfilespec fs, ResType type, short id, bigstring bsname, short forkttype) { /* delete the resource specified by type, id or bsname @@ -857,7 +805,7 @@ #ifdef MACVERSION -boolean getnumresourcetypes (const tyfilespec *fs, short *cttypes, short forktype) { +boolean getnumresourcetypes (const ptrfilespec fs, short *cttypes, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile @@ -875,7 +823,7 @@ #endif #ifdef MACVERSION -boolean getnthresourcetype (const tyfilespec *fs, short n, ResType *type, short forktype) { +boolean getnthresourcetype (const ptrfilespec fs, short n, ResType *type, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile @@ -893,7 +841,7 @@ #endif #ifdef MACVERSION -boolean getnumresources (const tyfilespec *fs, ResType type, short *ctresources, short forktype) { +boolean getnumresources (const ptrfilespec fs, ResType type, short *ctresources, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile @@ -911,7 +859,7 @@ #endif #ifdef MACVERSION -boolean getnthresourcehandle (const tyfilespec *fs, ResType type, short n, short *id, bigstring bsname, Handle *hresource, short forktype) { +boolean getnthresourcehandle (const ptrfilespec fs, ResType type, short n, short *id, bigstring bsname, Handle *hresource, short forktype) { /* load the nth resource of the given type into a handle. also return the @@ -992,7 +940,7 @@ #ifdef MACVERSION -boolean getresourceattributes (const tyfilespec *fs, ResType type, short id, bigstring bsname, short *resattrs, short forktype) { +boolean getresourceattributes (const ptrfilespec fs, ResType type, short id, bigstring bsname, short *resattrs, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile @@ -1021,7 +969,7 @@ #ifdef MACVERSION -boolean setresourceattributes (const tyfilespec *fs, ResType type, short id, bigstring bsname, short resattrs, short forktype) { +boolean setresourceattributes (const ptrfilespec fs, ResType type, short id, bigstring bsname, short resattrs, short forktype) { /* 2005-09-02 creedon: added support for fork parameter, see resources.c: openresourcefile and pushresourcefile Modified: Frontier/branches/FSRef_Migration/Common/source/search.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/search.c 2006-06-24 02:08:06 UTC (rev 1411) +++ Frontier/branches/FSRef_Migration/Common/source/search.c 2006-06-24 02:15:20 UTC (rev 1412) @@ -47,7 +47,7 @@ boundaries. */ - #ifdef MACVERSION + #ifdef MACVERSION OffsetTable offsets; //Code change by Timothy Paustian Sunday, June 25, 2000 12:50:40 PM Modified: Frontier/branches/FSRef_Migration/Common/source/shell.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/shell.c 2006-06-24 02:08:06 UTC (rev 1411) +++ Frontier/branches/FSRef_Migration/Common/source/shell.c 2006-06-24 02:15:20 UTC (rev 1412) @@ -28,7 +28,7 @@ #include "frontier.h" #include "standard.h" -#ifdef MACVERSION +#ifdef MACVERSION #include <land.h> #include <SetUpA5.h> #include "player.h" /*7.0b4 PBS*/ @@ -1038,11 +1038,6 @@ //#endif #endif - #ifdef flsystem6 - if ((**landgetglobals ()).transport != macsystem7) /*under system 7, we wait for appleevents*/ - shellopeninitialfiles (); - #endif - #ifdef WIN95VERSION shellopeninitialfiles (); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 02:08:09
|
Revision: 1411 Author: creecode Date: 2006-06-23 19:08:06 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1411&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/shellfile.c Modified: Frontier/branches/FSRef_Migration/Common/source/shellfile.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/shellfile.c 2006-06-24 01:43:34 UTC (rev 1410) +++ Frontier/branches/FSRef_Migration/Common/source/shellfile.c 2006-06-24 02:08:06 UTC (rev 1411) @@ -115,48 +115,54 @@ } /*findfilevisit*/ -boolean shellopenfile (ptrfilespec fspec, boolean flhidden, WindowPtr *wnew) { +boolean shellopenfile (ptrfilespec fs, boolean flhidden, WindowPtr *wnew) { - /* - open the specified file in a new window. + // + // open the specified file in a new window. + // + // 2006-06-23 creedon: for Mac, FSRef-ized + // + // 6.0a11 dmb: fixed wnew handling for already-open windows + // + // 3.0.2 dmb: if asked to open a file that's already open in a root window, just bring it to the front and return true + // + // 2.1b3 dmb: resolve alias files + // + // 1992-08-20 dmb: since handling of update events can push/pop globals, we need to re-establish default globals + // after calling partialeventloop + // + // 1992-07-29 dmb: moved handling of update events after loadspecial handler, so that is can see what kind of event + // triggered the open + // + // 1990-11-08 dmb: push default globals so that caller doesn't have to + // + // 1990-08-31 DW: replace setglobals calls with shellpush/popglobals. also commented out the call to + // shellfrontglobals. + // + // 1990-08-20 dmb: added resfile support. + // + // show window after success (window now initially invisible). + // - dmb 8/20/90: show window after success (window now initially invisible). - - dmb 8/20/90: added resfile support. - - 8/31/90 DW: replace setglobals calls with shellpush/popglobals. also commented - out the call to shellfrontglobals. - - 11/8/90 dmb: push default globals so that caller doesn't have to - - 7/29/92 dmb: moved handling of update events after loadspecial handler, so that - is can see what kind of event triggered the open - - 8/20/92 dmb: since handling of update events can push/pop globals, we need to - re-establish default globals after calling partialeventloop - - 2.1b3 dmb: resolve alias files - - 3.0.2 dmb: if asked to open a file that's already open in a root window, - just bring it to the front and return true - - 6.0a11 dmb: fixed wnew handling for already-open windows - */ - WindowPtr w; hdlfilenum fnum; short rnum; boolean fl; OSType filetype; tyfindvisitinfo info; -#ifdef MACVERSION - bigstring bsext; -#endif + + #ifdef MACVERSION + bigstring bsext, bs; + + ( void ) extendfilespec ( fs, fs ); + + #endif + if (wnew != nil) *wnew = nil; - info.fsfind = fspec; + info.fsfind = fs; info.wfound = wnew; info.flhidden = flhidden; @@ -165,26 +171,29 @@ initbeachball (right); - if (!fileresolvealias (fspec)) + if (!fileresolvealias (fs)) return (false); - if (!getfiletype (fspec, &filetype)) + if (!getfiletype (fs, &filetype)) return (false); -#ifdef MACVERSION + #ifdef MACVERSION - lastword (fspec->name, '.', bsext); + getfsfile ( fs, bs ); - if (equalidentifiers (bsext, "\proot")) - filetype = 'TABL'; -#endif + lastword ( bs, '.', bsext); + + if (equalidentifiers (bsext, "\proot")) + filetype = 'TABL'; + + #endif if (!shellpushdefaultglobals ()) return (false); if (filetype != config.filetype) { - fl = (*shellglobals.loadspecialroutine) (fspec, filetype); + fl = (*shellglobals.loadspecialroutine) (fs, filetype); shellpopglobals (); @@ -201,16 +210,19 @@ rnum = -1; - if (!openfile (fspec, &fnum, false)) + if (!openfile (fs, &fnum, false)) goto error; -#ifdef MACVERSION - if (config.flopenresfile) - if (!openresourcefile (fspec, &rnum, resourcefork)) /* 2005-09-02 creedon - added support for fork parameter, see resources.c: openresourcefile and pushresourcefile */ - goto error; -#endif + #ifdef MACVERSION - if (!newfilewindow (fspec, fnum, rnum, flhidden, &w)) + if (config.flopenresfile) + if (!openresourcefile (fs, &rnum, resourcefork)) // 2005-09-02 creedon - added support for fork parameter, + // see resources.c: openresourcefile and pushresourcefile + goto error; + + #endif + + if (!newfilewindow (fs, fnum, rnum, flhidden, &w)) goto error; if (wnew != nil) @@ -246,13 +258,16 @@ closefile (fnum); -#ifdef MACVERSION - closeresourcefile (rnum); -#endif + #ifdef MACVERSION + closeresourcefile (rnum); + + #endif + return (false); - } /*shellopenfile*/ + } // shellopenfile + static boolean clickersvisit (hdlhashnode hnode, ptrvoid refcon) { @@ -281,11 +296,11 @@ 5.0d3 dmb: look in clickers table for types we can actually open */ - tyconfigrecord lconfig; - tyfilespec fspec; - tysftypelist filetypes; - ptrsftypelist ptypes = nil; - hdlhashtable htable; + tyconfigrecord lconfig; + tyfilespec fspec; + tysftypelist filetypes; + ptrsftypelist ptypes = nil; + hdlhashtable htable; bigstring bs; boolean fl; hdlwindowinfo hdummy; @@ -583,17 +598,18 @@ boolean shellsaveas (WindowPtr wsave, ptrfilespec fspec, boolean flrunnable) { - /* - if we're given a path, save the current file to that location with no - dialog. + // + // if we're given a path, save the current file to that location with no dialog. + // + // if bspath is nil, use standard file to determine the new file location + // + // 2006-06-23 creedon: for Mac FSRef-ized + // + // 5.0d8 dmb: pass file type to sfdialog for Win + // + // 1991-12-12 dmb: make sure we don't use a full path as the default file name + // - if bspath is nil, use standard file to determine the new file location - - 12/12/91 dmb: make sure we don't use a full path as the default file name - - 5.0d8 dmb: pass file type to sfdialog for Win - */ - // #if TARGET_API_MAC_CARBON == 1 /*7.0b50 PBS: set window title icon*/ // OSStatus err = noErr; // #endif @@ -616,9 +632,16 @@ } else { - if (!windowgetfspec (w, &fs)) - getdefaultfilename (fsname (&fs)); + if (!windowgetfspec (w, &fs)) { + bigstring bs; + + getfsfile ( &fs, bs ); + + getdefaultfilename ( bs ); + + } + filetypes.cttypes = 1; filetypes.types [0] = config.filetype; @@ -692,10 +715,13 @@ goto error; #ifdef MACVERSION + if (config.flopenresfile) - if (!openresourcefile (fspec, &rnum, resourcefork)) /* 2005-09-02 creedon - added support for fork parameter, see resources.c: openresourcefile and pushresourcefile */ + if (!openresourcefile (fspec, &rnum, resourcefork)) // 2005-09-02 creedon - added support for fork parameter, + // see resources.c: openresourcefile and pushresourcefile goto error; #endif + } if (!newfilewindow (fspec, fnum, rnum, flhidden, wnew)) @@ -743,37 +769,45 @@ boolean shellnew (void) { - /* - new front end to shellnewfile, isolates user interface - - 5.0d8 dmb: pass file type to sfdialog for Win - */ + // + // new front end to shellnewfile, isolates user interface + // + // 2006-06-23 creedon: for Mac, FSRef-ized + // + // 2005-10-06 creedon - added 'LAND' to sfdialog call + // + // 5.0d8 dmb: pass file type to sfdialog for Win + // tyconfigrecord lconfig; tyfilespec fspec; tysftypelist filetypes; WindowPtr w; + bigstring bs; shellgetconfig (iddefaultconfig, &lconfig); clearbytes (&fspec, sizeof (fspec)); - getuntitledfilename (fsname (&fspec)); + getfsfile ( &fspec, bs ); + getuntitledfilename ( bs ); + if (lconfig.flcreateonnew) { filetypes.cttypes = 1; filetypes.types [0] = lconfig.filetype; - if (!sfdialog (sfputfileverb, nil, &filetypes, &fspec, 'LAND')) /* 2005-10-06 creedon - added 'LAND' */ /*user canceled*/ + if (!sfdialog (sfputfileverb, nil, &filetypes, &fspec, 'LAND')) // user canceled return (false); } return (shellnewfile (&fspec, false, &w)); - } /*shellnew*/ + } // shellnew + boolean shellsave (WindowPtr wsave) { /* @@ -1270,23 +1304,22 @@ boolean shellopendefaultfile (void) { - /* - no files were selected to be open from the finder. we either open a new - file, or we try to open the default startup file -- similar to autoexec.bat - from MS-DOS and System.Startup from UCSD Pascal. + // + // no files were selected to be open from the finder. we either open a new file, or we try to open the default startup file -- + // similar to autoexec.bat from MS-DOS and System.Startup from UCSD Pascal. + // + // 2006-06-18 creedon: for Mac, FSRef-ized + // + // 7.30.97 dmb: use defaultpath instead of application filespec, and use new setfsfile to plug in default file name + // + // 5/19/92 dmb: always return a value; explicitly return boolean + // + // 4/24/92 dmb: use filegetapplicationvnum rather than zero (the default volume) when opening the default file. + // otherwise, if the default volume changes later, the file info won't be adequate to locate the file. + // + // 5/20/91 dmb: if the option key is down, just do a normal open file + // - 5/20/91 dmb: if the option key is down, just do a normal open file - - 4/24/92 dmb: use filegetapplicationvnum rather than zero (the default volume) - when opening the default file. otherwise, if the default volume changes later, - the file info won't be adequate to locate the file. - - 5/19/92 dmb: always return a value; explicitly return boolean - - 7.30.97 dmb: use defaultpath instead of application filespec, - and use new setfsfile to plug in default file name - */ - tyfilespec fs; boolean fl = false; boolean flfolder; @@ -1295,14 +1328,15 @@ if (optionkeydown ()) return (shellopen ()); - shellpushdefaultglobals (); /*so config is correct*/ + shellpushdefaultglobals (); // so config is correct if (config.flnewonlaunch) fl = shellnew (); else { - getapplicationfilespec (nil, &fs); /*get our own app fspec*/ - // - + getapplicationfilespec (nil, &fs); // get our own app filespec + + ( void ) extendfilespec ( &fs, &fs ); + if (getstringlist (defaultlistnumber, startupfilename, bsdefault)) { setfsfile (&fs, bsdefault); @@ -1329,44 +1363,6 @@ } /*shellopendefaultfile*/ -#ifdef flsystem6 - -void shellopeninitialfiles (void) { - - /* - if the user double-clicked on the applications with files selected, - then we open the files. otherwise we try to open the default startup - file -- similar to autoexec.bat from MS-DOS and System.Startup from - UCSD Pascal. - */ - - bigstring bs; - register short ctfiles; - short vnum; - - ctfiles = countinitialfiles (); - - if (ctfiles > 0) { /*one or more files selected on launch*/ - - register short i; - - for (i = 1; i <= ctfiles; i++) { - - getinitialfile (i, bs, &vnum); - - shellopenfile (bs, vnum, nil); - } /*for*/ - } - - else { /*zero files selected on launch*/ - - shellopendefaultfile (); - } - } /*shellopeninitialfiles*/ - -#endif - - #ifdef WIN95VERSION void shellopeninitialfiles (void) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:43:36
|
Revision: 1410 Author: creecode Date: 2006-06-23 18:43:34 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1410&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/shellsysverbs.c Modified: Frontier/branches/FSRef_Migration/Common/source/shellsysverbs.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/shellsysverbs.c 2006-06-24 01:39:56 UTC (rev 1409) +++ Frontier/branches/FSRef_Migration/Common/source/shellsysverbs.c 2006-06-24 01:43:34 UTC (rev 1410) @@ -28,7 +28,7 @@ #include "frontier.h" #include "standard.h" -#ifdef MACVERSION +#ifdef MACVERSION #include <land.h> #define wsprintf sprintf #endif @@ -386,21 +386,22 @@ static boolean sysfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { - /* - 2/12/92 dmb: do partialeventloop on systemtask & bringapptofrontfunc + // + // 2006-06-18 creedon: for Mac, FSRef-ized + // + // 5.0b16 dmb: undo that change. it affect performance adversely if many threads do it. + // + // 5.0b12 dmb: in systemtaskfunc, set flresting to false to make sure we don't slow down too much + // + // 1/18/93 dmb: in systemtaskfunc, don't call processyield directly; use langbackgroundtask + // + // 8/11/92 dmb: make apprunningfunc accept a string or an ostype + // + // 5/20/92 dmb: do processyield directly on systemtaskfunc + // + // 2/12/92 dmb: do partialeventloop on systemtask & bringapptofrontfunc + // - 5/20/92 dmb: do processyield directly on systemtaskfunc - - 8/11/92 dmb: make apprunningfunc accept a string or an ostype - - 1/18/93 dmb: in systemtaskfunc, don't call processyield directly; use langbackgroundtask - - 5.0b12 dmb: in systemtaskfunc, set flresting to false to make sure we don't slow - down too much - - 5.0b16 dmb: undo that change. it affect performance adversely if many threads do it. - */ - register tyvaluerecord *v = vreturned; setbooleanvalue (false, v); /*assume the worst*/ @@ -437,12 +438,19 @@ return (true); case browsenetworkfunc: + #ifdef MACVERSION + return (langipcbrowsenetwork (hparam1, v)); + #endif + #ifdef WIN95VERSION - #pragma message ("WIN95: browsenetworkfunc - not yet implemented!") + + #pragma message ("WIN95: browsenetworkfunc - not yet implemented!") + break; + #endif case apprunningfunc: { @@ -536,9 +544,11 @@ if (!getstringvalue (hparam1, 1, bs)) return (false); - if (!getapplicationfilespec (bs, &fs)) /* 2006-02-17 aradke: initializes fs even if it fails */ + if (!getapplicationfilespec (bs, &fs)) // 2006-02-17 aradke: initializes fs even if it fails setemptystring (bs); + ( void ) extendfilespec ( &fs, &fs ); + return (setfilespecvalue (&fs, v)); } @@ -904,6 +914,7 @@ return (false); return (setfilespecvalue (&programfspec, v)); + } case filepathfunc: { @@ -1642,7 +1653,7 @@ boolean sysinitverbs (void) { - + getapplicationfilespec (nil, &programfspec); launchcallbacks.waitcallback = &shellsysverbwaitroutine; @@ -1663,8 +1674,6 @@ return (false); return (true); - } /*sysinitverbs*/ + + } // sysinitverbs - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:39:59
|
Revision: 1409 Author: creecode Date: 2006-06-23 18:39:56 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1409&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/headers/shelltypes.h Modified: Frontier/branches/FSRef_Migration/Common/headers/shelltypes.h =================================================================== --- Frontier/branches/FSRef_Migration/Common/headers/shelltypes.h 2006-06-24 01:28:19 UTC (rev 1408) +++ Frontier/branches/FSRef_Migration/Common/headers/shelltypes.h 2006-06-24 01:39:56 UTC (rev 1409) @@ -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,60 @@ 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 { + + long volumeID; + char fullSpecifier [258]; + + } tyfilespec, *ptrfilespec, **hdlfilespec; + + #define fsname ( fs ) ( fs ) -> fullSpecifier + + #endif // WIN95VERSION + + +/* #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 + +*/ + +#endif + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:28:22
|
Revision: 1408 Author: creecode Date: 2006-06-23 18:28:19 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1408&view=rev Log Message: ----------- removed extra space at end of line Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/shellwindowverbs.c Modified: Frontier/branches/FSRef_Migration/Common/source/shellwindowverbs.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/shellwindowverbs.c 2006-06-24 01:26:48 UTC (rev 1407) +++ Frontier/branches/FSRef_Migration/Common/source/shellwindowverbs.c 2006-06-24 01:28:19 UTC (rev 1408) @@ -28,7 +28,7 @@ #include "frontier.h" #include "standard.h" -#ifdef MACVERSION +#ifdef MACVERSION #include "player.h" /*7.0b4 PBS: QuickTime Player window*/ #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:26:52
|
Revision: 1407 Author: creecode Date: 2006-06-23 18:26:48 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1407&view=rev Log Message: ----------- removed extra lines from end of file Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/error.c Modified: Frontier/branches/FSRef_Migration/Common/source/error.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/error.c 2006-06-24 01:25:36 UTC (rev 1406) +++ Frontier/branches/FSRef_Migration/Common/source/error.c 2006-06-24 01:26:48 UTC (rev 1407) @@ -489,6 +489,3 @@ return (getsafetycushion ()); } /*initerror*/ - - - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:25:40
|
Revision: 1406 Author: creecode Date: 2006-06-23 18:25:36 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1406&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/claycallbacks.c Modified: Frontier/branches/FSRef_Migration/Common/source/claycallbacks.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/claycallbacks.c 2006-06-24 01:14:06 UTC (rev 1405) +++ Frontier/branches/FSRef_Migration/Common/source/claycallbacks.c 2006-06-24 01:25:36 UTC (rev 1406) @@ -282,8 +282,12 @@ #if filebrowser boolean claygetdirid (const tybrowserspec * fsfolder, tybrowserdir *dirid) { + + // + // 2006-06-23 creedon: FSRef-ized + // - CInfoPBRec pb; + FSRefParam pb; if (!getmacfileinfo (fsfolder, &pb)) return (false); @@ -291,7 +295,7 @@ *dirid = pb.dirInfo.ioDrDirID; return (true); - } /*claygetdirid*/ + } // claygetdirid #endif @@ -745,21 +749,26 @@ boolean claygetfilename (const tybrowserspec *pfs, bigstring name) { - -#if filebrowser - - return (filegetfilename (pfs, name)); - -#endif -#if odbbrowser + // + // 2006-06-23 creedon: FSRef-ized + // - copystring ((*pfs).name, name); + #if filebrowser + + return (getfsfile (pfs, name)); + + #endif - return (true); + #if odbbrowser + + copystring ((*pfs).name, name); + + return (true); + + #endif -#endif - } /*claygetfilename*/ + } // claygetfilename boolean clayrenamefile (tybrowserspec *fs, hdlheadrecord headnode) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:14:09
|
Revision: 1405 Author: creecode Date: 2006-06-23 18:14:06 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1405&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/cancoon.c Modified: Frontier/branches/FSRef_Migration/Common/source/cancoon.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/cancoon.c 2006-06-24 01:06:58 UTC (rev 1404) +++ Frontier/branches/FSRef_Migration/Common/source/cancoon.c 2006-06-24 01:14:06 UTC (rev 1405) @@ -857,15 +857,15 @@ boolean ccloadspecialfile (ptrfilespec fspec, OSType filetype) { #pragma unused (filetype) - /* - 7/28/92 dmb: use new finder2frontscript to set the Frontier.findertofront - global, instead of having Frontier.finder2click always set it to true. also, - handle updates now. + // + // 2006-06-23 creedon: replace fsname macro with getfsfile function; + // + // 2.1b3 dmb: only set finder2front to true if the sender of the 'odoc' event was the Finder + // + // 1992-07-28 dmb: use new finder2frontscript to set the Frontier.findertofront global, instead of having + // Frontier.finder2click always set it to true. also, handle updates now. + // - 2.1b3 dmb: only set finder2front to true if the sender of the 'odoc' event - was the Finder - */ - bigstring bspath; bigstring bs; ptrbyte pbool; @@ -883,15 +883,19 @@ } if (!filespectopath (fspec, bspath)) { + + bigstring bs; - filenotfounderror ((ptrstring) fsname (fspec)); + getfsfile ( fspec, bs ); + filenotfounderror ( bs ); + return (false); } - langdeparsestring (bspath, chclosecurlyquote); /*add needed escape sequences*/ + langdeparsestring (bspath, chclosecurlyquote); // add needed escape sequences - if (getsystemtablescript (idfinder2frontscript, bs)) { /*frontier.findertofront=^0*/ + if (getsystemtablescript (idfinder2frontscript, bs)) { // frontier.findertofront=^0 #ifdef MACVERSION if ((shellevent.what == kHighLevelEvent) && ((**landgetglobals ()).maceventsender == 'MACS')) @@ -905,15 +909,15 @@ langrunstringnoerror (bs, bs); } - if (!getsystemtablescript (idfinder2clickscript, bs)) /*frontier.finder2click ("^0")*/ + if (!getsystemtablescript (idfinder2clickscript, bs)) // frontier.finder2click ("^0") return (false); parsedialogstring (bs, bspath, nil, nil, nil, bs); - shellpartialeventloop (updateMask); /*handle updates first*/ + shellpartialeventloop (updateMask); // handle updates first return (processrunstring (bs)); - } /*ccloadspecialfile*/ + } // ccloadspecialfile boolean ccsavespecialfile (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:07:02
|
Revision: 1404 Author: creecode Date: 2006-06-23 18:06:58 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1404&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/appletglue.c Modified: Frontier/branches/FSRef_Migration/Common/source/appletglue.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/appletglue.c 2006-06-24 01:00:11 UTC (rev 1403) +++ Frontier/branches/FSRef_Migration/Common/source/appletglue.c 2006-06-24 01:06:58 UTC (rev 1404) @@ -188,18 +188,20 @@ boolean assureappisrunning (OSType serverid, boolean flbringtofront) { - /* - if the application whose creator id is serverid is running, return true. + // + // 2006-06-23 creedon: replaced FSSpec with tyfilespec + // + // if the application whose creator id is serverid is running, return true. + // + // if not, we look for the application and try to launch it. we wait until it's actually running and ready to receive Apple + // Events. + // - if not, we look for the application and try to launch it. we wait until it's - actually running and ready to receive Apple Events. - */ - bigstring appname; typrocessid psn; - FSSpec fs; + tyfilespec fs; - if (findrunningapplication (&serverid, appname, &psn)) /*already running, nothing to do*/ + if (findrunningapplication (&serverid, appname, &psn)) // already running, nothing to do return (true); if (!findapplication (serverid, &fs)) @@ -209,9 +211,10 @@ return (false); return (true); - } /*assureappisrunning*/ + } // assureappisrunning + boolean pushhandleonhandle (Handle hsource, Handle hdest) { return (pushhandle (hsource, hdest)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-24 01:00:20
|
Revision: 1403 Author: creecode Date: 2006-06-23 18:00:11 -0700 (Fri, 23 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1403&view=rev Log Message: ----------- FSRef-ized Modified Paths: -------------- Frontier/branches/FSRef_Migration/Common/source/about.c Modified: Frontier/branches/FSRef_Migration/Common/source/about.c =================================================================== --- Frontier/branches/FSRef_Migration/Common/source/about.c 2006-06-15 13:17:26 UTC (rev 1402) +++ Frontier/branches/FSRef_Migration/Common/source/about.c 2006-06-24 01:00:11 UTC (rev 1403) @@ -68,17 +68,19 @@ #include "processinternal.h" #include "launch.h" -#ifdef WIN95VERSION - #include "Winland.h" - #define idfrontiericon IDB_FRONTIER_BITMAP -#endif #ifdef MACVERSION + #include "MoreFilesX.h" #define idfrontiericon 128 #endif +#ifdef WIN95VERSION + #include "Winland.h" + #define idfrontiericon IDB_FRONTIER_BITMAP +#endif + static long aboutopenticks; /*so we can tell how long it's been up*/ @@ -266,31 +268,37 @@ static void ccdrawfrontiericon (Rect rcicn, boolean flpressed) { + + // + // 2006-06-18 creedon: FSRef-ized + // + // 7.0b53 PBS: draw an OS X style icon + // - #if TARGET_API_MAC_CARBON == 1 /*PBS 7.0b53: draw an OS X style icon*/ - IconRef iconref; tyfilespec programfspec; short label; - OSErr ec; + OSErr err; Rect r = rcicn; + FSSpec fs; getapplicationfilespec (nil, &programfspec); + + ( void ) extendfilespec ( &programfspec, &programfspec ); + + err = FSRefMakeFSSpec ( &programfspec.fsref, &fs ); - if (GetIconRefFromFile (&programfspec, &iconref, &label) == noErr) { + if (GetIconRefFromFile (&fs, &iconref, &label) == noErr) { - ec = PlotIconRef (&r, kAlignAbsoluteCenter, flpressed? kTransformSelected : 0, kIconServicesNormalUsageFlag, iconref); + err = PlotIconRef (&r, kAlignAbsoluteCenter, flpressed? kTransformSelected : 0, kIconServicesNormalUsageFlag, iconref); ReleaseIconRef (iconref); - if (ec == noErr) + if (err == noErr) return; - } /*if*/ - #endif + } // if - ploticonresource (&rcicn, kAlignAbsoluteCenter, flpressed? kTransformSelected : 0, idfrontiericon); - - } /*ccdrawfrontiericon*/ + } // ccdrawfrontiericon static boolean ccgettextitemrect (short item, Rect *r) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-12 18:23:57
|
Revision: 1401 Author: karstenw Date: 2006-06-12 11:23:45 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1401&view=rev Log Message: ----------- more detail work Modified Paths: -------------- Frontier/branches/Int64/Common/SystemHeaders/standard.h Frontier/branches/Int64/Common/UserLandIACToolkit/landinternal.h Frontier/branches/Int64/Common/resources/Mac/kernelverbs.r Frontier/branches/Int64/Common/source/langstartup.c Frontier/branches/Int64/Common/source/shellfile.c Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj Modified: Frontier/branches/Int64/Common/SystemHeaders/standard.h =================================================================== --- Frontier/branches/Int64/Common/SystemHeaders/standard.h 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/Common/SystemHeaders/standard.h 2006-06-12 18:23:45 UTC (rev 1401) @@ -156,6 +156,13 @@ #define infinity 32767 #define longinfinity (long)0x7FFFFFFF + +#if LONGINT_LONGDATE == 1 // beyondinfinity kernel constant + +#define beyondinfinity (tylonglongint)0x7FFFFFFFFFFFFFFF + +#endif + #define intinfinity 32767 #define intminusinfinity -32768 Modified: Frontier/branches/Int64/Common/UserLandIACToolkit/landinternal.h =================================================================== --- Frontier/branches/Int64/Common/UserLandIACToolkit/landinternal.h 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/Common/UserLandIACToolkit/landinternal.h 2006-06-12 18:23:45 UTC (rev 1401) @@ -64,6 +64,12 @@ #define longinfinity (long)0x7FFFFFFF +#if LONGINT_LONGDATE == 1 // beyondinfinity kernel constant + +#define beyondinfinity (tylonglongint)0x7FFFFFFFFFFFFFFF + +#endif + #define stringlength(bs) ((bs)[0]) #define setstringlength(bs,len) (bs[0]=(char)len) Modified: Frontier/branches/Int64/Common/resources/Mac/kernelverbs.r =================================================================== --- Frontier/branches/Int64/Common/resources/Mac/kernelverbs.r 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/Common/resources/Mac/kernelverbs.r 2006-06-12 18:23:45 UTC (rev 1401) @@ -329,6 +329,11 @@ "packwindow", "unpackwindow", "callscript" +#if LONGINT_LONGDATE == 1 /* in lang.builtins verbnames */ + ,"sint64" + ,"longdatetime" +#endif + }, "clock", false, { Modified: Frontier/branches/Int64/Common/source/langstartup.c =================================================================== --- Frontier/branches/Int64/Common/source/langstartup.c 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/Common/source/langstartup.c 2006-06-12 18:23:45 UTC (rev 1401) @@ -503,6 +503,21 @@ } /*langaddlongconst*/ +#if LONGINT_LONGDATE == 1 + // UNTESTED + // LONGLONGINTCONSTRUCTIONSITE +static boolean langaddlonglongintconst( bigstring bs, tylonglongint x) { + + /* 2006-06-11 kw: new. for longinfinity constant */ + tyvaluerecord val; + + setlonglongintvalue ( x, &val); + + return (hashinsertcstring (bs, &val)); + } /* langaddlonglongintconst */ +#endif + + static boolean langaddstringconst (bigstring bs, bigstring x) { tyvaluerecord val; @@ -568,6 +583,14 @@ #define addlong(x,y) if (!langaddlongconst ((ptrstring) x, y)) return (false) +#if LONGINT_LONGDATE == 1 // addlonglong macro + + // 2006-06-11 kw: I hereby officially protest against the usage of macros disguised as functions! + +# define addlonglong(x,y) if (!langaddlonglongintconst ((ptrstring) x, y)) return (false) + +#endif + #define addint(x,y) if (!langaddintconst ((ptrstring) x, y)) return (false) #define adddirection(x,y) if (!langadddirectionconst ((ptrstring) x, y)) return (false) @@ -599,7 +622,13 @@ addnil ("nil"); addlong ("infinity", longinfinity); - + +#if LONGINT_LONGDATE == 1 // beyondinfinity usertalk constant + + addlonglong ("beyondinfinity", beyondinfinity); + +#endif + adddirection ("up", up); adddirection ("down", down); Modified: Frontier/branches/Int64/Common/source/shellfile.c =================================================================== --- Frontier/branches/Int64/Common/source/shellfile.c 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/Common/source/shellfile.c 2006-06-12 18:23:45 UTC (rev 1401) @@ -349,6 +349,7 @@ else shellpartialeventloop (updateMask); +#if 0 // 2006-06-11 kw: disabled due to grayed out menu bar #ifdef MACVERSION /*7.0b16 PBS: only Macs get grayed windows. Fix for Windows display glitch.*/ #if TARGET_API_MAC_CARBON { @@ -361,6 +362,7 @@ #endif #endif +#endif } /*prepuserforwait*/ Modified: Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj =================================================================== --- Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-06 19:57:02 UTC (rev 1400) +++ Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-12 18:23:45 UTC (rev 1401) @@ -3632,7 +3632,7 @@ GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; GCC_REUSE_STRINGS = NO; GCC_SHORT_ENUMS = NO; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; + GCC_WARN_ABOUT_MISSING_PROTOTYPES = NO; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; GCC_WARN_UNKNOWN_PRAGMAS = YES; GCC_WARN_UNUSED_FUNCTION = NO; @@ -3836,7 +3836,7 @@ GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_OPTIMIZATION_LEVEL = 2; GCC_STRICT_ALIASING = NO; - GCC_UNROLL_LOOPS = YES; + GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-06 19:58:14
|
Revision: 1400 Author: karstenw Date: 2006-06-06 12:57:02 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1400&view=rev Log Message: ----------- rest of update Modified Paths: -------------- Frontier/branches/Int64/Common/IOAToolkit/ioa.c Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c Frontier/branches/Int64/Common/SystemHeaders/WSE.h Frontier/branches/Int64/Common/headers/WinSockNetEvents.h Frontier/branches/Int64/Common/headers/frontierdefs.h Frontier/branches/Int64/Common/headers/lang.h Frontier/branches/Int64/Common/headers/langdll.h Frontier/branches/Int64/Common/headers/langpython.h Frontier/branches/Int64/Common/headers/langxml.h Frontier/branches/Int64/Common/headers/macconv.h Frontier/branches/Int64/Common/headers/opbuttons.h Frontier/branches/Int64/Common/headers/process.h Frontier/branches/Int64/Common/headers/quickdraw.h Frontier/branches/Int64/Common/headers/shellprint.h Frontier/branches/Int64/Common/source/langcrypt.c Frontier/branches/Int64/Common/source/langops.c Frontier/branches/Int64/Common/source/md5.c Frontier/branches/Int64/Common/source/uisharing.c Frontier/branches/Int64/FrontierSDK/Toolkits/AppletToolkit/Source/appletfrontier.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactable.c Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactext.c Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj Frontier/branches/Int64/build_XCode/tools/postlinking.sh Modified: Frontier/branches/Int64/Common/IOAToolkit/ioa.c =================================================================== --- Frontier/branches/Int64/Common/IOAToolkit/ioa.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/IOAToolkit/ioa.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -579,7 +579,7 @@ static void callsetuproutine (setupcallback pcallback, tyioaconfigrecord *pconfig) { -// 2006-04-03 - kw --- renamed parameter config -> pconfig +// 2006-04-03 kw: renamed parameter config -> pconfig IOAclearbytes (pconfig, longsizeof (tyioaconfigrecord)); (*pconfig).setValueFromScriptCallback = IOAsetobjectvalue; Modified: Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/IowaRuntime/Source/iowacore.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -672,7 +672,7 @@ hdlobject x = firstobject; hdlobject hsmallest = nil; - Rect rsmallest; + Rect rsmallest = {-infinity, -infinity, infinity, infinity }; while (x != nil) { @@ -908,7 +908,7 @@ if ((**h).objecthasframe) { - Rect tempRect; // 2006-04-03 - kw ---renamed from robject - shadowwarning + Rect tempRect; // 2006-04-03 kw: renamed from robject - shadowwarning tempRect = (**h).objectrect; Modified: Frontier/branches/Int64/Common/SystemHeaders/WSE.h =================================================================== --- Frontier/branches/Int64/Common/SystemHeaders/WSE.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/SystemHeaders/WSE.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -177,4 +177,4 @@ rulerRecord rCurRuler; /* Currently displaying ruler info */ } rulerInfo,*rulerInfoPtr,**rulerInfoHandle; -#endif \ No newline at end of file +#endif Modified: Frontier/branches/Int64/Common/headers/WinSockNetEvents.h =================================================================== --- Frontier/branches/Int64/Common/headers/WinSockNetEvents.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/WinSockNetEvents.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -102,7 +102,7 @@ extern boolean fwsNetEventWriteStream (unsigned long stream, unsigned long bytesToWrite, char * buffer); /* Set up a listner on a port */ -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern boolean fwsNetEventListenStream (unsigned long port, long depth, bigstring callback, unsigned long refcon, unsigned long * stream, unsigned long ipaddr, long hdatabase); extern boolean fwsNetEventListenStream (unsigned long, long, bigstring, unsigned long, unsigned long *, unsigned long, long); Modified: Frontier/branches/Int64/Common/headers/frontierdefs.h =================================================================== --- Frontier/branches/Int64/Common/headers/frontierdefs.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/frontierdefs.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -83,10 +83,10 @@ #define SPEED 1 #undef fltracklocaladdresses /*2004-12-08 aradke: disable [buggy] code for tracking deleted local addresses*/ -// kw 2006-01-27 --- make new data types +// 2006-01-27 kw: make new data types #define LONGINT_LONGDATE 1 -// kw - 2006-02-13 --- a test for the AE-memory leak +// 2006-02-13 kw: a test for the AE-memory leak #define AEDISPOSAL 1 #ifdef MACVERSION Modified: Frontier/branches/Int64/Common/headers/lang.h =================================================================== --- Frontier/branches/Int64/Common/headers/lang.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/lang.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -291,7 +291,7 @@ /*new types must be added at end of list, these get saved on disk*/ #if LONGINT_LONGDATE == 1 // tyvaluetype enum - // kw - 2006-01-27 --- new types added + // 2006-01-27 kw: new types added /* 38 */ longlongintvaluetype, @@ -303,7 +303,7 @@ } tyvaluetype; -// kw - 2006-01-27 --- new longlong types +// 2006-01-27 kw: new longlong types #if LONGINT_LONGDATE == 1 // typedef tylonglongint # if defined (WIN95VERSION) Modified: Frontier/branches/Int64/Common/headers/langdll.h =================================================================== --- Frontier/branches/Int64/Common/headers/langdll.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/langdll.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -63,7 +63,7 @@ odbBool xCALLBACK extOdbNewListValue (odbRef odb, odbValueRecord *valueList, odbBool flRecord); odbBool xCALLBACK extOdbGetListCount (odbRef odb, odbValueRecord *valueList, long * cnt); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // odbBool xCALLBACK extOdbDeleteListValue (odbRef odb, odbValueRecord *valueList, long index, char * recordname); odbBool xCALLBACK extOdbDeleteListValue (odbRef, odbValueRecord *, long, char *); Modified: Frontier/branches/Int64/Common/headers/langpython.h =================================================================== --- Frontier/branches/Int64/Common/headers/langpython.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/langpython.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -32,4 +32,4 @@ extern boolean langrunpythonscript (hdltreenode hp1, tyvaluerecord *v); -#endif //langpythoninclude \ No newline at end of file +#endif //langpythoninclude Modified: Frontier/branches/Int64/Common/headers/langxml.h =================================================================== --- Frontier/branches/Int64/Common/headers/langxml.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/langxml.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -45,4 +45,4 @@ extern boolean gethashnodetable (hdlhashnode hn, hdlhashtable *ht); -extern boolean replaceallinhandle (bigstring bsfind, bigstring bsreplace, Handle htext); \ No newline at end of file +extern boolean replaceallinhandle (bigstring bsfind, bigstring bsreplace, Handle htext); Modified: Frontier/branches/Int64/Common/headers/macconv.h =================================================================== --- Frontier/branches/Int64/Common/headers/macconv.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/macconv.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -97,7 +97,7 @@ typeFloat = 'doub', typeLongInteger = 'long', typeShortInteger = 'shor', - // kw - 2006-01-27 --- new 64-bit int types + // 2006-01-27 kw: new 64-bit int types typeSInt64 = 'comp', typeLongFloat = 'doub', Modified: Frontier/branches/Int64/Common/headers/opbuttons.h =================================================================== --- Frontier/branches/Int64/Common/headers/opbuttons.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/opbuttons.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -29,4 +29,4 @@ extern boolean opbuttonstatus (short buttonnum, tybuttonstatus *status); -extern boolean opbutton (short buttonnum); \ No newline at end of file +extern boolean opbutton (short buttonnum); Modified: Frontier/branches/Int64/Common/headers/process.h =================================================================== --- Frontier/branches/Int64/Common/headers/process.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/process.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -191,7 +191,7 @@ extern boolean processkill (hdlprocessrecord); -// kw 2005-12-16 - These two are retired +// 2005-12-16 kw: These two are retired // extern void processinvalidglobals (WindowPtr); // extern void processinvalidoutline (struct tyoutlinerecord **); Modified: Frontier/branches/Int64/Common/headers/quickdraw.h =================================================================== --- Frontier/branches/Int64/Common/headers/quickdraw.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/quickdraw.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -74,7 +74,7 @@ extern short getmenubarheight (void); -// kw - make static +// kw: make static extern CGrafPtr getmacwindowport(WindowPtr); extern CGrafPtr getmacqdglobaltheport(void); extern Rect getwindowportrect(WindowPtr); Modified: Frontier/branches/Int64/Common/headers/shellprint.h =================================================================== --- Frontier/branches/Int64/Common/headers/shellprint.h 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/headers/shellprint.h 2006-06-06 19:57:02 UTC (rev 1400) @@ -48,7 +48,7 @@ GrafPtr printport; PMPrintSession printhandle; - PMPrintSession printDefaultSession; /* kw added 2005-06 */ + PMPrintSession printDefaultSession; /* 2005-06 kw: added */ PMPageFormat pageformat; PMPrintSettings printsettings; PMRect pagerect; Modified: Frontier/branches/Int64/Common/source/langcrypt.c =================================================================== --- Frontier/branches/Int64/Common/source/langcrypt.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/source/langcrypt.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -89,7 +89,7 @@ flnextparamislast = true; - if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, "\x0b""flTranslate", &vtranslate)) + if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, BIGSTRING("\x0b""flTranslate"), &vtranslate)) return (false); lockhandle (h); @@ -149,7 +149,7 @@ flnextparamislast = true; - if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, "\x0b""flTranslate", &vtranslate)) + if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, BIGSTRING("\x0b""flTranslate"), &vtranslate)) return (false); lockhandle (hkey); @@ -206,7 +206,7 @@ flnextparamislast = true; - if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, "\x0b""flTranslate", &vtranslate)) + if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, BIGSTRING("\x0b""flTranslate"), &vtranslate)) return (false); lockhandle (x); @@ -265,7 +265,7 @@ flnextparamislast = true; - if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, "\x0b""flTranslate", &vtranslate)) + if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, BIGSTRING("\x0b""flTranslate"), &vtranslate)) return (false); lockhandle (h); @@ -327,7 +327,7 @@ flnextparamislast = true; - if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, "\x0b""flTranslate", &vtranslate)) + if (!getoptionalparamvalue (hp1, &ctconsumed, &ctpositional, BIGSTRING("\x0b""flTranslate"), &vtranslate)) return (false); lockhandle (hkey); Modified: Frontier/branches/Int64/Common/source/langops.c =================================================================== --- Frontier/branches/Int64/Common/source/langops.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/source/langops.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -172,14 +172,15 @@ boolean fl = true; #if LONGINT_LONGDATE == 1 // delete me after debugging - // kw - 2006-01 --- debugging stuff + // 2006-01 kw: debugging stuff int x = type, y = ctvaluetypes; + + tytypeinfo z = typeinfo[type]; + #endif - tytypeinfo z = typeinfo[type]; - if ((type < novaluetype) || (type >= ctvaluetypes)) { type = novaluetype; Modified: Frontier/branches/Int64/Common/source/md5.c =================================================================== --- Frontier/branches/Int64/Common/source/md5.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/source/md5.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -343,4 +343,4 @@ for (i = 0; i < len; i++) ((char *)output)[i] = (char)value; } -*/ \ No newline at end of file +*/ Modified: Frontier/branches/Int64/Common/source/uisharing.c =================================================================== --- Frontier/branches/Int64/Common/source/uisharing.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/Common/source/uisharing.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -1545,7 +1545,4 @@ #endif } /*uisClose*/ - - - - \ No newline at end of file + Modified: Frontier/branches/Int64/FrontierSDK/Toolkits/AppletToolkit/Source/appletfrontier.c =================================================================== --- Frontier/branches/Int64/FrontierSDK/Toolkits/AppletToolkit/Source/appletfrontier.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/FrontierSDK/Toolkits/AppletToolkit/Source/appletfrontier.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -611,7 +611,7 @@ if (!IACgetlongparam ('----', (long *) &x)) goto error; - + *majorRev = x.majorRev; *minorRev = x.minorRev; Modified: Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c =================================================================== --- Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iacdouble.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -198,7 +198,7 @@ if (ec == noErr) { - // 2006-04-02 kw --- inserted braces for ambiguity warning + // 2006-04-02 kw: inserted braces for ambiguity warning if ((*list).descriptorType == typeAERecord) ec = AEPutKeyDesc (list, n, &valDesc); else Modified: Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactable.c =================================================================== --- Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactable.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactable.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -53,7 +53,7 @@ Boolean IACgettableitem (AEDescList *list, long n, Handle *val) { OSErr ec; - AEDesc desc = {typeNull, 0L}; // kw - 2006-02-19 --- AEDISPOSAL + AEDesc desc = {typeNull, 0L}; // 2006-02-19 kw: AEDISPOSAL DescType key; if ((*list).descriptorType != typeAEList) { Modified: Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactext.c =================================================================== --- Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactext.c 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/FrontierSDK/Toolkits/IACTools/Source/iactext.c 2006-06-06 19:57:02 UTC (rev 1400) @@ -43,7 +43,7 @@ Boolean IACgettextitem (AEDescList *list, long n, Handle *val) { register OSErr ec; - AEDesc desc = {typeNull, 0L}; // kw - 2006-02-18 --- AEDISPOSAL + AEDesc desc = {typeNull, 0L}; // 2006-02-18 kw: AEDISPOSAL DescType key; if ((*list).descriptorType != typeAEList) { Modified: Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj =================================================================== --- Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-06 19:57:02 UTC (rev 1400) @@ -6,6 +6,21 @@ objectVersion = 42; objects = { +/* Begin PBXAggregateTarget section */ + 83369EEE0A31A24A0060462B /* buildAll */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 83369EF40A31A2870060462B /* Build configuration list for PBXAggregateTarget "buildAll" */; + buildPhases = ( + ); + dependencies = ( + 83369EF00A31A2540060462B /* PBXTargetDependency */, + 83369EF20A31A2590060462B /* PBXTargetDependency */, + ); + name = buildAll; + productName = buildAll; + }; +/* End PBXAggregateTarget section */ + /* Begin PBXBuildFile section */ 6505996409968C1400410571 /* ioascrollbar.h in Headers */ = {isa = PBXBuildFile; fileRef = 651525AB072BFC6700411831 /* ioascrollbar.h */; }; 6505996509968C1400410571 /* ioapopup.h in Headers */ = {isa = PBXBuildFile; fileRef = 651525A7072BFC6700411831 /* ioapopup.h */; }; @@ -1000,6 +1015,23 @@ DEA58AB407435A9500BAB271 /* Frontier.icns in Resources */ = {isa = PBXBuildFile; fileRef = DEA58AB307435A9500BAB271 /* Frontier.icns */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 83369EEF0A31A2540060462B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 65152560072BFC6500411831 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 65152568072BFC6500411831; + remoteInfo = Frontier; + }; + 83369EF10A31A2590060462B /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 65152560072BFC6500411831 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 6505996209968C1400410571; + remoteInfo = OPML; + }; +/* End PBXContainerItemProxy section */ + /* Begin PBXFileReference section */ 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 65059B760996945100410571 /* OPML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPML.icns; path = ../resources/OPML/OPML.icns; sourceTree = SOURCE_ROOT; }; @@ -2851,6 +2883,7 @@ targets = ( 65152568072BFC6500411831 /* Frontier */, 6505996209968C1400410571 /* OPML */, + 83369EEE0A31A24A0060462B /* buildAll */, ); }; /* End PBXProject section */ @@ -3513,6 +3546,19 @@ }; /* End PBXSourcesBuildPhase section */ +/* Begin PBXTargetDependency section */ + 83369EF00A31A2540060462B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 65152568072BFC6500411831 /* Frontier */; + targetProxy = 83369EEF0A31A2540060462B /* PBXContainerItemProxy */; + }; + 83369EF20A31A2590060462B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 6505996209968C1400410571 /* OPML */; + targetProxy = 83369EF10A31A2590060462B /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + /* Begin XCBuildConfiguration section */ 657A822D09F18A6100331344 /* Development */ = { isa = XCBuildConfiguration; @@ -3575,7 +3621,7 @@ COPY_PHASE_STRIP = YES; GCC_ALTIVEC_EXTENSIONS = NO; GCC_CHAR_IS_UNSIGNED_CHAR = NO; - GCC_C_LANGUAGE_STANDARD = c99; + GCC_C_LANGUAGE_STANDARD = "compiler-default"; GCC_ENABLE_ASM_KEYWORD = YES; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; @@ -3585,7 +3631,7 @@ GCC_PREFIX_HEADER = frontier.xcode.h; GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; GCC_REUSE_STRINGS = NO; - GCC_SHORT_ENUMS = YES; + GCC_SHORT_ENUMS = NO; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; GCC_WARN_UNKNOWN_PRAGMAS = YES; @@ -3597,7 +3643,7 @@ INFOPLIST_FILE = Info_Frontier.plist; LIBRARY_SEARCH_PATHS = tools; MACOSX_DEPLOYMENT_TARGET_i386 = 10.4; - MACOSX_DEPLOYMENT_TARGET_ppc = 10.1; + MACOSX_DEPLOYMENT_TARGET_ppc = 10.4; OTHER_CFLAGS = ( "-fno-inline", "-malign-mac68k", @@ -3784,19 +3830,47 @@ ppc, i386, ); - GCC_AUTO_VECTORIZATION = YES; - GCC_DYNAMIC_NO_PIC = YES; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_AUTO_VECTORIZATION = NO; + GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = 3; + GCC_OPTIMIZATION_LEVEL = 2; GCC_STRICT_ALIASING = NO; + GCC_UNROLL_LOOPS = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + MACH_O_TYPE = mh_execute; MACOSX_DEPLOYMENT_TARGET = 10.4; + OTHER_CFLAGS = ""; + PREBINDING = NO; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; }; + 83369EF50A31A2870060462B /* Development */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = NO; + GCC_DYNAMIC_NO_PIC = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + PRODUCT_NAME = buildAll; + }; + name = Development; + }; + 83369EF60A31A2870060462B /* Deployment */ = { + isa = XCBuildConfiguration; + buildSettings = { + COPY_PHASE_STRIP = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + PRODUCT_NAME = buildAll; + ZERO_LINK = NO; + }; + name = Deployment; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -3827,6 +3901,15 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; + 83369EF40A31A2870060462B /* Build configuration list for PBXAggregateTarget "buildAll" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 83369EF50A31A2870060462B /* Development */, + 83369EF60A31A2870060462B /* Deployment */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; + }; /* End XCConfigurationList section */ }; rootObject = 65152560072BFC6500411831 /* Project object */; Modified: Frontier/branches/Int64/build_XCode/tools/postlinking.sh =================================================================== --- Frontier/branches/Int64/build_XCode/tools/postlinking.sh 2006-06-06 19:54:31 UTC (rev 1399) +++ Frontier/branches/Int64/build_XCode/tools/postlinking.sh 2006-06-06 19:57:02 UTC (rev 1400) @@ -31,7 +31,7 @@ preprocessor_defs=`echo ${GCC_PREPROCESSOR_DEFINITIONS} | sed -e "s/[A-Z0-9_][A-Z0-9_=]*/-D&/g"` # set environment variable to stop cc from complaining -export MACOSX_DEPLOYMENT_TARGET="10.1" +export MACOSX_DEPLOYMENT_TARGET="10.4" # extract the APP_VERSION_STRING cc ${preprocessor_defs} -I"${SRCROOT}/../Common/headers" -o appversion appversion.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-06 19:55:56
|
Revision: 1399 Author: karstenw Date: 2006-06-06 12:54:31 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1399&view=rev Log Message: ----------- comment work Modified Paths: -------------- Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c Frontier/branches/Int64/Common/Paige/headers/PAIGE.H Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c Frontier/branches/Int64/Common/headers/FDllCall.h Frontier/branches/Int64/Common/headers/stringdefs.h Frontier/branches/Int64/Common/headers/strings.h Frontier/branches/Int64/Common/resources/Mac/SHELL.R Frontier/branches/Int64/Common/source/aeutils.c Frontier/branches/Int64/Common/source/appletglue.c Frontier/branches/Int64/Common/source/cancoon.c Frontier/branches/Int64/Common/source/claybrowservalidate.c Frontier/branches/Int64/Common/source/claylinelayout.c Frontier/branches/Int64/Common/source/filelaunch.c Frontier/branches/Int64/Common/source/langexternal.c Frontier/branches/Int64/Common/source/langipc.c Frontier/branches/Int64/Common/source/langpack.c Frontier/branches/Int64/Common/source/langscan.c Frontier/branches/Int64/Common/source/langsystypes.c Frontier/branches/Int64/Common/source/langverbs.c Frontier/branches/Int64/Common/source/oplist.c Frontier/branches/Int64/Common/source/oprefcon.c Frontier/branches/Int64/Common/source/ops.c Frontier/branches/Int64/Common/source/osacomponent.c Frontier/branches/Int64/Common/source/resources.c Frontier/branches/Int64/Common/source/shellmouse.c Frontier/branches/Int64/Common/source/shellprint.c Frontier/branches/Int64/Common/source/strings.c Frontier/branches/Int64/Common/source/stringverbs.c Frontier/branches/Int64/Common/source/wpengine.c Frontier/branches/Int64/Common/source/zoom.c Modified: Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/IowaRuntime/Headers/iowaruntime.h 2006-06-06 19:54:31 UTC (rev 1399) @@ -112,7 +112,7 @@ boolean runCard (Handle, boolean, short, short, tycardeventcallback); -// 2006-04-03 - kw --- renamed parameter +// 2006-04-03 kw: renamed parameter boolean runHostedCard (WindowPtr hostwindow, Handle hpackedcard, boolean flscriptedcard, tycardeventcallback pcallback); boolean setObjectValue (hdlcard, bigstring, Handle); Modified: Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c =================================================================== --- Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/IowaRuntime/Source/iowaruntime.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -613,7 +613,7 @@ static void filterevent (EventRecord *ev) { - // 2006-04-03 - kw --- renamed callback -> lCallback + // 2006-04-03 kw: renamed callback -> lCallback tycardeventcallback lCallback = (**runtimedata).callback; if (lCallback == nil) @@ -675,7 +675,7 @@ return true if the buttonhit has been fully processed */ - // 2006-04-03 - kw --- renamed callback -> lCallback + // 2006-04-03 kw: renamed callback -> lCallback tycardeventcallback lCallback = (**runtimedata).callback; EventRecord ev; @@ -706,7 +706,7 @@ giving him a chance to save data from the card. */ - // 2006-04-03 - kw --- renamed callback -> lCallback + // 2006-04-03 kw: renamed callback -> lCallback tycardeventcallback lCallback = (**runtimedata).callback; EventRecord ev; @@ -2298,7 +2298,7 @@ boolean runModalCard (Handle hpackedcard, boolean flscriptedcard, short top, short pLeft, tycardeventcallback pCallback) { - // 2006-04-03 - kw --- renamed params left -pLeft, callback -> pCallback + // 2006-04-03 kw: renamed params left -pLeft, callback -> pCallback /* dmb 1.0b24: changed flcallback logic. we no longer call back on activate and update events that we just handled Modified: Frontier/branches/Int64/Common/Paige/headers/PAIGE.H =================================================================== --- Frontier/branches/Int64/Common/Paige/headers/PAIGE.H 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/Paige/headers/PAIGE.H 2006-06-06 19:54:31 UTC (rev 1399) @@ -1961,7 +1961,7 @@ /* Async Lock/Unlock */ -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names //extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref pg, long ID); extern PG_PASCAL (pg_boolean) pgSetLockID (pg_ref, long); extern PG_PASCAL (long) pgGetLockID (pg_ref pg); @@ -2118,7 +2118,7 @@ extern PG_PASCAL (short) pgFindStyleSheet (pg_ref pg, const style_info_ptr compare_style, const style_info_ptr mask); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref pg, short index, style_info_ptr stylesheet); extern PG_PASCAL (short) pgGetIndStyleSheet (pg_ref, short, style_info_ptr); @@ -2135,7 +2135,7 @@ extern PG_PASCAL (short) pgFindParStyleSheet (pg_ref pg, const par_info_ptr compare_style, const par_info_ptr mask); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref pg, short index, par_info_ptr stylesheet); extern PG_PASCAL (short) pgGetIndParStyleSheet (pg_ref, short, par_info_ptr); @@ -2145,14 +2145,14 @@ extern PG_PASCAL (void) pgApplyNamedStyle (pg_ref pg, select_pair_ptr selection, pg_c_string_ptr stylename, short draw_mode); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref pg, select_pair_ptr selection, long index, short draw_mode); extern PG_PASCAL (void) pgApplyNamedStyleIndex (pg_ref, select_pair_ptr, long, short); extern PG_PASCAL (long) pgNumNamedStyles (pg_ref pg); extern PG_PASCAL (long) pgGetNamedStyleIndex (pg_ref pg, pg_c_string_ptr stylename); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref pg, long index, style_info_ptr style, font_info_ptr font, par_info_ptr par); extern PG_PASCAL (void) pgGetNamedStyleInfo (pg_ref, long, style_info_ptr, font_info_ptr, par_info_ptr); @@ -2359,7 +2359,7 @@ extern PG_PASCAL (void) pgInsertExclusionShape (pg_ref pg, pg_short_t position, shape_ref exclude_shape, short draw_mode); -// 2006-04-04 - kw --- removed parameter names +// 2006-04-04 kw: removed parameter names // extern PG_PASCAL (void) pgAttachParExclusion (pg_ref pg, long position, pg_short_t index, short draw_mode); extern PG_PASCAL (void) pgAttachParExclusion (pg_ref, long, pg_short_t, short); Modified: Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c =================================================================== --- Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/UserLandIACToolkit/landgetparam.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -144,7 +144,7 @@ if (!landgetparam (hverb, key, longtype, ¶m)) return (false); - /* kw - 2006-02-19 --- don't dereference the nil handle... */ + /* 2006-02-19 kw: don't dereference the nil handle... */ #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ if (copydatahandle (&(param.desc), &theData)) Modified: Frontier/branches/Int64/Common/headers/FDllCall.h =================================================================== --- Frontier/branches/Int64/Common/headers/FDllCall.h 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/headers/FDllCall.h 2006-06-06 19:54:31 UTC (rev 1399) @@ -263,7 +263,7 @@ odbBool (xCALLBACK *xOdbNewListValue) (odbRef odb, odbValueRecord *value, odbBool flRecord); odbBool (xCALLBACK *xOdbGetListCount) (odbRef odb, odbValueRecord *value, long * cnt); - // 2006-04-04 - kw --- removed parameter names + // 2006-04-04 kw: removed parameter names // odbBool (xCALLBACK *xOdbDeleteListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname); odbBool (xCALLBACK *xOdbDeleteListValue) (odbRef, odbValueRecord *, long, char *); // odbBool (xCALLBACK *xOdbSetListValue) (odbRef odb, odbValueRecord *value, long index, char * recordname, odbValueRecord *valueData); Modified: Frontier/branches/Int64/Common/headers/stringdefs.h =================================================================== --- Frontier/branches/Int64/Common/headers/stringdefs.h 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/headers/stringdefs.h 2006-06-06 19:54:31 UTC (rev 1399) @@ -75,7 +75,7 @@ #define STR_picture BIGSTRING ("\x07" "picture") #if LONGINT_LONGDATE == 1 // long type names - // kw - 2006-01-30 --- new types added + // 2006-01-30 kw: new types added #define STR_longlong BIGSTRING ("\x06" "sint64") #define STR_longdate BIGSTRING ("\x0c" "longdatetime") #endif Modified: Frontier/branches/Int64/Common/headers/strings.h =================================================================== --- Frontier/branches/Int64/Common/headers/strings.h 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/headers/strings.h 2006-06-06 19:54:31 UTC (rev 1399) @@ -33,6 +33,10 @@ #include "memory.h" #endif +#ifndef langinclude +#include "lang.h" // for tylonglongint +#endif + #ifdef PASCALSTRINGVERSION #define nullterminate(s) do {s [stringlength(s) + 1] = '\0';} while (0) #else @@ -247,7 +251,11 @@ extern boolean pullstringsuffix (bigstring, bigstring, unsigned char); /*7.0.2b1 Radio PBS*/ #if LONGINT_LONGDATE == 1 // additional functions declarations + extern boolean stringreverse (bigstring bs); + +extern boolean hexstringtolonglongint (bigstring bshex, tylonglongint *n); + #endif extern void initstrings (void); Modified: Frontier/branches/Int64/Common/resources/Mac/SHELL.R =================================================================== --- Frontier/branches/Int64/Common/resources/Mac/SHELL.R 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/resources/Mac/SHELL.R 2006-06-06 19:54:31 UTC (rev 1399) @@ -1283,7 +1283,7 @@ noAutoCenter }; -/* kw - 2006-02-05 --- missing; taken from carbon DLOG 518 */ +/* 2006-02-05 kw: missing; taken from carbon DLOG 518 */ resource 'DLOG' (512, "find", purgeable) { {0, 0, 123, 451}, noGrowDocProc, @@ -1295,7 +1295,7 @@ noAutoCenter }; -/* kw - 2006-02-05 --- personalisation dialog - was in root resourcefork */ +/* 2006-02-05 kw: personalisation dialog - was in root resourcefork */ resource 'DLOG' (515, "personalisation", purgeable) { {32, 188, 326, 453}, dBoxProc, @@ -1307,7 +1307,7 @@ noAutoCenter }; -/* kw - 2006-02-05 --- personalisation dialog - was in root resourcefork */ +/* 2006-02-05 kw: personalisation dialog - was in root resourcefork */ resource 'DLOG' (516, "tableinfo", purgeable) { {50, 100, 250, 452}, dBoxProc, @@ -1319,7 +1319,7 @@ noAutoCenter }; -/* kw - 2006-02-05 --- reconcile dialog - was in root resourcefork */ +/* 2006-02-05 kw: reconcile dialog - was in root resourcefork */ resource 'DLOG' (25000, "reconcile", purgeable) { {137, 259, 339, 611}, dBoxProc, @@ -3076,7 +3076,7 @@ }; -/* kw - 2006-02-05 --- missing; taken from carbon DLOG 518 */ +/* 2006-02-05 kw: missing; taken from carbon DLOG 518 */ resource 'DITL' (512, "Find Dialog", purgeable, preload) { { /* array DITLarray: 12 elements */ /* [1] */ @@ -3155,7 +3155,7 @@ }; -/* kw - 2006-02-05 --- personalisation dialog - was in root resourcefork */ +/* 2006-02-05 kw: personalisation dialog - was in root resourcefork */ resource 'DITL' (515, "Personalisation Dialog", purgeable, preload) { { /* array DITLarray: 9 elements */ /* [1] */ @@ -3216,7 +3216,7 @@ } }; -/* kw - 2006-02-05 --- table info dialog - was in root resourcefork */ +/* 2006-02-05 kw: table info dialog - was in root resourcefork */ resource 'DITL' (516, "tableinfo", purgeable) { { /* array DITLarray: 12 elements */ /* [1] */ @@ -3294,7 +3294,7 @@ } }; -/* kw - 2006-02-05 --- reconcile dialog - was in root resourcefork */ +/* 2006-02-05 kw: reconcile dialog - was in root resourcefork */ resource 'DITL' (25000) { { /* array DITLarray: 8 elements */ /* [1] */ @@ -3348,8 +3348,7 @@ } }; -/* kw - 2006-02-05 --- personalisation dialog - was in root resourcefork */ -/* kw - 2006-02-05 --- personalisation dialog - was in root resourcefork */ +/* 2006-02-05 kw: personalisation dialog - was in root resourcefork */ #if 0 @@ -3775,7 +3774,7 @@ "scroll bar" }; -/* kw - 2006-02-05 --- missing; taken from old root */ +/* 2006-02-05 kw: missing; taken from old root */ resource 'CNTL' (25000) { {64, 9, 89, 169}, 0, Modified: Frontier/branches/Int64/Common/source/aeutils.c =================================================================== --- Frontier/branches/Int64/Common/source/aeutils.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/aeutils.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -46,7 +46,7 @@ len = AEGetDescDataSize (desc); -/* kw - 2005-12-12 - we should return at least a zero sized handle +/* 2005-12-12 kw: we should return at least a zero sized handle if (len < 1) { *h = nil; Modified: Frontier/branches/Int64/Common/source/appletglue.c =================================================================== --- Frontier/branches/Int64/Common/source/appletglue.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/appletglue.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -41,7 +41,7 @@ boolean rectlessthan (Rect r1, Rect r2); boolean unicaseequalstrings (void *pvoid1, void *pvoid2); -// kw - 2005-12-15 - compiler warning rename +// 2005-12-15 kw: compiler warning rename boolean oldclutconverter (short idx, RGBColor *rgb); boolean emptyrect (Rect r); boolean pushhandleonhandle (Handle hsource, Handle hdest); Modified: Frontier/branches/Int64/Common/source/cancoon.c =================================================================== --- Frontier/branches/Int64/Common/source/cancoon.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/cancoon.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -235,7 +235,7 @@ 5.1.5b10 dmb: use ccfindrootwindow to avoid guest databases */ - tyconfigrecord lconfig; // 2006-04-03 - kw --- renamed + tyconfigrecord lconfig; // 2006-04-03 kw: renamed hdlwindowinfo hinfo; // if (shellpushfrontrootglobals ()) @@ -271,7 +271,7 @@ register hdlcancoonrecord hc = hcancoon; tycancoonwindowinfo windowinfo; - tyconfigrecord lconfig; // 2006-04-03 - kw --- renamed + tyconfigrecord lconfig; // 2006-04-03 kw: renamed Rect r; clearbytes (&windowinfo, sizeof (windowinfo)); Modified: Frontier/branches/Int64/Common/source/claybrowservalidate.c =================================================================== --- Frontier/branches/Int64/Common/source/claybrowservalidate.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/claybrowservalidate.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -152,7 +152,7 @@ static boolean browsercompareforcollision (hdlheadrecord hnode, long pdragmodified, bigstring bs1, bigstring bs2, ptrdraginfo draginfo) { -// 2006-04-03 - kw --- renamed dragmodified +// 2006-04-03 kw: renamed dragmodified /* 5.0.2b18 dmb: set tmpbit of subs too, so we can detect illegal moves */ Modified: Frontier/branches/Int64/Common/source/claylinelayout.c =================================================================== --- Frontier/branches/Int64/Common/source/claylinelayout.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/claylinelayout.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -754,7 +754,7 @@ /*special tweaked-up code for drawing the selected line*/ { - Rect lrframe = *rtext; // 2006-04-03 - kw --- renamed rframe + Rect lrframe = *rtext; // 2006-04-03 kw: renamed rframe lrframe.right = lrframe.left + stringpixels (bshead); Modified: Frontier/branches/Int64/Common/source/filelaunch.c =================================================================== --- Frontier/branches/Int64/Common/source/filelaunch.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/filelaunch.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -126,7 +126,7 @@ OSType fndrCreator; Boolean wasChanged; AliasHandle targetAlias; - long idx; // 2006-04-03 - kw --- renamed + long idx; // 2006-04-03 kw: renamed long nTargets = 1; FSSpec targets[1]; FSSpec *targetList; Modified: Frontier/branches/Int64/Common/source/langexternal.c =================================================================== --- Frontier/branches/Int64/Common/source/langexternal.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langexternal.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -2887,9 +2887,9 @@ register tyvaluetype type = langgetvaluetype (typeid); - // kw - 2006-01-30 --- for new int types - these were added at the end + // 2006-01-30 kw: for new int types - these were added at the end // not sure if these need to be externaltypes - // kw - 2006-06-02 --- re-enabled; externaltype is bad for tylonglongint + // 2006-06-02 kw: re-enabled; externaltype is bad for tylonglongint #if LONGINT_LONGDATE == 1 // in langexternalgetvaluetype() if ( (type < longlongintvaluetype) && (type >= outlinevaluetype)) Modified: Frontier/branches/Int64/Common/source/langipc.c =================================================================== --- Frontier/branches/Int64/Common/source/langipc.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langipc.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -297,7 +297,7 @@ // modelled after case binaryvaluetype case longlongintvaluetype: case longdatetimevaluetype: - // 2006-05-05 - kw --- copyvaluedata() is off limits here I guess + // 2006-05-05 kw: copyvaluedata() is off limits here I guess /* if (!copyvaluedata (v)) return (false); */ @@ -1057,7 +1057,7 @@ register short i; long ctparams; hdltreenode hlist = nil; - AEDescList directparam = {typeNull, 0L}; // kw - 2006-02-18 --- AEDISPOSAL + AEDescList directparam = {typeNull, 0L}; // 2006-02-18 kw: AEDISPOSAL typaramrecord param; tyvaluerecord val; hdltreenode hparam; @@ -4283,7 +4283,7 @@ */ OSErr err; - AEDesc desc = {typeNull, 0L}; // kw - 2006-02-18 - AEDISPOSAL + AEDesc desc = {typeNull, 0L}; // 2006-02-18 kw: AEDISPOSAL tyfastverbcontext savecontext; long curA5; Modified: Frontier/branches/Int64/Common/source/langpack.c =================================================================== --- Frontier/branches/Int64/Common/source/langpack.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langpack.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -260,7 +260,7 @@ // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: { -/* 2006-06-02 - kw --- my intention was to store these as binaries with the proper type +/* 2006-06-02 kw: my intention was to store these as binaries with the proper type Unfortunately coercetobinary currently calls langpack.... */ @@ -699,7 +699,7 @@ { fl = langunpackhandle (false, &v.data.binaryvalue, h, &ixunpack); - // 2006-06-02 - kw --- temporarily switched off; doesn't work + // 2006-06-02 kw: temporarily switched off; doesn't work if (false) //(v.valuetype == binaryvaluetype) { Modified: Frontier/branches/Int64/Common/source/langscan.c =================================================================== --- Frontier/branches/Int64/Common/source/langscan.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langscan.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -449,7 +449,7 @@ if (flfloat) { double d; - Handle fx; // 2006-05-15 - kw --- renamed due to ambiguity + Handle fx; // 2006-05-15 kw: renamed due to ambiguity stringtofloat (bsnumber, &d); @@ -461,21 +461,28 @@ (*val).data.binaryvalue = fx; } else { + #if LONGINT_LONGDATE == 1 // in parsepopnumber() + tylonglongint x; #else long x; + #endif bigstring bstest; if (flhex) { + #if LONGINT_LONGDATE == 1 // in parsepopnumber() + // "0x" + 16 hex chars if (stringlength (bsnumber) > 18) goto overflow; hexstringtolonglongint (bsnumber, &x); + #else + if (stringlength (bsnumber) > 10) goto overflow; @@ -483,14 +490,18 @@ #endif } else { + #if LONGINT_LONGDATE == 1 // in parsepopnumber() + stringtolonglongint (bsnumber, &x); #else stringtonumber (bsnumber, &x); + #endif popleadingchars (bsnumber, '0'); #if LONGINT_LONGDATE == 1 // in parsepopnumber() + longlonginttostring (x, bstest, 10); #else numbertostring (x, bstest); @@ -503,12 +514,16 @@ } #if LONGINT_LONGDATE == 1 // in parsepopnumber() + /* check if result fits in a long, if yes use long */ if ( (x < (tylonglongint)LONG_MAX) && (x > (tylonglongint)LONG_MIN)) { + setlongvalue ((long)x, val); } + else { + setlonglongintvalue (x, val); } #else Modified: Frontier/branches/Int64/Common/source/langsystypes.c =================================================================== --- Frontier/branches/Int64/Common/source/langsystypes.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langsystypes.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -388,8 +388,8 @@ } } -#if 0 //AEDISPOSAL == 1 - // kw - 2006-03-04 --- gotta crash with find next +#if AEDISPOSAL == 999 + // 2006-03-04 kw: gotta crash with find next AEDisposeDesc(&coerceddesc); #endif @@ -683,7 +683,7 @@ setemptystring (bs); // get each path element out of the alias -// kw - 2006-02-02 --- todo: replace this +// 2006-02-02 kw: todo: replace this /* extern OSErr GetAliasInfo( AliasHandle alias, Modified: Frontier/branches/Int64/Common/source/langverbs.c =================================================================== --- Frontier/branches/Int64/Common/source/langverbs.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/langverbs.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -864,7 +864,7 @@ if ((type >= outlinevaluetype) && (type <= pictvaluetype)) { #if LONGINT_LONGDATE == 1 // delete me after debugging - // kw - 2006-01-30 debugging aids + // 2006-01-30 kw: debugging aids int x = type; if ((type == 38) || (type == 39)) { Modified: Frontier/branches/Int64/Common/source/oplist.c =================================================================== --- Frontier/branches/Int64/Common/source/oplist.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/oplist.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -53,8 +53,8 @@ #define oplistversionnumber 1 -// kw - 2006-05-24 --- moved here from frontierdefs.h; -// kw - 2006-02-15 --- oplanglist accelerator - set to 1 to turn on +// 2006-05-24 kw: moved here from frontierdefs.h; +// 2006-02-15 kw: oplanglist accelerator - set to 1 to turn on #define OPLANGLISTACCEL 0 Modified: Frontier/branches/Int64/Common/source/oprefcon.c =================================================================== --- Frontier/branches/Int64/Common/source/oprefcon.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/oprefcon.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -97,7 +97,7 @@ Handle hrefcon; long lenrefcon; - // kw - 2006-01-19 - after crash - was "Handle hrefcon = (**hnode).hrefcon;" + // 2006-01-19 kw: after crash - was "Handle hrefcon = (**hnode).hrefcon;" if (hnode != nil) hrefcon = (**hnode).hrefcon; Modified: Frontier/branches/Int64/Common/source/ops.c =================================================================== --- Frontier/branches/Int64/Common/source/ops.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/ops.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -309,7 +309,7 @@ convert a bigstring into a tylonglongint */ /* - 2006-05-13 - kw - first write; modelled after stringtonumber + 2006-05-13 kw: first write; modelled after stringtonumber */ long i, n; Modified: Frontier/branches/Int64/Common/source/osacomponent.c =================================================================== --- Frontier/branches/Int64/Common/source/osacomponent.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/osacomponent.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -1282,7 +1282,7 @@ AEDesc list; register ScrpSTElement *pstyle; - #ifdef fldebug // 2006-04-04 - kw --- this was fldegug + #ifdef fldebug // 2006-04-04 kw: this was fldegug if (totype != typeStyledText) DebugStr ("\punexpected coercion"); @@ -3276,7 +3276,7 @@ long curA5 = SetUpAppA5 (); #endif - #ifdef fldebug // 2006-04-04 - kw --- this was fldegug + #ifdef fldebug // 2006-04-04 kw: this was fldegug if ((*desc).descriptorType != typeInsertionLoc) DebugStr ("\punexpected coercion"); Modified: Frontier/branches/Int64/Common/source/resources.c =================================================================== --- Frontier/branches/Int64/Common/source/resources.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/resources.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -664,7 +664,7 @@ errcode = FSOpenResourceFile (&myRef, fork.length, fork.unicode, permission, &newrnum); #else - // kw 2005-12-17 - OS9 compliance + // 2005-12-17 kw: OS9 compliance newrnum = FSpOpenResFile (fs, permission); #endif Modified: Frontier/branches/Int64/Common/source/shellmouse.c =================================================================== --- Frontier/branches/Int64/Common/source/shellmouse.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/shellmouse.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -435,7 +435,7 @@ if (TrackGoAway (w, mousept)) { - // 2006-04-03 - kw --- brace for ambiguity warning + // 2006-04-03 kw: brace for ambiguity warning if (keyboardstatus.floptionkey) shellcloseall (w, true); else Modified: Frontier/branches/Int64/Common/source/shellprint.c =================================================================== --- Frontier/branches/Int64/Common/source/shellprint.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/shellprint.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -673,7 +673,7 @@ #ifdef WIN95VERSION -// kw - 2006-06 - splitted for each platform +// 2005-06 kw: splitted for each platform #pragma mark shellprint windows boolean shellprint (WindowPtr w, boolean fldialog) { Modified: Frontier/branches/Int64/Common/source/strings.c =================================================================== --- Frontier/branches/Int64/Common/source/strings.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/strings.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -1931,7 +1931,7 @@ 2.1b4 dmb: always copy into type, even when returning false for bad length */ - // kw 2005-11-28 changed to unsigned for better match with stringlength() + // 2005-11-28 kw: changed to unsigned for better match with stringlength() register unsigned short len = stringlength (bs); boolean fl = true; @@ -2551,7 +2551,7 @@ return (false); } - // 2005-08-26 --- kw better bytemark detecting + // 2005-08-26 kw: better bytemark detecting // see http://en.wikipedia.org/wiki/Byte_Order_Mark if (inputcharset == kCFStringEncodingUTF8) // we handle utf-8 input { @@ -2882,7 +2882,7 @@ #if LONGINT_LONGDATE == 1 // stringreverse() boolean stringreverse (bigstring bs) { - // 2006-03-17 - kw --- initial write; needed for longlonginttostring + // 2006-03-17 kw: initial write; needed for longlonginttostring // reverse a bigstring by swapping bytes 1 & len, 2 & len-1,... unsigned char e, s, i, t; Modified: Frontier/branches/Int64/Common/source/stringverbs.c =================================================================== --- Frontier/branches/Int64/Common/source/stringverbs.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/stringverbs.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -2198,7 +2198,7 @@ utf16toansi (h, hresult); - disposehandle(h); // kw 2005-07-23 --- memleak + disposehandle(h); // 2005-07-23 kw: memleak return (setheapvalue (hresult, stringvaluetype, v)); } @@ -2216,7 +2216,7 @@ utf8toansi (h, hresult); - disposehandle(h); // kw 2005-07-23 --- memleak + disposehandle(h); // 2005-07-23 kw: memleak return (setheapvalue (hresult, stringvaluetype, v)); } @@ -2234,7 +2234,7 @@ ansitoutf8 (h, hresult); - disposehandle(h); // kw 2005-07-23 --- memleak + disposehandle(h); // 2005-07-23 kw: memleak return (setheapvalue (hresult, stringvaluetype, v)); } @@ -2252,7 +2252,7 @@ ansitoutf16 (h, hresult); - disposehandle (h); // kw 2005-07-23 --- memleak + disposehandle (h); // 2005-07-23 kw: memleak return (setheapvalue (hresult, stringvaluetype, v)); } Modified: Frontier/branches/Int64/Common/source/wpengine.c =================================================================== --- Frontier/branches/Int64/Common/source/wpengine.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/wpengine.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -1961,7 +1961,7 @@ 4.1b6 dmb: call SetFractEnable(true) so tab columns will line up */ - /* kw - 2005-12-05 remove this after print error correction */ + /* 2005-12-05 kw: remove this after print error correction */ #if TARGET_API_MAC_CARBON == 1 #pragma unused(pagenumber) return (false); Modified: Frontier/branches/Int64/Common/source/zoom.c =================================================================== --- Frontier/branches/Int64/Common/source/zoom.c 2006-06-06 19:53:23 UTC (rev 1398) +++ Frontier/branches/Int64/Common/source/zoom.c 2006-06-06 19:54:31 UTC (rev 1399) @@ -117,7 +117,7 @@ CGrafPtr deskport; - return; // kw - 2005-12-20 - killing zoomrects + return; // 2005-12-20 kw: killing zoomrects #if ACCESSOR_CALLS_ARE_FUNCTIONS == 1 deskport = CreateNewPort(); #else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-06 19:53:43
|
Revision: 1398 Author: karstenw Date: 2006-06-06 12:53:23 -0700 (Tue, 06 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1398&view=rev Log Message: ----------- more coercion Modified Paths: -------------- Frontier/branches/Int64/Common/source/langvalue.c Modified: Frontier/branches/Int64/Common/source/langvalue.c =================================================================== --- Frontier/branches/Int64/Common/source/langvalue.c 2006-06-02 20:36:09 UTC (rev 1397) +++ Frontier/branches/Int64/Common/source/langvalue.c 2006-06-06 19:53:23 UTC (rev 1398) @@ -635,7 +635,7 @@ memtodisklong (typeid); - // kw - 2005-12-12 filemaker empty string fix + // 2005-12-12 kw: filemaker empty string fix // we need to be able to handle empty strings that arrive as a binary['utxt'] if (x == nil) newhandle(0, &x); @@ -1963,7 +1963,7 @@ boolean getbinarylonglong (Handle x, tylonglongint *n) { /* - 2006-06-02 - kw --- modelled after getbinarynumber() + 2006-06-02 kw: modelled after getbinarynumber() return a tylonglongint interpretation of the binary handle. @@ -2066,7 +2066,9 @@ // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: - { + fl = **(*v).data.longlongintvalue != 0; + break; + /*{ tylonglongint n; Handle x; @@ -2082,7 +2084,7 @@ releaseheaptmp (x); break; - } + }*/ #endif case binaryvaluetype: { @@ -2172,6 +2174,7 @@ long x; double f; + tylonglongint lln; switch ((*v).valuetype) { @@ -2252,7 +2255,22 @@ // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: - { + lln = **(*v).data.longlongintvalue; + if ( (lln > LONG_MAX) + || (lln < LONG_MIN)) + { + // longlongvalue is out of range + x = 0; + return (false); + } + else + { + // we're in range + x = (long)lln; + return (true); + } + break; + /*{ tylonglongint lln; boolean fl = false; @@ -2277,7 +2295,7 @@ } return (fl); break; - } + }*/ #endif case binaryvaluetype: { @@ -2430,7 +2448,7 @@ boolean coercetolongdate (tyvaluerecord *v) { - // kw - 2006-02-12 --- modeled after coercetodate + // 2006-02-12 kw: modeled after coercetodate tylonglongint x; @@ -2480,7 +2498,7 @@ case stringvaluetype: { bigstring bs; - unsigned long ltime; // kw - 2006-02-02 renamed due to shadow warning + unsigned long ltime; // 2006-02-02 kw: renamed due to shadow warning pullstringvalue (v, bs); @@ -2810,7 +2828,7 @@ case stringvaluetype: { bigstring bs; - unsigned long ltime; // kw - 2006-02-02 renamed due to shadow warning + unsigned long ltime; // 2006-02-02 kw: renamed due to shadow warning pullstringvalue (v, bs); @@ -4064,7 +4082,7 @@ return (7); #if LONGINT_LONGDATE == 1 // in coercionweight() - // 2006-05-09 - kw --- this is my first & fast guess where these should sort in + // 2006-05-09 kw: this is my first & fast guess where these should sort in // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-02 20:36:22
|
Revision: 1397 Author: karstenw Date: 2006-06-02 13:36:09 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1397&view=rev Log Message: ----------- copy & paste of sint64 type. saving to odb. Incompatible with non-Int64 version Modified Paths: -------------- Frontier/branches/Int64/Common/headers/lang.h Frontier/branches/Int64/Common/source/langexternal.c Frontier/branches/Int64/Common/source/langhash.c Frontier/branches/Int64/Common/source/langpack.c Frontier/branches/Int64/Common/source/langvalue.c Modified: Frontier/branches/Int64/Common/headers/lang.h =================================================================== --- Frontier/branches/Int64/Common/headers/lang.h 2006-06-02 15:59:34 UTC (rev 1396) +++ Frontier/branches/Int64/Common/headers/lang.h 2006-06-02 20:36:09 UTC (rev 1397) @@ -1078,10 +1078,14 @@ extern boolean coercetolonglong (tyvaluerecord *v); +extern boolean coercetolongdate (tyvaluerecord *v); + extern boolean getlonglongintparam(hdltreenode hfirst, short pnum, tyvaluerecord *v); extern boolean getlonglongintvalue (hdltreenode hfirst, short pnum, tylonglongint *lval); +extern boolean getbinarylonglong (Handle x, tylonglongint *n); + #endif extern boolean setdatevalue (unsigned long, tyvaluerecord *); Modified: Frontier/branches/Int64/Common/source/langexternal.c =================================================================== --- Frontier/branches/Int64/Common/source/langexternal.c 2006-06-02 15:59:34 UTC (rev 1396) +++ Frontier/branches/Int64/Common/source/langexternal.c 2006-06-02 20:36:09 UTC (rev 1397) @@ -2889,7 +2889,8 @@ // kw - 2006-01-30 --- for new int types - these were added at the end // not sure if these need to be externaltypes -#if LONGINT_LONGDATE == 999 // in langexternalgetvaluetype() + // kw - 2006-06-02 --- re-enabled; externaltype is bad for tylonglongint +#if LONGINT_LONGDATE == 1 // in langexternalgetvaluetype() if ( (type < longlongintvaluetype) && (type >= outlinevaluetype)) { Modified: Frontier/branches/Int64/Common/source/langhash.c =================================================================== --- Frontier/branches/Int64/Common/source/langhash.c 2006-06-02 15:59:34 UTC (rev 1396) +++ Frontier/branches/Int64/Common/source/langhash.c 2006-06-02 20:36:09 UTC (rev 1397) @@ -2696,18 +2696,10 @@ // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: { - // break; tylonglongint lln = **val.data.longlongintvalue; // any processor specific handling here??? -# if defined (WIN95VERSION) - -# endif -# if defined (MACVERSION) - -# endif - if (!hashpackdata (&lpi->s2, &lln, sizeof (lln), &rec.data.longvalue)) goto error; @@ -3193,6 +3185,12 @@ case listvaluetype: case recordvaluetype: #endif + +#if LONGINT_LONGDATE == 1 // in hashunpacktable() + // LONGLONGINTCONSTRUCTIONSITE + case longlongintvaluetype: + case longdatetimevaluetype: +#endif case binaryvaluetype: { if (!hashunpackscalar (hstrings, &val, ixstrings)) goto L1; @@ -3200,19 +3198,7 @@ break; } -#if LONGINT_LONGDATE == 1 // in hashumpacktable() - // LONGLONGINTCONSTRUCTIONSITE - case longlongintvaluetype: - case longdatetimevaluetype: - break; -# if defined (WIN95VERSION) -# endif -# if defined (MACVERSION) - -# endif -#endif - #ifdef oplanglists case listvaluetype: case recordvaluetype: Modified: Frontier/branches/Int64/Common/source/langpack.c =================================================================== --- Frontier/branches/Int64/Common/source/langpack.c 2006-06-02 15:59:34 UTC (rev 1396) +++ Frontier/branches/Int64/Common/source/langpack.c 2006-06-02 20:36:09 UTC (rev 1397) @@ -250,19 +250,34 @@ case recordvaluetype: #endif + case binaryvaluetype: + fl = langpackhandle (val.data.binaryvalue, hpackedvalue); + + break; + #if LONGINT_LONGDATE == 1 // in langpackvalue() - // UNTESTED - // LONGLONGINTCONSTRUCTIONSITE + // UNTESTED + // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: - case longdatetimevaluetype: -#endif + case longdatetimevaluetype: { +/* 2006-06-02 - kw --- my intention was to store these as binaries with the proper type + Unfortunately coercetobinary currently calls langpack.... + +*/ +/* + OSType mytype = val.valuetype; - case binaryvaluetype: + coercetobinary(&val); +*/ fl = langpackhandle (val.data.binaryvalue, hpackedvalue); - +/* + setbinaryvalue (val.data.binaryvalue, mytype, &val); +*/ + } break; - - #ifdef oplanglists +#endif + +#ifdef oplanglists case listvaluetype: case recordvaluetype: fl = oppacklist (val.data.listvalue, &hdata); @@ -675,8 +690,35 @@ case listvaluetype: case recordvaluetype: #endif +#if LONGINT_LONGDATE == 1 // in langunpackvalue() + // UNTESTED + // LONGLONGINTCONSTRUCTIONSITE + case longlongintvaluetype: + case longdatetimevaluetype: +#endif + { fl = langunpackhandle (false, &v.data.binaryvalue, h, &ixunpack); - + + // 2006-06-02 - kw --- temporarily switched off; doesn't work + if (false) //(v.valuetype == binaryvaluetype) + { + + OSType t = getbinarytypeid (v.data.binaryvalue); + + switch(t) { + + case 'ldt ': + coercetolongdate(&v); + break; + + case 'comp': + coercetolonglong(&v); + break; + } + } + + + } break; #ifdef oplanglists Modified: Frontier/branches/Int64/Common/source/langvalue.c =================================================================== --- Frontier/branches/Int64/Common/source/langvalue.c 2006-06-02 15:59:34 UTC (rev 1396) +++ Frontier/branches/Int64/Common/source/langvalue.c 2006-06-02 20:36:09 UTC (rev 1397) @@ -1958,7 +1958,38 @@ } /*getbinarynumber*/ +#if LONGINT_LONGDATE == 1 // getbinarylonglong() +boolean getbinarylonglong (Handle x, tylonglongint *n) { + + /* + 2006-06-02 - kw --- modelled after getbinarynumber() + + return a tylonglongint interpretation of the binary handle. + + we're allowed to munge the handle; the caller will be disposing it. + */ + + long ctbytes; + + ctbytes = gethandlesize (x) - sizeof (OSType); + + switch(ctbytes) { + + case 8: + *n = ((*(tylonglongint **) x) [4]); + + break; + + default: + return (false); + } + + return (true); +} /*getbinarylonglong*/ + +#endif + boolean coercetoboolean (tyvaluerecord *v) { /* @@ -2290,6 +2321,9 @@ switch ((*v).valuetype) { + case longlongintvaluetype: + return (true); + case longvaluetype: // kwtodo - 2006-01-30 @@ -2368,14 +2402,12 @@ break; case binaryvaluetype: { - long n; - register Handle h = (*v).data.binaryvalue; + + Handle h = (*v).data.binaryvalue; - if (!getbinarynumber (h, &n)) - return (binarytoscalar (v, longvaluetype)); + if (!getbinarylonglong (h, &x)) + return (false); - x = n; - releaseheaptmp (h); break; @@ -2395,7 +2427,7 @@ } /* coercetolonglong */ -static boolean +boolean coercetolongdate (tyvaluerecord *v) { // kw - 2006-02-12 --- modeled after coercetodate @@ -2464,9 +2496,18 @@ break; } - case binaryvaluetype: - return (binarytoscalar (v, datevaluetype)); + case binaryvaluetype: { + Handle h = (*v).data.binaryvalue; + + if (!getbinarylonglong (h, &x)) + return (false); + + releaseheaptmp (h); + + break; + } + case listvaluetype: case recordvaluetype: return (coercelistvalue (v, datevaluetype)); @@ -3782,7 +3823,28 @@ case filespecvaluetype: case aliasvaluetype: break; - + +#if LONGINT_LONGDATE == 1 // in coercetobinary() + case longlongintvaluetype: + case longdatetimevaluetype: { + Handle x; + + typeid = (*v).valuetype; + + if (!langpackvalue (*v, &x, HNoNode)) + return (false); + + if (!insertinhandle ((*v).data.binaryvalue, 0L, &typeid, sizeof (typeid))) + return (false); + + if (!setheapvalue (x, binaryvaluetype, v)) + return (false); + + + } + break; +#endif + #ifdef oplanglists case listvaluetype: case recordvaluetype: { @@ -6934,7 +6996,7 @@ t1 = (tylonglongint)v1.data.longvalue - (tylonglongint)v2.data.longvalue; if ( (t1 > LONG_MAX ) - || (t1 < LONG_MIN)) + || (t1 < LONG_MIN)) { coercetolonglong(vreturned); @@ -7089,7 +7151,7 @@ t1 = (tylonglongint)v1.data.longvalue * (tylonglongint)v2.data.longvalue; if ( (t1 > LONG_MAX ) - || (t1 < LONG_MIN)) + || (t1 < LONG_MIN)) { coercetolonglong(vreturned); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-06-02 15:59:48
|
Revision: 1396 Author: karstenw Date: 2006-06-02 08:59:34 -0700 (Fri, 02 Jun 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1396&view=rev Log Message: ----------- Some cleanup, some comments and finally expressions evaluate correctly. This is cool. Modified Paths: -------------- Frontier/branches/Int64/Common/headers/file.h Frontier/branches/Int64/Common/headers/lang.h Frontier/branches/Int64/Common/source/fileops.c Frontier/branches/Int64/Common/source/langops.c Frontier/branches/Int64/Common/source/langscan.c Frontier/branches/Int64/Common/source/langvalue.c Frontier/branches/Int64/Common/source/oplist.c Frontier/branches/Int64/Common/source/strings.c Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj Modified: Frontier/branches/Int64/Common/headers/file.h =================================================================== --- Frontier/branches/Int64/Common/headers/file.h 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/headers/file.h 2006-06-02 15:59:34 UTC (rev 1396) @@ -244,6 +244,12 @@ extern boolean getmacfileinfo (const tyfilespec *fs, CInfoPBRec *pb); +#if LONGINT_LONGDATE == 1 // getosxfileinfo() + +extern boolean getosxfileinfo (const tyfilespec *fs, FSRefParam *pb); + +#endif + 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 Modified: Frontier/branches/Int64/Common/headers/lang.h =================================================================== --- Frontier/branches/Int64/Common/headers/lang.h 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/headers/lang.h 2006-06-02 15:59:34 UTC (rev 1396) @@ -262,30 +262,40 @@ the value would actually be externalvaluetype; these are for flattening external types into a typevaluetype */ - + + /* 31 */ outlinevaluetype, + /* 32 */ wordvaluetype, + /* 33 */ headvaluetype, + /* 34 */ tablevaluetype, + /* 35 */ scriptvaluetype, + /* 36 */ menuvaluetype, + /* 37 */ pictvaluetype, #ifdef xmlfeatures + /* not used */ xmlvaluetype, #endif /*new types must be added at end of list, these get saved on disk*/ #if LONGINT_LONGDATE == 1 // tyvaluetype enum // kw - 2006-01-27 --- new types added + /* 38 */ longlongintvaluetype, + /* 39 */ longdatetimevaluetype, #endif ctvaluetypes @@ -462,11 +472,11 @@ hdlhashnode thistableshashnode; /*this tables hashnode referenced in it's parents hashbuckets 12/29/99 RAB*/ - #ifdef fltracklocaladdresses +#ifdef fltracklocaladdresses hdlhashnode refnodes; /*linked list of hash nodes containing addresses that reference an object in this table*/ - #endif +#endif boolean fldirty: 1; /*indicates whether anything has changed*/ @@ -490,9 +500,9 @@ boolean flmayaffectdisplay: 1; /*has this table ever been displayed in any table window?*/ - #ifdef xmlfeatures - boolean flxml: 1; - #endif +#ifdef xmlfeatures + boolean flxml: 1; +#endif boolean flsubsdirty: 1; /*has this table got dirty subs -- set in tablepreflightsubsdirtyflag before saving*/ @@ -500,11 +510,11 @@ long lexicalrefcon; - #if odbengine || !flruntime +#if odbengine || !flruntime struct tytableformats **hashtableformats; /*place to link in a display formats record*/ - #endif +#endif short sortorder; /*up to the application to understand what this means*/ @@ -549,13 +559,13 @@ unsigned short errorchar; - #ifdef flnewfeatures +#ifdef flnewfeatures unsigned long profilebase; unsigned long profiletotal; - #endif +#endif long errorrefcon; } tyerrorrecord; @@ -660,19 +670,19 @@ langeventcallback processeventcallback; - #ifdef flnewfeatures +#ifdef flnewfeatures langerrormessagecallback debugerrormessagecallback; - #endif +#endif - #ifdef flcomponent +#ifdef flcomponent callback presystemdialogcallback; callback postsystemdialogcallback; - #endif +#endif } tylangcallbacks; @@ -917,7 +927,8 @@ extern boolean hashtablesymbolexists (hdlhashtable, const bigstring); -extern void hashsetlocality (tyvaluerecord *, boolean); /*6.2b16 AR: needed to set locality in langaddlocals [langevaluate.c]*/ +/*6.2b16 AR: needed to set locality in langaddlocals [langevaluate.c]*/ +extern void hashsetlocality (tyvaluerecord *, boolean); extern boolean hashassign (const bigstring, tyvaluerecord); @@ -1070,6 +1081,7 @@ extern boolean getlonglongintparam(hdltreenode hfirst, short pnum, tyvaluerecord *v); extern boolean getlonglongintvalue (hdltreenode hfirst, short pnum, tylonglongint *lval); + #endif extern boolean setdatevalue (unsigned long, tyvaluerecord *); @@ -1191,15 +1203,18 @@ extern boolean getparamvalue (hdltreenode, short, tyvaluerecord *); -extern boolean getreadonlyparamvalue (hdltreenode, short, tyvaluerecord *); /* 2003-04-28 AR: needed in langregexp.c */ +/* 2003-04-28 AR: needed in langregexp.c */ +extern boolean getreadonlyparamvalue (hdltreenode, short, tyvaluerecord *); extern boolean getoptionalparam (hdltreenode, short *, short *, bigstring, hdltreenode *); extern boolean getoptionalparamvalue (hdltreenode, short *, short *, bigstring, tyvaluerecord *); -extern boolean getoptionaladdressparam (hdltreenode , short *, short *, bigstring , hdlhashtable *, bigstring); /*2006-03-10 aradke*/ +/*2006-03-10 aradke*/ +extern boolean getoptionaladdressparam (hdltreenode , short *, short *, bigstring , hdlhashtable *, bigstring); -extern boolean getoptionaltableparam (hdltreenode , short *, short *, bigstring, hdlhashtable *); /*2006-03-10 aradke*/ +/*2006-03-10 aradke*/ +extern boolean getoptionaltableparam (hdltreenode , short *, short *, bigstring, hdlhashtable *); extern boolean getaddressparam (hdltreenode, short, tyvaluerecord *); @@ -1351,6 +1366,3 @@ extern boolean langsettarget (hdlhashtable htable, bigstring bsname, tyvaluerecord *prevtarget); #endif - - - Modified: Frontier/branches/Int64/Common/source/fileops.c =================================================================== --- Frontier/branches/Int64/Common/source/fileops.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/fileops.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -261,7 +261,7 @@ #if LONGINT_LONGDATE == 1 // getosxfileinfo() -boolean getosxfileinfo (const tyfilespec *fs, CInfoPBRec *pb) { +boolean getosxfileinfo (const tyfilespec *fs, FSRefParam *pb) { /* 2.1b2 dmb: new fsspec-based version @@ -271,14 +271,16 @@ clearbytes (pb, sizeof (*pb)); - (*pb).hFileInfo.ioNamePtr = (StringPtr) (*fs).name; +// (*pb).hFileInfo.ioNamePtr = (StringPtr) (*fs).name; - (*pb).hFileInfo.ioVRefNum = (*fs).vRefNum; +// (*pb).hFileInfo.ioVRefNum = (*fs).vRefNum; - (*pb).hFileInfo.ioDirID = (*fs).parID; - - return (!oserror (PBGetCatInfoSync (pb))); -} /*getmacfileinfo*/ +// (*pb).hFileInfo.ioDirID = (*fs).parID; + + //extern OSErr PBGetCatalogInfoSync(FSRefParam * paramBlock) AVAILABLE_MAC_OS_X_VERSION_10_0_AND_LATER; + + return (false); //(!oserror (PBGetCatInfoSync (pb))); +} /* getosxfileinfo */ #endif Modified: Frontier/branches/Int64/Common/source/langops.c =================================================================== --- Frontier/branches/Int64/Common/source/langops.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langops.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -171,10 +171,13 @@ boolean fl = true; +#if LONGINT_LONGDATE == 1 // delete me after debugging // kw - 2006-01 --- debugging stuff int x = type, y = ctvaluetypes; +#endif + tytypeinfo z = typeinfo[type]; if ((type < novaluetype) || (type >= ctvaluetypes)) { @@ -184,10 +187,12 @@ fl = false; } +#if LONGINT_LONGDATE == 1 // delete me after debugging if (x >= 38) x = x * 1; // just for getting a debugging break when needed else x = x * 1; +#endif copystring ((ptrstring) typeinfo [type].bsname, bs); Modified: Frontier/branches/Int64/Common/source/langscan.c =================================================================== --- Frontier/branches/Int64/Common/source/langscan.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langscan.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -473,11 +473,14 @@ // "0x" + 16 hex chars if (stringlength (bsnumber) > 18) goto overflow; + + hexstringtolonglongint (bsnumber, &x); #else if (stringlength (bsnumber) > 10) goto overflow; + + hexstringtonumber (bsnumber, &x); #endif - hexstringtonumber (bsnumber, &x); } else { #if LONGINT_LONGDATE == 1 // in parsepopnumber() Modified: Frontier/branches/Int64/Common/source/langvalue.c =================================================================== --- Frontier/branches/Int64/Common/source/langvalue.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/langvalue.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -5535,7 +5535,7 @@ return (true); } /*getlongvalue*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // getlonglongintvalue() boolean getlonglongintvalue ( hdltreenode hfirst, @@ -6732,18 +6732,43 @@ (*vreturned).data.chvalue = v1.data.chvalue + v2.data.chvalue; break; - + case intvaluetype: (*vreturned).data.intvalue = v1.data.intvalue + v2.data.intvalue; break; + +#if LONGINT_LONGDATE == 1 // in addvalue() + case longvaluetype: + case ostypevaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue + (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else case longvaluetype: case ostypevaluetype: (*vreturned).data.longvalue = v1.data.longvalue + v2.data.longvalue; break; - +#endif case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue + (short) v2.data.dirvalue); @@ -6899,13 +6924,39 @@ (*vreturned).data.intvalue = v1.data.intvalue - v2.data.intvalue; break; - + +#if LONGINT_LONGDATE == 1 // in subtractvalue() case longvaluetype: case ostypevaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue - (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else + case longvaluetype: + case ostypevaluetype: (*vreturned).data.longvalue = v1.data.longvalue - v2.data.longvalue; break; - + +#endif + case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue - (short) v2.data.dirvalue); @@ -7030,12 +7081,36 @@ (*vreturned).data.intvalue = v1.data.intvalue * v2.data.intvalue; break; - +#if LONGINT_LONGDATE == 1 // in multiplyvalue() case longvaluetype: + { + tylonglongint t1; + + t1 = (tylonglongint)v1.data.longvalue * (tylonglongint)v2.data.longvalue; + + if ( (t1 > LONG_MAX ) + || (t1 < LONG_MIN)) + { + coercetolonglong(vreturned); + + fl = setlonglongintvalue (t1, vreturned); + + } + else + { + (*vreturned).data.longvalue = (long)t1; + } + + break; + } +#else + + case longvaluetype: (*vreturned).data.longvalue = v1.data.longvalue * v2.data.longvalue; break; - +#endif + case directionvaluetype: (*vreturned).data.dirvalue = (tydirection) ((short) v1.data.dirvalue * (short) v2.data.dirvalue); Modified: Frontier/branches/Int64/Common/source/oplist.c =================================================================== --- Frontier/branches/Int64/Common/source/oplist.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/oplist.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -62,12 +62,13 @@ #if OPLANGLISTACCEL == 1 // struct tylistindex typedef struct tylistindex { - hdlheadrecord oplistindex; SInt32 first, current, ctelements, size; +// hdlheadrecord oplistindex[]; + Handle oplistindex; } tylistindex, *tylistindexptr, **tylistindexhdl; #endif @@ -175,7 +176,9 @@ // one quarter reserved for unshift ops plistidx->first = plistidx->current = nsize >> 2; + plistidx->ctelements = 0; + plistidx->size = nsize; return(true); @@ -184,6 +187,8 @@ static SInt32 rel2absIndex(tylistindexptr theIndex, SInt32 n) { + // convert a relative index (list[i]) into an absolute index + // into the cache array return( n + theIndex->first - 1); } @@ -191,6 +196,14 @@ static relativeindextype checkValidityOfRelativeIndex(tylistindexptr theIndex, SInt32 n) { + // analyze n + // returns + // addshift the index is an unshift op + // firstadd the index is the first added to the cache + // addpush the index is a push op + // existing the index is a retrieve/replace/delete op + // outofbounds the index should never be requested + // n is either in or +-1 near the bounds of the list SInt32 shiftsize, pushsize, usedsize, nextidx, absn; @@ -215,6 +228,9 @@ static boolean checklistindexlimits(tylistindexptr theIndex) { + // return true if cache can accept unshift/push ops; grow cache if necessary + // return false if growcache failed + /* check the remaining space in the cache grow it if only to free places on either side @@ -275,11 +291,19 @@ } lockhandle(theIndex->oplistindex); + + // a move of the existing cache entries should be here + + // calc moveright amount & size + + // moveright + + theIndex->size = thesize; calcIndexVars(theIndex, &shiftsize, &pushsize, &usedsize, &nextidx); - // BULLSHIT! + // cattle excrement! // ToDo: shift first off to make room for unshift /* s = *(theIndex->oplistindex) + (theIndex->first * sizeof(void *)); @@ -294,6 +318,13 @@ static boolean getindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + // try to retrieve the handle for list entry n + + // return false on failure + + // return true and handle in h + + hdlheadrecord *dst; SInt32 relIndex = n + theIndex->first - 1; SInt32 shiftsize, pushsize, usedsize, nextidx; @@ -326,9 +357,12 @@ return (true); } + static hdlheadrecord getlastindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + /* this should acompany repeatedbump_down to get the last list item*/ + SInt32 s = theIndex->first, r = n + s - 1, @@ -354,6 +388,8 @@ static boolean setindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { + /* cache the handle h for list entry n */ + hdlheadrecord *dst; SInt32 s = theIndex->first, @@ -472,9 +508,11 @@ h = *hlist; /*copy into register*/ #if OPLANGLISTACCEL == 1 // in opnewlist() + (**h).listindex.oplistindex = nil; if (!initlistindex(&((**h).listindex))) return(false); + #endif if (!newoutlinerecord (&houtline)) { @@ -505,7 +543,7 @@ void opdisposelist (hdllistrecord hlist) { - register hdloutlinerecord ho; + hdloutlinerecord ho; if (hlist == nil) /*defensive driving*/ return; @@ -519,8 +557,10 @@ hcurrentlist = nil; #if OPLANGLISTACCEL == 1 // in opdisposelist() + if (!disposelistindex(&((**hlist).listindex))) ; + #endif disposehandle ((Handle) hlist); } /*opdisposelist*/ @@ -567,10 +607,12 @@ opsetheadstring (hnew, bs); #if OPLANGLISTACCEL == 1 // in oppushhandle() + // set value at index 1 if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) return(false); + #endif } else @@ -591,7 +633,9 @@ // if (!getindexedadr(&((**h).listindex), ctitems, (Handle *)&hlast)) // hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); #else + hlast = oprepeatedbump (down, ctitems - 1, (**ho).hsummit, false); + #endif // setstringlength (bs, 0); @@ -604,17 +648,19 @@ } #if OPLANGLISTACCEL == 1 // in oppushhandle() + // set value at index n if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), ctitems + 1, (Handle *)&hnew)) return(false); + #endif (**ho).ctexpanded++; (**hnew).flexpanded = true; } - #ifdef fldebug +#ifdef fldebug if (fldebugging) { @@ -654,10 +700,10 @@ error. */ - register hdllistrecord h = hlist; - register hdlheadrecord hstart; - register hdloutlinerecord ho; - register long ctitems; + hdllistrecord h = hlist; + hdlheadrecord hstart; + hdloutlinerecord ho; + long ctitems; hdlheadrecord hnew; bigstring bs; @@ -678,14 +724,17 @@ hnew = (**ho).hsummit; /*set this guy's refcon handle*/ opsetheadstring (hnew, bs); + #if OPLANGLISTACCEL == 1 // in opunshifthandle() + // set value at index 1 if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) return(false); + #endif } - - else { + else + { hstart = (**ho).hsummit; if (!opaddheadline (hstart, up, bs, &hnew)) { @@ -696,9 +745,11 @@ } #if OPLANGLISTACCEL == 1 // in opunshifthandle() + // set value at index 1 if (!setindexedadr( &((**h).listindex), 0, (Handle *)&hnew)) return(false); + #endif (**ho).ctexpanded++; @@ -706,7 +757,7 @@ (**hnew).flexpanded = true; } - #ifdef fldebug +#ifdef fldebug if (fldebugging) { @@ -717,7 +768,7 @@ opsetheadstring (hnew, bs); } - #endif +#endif (**hnew).hrefcon = hdata; /*link in the user's data structure*/ @@ -1142,7 +1193,10 @@ disktomemshort (info.recordsize); // load remaining data in record - if (!loadfromhandle (hpacked, &ixload, min (sizeof (info), info.recordsize) - sizeof (info.recordsize), &info.versionnumber)) + if (!loadfromhandle (hpacked, + &ixload, + min (sizeof (info), info.recordsize) - sizeof (info.recordsize), + &info.versionnumber)) goto error; disktomemshort (info.versionnumber); @@ -1153,7 +1207,8 @@ disktomemlong (info.ctoutlinebytes); - if (info.versionnumber == 0x0100) // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short! + // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short! + if (info.versionnumber == 0x0100) info.versionnumber = 0x01; if (info.versionnumber != oplistversionnumber) { /*we only read version 1 format lists*/ @@ -1333,4 +1388,3 @@ return (true); } /*opvisitlist*/ - Modified: Frontier/branches/Int64/Common/source/strings.c =================================================================== --- Frontier/branches/Int64/Common/source/strings.c 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/Common/source/strings.c 2006-06-02 15:59:34 UTC (rev 1396) @@ -1951,7 +1951,71 @@ return (fl); } /*stringtoostype*/ +#if LONGINT_LONGDATE == 1 // hexstringtolonglongint() +boolean hexstringtolonglongint (bigstring bshex, tylonglongint *n) { + + tylonglongint x = 0; + char ch; + long i; + short len; + bigstring bs; + boolean fl = true; + boolean flsignextend = false; + + copystring (bshex, bs); + + stringdeletechars (bs, chspace); + + subtractstrings (bs, bshexprefix, bs); + + + //flsignextend = stringlength (bs) == 4; + len = stringlength (bs); + switch (len) + { + // case 2: // byte + case 4: // word + case 8: // long + flsignextend = true; + break; + } + + popleadingchars (bs, '0'); + + alllower (bs); + + len = min (stringlength (bs), 16); + + for (i = 1; i <= len; ++i) { + + x <<= 4; /*one nibble per character*/ + + ch = getstringcharacter (bs, i - 1); + + if (isxdigit (ch)) + x += hextoint (ch); + + else { + fl = false; + + break; + } + } + + if (flsignextend) { /*need so sign-extend as an integer*/ + + i = x; + + x = i; + } + + *n = x; + + return (fl); +} /*hexstringtolonglongint*/ + +#endif boolean hexstringtonumber (bigstring bshex, long *n) { register long x = 0; Modified: Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj =================================================================== --- Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-01 00:11:10 UTC (rev 1395) +++ Frontier/branches/Int64/build_XCode/FrontierFat_i64.xcodeproj/project.pbxproj 2006-06-02 15:59:34 UTC (rev 1396) @@ -1000,34 +1000,6 @@ DEA58AB407435A9500BAB271 /* Frontier.icns in Resources */ = {isa = PBXBuildFile; fileRef = DEA58AB307435A9500BAB271 /* Frontier.icns */; }; /* End PBXBuildFile section */ -/* Begin PBXBuildStyle section */ - 6515255E072BFC6500411831 /* Development */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - REZ_PREPROCESSOR_DEFINITIONS = ""; - ZERO_LINK = NO; - }; - name = Development; - }; - 6515255F072BFC6500411831 /* Deployment */ = { - isa = PBXBuildStyle; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_OPTIMIZATION_LEVEL = 2; - GCC_PREPROCESSOR_DEFINITIONS = NDEBUG; - ZERO_LINK = NO; - }; - name = Deployment; - }; -/* End PBXBuildStyle section */ - /* Begin PBXFileReference section */ 65059B4E09968C1400410571 /* OPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OPML.app; sourceTree = BUILT_PRODUCTS_DIR; }; 65059B760996945100410571 /* OPML.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = OPML.icns; path = ../resources/OPML/OPML.icns; sourceTree = SOURCE_ROOT; }; @@ -1051,7 +1023,7 @@ 65152578072BFC6700411831 /* filemp3.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filemp3.c; path = ../Common/source/filemp3.c; sourceTree = SOURCE_ROOT; }; 65152579072BFC6700411831 /* fileops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileops.c; path = ../Common/source/fileops.c; sourceTree = SOURCE_ROOT; }; 6515257A072BFC6700411831 /* filepath.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filepath.c; path = ../Common/source/filepath.c; sourceTree = SOURCE_ROOT; }; - 6515257B072BFC6700411831 /* fileverbs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileverbs.c; path = ../Common/source/fileverbs.c; sourceTree = SOURCE_ROOT; }; + 6515257B072BFC6700411831 /* fileverbs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileverbs.c; path = ../Common/source/fileverbs.c; sourceTree = SOURCE_ROOT; wrapsLines = 1; }; 6515257C072BFC6700411831 /* findinfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = findinfile.c; path = ../Common/source/findinfile.c; sourceTree = SOURCE_ROOT; }; 6515257D072BFC6700411831 /* resources.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = resources.c; path = ../Common/source/resources.c; sourceTree = SOURCE_ROOT; }; 6515257F072BFC6700411831 /* iac.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = iac.c; path = ../FrontierSDK/Toolkits/IACTools/Source/iac.c; sourceTree = SOURCE_ROOT; }; @@ -1249,7 +1221,7 @@ 65152655072BFC6800411831 /* opinit.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = opinit.c; path = ../Common/source/opinit.c; sourceTree = SOURCE_ROOT; }; 65152656072BFC6800411831 /* oplangtext.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplangtext.c; path = ../Common/source/oplangtext.c; sourceTree = SOURCE_ROOT; }; 65152657072BFC6800411831 /* oplineheight.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplineheight.c; path = ../Common/source/oplineheight.c; sourceTree = SOURCE_ROOT; }; - 65152658072BFC6800411831 /* oplist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplist.c; path = ../Common/source/oplist.c; sourceTree = SOURCE_ROOT; }; + 65152658072BFC6800411831 /* oplist.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oplist.c; path = ../Common/source/oplist.c; sourceTree = SOURCE_ROOT; wrapsLines = 1; }; 65152659072BFC6800411831 /* opops.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = opops.c; path = ../Common/source/opops.c; sourceTree = SOURCE_ROOT; }; 6515265A072BFC6800411831 /* oppack.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oppack.c; path = ../Common/source/oppack.c; sourceTree = SOURCE_ROOT; }; 6515265B072BFC6800411831 /* oppopup.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = oppopup.c; path = ../Common/source/oppopup.c; sourceTree = SOURCE_ROOT; }; @@ -1605,7 +1577,6 @@ 651525C3072BFC6700411831 /* Paige */, 651525C5072BFC6700411831 /* PCRE */, 651525CB072BFC6700411831 /* pict */, - 651525CE072BFC6700411831 /* rez */, 651525E1072BFC6700411831 /* tool */, 6515260D072BFC6700411831 /* _cancoon */, 65152614072BFC6700411831 /* _clay */, @@ -1618,6 +1589,7 @@ 65152683072BFC6800411831 /* _string */, 65152686072BFC6800411831 /* _table */, 65152696072BFC6800411831 /* _wp */, + 651525CE072BFC6700411831 /* rez */, 65123A7709D9C0C5005AB449 /* Build Scripts */, 651527B7072BFE0E00411831 /* Frameworks */, 65AF8D1A074159FC007C3205 /* Include Files */, @@ -2838,64 +2810,11 @@ ); buildRules = ( ); - buildSettings = { - GCC_ALTIVEC_EXTENSIONS = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_ASM_KEYWORD = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = frontier.xcode.h; - GCC_PREPROCESSOR_DEFINITIONS = ( - "PIKE=1", - "OPMLEDITOR=1", - ); - GCC_REUSE_STRINGS = NO; - GCC_SHORT_ENUMS = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = NO; - GCC_WARN_UNUSED_LABEL = NO; - GCC_WARN_UNUSED_PARAMETER = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - INFOPLIST_FILE = Info_OPML.plist; - LIBRARY_SEARCH_PATHS = "\"tools\""; - OTHER_CFLAGS = ( - "-fno-inline", - "-malign-mac68k", - ); - OTHER_LDFLAGS = ( - "-multiply_defined", - warning, - ); - OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers -d PIKE=1 -d OPMLEDITOR=1"; - PRODUCT_NAME = OPML; - REZ_PREPROCESSOR_DEFINITIONS = ""; - REZ_PREPROCESSOR_UNDEFINITIONS = ""; - REZ_SCRIPT_TYPE = Roman; - REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - "-Wno-long-double", - ); - }; dependencies = ( ); name = OPML; productName = "Frontier OSX MachO Debug"; productReference = 65059B4E09968C1400410571 /* OPML.app */; - productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict/> -</plist> -"; productType = "com.apple.product-type.application"; }; 65152568072BFC6500411831 /* Frontier */ = { @@ -2912,60 +2831,11 @@ ); buildRules = ( ); - buildSettings = { - GCC_ALTIVEC_EXTENSIONS = NO; - GCC_CHAR_IS_UNSIGNED_CHAR = NO; - GCC_C_LANGUAGE_STANDARD = c99; - GCC_ENABLE_ASM_KEYWORD = YES; - GCC_ENABLE_CPP_EXCEPTIONS = NO; - GCC_ENABLE_CPP_RTTI = NO; - GCC_PRECOMPILE_PREFIX_HEADER = YES; - GCC_PREFIX_HEADER = frontier.xcode.h; - GCC_REUSE_STRINGS = NO; - GCC_SHORT_ENUMS = YES; - GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; - GCC_WARN_HIDDEN_VIRTUAL_FUNCTIONS = NO; - GCC_WARN_UNKNOWN_PRAGMAS = YES; - GCC_WARN_UNUSED_FUNCTION = NO; - GCC_WARN_UNUSED_LABEL = NO; - GCC_WARN_UNUSED_PARAMETER = NO; - GCC_WARN_UNUSED_VALUE = NO; - GCC_WARN_UNUSED_VARIABLE = NO; - INFOPLIST_FILE = Info_Frontier.plist; - LIBRARY_SEARCH_PATHS = "\"tools\""; - OTHER_CFLAGS = ( - "-fno-inline", - "-malign-mac68k", - ); - OTHER_LDFLAGS = ( - "-multiply_defined", - warning, - ); - OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers"; - PRODUCT_NAME = Frontier; - REZ_PREPROCESSOR_DEFINITIONS = ""; - REZ_PREPROCESSOR_UNDEFINITIONS = ""; - REZ_SCRIPT_TYPE = Roman; - REZ_SUPPRESS_REDECLARED_RESOURCE_TYPE_WARNINGS = NO; - SECTORDER_FLAGS = ""; - WARNING_CFLAGS = ( - "-Wmost", - "-Wno-four-char-constants", - "-Wno-unknown-pragmas", - "-Wno-long-double", - ); - }; dependencies = ( ); name = Frontier; productName = "Frontier OSX MachO Debug"; productReference = 65CF0C7F099545A4006E3A79 /* Frontier.app */; - productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> -<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\"> -<plist version=\"1.0\"> -<dict/> -</plist> -"; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -2974,12 +2844,6 @@ 65152560072BFC6500411831 /* Project object */ = { isa = PBXProject; buildConfigurationList = 657A823409F18A6100331344 /* Build configuration list for PBXProject "FrontierFat_i64" */; - buildSettings = { - }; - buildStyles = ( - 6515255E072BFC6500411831 /* Development */, - 6515255F072BFC6500411831 /* Deployment */, - ); hasScannedForEncodings = 1; mainGroup = 6515255C072BFC6500411831; productRefGroup = 6515255C072BFC6500411831; @@ -3875,15 +3739,20 @@ 657A823509F18A6100331344 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = "$(NATIVE_ARCH)"; + DEBUG_INFORMATION_FORMAT = dwarf; + GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_GENERATE_TEST_COVERAGE_FILES = YES; GCC_MODEL_TUNING = ""; + GCC_NO_COMMON_BLOCKS = NO; GCC_OPTIMIZATION_LEVEL = 0; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = frontier.xcode.h; GCC_TREAT_NONCONFORMANT_CODE_ERRORS_AS_WARNINGS = NO; + GCC_UNROLL_LOOPS = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES; GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO = YES; GCC_WARN_ABOUT_MISSING_NEWLINE = YES; @@ -3903,6 +3772,7 @@ GCC_WARN_UNUSED_VALUE = YES; GCC_WARN_UNUSED_VARIABLE = YES; MACOSX_DEPLOYMENT_TARGET = 10.4; + PREBINDING = NO; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; @@ -3914,7 +3784,15 @@ ppc, i386, ); + GCC_AUTO_VECTORIZATION = YES; + GCC_DYNAMIC_NO_PIC = YES; + GCC_ENABLE_FIX_AND_CONTINUE = NO; + GCC_OPTIMIZATION_LEVEL = 3; + GCC_STRICT_ALIASING = NO; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; + GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO; + GCC_WARN_ALLOW_INCOMPLETE_PROTOCOL = NO; + MACOSX_DEPLOYMENT_TARGET = 10.4; SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-01 00:11:12
|
Revision: 1395 Author: creecode Date: 2006-05-31 17:11:10 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1395&view=rev Log Message: ----------- minor formatting tweaks Modified Paths: -------------- ODBs/trunk/docServerRoot/docServerData/formats/outline/file/copy.fvc Modified: ODBs/trunk/docServerRoot/docServerData/formats/outline/file/copy.fvc =================================================================== --- ODBs/trunk/docServerRoot/docServerData/formats/outline/file/copy.fvc 2006-06-01 00:10:05 UTC (rev 1394) +++ ODBs/trunk/docServerRoot/docServerData/formats/outline/file/copy.fvc 2006-06-01 00:11:10 UTC (rev 1395) @@ -12,22 +12,14 @@ Examples file.copy ("C:\\Program Files\\Frontier\\cactus.gif", "C:\\Program Files\\Frontier\\Copy of cactus.gif") // true - - file.copy ("C:\\Program Files\\Frontier\\cactus.gif", "D:\\") + file.copy ("C:\\Program Files\\Frontier\\cactus.gif", "D:\\") // The file "cactus.gif" is copied to "D:\\cactus.gif" // true - The file "cactus.gif" is copied to "D:\\cactus.gif" - - file.copy ("System:ResEdit 2.1b3", "XP150:ResEdit") + file.copy ("System:ResEdit 2.1b3", "XP150:ResEdit") // The file "ResEdit 2.1b3" is copied to the volume "XP150" as "ResEdit". // true - The file "ResEdit 2.1b3" is copied to the volume "XP150" as "ResEdit". - - file.copy ("System:ResEdit 2.1b3", "XP150:") + file.copy ("System:ResEdit 2.1b3", "XP150:") // The file "ResEdit 2.1b3" is copied to the volume "XP150" retaining its original name. // true - The file "ResEdit 2.1b3" is copied to the volume "XP150" retaining its original name. - - file.copy ("System:Utilities:", "XP150:Tools:") + file.copy ("System:Utilities:", "XP150:Tools:") // If the folder "Tools" doesn't exist, it is created. The contents of "Utilities" are then copied into "Tools". // true - If the folder "Tools" doesn't exist, it is created. The contents of "Utilities" are then copied into "Tools". Notes No prompt for confirmation will be made if file.copy attempts to overwrite an existing file. If destpath defines a folder and sourcepath points to a file, the file will be copied into the folder. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-06-01 00:10:12
|
Revision: 1394 Author: creecode Date: 2006-05-31 17:10:05 -0700 (Wed, 31 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1394&view=rev Log Message: ----------- tried to make these a bit more descriptive Modified Paths: -------------- ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramMD5.fvc ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramSHA1.fvc Modified: ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramMD5.fvc =================================================================== --- ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramMD5.fvc 2006-05-26 17:26:41 UTC (rev 1393) +++ ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramMD5.fvc 2006-06-01 00:10:05 UTC (rev 1394) @@ -7,8 +7,11 @@ password, a string. challenge, a string. Action + Computes a challenge-response authentication mechanism (CRAM) response using MD5. Returns + A string that can used as a response to a challenge-response protocol. Examples crypt.cramMD5 ("tim", "tanstaaftanstaaf", base64.decode ("PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+")) // "tim b913a602c7eda7a495b4e6e7334d3890" Notes + See < http://en.wikipedia.org/wiki/CRAM-MD5 >. Modified: ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramSHA1.fvc =================================================================== --- ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramSHA1.fvc 2006-05-26 17:26:41 UTC (rev 1393) +++ ODBs/trunk/docServerRoot/docServerData/formats/outline/crypt/cramSHA1.fvc 2006-06-01 00:10:05 UTC (rev 1394) @@ -7,7 +7,9 @@ password, a string. challenge, a string. Action + Computes a challenge-response authentication mechanism (CRAM) response using SHA1. Returns + A string that can used as a response to a challenge-response protocol. Examples crypt.cramSHA1 ("tim", "tanstaaftanstaaf", base64.decode ("PDE4OTYuNjk3MTcwOTUyQHBvc3RvZmZpY2UucmVzdG9uLm1jaS5uZXQ+")) // "tim 8cb10ed0a8b764ab0e05125dd6eaa295f19b5943" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-05-26 17:26:51
|
Revision: 1393 Author: creecode Date: 2006-05-26 10:26:41 -0700 (Fri, 26 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1393&view=rev Log Message: ----------- Create branch for migration of Mac FSSpecs to FSRefs Added Paths: ----------- Frontier/branches/FSRef_Migration/ Copied: Frontier/branches/FSRef_Migration (from rev 1392, Frontier/trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-05-24 18:06:54
|
Revision: 1392 Author: karstenw Date: 2006-05-24 11:06:41 -0700 (Wed, 24 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1392&view=rev Log Message: ----------- Moved #define OPLANGLISTACCEL from frontierdefs.h to oplist.c; the only place that needs modification for the listcache. Comments added for easier navigation. Started work on files for Sint64 sizes. Modified Paths: -------------- Frontier/branches/Int64/Common/headers/file.h Frontier/branches/Int64/Common/headers/frontierdefs.h Frontier/branches/Int64/Common/source/fileops.c Frontier/branches/Int64/Common/source/oplist.c Modified: Frontier/branches/Int64/Common/headers/file.h =================================================================== --- Frontier/branches/Int64/Common/headers/file.h 2006-05-22 17:05:05 UTC (rev 1391) +++ Frontier/branches/Int64/Common/headers/file.h 2006-05-24 18:06:41 UTC (rev 1392) @@ -159,25 +159,53 @@ boolean fltemp; /*Windows "temp" file attribute*/ OSType filecreator, filetype; /*the creator ID and file type*/ - + +#if LONGINT_LONGDATE == 999 // struct tyfileinfo file dates + + tylongdate + timecreated, + timemodified, + timeaccessed; + +#else long timecreated, timemodified, timeaccessed; /*the creation and modification date for the file*/ +#endif long sizedataforkhigh, sizedatafork, sizeresourcefork; /*the size of the file's two forks*/ - + 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*/ - + +#if LONGINT_LONGDATE == 999 // struct tyfileinfo folderitemcount & noOfVolumeFolders + + tylonglongint + ctfiles, + ctfolders; + +#else + unsigned short ctfiles; /*for folders, the number of files in the folder*/ unsigned short ctfolders; /*for volumes, the number of folders on the disk*/ - + +#endif + tyfolderview folderview; /*for folders, view by name, by date, etc.*/ +#if LONGINT_LONGDATE == 999 // struct tyfileinfo volume freeBytes & volume totalBytes + + tylonglongint + ctfreebytes, + cttotalbytes; + +#else + unsigned long ctfreebytes; /*for volumes*/ unsigned long cttotalbytes; /*for volumes*/ - +#endif + unsigned long blocksize; } tyfileinfo; Modified: Frontier/branches/Int64/Common/headers/frontierdefs.h =================================================================== --- Frontier/branches/Int64/Common/headers/frontierdefs.h 2006-05-22 17:05:05 UTC (rev 1391) +++ Frontier/branches/Int64/Common/headers/frontierdefs.h 2006-05-24 18:06:41 UTC (rev 1392) @@ -89,10 +89,6 @@ // kw - 2006-02-13 --- a test for the AE-memory leak #define AEDISPOSAL 1 -// kw - 2006-02-15 --- oplanglist accelerator - set to 1 to turn on -#define OPLANGLISTACCEL 0 - - #ifdef MACVERSION #define macBirdRuntime 1 #undef appRunsCards /*for Applet Toolkit, Iowa Runtime is baked in*/ Modified: Frontier/branches/Int64/Common/source/fileops.c =================================================================== --- Frontier/branches/Int64/Common/source/fileops.c 2006-05-22 17:05:05 UTC (rev 1391) +++ Frontier/branches/Int64/Common/source/fileops.c 2006-05-24 18:06:41 UTC (rev 1392) @@ -260,6 +260,28 @@ } /*getmacfileinfo*/ +#if LONGINT_LONGDATE == 1 // getosxfileinfo() +boolean getosxfileinfo (const tyfilespec *fs, CInfoPBRec *pb) { + + /* + 2.1b2 dmb: new fsspec-based version + */ + + setoserrorparam ((ptrstring) (*fs).name); /*in case error message takes a filename parameter*/ + + clearbytes (pb, sizeof (*pb)); + + (*pb).hFileInfo.ioNamePtr = (StringPtr) (*fs).name; + + (*pb).hFileInfo.ioVRefNum = (*fs).vRefNum; + + (*pb).hFileInfo.ioDirID = (*fs).parID; + + return (!oserror (PBGetCatInfoSync (pb))); +} /*getmacfileinfo*/ +#endif + + static boolean setmacfileinfo (const tyfilespec *fs, CInfoPBRec *pb) { /* Modified: Frontier/branches/Int64/Common/source/oplist.c =================================================================== --- Frontier/branches/Int64/Common/source/oplist.c 2006-05-22 17:05:05 UTC (rev 1391) +++ Frontier/branches/Int64/Common/source/oplist.c 2006-05-24 18:06:41 UTC (rev 1392) @@ -53,13 +53,18 @@ #define oplistversionnumber 1 +// kw - 2006-05-24 --- moved here from frontierdefs.h; +// kw - 2006-02-15 --- oplanglist accelerator - set to 1 to turn on +#define OPLANGLISTACCEL 0 -#if OPLANGLISTACCEL == 1 + + +#if OPLANGLISTACCEL == 1 // struct tylistindex typedef struct tylistindex { hdlheadrecord oplistindex; SInt32 - start, + first, current, ctelements, size; @@ -80,7 +85,7 @@ /*routine that releases one of **your** handles*/ oplistreleaseitemcallback releaseitemcallback; -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in struct tylistrecord tylistindex listindex; #endif @@ -125,7 +130,7 @@ } /%oplistreleaserefcon%/ */ -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // functions // a try at accelerating list access by use of an index. // currently getnthlistitem has time complexity O(n). // I want O(1) @@ -151,10 +156,10 @@ SInt32 *usedsize, SInt32 *nextidx) { - *shiftsize = theIndex->start; + *shiftsize = theIndex->first; *pushsize = theIndex->size - theIndex->current; - *usedsize = theIndex->current - theIndex->start; - *nextidx = theIndex->current - theIndex->start + 1; + *usedsize = theIndex->current - theIndex->first; + *nextidx = theIndex->current - theIndex->first + 1; } static boolean @@ -169,7 +174,7 @@ return (false); // one quarter reserved for unshift ops - plistidx->start = plistidx->current = nsize >> 2; + plistidx->first = plistidx->current = nsize >> 2; plistidx->ctelements = 0; plistidx->size = nsize; @@ -179,7 +184,7 @@ static SInt32 rel2absIndex(tylistindexptr theIndex, SInt32 n) { - return( n + theIndex->start - 1); + return( n + theIndex->first - 1); } @@ -194,9 +199,9 @@ absn = rel2absIndex(theIndex, n); - if (absn == (theIndex->start) && absn == (theIndex->current)) + if (absn == (theIndex->first) && absn == (theIndex->current)) return(firstadd); - else if (absn == (theIndex->start - 1)) + else if (absn == (theIndex->first - 1)) return(addshift); else if(absn == (theIndex->current)) return(addpush); @@ -216,13 +221,13 @@ */ // total push array - long limit = theIndex->size - theIndex->start; + long limit = theIndex->size - theIndex->first; // free handles in pushspace - long remainpush = limit - (theIndex->current - theIndex->start); + long remainpush = limit - (theIndex->current - theIndex->first); // free handles in unshift space - long remainunshift = theIndex->start; + long remainunshift = theIndex->first; SInt32 shiftsize, pushsize, usedsize, nextidx; @@ -251,7 +256,7 @@ UInt32 thesize = (UInt32)(theIndex->size + (theIndex->size >> 2)); SInt32 therate = (SInt32)thesize >> 3; - // ptrs to start & current of used area + // ptrs to first & current of used area // void *s, *e; SInt32 shiftsize, pushsize, usedsize, nextidx; @@ -264,7 +269,7 @@ // disposehandle(theIndex->oplistindex); theIndex->oplistindex = nil; theIndex->size = -1; - theIndex->start = -1; + theIndex->first = -1; theIndex->current = -1; return(false); } @@ -275,12 +280,12 @@ calcIndexVars(theIndex, &shiftsize, &pushsize, &usedsize, &nextidx); // BULLSHIT! - // ToDo: shift start off to make room for unshift + // ToDo: shift first off to make room for unshift /* - s = *(theIndex->oplistindex) + (theIndex->start * sizeof(void *)); - e = *(theIndex->oplistindex) + (theIndex->start * 256 * sizeof(void *)); + s = *(theIndex->oplistindex) + (theIndex->first * sizeof(void *)); + e = *(theIndex->oplistindex) + (theIndex->first * 256 * sizeof(void *)); moveright(s, e, 256 * sizeof(void *)); - theIndex->start += 256; + theIndex->first += 256; theIndex->current += 256; */ return(true); @@ -290,7 +295,7 @@ getindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { hdlheadrecord *dst; - SInt32 relIndex = n + theIndex->start - 1; + SInt32 relIndex = n + theIndex->first - 1; SInt32 shiftsize, pushsize, usedsize, nextidx; calcIndexVars(theIndex, &shiftsize, &pushsize, &usedsize, &nextidx); @@ -325,7 +330,7 @@ getlastindexedadr(tylistindexptr theIndex, long n, hdlheadrecord *h) { SInt32 - s = theIndex->start, + s = theIndex->first, r = n + s - 1, e = theIndex->current - 1, shiftsize, pushsize, usedsize, nextidx; @@ -351,7 +356,7 @@ { hdlheadrecord *dst; SInt32 - s = theIndex->start, + s = theIndex->first, r = n + s - 1, e = theIndex->current, l = theIndex->size; @@ -406,12 +411,12 @@ calcIndexVars(theIndex, &shiftsize, &pushsize, &usedsize, &nextidx); // start address of cache - b = *(theIndex->oplistindex) + (theIndex->start * sizeof(Handle)); + b = *(theIndex->oplistindex) + (theIndex->first * sizeof(Handle)); - // dest of areamove (start + n) + // dest of areamove (first + n) s = b + n * sizeof(Handle); - // start of areamove (start + n + 1) + // start of areamove (first + n + 1) e = b + (n + 1) * sizeof(Handle); // size of area to move (arraysize - 1 - n + 1) @@ -466,7 +471,7 @@ h = *hlist; /*copy into register*/ -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in opnewlist() (**h).listindex.oplistindex = nil; if (!initlistindex(&((**h).listindex))) return(false); @@ -513,7 +518,7 @@ hcurrentlist = nil; -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in opdisposelist() if (!disposelistindex(&((**hlist).listindex))) ; #endif @@ -561,7 +566,7 @@ opsetheadstring (hnew, bs); -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in oppushhandle() // set value at index 1 if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) @@ -571,7 +576,7 @@ else { -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in oppushhandle() // get last index at n // this one is for debugging only @@ -598,7 +603,7 @@ goto error; } -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in oppushhandle() // set value at index n if (!(**h).isrecord) if (!setindexedadr( &((**h).listindex), ctitems + 1, (Handle *)&hnew)) @@ -673,7 +678,7 @@ hnew = (**ho).hsummit; /*set this guy's refcon handle*/ opsetheadstring (hnew, bs); -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in opunshifthandle() // set value at index 1 if (!setindexedadr( &((**h).listindex), 1, (Handle *)&hnew)) return(false); @@ -690,7 +695,7 @@ goto error; } -#if OPLANGLISTACCEL == 1 +#if OPLANGLISTACCEL == 1 // in opunshifthandle() // set value at index 1 if (!setindexedadr( &((**h).listindex), 0, (Handle *)&hnew)) return(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <kar...@us...> - 2006-05-22 17:05:22
|
Revision: 1391 Author: karstenw Date: 2006-05-22 10:05:05 -0700 (Mon, 22 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1391&view=rev Log Message: ----------- added comments for easier navigation. When working on Int64, search for LONGINT_LONGDATE; this gives a list of all involved sections. active section: #if LONGINT_LONGDATE == 1 deactivated section #if LONGINT_LONGDATE == 999 There are currently 3 types of comments accompanying the #if LONGINT_LONGDATE part: full function definitions #if LONGINT_LONGDATE == 1 //longlonginttostring() & stringtolonglongint() function modifications #if LONGINT_LONGDATE == 1 // in lanpipcpushparam() temporary modifications that go away after testing #if LONGINT_LONGDATE == 1 // delete me after debugging Modified Paths: -------------- Frontier/branches/Int64/Common/SystemHeaders/land.h Frontier/branches/Int64/Common/headers/lang.h Frontier/branches/Int64/Common/headers/ops.h Frontier/branches/Int64/Common/headers/stringdefs.h Frontier/branches/Int64/Common/headers/strings.h Frontier/branches/Int64/Common/source/langexternal.c Frontier/branches/Int64/Common/source/langhash.c Frontier/branches/Int64/Common/source/langipc.c Frontier/branches/Int64/Common/source/langmath.c Frontier/branches/Int64/Common/source/langops.c Frontier/branches/Int64/Common/source/langpack.c Frontier/branches/Int64/Common/source/langscan.c Frontier/branches/Int64/Common/source/langvalue.c Frontier/branches/Int64/Common/source/langverbs.c Frontier/branches/Int64/Common/source/ops.c Frontier/branches/Int64/Common/source/strings.c Modified: Frontier/branches/Int64/Common/SystemHeaders/land.h =================================================================== --- Frontier/branches/Int64/Common/SystemHeaders/land.h 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/SystemHeaders/land.h 2006-05-22 17:05:05 UTC (rev 1391) @@ -171,7 +171,7 @@ objectspectype = cObjectSpecifier /*a Mac object specifier, for Frontier, not fully supported in Toolkit*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // type specifiers ,longlonginttype = 'comp', longdatetimetype = 'ldt ' #endif Modified: Frontier/branches/Int64/Common/headers/lang.h =================================================================== --- Frontier/branches/Int64/Common/headers/lang.h 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/headers/lang.h 2006-05-22 17:05:05 UTC (rev 1391) @@ -282,7 +282,7 @@ #endif /*new types must be added at end of list, these get saved on disk*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // tyvaluetype enum // kw - 2006-01-27 --- new types added longlongintvaluetype, @@ -295,7 +295,7 @@ // kw - 2006-01-27 --- new longlong types -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // typedef tylonglongint # if defined (WIN95VERSION) typedef long long int tylonglongint; # endif @@ -358,7 +358,7 @@ #endif dbaddress diskvalue; /*4.0.2b1 dmb*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // tyvaluedata union // shouldn't this better be a Handle? // on third (as first) thought, NO! // Handle longlongintvalue; @@ -1059,11 +1059,11 @@ extern boolean setlongvalue (long, tyvaluerecord *); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // additional functions declarations extern boolean setlonglongintvalue (tylonglongint x, tyvaluerecord *val); -extern boolean setlongdatevalue (Handle x, tyvaluerecord *val); +extern boolean setlongdatevalue (tylonglongint x, tyvaluerecord *val); extern boolean coercetolonglong (tyvaluerecord *v); Modified: Frontier/branches/Int64/Common/headers/ops.h =================================================================== --- Frontier/branches/Int64/Common/headers/ops.h 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/headers/ops.h 2006-05-22 17:05:05 UTC (rev 1391) @@ -70,7 +70,7 @@ extern boolean stringtoshort (bigstring, short *); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // additional functions declarations extern boolean longlonginttostring(tylonglongint theInt, bigstring bs, int radix); extern boolean stringtolonglongint (bigstring bs, tylonglongint *llival); Modified: Frontier/branches/Int64/Common/headers/stringdefs.h =================================================================== --- Frontier/branches/Int64/Common/headers/stringdefs.h 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/headers/stringdefs.h 2006-05-22 17:05:05 UTC (rev 1391) @@ -74,7 +74,7 @@ #define STR_menubar "\x07" "menubar" #define STR_picture BIGSTRING ("\x07" "picture") -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // long type names // kw - 2006-01-30 --- new types added #define STR_longlong BIGSTRING ("\x06" "sint64") #define STR_longdate BIGSTRING ("\x0c" "longdatetime") Modified: Frontier/branches/Int64/Common/headers/strings.h =================================================================== --- Frontier/branches/Int64/Common/headers/strings.h 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/headers/strings.h 2006-05-22 17:05:05 UTC (rev 1391) @@ -246,7 +246,7 @@ extern boolean pullstringsuffix (bigstring, bigstring, unsigned char); /*7.0.2b1 Radio PBS*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // additional functions declarations extern boolean stringreverse (bigstring bs); #endif Modified: Frontier/branches/Int64/Common/source/langexternal.c =================================================================== --- Frontier/branches/Int64/Common/source/langexternal.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langexternal.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -2889,7 +2889,7 @@ // kw - 2006-01-30 --- for new int types - these were added at the end // not sure if these need to be externaltypes -#if 0 //LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 999 // in langexternalgetvaluetype() if ( (type < longlongintvaluetype) && (type >= outlinevaluetype)) { Modified: Frontier/branches/Int64/Common/source/langhash.c =================================================================== --- Frontier/branches/Int64/Common/source/langhash.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langhash.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -2692,7 +2692,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in hashpackvisit() // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: { @@ -3200,7 +3200,7 @@ break; } -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in hashumpacktable() // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: @@ -3680,7 +3680,7 @@ case enumvaluetype: case listvaluetype: case recordvaluetype: -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in hashgetvaluestring() case longlongintvaluetype: #endif @@ -3734,7 +3734,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in hashgetvaluestring() // LONGLONGINTCONSTRUCTIONSITE case longdatetimevaluetype: // just for now to get some display @@ -3819,7 +3819,7 @@ break; -#if xxxLONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 999 // in hashgettypestring() // not needed; langgettypestring does the work // think about making it a number; see above int/long // LONGLONGINTCONSTRUCTIONSITE Modified: Frontier/branches/Int64/Common/source/langipc.c =================================================================== --- Frontier/branches/Int64/Common/source/langipc.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langipc.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -291,7 +291,7 @@ len = sizeof ((*v).data.longvalue); break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in lanpipcpushparam() // LONGLONGINTCONSTRUCTIONSITE // untested // modelled after case binaryvaluetype @@ -583,7 +583,7 @@ case recordvaluetype: #endif -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in langipccoerceparam() // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: case longdatetimevaluetype: @@ -2350,7 +2350,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in getbinarylistdesc() // LONGLONGINTCONSTRUCTIONSITE #endif default: Modified: Frontier/branches/Int64/Common/source/langmath.c =================================================================== --- Frontier/branches/Int64/Common/source/langmath.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langmath.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -96,18 +96,13 @@ case longvaluetype: return setlongvalue (min (v1.data.longvalue, v2.data.longvalue), v); - -#if LONGINT_LONGDATE == 1 + +#if LONGINT_LONGDATE == 1 // min in mathfunctionvalue() // LONGLONGINTCONSTRUCTIONSITE + /* this should work for both types */ case longlongintvaluetype: case longdatetimevaluetype: - break; -# if defined (WIN95VERSION) - -# endif -# if defined (MACVERSION) - -# endif + return setlonglongintvalue (min (**(v1.data.longlongintvalue), **(v2.data.longlongintvalue)), v); #endif case ostypevaluetype: @@ -191,18 +186,14 @@ case longvaluetype: return setlongvalue (max (v1.data.longvalue, v2.data.longvalue), v); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // max in mathfunctionvalue() // LONGLONGINTCONSTRUCTIONSITE + /* this should work for both types */ case longlongintvaluetype: case longdatetimevaluetype: - break; -# if defined (WIN95VERSION) - -# endif -# if defined (MACVERSION) - -# endif + return setlonglongintvalue (max (**(v1.data.longlongintvalue), **(v2.data.longlongintvalue)), v); #endif + case ostypevaluetype: return setostypevalue (max (v1.data.longvalue, v2.data.longvalue), v); Modified: Frontier/branches/Int64/Common/source/langops.c =================================================================== --- Frontier/branches/Int64/Common/source/langops.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langops.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -159,7 +159,7 @@ /* 37 */ {'pict', STR_picture} -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // type str4, string /* 38 */ ,{'comp', STR_longlong }, /* 39 */ {'ldt ', STR_longdate } @@ -232,7 +232,7 @@ register tyvaluetype type; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // delete me after debugging // for debugging & profiling only static UInt64 x = 0; x++; @@ -307,7 +307,7 @@ case aliasvaluetype: case doublevaluetype: case binaryvaluetype: -#if xxxx_LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 999 // in langheaptype() // setting this might be wrong // LONGLONGINTCONSTRUCTIONSITE // UNTESTED @@ -928,7 +928,7 @@ case patternvaluetype: case rgbvaluetype: case objspecvaluetype: -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in langgetvalsize() // should be ok - could be made constant - 8 bytes // UNTESTED // LONGLONGINTCONSTRUCTIONSITE Modified: Frontier/branches/Int64/Common/source/langpack.c =================================================================== --- Frontier/branches/Int64/Common/source/langpack.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langpack.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -250,7 +250,7 @@ case recordvaluetype: #endif -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in langpackvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: Modified: Frontier/branches/Int64/Common/source/langscan.c =================================================================== --- Frontier/branches/Int64/Common/source/langscan.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langscan.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -461,7 +461,7 @@ (*val).data.binaryvalue = fx; } else { -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in parsepopnumber() tylonglongint x; #else long x; @@ -469,8 +469,8 @@ bigstring bstest; if (flhex) { -#if LONGINT_LONGDATE == 1 - // 0x + 16 hex chars +#if LONGINT_LONGDATE == 1 // in parsepopnumber() + // "0x" + 16 hex chars if (stringlength (bsnumber) > 18) goto overflow; #else @@ -480,14 +480,14 @@ hexstringtonumber (bsnumber, &x); } else { -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in parsepopnumber() stringtolonglongint (bsnumber, &x); #else stringtonumber (bsnumber, &x); #endif popleadingchars (bsnumber, '0'); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in parsepopnumber() longlonginttostring (x, bstest, 10); #else numbertostring (x, bstest); @@ -497,29 +497,22 @@ if (!equalstrings (bsnumber, bstest)) goto overflow; - // DELETEME - if (x > 2147483647LL) - { - x = -x; - x = -x; } - } -#if LONGINT_LONGDATE == 1 + +#if LONGINT_LONGDATE == 1 // in parsepopnumber() if ( (x < (tylonglongint)LONG_MAX) && (x > (tylonglongint)LONG_MIN)) { - long lx = (long)x; - setlongvalue (lx, val); - } - else - { + setlongvalue ((long)x, val); + } + else { setlonglongintvalue (x, val); - } + } #else setlongvalue (x, val); #endif } - + #ifdef fldebug copystring (bsnumber, bstoken); /*for debugging*/ Modified: Frontier/branches/Int64/Common/source/langvalue.c =================================================================== --- Frontier/branches/Int64/Common/source/langvalue.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langvalue.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -231,14 +231,14 @@ } /*setlongvalue*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // setlonglongintvalue() & setlongdatevalue() boolean setlonglongintvalue (tylonglongint x, tyvaluerecord *val) { /* modelled after setdoublevalue() set val to be a the long long value x. - turn val into a double value, allocated in the heap. + turn val into a long long int value, allocated in the heap. the handle is recorded in the tmpstack so that it gets deallocated. */ @@ -248,13 +248,18 @@ } /* setlonglongintvalue */ -boolean setlongdatevalue (Handle x, tyvaluerecord *val) { - // set val to be a the long date value x. +boolean setlongdatevalue (tylonglongint x, tyvaluerecord *val) { + /* + modelled after setdoublevalue() - if (x == nil) - newclearhandle(sizeof(tylonglongint), &x); + set val to be a the long date value x. - return(setheapvalue(x, longdatetimevaluetype, val)); + turn val into a long long int value, allocated in the heap. + + the handle is recorded in the tmpstack so that it gets deallocated. + */ + + return(newheapvalue(&x, sizeof(x), longdatetimevaluetype, val)); } /* setlongdatevalue */ #endif @@ -940,7 +945,7 @@ case aliasvaluetype: case doublevaluetype: case binaryvaluetype: -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in copyvaluerecord() // LONGLONGINTCONSTRUCTIONSITE // UNTESTED case longlongintvaluetype: @@ -1047,7 +1052,7 @@ case aliasvaluetype: case doublevaluetype: case binaryvaluetype: -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in disposevaluerecord() // LONGLONGINTCONSTRUCTIONSITE // UNTESTED case longlongintvaluetype: @@ -2025,7 +2030,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in coercetoboolean() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -2107,7 +2112,7 @@ } /*longrangeerror*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // longlongrangeerror() static boolean longlongrangeerror (double f) { bigstring bs; @@ -2211,7 +2216,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in coercetolong() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -2272,7 +2277,7 @@ } /*coercetolong*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // coercetolonglong() & coercetolongdate() boolean coercetolonglong (tyvaluerecord *v) { /* @@ -2472,7 +2477,7 @@ return (false); } /*switch*/ - setdatevalue (x, v); + setlongdatevalue (x, v); return (true); } /* coercetolongdate */ @@ -3521,7 +3526,7 @@ case longvaluetype: { -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // delete me after debugging // debugging and call stats static UInt32 ncalls = 0; ncalls++; @@ -3529,7 +3534,7 @@ numbertostring ((*v).data.longvalue, bs); } break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in coercetostring() case longlongintvaluetype: longlonginttostring(**(*v).data.longlongintvalue, bs, 10); @@ -3869,7 +3874,7 @@ case longvaluetype: return (coercetolong (v)); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in coercevalue() case longlongintvaluetype: return (coercetolonglong(v)); @@ -3996,7 +4001,7 @@ case doublevaluetype: return (7); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in coercionweight() // 2006-05-09 - kw --- this is my first & fast guess where these should sort in // UNTESTED // LONGLONGINTCONSTRUCTIONSITE @@ -5197,7 +5202,7 @@ } /*getlongparam*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // getlonglongintparam() boolean getlonglongintparam( hdltreenode hfirst, @@ -6790,7 +6795,7 @@ break; } -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in addvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -6962,7 +6967,7 @@ case filespecvaluetype: return (filespecsubtractvalue (&v1, &v2, vreturned)); -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in subtractvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7057,7 +7062,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in multiplyvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7135,7 +7140,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in nonzerovalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7221,7 +7226,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in dividevalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7305,7 +7310,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in modvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7441,7 +7446,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in EQvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7547,7 +7552,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in GTValue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7653,7 +7658,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in LTvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: @@ -7861,7 +7866,7 @@ break; -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // in unaryminusvalue() // UNTESTED // LONGLONGINTCONSTRUCTIONSITE case longlongintvaluetype: Modified: Frontier/branches/Int64/Common/source/langverbs.c =================================================================== --- Frontier/branches/Int64/Common/source/langverbs.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/langverbs.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -863,7 +863,7 @@ type = langgetvaluetype (typeid); if ((type >= outlinevaluetype) && (type <= pictvaluetype)) { -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // delete me after debugging // kw - 2006-01-30 debugging aids int x = type; if ((type == 38) || (type == 39)) Modified: Frontier/branches/Int64/Common/source/ops.c =================================================================== --- Frontier/branches/Int64/Common/source/ops.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/ops.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -259,7 +259,7 @@ } /*numbertostring*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 //longlonginttostring() & stringtolonglongint() boolean longlonginttostring( tylonglongint theInt, Modified: Frontier/branches/Int64/Common/source/strings.c =================================================================== --- Frontier/branches/Int64/Common/source/strings.c 2006-05-20 19:08:43 UTC (rev 1390) +++ Frontier/branches/Int64/Common/source/strings.c 2006-05-22 17:05:05 UTC (rev 1391) @@ -2815,7 +2815,7 @@ return (fl); } /*pullsuffix*/ -#if LONGINT_LONGDATE == 1 +#if LONGINT_LONGDATE == 1 // stringreverse() boolean stringreverse (bigstring bs) { // 2006-03-17 - kw --- initial write; needed for longlonginttostring This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <cre...@us...> - 2006-05-20 19:08:47
|
Revision: 1390 Author: creecode Date: 2006-05-20 12:08:43 -0700 (Sat, 20 May 2006) ViewCVS: http://svn.sourceforge.net/frontierkernel/?rev=1390&view=rev Log Message: ----------- new shipdate and initialLastUpdateTime for Frontier Developer Preview 2 Modified Paths: -------------- ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/data/initialLastUpdateTime.fvc ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/shipdate.fvc Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/data/initialLastUpdateTime.fvc =================================================================== --- ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/data/initialLastUpdateTime.fvc 2006-05-20 18:41:12 UTC (rev 1389) +++ ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/data/initialLastUpdateTime.fvc 2006-05-20 19:08:43 UTC (rev 1390) @@ -1,3 +1,3 @@ -FrontierVcsFile:1:TEXT:system.verbs.builtins.Frontier.data.initialLastUpdateTime +FrontierVcsFile:2:TEXT:system.verbs.builtins.Frontier.data.initialLastUpdateTime -Thu, 16 Feb 2006 08:00:00 GMT \ No newline at end of file +Sat, 21 May 2006 07:00:00 GMT \ No newline at end of file Modified: ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/shipdate.fvc =================================================================== --- ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/shipdate.fvc 2006-05-20 18:41:12 UTC (rev 1389) +++ ODBs/trunk/frontierRoot/system/verbs/builtins/Frontier/shipdate.fvc 2006-05-20 19:08:43 UTC (rev 1390) @@ -1,3 +1,3 @@ -FrontierVcsFile:1:date:system.verbs.builtins.Frontier.shipdate +FrontierVcsFile:2:date:system.verbs.builtins.Frontier.shipdate -2/16/06; 12:00:00 AM \ No newline at end of file +5/21/06; 12:00:00 AM \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
1 message has been excluded from this view by a project administrator.
