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: Andre R. <and...@us...> - 2004-11-03 21:21:09
|
Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12105 Modified Files: WinLand.rc Log Message: Include frontierdefs.h to pick up flregexpverbs and possibly other preprocessor definitions. Index: WinLand.rc =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WinLand.rc 17 Oct 2004 12:39:57 -0000 1.3 --- WinLand.rc 3 Nov 2004 21:20:58 -0000 1.4 *************** *** 31,38 **** //#include "resource.h" ! /* 2004-10-17 AR: pick up flregexpverbs and possibly other definitions */ #include "standard.h" - #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// --- 31,38 ---- //#include "resource.h" ! /* 2004-11-03 AR: pick up flregexpverbs and possibly other definitions */ ! #include "frontierdefs.h" #include "standard.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// |
|
From: Andre R. <and...@us...> - 2004-11-03 21:20:13
|
Update of /cvsroot/frontierkernel/Frontier/build_VC6 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11901 Modified Files: Frontier.dsp Log Message: Added frontierdefs.h to project. Index: Frontier.dsp =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_VC6/Frontier.dsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Frontier.dsp 24 Oct 2004 12:43:49 -0000 1.2 --- Frontier.dsp 3 Nov 2004 21:20:03 -0000 1.3 *************** *** 1019,1022 **** --- 1019,1026 ---- # Begin Source File + SOURCE=..\Common\headers\frontierdefs.h + # End Source File + # Begin Source File + SOURCE=..\Common\headers\frontierstart.h # End Source File |
|
From: Andre R. <and...@us...> - 2004-11-01 13:54:44
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25731 Modified Files: frontier.r frontierdefs.h Log Message: Reorganized global headers slightly. Introduced FRONTIER_FRAMEWORK_INCLUDES preprocessor directive, applicable to C and rez compilation. Index: frontier.r =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontier.r,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frontier.r 26 Oct 2004 10:09:38 -0000 1.1 --- frontier.r 1 Nov 2004 13:54:28 -0000 1.2 *************** *** 32,37 **** ! #ifdef TARGET_API_MAC_CARBON ! #include <Carbon/Carbon.r> #else #include <MacTypes.r> --- 32,41 ---- ! #if TARGET_API_MAC_CARBON ! #ifdef FRONTIER_FRAMEWORK_INCLUDES ! #include <Carbon/Carbon.r> ! #else ! #include <Carbon.r> ! #endif #else #include <MacTypes.r> Index: frontierdefs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/frontierdefs.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frontierdefs.h 26 Oct 2004 10:08:31 -0000 1.1 --- frontierdefs.h 1 Nov 2004 13:54:29 -0000 1.2 *************** *** 49,53 **** #ifdef __powerc #define noextended 1 ! #elif __GNUC__ #define noextended 1 #else --- 49,53 ---- #ifdef __powerc #define noextended 1 ! #elif defined(__GNUC__) #define noextended 1 #else |
|
From: Andre R. <and...@us...> - 2004-11-01 13:25:35
|
Update of /cvsroot/frontierkernel/Frontier/build_CWPro8 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20500 Modified Files: Frontier.mcp Log Message: Remove shell.*.h prefix headers for rez compilation. Switch to frontier.osx.r and frontier.ppc.r instead. Index: Frontier.mcp =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_CWPro8/Frontier.mcp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 Binary files /tmp/cvsopl4Xe and /tmp/cvs9uTTzH differ |
|
From: Andre R. <and...@us...> - 2004-11-01 13:20:07
|
Update of /cvsroot/frontierkernel/Frontier/build_CWPro8/prefix_headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19408 Added Files: frontier.ppc.r frontier.osx.r Log Message: Prefix files for CodeWarrior rez compiler. --- NEW FILE: frontier.osx.r --- /****************************************************************************** UserLand Frontier(tm) -- High performance Web content management, object database, system-level and Internet scripting environment, including source code editing and debugging. Copyright (C) 1992-2004 UserLand Software, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ /* 2004-11-01 aradke: Generalized CodeWarrior prefix file for Carbon/OSX */ #undef WIN95VERSION #define MACVERSION 1 #define TARGET_API_MAC_OS8 0 /* see ConditionalMacros.h */ #define TARGET_API_MAC_CARBON 1 #define TARGET_API_MAC_OSX 0 #undef FRONTIER_FRAMEWORK_INCLUDES --- NEW FILE: frontier.ppc.r --- /****************************************************************************** UserLand Frontier(tm) -- High performance Web content management, object database, system-level and Internet scripting environment, including source code editing and debugging. Copyright (C) 1992-2004 UserLand Software, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ******************************************************************************/ /* 2004-11-01 aradke: Generalized CodeWarrior prefix file for Classic Mac OS */ #undef WIN95VERSION #define MACVERSION 1 #define TARGET_API_MAC_OS8 1 /* see ConditionalMacros.h */ #define TARGET_API_MAC_CARBON 0 #define TARGET_API_MAC_OSX 0 #undef FRONTIER_FRAMEWORK_INCLUDES |
|
From: Andre R. <and...@us...> - 2004-11-01 13:16:39
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18475 Modified Files: frontier.xcode.h Log Message: Reorganized global headers slightly. Introduced FRONTIER_FRAMEWORK_INCLUDES preprocessor directive, applicable to C and rez compilation. Index: frontier.xcode.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/frontier.xcode.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** frontier.xcode.h 24 Oct 2004 22:31:12 -0000 1.1 --- frontier.xcode.h 1 Nov 2004 13:16:29 -0000 1.2 *************** *** 36,38 **** --- 36,40 ---- #define TARGET_API_MAC_OSX 0 + #define FRONTIER_FRAMEWORK_INCLUDES 1 + #include "frontier.h" |
|
From: Andre R. <and...@us...> - 2004-11-01 13:16:28
|
Update of /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18331 Modified Files: project.pbxproj Log Message: Reorganized global headers slightly. Introduced FRONTIER_FRAMEWORK_INCLUDES preprocessor directive, applicable to C and rez compilation. Index: project.pbxproj =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/build_XCode/Frontier.xcode/project.pbxproj,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** project.pbxproj 30 Oct 2004 23:51:42 -0000 1.11 --- project.pbxproj 1 Nov 2004 13:16:18 -0000 1.12 *************** *** 631,635 **** OTHER_CFLAGS = "-fno-inline -malign-mac68k "; OTHER_LDFLAGS = "-multiply_defined warning"; ! OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -i ../Common/headers"; PRODUCT_NAME = Frontier; REZ_PREPROCESSOR_DEFINITIONS = ""; --- 631,635 ---- OTHER_CFLAGS = "-fno-inline -malign-mac68k "; OTHER_LDFLAGS = "-multiply_defined warning"; ! OTHER_REZFLAGS = "-d TARGET_API_MAC_CARBON=1 -d FRONTIER_FRAMEWORK_INCLUDES=1 -i ../Common/headers"; PRODUCT_NAME = Frontier; REZ_PREPROCESSOR_DEFINITIONS = ""; |
|
From: Andre R. <and...@us...> - 2004-11-01 13:15:53
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18272 Modified Files: osincludes.h Log Message: Reorganized global headers slightly. Introduced FRONTIER_FRAMEWORK_INCLUDES preprocessor directive, applicable to C and rez compilation. Index: osincludes.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/osincludes.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** osincludes.h 23 Oct 2004 18:31:25 -0000 1.1 --- osincludes.h 1 Nov 2004 13:15:44 -0000 1.2 *************** *** 63,67 **** #if TARGET_API_MAC_CARBON ! #ifdef __MACH__ /* building for Mach-O with framework-style includes */ #include <Carbon/Carbon.h> --- 63,67 ---- #if TARGET_API_MAC_CARBON ! #ifdef FRONTIER_FRAMEWORK_INCLUDES /* building for Mach-O with framework-style includes */ #include <Carbon/Carbon.h> |
|
From: Andre R. <and...@us...> - 2004-11-01 12:21:54
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7289 Modified Files: db.h Log Message: Fixed Xcode/ld linker warning about doubly defined symbol _dbopen (from db.c and System.framework) by renaming our dbopen to dbopenfile. Index: db.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/db.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** db.h 9 Oct 2004 20:53:59 -0000 1.1 --- db.h 1 Nov 2004 12:21:42 -0000 1.2 *************** *** 168,172 **** extern boolean dbnew (hdlfilenum); ! extern boolean dbopen (hdlfilenum, boolean); extern boolean dbclose (void); --- 168,172 ---- extern boolean dbnew (hdlfilenum); ! extern boolean dbopenfile (hdlfilenum, boolean); extern boolean dbclose (void); |
|
From: Andre R. <and...@us...> - 2004-11-01 12:21:42
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7231 Modified Files: db.c odbengine.c cancoon.c Log Message: Fixed Xcode/ld linker warning about doubly defined symbol _dbopen (from db.c and System.framework) by renaming our dbopen to dbopenfile. Index: odbengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/odbengine.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** odbengine.c 31 Oct 2004 17:59:48 -0000 1.3 --- odbengine.c 1 Nov 2004 12:21:31 -0000 1.4 *************** *** 507,511 **** #endif ! if (!dbopen (fnum, flreadonly)) return (false); --- 507,511 ---- #endif ! if (!dbopenfile (fnum, flreadonly)) return (false); *************** *** 522,526 **** hc = cancoonglobals; ! (**hc).hdatabase = databasedata; /*result from dbopen*/ switch (versionnumber) { --- 522,526 ---- hc = cancoonglobals; ! (**hc).hdatabase = databasedata; /*result from dbopenfile*/ switch (versionnumber) { Index: cancoon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoon.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cancoon.c 31 Oct 2004 17:59:48 -0000 1.3 --- cancoon.c 1 Nov 2004 12:21:31 -0000 1.4 *************** *** 771,775 **** cancoondata = nil; /*default error return*/ ! if (!dbopen (fnum, false)) return (false); --- 771,775 ---- cancoondata = nil; /*default error return*/ ! if (!dbopenfile (fnum, false)) return (false); *************** *** 800,804 **** //(**cancoonwindowinfo).hdata = (Handle) hc; /*link data to window*/ ! (**hc).hdatabase = databasedata; /*result from dbopen*/ switch (versionnumber) { --- 800,804 ---- //(**cancoonwindowinfo).hdata = (Handle) hc; /*link data to window*/ ! (**hc).hdatabase = databasedata; /*result from dbopenfile*/ switch (versionnumber) { Index: db.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/db.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** db.c 31 Oct 2004 17:59:48 -0000 1.4 --- db.c 1 Nov 2004 12:21:31 -0000 1.5 *************** *** 2486,2490 **** ! boolean dbopen (hdlfilenum fnum, boolean flreadonly) { /* --- 2486,2490 ---- ! boolean dbopenfile (hdlfilenum fnum, boolean flreadonly) { /* *************** *** 2573,2577 **** return (false); /*error loading in header*/ ! } /*dbopen*/ --- 2573,2577 ---- return (false); /*error loading in header*/ ! } /*dbopenfile*/ |
|
From: Andre R. <and...@us...> - 2004-11-01 11:50:53
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1251 Modified Files: op.h shell.h shellprint.h Log Message: Fixed GCC compiler warnings. Index: shell.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shell.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shell.h 24 Oct 2004 19:38:40 -0000 1.2 --- shell.h 1 Nov 2004 11:50:42 -0000 1.3 *************** *** 722,732 **** //Code change by Timothy Paustian Saturday, July 22, 2000 9:56:19 PM //two new routines to allow initialization and destruction of the scroll UPPs ! extern void shellinitscroll(); ! extern void shellshutdownscroll(); ! extern void fileinit(); ! extern void fileshutdown(); #ifdef WIN95VERSION --- 722,732 ---- //Code change by Timothy Paustian Saturday, July 22, 2000 9:56:19 PM //two new routines to allow initialization and destruction of the scroll UPPs ! extern void shellinitscroll(void); ! extern void shellshutdownscroll(void); ! extern void fileinit(void); ! extern void fileshutdown(void); #ifdef WIN95VERSION Index: shellprint.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellprint.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellprint.h 24 Oct 2004 16:58:11 -0000 1.2 --- shellprint.h 1 Nov 2004 11:50:42 -0000 1.3 *************** *** 76,82 **** extern boolean shellprint (WindowPtr, boolean); ! extern boolean iscurrentportprintport (); ! extern boolean isprintingactive (); extern boolean getprintscale (long * scaleMult, long * scaleDiv); \ No newline at end of file --- 76,82 ---- extern boolean shellprint (WindowPtr, boolean); ! extern boolean iscurrentportprintport (void); ! extern boolean isprintingactive (void); extern boolean getprintscale (long * scaleMult, long * scaleDiv); \ No newline at end of file Index: op.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/op.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** op.h 9 Oct 2004 21:01:28 -0000 1.1 --- op.h 1 Nov 2004 11:50:42 -0000 1.2 *************** *** 64,67 **** --- 64,70 ---- #define cthoists 5 /*depth of hoist stack*/ + typedef struct tyoutlinerecord *ptroutlinerecord, **hdloutlinerecord; /*forward declaration*/ + + typedef struct tyheadrecord *ptrheadrecord, **hdlheadrecord;/*forward declaration*/ typedef struct tyheadrecord { *************** *** 112,116 **** Handle headstring; /*text of headline lives in its own block*/ ! } tyheadrecord, *ptrheadrecord, **hdlheadrecord; --- 115,119 ---- Handle headstring; /*text of headline lives in its own block*/ ! } tyheadrecord; *************** *** 178,184 **** typedef boolean (*opgefullrectcallback) (hdlheadrecord, Rect *); ! typedef boolean (*opsetscrapcallback) (struct tyoutlinerecord **); ! typedef boolean (*opgetscrapcallback) (struct tyoutlinerecord ** *, boolean *); typedef boolean (*optextchangedcallback) (hdlheadrecord, bigstring); --- 181,187 ---- typedef boolean (*opgefullrectcallback) (hdlheadrecord, Rect *); ! typedef boolean (*opsetscrapcallback) (hdloutlinerecord); ! typedef boolean (*opgetscrapcallback) (hdloutlinerecord *, boolean *); typedef boolean (*optextchangedcallback) (hdlheadrecord, bigstring); *************** *** 202,206 **** typedef boolean (*opsetwindowhandlecontextcallback) (Handle); ! typedef boolean (*optexttooutlinecallback) (struct tyoutlinerecord **, Handle, hdlheadrecord *); --- 205,209 ---- typedef boolean (*opsetwindowhandlecontextcallback) (Handle); ! typedef boolean (*optexttooutlinecallback) (hdloutlinerecord, Handle, hdlheadrecord *); *************** *** 444,448 **** long outlinerefcon; /*for use by application*/ ! } tyoutlinerecord, *ptroutlinerecord, **hdloutlinerecord; --- 447,451 ---- long outlinerefcon; /*for use by application*/ ! } tyoutlinerecord; |
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv912 Modified Files: shell.c opops.c menubar.c meprograms.c shellbuttons.c shellwindow.c langerror.c osadroplet.c menupack.c langcard.c opdisplay.c menuverbs.c oppack.c langdialog.c opscrollbar.c shellmouse.c langmodeless.c oplist.c op.c langparser.y shellmenu.c oplangtext.c opdraggingmove.c opinit.c shellfile.c langipc.c shellops.c shellkb.c ophoist.c shellupdate.c opedit.c langparser.c shellcallbacks.c shellscrap.c shellscroll.c assert.c shellundo.c oppopup.c langerrorwindow.c menueditor.c lang.c opstructure.c langhash.c opprint.c shellprint.c langlist.c Log Message: Fixed GCC compiler warnings. Index: shellcallbacks.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellcallbacks.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellcallbacks.c 23 Oct 2004 22:52:59 -0000 1.2 --- shellcallbacks.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 210,213 **** --- 210,215 ---- + #if 0 + static boolean shelldefaultstyleroutine (void) { *************** *** 230,233 **** --- 232,237 ---- } /*shelldefaultstyleroutine*/ + #endif + boolean shelldefaultselectioninfo (void) { *************** *** 585,589 **** WindowPtr w; ! if (!frontrootwindow (&hinfo)) /*no windows open%/ return; --- 589,593 ---- WindowPtr w; ! if (!frontrootwindow (&hinfo)) /%no windows open%/ return; *************** *** 613,618 **** popport (); ! } /*stacktracer*/ ! boolean shellpushglobals (WindowPtr wpush) { --- 617,622 ---- popport (); ! } /%stacktracer%/ ! */ boolean shellpushglobals (WindowPtr wpush) { *************** *** 638,642 **** /* ! if (wpush == nil) /*caller just wants state saved%/ { shellwindow = nil; --- 642,646 ---- /* ! if (wpush == nil) /%caller just wants state saved%/ { shellwindow = nil; *************** *** 711,718 **** void shellinvalidglobals (WindowPtr winvalid) { ! /* the indicated windowptr is no longer valid -- it was presumably just disposed. make sure that we'll never try to push its globals ! * / register WindowPtr w = winvalid; --- 715,722 ---- void shellinvalidglobals (WindowPtr winvalid) { ! /% the indicated windowptr is no longer valid -- it was presumably just disposed. make sure that we'll never try to push its globals ! %/ register WindowPtr w = winvalid; *************** *** 729,733 **** processinvalidglobals (w); //every thread needs to know about the change* ! } /*shellinvalidglobals*/ --- 733,738 ---- processinvalidglobals (w); //every thread needs to know about the change* ! } /%shellinvalidglobals%/ ! */ Index: langmodeless.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langmodeless.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langmodeless.c 23 Oct 2004 22:28:25 -0000 1.2 --- langmodeless.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 82,86 **** ! return (dialogselectall (langdialogwindow)); } /*langdialogselectall*/ --- 82,86 ---- ! return (dialogselectall ((DialogPtr) langdialogwindow)); } /*langdialogselectall*/ *************** *** 196,200 **** #if TARGET_API_MAC_CARBON ! while (((char)(*hd) != -1) && ((**hd).flstillalive)) { /*make sure it's handled before window is disposed*/ processchecktimeouts (); --- 196,200 ---- #if TARGET_API_MAC_CARBON ! while (((char)((long)*hd) != -1) && ((**hd).flstillalive)) { /*make sure it's handled before window is disposed*/ processchecktimeouts (); *************** *** 261,267 **** static boolean langdialogadjustcursor (Point pt){ ! ! register hdldialogrecord hd = langdialogdata; ! setcursortype (cursorisarrow); --- 261,265 ---- static boolean langdialogadjustcursor (Point pt){ ! setcursortype (cursorisarrow); *************** *** 278,298 **** return (true); ! } /*langdialogsetfontsize%/ static boolean langdialogsetfont (void) { ! shelldefaultfontroutine (); /*set windowinfo record defaultfont field%/ return (langdialogsetfontsize ()); ! } /*langdialogsetfont%/ static boolean langdialogsetsize (void) { ! shelldefaultsizeroutine (); /*set windowinfo record defaultfont field%/ return (langdialogsetfontsize ()); ! } /*langdialogsetsize*/ --- 276,297 ---- return (true); ! } /%langdialogsetfontsize%/ static boolean langdialogsetfont (void) { ! shelldefaultfontroutine (); /%set windowinfo record defaultfont field%/ return (langdialogsetfontsize ()); ! } /%langdialogsetfont%/ static boolean langdialogsetsize (void) { ! shelldefaultsizeroutine (); /%set windowinfo record defaultfont field%/ return (langdialogsetfontsize ()); ! } /%langdialogsetsize%/ ! */ *************** *** 332,336 **** return (false); ! return (shellsetscrap (htext, textscraptype, &disposehandle, nil)); } /*langdialogcopy*/ --- 331,335 ---- return (false); ! return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) &disposehandle, nil)); } /*langdialogcopy*/ *************** *** 386,390 **** ! static callback savedebugger; --- 385,389 ---- ! static langtreenodecallback savedebugger; *************** *** 419,423 **** */ - register hdldialogrecord hd = langdialogdata; hdltreenode hparam; tyvaluerecord val; --- 418,421 ---- *************** *** 492,497 **** ! static boolean finddialogvisit (WindowPtr w, ptrfinddialoginfo findinfo) { hdlwindowinfo hinfo; hdldialogrecord hd; --- 490,496 ---- ! static boolean finddialogvisit (WindowPtr w, ptrvoid refcon) { + ptrfinddialoginfo findinfo = (ptrfinddialoginfo) refcon; hdlwindowinfo hinfo; hdldialogrecord hd; *************** *** 750,754 **** flzoomscript = false; /*7.1b37 PBS: wiring off a feature that: 1. no one knows about and 2. crashes anyway.*/ ! /*Attempting to support this feature also causes crashes. /*That's why it's gone.*/ --- 749,753 ---- flzoomscript = false; /*7.1b37 PBS: wiring off a feature that: 1. no one knows about and 2. crashes anyway.*/ ! /*Attempting to support this feature also causes crashes.*/ /*That's why it's gone.*/ Index: opprint.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opprint.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opprint.c 23 Oct 2004 22:43:11 -0000 1.2 --- opprint.c 1 Nov 2004 11:50:17 -0000 1.3 *************** *** 49,54 **** (**ho).linespacing, (**ho).lineindent, info); ! } /*opgetprintdisplayinfo*/ ! static short opgetpagecount (void) { --- 49,54 ---- (**ho).linespacing, (**ho).lineindent, info); ! } /%opgetprintdisplayinfo%/ ! */ static short opgetpagecount (void) { *************** *** 167,171 **** hdlheadrecord oldline1; short oldline1linesabove; ! typrintinfo *pi = &shellprintinfo; Rect printrect; // Rect oldoutlinerect; --- 167,171 ---- hdlheadrecord oldline1; short oldline1linesabove; ! //typrintinfo *pi = &shellprintinfo; Rect printrect; // Rect oldoutlinerect; Index: shellops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellops.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellops.c 23 Oct 2004 22:54:54 -0000 1.2 --- shellops.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 46,51 **** setscrollbarinfo ( (**h).horizscrollbar, (**h).horizmin, (**h).horizmax, (**h).horizcurrent); ! } /*shellsetscrollbarinfo*/ ! void shellsetdefaultstyle (hdlwindowinfo hinfo) { --- 46,51 ---- setscrollbarinfo ( (**h).horizscrollbar, (**h).horizmin, (**h).horizmax, (**h).horizcurrent); ! } /%shellsetscrollbarinfo%/ ! */ void shellsetdefaultstyle (hdlwindowinfo hinfo) { Index: meprograms.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/meprograms.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** meprograms.c 23 Oct 2004 22:37:27 -0000 1.2 --- meprograms.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 53,58 **** ! static boolean mefindnodevisit (WindowPtr w, tyfindnodeinfo *findinfo) { boolean fl; --- 53,59 ---- ! static boolean mefindnodevisit (WindowPtr w, ptrvoid refcon) { + tyfindnodeinfo *findinfo = (tyfindnodeinfo *) refcon; boolean fl; *************** *** 197,201 **** register boolean fl; boolean fldispose = false; - long ixload = 0; #if !flruntime --- 198,201 ---- Index: shell.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shell.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** shell.c 29 Oct 2004 19:39:12 -0000 1.3 --- shell.c 1 Nov 2004 11:50:16 -0000 1.4 *************** *** 120,126 **** static boolean floverridebeachball = false; /*set true when user action occurs*/ ! static flipcstarted = false; ! static flbackgroundtasksdisabled = true; /*will be set to false when initialization is complete*/ static boolean flshelleventposted = false; --- 120,126 ---- static boolean floverridebeachball = false; /*set true when user action occurs*/ ! static boolean flipcstarted = false; ! static boolean flbackgroundtasksdisabled = true; /*will be set to false when initialization is complete*/ static boolean flshelleventposted = false; *************** *** 281,295 **** ! #ifdef MACVERSION static void shellhandlediskinsertion (void) { //Code change by Timothy Paustian Friday, June 16, 2000 2:21:17 PM //Changed to Opaque call for Carbon //The system takes care of bad mounted disks, we don't need to. - #if !TARGET_API_MAC_CARBON Point pt = {0, 0}; if (HiWord (shellevent.message) != 0) DIBadMount (pt, shellevent.message); - #endif } /*shellhandlediskinsertion*/ --- 281,293 ---- ! #if defined(MACVERSION) && TARGET_API_MAC_OS8 static void shellhandlediskinsertion (void) { //Code change by Timothy Paustian Friday, June 16, 2000 2:21:17 PM //Changed to Opaque call for Carbon //The system takes care of bad mounted disks, we don't need to. Point pt = {0, 0}; if (HiWord (shellevent.message) != 0) DIBadMount (pt, shellevent.message); } /*shellhandlediskinsertion*/ *************** *** 387,391 **** //Code change by Timothy Paustian Friday, June 16, 2000 2:22:47 PM //Changed to Opaque call for Carbon ! #if !TARGET_API_MAC_CARBON shellhandlediskinsertion (); #endif --- 385,389 ---- //Code change by Timothy Paustian Friday, June 16, 2000 2:22:47 PM //Changed to Opaque call for Carbon ! #if TARGET_API_MAC_OS8 shellhandlediskinsertion (); #endif *************** *** 893,897 **** EventRecord ev; ! if (shelleventsblocked ()) /*all events are blocked -- don't ask the OS for any%/ return (false); --- 891,895 ---- EventRecord ev; ! if (shelleventsblocked ()) /%all events are blocked -- don't ask the OS for any%/ return (false); *************** *** 899,903 **** return (true); ! return (landeventfilter (&ev)); /*null event consumed by IAC toolkit%/ */ --- 897,901 ---- return (true); ! return (landeventfilter (&ev)); /%null event consumed by IAC toolkit%/ */ *************** *** 968,976 **** */ ! /* ! shellpushblock (networkMask, true); /*for network toolkit; block network events%/ ! */ ! ! #if defined(MACVERSION) && !TARGET_API_MAC_CARBON UnloadSeg (&initsegment); #endif --- 966,972 ---- */ ! //shellpushblock (networkMask, true); /*for network toolkit; block network events%/ ! ! #if defined(MACVERSION) && TARGET_API_MAC_OS8 UnloadSeg (&initsegment); #endif *************** *** 1023,1027 **** OSErr err = noErr; ! err = GetIndMenuItemWithCommandID (NULL, kHICommandPreferences, 1, &hmenu, &itemIndex); if (err == noErr) { --- 1019,1023 ---- OSErr err = noErr; ! err = GetIndMenuItemWithCommandID (NULL, kHICommandPreferences, 1, &hmenu, (MenuItemIndex*) &itemIndex); if (err == noErr) { *************** *** 1100,1105 **** ChangedResource (h); ! } /*shelltrashresource*/ ! #ifdef MACVERSION --- 1096,1101 ---- ChangedResource (h); ! } /%shelltrashresource%/ ! */ #ifdef MACVERSION *************** *** 1108,1117 **** long ctstillneeded = ctbytesneeded; long curA5 = SetUpAppA5 (); shellcallmemoryhooks (&ctstillneeded); RestoreA5 (curA5); ! return (ctbytesneeded - ctstillneeded); } /*shellgrowzone*/ --- 1104,1117 ---- long ctstillneeded = ctbytesneeded; + #if TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); + #endif shellcallmemoryhooks (&ctstillneeded); + #if TARGET_API_MAC_OS8 RestoreA5 (curA5); ! #endif ! return (ctbytesneeded - ctstillneeded); } /*shellgrowzone*/ *************** *** 1386,1390 **** } /*shellinit*/ ! #if TARGET_API_MAC_CARBON == 1 static pascal void idleTimer (EventLoopTimerRef theTimer, void * userData) { --- 1386,1390 ---- } /*shellinit*/ ! #if 0 //TARGET_API_MAC_CARBON == 1 static pascal void idleTimer (EventLoopTimerRef theTimer, void * userData) { Index: opedit.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opedit.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opedit.c 23 Oct 2004 22:39:51 -0000 1.2 --- opedit.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 113,119 **** */ ! hdlstring htext = (**hnode).headstring; ! ! return (wpsettexthandle (htext)); } /*opdefaultsetwpedittext*/ --- 113,117 ---- */ ! return (wpsettexthandle ((**hnode).headstring)); } /*opdefaultsetwpedittext*/ *************** *** 881,885 **** boolean opeditclick (Point pt, tyclickflags flags) { ! /*opclearallmarks (); /*9/11/91*/ opeditsetglobals (); --- 879,883 ---- boolean opeditclick (Point pt, tyclickflags flags) { ! //opclearallmarks (); /*9/11/91*/ opeditsetglobals (); Index: langlist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** langlist.c 29 Oct 2004 23:54:20 -0000 1.4 --- langlist.c 1 Nov 2004 11:50:17 -0000 1.5 *************** *** 900,904 **** hdllistrecord list2; hdllistrecord list3; ! long i, n, m, min_mn; Handle hitem, hignore; bigstring key; --- 900,904 ---- hdllistrecord list2; hdllistrecord list3; ! long i, n, m; Handle hitem, hignore; bigstring key; Index: opops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opops.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** opops.c 31 Oct 2004 19:08:16 -0000 1.3 --- opops.c 1 Nov 2004 11:50:16 -0000 1.4 *************** *** 379,383 **** ! static boolean opgetnthnodevisit (hdlheadrecord hnode, ptrscanrecord scanrecord) { if ((*scanrecord).lnumcurrent == (*scanrecord).lnumlookfor) { /*we're at the node*/ --- 379,385 ---- ! static boolean opgetnthnodevisit (hdlheadrecord hnode, ptrvoid refcon) { ! ! ptrscanrecord scanrecord = (ptrscanrecord) refcon; if ((*scanrecord).lnumcurrent == (*scanrecord).lnumlookfor) { /*we're at the node*/ *************** *** 1072,1076 **** ! static boolean opcontainsvisit (hdlheadrecord hnode, ptrscanrecord scanrecord) { if (hnode == (*scanrecord).hnodelookfor) { --- 1074,1080 ---- ! static boolean opcontainsvisit (hdlheadrecord hnode, ptrvoid refcon) { ! ! ptrscanrecord scanrecord = (ptrscanrecord) refcon; if (hnode == (*scanrecord).hnodelookfor) { *************** *** 1202,1206 **** #if !fljustpacking ! (*(**outlinedata).releaserefconcallback) (hnode, (boolean) refcon); #endif --- 1206,1210 ---- #if !fljustpacking ! (*(**outlinedata).releaserefconcallback) (hnode, (boolean) ((long) refcon)); #endif *************** *** 1221,1225 **** void opreleasenode (hdlheadrecord hnode, boolean fldisk) { ! opreleasevisit (hnode, (ptrvoid) fldisk); } /*opreleasenode*/ --- 1225,1229 ---- void opreleasenode (hdlheadrecord hnode, boolean fldisk) { ! opreleasevisit (hnode, (ptrvoid) ((long) fldisk)); } /*opreleasenode*/ *************** *** 1470,1474 **** */ ! opsiblingvisiter (hnode, true, &opreleasevisit, (ptrvoid) fldisk); } /*opdisposestructure*/ --- 1474,1478 ---- */ ! opsiblingvisiter (hnode, true, &opreleasevisit, (ptrvoid) ((long) fldisk)); } /*opdisposestructure*/ *************** *** 1566,1572 **** ! static boolean opcountvisit (hdlheadrecord hnode, long *count) { ! (*count)++; /*the simplest visit routine*/ return (true); --- 1570,1576 ---- ! static boolean opcountvisit (hdlheadrecord hnode, ptrvoid refcon) { ! (*(long*)refcon)++; /*the simplest visit routine*/ return (true); *************** *** 1603,1609 **** ! static boolean opnotinoutlinevisit (hdlheadrecord hnode, ptrscanrecord scanrecord) { ! return (hnode != (*scanrecord).hnodelookfor); } /*opnotinoutlinevisit*/ --- 1607,1613 ---- ! static boolean opnotinoutlinevisit (hdlheadrecord hnode, ptrvoid refcon) { ! return (hnode != (*(ptrscanrecord)refcon).hnodelookfor); } /*opnotinoutlinevisit*/ Index: shellscrap.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellscrap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellscrap.c 23 Oct 2004 22:55:38 -0000 1.2 --- shellscrap.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 278,281 **** --- 278,283 ---- + #ifdef WIN95VERSION + static boolean cr2crlfhandle (Handle htext) { *************** *** 301,304 **** --- 303,308 ---- } /*cr2crlfhandle*/ + #endif + boolean shellexportscrap (tyscraptype scraptype) { Index: shellprint.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellprint.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellprint.c 23 Oct 2004 22:55:21 -0000 1.2 --- shellprint.c 1 Nov 2004 11:50:17 -0000 1.3 *************** *** 62,67 **** clearbytes (&shellprintinfo, longsizeof (shellprintinfo)); ! } /*shelldisposeprintinfo*/ static boolean shellcheckprinterror (boolean flopening) { --- 62,69 ---- clearbytes (&shellprintinfo, longsizeof (shellprintinfo)); ! } /%shelldisposeprintinfo%/ ! */ + #if defined(WIN95VERSION) || (defined(MACVERSION) && !TARGET_API_MAC_CARBON) static boolean shellcheckprinterror (boolean flopening) { *************** *** 118,121 **** --- 120,125 ---- } /*shellcheckprinterror*/ + #endif + static void shellcopyprintinfo (void) { *************** *** 143,149 **** oserror(theErr); ! PMGetAdjustedPageRect(shellprintinfo.pageformat, &rpage); ! PMGetAdjustedPaperRect(shellprintinfo.pageformat, &rpaper); shellprintinfo.pagerect = rpage; } --- 147,153 ---- oserror(theErr); ! PMGetAdjustedPageRect(shellprintinfo.pageformat, (PMRect *)&rpage); ! PMGetAdjustedPaperRect(shellprintinfo.pageformat, (PMRect *)&rpaper); shellprintinfo.pagerect = rpage; } *************** *** 263,267 **** --- 267,273 ---- return (true); + #if !defined(MACVERSION) || !TARGET_API_MAC_CARBON error: + #endif /* *************** *** 302,306 **** OSStatus status; //validate the page format record. ! status = PMSessionValidatePageFormat(shellprintinfo.printhandle, &(shellprintinfo.pageformat), kPMDontWantBoolean); // Display the Page Setup dialog --- 308,313 ---- OSStatus status; //validate the page format record. ! status = PMSessionValidatePageFormat(shellprintinfo.printhandle, ! (PMPageFormat) shellprintinfo.pageformat, kPMDontWantBoolean); // Display the Page Setup dialog *************** *** 308,312 **** { status = PMSessionPageSetupDialog(shellprintinfo.printhandle, ! &(shellprintinfo.pageformat), &fl); if (!fl) status = kPMCancel; // user clicked Cancel button --- 315,319 ---- { status = PMSessionPageSetupDialog(shellprintinfo.printhandle, ! (PMPageFormat) shellprintinfo.pageformat, &fl); if (!fl) status = kPMCancel; // user clicked Cancel button *************** *** 359,363 **** boolean shellsetprintmargins (Rect newmargins) { ! /* 10/21/91 dmb: we may need this some day [never tested] %/ --- 366,370 ---- boolean shellsetprintmargins (Rect newmargins) { ! /% 10/21/91 dmb: we may need this some day [never tested] %/ *************** *** 374,388 **** shellprintinfo.margins = newmargins; ! shellcopyprintinfo (); /*copies fields from handle into record%/ ! shellvisittypedwindows (-1, &shellpagesetupvisit, nil); /*visit all windows%/ return (true); ! } /*shellsetprintmargins*/ - /* void printresetrects (hdlwindowinfo hinfo, Rect * r) { ! /* (re)initialize all of the rectangles stored in the window's information record. start by clearing the buttons rect and setting the content rect --- 381,395 ---- shellprintinfo.margins = newmargins; ! shellcopyprintinfo (); /%copies fields from handle into record%/ ! shellvisittypedwindows (-1, &shellpagesetupvisit, nil); /%visit all windows%/ return (true); ! } /%shellsetprintmargins%/ ! void printresetrects (hdlwindowinfo hinfo, Rect * r) { ! /% (re)initialize all of the rectangles stored in the window's information record. start by clearing the buttons rect and setting the content rect *************** *** 393,397 **** 3. positioning any scrollbars 4. setting up the grow box rect ! * / register hdlwindowinfo h = hinfo; --- 400,404 ---- 3. positioning any scrollbars 4. setting up the grow box rect ! %/ register hdlwindowinfo h = hinfo; *************** *** 406,413 **** (*shellglobals.resizeroutine) (); ! } /*printresetrects*/ ! boolean iscurrentportprintport () { return (isprintingactive () && (currentprintport == getport())); --- 413,421 ---- (*shellglobals.resizeroutine) (); ! } /%printresetrects%/ ! */ ! boolean iscurrentportprintport (void) { return (isprintingactive () && (currentprintport == getport())); *************** *** 415,419 **** ! boolean isprintingactive () { return (currentprintport != NULL); --- 423,427 ---- ! boolean isprintingactive (void) { return (currentprintport != NULL); *************** *** 450,454 **** PMPrintSession hp = 0; // JES 9.0.1: initialize to 0 -- printing still doesn't work on OS X, but at least Cmd-P won't crash // PMPageFormat pageformat; ! PMPrintSettings printsettings; boolean accepted; //remember that this is a grafport, TPPrPort isn't --- 458,462 ---- PMPrintSession hp = 0; // JES 9.0.1: initialize to 0 -- printing still doesn't work on OS X, but at least Cmd-P won't crash // PMPageFormat pageformat; ! PMPrintSettings printsettings = nil; boolean accepted; //remember that this is a grafport, TPPrPort isn't *************** *** 486,490 **** { //I may need to save back the graf port. ! theErr = PMCreateSession(hp); //This should cover it, but I may need to add a further check. if(theErr != noErr) --- 494,498 ---- { //I may need to save back the graf port. ! theErr = PMCreateSession(&hp); // 2004-10-31 aradke: this was just hp instead of &hp -- not sure what's up!? //This should cover it, but I may need to add a further check. if(theErr != noErr) *************** *** 528,532 **** if(fldialog) { theErr = PMCreatePrintSettings(&printsettings); ! if(theErr != noErr || (pageformat == kPMNoPrintSettings)){ PMRelease(hp); PMRelease(pageformat); --- 536,540 ---- if(fldialog) { theErr = PMCreatePrintSettings(&printsettings); ! if(theErr != noErr || (printsettings == kPMNoPrintSettings)){ PMRelease(hp); PMRelease(pageformat); *************** *** 539,543 **** else { ! theErr = PMSessionValidatePrintSettings(hp, &printsettings, kPMDontWantBoolean); } --- 547,551 ---- else { ! theErr = PMSessionValidatePrintSettings(hp, printsettings, kPMDontWantBoolean); } *************** *** 550,554 **** //set the page range ! theErr = PMSetPageRange(hp, minPage, maxPage); if(theErr != noErr){ goto exit; --- 558,562 ---- //set the page range ! theErr = PMSetPageRange(printsettings, minPage, maxPage); if(theErr != noErr){ goto exit; *************** *** 637,641 **** if(theErr != noErr) goto exit; ! theErr = PMSessionGetGraphicsContext(hp, nil, &printport);//the second parameter is currently ignored. shellprintinfo.printport = printport; if(theErr != noErr) --- 645,649 ---- if(theErr != noErr) goto exit; ! theErr = PMSessionGetGraphicsContext(hp, nil, (void**)&printport);//the second parameter is currently ignored. shellprintinfo.printport = printport; if(theErr != noErr) *************** *** 658,662 **** #if TARGET_API_MAC_CARBON == 1 ! theErr = PMGetFirstPage(hp, &firstPage); if (theErr == noErr){ theErr = PMGetLastPage(printsettings, &lastPage); --- 666,670 ---- #if TARGET_API_MAC_CARBON == 1 ! theErr = PMGetFirstPage(printsettings, &firstPage); if (theErr == noErr){ theErr = PMGetLastPage(printsettings, &lastPage); *************** *** 675,679 **** #if TARGET_API_MAC_CARBON == 1 ! theErr = PMSessionBeginPage(hp, pageformat, &shellprintinfo.pagerect); if (theErr != noErr) break; --- 683,687 ---- #if TARGET_API_MAC_CARBON == 1 ! theErr = PMSessionBeginPage(hp, pageformat, (PMRect *) &shellprintinfo.pagerect); if (theErr != noErr) break; *************** *** 685,689 **** GrafPtr thePort, oldPort; GetPort(&oldPort); ! theErr = PMSessionGetGraphicsContext(hp, nil, &thePort);//the second parameter is currently ignored. SetPort(thePort); // Draw the page --- 693,697 ---- GrafPtr thePort, oldPort; GetPort(&oldPort); ! theErr = PMSessionGetGraphicsContext(hp, nil, (void **) &thePort);//the second parameter is currently ignored. SetPort(thePort); // Draw the page Index: shellscroll.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellscroll.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellscroll.c 23 Oct 2004 22:55:53 -0000 1.2 --- shellscroll.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 225,229 **** static pascal void shellhorizscroll (hdlscrollbar ctrl, short part) { - register WindowPtr w = shellwindow; register hdlwindowinfo h = shellwindowinfo; boolean flleft, flpage; --- 225,228 ---- *************** *** 251,255 **** static pascal void shellvertscroll (hdlscrollbar ctrl, short part) { - register WindowPtr w = shellwindow; register hdlwindowinfo h = shellwindowinfo; boolean flup, flpage; --- 250,253 ---- *************** *** 321,325 **** static ControlRef gControl; static SInt32 gValueSlop; ! static SInt32 gSaveValue; static SInt32 gStartValue; --- 319,323 ---- static ControlRef gControl; static SInt32 gValueSlop; ! //static SInt32 gSaveValue; static SInt32 gStartValue; *************** *** 485,489 **** static OSErr BeginThumbTracking ( ControlRef theControl ) { - const SInt32 kMinLowMem = 512; OSErr theErr = noErr; Point thePoint; --- 483,486 ---- *************** *** 512,516 **** static void EndThumbTracking ( void ) { ! hdlwindowinfo h = shellwindowinfo; EnableDrawing (); --- 509,513 ---- static void EndThumbTracking ( void ) { ! // hdlwindowinfo h = shellwindowinfo; EnableDrawing (); *************** *** 530,534 **** extern void shellinitscroll (); ! void shellinitscroll() { //Code change by Timothy Paustian Saturday, July 22, 2000 12:04:35 AM --- 527,531 ---- extern void shellinitscroll (); ! void shellinitscroll(void) { //Code change by Timothy Paustian Saturday, July 22, 2000 12:04:35 AM *************** *** 545,549 **** extern void shellshutdownscroll (); ! void shellshutdownscroll() { #if TARGET_API_MAC_CARBON --- 542,546 ---- extern void shellshutdownscroll (); ! void shellshutdownscroll(void) { #if TARGET_API_MAC_CARBON *************** *** 559,563 **** void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) { ! register WindowPtr w = shellwindow; register long oldscrollbarcurrent; #if TARGET_API_MAC_CARBON != 1 --- 556,560 ---- void shellscroll (boolean flvert, hdlscrollbar sb, short part, Point pt) { ! // register WindowPtr w = shellwindow; register long oldscrollbarcurrent; #if TARGET_API_MAC_CARBON != 1 *************** *** 566,573 **** #endif ! /* ! pushclip ((*w).portRect); /*allow drawing in whole window%/ ! */ ! if (part == kControlIndicatorPart) { --- 563,568 ---- #endif ! //pushclip ((*w).portRect); /*allow drawing in whole window%/ ! if (part == kControlIndicatorPart) { *************** *** 584,588 **** BeginThumbTracking (sb); ! TrackControl (sb, pt, shelllivescrollupp); EndThumbTracking (); --- 579,583 ---- BeginThumbTracking (sb); ! TrackControl (sb, pt, (ControlActionUPP) shelllivescrollupp); EndThumbTracking (); Index: oplist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplist.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** oplist.c 29 Oct 2004 09:02:22 -0000 1.3 --- oplist.c 1 Nov 2004 11:50:16 -0000 1.4 *************** *** 97,101 **** if (cb) return ((*cb) ((**hnode).hrefcon)); ! } /*oplistreleaserefcon*/ --- 97,102 ---- if (cb) return ((*cb) ((**hnode).hrefcon)); ! } /%oplistreleaserefcon%/ ! */ *************** *** 657,661 **** disktomemlong (info.ctoutlinebytes); ! if (info.versionnumber == 0x01000000) // handle pre-swapped objects (unswap) info.versionnumber = 0x01; --- 658,662 ---- disktomemlong (info.ctoutlinebytes); ! if (info.versionnumber == 0x0100) // handle pre-swapped objects (unswap) - 2004-10-31 aradke: was 0x01000000 but that's not a short! info.versionnumber = 0x01; Index: langdialog.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langdialog.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langdialog.c 23 Oct 2004 22:23:51 -0000 1.2 --- langdialog.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 323,330 **** RgnHandle visRgn; ! fllangdialog = (w == langmodaldialog); for (ix = 0; (!fllangdialog) && (ix < topdialog); ++ix) ! if (dialogstack [ix].pdialog == w) fllangdialog = true; --- 323,330 ---- RgnHandle visRgn; ! fllangdialog = (w == (WindowPtr) langmodaldialog); for (ix = 0; (!fllangdialog) && (ix < topdialog); ++ix) ! if ((WindowPtr) dialogstack [ix].pdialog == w) fllangdialog = true; *************** *** 347,351 **** visRgn = NewRgn(); GetWindowRegion(w, kWindowUpdateRgn, visRgn); ! UpdateDialog (w, visRgn); DisposeRgn(visRgn); #else --- 347,351 ---- visRgn = NewRgn(); GetWindowRegion(w, kWindowUpdateRgn, visRgn); ! UpdateDialog ((DialogRef) w, visRgn); DisposeRgn(visRgn); #else *************** *** 354,358 **** UpdateDialog (w, (*w).visRgn); #endif ! modaldialogcallback (w, ev, &item); EndUpdate (w); --- 354,358 ---- UpdateDialog (w, (*w).visRgn); #endif ! modaldialogcallback ((DialogPtr) w, ev, &item); EndUpdate (w); *************** *** 430,435 **** langdisposetree (hparam); ! if (pdialog != getfrontwindow ()) /*this can happen under the debugger*/ ! windowbringtofront (pdialog); if (!fl) --- 430,435 ---- langdisposetree (hparam); ! if ((WindowPtr) pdialog != getfrontwindow ()) /*this can happen under the debugger*/ ! windowbringtofront ((WindowPtr) pdialog); if (!fl) Index: langerrorwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langerrorwindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langerrorwindow.c 23 Oct 2004 22:24:35 -0000 1.2 --- langerrorwindow.c 1 Nov 2004 11:50:17 -0000 1.3 *************** *** 64,72 **** unsigned short lnum, cnum; /*location of error, passed to callback routine*/ ! /* ! callback errorcallback; /*routine to call when user hits script button%/ ! long errorrefcon; /*the info we pass him%/ ! */ hdlerrorstack herrorstack; --- 64,70 ---- unsigned short lnum, cnum; /*location of error, passed to callback routine*/ ! //callback errorcallback; /*routine to call when user hits script button*/ ! //long errorrefcon; /*the info we pass him*/ hdlerrorstack herrorstack; *************** *** 119,123 **** return (false); ! return (shellsetscrap (htext, textscraptype, disposehandle, nil)); } /*langerrorcopy*/ --- 117,121 ---- return (false); ! return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) disposehandle, nil)); } /*langerrorcopy*/ *************** *** 508,512 **** return (false); ! ix = ix = (**hs).toperror - itemselected; pe = &(**hs).stack [ix]; --- 506,510 ---- return (false); ! ix = (**hs).toperror - itemselected; pe = &(**hs).stack [ix]; Index: oppack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** oppack.c 23 Oct 2004 22:42:47 -0000 1.2 --- oppack.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 91,99 **** #define diskchdivide ((byte) 0xd6) /* 'Ö' */ #define diskchellipses ((byte) 0xc9) /* 'É' */ - #endif - - - static byte bsellipses [] = "\x03..."; #define opversionnumber 2 --- 91,97 ---- #define diskchdivide ((byte) 0xd6) /* 'Ö' */ #define diskchellipses ((byte) 0xc9) /* 'É' */ + static byte bsellipses [] = "\x03..."; + #endif #define opversionnumber 2 *************** *** 163,167 **** ! static boolean outtablevisit (hdlheadrecord hnode, ptroppackinfo packinfo) { /* --- 161,165 ---- ! static boolean outtablevisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 176,179 **** --- 174,178 ---- register Handle hrefcon = (**hn).hrefcon; register long lenrefcon; + ptroppackinfo packinfo = (ptroppackinfo) refcon; tylinetableitem item; *************** *** 305,308 **** --- 304,309 ---- + #if 0 + static boolean xxxpushstringtodisk (bigstring bssource, bigstring bsdest) { *************** *** 371,374 **** --- 372,377 ---- } /*pushstringtodisk*/ + #endif + static boolean outtextvisit (hdlheadrecord hnode, ptroppackinfo packinfo) { *************** *** 440,444 **** packinfo.flpackcomments = true; ! if (!opsiblingvisiter (hnode, false, &outtextvisit, &packinfo)) return (false); --- 443,447 ---- packinfo.flpackcomments = true; ! if (!opsiblingvisiter (hnode, false, (opvisitcallback) &outtextvisit, &packinfo)) return (false); *************** *** 636,640 **** ! static boolean intablevisit (hdlheadrecord hnode, ptroppackinfo packinfo) { /* --- 639,643 ---- ! static boolean intablevisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 643,646 **** --- 646,650 ---- register hdlheadrecord hn = hnode; + ptroppackinfo packinfo = (ptroppackinfo) refcon; register long lenrefcon; Handle hrefcon; *************** *** 781,785 **** /* ! while (*p == chtab) { /*count the leading tab chars ct++; --- 785,789 ---- /* ! while (*p == chtab) { /%count the leading tab chars ct++; *************** *** 789,793 **** ixtext++; ! if (ixtext >= sizetext) /*no text on the line return (false); --- 793,797 ---- ixtext++; ! if (ixtext >= sizetext) /%no text on the line return (false); *************** *** 797,801 **** if (!fltabindent) { ! while (*p == chspace) { /*count the leading tab chars ct++; --- 801,805 ---- if (!fltabindent) { ! while (*p == chspace) { /%count the leading tab chars ct++; *************** *** 805,809 **** ixtext++; ! if (ixtext >= sizetext) /*no text on the line return (false); } --- 809,813 ---- ixtext++; ! if (ixtext >= sizetext) /%no text on the line return (false); } *************** *** 811,815 **** if (ct > 0) { ! if (spacesforlevel == 0) /*first run of spaces spacesforlevel = (short) ct; --- 815,819 ---- if (ct > 0) { ! if (spacesforlevel == 0) /%first run of spaces spacesforlevel = (short) ct; *************** *** 878,882 **** register hdlheadrecord h = nil; ! register short lastlevel; register tydirection dir; Handle hlinetext; --- 882,886 ---- register hdlheadrecord h = nil; ! register short lastlevel = 0; register tydirection dir; Handle hlinetext; *************** *** 1262,1266 **** ! static boolean outscrapvisit (hdlheadrecord hnode, ptroppackinfo packinfo) { /* --- 1266,1270 ---- ! static boolean outscrapvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 1271,1274 **** --- 1275,1279 ---- register hdlheadrecord h = hnode; + ptroppackinfo packinfo = (ptroppackinfo) refcon; handlestream *s; *************** *** 1370,1374 **** boolean opsuboutlinetonewtextscrap (hdlheadrecord hnode, Handle *htext) { ! /* similar to opoutlinetotextscrap above, but allocated new handle and only visits hnode and its subheads --- 1375,1379 ---- boolean opsuboutlinetonewtextscrap (hdlheadrecord hnode, Handle *htext) { ! /% similar to opoutlinetotextscrap above, but allocated new handle and only visits hnode and its subheads *************** *** 1390,1395 **** return (false); ! } /*opsuboutlinetonewtextscrap*/ ! --- 1395,1400 ---- return (false); ! } /%opsuboutlinetonewtextscrap%/ ! */ Index: langcard.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langcard.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langcard.c 23 Oct 2004 22:23:24 -0000 1.2 --- langcard.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 376,380 **** disposehandle (hcard); ! langerror (0); //*** return (false); --- 376,380 ---- disposehandle (hcard); ! langerror (0); return (false); *************** *** 386,391 **** else fl = uisOpenHandle (hcard, true, bscard, 0, 0, nil); ! ! /* uisClose (); */ --- 386,390 ---- else fl = uisOpenHandle (hcard, true, bscard, 0, 0, nil); ! uisClose (); */ Index: ophoist.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ophoist.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ophoist.c 23 Oct 2004 22:40:52 -0000 1.2 --- ophoist.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 47,51 **** ! static void ophoistdisplay (void) { /* --- 47,51 ---- ! void ophoistdisplay (void) { /* Index: opdraggingmove.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opdraggingmove.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opdraggingmove.c 23 Oct 2004 22:39:36 -0000 1.2 --- opdraggingmove.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 373,379 **** ! static boolean movetohotspotvisit (hdlheadrecord hnode, ptrdraginfo draginfo) { register hdlheadrecord h = hnode; register hdlheadrecord hpre = (*draginfo).hnode; tydirection dir = (*draginfo).dir; --- 373,380 ---- ! static boolean movetohotspotvisit (hdlheadrecord hnode, ptrvoid refcon) { register hdlheadrecord h = hnode; + ptrdraginfo draginfo = (ptrdraginfo) refcon; register hdlheadrecord hpre = (*draginfo).hnode; tydirection dir = (*draginfo).dir; *************** *** 433,437 **** register tyhotspot *hs = hotspot; ! hdlheadrecord hsource = (*hs).hsource; hdlheadrecord htarget = (*hs).htarget; tydirection dir = (*hs).dir; --- 434,438 ---- register tyhotspot *hs = hotspot; ! //hdlheadrecord hsource = (*hs).hsource; hdlheadrecord htarget = (*hs).htarget; tydirection dir = (*hs).dir; *************** *** 492,496 **** /*DW 9/3/93 -- defend against the target getting deleted in predragcallback*/ { ! hdlheadrecord htargetparent = (**htarget).headlinkleft; switch ((*(**outlinedata).predragcallback) (&htarget, &dir)) { --- 493,497 ---- /*DW 9/3/93 -- defend against the target getting deleted in predragcallback*/ { ! //hdlheadrecord htargetparent = (**htarget).headlinkleft; switch ((*(**outlinedata).predragcallback) (&htarget, &dir)) { *************** *** 551,555 **** ! static void opscrollfordrag (tyhotspot *hotspot, tydirection scrolldir) { register hdloutlinerecord ho = outlinedata; --- 552,556 ---- ! void opscrollfordrag (tyhotspot *hotspot, tydirection scrolldir) { register hdloutlinerecord ho = outlinedata; Index: menupack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menupack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menupack.c 23 Oct 2004 22:36:46 -0000 1.2 --- menupack.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 118,122 **** ! static boolean headleveloffsetvisit (hdlheadrecord hnode, long *headleveloffset) { (**hnode).headlevel += *headleveloffset; --- 118,124 ---- ! static boolean headleveloffsetvisit (hdlheadrecord hnode, ptrvoid refcon) { ! ! long *headleveloffset = (long *) refcon; (**hnode).headlevel += *headleveloffset; *************** *** 204,210 **** ! static boolean mesavescriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) { register hdlheadrecord h = hnode; register hdloutlinerecord ho; tymenuiteminfo item; --- 206,213 ---- ! static boolean mesavescriptvisit (hdlheadrecord hnode, ptrvoid refcon) { register hdlheadrecord h = hnode; + //ptrpackinfo packinfo = (ptrpackinfo) refcon; register hdloutlinerecord ho; tymenuiteminfo item; *************** *** 290,294 **** ! static boolean mepackscriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) { /* --- 293,297 ---- ! static boolean mepackscriptvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 298,301 **** --- 301,305 ---- register hdlheadrecord h = hnode; + ptrpackinfo packinfo = (ptrpackinfo) refcon; register hdloutlinerecord ho; tymenuiteminfo item; *************** *** 366,370 **** ! static boolean mepackmenustructure (tysavedmenuinfo *info, Handle *hpacked) { /* --- 370,374 ---- ! boolean mepackmenustructure (tysavedmenuinfo *info, Handle *hpacked) { /* *************** *** 432,436 **** register WindowPtr w; Rect r; - long ixload = 0; long lnumcursor; --- 436,439 ---- *************** *** 551,555 **** ! static boolean mesetupmenurecord (tysavedmenuinfo *info, hdloutlinerecord houtline, hdlmenurecord *hmenurecord) { /* --- 554,558 ---- ! boolean mesetupmenurecord (tysavedmenuinfo *info, hdloutlinerecord houtline, hdlmenurecord *hmenurecord) { /* *************** *** 603,607 **** ! static boolean meunpackscriptvisit (hdlheadrecord hnode, ptrpackinfo packinfo) { /* --- 606,610 ---- ! static boolean meunpackscriptvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 610,613 **** --- 613,617 ---- register hdlheadrecord h = hnode; + ptrpackinfo packinfo = (ptrpackinfo) refcon; hdloutlinerecord houtline; tymenuiteminfo item; *************** *** 765,769 **** boolean mesetscraproutine (hdloutlinerecord houtline) { ! return (shellsetscrap ((Handle) houtline, menuscraptype, &medisposescrap, &meexportscrap)); } /*mesetscraproutine*/ --- 769,775 ---- boolean mesetscraproutine (hdloutlinerecord houtline) { ! return (shellsetscrap ((Handle) houtline, menuscraptype, ! (shelldisposescrapcallback) &medisposescrap, ! (shellexportscrapcallback) &meexportscrap)); } /*mesetscraproutine*/ Index: langhash.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhash.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langhash.c 31 Oct 2004 21:43:38 -0000 1.3 --- langhash.c 1 Nov 2004 11:50:17 -0000 1.4 *************** *** 1310,1314 **** x = nextx; ! } /*while%/ (**hsource).hashbucket [i] = nil; /%we leave the source table empty%/ --- 1310,1314 ---- x = nextx; ! } /%while%/ (**hsource).hashbucket [i] = nil; /%we leave the source table empty%/ Index: langparser.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langparser.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langparser.c 23 Oct 2004 22:29:14 -0000 1.2 --- langparser.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 52,56 **** ! static FILE __file[1]; static int fprintf (FILE *f, const char *s, ...) {return (0);} --- 52,56 ---- ! //static FILE __file[1]; static int fprintf (FILE *f, const char *s, ...) {return (0);} *************** *** 62,65 **** --- 62,66 ---- static int strcmp (const char * str1, const char * str2) {return (0);} + /* 10/2/91 dmb: a disturbing discovery -- our error handling doesn't deallocate *************** *** 537,541 **** ! yyparse() { int statestack[YYMAXDEPTH]; /* state stack */ --- 538,542 ---- ! int yyparse(void) { int statestack[YYMAXDEPTH]; /* state stack */ *************** *** 624,628 **** case WAS0ERR: /* an error just occurred */ yyerror("syntax error"); ! yyerrlab: ++pcyyerrct; case WAS1ERR: --- 625,629 ---- case WAS0ERR: /* an error just occurred */ yyerror("syntax error"); ! //yyerrlab: ++pcyyerrct; case WAS1ERR: Index: shellupdate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellupdate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellupdate.c 23 Oct 2004 22:56:32 -0000 1.2 --- shellupdate.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 270,274 **** #ifdef MACVERSION #if TARGET_API_MAC_CARBON == 1 ! ValidWindowRgn(hw, contentrgn); #else ValidRgn (contentrgn); /*no need to draw it again. do now to simulate beginupdate*/ --- 270,274 ---- #ifdef MACVERSION #if TARGET_API_MAC_CARBON == 1 ! ValidWindowRgn((WindowRef) hw, contentrgn); #else ValidRgn (contentrgn); /*no need to draw it again. do now to simulate beginupdate*/ Index: shellmouse.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmouse.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellmouse.c 23 Oct 2004 22:54:43 -0000 1.2 --- shellmouse.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 199,203 **** --- 199,205 ---- WindowPtr macwindow; register WindowPtr w; + #ifdef WIN95VERSION tyclickflags flags = clicknormal; + #endif #ifdef MACVERSION *************** *** 506,510 **** static void shellinstallmousewheelhandler (void) { - OSErr ec = noErr; EventTypeSpec myevents = {kEventClassMouse, kEventMouseWheelMoved}; --- 508,511 ---- Index: langerror.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langerror.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langerror.c 23 Oct 2004 22:24:19 -0000 1.2 --- langerror.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 62,66 **** static boolean fllocalerrorhook = false; ! langerrordispatch (bigstring bs) { /**finish this someday%/ hdltreenode hcode; --- 62,66 ---- static boolean fllocalerrorhook = false; ! langerrordispatch (bigstring bs) { /%finish this someday%/ hdltreenode hcode; *************** *** 76,81 **** langerrormessage (bs); ! } /*langerrordispatch*/ ! void langerror (short stringnum) { --- 76,81 ---- langerrormessage (bs); ! } /%langerrordispatch%/ ! */ void langerror (short stringnum) { Index: oplangtext.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oplangtext.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** oplangtext.c 23 Oct 2004 22:41:50 -0000 1.2 --- oplangtext.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 95,99 **** ! static boolean oplangtextvisit (hdlheadrecord hnode, handlestream *langtext) { /* --- 95,99 ---- ! static boolean oplangtextvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 131,134 **** --- 131,135 ---- register hdlheadrecord h = hnode; + handlestream *langtext = (handlestream *) refcon; register short level; bigstring bs; Index: oppopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/oppopup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** oppopup.c 23 Oct 2004 22:42:59 -0000 1.2 --- oppopup.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 58,65 **** static hdlmenurecord oppopupmenubar; /*current popup menu*/ - static unsigned long popupstartticks = 0; /*7.0b27 PBS: when menu was started. Used to make sure menu appeared minimum amount of ticks.*/ - - static popupticksminimum = 20; /*7.0b27 PBS*/ - static boolean opbuildpopupmenu (hdlheadrecord hnode, hdlmenu hmenu); --- 58,61 ---- *************** *** 70,73 **** --- 66,76 ---- short currmenuid; + #ifdef WIN95VERSION + + static unsigned long popupstartticks = 0; /*7.0b27 PBS: when menu was started. Used to make sure menu appeared minimum amount of ticks.*/ + + static unsigned long popupticksminimum = 20; /*7.0b27 PBS*/ + + #endif #if MACVERSION Index: menuverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menuverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menuverbs.c 23 Oct 2004 22:37:13 -0000 1.2 --- menuverbs.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 120,124 **** ! static errornum = 0; /*error number exclusively for menu routines*/ --- 120,124 ---- ! static short errornum = 0; /*error number exclusively for menu routines*/ *************** *** 223,227 **** */ - register hdlmenuvariable hv = (hdlmenuvariable) hvariable; long ctheads; --- 223,226 ---- *************** *** 484,488 **** ! static boolean mefindusedblocksvisit (hdlheadrecord hnode, ptrstring bsparent) { /* --- 483,487 ---- ! static boolean mefindusedblocksvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 490,493 **** --- 489,493 ---- */ + ptrstring bsparent = (ptrstring) refcon; tymenuiteminfo item; bigstring bspath; *************** *** 1181,1185 **** shellpopglobals (); ! /* meunloadscript (); /*detach the script from the window*/ (**hm).scriptnode = nil; --- 1181,1185 ---- shellpopglobals (); ! // meunloadscript (); /*detach the script from the window*/ (**hm).scriptnode = nil; *************** *** 1259,1271 **** /* ! megetmenuiteminfo (hcursor, &item); /*gets prior cmd key, or clears bytes%/ mereleaserefconroutine (hcursor, true); ! (**hcopy).fldirty = true; /*force save on this guy's script%/ item.linkedscript.houtline = hcopy; ! item.linkedscript.adrlink = nildbaddress; /*hasn't been allocated yet%/ mesetmenuiteminfo (hcursor, &item); --- 1259,1271 ---- /* ! megetmenuiteminfo (hcursor, &item); /%gets prior cmd key, or clears bytes%/ mereleaserefconroutine (hcursor, true); ! (**hcopy).fldirty = true; /%force save on this guy's script%/ item.linkedscript.houtline = hcopy; ! item.linkedscript.adrlink = nildbaddress; /%hasn't been allocated yet%/ mesetmenuiteminfo (hcursor, &item); *************** *** 1289,1294 **** ! static boolean findheadlinevisit (hdlheadrecord hnode, ptrfindinfo findinfo) { bigstring bs; --- 1289,1295 ---- ! static boolean findheadlinevisit (hdlheadrecord hnode, ptrvoid refcon) { + ptrfindinfo findinfo = (ptrfindinfo) refcon; bigstring bs; *************** *** 2311,2315 **** (*cb).gettargetdataroutine = &menuverbgettargetdata; ! (*cb).getvariableroutine = &menuverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; --- 2312,2316 ---- (*cb).gettargetdataroutine = &menuverbgettargetdata; ! (*cb).getvariableroutine = (shellgetvariablecallback) &menuverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** langipc.c 31 Oct 2004 21:43:38 -0000 1.4 --- langipc.c 1 Nov 2004 11:50:16 -0000 1.5 *************** *** 198,202 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) savecallback; fllangerror = false; /*make sure error flag is cleared*/ --- 198,202 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = (langerrormessagecallback) savecallback; fllangerror = false; /*make sure error flag is cleared*/ *************** *** 3376,3380 **** static AEDesc *fastreply; ! static callback fastsavecallback; --- 3376,3380 ---- static AEDesc *fastreply; ! static langerrormessagecallback fastsavecallback; *************** *** 3399,3403 **** static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = (callback) langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; --- 3399,3403 ---- static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; *************** *** 3413,3417 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ --- 3413,3417 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ Index: shellundo.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellundo.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellundo.c 23 Oct 2004 22:56:18 -0000 1.2 --- shellundo.c 1 Nov 2004 11:50:16 -0000 1.3 *************** *** 181,185 **** static boolean pushactionstep (short ixaction, long globaldata) { ! return (pushstep ((undocallback) ixaction, (Handle) globaldata, true)); } /*pushactionstep*/ --- 181,185 ---- static boolean pushactionstep (short ixaction, long globaldata) { ! return (pushstep ((undocallback) ((long) ixaction), (Handle) globaldata, true)); } /*pushactionstep*/ *************** *** 325,329 **** if (step.flactionstep) { /*new action record; finished with this undo*/ ! ixaction = (short) step.undoroutine; globaldata = (long) step.hundodata; --- 325,329 ---- if (step.flactionstep) { /*new action record; finished with this undo*/ ! ixaction = (short) ((long) step.undoroutine); globaldata = (long) step.hundodata; *************** *** 378,382 **** if (step.flactionstep) { /*new action record; finished with this undo*/ ! ixaction = (short) step.undoroutine; globaldata = (long) step.hundodata; --- 378,382 ---- if (step.flactionstep) { /*new action record; finished with this undo*/ ! ixaction = (short) ((long) step.undoroutine); globaldata = (long) step.hundodata; Index: menueditor.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menueditor.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** menueditor.c 23 Oct 2004 22:36:17 -0000 1.2 --- menueditor.c 1 Nov 2004 11:50:17 -0000 1.3 *************** *** 161,165 **** ! static medeactivateoutline (void) { mecheckglobals (); --- 161,166 ---- ! /* ! static boolean medeactivateoutline (void) { mecheckglobals (); *************** *** 169,174 **** return (true); ! } /*medeactivateoutline*/ ! static void meactivateoutline (void) { --- 170,175 ---- return (true); ! } /%medeactivateoutline%/ ! */ static void meactivateoutline (void) { *************** *** 926,930 **** static medisplaycmdkey (void) { ! /* 10/7/91 dmb: resurrected the seperate item for the setting the command key %/ --- 927,931 ---- static medisplaycmdkey (void) { ! /% 10/7/91 dmb: resurrected the seperate item for the setting the command key %/ *************** *** 971,975 **** closebitmap (menuwindow); ! } /*medisplaycmdkey*/ --- 972,977 ---- closebitmap (menuwindow); ! } /%medisplaycmdkey%/ ! */ *************** *** 1066,1070 **** popport (); ! /*windowsetchanges (menuwindow, true); /*the window is dirty*/ return (true); --- 1068,1072 ---- popport (); ! //windowsetchanges (menuwindow, true); /*the window is dirty*/ return (true); *************** *** 1335,1339 **** mezoomscriptwindow (); ! /*windowsetchanges (menuwindow, true); /*the window is dirty*/ return (true); --- 1337,1341 ---- mezoomscriptwindow (); ! //windowsetchanges (menuwindow, true); /*the window is dirty*/ return (true); *************** *** 1387,1391 **** (**menudata).menuactiveitem = item; ! medisplaycmdkey (); /*show it in its active form%/ break; --- 1389,1393 ---- (**menudata).menuactiveitem = item; ! medisplaycmdkey (); /%show it in its active form%/ break; *************** *** 1429,1433 **** merotateactiveitem (boolean flforward) { ! /* this is ... [truncated message content] |
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28537 Modified Files: opxml.c shellwindowverbs.c opverbs.c langipc.c shellverbs.c langvalue.c langexternal.c langhash.c Log Message: Fixed GCC compiler warnings. Index: langexternal.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langexternal.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langexternal.c 23 Oct 2004 22:25:08 -0000 1.2 --- langexternal.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 82,86 **** return (dbrefhandle ((dbaddress) (**hv).variabledata, h)); ! } /*langexternalload%/ --- 82,86 ---- return (dbrefhandle ((dbaddress) (**hv).variabledata, h)); ! } /%langexternalload%/ *************** *** 107,112 **** return (dbassignhandle (h, adr)); ! } /*langexternalsave*/ ! tyexternalid langexternalgettype (tyvaluerecord val) { --- 107,112 ---- return (dbassignhandle (h, adr)); ! } /%langexternalsave%/ ! */ tyexternalid langexternalgettype (tyvaluerecord val) { *************** *** 223,227 **** boolean langexternalarrayreference (bigstring bsarrayname, short ix, tyvaluerecord *valref) { ! /* we want to isolate the interpreter from understanding how arrays are stored. that's why this routine is part of the "external" interface of the language. --- 223,227 ---- boolean langexternalarrayreference (bigstring bsarrayname, short ix, tyvaluerecord *valref) { ! /% we want to isolate the interpreter from understanding how arrays are stored. that's why this routine is part of the "external" interface of the language. *************** *** 269,275 **** return (false); ! h = hnew; /*copy into register%/ ! pushtmpstack ((Handle) h); /*we just allocated a temporary value%/ (**h).id = idheadrecord; --- 269,275 ---- return (false); ! h = hnew; /%copy into register%/ ! pushtmpstack ((Handle) h); /%we just allocated a temporary value%/ (**h).id = idheadrecord; *************** *** 280,284 **** return (true); ! } /*langexternalarrayreference%/ */ --- 280,284 ---- return (true); ! } /%langexternalarrayreference%/ */ *************** *** 596,600 **** static boolean closeregisteredwindowvisit (hdlhashnode hnode, ptrvoid refcon) { ! boolean flconfirm = (boolean) refcon; hdlwindowinfo hinfo; --- 596,600 ---- static boolean closeregisteredwindowvisit (hdlhashnode hnode, ptrvoid refcon) { ! boolean flconfirm = (refcon != nil); hdlwindowinfo hinfo; *************** *** 613,617 **** */ ! return (hashtablevisit (filewindowtable, &closeregisteredwindowvisit, (ptrvoid) flconfirm)); } /*langexternalcloseregisteredwindows*/ --- 613,617 ---- */ ! return (hashtablevisit (filewindowtable, &closeregisteredwindowvisit, (ptrvoid) ((long) flconfirm))); } /*langexternalcloseregisteredwindows*/ *************** *** 1082,1086 **** boolean langexternalcoercetostring (tyvaluerecord *v) { ! /* assume the valuerecord is of type externalvaluetype. --- 1082,1086 ---- boolean langexternalcoercetostring (tyvaluerecord *v) { ! /% assume the valuerecord is of type externalvaluetype. *************** *** 1105,1112 **** return (false); ! } /*switch%/ return (false); ! } /*langexternalcoercetostring*/ --- 1105,1113 ---- return (false); ! } /%switch%/ return (false); ! } /%langexternalcoercetostring%/ ! */ *************** *** 1153,1160 **** nomad = (**nomad).prevhashtable; ! } /*while%/ ! ! /*ran out of tables to look at%/ */ --- 1154,1160 ---- nomad = (**nomad).prevhashtable; ! } /%while%/ + /%ran out of tables to look at%/ */ *************** *** 1254,1258 **** register boolean fltempload; hdlhashnode x; ! register hdlexternalvariable hv; bigstring bs; hdlwindowinfo hinfo; --- 1254,1258 ---- register boolean fltempload; hdlhashnode x; ! register hdlexternalvariable hv = nil; bigstring bs; hdlwindowinfo hinfo; *************** *** 1483,1487 **** register long i; tyvaluerecord val; ! register hdlexternalvariable hv; extern boolean tablesetdebugglobals (hdlhashtable, hdlhashnode); long bucketCount; --- 1483,1487 ---- register long i; tyvaluerecord val; ! register hdlexternalvariable hv = nil; extern boolean tablesetdebugglobals (hdlhashtable, hdlhashnode); long bucketCount; Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langipc.c 31 Oct 2004 19:08:17 -0000 1.3 --- langipc.c 31 Oct 2004 21:43:38 -0000 1.4 *************** *** 124,128 **** static hdlverbrecord hipcverb = nil; /*the verb currently being handled*/ - static boolean flipcthreadwaiting = false; //Code change by Timothy Paustian Wednesday, June 14, 2000 8:59:44 PM //Changed to Opaque call for Carbon --- 124,127 ---- *************** *** 185,189 **** static void langipchookerrors (hdlverbrecord hverb, callback *savecallback) { ! *savecallback = langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcerrorroutine; --- 184,188 ---- static void langipchookerrors (hdlverbrecord hverb, callback *savecallback) { ! *savecallback = (callback) langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcerrorroutine; *************** *** 199,203 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = savecallback; fllangerror = false; /*make sure error flag is cleared*/ --- 198,202 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) savecallback; fllangerror = false; /*make sure error flag is cleared*/ *************** *** 425,429 **** register AEDesc *p = param; ! register desctype = (*p).descriptorType; register tyvaluerecord *v = vreturned; Handle hdata; --- 424,428 ---- register AEDesc *p = param; ! register DescType desctype = (*p).descriptorType; register tyvaluerecord *v = vreturned; Handle hdata; *************** *** 848,852 **** hdltreenode hcode; register boolean fl = false; - Handle hthread = nil; if (!langipcfileopen (hverb)) --- 847,850 ---- *************** *** 1275,1279 **** if (iachandlertable != nil) hashtableassign (iachandlertable, "\ptrapTransaction", val); ! } /*setglobaltransactionid*/ #if TARGET_API_MAC_CARBON == 0 --- 1273,1278 ---- if (iachandlertable != nil) hashtableassign (iachandlertable, "\ptrapTransaction", val); ! } /%setglobaltransactionid%/ ! */ #if TARGET_API_MAC_CARBON == 0 *************** *** 1344,1348 **** tyvaluerecord vhandler; tyvaluerecord osacode; ! Handle hthread = nil; hdlhashnode handlernode; AppleEvent event, reply; --- 1343,1347 ---- tyvaluerecord vhandler; tyvaluerecord osacode; ! //Handle hthread = nil; hdlhashnode handlernode; AppleEvent event, reply; *************** *** 1510,1513 **** --- 1509,1514 ---- + #if TARGET_API_MAC_OS8 + static boolean langipcgetmenuarrayverb (hdlverbrecord hverb) { *************** *** 1619,1622 **** --- 1620,1625 ---- } /*langipckillscriptverb*/ + #endif + static pascal boolean langipchandleverb (hdlverbrecord hverb) { *************** *** 1703,1707 **** #ifndef PIKE ! #if TARGET_API_MAC_CARBON == 0 case getmenuarraytoken: fl = langipcgetmenuarrayverb (hverb); --- 1706,1710 ---- #ifndef PIKE ! #if TARGET_API_MAC_OS8 case getmenuarraytoken: fl = langipcgetmenuarrayverb (hverb); *************** *** 1723,1727 **** break; ! #endif #endif --- 1726,1730 ---- break; ! #endif #endif *************** *** 2030,2036 **** boolean langipcgetaddressvalue (hdltreenode hparam1, tyvaluerecord *vreturned) { - register hdltreenode hp1 = hparam1; - register tyvaluerecord *v = vreturned; - return (setbooleanvalue (false, vreturned)); } /*langipcgetaddressvalue*/ --- 2033,2036 ---- *************** *** 2236,2240 **** ! static stealbinaryhandle (tyvaluerecord *val, Handle *x) { if (exemptfromtmpstack (val)) { --- 2236,2240 ---- ! static boolean stealbinaryhandle (tyvaluerecord *val, Handle *x) { if (exemptfromtmpstack (val)) { *************** *** 2503,2507 **** valuetype = langgetvaluetype (itemdesc.descriptorType); ! if (langgoodbinarytype (valuetype)) { /*unpackable%/ if (!coercevalue (&itemval, valuetype)) --- 2503,2507 ---- valuetype = langgetvaluetype (itemdesc.descriptorType); ! if (langgoodbinarytype (valuetype)) { /%unpackable%/ if (!coercevalue (&itemval, valuetype)) *************** *** 2700,2708 **** return (true); ! } /*langipcapprunning*/ ! ! static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, hdlverbrecord hv) { OSType key; --- 2700,2709 ---- return (true); ! } /%langipcapprunning%/ ! */ ! static boolean langipcgetparamvisit (bigstring bs, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { + hdlverbrecord hv = (hdlverbrecord) refcon; OSType key; *************** *** 2977,2981 **** ! static boolean apptablevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tyappvisitinfo *appvisitinfo) { /* --- 2978,2982 ---- ! static boolean apptablevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 2984,2987 **** --- 2985,2989 ---- */ + tyappvisitinfo *appvisitinfo = (tyappvisitinfo*) refcon; register hdltablevariable hv; register hdlhashtable ht; *************** *** 3397,3401 **** static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; --- 3399,3403 ---- static void langipchookfasterrors (AEDesc *reply) { ! fastsavecallback = (callback) langcallbacks.errormessagecallback; langcallbacks.errormessagecallback = &langipcfasterror; *************** *** 3411,3415 **** shellpoperrorhook (); ! langcallbacks.errormessagecallback = fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ --- 3413,3417 ---- shellpoperrorhook (); ! langcallbacks.errormessagecallback = (errorhookcallback) fastsavecallback; oserror (noErr); /*clear it out to avoid conflicts with current thread*/ *************** *** 3673,3677 **** static boolean handlekernelfunction (hdlverbrecord hverb) { ! /* 2.1b14: this is what langipchandletrapverb boils down to in its handling of the kernel event. but to avoid all this code --- 3675,3679 ---- static boolean handlekernelfunction (hdlverbrecord hverb) { ! /% 2.1b14: this is what langipchandletrapverb boils down to in its handling of the kernel event. but to avoid all this code *************** *** 3700,3704 **** return (false); ! /*build a code tree and call the handler, with our error hook in place%/ langipchookerrors (hv, &savecallback); --- 3702,3706 ---- return (false); ! /%build a code tree and call the handler, with our error hook in place%/ langipchookerrors (hv, &savecallback); *************** *** 3710,3714 **** goto exit; ! pushhashtable (hcontext); /*need context to evaluate local address params%/ fl = langipcbuildparamlist (hv, &hparamlist); --- 3712,3716 ---- goto exit; ! pushhashtable (hcontext); /%need context to evaluate local address params%/ fl = langipcbuildparamlist (hv, &hparamlist); *************** *** 3723,3730 **** } ! if (!pushfunctioncall (hfunctioncall, hparamlist, &hcode)) /*consumes input parameters%/ goto exit; ! if (!pushbinaryoperation (moduleop, hcode, nil, &hcode)) /*needs this level%/ goto exit; --- 3725,3732 ---- } ! if (!pushfunctioncall (hfunctioncall, hparamlist, &hcode)) /%consumes input parameters%/ goto exit; ! if (!pushbinaryoperation (moduleop, hcode, nil, &hcode)) /%needs this level%/ goto exit; *************** *** 3736,3741 **** return (fl); ! } /*handlekernelfunction*/ ! boolean langipckernelfunction (hdlhashtable htable, bigstring bsverb, hdltreenode hparam1, tyvaluerecord *vreturned) { --- 3738,3743 ---- return (fl); ! } /%handlekernelfunction%/ ! */ boolean langipckernelfunction (hdlhashtable htable, bigstring bsverb, hdltreenode hparam1, tyvaluerecord *vreturned) { *************** *** 4091,4095 **** /* ! shellpushblock (highLevelEventMask, true); /*just in case%/ fl = langbackgroundtask (); --- 4093,4097 ---- /* ! shellpushblock (highLevelEventMask, true); /%just in case%/ fl = langbackgroundtask (); *************** *** 4293,4297 **** Boolean fl; ! #if flcomponent long curA5 = SetUpAppA5 (); --- 4295,4299 ---- Boolean fl; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); *************** *** 4349,4353 **** landpopfastcontext (&savecontext); ! #if flcomponent RestoreA5 (curA5); --- 4351,4355 ---- landpopfastcontext (&savecontext); ! #if flcomponent && TARGET_API_MAC_OS8 RestoreA5 (curA5); *************** *** 4376,4380 **** OSErr err; ! #if flcomponent long curA5 = SetUpThisA5 (refcon); --- 4378,4382 ---- OSErr err; ! #if flcomponent && TARGET_API_MAC_OS8 long curA5 = SetUpThisA5 (refcon); *************** *** 4466,4470 **** #endif ! #if flcomponent RestoreA5 (curA5); --- 4468,4472 ---- #endif ! #if flcomponent && TARGET_API_MAC_OS8 RestoreA5 (curA5); Index: opverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opverbs.c 23 Oct 2004 22:45:16 -0000 1.2 --- opverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 466,472 **** static void opverbsetcallbacks (hdloutlinevariable hvariable, hdloutlinerecord houtline) { register hdloutlinerecord ho = houtline; - /* (**ho).setscrollbarsroutine = &opverbsetscrollbarsroutine; // 1/31/97 dmb: default is ok now */ --- 466,472 ---- static void opverbsetcallbacks (hdloutlinevariable hvariable, hdloutlinerecord houtline) { + /* register hdloutlinerecord ho = houtline; (**ho).setscrollbarsroutine = &opverbsetscrollbarsroutine; // 1/31/97 dmb: default is ok now */ *************** *** 1456,1460 **** bigstring bs; ! setbooleanvalue (false, v); /*assume the worst%/ flnextparamislast = true; --- 1456,1460 ---- bigstring bs; ! setbooleanvalue (false, v); /%assume the worst%/ flnextparamislast = true; *************** *** 1467,1471 **** return (langrun (htext, v)); ! } /*oprunverb*/ --- 1467,1472 ---- return (langrun (htext, v)); ! } /%oprunverb%/ ! */ *************** *** 1595,1601 **** ! static boolean opcommentvisit (hdlheadrecord hnode, ptrbitinfo bitinfo) { hdlheadrecord h = hnode; if ((**h).flcomment != (*bitinfo).flset) { /*changing*/ --- 1596,1603 ---- ! static boolean opcommentvisit (hdlheadrecord hnode, ptrvoid refcon) { hdlheadrecord h = hnode; + ptrbitinfo bitinfo = (ptrbitinfo) refcon; if ((**h).flcomment != (*bitinfo).flset) { /*changing*/ *************** *** 1625,1630 **** ! static boolean opbreakpointvisit (hdlheadrecord hnode, ptrbitinfo bitinfo) { hdlheadrecord h = hnode; --- 1627,1633 ---- ! static boolean opbreakpointvisit (hdlheadrecord hnode, ptrvoid refcon) { + ptrbitinfo bitinfo = (ptrbitinfo) refcon; hdlheadrecord h = hnode; *************** *** 1658,1662 **** static boolean opmarkedverb (boolean fl) { ! /* change the marked state of the cursor line. only update if it actually changed. fl == true means set a mark. --- 1661,1665 ---- static boolean opmarkedverb (boolean fl) { ! /% change the marked state of the cursor line. only update if it actually changed. fl == true means set a mark. *************** *** 1665,1673 **** hdlheadrecord hcursor; ! fl = bitboolean (fl); /*make sure it's a 1 or a 0%/ hcursor = (**outlinedata).hbarcursor; ! if ((**hcursor).flmarked == fl) /*not changing%/ return (false); --- 1668,1676 ---- hdlheadrecord hcursor; ! fl = bitboolean (fl); /%make sure it's a 1 or a 0%/ hcursor = (**outlinedata).hbarcursor; ! if ((**hcursor).flmarked == fl) /%not changing%/ return (false); *************** *** 1681,1686 **** return (true); ! } /*opmarkedverb*/ ! static boolean opsetdisplayverb (boolean fldisplay) { --- 1684,1689 ---- return (true); ! } /%opmarkedverb%/ ! */ static boolean opsetdisplayverb (boolean fldisplay) { *************** *** 2175,2179 **** flnextparamislast = true; ! if (!getvarparam (hparam1, 1, &htable, bs)) /*returned handle holder%/ return (false); */ --- 2178,2182 ---- flnextparamislast = true; ! if (!getvarparam (hparam1, 1, &htable, bs)) /%returned handle holder%/ return (false); */ *************** *** 2210,2214 **** /* ! if (!langsetsymboltableval (htable, bs, linkedval)) /*probably a memory error%/ return (false); --- 2213,2217 ---- /* ! if (!langsetsymboltableval (htable, bs, linkedval)) /%probably a memory error%/ return (false); *************** *** 2574,2578 **** register hdloutlinerecord ho = outlinedata; register hdlheadrecord nomad; - register long ctheadlines = 1; assert ((ho != nil) && (*ho != nil)); --- 2577,2580 ---- *************** *** 2599,2603 **** ! static boolean opgetselvisit (hdlheadrecord hnode, hdllistrecord hlist) { /* --- 2601,2605 ---- ! static boolean opgetselvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 2609,2612 **** --- 2611,2615 ---- */ + hdllistrecord hlist = (hdllistrecord) refcon; tyvaluerecord val; *************** *** 2883,2887 **** ! static boolean opgetselectedsuboutlinesvisit (hdlheadrecord hnode, hdloutlinerecord ho) { /* --- 2886,2890 ---- ! static boolean opgetselectedsuboutlinesvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 2889,2892 **** --- 2892,2896 ---- */ + hdloutlinerecord ho = (hdloutlinerecord) refcon; hdlheadrecord hcopy; hdlheadrecord hbarcursor = (**ho).hbarcursor; *************** *** 3005,3009 **** tyvaluerecord val; hdlhashnode hnode; ! boolean fl = false, flhadtarget = false; Handle htext; boolean flnewoutline; --- 3009,3013 ---- tyvaluerecord val; hdlhashnode hnode; ! boolean fl = false; Handle htext; boolean flnewoutline; *************** *** 4433,4437 **** (*cb).titleclickroutine = &opverbtitleclick; ! (*cb).getvariableroutine = &opverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; --- 4437,4441 ---- (*cb).titleclickroutine = &opverbtitleclick; ! (*cb).getvariableroutine = (shellgetvariablecallback) &opverbgetvariable; (*cb).settextmoderoutine = &opsettextmode; Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** langvalue.c 31 Oct 2004 18:48:51 -0000 1.4 --- langvalue.c 31 Oct 2004 21:43:38 -0000 1.5 *************** *** 5264,5267 **** --- 5264,5282 ---- + boolean langsetstringvarparam (hdltreenode hfirst, short pnum, bigstring bsset) { + + hdlhashtable htable; + bigstring bsname; + tyvaluerecord val; + + if (!getvarparam (hfirst, pnum, &htable, bsname)) + return (false); + + setstringvalue (bsset, &val); + + return (hashtableassign (htable, bsname, val)); + } /*langsetstringvarparam*/ + + boolean setintvarparam (hdltreenode hfirst, short pnum, short n) { Index: opxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opxml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opxml.c 23 Oct 2004 22:45:51 -0000 1.2 --- opxml.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 1251,1255 **** bigstring bs; - boolean fl = false; short ix = 1; --- 1251,1254 ---- *************** *** 1484,1490 **** return (false); ! /* if (!shellmovewindow (hinfo, windowleft, windowtop)) /*Set window position*/ ! /* return (false); /*shellmovewindow always returns true at this writing, but that could change*/ ! if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ --- 1483,1488 ---- return (false); ! // if (!shellmovewindow (hinfo, windowleft, windowtop)) /*Set window position*/ ! // return (false); /*shellmovewindow always returns true at this writing, but that could change*/ if (!shellmovewindowhidden (hinfo, windowleft, windowtop)) /*Set window position*/ *************** *** 1877,1881 **** hdlheadrecord hbarcursor; boolean fl = false; - boolean fldummy = false; /*Get the /atts table.*/ --- 1875,1878 ---- Index: shellwindowverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellwindowverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellwindowverbs.c 23 Oct 2004 22:57:39 -0000 1.2 --- shellwindowverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 31,34 **** --- 31,36 ---- #endif + #include "shell.h" + #include "shellprivate.h" #include "about.h" #include "file.h" *************** *** 38,43 **** #include "db.h" #include "command.h" - #include "shell.h" - #include "shellprivate.h" #include "lang.h" #include "langexternal.h" --- 40,43 ---- *************** *** 588,592 **** */ - register boolean fl = false; hdlwindowinfo hinfo; WindowPtr pnext; --- 588,591 ---- *************** *** 745,752 **** boolean fl; ! if (!langcheckparamcount (hparam1, 0)) /*shouldn't have any parameters%/ return (false); ! fl = false; /*default return is false%/ if (shellfindtargetwindow (-1, &target)) { --- 744,751 ---- boolean fl; ! if (!langcheckparamcount (hparam1, 0)) /%shouldn't have any parameters%/ return (false); ! fl = false; /%default return is false%/ if (shellfindtargetwindow (-1, &target)) { *************** *** 1039,1043 **** hdlwindowinfo hinfo; tyfilespec fs; - boolean fl = false; flnextparamislast = true; --- 1038,1041 ---- Index: shellverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shellverbs.c 23 Oct 2004 22:56:47 -0000 1.2 --- shellverbs.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 241,245 **** }; ! static enum nameindexes { ixsearchfor, --- 241,245 ---- }; ! enum nameindexes { ixsearchfor, *************** *** 260,265 **** ixregularexpression ! } nameindexes; ! static void shellverbsetselectioninfo () { --- 260,264 ---- ixregularexpression ! }; static void shellverbsetselectioninfo () { *************** *** 320,353 **** - static boolean langsetbooleanvarparam (hdltreenode hfirst, short pnum, boolean flset) { - - hdlhashtable htable; - bigstring bsname; - tyvaluerecord val; - - if (!getvarparam (hfirst, pnum, &htable, bsname)) - return (false); - - setbooleanvalue (flset, &val); - - return (hashtableassign (htable, bsname, val)); - } /*langsetbooleanvarparam*/ - - - static boolean langsetstringvarparam (hdltreenode hfirst, short pnum, bigstring bsset) { - - hdlhashtable htable; - bigstring bsname; - tyvaluerecord val; - - if (!getvarparam (hfirst, pnum, &htable, bsname)) - return (false); - - setstringvalue (bsset, &val); - - return (hashtableassign (htable, bsname, val)); - } /*langsetstringvarparam*/ - - static boolean getstringsearchparam (short ixparam, bigstring bsvalue) { --- 319,322 ---- *************** *** 741,745 **** keyboardclearescape (); /*consume it*/ ! /*break; /*we'll return false to halt script execution*/ } --- 710,714 ---- keyboardclearescape (); /*consume it*/ ! //break; /*we'll return false to halt script execution*/ } *************** *** 782,786 **** keyboardclearescape (); /*consume it*/ ! /*break; /*we'll return false to halt script execution*/ } --- 751,755 ---- keyboardclearescape (); /*consume it*/ ! //break; /*we'll return false to halt script execution*/ } *************** *** 1121,1125 **** tyfilespec fs; tyexternalid id; - boolean flhidden = false; tyvaluerecord vhidden; short ctconsumed = 0; --- 1090,1093 ---- Index: langhash.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langhash.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langhash.c 23 Oct 2004 22:25:24 -0000 1.2 --- langhash.c 31 Oct 2004 21:43:38 -0000 1.3 *************** *** 378,382 **** getaddresspath ((**hn).val, bspath); ! sethandlecontents (bspath, stringsize (bspath), (**hn).val.data.addressvalue); #if fldebug --- 378,382 ---- getaddresspath ((**hn).val, bspath); ! sethandlecontents (bspath, stringsize (bspath), (Handle) (**hn).val.data.addressvalue); #if fldebug *************** *** 508,511 **** --- 508,513 ---- + #if 0 + static boolean indexhashtable_obsolete (short tablenum, hdlhashtable *htable) { *************** *** 541,544 **** --- 543,548 ---- return (true); } /*indexhashtable*/ + + #endif *************** *** 977,985 **** nomad = (**ht).hashbucket [i]; ! (**ht).hashbucket [i] = nil; /*disconnect list so table is valid during disposal%/ while (nomad != nil) { ! /* boolean fldisposevalue; --- 981,989 ---- nomad = (**ht).hashbucket [i]; ! (**ht).hashbucket [i] = nil; /%disconnect list so table is valid during disposal%/ while (nomad != nil) { ! /% boolean fldisposevalue; *************** *** 989,993 **** nextnomad = (**nomad).hashlink; ! disposehashnode (nomad, true /*fldisposevalue%/, fldisk); nomad = nextnomad; --- 993,997 ---- nextnomad = (**nomad).hashlink; ! disposehashnode (nomad, true /%fldisposevalue%/, fldisk); nomad = nextnomad; *************** *** 1284,1288 **** hashmerge (hdlhashtable hsource, hdlhashtable hdest) { ! /* merge hsource into hdest, leaving hsource empty. since it consumes no memory (we just unlink nodes and deposit them) it can't fail. --- 1288,1292 ---- hashmerge (hdlhashtable hsource, hdlhashtable hdest) { ! /% merge hsource into hdest, leaving hsource empty. since it consumes no memory (we just unlink nodes and deposit them) it can't fail. *************** *** 1297,1301 **** x = (**hsource).hashbucket [i]; ! while (x != nil) { /*chain through the hash list%/ register hdlhashnode nextx; --- 1301,1305 ---- x = (**hsource).hashbucket [i]; ! while (x != nil) { /%chain through the hash list%/ register hdlhashnode nextx; *************** *** 1308,1315 **** } /*while%/ ! (**hsource).hashbucket [i] = nil; /*we leave the source table empty%/ ! } /*for%/ ! } /*hashmerge*/ ! /** 2/7/91 dmb: new implementation of array references resolves them --- 1312,1319 ---- } /*while%/ ! (**hsource).hashbucket [i] = nil; /%we leave the source table empty%/ ! } /%for%/ ! } /%hashmerge%/ ! */ /** 2/7/91 dmb: new implementation of array references resolves them *************** *** 1329,1334 **** return (hashlocate (bsvarname, hnode, hprev)); ! } /*hashlocatearray%/ ! boolean hashstringtoarrayindex (bigstring bs, short *arrayindex) { --- 1333,1338 ---- return (hashlocate (bsvarname, hnode, hprev)); ! } /%hashlocatearray%/ ! boolean hashstringtoarrayindex (bigstring bs, short *arrayindex) { *************** *** 1336,1340 **** bigstring bscopy; ! if (stringlength (bs) == 0) /*empty names not allowed, defensive driving%/ return (false); --- 1340,1344 ---- bigstring bscopy; ! if (stringlength (bs) == 0) /%empty names not allowed, defensive driving%/ return (false); *************** *** 1354,1361 **** return (true); ! } /*hashstringtoarrayindex%/ */ ! static boolean hashlocate (const bigstring bs, hdlhashnode *hnode, hdlhashnode *hprev) { /* --- 1358,1365 ---- return (true); ! } /%hashstringtoarrayindex%/ */ ! boolean hashlocate (const bigstring bs, hdlhashnode *hnode, hdlhashnode *hprev) { /* *************** *** 1450,1454 **** return (true); ! } /*hashdeletenode*/ --- 1454,1459 ---- return (true); ! } /%hashdeletenode%/ ! */ *************** *** 1531,1539 **** ! static boolean hashsetlocalityvisit (hdlhashnode hnode, ptrlocalityinfo info) { hdlhashtable ht; hdlexternalvariable hv; tyvaluerecord val = (**hnode).val; if (val.valuetype == externalvaluetype) { --- 1536,1545 ---- ! static boolean hashsetlocalityvisit (hdlhashnode hnode, ptrvoid refcon) { hdlhashtable ht; hdlexternalvariable hv; tyvaluerecord val = (**hnode).val; + ptrlocalityinfo info = (ptrlocalityinfo) refcon; if (val.valuetype == externalvaluetype) { *************** *** 1961,1965 **** return (true); ! } /*hashinsertaddress*/ --- 1967,1972 ---- return (true); ! } /%hashinsertaddress%/ ! */ *************** *** 2175,2181 **** ! static boolean nodeintablevisit (hdlhashnode hnode, hdlhashnode hnodelookfor) { ! return (hnode != hnodelookfor); /*false terminates traversal*/ } /*nodeintablevisit*/ --- 2182,2188 ---- ! static boolean nodeintablevisit (hdlhashnode hnode, ptrvoid refcon) { ! return (hnode != (hdlhashnode) refcon); /*false terminates traversal*/ } /*nodeintablevisit*/ *************** *** 2502,2506 **** ! static boolean hashpackvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, typackinforecord *pi) { /* --- 2509,2513 ---- ! static boolean hashpackvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 2525,2528 **** --- 2532,2536 ---- */ + typackinforecord *pi = (typackinforecord *) refcon; tydisksymbolrecord rec; bigstring bsvalue; |
|
From: Andre R. <and...@us...> - 2004-10-31 21:43:03
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28485 Modified Files: lang.h Log Message: Fixed GCC compiler warnings. Index: lang.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/lang.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** lang.h 28 Oct 2004 23:07:18 -0000 1.3 --- lang.h 31 Oct 2004 21:42:48 -0000 1.4 *************** *** 1273,1276 **** --- 1273,1278 ---- extern boolean langsetlongvarparam (hdltreenode, short, long); + extern boolean langsetstringvarparam (hdltreenode, short, bigstring); /* 2004-10-31 aradke */ + extern boolean setintvarparam (hdltreenode, short, short); |
|
From: Andre R. <and...@us...> - 2004-10-31 20:41:32
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17231 Modified Files: tableverbs.h CallMachOFrameWork.h Log Message: Fixed GCC compiler warnings. Index: tableverbs.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/tableverbs.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** tableverbs.h 9 Oct 2004 21:11:16 -0000 1.1 --- tableverbs.h 31 Oct 2004 20:41:22 -0000 1.2 *************** *** 129,133 **** extern boolean tableverbsetupdisplay (hdlhashtable, hdlwindowinfo); ! extern boolean tableresetformatsrects (); extern boolean tablestart (void); --- 129,133 ---- extern boolean tableverbsetupdisplay (hdlhashtable, hdlwindowinfo); ! extern boolean tableresetformatsrects (void); extern boolean tablestart (void); Index: CallMachOFrameWork.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/CallMachOFrameWork.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallMachOFrameWork.h 24 Oct 2004 19:29:05 -0000 1.2 --- CallMachOFrameWork.h 31 Oct 2004 20:41:23 -0000 1.3 *************** *** 29,33 **** extern boolean unixshellcall (Handle hcommand, Handle hreturn); extern OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr); - static boolean unixshellcallinit (void); #endif --- 29,32 ---- |
|
From: Andre R. <and...@us...> - 2004-10-31 20:41:22
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17087 Modified Files: tablestructure.c tablepack.c tablerunbutton.c tableformats.c CallMachOFrameWork.c tablevalidate.c tableops.c tableverbs.c tablecompare.c tabledisplay.c tablescrap.c tableexternal.c tablewindow.c tablepopup.c wpengine.c tablefind.c Log Message: Fixed GCC compiler warnings. Index: tablerunbutton.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablerunbutton.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablerunbutton.c 23 Oct 2004 23:02:51 -0000 1.2 --- tablerunbutton.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 42,60 **** static char *iconstrings [] = { ! "\pZoom", /*0%/ ! "\pOutline", /*1%/ ! "\pWP-Text", /*2%/ nil, ! "\pTable", /*4%/ ! "\pScript", /*5%/ ! "\pMenuBar", /*6%/ ! "\pPicture" /*7%/ }; */ --- 42,60 ---- static char *iconstrings [] = { ! "\pZoom", /%0%/ ! "\pOutline", /%1%/ ! "\pWP-Text", /%2%/ nil, ! "\pTable", /%4%/ ! "\pScript", /%5%/ ! "\pMenuBar", /%6%/ ! "\pPicture" /%7%/ }; */ *************** *** 102,106 **** tyvaluerecord val; ! ixicontitle = 0; /*default%/ if (tablegetcursorinfo (bs, &val)) { --- 102,106 ---- tyvaluerecord val; ! ixicontitle = 0; /%default%/ if (tablegetcursorinfo (bs, &val)) { *************** *** 168,172 **** */ - register boolean flrunnable; hdlhashtable htable; bigstring bs; --- 168,171 ---- *************** *** 177,202 **** return (false); ! flrunnable = false; ! ! switch (val.valuetype) { ! ! case stringvaluetype: ! flrunnable = true; ! ! break; ! ! case externalvaluetype: ! switch (langexternalgettype (val)) { ! ! case idscriptprocessor: ! flrunnable = true; ! ! break; ! } /*switch*/ ! ! break; ! } /*switch*/ ! ! return (flrunnable); } /*tablecursorisrunnable*/ --- 176,182 ---- return (false); ! return (val.valuetype == stringvaluetype ! || (val.valuetype == externalvaluetype ! && langexternalgettype (val) == idscriptprocessor)); } /*tablecursorisrunnable*/ *************** *** 204,208 **** boolean tableruncursor (void) { - register hdltableformats hf = tableformatsdata; tyvaluerecord val; hdlhashtable htable; --- 184,187 ---- *************** *** 232,246 **** case externalvaluetype: ! switch (langexternalgettype (val)) { ! case idscriptprocessor: ! tablegetcursorpath (bsscript); ! ! pushstring ((ptrstring) "\x02()", bsscript); ! ! return (langrunstring (bsscript, bsresult)); ! } /*switch*/ break; } /*switch*/ --- 211,229 ---- case externalvaluetype: ! if (langexternalgettype (val) == idscriptprocessor) { ! ! tablegetcursorpath (bsscript); ! pushstring ((ptrstring) "\x02()", bsscript); ! ! return (langrunstring (bsscript, bsresult)); ! } /*if*/ break; + + default: + /* do nothing */ + break; + } /*switch*/ Index: tablefind.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablefind.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablefind.c 23 Oct 2004 23:00:36 -0000 1.2 --- tablefind.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 419,423 **** /* ! if (searchparams.floneobject) /*user has flat search turned off%/ return (false); */ --- 419,423 ---- /* ! if (searchparams.floneobject) /%user has flat search turned off%/ return (false); */ Index: wpengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/wpengine.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wpengine.c 30 Oct 2004 20:49:51 -0000 1.3 --- wpengine.c 31 Oct 2004 20:41:10 -0000 1.4 *************** *** 443,448 **** */ - register hdlwindowinfo hw = wpwindowinfo; - if ((wpwindowinfo != nil) && wpdisplayenabled ()) (**wpwindowinfo).selectioninfo.fldirty = true; --- 443,446 ---- *************** *** 644,648 **** (*bounds).right = (*r).left + wpavailwidth (); ! } /*getlongbounds*/ --- 642,647 ---- (*bounds).right = (*r).left + wpavailwidth (); ! } /%getlongbounds%/ ! */ *************** *** 962,966 **** return (lastline - line1 + 1); ! } /*wpgetcurrentscreenlines*/ --- 961,966 ---- return (lastline - line1 + 1); ! } /%wpgetcurrentscreenlines%/ ! */ *************** *** 1684,1687 **** --- 1684,1691 ---- break; + + default: + /* nothing to do */ + break; } *************** *** 1817,1822 **** if (wpsetglobals ()) { ! register pg_ref pg = wpbuffer; ! Rect rcontent = (**wpdata).wprect; graf_device_ptr updateport = NULL; hdlregion updatergn = nil; --- 1821,1827 ---- if (wpsetglobals ()) { ! #ifdef gray3Dlook ! Rect rcontent = (**wpdata).wprect; ! #endif graf_device_ptr updateport = NULL; hdlregion updatergn = nil; *************** *** 1842,1850 **** #endif - #ifdef gray3Dlook - pushbackcolor (&whitecolor); - - eraserect (rcontent); - #endif if (updatergn == nil) --- 1847,1850 ---- *************** *** 3067,3071 **** ! static void wppostruleredit (boolean flchangedtext, boolean flvisi) { /* --- 3067,3071 ---- ! void wppostruleredit (boolean flchangedtext, boolean flvisi) { /* *************** *** 3133,3137 **** return (false); ! } /*wperrorhandler*/ --- 3133,3138 ---- return (false); ! } /%wperrorhandler%/ ! */ *************** *** 3215,3219 **** ! static boolean wppushundo (long undocode, void *insertref) { setupundo (undocode, insertref); --- 3216,3220 ---- ! boolean wppushundo (long undocode, void *insertref) { setupundo (undocode, insertref); *************** *** 3229,3233 **** ! static boolean wppushformatundo (void) { return (wppushrulerundo ()); --- 3230,3234 ---- ! boolean wppushformatundo (void) { return (wppushrulerundo ()); *************** *** 3381,3386 **** #endif return (false); ! } /*wptrimrighthiddentextfromselection*/ ! boolean wpkeystroke (void) { --- 3382,3387 ---- #endif return (false); ! } /%wptrimrighthiddentextfromselection%/ ! */ boolean wpkeystroke (void) { *************** *** 3395,3399 **** pg_byte chkey = keyboardstatus.chkb; short modifiers = 0; - long extending = 0; boolean flinserting = true; pg_short_t caretverb = (pg_short_t) -1; --- 3396,3399 ---- Index: tablestructure.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablestructure.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablestructure.c 23 Oct 2004 23:03:32 -0000 1.2 --- tablestructure.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 244,248 **** */ - Handle hdata = (Handle) (**internaltable).hashtablerefcon; hdlhashtable hsystem, htemp; --- 244,247 ---- *************** *** 534,538 **** ! static boolean checktablestructure (boolean flcreate) { /* --- 533,537 ---- ! boolean checktablestructure (boolean flcreate) { /* *************** *** 594,598 **** } ! /*usertable = roottable; /*does this work?*/ return (fl); --- 593,597 ---- } ! //usertable = roottable; /*does this work?*/ return (fl); Index: tableformats.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableformats.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tableformats.c 23 Oct 2004 23:00:50 -0000 1.2 --- tableformats.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 116,120 **** register hdltableformats hf = tableformatsdata; ! register hdlhashtable ht = (hdlhashtable) (**hf).htable; hdloutlinerecord ho = (**hf).houtline; --- 116,120 ---- register hdltableformats hf = tableformatsdata; ! //register hdlhashtable ht = (hdlhashtable) (**hf).htable; hdloutlinerecord ho = (**hf).houtline; *************** *** 235,239 **** register hdltableformats hc = tableformatsdata; - hdloutlinerecord ho = outlinedata; long curwidth, newwidth; short i; --- 235,238 ---- *************** *** 466,472 **** // (**ho).returnkeycallback = tablereturnkey; ! (**ho).setscrapcallback = browsersetscrap; ! (**ho).getscrapcallback = browsergetscrap; (**ho).beforeprintpagecallback = tablebeforeprintpage; --- 465,471 ---- // (**ho).returnkeycallback = tablereturnkey; ! (**ho).setscrapcallback = (opsetscrapcallback) browsersetscrap; ! (**ho).getscrapcallback = (opgetscrapcallback) browsergetscrap; (**ho).beforeprintpagecallback = tablebeforeprintpage; *************** *** 478,485 **** static boolean duplicateexpansion (hdlheadrecord, hdlheadrecord); // forward ! static boolean duplicateexpansionvisit (hdlheadrecord hnode, hdlheadrecord hfirstnew) { if (opsubheadsexpanded (hnode)) { bigstring bs; hdlheadrecord hmatch; --- 477,485 ---- static boolean duplicateexpansion (hdlheadrecord, hdlheadrecord); // forward ! static boolean duplicateexpansionvisit (hdlheadrecord hnode, ptrvoid refcon) { if (opsubheadsexpanded (hnode)) { + hdlheadrecord hfirstnew = (hdlheadrecord) refcon; bigstring bs; hdlheadrecord hmatch; *************** *** 726,730 **** void tabledisposeoutline (hdltableformats hf) { ! hdlhashtable ht = (**hf).htable; hdloutlinerecord ho = (**hf).houtline; --- 726,730 ---- void tabledisposeoutline (hdltableformats hf) { ! //hdlhashtable ht = (**hf).htable; hdloutlinerecord ho = (**hf).houtline; *************** *** 810,819 **** } - /* tableresetrects (tablerect); ! x = (tablerect.right - tablerect.left) / ctcols; /*initial column width*/ - /* x = (**hf).defaultcolwidth = tablelimitcolwidth (x); --- 810,817 ---- } tableresetrects (tablerect); ! x = (tablerect.right - tablerect.left) / ctcols; /%initial column width%/ x = (**hf).defaultcolwidth = tablelimitcolwidth (x); Index: tableexternal.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableexternal.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tableexternal.c 23 Oct 2004 23:00:07 -0000 1.2 --- tableexternal.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 343,347 **** ! static boolean tableresetformatsrects () { /* --- 343,347 ---- ! boolean tableresetformatsrects (void) { /* *************** *** 748,752 **** ! static boolean finddatabasevisit (WindowPtr w, tyfinddatabaseinfo *pinfo) { if (ccwindowgetdatabase (w) == (*pinfo).hdatabase) { // got it --- 748,754 ---- ! static boolean finddatabasevisit (WindowPtr w, ptrvoid refcon) { ! ! tyfinddatabaseinfo *pinfo = (tyfinddatabaseinfo *) refcon; if (ccwindowgetdatabase (w) == (*pinfo).hdatabase) { // got it *************** *** 824,828 **** if (langexternalvaltotable (val, &htable, hnode)) { ! hashtablevisit (htable, &tableupdatewindowtitles, htable); /*daisy chain recursion*/ } --- 826,830 ---- if (langexternalvaltotable (val, &htable, hnode)) { ! hashtablevisit (htable, (langtablevisitcallback) &tableupdatewindowtitles, htable); /*daisy chain recursion*/ } *************** *** 906,910 **** ! static boolean tablesymbolzoomvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) { /* --- 908,912 ---- ! static boolean tablesymbolzoomvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 912,915 **** --- 914,918 ---- */ + ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon; bigstring bs; tybrowserinfo info; *************** *** 953,958 **** ! static boolean tablesymbolchangedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) { bigstring bs; tybrowserinfo info; --- 956,962 ---- ! static boolean tablesymbolchangedvisit (hdlheadrecord hnode, ptrvoid refcon) { + ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon; bigstring bs; tybrowserinfo info; *************** *** 1018,1022 **** ! static boolean tablesymbolinsertedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) { /* --- 1022,1026 ---- ! static boolean tablesymbolinsertedvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 1031,1034 **** --- 1035,1039 ---- */ + ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon; tybrowserspec fs; hdlhashtable htable; *************** *** 1092,1096 **** ! static boolean tablesymboldeletedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) { /* --- 1097,1101 ---- ! static boolean tablesymboldeletedvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 1099,1102 **** --- 1104,1108 ---- */ + ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon; bigstring bs; tybrowserinfo info; *************** *** 1154,1159 **** ! static boolean tablesymbolsresortedvisit (hdlheadrecord hnode, ptrsymbolchangedinfo symbolinfo) { tybrowserspec fs; hdlhashtable htable; --- 1160,1166 ---- ! static boolean tablesymbolsresortedvisit (hdlheadrecord hnode, ptrvoid refcon) { + ptrsymbolchangedinfo symbolinfo = (ptrsymbolchangedinfo) refcon; tybrowserspec fs; hdlhashtable htable; *************** *** 1279,1284 **** saveoutlinedata = outlinedata; // may not be associated with current shellglobals ! fl = shellvisittypedwindows (idtableconfig, &tablesymbolchangedwindowvisit, &symbolchangedinfo) ! && shellvisittypedwindows (idcancoonconfig, &tablesymbolchangedwindowvisit, &symbolchangedinfo) && symbolchangedinfo.flfound; --- 1286,1291 ---- saveoutlinedata = outlinedata; // may not be associated with current shellglobals ! fl = shellvisittypedwindows (idtableconfig, (shellwindowvisitcallback) &tablesymbolchangedwindowvisit, &symbolchangedinfo) ! && shellvisittypedwindows (idcancoonconfig, (shellwindowvisitcallback) &tablesymbolchangedwindowvisit, &symbolchangedinfo) && symbolchangedinfo.flfound; Index: tabledisplay.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tabledisplay.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tabledisplay.c 23 Oct 2004 22:59:40 -0000 1.2 --- tabledisplay.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 70,95 **** - - - static void darkcolorof (RGBColor *rgb) { - - (*rgb).red -= (*rgb).red / 4; - - (*rgb).green -= (*rgb).green / 4; - - (*rgb).blue -= (*rgb).blue / 4; - } /*darkcolorof*/ - - - static void lightcolorof (RGBColor *rgb) { - - (*rgb).red += (65535 - (*rgb).red) / 3; - - (*rgb).green += (65535 - (*rgb).green) / 3; - - (*rgb).blue += (65535 - (*rgb).blue) / 3; - } /*lightcolorof*/ - - static short opnodeindentpix (hdlheadrecord hnode) { --- 70,73 ---- *************** *** 130,135 **** ploticonresource (&r, align, transform, iconresnum); #endif ! } /*tabledrawnodeicon*/ ! static void tableprepfordraw (Rect *r) { --- 108,113 ---- ploticonresource (&r, align, transform, iconresnum); #endif ! } /%tabledrawnodeicon%/ ! */ static void tableprepfordraw (Rect *r) { *************** *** 204,208 **** if (flbitmap) ! flbitmap = openbitmap (r, getport ()); #if TARGET_API_MAC_CARBON == 1 --- 182,186 ---- if (flbitmap) ! flbitmap = openbitmap (r, (WindowPtr) getport ()); #if TARGET_API_MAC_CARBON == 1 *************** *** 227,231 **** if (flbitmap) ! closebitmap (getport ()); popstyle (); --- 205,209 ---- if (flbitmap) ! closebitmap ((WindowPtr) getport ()); popstyle (); *************** *** 274,278 **** static void tableupdateseparator (void) { ! /* we formalized the separator rect so we could easily experiment with different ideas for showing the boundary between the titles of a table display and --- 252,256 ---- static void tableupdateseparator (void) { ! /% we formalized the separator rect so we could easily experiment with different ideas for showing the boundary between the titles of a table display and *************** *** 284,288 **** seprect = (**tableformatsdata).seprect; ! if (!shellrectneedsupdate (&seprect)) /*no intersection, nothing to do%/ return; --- 262,266 ---- seprect = (**tableformatsdata).seprect; ! if (!shellrectneedsupdate (&seprect)) /%no intersection, nothing to do%/ return; *************** *** 291,295 **** eraserect (seprect); ! } /*tableupdateseparator*/ --- 269,274 ---- eraserect (seprect); ! } /%tableupdateseparator%/ ! */ *************** *** 418,422 **** */ - hdltableformats hc = tableformatsdata; short optextindent = opnodeindentpix (hnode) + opiconindentpix (); --- 397,400 ---- *************** *** 530,534 **** register hdltableformats hf = tableformatsdata; register short h; - hdlheadrecord hnode = (**outlinedata).hline1; Rect rtable, rcell; Point pt; --- 508,511 ---- *************** *** 662,666 **** hdltableformats hf = tableformatsdata; short col; - short indent = opnodeindentpix (hnode) + opiconindentpix (); if (isclaydisplay (hf)) --- 639,642 ---- *************** *** 965,970 **** Rect rcell; ! hdloutlinerecord ho = outlinedata; ! boolean fltextmode = (**ho).fltextmode; /* --- 941,946 ---- Rect rcell; ! //hdloutlinerecord ho = outlinedata; ! //boolean fltextmode = (**ho).fltextmode; /* *************** *** 1104,1108 **** ! static void browserdrawnodeicon (const Rect *r, boolean flhighlighted, hdlheadrecord hnode) { tybrowserinfo browserinfo; --- 1080,1084 ---- ! void browserdrawnodeicon (const Rect *r, boolean flhighlighted, hdlheadrecord hnode) { tybrowserinfo browserinfo; *************** *** 1286,1291 **** getparent return (opinsertheadline (emptystring, dir, flcomment)); ! } /*tablereturnkey*/ ! boolean tableinitdisplay (void) { --- 1262,1267 ---- getparent return (opinsertheadline (emptystring, dir, flcomment)); ! } /%tablereturnkey%/ ! */ boolean tableinitdisplay (void) { Index: tableops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableops.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tableops.c 23 Oct 2004 23:01:37 -0000 1.2 --- tableops.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 427,431 **** register short i; tyvaluerecord val; ! register hdlexternalvariable hv; for (i = 0; i < ctbuckets; i++) { --- 427,431 ---- register short i; tyvaluerecord val; ! register hdlexternalvariable hv = nil; for (i = 0; i < ctbuckets; i++) { *************** *** 595,601 **** static boolean tableupdatesubsdirtyflag (hdlhashtable ht); /*forward declaration*/ ! static boolean updatesubsdirtyvisit (hdlhashnode hnode, boolean *flsubsdirty) { tyvaluerecord val = (**hnode).val; if (val.valuetype == externalvaluetype) { --- 595,602 ---- static boolean tableupdatesubsdirtyflag (hdlhashtable ht); /*forward declaration*/ ! static boolean updatesubsdirtyvisit (hdlhashnode hnode, ptrvoid refcon) { tyvaluerecord val = (**hnode).val; + boolean *flsubsdirty = (boolean *) refcon; if (val.valuetype == externalvaluetype) { *************** *** 657,661 **** ! static boolean findtablevisit (hdlhashnode hnode, ptrfindtableinfo info) { /* --- 658,662 ---- ! static boolean findtablevisit (hdlhashnode hnode, ptrvoid refcon) { /* *************** *** 663,667 **** one pointed to by info.htablelookfor. */ ! hdltablevariable hvariable; register hdlhashtable ht; --- 664,668 ---- one pointed to by info.htablelookfor. */ ! ptrfindtableinfo info = (ptrfindtableinfo) refcon; hdltablevariable hvariable; register hdlhashtable ht; *************** *** 700,704 **** register short i; tyvaluerecord val; ! register hdlexternalvariable hv; if (intable == fortable) { /*special case for root*/ --- 701,705 ---- register short i; tyvaluerecord val; ! register hdlexternalvariable hv = nil; if (intable == fortable) { /*special case for root*/ *************** *** 830,834 **** return (tablevisi ((**hf).rowcursor, (**hf).colcursor)); ! } /*tablevisicursor*/ --- 831,836 ---- return (tablevisi ((**hf).rowcursor, (**hf).colcursor)); ! } /%tablevisicursor%/ ! */ *************** *** 848,852 **** */ - register hdltableformats hf = tableformatsdata; hdlheadrecord hfound; boolean fl; --- 850,853 ---- *************** *** 930,937 **** return (hashgetnthnode (tablegetlinkedhashtable (), (**hf).rowcursor, hnode)); ! } /*tablesavebarcursor*/ - /* static boolean tablerestorebarcursor (hdlhashnode hnode) { --- 931,937 ---- return (hashgetnthnode (tablegetlinkedhashtable (), (**hf).rowcursor, hnode)); ! } /%tablesavebarcursor%/ static boolean tablerestorebarcursor (hdlhashnode hnode) { *************** *** 943,948 **** return (true); ! } /*tablerestorebarcursor*/ ! boolean tableresort (hdlhashtable ht, hdlhashnode hresort) { --- 943,948 ---- return (true); ! } /%tablerestorebarcursor%/ ! */ boolean tableresort (hdlhashtable ht, hdlhashnode hresort) { Index: CallMachOFrameWork.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/CallMachOFrameWork.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CallMachOFrameWork.c 31 Oct 2004 17:59:48 -0000 1.3 --- CallMachOFrameWork.c 31 Oct 2004 20:41:10 -0000 1.4 *************** *** 45,48 **** --- 45,51 ---- + static boolean unixshellcallinit (void); /* forward declaration */ + + boolean unixshellcall (Handle hcommand, Handle hreturn) { Index: tablevalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablevalidate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablevalidate.c 23 Oct 2004 23:03:49 -0000 1.2 --- tablevalidate.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 175,180 **** copystring (bs, bslast); ! } /*while*/ ! return (true); } /*validate*/ --- 175,181 ---- copystring (bs, bslast); ! } /%while%/ ! */ ! return (true); } /*validate*/ Index: tablepack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablepack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablepack.c 23 Oct 2004 23:01:59 -0000 1.2 --- tablepack.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 376,380 **** ! static boolean tablepacktotextvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, Handle htextscrap) { /* --- 376,380 ---- ! static boolean tablepacktotextvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 382,385 **** --- 382,386 ---- */ + Handle htextscrap = (Handle) refcon; boolean fl; *************** *** 429,435 **** //htextscrap = htext; /*set for visit routine*/ ! /* ! fl = !hashinversesearch (ht, &tablepacktotextvisit, bsname); /*false means complete traversal%/ ! */ fl = !tablesortedinversesearch (ht, &tablepacktotextvisit, htext); --- 430,434 ---- //htextscrap = htext; /*set for visit routine*/ ! //fl = !hashinversesearch (ht, &tablepacktotextvisit, bsname); /*false means complete traversal%/ fl = !tablesortedinversesearch (ht, &tablepacktotextvisit, htext); *************** *** 478,482 **** ! static boolean findusedblocksvisit (hdlhashnode hnode, ptrstring bsparent) { /* --- 477,481 ---- ! static boolean findusedblocksvisit (hdlhashnode hnode, ptrvoid refcon) { /* *************** *** 484,487 **** --- 483,487 ---- */ + ptrstring bsparent = (ptrstring) refcon; tyvaluerecord val = (**hnode).val; bigstring bspath; Index: tablescrap.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablescrap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablescrap.c 23 Oct 2004 23:03:10 -0000 1.2 --- tablescrap.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 59,62 **** --- 59,63 ---- + #if 0 static boolean tablegetscrapvaluetype (Handle hscrap, tyvaluetype *type) { *************** *** 78,81 **** --- 79,84 ---- } /*tablegetscrapvaluetype*/ + #endif + static boolean tableexpandtodotparams (bigstring bspath, hdlhashtable *htable, bigstring bsname) { *************** *** 371,374 **** --- 374,379 ---- + #ifndef odbbrowser + static void tabledisposescrap (hdltablescrap hscrap) { *************** *** 376,379 **** --- 381,386 ---- } /*tabledisposescrap*/ + #endif + boolean tablescraphook (Handle hscrap) { *************** *** 414,418 **** if (getscrap (scraptype, hscrap)) { ! shellsetscrap (hscrap, scraptype, &disposehandle, &tableexportvaluescrap); return (false); /*don't call any more hooks*/ --- 421,427 ---- if (getscrap (scraptype, hscrap)) { ! shellsetscrap (hscrap, scraptype, ! (shelldisposescrapcallback) &disposehandle, ! (shellexportscrapcallback) &tableexportvaluescrap); return (false); /*don't call any more hooks*/ *************** *** 475,479 **** #endif ! static boolean tableredoclear (hdlhashnode hnode, boolean flundo) { bigstring bsname; --- 484,488 ---- #endif ! boolean tableredoclear (hdlhashnode hnode, boolean flundo) { bigstring bsname; *************** *** 505,509 **** ! static boolean tableundoclear (hdlhashnode hnode, boolean flundo) { hdlhashtable htable = tablegetlinkedhashtable (); --- 514,518 ---- ! boolean tableundoclear (hdlhashnode hnode, boolean flundo) { hdlhashtable htable = tablegetlinkedhashtable (); Index: tablepopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablepopup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablepopup.c 23 Oct 2004 23:02:23 -0000 1.2 --- tablepopup.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 81,85 **** typedef struct tykindmenuinfo { ! /*byte *bsitem; /*the text of the menu item*/ tyvaluetype type; /*the associated value type*/ --- 81,85 ---- typedef struct tykindmenuinfo { ! //byte *bsitem; /*the text of the menu item*/ tyvaluetype type; /*the associated value type*/ *************** *** 89,141 **** static tykindmenuinfo kindmenuinfo [] = { /*menu contents, in menu order*/ ! /*Boolean*/ booleanvaluetype, /*1*/ ! /*Character*/ charvaluetype, /*2*/ ! /*Number*/ longvaluetype, /*3*/ ! /*Float*/ doublevaluetype, /*4*/ ! /*Date*/ datevaluetype, /*5*/ ! /*Direction*/ directionvaluetype, /*6*/ ! /*String*/ stringvaluetype, /*7*/ ! /*-*/ novaluetype, /*8*/ ! /*String4*/ ostypevaluetype, /*9*/ ! /*Enumerator*/ enumvaluetype, /*10*/ ! /*File Specifier*/ filespecvaluetype, /*11*/ ! /*Alias*/ aliasvaluetype, /*12*/ ! /*Object Specifier*/ objspecvaluetype, /*13*/ ! /*Address*/ addressvaluetype, /*14*/ ! /*-*/ novaluetype, /*15*/ ! /*Table*/ tablevaluetype, /*16*/ ! /*WP-Text*/ wordvaluetype, /*17*/ ! /*Picture*/ pictvaluetype, /*18*/ ! /*Outline*/ outlinevaluetype, /*19*/ ! /*Script*/ scriptvaluetype, /*20*/ ! /*MenuBar*/ menuvaluetype, /*21*/ ! /*-*/ novaluetype, ! /*List*/ listvaluetype, /*23*/ ! /*Record*/ recordvaluetype, /*24*/ ! /*Binary*/ binaryvaluetype /*25*/ }; --- 89,141 ---- static tykindmenuinfo kindmenuinfo [] = { /*menu contents, in menu order*/ ! {/*Boolean*/ booleanvaluetype}, /*1*/ ! {/*Character*/ charvaluetype}, /*2*/ ! {/*Number*/ longvaluetype}, /*3*/ ! {/*Float*/ doublevaluetype}, /*4*/ ! {/*Date*/ datevaluetype}, /*5*/ ! {/*Direction*/ directionvaluetype}, /*6*/ ! {/*String*/ stringvaluetype}, /*7*/ ! {/*-*/ novaluetype}, /*8*/ ! {/*String4*/ ostypevaluetype}, /*9*/ ! {/*Enumerator*/ enumvaluetype}, /*10*/ ! {/*File Specifier*/ filespecvaluetype}, /*11*/ ! {/*Alias*/ aliasvaluetype}, /*12*/ ! {/*Object Specifier*/ objspecvaluetype}, /*13*/ ! {/*Address*/ addressvaluetype}, /*14*/ ! {/*-*/ novaluetype}, /*15*/ ! {/*Table*/ tablevaluetype}, /*16*/ ! {/*WP-Text*/ wordvaluetype}, /*17*/ ! {/*Picture*/ pictvaluetype}, /*18*/ ! {/*Outline*/ outlinevaluetype}, /*19*/ ! {/*Script*/ scriptvaluetype}, /*20*/ ! {/*MenuBar*/ menuvaluetype}, /*21*/ ! {/*-*/ novaluetype}, ! {/*List*/ listvaluetype}, /*23*/ ! {/*Record*/ recordvaluetype}, /*24*/ ! {/*Binary*/ binaryvaluetype} /*25*/ }; *************** *** 216,224 **** if (vt1 == stringvaluetype) { /*special cases for converting from a string*/ ! switch (vt2) { ! case wordvaluetype: ! case outlinevaluetype: ! case scriptvaluetype: ! return (true); } } --- 216,223 ---- if (vt1 == stringvaluetype) { /*special cases for converting from a string*/ ! if (vt2 == wordvaluetype ! || vt2 == outlinevaluetype ! || vt2 == scriptvaluetype) { ! return (true); } } *************** *** 511,515 **** bigstring bs; ! register short sortorder; switch (itemselected) { --- 510,514 ---- bigstring bs; ! register short sortorder = sortbyname; /*default*/ switch (itemselected) { Index: tablewindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablewindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablewindow.c 23 Oct 2004 23:04:19 -0000 1.2 --- tablewindow.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 377,382 **** ! static boolean tablegetvariableroutine (hdlexternalvariable *hvariable) { hdlhashtable ht; --- 377,383 ---- ! static boolean tablegetvariableroutine (ptrvoid refcon) { + hdlexternalvariable *hvariable = (hdlexternalvariable *) refcon; hdlhashtable ht; *************** *** 588,595 **** - static void tableeditreturnkey () { - } /*tableeditreturnkey*/ - - static boolean tableverbkeystroke (void) { --- 589,592 ---- Index: tablecompare.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tablecompare.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tablecompare.c 23 Oct 2004 22:59:23 -0000 1.2 --- tablecompare.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 104,108 **** register hdlhashnode h2 = hnode2; tyvaluerecord val1, val2, vreturned; ! register boolean fllessthan; register boolean flequal = false; boolean flcomparable; --- 104,108 ---- register hdlhashnode h2 = hnode2; tyvaluerecord val1, val2, vreturned; ! register boolean fllessthan = false; register boolean flequal = false; boolean flcomparable; Index: tableverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/tableverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tableverbs.c 23 Oct 2004 23:04:05 -0000 1.2 --- tableverbs.c 31 Oct 2004 20:41:10 -0000 1.3 *************** *** 387,391 **** static boolean tablefindverb (hdltreenode hparam1, tyvaluerecord *v) { ! /* table.find (adr, bs): boolean; search the (external) value at adr for the string bs. if adr is a table, do *not* search subordinate --- 387,391 ---- static boolean tablefindverb (hdltreenode hparam1, tyvaluerecord *v) { ! /% table.find (adr, bs): boolean; search the (external) value at adr for the string bs. if adr is a table, do *not* search subordinate *************** *** 425,429 **** return (true); ! } /*tablefindverb*/ --- 425,430 ---- return (true); ! } /%tablefindverb%/ ! */ *************** *** 529,534 **** ! static boolean tablegetselvisit (hdlheadrecord hnode, hdllistrecord hlist) { hdlhashtable ht; bigstring bs; --- 530,536 ---- ! static boolean tablegetselvisit (hdlheadrecord hnode, ptrvoid refcon) { + hdllistrecord hlist = (hdllistrecord) refcon; hdlhashtable ht; bigstring bs; *************** *** 596,600 **** static boolean tablesetdisplaysettingsverb (hdltreenode hp1, tyvaluerecord *v) { - hdltableformats hf = tableformatsdata; hdlhashtable hsettings; tylinelayout layout; --- 598,601 ---- |
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27425 Modified Files: op.c langtrace.c threads.c opdisplay.c opops.c opicons.c osacomponent.c langipc.c textdisplay.c Log Message: Fixed GCC compiler warnings. Index: langtrace.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langtrace.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langtrace.c 23 Oct 2004 22:32:07 -0000 1.2 --- langtrace.c 31 Oct 2004 19:08:15 -0000 1.3 *************** *** 123,127 **** #ifdef fldebug ! fllangtrace = fl; /*set global that turns the syntax trace on or off%/ if (fl) --- 123,127 ---- #ifdef fldebug ! fllangtrace = fl; /%set global that turns the syntax trace on or off%/ if (fl) *************** *** 129,133 **** #endif ! } /*langsyntaxtrace*/ ! --- 129,133 ---- #endif ! } /%langsyntaxtrace%/ ! */ Index: osacomponent.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/osacomponent.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** osacomponent.c 28 Oct 2004 19:54:59 -0000 1.5 --- osacomponent.c 31 Oct 2004 19:08:16 -0000 1.6 *************** *** 1532,1536 **** ! #if TARGET_API_MAC_CLASSIC static UniversalProcPtr installpatch (short trapnum, GNEUPP patch) { --- 1532,1536 ---- ! #if TARGET_API_MAC_OS8 static UniversalProcPtr installpatch (short trapnum, GNEUPP patch) { *************** *** 1709,1713 **** ! #if TARGET_API_MAC_CLASSIC static pascal Boolean osagetnextevent (short mask, EventRecord *event) { --- 1709,1713 ---- ! #if TARGET_API_MAC_OS8 static pascal Boolean osagetnextevent (short mask, EventRecord *event) { *************** *** 1758,1762 **** } /*osagetnextevent*/ ! #endif /*TARGET_API_MAC_CLASSIC*/ --- 1758,1762 ---- } /*osagetnextevent*/ ! #endif /*TARGET_API_MAC_OS8*/ Index: langipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langipc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langipc.c 23 Oct 2004 22:27:45 -0000 1.2 --- langipc.c 31 Oct 2004 19:08:17 -0000 1.3 *************** *** 2308,2311 **** --- 2308,2315 ---- break; + + default: + /* do nothing */ + break; } Index: opops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opops.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opops.c 23 Oct 2004 22:42:34 -0000 1.2 --- opops.c 31 Oct 2004 19:08:16 -0000 1.3 *************** *** 814,817 **** --- 814,821 ---- break; + + default: + /* do nothing */ + break; } /*switch*/ Index: opicons.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opicons.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** opicons.c 23 Oct 2004 22:41:04 -0000 1.2 --- opicons.c 31 Oct 2004 19:08:16 -0000 1.3 *************** *** 262,265 **** --- 262,270 ---- case right: iconnum = righticon; break; + + default: + /* do nothing*/ + break; + } /*switch*/ Index: opdisplay.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/opdisplay.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** opdisplay.c 29 Oct 2004 00:09:40 -0000 1.3 --- opdisplay.c 31 Oct 2004 19:08:16 -0000 1.4 *************** *** 1598,1601 **** --- 1598,1606 ---- break; + + default: + /* do nothing */ + break; + } /*switch*/ Index: op.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/op.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** op.c 23 Oct 2004 22:38:52 -0000 1.2 --- op.c 31 Oct 2004 19:08:15 -0000 1.3 *************** *** 1047,1050 **** --- 1047,1054 ---- break; + + default: + /* do nothing */ + break; } *************** *** 1517,1520 **** --- 1521,1528 ---- break; + + default: + /* do nothing */ + break; } *************** *** 1541,1544 **** --- 1549,1556 ---- break; + + default: + /* do nothing */ + break; } *************** *** 1563,1566 **** --- 1575,1583 ---- break; + + default: + /* do nothing */ + break; + } } Index: textdisplay.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/textdisplay.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** textdisplay.c 23 Oct 2004 23:04:40 -0000 1.2 --- textdisplay.c 31 Oct 2004 19:08:17 -0000 1.3 *************** *** 71,74 **** --- 71,77 ---- switch (spacing) { + case singlespaced: + break; + case oneandalittlespaced: r3 += 1; break; Index: threads.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/threads.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** threads.c 31 Oct 2004 16:45:52 -0000 1.3 --- threads.c 31 Oct 2004 19:08:15 -0000 1.4 *************** *** 88,92 **** static pascal void copythreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); #endif --- 88,92 ---- static pascal void copythreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); #endif *************** *** 94,98 **** (*threadcallbacks.swapoutcallback) (hglobals); ! #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); #endif --- 94,98 ---- (*threadcallbacks.swapoutcallback) (hglobals); ! #if TARGET_API_MAC_OS8 RestoreA5 (curA5); #endif *************** *** 102,106 **** static pascal void swapinthreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); #endif --- 102,106 ---- static pascal void swapinthreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); #endif *************** *** 108,112 **** (*threadcallbacks.swapincallback) (hglobals); ! #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); #endif --- 108,112 ---- (*threadcallbacks.swapincallback) (hglobals); ! #if TARGET_API_MAC_OS8 RestoreA5 (curA5); #endif *************** *** 116,120 **** static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); #endif --- 116,120 ---- static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { ! #if TARGET_API_MAC_OS8 long curA5 = SetUpAppA5 (); #endif *************** *** 133,137 **** (*threadcallbacks.disposecallback) (hglobals); ! #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); #endif --- 133,137 ---- (*threadcallbacks.disposecallback) (hglobals); ! #if TARGET_API_MAC_OS8 RestoreA5 (curA5); #endif |
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22795 Modified Files: langxml.c langstartup.c langops.c langpack.c langwinipc.c langsystypes.c langscan.c langverbs.c langvalue.c langtree.c Log Message: Fixed GCC compiler warnings. Index: langverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langverbs.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langverbs.c 23 Oct 2004 22:33:15 -0000 1.3 --- langverbs.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 585,592 **** case controlkeyfunc: return (kb.flcontrolkey); ! } /*switch*/ - return (false); } /*keyboardmodifierverb*/ --- 585,593 ---- case controlkeyfunc: return (kb.flcontrolkey); ! ! default: ! return (false); } /*switch*/ } /*keyboardmodifierverb*/ *************** *** 607,614 **** err = PPostEvent (keyDown, (keycode << 8) + keychar, &ev); ! /***ev.evtQModifiers = btnState; /*the mouse is up%/ return (err == noErr); ! } /*presskeyverb*/ --- 608,616 ---- err = PPostEvent (keyDown, (keycode << 8) + keychar, &ev); ! //ev.evtQModifiers = btnState; /%the mouse is up%/ return (err == noErr); ! } /%presskeyverb%/ ! */ *************** *** 662,670 **** */ - hdlhashtable hcurrent = currenthashtable; boolean fl; - // pophashtable (); - fl = copyvaluerecord (*v, vcopy); --- 664,669 ---- *************** *** 672,677 **** exemptfromtmpstack (vcopy); - // pushhashtable (hcurrent); - return (fl); } /*copyexemptvalue*/ --- 671,674 ---- *************** *** 1374,1405 **** ! #if MACVERSION ! ! #if TARGET_API_MAC_CARBON ! ! static boolean callxcmdverb (hdltreenode hparam1, tyvaluerecord *vreturned) { ! ! /* ! 2004-10-21 aradke: XCMDs and XCFNs are not supported on OS X ! */ ! ! bigstring bssourcemessage = "\pCan't call Ò^0Ó because XCMDs and XFCNs are not supported in the Carbon version."; ! bigstring bserrormessage; ! bigstring bsxcmd; ! hdlhashtable htable; ! tyvaluerecord val; ! hdlhashnode hnode; ! ! if (!getvarvalue (hparam1, 1, &htable, bsxcmd, &val, &hnode)) ! return (false); ! ! parsedialogstring (bssourcemessage, bsxcmd, nil, nil, nil, bserrormessage); ! ! langerrormessage (bserrormessage); ! return (false); ! ! } /*callxcmdverb*/ ! ! #else #if !TARGET_RT_MAC_CFM --- 1371,1375 ---- ! #if MACVERSION && TARGET_API_MAC_OS8 #if !TARGET_RT_MAC_CFM *************** *** 1568,1572 **** #endif - #endif --- 1538,1541 ---- *************** *** 3165,3178 **** return ((*langcallbacks.msgverbcallback) (hparam1, v)); ! #if MACVERSION ! ! #if !TARGET_API_MAC_CARBON /*7.0b49: not implemented in OS X*/ ! case callxcmdfunc: return (callxcmdverb (hparam1, v)); - - #endif - #endif case callscriptfunc: return (callscriptverb (hparam1, v)); --- 3134,3142 ---- return ((*langcallbacks.msgverbcallback) (hparam1, v)); ! #if MACVERSION && TARGET_API_MAC_OS8 /*7.0b49: not implemented in OS X*/ case callxcmdfunc: return (callxcmdverb (hparam1, v)); #endif + case callscriptfunc: return (callscriptverb (hparam1, v)); Index: langscan.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langscan.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langscan.c 23 Oct 2004 22:30:35 -0000 1.2 --- langscan.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 460,464 **** long x; bigstring bstest; - boolean floverflow = false; if (flhex) { --- 460,463 ---- *************** *** 1331,1335 **** DebugStr ("\pyyoverflow"); ! } /*yyoverflow*/ #endif --- 1330,1336 ---- DebugStr ("\pyyoverflow"); ! } /%yyoverflow%/ ! */ ! #endif Index: langxml.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langxml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langxml.c 23 Oct 2004 22:34:12 -0000 1.2 --- langxml.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 169,173 **** - static boolean handlebeginswith (Handle h, bigstring bs) { --- 169,172 ---- *************** *** 182,185 **** --- 181,186 ---- + #if 0 + static boolean handleendswith (Handle h, bigstring bs) { *************** *** 193,201 **** } /*handleendswith*/ static boolean handlecontains (Handle h, bigstring bs) { return (textpatternmatch (*h, gethandlesize (h), bs, false) >= 0); ! } /*handleendswith*/ --- 194,204 ---- } /*handleendswith*/ + #endif + static boolean handlecontains (Handle h, bigstring bs) { return (textpatternmatch (*h, gethandlesize (h), bs, false) >= 0); ! } /*handlecontains*/ *************** *** 305,308 **** --- 308,313 ---- + #if 0 + static boolean bettyRPCclient (bigstring server, short port, bigstring procedurename, hdltreenode hparams) { *************** *** 376,379 **** --- 381,385 ---- } /*bettyRPCclient*/ + #endif *************** *** 1095,1099 **** bigstring bsfunction; hdlhashtable hremotetable; - boolean fl = false; hdltreenode hcode; short port; --- 1101,1104 ---- *************** *** 1196,1201 **** return (true); ! } /*assignstringvalue*/ ! static boolean assigntokenstringvalue (hdlhashtable ht, const bigstring bs, xmltoken *value) { --- 1201,1206 ---- return (true); ! } /%assignstringvalue%/ ! */ static boolean assigntokenstringvalue (hdlhashtable ht, const bigstring bs, xmltoken *value) { *************** *** 1262,1268 **** ! /*static boolean skipblanks (Handle s) { ! /* on skipBlanks () { loop { --- 1267,1274 ---- ! /* ! static boolean skipblanks (Handle s) { ! /% on skipBlanks () { loop { *************** *** 1272,1276 **** break}; s = string.delete (s, 1, 1)}}; ! * / long ix, ct = gethandlesize (s); --- 1278,1282 ---- break}; s = string.delete (s, 1, 1)}}; ! %/ long ix, ct = gethandlesize (s); *************** *** 1280,1285 **** pullfromhandle (s, 0, ix, nil); ! } /*skipblanks*/ ! static boolean namenomad (xmladdress *nomad, bigstring name) { --- 1286,1291 ---- pullfromhandle (s, 0, ix, nil); ! } /%skipblanks%/ ! */ static boolean namenomad (xmladdress *nomad, bigstring name) { *************** *** 1535,1539 **** static boolean findinhandlestream (handlestream *s, bigstring bsfind, boolean flunicase) { - long startpos = (*s).pos; byte *p = *(*s).data; long ix; --- 1541,1544 ---- *************** *** 1942,1946 **** hdlhashtable nomadtable; hdlhashnode hnode; ! long ixsleep = 0; long lastsleeptickcount = gettickcount (); long ticksbetweensleeps = 60; /*one second*/ --- 1947,1951 ---- hdlhashtable nomadtable; hdlhashnode hnode; ! //long ixsleep = 0; long lastsleeptickcount = gettickcount (); long ticksbetweensleeps = 60; /*one second*/ *************** *** 2142,2146 **** long ctitems; ! /*if (!inmainthread () && !debuggingcurrentprocess ()) { /*PBS 7.1b14: give up some time to other threads periodically.*/ /* ixsleep++; --- 2147,2151 ---- long ctitems; ! //if (!inmainthread () && !debuggingcurrentprocess ()) { /*PBS 7.1b14: give up some time to other threads periodically.*/ /* ixsleep++; *************** *** 2151,2157 **** processsleep (getcurrentthread (), 0); ! } /*if*/ ! /* } /*if*/ ! // if nomad == adrtable if (nomad.ht == (*xmladr).ht && equalstrings (nomad.bs, (*xmladr).bs)) --- 2156,2163 ---- processsleep (getcurrentthread (), 0); ! } /%if%/ ! } /%if%/ ! */ ! // if nomad == adrtable if (nomad.ht == (*xmladr).ht && equalstrings (nomad.bs, (*xmladr).bs)) *************** *** 2173,2177 **** xmladdress adrsubitem; tyvaluerecord val; ! boolean flspecialname = false; bigstring namesubitem; tyvaluetype specialtype; --- 2179,2183 ---- xmladdress adrsubitem; tyvaluerecord val; ! //boolean flspecialname = false; bigstring namesubitem; tyvaluetype specialtype; Index: langwinipc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langwinipc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langwinipc.c 23 Oct 2004 22:33:35 -0000 1.2 --- langwinipc.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 67,72 **** - - boolean langwinipcerrorroutine (bigstring bs, ptrvoid refcon) { --- 67,70 ---- *************** *** 93,96 **** --- 91,96 ---- + #ifdef WIN95VERSION + static void langwinipchookerrors (langerrormessagecallback *savecallback) { *************** *** 119,123 **** - #ifdef WIN95VERSION static boolean langwinipccoerceparam (VARIANTARG * var, tyvaluerecord * val); --- 119,122 ---- *************** *** 1002,1006 **** hdlhashtable htable; tyvaluerecord vhandler; - Handle hthread = nil; hdlhashnode handlernode; --- 1001,1004 ---- Index: langsystypes.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langsystypes.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langsystypes.c 23 Oct 2004 22:31:25 -0000 1.2 --- langsystypes.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 224,228 **** ! static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tyvaluerecord *vallookfor) { /* --- 224,228 ---- ! static boolean getostypevalnamevisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 231,234 **** --- 231,235 ---- */ + tyvaluerecord *vallookfor = (tyvaluerecord *) refcon; register hdltablevariable hv; register hdlhashtable ht; *************** *** 366,370 **** /* ! hashgetvaluestring (*v, bsvalue); /*go with hex string%/ goto limit; --- 367,371 ---- /* ! hashgetvaluestring (*v, bsvalue); /%go with hex string%/ goto limit; *************** *** 1303,1308 **** static void setupdescriptor (Handle hdata, AEDesc *desc) { - register AEDesc *d = desc; - #if TARGET_API_MAC_CARBON == 1 /*PBS 03/14/02: AE OS X fix.*/ --- 1304,1307 ---- *************** *** 1316,1319 **** --- 1315,1320 ---- #else + register AEDesc *d = desc; + (*d).dataHandle = hdata; *************** *** 3133,3137 **** op = (**h).nodetype; /*copy into register*/ ! /*langseterrorline (h); /*set globals for error reporting*/ switch (op) { --- 3134,3138 ---- op = (**h).nodetype; /*copy into register*/ ! //langseterrorline (h); /*set globals for error reporting*/ switch (op) { Index: langops.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langops.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langops.c 23 Oct 2004 22:28:40 -0000 1.2 --- langops.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 68,132 **** static tytypeinfo typeinfo [ctvaluetypes] = { ! '\?\?\?\?', STR_unknown, ! 'char', STR_char, ! 'shor', STR_int, ! 'long', STR_long, ! 'bad1', STR_unused1, /*8/13*/ ! 'data', STR_binary, ! 'bool', STR_boolean, ! 'tokn', STR_token, ! 'date', STR_date, ! 'addr', STR_address, ! 'code', STR_compiled_code, ! 'exte', STR_double, ! 'TEXT', STR_string, /*8/13*/ ! 'xtrn', STR_external, ! 'dir ', STR_direction, ! 'bad2', STR_unused2, /*9/17/91*/ ! 'type', STR_string4, ! 'bad3', STR_unused3, ! 'QDpt', STR_point, ! 'qdrt', STR_rect, ! 'tptn', STR_pattern, ! 'cRGB', STR_rgb, /*12/11/92 dmb*/ ! 'fixd', STR_fixed, ! 'sing', STR_single, ! 'doub', STR_double, ! 'obj ', STR_objspec, ! 'fss ', STR_filespec, ! 'alis', STR_alias, ! 'enum', STR_enumerator, ! 'list', STR_list, ! 'reco', STR_record, /* --- 68,132 ---- static tytypeinfo typeinfo [ctvaluetypes] = { ! {'\?\?\?\?', STR_unknown}, ! {'char', STR_char}, ! {'shor', STR_int}, ! {'long', STR_long}, ! {'bad1', STR_unused1}, /*8/13*/ ! {'data', STR_binary}, ! {'bool', STR_boolean}, ! {'tokn', STR_token}, ! {'date', STR_date}, ! {'addr', STR_address}, ! {'code', STR_compiled_code}, ! {'exte', STR_double}, ! {'TEXT', STR_string}, /*8/13*/ ! {'xtrn', STR_external}, ! {'dir ', STR_direction}, ! {'bad2', STR_unused2}, /*9/17/91*/ ! {'type', STR_string4}, ! {'bad3', STR_unused3}, ! {'QDpt', STR_point}, ! {'qdrt', STR_rect}, ! {'tptn', STR_pattern}, ! {'cRGB', STR_rgb}, /*12/11/92 dmb*/ ! {'fixd', STR_fixed}, ! {'sing', STR_single}, ! {'doub', STR_double}, ! {'obj ', STR_objspec}, ! {'fss ', STR_filespec}, ! {'alis', STR_alias}, ! {'enum', STR_enumerator}, ! {'list', STR_list}, ! {'reco', STR_record}, /* *************** *** 136,160 **** */ ! 'optx', STR_outline, ! 'wptx', STR_wptext, #ifdef fliowa ! 'intf', STR_interface, #else ! 'head', STR_headline, #endif ! 'tabl', STR_table, ! 'scpt', STR_script, ! 'mbar', STR_menubar, ! 'pict', STR_picture }; --- 136,160 ---- */ ! {'optx', STR_outline}, ! {'wptx', STR_wptext}, #ifdef fliowa ! {'intf', STR_interface}, #else ! {'head', STR_headline}, #endif ! {'tabl', STR_table}, ! {'scpt', STR_script}, ! {'mbar', STR_menubar}, ! {'pict', STR_picture} }; *************** *** 445,449 **** /*12/18/92 dmb ! if (*htable == nil) /*this is the innermost with value -- return to caller%/ *htable = hwith; */ --- 445,449 ---- /*12/18/92 dmb ! if (*htable == nil) /%this is the innermost with value -- return to caller%/ *htable = hwith; */ *************** *** 462,468 **** boolean langfindexternalwindow (const bigstring bs, Handle *hdata) { ! /* 7.21.97 dmb: see if the string specifies a standalong window that has data ! * / hdlwindowinfo hinfo; --- 462,468 ---- boolean langfindexternalwindow (const bigstring bs, Handle *hdata) { ! /% 7.21.97 dmb: see if the string specifies a standalong window that has data ! %/ hdlwindowinfo hinfo; *************** *** 475,479 **** return (false); ! } /*langfindexternalwindow*/ --- 475,480 ---- return (false); ! } /%langfindexternalwindow%/ ! */ Index: langvalue.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langvalue.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langvalue.c 28 Oct 2004 23:08:32 -0000 1.3 --- langvalue.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 437,452 **** /* ! setheapstring (emptystring, hstring); /*avoid recursion%/ ! disablelangerror (); /*we don't want to generate errors here%/ ! if (langexpandtodotparams (bs, htable, bs)) { /*valid path%/ ! setheapstring (bs, hstring); /*now we have just the name%/ ! enlargehandle ((Handle) hstring, sizeof (hdlhashtable), htable); /*should never fail%/ } else ! setheapstring (bs, hstring); /*restore original%/ enablelangerror (); --- 437,452 ---- /* ! setheapstring (emptystring, hstring); /%avoid recursion%/ ! disablelangerror (); /%we don't want to generate errors here%/ ! if (langexpandtodotparams (bs, htable, bs)) { /%valid path%/ ! setheapstring (bs, hstring); /%now we have just the name%/ ! enlargehandle ((Handle) hstring, sizeof (hdlhashtable), htable); /%should never fail%/ } else ! setheapstring (bs, hstring); /%restore original%/ enablelangerror (); *************** *** 493,497 **** // set the value with the new encoding ! h = (*val).data.addressvalue; if (!sethandlecontents (bs, stringsize (bs), h)) --- 493,497 ---- // set the value with the new encoding ! h = (Handle) (*val).data.addressvalue; if (!sethandlecontents (bs, stringsize (bs), h)) *************** *** 550,554 **** return (true); ! } /*setpasswordvalue*/ --- 550,555 ---- return (true); ! } /%setpasswordvalue%/ ! */ *************** *** 1040,1047 **** --- 1041,1055 ---- break; + + default: + /* do nothing */ + break; + } /*switch*/ } /*disposevaluerecord*/ + #if 0 + static boolean isgarbagetype (tyvaluetype type) { *************** *** 1065,1068 **** --- 1073,1078 ---- } /*isgarbagetype*/ + #endif + static void disposevalues (tyvaluerecord *val1, tyvaluerecord *val2) { *************** *** 1360,1386 **** return (setfixedvalue (FixRatio ((*val).data.longvalue, 1), val)); ! } /*stringtofixed*/ ! ! ! static boolean stringtosingle (tyvaluerecord *val) { ! ! if (!stringtolong (val)) ! return (false); ! ! return (setsinglevalue ((float) (*val).data.longvalue, val)); ! } /*stringtosingle*/ ! ! ! static boolean stringtodouble (tyvaluerecord *val) { ! ! double x; ! ! if (!stringtolong (val)) ! return (false); ! ! x = (float) (*val).data.longvalue; ! ! return (newheapvalue (&x, sizeof (x), doublevaluetype, val)); ! } /*stringtodouble*/ --- 1370,1375 ---- return (setfixedvalue (FixRatio ((*val).data.longvalue, 1), val)); ! } /%stringtofixed%/ ! */ *************** *** 1649,1653 **** *htable = internaltable; ! return (true); /*it is a special table%/ } */ --- 1638,1642 ---- *htable = internaltable; ! return (true); /%it is a special table%/ } */ *************** *** 3047,3051 **** --- 3036,3044 ---- if (equaltextidentifiers (stringbaseaddress(bs), stringbaseaddress(fileurl), stringlength(fileurl) )) { + + #ifdef WIN95VERSION short ix = 0; + #endif + /* Convert string to standard file string.*/ deletestring (bs, 1, stringlength (fileurl)); *************** *** 4639,4645 **** hdltreenode hparam = nil; - short ctskip = *ctpositional; tyvaluetype ptype = (*vreturned).valuetype; - boolean fllastparam = flnextparamislast; if (!getoptionalparam (hfirst, ctconsumed, ctpositional, bsparam, &hparam)) --- 4632,4636 ---- *************** *** 5242,5288 **** } /*getbinaryvalue*/ - /* - static boolean getbinarycopy (hdltreenode hfirst, short pnum, Handle *x) { - - /* - unlike getstringcopy in stringverbs.c, we leave the handle in the temp - stack; the caller should assume that the handle will be diposed on its own accord. - %/ - - tyvaluerecord v; - - if (!getparamvalue (hfirst, pnum, &v)) - return (false); - - if (!coercetobinary (&v)) - return (false); - - assert (exemptfromtmpstack (v) && pushvalueontmpstack (v)); /*there are no binary literals in the language%/ - - *x = v.data.binaryvalue; - - return (true); - } /*getbinarycopy%/ - - - boolean xgetbinaryvalue (hdltreenode hfirst, short pnum, boolean flreadonly, Handle *x) { - - /* - new version of getbinaryvalue; gets it like any other normal data type. - %/ - - tyvaluerecord val; - - if (!flreadonly) - return (getbinarycopy (hfirst, pnum, x)); - - if (!getbinaryparam (hfirst, pnum, &val)) - return (false); - - *x = val.data.binaryvalue; - - return (true); - } /*xgetbinaryvalue*/ - boolean langsetbooleanvarparam (hdltreenode hfirst, short pnum, boolean fl) { --- 5233,5236 ---- *************** *** 5331,5335 **** ! static int ctlazythis = 0; boolean idvalue (hdltreenode htree, tyvaluerecord *val) { --- 5279,5285 ---- ! #if lazythis_optimization ! static int ctlazythis = 0; ! #endif boolean idvalue (hdltreenode htree, tyvaluerecord *val) { *************** *** 5673,5678 **** tyvaluerecord varray; tyvaluerecord vindex; ! register short top; ! boolean flarrayistable = false; boolean fltmp; boolean fl; --- 5623,5627 ---- tyvaluerecord varray; tyvaluerecord vindex; ! register short top = 0; boolean fltmp; boolean fl; *************** *** 5865,5869 **** tyvaluerecord velement; tyarraystack arraystack = {0}; - register hdltreenode harray = (**h).param1; hdlhashtable htable; bigstring bsname; --- 5814,5817 ---- *************** *** 7181,7195 **** h2 = (*v2).data.stringvalue; ! switch (op) { ! ! case beginswithop: ! ixlimit = gethandlesize (h2); ! ! break; ! ! case endswithop: ! ixstart = gethandlesize (h1) - gethandlesize (h2); ! ! break; } --- 7129,7137 ---- h2 = (*v2).data.stringvalue; ! if (op == beginswithop) { ! ixlimit = gethandlesize (h2); ! } ! else if (op == endswithop) { ! ixstart = gethandlesize (h1) - gethandlesize (h2); } *************** *** 7364,7369 **** */ - register boolean fl = true; - if (!coercetoboolean (&v1)) return (false); --- 7306,7309 ---- *************** *** 7371,7433 **** return (setbooleanvalue (!v1.data.flvalue, vreturned)); } /*notvalue*/ ! ! /* ! notvalue (tyvaluerecord v1, tyvaluerecord *vreturned) { ! ! register boolean fl = true; ! ! initvalue (vreturned, v1.valuetype); ! ! switch (v1.valuetype) { ! ! case booleanvaluetype: ! (*vreturned).data.flvalue = !v1.data.flvalue; ! ! break; ! ! case charvaluetype: ! (*vreturned).data.chvalue = !v1.data.chvalue; ! ! break; ! ! case intvaluetype: ! (*vreturned).data.intvalue = !v1.data.intvalue; ! ! break; ! ! case longvaluetype: ! case fixedvaluetype: ! (*vreturned).data.longvalue = !v1.data.longvalue; ! ! break; ! ! case datevaluetype: ! (*vreturned).data.datevalue = !v1.data.datevalue; ! ! break; ! ! case singlevaluetype: ! (*vreturned).data.singlevalue = !v1.data.singlevalue; ! ! break; ! ! case doublevaluetype: ! fl = setdoublevalue (!**v1.data.doublevalue, vreturned); ! ! break; ! ! default: ! langerror (unarynotnotpossibleerror); ! ! fl = false; /*negation is not defined%/ ! ! break; ! } /*switch%/ ! ! disposevalues (&v1, nil); ! ! return (fl); ! } /*notvalue*/ ! static boolean sizefunc (hdltreenode hparam1, tyvaluerecord *vreturned) { --- 7311,7315 ---- return (setbooleanvalue (!v1.data.flvalue, vreturned)); } /*notvalue*/ ! static boolean sizefunc (hdltreenode hparam1, tyvaluerecord *vreturned) { *************** *** 8420,8424 **** ! /* boolean langgetlocalhandlercode (bigstring bs, hdltreenode *hcode) { --- 8302,8307 ---- ! #if 0 ! boolean langgetlocalhandlercode (bigstring bs, hdltreenode *hcode) { *************** *** 8426,8433 **** tyvaluerecord val; ! if (!langgetsymbolval (bs, &val)) /*not found in local chain%/ return (false); ! if (val.valuetype != codevaluetype) /*not a local handler%/ return (false); --- 8309,8316 ---- tyvaluerecord val; ! if (!langgetsymbolval (bs, &val)) /*not found in local chain*/ return (false); ! if (val.valuetype != codevaluetype) /*not a local handler*/ return (false); *************** *** 8437,8440 **** --- 8320,8325 ---- } /*langgetlocalhandlercode*/ + #endif + boolean langgetnodecode (hdlhashtable ht, bigstring bs, hdlhashnode hnode, hdltreenode *hcode) { *************** *** 8869,8872 **** --- 8754,8762 ---- #endif + + default: + /* do nothing */ + break; + } /*switch*/ Index: langstartup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langstartup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langstartup.c 23 Oct 2004 22:30:48 -0000 1.2 --- langstartup.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 112,116 **** ! static boolean langaddkeyword (bigstring bs, short tokennumber) { tyvaluerecord val; --- 112,116 ---- ! boolean langaddkeyword (bigstring bs, short tokennumber) { tyvaluerecord val; *************** *** 137,142 **** return (fl); ! } /*langaddkeywordlist*/ ! boolean loadfunctionprocessor (short id, langvaluecallback valuecallback) { --- 137,142 ---- return (fl); ! } /%langaddkeywordlist%/ ! */ boolean loadfunctionprocessor (short id, langvaluecallback valuecallback) { *************** *** 416,419 **** --- 416,421 ---- + #if 0 + static boolean langaddintconst (bigstring bs, short x) { *************** *** 424,427 **** --- 426,431 ---- return (hashinsertcstring (bs, &val)); } /*langaddintconst*/ + + #endif *************** *** 443,447 **** return (hashinsert (bs, val)); ! } /*langaddintconst*/ --- 447,451 ---- return (hashinsert (bs, val)); ! } /*langaddbooleanconst*/ Index: langpack.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langpack.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** langpack.c 23 Oct 2004 22:29:00 -0000 1.2 --- langpack.c 31 Oct 2004 18:48:51 -0000 1.3 *************** *** 111,115 **** /* ! copystring (signaturestring, header.sigbytes); /*prevents crashes on bad data%/ header.valuetype = val.valuetype; --- 111,115 ---- /* ! copystring (signaturestring, header.sigbytes); /%prevents crashes on bad data%/ header.valuetype = val.valuetype; Index: langtree.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langtree.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** langtree.c 28 Oct 2004 23:08:10 -0000 1.3 --- langtree.c 31 Oct 2004 18:48:51 -0000 1.4 *************** *** 316,320 **** ! static boolean counttreenodevisit (hdltreenode hnode, short *ctnodes) { ++*ctnodes; --- 316,322 ---- ! static boolean counttreenodevisit (hdltreenode hnode, ptrvoid refcon) { ! ! short *ctnodes = (short *) refcon; ++*ctnodes; *************** *** 669,672 **** --- 671,678 ---- break; + + default: + /* do nothing */ + break; } } *************** *** 805,809 **** /* ! if ((**h).nodeval.valuetype != stringvaluetype) /*skip optimization%/ goto L1; */ --- 811,815 ---- /* ! if ((**h).nodeval.valuetype != stringvaluetype) /%skip optimization%/ goto L1; */ *************** *** 1010,1014 **** ! static boolean langpacktreevisit (hdltreenode htree, ptrpacktreeinfo pi) { /* --- 1016,1020 ---- ! static boolean langpacktreevisit (hdltreenode htree, ptrvoid refcon) { /* *************** *** 1018,1021 **** --- 1024,1028 ---- register hdltreenode hn = htree; + ptrpacktreeinfo pi = (ptrpacktreeinfo) refcon; register ptrdisktreenode pn; tyvaluerecord val = (**hn).nodeval; |
|
From: Andre R. <and...@us...> - 2004-10-31 18:00:33
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12530 Modified Files: WinSockNetEvents.h dbinternal.h Log Message: Fixed GCC compiler warnings. Index: WinSockNetEvents.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/WinSockNetEvents.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WinSockNetEvents.h 9 Oct 2004 21:12:29 -0000 1.1 --- WinSockNetEvents.h 31 Oct 2004 18:00:21 -0000 1.2 *************** *** 112,116 **** #ifdef MACVERSION ! extern boolean fwsNetEventCheckAndAcceptSocket (); #endif --- 112,116 ---- #ifdef MACVERSION ! extern boolean fwsNetEventCheckAndAcceptSocket (void); #endif Index: dbinternal.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/dbinternal.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dbinternal.h 9 Oct 2004 20:54:06 -0000 1.1 --- dbinternal.h 31 Oct 2004 18:00:21 -0000 1.2 *************** *** 31,37 **** ! /***RAB #define dbversionnumber 3 **VERSION used in 4.x**/ ! /***AR #define dbversionnumber 5 /**VERSION used up to 6.2a10**/ #ifdef SMART_DB_OPENING --- 31,37 ---- ! //RAB #define dbversionnumber 3 /**VERSION used in 4.x**/ ! //AR #define dbversionnumber 5 /**VERSION used up to 6.2a10**/ #ifdef SMART_DB_OPENING |
|
From: Andre R. <and...@us...> - 2004-10-31 18:00:02
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12408 Modified Files: OpenTransportNetEvents.c odbengine.c CallMachOFrameWork.c claybrowservalidate.c cancoon.c dbverbs.c claycallbacks.c db.c claybrowserstruc.c claylinelayout.c Log Message: Fixed GCC compiler warnings. Index: dbverbs.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/dbverbs.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** dbverbs.c 23 Oct 2004 22:16:17 -0000 1.2 --- dbverbs.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 528,531 **** --- 528,533 ---- + #if 0 + static ptrfilespec fsfind; *************** *** 553,556 **** --- 555,560 ---- } /*odbfindfilevisit*/ + #endif + static boolean dbnewverb (hdltreenode hparam1, tyvaluerecord *vreturned) { Index: claycallbacks.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claycallbacks.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claycallbacks.c 23 Oct 2004 22:14:37 -0000 1.2 --- claycallbacks.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 373,377 **** #endif ! #if odbbrowser static boolean xxxfilegetprefsspec (bigstring fname, tybrowserspec *fsprefs) { --- 373,377 ---- #endif ! #if 0 //odbbrowser static boolean xxxfilegetprefsspec (bigstring fname, tybrowserspec *fsprefs) { *************** *** 592,596 **** ! static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, tycallbackinfo *cbinfo) { /* --- 592,596 ---- ! static boolean clayfolderloopvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 602,605 **** --- 602,606 ---- tybrowserspec fs; tybrowserinfo info; + tycallbackinfo *cbinfo = (tycallbackinfo *) refcon; fs.vRefNum = (*cbinfo).hdatabase; *************** *** 819,822 **** --- 820,825 ---- #endif + #if 0 + static boolean xxxclayinitializeoutline (void) { *************** *** 862,865 **** --- 865,870 ---- } /*clayinitializeoutline*/ + #endif + #if filebrowser Index: CallMachOFrameWork.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/CallMachOFrameWork.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CallMachOFrameWork.c 23 Oct 2004 22:12:44 -0000 1.2 --- CallMachOFrameWork.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 122,126 **** ! static OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) /*Adapted from Apple sample code*/ { OSStatus err; --- 122,126 ---- ! OSStatus LoadFrameworkBundle(CFStringRef framework, CFBundleRef *bundlePtr) /*Adapted from Apple sample code*/ { OSStatus err; Index: OpenTransportNetEvents.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/OpenTransportNetEvents.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** OpenTransportNetEvents.c 29 Oct 2004 00:12:20 -0000 1.5 --- OpenTransportNetEvents.c 31 Oct 2004 17:59:48 -0000 1.6 *************** *** 3545,3549 **** ! boolean fwsNetEventCheckAndAcceptSocket () { /* --- 3545,3549 ---- ! boolean fwsNetEventCheckAndAcceptSocket (void) { /* Index: claylinelayout.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claylinelayout.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claylinelayout.c 23 Oct 2004 22:14:51 -0000 1.2 --- claylinelayout.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 98,101 **** --- 98,102 ---- memtodiskshort (rgb.blue); } while (0) + #if 0 static boolean midcolorof (Rect r, RGBColor *rgb1, RGBColor *rgb2, RGBColor *rgbmid) { *************** *** 118,132 **** return (true); #endif ! } /*darkcolorof*/ ! ! ! static void darkcolorof (RGBColor *rgb) { ! ! (*rgb).red -= (*rgb).red / 4; ! ! (*rgb).green -= (*rgb).green / 4; ! ! (*rgb).blue -= (*rgb).blue / 4; ! } /*darkcolorof*/ --- 119,123 ---- return (true); #endif ! } /*midcolorof*/ *************** *** 140,143 **** --- 131,146 ---- } /*lightcolorof*/ + #endif + + + static void darkcolorof (RGBColor *rgb) { + + (*rgb).red -= (*rgb).red / 4; + + (*rgb).green -= (*rgb).green / 4; + + (*rgb).blue -= (*rgb).blue / 4; + } /*darkcolorof*/ + /*static boolean claypushtextstyle (diskfontstring fontname, short fontsize) { *************** *** 151,155 **** return (pushstyle (fontnum, fontsize, 0)); ! } /*claypushtextstyle*/ --- 154,159 ---- return (pushstyle (fontnum, fontsize, 0)); ! } /%claypushtextstyle%/ ! */ *************** *** 547,550 **** --- 551,556 ---- + #if 0 + static void getfatsizestring (tybrowserinfo *browserinfo, bigstring bs) { *************** *** 567,570 **** --- 573,578 ---- getsizestring ((*browserinfo).filesize, bs); } /*getfatsizestring*/ + + #endif *************** *** 598,604 **** /* ! /*an experiment -- try to give the files "depth" or 3D indentation%/ { ! /*top and left edges are framed in dark color%/ { RGBColor rgb = (**hf).linelayout.backcolor; --- 606,612 ---- /* ! /%an experiment -- try to give the files "depth" or 3D indentation%/ { ! /%top and left edges are framed in dark color%/ { RGBColor rgb = (**hf).linelayout.backcolor; *************** *** 629,633 **** } ! /*bottom and right edges are framed in light color%/ { RGBColor rgb = (**hf).linelayout.backcolor; --- 637,641 ---- } ! /%bottom and right edges are framed in light color%/ { RGBColor rgb = (**hf).linelayout.backcolor; *************** *** 787,791 **** hdltableformats hf = tableformatsdata; RGBColor rgb = (**hf).linelayout.filenamecolor; - hdloutlinerecord ho = outlinedata; claypushnodestyle (hnode); --- 795,798 ---- Index: odbengine.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/odbengine.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** odbengine.c 23 Oct 2004 22:38:34 -0000 1.2 --- odbengine.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 295,335 **** ! static short tablecomparenames (hdlhashtable ht, hdlhashnode hnode1, hdlhashnode hnode2) { ! bigstring bs1, bs2; ! ! gethashkey (hnode1, bs1); ! gethashkey (hnode2, bs2); ! ! alllower (bs1); /*comparison is unicase*/ ! ! alllower (bs2); ! ! return (comparestrings (bs1, bs2)); ! } /*tablecomparenames*/ - static boolean odbtabledirty (hdlhashtable htable, const bigstring bsname) { - - // hdltablediskrecord hf = (hdltablediskrecord) (**htable).hashtableformats; - - // if (hf != nil) - (**htable).timelastsave = timenow (); /*modification time until saved*/ - - return (true); - } /*tabledirty*/ ! static boolean odbsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) { ! ! return (odbtabledirty (htable, bsname)); ! } /*odbsymbolchanged*/ ! static boolean odbsymbolunlinking (hdlhashtable ht, hdlhashnode hn) { ! return (true); ! } /*odbsymbolunlinking*/ - #ifndef isFrontier static void initlangcallbacks (void) { --- 295,336 ---- ! #ifndef isFrontier ! static short tablecomparenames (hdlhashtable ht, hdlhashnode hnode1, hdlhashnode hnode2) { ! bigstring bs1, bs2; ! ! gethashkey (hnode1, bs1); + gethashkey (hnode2, bs2); + + alllower (bs1); /*comparison is unicase*/ + + alllower (bs2); + + return (comparestrings (bs1, bs2)); + } /*tablecomparenames*/ ! static boolean odbtabledirty (hdlhashtable htable, const bigstring bsname) { ! ! // hdltablediskrecord hf = (hdltablediskrecord) (**htable).hashtableformats; ! ! // if (hf != nil) ! (**htable).timelastsave = timenow (); /*modification time until saved*/ ! ! return (true); ! } /*tabledirty*/ ! static boolean odbsymbolchanged (hdlhashtable htable, const bigstring bsname, hdlhashnode hnode, boolean flvalue) { ! ! return (odbtabledirty (htable, bsname)); ! } /*odbsymbolchanged*/ ! static boolean odbsymbolunlinking (hdlhashtable ht, hdlhashnode hn) { ! ! return (true); ! } /*odbsymbolunlinking*/ static void initlangcallbacks (void) { *************** *** 462,466 **** */ - hdlcancoonrecord hc = nil; tyversion2cancoonrecord info; dbaddress adr = nildbaddress; --- 463,466 ---- Index: cancoon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoon.c 23 Oct 2004 22:12:59 -0000 1.2 --- cancoon.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 380,384 **** disposeprocesslist ((**hc).hprocesslist); /*checks for nil*/ ! /**setcurrentmenubarlist (nil); /*clear menubar.c global before disposing roottable*/ disposehandle ((Handle) (**hc).hmenubarlist); /*roottable disposal will do menubars*/ --- 380,384 ---- disposeprocesslist ((**hc).hprocesslist); /*checks for nil*/ ! //setcurrentmenubarlist (nil); /*clear menubar.c global before disposing roottable*/ disposehandle ((Handle) (**hc).hmenubarlist); /*roottable disposal will do menubars*/ *************** *** 638,647 **** dbrefheapstring (info.adrscriptstring, &hstring); ! pullfromhandle (hstring, 0, 1, nil); // pluck out the length byte } else ! dbrefhandle (info.adrscriptstring, &hstring); ! (**hc).hscriptstring = hstring; (**hc).flflagdisabled = (info.flags & flflagdisabled_mask) != 0; --- 638,647 ---- dbrefheapstring (info.adrscriptstring, &hstring); ! pullfromhandle ((Handle) hstring, 0, 1, nil); // pluck out the length byte } else ! dbrefhandle (info.adrscriptstring, (Handle *) &hstring); ! (**hc).hscriptstring = (Handle) hstring; (**hc).flflagdisabled = (info.flags & flflagdisabled_mask) != 0; *************** *** 1017,1021 **** register hdlcancoonrecord hc; - hdlmenurecord hmenurecord = nil; hdlcancoonrecord origglobals = cancoonglobals; hdltablevariable hvariable; --- 1017,1020 ---- *************** *** 1599,1602 **** --- 1598,1603 ---- + #if 0 + static boolean cctoggleexpertmode (void) { *************** *** 1627,1630 **** --- 1628,1633 ---- } /*cctoggleexpertmode*/ + #endif + static boolean ccmenuroutine (short idmenu, short ixmenu) { *************** *** 1650,1655 **** */ - register boolean fl = true; - /* if (idmenu == 0 && ixmenu == 0) { --- 1653,1656 ---- *************** *** 1671,1679 **** /* ! if (!idmenu) { /*request to update all of our menus%/ ! /*all our menus are enabled, dmb 8/1/90%/ ! mecheckmenubar (); /*see if menubar needs to be redrawn%/ return (true); --- 1672,1680 ---- /* ! if (!idmenu) { /%request to update all of our menus%/ ! /%all our menus are enabled, dmb 8/1/90%/ ! mecheckmenubar (); /%see if menubar needs to be redrawn%/ return (true); Index: db.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/db.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** db.c 23 Oct 2004 22:15:48 -0000 1.3 --- db.c 31 Oct 2004 17:59:48 -0000 1.4 *************** *** 429,433 **** pb.ioRefNum = (hdlfilenum)((**databasedata).fnumdatabase); ! PBFlushFile (&pb, false); } #endif --- 429,433 ---- pb.ioRefNum = (hdlfilenum)((**databasedata).fnumdatabase); ! PBFlushFile ((ParmBlkPtr) &pb, false); } #endif *************** *** 1261,1264 **** --- 1261,1266 ---- + #if 0 + static boolean dbrefbytes (dbaddress adr, long ctwanted, ptrvoid pdata) { *************** *** 1289,1293 **** return (dbread (adr + sizeheader, ctwanted, pdata)); } /*dbrefbytes*/ ! static boolean dballocate (long databytes, ptrvoid pdata, dbaddress *paddress) { --- 1291,1297 ---- return (dbread (adr + sizeheader, ctwanted, pdata)); } /*dbrefbytes*/ ! ! #endif ! static boolean dballocate (long databytes, ptrvoid pdata, dbaddress *paddress) { *************** *** 1861,1864 **** --- 1865,1870 ---- + #if 0 + static boolean dbreadbytes (dbaddress adr, long offset, long ctbytes, char *pdata) { *************** *** 1885,1888 **** --- 1891,1896 ---- return (dbwrite (adr + sizeheader + offset, ctbytes, pdata)); } /*dbwritebytes*/ + + #endif *************** *** 2190,2194 **** return (dballocate (ctbytes, pdata, adr)); ! } /*dbnewarray*/ --- 2198,2203 ---- return (dballocate (ctbytes, pdata, adr)); ! } /%dbnewarray%/ ! */ Index: claybrowserstruc.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowserstruc.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claybrowserstruc.c 23 Oct 2004 22:14:06 -0000 1.2 --- claybrowserstruc.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 145,149 **** /* ! if (info.flvolume) { /*special case%/ (*fs).vRefNum = info.vnum; --- 145,149 ---- /* ! if (info.flvolume) { /%special case%/ (*fs).vRefNum = info.vnum; *************** *** 212,215 **** --- 212,216 ---- } /*browserchecklinelength*/ + #if 0 static boolean browserupdatefileinfo (hdlheadrecord hnode) { *************** *** 234,237 **** --- 235,240 ---- } /*browserupdatefileinfo*/ + #endif + boolean browserfileadded (hdlheadrecord hnodeparent, const tybrowserspec *fsnew, hdlheadrecord *hnew) { *************** *** 283,286 **** --- 286,291 ---- + #if 0 + static boolean browsernodeislocked (hdlheadrecord hnode) { *************** *** 312,315 **** --- 317,322 ---- } /*browserpostpaste*/ + #endif + static boolean foldercontainsfile (tybrowserspec *fsfolder, tybrowserspec *fsfile) { *************** *** 459,463 **** if (claycreatefile (&fsdest)) { ! /*update the node's refcon to reflect the new file's position & attributes* / tybrowserinfo browserinfo; --- 466,470 ---- if (claycreatefile (&fsdest)) { ! /%update the node's refcon to reflect the new file's position & attributes%/ tybrowserinfo browserinfo; *************** *** 469,474 **** return (true); ! } /*browsercreatefile*/ ! static boolean browsermoveto (hdlheadrecord hnode, tybrowserspec *fsfolder) { --- 476,481 ---- return (true); ! } /%browsercreatefile%/ ! */ static boolean browsermoveto (hdlheadrecord hnode, tybrowserspec *fsfolder) { *************** *** 1109,1112 **** --- 1116,1121 ---- + #if 0 + static boolean xxxbrowserexportscrap (hdloutlinerecord hscrap) { *************** *** 1128,1131 **** --- 1137,1142 ---- } /*browserexportscrap*/ + #endif + static void tabledisposescrap (hdloutlinerecord houtline) { *************** *** 1205,1209 **** } /*while*/ ! return (shellsetscrap ((Handle) houtline, hashscraptype, &tabledisposescrap, &tableexportscrap)); } /*browsersetscrap*/ --- 1216,1222 ---- } /*while*/ ! return (shellsetscrap ((Handle) houtline, hashscraptype, ! (shelldisposescrapcallback) &tabledisposescrap, ! (shellexportscrapcallback) &tableexportscrap)); } /*browsersetscrap*/ Index: claybrowservalidate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/claybrowservalidate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** claybrowservalidate.c 23 Oct 2004 22:14:25 -0000 1.2 --- claybrowservalidate.c 31 Oct 2004 17:59:48 -0000 1.3 *************** *** 46,50 **** static long dragmodified; ! static char *pastefname; typedef enum tyaction { --- 46,50 ---- static long dragmodified; ! //static char *pastefname; typedef enum tyaction { *************** *** 189,193 **** ! static boolean collisionvisit (hdlheadrecord hnode, ptrdraginfo draginfo) { /* --- 189,193 ---- ! static boolean collisionvisit (hdlheadrecord hnode, ptrvoid refcon) { /* *************** *** 196,199 **** --- 196,200 ---- bigstring bsnode, bsdrag; + ptrdraginfo draginfo = (ptrdraginfo) refcon; if (hnode == (*draginfo).hdrag) *************** *** 279,285 **** ! static boolean validatemovevisit (hdlheadrecord hnode, ptrdraginfo draginfo) { tybrowserinfo info; hdlheadrecord hdest = (*draginfo).hdest; --- 280,287 ---- ! static boolean validatemovevisit (hdlheadrecord hnode, ptrvoid refcon) { tybrowserinfo info; + ptrdraginfo draginfo = (ptrdraginfo) refcon; hdlheadrecord hdest = (*draginfo).hdest; *************** *** 339,346 **** */ - hdlheadrecord hfolder = (**hdest).headlinkleft; - #if filebrowser if (hfolder == hdest) { --- 341,348 ---- */ #if filebrowser + hdlheadrecord hfolder = (**hdest).headlinkleft; + if (hfolder == hdest) { *************** *** 422,428 **** ! static boolean compareforcopyvisit (hdlheadrecord hnode, ptrdraginfo draginfo) { bigstring bs, bsnode; if (hnode == (*draginfo).hcompare) --- 424,431 ---- ! static boolean compareforcopyvisit (hdlheadrecord hnode, ptrvoid refcon) { bigstring bs, bsnode; + ptrdraginfo draginfo = (ptrdraginfo) refcon; if (hnode == (*draginfo).hcompare) |
|
From: Andre R. <and...@us...> - 2004-10-31 17:31:13
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6922 Modified Files: command.c miniwindow.c cancoonpopup.c cancoonwindow.c Log Message: Fixed GCC compiler warnings. Index: miniwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/miniwindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** miniwindow.c 23 Oct 2004 22:37:40 -0000 1.2 --- miniwindow.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 138,143 **** invalrect ((**minidata).popuprects [popupnumber]); ! } /*minisetpopupmessage*/ ! void minisetselect (short startsel, short endsel) { --- 138,143 ---- invalrect ((**minidata).popuprects [popupnumber]); ! } /%minisetpopupmessage%/ ! */ void minisetselect (short startsel, short endsel) { *************** *** 150,153 **** --- 150,155 ---- + #if 0 + static void minigetactivetextrect (Rect *r) { *************** *** 161,164 **** --- 163,168 ---- } /*minigetactivetextitem*/ + #endif + static boolean miniselectallandactivate (short newactiveitem) { *************** *** 183,187 **** ! static boolean mininextwindowvisit (WindowPtr w, WindowPtr *nextwindow) { if (*nextwindow == nil) { /*we passed our target*/ --- 187,193 ---- ! static boolean mininextwindowvisit (WindowPtr w, ptrvoid refcon) { ! ! WindowPtr *nextwindow = (WindowPtr *) refcon; if (*nextwindow == nil) { /*we passed our target*/ *************** *** 427,430 **** --- 433,438 ---- + #if 0 + static void minizoomtexttoicon (void) { *************** *** 462,465 **** --- 470,475 ---- } /*minizoomicontomsg*/ + #endif + static boolean miniiconhit (boolean flanimate) { *************** *** 684,688 **** */ - register hdlminirecord hm = minidata; register char chkb = keyboardstatus.chkb; --- 694,697 ---- *************** *** 853,857 **** #endif ! /***(**hm).flmassiveupdate = true; /*it don't get much more massive than this!*/ } /*miniresize*/ --- 862,866 ---- #endif ! //(**hm).flmassiveupdate = true; /*it don't get much more massive than this!*/ } /*miniresize*/ *************** *** 978,982 **** static void miniupdate (void) { - register hdlwindowinfo hw = miniwindowinfo; register hdlminirecord hm = minidata; --- 987,990 ---- *************** *** 1008,1012 **** ! static boolean minifindvisit (WindowPtr w, hdlwindowinfo *hinfo) { /* --- 1016,1020 ---- ! static boolean minifindvisit (WindowPtr w, ptrvoid refcon) { /* *************** *** 1017,1020 **** --- 1025,1030 ---- */ + hdlwindowinfo *hinfo = (hdlwindowinfo *) refcon; + miniwindow = w; *************** *** 1137,1142 **** static boolean miniadjustcursor (Point pt){ - register hdlminirecord hm = minidata; - if (minifindtextobject (pt) >= 0) { --- 1147,1150 ---- *************** *** 1213,1217 **** return (false); ! return (shellsetscrap (htext, textscraptype, disposehandle, nil)); } else --- 1221,1225 ---- return (false); ! return (shellsetscrap (htext, textscraptype, (shelldisposescrapcallback) disposehandle, nil)); } else *************** *** 1268,1274 **** */ - register hdloutlinerecord ho = outlinedata; - register hdlheadrecord hnode = (hdlheadrecord) globals; - if (!flundo) return (true); --- 1276,1279 ---- Index: cancoonpopup.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoonpopup.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoonpopup.c 23 Oct 2004 22:13:11 -0000 1.2 --- cancoonpopup.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 54,60 **** ! static boolean ccagentpopupvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptragentpopupinfo info) { hdltreenode hcode; if (!langexternalvaltocode (val, &hcode)) /*not a scipt, or no code*/ --- 54,61 ---- ! static boolean ccagentpopupvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { hdltreenode hcode; + ptragentpopupinfo info = (ptragentpopupinfo) refcon; if (!langexternalvaltocode (val, &hcode)) /*not a scipt, or no code*/ *************** *** 95,99 **** ! static boolean ccagentselectvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptragentpopupinfo info) { /* --- 96,100 ---- ! static boolean ccagentselectvisit (bigstring bsname, hdlhashnode hnode, tyvaluerecord val, ptrvoid refcon) { /* *************** *** 105,108 **** --- 106,110 ---- hdltreenode hcode; bigstring bs; + ptragentpopupinfo info = (ptragentpopupinfo) refcon; if (!langexternalvaltocode (val, &hcode)) /*not a scipt*/ *************** *** 115,119 **** /* ! if ((**hc).hprimaryagent == hcode) /*already selected -- toggle to off, no selection%/ (**hc).hprimaryagent = nil; else --- 117,121 ---- /* ! if ((**hc).hprimaryagent == hcode) /%already selected -- toggle to off, no selection%/ (**hc).hprimaryagent = nil; else Index: cancoonwindow.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/cancoonwindow.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cancoonwindow.c 23 Oct 2004 22:13:37 -0000 1.2 --- cancoonwindow.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 376,380 **** ! static boolean findrootvisit (WindowPtr w, WindowPtr *pw) { hdlwindowinfo hinfo; --- 376,380 ---- ! static boolean findrootvisit (WindowPtr w, ptrvoid refcon) { hdlwindowinfo hinfo; *************** *** 385,388 **** --- 385,390 ---- if (hf && ((**hf).refcon == (long) cancoonglobals)) { // got it + + WindowPtr *pw = (WindowPtr *) refcon; *pw = w; Index: command.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/command.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** command.c 23 Oct 2004 22:15:04 -0000 1.2 --- command.c 31 Oct 2004 17:31:02 -0000 1.3 *************** *** 179,183 **** register hdlprocessrecord hp = (hdlprocessrecord) hprocess; - register hdlhashtable ht = nil; tyvaluerecord val; bigstring bsresult; --- 179,182 ---- |
|
From: Andre R. <and...@us...> - 2004-10-31 16:46:01
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27622 Modified Files: smallicon.c sounds.c frontierwindows.c scrap.c threads.c Log Message: Fixed GCC compiler warnings. Index: sounds.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/sounds.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** sounds.c 23 Oct 2004 22:58:10 -0000 1.2 --- sounds.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 167,173 **** Beep(1000, 500); #endif ! /* ! dosound (1 /*duration%/, 250 /*amplitude%/, 14300 /*frequency%/); ! */ } /*ouch*/ --- 167,173 ---- Beep(1000, 500); #endif ! ! //dosound (1 /*duration*/, 250 /*amplitude*/, 14300 /*frequency*/); ! } /*ouch*/ Index: smallicon.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/smallicon.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** smallicon.c 23 Oct 2004 22:57:57 -0000 1.2 --- smallicon.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 40,44 **** ! static hdlsmalliconbits hmiscbits, hleaderbits; #ifndef version42orgreater --- 40,45 ---- ! static hdlsmalliconbits hmiscbits; ! //static hdlsmalliconbits hleaderbits; #ifndef version42orgreater Index: scrap.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scrap.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** scrap.c 23 Oct 2004 22:50:33 -0000 1.2 --- scrap.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 399,403 **** --i; ! } /*while*/ ctbytes = strlen (pdata); /*7.1b23: call strlen to find the first terminator: removes junk from end*/ --- 399,404 ---- --i; ! } /%while%/ ! */ ctbytes = strlen (pdata); /*7.1b23: call strlen to find the first terminator: removes junk from end*/ Index: frontierwindows.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/frontierwindows.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** frontierwindows.c 23 Oct 2004 22:21:14 -0000 1.2 --- frontierwindows.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 96,100 **** if (fldialog) { ! DialogPtr theDial = GetNewDialog (id, nil, (DialogPtr) -1L); w = GetDialogWindow(theDial); } --- 96,100 ---- if (fldialog) { ! DialogPtr theDial = GetNewDialog (id, nil, (WindowRef) -1L); w = GetDialogWindow(theDial); } Index: threads.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/threads.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** threads.c 23 Oct 2004 23:05:20 -0000 1.2 --- threads.c 31 Oct 2004 16:45:52 -0000 1.3 *************** *** 88,96 **** --- 88,100 ---- static pascal void copythreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif (*threadcallbacks.swapoutcallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*copythreadcontext*/ *************** *** 98,106 **** --- 102,114 ---- static pascal void swapinthreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif (*threadcallbacks.swapincallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*swapinthreadcontext*/ *************** *** 108,127 **** static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { long curA5 = SetUpAppA5 (); //Code change by Timothy Paustian Thursday, May 11, 2000 4:44:59 PM //Get rid of the UPPs for carbon here #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock(globals); DisposeThreadSwitchUPP((**globals).threadInCallbackUPP); DisposeThreadSwitchUPP((**globals).threadOutCallbackUPP); DisposeThreadTerminationUPP((**globals).threadTerminateUPP); DisposeThreadEntryUPP((**globals).threadEntryCallbackUPP); ! HUnlock(globals); #endif (*threadcallbacks.disposecallback) (hglobals); RestoreA5 (curA5); } /*disposethreadcontext*/ --- 116,139 ---- static pascal void disposethreadcontext (ThreadID hthread, void * hglobals) { + #if TARGET_API_MAC_CLASSIC long curA5 = SetUpAppA5 (); + #endif //Code change by Timothy Paustian Thursday, May 11, 2000 4:44:59 PM //Get rid of the UPPs for carbon here #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock((Handle) globals); DisposeThreadSwitchUPP((**globals).threadInCallbackUPP); DisposeThreadSwitchUPP((**globals).threadOutCallbackUPP); DisposeThreadTerminationUPP((**globals).threadTerminateUPP); DisposeThreadEntryUPP((**globals).threadEntryCallbackUPP); ! HUnlock((Handle) globals); #endif (*threadcallbacks.disposecallback) (hglobals); + #if TARGET_API_MAC_CLASSIC RestoreA5 (curA5); + #endif } /*disposethreadcontext*/ *************** *** 136,140 **** #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock(globals); (**globals).threadInCallbackUPP = NewThreadSwitchUPP(&swapinthreadcontext); (**globals).threadOutCallbackUPP = NewThreadSwitchUPP(©threadcontext); --- 148,152 ---- #if TARGET_API_MAC_CARBON == 1 hdlthreadglobals globals = (hdlthreadglobals)hglobals; ! HLock((Handle) globals); (**globals).threadInCallbackUPP = NewThreadSwitchUPP(&swapinthreadcontext); (**globals).threadOutCallbackUPP = NewThreadSwitchUPP(©threadcontext); *************** *** 147,151 **** SetThreadTerminator (idthread, (**globals).threadTerminateUPP, hglobals); ! HUnlock(globals); #else --- 159,163 ---- SetThreadTerminator (idthread, (**globals).threadTerminateUPP, hglobals); ! HUnlock((Handle) globals); #else |
|
From: Andre R. <and...@us...> - 2004-10-31 16:38:51
|
Update of /cvsroot/frontierkernel/Frontier/Common/headers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25863 Modified Files: player.h timedate.h Log Message: Fixed GCC compiler warnings. Index: player.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/player.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** player.h 9 Oct 2004 21:05:11 -0000 1.1 --- player.h 31 Oct 2004 16:38:39 -0000 1.2 *************** *** 37,41 **** boolean playerisplaying (void); ! boolean isplayerevent (); boolean playeropenmovieinwindow (FSSpec *f); --- 37,41 ---- boolean playerisplaying (void); ! boolean isplayerevent (void); boolean playeropenmovieinwindow (FSSpec *f); Index: timedate.h =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/timedate.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** timedate.h 9 Oct 2004 21:11:51 -0000 1.1 --- timedate.h 31 Oct 2004 16:38:39 -0000 1.2 *************** *** 24,27 **** --- 24,28 ---- ******************************************************************************/ + #ifndef timedateinclude #define timedateinclude *************** *** 82,85 **** --- 83,88 ---- extern void secondstofiletime (long seconds, FILETIME *); + extern tyinternationalinfoptr getIntlInfo (); + #endif *************** *** 106,112 **** extern void getdaystring (short dayofweek, bigstring bs, boolean flFullname); ! extern long getcurrenttimezonebias(); extern boolean isLeapYear (short year); ! extern tyinternationalinfoptr getIntlInfo (); --- 109,116 ---- extern void getdaystring (short dayofweek, bigstring bs, boolean flFullname); ! extern long getcurrenttimezonebias(void); extern boolean isLeapYear (short year); ! ! #endif /*timedateinclude*/ |
|
From: Andre R. <and...@us...> - 2004-10-31 16:38:38
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25786 Modified Files: timedate.c player.c process.c uisharing.c zoom.c Log Message: Fixed GCC compiler warnings. Index: timedate.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/timedate.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** timedate.c 23 Oct 2004 23:05:38 -0000 1.2 --- timedate.c 31 Oct 2004 16:38:27 -0000 1.3 *************** *** 116,121 **** ! static tyinternationalinfo globalII; ! static tyinternationalinfoptr globalIIptr = NULL; typedef struct tydaterec { --- 116,123 ---- ! #ifdef WIN95VERSION ! static tyinternationalinfo globalII; ! static tyinternationalinfoptr globalIIptr = NULL; ! #endif typedef struct tydaterec { *************** *** 138,141 **** --- 140,144 ---- #ifdef WIN95VERSION + boolean ValidDate ( unsigned char * strIn, *************** *** 153,269 **** unsigned long * validUnits, tyvalidationerrorptr err); - #endif static boolean getNewLocaleString (unsigned long lc, char ** foo, char * defValue) { - #ifdef MACVERSION - return (false); - #endif ! #ifdef WIN95VERSION ! char buf[300]; ! short len; ! len = GetLocaleInfo (LOCALE_USER_DEFAULT, lc, buf, 300); ! if (len != 0) { ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (buf, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len-1); ! nullterminate ((*foo)); ! return (true); ! } } ! else { ! len = strlen (defValue); ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (defValue, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); ! } } ! return (false); ! #endif } /*getNewLocaleString*/ static boolean getNewLocalePatternString (unsigned long lc, char ** foo, char * defValue) { - #ifdef MACVERSION - return (false); - #endif ! #ifdef WIN95VERSION ! char buf[256]; ! char buf2[256]; ! short i, j, cnt, len; ! char c; ! len = GetLocaleInfo (LOCALE_USER_DEFAULT, lc, buf, 256); ! --len; ! if (len != 0) { ! i = 0; ! j = 0; ! while (len > i) { ! c = buf[i++]; ! switch (c) { ! case 'M': ! case 'd': ! case 'y': ! case 'h': ! case 'm': ! case 's': ! case 't': ! cnt = 1; ! while (buf[i] == c) { ! ++cnt; ! ++i; ! } ! buf2[j++] = '%'; ! buf2[j++] = '%'; ! buf2[j++] = toupper(c); ! if (cnt > 2) ! buf2[j++] = 'N'; ! else ! buf2[j++] = '#'; ! break; ! default: ! buf2[j++] = c; ! break; ! } } ! len = j; ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (buf2, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); ! } } ! else { ! len = strlen (defValue); ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (defValue, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); ! } } ! return (false); ! #endif } --- 156,261 ---- unsigned long * validUnits, tyvalidationerrorptr err); static boolean getNewLocaleString (unsigned long lc, char ** foo, char * defValue) { ! char buf[300]; ! short len; ! len = GetLocaleInfo (LOCALE_USER_DEFAULT, lc, buf, 300); ! if (len != 0) { ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (buf, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len-1); ! nullterminate ((*foo)); ! return (true); } ! } ! else { ! len = strlen (defValue); ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (defValue, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); } + } ! return (false); } /*getNewLocaleString*/ static boolean getNewLocalePatternString (unsigned long lc, char ** foo, char * defValue) { ! char buf[256]; ! char buf2[256]; ! short i, j, cnt, len; ! char c; ! len = GetLocaleInfo (LOCALE_USER_DEFAULT, lc, buf, 256); ! --len; ! if (len != 0) { ! i = 0; ! j = 0; ! while (len > i) { ! c = buf[i++]; ! switch (c) { ! case 'M': ! case 'd': ! case 'y': ! case 'h': ! case 'm': ! case 's': ! case 't': ! cnt = 1; ! while (buf[i] == c) { ! ++cnt; ! ++i; ! } ! buf2[j++] = '%'; ! buf2[j++] = '%'; ! buf2[j++] = toupper(c); ! if (cnt > 2) ! buf2[j++] = 'N'; ! else ! buf2[j++] = '#'; ! break; ! default: ! buf2[j++] = c; ! break; } + } ! len = j; ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (buf2, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); } ! } ! else { ! len = strlen (defValue); ! *foo = malloc (len + 2); ! if (*foo != NULL) { ! moveleft (defValue, stringbaseaddress((*foo)), len); ! setstringlength ((*foo), len); ! nullterminate ((*foo)); ! return (true); } + } ! return (false); } *************** *** 271,365 **** static boolean initInternationalInfo() { ! #ifdef MACVERSION ! boolean res = false; ! #endif ! ! #ifdef WIN95VERSION ! short i; ! boolean res = true; ! res = res && getNewLocaleString (LOCALE_SDAYNAME7, &globalII.longDaysOfWeek[0], "Sunday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME1, &globalII.longDaysOfWeek[1], "Monday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME2, &globalII.longDaysOfWeek[2], "Tuesday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME3, &globalII.longDaysOfWeek[3], "Wednesday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME4, &globalII.longDaysOfWeek[4], "Thursday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME5, &globalII.longDaysOfWeek[5], "Friday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME6, &globalII.longDaysOfWeek[6], "Saturday"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[7], "Yesterday"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[8], "Today"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[9], "Tomorrow"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME7, &globalII.shortDaysOfWeek[0], "Sun"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME1, &globalII.shortDaysOfWeek[1], "Mon"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME2, &globalII.shortDaysOfWeek[2], "Tue"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME3, &globalII.shortDaysOfWeek[3], "Wed"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME4, &globalII.shortDaysOfWeek[4], "Thu"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME5, &globalII.shortDaysOfWeek[5], "Fri"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME6, &globalII.shortDaysOfWeek[6], "Sat"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[7], "Yest"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[8], "Tod"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[9], "Tom"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME1, &globalII.longMonths[0], "January"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME2, &globalII.longMonths[1], "February"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME3, &globalII.longMonths[2], "March"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME4, &globalII.longMonths[3], "April"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME5, &globalII.longMonths[4], "May"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME6, &globalII.longMonths[5], "June"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME7, &globalII.longMonths[6], "July"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME8, &globalII.longMonths[7], "August"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME9, &globalII.longMonths[8], "September"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME10, &globalII.longMonths[9], "October"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME11, &globalII.longMonths[10], "November"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME12, &globalII.longMonths[11], "December"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME13, &globalII.longMonths[12], ""); ! ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME1, &globalII.shortMonths[0], "Jan"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME2, &globalII.shortMonths[1], "Feb"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME3, &globalII.shortMonths[2], "Mar"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME4, &globalII.shortMonths[3], "Apr"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME5, &globalII.shortMonths[4], "May"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME6, &globalII.shortMonths[5], "Jun"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME7, &globalII.shortMonths[6], "Jul"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME8, &globalII.shortMonths[7], "Aug"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME9, &globalII.shortMonths[8], "Sep"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME10, &globalII.shortMonths[9], "Oct"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME11, &globalII.shortMonths[10], "Nov"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME12, &globalII.shortMonths[11], "Dec"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME13, &globalII.shortMonths[12], ""); ! ! res = res && getNewLocaleString (LOCALE_S1159, &globalII.morning, "AM"); ! res = res && getNewLocaleString (LOCALE_S2359, &globalII.evening, "PM"); ! res = res && getNewLocaleString (999999, &globalII.military, "hours"); ! ! res = res && getNewLocaleString (LOCALE_SCURRENCY, &globalII.currency, "$"); ! res = res && getNewLocaleString (LOCALE_SINTLSYMBOL, &globalII.intlCurrency, "USD"); ! res = res && getNewLocaleString (LOCALE_SDECIMAL, &globalII.decimal, "."); ! res = res && getNewLocaleString (LOCALE_STHOUSAND, &globalII.thousands, ","); ! res = res && getNewLocaleString (LOCALE_SLIST, &globalII.list, ","); ! res = res && getNewLocaleString (LOCALE_STIME, &globalII.timesep, ":"); ! res = res && getNewLocaleString (LOCALE_SDATE, &globalII.datesep, "/"); ! res = res && getNewLocalePatternString (LOCALE_SSHORTDATE, &globalII.shortDateFormatPattern, "M#/D#/Y#"); ! res = res && getNewLocalePatternString (LOCALE_SLONGDATE, &globalII.longDateFormatPattern, "DN, MN D#, YN"); ! globalII.numberOfDays = 7; //Make this 10 to use yesterday, today, tommorrow - dave wanted them removed. ! globalII.numberOfMonths = 12; ! globalII.numberOfYears = 0; ! globalII.defaultTimeFormat = false; ! for (i = 0; i < globalII.numberOfMonths; i++) { ! globalII.daysInMonth[i] = daysInMonthsArray[i]; ! } ! for (i = globalII.numberOfMonths; i < 13; i++) { ! globalII.daysInMonth[i] = 0; ! } ! if (res) ! globalIIptr = &globalII; ! #endif return (res); --- 263,351 ---- static boolean initInternationalInfo() { ! short i; ! boolean res = true; ! res = res && getNewLocaleString (LOCALE_SDAYNAME7, &globalII.longDaysOfWeek[0], "Sunday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME1, &globalII.longDaysOfWeek[1], "Monday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME2, &globalII.longDaysOfWeek[2], "Tuesday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME3, &globalII.longDaysOfWeek[3], "Wednesday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME4, &globalII.longDaysOfWeek[4], "Thursday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME5, &globalII.longDaysOfWeek[5], "Friday"); ! res = res && getNewLocaleString (LOCALE_SDAYNAME6, &globalII.longDaysOfWeek[6], "Saturday"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[7], "Yesterday"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[8], "Today"); ! res = res && getNewLocaleString (999999, &globalII.longDaysOfWeek[9], "Tomorrow"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME7, &globalII.shortDaysOfWeek[0], "Sun"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME1, &globalII.shortDaysOfWeek[1], "Mon"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME2, &globalII.shortDaysOfWeek[2], "Tue"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME3, &globalII.shortDaysOfWeek[3], "Wed"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME4, &globalII.shortDaysOfWeek[4], "Thu"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME5, &globalII.shortDaysOfWeek[5], "Fri"); ! res = res && getNewLocaleString (LOCALE_SABBREVDAYNAME6, &globalII.shortDaysOfWeek[6], "Sat"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[7], "Yest"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[8], "Tod"); ! res = res && getNewLocaleString (999999, &globalII.shortDaysOfWeek[9], "Tom"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME1, &globalII.longMonths[0], "January"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME2, &globalII.longMonths[1], "February"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME3, &globalII.longMonths[2], "March"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME4, &globalII.longMonths[3], "April"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME5, &globalII.longMonths[4], "May"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME6, &globalII.longMonths[5], "June"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME7, &globalII.longMonths[6], "July"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME8, &globalII.longMonths[7], "August"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME9, &globalII.longMonths[8], "September"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME10, &globalII.longMonths[9], "October"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME11, &globalII.longMonths[10], "November"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME12, &globalII.longMonths[11], "December"); ! res = res && getNewLocaleString (LOCALE_SMONTHNAME13, &globalII.longMonths[12], ""); ! ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME1, &globalII.shortMonths[0], "Jan"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME2, &globalII.shortMonths[1], "Feb"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME3, &globalII.shortMonths[2], "Mar"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME4, &globalII.shortMonths[3], "Apr"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME5, &globalII.shortMonths[4], "May"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME6, &globalII.shortMonths[5], "Jun"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME7, &globalII.shortMonths[6], "Jul"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME8, &globalII.shortMonths[7], "Aug"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME9, &globalII.shortMonths[8], "Sep"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME10, &globalII.shortMonths[9], "Oct"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME11, &globalII.shortMonths[10], "Nov"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME12, &globalII.shortMonths[11], "Dec"); ! res = res && getNewLocaleString (LOCALE_SABBREVMONTHNAME13, &globalII.shortMonths[12], ""); ! ! res = res && getNewLocaleString (LOCALE_S1159, &globalII.morning, "AM"); ! res = res && getNewLocaleString (LOCALE_S2359, &globalII.evening, "PM"); ! res = res && getNewLocaleString (999999, &globalII.military, "hours"); ! ! res = res && getNewLocaleString (LOCALE_SCURRENCY, &globalII.currency, "$"); ! res = res && getNewLocaleString (LOCALE_SINTLSYMBOL, &globalII.intlCurrency, "USD"); ! res = res && getNewLocaleString (LOCALE_SDECIMAL, &globalII.decimal, "."); ! res = res && getNewLocaleString (LOCALE_STHOUSAND, &globalII.thousands, ","); ! res = res && getNewLocaleString (LOCALE_SLIST, &globalII.list, ","); ! res = res && getNewLocaleString (LOCALE_STIME, &globalII.timesep, ":"); ! res = res && getNewLocaleString (LOCALE_SDATE, &globalII.datesep, "/"); ! res = res && getNewLocalePatternString (LOCALE_SSHORTDATE, &globalII.shortDateFormatPattern, "M#/D#/Y#"); ! res = res && getNewLocalePatternString (LOCALE_SLONGDATE, &globalII.longDateFormatPattern, "DN, MN D#, YN"); ! globalII.numberOfDays = 7; //Make this 10 to use yesterday, today, tommorrow - dave wanted them removed. ! globalII.numberOfMonths = 12; ! globalII.numberOfYears = 0; ! globalII.defaultTimeFormat = false; ! for (i = 0; i < globalII.numberOfMonths; i++) { ! globalII.daysInMonth[i] = daysInMonthsArray[i]; ! } ! for (i = globalII.numberOfMonths; i < 13; i++) { ! globalII.daysInMonth[i] = 0; ! } ! if (res) ! globalIIptr = &globalII; return (res); *************** *** 367,371 **** ! tyinternationalinfoptr getIntlInfo () { if (globalIIptr == NULL) { if (initInternationalInfo()) { --- 353,357 ---- ! tyinternationalinfoptr getIntlInfo (void) { if (globalIIptr == NULL) { if (initInternationalInfo()) { *************** *** 395,399 **** - #ifdef WIN95VERSION static void getDateTime (tydaterecptr dt) { SYSTEMTIME sysdt; --- 381,384 ---- *************** *** 1496,1500 **** } /*getdaystring*/ ! long getcurrenttimezonebias() { #ifdef MACVERSION MachineLocation ml; --- 1481,1485 ---- } /*getdaystring*/ ! long getcurrenttimezonebias(void) { #ifdef MACVERSION MachineLocation ml; Index: zoom.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/zoom.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** zoom.c 23 Oct 2004 23:07:56 -0000 1.2 --- zoom.c 31 Oct 2004 16:38:27 -0000 1.3 *************** *** 63,67 **** void middlerect (Rect rorig, Rect *rmiddle) { ! /* compute a rectangle which is at or near the center of rorig of minimum dimensions. --- 63,67 ---- void middlerect (Rect rorig, Rect *rmiddle) { ! /% compute a rectangle which is at or near the center of rorig of minimum dimensions. *************** *** 74,79 **** r.top = r.bottom = rorig.top + ((rorig.bottom - rorig.top) / 2); ! *rmiddle = r; /*return value%/ ! } /*middlerect*/ --- 74,80 ---- r.top = r.bottom = rorig.top + ((rorig.bottom - rorig.top) / 2); ! *rmiddle = r; /%return value%/ ! } /%middlerect%/ ! */ *************** *** 215,220 **** zoomrect (&rmiddle, &r, true); ! } /*zoomfrommiddle*/ ! void zoomport (Rect rsource, WindowPtr w, boolean flzoomup) { --- 216,221 ---- zoomrect (&rmiddle, &r, true); ! } /%zoomfrommiddle%/ ! */ void zoomport (Rect rsource, WindowPtr w, boolean flzoomup) { *************** *** 398,402 **** boolean zoomtempwindow (boolean flzoom, short height, short width, WindowPtr *w) { ! /* a temp window is like the one used in the About... command. --- 399,403 ---- boolean zoomtempwindow (boolean flzoom, short height, short width, WindowPtr *w) { ! /% a temp window is like the one used in the About... command. *************** *** 407,411 **** Rect r, rsource; ! /* SetRect (&r, 0, 0, width, height); --- 408,412 ---- Rect r, rsource; ! /% SetRect (&r, 0, 0, width, height); *************** *** 422,431 **** if (!newcolorwindow (height, width, w)) { ! sysbeep (); /*instead of showing window%/ return (false); } ! x = *w; /*copy into register%/ pushport (x); --- 423,432 ---- if (!newcolorwindow (height, width, w)) { ! sysbeep (); /%instead of showing window%/ return (false); } ! x = *w; /%copy into register%/ pushport (x); *************** *** 442,449 **** ShowWindow (x); ! *w = x; /*return pointer to window record%/ return (true); ! } /*zoomtempwindow%/ --- 443,450 ---- ShowWindow (x); ! *w = x; /%return pointer to window record%/ return (true); ! } /%zoomtempwindow%/ *************** *** 466,470 **** popport (); } ! } /*closetempwindow%/ --- 467,471 ---- popport (); } ! } /%closetempwindow%/ *************** *** 488,492 **** return; ! case updateEvt: /*handle updates, he might be using Pyro!%/ if ((WindowPtr) (ev.message) == x) { --- 489,493 ---- return; ! case updateEvt: /%handle updates, he might be using Pyro!%/ if ((WindowPtr) (ev.message) == x) { *************** *** 504,510 **** break; ! } /*switch%/ ! } /*while%/ ! } /*modaltempwindow*/ --- 505,512 ---- break; ! } /%switch%/ ! } /%while%/ ! } /%modaltempwindow%/ ! */ Index: process.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/process.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** process.c 23 Oct 2004 22:49:31 -0000 1.2 --- process.c 31 Oct 2004 16:38:27 -0000 1.3 *************** *** 532,536 **** #ifdef landinclude ! if (landvisitsleepingthreads (visit, refcon)) return (true); #endif --- 532,536 ---- #ifdef landinclude ! if (landvisitsleepingthreads ((landqueuepopcallback) visit, refcon)) return (true); #endif *************** *** 754,758 **** /* ! assert (!(**x).flrunning); /*if this can happen, maybe generate langerror?%/ deletefromprocesslist (x); --- 754,758 ---- /* ! assert (!(**x).flrunning); /%if this can happen, maybe generate langerror?%/ deletefromprocesslist (x); *************** *** 2044,2048 **** register hdlprocessrecord hp = (hdlprocessrecord) (**hg).hprocess; ! /***if ((hp != nil) && ((**hg).hccglobals != nil)) { /*a living process*/ if ((hp != nil) && (**hp).floneshot && !(**hg).flthreadkilled) { /*a living 1shot process*/ --- 2044,2048 ---- register hdlprocessrecord hp = (hdlprocessrecord) (**hg).hprocess; ! //if ((hp != nil) && ((**hg).hccglobals != nil)) { /*a living process*/ if ((hp != nil) && (**hp).floneshot && !(**hg).flthreadkilled) { /*a living 1shot process*/ *************** *** 2062,2075 **** ! #if flruntime ! ! boolean abort1shotprocess (void) ! ! #else ! ! static boolean abort1shotprocess (void) - #endif - { /* kill the most recently sharted 1-shot process we find. maybe there's a --- 2062,2067 ---- ! boolean abort1shotprocess (void) { /* kill the most recently sharted 1-shot process we find. maybe there's a *************** *** 2260,2264 **** register short i; ThreadID idthread; ! boolean flrecycle = false; /*default%/ GetCurrentThread (&idthread); --- 2252,2256 ---- register short i; ThreadID idthread; ! boolean flrecycle = false; /%default%/ GetCurrentThread (&idthread); *************** *** 2266,2274 **** for (i = 0; i < threadpoolsize; ++i) { ! if (threadpool [i] == idthread) { /*came from the pool...%/ threadpool [i] = kNoThread; ! flrecycle = true; /*...return to the pool%/ break; --- 2258,2266 ---- for (i = 0; i < threadpoolsize; ++i) { ! if (threadpool [i] == idthread) { /%came from the pool...%/ threadpool [i] = kNoThread; ! flrecycle = true; /%...return to the pool%/ break; *************** *** 2277,2281 **** DisposeThread (kCurrentThread, result, flrecycle) ! } /*exitprocessthread*/ --- 2269,2274 ---- DisposeThread (kCurrentThread, result, flrecycle) ! } /%exitprocessthread%/ ! */ *************** *** 2319,2325 **** ! static void disposeprocessthread (hdlthreadglobals hglobals) { ! disposethreadglobals (hglobals); --ctprocessthreads; --- 2312,2318 ---- ! static void disposeprocessthread (hdlthreadglobals htread) { ! disposethreadglobals (htread); --ctprocessthreads; *************** *** 2372,2378 **** for (i = 0; i < threadpoolsize; ++i) { ! if (threadpool [i] == kNoThread) { /*must have come from the pool...%/ ! threadpool [i] = idthread; /*...keep track of who owns this slot%/ break; --- 2365,2371 ---- for (i = 0; i < threadpoolsize; ++i) { ! if (threadpool [i] == kNoThread) { /%must have come from the pool...%/ ! threadpool [i] = idthread; /%...keep track of who owns this slot%/ break; *************** *** 2441,2445 **** ! static pascal boolean wakeupvisit (hdlthreadglobals hthread, long refcon) { /* --- 2434,2438 ---- ! static pascal boolean wakeupvisit (Handle hthread, long refcon) { /* *************** *** 2543,2551 **** } ! threadcallbacks.disposecallback = disposeprocessthread; ! threadcallbacks.swapincallback = swapinthreadglobals; ! threadcallbacks.swapoutcallback = copythreadglobals; initmainthread (hglobals); --- 2536,2544 ---- } ! threadcallbacks.disposecallback = (tythreadglobalscallback) &disposeprocessthread; ! threadcallbacks.swapincallback = (tythreadglobalscallback) &swapinthreadglobals; ! threadcallbacks.swapoutcallback = (tythreadglobalscallback) ©threadglobals; initmainthread (hglobals); *************** *** 2776,2780 **** //Changed this to wored in OSX kCurrentThread wasn't working //for some reason. ! OSErr anErr = GetCurrentThread(¤tThread); if (ThreadCurrentStackSpace (currentThread, &space) == noErr) return (space); --- 2769,2773 ---- //Changed this to wored in OSX kCurrentThread wasn't working //for some reason. ! GetCurrentThread(¤tThread); if (ThreadCurrentStackSpace (currentThread, &space) == noErr) return (space); *************** *** 3124,3132 **** continue; */ ! /* ! /* ! (**hp).sleepuntil++; //6.1b8 AR: old rescheduling code by dmb -- commented out ! */ ! (**hp).sleepuntil = x + 1; /*6.1b8 AR: reschedule for a second later*/ --- 3117,3123 ---- continue; */ ! ! //(**hp).sleepuntil++; //6.1b8 AR: old rescheduling code by dmb -- commented out ! (**hp).sleepuntil = x + 1; /*6.1b8 AR: reschedule for a second later*/ *************** *** 3241,3245 **** /* ! if (globalsstack.top > 1) { /*can't keep things clean if more than 1 window pushed%/ return; --- 3232,3236 ---- /* ! if (globalsstack.top > 1) { /%can't keep things clean if more than 1 window pushed%/ return; Index: uisharing.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/uisharing.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** uisharing.c 26 Oct 2004 10:27:39 -0000 1.3 --- uisharing.c 31 Oct 2004 16:38:27 -0000 1.4 *************** *** 60,63 **** --- 60,65 ---- + #ifndef isFrontier + static Boolean isFrontProcess () { *************** *** 73,76 **** --- 75,80 ---- return (fl); } /*isFrontProcess*/ + + #endif *************** *** 113,117 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 117,121 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 141,145 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 145,149 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 169,173 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 173,177 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 197,201 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 201,205 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 229,233 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 233,237 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 257,261 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 261,265 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 283,287 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 287,291 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 311,315 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 315,319 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 337,341 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 341,345 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 367,371 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 371,375 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 395,399 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 399,403 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 453,457 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 457,461 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 479,483 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 483,487 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 517,521 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 521,525 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 553,557 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 557,561 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 560,563 **** --- 564,569 ---- + #ifndef isFrontier + glue setobjectvalueGlue (ComponentInstance comp, Handle hcard, Str255 name, Handle value) { *************** *** 585,589 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 591,595 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 617,621 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 623,627 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 649,653 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 655,659 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 677,681 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 683,687 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 683,686 **** --- 689,694 ---- } /*recalcGlue*/ + #endif + glue editGlue (ComponentInstance comp, short editcommand) { *************** *** 705,709 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 713,717 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *)&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 712,715 **** --- 720,725 ---- + #ifndef isFrontier + glue updateGlue (ComponentInstance comp, Handle h) { *************** *** 733,737 **** #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch(&pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); --- 743,747 ---- #if TARGET_API_MAC_CARBON == 1 ! return CallComponentDispatch((ComponentParameters *) &pb); #else return CallUniversalProc(CallComponentUPP, uppCallComponentProcInfo, &pb); *************** *** 739,742 **** --- 749,755 ---- } /*updateGlue*/ + #endif + + #pragma options align=reset *************** *** 1498,1506 **** return (true); ! error: uisClose (); return (false); } /*uisInit*/ --- 1511,1521 ---- return (true); ! #ifndef isFrontier ! error: uisClose (); return (false); + #endif } /*uisInit*/ Index: player.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/player.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** player.c 23 Oct 2004 22:49:02 -0000 1.2 --- player.c 31 Oct 2004 16:38:27 -0000 1.3 *************** *** 282,285 **** --- 282,287 ---- + #if 0 + static boolean playersave (ptrfilespec fs, hdlfilenum fnum, short rnum, boolean flsaveas, boolean flrunnable) { *************** *** 300,303 **** --- 302,307 ---- } /*playersave*/ + #endif + static boolean playerdisposerecord (void) { *************** *** 333,337 **** --- 337,343 ---- return (id == -1); /*true if target type is generic -- a shell verb*/ } /*playergettargetdata*/ + + #if 0 static boolean playersetsuperglobals (void) { *************** *** 417,420 **** --- 423,428 ---- } /*playeropenmoviefile*/ + #endif + static void playerdisposecurrentmovie (void) { *************** *** 440,444 **** ! boolean isplayerevent () { /* --- 448,452 ---- ! boolean isplayerevent (void) { /* *************** *** 634,640 **** ! static boolean playeractivate (void) { ! return (true); } /*playeractivate*/ --- 642,650 ---- ! static void playeractivate (boolean fl) { ! #pragma unused (fl) ! ! return; } /*playeractivate*/ *************** *** 646,651 **** */ - boolean fl =false; - if (currentcontroller != nil) { --- 656,659 ---- |
|
From: Andre R. <and...@us...> - 2004-10-31 13:19:38
|
Update of /cvsroot/frontierkernel/Frontier/Common/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18748 Modified Files: langregexp.c Log Message: Fix GCC compiler warning. Index: langregexp.c =================================================================== RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langregexp.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** langregexp.c 30 Oct 2004 22:19:55 -0000 1.5 --- langregexp.c 31 Oct 2004 13:19:30 -0000 1.6 *************** *** 3219,3223 **** info.hresult = hresult; info.flincludematches = flincludematches; ! info.bserrorptr = (StringPtr) &bserror; flsuccess = langvisitlistvalues (&vsubject, ®expgreplistitemscallback, (ptrvoid) &info); --- 3219,3223 ---- info.hresult = hresult; info.flincludematches = flincludematches; ! info.bserrorptr = (ptrstring) &bserror; flsuccess = langvisitlistvalues (&vsubject, ®expgreplistitemscallback, (ptrvoid) &info); |
1 message has been excluded from this view by a project administrator.
