Menu
▾
▴
[frontierkernel-commits] Frontier/Common/source FastTimes.c,NONE,1.5.2.1 langmath.c,NONE,1.2.2.1 CallMachOFrameWork.c,1.4,1.4.6.1 FrontierMacMain.c,1.1,1.1.6.1 FrontierWinMain.c,1.3,1.3.6.1 OSXSpecifics.c,1.1,1.1.6.1 OpenTransportNetEvents.c,1.6,1.6.6.1 WinSockNetEvents.c,1.3,1.3.6.1 aeutils.c,1.3,1.3.6.1 appletglue.c,1.2,1.2.6.1 assert.c,1.6,1.6.6.1 base64.c,1.2,1.2.6.1 bitmaps.c,1.2,1.2.6.1 browserverbs.c,1.1,1.1.6.1 cancoon.c,1.4,1.4.6.1 cancoonpopup.c,1.3,1.3.6.1 cancoonverbs.c,1.2,1.2.6.1 cancoonwindow.c,1.3,1.3.6.1 claybrowserexpand.c,1.2,1.2.6.1 claybrowserstruc.c,1.3,1.3.6.1 claybrowservalidate.c,1.3,1.3.6.1 claycallbacks.c,1.3,1.3.6.1 claylinelayout.c,1.3,1.3.6.1 command.c,1.3,1.3.6.1 config.c,1.1,1.1.6.1 cursor.c,1.3,1.3.6.1 db.c,1.5,1.5.6.1 dbstats.c,1.2,1.2.6.1 dbverbs.c,1.3,1.3.6.1 dialogs.c,1.4,1.4.6.1 dockmenu.c,1.3,1.3.6.1 error.c,1.3,1.3.6.1 file.c,1.3,1.3.6.1 filealias.c,1.3,1.3.6.1 filedialog.c,1.4,1.4.6.1 filelaunch.c,1.3,1.3.6.1 fileloop.c,1.3,1.3.6.1 filemp3.c,1.2,1.2.6.1 fileops.c,1.4,1.4.6.1 filepath.c,1.3,1.3.6.1 fileverbs.c,1.3,1.3.6.1 findinfile.c,1.3,1.3.6.1 font.c,1.3,1.3.6.1 frontierconfig.c,1.2,1.2.6.1 frontierdebug.c,1.3,1.3.6.1 frontierstart.c,1.2,1.2.6.1 frontierwindows.c,1.3,1.3.6.1 htmlcontrol.c,1.2,1.2.6.1 icon.c,1.3,1.3.6.1 iso8859.c,1.1,1.1.6.1 kb.c,1.3,1.3.6.1 lang.c,1.4.4.1,1.4.4.1.2.1 langcallbacks.c,1.2,1.2.6.1 langcard.c,1.3,1.3.6.1 langdate.c,1.2,1.2.6.1 langdialog.c,1.3,1.3.6.1 langdll.c,1.3,1.3.6.1 langerror.c,1.3,1.3.6.1 langerrorwindow.c,1.3,1.3.6.1 langevaluate.c,1.3.4.3,1.3.4.3.2.1 langexternal.c,1.3,1.3.6.1 langhash.c,1.4,1.4.6.1 langhtml.c,1.3,1.3.6.1 langipc.c,1.5,1.5.6.1 langipcmenus.c,1.2,1.2.6.1 langlist.c,1.6,1.6.6.1 langmodeless.c,1.3,1.3.6.1 langops.c,1.3,1.3.6.1 langpack.c,1.3,1.3.6.1 langparser.c,1.3,1.3.6.1 langparser.y,1.2,1.2.6.1 langpython.c,1.2.4.35,1.2.4.35.2.1 langquicktime.c,1.2,1.2.6.1 langregexp.c,1.6,1.6.6.1 langscan.c,1.3,1.3.6.1 langstartup.c,1.3,1.3.6.1 langsystem7.c,1.1,1.1.6.1 langsystypes.c,1.3,1.3.6.1 langtmpstack.c,1.2,1.2.6.1 langtrace.c,1.3,1.3.6.1 langtree.c,1.4,1.4.6.1 langvalue.c,1.5.4.4,1.5.4.4.2.1 langverbs.c,1.5.4.1,1.5.4.1.2.1 langwinipc.c,1.3,1.3.6.1 langxcmd.c,1.2,1.2.6.1 langxml.c,1.3,1.3.6.1 launch.c,1.5,1.5.6.1 mac.c,1.3,1.3.6.1 main.c,1.3,1.3.6.1 md5.c,1.1,1.1.6.1 memory.c,1.4,1.4.4.1 memory.track.c,1.1,1.1.6.1 menu.c,1.3,1.3.6.1 menubar.c,1.3,1.3.6.1 menueditor.c,1.3.4.1,1.3.4.1.2.1 menufind.c,1.2,1.2.6.1 menupack.c,1.3,1.3.6.1 menuresize.c,1.2,1.2.6.1 menuverbs.c,1.3.4.1,1.3.4.1.2.1 meprograms.c,1.3,1.3.6.1 miniwindow.c,1.3,1.3.6.1 mouse.c,1.3,1.3.6.1 notify.c,1.2,1.2.6.1 odbengine.c,1.4,1.4.6.1 op.c,1.4,1.4.6.1 opbuttons.c,1.3,1.3.6.1 opdisplay.c,1.5,1.5.6.1 opdraggingmove.c,1.3,1.3.6.1 opedit.c,1.3,1.3.6.1 opexpand.c,1.2,1.2.6.1 ophoist.c,1.3,1.3.6.1 opicons.c,1.3,1.3.6.1 opinit.c,1.3,1.3.6.1 oplangtext.c,1.3.4.3,1.3.4.3.2.1 oplineheight.c,1.2,1.2.6.1 oplist.c,1.5,1.5.6.1 opops.c,1.4.4.1,1.4.4.1.2.1 oppack.c,1.3,1.3.6.1 oppopup.c,1.3,1.3.6.1 opprint.c,1.3,1.3.6.1 oprefcon.c,1.2,1.2.6.1 ops.c,1.3,1.3.6.1 opscreenmap.c,1.2,1.2.6.1 opscrollbar.c,1.3,1.3.6.1 opstructure.c,1.3,1.3.6.1 opvalidate.c,1.2,1.2.6.1 opverbs.c,1.4,1.4.6.1 opvisit.c,1.2,1.2.6.1 opwinpad.c,1.1,1.1.6.1 opxml.c,1.3,1.3.6.1 osacomponent.c,1.6,1.6.6.1 osadroplet.c,1.4,1.4.6.1 osamenus.c,1.3,1.3.6.1 osaparseaete.c,1.2,1.2.6.1 osawindows.c,1.3,1.3.6.1 outlineland.c,1.1,1.1.6.1 pict.c,1.3,1.3.6.1 pictverbs.c,1.3,1.3.6.1 player.c,1.3,1.3.6.1 popup.c,1.2,1.2.6.1 process.c,1.3,1.3.6.1 progressbar.c,1.1,1.1.6.1 quickdraw.c,1.3,1.3.6.1 resources.c,1.3,1.3.6.1 scrap.c,1.3,1.3.6.1 scripts.c,1.3.4.2,1.3.4.2.2.1 scrollbar.c,1.3,1.3.6.1 search.c,1.2,1.2.6.1 serialnumber.c,1.2,1.2.6.1 services.c,1.3,1.3.6.1 shell.c,1.4.4.2,1.4.4.2.2.1 shellactivate.c,1.2,1.2.6.1 shellblocker.c,1.2,1.2.6.1 shellbuttons.c,1.5,1.5.6.1 shellcallbacks.c,1.3,1.3.6.1 shellfile.c,1.3,1.3.6.1 shellhooks.c,1.3,1.3.6.1 shelljuggler.c,1.2,1.2.6.1 shellkb.c,1.3,1.3.6.1 shellmenu.c,1.3,1.3.6.1 shellmouse.c,1.3,1.3.6.1 shellops.c,1.3,1.3.6.1 shellprint.c,1.3,1.3.6.1 shellscrap.c,1.3,1.3.6.1 shellscroll.c,1.3,1.3.6.1 shellsysverbs.c,1.3,1.3.6.1 shellundo.c,1.3,1.3.6.1 shellupdate.c,1.3,1.3.6.1 shellverbs.c,1.3,1.3.6.1 shellwindow.c,1.3.4.1,1.3.4.1.2.1 shellwindowmenu.c,1.2,1.2.6.1 shellwindowverbs.c,1.3,1.3.6.1 smallicon.c,1.3,1.3.6.1 sounds.c,1.3,1.3.6.1 stdwin.c,1.1,1.1.6.1 strings.c,1.5,1.5.6.1 stringverbs.c,1.3,1.3.6.1 tablecallbacks.c,1.1,1.1.6.1 tablecompare.c,1.4,1.4.6.1 tabledisplay.c,1.3,1.3.6.1 tableedit.c,1.2,1.2.6.1 tableexternal.c,1.3,1.3.6.1 tablefind.c,1.3,1.3.6.1 tableformats.c,1.3,1.3.6.1 tablelayout.c,1.1,1.1.6.1 tablenewvalue.c,1.1,1.1.6.1 tableops.c,1.3,1.3.6.1 tablepack.c,1.3,1.3.6.1 tablepopup.c,1.3,1.3.6.1 tableprint.c,1.1,1.1.6.1 tablerunbutton.c,1.3,1.3.6.1 tablescrap.c,1.3,1.3.6.1 tablestructure.c,1.3,1.3.6.1 tablevalidate.c,1.3,1.3.6.1 tableverbs.c,1.3,1.3.6.1 tablewindow.c,1.3,1.3.6.1 textdisplay.c,1.3,1.3.6.1 textedit.c,1.2,1.2.6.1 threads.c,1.4,1.4.6.1 timedate.c,1.3,1.3.6.1 uisharing.c,1.4,1.4.6.1 winregistry.c,1.2,1.2.6.1 wpengine.c,1.4.4.1,1.4.4.1.2.1 wpvariables.c,1.1,1.1.6.1 wpverbs.c,1.3,1.3.6.1 zoom.c,1.3,1.3.6.1
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11552/Common/source Modified Files: Tag: sidewinder-merge-20050115 CallMachOFrameWork.c FrontierMacMain.c FrontierWinMain.c OSXSpecifics.c OpenTransportNetEvents.c WinSockNetEvents.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-merge-20050115 FastTimes.c langmath.c Log Message: merge from head Index: uisharing.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v retrieving revision 1.4 retrieving revision 1.4.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** uisharing.c 31 Oct 2004 16:38:27 -0000 1.4 --- uisharing.c 16 Jan 2005 08:07:55 -0000 1.4.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** claylinelayout.c 31 Oct 2004 17:59:48 -0000 1.3 --- claylinelayout.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langmodeless.c 1 Nov 2004 11:50:16 -0000 1.3 --- langmodeless.c 16 Jan 2005 08:07:51 -0000 1.3.6.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.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** FrontierMacMain.c 9 Oct 2004 07:25:06 -0000 1.1 --- FrontierMacMain.c 16 Jan 2005 08:07:34 -0000 1.1.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** scrap.c 31 Oct 2004 16:45:52 -0000 1.3 --- scrap.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** shellwindowmenu.c 23 Oct 2004 22:57:24 -0000 1.2 --- shellwindowmenu.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** tablevalidate.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablevalidate.c 16 Jan 2005 08:07:55 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** dockmenu.c 29 Oct 2004 21:55:24 -0000 1.3 --- dockmenu.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** odbengine.c 1 Nov 2004 12:21:31 -0000 1.4 --- odbengine.c 16 Jan 2005 08:07:53 -0000 1.4.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** tablewindow.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablewindow.c 16 Jan 2005 08:07:55 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** zoom.c 31 Oct 2004 16:38:27 -0000 1.3 --- zoom.c 16 Jan 2005 08:07:55 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** fileloop.c 4 Nov 2004 21:12:51 -0000 1.3 --- fileloop.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** shellactivate.c 23 Oct 2004 22:52:23 -0000 1.2 --- shellactivate.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** menuresize.c 23 Oct 2004 22:36:57 -0000 1.2 --- menuresize.c 16 Jan 2005 08:07:52 -0000 1.2.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** oprefcon.c 23 Oct 2004 22:43:24 -0000 1.2 --- oprefcon.c 16 Jan 2005 08:07:53 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** smallicon.c 31 Oct 2004 16:45:52 -0000 1.3 --- smallicon.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langxml.c 31 Oct 2004 18:48:51 -0000 1.3 --- langxml.c 16 Jan 2005 08:07:52 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** claybrowservalidate.c 31 Oct 2004 17:59:48 -0000 1.3 --- claybrowservalidate.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.1.2.1 diff -C2 -d -r1.3.4.1 -r1.3.4.1.2.1 *** shellwindow.c 30 Nov 2004 13:04:21 -0000 1.3.4.1 --- shellwindow.c 16 Jan 2005 08:07:54 -0000 1.3.4.1.2.1 *************** *** 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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** ophoist.c 1 Nov 2004 11:50:16 -0000 1.3 --- ophoist.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** osawindows.c 28 Oct 2004 20:49:26 -0000 1.3 --- osawindows.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** claybrowserexpand.c 23 Oct 2004 22:13:52 -0000 1.2 --- claybrowserexpand.c 16 Jan 2005 08:07:49 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** tablepack.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablepack.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** cancoonpopup.c 31 Oct 2004 17:31:02 -0000 1.3 --- cancoonpopup.c 16 Jan 2005 08:07:49 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** menufind.c 23 Oct 2004 22:36:34 -0000 1.2 --- menufind.c 16 Jan 2005 08:07:52 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** ops.c 26 Oct 2004 10:24:57 -0000 1.3 --- ops.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** WinSockNetEvents.c 23 Oct 2004 23:06:40 -0000 1.3 --- WinSockNetEvents.c 16 Jan 2005 08:07:34 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** tablerunbutton.c 31 Oct 2004 20:41:10 -0000 1.3 --- tablerunbutton.c 16 Jan 2005 08:07:55 -0000 1.3.6.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.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** OpenTransportNetEvents.c 31 Oct 2004 17:59:48 -0000 1.6 --- OpenTransportNetEvents.c 16 Jan 2005 08:07:34 -0000 1.6.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** cursor.c 30 Oct 2004 23:50:28 -0000 1.3 --- cursor.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** filealias.c 29 Oct 2004 07:25:21 -0000 1.3 --- filealias.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** shellblocker.c 23 Oct 2004 22:52:35 -0000 1.2 --- shellblocker.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** opbuttons.c 24 Oct 2004 19:16:36 -0000 1.3 --- opbuttons.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.35.2.1 diff -C2 -d -r1.2.4.35 -r1.2.4.35.2.1 *** langpython.c 9 Jan 2005 21:34:08 -0000 1.2.4.35 --- langpython.c 16 Jan 2005 08:07:52 -0000 1.2.4.35.2.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** Index: tablelayout.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablelayout.c,v retrieving revision 1.1 retrieving revision 1.1.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** tablelayout.c 9 Oct 2004 08:08:51 -0000 1.1 --- tablelayout.c 16 Jan 2005 08:07:54 -0000 1.1.6.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.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** tableprint.c 9 Oct 2004 08:09:52 -0000 1.1 --- tableprint.c 16 Jan 2005 08:07:55 -0000 1.1.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** shellhooks.c 24 Oct 2004 19:24:34 -0000 1.3 --- shellhooks.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** opicons.c 31 Oct 2004 19:08:16 -0000 1.3 --- opicons.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** pict.c 29 Oct 2004 21:14:52 -0000 1.3 --- pict.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** serialnumber.c 23 Oct 2004 22:51:36 -0000 1.2 --- serialnumber.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** htmlcontrol.c 23 Oct 2004 22:22:09 -0000 1.2 --- htmlcontrol.c 16 Jan 2005 08:07:50 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** shellsysverbs.c 27 Oct 2004 18:57:55 -0000 1.3 --- shellsysverbs.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langdll.c 30 Oct 2004 23:15:04 -0000 1.3 --- langdll.c 16 Jan 2005 08:07:51 -0000 1.3.6.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.1.2.1 diff -C2 -d -r1.4.4.1 -r1.4.4.1.2.1 *** lang.c 20 Dec 2004 00:00:20 -0000 1.4.4.1 --- lang.c 16 Jan 2005 08:07:50 -0000 1.4.4.1.2.1 *************** *** 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.1.2.1 diff -C2 -d -r1.4.4.1 -r1.4.4.1.2.1 *** wpengine.c 30 Nov 2004 10:58:05 -0000 1.4.4.1 --- wpengine.c 16 Jan 2005 08:07:55 -0000 1.4.4.1.2.1 *************** *** 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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** opinit.c 1 Nov 2004 11:50:16 -0000 1.3 --- opinit.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** winregistry.c 24 Oct 2004 12:30:58 -0000 1.2 --- winregistry.c 16 Jan 2005 08:07:55 -0000 1.2.6.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.6.1 diff -C2 -d -r1.5 -r1.5.6.1 *** opdisplay.c 1 Nov 2004 11:50:16 -0000 1.5 --- opdisplay.c 16 Jan 2005 08:07:53 -0000 1.5.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** dbstats.c 23 Oct 2004 22:15:59 -0000 1.2 --- dbstats.c 16 Jan 2005 08:07:50 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** mac.c 28 Oct 2004 23:08:45 -0000 1.3 --- mac.c 16 Jan 2005 08:07:52 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** osaparseaete.c 23 Oct 2004 22:47:22 -0000 1.2 --- osaparseaete.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** shellkb.c 1 Nov 2004 11:50:16 -0000 1.3 --- shellkb.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** osadroplet.c 1 Nov 2004 11:50:16 -0000 1.4 --- osadroplet.c 16 Jan 2005 08:07:54 -0000 1.4.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langsystypes.c 31 Oct 2004 18:48:51 -0000 1.3 --- langsystypes.c 16 Jan 2005 08:07:52 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** langtrace.c 31 Oct 2004 19:08:15 -0000 1.3 --- langtrace.c 16 Jan 2005 08:07:52 -0000 1.3.6.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.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** outlineland.c 9 Oct 2004 07:56:28 -0000 1.1 --- outlineland.c 16 Jan 2005 08:07:54 -0000 1.1.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** oplineheight.c 23 Oct 2004 22:42:02 -0000 1.2 --- oplineheight.c 16 Jan 2005 08:07:53 -0000 1.2.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** opprint.c 1 Nov 2004 11:50:17 -0000 1.3 --- opprint.c 16 Jan 2005 08:07:53 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** shellops.c 1 Nov 2004 11:50:16 -0000 1.3 --- shellops.c 16 Jan 2005 08:07:54 -0000 1.3.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** error.c 28 Oct 2004 01:51:26 -0000 1.3 --- error.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.2 -r1.2.6.1 *** popup.c 23 Oct 2004 22:49:15 -0000 1.2 --- popup.c 16 Jan 2005 08:07:54 -0000 1.2.6.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.6.1 diff -C2 -d -r1.4 -r1.4.6.1 *** fileops.c 29 Oct 2004 19:58:27 -0000 1.4 --- fileops.c 16 Jan 2005 08:07:50 -0000 1.4.6.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.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** wpvariables.c 9 Oct 2004 08:14:19 -0000 1.1 --- wpvariables.c 16 Jan 2005 08:07:55 -0000 1.1.6.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.6.1 diff -C2 -d -r1.1 -r1.1.6.1 *** OSXSpecifics.c 9 Oct 2004 07:56:14 -0000 1.1 --- OSXSpecifics.c 16 Jan 2005 08:07:34 -0000 1.1.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** fileverbs.c 29 Oct 2004 19:58:27 -0000 1.3 --- fileverbs.c 16 Jan 2005 08:07:50 -0000 1.3.6.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.6.1 diff -C2 -d -r1.6 -r1.6.6.1 *** assert.c 9 Nov 2004 21:10:47 -0000 1.6 --- assert.c 16 Jan 2005 08:07:35 -0000 1.6.6.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.6.1 diff -C2 -d -r1.3 -r1.3.6.1 *** opxml.c 31 Oct 2004 21:43:38 -0000 1.3 --- opxml.c 16 Jan 2005 08:07:54 -0000 1.3.6.1 *************** *** 1,3 **** --- 1,5 ---- + /* $Id$ */ + /****************************************************************************** --- NEW FILE: langmath.c --- /* $Id: langmath.c,v 1.2.2.1 2005/01/16 08:07:51 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: return setdatevalue (timegreaterthan (v1.data.datevalue, v2.data.datevalue) ? v1.data.datevalue : v2.data.datevalue, v); case singlevaluetype: return setsinglevalue (max (v1.data.singlevalue, v2.data.singlevalue), v); case doublevaluetype: return setdoublevalue (max (**v1.data.doublevalue, **v2.data.doublevalue), v); case stringvaluetype: { Handle h; if (comparehandles (v1.data.stringvalue, v2.data.stringvalue) == 1) copyhandle (v1.data.stringvalue, &h); else copyhandle (v2.data.stringvalue, &h); return (setheapvalue (h, stringvaluetype, v)); } default: langerror (comparisonnotpossibleerror); fl = false; /*o... [truncated message content] |
