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: Terry T. <ter...@us...> - 2005-01-24 02:49:04
|
Update of /cvsroot/frontierkernel/Frontier/Common/Paige/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29649/Frontier/Common/Paige/headers Modified Files: pgMemMgr.h Log Message: Correct name of "CPUDefs.h" -> "CPUDEFS.H", "pgSetJmp.h" -> "PGSETJMP.H" so compiles on case-sensitive filesystems work. Index: pgMemMgr.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/pgMemMgr.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pgMemMgr.h 11 Jan 2005 22:47:44 -0000 1.2 --- pgMemMgr.h 24 Jan 2005 02:48:56 -0000 1.3 *************** *** 13,17 **** #define PGMEMMGR_H ! #include "CPUDefs.h" --- 13,17 ---- #define PGMEMMGR_H ! #include "CPUDEFS.H" *************** *** 22,26 **** #include "pgMTraps.h" ! #include "pgSetJmp.h" #ifdef PG_DEBUG --- 22,26 ---- #include "pgMTraps.h" ! #include "PGSETJMP.H" #ifdef PG_DEBUG |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:46:38
|
Update of /cvsroot/frontierkernel/Frontier/Common/Paige/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29056/Frontier/Common/Paige/headers Modified Files: PGERRORS.H Log Message: Correct name of "CPUDefs.h" -> "CPUDEFS.H" so compiles on case-sensitive filesystems work. Index: PGERRORS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGERRORS.H,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** PGERRORS.H 11 Jan 2005 22:47:44 -0000 1.4 --- PGERRORS.H 24 Jan 2005 02:46:29 -0000 1.5 *************** *** 15,19 **** #define PGERRORS_H ! #include "CPUDefs.h" #ifndef NO_ERROR --- 15,19 ---- #define PGERRORS_H ! #include "CPUDEFS.H" #ifndef NO_ERROR |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:43:50
|
Update of /cvsroot/frontierkernel/Frontier/Common/Paige/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28508/Frontier/Common/Paige/headers Modified Files: PGDEFTBL.H Log Message: Correct name of "CPUDefs.h" -> "CPUDEFS.H", "pgtxr.h" -> "pgTxr.h" so compiles on case-sensitive filesystems work. Index: PGDEFTBL.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGDEFTBL.H,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PGDEFTBL.H 11 Jan 2005 22:47:44 -0000 1.2 --- PGDEFTBL.H 24 Jan 2005 02:43:41 -0000 1.3 *************** *** 9,13 **** #include "CPUDEFS.H" ! #include "pgtxr.h" #ifdef __cplusplus --- 9,13 ---- #include "CPUDEFS.H" ! #include "pgTxr.h" #ifdef __cplusplus |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:40:27
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27737/Frontier/Common/source Modified Files: font.c Log Message: Correct name of "Paige.h" -> "PAIGE.H", "pgdeftbl.h" -> "PGDEFTBL.H" so compiles on case-sensitive filesystems work. Index: font.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/font.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** font.c 11 Jan 2005 22:48:05 -0000 1.4 --- font.c 24 Jan 2005 02:40:18 -0000 1.5 *************** *** 29,34 **** #include "standard.h" ! #include "Paige.h" ! #include "pgdeftbl.h" #include "strings.h" --- 29,34 ---- #include "standard.h" ! #include "PAIGE.H" ! #include "PGDEFTBL.H" #include "strings.h" |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:22:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23331/Frontier/Common/source Modified Files: base64.c Log Message: Correct name of "base64.h" -> "BASE64.H" so compiles on case-sensitive filesystems work. Index: base64.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/base64.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** base64.c 11 Jan 2005 22:48:04 -0000 1.3 --- base64.c 24 Jan 2005 02:22:13 -0000 1.4 *************** *** 31,35 **** #include "memory.h" #include "lang.h" ! #include "base64.h" --- 31,35 ---- #include "memory.h" #include "lang.h" ! #include "BASE64.H" |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:17:32
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22235/Frontier/Common/source Modified Files: OpenTransportNetEvents.c Log Message: Correct name of "winsocknetevents.h" -> "WinSockNetEvents.h" so compiles on case-sensitive filesystems work. Index: OpenTransportNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** OpenTransportNetEvents.c 11 Jan 2005 22:48:04 -0000 1.7 --- OpenTransportNetEvents.c 24 Jan 2005 02:17:23 -0000 1.8 *************** *** 292,296 **** #include "shellhooks.h" #include "timedate.h" ! #include "winsocknetevents.h" #include "frontierdebug.h" #include "file.h" --- 292,296 ---- #include "shellhooks.h" #include "timedate.h" ! #include "WinSockNetEvents.h" #include "frontierdebug.h" #include "file.h" |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:12:09
|
Update of /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20940/Frontier/Common/IowaRuntime/Source Modified Files: iowaruntime.c Log Message: Correct name of "SetupA5.h" -> "SetUpA5.h" so compiles on case-sensitive filesystems work. Index: iowaruntime.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IowaRuntime/Source/iowaruntime.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** iowaruntime.c 11 Jan 2005 22:47:40 -0000 1.4 --- iowaruntime.c 24 Jan 2005 02:11:50 -0000 1.5 *************** *** 32,36 **** #include <appletdefs.h> #include <iac.h> ! #include <SetupA5.h> #include <appletquickdraw.h> #include <appletmouse.h> --- 32,36 ---- #include <appletdefs.h> #include <iac.h> ! #include <SetUpA5.h> #include <appletquickdraw.h> #include <appletmouse.h> |
|
From: Terry T. <ter...@us...> - 2005-01-24 02:10:16
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20428/Frontier/Common/source Modified Files: langscan.c Log Message: Fix minor syntax error. Index: langscan.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langscan.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** langscan.c 22 Jan 2005 18:35:56 -0000 1.5 --- langscan.c 24 Jan 2005 02:10:01 -0000 1.6 *************** *** 1161,1168 **** if ((token2 == '}') || (ctscanlines > line2)) { /*we got a return, go ahead & strip it*/ if (token2 == '}') /* 2005-01-15 creedon - fix suggested by JES w/caveats < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */ ix1 = ix2 - 1; ! short len = ix2 - ix1; pullfromhandle (htext, ix1, len, nil); /*get rid of the token source*/ --- 1161,1170 ---- if ((token2 == '}') || (ctscanlines > line2)) { /*we got a return, go ahead & strip it*/ + short len; + if (token2 == '}') /* 2005-01-15 creedon - fix suggested by JES w/caveats < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */ ix1 = ix2 - 1; ! len = ix2 - ix1; pullfromhandle (htext, ix1, len, nil); /*get rid of the token source*/ |
|
From: creedon <icr...@us...> - 2005-01-22 18:36:05
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2875 Modified Files: langscan.c oppack.c Log Message: partial fix for string to script/outline bug < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > Index: langscan.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langscan.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** langscan.c 11 Jan 2005 22:48:07 -0000 1.4 --- langscan.c 22 Jan 2005 18:35:56 -0000 1.5 *************** *** 1161,1164 **** --- 1161,1167 ---- if ((token2 == '}') || (ctscanlines > line2)) { /*we got a return, go ahead & strip it*/ + if (token2 == '}') /* 2005-01-15 creedon - fix suggested by JES w/caveats < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */ + ix1 = ix2 - 1; + short len = ix2 - ix1; Index: oppack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppack.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** oppack.c 11 Jan 2005 22:48:09 -0000 1.4 --- oppack.c 22 Jan 2005 18:35:56 -0000 1.5 *************** *** 1225,1230 **** } ! if (gethandlesize (hlinetext) == 0) // 5.0a4 dmb: empty lines don't dictate structure ! level = lastlevel; if (level > lastlevel) { --- 1225,1231 ---- } ! /* 2005-01-21 creedon, aradke, JES - empty lines DO dictate structure < http://sourceforge.net/tracker/index.php?func=detail&aid=1093595&group_id=120666&atid=687798 > */ ! /* if (gethandlesize (hlinetext) == 0) // 5.0a4 dmb: empty lines don't dictate structure ! level = lastlevel; */ if (level > lastlevel) { |
|
From: David B. <dav...@us...> - 2005-01-21 07:23:17
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv581 Modified Files: Tag: sidewinder-branch langpython.c Log Message: fixed serious bug in handling InternalValue and ExternalValue objects. The problem was this -- I was not using copyvaluerecord, I was just assigning from one value record to another. Frontier was reclaiming them and using them for other values without me knowing, and I was causing random parts of the Frontier database to be modified. After restoring my root file, I was able to locate and fix this particularly scary bug. Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.37 retrieving revision 1.2.4.38 diff -C2 -d -r1.2.4.37 -r1.2.4.38 *** langpython.c 19 Jan 2005 07:59:46 -0000 1.2.4.37 --- langpython.c 21 Jan 2005 07:23:07 -0000 1.2.4.38 *************** *** 208,211 **** --- 208,212 ---- PyObject * (*ptr_PyErr_Occurred) (void); void (*ptr_PyErr_Print) (void); + void (*ptr_PyErr_Fetch) (PyObject **, PyObject **, PyObject **); void (*ptr_PyErr_SetString) (PyObject *, const char *); void (*ptr_PyErr_SetInterrupt) (void); *************** *** 324,327 **** --- 325,329 ---- #define PyErr_Occurred (*py.ptr_PyErr_Occurred) #define PyErr_Print (*py.ptr_PyErr_Print) + #define PyErr_Fetch (*py.ptr_PyErr_Fetch) #define PyErr_SetString (*py.ptr_PyErr_SetString) #define PyErr_SetInterrupt (*py.ptr_PyErr_SetInterrupt) *************** *** 477,480 **** --- 479,483 ---- fl = fl && IMPORTSYMBOL (hm, PyErr_Occurred); fl = fl && IMPORTSYMBOL (hm, PyErr_Print); + fl = fl && IMPORTSYMBOL (hm, PyErr_Fetch); fl = fl && IMPORTSYMBOL (hm, PyErr_SetString); fl = fl && IMPORTSYMBOL (hm, PyErr_SetInterrupt); *************** *** 1968,1972 **** class = PyObject_GetAttrString(frontierModule, "Script"); obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class); ! obj->value = *tvr; obj->parent = parent; copystring(loc, obj->name); --- 1971,1978 ---- class = PyObject_GetAttrString(frontierModule, "Script"); obj = PyObject_New(frontier_ScriptObject, (PyTypeObject *)class); ! ! copyvaluerecord(*tvr, &(obj->value)); ! exemptfromtmpstack(&(obj->value)); ! obj->parent = parent; copystring(loc, obj->name); *************** *** 1982,1987 **** class = PyObject_GetAttrString(frontierModule, "InternalValue"); obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class); obj->vartype = vt; - obj->value = *tvr; return (PyObject *)obj; --- 1988,1996 ---- class = PyObject_GetAttrString(frontierModule, "InternalValue"); obj = PyObject_New(frontier_InternalValue, (PyTypeObject *)class); + + copyvaluerecord(*tvr, &(obj->value)); + exemptfromtmpstack(&(obj->value)); + obj->vartype = vt; return (PyObject *)obj; *************** *** 1995,2000 **** class = PyObject_GetAttrString(frontierModule, "ExternalValue"); obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class); obj->extvartype = ei; - obj->value = *tvr; return (PyObject *)obj; --- 2004,2012 ---- class = PyObject_GetAttrString(frontierModule, "ExternalValue"); obj = PyObject_New(frontier_ExternalValue, (PyTypeObject *)class); + + copyvaluerecord(*tvr, &(obj->value)); + exemptfromtmpstack(&(obj->value)); + obj->extvartype = ei; return (PyObject *)obj; *************** *** 2211,2214 **** --- 2223,2252 ---- char *defArgv[] = {""}; + static void handlePythonError() { + bigstring errtyp; + bigstring errtxt; + bigstring errmsg; + PyObject *ptype; + PyObject *pvalue; + PyObject *ptraceback; + + PyErr_Fetch(&ptype, &pvalue, &ptraceback); + + copyctopstring("", errmsg); + copyctopstring(PyString_AsString(PyObject_Str(ptype)), errtyp); + copyctopstring(PyString_AsString(PyObject_Str(pvalue)), errtxt); + pushstring(errtyp, errmsg); + pushstring("\p: ", errmsg); + pushstring(errtxt, errmsg); + + Py_DECREF(ptype); + Py_DECREF(pvalue); + Py_DECREF(ptraceback); + + langerrormessage(errmsg); + + PyErr_Clear(); + } + boolean callpythonscript(tyvaluerecord code, hdltreenode hparam1, bigstring bsname, tyvaluerecord *vreturned, boolean runbutton) { PyObject *globals; *************** *** 2255,2260 **** // handle errors if (PyErr_Occurred()) { ! PyErr_Print(); ! PyErr_Clear(); releasepythonlock(); return false; --- 2293,2297 ---- // handle errors if (PyErr_Occurred()) { ! handlePythonError(); releasepythonlock(); return false; *************** *** 2288,2293 **** // handle errors if (PyErr_Occurred()) { ! PyErr_Print(); ! PyErr_Clear(); releasepythonlock(); return false; --- 2325,2329 ---- // handle errors if (PyErr_Occurred()) { ! handlePythonError(); releasepythonlock(); return false; |
|
From: David B. <dav...@us...> - 2005-01-19 07:59:57
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13437 Modified Files: Tag: sidewinder-branch oplangtext.c langpython.c Log Message: fixing python rendering (will require an update to the root file as well) Index: oplangtext.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplangtext.c,v retrieving revision 1.3.4.4 retrieving revision 1.3.4.5 diff -C2 -d -r1.3.4.4 -r1.3.4.5 *** oplangtext.c 17 Jan 2005 01:19:30 -0000 1.3.4.4 --- oplangtext.c 19 Jan 2005 07:59:46 -0000 1.3.4.5 *************** *** 291,295 **** } ! flfirstlangtextline = false; if (!writehandlestreamhandle (langtext, bshead)) --- 291,295 ---- } ! flfirstlangtextline = false; if (!writehandlestreamhandle (langtext, bshead)) Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.36 retrieving revision 1.2.4.37 diff -C2 -d -r1.2.4.36 -r1.2.4.37 *** langpython.c 17 Jan 2005 01:19:28 -0000 1.2.4.36 --- langpython.c 19 Jan 2005 07:59:46 -0000 1.2.4.37 *************** *** 2318,2323 **** boolean pushed = false; - disablelangerror (); - fl = langfastaddresstotable (roottable, PYTHONBUILTINS, &table) && langexternalgetquotedpath (table, RENDERPYTHON, funcname); --- 2318,2321 ---- *************** *** 2325,2329 **** if (!fl) { - enablelangerror (); return false; } --- 2323,2326 ---- *************** *** 2331,2335 **** setnilvalue(&val); if (!coercevalue(&val, listvaluetype)) { - enablelangerror (); return false; } --- 2328,2331 ---- *************** *** 2342,2346 **** if (!langrunscript(funcname, &val, roottable, &retval)) { if (pushed) oppopoutline(); - enablelangerror (); return false; } --- 2338,2341 ---- |
|
From: David B. <dav...@us...> - 2005-01-19 07:59:08
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13271 Modified Files: Tag: sidewinder-branch FastTimes.c Log Message: catching up with HEAD Index: FastTimes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/FastTimes.c,v retrieving revision 1.5.4.1 retrieving revision 1.5.4.2 diff -C2 -d -r1.5.4.1 -r1.5.4.2 *** FastTimes.c 17 Jan 2005 01:19:21 -0000 1.5.4.1 --- FastTimes.c 19 Jan 2005 07:58:56 -0000 1.5.4.2 *************** *** 1,3 **** - /* $Id$ */ --- 1,2 ---- *************** *** 92,97 **** static double gScaleMSec = 1.0 / 1000000.0; /* 1 / ( nsec / msec) */ ! static __asm__ UnsignedWide PollRTC(void); ! static __asm__ UnsignedWide PollTBR(void); static Ptr FindFunctionInSharedLib(StringPtr libName, StringPtr funcName); --- 91,101 ---- static double gScaleMSec = 1.0 / 1000000.0; /* 1 / ( nsec / msec) */ ! #if (! TARGET_API_MAC_CARBON) ! ! static __asm__ UnsignedWide PollRTC(void); ! static __asm__ UnsignedWide PollTBR(void); ! ! #endif ! static Ptr FindFunctionInSharedLib(StringPtr libName, StringPtr funcName); *************** *** 176,183 **** for(tick = TickCount() + 1; tick > TickCount(); ) ; #else for(tick = MyLMGetTicks() + 1; tick > MyLMGetTicks(); ) ; - #endif /* TARGET_API_MAC_CARBON */ /* Poll the selected timer and prepare it (since we have time) */ --- 180,198 ---- for(tick = TickCount() + 1; tick > TickCount(); ) ; + + /* Poll the selected timer and prepare it (since we have time) */ + wide = (*gA2NS)((*gUpTime)()); + usec1 = WideTo64bit(wide); + + /* Wait for the exact 60th tick to roll over */ + while(tick + 60 > TickCount()) + ; + + /* Poll the selected timer again and prepare it */ + wide = (*gA2NS)((*gUpTime)()); + usec2 = WideTo64bit(wide); #else for(tick = MyLMGetTicks() + 1; tick > MyLMGetTicks(); ) ; /* Poll the selected timer and prepare it (since we have time) */ *************** *** 187,197 **** /* Wait for the exact 60th tick to roll over */ - #if TARGET_API_MAC_CARBON - while(tick + 60 > TickCount()) - ; - #else while(tick + 60 > MyLMGetTicks()) ; - #endif /* TARGET_API_MAC_CARBON */ /* Poll the selected timer again and prepare it */ --- 202,207 ---- *************** *** 199,203 **** ((gUseRTC) ? PollRTC() : PollTBR()); usec2 = (gUseRTC) ? RTCToNano(wide) : WideTo64bit(wide); ! /* Calculate a scale value that will give microseconds per second. Remember, there are actually 60.15 ticks in a second, not 60. */ --- 209,214 ---- ((gUseRTC) ? PollRTC() : PollTBR()); usec2 = (gUseRTC) ? RTCToNano(wide) : WideTo64bit(wide); ! #endif /* TARGET_API_MAC_CARBON */ ! /* Calculate a scale value that will give microseconds per second. Remember, there are actually 60.15 ticks in a second, not 60. */ *************** *** 234,237 **** --- 245,251 ---- usec = (double) WideTo64bit(wide) * gScaleUSec + 0.5; } + + #if (! TARGET_API_MAC_CARBON) + else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 244,247 **** --- 258,264 ---- usec = (double) RTCToNano(wide) * gScaleUSec + 0.5; } + + #endif /* TARGET_API_MAC_CARBON */ + else #endif /* TARGET_CPU_PPC */ *************** *** 276,279 **** --- 293,299 ---- msec = (double) WideTo64bit(wide) * gScaleMSec + 0.5; } + + #if (! TARGET_API_MAC_CARBON) + else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 286,289 **** --- 306,312 ---- msec = (double) RTCToNano(wide) * gScaleMSec + 0.5; } + + #endif /* ! TARGET_API_MAC_CARBON */ + else #endif /* TARGET_CPU_PPC */ *************** *** 315,318 **** --- 338,343 ---- method = "\pUpTime()"; } + + #if (! TARGET_API_MAC_CARBON) else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 323,326 **** --- 348,353 ---- method = "\pPowerPC RTC"; } + #endif + else #endif /* TARGET_CPU_PPC */ *************** *** 338,341 **** --- 365,370 ---- #if TARGET_CPU_PPC + #if (! TARGET_API_MAC_CARBON) + __asm__ static UnsignedWide PollRTC_() { entry PollRTC /* Avoid CodeWarrior glue */ *************** *** 368,371 **** --- 397,402 ---- blr } + + #endif /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ |
|
From: Seth D. <set...@us...> - 2005-01-18 05:39:24
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29964 Modified Files: FastTimes.c Log Message: I *think* the problem with compiling FastTimes under Xcode 1.2 is fixed. All references to the asm code are ifdefed out for carbon builds. Have fun reviewing this, Andre! Index: FastTimes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/FastTimes.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FastTimes.c 15 Jan 2005 16:47:03 -0000 1.5 --- FastTimes.c 18 Jan 2005 05:39:13 -0000 1.6 *************** *** 1,3 **** - /* $Id$ */ --- 1,2 ---- *************** *** 92,97 **** static double gScaleMSec = 1.0 / 1000000.0; /* 1 / ( nsec / msec) */ ! static __asm__ UnsignedWide PollRTC(void); ! static __asm__ UnsignedWide PollTBR(void); static Ptr FindFunctionInSharedLib(StringPtr libName, StringPtr funcName); --- 91,101 ---- static double gScaleMSec = 1.0 / 1000000.0; /* 1 / ( nsec / msec) */ ! #if (! TARGET_API_MAC_CARBON) ! ! static __asm__ UnsignedWide PollRTC(void); ! static __asm__ UnsignedWide PollTBR(void); ! ! #endif ! static Ptr FindFunctionInSharedLib(StringPtr libName, StringPtr funcName); *************** *** 176,183 **** for(tick = TickCount() + 1; tick > TickCount(); ) ; #else for(tick = MyLMGetTicks() + 1; tick > MyLMGetTicks(); ) ; - #endif /* TARGET_API_MAC_CARBON */ /* Poll the selected timer and prepare it (since we have time) */ --- 180,198 ---- for(tick = TickCount() + 1; tick > TickCount(); ) ; + + /* Poll the selected timer and prepare it (since we have time) */ + wide = (*gA2NS)((*gUpTime)()); + usec1 = WideTo64bit(wide); + + /* Wait for the exact 60th tick to roll over */ + while(tick + 60 > TickCount()) + ; + + /* Poll the selected timer again and prepare it */ + wide = (*gA2NS)((*gUpTime)()); + usec2 = WideTo64bit(wide); #else for(tick = MyLMGetTicks() + 1; tick > MyLMGetTicks(); ) ; /* Poll the selected timer and prepare it (since we have time) */ *************** *** 187,197 **** /* Wait for the exact 60th tick to roll over */ - #if TARGET_API_MAC_CARBON - while(tick + 60 > TickCount()) - ; - #else while(tick + 60 > MyLMGetTicks()) ; - #endif /* TARGET_API_MAC_CARBON */ /* Poll the selected timer again and prepare it */ --- 202,207 ---- *************** *** 199,203 **** ((gUseRTC) ? PollRTC() : PollTBR()); usec2 = (gUseRTC) ? RTCToNano(wide) : WideTo64bit(wide); ! /* Calculate a scale value that will give microseconds per second. Remember, there are actually 60.15 ticks in a second, not 60. */ --- 209,214 ---- ((gUseRTC) ? PollRTC() : PollTBR()); usec2 = (gUseRTC) ? RTCToNano(wide) : WideTo64bit(wide); ! #endif /* TARGET_API_MAC_CARBON */ ! /* Calculate a scale value that will give microseconds per second. Remember, there are actually 60.15 ticks in a second, not 60. */ *************** *** 234,237 **** --- 245,251 ---- usec = (double) WideTo64bit(wide) * gScaleUSec + 0.5; } + + #if (! TARGET_API_MAC_CARBON) + else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 244,247 **** --- 258,264 ---- usec = (double) RTCToNano(wide) * gScaleUSec + 0.5; } + + #endif /* TARGET_API_MAC_CARBON */ + else #endif /* TARGET_CPU_PPC */ *************** *** 276,279 **** --- 293,299 ---- msec = (double) WideTo64bit(wide) * gScaleMSec + 0.5; } + + #if (! TARGET_API_MAC_CARBON) + else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 286,289 **** --- 306,312 ---- msec = (double) RTCToNano(wide) * gScaleMSec + 0.5; } + + #endif /* ! TARGET_API_MAC_CARBON */ + else #endif /* TARGET_CPU_PPC */ *************** *** 315,318 **** --- 338,343 ---- method = "\pUpTime()"; } + + #if (! TARGET_API_MAC_CARBON) else if (gUseTBR) { /* On a recent PowerPC, we poll the TBR directly */ *************** *** 323,326 **** --- 348,353 ---- method = "\pPowerPC RTC"; } + #endif + else #endif /* TARGET_CPU_PPC */ *************** *** 338,341 **** --- 365,370 ---- #if TARGET_CPU_PPC + #if (! TARGET_API_MAC_CARBON) + __asm__ static UnsignedWide PollRTC_() { entry PollRTC /* Avoid CodeWarrior glue */ *************** *** 368,371 **** --- 397,402 ---- blr } + + #endif /* **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** */ |
|
From: Terry T. <ter...@us...> - 2005-01-17 03:31:01
|
Update of /cvsroot/frontierkernel/Frontier/build_GNU In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9307/Frontier/build_GNU Modified Files: Makefile Log Message: Add support for Seth's recent additions : * string.patternMatch() * clock.milliseconds() * the script profiler * math verbs Index: Makefile =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_GNU/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile 3 Jan 2005 00:41:32 -0000 1.1 --- Makefile 17 Jan 2005 03:30:51 -0000 1.2 *************** *** 398,402 **** $(SRCDIR)/Common/Paige/headers/pgMTraps.h \ $(SRCDIR)/Common/Paige/headers/PGERRORS.h \ ! $(SRCDIR)/Common/headers/frontierdefs.h #================================================================================================ --- 398,404 ---- $(SRCDIR)/Common/Paige/headers/pgMTraps.h \ $(SRCDIR)/Common/Paige/headers/PGERRORS.h \ ! $(SRCDIR)/Common/headers/frontierdefs.h \ ! $(SRCDIR)/Common/headers/langmath.h \ ! $(SRCDIR)/Common/headers/FastTimes.h #================================================================================================ *************** *** 620,623 **** --- 622,626 ---- $(SRCDIR)/Common/source/bitmaps.c \ $(SRCDIR)/Common/source/dialogs.c \ + $(SRCDIR)/Common/source/FastTimes.c \ $(SRCDIR)/Common/source/mac.c \ $(SRCDIR)/Common/source/player.c \ *************** *** 630,633 **** --- 633,637 ---- $(OBJDIR)/Common/source/bitmaps.o \ $(OBJDIR)/Common/source/dialogs.o \ + $(OBJDIR)/Common/source/FastTimes.o \ $(OBJDIR)/Common/source/mac.o \ $(OBJDIR)/Common/source/player.o \ *************** *** 802,805 **** --- 806,810 ---- $(SRCDIR)/Common/source/langhtml.c \ $(SRCDIR)/Common/source/langlist.c \ + $(SRCDIR)/Common/source/langmath.c \ $(SRCDIR)/Common/source/langops.c \ $(SRCDIR)/Common/source/langpack.c \ *************** *** 830,833 **** --- 835,839 ---- $(OBJDIR)/Common/source/langhtml.o \ $(OBJDIR)/Common/source/langlist.o \ + $(OBJDIR)/Common/source/langmath.o \ $(OBJDIR)/Common/source/langops.o \ $(OBJDIR)/Common/source/langpack.o \ |
|
From: David B. <dav...@us...> - 2005-01-17 02:23:54
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30171 Modified Files: Tag: sidewinder-branch shell.c timedate.c Log Message: minor touchups Index: timedate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/timedate.c,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** timedate.c 17 Jan 2005 01:19:48 -0000 1.3.4.1 --- timedate.c 17 Jan 2005 02:23:44 -0000 1.3.4.2 *************** *** 122,125 **** --- 122,127 ---- static tyinternationalinfo globalII; static tyinternationalinfoptr globalIIptr = NULL; + + static LONGLONG gPerformanceFreq = 0; /* for getmilliseconds() */ #endif *************** *** 1554,1567 **** extern long getmilliseconds(void) { ! LARGE_INTEGER counter, freq; ! LONGLONG freqLong; QueryPerformanceCounter (&counter); /* counter hits since boot-up */ ! QueryPerformanceFrequency (&freq); /* frequency of coutner hits (per second) */ ! ! freqLong = ( freq.LowPart | ( freq.HighPart << 32 ) ) / 1000; /* per millisecond */ ! return ((long) ((counter.LowPart | (counter.HighPart << 32)) / freqLong)); } /* getmilliseconds */ --- 1556,1570 ---- extern long getmilliseconds(void) { ! LARGE_INTEGER counter; QueryPerformanceCounter (&counter); /* counter hits since boot-up */ ! if (gPerformanceFreq == 0) { ! LARGE_INTEGER freq; ! QueryPerformanceFrequency (&freq); /* frequency of coutner hits (per second) */ ! gPerformanceFreq = freq.QuadPart / 1000; ! } ! return ((long) (counter.QuadPart / gPerformanceFreq)); } /* getmilliseconds */ Index: shell.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v retrieving revision 1.4.4.3 retrieving revision 1.4.4.4 diff -C2 -d -r1.4.4.3 -r1.4.4.4 *** shell.c 17 Jan 2005 01:19:32 -0000 1.4.4.3 --- shell.c 17 Jan 2005 02:23:44 -0000 1.4.4.4 *************** *** 1338,1345 **** dllinitverbs (); /*2004-11-29 aradke: langdll.c*/ - mathinitverbs (); /*2004-12-30 smd: langmath.c*/ - - dllinitverbs (); /*2004-11-29 aradke: langdll.c*/ - if (keyboardescape ()) /*check again before landinit; after this, must do shellquit*/ exittooperatingsystem (); --- 1338,1341 ---- |
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/source Modified Files: Tag: sidewinder-branch CallMachOFrameWork.c FrontierMacMain.c FrontierWinMain.c OSXSpecifics.c OpenTransportNetEvents.c WinSockNetEvents.c about.c aeutils.c appletglue.c assert.c base64.c bitmaps.c browserverbs.c cancoon.c cancoonpopup.c cancoonverbs.c cancoonwindow.c claybrowserexpand.c claybrowserstruc.c claybrowservalidate.c claycallbacks.c claylinelayout.c command.c config.c cursor.c db.c dbstats.c dbverbs.c dialogs.c dockmenu.c error.c file.c filealias.c filedialog.c filelaunch.c fileloop.c filemp3.c fileops.c filepath.c fileverbs.c findinfile.c font.c frontierconfig.c frontierdebug.c frontierstart.c frontierwindows.c htmlcontrol.c icon.c iso8859.c kb.c lang.c langcallbacks.c langcard.c langdate.c langdialog.c langdll.c langerror.c langerrorwindow.c langevaluate.c langexternal.c langhash.c langhtml.c langipc.c langipcmenus.c langlist.c langmodeless.c langops.c langpack.c langparser.c langparser.y langpython.c langquicktime.c langregexp.c langscan.c langstartup.c langsystem7.c langsystypes.c langtmpstack.c langtrace.c langtree.c langvalue.c langverbs.c langwinipc.c langxcmd.c langxml.c launch.c mac.c main.c md5.c memory.c memory.track.c menu.c menubar.c menueditor.c menufind.c menupack.c menuresize.c menuverbs.c meprograms.c miniwindow.c mouse.c notify.c odbengine.c op.c opbuttons.c opdisplay.c opdraggingmove.c opedit.c opexpand.c ophoist.c opicons.c opinit.c oplangtext.c oplineheight.c oplist.c opops.c oppack.c oppopup.c opprint.c oprefcon.c ops.c opscreenmap.c opscrollbar.c opstructure.c opvalidate.c opverbs.c opvisit.c opwinpad.c opxml.c osacomponent.c osadroplet.c osamenus.c osaparseaete.c osawindows.c outlineland.c pict.c pictverbs.c player.c popup.c process.c progressbar.c quickdraw.c resources.c scrap.c scripts.c scrollbar.c search.c serialnumber.c services.c shell.c shellactivate.c shellblocker.c shellbuttons.c shellcallbacks.c shellfile.c shellhooks.c shelljuggler.c shellkb.c shellmenu.c shellmouse.c shellops.c shellprint.c shellscrap.c shellscroll.c shellsysverbs.c shellundo.c shellupdate.c shellverbs.c shellwindow.c shellwindowmenu.c shellwindowverbs.c smallicon.c sounds.c stdwin.c strings.c stringverbs.c tablecallbacks.c tablecompare.c tabledisplay.c tableedit.c tableexternal.c tablefind.c tableformats.c tablelayout.c tablenewvalue.c tableops.c tablepack.c tablepopup.c tableprint.c tablerunbutton.c tablescrap.c tablestructure.c tablevalidate.c tableverbs.c tablewindow.c textdisplay.c textedit.c threads.c timedate.c uisharing.c winregistry.c wpengine.c wpvariables.c wpverbs.c zoom.c Added Files: Tag: sidewinder-branch FastTimes.c langmath.c Log Message: final merge step Index: uisharing.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** uisharing.c 31 Oct 2004 16:38:27 -0000 1.4 --- uisharing.c 17 Jan 2005 01:19:48 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: claylinelayout.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claylinelayout.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** claylinelayout.c 31 Oct 2004 17:59:48 -0000 1.3 --- claylinelayout.c 17 Jan 2005 01:19:23 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langmodeless.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langmodeless.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** langmodeless.c 1 Nov 2004 11:50:16 -0000 1.3 --- langmodeless.c 17 Jan 2005 01:19:28 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: FrontierMacMain.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/FrontierMacMain.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** FrontierMacMain.c 9 Oct 2004 07:25:06 -0000 1.1 --- FrontierMacMain.c 17 Jan 2005 01:19:21 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: scrap.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scrap.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** scrap.c 31 Oct 2004 16:45:52 -0000 1.3 --- scrap.c 17 Jan 2005 01:19:32 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellwindowmenu.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindowmenu.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** shellwindowmenu.c 23 Oct 2004 22:57:24 -0000 1.2 --- shellwindowmenu.c 17 Jan 2005 01:19:33 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tablevalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablevalidate.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** tablevalidate.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablevalidate.c 17 Jan 2005 01:19:48 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.h" #include "standard.h" --- 26,29 ---- Index: dockmenu.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dockmenu.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** dockmenu.c 29 Oct 2004 21:55:24 -0000 1.3 --- dockmenu.c 17 Jan 2005 01:19:24 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: odbengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/odbengine.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** odbengine.c 1 Nov 2004 12:21:31 -0000 1.4 --- odbengine.c 17 Jan 2005 01:19:30 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tablewindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablewindow.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** tablewindow.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablewindow.c 17 Jan 2005 01:19:48 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: zoom.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/zoom.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** zoom.c 31 Oct 2004 16:38:27 -0000 1.3 --- zoom.c 17 Jan 2005 01:19:48 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: fileloop.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileloop.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** fileloop.c 4 Nov 2004 21:12:51 -0000 1.3 --- fileloop.c 17 Jan 2005 01:19:24 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellactivate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellactivate.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** shellactivate.c 23 Oct 2004 22:52:23 -0000 1.2 --- shellactivate.c 17 Jan 2005 01:19:33 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: menuresize.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menuresize.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** menuresize.c 23 Oct 2004 22:36:57 -0000 1.2 --- menuresize.c 17 Jan 2005 01:19:29 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: oprefcon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oprefcon.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** oprefcon.c 23 Oct 2004 22:43:24 -0000 1.2 --- oprefcon.c 17 Jan 2005 01:19:30 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: smallicon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/smallicon.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** smallicon.c 31 Oct 2004 16:45:52 -0000 1.3 --- smallicon.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 205,212 **** #ifdef MACVERSION Handle h; h = GetResource ('SICN', resnum); ! return (copyhandle (h, (Handle *) hbits)); #endif --- 207,222 ---- #ifdef MACVERSION Handle h; + boolean fl; + SInt8 hState; h = GetResource ('SICN', resnum); ! LoadResource(h); /*in case resource was purged*/ ! hState = HGetState(h); ! HNoPurge(h); /*in case resource is purgeable*/ ! fl = copyhandle (h, (Handle *) hbits); ! HSetState(h, hState); ! ! return (fl); #endif Index: langxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langxml.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** langxml.c 31 Oct 2004 18:48:51 -0000 1.3 --- langxml.c 17 Jan 2005 01:19:29 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: claybrowservalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowservalidate.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** claybrowservalidate.c 31 Oct 2004 17:59:48 -0000 1.3 --- claybrowservalidate.c 17 Jan 2005 01:19:23 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindow.c,v retrieving revision 1.3.4.1 retrieving revision 1.3.4.2 diff -C2 -d -r1.3.4.1 -r1.3.4.2 *** shellwindow.c 30 Nov 2004 13:04:21 -0000 1.3.4.1 --- shellwindow.c 17 Jan 2005 01:19:33 -0000 1.3.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ophoist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ophoist.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ophoist.c 1 Nov 2004 11:50:16 -0000 1.3 --- ophoist.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osawindows.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osawindows.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** osawindows.c 28 Oct 2004 20:49:26 -0000 1.3 --- osawindows.c 17 Jan 2005 01:19:31 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: claybrowserexpand.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowserexpand.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** claybrowserexpand.c 23 Oct 2004 22:13:52 -0000 1.2 --- claybrowserexpand.c 17 Jan 2005 01:19:23 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tablepack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablepack.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** tablepack.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablepack.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.h" #include "standard.h" --- 26,29 ---- Index: cancoonpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoonpopup.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** cancoonpopup.c 31 Oct 2004 17:31:02 -0000 1.3 --- cancoonpopup.c 17 Jan 2005 01:19:23 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: menufind.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menufind.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** menufind.c 23 Oct 2004 22:36:34 -0000 1.2 --- menufind.c 17 Jan 2005 01:19:29 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ops.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ops.c 26 Oct 2004 10:24:57 -0000 1.3 --- ops.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 39,44 **** - - static tydirection directions [ctdirections] = { --- 41,44 ---- *************** *** 865,869 **** gestalt (gestaltSystemVersion, &x); ! numbertostring (x >> 8, bs); /*high byte is major rev.*/ pushchar ('.', bs); --- 865,869 ---- gestalt (gestaltSystemVersion, &x); ! numbertostring (bcdtolong (x >> 8), bs); /* high byte is major rev., 2004-11-16 creedon - convert from bcd for correct display on Mac OS X */ pushchar ('.', bs); *************** *** 955,958 **** --- 955,976 ---- + unsigned long bcdtolong (unsigned long bcd) { /* 2004-11-23 creedon, aradke */ + + /* + convert a long value from BCD notation + */ + + unsigned long ret = 0; + unsigned long m = 1; + + do { + ret += m * (bcd & 0x0000000f); + + m *= 10; + + bcd >>= 4; + } while (bcd != 0); + return (ret); + } /* bcdtolong */ \ No newline at end of file Index: WinSockNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/WinSockNetEvents.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** WinSockNetEvents.c 23 Oct 2004 23:06:40 -0000 1.3 --- WinSockNetEvents.c 17 Jan 2005 01:19:22 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tablerunbutton.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablerunbutton.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** tablerunbutton.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablerunbutton.c 17 Jan 2005 01:19:34 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.h" #include "standard.h" --- 26,29 ---- Index: OpenTransportNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** OpenTransportNetEvents.c 31 Oct 2004 17:59:48 -0000 1.6 --- OpenTransportNetEvents.c 17 Jan 2005 01:19:22 -0000 1.6.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: cursor.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cursor.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** cursor.c 30 Oct 2004 23:50:28 -0000 1.3 --- cursor.c 17 Jan 2005 01:19:24 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: filealias.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/filealias.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** filealias.c 29 Oct 2004 07:25:21 -0000 1.3 --- filealias.c 17 Jan 2005 01:19:24 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellblocker.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellblocker.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** shellblocker.c 23 Oct 2004 22:52:35 -0000 1.2 --- shellblocker.c 17 Jan 2005 01:19:33 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opbuttons.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opbuttons.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** opbuttons.c 24 Oct 2004 19:16:36 -0000 1.3 --- opbuttons.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langpython.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpython.c,v retrieving revision 1.2.4.35 retrieving revision 1.2.4.36 diff -C2 -d -r1.2.4.35 -r1.2.4.36 *** langpython.c 9 Jan 2005 21:34:08 -0000 1.2.4.35 --- langpython.c 17 Jan 2005 01:19:28 -0000 1.2.4.36 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 147,150 **** --- 149,153 ---- PyObject * (*ptr_PyDict_Keys) (PyObject *); PyObject * (*ptr_PyDict_New) (void); + int (*ptr_PyDict_Next) (PyObject *, int *, PyObject **, PyObject **); int (*ptr_PyDict_SetItemString) (PyObject *, const char *, PyObject *); *************** *** 263,266 **** --- 266,270 ---- #define PyDict_Keys (*py.ptr_PyDict_Keys) #define PyDict_New (*py.ptr_PyDict_New) + #define PyDict_Next (*py.ptr_PyDict_Next) #define PyDict_SetItemString (*py.ptr_PyDict_SetItemString) *************** *** 417,420 **** --- 421,425 ---- fl = fl && IMPORTSYMBOL (hm, PyDict_Keys); fl = fl && IMPORTSYMBOL (hm, PyDict_New); + fl = fl && IMPORTSYMBOL (hm, PyDict_Next); fl = fl && IMPORTSYMBOL (hm, PyDict_SetItemString); Index: tablelayout.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablelayout.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** tablelayout.c 9 Oct 2004 08:08:51 -0000 1.1 --- tablelayout.c 17 Jan 2005 01:19:33 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tableprint.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableprint.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** tableprint.c 9 Oct 2004 08:09:52 -0000 1.1 --- tableprint.c 17 Jan 2005 01:19:34 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellhooks.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellhooks.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellhooks.c 24 Oct 2004 19:24:34 -0000 1.3 --- shellhooks.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opicons.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opicons.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** opicons.c 31 Oct 2004 19:08:16 -0000 1.3 --- opicons.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: pict.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/pict.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** pict.c 29 Oct 2004 21:14:52 -0000 1.3 --- pict.c 17 Jan 2005 01:19:32 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: serialnumber.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/serialnumber.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** serialnumber.c 23 Oct 2004 22:51:36 -0000 1.2 --- serialnumber.c 17 Jan 2005 01:19:32 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: htmlcontrol.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/htmlcontrol.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** htmlcontrol.c 23 Oct 2004 22:22:09 -0000 1.2 --- htmlcontrol.c 17 Jan 2005 01:19:25 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellsysverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellsysverbs.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellsysverbs.c 27 Oct 2004 18:57:55 -0000 1.3 --- shellsysverbs.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 162,165 **** --- 164,169 ---- isvalidserialnumberfunc, + showapplicationfunc, + ctfrontierverbs } tyfrontiertoken; *************** *** 983,986 **** --- 987,1005 ---- return (true); } + + case showapplicationfunc: { /*2004-11-28 aradke: re-emerge from system tray*/ + + #ifdef WIN95VERSION + + releasethreadglobals (); + + ShowWindow (shellframewindow, SW_SHOW); + + grabthreadglobals (); + + #endif + + return (setbooleanvalue (true, v)); + } default: Index: langdll.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdll.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** langdll.c 30 Oct 2004 23:15:04 -0000 1.3 --- langdll.c 17 Jan 2005 01:19:26 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 68,71 **** --- 70,76 ---- #include "langdll.h" + #if defined(MACVERSION) && TARGET_RT_MAC_MACHO + #include "CallMachOFramework.h" + #endif #define NEW_DLL_INTERFACE 1 /* 2002-11-03 AR: defined to enable new DLL interface */ *************** *** 136,185 **** static tydllinfohandle loadeddlls; /* linked list of currently loaded stay-resident DLLs */ - /* - static const XDLLProcTable dllcallbacks = { /+ we create a copy of this struct on the stack for every call +/ - extfrontierAlloc, - extfrontierReAlloc, - extfrontierLock, - extfrontierUnlock, - extfrontierFree, - extfrontierSize, - - extOdbGetCurrentRoot, - extOdbNewFile, - extOdbOpenFile, - extOdbSaveFile, - extOdbCloseFile, - extOdbDefined, - extOdbDelete, - extOdbGetType, - extOdbCountItems, - extOdbGetNthItem, - extOdbGetValue, - extOdbSetValue, - extOdbNewTable, - extOdbGetModDate, - extOdbDisposeValue, - extOdbGetError, - - extDoScript, - extDoScriptText, - - extOdbNewListValue, - extOdbGetListCount, - extOdbDeleteListValue, - extOdbSetListValue, - extOdbGetListValue, - extOdbAddListValue, ! extInvoke, ! extCoerce, - extCallScript, - extCallScriptText, - - extThreadYield, - extThreadSleep - }; - */ #else --- 141,147 ---- static tydllinfohandle loadeddlls; /* linked list of currently loaded stay-resident DLLs */ ! static XDLLProcTable *dllcallbacks; /* global pointer to array of callback functions */ #else *************** *** 1074,1077 **** --- 1036,1043 ---- hnext = (**h).hashlink; + + #if defined(MACVERSION) && TARGET_RT_MAC_MACHO + disposemachofuncptr ((void *) (**h).procaddress); + #endif disposehandle ((Handle) h); *************** *** 1723,1726 **** --- 1689,1696 ---- (**hprocinfo).moduleUPP = (UniversalProcPtr) &(**hprocinfo).moduledesc; } + #elif TARGET_RT_MAC_MACHO + if (err == noErr) { + (**hprocinfo).procaddress = convertcfmtomachofuncptr ((**hprocinfo).procaddress); + } #endif #endif *************** *** 1744,1752 **** */ - XDLLProcTable calltable; boolean fl = false; - fillcalltable (&calltable); - lockhandle ((Handle) hprocinfo); /* just to be sure our data doesn't move around */ --- 1714,1719 ---- *************** *** 1770,1779 **** #if MACVERSION && !TARGET_API_MAC_CARBON #if GENERATINGCFM ! fl = CallUniversalProc ((**hprocinfo).moduleUPP, uppdllcallProcInfo, params, &calltable); #else ! fl = (*(tyDLLEXTROUTINE) ((**hprocinfo).moduleUPP)) (params, &calltable); #endif #else ! fl = (*(**hprocinfo).procaddress) (params, &calltable); #endif --- 1737,1746 ---- #if MACVERSION && !TARGET_API_MAC_CARBON #if GENERATINGCFM ! fl = CallUniversalProc ((**hprocinfo).moduleUPP, uppdllcallProcInfo, params, dllcallbacks); #else ! fl = (*(tyDLLEXTROUTINE) ((**hprocinfo).moduleUPP)) (params, dllcallbacks); #endif #else ! fl = (*(**hprocinfo).procaddress) (params, dllcallbacks); #endif *************** *** 1913,1916 **** --- 1880,1887 ---- /* Dispose proc info here because we didn't ask for the hash table to be built */ + #if defined(MACVERSION) && TARGET_RT_MAC_MACHO + disposemachofuncptr ((void*) (**hprocinfo).procaddress); + #endif + disposehandle ((Handle) hprocinfo); *************** *** 2375,2394 **** call the dll. */ - XDLLProcTable calltable; boolean fl = false; - /*Need to initialize the callback table*/ - fillcalltable (&calltable); - //#endif - - - // dllcall.frontiercallback = ??? - - // - releasethreadglobals (); #ifdef WIN95VERSION ! fl = (*(dllinfo->procAddress)) (dllcall, &calltable); #endif --- 2346,2355 ---- call the dll. */ boolean fl = false; releasethreadglobals (); #ifdef WIN95VERSION ! fl = (*(dllinfo->procAddress)) (dllcall, dllcallbacks); #endif *************** *** 2397,2407 **** //Code change by Timothy Paustian Friday, June 16, 2000 1:13:28 PM //Changed to Opaque call for Carbon - we don't need UPPs in Carbon. ! //fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, &calltable); // call it ! fl = (*(dllinfo->procAddress)) (dllcall, &calltable); // call it #else #if GENERATINGCFM ! fl = CallUniversalProc (dllinfo->moduleUPP, uppdllcallProcInfo, dllcall, &calltable); #else ! fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, &calltable); // call it #endif #endif --- 2358,2368 ---- //Code change by Timothy Paustian Friday, June 16, 2000 1:13:28 PM //Changed to Opaque call for Carbon - we don't need UPPs in Carbon. ! //fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, dllcallbacks); // call it ! fl = (*(dllinfo->procAddress)) (dllcall, dllcallbacks); // call it #else #if GENERATINGCFM ! fl = CallUniversalProc (dllinfo->moduleUPP, uppdllcallProcInfo, dllcall, dllcallbacks); #else ! fl = (*(tyDLLEXTROUTINE) (dllinfo->moduleUPP)) (dllcall, dllcallbacks); // call it #endif #endif *************** *** 2415,2485 **** } /*langcalldll*/ - #endif /* NEW_DLL_INTERFACE */ - - void fillcalltable (XDLLProcTable * calltable) { ! /* ! 2003-06-16 AR: We got some crash reports on Mac OS Classic ! implicating the new DLL interface where the stdlogs did not ! include a proper stack backtrace. Therefore, let's abandon ! the idea of using a global dllcallbacks table and switch ! back to building it on the fly for every call. ! */ ! /* ! #ifdef NEW_DLL_INTERFACE ! *calltable = dllcallbacks; ! ! #else ! */ ! calltable->xMemAlloc = extfrontierAlloc; ! calltable->xMemResize = extfrontierReAlloc; ! calltable->xMemLock = extfrontierLock; ! calltable->xMemUnlock = extfrontierUnlock; ! calltable->xMemFree = extfrontierFree; ! calltable->xMemGetSize = extfrontierSize; ! calltable->xOdbGetCurrentRoot = extOdbGetCurrentRoot; ! calltable->xOdbNewFile = extOdbNewFile; ! calltable->xOdbOpenFile = extOdbOpenFile; ! calltable->xOdbSaveFile = extOdbSaveFile; ! calltable->xOdbCloseFile = extOdbCloseFile; ! calltable->xOdbDefined = extOdbDefined; ! calltable->xOdbDelete = extOdbDelete; ! calltable->xOdbGetType = extOdbGetType; ! calltable->xOdbCountItems = extOdbCountItems; ! calltable->xOdbGetNthItem = extOdbGetNthItem; ! calltable->xOdbGetValue = extOdbGetValue; ! calltable->xOdbSetValue = extOdbSetValue; ! calltable->xOdbNewTable = extOdbNewTable; ! calltable->xOdbGetModDate = extOdbGetModDate; ! calltable->xOdbDisposeValue = extOdbDisposeValue; ! calltable->xOdbGetError = extOdbGetError; ! calltable->xDoScript = extDoScript; ! calltable->xDoScriptText = extDoScriptText; ! calltable->xOdbNewListValue = extOdbNewListValue; ! calltable->xOdbGetListCount = extOdbGetListCount; ! calltable->xOdbDeleteListValue = extOdbDeleteListValue; ! calltable->xOdbSetListValue = extOdbSetListValue; ! calltable->xOdbGetListValue = extOdbGetListValue; ! calltable->xOdbAddListValue = extOdbAddListValue; ! calltable->xInvoke = extInvoke; ! calltable->xCoerce = extCoerce; ! ! calltable->xCallScript = extCallScript; ! calltable->xCallScriptText = extCallScriptText; ! calltable->xThreadYield = extThreadYield; ! calltable->xThreadSleep = extThreadSleep; ! /* #endif - */ - } /*fillcalltable*/ --- 2376,2533 ---- } /*langcalldll*/ #endif /* NEW_DLL_INTERFACE */ ! void fillcalltable (XDLLProcTable *pt) { ! #if defined(MACVERSION) && TARGET_RT_MAC_MACHO ! pt->xMemAlloc = convertmachotocfmfuncptr (&extfrontierAlloc); ! pt->xMemResize = convertmachotocfmfuncptr (&extfrontierReAlloc); ! pt->xMemLock = convertmachotocfmfuncptr (&extfrontierLock); ! pt->xMemUnlock = convertmachotocfmfuncptr (&extfrontierUnlock); ! pt->xMemFree = convertmachotocfmfuncptr (&extfrontierFree); ! pt->xMemGetSize = convertmachotocfmfuncptr (&extfrontierSize); ! pt->xOdbGetCurrentRoot = convertmachotocfmfuncptr (&extOdbGetCurrentRoot); ! pt->xOdbNewFile = convertmachotocfmfuncptr (&extOdbNewFile); ! pt->xOdbOpenFile = convertmachotocfmfuncptr (&extOdbOpenFile); ! pt->xOdbSaveFile = convertmachotocfmfuncptr (&extOdbSaveFile); ! pt->xOdbCloseFile = convertmachotocfmfuncptr (&extOdbCloseFile); ! pt->xOdbDefined = convertmachotocfmfuncptr (&extOdbDefined); ! pt->xOdbDelete = convertmachotocfmfuncptr (&extOdbDelete); ! pt->xOdbGetType = convertmachotocfmfuncptr (&extOdbGetType); ! pt->xOdbCountItems = convertmachotocfmfuncptr (&extOdbCountItems); ! pt->xOdbGetNthItem = convertmachotocfmfuncptr (&extOdbGetNthItem); ! pt->xOdbGetValue = convertmachotocfmfuncptr (&extOdbGetValue); ! pt->xOdbSetValue = convertmachotocfmfuncptr (&extOdbSetValue); ! pt->xOdbNewTable = convertmachotocfmfuncptr (&extOdbNewTable); ! pt->xOdbGetModDate = convertmachotocfmfuncptr (&extOdbGetModDate); ! pt->xOdbDisposeValue = convertmachotocfmfuncptr (&extOdbDisposeValue); ! pt->xOdbGetError = convertmachotocfmfuncptr (&extOdbGetError); ! pt->xDoScript = convertmachotocfmfuncptr (&extDoScript); ! pt->xDoScriptText = convertmachotocfmfuncptr (&extDoScriptText); ! pt->xOdbNewListValue = convertmachotocfmfuncptr (&extOdbNewListValue); ! pt->xOdbGetListCount = convertmachotocfmfuncptr (&extOdbGetListCount); ! pt->xOdbDeleteListValue = convertmachotocfmfuncptr (&extOdbDeleteListValue); ! pt->xOdbSetListValue = convertmachotocfmfuncptr (&extOdbSetListValue); ! pt->xOdbGetListValue = convertmachotocfmfuncptr (&extOdbGetListValue); ! pt->xOdbAddListValue = convertmachotocfmfuncptr (&extOdbAddListValue); ! pt->xInvoke = convertmachotocfmfuncptr (&extInvoke); ! pt->xCoerce = convertmachotocfmfuncptr (&extCoerce); ! ! pt->xCallScript = convertmachotocfmfuncptr (&extCallScript); ! pt->xCallScriptText = convertmachotocfmfuncptr (&extCallScriptText); ! ! pt->xThreadYield = convertmachotocfmfuncptr (&extThreadYield); ! pt->xThreadSleep = convertmachotocfmfuncptr (&extThreadSleep); ! ! #else ! ! pt->xMemAlloc = &extfrontierAlloc; ! pt->xMemResize = &extfrontierReAlloc; ! pt->xMemLock = &extfrontierLock; ! pt->xMemUnlock = &extfrontierUnlock; ! pt->xMemFree = &extfrontierFree; ! pt->xMemGetSize = &extfrontierSize; ! ! pt->xOdbGetCurrentRoot = &extOdbGetCurrentRoot; ! pt->xOdbNewFile = &extOdbNewFile; ! pt->xOdbOpenFile = &extOdbOpenFile; ! pt->xOdbSaveFile = &extOdbSaveFile; ! pt->xOdbCloseFile = &extOdbCloseFile; ! pt->xOdbDefined = &extOdbDefined; ! pt->xOdbDelete = &extOdbDelete; ! pt->xOdbGetType = &extOdbGetType; ! pt->xOdbCountItems = &extOdbCountItems; ! pt->xOdbGetNthItem = &extOdbGetNthItem; ! pt->xOdbGetValue = &extOdbGetValue; ! pt->xOdbSetValue = &extOdbSetValue; ! pt->xOdbNewTable = &extOdbNewTable; ! pt->xOdbGetModDate = &extOdbGetModDate; ! pt->xOdbDisposeValue = &extOdbDisposeValue; ! pt->xOdbGetError = &extOdbGetError; ! ! pt->xDoScript = &extDoScript; ! pt->xDoScriptText = &extDoScriptText; ! ! pt->xOdbNewListValue = &extOdbNewListValue; ! pt->xOdbGetListCount = &extOdbGetListCount; ! pt->xOdbDeleteListValue = &extOdbDeleteListValue; ! pt->xOdbSetListValue = &extOdbSetListValue; ! pt->xOdbGetListValue = &extOdbGetListValue; ! pt->xOdbAddListValue = &extOdbAddListValue; ! ! pt->xInvoke = &extInvoke; ! pt->xCoerce = &extCoerce; ! ! pt->xCallScript = &extCallScript; ! pt->xCallScriptText = &extCallScriptText; ! ! pt->xThreadYield = &extThreadYield; ! pt->xThreadSleep = &extThreadSleep; ! ! #endif ! ! } /*fillcalltable*/ ! ! ! #if 0 ! ! void smashcalltable (XDLLProcTable *pt) { ! ! #if defined(MACVERSION) && TARGET_RT_MAC_MACHO ! ! disposecfmfuncptr (pt->xMemAlloc); ! disposecfmfuncptr (pt->xMemResize); ! disposecfmfuncptr (pt->xMemLock); ! disposecfmfuncptr (pt->xMemUnlock); ! disposecfmfuncptr (pt->xMemFree); ! disposecfmfuncptr (pt->xMemGetSize); ! ! disposecfmfuncptr (pt->xOdbGetCurrentRoot); ! disposecfmfuncptr (pt->xOdbNewFile); ! disposecfmfuncptr (pt->xOdbOpenFile); ! disposecfmfuncptr (pt->xOdbSaveFile); ! disposecfmfuncptr (pt->xOdbCloseFile); ! disposecfmfuncptr (pt->xOdbDefined); ! disposecfmfuncptr (pt->xOdbDelete); ! disposecfmfuncptr (pt->xOdbGetType); ! disposecfmfuncptr (pt->xOdbCountItems); ! disposecfmfuncptr (pt->xOdbGetNthItem); ! disposecfmfuncptr (pt->xOdbGetValue); ! disposecfmfuncptr (pt->xOdbSetValue); ! disposecfmfuncptr (pt->xOdbNewTable); ! disposecfmfuncptr (pt->xOdbGetModDate); ! disposecfmfuncptr (pt->xOdbDisposeValue); ! disposecfmfuncptr (pt->xOdbGetError); ! ! disposecfmfuncptr (pt->xDoScript); ! disposecfmfuncptr (pt->xDoScriptText); ! ! disposecfmfuncptr (pt->xOdbNewListValue); ! disposecfmfuncptr (pt->xOdbGetListCount); ! disposecfmfuncptr (pt->xOdbDeleteListValue); ! disposecfmfuncptr (pt->xOdbSetListValue); ! disposecfmfuncptr (pt->xOdbGetListValue); ! disposecfmfuncptr (pt->xOdbAddListValue); ! ! disposecfmfuncptr (pt->xInvoke); ! disposecfmfuncptr (pt->xCoerce); ! ! disposecfmfuncptr (pt->xCallScript); ! disposecfmfuncptr (pt->xCallScriptText); ! ! disposecfmfuncptr (pt->xThreadYield); ! disposecfmfuncptr (pt->xThreadSleep); ! ! #endif ! } /*smashcalltable*/ ! #endif *************** *** 2738,2739 **** --- 2786,2798 ---- } /*calldllverb*/ + + void dllinitverbs (void) { + + if (dllcallbacks == nil) { + + dllcallbacks = (XDLLProcTable *) malloc (sizeof (XDLLProcTable)); + + if (dllcallbacks != nil) + fillcalltable (dllcallbacks); + } + } /*initdllverbs*/ Index: lang.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/lang.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** lang.c 20 Dec 2004 00:00:20 -0000 1.4.4.1 --- lang.c 17 Jan 2005 01:19:26 -0000 1.4.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 45,48 **** --- 47,52 ---- #include "shell.rsrc.h" #include "shellhooks.h" + #include "timedate.h" /* for the milliseconds function */ + #include "process.h" #include "tablestructure.h" *************** *** 174,178 **** //short ix, ixtop; tyerrorrecord *pe; ! unsigned long ticksnow = gettickcount (); if ((hs == nil) || ((**hs).toperror <= 0)) --- 178,183 ---- //short ix, ixtop; tyerrorrecord *pe; ! /*unsigned long ticksnow = gettickcount ();*/ ! unsigned long msnow = getmilliseconds (); if ((hs == nil) || ((**hs).toperror <= 0)) *************** *** 195,199 **** pe = &(**hs).stack [(**hs).toperror - 1]; ! (*pe).profilebase = ticksnow; (*pe).profiletotal = 0; --- 200,204 ---- pe = &(**hs).stack [(**hs).toperror - 1]; ! (*pe).profilebase = msnow; (*pe).profiletotal = 0; *************** *** 214,218 **** short ix; tyerrorrecord item; ! unsigned long ticksnow = gettickcount (); if ((hs == nil) || ((**hs).toperror <= 0)) --- 219,224 ---- short ix; tyerrorrecord item; ! /*unsigned long ticksnow = gettickcount ();*/ ! unsigned long msnow = getmilliseconds (); if ((hs == nil) || ((**hs).toperror <= 0)) *************** *** 227,231 **** if (item.profilebase != 0) { // included in profile ! item.profiletotal += ticksnow - item.profilebase; langtracktimeslice (&item); --- 233,237 ---- if (item.profilebase != 0) { // included in profile ! item.profiletotal += msnow - item.profilebase; langtracktimeslice (&item); *************** *** 265,269 **** if (hp && (**hp).flprofiling) { ! item.profilebase = gettickcount (); item.profiletotal = 0; --- 271,276 ---- if (hp && (**hp).flprofiling) { ! /* item.profilebase = gettickcount (); */ ! item.profilebase = getmilliseconds (); item.profiletotal = 0; *************** *** 309,313 **** item = (**hs).stack [ixtop]; // the one we just popped ! item.profiletotal += gettickcount () - item.profilebase; pe = &(**hs).stack [ixtop - 1]; // new new current top item --- 316,321 ---- item = (**hs).stack [ixtop]; // the one we just popped ! /* item.profiletotal += gettickcount () - item.profilebase; */ ! item.profiletotal += getmilliseconds () - item.profilebase; pe = &(**hs).stack [ixtop - 1]; // new new current top item *************** *** 317,321 **** if ((**hp).flprofilesliced && (ixtop > 0)) // restart previous function timer ! (*pe).profilebase = gettickcount (); } --- 325,330 ---- if ((**hp).flprofilesliced && (ixtop > 0)) // restart previous function timer ! /* (*pe).profilebase = gettickcount (); */ ! (*pe).profilebase = getmilliseconds (); } Index: wpengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** wpengine.c 30 Nov 2004 10:58:05 -0000 1.4.4.1 --- wpengine.c 17 Jan 2005 01:19:48 -0000 1.4.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 1846,1856 **** #endif ! #ifdef gray3Dlook ! pushbackcolor (&whitecolor); - eraserect (rcontent); - #endif - if (updatergn == nil) pgErasePageArea (wpbuffer, MEM_NULL); --- 1848,1858 ---- #endif + + #ifdef gray3Dlook + pushbackcolor (&whitecolor); ! eraserect (rcontent); ! #endif if (updatergn == nil) pgErasePageArea (wpbuffer, MEM_NULL); *************** *** 1866,1870 **** #ifdef gray3Dlook ! popbackcolor (); #endif --- 1868,1872 ---- #ifdef gray3Dlook ! popbackcolor (); #endif Index: opinit.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opinit.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** opinit.c 1 Nov 2004 11:50:16 -0000 1.3 --- opinit.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: winregistry.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/winregistry.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** winregistry.c 24 Oct 2004 12:30:58 -0000 1.2 --- winregistry.c 17 Jan 2005 01:19:48 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opdisplay.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opdisplay.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** opdisplay.c 1 Nov 2004 11:50:16 -0000 1.5 --- opdisplay.c 17 Jan 2005 01:19:30 -0000 1.5.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: dbstats.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dbstats.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** dbstats.c 23 Oct 2004 22:15:59 -0000 1.2 --- dbstats.c 17 Jan 2005 01:19:24 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: mac.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/mac.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** mac.c 28 Oct 2004 23:08:45 -0000 1.3 --- mac.c 17 Jan 2005 01:19:29 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osaparseaete.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osaparseaete.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** osaparseaete.c 23 Oct 2004 22:47:22 -0000 1.2 --- osaparseaete.c 17 Jan 2005 01:19:31 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellkb.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellkb.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellkb.c 1 Nov 2004 11:50:16 -0000 1.3 --- shellkb.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osadroplet.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osadroplet.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** osadroplet.c 1 Nov 2004 11:50:16 -0000 1.4 --- osadroplet.c 17 Jan 2005 01:19:31 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langsystypes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** langsystypes.c 31 Oct 2004 18:48:51 -0000 1.3 --- langsystypes.c 17 Jan 2005 01:19:28 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langtrace.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langtrace.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** langtrace.c 31 Oct 2004 19:08:15 -0000 1.3 --- langtrace.c 17 Jan 2005 01:19:28 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: outlineland.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/outlineland.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** outlineland.c 9 Oct 2004 07:56:28 -0000 1.1 --- outlineland.c 17 Jan 2005 01:19:32 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: oplineheight.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplineheight.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** oplineheight.c 23 Oct 2004 22:42:02 -0000 1.2 --- oplineheight.c 17 Jan 2005 01:19:30 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opprint.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opprint.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** opprint.c 1 Nov 2004 11:50:17 -0000 1.3 --- opprint.c 17 Jan 2005 01:19:30 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellops.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellops.c 1 Nov 2004 11:50:16 -0000 1.3 --- shellops.c 17 Jan 2005 01:19:33 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: error.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/error.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** error.c 28 Oct 2004 01:51:26 -0000 1.3 --- error.c 17 Jan 2005 01:19:24 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: popup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/popup.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** popup.c 23 Oct 2004 22:49:15 -0000 1.2 --- popup.c 17 Jan 2005 01:19:32 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: fileops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileops.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** fileops.c 29 Oct 2004 19:58:27 -0000 1.4 --- fileops.c 17 Jan 2005 01:19:24 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: wpvariables.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpvariables.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** wpvariables.c 9 Oct 2004 08:14:19 -0000 1.1 --- wpvariables.c 17 Jan 2005 01:19:48 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: OSXSpecifics.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OSXSpecifics.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** OSXSpecifics.c 9 Oct 2004 07:56:14 -0000 1.1 --- OSXSpecifics.c 17 Jan 2005 01:19:22 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: fileverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/fileverbs.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** fileverbs.c 29 Oct 2004 19:58:27 -0000 1.3 --- fileverbs.c 17 Jan 2005 01:19:25 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: assert.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/assert.c,v retrieving revision 1.6 retrieving revision 1.6.4.1 diff -C2 -d -r1.6 -r1.6.4.1 *** assert.c 9 Nov 2004 21:10:47 -0000 1.6 --- assert.c 17 Jan 2005 01:19:23 -0000 1.6.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opxml.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** opxml.c 31 Oct 2004 21:43:38 -0000 1.3 --- opxml.c 17 Jan 2005 01:19:31 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** --- NEW FILE: langmath.c --- /* $Id: langmath.c,v 1.2.4.1 2005/01/17 01:19:28 davidbro Exp $ */ /* * langmath.c * Frontier * * Created by Seth Dillingham on 12/29/04. * Copyright 2004 __MyCompanyName__. All rights reserved. * */ #include <math.h> #include "frontier.h" #include "standard.h" #include "error.h" #include "memory.h" #include "ops.h" #include "resources.h" #include "lang.h" #include "langinternal.h" #include "langexternal.h" #include "langsystem7.h" #include "tablestructure.h" #include "kernelverbs.h" #include "kernelverbdefs.h" #include "shell.rsrc.h" #include "timedate.h" #include "langmath.h" #define matherrorlist 269 #define notimplementederror 1 typedef enum tymathtoken { /*verbs that are processed by langmath.c*/ minfunc, maxfunc, sqrtfunc, cmathverbs } tymathtoken; static boolean mathfunctionvalue (short token, hdltreenode hparam1, tyvaluerecord *vreturned, bigstring bserror) { hdltreenode hp1 = hparam1; tyvaluerecord *v = vreturned; short errornum = 0; setbooleanvalue (false, v); /*by default, math functions return false*/ switch (token) { case minfunc: { /* 2004/12/29 smd */ tyvaluerecord v1, v2; boolean fl; if (!getparamvalue (hp1, 1, &v1)) break; flnextparamislast = true; if (!getparamvalue (hp1, 2, &v2)) break; if (!coercetypes (&v1, &v2)) { break; } switch (v1.valuetype) { case novaluetype: { /* no test needed, nil is nil*/ initvalue (v, novaluetype); return true; } case booleanvaluetype: /* just return an or */ return setbooleanvalue (v1.data.flvalue || v2.data.flvalue, v); /* all the rest return the greater of the two values */ case charvaluetype: return setcharvalue (min (v1.data.chvalue, v2.data.chvalue), v); case intvaluetype: return setintvalue (min (v1.data.intvalue, v2.data.intvalue), v); case longvaluetype: return setlongvalue (min (v1.data.longvalue, v2.data.longvalue), v); case ostypevaluetype: return setostypevalue (min (v1.data.longvalue, v2.data.longvalue), v); /* case fixedvaluetype: return setfixedvalue (min (v1.data.longvalue, v2.data.longvalue), v); */ case directionvaluetype: return setdirectionvalue (min ((short) v1.data.dirvalue, (short) v2.data.dirvalue), v); case datevaluetype: return setdatevalue (timegreaterthan (v1.data.datevalue, v2.data.datevalue) ? v1.data.datevalue : v2.data.datevalue, v); case singlevaluetype: return setsinglevalue (min (v1.data.singlevalue, v2.data.singlevalue), v); case doublevaluetype: return setdoublevalue (min (**v1.data.doublevalue, **v2.data.doublevalue), v); case stringvaluetype: { Handle h; if (comparehandles (v1.data.stringvalue, v2.data.stringvalue) == 1) copyhandle (v2.data.stringvalue, &h); else copyhandle (v1.data.stringvalue, &h); return (setheapvalue (h, stringvaluetype, v)); } default: langerror (comparisonnotpossibleerror); fl = false; /*operation is not defined*/ break; } /*switch*/ return (false); } case maxfunc: { /* 2004/12/29 smd */ tyvaluerecord v1, v2; boolean fl; if (!getparamvalue (hparam1, 1, &v1)) break; flnextparamislast = true; if (!getparamvalue (hparam1, 2, &v2)) break; if (!coercetypes (&v1, &v2)) { disposevalues (&v1, &v2); break; } switch (v1.valuetype) { case novaluetype: { /* no test needed, nil is nil*/ initvalue (v, novaluetype); return true; } case booleanvaluetype: /* just return an or */ return setbooleanvalue (v1.data.flvalue || v2.data.flvalue, v); /* all the rest return the greater of the two values */ case charvaluetype: return setcharvalue (max (v1.data.chvalue, v2.data.chvalue), v); case intvaluetype: return setintvalue (max (v1.data.intvalue, v2.data.intvalue), v); case longvaluetype: return setlongvalue (max (v1.data.longvalue, v2.data.longvalue), v); case ostypevaluetype: return setostypevalue (max (v1.data.longvalue, v2.data.longvalue), v); /* case fixedvaluetype: return setfixedvalue (max (v1.data.longvalue, v2.data.longvalue), v); */ case directionvaluetype: return setdirectionvalue (max ((short) v1.data.dirvalue, (short) v2.data.dirvalue), v); case datevaluetype... [truncated message content] |
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/headers Modified Files: Tag: sidewinder-branch BASE64.H CallMachOFrameWork.h FDllCall.h FrontierWinMain.h OSXSpecifics.h WinLand.h WinSockNetEvents.h about.h aeutils.h birdruncard.h bitmaps.h cancoon.h cancooninternal.h carbonheaders.c carbonheaders.h carbonheaders.pch clay.h claybrowser.h claybrowserexpand.h claybrowserstruc.h claybrowservalidate.h claycallbacks.h clayfiles.h claylinelayout.h command.h config.h config.r cursor.h db.h dbinternal.h dialogs.h dockmenu.h error.h file.h filealias.h fileloop.h filesystem7.h font.h frontier.h frontier.r frontierconfig.h frontierdebug.h frontierdefs.h frontierstart.h frontierwindows.h htmlcontrol.h icon.h iowaverbs.h kb.h kernelverbdefs.h kernelverbs.h lang.h langdll.h langexternal.h langhtml.h langinternal.h langipc.h langparser.h langpython.h langregexp.h langsystem7.h langtokens.h langwinipc.h langxcmd.h langxml.h launch.h mac.h macconv.h md5.h memory.h menu.h menubar.h menueditor.h menuinternal.h menuverbs.h meprograms.h miniwindow.h mouse.h multipad.h notify.h odbinternal.h op.h opbuttons.h opdisplay.h opdraggingmove.h opentrypoints.h opicons.h opinternal.h oplineheight.h oplist.h ops.h opscreenmap.h optoolkit.h opverbs.h opxml.h osacomponent.h osadroplet.h osainternal.h osamenus.h osaparseaete.h osawindows.h osincludes.h pict.h pictverbs.h player.h popup.h process.h processinternal.h quickdraw.h resource.h resources.h scrap.h scripts.h scrollbar.h search.h serialnumber.h services.h shell.carbon.h shell.h shell.mcp.r shell.msvs.h shell.msvs.track.h shell.rsrc.h shell.trial.h shell.werks.h shell.win.h shell.windebug.h shell.winrelease.h shellbuttons.h shellheaders.c shellheaders.h shellheaders.pch shellhooks.h shellmenu.h shellprint.h shellprivate.h shelltypes.h shellundo.h smallicon.h sounds.h stdwin.h stringdefs.h strings.h tabledisplay.h tableedit.h tableformats.h tableinternal.h tablestructure.h tableverbs.h textdisplay.h textedit.h threads.h timedate.h versions.h windowlayout.h winregistry.h wpengine.h wpinternal.h wpverbs.h xMacHeaders.c yytab.h zoom.h Added Files: Tag: sidewinder-branch FastTimes.h langmath.h Log Message: final merge step Index: WinLand.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/WinLand.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** WinLand.h 9 Oct 2004 21:12:13 -0000 1.1 --- WinLand.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /******************************************************************************\ * This is a part of the Microsoft Source Code Samples. *************** *** 65,68 **** --- 67,71 ---- #define ID_TABLE_ICON 11 #define ID_WP_ICON 12 + #define ID_NOTE_ICON 13 #define ID_DESKTOPSCRIPT_ICON 14 *************** *** 71,76 **** #endif - #define IDNOTE 13 - #define ID_FRONTIERTRAY_ICON 16 --- 74,77 ---- Index: cursor.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/cursor.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** cursor.h 9 Oct 2004 20:53:52 -0000 1.1 --- cursor.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: scrap.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/scrap.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** scrap.h 9 Oct 2004 21:06:12 -0000 1.1 --- scrap.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: meprograms.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/meprograms.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** meprograms.h 9 Oct 2004 21:00:34 -0000 1.1 --- meprograms.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: memory.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/memory.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** memory.h 9 Oct 2004 20:59:45 -0000 1.1 --- memory.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: claylinelayout.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/claylinelayout.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** claylinelayout.h 9 Oct 2004 20:53:25 -0000 1.1 --- claylinelayout.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osamenus.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osamenus.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** osamenus.h 9 Oct 2004 21:04:10 -0000 1.1 --- osamenus.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: fileloop.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/fileloop.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** fileloop.h 9 Oct 2004 20:54:57 -0000 1.1 --- fileloop.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellprint.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellprint.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellprint.h 1 Nov 2004 11:50:42 -0000 1.3 --- shellprint.h 17 Jan 2005 01:19:19 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langregexp.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langregexp.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** langregexp.h 17 Oct 2004 12:13:56 -0000 1.2 --- langregexp.h 17 Jan 2005 01:19:09 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: dockmenu.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/dockmenu.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** dockmenu.h 9 Oct 2004 20:54:20 -0000 1.1 --- dockmenu.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: command.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/command.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** command.h 28 Oct 2004 22:58:40 -0000 1.2 --- command.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: processinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/processinternal.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** processinternal.h 9 Oct 2004 21:05:34 -0000 1.1 --- processinternal.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: kernelverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/kernelverbs.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** kernelverbs.h 23 Nov 2004 16:13:23 -0000 1.1.4.1 --- kernelverbs.h 17 Jan 2005 01:19:09 -0000 1.1.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 54,55 **** --- 56,58 ---- extern boolean pythoninitverbs(void); /*langpython.c*/ + extern boolean mathinitverbs (void); /* langmath.c */ Index: oplist.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/oplist.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** oplist.h 4 Nov 2004 21:12:51 -0000 1.3 --- oplist.h 17 Jan 2005 01:19:18 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: optoolkit.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/optoolkit.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** optoolkit.h 9 Oct 2004 21:03:11 -0000 1.1 --- optoolkit.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: notify.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/notify.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** notify.h 9 Oct 2004 21:01:05 -0000 1.1 --- notify.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: file.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/file.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** file.h 29 Oct 2004 19:39:24 -0000 1.3 --- file.h 17 Jan 2005 01:19:08 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellhooks.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellhooks.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shellhooks.h 24 Oct 2004 19:25:15 -0000 1.3 --- shellhooks.h 17 Jan 2005 01:19:19 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: claybrowserexpand.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/claybrowserexpand.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** claybrowserexpand.h 9 Oct 2004 20:52:36 -0000 1.1 --- claybrowserexpand.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: iowaverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/iowaverbs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** iowaverbs.h 9 Oct 2004 20:56:09 -0000 1.1 --- iowaverbs.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: yytab.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/yytab.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** yytab.h 9 Oct 2004 21:13:15 -0000 1.1 --- yytab.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: filealias.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/filealias.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** filealias.h 23 Oct 2004 21:53:35 -0000 1.2 --- filealias.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: frontierdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v retrieving revision 1.4.2.1 retrieving revision 1.4.2.2 diff -C2 -d -r1.4.2.1 -r1.4.2.2 *** frontierdefs.h 23 Nov 2004 16:11:47 -0000 1.4.2.1 --- frontierdefs.h 17 Jan 2005 01:19:08 -0000 1.4.2.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 62,66 **** - #undef fltrialsize #undef flruntime #define fldebug 1 --- 64,67 ---- *************** *** 78,81 **** --- 79,83 ---- #define PASCALSTRINGVERSION 1 #define SPEED 1 + #undef fltracklocaladdresses /*2004-12-08 aradke: disable [buggy] code for tracking deleted local addresses*/ #define FRONTIER_PYTHON 1 /*2004-11-23 aradke: enable globally for all platforms*/ *************** *** 109,114 **** - #define fltracklocaladdresses 0 /* enable code for tracking deleted local addresses */ - - #endif /*__FRONTIERDEFS_H__*/ --- 111,113 ---- Index: dialogs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/dialogs.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** dialogs.h 24 Oct 2004 16:16:09 -0000 1.2 --- dialogs.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: textdisplay.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/textdisplay.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** textdisplay.h 9 Oct 2004 21:11:31 -0000 1.1 --- textdisplay.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: font.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/font.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** font.h 31 Oct 2004 13:02:36 -0000 1.2 --- font.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langxml.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langxml.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langxml.h 9 Oct 2004 20:58:59 -0000 1.1 --- langxml.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: WinSockNetEvents.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/WinSockNetEvents.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** WinSockNetEvents.h 31 Oct 2004 18:00:21 -0000 1.2 --- WinSockNetEvents.h 17 Jan 2005 01:19:07 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: smallicon.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/smallicon.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** smallicon.h 9 Oct 2004 21:09:51 -0000 1.1 --- smallicon.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osawindows.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osawindows.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** osawindows.h 9 Oct 2004 21:04:23 -0000 1.1 --- osawindows.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.msvs.track.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.msvs.track.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.msvs.track.h 17 Oct 2004 13:11:46 -0000 1.1 --- shell.msvs.track.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.rsrc.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.rsrc.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.rsrc.h 9 Oct 2004 21:07:33 -0000 1.1 --- shell.rsrc.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: popup.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/popup.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** popup.h 9 Oct 2004 21:05:18 -0000 1.1 --- popup.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langparser.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langparser.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** langparser.h 28 Oct 2004 23:05:48 -0000 1.2 --- langparser.h 17 Jan 2005 01:19:09 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: stringdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/stringdefs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** stringdefs.h 9 Oct 2004 21:10:23 -0000 1.1 --- stringdefs.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 154,157 **** #define STR_menuseparator "\x02" "(-" #define STR_hexprefix "\x02" "0x" - - --- 156,157 ---- Index: dbinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/dbinternal.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** dbinternal.h 31 Oct 2004 18:00:21 -0000 1.2 --- dbinternal.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: frontier.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontier.h,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** frontier.h 26 Oct 2004 10:10:19 -0000 1.4 --- frontier.h 17 Jan 2005 01:19:08 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langpython.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langpython.h,v retrieving revision 1.1.4.8 retrieving revision 1.1.4.9 diff -C2 -d -r1.1.4.8 -r1.1.4.9 *** langpython.h 9 Jan 2005 21:34:16 -0000 1.1.4.8 --- langpython.h 17 Jan 2005 01:19:09 -0000 1.1.4.9 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opbuttons.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/opbuttons.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** opbuttons.h 9 Oct 2004 21:01:35 -0000 1.1 --- opbuttons.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: menubar.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/menubar.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** menubar.h 9 Oct 2004 20:59:59 -0000 1.1 --- menubar.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellheaders.pch =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellheaders.pch,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shellheaders.pch 9 Oct 2004 21:08:42 -0000 1.1 --- shellheaders.pch 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* * shellheaders.pch Index: macconv.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/macconv.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** macconv.h 23 Oct 2004 21:54:09 -0000 1.2 --- macconv.h 17 Jan 2005 01:19:16 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 88,92 **** static long dolongswap(long foo) { ! //#ifndef __MWERKS__ _asm { --- 90,105 ---- static long dolongswap(long foo) { ! #if defined(__i386__) && defined(__GNUC__) ! /* ! 10.0a5 - TRT - 29 Dec 2004 ! GNU by default uses the AT&T assembly code syntax; ! MSC/MWERKS uses the Intel assembly code syntax; ! some versions of 'gcc' accept -masm=att|intel to ! specify which syntax to use; but for those that don't... ! */ ! __asm__("mov foo,%eax\nbswap %eax\nmov %eax,foo\n"); ! #elif defined(__powerpc__) && defined(__GNUC__) ! foo = Endian32_Swap(foo); ! #else _asm { *************** *** 95,99 **** mov foo,eax } ! //#endif return (foo); } --- 108,112 ---- mov foo,eax } ! #endif return (foo); } *************** *** 101,104 **** --- 114,129 ---- static short doshortswap(short foo) { + #if defined(__i386__) && defined(__GNUC__) + /* + 10.0a5 - TRT - 29 Dec 2004 + GNU by default uses the AT&T assembly code syntax; + MSC/MWERKS uses the Intel assembly code syntax; + some versions of 'gcc' accept -masm=att|intel to + specify which syntax to use; but for those that don't... + */ + __asm__("mov foo,%ax\n mov %al,%bh\nmov %ah,%bl\nmov %bx,foo"); + #elif defined(__powerpc__) && defined(__GNUC__) + foo = Endian16_Swap(foo); + #else _asm { *************** *** 108,111 **** --- 133,137 ---- mov foo,bx } + #endif return (foo); } Index: langexternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langexternal.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langexternal.h 9 Oct 2004 20:57:18 -0000 1.1 --- langexternal.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ops.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/ops.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ops.h 30 Oct 2004 23:50:16 -0000 1.2 --- ops.h 17 Jan 2005 01:19:18 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 109,110 **** --- 111,113 ---- extern void getsizestring (unsigned long, bigstring); + extern unsigned long bcdtolong (unsigned long); /* 2004-11-16 creedon */ \ No newline at end of file Index: multipad.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/multipad.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** multipad.h 9 Oct 2004 21:00:59 -0000 1.1 --- multipad.h 17 Jan 2005 01:19:17 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /******************************************************************************\ * This is a part of the Microsoft Source Code Samples. Index: tableformats.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/tableformats.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** tableformats.h 9 Oct 2004 21:10:53 -0000 1.1 --- tableformats.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: zoom.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/zoom.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** zoom.h 9 Oct 2004 21:13:21 -0000 1.1 --- zoom.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opicons.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/opicons.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** opicons.h 9 Oct 2004 21:02:03 -0000 1.1 --- opicons.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: icon.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/icon.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** icon.h 9 Oct 2004 20:56:02 -0000 1.1 --- icon.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: aeutils.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/aeutils.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** aeutils.h 9 Oct 2004 20:50:52 -0000 1.1 --- aeutils.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.winrelease.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.winrelease.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.winrelease.h 9 Oct 2004 21:08:16 -0000 1.1 --- shell.winrelease.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: serialnumber.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/serialnumber.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** serialnumber.h 9 Oct 2004 21:06:38 -0000 1.1 --- serialnumber.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** shell.h 1 Nov 2004 11:50:42 -0000 1.3 --- shell.h 17 Jan 2005 01:19:19 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: FDllCall.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/FDllCall.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** FDllCall.h 9 Oct 2004 20:54:34 -0000 1.1 --- FDllCall.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: error.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/error.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** error.h 28 Oct 2004 01:51:21 -0000 1.2 --- error.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: birdruncard.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/birdruncard.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** birdruncard.h 9 Oct 2004 20:51:04 -0000 1.1 --- birdruncard.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opdisplay.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/opdisplay.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** opdisplay.h 9 Oct 2004 21:01:42 -0000 1.1 --- opdisplay.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: BASE64.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/BASE64.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** BASE64.H 9 Oct 2004 20:50:58 -0000 1.1 --- BASE64.H 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: threads.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/threads.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** threads.h 9 Oct 2004 21:11:44 -0000 1.1 --- threads.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: search.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/search.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** search.h 9 Oct 2004 21:06:32 -0000 1.1 --- search.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opxml.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/opxml.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** opxml.h 9 Oct 2004 21:03:25 -0000 1.1 --- opxml.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: lang.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -C2 -d -r1.6.2.2 -r1.6.2.3 *** lang.h 20 Dec 2004 00:00:39 -0000 1.6.2.2 --- lang.h 17 Jan 2005 01:19:09 -0000 1.6.2.3 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 1166,1169 **** --- 1168,1175 ---- extern boolean coercevalue (tyvaluerecord *, tyvaluetype); + extern boolean coercetypes (tyvaluerecord *, tyvaluerecord *); + + extern void disposevalues (tyvaluerecord *, tyvaluerecord *); + extern boolean langgetidentifier (hdltreenode, bigstring); Index: wpinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/wpinternal.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** wpinternal.h 9 Oct 2004 21:12:54 -0000 1.1 --- wpinternal.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.werks.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.werks.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.werks.h 9 Oct 2004 21:07:47 -0000 1.1 --- shell.werks.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: winregistry.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/winregistry.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** winregistry.h 17 Oct 2004 12:34:36 -0000 1.1 --- winregistry.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: wpengine.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/wpengine.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** wpengine.h 30 Oct 2004 20:49:31 -0000 1.3 --- wpengine.h 17 Jan 2005 01:19:19 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: quickdraw.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/quickdraw.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** quickdraw.h 29 Oct 2004 00:10:54 -0000 1.2 --- quickdraw.h 17 Jan 2005 01:19:18 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langsystem7.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langsystem7.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langsystem7.h 9 Oct 2004 20:58:17 -0000 1.1 --- langsystem7.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langtokens.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langtokens.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langtokens.h 9 Oct 2004 20:58:24 -0000 1.1 --- langtokens.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: about.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/about.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** about.h 24 Oct 2004 17:58:16 -0000 1.2 --- about.h 17 Jan 2005 01:19:07 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: odbinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/odbinternal.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** odbinternal.h 9 Oct 2004 21:01:14 -0000 1.1 --- odbinternal.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langdll.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langdll.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langdll.h 9 Oct 2004 20:57:10 -0000 1.1 --- langdll.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 75,79 **** odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */ ! extern void fillcalltable (XDLLProcTable * calltable); extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned); --- 77,83 ---- odbBool xCALLBACK extThreadSleep (long sleepticks); /* 2003-04-22 AR */ ! extern void dllinitverbs (void); /*2004-11-29 aradke*/ ! ! extern void fillcalltable (XDLLProcTable *); extern boolean dllisloadedverb (hdltreenode hparam1, tyvaluerecord *vreturned); Index: mac.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/mac.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** mac.h 28 Oct 2004 23:07:42 -0000 1.2 --- mac.h 17 Jan 2005 01:19:12 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: FrontierWinMain.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/FrontierWinMain.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** FrontierWinMain.h 9 Oct 2004 20:55:49 -0000 1.1 --- FrontierWinMain.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osadroplet.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osadroplet.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** osadroplet.h 9 Oct 2004 21:03:38 -0000 1.1 --- osadroplet.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: kernelverbdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/kernelverbdefs.h,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** kernelverbdefs.h 22 Nov 2004 04:31:40 -0000 1.1.4.1 --- kernelverbdefs.h 17 Jan 2005 01:19:08 -0000 1.1.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 48,51 **** #define idquicktimeverbs 1022 /*7.0b4 PBS: QuickTime Player window verbs*/ #define idregexpverbs 1023 /*2003-04-22 AR: regular expression verbs*/ ! #define idpythonverbs 1024 /* 2004-11-3 ddb: added python verbs */ ! --- 50,53 ---- #define idquicktimeverbs 1022 /*7.0b4 PBS: QuickTime Player window verbs*/ #define idregexpverbs 1023 /*2003-04-22 AR: regular expression verbs*/ ! #define idmathverbs 1024 /*2004-12-29 SMD: extended math verbs*/ ! #define idpythonverbs 1025 /*2004-11-03 ddb: added python verbs */ Index: osaparseaete.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osaparseaete.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** osaparseaete.h 9 Oct 2004 21:04:17 -0000 1.1 --- osaparseaete.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: clay.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/clay.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** clay.h 9 Oct 2004 20:52:15 -0000 1.1 --- clay.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: menuverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/menuverbs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** menuverbs.h 9 Oct 2004 21:00:27 -0000 1.1 --- menuverbs.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: oplineheight.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/oplineheight.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** oplineheight.h 9 Oct 2004 21:02:29 -0000 1.1 --- oplineheight.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: frontierconfig.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierconfig.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** frontierconfig.h 9 Oct 2004 20:55:17 -0000 1.1 --- frontierconfig.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellheaders.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellheaders.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shellheaders.h 9 Oct 2004 21:08:36 -0000 1.1 --- shellheaders.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* * MacHeaders.h Index: launch.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/launch.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** launch.h 9 Oct 2004 20:59:05 -0000 1.1 --- launch.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: stdwin.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/stdwin.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** stdwin.h 9 Oct 2004 21:10:15 -0000 1.1 --- stdwin.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /******************************************************************************\ * This is a part of the Microsoft Source Code Samples. Index: wpverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/wpverbs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** wpverbs.h 9 Oct 2004 21:13:01 -0000 1.1 --- wpverbs.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: CallMachOFrameWork.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/CallMachOFrameWork.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** CallMachOFrameWork.h 31 Oct 2004 20:41:23 -0000 1.3 --- CallMachOFrameWork.h 17 Jan 2005 01:19:07 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 28,32 **** --- 30,45 ---- extern boolean unixshellcall (Handle hcommand, Handle hreturn); + extern OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr); + extern void *getframeworkfuncptr (CFStringRef framework, CFStringRef functionname); + + extern void *convertcfmtomachofuncptr (void *); + + extern void disposemachofuncptr (void *); + + extern void *convertmachotocfmfuncptr (void *); + + extern void disposecfmfuncptr (void *); + #endif Index: textedit.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/textedit.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** textedit.h 9 Oct 2004 21:11:37 -0000 1.1 --- textedit.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: sounds.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/sounds.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** sounds.h 9 Oct 2004 21:10:07 -0000 1.1 --- sounds.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shellheaders.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellheaders.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shellheaders.c 9 Oct 2004 21:08:30 -0000 1.1 --- shellheaders.c 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* * MacHeaders.c Index: shell.windebug.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.windebug.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.windebug.h 9 Oct 2004 21:08:04 -0000 1.1 --- shell.windebug.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: md5.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/md5.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** md5.h 9 Oct 2004 20:59:35 -0000 1.1 --- md5.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* RSAGLOBAL.H - RSAREF types and constants */ Index: menu.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/menu.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** menu.h 9 Oct 2004 20:59:51 -0000 1.1 --- menu.h 17 Jan 2005 01:19:16 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: bitmaps.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/bitmaps.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** bitmaps.h 9 Oct 2004 20:51:25 -0000 1.1 --- bitmaps.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: filesystem7.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/filesystem7.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** filesystem7.h 9 Oct 2004 20:55:03 -0000 1.1 --- filesystem7.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tabledisplay.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/tabledisplay.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** tabledisplay.h 9 Oct 2004 21:10:39 -0000 1.1 --- tabledisplay.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.mcp.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.mcp.r,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.mcp.r 9 Oct 2004 21:07:26 -0000 1.1 --- shell.mcp.r 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langxcmd.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langxcmd.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** langxcmd.h 23 Oct 2004 21:53:58 -0000 1.2 --- langxcmd.h 17 Jan 2005 01:19:09 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: carbonheaders.pch =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/carbonheaders.pch,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** carbonheaders.pch 9 Oct 2004 20:52:07 -0000 1.1 --- carbonheaders.pch 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* * carbonheaders.pch Index: db.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/db.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** db.h 1 Nov 2004 12:21:42 -0000 1.2 --- db.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: strings.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/strings.h,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** strings.h 9 Nov 2004 08:54:14 -0000 1.5 --- strings.h 17 Jan 2005 01:19:19 -0000 1.5.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.msvs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.msvs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.msvs.h 17 Oct 2004 13:11:46 -0000 1.1 --- shell.msvs.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: cancoon.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/cancoon.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** cancoon.h 9 Oct 2004 20:51:39 -0000 1.1 --- cancoon.h 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: langhtml.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/langhtml.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** langhtml.h 9 Oct 2004 20:57:26 -0000 1.1 --- langhtml.h 17 Jan 2005 01:19:09 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: config.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/config.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** config.h 9 Oct 2004 20:53:39 -0000 1.1 --- config.h 17 Jan 2005 01:19:08 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: shell.win.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.win.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** shell.win.h 9 Oct 2004 21:07:57 -0000 1.1 --- shell.win.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: frontierdebug.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdebug.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** frontierdebug.h 28 Oct 2004 21:07:12 -0000 1.2 --- frontierdebug.h 17 Jan 2005 01:19:08 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: osacomponent.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osacomponent.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** osacomponent.h 9 Oct 2004 21:03:31 -0000 1.1 --- osacomponent.h 17 Jan 2005 01:19:18 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: carbonheaders.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/carbonheaders.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** carbonheaders.c 9 Oct 2004 20:51:54 -0000 1.1 --- carbonheaders.c 17 Jan 2005 01:19:07 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* * MacHeaders.c Index: windowlayout.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/windowlayout.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** windowlayout.h 9 Oct 2004 21:12:04 -0000 1.1 --- windowlayout.h 17 Jan 2005 01:19:19 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opdraggingmove.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/opdraggingmove.h,v retrievi... [truncated message content] |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:28
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/resources/Win32 Modified Files: Tag: sidewinder-branch WinLand.rc kernvelverbs.rc Log Message: final merge step Index: WinLand.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** WinLand.rc 30 Nov 2004 13:04:20 -0000 1.4.4.1 --- WinLand.rc 17 Jan 2005 01:19:21 -0000 1.4.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 151,157 **** #ifdef PIKE ! ID_OP_ICON ICON DISCARDABLE radioDoc.ico /*7.0b31 PBS*/ #else ! ID_OP_ICON ICON DISCARDABLE FTop.ico #endif --- 153,159 ---- #ifdef PIKE ! ID_OP_ICON ICON DISCARDABLE radioDoc.ico /*7.0b31 PBS*/ #else ! ID_OP_ICON ICON DISCARDABLE FTop.ico #endif *************** *** 160,175 **** ID_TABLE_ICON ICON DISCARDABLE FTtb.ico ID_WP_ICON ICON DISCARDABLE FTwp.ico ! ID_DESKTOPSCRIPT_ICON ICON DISCARDABLE FTds.ico #ifdef PIKE ! ID_OPML_ICON ICON DISCARDABLE radioDoc.ico /*7.0b24 PBS*/ #endif ! /*Appears in title bar for About and Quick Script window -- generic windows.*/ #ifdef PIKE ! IDNOTE ICON DISCARDABLE radio.ico ! #else ! IDNOTE ICON DISCARDABLE note300.ico #endif --- 162,178 ---- ID_TABLE_ICON ICON DISCARDABLE FTtb.ico ID_WP_ICON ICON DISCARDABLE FTwp.ico ! ! /*Appears in title bar for About and Quick Script window -- generic windows.*/ #ifdef PIKE ! ID_NOTE_ICON ICON DISCARDABLE radio.ico ! #else ! ID_NOTE_ICON ICON DISCARDABLE note300.ico #endif ! ID_DESKTOPSCRIPT_ICON ICON DISCARDABLE FTds.ico #ifdef PIKE ! ID_OPML_ICON ICON DISCARDABLE radioDoc.ico /*7.0b24 PBS*/ #endif *************** *** 182,186 **** IDMULTIPAD1 MENU DISCARDABLE BEGIN ! MENUITEM "Dummy" 500 END #endif --- 185,189 ---- IDMULTIPAD1 MENU DISCARDABLE BEGIN ! MENUITEM "Dummy", 500 END #endif *************** *** 189,193 **** IDMULTIPAD MENU DISCARDABLE BEGIN ! MENUITEM "Dummy" 500 END #endif --- 192,196 ---- IDMULTIPAD MENU DISCARDABLE BEGIN ! MENUITEM "Dummy", 500 END #endif *************** *** 238,242 **** MENUITEM SEPARATOR MENUITEM "&Save\tCtrl+S", filemenu+saveitem ! MENUITEM "Save as Runnable..." filemenu+saverunnableitem MENUITEM "Save a &Copy...", filemenu+saveasitem MENUITEM "&Revert", filemenu+revertitem --- 241,245 ---- MENUITEM SEPARATOR MENUITEM "&Save\tCtrl+S", filemenu+saveitem ! MENUITEM "Save as Runnable...", filemenu+saverunnableitem MENUITEM "Save a &Copy...", filemenu+saveasitem MENUITEM "&Revert", filemenu+revertitem *************** *** 853,857 **** #else #ifdef fltrialsize ! VALUE "ProductVersion", "Trial " forntier_version_string "\0" #else VALUE "ProductVersion", frontier_version_string "\0" --- 856,860 ---- #else #ifdef fltrialsize ! VALUE "ProductVersion", "Trial " frontier_version_string "\0" #else VALUE "ProductVersion", frontier_version_string "\0" *************** *** 960,963 **** --- 963,967 ---- #define PICT_Errors 267 #define Window_Errors 268 + #define Math_errors 269 #define Script_Window_Buttons 300 #define Outline_Window_Buttons 301 *************** *** 1365,1369 **** 93 Lang_Errors DISCARDABLE BEGIN "\042^0\042 is not a supported key format specification. Valid formats are 'name', 'indx' and 'prop'.\0" END 94 Lang_Errors DISCARDABLE BEGIN "Can't perform the operation because the address of a binary value is required here.\0" END ! 95 Lang_Errors DISCARDABLE BEGIN "Can't coerce the string \042^0\042 into a floating point number because it isn't in the form \0421.234\042.\0" END 96 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as an XCMD because it isn't a binary value with binary type 'XCMD' or 'XFCN'.\0" END 97 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as a UCMD because it isn't a binary value with binary type 'UCMD'.\0" END --- 1369,1373 ---- 93 Lang_Errors DISCARDABLE BEGIN "\042^0\042 is not a supported key format specification. Valid formats are 'name', 'indx' and 'prop'.\0" END 94 Lang_Errors DISCARDABLE BEGIN "Can't perform the operation because the address of a binary value is required here.\0" END ! 95 Lang_Errors DISCARDABLE BEGIN "Can't coerce the string \042^0\042 into a floating point number because it isn't in the form \042\061.234\042.\0" END 96 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as an XCMD because it isn't a binary value with binary type 'XCMD' or 'XFCN'.\0" END 97 Lang_Errors DISCARDABLE BEGIN "Can't call \042^0\042 as a UCMD because it isn't a binary value with binary type 'UCMD'.\0" END *************** *** 1411,1415 **** 139 Lang_Errors DISCARDABLE BEGIN "Can't save the database because there was an ^0.\0" END 140 Lang_Errors DISCARDABLE BEGIN "Can't rename \042^0\042 as \042^1\042 because an item with that name already exists.\0" END ! 141 Lang_Errors DISCARDABLE BEGIN "Can't encode \042^0\042 as an IP address because it isn't in the form \0420.0.0.0\042.\0" END 142 Lang_Errors DISCARDABLE BEGIN "Can't decode \042^0\042 as an IP address.\0" END 143 Lang_Errors DISCARDABLE BEGIN "Can't ^0 the specified window because it doesn't exist.\0" END --- 1415,1419 ---- 139 Lang_Errors DISCARDABLE BEGIN "Can't save the database because there was an ^0.\0" END 140 Lang_Errors DISCARDABLE BEGIN "Can't rename \042^0\042 as \042^1\042 because an item with that name already exists.\0" END ! 141 Lang_Errors DISCARDABLE BEGIN "Can't encode \042^0\042 as an IP address because it isn't in the form \042\060.0.0.0\042.\0" END 142 Lang_Errors DISCARDABLE BEGIN "Can't decode \042^0\042 as an IP address.\0" END 143 Lang_Errors DISCARDABLE BEGIN "Can't ^0 the specified window because it doesn't exist.\0" END *************** *** 1551,1554 **** --- 1555,1560 ---- 1 Window_Errors DISCARDABLE BEGIN "Internal error running \042window.^0\042.\0" END + + 1 Math_Errors DISCARDABLE BEGIN "Internal error running \042math.^0\042.\0" END 1 Script_Window_Buttons DISCARDABLE BEGIN "Run\0" END *************** *** 1892,1896 **** plain, 0, ! 40L, 40L, 460L, 100L, END --- 1898,1902 ---- plain, 0, ! 40L, 40L, 460L, 100L END *************** *** 1923,1927 **** plain, 0, ! 40L, 40L, 460L, 100L, END --- 1929,1933 ---- plain, 0, ! 40L, 40L, 460L, 100L END Index: kernvelverbs.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/kernvelverbs.rc,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** kernvelverbs.rc 22 Nov 2004 10:15:23 -0000 1.1.4.1 --- kernvelverbs.rc 17 Jan 2005 01:19:21 -0000 1.1.4.2 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 301,309 **** "clock\0", false, ! 6, "now\0", "set\0", "sleepfor\0", "ticks\0", "waitseconds\0", "waitsixtieths\0", --- 303,312 ---- "clock\0", false, ! 7, "now\0", "set\0", "sleepfor\0", "ticks\0", + "milliseconds\0", "waitseconds\0", "waitsixtieths\0", *************** *** 498,502 **** "read\0", "gettype\0", ! "write\0", END --- 501,505 ---- "read\0", "gettype\0", ! "write\0" END *************** *** 507,511 **** "string\0", //Function Processor Name false, //Window required ! 56 //Count of verbs "delete\0", "insert\0", --- 510,514 ---- "string\0", //Function Processor Name false, //Window required ! 56, //Count of verbs "delete\0", "insert\0", *************** *** 563,567 **** "ansitoutf8\0", "ansitoutf16\0", ! "multiplereplaceall\0", END --- 566,570 ---- "ansitoutf8\0", "ansitoutf16\0", ! "multiplereplaceall\0" END *************** *** 795,799 **** "getenvironmentvariable\0", "setenvironmentvariable\0", ! "unixshellcommand\0", END --- 798,802 ---- "getenvironmentvariable\0", "setenvironmentvariable\0", ! "unixshellcommand\0" END *************** *** 827,831 **** "frontier\0", //Function Processor Name true, //Window required ! 13, //Count of verbs "getprogrampath\0", "getfilepath\0", --- 830,834 ---- "frontier\0", //Function Processor Name true, //Window required ! 14, //Count of verbs "getprogrampath\0", "getfilepath\0", *************** *** 840,844 **** "gethashloopcount\0", "hideapplication\0", ! "isvalidserialnumber\0" END --- 843,848 ---- "gethashloopcount\0", "hideapplication\0", ! "isvalidserialnumber\0", ! "showapplication\0" END *************** *** 998,1002 **** "inetd\0", ! false 1, "supervisor\0" --- 1002,1006 ---- "inetd\0", ! false, 1, "supervisor\0" *************** *** 1036,1044 **** #endif //flregexpverbs ! #ifdef FRONTIER_PYTHON ! 1024 /*idpythonverbs*/ EFP DISCARDABLE BEGIN 1, //Number of "blocks" in this resource --- 1040,1057 ---- #endif //flregexpverbs ! 1024 /*mathverbs*/ EFP DISCARDABLE ! BEGIN ! 1, //Number of "blocks" in this resource ! "math\0", //Function Processor name ! false, //Window required ! 3, //Count of verbs ! "min\0", ! "max\0", ! "sqrt\0" ! END #ifdef FRONTIER_PYTHON ! 1025 /*idpythonverbs*/ EFP DISCARDABLE BEGIN 1, //Number of "blocks" in this resource |
Update of /cvsroot/frontierkernel/Frontier/Common/IOAToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/IOAToolkit Modified Files: Tag: sidewinder-branch ioa.c ioa.h ioabutton.c ioacheckbox.c ioacolorpopup.c ioacolorpopup.h ioaedittext.c ioaedittext.h ioaframe.c ioaicon.c ioaicon.h ioapicture.c ioapopup.c ioapopup.h ioaradio.c ioarect.c ioascrollbar.c ioascrollbar.h ioastatic.c Log Message: final merge step Index: ioastatic.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioastatic.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioastatic.c 23 Oct 2004 21:41:30 -0000 1.2 --- ioastatic.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioapopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapopup.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ioapopup.c 31 Oct 2004 11:58:27 -0000 1.4 --- ioapopup.c 17 Jan 2005 01:18:59 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioabutton.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioabutton.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ioabutton.c 29 Oct 2004 20:22:02 -0000 1.3 --- ioabutton.c 17 Jan 2005 01:18:59 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioa.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ioa.h 9 Oct 2004 20:28:07 -0000 1.1 --- ioa.h 17 Jan 2005 01:18:59 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioacolorpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.c,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ioacolorpopup.c 29 Oct 2004 20:22:02 -0000 1.4 --- ioacolorpopup.c 17 Jan 2005 01:18:59 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioapopup.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapopup.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ioapopup.h 9 Oct 2004 20:29:51 -0000 1.1 --- ioapopup.h 17 Jan 2005 01:18:59 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioa.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioa.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ioa.c 29 Oct 2004 20:22:02 -0000 1.3 --- ioa.c 17 Jan 2005 01:18:58 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioapicture.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioapicture.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioapicture.c 23 Oct 2004 21:40:31 -0000 1.2 --- ioapicture.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioacolorpopup.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacolorpopup.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioacolorpopup.h 29 Oct 2004 00:09:35 -0000 1.2 --- ioacolorpopup.h 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaframe.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaframe.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioaframe.c 23 Oct 2004 21:40:10 -0000 1.2 --- ioaframe.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaicon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaicon.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioaicon.c 23 Oct 2004 21:40:21 -0000 1.2 --- ioaicon.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaedittext.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaedittext.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ioaedittext.h 9 Oct 2004 20:28:56 -0000 1.1 --- ioaedittext.h 17 Jan 2005 01:18:59 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioascrollbar.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioascrollbar.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ioascrollbar.h 9 Oct 2004 20:30:24 -0000 1.1 --- ioascrollbar.h 17 Jan 2005 01:18:59 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioacheckbox.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioacheckbox.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioacheckbox.c 23 Oct 2004 21:39:35 -0000 1.2 --- ioacheckbox.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaedittext.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaedittext.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioaedittext.c 23 Oct 2004 21:39:57 -0000 1.2 --- ioaedittext.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaicon.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaicon.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ioaicon.h 9 Oct 2004 20:29:24 -0000 1.1 --- ioaicon.h 17 Jan 2005 01:18:59 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioaradio.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioaradio.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ioaradio.c 29 Oct 2004 20:22:02 -0000 1.3 --- ioaradio.c 17 Jan 2005 01:18:59 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioascrollbar.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioascrollbar.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** ioascrollbar.c 29 Oct 2004 20:22:02 -0000 1.3 --- ioascrollbar.c 17 Jan 2005 01:18:59 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ioarect.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/IOAToolkit/ioarect.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioarect.c 23 Oct 2004 21:41:09 -0000 1.2 --- ioarect.c 17 Jan 2005 01:18:59 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:27
|
Update of /cvsroot/frontierkernel/Frontier/FrontierSDK/SampleCode/FrontierDoScript/AppleEventDoScript In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/FrontierSDK/SampleCode/FrontierDoScript/AppleEventDoScript Modified Files: Tag: sidewinder-branch doscript.r main.c Log Message: final merge step Index: doscript.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/SampleCode/FrontierDoScript/AppleEventDoScript/doscript.r,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** doscript.r 9 Oct 2004 04:29:31 -0000 1.1 --- doscript.r 17 Jan 2005 01:19:53 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + data 'vers' (1) { $"0400 6002 0000 0534 2E30 6232 3934 2E30" /* ..`....4.0b294.0 */ Index: main.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/FrontierSDK/SampleCode/FrontierDoScript/AppleEventDoScript/main.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** main.c 9 Oct 2004 04:30:01 -0000 1.1 --- main.c 17 Jan 2005 01:19:53 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /*© copyright 1991-96 UserLand Software, Inc. All Rights Reserved.*/ |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:27
|
Update of /cvsroot/frontierkernel/Frontier/Common/MoreFiles In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/MoreFiles Modified Files: Tag: sidewinder-branch FSpCompat.h MoreDesktopMgr.h MoreFiles.h MoreFilesExtras.c MoreFilesExtras.h MoreFilesX.c MoreFilesX.h Optimization.h OptimizationEnd.h Log Message: final merge step Index: MoreFilesX.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreFilesX.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreFilesX.h 23 Oct 2004 21:00:33 -0000 1.1 --- MoreFilesX.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* File: MoreFilesX.h Index: MoreFiles.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreFiles.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreFiles.h 9 Oct 2004 20:14:04 -0000 1.1 --- MoreFiles.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* File: MoreFiles.h Index: MoreFilesExtras.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreFilesExtras.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreFilesExtras.h 9 Oct 2004 20:15:32 -0000 1.1 --- MoreFilesExtras.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* ** Apple Macintosh Developer Technical Support Index: MoreDesktopMgr.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreDesktopMgr.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreDesktopMgr.h 9 Oct 2004 20:13:34 -0000 1.1 --- MoreDesktopMgr.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* File: MoreDesktopMgr.h Index: MoreFilesX.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreFilesX.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreFilesX.c 23 Oct 2004 21:00:16 -0000 1.1 --- MoreFilesX.c 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* File: MoreFilesX.c Index: Optimization.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/Optimization.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** Optimization.h 9 Oct 2004 20:15:39 -0000 1.1 --- Optimization.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* ** Apple Macintosh Developer Technical Support Index: FSpCompat.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/FSpCompat.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** FSpCompat.h 9 Oct 2004 20:13:21 -0000 1.1 --- FSpCompat.h 17 Jan 2005 01:19:00 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* File: FSpCompat.h Index: MoreFilesExtras.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/MoreFilesExtras.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** MoreFilesExtras.c 9 Oct 2004 20:14:44 -0000 1.1 --- MoreFilesExtras.c 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* ** Apple Macintosh Developer Technical Support Index: OptimizationEnd.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/MoreFiles/OptimizationEnd.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** OptimizationEnd.h 9 Oct 2004 20:15:46 -0000 1.1 --- OptimizationEnd.h 17 Jan 2005 01:19:01 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* ** Apple Macintosh Developer Technical Support |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:19
|
Update of /cvsroot/frontierkernel/Frontier/Common/Paige/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/Paige/headers Modified Files: Tag: sidewinder-branch CPUDEFS.H DEFPROCS.H MACHINE.H PAIGE.H PGDEFTBL.H PGERRORS.H PGEXCEPS.H PGSETJMP.H PGTRAPS.H Userdefs.h pgHLevel.h pgMTraps.h pgMemMgr.h pgTxr.h Log Message: final merge step Index: PAIGE.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PAIGE.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PAIGE.H 9 Oct 2004 20:08:56 -0000 1.1 --- PAIGE.H 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* Paige Technology API file, copyright 1993-1995 by DataPak Software, Inc. Stronger typing added by T. R. Shaw, OITC, Inc. Index: pgMTraps.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/pgMTraps.h,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** pgMTraps.h 24 Oct 2004 22:22:38 -0000 1.3 --- pgMTraps.h 17 Jan 2005 01:19:04 -0000 1.3.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + #ifndef PGMTRAPS_H #define PGMTRAPS_H Index: Userdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/Userdefs.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** Userdefs.h 9 Oct 2004 20:10:26 -0000 1.1 --- Userdefs.h 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This header file contains user definitions which you CAN MODIFY without being affected by DataPak's possible upgrades. Index: pgTxr.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/pgTxr.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** pgTxr.h 9 Oct 2004 20:10:19 -0000 1.1 --- pgTxr.h 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* Paige Technology, copyright 1993-1995 by DataPak Software, Inc. This header file defines all the components for the built-in import-export mechanism, Index: PGSETJMP.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGSETJMP.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PGSETJMP.H 9 Oct 2004 20:09:59 -0000 1.1 --- PGSETJMP.H 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* Paige Exceptions Handler header. Original source created by Tom Shaw, OITC. Modified by Gar for DataPak Software, Inc. to be more consistent with Paige Index: MACHINE.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/MACHINE.H,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** MACHINE.H 24 Oct 2004 22:22:02 -0000 1.2 --- MACHINE.H 17 Jan 2005 01:19:04 -0000 1.2.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This is the generic header file for "machinespecific.h". You do NOT need to modify this header as its definitions are intended to compile on various Index: pgMemMgr.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/pgMemMgr.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** pgMemMgr.h 9 Oct 2004 20:09:44 -0000 1.1 --- pgMemMgr.h 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* pgMemMgr.h defines the API for Paige Memory Manager. This header file also #includes "pgMachineDefs." */ Index: PGEXCEPS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGEXCEPS.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PGEXCEPS.H 9 Oct 2004 20:09:17 -0000 1.1 --- PGEXCEPS.H 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This PAIGE file is separate to maintain compatibility with MS Foundation Class development for Windows (when users use pure MFC their compiler complains about Index: DEFPROCS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/DEFPROCS.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** DEFPROCS.H 9 Oct 2004 20:07:59 -0000 1.1 --- DEFPROCS.H 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This header file defines all the default hooks in a Paige structure. This includes both format functions (for style and paragraph) as well as Index: PGTRAPS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGTRAPS.H,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** PGTRAPS.H 24 Oct 2004 22:22:49 -0000 1.3 --- PGTRAPS.H 17 Jan 2005 01:19:04 -0000 1.3.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This header file maps machine-specific OS calls to the respective function for the currently defined platform. */ Index: CPUDEFS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/CPUDEFS.H,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** CPUDEFS.H 24 Oct 2004 22:21:48 -0000 1.3 --- CPUDEFS.H 17 Jan 2005 01:19:04 -0000 1.3.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + #ifndef CPUDEFS_H #define CPUDEFS_H *************** *** 115,118 **** --- 118,130 ---- #endif + //Auto configure for WINE - TRT - 29 Dec 2004 + #ifdef __GNUC__ + #ifdef __WINE__ + #define WIN32_COMPILE + //#define WINDOWS_EMULATE_COMPILE /* Fakes Windows environment on Mac */ + #else + #endif + #endif + #ifdef ACCESS_MS_DLL #define MS_DLL Index: pgHLevel.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/pgHLevel.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** pgHLevel.h 9 Oct 2004 20:09:24 -0000 1.1 --- pgHLevel.h 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* This header file provides function prototypes for a Mac-specific high-level wrapper around some of the otherwise complicated functions in PAIGE such as Index: PGDEFTBL.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGDEFTBL.H,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** PGDEFTBL.H 9 Oct 2004 20:09:02 -0000 1.1 --- PGDEFTBL.H 17 Jan 2005 01:19:04 -0000 1.1.4.1 *************** *** 1,2 **** --- 1,5 ---- + + /* $Id$ */ + /* Default look-up tables for PAIGE import-export mechanism. Copyright 1995-96 DataPak Software, Inc. Software by Gar. */ Index: PGERRORS.H =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/Paige/headers/PGERRORS.H,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** PGERRORS.H 24 Oct 2004 22:22:12 -0000 1.3 --- PGERRORS.H 17 Jan 2005 01:19:04 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /* This header file defines "generic" errors. |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:19
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Mac In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/resources/Mac Modified Files: Tag: sidewinder-branch ResEditTMPLsForShell.r SHELL.R aeut.r carb.r clut.r ioaapp.r iowaruntime.r kernvelverbs.r lang.r opicons.r osacomponent.r osxdialogs.r ppat.r sicn.r Log Message: final merge step Index: SHELL.R =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/SHELL.R,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** SHELL.R 26 Oct 2004 10:14:27 -0000 1.4 --- SHELL.R 17 Jan 2005 01:19:20 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 572,576 **** #else /* [1] */ ! "UserLand Frontierª", #endif /* [2] */ --- 574,578 ---- #else /* [1] */ ! "Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ #endif /* [2] */ *************** *** 609,613 **** "Command Key:", /* [7] */ ! "Internal error#^0. Please report to UserLand Technical Support", /* [8] */ "; ", --- 611,615 ---- "Command Key:", /* [7] */ ! "Internal error#^0. Please report to <http://groups.yahoo.com/group/frontierkernel/>", /* [8] */ "; ", *************** *** 2086,2090 **** --- 2088,2096 ---- 'BigD', 'STAT', + #if TARGET_API_MAC_CARBON + 133, /* normal window */ + #else 128, + #endif {100, 25, 175, 200}, 2, *************** *** 2679,2683 **** resource 'STR ' (256) { ! "UserLand Frontierª\n\nPowerful cross-platform web scripting.\n\nUse Frontier to manage large, dynamic websites with multiple authors." }; --- 2685,2689 ---- resource 'STR ' (256) { ! "Frontierª\n\nHigh performance Web content management, object database, system-level and Internet scripting environment, including source code editing and debugging" }; Index: ResEditTMPLsForShell.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ResEditTMPLsForShell.r,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ResEditTMPLsForShell.r 9 Oct 2004 08:55:53 -0000 1.1 --- ResEditTMPLsForShell.r 17 Jan 2005 01:19:20 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: opicons.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/opicons.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** opicons.r 26 Oct 2004 10:13:28 -0000 1.2 --- opicons.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: osacomponent.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/osacomponent.r,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** osacomponent.r 26 Oct 2004 10:13:48 -0000 1.4 --- osacomponent.r 17 Jan 2005 01:19:21 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- *************** *** 44,49 **** { ! "Through", 'thgh', ! "Between", 'btwn', "Against", 'agst', "OutOf", 'outo', --- 45,50 ---- { ! "Through", 'thgh', ! "Between", 'btwn', "Against", 'agst', "OutOf", 'outo', *************** *** 52,56 **** "Around", 'arnd', "Beside", 'bsid', ! "Beneath", 'bnth', "Under", 'undr', "Above", 'abve', --- 53,57 ---- "Around", 'arnd', "Beside", 'bsid', ! "Beneath", 'bnth', "Under", 'undr', "Above", 'abve', *************** *** 64,73 **** resource 'thng' (128, sysHeap) { ! 'osa ', 'LAND', 'LAND', /* ComponentDescription */ kOSASupportsCompiling + kOSASupportsConvenience + kOSASupportsEventHandling, 0x00, /*flags & mask*/ ! 'STUB', 128, /* resource where Component code is found */ ! 'STR ', 128, /* name string resource */ ! 'STR ', 129, /* info string resource */ ! 'ICON', 129 /* icon resource */ }; --- 65,74 ---- resource 'thng' (128, sysHeap) { ! 'osa ', 'LAND', 'LAND', /* ComponentDescription */ kOSASupportsCompiling + kOSASupportsConvenience + kOSASupportsEventHandling, 0x00, /*flags & mask*/ ! 'STUB', 128, /* resource where Component code is found */ ! 'STR ', 128, /* name string resource */ ! 'STR ', 129, /* info string resource */ ! 'ICON', 129 /* icon resource */ }; *************** *** 94,106 **** { /* array StringArray: 5 elements */ /* [1] */ ! "UserLand Frontierª", /* [2] */ "UserTalk", /* [2] */ ! "UserLand Frontierª UserTalk scripting component", /* [4] */ ! "UserLand Frontierª Menu Sharing component", /* [5] */ ! "UserLand Frontierª Window Sharing component" } }; --- 95,107 ---- { /* array StringArray: 5 elements */ /* [1] */ ! "Frontier", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [2] */ "UserTalk", /* [2] */ ! "Frontier UserTalk scripting component", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [4] */ ! "Frontier Menu Sharing component", /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ /* [5] */ ! "Frontier Window Sharing component" /* 2005-01-04 creedon - removed UserLand and (tm) for open source release */ } }; Index: osxdialogs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/osxdialogs.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** osxdialogs.r 26 Oct 2004 10:13:59 -0000 1.2 --- osxdialogs.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: ioaapp.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ioaapp.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ioaapp.r 26 Oct 2004 10:12:24 -0000 1.2 --- ioaapp.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: kernvelverbs.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/kernvelverbs.r,v retrieving revision 1.2.4.3 retrieving revision 1.2.4.4 diff -C2 -d -r1.2.4.3 -r1.2.4.4 *** kernvelverbs.r 28 Nov 2004 06:51:47 -0000 1.2.4.3 --- kernvelverbs.r 17 Jan 2005 01:19:21 -0000 1.2.4.4 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" #include "kernelverbdefs.h" --- 26,29 ---- *************** *** 337,340 **** --- 338,342 ---- "sleepfor", "ticks", + "milliseconds", /* 2005-01-08 SMD */ "waitseconds", "waitsixtieths" *************** *** 884,888 **** "gethashloopcount", "hideapplication", ! "isvalidserialnumber" } } --- 886,891 ---- "gethashloopcount", "hideapplication", ! "isvalidserialnumber", ! "showapplication" } } *************** *** 1098,1101 **** --- 1101,1115 ---- }; + resource 'EFP#' (idmathverbs, "math") { /*2004-12-29 SMD: math verbs*/ + + { + "math", false, { + + "min", + "max", + "sqrt" + } + } + }; #ifdef FRONTIER_PYTHON *************** *** 1112,1115 **** #endif - - --- 1126,1127 ---- Index: iowaruntime.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/iowaruntime.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** iowaruntime.r 26 Oct 2004 10:12:37 -0000 1.2 --- iowaruntime.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: lang.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/lang.r,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** lang.r 26 Oct 2004 10:13:15 -0000 1.4 --- lang.r 17 Jan 2005 01:19:21 -0000 1.4.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- *************** *** 1031,1034 **** --- 1032,1042 ---- }; + resource 'STR#' (269, "Math Errors", purgeable) { + { /* array StringArray: 1 elements */ + /* [1] */ + "Internal error running \"math.^0\"." + } + }; + resource 'DLOG' (259, "notify", purgeable) { {0, 0, 107, 375}, Index: aeut.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/aeut.r,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** aeut.r 26 Oct 2004 10:11:51 -0000 1.3 --- aeut.r 17 Jan 2005 01:19:20 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: clut.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/clut.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** clut.r 26 Oct 2004 10:12:13 -0000 1.2 --- clut.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: sicn.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/sicn.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** sicn.r 26 Oct 2004 10:14:38 -0000 1.2 --- sicn.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: carb.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/carb.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** carb.r 26 Oct 2004 10:12:02 -0000 1.2 --- carb.r 17 Jan 2005 01:19:20 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- Index: ppat.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Mac/ppat.r,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** ppat.r 26 Oct 2004 10:14:14 -0000 1.2 --- ppat.r 17 Jan 2005 01:19:21 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 24,28 **** ******************************************************************************/ - #include "frontier.r" --- 26,29 ---- |
Update of /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/UserLandIACToolkit Modified Files: Tag: sidewinder-branch ipcdriver.h land.c landcallbacks.c landgetparam.c landinternal.h landops.c landppc.c landpush.c landqueue.c landreturn.c landruntime.c landsystem6.c landsystem7.c landtransport.c landtransport.h landverbarray.c landwindow.c Log Message: final merge step Index: landruntime.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landruntime.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landruntime.c 9 Oct 2004 06:14:34 -0000 1.1 --- landruntime.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landtransport.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landtransport.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landtransport.h 9 Oct 2004 06:15:25 -0000 1.1 --- landtransport.h 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landgetparam.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landgetparam.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landgetparam.c 23 Oct 2004 21:30:16 -0000 1.2 --- landgetparam.c 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landwindow.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landwindow.c 9 Oct 2004 06:15:43 -0000 1.1 --- landwindow.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: ipcdriver.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/ipcdriver.h,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** ipcdriver.h 9 Oct 2004 06:12:55 -0000 1.1 --- ipcdriver.h 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landtransport.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landtransport.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landtransport.c 9 Oct 2004 06:15:19 -0000 1.1 --- landtransport.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landinternal.h,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landinternal.h 28 Oct 2004 23:01:26 -0000 1.2 --- landinternal.h 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landreturn.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landreturn.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landreturn.c 23 Oct 2004 21:31:07 -0000 1.2 --- landreturn.c 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landsystem6.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem6.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landsystem6.c 9 Oct 2004 06:14:44 -0000 1.1 --- landsystem6.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landpush.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landpush.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landpush.c 23 Oct 2004 21:30:45 -0000 1.2 --- landpush.c 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landsystem7.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landsystem7.c,v retrieving revision 1.5 retrieving revision 1.5.4.1 diff -C2 -d -r1.5 -r1.5.4.1 *** landsystem7.c 29 Oct 2004 21:56:45 -0000 1.5 --- landsystem7.c 17 Jan 2005 01:19:06 -0000 1.5.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: land.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/land.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** land.c 29 Oct 2004 20:59:44 -0000 1.3 --- land.c 17 Jan 2005 01:19:06 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landverbarray.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landverbarray.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landverbarray.c 23 Oct 2004 21:31:36 -0000 1.2 --- landverbarray.c 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landppc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landppc.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landppc.c 9 Oct 2004 06:14:02 -0000 1.1 --- landppc.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landqueue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landqueue.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** landqueue.c 29 Oct 2004 07:25:10 -0000 1.3 --- landqueue.c 17 Jan 2005 01:19:06 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landcallbacks.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landcallbacks.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** landcallbacks.c 9 Oct 2004 06:13:26 -0000 1.1 --- landcallbacks.c 17 Jan 2005 01:19:06 -0000 1.1.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: landops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/UserLandIACToolkit/landops.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** landops.c 23 Oct 2004 21:30:29 -0000 1.2 --- landops.c 17 Jan 2005 01:19:06 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** |
|
From: David B. <dav...@us...> - 2005-01-17 01:21:17
|
Update of /cvsroot/frontierkernel/Frontier/Common/stubs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16183/Common/stubs Modified Files: Tag: sidewinder-branch megastubs.c megastubs2.c minneed.c Log Message: final merge step Index: minneed.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/stubs/minneed.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** minneed.c 23 Oct 2004 21:29:54 -0000 1.2 --- minneed.c 17 Jan 2005 01:19:49 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: megastubs2.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/stubs/megastubs2.c,v retrieving revision 1.2 retrieving revision 1.2.4.1 diff -C2 -d -r1.2 -r1.2.4.1 *** megastubs2.c 23 Oct 2004 21:29:43 -0000 1.2 --- megastubs2.c 17 Jan 2005 01:19:49 -0000 1.2.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: megastubs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/stubs/megastubs.c,v retrieving revision 1.3 retrieving revision 1.3.4.1 diff -C2 -d -r1.3 -r1.3.4.1 *** megastubs.c 23 Oct 2004 21:29:31 -0000 1.3 --- megastubs.c 17 Jan 2005 01:19:49 -0000 1.3.4.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** *************** *** 82,85 **** --- 84,99 ---- tenbuf = tenbytebuffer->x80; + #if defined(__i386__) && defined(__GNUC__) + /* + 10.0a5 - TRT - 29 Dec 2004 + GNU by default uses the AT&T assembly code syntax; + MSC/MWERKS uses the Intel assembly code syntax; + some versions of 'gcc' accept -masm=att|intel to + specify which syntax to use; but for those that don't... + */ + __asm__("FLD foo/\nFWAIT/\nFSTP tbyte ptr myext/\nFWAIT/"); + #elif defined(__powerpc__) && defined(__GNUC__) + dtox80(&foo, tenbytebuffer); /* at present - see fp.h in Universal Interfaces */ + #else _asm { FLD foo; *************** *** 88,91 **** --- 102,106 ---- FWAIT; } + #endif for (i = 9; i >= 0; i--) { *************** *** 108,111 **** --- 123,138 ---- } + #if defined(__i386__) && defined(__GNUC__) + /* + 10.0a5 - TRT - 29 Dec 2004 + GNU by default uses the AT&T assembly code syntax; + MSC/MWERKS uses the Intel assembly code syntax; + some versions of 'gcc' accept -masm=att|intel to + specify which syntax to use; but for those that don't... + */ + __asm__("FLD tbyte ptr myext\nFWAIT/\nFSTP getfoo/\nFWAIT/"); + #elif defined(__powerpc__) && defined(__GNUC__) + *foo = x80tod(tenbytebuffer); /* at present - see fp.h in Universal Interfaces */ + #else _asm { FLD tbyte ptr myext *************** *** 114,117 **** --- 141,145 ---- FWAIT; } + #endif *foo = getfoo; |
1 message has been excluded from this view by a project administrator.
