From eb2e691bbe2a0a709ec7a7c0681afa891657c68b Mon Sep 17 00:00:00 2001 From: Stuart Swales Date: Sun, 21 Aug 2022 22:55:52 +0100 Subject: [PATCH] Imported from svn tag fireworkz__2016_07_07__2_10_02 --- docs/LICENSE | 13 +- docs/RiscPkg/Copyright | 2 +- examples/_make_w32.cmd | 2 +- t5/Build/!!!Boot,feb | 11 +- t5/Build/ReadMeR.txt | 16 +- t5/Build/ReadMeW.txt | 19 +- t5/Build/Tools/BootRunGen | 2 +- t5/Build/Tools/ConfigGen | 1 + t5/Build/bld_mkdir/_do_mkdir,feb | 12 +- t5/Build/configure | 7 +- t5/Build/gccsdk/gcc-cross-check.sh | 2 +- t5/Build/gccsdk/setup.sh | 4 +- t5/Build/setup-csnf,fd7 | 7 +- t5/Build/windows/OUTx64/BLDCD2.BAT | 12 +- t5/Build/windows/OUTx64/firewrkz-x64.iss | 4 +- t5/Build/windows/OUTx86/BLDCD2.BAT | 12 +- t5/Build/windows/OUTx86/firewrkz-x86.iss | 4 +- t5/Build/windows/firewrkz-vs2005.vcproj | 36 +- t5/Build/windows/firewrkz-vs2008.vcproj | 150 ++-- t5/Build/windows/firewrkz-vs2013.vcxproj | 76 +- .../windows/firewrkz-vs2013.vcxproj.filters | 66 +- t5/Build/windows/firewrkz-vs2015.vcxproj | 60 +- .../windows/firewrkz-vs2015.vcxproj.filters | 60 +- t5/Build/windows/firewrkz.rc | 4 +- t5/Build/windows/setup.cmd | 36 - t5/Build/windows/t5_VC2005.bat | 8 +- t5/Build/windows/t5_VC2008.bat | 8 +- t5/Build/windows/t5_VC2013.bat | 8 +- t5/Build/windows/t5_VC2015.bat | 8 +- t5/cmodules/aligator.c | 24 +- t5/cmodules/alloc.c | 22 +- t5/cmodules/bitmap.c | 20 +- t5/cmodules/bitmap.h | 14 +- t5/cmodules/cfbf.c | 2 +- t5/cmodules/cfbfwrite.c | 2 +- t5/cmodules/collect.c | 8 +- t5/cmodules/coltsoft/coltsoft.h | 22 +- t5/cmodules/ev_eval.c | 4 +- t5/cmodules/ev_evali.h | 8 +- t5/cmodules/ev_fnstb.c | 2 +- t5/cmodules/fileutil.c | 10 +- t5/cmodules/gr_axis2.c | 2 +- t5/cmodules/gr_axisp.c | 4 +- t5/cmodules/gr_chari.h | 2 +- t5/cmodules/gr_chart.c | 6 +- t5/cmodules/gr_diag.c | 12 +- t5/cmodules/gr_rdia3.c | 2 +- t5/cmodules/gr_rdiag.c | 4 +- t5/cmodules/gr_scatc.c | 6 +- t5/cmodules/gr_texts.c | 2 +- t5/cmodules/im_cache.c | 4 +- t5/cmodules/im_convert.c | 10 +- t5/cmodules/mlec.c | 74 +- t5/cmodules/mlec2.c | 2 +- t5/cmodules/myassert.c | 8 +- t5/cmodules/resource.c | 14 +- t5/cmodules/riscos/ho_dll.c | 6 +- t5/cmodules/spell.c | 6 +- t5/cmodules/ss_date.c | 4 +- t5/cmodules/ucs4.c | 2 +- t5/cmodules/utf8.c | 4 +- t5/cmodules/utf8.h | 2 +- t5/cmodules/xustring.c | 2 +- t5/common/gflags.h | 2 +- t5/common/mf_mid | 6 +- t5/external/setup-windows.cmd | 40 + t5/firewrkz/RelNotes.htm | 37 +- t5/firewrkz/RelNotesW.htm | 31 +- t5/firewrkz/r/RiscPkg/Control | 2 +- t5/firewrkz/r/RiscPkg/Copyright | 2 +- t5/firewrkz/r32b/MakeRiscPkg,fd7 | 2 +- t5/firewrkz/r32b/_copy_r32,fd7 | 72 +- t5/firewrkz/r32m/MakeNN/MakeCommon,feb | 6 +- t5/firewrkz/r32m/MakeNN/MakeF1Core,feb | 6 +- t5/firewrkz/r32m/MakeNN/MakeF2Core,feb | 8 +- .../resource/riscos/uk/Choices/ChoicesDoc | 3 +- t5/firewrkz/resource/windows/uk/config | 3 +- t5/firewrkz/resource/windows/uk/res00.rci | 10 +- t5/firewrkz/windows/Disc1-x64.src/LICENCE.TXT | 2 +- .../System/UK/Choices/ChoicesDoc.txt | 3 +- t5/firewrkz/windows/Disc1-x86.src/LICENCE.TXT | 2 +- .../System/UK/Choices/ChoicesDoc.txt | 3 +- t5/fl_123/fl_123.c | 6 +- t5/fl_ascii/fl_ascii.c | 4 +- t5/fl_csv/fl_csv.c | 12 +- t5/fl_fwp/fl_fwp.c | 6 +- t5/fl_pdss/fl_pdss.c | 10 +- t5/fl_pdtx/fl_pdtx.c | 8 +- t5/fl_rtf/fl_rtf.c | 20 +- t5/fl_xls/ff_xls.h | 390 ++++++++- t5/fl_xls/fl_xls.c | 8 +- t5/fl_xls/fl_xls_loadb.c | 778 +++++++++--------- t5/fs_123/fs_123.c | 12 +- t5/fs_ascii/fs_ascii.c | 6 +- t5/fs_csv/fs_csv.c | 6 +- t5/fs_rtf/fs_rtf.c | 6 +- t5/fs_xls/fs_xls.c | 6 +- t5/fs_xls/fs_xls_saveb.c | 504 ++++++------ t5/ob_cells/ce_edit.c | 18 +- t5/ob_cells/ob_cells.c | 114 +-- t5/ob_cells/sk_col.c | 2 +- t5/ob_cells/sk_draw.c | 8 +- t5/ob_cells/sk_form.c | 16 +- t5/ob_cells/sk_slot.c | 4 +- t5/ob_chart/gr_blgal.c | 2 +- t5/ob_chart/gr_blpro.c | 8 +- t5/ob_chart/gr_chtio.c | 36 +- t5/ob_chart/gr_edit.c | 68 +- t5/ob_chart/gr_uiaxi.c | 4 +- t5/ob_chart/gr_uigal.c | 8 +- t5/ob_chart/gr_uisty.c | 10 +- t5/ob_chart/ob_chart.c | 22 +- t5/ob_dlg/ob_dlg.c | 16 +- t5/ob_dlg/ob_dlg2.c | 6 +- t5/ob_dlg/ob_dlg3.c | 8 +- t5/ob_dlg/ri_dlg.c | 14 +- t5/ob_dlg/ri_lbox.c | 2 +- t5/ob_dlg/wi_dlg.c | 14 +- t5/ob_draw/ob_draw.c | 34 +- t5/ob_drwio/drwprint.c | 4 +- t5/ob_drwio/ob_drwio.c | 18 +- t5/ob_file/ob_file.c | 20 +- t5/ob_hefo/ob_hefo.c | 48 +- t5/ob_hefo/ob_hefo.h | 2 +- t5/ob_hefo/ui_hefo.c | 4 +- t5/ob_mails/ob_mails.c | 14 +- t5/ob_mlec/ob_mlec.c | 4 +- t5/ob_note/ob_note.c | 466 ++++++----- t5/ob_note/ob_note2.c | 165 ++-- t5/ob_note/xp_note.h | 2 +- t5/ob_recn/ob_recn.c | 10 +- t5/ob_ruler/ob_ruler.c | 62 +- t5/ob_skel/ff_load.c | 14 +- t5/ob_skel/flags.h | 5 + t5/ob_skel/fonty.c | 32 +- t5/ob_skel/ob_imps.c | 8 +- t5/ob_skel/object.c | 12 +- t5/ob_skel/of_load.c | 20 +- t5/ob_skel/resource/uk-msg | 10 +- t5/ob_skel/riscos/colourpick.c | 8 +- t5/ob_skel/riscos/cs-flex.c | 8 +- t5/ob_skel/riscos/cs-winx.c | 23 +- t5/ob_skel/riscos/event.c | 2 - t5/ob_skel/riscos/ho_event.c | 12 +- t5/ob_skel/riscos/ho_paint.c | 18 +- t5/ob_skel/riscos/host.c | 74 +- t5/ob_skel/riscos/main.c | 13 +- t5/ob_skel/sk_alpha.c | 4 +- t5/ob_skel/sk_area.c | 2 +- t5/ob_skel/sk_bord.c | 60 +- t5/ob_skel/sk_choic.c | 50 +- t5/ob_skel/sk_cmd.c | 18 +- t5/ob_skel/sk_cont.c | 6 +- t5/ob_skel/sk_docno.c | 6 +- t5/ob_skel/sk_draft.c | 6 +- t5/ob_skel/sk_find.c | 10 +- t5/ob_skel/sk_hefod.c | 8 +- t5/ob_skel/sk_load.c | 8 +- t5/ob_skel/sk_mark.c | 11 +- t5/ob_skel/sk_menu.c | 10 +- t5/ob_skel/sk_null.c | 6 +- t5/ob_skel/sk_print.c | 16 +- t5/ob_skel/sk_prost.c | 6 +- t5/ob_skel/sk_root.c | 52 +- t5/ob_skel/sk_save.c | 24 +- t5/ob_skel/sk_styl.c | 16 +- t5/ob_skel/sk_stylc.c | 36 +- t5/ob_skel/sk_stylg.c | 80 +- t5/ob_skel/sk_table.c | 6 +- t5/ob_skel/sk_uref.c | 2 +- t5/ob_skel/t5_glue.c | 2 +- t5/ob_skel/ui_data.c | 4 +- t5/ob_skel/ui_field.c | 8 +- t5/ob_skel/ui_misc.c | 2 +- t5/ob_skel/ui_page.c | 12 +- t5/ob_skel/ui_save.c | 44 +- t5/ob_skel/vi_cmd.c | 56 +- t5/ob_skel/vi_edge.c | 8 +- t5/ob_skel/view.c | 18 +- t5/ob_skel/windows/ho_color.c | 2 +- t5/ob_skel/windows/ho_dde.c | 8 +- t5/ob_skel/windows/ho_dll.c | 4 +- t5/ob_skel/windows/ho_event.c | 2 +- t5/ob_skel/windows/ho_menu.c | 12 +- t5/ob_skel/windows/ho_paint.c | 12 +- t5/ob_skel/windows/ho_print.c | 18 +- t5/ob_skel/windows/ho_win.c | 50 +- t5/ob_skel/windows/splash.c | 8 +- t5/ob_skel/xp_skel.h | 14 +- t5/ob_skel/xp_skelr.h | 11 +- t5/ob_skspt/ob_skspt.c | 26 +- t5/ob_skspt/ui_remov.c | 12 +- t5/ob_skspt/ui_styl3.c | 6 +- t5/ob_skspt/ui_style.c | 16 +- t5/ob_spelb/ob_spelb.c | 18 +- t5/ob_spell/ob_spell.c | 32 +- t5/ob_spell/resource/Dicts/process.sh | 2 +- t5/ob_spell/ui_check.c | 2 +- t5/ob_ss/link_ev.c | 6 +- t5/ob_ss/ob_ss.c | 137 ++- t5/ob_ss/sle_ss.c | 123 +-- t5/ob_ss/ui_name.c | 12 +- t5/ob_story/ob_story.c | 12 +- t5/ob_story/tx_cache.c | 6 +- t5/ob_story/tx_form.c | 2 +- t5/ob_story/tx_main.c | 38 +- t5/ob_text/ob_text.c | 65 +- t5/ob_toolb/ob_toolb.c | 76 +- t5/ob_toolb/wi_toolb.c | 20 +- t5/resource/template/draft_rz,c1d | 14 +- t5/resource/template/draft_wz,c1d | 12 +- t5/resource/template/letter,c1d | 11 +- t5/resource/template/sheetDE,c1d | 11 +- t5/resource/template/sheetUK,c1d | 10 +- 214 files changed, 3174 insertions(+), 2713 deletions(-) delete mode 100644 t5/Build/windows/setup.cmd create mode 100644 t5/external/setup-windows.cmd diff --git a/docs/LICENSE b/docs/LICENSE index cc64ef2..6f4f459 100644 --- a/docs/LICENSE +++ b/docs/LICENSE @@ -1,13 +1,8 @@ -Fireworkz is free and open source software. +This Source Code Form is subject to the terms of the Mozilla Public +License, v. 2.0. If a copy of the MPL was not distributed with this +file, You can obtain one at http://mozilla.org/MPL/2.0/. -Fireworkz is made available to you under the terms of the -Mozilla Public License 2.0 (MPL). This means you may use, -copy and distribute Fireworkz to others. You are also -welcome to modify the source code of Fireworkz as you want -to meet your needs. The Mozilla Public License also gives -you the right to distribute your modified versions. - -Copyright (C) 1992-1998 Colton Software Limited +Copyright (C) 1989-1998 Colton Software Limited Copyright (C) 1998-2015 R W Colton This licence also applies to the following files in this directory diff --git a/docs/RiscPkg/Copyright b/docs/RiscPkg/Copyright index b1404a3..dd69432 100644 --- a/docs/RiscPkg/Copyright +++ b/docs/RiscPkg/Copyright @@ -1,6 +1,6 @@ Copyright (C) 1992-2016 Colton Software -Fireworkz is free and open source software. +Fireworkz is free to use and open source software. Fireworkz is made available to you under the terms of the Mozilla Public License 2.0 (MPL). This means you may use, diff --git a/examples/_make_w32.cmd b/examples/_make_w32.cmd index abee722..99fc2c2 100644 --- a/examples/_make_w32.cmd +++ b/examples/_make_w32.cmd @@ -9,7 +9,7 @@ @rem SUBST N: %USERPROFILE%\cs-dev @rem or some appropriate equivalent for your dev environment. @rem If not, you just have to navigate to this directory before executing the batch file -set SRC_DIR=N:\fireworkz\trunk\examples\Apps\Document\FzExamples +set SRC_DIR=N:\fireworkz\%FIREWORKZ_TBT%\examples\Apps\Document\FzExamples @rem set OUT_DIR=%TEMP%\OUT_DIR @rem diff --git a/t5/Build/!!!Boot,feb b/t5/Build/!!!Boot,feb index daf2e23..e4f3fe2 100644 --- a/t5/Build/!!!Boot,feb +++ b/t5/Build/!!!Boot,feb @@ -9,7 +9,7 @@ | If ""="" Then Error AcornC/C++ Tools not yet opened | -If ""<>"" Then Error 0 Please reboot and reselect +If ""<>"" Then Error 0 Please reboot and reselect | | SKS iMX6 If ""="" Then IfThere SCSI::hd4.$.!Boot Then Set disc_root SCSI::hd4.$ @@ -23,15 +23,16 @@ If ""="" Then IfThere SDFS::RISCOSpi.$.!Boot Then Set disc_root SDFS: | RPCEmu If ""="" Then IfThere HostFS:$.!Boot Then Set disc_root HostFS:$ | -Set t5_root .fireworkz.trunk +Set fireworkz_tbt fireworkz__2_10__branch +Set fireworkz_root .fireworkz. | -URD +URD |Lib &.arm.Library |Dir &.t5 | | Fireworkz Pro can only be built if R-Comp components are present -IfThere .coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Set DPlib$Path .coltsoft.trunk.cs-nonfree.DataPower.DPlib.. -IfThere .coltsoft.trunk.cs-nonfree.DataPower.DPlib..WindLibC Then Set WindLibC$Path .coltsoft.trunk.cs-nonfree.DataPower.WindLibC.. +IfThere .coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Set DPlib$Path .coltsoft..cs-nonfree.DataPower.DPlib.. +IfThere .coltsoft..cs-nonfree.DataPower.DPlib..WindLibC Then Set WindLibC$Path .coltsoft..cs-nonfree.DataPower.WindLibC.. | Set Fireworkz$ReportEnable 1 Set Fireworkz$TraceEnable 1 diff --git a/t5/Build/ReadMeR.txt b/t5/Build/ReadMeR.txt index 62f4221..9f87e35 100644 --- a/t5/Build/ReadMeR.txt +++ b/t5/Build/ReadMeR.txt @@ -10,14 +10,16 @@ Copyright (C) 2013-2016 Stuart Swales Prerequisites ------------- -Acorn C/C++ Release 20 or later (!Amu, C compiler, headers, libraries, linker). +Acorn C/C++ Release 25 or later (!Amu, C compiler, headers, libraries, linker). -GNU Sed (Colton Software build - the one provided by PackMan doesn't work -for this) to generate the Makefiles. +GNU Sed to generate the Makefiles (you will need the Colton Software build as +the one provided by PackMan doesn't work for this). + +InfoZip (install with PackMan) for creating a zip of the final build. Unzip (installed as InfoZip dependency) to populate the build directories. -Zip (install InfoZip with PackMan) for creating a zip of the final build. +Zip (install as InfoZip dependency) for creating a zip of the final build. First-time configuration and build @@ -35,7 +37,7 @@ See ^.external.RISC_OSLib.ReadMe for instructions on how to do this. Edit 'configure' - set the URD macro to the directory containing t5. -Edit !Amu.Desc for a larger WimpSlot. I use 5024k - it's ample. +Edit DDE's !Amu.Desc for a larger WimpSlot. I use 5024k - it's ample. Run !Amu. @@ -46,9 +48,9 @@ Please note that ObjMunge doesn't work on 32-bit only systems. You will therefore need to build the fully-bound Fireworkz, r32b, on such systems. Then drag 'r32b.firewrkz.Makefile' to !Amu... and wait... A Fireworkz build -takes about fifty minutes on a SA RISC PC. Building on a i.MX6 takes under +takes about eighty minutes on a SA RISC PC. Building on an ARMX6 takes about five minutes. A Fireworkz Pro build takes about ten minutes longer on a SA -RISC PC, and about thirty seconds(!) on a i.MX6. +RISC PC, and about thirty seconds(!) on an ARMX6. Subsequent builds diff --git a/t5/Build/ReadMeW.txt b/t5/Build/ReadMeW.txt index 0ecf590..89a9ccd 100644 --- a/t5/Build/ReadMeW.txt +++ b/t5/Build/ReadMeW.txt @@ -10,7 +10,7 @@ Copyright (C) 2013-2016 Stuart Swales Prerequisites ------------- -A Windows SVN client (such as TortoiseSVN - minimal install with command line tools, no en_US dictionary, no additional iconsets will suffice). +A Windows SVN client such as TortoiseSVN (minimal install, with command line tools, no en_US dictionary, no additional iconsets will suffice). Microsoft Visual Studio 2013 or later (C compiler, headers, libraries, linker). The free Community Edition is suitable (you don't need Blend, MFC, SQL or Web development options). @@ -18,7 +18,7 @@ I recommend setting: Options - Text editor - C++ - Tabs - Insert Spaces -GNU Win32 Patch (install with PackMan) to generate the patched BTTNCUR(P) source files. +GNU Win32 Patch to generate the patched BTTNCUR(P) source files. InnoSetup to create the distributable setup executable. @@ -32,23 +32,17 @@ You first need to acquire some files that are needed to compile Fireworkz but ca See -external/Microsoft/Excel97SDK/README.TXT - -for the Excel 97 SDK (trivial) - -and - external/Microsoft/InsideOLE2/README.TXT -for the 'Inside OLE 2' BTTNCUR sample (less so) +for the 'Inside OLE 2' BTTNCUR sample. Then run -Build\w32\Setup.cmd +Build\windows\Setup.cmd to copy and patch those files as needed. -Double-click on Build\w32\firewrkz-vs2013.sln to load the solution and project files into Visual Studio. +Double-click on Build\windows\firewrkz-vs2013.sln to load the solution and project files into Visual Studio. Choose the variant to build (e.g. Debug or Release). @@ -60,7 +54,6 @@ Subsequent builds To clean up a build, select Build -> Build Solution. - In order to build again, select Build -> Build Solution or Build -> Rebuild Solution. @@ -81,7 +74,7 @@ At a command prompt: cd /p N:\fireworkz\trunk\t5 -pushd firewrkz\w32\OUT +pushd firewrkz\windows\OUTx86 BLD32CD.BAT diff --git a/t5/Build/Tools/BootRunGen b/t5/Build/Tools/BootRunGen index 530c618..b7af1dd 100644 --- a/t5/Build/Tools/BootRunGen +++ b/t5/Build/Tools/BootRunGen @@ -291,7 +291,7 @@ IF NOT boot% THEN PROCo(f%,"If ""z""=""z"" Then Error 0 "+true_product$+" needs Choices$Write to be set") : PROCo(f%,"|") - PROCo(f%,"IfThere .Fireworkz Then Else Obey <"+product$+"$Dir>.uChoices.DoCopy") + PROCo(f%,"IfThere .Fireworkz.Choices.ChoicesDoc Then Else Obey <"+product$+"$Dir>.uChoices.DoCopy"): REM Ensure ChoicesDoc even if Choice00 etc there : REM Use appl_product$ to keep name length down for old filing systems and FireworkzPro PROCo(f%,"|") diff --git a/t5/Build/Tools/ConfigGen b/t5/Build/Tools/ConfigGen index 9138096..ad99458 100644 --- a/t5/Build/Tools/ConfigGen +++ b/t5/Build/Tools/ConfigGen @@ -455,6 +455,7 @@ REM PROCco(f%,"DefineKey:^!C"+asp$+"Button:JUSTIFY_CENTRE") REM PROCco(f%,"DefineKey:^!F"+asp$+"Button:JUSTIFY_FULL") REM PROCco(f%,"DefineKey:^!L"+asp$+"Button:JUSTIFY_LEFT") REM PROCco(f%,"DefineKey:^!R"+asp$+"Button:JUSTIFY_RIGHT") +PROCco(f%,"DefineKey:^!D"+asp$+"InsertFieldIntroDate") PROCco(f%,"DefineKey:^!V"+asp$+"Button:VIEW") PROCco(f%,"DefineKey:^!X"+asp$+"Button:BOX"): REM ^!X as alias for ^!B PROCco(f%,"DefineKey:^!Z"+asp$+"Button:CHART") diff --git a/t5/Build/bld_mkdir/_do_mkdir,feb b/t5/Build/bld_mkdir/_do_mkdir,feb index e8ae0d1..66718bc 100644 --- a/t5/Build/bld_mkdir/_do_mkdir,feb +++ b/t5/Build/bld_mkdir/_do_mkdir,feb @@ -62,13 +62,13 @@ X Copy ._std .ob_skel.riscos Copy ._app1 .firewrkz Copy ._app2 .firewrkz.!Fireworkz -| Fireworkz Pro can only be built if R-Comp components are present -IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .ob_rec -IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .ob_recb -IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .fs_xls +| Fireworkz Pro can only be built if corresponding R-Comp components are present +IfThere $.coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .ob_rec +IfThere $.coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .ob_recb +IfThere $.coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Copy ._std .fs_xls -IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Copy ._app1 .fprowrkz -IfThere $.coltsoft.trunk.cs-nonfree.DataPower.DPlib..DPlib Then Copy ._app2 .fprowrkz.!Fireworkz +IfThere $.coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Copy ._app1 .fprowrkz +IfThere $.coltsoft..cs-nonfree.DataPower.DPlib..DPlib Then Copy ._app2 .fprowrkz.!Fireworkz |IfThere .firewrkz Then Filer_OpenDir .firewrkz |IfThere .fprowrkz Then Filer_OpenDir .fprowrkz diff --git a/t5/Build/configure b/t5/Build/configure index 6a55b58..03cef3d 100644 --- a/t5/Build/configure +++ b/t5/Build/configure @@ -11,11 +11,14 @@ # By the way, you may need set the wimpslot in !Amu.Desc to at 2760k or so ... +# Specify trunk, branch (e.g. branches/fireworkz__2_10__branch) or tag (e.g. tags/fireworkz__2016_06_26__2_10_00) +$(FIREWORKZ_TBT)=fireworkz__2_10__branch + # NB Substitute URD location as necessary -URD=$.fireworkz.trunk +URD=$.fireworkz.$(FIREWORKZ_TBT) # Only Fireworkz Pro builders need to worry about this one -CSNF=$.coltsoft.trunk.cs-nonfree +CSNF=$.coltsoft.$(FIREWORKZ_TBT).cs-nonfree INC_RAM= # vvv Uncomment this line to allow use of RAM: to speed full builds diff --git a/t5/Build/gccsdk/gcc-cross-check.sh b/t5/Build/gccsdk/gcc-cross-check.sh index b8456ff..c007961 100644 --- a/t5/Build/gccsdk/gcc-cross-check.sh +++ b/t5/Build/gccsdk/gcc-cross-check.sh @@ -1,4 +1,4 @@ #!/bin/sh # Expect errors from # ob_rec that needs low-level DPLib -gcc -c ../../*/*.c -I../.. -I ../../../../../coltsoft/trunk/cs-nonfree/Acorn/Library/32/CLib/msvchack -I../../../../../coltsoft/trunk/cs-nonfree/Acorn/Library/32/tboxlibs -funsigned-char -DCROSS_COMPILE -DHOST_GCCSDK -DTARGET_RISCOS -DRELEASED +gcc -c ../../*/*.c -I../.. -I ../../external/cs-nonfree/Acorn/Library/32/CLib/msvchack -I../../external/cs-nonfree/Acorn/Library/32/tboxlibs -funsigned-char -DCROSS_COMPILE -DHOST_GCCSDK -DTARGET_RISCOS -DRELEASED diff --git a/t5/Build/gccsdk/setup.sh b/t5/Build/gccsdk/setup.sh index df98326..3ddae9a 100755 --- a/t5/Build/gccsdk/setup.sh +++ b/t5/Build/gccsdk/setup.sh @@ -8,9 +8,9 @@ #rem Copyright (C) 2013-2016 Stuart Swales -#rem Execute from top-level t5 directory +#rem Execute from top-level t5 directory (move as t5/external/setup-gccsdk.sh soon) -COLTSOFT_CS_NONFREE=../../../coltsoft/trunk/cs-nonfree +COLTSOFT_CS_NONFREE=../../../coltsoft/$FIREWORKZ_TBT/cs-nonfree [ ! -d ./external/Microsoft/Excel97SDK/INCLUDE ] && mkdir ./external/Microsoft/Excel97SDK/INCLUDE cp $COLTSOFT_CS_NONFREE/Microsoft/Excel_97_SDK/INCLUDE/XLCALL.H ./external/Microsoft/Excel97SDK/INCLUDE/xlcall.h diff --git a/t5/Build/setup-csnf,fd7 b/t5/Build/setup-csnf,fd7 index 5c315df..6ad70ee 100644 --- a/t5/Build/setup-csnf,fd7 +++ b/t5/Build/setup-csnf,fd7 @@ -4,11 +4,8 @@ | | Copyright (C) 2013-2016 Stuart Swales | -set COLTSOFT_CS_NONFREE .^.^.^.^.coltsoft.trunk.cs-nonfree +set COLTSOFT_CS_NONFREE .^.^.^.^.coltsoft..cs-nonfree | IfThere .Microsoft Then Else Error 0 not present | -cdir .^.external.Microsoft.Excel97SDK.INCLUDE -cdir .^.external.Microsoft.Excel97SDK.INCLUDE.h -copy .Microsoft.Excel_97_SDK.INCLUDE.XLCALL/H .^.external.Microsoft.Excel97SDK.INCLUDE.h.xlcall ~CF~N~RV - +echo Nothing to do these days diff --git a/t5/Build/windows/OUTx64/BLDCD2.BAT b/t5/Build/windows/OUTx64/BLDCD2.BAT index 98aeff3..a59dbad 100644 --- a/t5/Build/windows/OUTx64/BLDCD2.BAT +++ b/t5/Build/windows/OUTx64/BLDCD2.BAT @@ -7,19 +7,19 @@ pushd %~dp0 IF NOT EXIST BLDCD2.BAT EXIT -rmdir /s /q fwin-210yy -mkdir fwin-210yy\ +rmdir /s /q fwin-21002 +mkdir fwin-21002\ @if errorlevel 1 goto failed @ @rem copy newly built stuff ie. the Setup EXE -xcopy .\InnoSetup\*.exe fwin-210yy\ +xcopy .\InnoSetup\*.exe fwin-21002\ @if errorlevel 1 goto failed @ -@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm fwin-210yy\RelNotes.htm +@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm fwin-21002\RelNotes.htm @if errorlevel 1 goto failed @ -mkdir fwin-210yy\GSGuide\ -@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows fwin-210yy\GSGuide\Windows +mkdir fwin-21002\GSGuide\ +@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows fwin-21002\GSGuide\Windows @if errorlevel 1 goto failed @ @explorer . diff --git a/t5/Build/windows/OUTx64/firewrkz-x64.iss b/t5/Build/windows/OUTx64/firewrkz-x64.iss index de9b3b3..d494ebe 100644 --- a/t5/Build/windows/OUTx64/firewrkz-x64.iss +++ b/t5/Build/windows/OUTx64/firewrkz-x64.iss @@ -26,8 +26,8 @@ MinVersion=6.1 ; Require Windows 7 for 64-bit version ; AppVersion=2.xx.yy ; AppVerName=Colton Software Fireworkz 2.xx.yy -AppVersion=2.10.00 -AppVerName=Colton Software Fireworkz 2.10 +AppVersion=2.10.02 +AppVerName=Colton Software Fireworkz 2.10.02 AppCopyright=Copyright (C) 1992-2016 Colton Software AppId=Colton Fireworkz for Windows (64-bit) AppName=Colton Software Fireworkz for Windows (64-bit) diff --git a/t5/Build/windows/OUTx86/BLDCD2.BAT b/t5/Build/windows/OUTx86/BLDCD2.BAT index 98aeff3..a59dbad 100644 --- a/t5/Build/windows/OUTx86/BLDCD2.BAT +++ b/t5/Build/windows/OUTx86/BLDCD2.BAT @@ -7,19 +7,19 @@ pushd %~dp0 IF NOT EXIST BLDCD2.BAT EXIT -rmdir /s /q fwin-210yy -mkdir fwin-210yy\ +rmdir /s /q fwin-21002 +mkdir fwin-21002\ @if errorlevel 1 goto failed @ @rem copy newly built stuff ie. the Setup EXE -xcopy .\InnoSetup\*.exe fwin-210yy\ +xcopy .\InnoSetup\*.exe fwin-21002\ @if errorlevel 1 goto failed @ -@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm fwin-210yy\RelNotes.htm +@echo F | xcopy ..\..\..\firewrkz\RelNotesW.htm fwin-21002\RelNotes.htm @if errorlevel 1 goto failed @ -mkdir fwin-210yy\GSGuide\ -@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows fwin-210yy\GSGuide\Windows +mkdir fwin-21002\GSGuide\ +@echo D | xcopy /s ..\..\..\..\docs\GSGuide\windows fwin-21002\GSGuide\Windows @if errorlevel 1 goto failed @ @explorer . diff --git a/t5/Build/windows/OUTx86/firewrkz-x86.iss b/t5/Build/windows/OUTx86/firewrkz-x86.iss index 4bb98e6..a831a93 100644 --- a/t5/Build/windows/OUTx86/firewrkz-x86.iss +++ b/t5/Build/windows/OUTx86/firewrkz-x86.iss @@ -24,8 +24,8 @@ MinVersion=5.1sp3 ; Require XP SP3 ; AppVersion=2.xx.yy ; AppVerName=Colton Software Fireworkz 2.xx.yy -AppVersion=2.10.00 -AppVerName=Colton Software Fireworkz 2.10 +AppVersion=2.10.02 +AppVerName=Colton Software Fireworkz 2.10.02 AppCopyright=Copyright (C) 1992-2016 Colton Software AppId=Colton Fireworkz for Windows (32-bit) AppName=Colton Software Fireworkz for Windows (32-bit) diff --git a/t5/Build/windows/firewrkz-vs2005.vcproj b/t5/Build/windows/firewrkz-vs2005.vcproj index e725344..4abe3a8 100644 --- a/t5/Build/windows/firewrkz-vs2005.vcproj +++ b/t5/Build/windows/firewrkz-vs2005.vcproj @@ -49,7 +49,7 @@ Optimization="3" InlineFunctionExpansion="2" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""\coltsoft\trunk\cs-nonfree\Acorn\Library\32\CLib\msvchack";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\tboxlibs";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" + AdditionalIncludeDirectories=""..\..\external\cs-nonfree\Acorn\Library\32\CLib\msvchack";"..\..\external\cs-nonfree\Acorn\Library\32\tboxlibs";"..\..\external\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" PreprocessorDefinitions="TARGET_RISCOS;HOST_WINDOWS;UNRELEASED" IgnoreStandardIncludePath="true" RuntimeLibrary="1" @@ -124,7 +124,7 @@ Optimization="3" InlineFunctionExpansion="2" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""\coltsoft\trunk\cs-nonfree\Acorn\Library\32\CLib\msvchack";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\tboxlibs";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" + AdditionalIncludeDirectories=""..\..\external\cs-nonfree\Acorn\Library\32\CLib\msvchack";"..\..\external\cs-nonfree\Acorn\Library\32\tboxlibs";"..\..\external\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" PreprocessorDefinitions="TARGET_RISCOS;HOST_WINDOWS" IgnoreStandardIncludePath="true" RuntimeLibrary="0" @@ -5198,7 +5198,7 @@ > @@ -5207,7 +5207,7 @@ > @@ -5256,7 +5256,7 @@ > @@ -5265,7 +5265,7 @@ > @@ -5314,7 +5314,7 @@ > @@ -5323,7 +5323,7 @@ > @@ -5372,7 +5372,7 @@ > @@ -5381,7 +5381,7 @@ > @@ -5480,7 +5480,7 @@ > @@ -5489,7 +5489,7 @@ > @@ -5538,7 +5538,7 @@ > @@ -5547,7 +5547,7 @@ > @@ -5596,7 +5596,7 @@ > @@ -5605,7 +5605,7 @@ > @@ -5741,11 +5741,11 @@ Name="Norcroft_C" > diff --git a/t5/Build/windows/firewrkz-vs2008.vcproj b/t5/Build/windows/firewrkz-vs2008.vcproj index d647a5e..faaa8fe 100644 --- a/t5/Build/windows/firewrkz-vs2008.vcproj +++ b/t5/Build/windows/firewrkz-vs2008.vcproj @@ -868,7 +868,7 @@ Optimization="3" InlineFunctionExpansion="2" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""\coltsoft\trunk\cs-nonfree\Acorn\Library\32\CLib\msvchack";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\tboxlibs";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" + AdditionalIncludeDirectories=""..\..\external\cs-nonfree\Acorn\Library\32\CLib\msvchack";"..\..\external\cs-nonfree\Acorn\Library\32\tboxlibs";"..\..\external\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" PreprocessorDefinitions="TARGET_RISCOS;HOST_WINDOWS;UNRELEASED" IgnoreStandardIncludePath="true" RuntimeLibrary="1" @@ -1009,7 +1009,7 @@ Optimization="3" InlineFunctionExpansion="2" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""\coltsoft\trunk\cs-nonfree\Acorn\Library\32\CLib\msvchack";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\tboxlibs";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" + AdditionalIncludeDirectories=""..\..\external\cs-nonfree\Acorn\Library\32\CLib\msvchack";"..\..\external\cs-nonfree\Acorn\Library\32\tboxlibs";"..\..\external\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" PreprocessorDefinitions="TARGET_RISCOS;HOST_WINDOWS" IgnoreStandardIncludePath="true" RuntimeLibrary="0" @@ -1149,7 +1149,7 @@ Optimization="3" InlineFunctionExpansion="2" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories=""\coltsoft\trunk\cs-nonfree\Acorn\Library\32\CLib\msvchack";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\tboxlibs";"\coltsoft\trunk\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" + AdditionalIncludeDirectories=""..\..\external\cs-nonfree\Acorn\Library\32\CLib\msvchack";"..\..\external\cs-nonfree\Acorn\Library\32\tboxlibs";"..\..\external\cs-nonfree\Acorn\Library\32\RISC_OSLib";"$(ProjectDir)..\..";"$(ProjectDir)..\..\..\fprowrkz"" PreprocessorDefinitions="TARGET_RISCOS;HOST_WINDOWS;UNRELEASED" IgnoreStandardIncludePath="true" RuntimeLibrary="1" @@ -10692,7 +10692,7 @@ > @@ -10701,7 +10701,7 @@ > @@ -10710,7 +10710,7 @@ > @@ -10719,7 +10719,7 @@ > @@ -10728,7 +10728,7 @@ > @@ -10737,7 +10737,7 @@ > @@ -10840,7 +10840,7 @@ > @@ -10849,7 +10849,7 @@ > @@ -10858,7 +10858,7 @@ > @@ -10867,7 +10867,7 @@ > @@ -10876,7 +10876,7 @@ > @@ -10885,7 +10885,7 @@ > @@ -10988,7 +10988,7 @@ > @@ -10997,7 +10997,7 @@ > @@ -11006,7 +11006,7 @@ > @@ -11015,7 +11015,7 @@ > @@ -11024,7 +11024,7 @@ > @@ -11033,7 +11033,7 @@ > @@ -11136,7 +11136,7 @@ > @@ -11145,7 +11145,7 @@ > @@ -11154,7 +11154,7 @@ > @@ -11163,7 +11163,7 @@ > @@ -11172,7 +11172,7 @@ > @@ -11181,7 +11181,7 @@ > @@ -11410,7 +11410,7 @@ > @@ -11419,7 +11419,7 @@ > @@ -11428,7 +11428,7 @@ > @@ -11437,7 +11437,7 @@ > @@ -11446,7 +11446,7 @@ > @@ -11455,7 +11455,7 @@ > @@ -11558,7 +11558,7 @@ > @@ -11567,7 +11567,7 @@ > @@ -11576,7 +11576,7 @@ > @@ -11585,7 +11585,7 @@ > @@ -11594,7 +11594,7 @@ > @@ -11603,7 +11603,7 @@ > @@ -11706,7 +11706,7 @@ > @@ -11715,7 +11715,7 @@ > @@ -11724,7 +11724,7 @@ > @@ -11733,7 +11733,7 @@ > @@ -11742,7 +11742,7 @@ > @@ -11751,7 +11751,7 @@ > @@ -11761,7 +11761,7 @@ Name="ob_rec_windlib" > - + + true + true + true + true + + true true true @@ -420,7 +426,7 @@ true true - + true true true @@ -430,7 +436,7 @@ true true - + true true true @@ -440,7 +446,7 @@ true true - + true true true @@ -450,7 +456,7 @@ true true - + true true true @@ -460,7 +466,7 @@ true true - + true true true @@ -470,7 +476,7 @@ true true - + true true true @@ -480,7 +486,7 @@ true true - + true true true @@ -490,7 +496,7 @@ true true - + true true true @@ -951,16 +957,6 @@ - - true - true - true - true - true - true - true - true - @@ -1298,7 +1294,7 @@ - + true true true @@ -1308,7 +1304,7 @@ true true - + true true true @@ -1318,7 +1314,7 @@ true true - + true true true @@ -1328,7 +1324,7 @@ true true - + true true true @@ -1338,7 +1334,7 @@ true true - + true true true @@ -1348,7 +1344,7 @@ true true - + true true true @@ -1358,7 +1354,7 @@ true true - + true true true @@ -1368,7 +1364,7 @@ true true - + true true true @@ -1378,7 +1374,7 @@ true true - + true true true @@ -1388,7 +1384,7 @@ true true - + true true true @@ -1398,7 +1394,7 @@ true true - + true true true @@ -1408,7 +1404,7 @@ true true - + true true true @@ -1418,7 +1414,7 @@ true true - + true true true @@ -1428,7 +1424,7 @@ true true - + true true true @@ -1438,7 +1434,7 @@ true true - + true true true @@ -1448,7 +1444,7 @@ true true - + true true true @@ -1748,7 +1744,7 @@ true true - + true true true @@ -1758,7 +1754,7 @@ true true - + true true true @@ -1768,7 +1764,7 @@ true true - + true true true @@ -1778,7 +1774,7 @@ true true - + true true true @@ -1790,7 +1786,7 @@ - + true diff --git a/t5/Build/windows/firewrkz-vs2013.vcxproj.filters b/t5/Build/windows/firewrkz-vs2013.vcxproj.filters index cc2221e..9b4abca 100644 --- a/t5/Build/windows/firewrkz-vs2013.vcxproj.filters +++ b/t5/Build/windows/firewrkz-vs2013.vcxproj.filters @@ -826,31 +826,31 @@ Source Files\ob_chart - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib @@ -1087,9 +1087,6 @@ Source Files\ob_skel\ob_skel_cmodules - - Source Files\fprowrkz - Source Files\firewrkz @@ -1108,6 +1105,9 @@ Source Files\ob_skel\ob_skel_cmodules + + Source Files\fprowrkz + @@ -1344,64 +1344,64 @@ Source Files\ob_ss\ob_ss_external - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Header Files\Norcroft_C - + Header Files\Norcroft_C - + Header Files\RISC_OSLib - + Header Files\RISC_OSLib - + Header Files\tboxlibs - + Header Files\tboxlibs - + Header Files\tboxlibs @@ -1658,7 +1658,7 @@ Source Files\foreign_formats\fl_xls - + Source Files\fprowrkz\ob_rec\ob_rec_windlib diff --git a/t5/Build/windows/firewrkz-vs2015.vcxproj b/t5/Build/windows/firewrkz-vs2015.vcxproj index 820f2cd..b8b1a39 100644 --- a/t5/Build/windows/firewrkz-vs2015.vcxproj +++ b/t5/Build/windows/firewrkz-vs2015.vcxproj @@ -815,7 +815,7 @@ - + true true true @@ -833,7 +833,7 @@ true true - + true true true @@ -851,7 +851,7 @@ true true - + true true true @@ -869,7 +869,7 @@ true true - + true true true @@ -887,7 +887,7 @@ true true - + true true true @@ -905,7 +905,7 @@ true true - + true true true @@ -923,7 +923,7 @@ true true - + true true true @@ -941,7 +941,7 @@ true true - + true true true @@ -959,7 +959,7 @@ true true - + true true true @@ -2319,7 +2319,7 @@ - + true true true @@ -2337,7 +2337,7 @@ true true - + true true true @@ -2355,7 +2355,7 @@ true true - + true true true @@ -2373,7 +2373,7 @@ true true - + true true true @@ -2391,7 +2391,7 @@ true true - + true true true @@ -2409,7 +2409,7 @@ true true - + true true true @@ -2427,7 +2427,7 @@ true true - + true true true @@ -2445,7 +2445,7 @@ true true - + true true true @@ -2463,7 +2463,7 @@ true true - + true true true @@ -2481,7 +2481,7 @@ true true - + true true true @@ -2499,7 +2499,7 @@ true true - + true true true @@ -2517,7 +2517,7 @@ true true - + true true true @@ -2535,7 +2535,7 @@ true true - + true true true @@ -2553,7 +2553,7 @@ true true - + true true true @@ -2571,7 +2571,7 @@ true true - + true true true @@ -2589,7 +2589,7 @@ true true - + true true true @@ -3037,7 +3037,7 @@ true true - + true true true @@ -3055,7 +3055,7 @@ true true - + true true true @@ -3073,7 +3073,7 @@ true true - + true true true @@ -3091,7 +3091,7 @@ true true - + true true true @@ -3111,7 +3111,7 @@ - + diff --git a/t5/Build/windows/firewrkz-vs2015.vcxproj.filters b/t5/Build/windows/firewrkz-vs2015.vcxproj.filters index e255981..1ef5eb7 100644 --- a/t5/Build/windows/firewrkz-vs2015.vcxproj.filters +++ b/t5/Build/windows/firewrkz-vs2015.vcxproj.filters @@ -802,31 +802,31 @@ Source Files\ob_chart - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib @@ -1344,64 +1344,64 @@ Source Files\ob_ss\ob_ss_external - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Source Files\fprowrkz\ob_rec\ob_rec_windlib - + Header Files\Norcroft_C - + Header Files\Norcroft_C - + Header Files\RISC_OSLib - + Header Files\RISC_OSLib - + Header Files\tboxlibs - + Header Files\tboxlibs - + Header Files\tboxlibs @@ -1667,7 +1667,7 @@ Source Files\foreign_formats\fl_xls - + Source Files\fprowrkz\ob_rec\ob_rec_windlib diff --git a/t5/Build/windows/firewrkz.rc b/t5/Build/windows/firewrkz.rc index a686376..408fefb 100644 --- a/t5/Build/windows/firewrkz.rc +++ b/t5/Build/windows/firewrkz.rc @@ -9,8 +9,8 @@ /*#define VER_FILEVERSION 2,xx,y,0*/ /*#define VER_FILEVERSION 2,xx,0,0*/ -#define VER_FILEVERSION 2,10,0,0 -#define VER_FILEVERSION_STR "2.10\0" +#define VER_FILEVERSION 2,10,1,0 +#define VER_FILEVERSION_STR "2.10.01\0" /*#define VER_FILEVERSION_STR "2.xx\0"*/ /*#define VER_FILEVERSION_STR "2.xx.yy\0"*/ diff --git a/t5/Build/windows/setup.cmd b/t5/Build/windows/setup.cmd deleted file mode 100644 index 8988e2c..0000000 --- a/t5/Build/windows/setup.cmd +++ /dev/null @@ -1,36 +0,0 @@ -@rem Build\windows\setup.cmd - -@rem This Source Code Form is subject to the terms of the Mozilla Public -@rem License, v. 2.0. If a copy of the MPL was not distributed with this -@rem file, You can obtain one at http://mozilla.org/MPL/2.0/. - -@rem Copyright (C) 2013-2016 Stuart Swales - -@rem Execute from top-level t5 directory - -set COLTSOFT_CS_NONFREE=..\..\..\coltsoft\trunk\cs-nonfree - -mkdir .\external\Microsoft\Excel97SDK\INCLUDE -copy /Y %COLTSOFT_CS_NONFREE%\Microsoft\Excel_97_SDK\INCLUDE\XLCALL.H .\external\Microsoft\Excel97SDK\INCLUDE\xlcall.h - -@rem Patched copy of BTTNCUR from 'Inside OLE 2' for Fireworkz - -@set BTTNCURP_FILE=.\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C -@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) -@set BTTNCURP_FILE=.\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H -@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) -@set BTTNCURP_FILE=.\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCURI.H -@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) - -set BTTNCUR_SOURCE=.\external\Microsoft\InsideOLE2\BTTNCUR -if exist %COLTSOFT_CS_NONFREE%\Microsoft\InsideOLE2\BTTNCUR (set BTTNCUR_SOURCE=%COLTSOFT_CS_NONFREE%\Microsoft\InsideOLE2\BTTNCUR) - -@rem it helps to rename the patch utility on Windows 8 etc -Build\windows\gnu-paatch -b %BTTNCUR_SOURCE%\BTTNCUR.C -o .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C -i .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C.patch --verbose -Build\windows\gnu-paatch -b %BTTNCUR_SOURCE%\BTTNCUR.H -o .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H -i .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H.patch --verbose -copy /Y %BTTNCUR_SOURCE%\BTTNCURI.H .\external\Microsoft\InsideOLE2\BTTNCURP - -@rem Make the patched source files read-only to avoid accidental mods... -attrib +r .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C -attrib +r .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H -attrib +r .\external\Microsoft\InsideOLE2\BTTNCURP\BTTNCURI.H diff --git a/t5/Build/windows/t5_VC2005.bat b/t5/Build/windows/t5_VC2005.bat index 85add88..d126a0a 100644 --- a/t5/Build/windows/t5_VC2005.bat +++ b/t5/Build/windows/t5_VC2005.bat @@ -12,9 +12,13 @@ call "C:\Program Files\Microsoft Visual Studio 8\VC\vcvarsall.bat" x86 @rem call "C:\Program Files\Microsoft SDKs\Windows\v6.0\bin\setenv.cmd" /XP /x86 /Debug +set FIREWORKZ_TBT=fireworkz__2_10__branch + +set FIREWORKZ_ROOT=N:\fireworkz\%FIREWORKZ_TBT% + @rem display environment set for development set -title fireworkz_trunk +title %FIREWORKZ_ROOT% -cd \fireworkz\trunk \ No newline at end of file +cd /D %FIREWORKZ_ROOT% diff --git a/t5/Build/windows/t5_VC2008.bat b/t5/Build/windows/t5_VC2008.bat index 0f480a2..d359d27 100644 --- a/t5/Build/windows/t5_VC2008.bat +++ b/t5/Build/windows/t5_VC2008.bat @@ -11,9 +11,13 @@ call prefer-unix if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 if exist "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" call "%ProgramFiles%\Microsoft Visual Studio 9.0\VC\vcvarsall.bat" x86 +set FIREWORKZ_TBT=fireworkz__2_10__branch + +set FIREWORKZ_ROOT=N:\fireworkz\%FIREWORKZ_TBT% + @rem display environment set for development set -title fireworkz_trunk +title %FIREWORKZ_ROOT% -cd \fireworkz\trunk +cd /D %FIREWORKZ_ROOT% diff --git a/t5/Build/windows/t5_VC2013.bat b/t5/Build/windows/t5_VC2013.bat index 6a300a3..23c53df 100644 --- a/t5/Build/windows/t5_VC2013.bat +++ b/t5/Build/windows/t5_VC2013.bat @@ -11,9 +11,13 @@ call prefer-unix if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 if exist "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" call "%ProgramFiles%\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x86 +set FIREWORKZ_TBT=fireworkz__2_10__branch + +set FIREWORKZ_ROOT=N:\fireworkz\%FIREWORKZ_TBT% + @rem display environment set for development set -title fireworkz_trunk +title %FIREWORKZ_ROOT% -cd \fireworkz\trunk +cd /D %FIREWORKZ_ROOT% diff --git a/t5/Build/windows/t5_VC2015.bat b/t5/Build/windows/t5_VC2015.bat index 475ccd4..0a3b1d1 100644 --- a/t5/Build/windows/t5_VC2015.bat +++ b/t5/Build/windows/t5_VC2015.bat @@ -11,9 +11,13 @@ call prefer-unix if exist "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 if exist "%ProgramFiles%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" call "%ProgramFiles%\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86 +set FIREWORKZ_TBT=fireworkz__2_10__branch + +set FIREWORKZ_ROOT=N:\fireworkz\%FIREWORKZ_TBT% + @rem display environment set for development set -title fireworkz_trunk +title %FIREWORKZ_ROOT% -cd \fireworkz\trunk +cd /D %FIREWORKZ_ROOT% diff --git a/t5/cmodules/aligator.c b/t5/cmodules/aligator.c index 8072719..a5709ca 100644 --- a/t5/cmodules/aligator.c +++ b/t5/cmodules/aligator.c @@ -122,7 +122,7 @@ static STATUS aligator_fail( _InVal_ U32 n_bytes) { - IGNOREPARM_InVal_(n_bytes); + UNREFERENCED_PARAMETER_InVal_(n_bytes); myassert1(TEXT("failed to allocate n_bytes=") U32_XTFMT, n_bytes); return(status_nomem()); } @@ -456,7 +456,7 @@ _al_array_add( { PC_ARRAY_BLOCK p_array_block = array_blockc_no_checks(p_array_handle); const U32 n_bytesof_elem_x_num_elem = n_elements * array_block_element_size(p_array_block); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem_x_num_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem_x_num_elem)); CODE_ANALYSIS_ONLY(assert((n_bytesof_elem_x_num_elem == n_bytesof_elem_x_num_elem) || (0 == bytesof_elem_x_num_elem))); memcpy32(p_any, p_data_in, n_bytesof_elem_x_num_elem); } @@ -484,7 +484,7 @@ _al_array_alloc( *p_status = STATUS_OK; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem_x_num_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem_x_num_elem)); /* first of all, acquire a handle */ if(0 != next_free_block) @@ -638,7 +638,7 @@ _al_array_bfind( const U32 array_element_size = array_element_size32_no_checks(p_array_handle); P_ANY p_any; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); CODE_ANALYSIS_ONLY(assert(bytesof_elem == array_element_size)); p_any = @@ -680,7 +680,7 @@ _al_array_bsearch( if(0 == array_elements32_no_checks(p_array_handle)) return(P_DATA_NONE); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); CODE_ANALYSIS_ONLY(assert(bytesof_elem == array_element_size32_no_checks(p_array_handle))); p_data = @@ -716,7 +716,7 @@ _al_array_lsearch( if(0 == array_elements32_no_checks(p_array_handle)) return(P_DATA_NONE); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); CODE_ANALYSIS_ONLY(assert(bytesof_elem == array_element_size32_no_checks(p_array_handle))); p_data = @@ -994,7 +994,7 @@ al_array_garbage_collect( STATUS status; p_array_block->p_data = al_ptr_realloc_us(p_array_block->p_data, p_array_block->free * array_block_element_size(p_array_block), &status); p_array_block->size = p_array_block->free; - IGNOREPARM(status); + UNREFERENCED_PARAMETER(status); } } } @@ -1018,7 +1018,7 @@ al_array_handle_check( ARRAY_INDEX count = 0; UINT pass; - IGNOREPARM_InVal_(whinge); + UNREFERENCED_PARAMETER_InVal_(whinge); for(pass = 1; pass <= 2; ++pass) { @@ -1570,14 +1570,14 @@ al_array_trim( { STATUS status; p_new_array = _dsapplib_ptr_realloc(p_array_block->p_data, n_bytes, &status); - IGNOREPARM(status); + UNREFERENCED_PARAMETER(status); } else /* if(ALLOC_USE_ALLOC == p_array_block->parms.use_alloc) */ #endif /* WINDOWS */ { STATUS status; p_new_array = al_ptr_realloc_us(p_array_block->p_data, n_bytes, &status); - IGNOREPARM(status); + UNREFERENCED_PARAMETER(status); } p_array_block->size = p_array_block->free; @@ -2236,7 +2236,7 @@ array_range_check( return(P_BYTE_NONE); } - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(total_n_bytes)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(total_n_bytes)); return(PtrAddBytes(P_BYTE, p_array_block->p_data, (ele_index * ele_size))); } @@ -2302,7 +2302,7 @@ array_range_bytes_check( return(P_BYTE_NONE); } - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_bytes)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_bytes)); return(PtrAddBytes(P_BYTE, p_array_block->p_data, byte_offset)); } diff --git a/t5/cmodules/alloc.c b/t5/cmodules/alloc.c index d18d417..e6fa5bd 100644 --- a/t5/cmodules/alloc.c +++ b/t5/cmodules/alloc.c @@ -914,7 +914,7 @@ alloc_traversefree( { const PC_ALLOC_HEAP_DESC ahp = &alloc_main_heap_desc; - IGNOREPARM(which); + UNREFERENCED_PARAMETER(which); alloc_validate_heap(ahp, "traversefree", 0); } @@ -934,9 +934,9 @@ alloc_validate_heap( _In_ int set_guards) { #if !TRACE_ALLOWED - IGNOREPARM_InRef_(ahp); - IGNOREPARM(routine); - IGNOREPARM(set_guards); + UNREFERENCED_PARAMETER_InRef_(ahp); + UNREFERENCED_PARAMETER(routine); + UNREFERENCED_PARAMETER(set_guards); #else const P_RISCOS_HEAP heap = ahp->heap; P_RISCOS_HEAP_DATA p; @@ -1084,10 +1084,10 @@ alloc_validate_block( _In_ int set_guards) { #if !TRACE_ALLOWED - IGNOREPARM_InRef_(ahp); - IGNOREPARM(usrcore); - IGNOREPARM(routine); - IGNOREPARM(set_guards); + UNREFERENCED_PARAMETER_InRef_(ahp); + UNREFERENCED_PARAMETER(usrcore); + UNREFERENCED_PARAMETER(routine); + UNREFERENCED_PARAMETER(set_guards); #else const P_RISCOS_HEAP heap = ahp->heap; P_U8 syscore; @@ -1097,7 +1097,7 @@ alloc_validate_block( #if defined(CHECK_ALLOCS) U32 actualusrsize; #else - IGNOREPARM(set_guards); + UNREFERENCED_PARAMETER(set_guards); #endif syscore = PtrSubBytes(P_U8, usrcore, startguardsize); @@ -1226,8 +1226,8 @@ alloc__ini_validate( P_ANY usrcore, _In_z_ PCTSTR msg) { - IGNOREPARM(usrcore); - IGNOREPARM(msg); + UNREFERENCED_PARAMETER(usrcore); + UNREFERENCED_PARAMETER(msg); } #endif diff --git a/t5/cmodules/bitmap.c b/t5/cmodules/bitmap.c index c162832..b18e162 100644 --- a/t5/cmodules/bitmap.c +++ b/t5/cmodules/bitmap.c @@ -34,7 +34,7 @@ bitmap_and( BIT_NUMBER bit_number; BOOL any = FALSE; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) if((*p_bitmap_result++ = (BITMAP_WORD) (*p_bitmap_1++ & *p_bitmap_2++)) != 0) @@ -57,7 +57,7 @@ bitmap_any( { BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) if(*p_bitmap++ != 0) @@ -83,7 +83,7 @@ bitmap_bic( BIT_NUMBER bit_number; BOOL any = FALSE; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) if((*p_bitmap_result++ = (BITMAP_WORD) (*p_bitmap_1++ & ~*p_bitmap_2++)) != 0) @@ -117,7 +117,7 @@ bitmap_bit_copy( const int bit = ((int) bit_number) & (BITMAP_BPW - 1); const BITMAP_WORD mask = (BITMAP_WORD) (ONE_BIT << bit); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); assert(bit_number < n_bits); if(bit_number < n_bits) { @@ -163,7 +163,7 @@ bitmap_compare( { BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) if(*p_bitmap_1++ != *p_bitmap_2++) @@ -247,7 +247,7 @@ bitmap_next_bit( } #endif - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); return(-1); } @@ -313,7 +313,7 @@ bitmap_next_bit_in_both( } #endif - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); return(-1); } @@ -334,7 +334,7 @@ bitmap_not( const BIT_NUMBER size_bits = BITMAP_BITS_FROM_SIZE(bitmap_size); /* round back up, >= n_bits */ BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) *p_bitmap_result++ = (BITMAP_WORD) ~(*p_bitmap++); @@ -374,7 +374,7 @@ bitmap_or( { BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) *p_bitmap_result++ = (BITMAP_WORD) (*p_bitmap_1++ | *p_bitmap_2++); @@ -437,7 +437,7 @@ bitmap_xor( { BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) *p_bitmap_result++ = (BITMAP_WORD) (*p_bitmap_1++ ^ *p_bitmap_2++); diff --git a/t5/cmodules/bitmap.h b/t5/cmodules/bitmap.h index e6d9801..cbab449 100644 --- a/t5/cmodules/bitmap.h +++ b/t5/cmodules/bitmap.h @@ -95,7 +95,7 @@ bitmap_bit_clear( const int bit = ((int) bit_number) & (BITMAP_BPW - 1); const BITMAP_WORD mask = (BITMAP_WORD) (ONE_BIT << bit); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); assert(bit_number < n_bits); if(bit_number < n_bits) p_bitmap[word] &= ~mask; @@ -118,7 +118,7 @@ bitmap_bit_set( const int bit = ((int) bit_number) & (BITMAP_BPW - 1); const BITMAP_WORD mask = (BITMAP_WORD) (ONE_BIT << bit); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); assert(bit_number < n_bits); if(bit_number < n_bits) p_bitmap[word] |= mask; @@ -136,7 +136,7 @@ bitmap_bit_test( const int bit = ((int) bit_number) & (BITMAP_BPW - 1); const BITMAP_WORD mask = (BITMAP_WORD) (ONE_BIT << bit); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); assert(bit_number < n_bits); if(bit_number < n_bits) { @@ -153,7 +153,7 @@ bitmap_clear( _Out_writes_all_(n_words_for_n_bits) P_BITMAP p_bitmap, N_BITS_ARG_DECL(n_bits)) { - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); memset32(p_bitmap, 0, BITMAP_SIZE_FROM_BITS(n_bits) * sizeof32(BITMAP_WORD)); } @@ -171,7 +171,7 @@ bitmap_copy( _In_reads_(n_words_for_n_bits) PC_BITMAP p_bitmap, N_BITS_ARG_DECL(n_bits)) { - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); memcpy32(p_bitmap_result, p_bitmap, BITMAP_SIZE_FROM_BITS(n_bits) * sizeof32(BITMAP_WORD)); } @@ -185,7 +185,7 @@ bitmap_count( BIT_NUMBER bit_number; U32 count = 0; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) { @@ -245,7 +245,7 @@ bitmap_test( { BIT_NUMBER bit_number; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(n_words_for_n_bits)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(n_words_for_n_bits)); for(bit_number = 0; bit_number < n_bits; bit_number += BITMAP_BPW) if((*p_bitmap_1++ & *p_bitmap_2++) != 0) diff --git a/t5/cmodules/cfbf.c b/t5/cmodules/cfbf.c index f4205ba..c57bfea 100644 --- a/t5/cmodules/cfbf.c +++ b/t5/cmodules/cfbf.c @@ -500,7 +500,7 @@ compound_file_dump_directory_entry( _InRef_ PC_StructuredStorageDirectoryEntry file_dir, _In_ int dirnum) { - IGNOREPARM_InRef_(p_compound_file); + UNREFERENCED_PARAMETER_InRef_(p_compound_file); if(CFBF_STGTY_INVALID == file_dir->_mse) return; diff --git a/t5/cmodules/cfbfwrite.c b/t5/cmodules/cfbfwrite.c index 31ec62b..83c63b7 100644 --- a/t5/cmodules/cfbfwrite.c +++ b/t5/cmodules/cfbfwrite.c @@ -299,7 +299,7 @@ cfbf_write_stream_in_storage( if(status_ok(status = t5_file_open(storage_filename, file_open_write, &file_handle, TRUE))) { #if !RISCOS - IGNOREPARM_InVal_(storage_filetype); + UNREFERENCED_PARAMETER_InVal_(storage_filetype); #else status_assert(file_set_risc_os_filetype(file_handle, storage_filetype)); #endif diff --git a/t5/cmodules/collect.c b/t5/cmodules/collect.c index 986a3e2..5aac447 100644 --- a/t5/cmodules/collect.c +++ b/t5/cmodules/collect.c @@ -178,7 +178,7 @@ _collect_first( P_LIST_ITEM it; LIST_ITEMNO item = 0; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); it = list_initseq(p_list_block, &item); @@ -212,7 +212,7 @@ _collect_first_from( P_LIST_ITEM it; LIST_ITEMNO item = *p_key; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); myassert1x(item >= 0, TEXT("collect_first key ") LIST_ITEMNO_TFMT TEXT(" negative"), item); it = list_initseq(p_list_block, &item); @@ -304,7 +304,7 @@ _collect_next( P_LIST_ITEM it; LIST_ITEMNO item; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); if(p_key) { @@ -345,7 +345,7 @@ _collect_prev( P_LIST_ITEM it; LIST_ITEMNO item = *p_key; - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); myassert1x(item >= 0, TEXT("collect_prev key ") LIST_ITEMNO_TFMT TEXT(" negative"), item); it = list_prevseq(p_list_block, &item); diff --git a/t5/cmodules/coltsoft/coltsoft.h b/t5/cmodules/coltsoft/coltsoft.h index 18567b9..3fd624f 100644 --- a/t5/cmodules/coltsoft/coltsoft.h +++ b/t5/cmodules/coltsoft/coltsoft.h @@ -854,12 +854,12 @@ typedef int HOST_WND; /* really wimp_w but don't tell everyone */ #define _HwndRef_ _InVal_ #define _HwndRef_opt_ _InVal_ /* may be 0 */ -#define IGNOREPARM_HwndRef_ IGNOREPARM_InVal_ +#define UNREFERENCED_PARAMETER_HwndRef_ UNREFERENCED_PARAMETER_InVal_ #elif WINDOWS #define _HwndRef_ _InRef_ #define _HwndRef_opt_ _InRef_opt_ /* may be NULL */ -#define IGNOREPARM_HwndRef_ IGNOREPARM_InRef_ +#define UNREFERENCED_PARAMETER_HwndRef_ UNREFERENCED_PARAMETER_InRef_ #endif /* @@ -1349,18 +1349,20 @@ div_round_floor_fn( return(div_round_floor(a, b)); } -#define IGNOREPARM(p) (p)=(p) -#define IGNOREPARM_CONST(p) (void)(p) -#define IGNOREPARM_InRef_(p) (void)(p) -#define IGNOREPARM_InoutRef_(p) (void)(p) -#define IGNOREPARM_OutRef_(p) (void)(p) -#define IGNOREPARM_InVal_(p) (void)(p) +#if !defined(UNREFERENCED_PARAMETER) +#define UNREFERENCED_PARAMETER(p) (p)=(p) +#endif +#define UNREFERENCED_PARAMETER_CONST(p) (void)(p) +#define UNREFERENCED_PARAMETER_InRef_(p) (void)(p) +#define UNREFERENCED_PARAMETER_InoutRef_(p) (void)(p) +#define UNREFERENCED_PARAMETER_OutRef_(p) (void)(p) +#define UNREFERENCED_PARAMETER_InVal_(p) (void)(p) -#define IGNOREVAR(v) (void)(v) +#define UNREFERENCED_LOCAL_VARIABLE(v) (void)(v) #define consume(__base_type, expr) \ do { \ - __base_type __v = (expr); IGNOREVAR(__v); \ + __base_type __v = (expr); UNREFERENCED_LOCAL_VARIABLE(__v); \ } while_constant(0) #define consume_ptr(expr) consume(PC_ANY, expr) diff --git a/t5/cmodules/ev_eval.c b/t5/cmodules/ev_eval.c index 32cee7c..8df8cca 100644 --- a/t5/cmodules/ev_eval.c +++ b/t5/cmodules/ev_eval.c @@ -476,7 +476,7 @@ array_range_proc_blank( _InoutRef_ P_STAT_BLOCK p_stat_block, _InoutRef_ P_EV_DATA p_ev_data) { - IGNOREPARM_InoutRef_(p_ev_data); + UNREFERENCED_PARAMETER_InoutRef_(p_ev_data); p_stat_block->count_blank += 1; } @@ -960,7 +960,7 @@ array_range_proc_others( _InoutRef_ P_STAT_BLOCK p_stat_block, _InoutRef_ P_EV_DATA p_ev_data) { - IGNOREPARM_InoutRef_(p_ev_data); + UNREFERENCED_PARAMETER_InoutRef_(p_ev_data); assert(0 != p_stat_block->exec_array_range_id); diff --git a/t5/cmodules/ev_evali.h b/t5/cmodules/ev_evali.h index 2314fc6..095640b 100644 --- a/t5/cmodules/ev_evali.h +++ b/t5/cmodules/ev_evali.h @@ -66,10 +66,10 @@ types for exec routines */ #define exec_func_ignore_parms() (void) ( \ - IGNOREPARM(args), \ - IGNOREPARM_InVal_(n_args), \ - IGNOREPARM_InoutRef_(p_ev_data_res), \ - IGNOREPARM_InRef_(p_cur_slr) ) + UNREFERENCED_PARAMETER(args), \ + UNREFERENCED_PARAMETER_InVal_(n_args), \ + UNREFERENCED_PARAMETER_InoutRef_(p_ev_data_res), \ + UNREFERENCED_PARAMETER_InRef_(p_cur_slr) ) /* symbol information */ diff --git a/t5/cmodules/ev_fnstb.c b/t5/cmodules/ev_fnstb.c index 82b8007..6327b9e 100644 --- a/t5/cmodules/ev_fnstb.c +++ b/t5/cmodules/ev_fnstb.c @@ -235,7 +235,7 @@ large_small_common( S32 x_size, y_size; const S32 k_idx = args[1]->arg.integer - 1; - IGNOREPARM_InVal_(n_args); + UNREFERENCED_PARAMETER_InVal_(n_args); /* can trivially index by sorting a flattened copy of the source */ status_assert(statistics_array_flatten_copy(&ev_data_temp_array, args[0])); diff --git a/t5/cmodules/fileutil.c b/t5/cmodules/fileutil.c index de776f5..6a7c9d8 100644 --- a/t5/cmodules/fileutil.c +++ b/t5/cmodules/fileutil.c @@ -770,7 +770,7 @@ file_find_on_path_or_relative( return(res); } -#ifdef UNUSED_KEEP_ALIVE /* currently unused */ +#if defined(UNUSED_KEEP_ALIVE) /* currently unused */ /****************************************************************************** * @@ -825,7 +825,7 @@ file_find_dir_on_path( return(res); } -#endif +#endif /* UNUSED_KEEP_ALIVE */ /****************************************************************************** * @@ -940,7 +940,7 @@ file_is_dir( if(INVALID_FILE_ATTRIBUTES == dword) { const DWORD dwLastError = GetLastError(); - IGNOREPARM_CONST(dwLastError); + UNREFERENCED_PARAMETER_CONST(dwLastError); return(FALSE); } return((dword & FILE_ATTRIBUTE_DIRECTORY) != 0); @@ -973,7 +973,7 @@ file_is_file( if(INVALID_FILE_ATTRIBUTES == dword) { const DWORD dwLastError = GetLastError(); - IGNOREPARM_CONST(dwLastError); + UNREFERENCED_PARAMETER_CONST(dwLastError); return(FALSE); } return((dword & FILE_ATTRIBUTE_DIRECTORY) == 0); @@ -1009,7 +1009,7 @@ file_is_read_only( if(INVALID_FILE_ATTRIBUTES == dword) { const DWORD dwLastError = GetLastError(); - IGNOREPARM_CONST(dwLastError); + UNREFERENCED_PARAMETER_CONST(dwLastError); return(FALSE); } return((dword & FILE_ATTRIBUTE_READONLY) != 0); diff --git a/t5/cmodules/gr_axis2.c b/t5/cmodules/gr_axis2.c index 8cfa10a..e0fd6f6 100644 --- a/t5/cmodules/gr_axis2.c +++ b/t5/cmodules/gr_axis2.c @@ -385,7 +385,7 @@ gr_axis_form_value_lin( F64 exponent; F64 mantissa = splitlognum(&log10_major, &exponent); int decimals = (int) floor(exponent); - IGNOREPARM(mantissa); + UNREFERENCED_PARAMETER(mantissa); p_axis->major.bits.decimals = (decimals < 0) ? -decimals : 0; } /*block*/ diff --git a/t5/cmodules/gr_axisp.c b/t5/cmodules/gr_axisp.c index 19dbc87..4ae3bd5 100644 --- a/t5/cmodules/gr_axisp.c +++ b/t5/cmodules/gr_axisp.c @@ -881,7 +881,7 @@ gr_axis_addin_value_grids_x( GR_DIAG_OFFSET gridStart; GR_LINESTYLE linestyle; - IGNOREPARM_InVal_(axis_ypos); + UNREFERENCED_PARAMETER_InVal_(axis_ypos); if(!p_axis_ticks->bits.grid) return(status); @@ -1135,7 +1135,7 @@ gr_axis_addin_value_labels_x( HOST_FONT host_font; F64 maxval; - IGNOREPARM_InVal_(front_phase); + UNREFERENCED_PARAMETER_InVal_(front_phase); gr_axis_iterator.step = p_axis_ticks->current; if(!gr_axis_iterator.step) diff --git a/t5/cmodules/gr_chari.h b/t5/cmodules/gr_chari.h index 792718b..ba63ddb 100644 --- a/t5/cmodules/gr_chari.h +++ b/t5/cmodules/gr_chari.h @@ -882,7 +882,7 @@ typedef struct GR_CHART GR_CHART, * P_GR_CHART; typedef const GR_CHART * PC_GR_CHART; #define _ChartRef_ const -#define IGNOREPARM_ChartRef_(p_gr_chart) IGNOREPARM_CONST(p_gr_chart) +#define UNREFERENCED_PARAMETER_ChartRef_(p_gr_chart) UNREFERENCED_PARAMETER_CONST(p_gr_chart) typedef struct GR_TEXT_BITS { diff --git a/t5/cmodules/gr_chart.c b/t5/cmodules/gr_chart.c index d47635f..1ab6973 100644 --- a/t5/cmodules/gr_chart.c +++ b/t5/cmodules/gr_chart.c @@ -862,7 +862,7 @@ gr_chart_preferred_save( if(gr_chart_preferred_ch) return(gr_chart_save_chart_without_dialog(gr_chart_preferred_ch, filename)); #else - IGNOREPARM(filename); + UNREFERENCED_PARAMETER(filename); #endif assert0(); @@ -899,7 +899,7 @@ gr_chart_preferred_set( gr_chart_clone_noncore_pict_lose_refs(gr_chart_preferred_ch); #else - IGNOREPARM(ch); + UNREFERENCED_PARAMETER(ch); #endif pcp = p_gr_chart_from_chart_handle(gr_chart_preferred_ch); @@ -932,7 +932,7 @@ gr_chart_preferred_use( #ifdef GR_CLONE return(gr_chart_clone(ch, gr_chart_preferred_ch, 0 /*leave non-core info alone*/)); #else - IGNOREPARM(ch); + UNREFERENCED_PARAMETER(ch); return(status_nomem()); #endif diff --git a/t5/cmodules/gr_diag.c b/t5/cmodules/gr_diag.c index 12d3888..f4083fc 100644 --- a/t5/cmodules/gr_diag.c +++ b/t5/cmodules/gr_diag.c @@ -30,7 +30,7 @@ gr_diag_normalise_stt( _InVal_ GR_DIAG_OFFSET sttObject_in) { GR_DIAG_OFFSET sttObject = sttObject_in; - IGNOREPARM_InRef_(p_gr_diag); + UNREFERENCED_PARAMETER_InRef_(p_gr_diag); myassert0x(p_gr_diag && array_elements32(&p_gr_diag->handle), TEXT("gr_diag_normalise_stt has no diagram")); @@ -52,7 +52,7 @@ gr_diag_normalise_end( GR_DIAG_OFFSET endObject = endObject_in; myassert0x(p_gr_diag && array_elements32(&p_gr_diag->handle), TEXT("gr_diag_normalise_end has no diagram")); - IGNOREPARM_InRef_(p_gr_diag); + UNREFERENCED_PARAMETER_InRef_(p_gr_diag); if(endObject == GR_DIAG_OBJECT_LAST) endObject = array_elements32(&p_gr_diag->handle); @@ -648,7 +648,7 @@ gr_diag_ensure_riscdiag_font_table_entry_for_TEXT( if(status_ok(status)) status = gr_diag_ensure_riscdiag_font_tableW_entry_for_TEXT(p_gr_textstyle, p_array_handleW, status); #else - IGNOREPARM_InoutRef_(p_array_handleW); + UNREFERENCED_PARAMETER_InoutRef_(p_array_handleW); #endif return(status); @@ -670,7 +670,7 @@ gr_diag_ensure_riscdiag_font_table_entries_for_PICTURE( if(status_ok(status)) status = gr_diag_ensure_riscdiag_font_tableW_entries_for_PICTURE(p_diag, diag_len, p_array_handleW, status); #else - IGNOREPARM_InoutRef_(p_array_handleW); + UNREFERENCED_PARAMETER_InoutRef_(p_array_handleW); #endif return(status); @@ -1679,7 +1679,7 @@ gr_diag_piesector_hit_refine( _InRef_ PC_GR_POINT point, _InRef_ PC_GR_SIZE size) { - IGNOREPARM_InRef_(size); + UNREFERENCED_PARAMETER_InRef_(size); return(piesector_hit(&pie->pos, pie->radius, &pie->alpha, &pie->beta, point)); } @@ -1747,7 +1747,7 @@ gr_diag_quadrilateral_hit_refine( { GR_POINT points[4 + 1]; - IGNOREPARM_InRef_(size); + UNREFERENCED_PARAMETER_InRef_(size); points[0] = quad->pos; diff --git a/t5/cmodules/gr_rdia3.c b/t5/cmodules/gr_rdia3.c index 1af2d7c..7391653 100644 --- a/t5/cmodules/gr_rdia3.c +++ b/t5/cmodules/gr_rdia3.c @@ -112,7 +112,7 @@ gr_riscdiag_host_font_from_textstyle( #else - IGNOREPARM_InRef_(textstyle); + UNREFERENCED_PARAMETER_InRef_(textstyle); #endif /* OS */ diff --git a/t5/cmodules/gr_rdiag.c b/t5/cmodules/gr_rdiag.c index a1ccb8b..76b24f1 100644 --- a/t5/cmodules/gr_rdiag.c +++ b/t5/cmodules/gr_rdiag.c @@ -976,7 +976,7 @@ gr_riscdiag_normalise_stt( DRAW_DIAG_OFFSET sttObject = sttObject_in; myassert0x(p_gr_riscdiag && p_gr_riscdiag->draw_diag.length, TEXT("gr_riscdiag_normalise_stt has no diagram")); - IGNOREPARM_InRef_(p_gr_riscdiag); + UNREFERENCED_PARAMETER_InRef_(p_gr_riscdiag); if(sttObject == DRAW_DIAG_OFFSET_FIRST) sttObject = sizeof32(DRAW_FILE_HEADER); @@ -1099,7 +1099,7 @@ gr_riscdiag_object_first( TEXT("gr_riscdiag_object_first object ") U32_XTFMT TEXT(" size ") U32_XTFMT TEXT(" goes beyond end ") U32_XTFMT, thisObject, objectSize, *pEndObject); } /*block*/ #else - IGNOREPARM_InVal_(recurse); + UNREFERENCED_PARAMETER_InVal_(recurse); #endif /* CHECKING */ /* stay at this first object */ diff --git a/t5/cmodules/gr_scatc.c b/t5/cmodules/gr_scatc.c index 67e1eca..202e620 100644 --- a/t5/cmodules/gr_scatc.c +++ b/t5/cmodules/gr_scatc.c @@ -170,7 +170,7 @@ gr_actualise_series_point( { const P_GR_SERIES serp = getserp(cp, series_idx); - IGNOREPARM_InVal_(plain); + UNREFERENCED_PARAMETER_InVal_(plain); #if 0 if(1 /*!serp->valid.limits*/) @@ -230,7 +230,7 @@ gr_actualise_series_point_error1( { const P_GR_SERIES serp = getserp(cp, series_idx); - IGNOREPARM_InVal_(plain); + UNREFERENCED_PARAMETER_InVal_(plain); #if 0 if(1 /*!serp->valid.limits*/) @@ -310,7 +310,7 @@ gr_actualise_series_point_error2( { const P_GR_SERIES serp = getserp(cp, series_idx); - IGNOREPARM_InVal_(plain); + UNREFERENCED_PARAMETER_InVal_(plain); #if 0 if(1 /*!serp->valid.limits*/) diff --git a/t5/cmodules/gr_texts.c b/t5/cmodules/gr_texts.c index 96e004a..a0acb64 100644 --- a/t5/cmodules/gr_texts.c +++ b/t5/cmodules/gr_texts.c @@ -187,7 +187,7 @@ gr_chart_text_order_set( _InVal_ GR_CHART_HANDLE ch, _InVal_ S32 key) { - IGNOREPARM_InVal_(ch); + UNREFERENCED_PARAMETER_InVal_(ch); gr_text_key_to_use = key; } diff --git a/t5/cmodules/im_cache.c b/t5/cmodules/im_cache.c index ab8b964..97afa16 100644 --- a/t5/cmodules/im_cache.c +++ b/t5/cmodules/im_cache.c @@ -1654,7 +1654,7 @@ image_cache_activate_group( { STATUS status; P_S32 p_new = al_array_extend_by(p_array_handle, S32, 1, PC_ARRAY_INIT_BLOCK_NONE, &status); - IGNOREPARM(p_base); + UNREFERENCED_PARAMETER(p_base); PTR_ASSERT(p_new); *p_new = offset; } @@ -1696,7 +1696,7 @@ image_cache_patch_groups( const ARRAY_INDEX n_elements = array_elements(p_array_handle); ARRAY_INDEX index; - IGNOREPARM_InVal_(offset); + UNREFERENCED_PARAMETER_InVal_(offset); if(delta == 0) return; diff --git a/t5/cmodules/im_convert.c b/t5/cmodules/im_convert.c index 0747ffa..0adb284 100644 --- a/t5/cmodules/im_convert.c +++ b/t5/cmodules/im_convert.c @@ -196,9 +196,9 @@ image_convert_do_convert_data( *p_t5_filetype_converted = FILETYPE_BMP; else status = STATUS_FAIL; - } - GdipImage_Dispose(&gdip_image); + GdipImage_Dispose(&gdip_image); + } #endif /* OS */ quick_tblock_dispose(&quick_tblock); @@ -250,7 +250,7 @@ image_convert_do_convert_file( status_return(status); #if RISCOS - IGNOREPARM_InVal_(t5_filetype); + UNREFERENCED_PARAMETER_InVal_(t5_filetype); if(host_os_version_query() < RISCOS_4_0) mode = TEXT("28r"); @@ -307,9 +307,9 @@ image_convert_do_convert_file( *p_t5_filetype_converted = FILETYPE_BMP; else status = STATUS_FAIL; - } - GdipImage_Dispose(&gdip_image); + GdipImage_Dispose(&gdip_image); + } #endif /* OS */ quick_tblock_dispose(&quick_tblock); diff --git a/t5/cmodules/mlec.c b/t5/cmodules/mlec.c index 6d4f754..13683ec 100644 --- a/t5/cmodules/mlec.c +++ b/t5/cmodules/mlec.c @@ -501,6 +501,32 @@ mlec__point_from_colrow( p_point->y = -(mlec->attributes[MLEC_ATTRIBUTE_MARGIN_TOP] + (S32) row * mlec->attributes[MLEC_ATTRIBUTE_LINESPACE]); } +_Check_return_ +static HOST_FONT +mlec_find_font( + const char * name, + U32 x16_size_x, + U32 x16_size_y) +{ + HOST_FONT host_font = HOST_FONT_NONE; + + /* c.f. host_font_find() in Fireworkz */ + _kernel_swi_regs rs; + _kernel_oserror * p_kernel_oserror; + + rs.r[1] = (int) name; + rs.r[2] = x16_size_x; + rs.r[3] = x16_size_y; + rs.r[4] = 0; + rs.r[5] = 0; + + if(NULL == (p_kernel_oserror = (_kernel_swi(Font_FindFont, &rs, &rs)))) + host_font = (HOST_FONT) rs.r[0]; + + return(host_font); + +} + _Check_return_ static HOST_FONT mlec_get_host_font(void) @@ -514,33 +540,23 @@ mlec_get_host_font(void) /*U32 x16_size_x = 16 * 0;*/ U32 x16_size_y = 16 * size_y; - /* c.f. host_font_find() in Fireworkz */ - _kernel_swi_regs rs; - _kernel_oserror * p_kernel_oserror; - - rs.r[1] = (int) /*"\\E" "Latin1"*/ "\\F" "DejaVuSans.Mono"; - rs.r[2] = /*x16_size_x ? x16_size_x :*/ x16_size_y; - rs.r[3] = x16_size_y; - rs.r[4] = 0; - rs.r[5] = 0; + /* Only use DejaVuSans.Mono if we have a Unicode Font Manager */ + host_font = mlec_find_font("\\F" "DejaVuSans.Mono" "\\E" "UTF8", x16_size_y, x16_size_y); - if(NULL == (p_kernel_oserror = (_kernel_swi(/*Font_FindFont*/ 0x040081, &rs, &rs)))) + if(HOST_FONT_NONE != host_font) { - host_font = (HOST_FONT) rs.r[0]; - return(host_font); + (void) font_LoseFont(host_font); + + host_font = mlec_find_font("\\F" "DejaVuSans.Mono" /*"\\E" "Latin1"*/, x16_size_y, x16_size_y); + + if(HOST_FONT_NONE != host_font) + return(host_font); } - rs.r[1] = (int) /*"\\E" "Latin1"*/ "\\F" "Corpus.Medium"; - rs.r[2] = /*x16_size_x ? x16_size_x :*/ x16_size_y; - rs.r[3] = x16_size_y; - rs.r[4] = 0; - rs.r[5] = 0; + host_font = mlec_find_font("\\F" "Corpus.Medium" /*"\\E" "Latin1"*/, x16_size_y, x16_size_y); - if(NULL == (p_kernel_oserror = (_kernel_swi(/*Font_FindFont*/ 0x040081, &rs, &rs)))) - { - host_font = (HOST_FONT) rs.r[0]; + if(HOST_FONT_NONE != host_font) return(host_font); - } return(HOST_FONT_NONE); } @@ -2963,7 +2979,7 @@ mlec__drag_complete( /*_Inout_*/ MLEC mlec, BBox * dragboxp) { - IGNOREPARM(dragboxp); + UNREFERENCED_PARAMETER(dragboxp); trace_0(TRACE_OUT | TRACE_ANY, TEXT("mlec__drag_complete() - *** null_events_stop(DOCNO_NONE)")); null_events_stop(P_DOCU_NONE, T5_EVENT_NULL, null_event_mlec_drag, mlec); @@ -2997,7 +3013,7 @@ mlec_drag_null_event( PROC_EVENT_PROTO(static, null_event_mlec_drag) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); #if CHECKING switch(t5_message) @@ -3007,7 +3023,7 @@ PROC_EVENT_PROTO(static, null_event_mlec_drag) case T5_EVENT_NULL: #else - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { #endif return(mlec_drag_null_event((P_NULL_EVENT_BLOCK) p_data)); @@ -3608,7 +3624,7 @@ show_selection( } /* remaining lines are above the graphics window */ - IGNOREPARM(lineCol); + UNREFERENCED_PARAMETER(lineCol); } /*block*/ } @@ -3740,8 +3756,8 @@ file_write_size( P_XFER_HANDLE xferhandlep, _In_ int xfersize) { - IGNOREPARM(xferhandlep); - IGNOREPARM(xfersize); + UNREFERENCED_PARAMETER(xferhandlep); + UNREFERENCED_PARAMETER(xfersize); return(0); /*>>>might be better to set the file extent to xfersize - ask Tutu */ } @@ -3839,7 +3855,7 @@ paste_read_open( { marked_text range; - IGNOREPARM(filename); + UNREFERENCED_PARAMETER(filename); xferhandlep->p = (MLEC) paste; @@ -3871,7 +3887,7 @@ paste_read_getblock( { MLEC mlec = (MLEC) xferhandlep->p; - IGNOREPARM(datasize); + UNREFERENCED_PARAMETER(datasize); if(mlec) { diff --git a/t5/cmodules/mlec2.c b/t5/cmodules/mlec2.c index 765317a..c1de61c 100644 --- a/t5/cmodules/mlec2.c +++ b/t5/cmodules/mlec2.c @@ -117,7 +117,7 @@ mlec__event_menu_proc( MLEC mlec = (MLEC) handle; int err = 0; - IGNOREPARM(submenurequest); + UNREFERENCED_PARAMETER(submenurequest); switch(*hit++) { diff --git a/t5/cmodules/myassert.c b/t5/cmodules/myassert.c index 474785f..dbd8f7f 100644 --- a/t5/cmodules/myassert.c +++ b/t5/cmodules/myassert.c @@ -335,10 +335,10 @@ __status_assert( return(status); #if 0 /* sometimes you may need to take the assertions out */ - IGNOREPARM(p_function); - IGNOREPARM(p_file); - IGNOREPARM_InVal_(line_no); - IGNOREPARM(tstr); + UNREFERENCED_PARAMETER(p_function); + UNREFERENCED_PARAMETER(p_file); + UNREFERENCED_PARAMETER_InVal_(line_no); + UNREFERENCED_PARAMETER(tstr); #else { PCTSTR tstr_s = resource_lookup_tstr_no_default(status); diff --git a/t5/cmodules/resource.c b/t5/cmodules/resource.c index 5924d1b..c6b0a83 100644 --- a/t5/cmodules/resource.c +++ b/t5/cmodules/resource.c @@ -616,7 +616,7 @@ resource_dll_free( resource_statics.windows.library_handle[object_id] = 0; } #else - IGNOREPARM_InVal_(object_id); + UNREFERENCED_PARAMETER_InVal_(object_id); #endif } @@ -639,8 +639,8 @@ resource_donate( } } /*block*/ #else - IGNOREPARM_InVal_(object_id_dst); - IGNOREPARM_InVal_(object_id_src); + UNREFERENCED_PARAMETER_InVal_(object_id_dst); + UNREFERENCED_PARAMETER_InVal_(object_id_src); #endif } @@ -673,7 +673,7 @@ resource_init( resource_statics.riscos.sprites[object_id].s_24 = p_bound->sprite_area_24; } #elif WINDOWS - IGNOREPARM_CONST(p_u8_bound_msg); + UNREFERENCED_PARAMETER_CONST(p_u8_bound_msg); assert(MSG_WEAK == p_u8_bound_msg); #if defined(NOT_ALL_IN_ONE) @@ -697,8 +697,8 @@ resource_init( } #else /* never load any DLL resources */ - IGNOREPARM_InRef_(p_bound); - IGNOREPARM_InVal_(object_id); + UNREFERENCED_PARAMETER_InRef_(p_bound); + UNREFERENCED_PARAMETER_InVal_(object_id); #endif #endif /* OS */ @@ -853,7 +853,7 @@ resource_get_object_resources( #if defined(NOT_ALL_IN_ONE) hInstance = resource_statics.windows.library_handle[object_id]; #else - IGNOREPARM_InVal_(object_id); + UNREFERENCED_PARAMETER_InVal_(object_id); hInstance = GetInstanceHandle(); #endif diff --git a/t5/cmodules/riscos/ho_dll.c b/t5/cmodules/riscos/ho_dll.c index da4023c..9924305 100644 --- a/t5/cmodules/riscos/ho_dll.c +++ b/t5/cmodules/riscos/ho_dll.c @@ -165,8 +165,8 @@ ho_dll_msg_exit2(void) T5_MSG_PROTO(static, maeve_services_ho_dll_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -183,7 +183,7 @@ T5_MSG_PROTO(static, maeve_services_ho_dll_msg_initclose, _InRef_ PC_MSG_INITCLO MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_dll) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(t5_message) { diff --git a/t5/cmodules/spell.c b/t5/cmodules/spell.c index 8b7c8b4..4ef0a00 100644 --- a/t5/cmodules/spell.c +++ b/t5/cmodules/spell.c @@ -602,7 +602,7 @@ spell_addword( cache_lock = 0; - IGNOREPARM(cache_lock); + UNREFERENCED_PARAMETER(cache_lock); status_return(err); @@ -1486,6 +1486,8 @@ spell_setoptions( return(STATUS_OK); } +#endif /* OS */ + /****************************************************************************** * * return statistics about spelling checker @@ -1521,8 +1523,6 @@ spell_stats( } } -#endif /* OS */ - extern void spell_startup(void) { diff --git a/t5/cmodules/ss_date.c b/t5/cmodules/ss_date.c index ae54ce8..56dc5b2 100644 --- a/t5/cmodules/ss_date.c +++ b/t5/cmodules/ss_date.c @@ -295,14 +295,14 @@ ss_ymd_to_dateval( year += (month_index - 12) / 12; month_index = 12 + (month_index % 12); /* 12 + (-11,-10,..,-1,0) => 0..11 : month_index now positive */ month = month_index + 1; /* reduces month into 1..12 */ - IGNOREVAR(month); /* useful for debug */ + UNREFERENCED_LOCAL_VARIABLE(month); /* useful for debug */ } else if(month_index > 11) { year += (month_index / 12); month_index = (month_index % 12); /* reduce month_index into 0..11 */ month = month_index + 1; /* reduces month into 1..12 */ - IGNOREVAR(month); + UNREFERENCED_LOCAL_VARIABLE(month); } if(year <= 0) diff --git a/t5/cmodules/ucs4.c b/t5/cmodules/ucs4.c index ad34666..5af7a47 100644 --- a/t5/cmodules/ucs4.c +++ b/t5/cmodules/ucs4.c @@ -284,7 +284,7 @@ load_case_map_simple( #if TRACE_ALLOWED && 1 tracef(TRACE_OUT | TRACE_ANY, TEXT("CaseMap: U+%.6X: 0x%.6X(U),0x%.6X(L) # %s\n"), code_point, entry_mapping_uc, entry_mapping_lc, report_sbstr(code_point_name)); #else - IGNOREPARM(code_point_name); + UNREFERENCED_PARAMETER(code_point_name); #endif l2_table[code_point - l2_base_ucs4].lowercase = entry_mapping_lc; diff --git a/t5/cmodules/utf8.c b/t5/cmodules/utf8.c index b997268..09b0df5 100644 --- a/t5/cmodules/utf8.c +++ b/t5/cmodules/utf8.c @@ -873,7 +873,7 @@ utf8_validate( PC_U8 p_u8 = p_u8_in; U32 n_bytes_so_far = 0; - IGNOREPARM_CONST(func); + UNREFERENCED_PARAMETER_CONST(func); assert(strlen_without_NULLCH > uchars_n); @@ -1006,7 +1006,7 @@ uchars_inline_validate( PC_U8 p_u8 = p_u8_in; U32 n_bytes_so_far = 0; - IGNOREPARM_CONST(func); + UNREFERENCED_PARAMETER_CONST(func); assert(strlen_without_NULLCH > uchars_n); diff --git a/t5/cmodules/utf8.h b/t5/cmodules/utf8.h index 121683d..cb8928c 100644 --- a/t5/cmodules/utf8.h +++ b/t5/cmodules/utf8.h @@ -573,7 +573,7 @@ uchars_char_copy( _In_reads_(uchars_n) PC_UCHARS src_uchars, _InVal_ U32 uchars_n) { - IGNOREPARM_InVal_(uchars_n); + UNREFERENCED_PARAMETER_InVal_(uchars_n); assert(1 == uchars_n); PtrPutByte(dst_uchars, PtrGetByte(src_uchars)); } diff --git a/t5/cmodules/xustring.c b/t5/cmodules/xustring.c index afc9488..e8bd00a 100644 --- a/t5/cmodules/xustring.c +++ b/t5/cmodules/xustring.c @@ -579,7 +579,7 @@ sbstr_buf_from_ustr( _InVal_ U32 uchars_n /*strlen_with,without_NULLCH*/) { #if USTR_IS_SBSTR - IGNOREPARM_InVal_(sbchar_codepage); + UNREFERENCED_PARAMETER_InVal_(sbchar_codepage); /* no conversion needed, don't waste any more time/space */ return(xstrnkpy(buffer, elemof_buffer, ustr, ustrlen32_n(ustr, uchars_n))); #else diff --git a/t5/common/gflags.h b/t5/common/gflags.h index 4d1c97d..158f491 100644 --- a/t5/common/gflags.h +++ b/t5/common/gflags.h @@ -15,7 +15,7 @@ #define __gflags_h /* Define the version number of this release */ -#define VERSION_NUMBER 21000 +#define VERSION_NUMBER 21002 /* NB keep in step with other files (definitive list in common.mf_mid) */ #ifdef RELEASED diff --git a/t5/common/mf_mid b/t5/common/mf_mid index 29ccd45..5be4bfa 100644 --- a/t5/common/mf_mid +++ b/t5/common/mf_mid @@ -10,11 +10,11 @@ # Copyright (C) 1992-1998 Colton Software Limited # Copyright (C) 1998-2015 R W Colton -#TEXTUAL_VERSION_NUMBER=2.xx.yy (yy usually 00) -TEXTUAL_VERSION_NUMBER=2.10 +#TEXTUAL_VERSION_NUMBER=2.xx.yy (when yy is 00, omit .yy) +TEXTUAL_VERSION_NUMBER=2.10.02 # this goes in !Boot/!Run/Config files -STUBS_VERSION_NUMBER=21000 +STUBS_VERSION_NUMBER=21002 # when changing version number for release, remember: # common.gflags.h # common.mf_mid diff --git a/t5/external/setup-windows.cmd b/t5/external/setup-windows.cmd new file mode 100644 index 0000000..c3227c3 --- /dev/null +++ b/t5/external/setup-windows.cmd @@ -0,0 +1,40 @@ +@rem Build\windows\setup.cmd + +@rem This Source Code Form is subject to the terms of the Mozilla Public +@rem License, v. 2.0. If a copy of the MPL was not distributed with this +@rem file, You can obtain one at http://mozilla.org/MPL/2.0/. + +@rem Copyright (C) 2013-2016 Stuart Swales + +@rem Execute from %FIREWORKZ_ROOT%\t5\external directory + +set COLTSOFT_CS_FREE=..\..\..\..\coltsoft\%FIREWORKZ_TBT%\cs-free +set COLTSOFT_CS_NONFREE=..\..\..\..\coltsoft\%FIREWORKZ_TBT%\cs-nonfree + +mklink /j %CD%\cs-free %COLTSOFT_CS_FREE% +mklink /j %CD%\cs-nonfree %COLTSOFT_CS_NONFREE% + +set COLTSOFT_CS_FREE=%CD%\cs-free +set COLTSOFT_CS_NONFREE=%CD%\cs-nonfree + +@rem Patched copy of BTTNCUR from 'Inside OLE 2' for Fireworkz + +@set BTTNCURP_FILE=.\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C +@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) +@set BTTNCURP_FILE=.\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H +@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) +@set BTTNCURP_FILE=.\Microsoft\InsideOLE2\BTTNCURP\BTTNCURI.H +@if exist %BTTNCURP_FILE% (@del /F /Q %BTTNCURP_FILE%) + +set BTTNCUR_SOURCE=.\Microsoft\InsideOLE2\BTTNCUR +if exist %COLTSOFT_CS_NONFREE%\Microsoft\InsideOLE2\BTTNCUR (set BTTNCUR_SOURCE=%COLTSOFT_CS_NONFREE%\Microsoft\InsideOLE2\BTTNCUR) + +@rem it helps to rename the patch utility on Windows 8 etc +%COLTSOFT_CS_FREE%\GNU\paatch.exe -b %BTTNCUR_SOURCE%\BTTNCUR.C -o .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C -i .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C.patch --verbose +%COLTSOFT_CS_FREE%\GNU\paatch.exe -b %BTTNCUR_SOURCE%\BTTNCUR.H -o .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H -i .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H.patch --verbose +copy /Y %BTTNCUR_SOURCE%\BTTNCURI.H .\Microsoft\InsideOLE2\BTTNCURP + +@rem Make the patched source files read-only to avoid accidental mods... +attrib +r .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.C +attrib +r .\Microsoft\InsideOLE2\BTTNCURP\BTTNCUR.H +attrib +r .\Microsoft\InsideOLE2\BTTNCURP\BTTNCURI.H diff --git a/t5/firewrkz/RelNotes.htm b/t5/firewrkz/RelNotes.htm index c5a09ff..63b0a20 100644 --- a/t5/firewrkz/RelNotes.htm +++ b/t5/firewrkz/RelNotes.htm @@ -101,14 +101,14 @@

Online Resources

Support

-

Fireworkz is now free-to-use, so support for Fireworkz is a self-help affair.

+

As Fireworkz is now free-to-use, support for Fireworkz is a self-help affair.

There is a Google Group colton-software-fireworkz where you may seek help from other users. - Please include files (in a ZIP or Spark archive) which demonstrate any problems. + Please include files which demonstrate any problems (in a ZIP or Spark archive).

@@ -126,7 +126,31 @@

Release History

-

2.10 (24 Jun 2016)

+

2.10.02 (07 Jul 2016)

+ +

Version information (and therefore top-bit-set encoding used therein) is saved in each Choices file.

+ +

BaseSingleCol construct is only saved in files where needed (i.e. when non-zero).

+ +

All newlines are suppressed in files between elements in Style definitions and Effect applications.

+ +

Reinstated the older Ctrl-Shift-D keyboard shortcut as synonym for Insert Date (now Ctrl-D).

+ +

RISC OS: Better handles upgrading from an earlier version with a Choices directory but without a ChoicesDoc.

+ +

RISC OS: Uses DejaVuSans.Mono 12pt (if it is available AND a Unicode Font Manager is in use) as the font for formula line text, edit controls and combo box controls.

+ + +

2.10.01 (04 Jul 2016)

+ +

When the Faint grid option is used for on-screen display, the (thin) grid colour is now derived from the style system. For spreadsheets, this is usually best set in BaseSheet.

+ +

RISC OS: Fix for partially initialised structure that could cause fault during application exit.

+ +

RISC OS: Use extended syntax Wimp_ForceRedraw to update title bar more efficiently.

+ + +

2.10 (24 Jun 2016)

Spreadsheet functions that take date parameters have been extended to accept numeric input. @@ -776,7 +800,8 @@

Other changes

LoadOther and SaveOther commands renamed as LoadForeign and SaveForeign for source consistency.

- Fireworkz' inline identifier character changed to ASCII 21 (was ASCII 7). NB. This character value is not exposed in file data. + Fireworkz' internal inline sequence identifier character changed to ASCII 21 (was ASCII 7). + NB. This character value is not exposed in file data. This helps on RISC OS where the Font Manager SWI Font_ScanString reads a byte beyond the string length specified as ASCII 21 is the Font Manager Comment sequence lead-in byte and so is ignored rather than giving an Unhandled CtrlChar error.

@@ -1032,7 +1057,9 @@

Known Problems in This Release

If you have a text cell with an inserted name which refers directly to another cell (e.g. you have defined "fred" to be h30) then if the value in the cell which is referred to changes, the text cell is not automatically reformatted or redisplayed. The way to do this at the moment is to use set_name to define the name in the number cell itself, e.g. set_name("fred", calculation)

-

RISC OS: Text handling will not behave correctly if *Alphabet UTF8 is set.

+

RISC OS

+ +

Text handling will not behave correctly if *Alphabet UTF8 is set.

diff --git a/t5/firewrkz/RelNotesW.htm b/t5/firewrkz/RelNotesW.htm index 96b7a2e..aa87c17 100644 --- a/t5/firewrkz/RelNotesW.htm +++ b/t5/firewrkz/RelNotesW.htm @@ -86,7 +86,7 @@

Online Resources

Support

-

Fireworkz is now free-to-use, so support for Fireworkz is a self-help affair.

+

As Fireworkz is now free-to-use, support for Fireworkz is a self-help affair.

There is a Google Group @@ -111,6 +111,22 @@

Release History

+

2.10.02 (07 Jul 2016)

+ +

Version information (and therefore top-bit-set encoding used therein) is saved in each Choices file.

+ +

BaseSingleCol construct is only saved in files where needed (i.e. when non-zero).

+ +

All newlines are suppressed in files between elements in Style definitions and Effect applications.

+ +

Reinstated the older Ctrl-Shift-D keyboard shortcut as synonym for Insert Date (now Ctrl-D).

+ + +

2.10.01 (04 Jul 2016)

+ +

When the Faint grid option is used for on-screen display, the (thin) grid colour is now derived from the style system. For spreadsheets, this is usually best set in BaseSheet.

+ +

2.10 (24 Jun 2016)

@@ -760,7 +776,8 @@

Other changes

LoadOther and SaveOther commands renamed as LoadForeign and SaveForeign for source consistency.

- Fireworkz' inline identifier character changed to ASCII 21 (was ASCII 7). NB. This character value is not exposed in file data. + Fireworkz' internal inline sequence identifier character changed to ASCII 21 (was ASCII 7). + NB. This character value is not exposed in file data. This helps on RISC OS where the Font Manager SWI Font_ScanString reads a byte beyond the string length specified as ASCII 21 is the Font Manager Comment sequence lead-in byte and so is ignored rather than giving an Unhandled CtrlChar error.

@@ -774,19 +791,19 @@

Other changes

Windows

-

Windows: Standard release build is now done on Windows 7 using Visual Studio 2013 Update 5 with the v120_xp platform toolset.

+

Standard release build is now done on Windows 7 using Visual Studio 2013 Update 5 with the v120_xp platform toolset.

-

Windows: U:XXXX inline sequences are translated to UTF-16 and rendered using the Wide Character API.

+

U:XXXX inline sequences are translated to UTF-16 and rendered using the Wide Character API.

-

Windows: Additional value Windows-<XXXX> added to Version information in Fireworkz file to help file portability, where <XXXXe> is the current Windows ANSI Code Page

+

Additional value Windows-<XXXX> added to Version information in Fireworkz file to help file portability, where <XXXXe> is the current Windows ANSI Code Page

- Windows: When loading supporting documents, such as custom function sheets, + When loading supporting documents, such as custom function sheets, Fireworkz will first scan the path without using the .fwk extension then, if needed, try again without the extension. This helps with cross-platform portability and centralised storage of supporting documents.

-

Windows: Updated templates in line with RISC OS ones (use of four-digit year).

+

Updated templates in line with RISC OS ones (use of four-digit year).

Other fixes

diff --git a/t5/firewrkz/r/RiscPkg/Control b/t5/firewrkz/r/RiscPkg/Control index ef4d038..cee71c0 100644 --- a/t5/firewrkz/r/RiscPkg/Control +++ b/t5/firewrkz/r/RiscPkg/Control @@ -1,5 +1,5 @@ Package: Fireworkz -Version: 2.10.0 +Version: 2.10.2 Section: Document Priority: Optional Maintainer: Colton Software diff --git a/t5/firewrkz/r/RiscPkg/Copyright b/t5/firewrkz/r/RiscPkg/Copyright index 7451c5b..d663fe9 100644 --- a/t5/firewrkz/r/RiscPkg/Copyright +++ b/t5/firewrkz/r/RiscPkg/Copyright @@ -1,6 +1,6 @@ Copyright (C) 1992-2016 Colton Software -Fireworkz is free and open source software. +Fireworkz is free to use and open source software. Fireworkz is made available to you under the terms of the Mozilla Public License 2.0 (MPL). This means you may use, diff --git a/t5/firewrkz/r32b/MakeRiscPkg,fd7 b/t5/firewrkz/r32b/MakeRiscPkg,fd7 index 1e8ac64..ce6eebe 100644 --- a/t5/firewrkz/r32b/MakeRiscPkg,fd7 +++ b/t5/firewrkz/r32b/MakeRiscPkg,fd7 @@ -9,7 +9,7 @@ IfThere $.Temp Then Else %CDir $.Temp -Set t5$Release 2_10_00 +Set t5$Release 2_10_02 Set t5$Disc $.Temp.Fireworkz_ Set t5$Zip $.Temp.Fireworkz_/zip diff --git a/t5/firewrkz/r32b/_copy_r32,fd7 b/t5/firewrkz/r32b/_copy_r32,fd7 index 9d8e2c8..82c3e24 100644 --- a/t5/firewrkz/r32b/_copy_r32,fd7 +++ b/t5/firewrkz/r32b/_copy_r32,fd7 @@ -12,39 +12,39 @@ Set where r32m | Set r32b_Build$Dir | -Copy .t5.Build..fl_123 .* rf~cn -Copy .t5.Build..fl_ascii .* rf~cn -Copy .t5.Build..fl_csv .* rf~cn -Copy .t5.Build..fl_fwp .* rf~cn -Copy .t5.Build..fl_pdss .* rf~cn -Copy .t5.Build..fl_pdtx .* rf~cn -Copy .t5.Build..fl_rtf .* rf~cn -Copy .t5.Build..fl_xls .* rf~cn -| -Copy .t5.Build..fs_123 .* rf~cn -Copy .t5.Build..fs_ascii .* rf~cn -Copy .t5.Build..fs_csv .* rf~cn -Copy .t5.Build..fs_rtf .* rf~cn -| -Copy .t5.Build..ob_cells .* rf~cn -Copy .t5.Build..ob_chart .* rf~cn -Copy .t5.Build..ob_chspt .* rf~cn -Copy .t5.Build..ob_dlg .* rf~cn -Copy .t5.Build..ob_draw .* rf~cn -Copy .t5.Build..ob_drwio .* rf~cn -Copy .t5.Build..ob_file .* rf~cn -Copy .t5.Build..ob_hefo .* rf~cn -Copy .t5.Build..ob_mails .* rf~cn -Copy .t5.Build..ob_mlec .* rf~cn -Copy .t5.Build..ob_note .* rf~cn -Copy .t5.Build..ob_recn .* rf~cn -Copy .t5.Build..ob_ruler .* rf~cn -Copy .t5.Build..ob_skel .* rf~cn -Copy .t5.Build..ob_skspt .* rf~cn -Copy .t5.Build..ob_spelb .* rf~cn -Copy .t5.Build..ob_spell .* rf~cn -Copy .t5.Build..ob_ss .* rf~cn -Copy .t5.Build..ob_ssspt .* rf~cn -Copy .t5.Build..ob_story .* rf~cn -Copy .t5.Build..ob_text .* rf~cn -Copy .t5.Build..ob_toolb .* rf~cn +Copy .t5.Build..fl_123 .* rf~cn +Copy .t5.Build..fl_ascii .* rf~cn +Copy .t5.Build..fl_csv .* rf~cn +Copy .t5.Build..fl_fwp .* rf~cn +Copy .t5.Build..fl_pdss .* rf~cn +Copy .t5.Build..fl_pdtx .* rf~cn +Copy .t5.Build..fl_rtf .* rf~cn +Copy .t5.Build..fl_xls .* rf~cn +| +Copy .t5.Build..fs_123 .* rf~cn +Copy .t5.Build..fs_ascii .* rf~cn +Copy .t5.Build..fs_csv .* rf~cn +Copy .t5.Build..fs_rtf .* rf~cn +| +Copy .t5.Build..ob_cells .* rf~cn +Copy .t5.Build..ob_chart .* rf~cn +Copy .t5.Build..ob_chspt .* rf~cn +Copy .t5.Build..ob_dlg .* rf~cn +Copy .t5.Build..ob_draw .* rf~cn +Copy .t5.Build..ob_drwio .* rf~cn +Copy .t5.Build..ob_file .* rf~cn +Copy .t5.Build..ob_hefo .* rf~cn +Copy .t5.Build..ob_mails .* rf~cn +Copy .t5.Build..ob_mlec .* rf~cn +Copy .t5.Build..ob_note .* rf~cn +Copy .t5.Build..ob_recn .* rf~cn +Copy .t5.Build..ob_ruler .* rf~cn +Copy .t5.Build..ob_skel .* rf~cn +Copy .t5.Build..ob_skspt .* rf~cn +Copy .t5.Build..ob_spelb .* rf~cn +Copy .t5.Build..ob_spell .* rf~cn +Copy .t5.Build..ob_ss .* rf~cn +Copy .t5.Build..ob_ssspt .* rf~cn +Copy .t5.Build..ob_story .* rf~cn +Copy .t5.Build..ob_text .* rf~cn +Copy .t5.Build..ob_toolb .* rf~cn diff --git a/t5/firewrkz/r32m/MakeNN/MakeCommon,feb b/t5/firewrkz/r32m/MakeNN/MakeCommon,feb index 8f51d91..8287a79 100644 --- a/t5/firewrkz/r32m/MakeNN/MakeCommon,feb +++ b/t5/firewrkz/r32m/MakeNN/MakeCommon,feb @@ -3,8 +3,8 @@ Set t5$Product firewrkz Set t5$Country uk -Set t5$Build$Dir .t5.Build.r32m..!Fireworkz -Set t5$Resource$Dir .t5.resource -Set ap$Resource$Dir .t5..resource.riscos. +Set t5$Build$Dir .t5.Build.r32m..!Fireworkz +Set t5$Resource$Dir .t5.resource +Set ap$Resource$Dir .t5..resource.riscos. %CDir .Z diff --git a/t5/firewrkz/r32m/MakeNN/MakeF1Core,feb b/t5/firewrkz/r32m/MakeNN/MakeF1Core,feb index 5f04cad..fcf0810 100644 --- a/t5/firewrkz/r32m/MakeNN/MakeF1Core,feb +++ b/t5/firewrkz/r32m/MakeNN/MakeF1Core,feb @@ -37,8 +37,8 @@ | These are the big dicts, later datestamps %CDir .Z.User.Dicts -%Copy .t5.ob_spell.resource.dicts.user .Z.User.Dicts.User f~cln~v -%Copy .t5.ob_spell.resource.dicts.userc .Z.User.Dicts.UserC f~cln~v +%Copy .t5.ob_spell.resource.dicts.user .Z.User.Dicts.User f~cln~v +%Copy .t5.ob_spell.resource.dicts.userc .Z.User.Dicts.UserC f~cln~v %Access .Z.User.Dicts.* wr/r %Access .Z.User.* wr/r @@ -46,4 +46,4 @@ | Top level, contains Fireworkz -%Copy .t5..r.RelNotes .* f~cln~v +%Copy .t5..r.RelNotes .* f~cln~v diff --git a/t5/firewrkz/r32m/MakeNN/MakeF2Core,feb b/t5/firewrkz/r32m/MakeNN/MakeF2Core,feb index bed0bb8..63c38c7 100644 --- a/t5/firewrkz/r32m/MakeNN/MakeF2Core,feb +++ b/t5/firewrkz/r32m/MakeNN/MakeF2Core,feb @@ -19,8 +19,8 @@ %Access .Z.Resource.Choices.* r/r %CDir .Z.Resource.Dicts -%Copy .t5.ob_spell.resource.dicts.master .Z.Resource.Dicts.Master f~cln~v -%Copy .t5.ob_spell.resource.dicts.masterc .Z.Resource.Dicts.MasterC f~cln~v +%Copy .t5.ob_spell.resource.dicts.master .Z.Resource.Dicts.Master f~cln~v +%Copy .t5.ob_spell.resource.dicts.masterc .Z.Resource.Dicts.MasterC f~cln~v %Access .Z.Resource.Dicts.* r/r %CDir .Z.Resource.Markers @@ -53,8 +53,8 @@ | not enough room on disc 2 for floppy users to have user dictionaries |%CDir .Z.User.Dicts -|%Copy .t5.ob_spell.resource.dicts.user .Z.User.Dicts.User f~cln~v -|%Copy .t5.ob_spell.resource.dicts.userc .Z.User.Dicts.UserC f~cln~v +|%Copy .t5.ob_spell.resource.dicts.user .Z.User.Dicts.User f~cln~v +|%Copy .t5.ob_spell.resource.dicts.userc .Z.User.Dicts.UserC f~cln~v |%Access .Z.User.Dicts.* wr/r | >>> if desperate for space start to lose these three diff --git a/t5/firewrkz/resource/riscos/uk/Choices/ChoicesDoc b/t5/firewrkz/resource/riscos/uk/Choices/ChoicesDoc index 898f554..398e274 100644 --- a/t5/firewrkz/resource/riscos/uk/Choices/ChoicesDoc +++ b/t5/firewrkz/resource/riscos/uk/Choices/ChoicesDoc @@ -1,5 +1,4 @@ -{Version:2.01;01 Jan 2016;Fireworkz (uk);Colton Software} -{BaseSingleCol:0} +{Version:2.10.02;07 Jul 2016;Fireworkz (uk);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:1} {Flow:10} {Block:0;0;;32;1;1;;32;1;1} diff --git a/t5/firewrkz/resource/windows/uk/config b/t5/firewrkz/resource/windows/uk/config index 883f2f6..e79d26d 100644 --- a/t5/firewrkz/resource/windows/uk/config +++ b/t5/firewrkz/resource/windows/uk/config @@ -1,4 +1,4 @@ -{Version:2.10;24 Jun 2016;Fireworkz for Windows (uk);Colton Software;Windows-1252} +{Version:2.10.02;07 Jul 2016;Fireworkz for Windows (uk);Colton Software;Windows-1252} {RowTable:1} {#:ObjectBindConstruct:object-id;command-suffix-character} {ObjectBindConstruct:0;*} @@ -211,6 +211,7 @@ {DefineKey:^U;DeleteLine} {DefineKey:^W;SelectWord} {DefineKey:^Z;Clear} +{DefineKey:^!D;InsertFieldIntroDate} {DefineKey:^!V;Button:VIEW} {DefineKey:^!X;Button:BOX} {DefineKey:^!Z;Button:CHART} diff --git a/t5/firewrkz/resource/windows/uk/res00.rci b/t5/firewrkz/resource/windows/uk/res00.rci index 79577b0..8c94b07 100644 --- a/t5/firewrkz/resource/windows/uk/res00.rci +++ b/t5/firewrkz/resource/windows/uk/res00.rci @@ -25,14 +25,12 @@ BEGIN // NB Use Title Caps on Windows for: // Title Bar / Action Buttons // -// when changing version number for release, remember other files: -// definitive list of files is in common.mf_mid +// When changing version number for release, remember other files +// The definitive list of files is in common.mf_mid //1:2.xx.yy //1:2.xx - 0x1, "2.10" - 0x2, "(24 Jun 2016)" -// -// update date and version in the corresponding RelNotes HTML files too + 0x1, "2.10.02" + 0x2, "(07 Jul 2016)" // 0x409, "© 1992-2016 Colton Software" // r1034:Portions © 1994-2016 R-Comp diff --git a/t5/firewrkz/windows/Disc1-x64.src/LICENCE.TXT b/t5/firewrkz/windows/Disc1-x64.src/LICENCE.TXT index 2c31a69..36bb037 100644 --- a/t5/firewrkz/windows/Disc1-x64.src/LICENCE.TXT +++ b/t5/firewrkz/windows/Disc1-x64.src/LICENCE.TXT @@ -1,4 +1,4 @@ -Fireworkz is free and open source software. +Fireworkz is free to use and open source software. Fireworkz is made available to you under the terms of the Mozilla Public License 2.0 (MPL). This means you may use, copy and distribute Fireworkz to others. You are also welcome to modify the source code of Fireworkz as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions. diff --git a/t5/firewrkz/windows/Disc1-x64.src/System/UK/Choices/ChoicesDoc.txt b/t5/firewrkz/windows/Disc1-x64.src/System/UK/Choices/ChoicesDoc.txt index 601d41d..8fa6be8 100644 --- a/t5/firewrkz/windows/Disc1-x64.src/System/UK/Choices/ChoicesDoc.txt +++ b/t5/firewrkz/windows/Disc1-x64.src/System/UK/Choices/ChoicesDoc.txt @@ -1,5 +1,4 @@ -{Version:2.01;01 Jan 2016;Fireworkz for Windows (uk);Colton Software} -{BaseSingleCol:0} +{Version:2.10.02;07 Jul 2016;Fireworkz for Windows (uk);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:1} {Flow:10} {Block:0;0;;32;1;1;;32;1;1} diff --git a/t5/firewrkz/windows/Disc1-x86.src/LICENCE.TXT b/t5/firewrkz/windows/Disc1-x86.src/LICENCE.TXT index 2c31a69..36bb037 100644 --- a/t5/firewrkz/windows/Disc1-x86.src/LICENCE.TXT +++ b/t5/firewrkz/windows/Disc1-x86.src/LICENCE.TXT @@ -1,4 +1,4 @@ -Fireworkz is free and open source software. +Fireworkz is free to use and open source software. Fireworkz is made available to you under the terms of the Mozilla Public License 2.0 (MPL). This means you may use, copy and distribute Fireworkz to others. You are also welcome to modify the source code of Fireworkz as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions. diff --git a/t5/firewrkz/windows/Disc1-x86.src/System/UK/Choices/ChoicesDoc.txt b/t5/firewrkz/windows/Disc1-x86.src/System/UK/Choices/ChoicesDoc.txt index 601d41d..8fa6be8 100644 --- a/t5/firewrkz/windows/Disc1-x86.src/System/UK/Choices/ChoicesDoc.txt +++ b/t5/firewrkz/windows/Disc1-x86.src/System/UK/Choices/ChoicesDoc.txt @@ -1,5 +1,4 @@ -{Version:2.01;01 Jan 2016;Fireworkz for Windows (uk);Colton Software} -{BaseSingleCol:0} +{Version:2.10.02;07 Jul 2016;Fireworkz for Windows (uk);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:1} {Flow:10} {Block:0;0;;32;1;1;;32;1;1} diff --git a/t5/fl_123/fl_123.c b/t5/fl_123/fl_123.c index af4499e..f75c811 100644 --- a/t5/fl_123/fl_123.c +++ b/t5/fl_123/fl_123.c @@ -2351,7 +2351,7 @@ T5_MSG_PROTO(static, lotus123_msg_insert_foreign, _InoutRef_ P_MSG_INSERT_FOREIG BOOL data_allocated = 0; BOOL insert_as_table = FALSE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* If it's a Letter-derived document, insert as table */ if(p_docu->flags.base_single_col) @@ -2425,8 +2425,8 @@ T5_MSG_PROTO(static, lotus123_msg_insert_foreign, _InoutRef_ P_MSG_INSERT_FOREIG T5_MSG_PROTO(static, lotus123_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_ascii/fl_ascii.c b/t5/fl_ascii/fl_ascii.c index cd51307..eff0935 100644 --- a/t5/fl_ascii/fl_ascii.c +++ b/t5/fl_ascii/fl_ascii.c @@ -383,8 +383,8 @@ T5_MSG_PROTO(static, ascii_msg_insert_foreign, _InoutRef_ P_MSG_INSERT_FOREIGN p T5_MSG_PROTO(static, ascii_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_csv/fl_csv.c b/t5/fl_csv/fl_csv.c index 87ada3e..dbde4b6 100644 --- a/t5/fl_csv/fl_csv.c +++ b/t5/fl_csv/fl_csv.c @@ -1008,7 +1008,7 @@ dialog_csv_load_query_ctl_pushbutton( PROC_DIALOG_EVENT_PROTO(static, dialog_event_csv_load_query) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1061,7 +1061,7 @@ T5_MSG_PROTO(static, csv_msg_insert_foreign, _InoutRef_ P_MSG_INSERT_FOREIGN p_m { STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(FILETYPE_TEXT == p_msg_insert_foreign->t5_filetype) g_field_sep_ch = (CH_NULL != global_preferences.ascii_load_delimiter) ? (U8) global_preferences.ascii_load_delimiter : CH_TAB; @@ -1122,8 +1122,8 @@ csv_msg_csv_read_record_core( T5_MSG_PROTO(static, csv_msg_csv_read_record, _InoutRef_ P_CSV_READ_RECORD p_csv_read_record) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(csv_msg_csv_read_record_core(p_csv_read_record)); } @@ -1136,8 +1136,8 @@ T5_MSG_PROTO(static, csv_msg_csv_read_record, _InoutRef_ P_CSV_READ_RECORD p_csv T5_MSG_PROTO(static, csv_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_fwp/fl_fwp.c b/t5/fl_fwp/fl_fwp.c index 1fb7b51..36d9eb9 100644 --- a/t5/fl_fwp/fl_fwp.c +++ b/t5/fl_fwp/fl_fwp.c @@ -67,7 +67,7 @@ T5_MSG_PROTO(static, fwp_msg_insert_foreign, _InoutRef_ P_MSG_INSERT_FOREIGN p_m STATUS status = STATUS_OK; ARRAY_HANDLE h_data = 0; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = file_memory_load(p_docu, &h_data, p_msg_insert_foreign->filename, NULL, 1))) { @@ -516,8 +516,8 @@ fwp_regions_make( T5_MSG_PROTO(static, fwp_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_pdss/fl_pdss.c b/t5/fl_pdss/fl_pdss.c index b1d8c1a..58ad4c9 100644 --- a/t5/fl_pdss/fl_pdss.c +++ b/t5/fl_pdss/fl_pdss.c @@ -827,7 +827,7 @@ pdss_regions_make( const ARRAY_INDEX n_elements = array_elements(p_h_pd_format); STATUS status = STATUS_OK; - IGNOREPARM(p_data_type); + UNREFERENCED_PARAMETER(p_data_type); if(0 != n_elements) { @@ -1288,7 +1288,7 @@ PROC_PDSS_CONSTRUCT_PROTO(proc_pdss_hilite) S32 hilite = fast_strtol(p_construct + 2, NULL); U8 format_ch; - IGNOREPARM(ok_flag); + UNREFERENCED_PARAMETER(ok_flag); switch(hilite) { @@ -1312,7 +1312,7 @@ PROC_PDSS_CONSTRUCT_PROTO(proc_pdss_left) PROC_PDSS_CONSTRUCT_PROTO(proc_pdss_percent) { - IGNOREPARM(ok_flag); + UNREFERENCED_PARAMETER(ok_flag); pdss_blat_with_format_ch(p_construct, len, CH_PERCENT_SIGN); return(0); @@ -1338,8 +1338,8 @@ PROC_PDSS_CONSTRUCT_PROTO(proc_pdss_ss) T5_MSG_PROTO(static, pdss_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_pdtx/fl_pdtx.c b/t5/fl_pdtx/fl_pdtx.c index 117dab1..fa16edd 100644 --- a/t5/fl_pdtx/fl_pdtx.c +++ b/t5/fl_pdtx/fl_pdtx.c @@ -1250,7 +1250,7 @@ PROC_PDTX_CONSTRUCT_PROTO(proc_pdtx_hilite) S32 hilite = fast_strtol(p_construct + 2, NULL); U8 format_ch; - IGNOREPARM(p_u8_start); + UNREFERENCED_PARAMETER(p_u8_start); switch(hilite) { @@ -1272,7 +1272,7 @@ PROC_PDTX_CONSTRUCT_PROTO(proc_pdtx_left) PROC_PDTX_CONSTRUCT_PROTO(proc_pdtx_percent) { - IGNOREPARM(p_u8_start); + UNREFERENCED_PARAMETER(p_u8_start); pdtx_blat_with_format_ch(p_construct, len, CH_PERCENT_SIGN); } @@ -1290,8 +1290,8 @@ PROC_PDTX_CONSTRUCT_PROTO(proc_pdtx_right) T5_MSG_PROTO(static, pdtx_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_rtf/fl_rtf.c b/t5/fl_rtf/fl_rtf.c index 1a6d59a..3352e00 100644 --- a/t5/fl_rtf/fl_rtf.c +++ b/t5/fl_rtf/fl_rtf.c @@ -176,12 +176,12 @@ _proc_name( \ _InVal_ UCS4 arg) #define func_ignore_parms() \ - IGNOREPARM_InoutRef_(p_rtf_load_info); \ - IGNOREPARM(a7str_control_word); \ - IGNOREPARM(a7str_parameter); \ - IGNOREPARM_InoutRef_(p_h_dest_contents); \ - IGNOREPARM(p_h_sub_regions); \ - IGNOREPARM_InVal_(arg) + UNREFERENCED_PARAMETER_InoutRef_(p_rtf_load_info); \ + UNREFERENCED_PARAMETER(a7str_control_word); \ + UNREFERENCED_PARAMETER(a7str_parameter); \ + UNREFERENCED_PARAMETER_InoutRef_(p_h_dest_contents); \ + UNREFERENCED_PARAMETER(p_h_sub_regions); \ + UNREFERENCED_PARAMETER_InVal_(arg) _Check_return_ static STATUS @@ -1924,7 +1924,7 @@ rtf_load_process_control_word( RTF_CONTROL_WORD_TABLE_SEARCH rtf_control_word_table_search; #if !TRACE_ALLOWED - IGNOREPARM(container_control_word); + UNREFERENCED_PARAMETER(container_control_word); #endif rtf_control_word_table_search.a7str_control_word = a7str_control_word; @@ -4261,7 +4261,7 @@ T5_MSG_PROTO(static, rtf_msg_insert_foreign, _InRef_ P_MSG_INSERT_FOREIGN p_msg_ DOCU_AREA docu_area_to_insert; POSITION position_actual; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); docu_area_init(&docu_area_to_insert); @@ -4390,8 +4390,8 @@ T5_MSG_PROTO(static, rtf_msg_insert_foreign, _InRef_ P_MSG_INSERT_FOREIGN p_msg_ T5_MSG_PROTO(static, rtf_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fl_xls/ff_xls.h b/t5/fl_xls/ff_xls.h index c88c952..932bcc6 100644 --- a/t5/fl_xls/ff_xls.h +++ b/t5/fl_xls/ff_xls.h @@ -15,41 +15,361 @@ extern "C" { #endif -#if RISCOS -/* #defines needed for xlcall.h to compile on RISC OS */ -#define FAR /*nothing*/ -#define _cdecl /*nothing*/ -#define pascal /*nothing*/ -#define LPSTR PC_U8Z -#endif - -/* -If you get an error here, you must download the -Microsoft Excel 97 SDK files and expand into the -directory external/Microsoft/Excel97SDK -*/ - -#if defined(__cplusplus) && !defined(bool_defined) -#define bool fBool -#define bool_defined 1 -#endif - -/* NB Do not redistribute xlcall.h header file with Fireworkz source! */ -#include "external/Microsoft/Excel97SDK/INCLUDE/xlcall.h" -/* NB If this #include fails, try - * Build\w32\setup.cmd (Windows) - * or - * Build\setup-ro.sh (on Linux, for RISC OS) - */ - -#ifndef xlfIf -#define xlfIf 1 -#endif - -#if defined(bool_defined) -#undef bool -#undef bool_defined -#endif +typedef enum _BIFF_function_number +{ + BIFF_FN_Count = 0, + BIFF_FN_If = 1, + BIFF_FN_Isna = 2, + BIFF_FN_Iserror = 3, + BIFF_FN_Sum = 4, + BIFF_FN_Average = 5, + BIFF_FN_Min = 6, + BIFF_FN_Max = 7, + BIFF_FN_Row = 8, + BIFF_FN_Column = 9, + BIFF_FN_Na = 10, + BIFF_FN_Npv = 11, + BIFF_FN_Stdev = 12, + BIFF_FN_Dollar = 13, + BIFF_FN_Fixed = 14, + BIFF_FN_Sin = 15, + BIFF_FN_Cos = 16, + BIFF_FN_Tan = 17, + BIFF_FN_Atan = 18, + BIFF_FN_Pi = 19, + BIFF_FN_Sqrt = 20, + BIFF_FN_Exp = 21, + BIFF_FN_Ln = 22, + BIFF_FN_Log10 = 23, + BIFF_FN_Abs = 24, + BIFF_FN_Int = 25, + BIFF_FN_Sign = 26, + BIFF_FN_Round = 27, + BIFF_FN_Lookup = 28, + BIFF_FN_Index = 29, + BIFF_FN_Rept = 30, + BIFF_FN_Mid = 31, + BIFF_FN_Len = 32, + BIFF_FN_Value = 33, + BIFF_FN_True = 34, + BIFF_FN_False = 35, + BIFF_FN_And = 36, + BIFF_FN_Or = 37, + BIFF_FN_Not = 38, + BIFF_FN_Mod = 39, + BIFF_FN_Dcount = 40, + BIFF_FN_Dsum = 41, + BIFF_FN_Daverage = 42, + BIFF_FN_Dmin = 43, + BIFF_FN_Dmax = 44, + BIFF_FN_Dstdev = 45, + BIFF_FN_Var = 46, + BIFF_FN_Dvar = 47, + BIFF_FN_Text = 48, + BIFF_FN_Linest = 49, + BIFF_FN_Trend = 50, + BIFF_FN_Logest = 51, + BIFF_FN_Growth = 52, + BIFF_FN_Goto = 53, + BIFF_FN_Halt = 54, + BIFF_FN_Pv = 56, + BIFF_FN_Fv = 57, + BIFF_FN_Nper = 58, + BIFF_FN_Pmt = 59, + BIFF_FN_Rate = 60, + BIFF_FN_Mirr = 61, + BIFF_FN_Irr = 62, + BIFF_FN_Rand = 63, + BIFF_FN_Match = 64, + BIFF_FN_Date = 65, + BIFF_FN_Time = 66, + BIFF_FN_Day = 67, + BIFF_FN_Month = 68, + BIFF_FN_Year = 69, + BIFF_FN_Weekday = 70, + BIFF_FN_Hour = 71, + BIFF_FN_Minute = 72, + BIFF_FN_Second = 73, + BIFF_FN_Now = 74, + BIFF_FN_Areas = 75, + BIFF_FN_Rows = 76, + BIFF_FN_Columns = 77, + BIFF_FN_Offset = 78, + BIFF_FN_Absref = 79, + BIFF_FN_Relref = 80, + BIFF_FN_Argument = 81, + BIFF_FN_Search = 82, + BIFF_FN_Transpose = 83, + BIFF_FN_Error = 84, + BIFF_FN_Step = 85, + BIFF_FN_Type = 86, + BIFF_FN_Echo = 87, + BIFF_FN_SetName = 88, + BIFF_FN_Caller = 89, + BIFF_FN_Deref = 90, + BIFF_FN_Windows = 91, + BIFF_FN_Series = 92, + BIFF_FN_Documents = 93, + BIFF_FN_ActiveCell = 94, + BIFF_FN_Selection = 95, + BIFF_FN_Result = 96, + BIFF_FN_Atan2 = 97, + BIFF_FN_Asin = 98, + BIFF_FN_Acos = 99, + BIFF_FN_Choose = 100, + BIFF_FN_Hlookup = 101, + BIFF_FN_Vlookup = 102, + BIFF_FN_Links = 103, + BIFF_FN_Input = 104, + BIFF_FN_Isref = 105, + BIFF_FN_GetFormula = 106, + BIFF_FN_GetName = 107, + BIFF_FN_SetValue = 108, + BIFF_FN_Log = 109, + BIFF_FN_Exec = 110, + BIFF_FN_Char = 111, + BIFF_FN_Lower = 112, + BIFF_FN_Upper = 113, + BIFF_FN_Proper = 114, + BIFF_FN_Left = 115, + BIFF_FN_Right = 116, + BIFF_FN_Exact = 117, + BIFF_FN_Trim = 118, + BIFF_FN_Replace = 119, + BIFF_FN_Substitute = 120, + BIFF_FN_Code = 121, + BIFF_FN_Names = 122, + BIFF_FN_Directory = 123, + BIFF_FN_Find = 124, + BIFF_FN_Cell = 125, + BIFF_FN_Iserr = 126, + BIFF_FN_Istext = 127, + BIFF_FN_Isnumber = 128, + BIFF_FN_Isblank = 129, + BIFF_FN_T = 130, + BIFF_FN_N = 131, + BIFF_FN_Fopen = 132, + BIFF_FN_Fclose = 133, + BIFF_FN_Fsize = 134, + BIFF_FN_Freadln = 135, + BIFF_FN_Fread = 136, + BIFF_FN_Fwriteln = 137, + BIFF_FN_Fwrite = 138, + BIFF_FN_Fpos = 139, + BIFF_FN_Datevalue = 140, + BIFF_FN_Timevalue = 141, + BIFF_FN_Sln = 142, + BIFF_FN_Syd = 143, + BIFF_FN_Ddb = 144, + BIFF_FN_GetDef = 145, + BIFF_FN_Reftext = 146, + BIFF_FN_Textref = 147, + BIFF_FN_Indirect = 148, + BIFF_FN_Register = 149, + BIFF_FN_Call = 150, + BIFF_FN_AddBar = 151, + BIFF_FN_AddMenu = 152, + BIFF_FN_AddCommand = 153, + BIFF_FN_EnableCommand = 154, + BIFF_FN_CheckCommand = 155, + BIFF_FN_RenameCommand = 156, + BIFF_FN_ShowBar = 157, + BIFF_FN_DeleteMenu = 158, + BIFF_FN_DeleteCommand = 159, + BIFF_FN_GetChartItem = 160, + BIFF_FN_DialogBox = 161, + BIFF_FN_Clean = 162, + BIFF_FN_Mdeterm = 163, + BIFF_FN_Minverse = 164, + BIFF_FN_Mmult = 165, + BIFF_FN_Files = 166, + BIFF_FN_Ipmt = 167, + BIFF_FN_Ppmt = 168, + BIFF_FN_Counta = 169, + BIFF_FN_CancelKey = 170, + BIFF_FN_Initiate = 175, + BIFF_FN_Request = 176, + BIFF_FN_Poke = 177, + BIFF_FN_Execute = 178, + BIFF_FN_Terminate = 179, + BIFF_FN_Restart = 180, + BIFF_FN_Help = 181, + BIFF_FN_GetBar = 182, + BIFF_FN_Product = 183, + BIFF_FN_Fact = 184, + BIFF_FN_GetCell = 185, + BIFF_FN_GetWorkspace = 186, + BIFF_FN_GetWindow = 187, + BIFF_FN_GetDocument = 188, + BIFF_FN_Dproduct = 189, + BIFF_FN_Isnontext = 190, + BIFF_FN_GetNote = 191, + BIFF_FN_Note = 192, + BIFF_FN_Stdevp = 193, + BIFF_FN_Varp = 194, + BIFF_FN_Dstdevp = 195, + BIFF_FN_Dvarp = 196, + BIFF_FN_Trunc = 197, + BIFF_FN_Islogical = 198, + BIFF_FN_Dcounta = 199, + BIFF_FN_DeleteBar = 200, + BIFF_FN_Unregister = 201, + BIFF_FN_Usdollar = 204, + BIFF_FN_Findb = 205, + BIFF_FN_Searchb = 206, + BIFF_FN_Replaceb = 207, + BIFF_FN_Leftb = 208, + BIFF_FN_Rightb = 209, + BIFF_FN_Midb = 210, + BIFF_FN_Lenb = 211, + BIFF_FN_Roundup = 212, + BIFF_FN_Rounddown = 213, + BIFF_FN_Asc = 214, + BIFF_FN_Dbcs = 215, + BIFF_FN_Rank = 216, + BIFF_FN_Address = 219, + BIFF_FN_Days360 = 220, + BIFF_FN_Today = 221, + BIFF_FN_Vdb = 222, + BIFF_FN_Median = 227, + BIFF_FN_Sumproduct = 228, + BIFF_FN_Sinh = 229, + BIFF_FN_Cosh = 230, + BIFF_FN_Tanh = 231, + BIFF_FN_Asinh = 232, + BIFF_FN_Acosh = 233, + BIFF_FN_Atanh = 234, + BIFF_FN_Dget = 235, + BIFF_FN_CreateObject = 236, + BIFF_FN_Volatile = 237, + BIFF_FN_LastError = 238, + BIFF_FN_CustomUndo = 239, + BIFF_FN_CustomRepeat = 240, + BIFF_FN_FormulaConvert = 241, + BIFF_FN_GetLinkInfo = 242, + BIFF_FN_TextBox = 243, + BIFF_FN_Info = 244, + BIFF_FN_Group = 245, + BIFF_FN_GetObject = 246, + BIFF_FN_Db = 247, + BIFF_FN_Pause = 248, + BIFF_FN_Resume = 251, + BIFF_FN_Frequency = 252, + BIFF_FN_AddToolbar = 253, + BIFF_FN_DeleteToolbar = 254, + BIFF_FN_ResetToolbar = 256, + BIFF_FN_Evaluate = 257, + BIFF_FN_GetToolbar = 258, + BIFF_FN_GetTool = 259, + BIFF_FN_SpellingCheck = 260, + BIFF_FN_ErrorType = 261, + BIFF_FN_AppTitle = 262, + BIFF_FN_WindowTitle = 263, + BIFF_FN_SaveToolbar = 264, + BIFF_FN_EnableTool = 265, + BIFF_FN_PressTool = 266, + BIFF_FN_RegisterId = 267, + BIFF_FN_GetWorkbook = 268, + BIFF_FN_Avedev = 269, + BIFF_FN_Betadist = 270, + BIFF_FN_Gammaln = 271, + BIFF_FN_Betainv = 272, + BIFF_FN_Binomdist = 273, + BIFF_FN_Chidist = 274, + BIFF_FN_Chiinv = 275, + BIFF_FN_Combin = 276, + BIFF_FN_Confidence = 277, + BIFF_FN_Critbinom = 278, + BIFF_FN_Even = 279, + BIFF_FN_Expondist = 280, + BIFF_FN_Fdist = 281, + BIFF_FN_Finv = 282, + BIFF_FN_Fisher = 283, + BIFF_FN_Fisherinv = 284, + BIFF_FN_Floor = 285, + BIFF_FN_Gammadist = 286, + BIFF_FN_Gammainv = 287, + BIFF_FN_Ceiling = 288, + BIFF_FN_Hypgeomdist = 289, + BIFF_FN_Lognormdist = 290, + BIFF_FN_Loginv = 291, + BIFF_FN_Negbinomdist = 292, + BIFF_FN_Normdist = 293, + BIFF_FN_Normsdist = 294, + BIFF_FN_Norminv = 295, + BIFF_FN_Normsinv = 296, + BIFF_FN_Standardize = 297, + BIFF_FN_Odd = 298, + BIFF_FN_Permut = 299, + BIFF_FN_Poisson = 300, + BIFF_FN_Tdist = 301, + BIFF_FN_Weibull = 302, + BIFF_FN_Sumxmy2 = 303, + BIFF_FN_Sumx2my2 = 304, + BIFF_FN_Sumx2py2 = 305, + BIFF_FN_Chitest = 306, + BIFF_FN_Correl = 307, + BIFF_FN_Covar = 308, + BIFF_FN_Forecast = 309, + BIFF_FN_Ftest = 310, + BIFF_FN_Intercept = 311, + BIFF_FN_Pearson = 312, + BIFF_FN_Rsq = 313, + BIFF_FN_Steyx = 314, + BIFF_FN_Slope = 315, + BIFF_FN_Ttest = 316, + BIFF_FN_Prob = 317, + BIFF_FN_Devsq = 318, + BIFF_FN_Geomean = 319, + BIFF_FN_Harmean = 320, + BIFF_FN_Sumsq = 321, + BIFF_FN_Kurt = 322, + BIFF_FN_Skew = 323, + BIFF_FN_Ztest = 324, + BIFF_FN_Large = 325, + BIFF_FN_Small = 326, + BIFF_FN_Quartile = 327, + BIFF_FN_Percentile = 328, + BIFF_FN_Percentrank = 329, + BIFF_FN_Mode = 330, + BIFF_FN_Trimmean = 331, + BIFF_FN_Tinv = 332, + BIFF_FN_MovieCommand = 334, + BIFF_FN_GetMovie = 335, + BIFF_FN_Concatenate = 336, + BIFF_FN_Power = 337, + BIFF_FN_PivotAddData = 338, + BIFF_FN_GetPivotTable = 339, + BIFF_FN_GetPivotField = 340, + BIFF_FN_GetPivotItem = 341, + BIFF_FN_Radians = 342, + BIFF_FN_Degrees = 343, + BIFF_FN_Subtotal = 344, + BIFF_FN_Sumif = 345, + BIFF_FN_Countif = 346, + BIFF_FN_Countblank = 347, + BIFF_FN_ScenarioGet = 348, + BIFF_FN_OptionsListsGet = 349, + BIFF_FN_Ispmt = 350, + BIFF_FN_Datedif = 351, + BIFF_FN_Datestring = 352, + BIFF_FN_Numberstring = 353, + BIFF_FN_Roman = 354, + BIFF_FN_OpenDialog = 355, + BIFF_FN_SaveDialog = 356, + BIFF_FN_ViewGet = 357, + BIFF_FN_GetPivotData = 358, + BIFF_FN_Hyperlink = 359, + BIFF_FN_Phonetic = 360, + BIFF_FN_AverageA = 361, + BIFF_FN_MaxA = 362, + BIFF_FN_MinA = 363, + BIFF_FN_StDevPA = 364, + BIFF_FN_VarPA = 365, + BIFF_FN_StDevA = 366, + BIFF_FN_VarA = 367 +} +BIFF_function_number; /* Excel record types (see http://sc.openoffice.org/excelfileformat.pdf) diff --git a/t5/fl_xls/fl_xls.c b/t5/fl_xls/fl_xls.c index ae9ad0a..b3e8360 100644 --- a/t5/fl_xls/fl_xls.c +++ b/t5/fl_xls/fl_xls.c @@ -97,8 +97,8 @@ xls_error_set( T5_MSG_PROTO(static, xls_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -125,8 +125,8 @@ T5_MSG_PROTO(static, xls_msg_error_rq, _InoutRef_ P_MSG_ERROR_RQ p_msg_error_rq) return(STATUS_FAIL); } - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); tstr_xstrkpy(p_msg_error_rq->tstr_buf, p_msg_error_rq->elemof_buffer, p_error); return(STATUS_OK); diff --git a/t5/fl_xls/fl_xls_loadb.c b/t5/fl_xls/fl_xls_loadb.c index 8a7fe85..ae7ea27 100644 --- a/t5/fl_xls/fl_xls_loadb.c +++ b/t5/fl_xls/fl_xls_loadb.c @@ -330,400 +330,400 @@ token_table[128] = /* MUST be in Excel token order, complete */ typedef struct XLS_FUNC_ENTRY { - PC_A7STR p_text_t5; /* Fireworkz' function name */ + PC_A7STR p_text_t5; /* Fireworkz' function name */ - U16 xls_func_number; /* Excel's function number (see xlcall.h) */ + U16 biff_function_number; /* Excel BIFF function number */ - U8 n_args; /* Required for tFuncV but leave zero for tFuncVarV */ + U8 n_args; /* Required for tFuncV but leave zero for tFuncVarV */ U8 _padding[1]; } XLS_FUNC_ENTRY; typedef const XLS_FUNC_ENTRY * PC_XLS_FUNC_ENTRY; -#define xls_func_entry(number, n_args, p_text_xls) \ - { p_text_xls, number, n_args, 0 } +#define xls_func_entry(biff_function_number, n_args, p_text_xls) \ + { p_text_xls, biff_function_number, n_args, 0 } -#define xlfExternCall 255 /* needs special handling */ +#define BIFF_FN_ExternCall 255 /* needs special handling */ static const XLS_FUNC_ENTRY BIFF2_functions[] = /* ordered as Excel for completeness checking */ { - xls_func_entry(xlfCount, /*Var*/ 0, "COUNT"), - xls_func_entry(xlfIf, /*Var*/ 0, "IF"), - xls_func_entry(xlfIsna, 1, "ISNA"), - xls_func_entry(xlfIserror, 1, "ISERROR"), - xls_func_entry(xlfSum, /*Var*/ 0, "SUM"), - xls_func_entry(xlfAverage, /*Var*/ 0, "AVG"), /* XLS:AVERAGE */ - xls_func_entry(xlfMin, /*Var*/ 0, "MIN"), - xls_func_entry(xlfMax, /*Var*/ 0, "MAX"), - xls_func_entry(xlfRow, /*Var*/ 0, "ROW"), - xls_func_entry(xlfColumn, /*Var*/ 0, "COL"), /* XLS:COLUMN */ - xls_func_entry(xlfNa, 0, "NA"), - xls_func_entry(xlfNpv, /*Var*/ 0, "NPV"), - xls_func_entry(xlfStdev, /*Var*/ 0, "STD"), /* XLS:STDEV */ - xls_func_entry(xlfDollar, /*Var*/ 0, "DOLLAR"), - xls_func_entry(xlfFixed, 2, "FIXED"), /* BIFF2 - becomes Var(2,3) in BIFF4 */ - xls_func_entry(xlfSin, 1, "SIN"), - xls_func_entry(xlfCos, 1, "COS"), - xls_func_entry(xlfTan, 1, "TAN"), - xls_func_entry(xlfAtan, 1, "ATAN"), - xls_func_entry(xlfPi, 0, "PI"), - xls_func_entry(xlfSqrt, 1, "SQR"), /* XLS:SQRT */ - xls_func_entry(xlfExp, 1, "EXP"), - xls_func_entry(xlfLn, 1, "LN"), - xls_func_entry(xlfLog10, 1, "ODF.LOG10"), /* XLS:LOG10 */ - xls_func_entry(xlfAbs, 1, "ABS"), - xls_func_entry(xlfInt, 1, "ODF.INT"), /*XLS:INT*/ - xls_func_entry(xlfSign, 1, "SGN"), /* XLS:SIGN */ - xls_func_entry(xlfRound, 2, "ROUND"), - xls_func_entry(xlfLookup, /*Var*/ 0, "LOOKUP"), - xls_func_entry(xlfIndex, /*Var*/ 0, "ODF.INDEX"), /* XLS:INDEX */ - xls_func_entry(xlfRept, 2, "REPT"), - xls_func_entry(xlfMid, 3, "MID"), - xls_func_entry(xlfLen, 1, "LENGTH"), /* XLS:LEN */ - xls_func_entry(xlfValue, 1, "VALUE"), - xls_func_entry(xlfTrue, 0, "TRUE"), - xls_func_entry(xlfFalse, 0, "FALSE"), - xls_func_entry(xlfAnd, /*Var*/ 0, "AND"), - xls_func_entry(xlfOr, /*Var*/ 0, "OR"), - xls_func_entry(xlfNot, 1, "NOT"), - xls_func_entry(xlfMod, 2, "MOD"), - xls_func_entry(xlfDcount, 3, ".DCOUNT.XLS"), /* XLS:DCOUNT */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDsum, 3, ".DSUM.XLS"), /* XLS:DSUM */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDaverage, 3, ".DAVG.XLS"), /* XLS:DAVERAGE */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDmin, 3, ".DMIN.XLS"), /* XLS:DMIN */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDmax, 3, ".DMAX.XLS"), /* XLS:DMAX */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDstdev, 3, ".DSTD.XLS"), /* XLS:DSTD */ /* Fireworkz is incompatible */ - xls_func_entry(xlfVar, /*Var*/ 0, "VAR"), - xls_func_entry(xlfDvar, 3, ".DVAR.XLS"), /* XLS:DVAR */ /* Fireworkz is incompatible */ - xls_func_entry(xlfText, 2, "TEXT"), - xls_func_entry(xlfLinest, /*Var*/ 0, "LINEST"), - xls_func_entry(xlfTrend, /*Var*/ 0, "TREND"), - xls_func_entry(xlfLogest, /*Var*/ 0, "LOGEST"), - xls_func_entry(xlfGrowth, /*Var*/ 0, "GROWTH"), - /*xls_func_entry(xlfGoto, 0, ".Goto"),*/ - /*xls_func_entry(xlfHalt, 0, ".Halt"),*/ - xls_func_entry(xlfPv, /*Var*/ 0, "PV"), - xls_func_entry(xlfFv, /*Var*/ 0, "ODF.FV"), /* XLS:FV */ - xls_func_entry(xlfNper, /*Var*/ 0, "NPER"), - xls_func_entry(xlfPmt, /*Var*/ 0, "ODF.PMT"), /* XLS:PMT */ - xls_func_entry(xlfRate, /*Var*/ 0, "RATE"), - xls_func_entry(xlfMirr, 3, "MIRR"), - xls_func_entry(xlfIrr, /*Var*/ 0, "ODF.IRR"), /* XLS:IRR */ - xls_func_entry(xlfRand, 0, "RAND"), - xls_func_entry(xlfMatch, /*Var*/ 0, "MATCH"), - xls_func_entry(xlfDate, 3, "DATE"), - xls_func_entry(xlfTime, 3, "TIME"), - xls_func_entry(xlfDay, 1, "DAY"), - xls_func_entry(xlfMonth, 1, "MONTH"), - xls_func_entry(xlfYear, 1, "YEAR"), - xls_func_entry(xlfWeekday, 1, "WEEKDAY"), /* BIFF2 - becomes Var(1,2) in BIFF5 */ - xls_func_entry(xlfHour, 1, "HOUR"), - xls_func_entry(xlfMinute, 1, "MINUTE"), - xls_func_entry(xlfSecond, 1, "SECOND"), - xls_func_entry(xlfNow, 0, "NOW"), - xls_func_entry(xlfAreas, 1, ".AREAS"), - xls_func_entry(xlfRows, 1, "ROWS"), - xls_func_entry(xlfColumns, 1, "COLS"), /* XLS:COLUMNS */ - xls_func_entry(xlfOffset, /*Var*/ 0, ".OFFSET"), - /*xls_func_entry(xlfAbsref, 0, ".Absref"),*/ - /*xls_func_entry(xlfRelref, 0, ".Relref"),*/ - /*xls_func_entry(xlfArgument, 0, ".Argument"),*/ - xls_func_entry(xlfSearch, /*Var*/ 0, "SEARCH"), - xls_func_entry(xlfTranspose, 1, "TRANSPOSE"), - /*xls_func_entry(xlfError, 0, ".Error"),*/ - /*xls_func_entry(xlfStep, 0, ".Step"),*/ - xls_func_entry(xlfType, 1, "ODF.TYPE"), /* XLS:TYPE */ - /*xls_func_entry(xlfEcho, 0, ".Echo"),*/ - /*xls_func_entry(xlfSetName, 0, ".Set.Name"),*/ - /*xls_func_entry(xlfCaller, 0, ".Caller"),*/ - /*xls_func_entry(xlfDeref, 0, ".Deref"),*/ - /*xls_func_entry(xlfWindows, 0, ".Windows"),*/ - /*xls_func_entry(xlfSeries, 0, ".Series"),*/ - /*xls_func_entry(xlfDocuments, 0, ".Documents"),*/ - /*xls_func_entry(xlfActiveCell, 0, ".Active.Cell"),*/ - /*xls_func_entry(xlfSelection, 0, ".Selection"),*/ - /*xls_func_entry(xlfResult, 0, ".Result"),*/ - xls_func_entry(xlfAtan2, 2, "ATAN_2"), /* XLS:ATAN2 */ - xls_func_entry(xlfAsin, 1, "ASIN"), - xls_func_entry(xlfAcos, 1, "ACOS"), - xls_func_entry(xlfChoose, /*Var*/ 0, "CHOOSE"), - xls_func_entry(xlfHlookup, 3, "HLOOKUP"), /* BIFF2 - becomes Var(3,4) in BIFF5 */ - xls_func_entry(xlfVlookup, 3, "VLOOKUP"), /* BIFF2 - becomes Var(3,4) in BIFF5 */ - /*xls_func_entry(xlfLinks, 0, ".Links"),*/ - /*xls_func_entry(xlfInput, 0, ".Input"),*/ - xls_func_entry(xlfIsref, 1, "ISREF"), - /*xls_func_entry(xlfGetFormula, 0, ".Get.Formula"),*/ - /*xls_func_entry(xlfGetName, 0, ".Get.Name"),*/ - /*xls_func_entry(xlfSetValue, 0, ".Set.Value"),*/ - xls_func_entry(xlfLog, /*Var*/ 0, "LOG"), - /*xls_func_entry(xlfExec, 0, ".Exec"),*/ - xls_func_entry(xlfChar, 1, "CHAR"), - xls_func_entry(xlfLower, 1, "LOWER"), - xls_func_entry(xlfUpper, 1, "UPPER"), - xls_func_entry(xlfProper, 1, "PROPER"), - xls_func_entry(xlfLeft, /*Var*/ 0, "LEFT"), - xls_func_entry(xlfRight, /*Var*/ 0, "RIGHT"), - xls_func_entry(xlfExact, 2, "EXACT"), - xls_func_entry(xlfTrim, 1, "TRIM"), - xls_func_entry(xlfReplace, 4, "REPLACE"), - xls_func_entry(xlfSubstitute, /*Var*/ 0, "SUBSTITUTE"), - xls_func_entry(xlfCode, 1, "CODE"), - /*xls_func_entry(xlfNames, 0, ".Names"),*/ - /*xls_func_entry(xlfDirectory, 0, ".Directory"),*/ - xls_func_entry(xlfFind, /*Var*/ 0, "FIND"), - xls_func_entry(xlfCell, /*Var*/ 0, ".CELL"), - xls_func_entry(xlfIserr, 1, "ISERR"), - xls_func_entry(xlfIstext, 1, "ISTEXT"), - xls_func_entry(xlfIsnumber, 1, "ISNUMBER"), - xls_func_entry(xlfIsblank, 1, "ISBLANK"), - xls_func_entry(xlfT, 1, "T"), - xls_func_entry(xlfN, 1, "N"), - /*xls_func_entry(xlfFopen, 0, ".Fopen"),*/ - /*xls_func_entry(xlfFclose, 0, ".Fclose"),*/ - /*xls_func_entry(xlfFsize, 0, ".Fsize"),*/ - /*xls_func_entry(xlfFreadln, 0, ".Freadln"),*/ - /*xls_func_entry(xlfFread, 0, ".Fread"),*/ - /*xls_func_entry(xlfFwriteln, 0, ".Fwriteln"),*/ - /*xls_func_entry(xlfFwrite, 0, ".Fwrite"),*/ - /*xls_func_entry(xlfFpos, 0, ".Fpos"),*/ - xls_func_entry(xlfDatevalue, 1, "DATEVALUE"), - xls_func_entry(xlfTimevalue, 1, "TIMEVALUE"), - xls_func_entry(xlfSln, 3, "SLN"), - xls_func_entry(xlfSyd, 4, "SYD"), - xls_func_entry(xlfDdb, /*Var*/ 0, "DDB"), - /*xls_func_entry(xlfGetDef, 0, ".Get.Def"),*/ - /*xls_func_entry(xlfReftext, 0, ".Reftext"),*/ - /*xls_func_entry(xlfTextref, 0, ".Textref"),*/ - /*xls_func_entry(xlfIndirect, 0, ".INDIRECT"),*/ - /*xls_func_entry(xlfRegister, 0, ".Register"),*/ - /*xls_func_entry(xlfCall, 0, ".Call"),*/ - /*xls_func_entry(xlfAddBar, 0, ".Add.Bar"),*/ - /*xls_func_entry(xlfAddMenu, 0, ".Add.Menu"),*/ - /*xls_func_entry(xlfAddCommand, 0, ".Add.Command"),*/ - /*xls_func_entry(xlfEnableCommand, 0, ".Enable.Command"),*/ - /*xls_func_entry(xlfCheckCommand, 0, ".Check.Command"),*/ - /*xls_func_entry(xlfRenameCommand, 0, ".Rename.Command"),*/ - /*xls_func_entry(xlfShowBar, 0, ".Show.Bar"),*/ - /*xls_func_entry(xlfDeleteMenu, 0, ".Delete.Menu"),*/ - /*xls_func_entry(xlfDeleteCommand, 0, ".Delete.Command"),*/ - /*xls_func_entry(xlfGetChartItem, 0, ".Get.Chart.Item"),*/ - /*xls_func_entry(xlfDialogBox, 0, ".Dialog.Box"),*/ - xls_func_entry(xlfClean, 1, "CLEAN"), - xls_func_entry(xlfMdeterm, 1, "M_DETERM"), /* XLS:MDETERM */ - xls_func_entry(xlfMinverse, 1, "M_INVERSE"), /* XLS:MINVERSE */ - xls_func_entry(xlfMmult, 2, "M_MULT"), /* XLS:MMULT */ - /*xls_func_entry(xlfFiles, 0, ".Files"),*/ - xls_func_entry(xlfIpmt, /*Var*/ 0, ".IPMT"), - xls_func_entry(xlfPpmt, /*Var*/ 0, ".PPMT"), - xls_func_entry(xlfCounta, /*Var*/ 0, "COUNTA"), - /*xls_func_entry(xlfCancelKey, 0, ".Cancel.Key"),*/ - /*xls_func_entry(xlfInitiate, 0, ".Initiate"),*/ - /*xls_func_entry(xlfRequest, 0, ".Request"),*/ - /*xls_func_entry(xlfPoke, 0, ".Poke"),*/ - /*xls_func_entry(xlfExecute, 0, ".Execute"),*/ - /*xls_func_entry(xlfTerminate, 0, ".Terminate"),*/ - /*xls_func_entry(xlfRestart, 0, ".Restart"),*/ - /*xls_func_entry(xlfHelp, 0, ".Help"),*/ - /*xls_func_entry(xlfGetBar, 0, ".Get.Bar"),*/ - xls_func_entry(xlfProduct, /*Var*/ 0, "PRODUCT"), - xls_func_entry(xlfFact, 1, "FACT"), - /*xls_func_entry(xlfGetCell, 0, ".Get.Cell"),*/ - /*xls_func_entry(xlfGetWorkspace, 0, ".Get.Workspace"),*/ - /*xls_func_entry(xlfGetWindow, 0, ".Get.Window"),*/ - /*xls_func_entry(xlfGetDocument, 0, ".Get.Document"),*/ - xls_func_entry(xlfDproduct, 3, ".DPRODUCT.XLS"), /* XLS:DPRODUCT */ /* Fireworkz is incompatible */ - xls_func_entry(xlfIsnontext, 1, "ISNONTEXT"), - /*xls_func_entry(xlfGetNote, 0, ".Get.Note"),*/ - /*xls_func_entry(xlfNote, 0, ".Note"),*/ - xls_func_entry(xlfStdevp, /*Var*/ 0, "STDP"), /* XLS:STDEVP */ - xls_func_entry(xlfVarp, /*Var*/ 0, "VARP"), - xls_func_entry(xlfDstdevp, 3, ".DSTDEVP.XLS"), /* XLS:DSTDEVP */ /* Fireworkz is incompatible */ - xls_func_entry(xlfDvarp, 3, ".DVARP.XLS"), /* XLS:DVARP */ /* Fireworkz is incompatible */ - xls_func_entry(xlfTrunc, 2, "TRUNC"), /* BIFF2 - becomes Var(1,2) in BIFF3 */ - xls_func_entry(xlfIslogical, 1, "ISLOGICAL"), - xls_func_entry(xlfDcounta, 3, ".DCOUNTA.XLS") /* XLS:DCOUNTA */ /* Fireworkz is incompatible */ - /*xls_func_entry(xlfDeleteBar, 0, ".Delete.Bar"),*/ - /*xls_func_entry(xlfUnregister, 0, ".Unregister"),*/ + xls_func_entry(BIFF_FN_Count, /*Var*/ 0, "COUNT"), + xls_func_entry(BIFF_FN_If, /*Var*/ 0, "IF"), + xls_func_entry(BIFF_FN_Isna, 1, "ISNA"), + xls_func_entry(BIFF_FN_Iserror, 1, "ISERROR"), + xls_func_entry(BIFF_FN_Sum, /*Var*/ 0, "SUM"), + xls_func_entry(BIFF_FN_Average, /*Var*/ 0, "AVG"), /* XLS:AVERAGE */ + xls_func_entry(BIFF_FN_Min, /*Var*/ 0, "MIN"), + xls_func_entry(BIFF_FN_Max, /*Var*/ 0, "MAX"), + xls_func_entry(BIFF_FN_Row, /*Var*/ 0, "ROW"), + xls_func_entry(BIFF_FN_Column, /*Var*/ 0, "COL"), /* XLS:COLUMN */ + xls_func_entry(BIFF_FN_Na, 0, "NA"), + xls_func_entry(BIFF_FN_Npv, /*Var*/ 0, "NPV"), + xls_func_entry(BIFF_FN_Stdev, /*Var*/ 0, "STD"), /* XLS:STDEV */ + xls_func_entry(BIFF_FN_Dollar, /*Var*/ 0, "DOLLAR"), + xls_func_entry(BIFF_FN_Fixed, 2, "FIXED"), /* BIFF2 - becomes Var(2,3) in BIFF4 */ + xls_func_entry(BIFF_FN_Sin, 1, "SIN"), + xls_func_entry(BIFF_FN_Cos, 1, "COS"), + xls_func_entry(BIFF_FN_Tan, 1, "TAN"), + xls_func_entry(BIFF_FN_Atan, 1, "ATAN"), + xls_func_entry(BIFF_FN_Pi, 0, "PI"), + xls_func_entry(BIFF_FN_Sqrt, 1, "SQR"), /* XLS:SQRT */ + xls_func_entry(BIFF_FN_Exp, 1, "EXP"), + xls_func_entry(BIFF_FN_Ln, 1, "LN"), + xls_func_entry(BIFF_FN_Log10, 1, "ODF.LOG10"), /* XLS:LOG10 */ + xls_func_entry(BIFF_FN_Abs, 1, "ABS"), + xls_func_entry(BIFF_FN_Int, 1, "ODF.INT"), /*XLS:INT*/ + xls_func_entry(BIFF_FN_Sign, 1, "SGN"), /* XLS:SIGN */ + xls_func_entry(BIFF_FN_Round, 2, "ROUND"), + xls_func_entry(BIFF_FN_Lookup, /*Var*/ 0, "LOOKUP"), + xls_func_entry(BIFF_FN_Index, /*Var*/ 0, "ODF.INDEX"), /* XLS:INDEX */ + xls_func_entry(BIFF_FN_Rept, 2, "REPT"), + xls_func_entry(BIFF_FN_Mid, 3, "MID"), + xls_func_entry(BIFF_FN_Len, 1, "LENGTH"), /* XLS:LEN */ + xls_func_entry(BIFF_FN_Value, 1, "VALUE"), + xls_func_entry(BIFF_FN_True, 0, "TRUE"), + xls_func_entry(BIFF_FN_False, 0, "FALSE"), + xls_func_entry(BIFF_FN_And, /*Var*/ 0, "AND"), + xls_func_entry(BIFF_FN_Or, /*Var*/ 0, "OR"), + xls_func_entry(BIFF_FN_Not, 1, "NOT"), + xls_func_entry(BIFF_FN_Mod, 2, "MOD"), + xls_func_entry(BIFF_FN_Dcount, 3, ".DCOUNT.XLS"), /* XLS:DCOUNT */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Dsum, 3, ".DSUM.XLS"), /* XLS:DSUM */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Daverage, 3, ".DAVG.XLS"), /* XLS:DAVERAGE */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Dmin, 3, ".DMIN.XLS"), /* XLS:DMIN */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Dmax, 3, ".DMAX.XLS"), /* XLS:DMAX */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Dstdev, 3, ".DSTD.XLS"), /* XLS:DSTD */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Var, /*Var*/ 0, "VAR"), + xls_func_entry(BIFF_FN_Dvar, 3, ".DVAR.XLS"), /* XLS:DVAR */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Text, 2, "TEXT"), + xls_func_entry(BIFF_FN_Linest, /*Var*/ 0, "LINEST"), + xls_func_entry(BIFF_FN_Trend, /*Var*/ 0, "TREND"), + xls_func_entry(BIFF_FN_Logest, /*Var*/ 0, "LOGEST"), + xls_func_entry(BIFF_FN_Growth, /*Var*/ 0, "GROWTH"), + /*xls_func_entry(BIFF_FN_Goto, 0, ".Goto"),*/ + /*xls_func_entry(BIFF_FN_Halt, 0, ".Halt"),*/ + xls_func_entry(BIFF_FN_Pv, /*Var*/ 0, "PV"), + xls_func_entry(BIFF_FN_Fv, /*Var*/ 0, "ODF.FV"), /* XLS:FV */ + xls_func_entry(BIFF_FN_Nper, /*Var*/ 0, "NPER"), + xls_func_entry(BIFF_FN_Pmt, /*Var*/ 0, "ODF.PMT"), /* XLS:PMT */ + xls_func_entry(BIFF_FN_Rate, /*Var*/ 0, "RATE"), + xls_func_entry(BIFF_FN_Mirr, 3, "MIRR"), + xls_func_entry(BIFF_FN_Irr, /*Var*/ 0, "ODF.IRR"), /* XLS:IRR */ + xls_func_entry(BIFF_FN_Rand, 0, "RAND"), + xls_func_entry(BIFF_FN_Match, /*Var*/ 0, "MATCH"), + xls_func_entry(BIFF_FN_Date, 3, "DATE"), + xls_func_entry(BIFF_FN_Time, 3, "TIME"), + xls_func_entry(BIFF_FN_Day, 1, "DAY"), + xls_func_entry(BIFF_FN_Month, 1, "MONTH"), + xls_func_entry(BIFF_FN_Year, 1, "YEAR"), + xls_func_entry(BIFF_FN_Weekday, 1, "WEEKDAY"), /* BIFF2 - becomes Var(1,2) in BIFF5 */ + xls_func_entry(BIFF_FN_Hour, 1, "HOUR"), + xls_func_entry(BIFF_FN_Minute, 1, "MINUTE"), + xls_func_entry(BIFF_FN_Second, 1, "SECOND"), + xls_func_entry(BIFF_FN_Now, 0, "NOW"), + xls_func_entry(BIFF_FN_Areas, 1, ".AREAS"), + xls_func_entry(BIFF_FN_Rows, 1, "ROWS"), + xls_func_entry(BIFF_FN_Columns, 1, "COLS"), /* XLS:COLUMNS */ + xls_func_entry(BIFF_FN_Offset, /*Var*/ 0, ".OFFSET"), + /*xls_func_entry(BIFF_FN_Absref, 0, ".Absref"),*/ + /*xls_func_entry(BIFF_FN_Relref, 0, ".Relref"),*/ + /*xls_func_entry(BIFF_FN_Argument, 0, ".Argument"),*/ + xls_func_entry(BIFF_FN_Search, /*Var*/ 0, "SEARCH"), + xls_func_entry(BIFF_FN_Transpose, 1, "TRANSPOSE"), + /*xls_func_entry(BIFF_FN_Error, 0, ".Error"),*/ + /*xls_func_entry(BIFF_FN_Step, 0, ".Step"),*/ + xls_func_entry(BIFF_FN_Type, 1, "ODF.TYPE"), /* XLS:TYPE */ + /*xls_func_entry(BIFF_FN_Echo, 0, ".Echo"),*/ + /*xls_func_entry(BIFF_FN_SetName, 0, ".Set.Name"),*/ + /*xls_func_entry(BIFF_FN_Caller, 0, ".Caller"),*/ + /*xls_func_entry(BIFF_FN_Deref, 0, ".Deref"),*/ + /*xls_func_entry(BIFF_FN_Windows, 0, ".Windows"),*/ + /*xls_func_entry(BIFF_FN_Series, 0, ".Series"),*/ + /*xls_func_entry(BIFF_FN_Documents, 0, ".Documents"),*/ + /*xls_func_entry(BIFF_FN_ActiveCell, 0, ".Active.Cell"),*/ + /*xls_func_entry(BIFF_FN_Selection, 0, ".Selection"),*/ + /*xls_func_entry(BIFF_FN_Result, 0, ".Result"),*/ + xls_func_entry(BIFF_FN_Atan2, 2, "ATAN_2"), /* XLS:ATAN2 */ + xls_func_entry(BIFF_FN_Asin, 1, "ASIN"), + xls_func_entry(BIFF_FN_Acos, 1, "ACOS"), + xls_func_entry(BIFF_FN_Choose, /*Var*/ 0, "CHOOSE"), + xls_func_entry(BIFF_FN_Hlookup, 3, "HLOOKUP"), /* BIFF2 - becomes Var(3,4) in BIFF5 */ + xls_func_entry(BIFF_FN_Vlookup, 3, "VLOOKUP"), /* BIFF2 - becomes Var(3,4) in BIFF5 */ + /*xls_func_entry(BIFF_FN_Links, 0, ".Links"),*/ + /*xls_func_entry(BIFF_FN_Input, 0, ".Input"),*/ + xls_func_entry(BIFF_FN_Isref, 1, "ISREF"), + /*xls_func_entry(BIFF_FN_GetFormula, 0, ".Get.Formula"),*/ + /*xls_func_entry(BIFF_FN_GetName, 0, ".Get.Name"),*/ + /*xls_func_entry(BIFF_FN_SetValue, 0, ".Set.Value"),*/ + xls_func_entry(BIFF_FN_Log, /*Var*/ 0, "LOG"), + /*xls_func_entry(BIFF_FN_Exec, 0, ".Exec"),*/ + xls_func_entry(BIFF_FN_Char, 1, "CHAR"), + xls_func_entry(BIFF_FN_Lower, 1, "LOWER"), + xls_func_entry(BIFF_FN_Upper, 1, "UPPER"), + xls_func_entry(BIFF_FN_Proper, 1, "PROPER"), + xls_func_entry(BIFF_FN_Left, /*Var*/ 0, "LEFT"), + xls_func_entry(BIFF_FN_Right, /*Var*/ 0, "RIGHT"), + xls_func_entry(BIFF_FN_Exact, 2, "EXACT"), + xls_func_entry(BIFF_FN_Trim, 1, "TRIM"), + xls_func_entry(BIFF_FN_Replace, 4, "REPLACE"), + xls_func_entry(BIFF_FN_Substitute, /*Var*/ 0, "SUBSTITUTE"), + xls_func_entry(BIFF_FN_Code, 1, "CODE"), + /*xls_func_entry(BIFF_FN_Names, 0, ".Names"),*/ + /*xls_func_entry(BIFF_FN_Directory, 0, ".Directory"),*/ + xls_func_entry(BIFF_FN_Find, /*Var*/ 0, "FIND"), + xls_func_entry(BIFF_FN_Cell, /*Var*/ 0, ".CELL"), + xls_func_entry(BIFF_FN_Iserr, 1, "ISERR"), + xls_func_entry(BIFF_FN_Istext, 1, "ISTEXT"), + xls_func_entry(BIFF_FN_Isnumber, 1, "ISNUMBER"), + xls_func_entry(BIFF_FN_Isblank, 1, "ISBLANK"), + xls_func_entry(BIFF_FN_T, 1, "T"), + xls_func_entry(BIFF_FN_N, 1, "N"), + /*xls_func_entry(BIFF_FN_Fopen, 0, ".Fopen"),*/ + /*xls_func_entry(BIFF_FN_Fclose, 0, ".Fclose"),*/ + /*xls_func_entry(BIFF_FN_Fsize, 0, ".Fsize"),*/ + /*xls_func_entry(BIFF_FN_Freadln, 0, ".Freadln"),*/ + /*xls_func_entry(BIFF_FN_Fread, 0, ".Fread"),*/ + /*xls_func_entry(BIFF_FN_Fwriteln, 0, ".Fwriteln"),*/ + /*xls_func_entry(BIFF_FN_Fwrite, 0, ".Fwrite"),*/ + /*xls_func_entry(BIFF_FN_Fpos, 0, ".Fpos"),*/ + xls_func_entry(BIFF_FN_Datevalue, 1, "DATEVALUE"), + xls_func_entry(BIFF_FN_Timevalue, 1, "TIMEVALUE"), + xls_func_entry(BIFF_FN_Sln, 3, "SLN"), + xls_func_entry(BIFF_FN_Syd, 4, "SYD"), + xls_func_entry(BIFF_FN_Ddb, /*Var*/ 0, "DDB"), + /*xls_func_entry(BIFF_FN_GetDef, 0, ".Get.Def"),*/ + /*xls_func_entry(BIFF_FN_Reftext, 0, ".Reftext"),*/ + /*xls_func_entry(BIFF_FN_Textref, 0, ".Textref"),*/ + /*xls_func_entry(BIFF_FN_Indirect, 0, ".INDIRECT"),*/ + /*xls_func_entry(BIFF_FN_Register, 0, ".Register"),*/ + /*xls_func_entry(BIFF_FN_Call, 0, ".Call"),*/ + /*xls_func_entry(BIFF_FN_AddBar, 0, ".Add.Bar"),*/ + /*xls_func_entry(BIFF_FN_AddMenu, 0, ".Add.Menu"),*/ + /*xls_func_entry(BIFF_FN_AddCommand, 0, ".Add.Command"),*/ + /*xls_func_entry(BIFF_FN_EnableCommand, 0, ".Enable.Command"),*/ + /*xls_func_entry(BIFF_FN_CheckCommand, 0, ".Check.Command"),*/ + /*xls_func_entry(BIFF_FN_RenameCommand, 0, ".Rename.Command"),*/ + /*xls_func_entry(BIFF_FN_ShowBar, 0, ".Show.Bar"),*/ + /*xls_func_entry(BIFF_FN_DeleteMenu, 0, ".Delete.Menu"),*/ + /*xls_func_entry(BIFF_FN_DeleteCommand, 0, ".Delete.Command"),*/ + /*xls_func_entry(BIFF_FN_GetChartItem, 0, ".Get.Chart.Item"),*/ + /*xls_func_entry(BIFF_FN_DialogBox, 0, ".Dialog.Box"),*/ + xls_func_entry(BIFF_FN_Clean, 1, "CLEAN"), + xls_func_entry(BIFF_FN_Mdeterm, 1, "M_DETERM"), /* XLS:MDETERM */ + xls_func_entry(BIFF_FN_Minverse, 1, "M_INVERSE"), /* XLS:MINVERSE */ + xls_func_entry(BIFF_FN_Mmult, 2, "M_MULT"), /* XLS:MMULT */ + /*xls_func_entry(BIFF_FN_Files, 0, ".Files"),*/ + xls_func_entry(BIFF_FN_Ipmt, /*Var*/ 0, ".IPMT"), + xls_func_entry(BIFF_FN_Ppmt, /*Var*/ 0, ".PPMT"), + xls_func_entry(BIFF_FN_Counta, /*Var*/ 0, "COUNTA"), + /*xls_func_entry(BIFF_FN_CancelKey, 0, ".Cancel.Key"),*/ + /*xls_func_entry(BIFF_FN_Initiate, 0, ".Initiate"),*/ + /*xls_func_entry(BIFF_FN_Request, 0, ".Request"),*/ + /*xls_func_entry(BIFF_FN_Poke, 0, ".Poke"),*/ + /*xls_func_entry(BIFF_FN_Execute, 0, ".Execute"),*/ + /*xls_func_entry(BIFF_FN_Terminate, 0, ".Terminate"),*/ + /*xls_func_entry(BIFF_FN_Restart, 0, ".Restart"),*/ + /*xls_func_entry(BIFF_FN_Help, 0, ".Help"),*/ + /*xls_func_entry(BIFF_FN_GetBar, 0, ".Get.Bar"),*/ + xls_func_entry(BIFF_FN_Product, /*Var*/ 0, "PRODUCT"), + xls_func_entry(BIFF_FN_Fact, 1, "FACT"), + /*xls_func_entry(BIFF_FN_GetCell, 0, ".Get.Cell"),*/ + /*xls_func_entry(BIFF_FN_GetWorkspace, 0, ".Get.Workspace"),*/ + /*xls_func_entry(BIFF_FN_GetWindow, 0, ".Get.Window"),*/ + /*xls_func_entry(BIFF_FN_GetDocument, 0, ".Get.Document"),*/ + xls_func_entry(BIFF_FN_Dproduct, 3, ".DPRODUCT.XLS"), /* XLS:DPRODUCT */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Isnontext, 1, "ISNONTEXT"), + /*xls_func_entry(BIFF_FN_GetNote, 0, ".Get.Note"),*/ + /*xls_func_entry(BIFF_FN_Note, 0, ".Note"),*/ + xls_func_entry(BIFF_FN_Stdevp, /*Var*/ 0, "STDP"), /* XLS:STDEVP */ + xls_func_entry(BIFF_FN_Varp, /*Var*/ 0, "VARP"), + xls_func_entry(BIFF_FN_Dstdevp, 3, ".DSTDEVP.XLS"), /* XLS:DSTDEVP */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Dvarp, 3, ".DVARP.XLS"), /* XLS:DVARP */ /* Fireworkz is incompatible */ + xls_func_entry(BIFF_FN_Trunc, 2, "TRUNC"), /* BIFF2 - becomes Var(1,2) in BIFF3 */ + xls_func_entry(BIFF_FN_Islogical, 1, "ISLOGICAL"), + xls_func_entry(BIFF_FN_Dcounta, 3, ".DCOUNTA.XLS") /* XLS:DCOUNTA */ /* Fireworkz is incompatible */ + /*xls_func_entry(BIFF_FN_DeleteBar, 0, ".Delete.Bar"),*/ + /*xls_func_entry(BIFF_FN_Unregister, 0, ".Unregister"),*/ }; static const XLS_FUNC_ENTRY BIFF3_functions[] = /* ordered as Excel for completeness checking */ { - xls_func_entry(xlfLinest, /*Var*/ 0, "LINEST"), - xls_func_entry(xlfTrend, /*Var*/ 0, "TREND"), - xls_func_entry(xlfLogest, /*Var*/ 0, "LOGEST"), - xls_func_entry(xlfGrowth, /*Var*/ 0, "GROWTH"), - xls_func_entry(xlfTrunc, /*Var*/ 0, "TRUNC"), /*Var(1,2) in BIFF3 */ - - xls_func_entry(xlfUsdollar, /*Var*/ 0, ".YEN"), /* BIFF3 - becomes USDOLLAR in BIFF4 */ - xls_func_entry(xlfFindb, /*Var*/ 0, "FIND"), /* XLS:FINDB */ /* Fireworkz doesn't handle DBCS */ - xls_func_entry(xlfSearchb, /*Var*/ 0, "SEARCH"), /* XLS:SEARCHB */ - xls_func_entry(xlfReplaceb, 4, "REPLACE"), /* XLS:REPLACEB */ - xls_func_entry(xlfLeftb, /*Var*/ 0, "LEFT"), /* XLS:LEFTB */ - xls_func_entry(xlfRightb, /*Var*/ 0, "RIGHT"), /* XLS:RIGHTB */ - xls_func_entry(xlfMidb, 3, "MID"), /* XLS:MIDB */ - xls_func_entry(xlfLenb, 1, "LEN"), /* XLS:LENB */ - xls_func_entry(xlfRoundup, 2, "ROUNDUP"), - xls_func_entry(xlfRounddown, 2, "ROUNDDOWN"), - xls_func_entry(xlfAsc, 1, ".ASC"), - xls_func_entry(xlfDbcs, 1, ".JIS"), /* BIFF3 - becomes DBCS in BIFF4 */ - xls_func_entry(xlfAddress, /*Var*/ 0, "ADDRESS"), - xls_func_entry(xlfDays360, 2, "DAYS_360"), /* XLS:DAYS360 */ /* BIFF3 - becomes Var(2,3) in BIFF5 */ - xls_func_entry(xlfToday, 0, "TODAY"), - xls_func_entry(xlfVdb, /*Var*/ 0, ".VDB"), - xls_func_entry(xlfMedian, /*Var*/ 0, "MEDIAN"), - xls_func_entry(xlfSumproduct, /*Var*/ 0, "SUMPRODUCT"), - xls_func_entry(xlfSinh, 1, "SINH"), - xls_func_entry(xlfCosh, 1, "COSH"), - xls_func_entry(xlfTanh, 1, "TANH"), - xls_func_entry(xlfAsinh, 1, "ASINH"), - xls_func_entry(xlfAcosh, 1, "ACOSH"), - xls_func_entry(xlfAtanh, 1, "ATANH"), - xls_func_entry(xlfDget, 3, ".DGET"), - /*xls_func_entry(xlfCreateObject, 0, ".Create.Object"),*/ - /*xls_func_entry(xlfVolatile, 0, ".Volatile"),*/ - /*xls_func_entry(xlfLastError, 0, ".Last.Error"),*/ - /*xls_func_entry(xlfCustomUndo, 0, ".Custom.Undo"),*/ - /*xls_func_entry(xlfCustomRepeat, 0, ".Custom.Repeat"),*/ - /*xls_func_entry(xlfFormulaConvert, 0, ".Formula.Convert"),*/ - /*xls_func_entry(xlfGetLinkInfo, 0, ".Get.Link.Info"),*/ - /*xls_func_entry(xlfTextBox, 0, ".Text.Box"),*/ - xls_func_entry(xlfInfo, 1, ".INFO") + xls_func_entry(BIFF_FN_Linest, /*Var*/ 0, "LINEST"), + xls_func_entry(BIFF_FN_Trend, /*Var*/ 0, "TREND"), + xls_func_entry(BIFF_FN_Logest, /*Var*/ 0, "LOGEST"), + xls_func_entry(BIFF_FN_Growth, /*Var*/ 0, "GROWTH"), + xls_func_entry(BIFF_FN_Trunc, /*Var*/ 0, "TRUNC"), /*Var(1,2) in BIFF3 */ + + xls_func_entry(BIFF_FN_Usdollar, /*Var*/ 0, ".YEN"), /* BIFF3 - becomes USDOLLAR in BIFF4 */ + xls_func_entry(BIFF_FN_Findb, /*Var*/ 0, "FIND"), /* XLS:FINDB */ /* Fireworkz doesn't handle DBCS */ + xls_func_entry(BIFF_FN_Searchb, /*Var*/ 0, "SEARCH"), /* XLS:SEARCHB */ + xls_func_entry(BIFF_FN_Replaceb, 4, "REPLACE"), /* XLS:REPLACEB */ + xls_func_entry(BIFF_FN_Leftb, /*Var*/ 0, "LEFT"), /* XLS:LEFTB */ + xls_func_entry(BIFF_FN_Rightb, /*Var*/ 0, "RIGHT"), /* XLS:RIGHTB */ + xls_func_entry(BIFF_FN_Midb, 3, "MID"), /* XLS:MIDB */ + xls_func_entry(BIFF_FN_Lenb, 1, "LEN"), /* XLS:LENB */ + xls_func_entry(BIFF_FN_Roundup, 2, "ROUNDUP"), + xls_func_entry(BIFF_FN_Rounddown, 2, "ROUNDDOWN"), + xls_func_entry(BIFF_FN_Asc, 1, ".ASC"), + xls_func_entry(BIFF_FN_Dbcs, 1, ".JIS"), /* BIFF3 - becomes DBCS in BIFF4 */ + xls_func_entry(BIFF_FN_Address, /*Var*/ 0, "ADDRESS"), + xls_func_entry(BIFF_FN_Days360, 2, "DAYS_360"), /* XLS:DAYS360 */ /* BIFF3 - becomes Var(2,3) in BIFF5 */ + xls_func_entry(BIFF_FN_Today, 0, "TODAY"), + xls_func_entry(BIFF_FN_Vdb, /*Var*/ 0, ".VDB"), + xls_func_entry(BIFF_FN_Median, /*Var*/ 0, "MEDIAN"), + xls_func_entry(BIFF_FN_Sumproduct, /*Var*/ 0, "SUMPRODUCT"), + xls_func_entry(BIFF_FN_Sinh, 1, "SINH"), + xls_func_entry(BIFF_FN_Cosh, 1, "COSH"), + xls_func_entry(BIFF_FN_Tanh, 1, "TANH"), + xls_func_entry(BIFF_FN_Asinh, 1, "ASINH"), + xls_func_entry(BIFF_FN_Acosh, 1, "ACOSH"), + xls_func_entry(BIFF_FN_Atanh, 1, "ATANH"), + xls_func_entry(BIFF_FN_Dget, 3, ".DGET"), + /*xls_func_entry(BIFF_FN_CreateObject, 0, ".Create.Object"),*/ + /*xls_func_entry(BIFF_FN_Volatile, 0, ".Volatile"),*/ + /*xls_func_entry(BIFF_FN_LastError, 0, ".Last.Error"),*/ + /*xls_func_entry(BIFF_FN_CustomUndo, 0, ".Custom.Undo"),*/ + /*xls_func_entry(BIFF_FN_CustomRepeat, 0, ".Custom.Repeat"),*/ + /*xls_func_entry(BIFF_FN_FormulaConvert, 0, ".Formula.Convert"),*/ + /*xls_func_entry(BIFF_FN_GetLinkInfo, 0, ".Get.Link.Info"),*/ + /*xls_func_entry(BIFF_FN_TextBox, 0, ".Text.Box"),*/ + xls_func_entry(BIFF_FN_Info, 1, ".INFO") }; static const XLS_FUNC_ENTRY BIFF4_functions[] = /* ordered as Excel for completeness checking */ { - xls_func_entry(xlfFixed, /*Var*/ 0, "FIXED"), /* Var(2,3) in BIFF4 */ - xls_func_entry(xlfUsdollar, /*Var*/ 0, ".USDOLLAR"), /* BIFF4 - was YEN in BIFF3 */ - xls_func_entry(xlfDbcs, 1, ".DBCS"), /* BIFF4 - was JIS in BIFF3 */ - - xls_func_entry(xlfRank, /*Var*/ 0, "RANK.EQ"), /* XLS:RANK */ - - /*xls_func_entry(xlfGroup, 0, ".Group"),*/ - /*xls_func_entry(xlfGetObject, 0, ".Get.Object"),*/ - xls_func_entry(xlfDb, /*Var*/ 0, "DB"), - /*xls_func_entry(xlfPause, 0, ".Pause"),*/ - /*xls_func_entry(xlfResume, 0, ".Resume"),*/ - xls_func_entry(xlfFrequency, 2, "FREQUENCY"), - /*xls_func_entry(xlfAddToolbar, 0, ".Add.Toolbar"),*/ - /*xls_func_entry(xlfDeleteToolbar, 0, ".Delete.Toolbar"),*/ - xls_func_entry(xlfExternCall, /*Var*/ 0, "EXTERN.CALL"), /* needs special handling */ - /*xls_func_entry(xlfResetToolbar, 0, ".Reset.Toolbar"),*/ - /*xls_func_entry(xlfEvaluate, 0, ".Evaluate"),*/ - /*xls_func_entry(xlfGetToolbar, 0, ".Get.Toolbar"),*/ - /*xls_func_entry(xlfGetTool, 0, ".Get.Tool"),*/ - /*xls_func_entry(xlfSpellingCheck, 0, ".Spelling.Check"),*/ - xls_func_entry(xlfErrorType, 1, ".ERROR.TYPE"), - /*xls_func_entry(xlfAppTitle, 0, ".App.Title"),*/ - /*xls_func_entry(xlfWindowTitle, 0, ".Window.Title"),*/ - /*xls_func_entry(xlfSaveToolbar, 0, ".Save.Toolbar"),*/ - /*xls_func_entry(xlfEnableTool, 0, ".Enable.Tool"),*/ - /*xls_func_entry(xlfPressTool, 0, ".Press.Tool"),*/ - /*xls_func_entry(xlfRegisterId, 0, ".Register.Id"),*/ - /*xls_func_entry(xlfGetWorkbook, 0, ".Get.Workbook"),*/ - xls_func_entry(xlfAvedev, /*Var*/ 0, "AVEDEV"), - xls_func_entry(xlfBetadist, /*Var*/ 0, "ODF.BETADIST"), /* XLS:BETADIST */ - xls_func_entry(xlfGammaln, 1, "GAMMALN"), - xls_func_entry(xlfBetainv, /*Var*/ 0, "BETA.INV"), /* XLS:BETAINV */ - xls_func_entry(xlfBinomdist, 4, "BINOM.DIST"), /* XLS:BINOMDIST */ - xls_func_entry(xlfChidist, 2, "CHISQ.DIST.RT"), /* XLS:CHIDIST */ - xls_func_entry(xlfChiinv, 2, "CHISQ.INV.RT"), /* XLS:CHIINV */ - xls_func_entry(xlfCombin, 2, "COMBIN"), - xls_func_entry(xlfConfidence, 3, "CONFIDENCE"), - xls_func_entry(xlfCritbinom, 3, "BINOM.INV"), /* XLS:CRITBINOM */ - xls_func_entry(xlfEven, 1, "EVEN"), - xls_func_entry(xlfExpondist, 3, "EXPON.DIST"), /* XLS:EXPONDIST */ - xls_func_entry(xlfFdist, 3, "F.DIST.RT"), /* XLS:FDIST */ - xls_func_entry(xlfFinv, 3, "F.INV.RT"), /* XLS:FINV */ - xls_func_entry(xlfFisher, 1, "FISHER"), - xls_func_entry(xlfFisherinv, 1, "FISHERINV"), - xls_func_entry(xlfFloor, 2, "FLOOR"), - xls_func_entry(xlfGammadist, 4, "GAMMA.DIST"), /* XLS:GAMMADIST */ - xls_func_entry(xlfGammainv, 3, "GAMMA.INV"), /* XLS:GAMMAINV */ - xls_func_entry(xlfCeiling, 2, "CEILING"), - xls_func_entry(xlfHypgeomdist, 4, "HYPGEOM.DIST"), /* XLS:HYPGEOMDIST */ - xls_func_entry(xlfLognormdist, 3, "LOGNORM.DIST"), /* XLS:LOGNORMDIST */ - xls_func_entry(xlfLoginv, 3, "LOGNORM.INV"), /* XLS:LOGINV */ - xls_func_entry(xlfNegbinomdist, 3, "NEGBINOM.DIST"), /* XLS:NEGBINOMDIST */ - xls_func_entry(xlfNormdist, 4, "NORM.DIST"), /* XLS:NORMDIST */ - xls_func_entry(xlfNormsdist, 1, "NORM.S.DIST"), /* XLS:NORMSDIST */ - xls_func_entry(xlfNorminv, 3, "NORM.INV"), /* XLS:NORMINV */ - xls_func_entry(xlfNormsinv, 1, "NORM.S.INV"), /* XLS:NORMSINV */ - xls_func_entry(xlfStandardize, 3, "STANDARDIZE"), - xls_func_entry(xlfOdd, 1, "ODD"), - xls_func_entry(xlfPermut, 2, "PERMUT"), - xls_func_entry(xlfPoisson, 3, "POISSON.DIST"), /* XLS:POISSON */ - xls_func_entry(xlfTdist, 3, "ODF.TDIST"), /* XLS:TDIST */ - xls_func_entry(xlfWeibull, 4, "WEIBULL.DIST"), /*XLS:WEIBULL */ - xls_func_entry(xlfSumxmy2, 2, "SUM_XMY2"), /* XLS:SUMXMY2*/ - xls_func_entry(xlfSumx2my2, 2, "SUM_X2MY2"), /* XLS:SUMX2MY2 */ - xls_func_entry(xlfSumx2py2, 2, "SUM_X2PY2"), /* XLS:SUMX2PY2 */ - xls_func_entry(xlfChitest, 2, "CHISQ.TEST"), /* XLS:CHITEST */ - xls_func_entry(xlfCorrel, 2, "CORREL"), - xls_func_entry(xlfCovar, 2, "COVARIANCE.P"), /* XLS:COVAR */ - xls_func_entry(xlfForecast, 3, "FORECAST"), - xls_func_entry(xlfFtest, 2, "F.TEST"), /* XLS:FTEST */ - xls_func_entry(xlfIntercept, 2, "INTERCEPT"), - xls_func_entry(xlfPearson, 2, "PEARSON"), - xls_func_entry(xlfRsq, 2, "RSQ"), - xls_func_entry(xlfSteyx, 2, "STEYX"), - xls_func_entry(xlfSlope, 2, "SLOPE"), - xls_func_entry(xlfTtest, 4, "T.TEST"), /* XLS:TTEST */ - xls_func_entry(xlfProb, /*Var*/ 0, "PROB"), - xls_func_entry(xlfDevsq, /*Var*/ 0, "DEVSQ"), - xls_func_entry(xlfGeomean, /*Var*/ 0, "GEOMEAN"), - xls_func_entry(xlfHarmean, /*Var*/ 0, "HARMEAN"), - xls_func_entry(xlfSumsq, /*Var*/ 0, "SUMSQ"), - xls_func_entry(xlfKurt, /*Var*/ 0, "KURT"), - xls_func_entry(xlfSkew, /*Var*/ 0, "SKEW"), - xls_func_entry(xlfZtest, /*Var*/ 0, "Z.TEST"), /* XLS:ZTEST */ - xls_func_entry(xlfLarge, 2, "LARGE"), - xls_func_entry(xlfSmall, 2, "SMALL"), - xls_func_entry(xlfQuartile, 2, "QUARTILE.INC"), /* XLS:QUARTILE */ - xls_func_entry(xlfPercentile, 2, "PERCENTILE.INC"), /* XLS:PERCENTILE */ - xls_func_entry(xlfPercentrank, /*Var*/ 0, "PERCENTRANK.INC"), /* XLS:PERCENTRANK */ - xls_func_entry(xlfMode, /*Var*/ 0, "MODE"), - xls_func_entry(xlfTrimmean, 2, "TRIMMEAN"), - xls_func_entry(xlfTinv, 2, "T.INV.2T") /* XLS:TINV */ + xls_func_entry(BIFF_FN_Fixed, /*Var*/ 0, "FIXED"), /* Var(2,3) in BIFF4 */ + xls_func_entry(BIFF_FN_Usdollar, /*Var*/ 0, ".USDOLLAR"), /* BIFF4 - was YEN in BIFF3 */ + xls_func_entry(BIFF_FN_Dbcs, 1, ".DBCS"), /* BIFF4 - was JIS in BIFF3 */ + + xls_func_entry(BIFF_FN_Rank, /*Var*/ 0, "RANK.EQ"), /* XLS:RANK */ + + /*xls_func_entry(BIFF_FN_Group, 0, ".Group"),*/ + /*xls_func_entry(BIFF_FN_GetObject, 0, ".Get.Object"),*/ + xls_func_entry(BIFF_FN_Db, /*Var*/ 0, "DB"), + /*xls_func_entry(BIFF_FN_Pause, 0, ".Pause"),*/ + /*xls_func_entry(BIFF_FN_Resume, 0, ".Resume"),*/ + xls_func_entry(BIFF_FN_Frequency, 2, "FREQUENCY"), + /*xls_func_entry(BIFF_FN_AddToolbar, 0, ".Add.Toolbar"),*/ + /*xls_func_entry(BIFF_FN_DeleteToolbar, 0, ".Delete.Toolbar"),*/ + xls_func_entry(BIFF_FN_ExternCall, /*Var*/ 0, "EXTERN.CALL"), /* needs special handling */ + /*xls_func_entry(BIFF_FN_ResetToolbar, 0, ".Reset.Toolbar"),*/ + /*xls_func_entry(BIFF_FN_Evaluate, 0, ".Evaluate"),*/ + /*xls_func_entry(BIFF_FN_GetToolbar, 0, ".Get.Toolbar"),*/ + /*xls_func_entry(BIFF_FN_GetTool, 0, ".Get.Tool"),*/ + /*xls_func_entry(BIFF_FN_SpellingCheck, 0, ".Spelling.Check"),*/ + xls_func_entry(BIFF_FN_ErrorType, 1, ".ERROR.TYPE"), + /*xls_func_entry(BIFF_FN_AppTitle, 0, ".App.Title"),*/ + /*xls_func_entry(BIFF_FN_WindowTitle, 0, ".Window.Title"),*/ + /*xls_func_entry(BIFF_FN_SaveToolbar, 0, ".Save.Toolbar"),*/ + /*xls_func_entry(BIFF_FN_EnableTool, 0, ".Enable.Tool"),*/ + /*xls_func_entry(BIFF_FN_PressTool, 0, ".Press.Tool"),*/ + /*xls_func_entry(BIFF_FN_RegisterId, 0, ".Register.Id"),*/ + /*xls_func_entry(BIFF_FN_GetWorkbook, 0, ".Get.Workbook"),*/ + xls_func_entry(BIFF_FN_Avedev, /*Var*/ 0, "AVEDEV"), + xls_func_entry(BIFF_FN_Betadist, /*Var*/ 0, "ODF.BETADIST"), /* XLS:BETADIST */ + xls_func_entry(BIFF_FN_Gammaln, 1, "GAMMALN"), + xls_func_entry(BIFF_FN_Betainv, /*Var*/ 0, "BETA.INV"), /* XLS:BETAINV */ + xls_func_entry(BIFF_FN_Binomdist, 4, "BINOM.DIST"), /* XLS:BINOMDIST */ + xls_func_entry(BIFF_FN_Chidist, 2, "CHISQ.DIST.RT"), /* XLS:CHIDIST */ + xls_func_entry(BIFF_FN_Chiinv, 2, "CHISQ.INV.RT"), /* XLS:CHIINV */ + xls_func_entry(BIFF_FN_Combin, 2, "COMBIN"), + xls_func_entry(BIFF_FN_Confidence, 3, "CONFIDENCE"), + xls_func_entry(BIFF_FN_Critbinom, 3, "BINOM.INV"), /* XLS:CRITBINOM */ + xls_func_entry(BIFF_FN_Even, 1, "EVEN"), + xls_func_entry(BIFF_FN_Expondist, 3, "EXPON.DIST"), /* XLS:EXPONDIST */ + xls_func_entry(BIFF_FN_Fdist, 3, "F.DIST.RT"), /* XLS:FDIST */ + xls_func_entry(BIFF_FN_Finv, 3, "F.INV.RT"), /* XLS:FINV */ + xls_func_entry(BIFF_FN_Fisher, 1, "FISHER"), + xls_func_entry(BIFF_FN_Fisherinv, 1, "FISHERINV"), + xls_func_entry(BIFF_FN_Floor, 2, "FLOOR"), + xls_func_entry(BIFF_FN_Gammadist, 4, "GAMMA.DIST"), /* XLS:GAMMADIST */ + xls_func_entry(BIFF_FN_Gammainv, 3, "GAMMA.INV"), /* XLS:GAMMAINV */ + xls_func_entry(BIFF_FN_Ceiling, 2, "CEILING"), + xls_func_entry(BIFF_FN_Hypgeomdist, 4, "HYPGEOM.DIST"), /* XLS:HYPGEOMDIST */ + xls_func_entry(BIFF_FN_Lognormdist, 3, "LOGNORM.DIST"), /* XLS:LOGNORMDIST */ + xls_func_entry(BIFF_FN_Loginv, 3, "LOGNORM.INV"), /* XLS:LOGINV */ + xls_func_entry(BIFF_FN_Negbinomdist, 3, "NEGBINOM.DIST"), /* XLS:NEGBINOMDIST */ + xls_func_entry(BIFF_FN_Normdist, 4, "NORM.DIST"), /* XLS:NORMDIST */ + xls_func_entry(BIFF_FN_Normsdist, 1, "NORM.S.DIST"), /* XLS:NORMSDIST */ + xls_func_entry(BIFF_FN_Norminv, 3, "NORM.INV"), /* XLS:NORMINV */ + xls_func_entry(BIFF_FN_Normsinv, 1, "NORM.S.INV"), /* XLS:NORMSINV */ + xls_func_entry(BIFF_FN_Standardize, 3, "STANDARDIZE"), + xls_func_entry(BIFF_FN_Odd, 1, "ODD"), + xls_func_entry(BIFF_FN_Permut, 2, "PERMUT"), + xls_func_entry(BIFF_FN_Poisson, 3, "POISSON.DIST"), /* XLS:POISSON */ + xls_func_entry(BIFF_FN_Tdist, 3, "ODF.TDIST"), /* XLS:TDIST */ + xls_func_entry(BIFF_FN_Weibull, 4, "WEIBULL.DIST"), /*XLS:WEIBULL */ + xls_func_entry(BIFF_FN_Sumxmy2, 2, "SUM_XMY2"), /* XLS:SUMXMY2*/ + xls_func_entry(BIFF_FN_Sumx2my2, 2, "SUM_X2MY2"), /* XLS:SUMX2MY2 */ + xls_func_entry(BIFF_FN_Sumx2py2, 2, "SUM_X2PY2"), /* XLS:SUMX2PY2 */ + xls_func_entry(BIFF_FN_Chitest, 2, "CHISQ.TEST"), /* XLS:CHITEST */ + xls_func_entry(BIFF_FN_Correl, 2, "CORREL"), + xls_func_entry(BIFF_FN_Covar, 2, "COVARIANCE.P"), /* XLS:COVAR */ + xls_func_entry(BIFF_FN_Forecast, 3, "FORECAST"), + xls_func_entry(BIFF_FN_Ftest, 2, "F.TEST"), /* XLS:FTEST */ + xls_func_entry(BIFF_FN_Intercept, 2, "INTERCEPT"), + xls_func_entry(BIFF_FN_Pearson, 2, "PEARSON"), + xls_func_entry(BIFF_FN_Rsq, 2, "RSQ"), + xls_func_entry(BIFF_FN_Steyx, 2, "STEYX"), + xls_func_entry(BIFF_FN_Slope, 2, "SLOPE"), + xls_func_entry(BIFF_FN_Ttest, 4, "T.TEST"), /* XLS:TTEST */ + xls_func_entry(BIFF_FN_Prob, /*Var*/ 0, "PROB"), + xls_func_entry(BIFF_FN_Devsq, /*Var*/ 0, "DEVSQ"), + xls_func_entry(BIFF_FN_Geomean, /*Var*/ 0, "GEOMEAN"), + xls_func_entry(BIFF_FN_Harmean, /*Var*/ 0, "HARMEAN"), + xls_func_entry(BIFF_FN_Sumsq, /*Var*/ 0, "SUMSQ"), + xls_func_entry(BIFF_FN_Kurt, /*Var*/ 0, "KURT"), + xls_func_entry(BIFF_FN_Skew, /*Var*/ 0, "SKEW"), + xls_func_entry(BIFF_FN_Ztest, /*Var*/ 0, "Z.TEST"), /* XLS:ZTEST */ + xls_func_entry(BIFF_FN_Large, 2, "LARGE"), + xls_func_entry(BIFF_FN_Small, 2, "SMALL"), + xls_func_entry(BIFF_FN_Quartile, 2, "QUARTILE.INC"), /* XLS:QUARTILE */ + xls_func_entry(BIFF_FN_Percentile, 2, "PERCENTILE.INC"), /* XLS:PERCENTILE */ + xls_func_entry(BIFF_FN_Percentrank, /*Var*/ 0, "PERCENTRANK.INC"), /* XLS:PERCENTRANK */ + xls_func_entry(BIFF_FN_Mode, /*Var*/ 0, "MODE"), + xls_func_entry(BIFF_FN_Trimmean, 2, "TRIMMEAN"), + xls_func_entry(BIFF_FN_Tinv, 2, "T.INV.2T") /* XLS:TINV */ }; static const XLS_FUNC_ENTRY BIFF5_functions[] = /* ordered as Excel for completeness checking */ { - xls_func_entry(xlfWeekday, /*Var*/ 0, "WEEKDAY"), /* Var(1,2) in BIFF5 */ - xls_func_entry(xlfHlookup, /*Var*/ 0, "HLOOKUP"), /* Var(3,4) in BIFF5 */ - xls_func_entry(xlfVlookup, /*Var*/ 0, "VLOOKUP"), /* Var(3,4) in BIFF5 */ - xls_func_entry(xlfDays360, /*Var*/ 0, "DAYS_360"), /* XLS:DAYS360 */ /* Var(2,3) in BIFF5 */ - - xls_func_entry(xlfConcatenate, /*Var*/ 0, "JOIN"), /* XLS:CONCATENATE */ - xls_func_entry(xlfPower, 2, "POWER"), - xls_func_entry(xlfRadians, 1, "RAD"), /* XLS:RADIANS */ - xls_func_entry(xlfDegrees, 1, "DEG"), /* XLS:DEGREES */ - xls_func_entry(xlfSubtotal, /*Var*/ 0, ".SUBTOTAL"), - xls_func_entry(xlfSumif, /*Var*/ 0, ".SUMIF"), - xls_func_entry(xlfCountif, 2, ".COUNTIF"), - xls_func_entry(xlfCountblank, 1, "COUNTBLANK"), - xls_func_entry(xlfIspmt, 1, ".ISPMT"), - xls_func_entry(xlfDatedif, 3, ".DATEDIF"), - xls_func_entry(xlfDatestring, 1, ".DATESTRING"), - xls_func_entry(xlfNumberstring, 2, ".NUMBERSTRING"), - xls_func_entry(xlfRoman, /*Var*/ 0, ".ROMAN") + xls_func_entry(BIFF_FN_Weekday, /*Var*/ 0, "WEEKDAY"), /* Var(1,2) in BIFF5 */ + xls_func_entry(BIFF_FN_Hlookup, /*Var*/ 0, "HLOOKUP"), /* Var(3,4) in BIFF5 */ + xls_func_entry(BIFF_FN_Vlookup, /*Var*/ 0, "VLOOKUP"), /* Var(3,4) in BIFF5 */ + xls_func_entry(BIFF_FN_Days360, /*Var*/ 0, "DAYS_360"), /* XLS:DAYS360 */ /* Var(2,3) in BIFF5 */ + + xls_func_entry(BIFF_FN_Concatenate, /*Var*/ 0, "JOIN"), /* XLS:CONCATENATE */ + xls_func_entry(BIFF_FN_Power, 2, "POWER"), + xls_func_entry(BIFF_FN_Radians, 1, "RAD"), /* XLS:RADIANS */ + xls_func_entry(BIFF_FN_Degrees, 1, "DEG"), /* XLS:DEGREES */ + xls_func_entry(BIFF_FN_Subtotal, /*Var*/ 0, ".SUBTOTAL"), + xls_func_entry(BIFF_FN_Sumif, /*Var*/ 0, ".SUMIF"), + xls_func_entry(BIFF_FN_Countif, 2, ".COUNTIF"), + xls_func_entry(BIFF_FN_Countblank, 1, "COUNTBLANK"), + xls_func_entry(BIFF_FN_Ispmt, 1, ".ISPMT"), + xls_func_entry(BIFF_FN_Datedif, 3, ".DATEDIF"), + xls_func_entry(BIFF_FN_Datestring, 1, ".DATESTRING"), + xls_func_entry(BIFF_FN_Numberstring, 2, ".NUMBERSTRING"), + xls_func_entry(BIFF_FN_Roman, /*Var*/ 0, ".ROMAN") }; static const XLS_FUNC_ENTRY BIFF8_functions[] = /* ordered as Excel for completeness checking */ { - xls_func_entry(xlfGetPivotData, /*Var*/ 0, ".GETPIVOTDATA"), - xls_func_entry(xlfHyperlink, /*Var*/ 0, ".HYPERLINK"), - xls_func_entry(xlfPhonetic, 1, ".PHONETIC"), - xls_func_entry(xlfAverageA, /*Var*/ 0, "AVERAGEA"), - xls_func_entry(xlfMaxA, /*Var*/ 0, "MAXA"), - xls_func_entry(xlfMinA, /*Var*/ 0, "MINA"), - xls_func_entry(xlfStDevPA, /*Var*/ 0, "STDEVPA"), - xls_func_entry(xlfVarPA, /*Var*/ 0, "VARPA"), - xls_func_entry(xlfStDevA, /*Var*/ 0, "STDEVA"), - xls_func_entry(xlfVarA, /*Var*/ 0, "VARA") + xls_func_entry(BIFF_FN_GetPivotData, /*Var*/ 0, ".GETPIVOTDATA"), + xls_func_entry(BIFF_FN_Hyperlink, /*Var*/ 0, ".HYPERLINK"), + xls_func_entry(BIFF_FN_Phonetic, 1, ".PHONETIC"), + xls_func_entry(BIFF_FN_AverageA, /*Var*/ 0, "AVERAGEA"), + xls_func_entry(BIFF_FN_MaxA, /*Var*/ 0, "MAXA"), + xls_func_entry(BIFF_FN_MinA, /*Var*/ 0, "MINA"), + xls_func_entry(BIFF_FN_StDevPA, /*Var*/ 0, "STDEVPA"), + xls_func_entry(BIFF_FN_VarPA, /*Var*/ 0, "VARPA"), + xls_func_entry(BIFF_FN_StDevA, /*Var*/ 0, "STDEVA"), + xls_func_entry(BIFF_FN_VarA, /*Var*/ 0, "VARA") }; _Check_return_ @@ -1113,7 +1113,7 @@ p_xls_record( { PC_BYTE p_x = p_xls_load_info->p_file_start + opcode_offset; assert(opcode_offset + 4 /*opcode,record_length*/ + record_length <= p_xls_load_info->file_end_offset); - IGNOREPARM_InVal_(record_length); + UNREFERENCED_PARAMETER_InVal_(record_length); p_x += 4 /*opcode,record_length*/; return(p_x); } @@ -1819,7 +1819,7 @@ xls_quick_ublock_xls_string_add( status = xls_quick_ublock_sbchars_add(p_quick_ublock, (PC_SBCHARS) xls_string, n_chars, sbchar_codepage, allow_il_unicode); } - IGNOREPARM_InVal_(allow_il_unicode); /* on UNICODE builds this is ignored as no inlines are generated */ + UNREFERENCED_PARAMETER_InVal_(allow_il_unicode); /* on UNICODE builds this is ignored as no inlines are generated */ return(status); } @@ -2187,7 +2187,7 @@ xls_dump_records( extra_data[0] = CH_NULL; #if 0 /* limited reporting best for large sheets unless critical! */ - IGNOREPARM(p_x); + UNREFERENCED_PARAMETER(p_x); switch(opcode) { @@ -3117,7 +3117,7 @@ dialog_pswd_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_pswd) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -4129,7 +4129,7 @@ PROC_BSEARCH_PROTO(static, xls_proc_func_compare, U16, XLS_FUNC_ENTRY) BSEARCH_KEY_VAR_DECL(PC_U16, key); const U16 s1 = *key; BSEARCH_DATUM_VAR_DECL(PC_XLS_FUNC_ENTRY, datum); - const U16 s2 = datum->xls_func_number; + const U16 s2 = datum->biff_function_number; if(s1 > s2) return(1); @@ -4144,7 +4144,7 @@ _Check_return_ _Ret_maybenull_ static PC_XLS_FUNC_ENTRY xls_func_lookup( - _InVal_ U16 xls_func_number) + _InVal_ U16 biff_function_number) { PC_XLS_FUNC_ENTRY p_xls_func_entry = NULL; @@ -4152,33 +4152,33 @@ xls_func_lookup( if(biff_version >= 8) { if(NULL != (p_xls_func_entry = (PC_XLS_FUNC_ENTRY) - bsearch(&xls_func_number, BIFF8_functions, elemof(BIFF8_functions), sizeof(BIFF8_functions[0]), xls_proc_func_compare))) + bsearch(&biff_function_number, BIFF8_functions, elemof(BIFF8_functions), sizeof(BIFF8_functions[0]), xls_proc_func_compare))) return(p_xls_func_entry); } if(biff_version >= 5) { if(NULL != (p_xls_func_entry = (PC_XLS_FUNC_ENTRY) - bsearch(&xls_func_number, BIFF5_functions, elemof(BIFF5_functions), sizeof(BIFF5_functions[0]), xls_proc_func_compare))) + bsearch(&biff_function_number, BIFF5_functions, elemof(BIFF5_functions), sizeof(BIFF5_functions[0]), xls_proc_func_compare))) return(p_xls_func_entry); } if(biff_version >= 4) { if(NULL != (p_xls_func_entry = (PC_XLS_FUNC_ENTRY) - bsearch(&xls_func_number, BIFF4_functions, elemof(BIFF4_functions), sizeof(BIFF4_functions[0]), xls_proc_func_compare))) + bsearch(&biff_function_number, BIFF4_functions, elemof(BIFF4_functions), sizeof(BIFF4_functions[0]), xls_proc_func_compare))) return(p_xls_func_entry); } if(biff_version >= 3) { if(NULL != (p_xls_func_entry = (PC_XLS_FUNC_ENTRY) - bsearch(&xls_func_number, BIFF3_functions, elemof(BIFF3_functions), sizeof(BIFF3_functions[0]), xls_proc_func_compare))) + bsearch(&biff_function_number, BIFF3_functions, elemof(BIFF3_functions), sizeof(BIFF3_functions[0]), xls_proc_func_compare))) return(p_xls_func_entry); } p_xls_func_entry = (PC_XLS_FUNC_ENTRY) - bsearch(&xls_func_number, BIFF2_functions, elemof(BIFF2_functions), sizeof(BIFF2_functions[0]), xls_proc_func_compare); + bsearch(&biff_function_number, BIFF2_functions, elemof(BIFF2_functions), sizeof(BIFF2_functions[0]), xls_proc_func_compare); return(p_xls_func_entry); } @@ -4419,7 +4419,7 @@ extern_ref_sheet_name_out( PC_UCHARS filename = PtrAddBytes(PC_UCHARS, p_x, 2); assert(p_x[0] <= 0x04); assert(*p_len + filename_len + 1 + 1 < elemof_buffer); - IGNOREPARM_InVal_(elemof_buffer); + UNREFERENCED_PARAMETER_InVal_(elemof_buffer); PtrPutByteOff(uchars_buf, (*p_len)++, CH_LEFT_SQUARE_BRACKET); memcpy32(PtrAddBytes(P_UCHARS, uchars_buf, *p_len), filename, filename_len); *p_len += filename_len; @@ -5068,7 +5068,7 @@ func_decode( if( n_args > (U8) arg_stack_n) n_args = (U8) arg_stack_n; /* limit, and see what we can make of it */ - if(xlfExternCall == p_xls_func_entry->xls_func_number) + if(BIFF_FN_ExternCall == p_xls_func_entry->biff_function_number) { /* permute EXTERN.CALL args such that function name moves to TOS and all actual function args move down one */ P_USTR function_arg = arg_stack[(arg_stack_n - n_args) + 0]; @@ -5085,7 +5085,7 @@ func_decode( len_tot += ustrlen32(ustr_t5); #if 0 - if(xlfIrr == p_xls_func_entry->xls_func_number) + if(BIFF_FN_Irr == p_xls_func_entry->biff_function_number) { /* SKS create guess arg for IRR() if needed */ if(n_args == 1) @@ -5267,7 +5267,7 @@ static STATUS xls_decode_formula_ptg_FUNC(void) { const S32 symR = (cursym & ~0x60) | 0x20; /* convert V and A to corresponding R token */ - U16 xls_func_number; + U16 biff_function_number; U8 n_args = 0; /* keep dataflower happy */ PC_XLS_FUNC_ENTRY p_xls_func_entry = NULL; @@ -5275,11 +5275,11 @@ xls_decode_formula_ptg_FUNC(void) { case tFuncR: if(biff_version >= 4) - xls_func_number = xls_read_U16_LE(p_scan + 1); + biff_function_number = xls_read_U16_LE(p_scan + 1); else /* (biff_version < 4) */ - xls_func_number = (U16) p_scan[1]; + biff_function_number = (U16) p_scan[1]; - if(NULL != (p_xls_func_entry = xls_func_lookup(xls_func_number))) + if(NULL != (p_xls_func_entry = xls_func_lookup(biff_function_number))) n_args = p_xls_func_entry->n_args; break; @@ -5290,15 +5290,15 @@ xls_decode_formula_ptg_FUNC(void) n_args = (U8) (p_scan[1] & 0x7F); if(func_number_word & 0x8000U) break; - xls_func_number = (U16) (func_number_word & 0x7FFFU); + biff_function_number = (U16) (func_number_word & 0x7FFFU); } else /* (biff_version < 4) */ { n_args = (U8) p_scan[1]; - xls_func_number = (U16) p_scan[2]; + biff_function_number = (U16) p_scan[2]; } - p_xls_func_entry = xls_func_lookup(xls_func_number); + p_xls_func_entry = xls_func_lookup(biff_function_number); break; #if CHECKING @@ -5399,7 +5399,7 @@ xls_decode_formula_ptg_OTHER( U8 grbit = p_scan[1]; if(grbit & 0x10) { /* optimised SUM function */ - PC_XLS_FUNC_ENTRY p_xls_func_entry = xls_func_lookup(xlfSum); + PC_XLS_FUNC_ENTRY p_xls_func_entry = xls_func_lookup(BIFF_FN_Sum); PTR_ASSERT(p_xls_func_entry); status = func_decode(p_xls_func_entry, 1); } @@ -5506,7 +5506,7 @@ xls_decode_formula_result( _InoutRef_ P_QUICK_UBLOCK p_quick_ublock /*appended*/, _In_reads_c_(sizeof32(F64)) PC_BYTE p_formula_result) { - IGNOREPARM(p_xls_load_info); + UNREFERENCED_PARAMETER(p_xls_load_info); if( (0xFF == PtrGetByteOff(p_formula_result, 7)) && (0xFF == PtrGetByteOff(p_formula_result, 6)) ) @@ -5585,7 +5585,7 @@ xls_get_shared_formula( else /* (biff_version == 2) */ tl_col = (XLS_COL) p_formula[3]; - IGNOREPARM_InVal_(formula_len); + UNREFERENCED_PARAMETER_InVal_(formula_len); /* first, try cached offset as they do repeat a LOT */ if(0 != p_xls_load_info->shared_formula_opcode_offset) @@ -6460,7 +6460,7 @@ xls_cell_make_from_excel( zero_struct(xf_data); style_init(&style); - IGNOREPARM_InVal_(record_length); /* for now, check CONTINUE later */ + UNREFERENCED_PARAMETER_InVal_(record_length); /* for now, check CONTINUE later */ xls_read_cell_address_r2_c2(p_x, &row, &col); @@ -8257,7 +8257,7 @@ T5_MSG_PROTO(extern, xls_msg_insert_foreign, P_MSG_INSERT_FOREIGN p_msg_insert_f XLS_LOAD_INFO xls_load_info; zero_struct(xls_load_info); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 == p_msg_insert_foreign->retry_with_this_arg) { /* not a continuation of previous workbook */ diff --git a/t5/fs_123/fs_123.c b/t5/fs_123/fs_123.c index a887622..b7150d2 100644 --- a/t5/fs_123/fs_123.c +++ b/t5/fs_123/fs_123.c @@ -1477,7 +1477,7 @@ PROC_WRITE_PROTO(proc_write_cols) SCAN_BLOCK scan_block; OBJECT_DATA object_data; - IGNOREPARM_InRef_(p_lotus123_ins); + UNREFERENCED_PARAMETER_InRef_(p_lotus123_ins); if(status_done(cells_scan_init(p_docu, &scan_block, SCAN_DOWN, SCAN_AREA, &p_ff_op_format->of_op_format.save_docu_area, OBJECT_ID_NONE))) { @@ -1551,7 +1551,7 @@ PROC_WRITE_PROTO(proc_write_graph) STATUS status = lotus123_write_ins(p_ff_op_format, p_lotus123_ins); S32 i; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); for(i = 0; i < 26 && status_ok(status); ++i) status = lotus123_write_bytes(p_ff_op_format, part1, sizeof32(part1)); @@ -1580,7 +1580,7 @@ PROC_WRITE_PROTO(proc_write_range) STATUS status = lotus123_write_ins(p_ff_op_format, p_lotus123_ins); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(status_ok(status)) status = lotus123_write_bytes(p_ff_op_format, def_start, sizeof32(def_start) - 1); @@ -1668,7 +1668,7 @@ T5_MSG_PROTO(static, lotus123_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_ STATUS status = STATUS_OK; U32 i; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); limits_from_docu_area(p_docu, &g_s_col, &g_e_col, &g_s_row, &g_e_row, &p_ff_op_format->of_op_format.save_docu_area); @@ -1739,8 +1739,8 @@ T5_MSG_PROTO(static, lotus123_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_ T5_MSG_PROTO(static, lotus123_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fs_ascii/fs_ascii.c b/t5/fs_ascii/fs_ascii.c index 19dc0fb..41d87ba 100644 --- a/t5/fs_ascii/fs_ascii.c +++ b/t5/fs_ascii/fs_ascii.c @@ -35,7 +35,7 @@ T5_MSG_PROTO(extern, ascii_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg OBJECT_DATA object_data; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_done(cells_scan_init(p_docu, &scan_block, SCAN_ACROSS, SCAN_AREA, &p_ff_op_format->of_op_format.save_docu_area, OBJECT_ID_NONE))) { @@ -125,8 +125,8 @@ T5_MSG_PROTO(extern, ascii_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg T5_MSG_PROTO(static, ascii_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fs_csv/fs_csv.c b/t5/fs_csv/fs_csv.c index 8686ab8..fba93fc 100644 --- a/t5/fs_csv/fs_csv.c +++ b/t5/fs_csv/fs_csv.c @@ -105,7 +105,7 @@ T5_MSG_PROTO(static, csv_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s OBJECT_DATA object_data; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_done(cells_scan_init(p_docu, &scan_block, SCAN_ACROSS, SCAN_AREA, &p_ff_op_format->of_op_format.save_docu_area, OBJECT_ID_NONE))) { @@ -210,8 +210,8 @@ T5_MSG_PROTO(static, csv_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s T5_MSG_PROTO(static, csv_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fs_rtf/fs_rtf.c b/t5/fs_rtf/fs_rtf.c index 47797cd..e94c934 100644 --- a/t5/fs_rtf/fs_rtf.c +++ b/t5/fs_rtf/fs_rtf.c @@ -1095,7 +1095,7 @@ T5_MSG_PROTO(static, rtf_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s P_PAGE_HEFO_BREAK p_page_hefo_break; ROW row = -1; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* Write ASCII-7 encoded file - we hex encode all the top bit set and Unicode characters */ status_assert(foreign_save_set_io_type(p_ff_op_format, IO_TYPE_ASCII)); @@ -1328,8 +1328,8 @@ T5_MSG_PROTO(static, rtf_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s T5_MSG_PROTO(static, rtf_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fs_xls/fs_xls.c b/t5/fs_xls/fs_xls.c index 06f47d9..871518d 100644 --- a/t5/fs_xls/fs_xls.c +++ b/t5/fs_xls/fs_xls.c @@ -30,7 +30,7 @@ T5_MSG_PROTO(static, xls_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s { P_FF_OP_FORMAT p_ff_op_format = p_msg_save_foreign->p_ff_op_format; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); #if 1 return(xls_save_biff(p_docu, p_ff_op_format)); @@ -50,8 +50,8 @@ T5_MSG_PROTO(static, xls_msg_save_foreign, _InoutRef_ P_MSG_SAVE_FOREIGN p_msg_s T5_MSG_PROTO(static, xls_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/fs_xls/fs_xls_saveb.c b/t5/fs_xls/fs_xls_saveb.c index 8ecbd2c..2b16cdc 100644 --- a/t5/fs_xls/fs_xls_saveb.c +++ b/t5/fs_xls/fs_xls_saveb.c @@ -161,10 +161,10 @@ static XLS_SCAN_SYMBOL xls_scan_symbol; typedef struct XLS_COMPILER_FUNC_ENTRY { - PC_A7STR a7str_text_t5; /* Fireworkz' function name */ + PC_A7STR a7str_text_t5; /* Fireworkz' function name */ - U16 xlf_number; /* Excel's function number (see xlcall.h) */ - S32 token; /* Excel function token (depends on return type) */ + U16 biff_function_number; /* Excel BIFF function number */ + S32 token; /* Excel function token (depends on return type) */ PC_BYTE p_args; U8 min_args; U8 max_args; @@ -172,8 +172,8 @@ typedef struct XLS_COMPILER_FUNC_ENTRY } XLS_COMPILER_FUNC_ENTRY; typedef const XLS_COMPILER_FUNC_ENTRY * PC_XLS_COMPILER_FUNC_ENTRY; -#define xls_func_entry(xlf_number, token, p_args, min_args, max_args, p_text_t5) \ - { p_text_t5, xlf_number, token, p_args, min_args, max_args, 0, 0 } +#define xls_func_entry(biff_fn_number, token, p_args, min_args, max_args, p_text_t5) \ + { p_text_t5, biff_fn_number, token, p_args, min_args, max_args, 0, 0 } static const BYTE arg_R[] = @@ -245,156 +245,156 @@ arg_A_A_V[] = static const XLS_COMPILER_FUNC_ENTRY BIFF3_compiler_functions[] = /* ordered as Fireworkz */ { - xls_func_entry(xlfAbs, tFuncV, arg_V, 1, 1, "ABS"), - xls_func_entry(xlfAddress, tFuncVarV, arg_V, 2, 5, "ADDRESS"), - xls_func_entry(xlfAnd, tFuncVarV, arg_R, 1, 30, "AND"), - xls_func_entry(xlfAcos, tFuncV, arg_V, 1, 1, "ACOS"), - xls_func_entry(xlfAcosh, tFuncV, arg_V, 1, 1, "ACOSH"), - xls_func_entry(xlfAsin, tFuncV, arg_V, 1, 1, "ASIN"), - xls_func_entry(xlfAsinh, tFuncV, arg_V, 1, 1, "ASINH"), - xls_func_entry(xlfAtan, tFuncV, arg_V, 1, 1, "ATAN"), - xls_func_entry(xlfAtan2, tFuncV, arg_V, 2, 2, "ATAN_2"), /* XLS:ATAN2 */ - xls_func_entry(xlfAtanh, tFuncV, arg_V, 1, 1, "ATANH"), - xls_func_entry(xlfAverage, tFuncVarV, arg_R, 1, 30, "AVG"), /* XLS:AVERAGE */ - - xls_func_entry(xlfChar, tFuncV, arg_V, 1, 1, "CHAR"), - xls_func_entry(xlfChoose, tFuncVarV, arg_V_R, 2, 30, "CHOOSE"), - xls_func_entry(xlfClean, tFuncV, arg_V, 1, 1, "CLEAN"), - xls_func_entry(xlfCode, tFuncV, arg_V, 1, 1, "CODE"), - xls_func_entry(xlfColumn, tFuncVarV, arg_R, 0, 1, "COL"), /* XLS:COLUMN */ - xls_func_entry(xlfColumns, tFuncV, arg_R, 1, 1, "COLS"), /* XLS:COLUMNS */ - xls_func_entry(xlfCos, tFuncV, arg_V, 1, 1, "COS"), - xls_func_entry(xlfCosh, tFuncV, arg_V, 1, 1, "COSH"), - xls_func_entry(xlfCount, tFuncVarV, arg_R, 0, 30, "COUNT"), - xls_func_entry(xlfCounta, tFuncVarV, arg_R, 0, 30, "COUNTA"), - - xls_func_entry(xlfDate, tFuncV, arg_V, 3, 3, "DATE"), - xls_func_entry(xlfDatevalue, tFuncV, arg_V, 1, 1, "DATEVALUE"), - xls_func_entry(xlfDaverage, tFuncV, arg_R, 3, 3, "DAVG"), /* XLS:DAVERAGE */ - xls_func_entry(xlfDay, tFuncV, arg_V, 1, 1, "DAY"), - xls_func_entry(xlfDays360, tFuncV, arg_V, 2, 2, "DAYS_360"), /* XLS:DAYS360 */ - xls_func_entry(xlfDdb, tFuncVarV, arg_V, 4, 5, "DDB"), - xls_func_entry(xlfDegrees, tFuncV, arg_V, 1, 1, "DEG"), /* XLS:DEGREES (BIFF5) */ - - xls_func_entry(xlfExact, tFuncV, arg_V, 2, 2, "EXACT"), - xls_func_entry(xlfExp, tFuncV, arg_V, 1, 1, "EXP"), - - xls_func_entry(xlfFact, tFuncV, arg_V, 1, 1, "FACT"), - xls_func_entry(xlfFalse, tFuncV, NULL, 0, 0, "FALSE"), - xls_func_entry(xlfFind, tFuncVarV, arg_V, 2, 3, "FIND"), - xls_func_entry(xlfFixed, tFuncVarV, arg_V, 2, 3, "FIXED"), - - xls_func_entry(xlfGrowth, tFuncVarA, arg_R, 1, 3, "GROWTH"), - - xls_func_entry(xlfHlookup, tFuncV, arg_V_R, 3, 3, "HLOOKUP"), - xls_func_entry(xlfHour, tFuncV, arg_V, 1, 1, "HOUR"), - - xls_func_entry(xlfIf, tFuncVarR, arg_V_R, 2, 3, "IF"), - xls_func_entry(xlfInt, tFuncV, arg_V, 1, 1, "INT"), /* NB XLS:INT is different for negative numbers but this is better than failing */ - xls_func_entry(xlfIsblank, tFuncV, arg_V, 1, 1, "ISBLANK"), - xls_func_entry(xlfIserr, tFuncV, arg_V, 1, 1, "ISERR"), - xls_func_entry(xlfIserror, tFuncV, arg_V, 1, 1, "ISERROR"), - xls_func_entry(xlfIslogical, tFuncV, arg_V, 1, 1, "ISLOGICAL"), - xls_func_entry(xlfIsna, tFuncV, arg_V, 1, 1, "ISNA"), - xls_func_entry(xlfIsnontext, tFuncV, arg_V, 1, 1, "ISNONTEXT"), - xls_func_entry(xlfIsnumber, tFuncV, arg_V, 1, 1, "ISNUMBER"), - xls_func_entry(xlfIsref, tFuncV, arg_R, 1, 1, "ISREF"), - xls_func_entry(xlfIstext, tFuncV, arg_V, 1, 1, "ISTEXT"), - - xls_func_entry(xlfConcatenate, tFuncVarV, arg_V, 0, 30, "JOIN"), /* XLS:CONCATENATE */ - - xls_func_entry(xlfLeft, tFuncVarV, arg_V, 1, 2, "LEFT"), - xls_func_entry(xlfLen, tFuncV, arg_V, 1, 1, "LENGTH"), /* XLS:LEN */ - xls_func_entry(xlfLinest, tFuncVarA, arg_R, 1, 2, "LINEST"), - xls_func_entry(xlfLn, tFuncV, arg_V, 1, 1, "LN"), - xls_func_entry(xlfLog10, tFuncV, arg_V, 1, 1, "ODF.LOG10"), /* XLS:LOG10 */ - xls_func_entry(xlfLog, tFuncVarV, arg_V, 1, 2, "LOG"), - xls_func_entry(xlfLogest, tFuncVarA, arg_R, 1, 2, "LOGEST"), - xls_func_entry(xlfLookup, tFuncVarV, arg_V_R, 2, 3, "LOOKUP"), - xls_func_entry(xlfLower, tFuncV, arg_V, 1, 1, "LOWER"), - - xls_func_entry(xlfMdeterm, tFuncV, arg_A, 1, 1, "M_DETERM"), - xls_func_entry(xlfMinverse, tFuncA, arg_A, 1, 1, "M_INVERSE"), - xls_func_entry(xlfMmult, tFuncA, arg_A, 2, 2, "M_MULT"), - - xls_func_entry(xlfMatch, tFuncVarV, arg_V_R, 2, 3, "MATCH"), - xls_func_entry(xlfMax, tFuncVarV, arg_R, 1, 30, "MAX"), - xls_func_entry(xlfMedian, tFuncVarV, arg_R, 1, 30, "MEDIAN"), - xls_func_entry(xlfMid, tFuncV, arg_V, 3, 3, "MID"), - xls_func_entry(xlfMin, tFuncVarV, arg_R, 1, 30, "MIN"), - xls_func_entry(xlfMinute, tFuncV, arg_V, 1, 1, "MINUTE"), - xls_func_entry(xlfMirr, tFuncV, arg_R_V, 3, 3, "MIRR"), - xls_func_entry(xlfMod, tFuncV, arg_V, 2, 2, "MOD"), - xls_func_entry(xlfMonth, tFuncV, arg_V, 1, 1, "MONTH"), - - xls_func_entry(xlfN, tFuncV, arg_R, 1, 1, "N"), - xls_func_entry(xlfNa, tFuncV, NULL, 0, 0, "NA"), - xls_func_entry(xlfNot, tFuncV, arg_V, 1, 1, "NOT"), - xls_func_entry(xlfNow, tFuncV, NULL, 0, 0, "NOW"), - xls_func_entry(xlfNper, tFuncVarV, arg_V, 3, 5, "NPER"), - xls_func_entry(xlfNpv, tFuncVarV, arg_V_R, 2, 30, "NPV"), - - xls_func_entry(xlfFv, tFuncVarV, arg_V, 3, 5, "ODF.FV"), /* XLS:FV */ - xls_func_entry(xlfIndex, tFuncVarR, arg_R_V, 2, 4, "ODF.INDEX"), /* XLS:INDEX */ - xls_func_entry(xlfInt, tFuncV, arg_V, 1, 1, "ODF.INT"), /* XLS:INT */ - xls_func_entry(xlfIrr, tFuncVarV, arg_R_V, 1, 2, "ODF.IRR"), /* XLS:IRR */ - xls_func_entry(xlfPmt, tFuncVarV, arg_V, 3, 5, "ODF.PMT"), /* XLS:PMT */ - xls_func_entry(xlfType, tFuncV, arg_V, 1, 1, "ODF.TYPE"), /* XLS:TYPE */ - - xls_func_entry(xlfOr, tFuncVarV, arg_R, 1, 30, "OR"), - - xls_func_entry(xlfPi, tFuncV, NULL, 0, 0, "PI"), - xls_func_entry(xlfProduct, tFuncVarV, arg_R, 1, 30, "PRODUCT"), - xls_func_entry(xlfProper, tFuncV, arg_V, 1, 1, "PROPER"), - xls_func_entry(xlfPv, tFuncVarV, arg_V, 3, 5, "PV"), - - xls_func_entry(xlfRadians, tFuncV, arg_V, 1, 1, "RAD"), /* XLS:RADIANS */ - xls_func_entry(xlfRand, tFuncV, NULL, 0, 0, "RAND"), - xls_func_entry(xlfRate, tFuncVarV, arg_V, 3, 6, "RATE"), - xls_func_entry(xlfReplace, tFuncV, arg_V, 4, 4, "REPLACE"), - xls_func_entry(xlfRept, tFuncV, arg_V, 2, 2, "REPT"), - xls_func_entry(xlfRight, tFuncVarV, arg_V, 1, 2, "RIGHT"), - xls_func_entry(xlfRound, tFuncV, arg_V, 2, 2, "ROUND"), - xls_func_entry(xlfRounddown, tFuncV, arg_V, 2, 2, "ROUNDDOWN"), - xls_func_entry(xlfRoundup, tFuncV, arg_V, 2, 2, "ROUNDUP"), - xls_func_entry(xlfRow, tFuncVarV, arg_R, 0, 1, "ROW"), - xls_func_entry(xlfRows, tFuncV, arg_R, 1, 1, "ROWS"), - - xls_func_entry(xlfSecond, tFuncV, arg_V, 1, 1, "SECOND"), - xls_func_entry(xlfSign, tFuncV, arg_V, 1, 1, "SGN"), /* XLS:SIGN */ - xls_func_entry(xlfSin, tFuncV, arg_V, 1, 1, "SIN"), - xls_func_entry(xlfSinh, tFuncV, arg_V, 1, 1, "SINH"), - xls_func_entry(xlfSln, tFuncV, arg_V, 3, 3, "SLN"), - xls_func_entry(xlfSqrt, tFuncV, arg_V, 1, 1, "SQR"), /* XLS:SQRT */ - xls_func_entry(xlfStdev, tFuncVarV, arg_R, 1, 30, "STD"), /* XLS:STDEV */ - xls_func_entry(xlfStdevp, tFuncVarV, arg_R, 1, 30, "STDP"), /* XLS:STDEVP */ - xls_func_entry(xlfSum, tFuncVarV, arg_R, 1, 30, "SUM"), - xls_func_entry(xlfSumproduct, tFuncVarV, arg_A, 1, 30, "SUMPRODUCT"), - xls_func_entry(xlfSyd, tFuncV, arg_V, 4, 4, "SYD"), - - xls_func_entry(xlfT, tFuncV, arg_R, 1, 1, "T"), - xls_func_entry(xlfTan, tFuncV, arg_V, 1, 1, "TAN"), - xls_func_entry(xlfTanh, tFuncV, arg_V, 1, 1, "TANH"), - xls_func_entry(xlfText, tFuncV, arg_V, 2, 2, "TEXT"), - xls_func_entry(xlfTime, tFuncV, arg_V, 3, 3, "TIME"), - xls_func_entry(xlfTimevalue, tFuncV, arg_V, 1, 1, "TIMEVALUE"), - xls_func_entry(xlfToday, tFuncV, NULL, 0, 0, "TODAY"), - xls_func_entry(xlfTranspose, tFuncA, arg_A, 1, 1, "TRANSPOSE"), - xls_func_entry(xlfTrend, tFuncVarA, arg_R, 1, 3, "TREND"), - xls_func_entry(xlfTrim, tFuncV, arg_V, 1, 1, "TRIM"), - xls_func_entry(xlfTrue, tFuncV, NULL, 0, 0, "TRUE"), - xls_func_entry(xlfTrunc, tFuncVarV, arg_V, 1, 2, "TRUNC"), - - xls_func_entry(xlfUpper, tFuncV, arg_V, 1, 1, "UPPER"), - - xls_func_entry(xlfValue, tFuncV, arg_V, 1, 1, "VALUE"), - xls_func_entry(xlfVar, tFuncVarV, arg_R, 1, 30 , "VAR"), - xls_func_entry(xlfVarp, tFuncVarV, arg_R, 1, 30, "VARP"), - xls_func_entry(xlfVlookup, tFuncV, arg_V_R, 3, 3, "VLOOKUP"), - - xls_func_entry(xlfWeekday, tFuncV, arg_V, 1, 1, "WEEKDAY"), - - xls_func_entry(xlfYear, tFuncV, arg_V, 1, 1, "YEAR") + xls_func_entry(BIFF_FN_Abs, tFuncV, arg_V, 1, 1, "ABS"), + xls_func_entry(BIFF_FN_Address, tFuncVarV, arg_V, 2, 5, "ADDRESS"), + xls_func_entry(BIFF_FN_And, tFuncVarV, arg_R, 1, 30, "AND"), + xls_func_entry(BIFF_FN_Acos, tFuncV, arg_V, 1, 1, "ACOS"), + xls_func_entry(BIFF_FN_Acosh, tFuncV, arg_V, 1, 1, "ACOSH"), + xls_func_entry(BIFF_FN_Asin, tFuncV, arg_V, 1, 1, "ASIN"), + xls_func_entry(BIFF_FN_Asinh, tFuncV, arg_V, 1, 1, "ASINH"), + xls_func_entry(BIFF_FN_Atan, tFuncV, arg_V, 1, 1, "ATAN"), + xls_func_entry(BIFF_FN_Atan2, tFuncV, arg_V, 2, 2, "ATAN_2"), /* XLS:ATAN2 */ + xls_func_entry(BIFF_FN_Atanh, tFuncV, arg_V, 1, 1, "ATANH"), + xls_func_entry(BIFF_FN_Average, tFuncVarV, arg_R, 1, 30, "AVG"), /* XLS:AVERAGE */ + + xls_func_entry(BIFF_FN_Char, tFuncV, arg_V, 1, 1, "CHAR"), + xls_func_entry(BIFF_FN_Choose, tFuncVarV, arg_V_R, 2, 30, "CHOOSE"), + xls_func_entry(BIFF_FN_Clean, tFuncV, arg_V, 1, 1, "CLEAN"), + xls_func_entry(BIFF_FN_Code, tFuncV, arg_V, 1, 1, "CODE"), + xls_func_entry(BIFF_FN_Column, tFuncVarV, arg_R, 0, 1, "COL"), /* XLS:COLUMN */ + xls_func_entry(BIFF_FN_Columns, tFuncV, arg_R, 1, 1, "COLS"), /* XLS:COLUMNS */ + xls_func_entry(BIFF_FN_Cos, tFuncV, arg_V, 1, 1, "COS"), + xls_func_entry(BIFF_FN_Cosh, tFuncV, arg_V, 1, 1, "COSH"), + xls_func_entry(BIFF_FN_Count, tFuncVarV, arg_R, 0, 30, "COUNT"), + xls_func_entry(BIFF_FN_Counta, tFuncVarV, arg_R, 0, 30, "COUNTA"), + + xls_func_entry(BIFF_FN_Date, tFuncV, arg_V, 3, 3, "DATE"), + xls_func_entry(BIFF_FN_Datevalue, tFuncV, arg_V, 1, 1, "DATEVALUE"), + xls_func_entry(BIFF_FN_Daverage, tFuncV, arg_R, 3, 3, "DAVG"), /* XLS:DAVERAGE */ + xls_func_entry(BIFF_FN_Day, tFuncV, arg_V, 1, 1, "DAY"), + xls_func_entry(BIFF_FN_Days360, tFuncV, arg_V, 2, 2, "DAYS_360"), /* XLS:DAYS360 */ + xls_func_entry(BIFF_FN_Ddb, tFuncVarV, arg_V, 4, 5, "DDB"), + xls_func_entry(BIFF_FN_Degrees, tFuncV, arg_V, 1, 1, "DEG"), /* XLS:DEGREES (BIFF5) */ + + xls_func_entry(BIFF_FN_Exact, tFuncV, arg_V, 2, 2, "EXACT"), + xls_func_entry(BIFF_FN_Exp, tFuncV, arg_V, 1, 1, "EXP"), + + xls_func_entry(BIFF_FN_Fact, tFuncV, arg_V, 1, 1, "FACT"), + xls_func_entry(BIFF_FN_False, tFuncV, NULL, 0, 0, "FALSE"), + xls_func_entry(BIFF_FN_Find, tFuncVarV, arg_V, 2, 3, "FIND"), + xls_func_entry(BIFF_FN_Fixed, tFuncVarV, arg_V, 2, 3, "FIXED"), + + xls_func_entry(BIFF_FN_Growth, tFuncVarA, arg_R, 1, 3, "GROWTH"), + + xls_func_entry(BIFF_FN_Hlookup, tFuncV, arg_V_R, 3, 3, "HLOOKUP"), + xls_func_entry(BIFF_FN_Hour, tFuncV, arg_V, 1, 1, "HOUR"), + + xls_func_entry(BIFF_FN_If, tFuncVarR, arg_V_R, 2, 3, "IF"), + xls_func_entry(BIFF_FN_Int, tFuncV, arg_V, 1, 1, "INT"), /* NB XLS:INT is different for negative numbers but this is better than failing */ + xls_func_entry(BIFF_FN_Isblank, tFuncV, arg_V, 1, 1, "ISBLANK"), + xls_func_entry(BIFF_FN_Iserr, tFuncV, arg_V, 1, 1, "ISERR"), + xls_func_entry(BIFF_FN_Iserror, tFuncV, arg_V, 1, 1, "ISERROR"), + xls_func_entry(BIFF_FN_Islogical, tFuncV, arg_V, 1, 1, "ISLOGICAL"), + xls_func_entry(BIFF_FN_Isna, tFuncV, arg_V, 1, 1, "ISNA"), + xls_func_entry(BIFF_FN_Isnontext, tFuncV, arg_V, 1, 1, "ISNONTEXT"), + xls_func_entry(BIFF_FN_Isnumber, tFuncV, arg_V, 1, 1, "ISNUMBER"), + xls_func_entry(BIFF_FN_Isref, tFuncV, arg_R, 1, 1, "ISREF"), + xls_func_entry(BIFF_FN_Istext, tFuncV, arg_V, 1, 1, "ISTEXT"), + + xls_func_entry(BIFF_FN_Concatenate, tFuncVarV, arg_V, 0, 30, "JOIN"), /* XLS:CONCATENATE */ + + xls_func_entry(BIFF_FN_Left, tFuncVarV, arg_V, 1, 2, "LEFT"), + xls_func_entry(BIFF_FN_Len, tFuncV, arg_V, 1, 1, "LENGTH"), /* XLS:LEN */ + xls_func_entry(BIFF_FN_Linest, tFuncVarA, arg_R, 1, 2, "LINEST"), + xls_func_entry(BIFF_FN_Ln, tFuncV, arg_V, 1, 1, "LN"), + xls_func_entry(BIFF_FN_Log10, tFuncV, arg_V, 1, 1, "ODF.LOG10"), /* XLS:LOG10 */ + xls_func_entry(BIFF_FN_Log, tFuncVarV, arg_V, 1, 2, "LOG"), + xls_func_entry(BIFF_FN_Logest, tFuncVarA, arg_R, 1, 2, "LOGEST"), + xls_func_entry(BIFF_FN_Lookup, tFuncVarV, arg_V_R, 2, 3, "LOOKUP"), + xls_func_entry(BIFF_FN_Lower, tFuncV, arg_V, 1, 1, "LOWER"), + + xls_func_entry(BIFF_FN_Mdeterm, tFuncV, arg_A, 1, 1, "M_DETERM"), + xls_func_entry(BIFF_FN_Minverse, tFuncA, arg_A, 1, 1, "M_INVERSE"), + xls_func_entry(BIFF_FN_Mmult, tFuncA, arg_A, 2, 2, "M_MULT"), + + xls_func_entry(BIFF_FN_Match, tFuncVarV, arg_V_R, 2, 3, "MATCH"), + xls_func_entry(BIFF_FN_Max, tFuncVarV, arg_R, 1, 30, "MAX"), + xls_func_entry(BIFF_FN_Median, tFuncVarV, arg_R, 1, 30, "MEDIAN"), + xls_func_entry(BIFF_FN_Mid, tFuncV, arg_V, 3, 3, "MID"), + xls_func_entry(BIFF_FN_Min, tFuncVarV, arg_R, 1, 30, "MIN"), + xls_func_entry(BIFF_FN_Minute, tFuncV, arg_V, 1, 1, "MINUTE"), + xls_func_entry(BIFF_FN_Mirr, tFuncV, arg_R_V, 3, 3, "MIRR"), + xls_func_entry(BIFF_FN_Mod, tFuncV, arg_V, 2, 2, "MOD"), + xls_func_entry(BIFF_FN_Month, tFuncV, arg_V, 1, 1, "MONTH"), + + xls_func_entry(BIFF_FN_N, tFuncV, arg_R, 1, 1, "N"), + xls_func_entry(BIFF_FN_Na, tFuncV, NULL, 0, 0, "NA"), + xls_func_entry(BIFF_FN_Not, tFuncV, arg_V, 1, 1, "NOT"), + xls_func_entry(BIFF_FN_Now, tFuncV, NULL, 0, 0, "NOW"), + xls_func_entry(BIFF_FN_Nper, tFuncVarV, arg_V, 3, 5, "NPER"), + xls_func_entry(BIFF_FN_Npv, tFuncVarV, arg_V_R, 2, 30, "NPV"), + + xls_func_entry(BIFF_FN_Fv, tFuncVarV, arg_V, 3, 5, "ODF.FV"), /* XLS:FV */ + xls_func_entry(BIFF_FN_Index, tFuncVarR, arg_R_V, 2, 4, "ODF.INDEX"), /* XLS:INDEX */ + xls_func_entry(BIFF_FN_Int, tFuncV, arg_V, 1, 1, "ODF.INT"), /* XLS:INT */ + xls_func_entry(BIFF_FN_Irr, tFuncVarV, arg_R_V, 1, 2, "ODF.IRR"), /* XLS:IRR */ + xls_func_entry(BIFF_FN_Pmt, tFuncVarV, arg_V, 3, 5, "ODF.PMT"), /* XLS:PMT */ + xls_func_entry(BIFF_FN_Type, tFuncV, arg_V, 1, 1, "ODF.TYPE"), /* XLS:TYPE */ + + xls_func_entry(BIFF_FN_Or, tFuncVarV, arg_R, 1, 30, "OR"), + + xls_func_entry(BIFF_FN_Pi, tFuncV, NULL, 0, 0, "PI"), + xls_func_entry(BIFF_FN_Product, tFuncVarV, arg_R, 1, 30, "PRODUCT"), + xls_func_entry(BIFF_FN_Proper, tFuncV, arg_V, 1, 1, "PROPER"), + xls_func_entry(BIFF_FN_Pv, tFuncVarV, arg_V, 3, 5, "PV"), + + xls_func_entry(BIFF_FN_Radians, tFuncV, arg_V, 1, 1, "RAD"), /* XLS:RADIANS */ + xls_func_entry(BIFF_FN_Rand, tFuncV, NULL, 0, 0, "RAND"), + xls_func_entry(BIFF_FN_Rate, tFuncVarV, arg_V, 3, 6, "RATE"), + xls_func_entry(BIFF_FN_Replace, tFuncV, arg_V, 4, 4, "REPLACE"), + xls_func_entry(BIFF_FN_Rept, tFuncV, arg_V, 2, 2, "REPT"), + xls_func_entry(BIFF_FN_Right, tFuncVarV, arg_V, 1, 2, "RIGHT"), + xls_func_entry(BIFF_FN_Round, tFuncV, arg_V, 2, 2, "ROUND"), + xls_func_entry(BIFF_FN_Rounddown, tFuncV, arg_V, 2, 2, "ROUNDDOWN"), + xls_func_entry(BIFF_FN_Roundup, tFuncV, arg_V, 2, 2, "ROUNDUP"), + xls_func_entry(BIFF_FN_Row, tFuncVarV, arg_R, 0, 1, "ROW"), + xls_func_entry(BIFF_FN_Rows, tFuncV, arg_R, 1, 1, "ROWS"), + + xls_func_entry(BIFF_FN_Second, tFuncV, arg_V, 1, 1, "SECOND"), + xls_func_entry(BIFF_FN_Sign, tFuncV, arg_V, 1, 1, "SGN"), /* XLS:SIGN */ + xls_func_entry(BIFF_FN_Sin, tFuncV, arg_V, 1, 1, "SIN"), + xls_func_entry(BIFF_FN_Sinh, tFuncV, arg_V, 1, 1, "SINH"), + xls_func_entry(BIFF_FN_Sln, tFuncV, arg_V, 3, 3, "SLN"), + xls_func_entry(BIFF_FN_Sqrt, tFuncV, arg_V, 1, 1, "SQR"), /* XLS:SQRT */ + xls_func_entry(BIFF_FN_Stdev, tFuncVarV, arg_R, 1, 30, "STD"), /* XLS:STDEV */ + xls_func_entry(BIFF_FN_Stdevp, tFuncVarV, arg_R, 1, 30, "STDP"), /* XLS:STDEVP */ + xls_func_entry(BIFF_FN_Sum, tFuncVarV, arg_R, 1, 30, "SUM"), + xls_func_entry(BIFF_FN_Sumproduct, tFuncVarV, arg_A, 1, 30, "SUMPRODUCT"), + xls_func_entry(BIFF_FN_Syd, tFuncV, arg_V, 4, 4, "SYD"), + + xls_func_entry(BIFF_FN_T, tFuncV, arg_R, 1, 1, "T"), + xls_func_entry(BIFF_FN_Tan, tFuncV, arg_V, 1, 1, "TAN"), + xls_func_entry(BIFF_FN_Tanh, tFuncV, arg_V, 1, 1, "TANH"), + xls_func_entry(BIFF_FN_Text, tFuncV, arg_V, 2, 2, "TEXT"), + xls_func_entry(BIFF_FN_Time, tFuncV, arg_V, 3, 3, "TIME"), + xls_func_entry(BIFF_FN_Timevalue, tFuncV, arg_V, 1, 1, "TIMEVALUE"), + xls_func_entry(BIFF_FN_Today, tFuncV, NULL, 0, 0, "TODAY"), + xls_func_entry(BIFF_FN_Transpose, tFuncA, arg_A, 1, 1, "TRANSPOSE"), + xls_func_entry(BIFF_FN_Trend, tFuncVarA, arg_R, 1, 3, "TREND"), + xls_func_entry(BIFF_FN_Trim, tFuncV, arg_V, 1, 1, "TRIM"), + xls_func_entry(BIFF_FN_True, tFuncV, NULL, 0, 0, "TRUE"), + xls_func_entry(BIFF_FN_Trunc, tFuncVarV, arg_V, 1, 2, "TRUNC"), + + xls_func_entry(BIFF_FN_Upper, tFuncV, arg_V, 1, 1, "UPPER"), + + xls_func_entry(BIFF_FN_Value, tFuncV, arg_V, 1, 1, "VALUE"), + xls_func_entry(BIFF_FN_Var, tFuncVarV, arg_R, 1, 30 , "VAR"), + xls_func_entry(BIFF_FN_Varp, tFuncVarV, arg_R, 1, 30, "VARP"), + xls_func_entry(BIFF_FN_Vlookup, tFuncV, arg_V_R, 3, 3, "VLOOKUP"), + + xls_func_entry(BIFF_FN_Weekday, tFuncV, arg_V, 1, 1, "WEEKDAY"), + + xls_func_entry(BIFF_FN_Year, tFuncV, arg_V, 1, 1, "YEAR") }; /* @@ -404,96 +404,96 @@ Later Excel versions add more functions, and the number of arguments can change static const XLS_COMPILER_FUNC_ENTRY BIFF4_compiler_functions[] = /* ordered as Fireworkz */ { - xls_func_entry(xlfAvedev, tFuncVarV, arg_R, 1, 30, "AVEDEV"), - xls_func_entry(xlfBinomdist, tFuncV, arg_V, 4, 4, "BINOM.DIST"), /* XLS:BINOMDIST */ - xls_func_entry(xlfCritbinom, tFuncV, arg_V, 3, 3, "BINOM.INV"), /* XLS:CRITBINOM */ - xls_func_entry(xlfCeiling, tFuncV, arg_V, 2, 2, "CEILING"), - xls_func_entry(xlfChidist, tFuncV, arg_V, 2, 2, "CHISQ.DIST.RT"), /* XLS:CHIDIST */ - xls_func_entry(xlfChiinv, tFuncV, arg_V, 2, 2, "CHISQ.INV.RT"), /* XLS:CHIINV */ - xls_func_entry(xlfChitest, tFuncV, arg_A, 2, 2, "CHISQ.TEST"), /* XLS:CHITEST */ - xls_func_entry(xlfCombin, tFuncV, arg_V, 2, 2, "COMBIN"), - xls_func_entry(xlfConfidence, tFuncV, arg_V, 3, 3, "CONFIDENCE.NORM"), /* XLS:CONFIDENCE */ - xls_func_entry(xlfCorrel, tFuncV, arg_A, 2, 2, "CORREL"), - xls_func_entry(xlfCovar, tFuncV, arg_A, 2, 2, "COVARIANCE.P"), /* XLS:COVAR */ - xls_func_entry(xlfDb, tFuncVarV, arg_V, 4, 5, "DB"), - xls_func_entry(xlfDevsq, tFuncVarV, arg_R, 1, 30, "DEVSQ"), - xls_func_entry(xlfEven, tFuncV, arg_V, 1, 1, "EVEN"), - xls_func_entry(xlfExpondist, tFuncV, arg_V, 3, 3, "EXPON.DIST"), /* XLS:EXPONDIST */ /* NB Excel requires third optional parameter */ - xls_func_entry(xlfFdist, tFuncV, arg_V, 3, 3, "F.DIST.RT"), /* XLS:FDIST */ - xls_func_entry(xlfFinv, tFuncV, arg_V, 3, 3, "F.INV.RT"), /* XLS:FINV */ - xls_func_entry(xlfFtest, tFuncV, arg_A, 2, 2, "F.TEST"), /* XLS:FTEST */ - xls_func_entry(xlfFisher, tFuncV, arg_V, 1, 1, "FISHER"), - xls_func_entry(xlfFisherinv, tFuncV, arg_V, 1, 1, "FISHERINV"), - xls_func_entry(xlfFixed, tFuncVarV, arg_V, 2, 3, "FIXED"), - xls_func_entry(xlfFloor, tFuncV, arg_V, 2, 2, "FLOOR"), - xls_func_entry(xlfFrequency, tFuncA, arg_R, 2, 2, "FREQUENCY"), - xls_func_entry(xlfGammadist, tFuncV, arg_V, 4, 4, "GAMMA.DIST"), /* XLS:GAMMADIST */ /* NB Excel requires fourth optional parameter */ - xls_func_entry(xlfGammainv, tFuncV, arg_V, 3, 3, "GAMMA.INV"), /* XLS:GAMMAINV */ - xls_func_entry(xlfGammaln, tFuncV, arg_V, 1, 1, "GAMMALN"), - xls_func_entry(xlfGeomean, tFuncVarV, arg_R, 1, 30, "GEOMEAN"), - xls_func_entry(xlfHarmean, tFuncVarV, arg_R, 1, 30, "HARMEAN"), - xls_func_entry(xlfHypgeomdist, tFuncV, arg_V, 4, 4, "HYPGEOM.DIST"), /* XLS:HYPGEOMDIST */ /* NB Excel doesn't cater for fifth optional parameter */ - xls_func_entry(xlfLognormdist, tFuncV, arg_V, 3, 3, "LOGNORM.DIST"), /* XLS:LOGNORMDIST*/ /* NB Excel doesn't cater for fourth optional parameter */ - xls_func_entry(xlfLoginv, tFuncV, arg_V, 3, 3, "LOGNORM.INV"), /* XLS:LOGINV */ - xls_func_entry(xlfKurt, tFuncVarV, arg_R, 1, 30, "KURT"), - xls_func_entry(xlfMode, tFuncV, arg_A, 1, 1, "MODE"), - xls_func_entry(xlfNegbinomdist, tFuncV, arg_V, 3, 3, "NEGBINOM.DIST"), /* XLS:NEGBINOMDIST */ /* NB Excel doesn't cater for fourth optional parameter */ - xls_func_entry(xlfNormdist, tFuncV, arg_V, 4, 4, "NORM.DIST"), /* XLS:NORMDIST */ /* NB Excel requires fourth optional parameter */ - xls_func_entry(xlfNorminv, tFuncV, arg_V, 3, 3, "NORM.INV"), /* XLS:NORMINV */ - xls_func_entry(xlfNormsdist, tFuncV, arg_V, 1, 1, "NORM.S.DIST"), /* XLS:NORMSDIST */ /* NB Excel doesn't cater for second optional parameter */ - xls_func_entry(xlfNormsinv, tFuncV, arg_V, 1, 1, "NORM.S.INV"), /* XLS:NORMSINV */ - xls_func_entry(xlfOdd, tFuncV, arg_V, 1, 1, "ODD"), - - xls_func_entry(xlfBetadist, tFuncVarV, arg_V, 3, 5, "ODF.BETADIST"), /* NB Excel doesn't cater for sixth optional parameter */ - xls_func_entry(xlfTdist, tFuncV, arg_V, 3, 3, "ODF.TDIST"), /* XLS:TDIST */ - - xls_func_entry(xlfPearson, tFuncV, arg_A, 2, 2, "PEARSON"), - xls_func_entry(xlfPercentile, tFuncV, arg_R_V, 2, 2, "PERCENTILE.INC"), /* XLS:PERCENTILE */ - xls_func_entry(xlfPercentrank, tFuncVarV, arg_R_V, 2, 3, "PERCENTRANK.INC"), /* XLS:PERCENTRANK */ - xls_func_entry(xlfPermut, tFuncV, arg_V, 2, 2, "PERMUT"), - xls_func_entry(xlfPoisson, tFuncV, arg_V, 3, 3, "POISSON.DIST"), /* XLS:POISSON */ - xls_func_entry(xlfProb, tFuncVarV, arg_A_A_V, 3, 4, "PROB"), - xls_func_entry(xlfQuartile, tFuncV, arg_R_V, 2, 2, "QUARTILE.INC"), /* XLS:QUARTILE */ - xls_func_entry(xlfRank, tFuncVarV, arg_V_R_V, 2, 3, "RANK.EQ"), /* XLS:RANK */ - xls_func_entry(xlfRsq, tFuncV, arg_A, 2, 2, "RSQ"), - xls_func_entry(xlfSkew, tFuncVarV, arg_R, 1, 30, "SKEW"), - xls_func_entry(xlfSlope, tFuncV, arg_A, 2, 2, "SLOPE"), - xls_func_entry(xlfStandardize, tFuncV, arg_V, 3, 3, "STANDARDIZE"), - xls_func_entry(xlfSumsq, tFuncVarV, arg_R, 0, 30, "SUMSQ"), - xls_func_entry(xlfSumx2my2, tFuncV, arg_A, 2, 2, "SUM_X2MY2"), - xls_func_entry(xlfSumx2py2, tFuncV, arg_A, 2, 2, "SUM_X2PY2"), - xls_func_entry(xlfSumxmy2, tFuncV, arg_A, 2, 2, "SUM_XMY2"), - xls_func_entry(xlfTinv, tFuncV, arg_V, 2, 2, "T.INV.2T"), /* XLS:TINV */ - xls_func_entry(xlfTtest, tFuncV, arg_A_A_V, 4, 4, "T.TEST"), /* XLS:TTEST */ - xls_func_entry(xlfTrimmean, tFuncV, arg_R_V, 2, 2, "TRIMMEAN"), - xls_func_entry(xlfWeibull, tFuncV, arg_V, 4, 4, "WEIBULL.DIST"), /* XLS:WEIBULL */ - xls_func_entry(xlfZtest, tFuncVarV, arg_R_V, 2, 3, "Z.TEST") /* XLS:ZTEST */ + xls_func_entry(BIFF_FN_Avedev, tFuncVarV, arg_R, 1, 30, "AVEDEV"), + xls_func_entry(BIFF_FN_Binomdist, tFuncV, arg_V, 4, 4, "BINOM.DIST"), /* XLS:BINOMDIST */ + xls_func_entry(BIFF_FN_Critbinom, tFuncV, arg_V, 3, 3, "BINOM.INV"), /* XLS:CRITBINOM */ + xls_func_entry(BIFF_FN_Ceiling, tFuncV, arg_V, 2, 2, "CEILING"), + xls_func_entry(BIFF_FN_Chidist, tFuncV, arg_V, 2, 2, "CHISQ.DIST.RT"), /* XLS:CHIDIST */ + xls_func_entry(BIFF_FN_Chiinv, tFuncV, arg_V, 2, 2, "CHISQ.INV.RT"), /* XLS:CHIINV */ + xls_func_entry(BIFF_FN_Chitest, tFuncV, arg_A, 2, 2, "CHISQ.TEST"), /* XLS:CHITEST */ + xls_func_entry(BIFF_FN_Combin, tFuncV, arg_V, 2, 2, "COMBIN"), + xls_func_entry(BIFF_FN_Confidence, tFuncV, arg_V, 3, 3, "CONFIDENCE.NORM"), /* XLS:CONFIDENCE */ + xls_func_entry(BIFF_FN_Correl, tFuncV, arg_A, 2, 2, "CORREL"), + xls_func_entry(BIFF_FN_Covar, tFuncV, arg_A, 2, 2, "COVARIANCE.P"), /* XLS:COVAR */ + xls_func_entry(BIFF_FN_Db, tFuncVarV, arg_V, 4, 5, "DB"), + xls_func_entry(BIFF_FN_Devsq, tFuncVarV, arg_R, 1, 30, "DEVSQ"), + xls_func_entry(BIFF_FN_Even, tFuncV, arg_V, 1, 1, "EVEN"), + xls_func_entry(BIFF_FN_Expondist, tFuncV, arg_V, 3, 3, "EXPON.DIST"), /* XLS:EXPONDIST */ /* NB Excel requires third optional parameter */ + xls_func_entry(BIFF_FN_Fdist, tFuncV, arg_V, 3, 3, "F.DIST.RT"), /* XLS:FDIST */ + xls_func_entry(BIFF_FN_Finv, tFuncV, arg_V, 3, 3, "F.INV.RT"), /* XLS:FINV */ + xls_func_entry(BIFF_FN_Ftest, tFuncV, arg_A, 2, 2, "F.TEST"), /* XLS:FTEST */ + xls_func_entry(BIFF_FN_Fisher, tFuncV, arg_V, 1, 1, "FISHER"), + xls_func_entry(BIFF_FN_Fisherinv, tFuncV, arg_V, 1, 1, "FISHERINV"), + xls_func_entry(BIFF_FN_Fixed, tFuncVarV, arg_V, 2, 3, "FIXED"), + xls_func_entry(BIFF_FN_Floor, tFuncV, arg_V, 2, 2, "FLOOR"), + xls_func_entry(BIFF_FN_Frequency, tFuncA, arg_R, 2, 2, "FREQUENCY"), + xls_func_entry(BIFF_FN_Gammadist, tFuncV, arg_V, 4, 4, "GAMMA.DIST"), /* XLS:GAMMADIST */ /* NB Excel requires fourth optional parameter */ + xls_func_entry(BIFF_FN_Gammainv, tFuncV, arg_V, 3, 3, "GAMMA.INV"), /* XLS:GAMMAINV */ + xls_func_entry(BIFF_FN_Gammaln, tFuncV, arg_V, 1, 1, "GAMMALN"), + xls_func_entry(BIFF_FN_Geomean, tFuncVarV, arg_R, 1, 30, "GEOMEAN"), + xls_func_entry(BIFF_FN_Harmean, tFuncVarV, arg_R, 1, 30, "HARMEAN"), + xls_func_entry(BIFF_FN_Hypgeomdist, tFuncV, arg_V, 4, 4, "HYPGEOM.DIST"), /* XLS:HYPGEOMDIST */ /* NB Excel doesn't cater for fifth optional parameter */ + xls_func_entry(BIFF_FN_Lognormdist, tFuncV, arg_V, 3, 3, "LOGNORM.DIST"), /* XLS:LOGNORMDIST*/ /* NB Excel doesn't cater for fourth optional parameter */ + xls_func_entry(BIFF_FN_Loginv, tFuncV, arg_V, 3, 3, "LOGNORM.INV"), /* XLS:LOGINV */ + xls_func_entry(BIFF_FN_Kurt, tFuncVarV, arg_R, 1, 30, "KURT"), + xls_func_entry(BIFF_FN_Mode, tFuncV, arg_A, 1, 1, "MODE"), + xls_func_entry(BIFF_FN_Negbinomdist, tFuncV, arg_V, 3, 3, "NEGBINOM.DIST"), /* XLS:NEGBINOMDIST */ /* NB Excel doesn't cater for fourth optional parameter */ + xls_func_entry(BIFF_FN_Normdist, tFuncV, arg_V, 4, 4, "NORM.DIST"), /* XLS:NORMDIST */ /* NB Excel requires fourth optional parameter */ + xls_func_entry(BIFF_FN_Norminv, tFuncV, arg_V, 3, 3, "NORM.INV"), /* XLS:NORMINV */ + xls_func_entry(BIFF_FN_Normsdist, tFuncV, arg_V, 1, 1, "NORM.S.DIST"), /* XLS:NORMSDIST */ /* NB Excel doesn't cater for second optional parameter */ + xls_func_entry(BIFF_FN_Normsinv, tFuncV, arg_V, 1, 1, "NORM.S.INV"), /* XLS:NORMSINV */ + xls_func_entry(BIFF_FN_Odd, tFuncV, arg_V, 1, 1, "ODD"), + + xls_func_entry(BIFF_FN_Betadist, tFuncVarV, arg_V, 3, 5, "ODF.BETADIST"), /* NB Excel doesn't cater for sixth optional parameter */ + xls_func_entry(BIFF_FN_Tdist, tFuncV, arg_V, 3, 3, "ODF.TDIST"), /* XLS:TDIST */ + + xls_func_entry(BIFF_FN_Pearson, tFuncV, arg_A, 2, 2, "PEARSON"), + xls_func_entry(BIFF_FN_Percentile, tFuncV, arg_R_V, 2, 2, "PERCENTILE.INC"), /* XLS:PERCENTILE */ + xls_func_entry(BIFF_FN_Percentrank, tFuncVarV, arg_R_V, 2, 3, "PERCENTRANK.INC"), /* XLS:PERCENTRANK */ + xls_func_entry(BIFF_FN_Permut, tFuncV, arg_V, 2, 2, "PERMUT"), + xls_func_entry(BIFF_FN_Poisson, tFuncV, arg_V, 3, 3, "POISSON.DIST"), /* XLS:POISSON */ + xls_func_entry(BIFF_FN_Prob, tFuncVarV, arg_A_A_V, 3, 4, "PROB"), + xls_func_entry(BIFF_FN_Quartile, tFuncV, arg_R_V, 2, 2, "QUARTILE.INC"), /* XLS:QUARTILE */ + xls_func_entry(BIFF_FN_Rank, tFuncVarV, arg_V_R_V, 2, 3, "RANK.EQ"), /* XLS:RANK */ + xls_func_entry(BIFF_FN_Rsq, tFuncV, arg_A, 2, 2, "RSQ"), + xls_func_entry(BIFF_FN_Skew, tFuncVarV, arg_R, 1, 30, "SKEW"), + xls_func_entry(BIFF_FN_Slope, tFuncV, arg_A, 2, 2, "SLOPE"), + xls_func_entry(BIFF_FN_Standardize, tFuncV, arg_V, 3, 3, "STANDARDIZE"), + xls_func_entry(BIFF_FN_Sumsq, tFuncVarV, arg_R, 0, 30, "SUMSQ"), + xls_func_entry(BIFF_FN_Sumx2my2, tFuncV, arg_A, 2, 2, "SUM_X2MY2"), + xls_func_entry(BIFF_FN_Sumx2py2, tFuncV, arg_A, 2, 2, "SUM_X2PY2"), + xls_func_entry(BIFF_FN_Sumxmy2, tFuncV, arg_A, 2, 2, "SUM_XMY2"), + xls_func_entry(BIFF_FN_Tinv, tFuncV, arg_V, 2, 2, "T.INV.2T"), /* XLS:TINV */ + xls_func_entry(BIFF_FN_Ttest, tFuncV, arg_A_A_V, 4, 4, "T.TEST"), /* XLS:TTEST */ + xls_func_entry(BIFF_FN_Trimmean, tFuncV, arg_R_V, 2, 2, "TRIMMEAN"), + xls_func_entry(BIFF_FN_Weibull, tFuncV, arg_V, 4, 4, "WEIBULL.DIST"), /* XLS:WEIBULL */ + xls_func_entry(BIFF_FN_Ztest, tFuncVarV, arg_R_V, 2, 3, "Z.TEST") /* XLS:ZTEST */ }; static const XLS_COMPILER_FUNC_ENTRY BIFF5_compiler_functions[] = /* ordered as Fireworkz */ { - xls_func_entry(xlfCountblank, tFuncV, arg_V, 1, 1, "COUNTBLANK"), - xls_func_entry(xlfDays360, tFuncVarV, arg_V, 2, 3, "DAYS_360"), /* XLS:DAYS360 */ - /*xls_func_entry(xlfHlookup, tFuncVarV, arg_V_R_R_V, 3, 4, "HLOOKUP"),*/ /* our 4th argument is not the same */ - xls_func_entry(xlfConcatenate, tFuncVarV, arg_V, 0, 30, "JOIN"), /* XLS:CONCATENATE */ - xls_func_entry(xlfLarge, tFuncV, arg_R_V, 2, 2, "LARGE"), - xls_func_entry(xlfPower, tFuncV, arg_V, 2, 2, "POWER"), - xls_func_entry(xlfSmall, tFuncV, arg_R_V, 2, 2, "SMALL"), - /*xls_func_entry(xlfVlookup, tFuncVarV, arg_V_R_R_V, 3, 4, "VLOOKUP"),*/ /* our 4th argument is not the same */ - xls_func_entry(xlfWeekday, tFuncVarV, arg_V, 1, 2, "WEEKDAY") + xls_func_entry(BIFF_FN_Countblank, tFuncV, arg_V, 1, 1, "COUNTBLANK"), + xls_func_entry(BIFF_FN_Days360, tFuncVarV, arg_V, 2, 3, "DAYS_360"), /* XLS:DAYS360 */ + /*xls_func_entry(BIFF_FN_Hlookup, tFuncVarV, arg_V_R_R_V, 3, 4, "HLOOKUP"),*/ /* our 4th argument is not the same */ + xls_func_entry(BIFF_FN_Concatenate, tFuncVarV, arg_V, 0, 30, "JOIN"), /* XLS:CONCATENATE */ + xls_func_entry(BIFF_FN_Large, tFuncV, arg_R_V, 2, 2, "LARGE"), + xls_func_entry(BIFF_FN_Power, tFuncV, arg_V, 2, 2, "POWER"), + xls_func_entry(BIFF_FN_Small, tFuncV, arg_R_V, 2, 2, "SMALL"), + /*xls_func_entry(BIFF_FN_Vlookup, tFuncVarV, arg_V_R_R_V, 3, 4, "VLOOKUP"),*/ /* our 4th argument is not the same */ + xls_func_entry(BIFF_FN_Weekday, tFuncVarV, arg_V, 1, 2, "WEEKDAY") }; static const XLS_COMPILER_FUNC_ENTRY BIFF8_compiler_functions[] = /* ordered as Fireworkz */ { - xls_func_entry(xlfAverageA, tFuncVarV, arg_R, 1, 30, "AVERAGEA"), - xls_func_entry(xlfMaxA, tFuncVarV, arg_R, 1, 30, "MINA"), - xls_func_entry(xlfMinA, tFuncVarV, arg_R, 1, 30, "MAXA"), - xls_func_entry(xlfStDevA, tFuncVarV, arg_R, 1, 30, "STDEVA"), - xls_func_entry(xlfStDevPA, tFuncVarV, arg_R, 1, 30, "STDEVPA"), - xls_func_entry(xlfVarA, tFuncVarV, arg_R, 1, 30, "VARA"), - xls_func_entry(xlfVarPA, tFuncVarV, arg_R, 1, 30, "VARPA") + xls_func_entry(BIFF_FN_AverageA, tFuncVarV, arg_R, 1, 30, "AVERAGEA"), + xls_func_entry(BIFF_FN_MaxA, tFuncVarV, arg_R, 1, 30, "MINA"), + xls_func_entry(BIFF_FN_MinA, tFuncVarV, arg_R, 1, 30, "MAXA"), + xls_func_entry(BIFF_FN_StDevA, tFuncVarV, arg_R, 1, 30, "STDEVA"), + xls_func_entry(BIFF_FN_StDevPA, tFuncVarV, arg_R, 1, 30, "STDEVPA"), + xls_func_entry(BIFF_FN_VarA, tFuncVarV, arg_R, 1, 30, "VARA"), + xls_func_entry(BIFF_FN_VarPA, tFuncVarV, arg_R, 1, 30, "VARPA") }; /* Fireworkz functions unsupported for Excel BIFF export */ @@ -1378,20 +1378,20 @@ process_function_arguments( _Check_return_ static inline STATUS -xls_rpn_out_xlfFalse(void) +xls_rpn_out_BIFF_FN_False(void) { status_return(tFuncV); - return(xls_rpn_out_U16(xlfFalse)); + return(xls_rpn_out_U16(BIFF_FN_False)); } _Check_return_ static inline STATUS -xls_rpn_out_xlfTrue(void) +xls_rpn_out_BIFF_FN_True(void) { status_return(tFuncV); - return(xls_rpn_out_U16(xlfTrue)); + return(xls_rpn_out_U16(BIFF_FN_True)); } _Check_return_ @@ -1400,13 +1400,13 @@ process_extra_function_arguments( _InRef_ PC_XLS_COMPILER_FUNC_ENTRY p_xls_compiler_func_entry, _In_ S32 n_args) { - switch(p_xls_compiler_func_entry->xlf_number) + switch(p_xls_compiler_func_entry->biff_function_number) { default: break; - case xlfCeiling: - case xlfFloor: + case BIFF_FN_Ceiling: + case BIFF_FN_Floor: if(n_args < 2) { /* Excel requires second parameter - Fireworkz significance is one if omitted */ status_return(xls_rpn_out_tNum(1.0)); @@ -1414,20 +1414,20 @@ process_extra_function_arguments( } break; - case xlfExpondist: - case xlfPoisson: + case BIFF_FN_Expondist: + case BIFF_FN_Poisson: if(n_args < 3) { /* Excel requires third parameter - Fireworkz default is TRUE (CDF) */ - status_return(xls_rpn_out_tBool(TRUE)); /*xls_rpn_out_xlfTrue();*/ + status_return(xls_rpn_out_tBool(TRUE)); /*xls_rpn_out_BIFF_FN_True();*/ ++n_args; } break; - case xlfGammadist: - case xlfNormdist: + case BIFF_FN_Gammadist: + case BIFF_FN_Normdist: if(n_args < 4) { /* Excel requires fourth parameter - Fireworkz default is TRUE (CDF) */ - status_return(xls_rpn_out_tBool(TRUE)); /*xls_rpn_out_xlfTrue();*/ + status_return(xls_rpn_out_tBool(TRUE)); /*xls_rpn_out_BIFF_FN_True();*/ ++n_args; } break; @@ -1524,7 +1524,7 @@ xls_lterm(void) } if(status_ok(status)) - status = xls_rpn_out_U16(p_xls_compiler_func_entry->xlf_number); + status = xls_rpn_out_U16(p_xls_compiler_func_entry->biff_function_number); } break; @@ -1608,7 +1608,7 @@ xls_fterm(void) status = xls_rpn_out_U8(tFuncV); if(status_ok(status)) - status = xls_rpn_out_U16(xlfNot); + status = xls_rpn_out_U16(BIFF_FN_Not); break; default: @@ -1789,7 +1789,7 @@ xls_aterm(void) status = xls_rpn_out_U8((U8) n_args); if(status_ok(status)) - status = xls_rpn_out_U16(xlfAnd); + status = xls_rpn_out_U16(BIFF_FN_And); } return(status); @@ -1828,7 +1828,7 @@ xls_expr(void) status = xls_rpn_out_U8((U8) n_args); if(status_ok(status)) - status = xls_rpn_out_U16(xlfOr); + status = xls_rpn_out_U16(BIFF_FN_Or); } return(status); diff --git a/t5/ob_cells/ce_edit.c b/t5/ob_cells/ce_edit.c index b43f664..73a56a5 100644 --- a/t5/ob_cells/ce_edit.c +++ b/t5/ob_cells/ce_edit.c @@ -640,8 +640,8 @@ main events MAEVE_EVENT_PROTO(static, maeve_event_cells_edit) { - IGNOREPARM(p_data); - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER(p_data); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -685,7 +685,7 @@ cells_edit_msg_close1( T5_MSG_PROTO(static, cells_edit_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -768,7 +768,7 @@ T5_MSG_PROTO(static, cells_edit_msg_object_delete_sub, _InoutRef_ P_OBJECT_DELET STATUS status; OBJECT_DATA object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_object_delete_sub->h_data_del = 0; @@ -917,7 +917,7 @@ T5_MSG_PROTO(static, cells_edit_msg_object_keys, P_OBJECT_KEYS p_object_keys) { STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = check_protection_simple(p_docu, TRUE))) { @@ -983,7 +983,7 @@ T5_MSG_PROTO(static, cells_edit_msg_object_read_text, P_OBJECT_READ_TEXT p_objec STATUS status; OBJECT_DATA object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_done(status = text_in_cell(p_docu, &object_data, &p_object_read_text->object_data))) { @@ -1000,7 +1000,7 @@ T5_MSG_PROTO(static, cells_edit_msg_object_string_replace, P_OBJECT_STRING_REPLA STATUS status; OBJECT_DATA object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_done(status = text_in_cell(p_docu, &object_data, &p_object_string_replace->object_data))) { @@ -1082,7 +1082,7 @@ T5_MSG_PROTO(static, cells_edit_msg_load_cell_ownform, P_LOAD_CELL_OWNFORM p_loa STATUS status; OBJECT_DATA object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = text_from_cell(p_docu, &object_data, &p_load_cell_ownform->object_data))) { /* SKS 11apr97 was status_done() but that's silly and I claim it'd never been thru this bit before */ @@ -1133,7 +1133,7 @@ T5_MSG_PROTO(static, cells_edit_msg_save_cell_ownform, P_SAVE_CELL_OWNFORM p_sav STATUS status; OBJECT_DATA object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_done(status = text_in_cell(p_docu, &object_data, &p_save_cell_ownform->object_data))) { diff --git a/t5/ob_cells/ob_cells.c b/t5/ob_cells/ob_cells.c index 71b25df..a7711a3 100644 --- a/t5/ob_cells/ob_cells.c +++ b/t5/ob_cells/ob_cells.c @@ -112,7 +112,7 @@ docu_caret_position_after_command_null( _DocuRef_ P_DOCU p_docu, _InRef_ P_NULL_EVENT_BLOCK p_null_event_block) { - IGNOREPARM_InRef_(p_null_event_block); + UNREFERENCED_PARAMETER_InRef_(p_null_event_block); trace_1(TRACE_OUT | TRACE_ANY, TEXT("docu_caret_position_after_command_null(docno=%d): null_event"), docno_from_p_docu(p_docu)); @@ -184,7 +184,7 @@ T5_MSG_PROTO(static, cells_msg_check_protection, P_CHECK_PROTECTION p_check_prot DOCU_AREA docu_area; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_check_protection->use_docu_area) docu_area = p_check_protection->docu_area; @@ -392,8 +392,8 @@ global_clip_data_set( /*clip_issue_change();*/ #else - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(object_id); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(object_id); #endif /* USE_GLOBAL_CLIPBOARD */ /* no usable global clipboard - save to local clipboard as before */ @@ -1313,7 +1313,7 @@ main events MAEVE_EVENT_PROTO(static, maeve_event_ob_cells) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -2211,7 +2211,7 @@ T5_CMD_PROTO(static, cells_cmd_page_up_down) SLR slr; BOOL key_selection, extend_selection; - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); drop_anchor(p_docu, t5_message, &key_selection, &extend_selection); @@ -2228,7 +2228,7 @@ T5_CMD_PROTO(static, cells_cmd_line_start) SKEL_POINT skel_point; BOOL extend_selection, key_selection; - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); drop_anchor(p_docu, t5_message, &key_selection, &extend_selection); @@ -2250,7 +2250,7 @@ T5_CMD_PROTO(static, cells_cmd_line_end) SKEL_POINT skel_point; BOOL extend_selection, key_selection; - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); drop_anchor(p_docu, t5_message, &key_selection, &extend_selection); @@ -2272,7 +2272,7 @@ T5_CMD_PROTO(static, cells_cmd_document_top) SLR slr = p_docu->cur.slr; BOOL extend_selection, key_selection; - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); drop_anchor(p_docu, t5_message, &key_selection, &extend_selection); @@ -2288,7 +2288,7 @@ T5_CMD_PROTO(static, cells_cmd_document_bottom) SKEL_RECT skel_rect; BOOL extend_selection, key_selection; - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); drop_anchor(p_docu, t5_message, &key_selection, &extend_selection); @@ -2303,8 +2303,8 @@ T5_CMD_PROTO(static, cells_cmd_first_column) { SLR slr = p_docu->cur.slr; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); slr.col = 0; caret_to_slr(p_docu, &slr, NULL, FALSE, FALSE, FALSE, FALSE); @@ -2316,8 +2316,8 @@ T5_CMD_PROTO(static, cells_cmd_last_column) { SLR slr = p_docu->cur.slr; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InVal_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(p_t5_cmd); slr.col = n_cols_logical(p_docu) - 1; caret_to_slr(p_docu, &slr, NULL, FALSE, FALSE, FALSE, FALSE); @@ -2840,8 +2840,8 @@ T5_CMD_PROTO(static, cells_cmd_block_clear) REGION region; STATUS status; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -2882,7 +2882,7 @@ T5_CMD_PROTO(static, cells_cmd_box) DOCU_AREA docu_area; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -2983,7 +2983,7 @@ T5_CMD_PROTO(static, cells_cmd_object_convert) REGION region; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -3216,7 +3216,7 @@ cells_cmd_return( T5_MSG_PROTO(static, cells_msg_mark_info_read, _OutRef_ P_MARK_INFO p_mark_info) { - IGNOREPARM_InRef_(t5_message); + UNREFERENCED_PARAMETER_InRef_(t5_message); *p_mark_info = p_docu->mark_info_cells; @@ -3225,7 +3225,7 @@ T5_MSG_PROTO(static, cells_msg_mark_info_read, _OutRef_ P_MARK_INFO p_mark_info) T5_CMD_PROTO(static, cells_cmd_toggle_marks) { - IGNOREPARM_InRef_(t5_message); + UNREFERENCED_PARAMETER_InRef_(t5_message); /* fire off appropriate command to focus owner, avoiding macro recording */ return(docu_focus_owner_object_call(p_docu, (p_docu->mark_info_cells.h_markers ? T5_CMD_SELECTION_CLEAR : T5_CMD_SELECT_DOCUMENT), de_const_cast(P_T5_CMD, p_t5_cmd))); @@ -3233,8 +3233,8 @@ T5_CMD_PROTO(static, cells_cmd_toggle_marks) T5_CMD_PROTO(static, cells_cmd_select_cell) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); docu_area_init(&p_docu->anchor_mark.docu_area); p_docu->anchor_mark.docu_area.tl = p_docu->cur; @@ -3250,8 +3250,8 @@ T5_CMD_PROTO(static, cells_cmd_select_cell) T5_CMD_PROTO(static, cells_cmd_select_document) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); p_docu->anchor_mark.docu_area.whole_col = p_docu->anchor_mark.docu_area.whole_row = 1; @@ -3276,8 +3276,8 @@ T5_CMD_PROTO(static, cells_cmd_select_word) OBJECT_POSITION_SET object_position_set; BOOL extend_selection = (p_docu->mark_info_cells.h_markers != 0); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(extend_selection) { @@ -3327,7 +3327,7 @@ T5_CMD_PROTO(static, cells_cmd_setc) STATUS status = STATUS_OK; STATUS status_cell = STATUS_OK; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(p_docu->mark_info_cells.h_markers) { @@ -3403,8 +3403,8 @@ T5_CMD_PROTO(static, cells_cmd_snapshot) REGION region; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -3530,7 +3530,7 @@ T5_CMD_PROTO(static, cells_cmd_style_apply) STYLE_DOCU_AREA_ADD_PARM style_docu_area_add_parm; STYLE_DOCU_AREA_ADD_INLINE(&style_docu_area_add_parm, ustr_inline); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -3563,7 +3563,7 @@ T5_CMD_PROTO(static, cells_cmd_tab_lr) TAB_WANTED tab_wanted; zero_struct(tab_wanted); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); tab_wanted.t5_message = t5_message; consume_bool(cell_data_from_position(p_docu, &tab_wanted.object_data, &p_docu->cur)); @@ -3643,7 +3643,7 @@ T5_MSG_PROTO(static, cells_event_click_left_single, _InoutRef_ P_SKELEVENT_CLICK OBJECT_DATA object_data; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(slr_owner_from_skel_point(p_docu, &slr, &tl, &p_skelevent_click->skel_point, ON_ROW_EDGE_GO_UP)); @@ -3705,7 +3705,7 @@ T5_MSG_PROTO(static, cells_event_click_left_triple, _InoutRef_ P_SKELEVENT_CLICK SKEL_POINT tl; SLR slr; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(slr_owner_from_skel_point(p_docu, &slr, &tl, &p_skelevent_click->skel_point, ON_ROW_EDGE_GO_UP)); @@ -3790,12 +3790,12 @@ T5_MSG_PROTO(static, cells_event_click_right, _InoutRef_ P_SKELEVENT_CLICK p_ske else anchor_to_markers_update(p_docu); - if(t5_message == T5_EVENT_CLICK_RIGHT_SINGLE) + if(T5_EVENT_CLICK_RIGHT_SINGLE == t5_message) anchor_to_markers_finish(p_docu); markers_show(p_docu); - if(t5_message == T5_EVENT_CLICK_RIGHT_DRAG) + if(T5_EVENT_CLICK_RIGHT_DRAG == t5_message) host_drag_start(NULL); } } @@ -3867,10 +3867,10 @@ T5_MSG_PROTO(static, cells_event_click_drags, _InoutRef_ P_SKELEVENT_CLICK p_ske return(object_call_id(object_id, p_docu, t5_message, p_skelevent_click)); } - if(t5_message == T5_EVENT_CLICK_DRAG_STARTED) + if(T5_EVENT_CLICK_DRAG_STARTED == t5_message) return(status); /* not interesting to us */ - if(t5_message == T5_EVENT_CLICK_DRAG_ABORTED) + if(T5_EVENT_CLICK_DRAG_ABORTED == t5_message) { status_assert(maeve_event(p_docu, T5_MSG_SELECTION_CLEAR, P_DATA_NONE)); return(status); @@ -3888,7 +3888,7 @@ T5_MSG_PROTO(static, cells_event_click_drags, _InoutRef_ P_SKELEVENT_CLICK p_ske p_docu->anchor_mark.docu_area.br.slr = slr; p_docu->anchor_mark.docu_area.br.object_position = object_position_find.object_data.object_position_start; - if(t5_message == T5_EVENT_CLICK_DRAG_FINISHED) + if(T5_EVENT_CLICK_DRAG_FINISHED == t5_message) anchor_to_markers_finish(p_docu); else anchor_to_markers_update(p_docu); @@ -3906,7 +3906,7 @@ T5_MSG_PROTO(static, cells_event_fileinsert_doinsert_1, _InoutRef_ P_SKELEVENT_C OBJECT_DATA object_data; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); cur_change_before(p_docu); @@ -3931,7 +3931,7 @@ T5_MSG_PROTO(static, cells_event_fileinsert_doinsert, _InoutRef_ P_SKELEVENT_CLI MSG_INSERT_FILE msg_insert_file; zero_struct(msg_insert_file); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(OBJECT_ID_NONE == object_id) return(create_error(ERR_UNKNOWN_FILETYPE)); @@ -3957,7 +3957,7 @@ T5_MSG_PROTO(static, cells_event_fileinsert_doinsert, _InoutRef_ P_SKELEVENT_CLI T5_MSG_PROTO(static, cells_event_keys, _InRef_ P_SKELEVENT_KEYS p_skelevent_keys) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!status_ok(check_protection_simple(p_docu, TRUE))) return(STATUS_OK); @@ -3982,7 +3982,7 @@ T5_MSG_PROTO(static, cells_event_keys, _InRef_ P_SKELEVENT_KEYS p_skelevent_keys T5_MSG_PROTO(static, cells_msg_col_auto_width, _InoutRef_ P_COL_AUTO_WIDTH p_col_auto_width) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_col_auto_width->width = col_auto_width(p_docu, p_col_auto_width->col, p_col_auto_width->row_s, p_col_auto_width->row_e, p_col_auto_width->allow_special); @@ -3997,7 +3997,7 @@ T5_MSG_PROTO(static, cells_msg_col_width_adjust, _InRef_ P_COL_WIDTH_ADJUST p_co STYLE_DOCU_AREA_ADD_PARM style_docu_area_add_parm; DOCU_AREA docu_area; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); style_init(&style); @@ -4042,7 +4042,7 @@ T5_MSG_PROTO(static, cells_msg_object_at_current_position, _InoutRef_ P_OBJECT_A /* SKS 17apr95 no point sending T5_MSG_OBJECT_WANTS_LOAD to ce_edit is it? Find the real cell owner */ const OBJECT_ID object_id = cell_owner_from_slr(p_docu, &p_docu->cur.slr); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { OBJECT_WANTS_LOAD object_wants_load; @@ -4059,7 +4059,7 @@ T5_MSG_PROTO(static, cells_msg_redraw_region, _InRef_ PC_REGION p_region) { REGION region_on_screen, region_clipped; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(region_intersect_region_out(®ion_clipped, p_region, region_visible(p_docu, ®ion_on_screen))) { @@ -4083,7 +4083,7 @@ T5_MSG_PROTO(static, cells_msg_redraw_region, _InRef_ PC_REGION p_region) T5_MSG_PROTO(static, cells_msg_redraw_cells, _InRef_ PC_SLR p_slr) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(row_is_visible(p_docu, p_slr->row)) { @@ -4103,7 +4103,7 @@ T5_MSG_PROTO(static, cells_msg_redraw_cells, _InRef_ PC_SLR p_slr) T5_MSG_PROTO(static, cells_msg_caret_show_claim, P_CARET_SHOW_CLAIM p_caret_show_claim) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); caret_position_set_show(p_docu, p_caret_show_claim->scroll); @@ -4118,7 +4118,7 @@ T5_MSG_PROTO(static, cells_msg_caret_show_claim, P_CARET_SHOW_CLAIM p_caret_show T5_MSG_PROTO(static, cells_msg_menu_other_info, _InoutRef_ P_MENU_OTHER_INFO p_menu_other_info) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(OBJECT_ID_CELLS == p_docu->focus_owner) { @@ -4138,7 +4138,7 @@ T5_MSG_PROTO(static, cells_msg_ruler_info, _InoutRef_ P_RULER_INFO p_ruler_info) ARRAY_HANDLE array_handle; ROW row; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!p_docu->mark_info_cells.h_markers) row = p_docu->cur.slr.row; @@ -4158,7 +4158,7 @@ T5_MSG_PROTO(static, cells_msg_ruler_info, _InoutRef_ P_RULER_INFO p_ruler_info) T5_MSG_PROTO(static, cells_msg_selection_make, _InRef_ PC_DOCU_AREA p_docu_area) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_docu->anchor_mark.docu_area = *p_docu_area; @@ -4177,7 +4177,7 @@ T5_MSG_PROTO(static, cells_msg_selection_replace, _InRef_ P_SELECTION_REPLACE p_ { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) { @@ -4207,7 +4207,7 @@ T5_MSG_PROTO(static, cells_msg_selection_style, _InoutRef_ P_SELECTION_STYLE p_s { DOCU_AREA docu_area; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) docu_area_from_markers_first(p_docu, &docu_area); @@ -4246,8 +4246,8 @@ OBJECT_PROTO(static, object_cells_default) T5_MSG_PROTO(static, cells_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -4274,8 +4274,8 @@ T5_MSG_PROTO(static, cells_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclo T5_MSG_PROTO(static, cells_msg_init_flow, _InRef_ P_OBJECT_ID p_object_id) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_object_id); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_object_id); position_init_from_col_row(&p_docu->cur, 0, 0); p_docu->old = p_docu->cur; @@ -4285,7 +4285,7 @@ T5_MSG_PROTO(static, cells_msg_init_flow, _InRef_ P_OBJECT_ID p_object_id) T5_MSG_PROTO(static, cells_msg_goto_slr, _InRef_ P_SKELCMD_GOTO p_skelcmd_goto) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); caret_to_slr(p_docu, &p_skelcmd_goto->slr, &p_skelcmd_goto->skel_point, FALSE, (BOOL) p_skelcmd_goto->keep_selection, FALSE, FALSE); diff --git a/t5/ob_cells/sk_col.c b/t5/ob_cells/sk_col.c index aca4fab..f208ad2 100644 --- a/t5/ob_cells/sk_col.c +++ b/t5/ob_cells/sk_col.c @@ -74,7 +74,7 @@ col_at_skel_point( ARRAY_INDEX i; PC_COL_INFO p_col_info = array_range(&h_col_info, COL_INFO, 0, n_elements); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); for(i = 0; i < n_elements; ++i, ++p_col_info) { diff --git a/t5/ob_cells/sk_draw.c b/t5/ob_cells/sk_draw.c index 7daf20b..ed7f951 100644 --- a/t5/ob_cells/sk_draw.c +++ b/t5/ob_cells/sk_draw.c @@ -469,7 +469,7 @@ draw_grid( ******************************************************************************/ static void -draw_this_object( +draw_these_objects( _DocuRef_ P_DOCU p_docu, _InVal_ ROW row_s, _InVal_ ROW row_e, @@ -625,7 +625,7 @@ object_background( _InoutRef_ P_OBJECT_REDRAW p_object_redraw, _InRef_ PC_STYLE p_style) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* only render background if requested */ if(!p_object_redraw->flags.show_content) @@ -756,7 +756,7 @@ T5_MSG_PROTO(extern, skel_event_redraw, _InoutRef_ P_SKELEVENT_REDRAW p_skeleven { ROW_ENTRY row_entry_top; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_4(TRACE_APP_SKEL_DRAW, TEXT("skel_rect_redraw pixits tl: ") PIXIT_TFMT TEXT(",") PIXIT_TFMT TEXT(" br: ") PIXIT_TFMT TEXT(",") PIXIT_TFMT, @@ -801,7 +801,7 @@ T5_MSG_PROTO(extern, skel_event_redraw, _InoutRef_ P_SKELEVENT_REDRAW p_skeleven draw_grid(p_docu, row_entry_top.row, row_entry_bot.row + 1, p_skelevent_redraw); } - draw_this_object(p_docu, row_entry_top.row, row_entry_bot.row + 1, p_skelevent_redraw); + draw_these_objects(p_docu, row_entry_top.row, row_entry_bot.row + 1, p_skelevent_redraw); if(p_skelevent_redraw->redraw_context.flags.printer || p_skelevent_redraw->redraw_context.flags.metafile || diff --git a/t5/ob_cells/sk_form.c b/t5/ob_cells/sk_form.c index 6e892d4..48c3ba5 100644 --- a/t5/ob_cells/sk_form.c +++ b/t5/ob_cells/sk_form.c @@ -48,8 +48,8 @@ format_row_move_y( T5_MSG_PROTO(static, docu_new_extent_null, P_NULL_EVENT_BLOCK p_null_event_block) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM(p_null_event_block); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER(p_null_event_block); trace_1(TRACE_DNE_NULL, TEXT("docu_new_extent_null(docno=%d): null_event"), docno_from_p_docu(p_docu)); @@ -70,7 +70,7 @@ PROC_EVENT_PROTO(static, null_event_docu_new_extent) case T5_EVENT_NULL: #else - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { #endif return(docu_new_extent_null(p_docu, t5_message, (P_NULL_EVENT_BLOCK) p_data)); @@ -1296,7 +1296,7 @@ T5_MSG_PROTO(static, rowtab_event_null, P_NULL_EVENT_BLOCK p_null_event_block) { const MONOTIME time_started = p_null_event_block->initial_time; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_3(TRACE_OUT | TRACE_ANY /*TRACE_APP_FORMAT*/, TEXT("null_event_rowtab_format(docno=%d) - null_event: n_rows: ") ROW_TFMT TEXT(", format_start_row: ") ROW_TFMT, docno_from_p_docu(p_docu), n_rows(p_docu), p_docu->format_start_row); @@ -1384,7 +1384,7 @@ main events T5_MSG_PROTO(static, rowtab_msg_reformat, _InRef_ PC_DOCU_REFORMAT p_docu_reformat) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_docu_reformat->data_space) { @@ -1466,7 +1466,7 @@ T5_MSG_PROTO(static, rowtab_msg_reformat, _InRef_ PC_DOCU_REFORMAT p_docu_reform MAEVE_EVENT_PROTO(static, maeve_event_sk_form) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1534,7 +1534,7 @@ sk_form_msg_close2( T5_MSG_PROTO(static, maeve_services_sk_form_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1551,7 +1551,7 @@ T5_MSG_PROTO(static, maeve_services_sk_form_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_form) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_cells/sk_slot.c b/t5/ob_cells/sk_slot.c index 68ba7aa..3a80e3f 100644 --- a/t5/ob_cells/sk_slot.c +++ b/t5/ob_cells/sk_slot.c @@ -71,7 +71,7 @@ sk_slot_msg_close1( T5_MSG_PROTO(static, maeve_services_sk_slot_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -85,7 +85,7 @@ T5_MSG_PROTO(static, maeve_services_sk_slot_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_slot) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_chart/gr_blgal.c b/t5/ob_chart/gr_blgal.c index bd61153..c3299df 100644 --- a/t5/ob_chart/gr_blgal.c +++ b/t5/ob_chart/gr_blgal.c @@ -337,7 +337,7 @@ dialog_bl_gallery_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_bl_gallery) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_chart/gr_blpro.c b/t5/ob_chart/gr_blpro.c index 744d4b8..ddb3d58 100644 --- a/t5/ob_chart/gr_blpro.c +++ b/t5/ob_chart/gr_blpro.c @@ -374,7 +374,7 @@ dialog_bl_process_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_bl_process) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -506,8 +506,8 @@ gr_chart_pie_process( P_CHART_HEADER p_chart_header, _InVal_ GR_CHART_OBJID id) { - IGNOREPARM(p_chart_header); - IGNOREPARM_InVal_(id); + UNREFERENCED_PARAMETER(p_chart_header); + UNREFERENCED_PARAMETER_InVal_(id); host_bleep(); return(STATUS_OK); } @@ -588,7 +588,7 @@ dialog_scat_process_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_scat_process) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_chart/gr_chtio.c b/t5/ob_chart/gr_chtio.c index 346a678..8a0eb1a 100644 --- a/t5/ob_chart/gr_chtio.c +++ b/t5/ob_chart/gr_chtio.c @@ -92,7 +92,7 @@ T5_CMD_PROTO(static, chart_load_pict_trans) LIST_ITEMNO key; S32 res; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); PTR_ASSERT(p_chart_load_instance); switch(t5_message) @@ -625,7 +625,7 @@ T5_CMD_PROTO(extern, chart_io_gr_construct_load) const GR_CHART_OBJID id = chart_load_save_objid; P_ANY p0; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); p_con = (P_GR_CONSTRUCT_TABLE_ENTRY) bsearch(&t5_message, chart_construct_table, elemof(chart_construct_table), sizeof(chart_construct_table[0]), proc_bsearch_chart_construct_table); @@ -1399,8 +1399,8 @@ T5_MSG_PROTO(static, chart_note_ensure_saved, _InoutRef_ P_NOTE_ENSURE_SAVED p_n P_CHART_SAVE_MAP p_chart_save_map; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_chart_save_instance) { @@ -2348,7 +2348,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_io_1) P_CHART_HEADER p_chart_header = NULL; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); for(;;) /* loop for structure */ { @@ -2416,8 +2416,8 @@ T5_CMD_PROTO(static, t5_cmd_chart_io_2) P_CHART_HEADER p_chart_header; CHART_SHAPEDESC chart_shapedesc; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); PTR_ASSERT(p_chart_load_instance); @@ -2446,7 +2446,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_io_3) CHART_SHAPEDESC chart_shapedesc; GR_SERIES_TYPE sertype; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); PTR_ASSERT(p_chart_load_instance); @@ -2563,8 +2563,8 @@ T5_CMD_PROTO(static, t5_cmd_chart_io_objid) const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 3); GR_CHART_OBJID id; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); gr_chart_objid_clear(&id); @@ -2591,8 +2591,8 @@ T5_MSG_PROTO(static, chart_note_load_intref_from_extref, _InoutRef_ P_NOTE_REF p { const P_CHART_LOAD_INSTANCE p_chart_load_instance = chart_load_instance_goto(p_note_ref->p_of_ip_format); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_chart_load_instance) { @@ -2617,8 +2617,8 @@ T5_MSG_PROTO(static, chart_load_ended, _InoutRef_ P_OF_IP_FORMAT p_of_ip_format) { const P_CHART_LOAD_INSTANCE p_chart_load_instance = chart_load_instance_goto(p_of_ip_format); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_chart_load_instance) al_array_dispose(&p_chart_load_instance->h_mapping_list); @@ -2628,8 +2628,8 @@ T5_MSG_PROTO(static, chart_load_ended, _InoutRef_ P_OF_IP_FORMAT p_of_ip_format) T5_MSG_PROTO(static, chart_io_direct_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -2657,8 +2657,8 @@ chart_io_save_ended( T5_MSG_PROTO(static, chart_io_direct_msg_save, _InRef_ PC_MSG_SAVE p_msg_save) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_save->t5_msg_save_message) { diff --git a/t5/ob_chart/gr_edit.c b/t5/ob_chart/gr_edit.c index 7e11008..1266abb 100644 --- a/t5/ob_chart/gr_edit.c +++ b/t5/ob_chart/gr_edit.c @@ -516,8 +516,8 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_click, _InoutRef_ P_NOTE_OBJECT_ T5_MESSAGE t5_message_effective = p_note_object_edit_click->t5_message; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); CODE_ANALYSIS_ONLY(zero_struct(hitObject)); @@ -538,7 +538,7 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_click, _InoutRef_ P_NOTE_OBJECT_ p_note_object_edit_click->processed = 1; - tighter_selection = (t5_message_effective == T5_EVENT_CLICK_RIGHT_SINGLE); + tighter_selection = (T5_EVENT_CLICK_RIGHT_SINGLE == t5_message_effective); if( !p_chart_header || !gr_chart_diagram(p_chart_header->ch, &p_gr_diag) || @@ -633,7 +633,7 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_click, _InoutRef_ P_NOTE_OBJECT_ if(hitObject[0] == GR_DIAG_OBJECT_NONE) { /* clear selection only on left click and if there was one */ - if((t5_message_effective == T5_EVENT_CLICK_LEFT_SINGLE) && (p_chart_header->selection.id.name != GR_CHART_OBJNAME_ANON)) + if((T5_EVENT_CLICK_LEFT_SINGLE == t5_message_effective) && (p_chart_header->selection.id.name != GR_CHART_OBJNAME_ANON)) chart_selection_clear(p_chart_header, p_note_object_edit_click->p_note_info); } else @@ -730,8 +730,8 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_size_query, _InoutRef_ P_NOTE_OB const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_size->object_data_ref; const P_GR_CHART cp = p_gr_chart_from_chart_handle(p_chart_header->ch); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_note_object_size->pixit_size.cx = cp->core.layout.width + CHART_NOTE_SIZE_FUDGE_X; p_note_object_size->pixit_size.cy = cp->core.layout.height + CHART_NOTE_SIZE_FUDGE_Y; @@ -743,8 +743,8 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_size_query, _InoutRef_ P_NOTE_OB T5_MSG_PROTO(static, chart_edit_msg_note_object_size_set_possible, _InoutRef_ P_NOTE_OBJECT_SIZE p_note_object_size) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_note_object_size->processed = 1; @@ -756,8 +756,8 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_size_set, _InoutRef_ P_NOTE_OBJE const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_size->object_data_ref; const P_GR_CHART cp = p_gr_chart_from_chart_handle(p_chart_header->ch); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); cp->core.layout.width = p_note_object_size->pixit_size.cx - CHART_NOTE_SIZE_FUDGE_X; cp->core.layout.height = p_note_object_size->pixit_size.cy - CHART_NOTE_SIZE_FUDGE_Y; @@ -775,8 +775,8 @@ T5_MSG_PROTO(static, chart_edit_msg_save_picture, _InRef_ P_MSG_SAVE_PICTURE p_m P_GR_DIAG p_gr_diag; P_GR_RISCDIAG p_gr_riscdiag; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_msg_save_picture->t5_filetype == FILETYPE_DRAW); @@ -801,8 +801,8 @@ T5_MSG_PROTO(static, chart_edit_msg_save_picture_filetypes_request, _InoutRef_ P { SAVE_FILETYPE save_filetype; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* Indicate that we can save charts as Drawfiles */ save_filetype.object_id = OBJECT_ID_CHART; @@ -815,8 +815,8 @@ T5_MSG_PROTO(static, chart_edit_msg_save_picture_filetypes_request, _InoutRef_ P T5_MSG_PROTO(static, chart_edit_msg_caret_show_claim, P_CARET_SHOW_CLAIM p_caret_show_claim) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_caret_show_claim); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_caret_show_claim); /* switch off caret */ view_show_caret(p_docu, UPDATE_PANE_CELLS_AREA, &p_docu->caret, 0); @@ -826,7 +826,7 @@ T5_MSG_PROTO(static, chart_edit_msg_caret_show_claim, P_CARET_SHOW_CLAIM p_caret T5_MSG_PROTO(static, chart_edit_msg_focus_changed, _InRef_ P_OBJECT_ID p_object_id) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(OBJECT_ID_CHART == *p_object_id) { @@ -852,7 +852,7 @@ T5_CMD_PROTO(static, chart_edit_cmd_toggle_marks) { const P_CHART_HEADER p_chart_header = p_chart_header_from_docu_last(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(docu_focus_owner_object_call(p_docu, p_chart_header && (p_chart_header->selection.id.name != GR_CHART_OBJNAME_ANON) ? T5_CMD_SELECTION_CLEAR : T5_CMD_SELECT_DOCUMENT, de_const_cast(P_T5_CMD, p_t5_cmd))); } @@ -861,7 +861,7 @@ T5_MSG_PROTO(static, chart_edit_msg_mark_info_read, _InoutRef_ P_MARK_INFO p_mar { const P_CHART_HEADER p_chart_header = p_chart_header_from_docu_last(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_mark_info->h_markers = p_chart_header && (p_chart_header->selection.id.name != GR_CHART_OBJNAME_ANON); @@ -872,8 +872,8 @@ T5_MSG_PROTO(static, chart_edit_msg_selection_clear, _InRef_ P_NOTE_OBJECT_SELEC { const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_selection_clear->object_data_ref; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); chart_selection_clear(p_chart_header, p_note_object_selection_clear->p_note_info); @@ -886,7 +886,7 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_snapshot, _InoutRef_ P_NOTE_OBJE const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_snapshot->object_data_ref; P_GR_DIAG p_gr_diag; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!gr_chart_diagram(p_chart_header->ch, &p_gr_diag)) return(STATUS_FAIL); @@ -899,8 +899,8 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_snapshot, _InoutRef_ P_NOTE_OBJE T5_MSG_PROTO(static, chart_edit_cmd_force_recalc, _InRef_ P_CHART_HEADER p_chart_header) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); chart_rebuild_after_modify(p_chart_header); @@ -909,8 +909,8 @@ T5_MSG_PROTO(static, chart_edit_cmd_force_recalc, _InRef_ P_CHART_HEADER p_chart T5_MSG_PROTO(static, chart_edit_msg_note_delete, _In_ P_CHART_HEADER p_chart_header) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); chart_dispose(&p_chart_header); @@ -921,7 +921,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_gallery) { S32 arg_s32 = -1; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { @@ -970,7 +970,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_edit) GR_CHART_OBJID id; S32 arg_s32 = -1; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_chart_header) { @@ -1045,7 +1045,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_style) GR_CHART_OBJID id; S32 arg_s32 = -1; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_chart_header) { @@ -1119,7 +1119,7 @@ T5_CMD_PROTO(static, t5_cmd_chart_editx) const P_CHART_HEADER p_chart_header = p_chart_header_from_docu_last(p_docu); S32 arg_s32 = -1; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_chart_header) { @@ -1153,7 +1153,7 @@ T5_MSG_PROTO(static, chart_edit_msg_chart_edit_insert_picture, _InRef_ P_MSG_INS const BOOL ctrl_pressed = p_msg_insert_foreign->ctrl_pressed; BOOL embed_file = global_preferences.embed_inserted_files; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* SKS 10/13oct99 take note of Ctrl key state too - inverts the preference */ if(ctrl_pressed) embed_file = !embed_file; @@ -1181,7 +1181,7 @@ T5_MSG_PROTO(static, chart_edit_msg_note_object_edit_start, _InoutRef_ P_NOTE_OB const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_edit_start->object_data_ref; P_GR_DIAG p_gr_diag; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if((NULL == p_chart_header) || !gr_chart_diagram(p_chart_header->ch, &p_gr_diag)) { @@ -1247,8 +1247,8 @@ T5_MSG_PROTO(static, chart_edit_event_redraw, _InRef_ P_NOTE_OBJECT_REDRAW p_not { const P_CHART_HEADER p_chart_header = (P_CHART_HEADER) p_note_object_redraw->object_redraw.object_data.u.p_object; /* (puke) */ - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_chart_header) return(create_error(ERR_NOTE_NOT_LOADED)); diff --git a/t5/ob_chart/gr_uiaxi.c b/t5/ob_chart/gr_uiaxi.c index f20b1e0..ca67be9 100644 --- a/t5/ob_chart/gr_uiaxi.c +++ b/t5/ob_chart/gr_uiaxi.c @@ -516,7 +516,7 @@ gr_chart_axis_process_ctl_state_change( PROC_DIALOG_EVENT_PROTO(static, dialog_event_gr_chart_axis_process) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -771,7 +771,7 @@ dialog_gr_chart_series_process_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_gr_chart_series_process) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_chart/gr_uigal.c b/t5/ob_chart/gr_uigal.c index e7b3481..42d838e 100644 --- a/t5/ob_chart/gr_uigal.c +++ b/t5/ob_chart/gr_uigal.c @@ -1061,8 +1061,8 @@ pie_gallery_ctl_create[] = T5_MSG_PROTO(extern, chart_msg_chart_gallery, _InoutRef_ P_T5_MSG_CHART_GALLERY_DATA p_t5_msg_chart_gallery_data) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_t5_msg_chart_gallery_data->chart_type) { @@ -1879,8 +1879,8 @@ series_ctl_create[] = T5_MSG_PROTO(extern, chart_msg_chart_dialog, _InoutRef_ P_T5_MSG_CHART_DIALOG_DATA p_msg_chart_dialog_data) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_chart_dialog_data->reason) { diff --git a/t5/ob_chart/gr_uisty.c b/t5/ob_chart/gr_uisty.c index 62c4ee2..5d3d2ca 100644 --- a/t5/ob_chart/gr_uisty.c +++ b/t5/ob_chart/gr_uisty.c @@ -602,7 +602,7 @@ dialog_style_fill_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_style_fill) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -877,7 +877,7 @@ dialog_style_line_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_style_line) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1276,7 +1276,7 @@ dialog_style_text_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_style_text) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1720,7 +1720,7 @@ dialog_chart_margins_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_chart_margins) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1845,7 +1845,7 @@ dialog_chart_legend_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_chart_legend) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_chart/ob_chart.c b/t5/ob_chart/ob_chart.c index 29c4ad3..f9f2176 100644 --- a/t5/ob_chart/ob_chart.c +++ b/t5/ob_chart/ob_chart.c @@ -372,8 +372,8 @@ gr_chart_warning( _ChartRef_ P_GR_CHART p_gr_chart, _InVal_ STATUS status) { - IGNOREPARM_ChartRef_(p_gr_chart); - IGNOREPARM_InVal_(status); + UNREFERENCED_PARAMETER_ChartRef_(p_gr_chart); + UNREFERENCED_PARAMETER_InVal_(status); } /* try to allocate charts in multiples of this */ @@ -461,7 +461,7 @@ chart_add( break; } - IGNOREPARM(p_u8); + UNREFERENCED_PARAMETER(p_u8); end_key = stt_key + 1; @@ -813,7 +813,7 @@ chart_event_scheduled( PROC_EVENT_PROTO(static, scheduled_event_chart) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(t5_message) { @@ -868,7 +868,7 @@ chart_new( if(NULL == collect_add_entry_elem(CHART_LISTED_DATA, &charts_list_block, &chart_listed_data, chartdatakey, &status)) break; - IGNOREPARM_InVal_(use_preferred); + UNREFERENCED_PARAMETER_InVal_(use_preferred); status = (/*use_preferred ? gr_chart_preferred_new(&p_chart_header->ch, p_chart_header) :*/ gr_chart_new(&p_chart_header->ch, p_chart_header, new_untitled)); @@ -1287,7 +1287,7 @@ main events MAEVE_EVENT_PROTO(static, maeve_event_ob_chart) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1333,9 +1333,9 @@ chart_msg_recalced(void) MAEVE_SERVICES_EVENT_PROTO(static, maeve_services_event_ob_chart) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -1358,7 +1358,7 @@ PROC_UREF_EVENT_PROTO(static, proc_uref_event_ob_chart) const P_CHART_ELEMENT p_chart_element = (P_CHART_ELEMENT) p_uref_event_block->uref_id.client_handle; const P_CHART_HEADER p_chart_header = p_chart_element->p_chart_header; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); #if TRACE_ALLOWED && 1 if_constant(tracing(TRACE_APP_UREF)) @@ -1820,7 +1820,7 @@ PROC_GR_CHART_TRAVEL_PROTO(proc_travel_chart_text) { const P_CHART_ELEMENT p_chart_element = (P_CHART_ELEMENT) client_handle; - IGNOREPARM(item); + UNREFERENCED_PARAMETER(item); if(!val) { diff --git a/t5/ob_dlg/ob_dlg.c b/t5/ob_dlg/ob_dlg.c index d22bea8..e0ece9b 100644 --- a/t5/ob_dlg/ob_dlg.c +++ b/t5/ob_dlg/ob_dlg.c @@ -380,7 +380,7 @@ dialog_cmd_ctl_parent_query( if(NULL == (p_dialog_ictl = p_dialog_ictl_from_control_id_in(&p_dialog->ictls, p_dialog_cmd_ctl_parent_query->dialog_control_id, &p_parent_ictls))) return(create_error(DIALOG_ERR_UNKNOWN_DIALOG_CONTROL)); - IGNOREPARM(p_dialog_ictl); + UNREFERENCED_PARAMETER(p_dialog_ictl); PTR_ASSERT(p_parent_ictls); @@ -763,7 +763,7 @@ dialog_cmd_ctl_size_set( _InRef_ P_DIALOG_CMD_CTL_SIZE_SET p_dialog_cmd_ctl_size_set) { /* no longer required */ - IGNOREPARM_InRef_(p_dialog_cmd_ctl_size_set); + UNREFERENCED_PARAMETER_InRef_(p_dialog_cmd_ctl_size_set); return(STATUS_OK); } @@ -1429,7 +1429,7 @@ dialog_cmd_hwnd_query( return(create_error(DIALOG_ERR_UNKNOWN_DIALOG_CONTROL)); /* otherwise WHAT? */ - IGNOREPARM(p_dialog_ictl); + UNREFERENCED_PARAMETER(p_dialog_ictl); } return(STATUS_OK); @@ -1731,8 +1731,8 @@ dialog_ictl_edit_xx_encode_here( #endif if(NULL != p_dialog_ictl_edit_xx->riscos.mlec) status_assert(status = mlec_SetText(p_dialog_ictl_edit_xx->riscos.mlec, ustr)); - IGNOREPARM_InRef_(p_dialog); - IGNOREPARM(combo_type); + UNREFERENCED_PARAMETER_InRef_(p_dialog); + UNREFERENCED_PARAMETER(combo_type); #elif WINDOWS if(HOST_WND_NONE != p_dialog->hwnd) { @@ -1786,7 +1786,7 @@ dialog_ictl_encode_here( _InVal_ S32 bits) { #if WINDOWS - IGNOREPARM_InVal_(bits); + UNREFERENCED_PARAMETER_InVal_(bits); #endif { @@ -2321,8 +2321,8 @@ dialog_event( T5_MSG_PROTO(static, dialog_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_dlg/ob_dlg2.c b/t5/ob_dlg/ob_dlg2.c index d0f070b..f921adb 100644 --- a/t5/ob_dlg/ob_dlg2.c +++ b/t5/ob_dlg/ob_dlg2.c @@ -1281,7 +1281,7 @@ dialog_current_set( const DIALOG_CONTROL_ID old_current_dialog_control_id = p_dialog->current_dialog_control_id; #if !RISCOS - IGNOREPARM_InVal_(disallow_movement); + UNREFERENCED_PARAMETER_InVal_(disallow_movement); #endif #if RISCOS @@ -1643,7 +1643,7 @@ dialog_dbox_process_focus_return_pre( } } #else - IGNOREPARM(p_dialog); + UNREFERENCED_PARAMETER(p_dialog); #endif } @@ -2055,7 +2055,7 @@ T5_MSG_PROTO(extern, dialog_dbox_process, P_DIALOG_CMD_PROCESS_DBOX p_dialog_cmd P_DIALOG p_dialog; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_dialog_cmd_process_dbox->caption.type != 0xBCBCBCBC); assert(* (PC_U32) &p_dialog_cmd_process_dbox->bits != (U32) 0xBCBCBCBC); diff --git a/t5/ob_dlg/ob_dlg3.c b/t5/ob_dlg/ob_dlg3.c index 3e6d1c3..dfb277a 100644 --- a/t5/ob_dlg/ob_dlg3.c +++ b/t5/ob_dlg/ob_dlg3.c @@ -1100,7 +1100,7 @@ maeve_dialog_msg_initclose( _InRef_ PC_MSG_INITCLOSE p_msg_initclose, _InRef_ PC_MAEVE_BLOCK p_maeve_block) { - IGNOREPARM_InVal_(t5_message_dummy); /* dummy for APCS */ + UNREFERENCED_PARAMETER_InVal_(t5_message_dummy); /* dummy for APCS */ switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1118,7 +1118,7 @@ maeve_dialog_msg_initclose( MAEVE_EVENT_PROTO(extern, maeve_event_dialog) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1151,7 +1151,7 @@ maeve_dialog_stolen_focus_msg_initclose( _InRef_ PC_MSG_INITCLOSE p_msg_initclose, _InRef_ PC_MAEVE_BLOCK p_maeve_block) { - IGNOREPARM_InVal_(t5_message_dummy); /* dummy for APCS */ + UNREFERENCED_PARAMETER_InVal_(t5_message_dummy); /* dummy for APCS */ switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1169,7 +1169,7 @@ maeve_dialog_stolen_focus_msg_initclose( MAEVE_EVENT_PROTO(extern, maeve_event_dialog_stolen_focus) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { diff --git a/t5/ob_dlg/ri_dlg.c b/t5/ob_dlg/ri_dlg.c index d7e7f22..423b3ef 100644 --- a/t5/ob_dlg/ri_dlg.c +++ b/t5/ob_dlg/ri_dlg.c @@ -275,7 +275,7 @@ dialog_riscos_free_cached_bitmaps( PROC_DIALOG_EVENT_PROTO(static, lbn_event_dialog) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); return(object_call_DIALOG(dialog_message, p_data)); } @@ -2574,7 +2574,7 @@ dialog_riscos_ictl_edit_xx_destroy( p_dialog_ictl_edit_xx->riscos.slec_buffer_size = 0; } #else - IGNOREPARM(p_dialog); + UNREFERENCED_PARAMETER(p_dialog); #endif if(NULL != p_dialog_ictl_edit_xx->riscos.mlec) @@ -2798,7 +2798,7 @@ static STATUS dialog_riscos_help_contents( _InoutRef_ P_DIALOG p_dialog) { - IGNOREPARM_InRef_(p_dialog); + UNREFERENCED_PARAMETER_InRef_(p_dialog); return(dialog_riscos_help_common(TEXT("HTMLhelp.html.") TEXT("index/htm"))); } @@ -2887,7 +2887,7 @@ dialog_riscos_key_pressed_hot_key( } } - IGNOREPARM(status); + UNREFERENCED_PARAMETER(status); return(STATUS_DONE /*processed*/); } @@ -3227,7 +3227,7 @@ dialog_riscos_null_event_do( if(NULL != (p_dialog_ictl_edit_xx = p_dialog_ictl_edit_xx_from(p_dialog_ictl))) { - IGNOREPARM(p_dialog_ictl_edit_xx); + UNREFERENCED_PARAMETER(p_dialog_ictl_edit_xx); dialog_riscos_mlec_enull(p_dialog, p_dialog_ictl); return; } @@ -3634,8 +3634,8 @@ dialog_riscos_mlec_event_mouse_click_pshape( P_DIALOG_ICTL_EDIT_XX p_dialog_ictl_edit_xx, _In_ const WimpMouseClickEvent * const p_mouse_click) { - IGNOREPARM(p_dialog); - IGNOREPARM(p_dialog_ictl); + UNREFERENCED_PARAMETER(p_dialog); + UNREFERENCED_PARAMETER(p_dialog_ictl); if(p_dialog_ictl_edit_xx->riscos.mlec) { diff --git a/t5/ob_dlg/ri_lbox.c b/t5/ob_dlg/ri_lbox.c index 13a2bf2..55c1c24 100644 --- a/t5/ob_dlg/ri_lbox.c +++ b/t5/ob_dlg/ri_lbox.c @@ -393,7 +393,7 @@ ri_lbox_event_close_window( return(dialog_riscos_lbn_destroy.processed); } - IGNOREPARM_CONST(p_close_window_request); + UNREFERENCED_PARAMETER_CONST(p_close_window_request); return(FALSE /*unprocessed*/); } diff --git a/t5/ob_dlg/wi_dlg.c b/t5/ob_dlg/wi_dlg.c index 6ba691a..671ec6d 100644 --- a/t5/ob_dlg/wi_dlg.c +++ b/t5/ob_dlg/wi_dlg.c @@ -480,7 +480,7 @@ dialog_onInitDialog( consume(LONG_PTR, SetWindowLongPtr(hwnd, DWLP_USER, (LONG_PTR) lParam)); - IGNOREPARM_HwndRef_(hwndFocus); + UNREFERENCED_PARAMETER_HwndRef_(hwndFocus); p_dialog->hwnd = hwnd; @@ -1909,7 +1909,7 @@ dialog_onCommand( const P_DIALOG_ICTL p_dialog_ictl = p_dialog_ictl_from_control_id(p_dialog, dialog_control_id); STATUS status = STATUS_OK; - IGNOREPARM_HwndRef_(hwndCtl); + UNREFERENCED_PARAMETER_HwndRef_(hwndCtl); if(NULL != p_dialog_ictl) /* some of them don't have Cancel buttons, for instance */ switch(p_dialog_ictl->dialog_control_type) @@ -2042,9 +2042,9 @@ dialog_onSetFont( _In_ HFONT hfont, _InVal_ BOOL fRedraw) { - IGNOREPARM_HwndRef_(hwnd); - IGNOREPARM(hfont); - IGNOREPARM_InVal_(fRedraw); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); + UNREFERENCED_PARAMETER(hfont); + UNREFERENCED_PARAMETER_InVal_(fRedraw); } /****************************************************************************** @@ -2464,7 +2464,7 @@ dialog_onMeasureItem( /*const P_DIALOG_ICTL p_dialog_ictl = p_dialog_ictl_from_control_id(p_dialog, dialog_control_id);*/ SIZE gdi_size = { 16, 16 }; /* Keep dataflower happy */ - IGNOREPARM_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); pMeasureItem->itemWidth = gdi_size.cx; pMeasureItem->itemHeight = gdi_size.cy; @@ -2556,7 +2556,7 @@ dialog_onNotify( _In_ int wParam, _In_reads_bytes_c_(sizeof32(NMUPDOWN)) NMHDR * pNmHdr) { - IGNOREPARM(wParam); /* The identifier of the common control sending the message */ + UNREFERENCED_PARAMETER(wParam); /* The identifier of the common control sending the message */ switch(pNmHdr->code) { diff --git a/t5/ob_draw/ob_draw.c b/t5/ob_draw/ob_draw.c index 3553002..d6c09fe 100644 --- a/t5/ob_draw/ob_draw.c +++ b/t5/ob_draw/ob_draw.c @@ -416,7 +416,7 @@ T5_MSG_PROTO(static, draw_msg_note_delete, /*_Inout_*/ P_ANY p_data) const P_DRAW_INSTANCE_DATA p_draw_instance_data = p_object_instance_data_DRAW(p_docu); ARRAY_INDEX intref = (ARRAY_INDEX) (intptr_t) p_data; /* position in h_drawing_list */ - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(array_index_is_valid(&p_draw_instance_data->h_drawing_list, intref)) { @@ -444,7 +444,7 @@ T5_MSG_PROTO(static, draw_note_donate, P_NOTE_OBJECT_SNAPSHOT p_note_object_snap ARRAY_HANDLE array_handle = 0; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { SC_ARRAY_INIT_BLOCK array_init_block = aib_init(1, sizeof32(*p_drawing_info), TRUE); @@ -499,7 +499,7 @@ T5_MSG_PROTO(static, draw_msg_note_object_size_query, P_NOTE_OBJECT_SIZE p_note_ const P_DRAW_INSTANCE_DATA p_draw_instance_data = p_object_instance_data_DRAW(p_docu); const P_DRAWING_INFO p_drawing_info = array_ptr(&p_draw_instance_data->h_drawing_list, DRAWING_INFO, (ARRAY_INDEX) (intptr_t) p_note_object_size->object_data_ref); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_drawing_info->use_image_cache_handle) { @@ -534,8 +534,8 @@ T5_MSG_PROTO(static, draw_msg_note_load_intref_from_extref, P_NOTE_REF p_note_re { const P_DRAW_LOAD_INSTANCE p_draw_load_instance = collect_goto_item(DRAW_LOAD_INSTANCE, &p_note_ref->p_of_ip_format->object_data_list, OBJECT_ID_DRAW); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_draw_load_instance) { @@ -561,7 +561,7 @@ T5_MSG_PROTO(static, draw_msg_note_ensure_embedded, P_NOTE_ENSURE_EMBEDDED p_not const P_DRAW_INSTANCE_DATA p_draw_instance_data = p_object_instance_data_DRAW(p_docu); const P_DRAWING_INFO p_drawing_info = array_ptr(&p_draw_instance_data->h_drawing_list, DRAWING_INFO, (ARRAY_INDEX) (intptr_t) p_note_ensure_embedded->object_data_ref); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_drawing_info->tag == DRAWING_REFERENCE) { @@ -653,7 +653,7 @@ T5_MSG_PROTO(static, draw_msg_note_ensure_saved, P_NOTE_ENSURE_SAVED p_note_ensu P_DRAW_SAVE_INSTANCE p_draw_save_instance = collect_goto_item(DRAW_SAVE_INSTANCE, &p_of_op_format->object_data_list, (LIST_ITEMNO) object_id); P_DRAW_SAVE_MAP p_draw_save_map; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_draw_save_instance) { @@ -966,7 +966,7 @@ draw_msg_close2( T5_MSG_PROTO(static, draw_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -994,7 +994,7 @@ T5_MSG_PROTO(static, draw_event_redraw, P_NOTE_OBJECT_REDRAW p_note_object_redra { const P_DRAW_INSTANCE_DATA p_draw_instance_data = p_object_instance_data_DRAW(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_note_object_redraw->object_redraw.flags.show_content) { @@ -1049,8 +1049,8 @@ T5_MSG_PROTO(static, draw_msg_load_ended, P_OF_IP_FORMAT p_of_ip_format) { const P_DRAW_LOAD_INSTANCE p_draw_load_instance = collect_goto_item(DRAW_LOAD_INSTANCE, &p_of_ip_format->object_data_list, OBJECT_ID_DRAW); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != p_draw_load_instance) al_array_dispose(&p_draw_load_instance->h_mapping_list); @@ -1060,7 +1060,7 @@ T5_MSG_PROTO(static, draw_msg_load_ended, P_OF_IP_FORMAT p_of_ip_format) T5_MSG_PROTO(static, draw_msg_load_construct_ownform, P_CONSTRUCT_CONVERT p_construct_convert) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_construct_convert->p_construct->t5_message) { @@ -1154,7 +1154,7 @@ T5_MSG_PROTO(static, draw_msg_insert_foreign, P_MSG_INSERT_FOREIGN p_msg_insert_ const BOOL ctrl_pressed = p_msg_insert_foreign->ctrl_pressed; BOOL embed_file = global_preferences.embed_inserted_files; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!image_cache_can_import_with_image_convert(p_msg_insert_foreign->t5_filetype)) return(create_error(ERR_UNKNOWN_FILETYPE)); @@ -1176,8 +1176,8 @@ T5_MSG_PROTO(static, draw_msg_insert_foreign, P_MSG_INSERT_FOREIGN p_msg_insert_ T5_MSG_PROTO(static, draw_msg_save, _InRef_ PC_MSG_SAVE p_msg_save) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_save->t5_msg_save_message) { @@ -1202,7 +1202,7 @@ T5_MSG_PROTO(static, draw_msg_save_picture, _InRef_ P_MSG_SAVE_PICTURE p_msg_sav const P_DRAW_INSTANCE_DATA p_draw_instance_data = p_object_instance_data_DRAW(p_docu); const P_DRAWING_INFO p_drawing_info = array_ptr(&p_draw_instance_data->h_drawing_list, DRAWING_INFO, (ARRAY_INDEX) p_msg_save_picture->extra); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_drawing_info->use_image_cache_handle) { @@ -1238,7 +1238,7 @@ T5_MSG_PROTO(static, draw_msg_save_picture_filetypes_request, _InoutRef_ P_MSG_S SAVE_FILETYPE save_filetype; zero_struct(save_filetype); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(FILETYPE_UNDETERMINED == p_drawing_info->t5_filetype) return(STATUS_OK); diff --git a/t5/ob_drwio/drwprint.c b/t5/ob_drwio/drwprint.c index b16ee5e..659fab2 100644 --- a/t5/ob_drwio/drwprint.c +++ b/t5/ob_drwio/drwprint.c @@ -79,7 +79,7 @@ T5_CMD_PROTO(static, t5_cmd_test_save_metafile) rect.right = (rect.right * iWidthMM * 100)/iWidthPels; rect.bottom = (rect.bottom * iHeightMM * 100)/iHeightPels; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); // Create the metafile device context. hdc = @@ -244,7 +244,7 @@ T5_CMD_PROTO(static, t5_cmd_test_save_metafile) if(NULL != hdc) DeleteEnhMetaFile(CloseEnhMetaFile(hdc)); - IGNOREPARM(p_t5_cmd); + UNREFERENCED_PARAMETER(p_t5_cmd); return(status); } diff --git a/t5/ob_drwio/ob_drwio.c b/t5/ob_drwio/ob_drwio.c index f816ea5..a180228 100644 --- a/t5/ob_drwio/ob_drwio.c +++ b/t5/ob_drwio/ob_drwio.c @@ -571,7 +571,7 @@ dialog_save_as_drawfile_riscos_drag_ended( PROC_DIALOG_EVENT_PROTO(static, dialog_event_save_as_drawfile) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -624,8 +624,8 @@ save_as_drawfile_details_query( } #else /* Assume filename already set up correctly, and is the one in p_save_as_drawfile_callback */ - IGNOREPARM_InoutRef_(p_save_as_drawfile_callback); - IGNOREPARM(p_ui_text_filename); + UNREFERENCED_PARAMETER_InoutRef_(p_save_as_drawfile_callback); + UNREFERENCED_PARAMETER(p_ui_text_filename); #endif } @@ -634,7 +634,7 @@ static STATUS save_as_drawfile_dialog_check( _InoutRef_ P_SAVE_AS_DRAWFILE_CALLBACK p_save_as_drawfile_callback) { - IGNOREPARM_InoutRef_(p_save_as_drawfile_callback); + UNREFERENCED_PARAMETER_InoutRef_(p_save_as_drawfile_callback); /* as good a place as any to get state back from UI */ p_save_as_drawfile_callback->all_or_range = ui_dlg_get_check(p_save_as_drawfile_callback->h_dialog, CONTROL_ID_AR_GROUP); @@ -1019,8 +1019,8 @@ T5_CMD_PROTO(static, t5_cmd_save_as_drawfile_intro) QUICK_TBLOCK_WITH_BUFFER(quick_tblock, 64); quick_tblock_with_buffer_setup(quick_tblock); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* encode initial state of control(s) */ @@ -1139,7 +1139,7 @@ T5_CMD_PROTO(static, t5_cmd_save_as_drawfile) SAVE_AS_DRAWFILE_CALLBACK save_as_drawfile_callback; PCTSTR filename; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); t5_cmd_save_as_drawfile_init(p_docu, &save_as_drawfile_callback); @@ -1170,8 +1170,8 @@ T5_CMD_PROTO(static, t5_cmd_save_as_drawfile) T5_MSG_PROTO(static, draw_io_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_file/ob_file.c b/t5/ob_file/ob_file.c index a881bcd..caf8ff9 100644 --- a/t5/ob_file/ob_file.c +++ b/t5/ob_file/ob_file.c @@ -234,7 +234,7 @@ OpenFileHook( { const HWND hwnd = GetParent(hdlg); /* *This* is the 'Open File' window handle */ - IGNOREPARM(wParam); + UNREFERENCED_PARAMETER(wParam); switch(uiMsg) { @@ -615,7 +615,7 @@ t5_SHGetSpecialFolderLocation( void_WrapOsBoolChecking(SHGetPathFromIDListEx(pidl, p_dir_name, elemof_buffer, GPFIDL_DEFAULT)); #else assert(elemof_buffer >= MAX_PATH); /* SHGetPathFromIDListEx() needs Vista or later */ - IGNOREPARM_InVal_(elemof_buffer); + UNREFERENCED_PARAMETER_InVal_(elemof_buffer); if(!WrapOsBoolChecking(SHGetPathFromIDList(pidl, p_dir_name))) p_dir_name[0] = CH_NULL; @@ -713,8 +713,8 @@ GetUserTemplatesDirectoryName( T5_MSG_PROTO(static, file_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -740,8 +740,8 @@ T5_MSG_PROTO(static, file_msg_error_rq, _InoutRef_ P_MSG_ERROR_RQ p_msg_error_rq { PCTSTR p_error = file_error_get(); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_error) { /* no error to be returned */ @@ -755,8 +755,8 @@ T5_MSG_PROTO(static, file_msg_error_rq, _InoutRef_ P_MSG_ERROR_RQ p_msg_error_rq T5_CMD_PROTO(static, file_cmd_new_document) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* pop up template list or load single template */ return(load_this_template_file_rl(p_docu, NULL)); @@ -766,8 +766,8 @@ T5_CMD_PROTO(static, file_cmd_new_document) T5_CMD_PROTO(static, file_cmd_close_document_req) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); process_close_request(p_docu, P_VIEW_NONE, TRUE /*closing_a_doc*/, FALSE, FALSE); diff --git a/t5/ob_hefo/ob_hefo.c b/t5/ob_hefo/ob_hefo.c index 712f4fd..f1972fb 100644 --- a/t5/ob_hefo/ob_hefo.c +++ b/t5/ob_hefo/ob_hefo.c @@ -516,7 +516,7 @@ MAEVE_EVENT_PROTO(static, maeve_event_ob_hefo) { const STATUS status = STATUS_OK; - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -619,7 +619,7 @@ T5_CMD_PROTO(static, hefo_load_data) P_HEADFOOT_DEF p_headfoot_def; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); row = p_args[ARG_HEFO_DATA_ROW].val.row; data_space = p_args[ARG_HEFO_DATA_DATA_SPACE].val.u8n; @@ -1399,7 +1399,7 @@ dialog_page_hefo_break_intro_ctl_state_change( PROC_DIALOG_EVENT_PROTO(static, dialog_event_page_hefo_break_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1611,7 +1611,7 @@ page_hefo_break_list_create( while(NULL != (p_page_hefo_break = page_hefo_break_enum(p_docu, &row))) { - IGNOREPARM(p_page_hefo_break); + UNREFERENCED_PARAMETER(p_page_hefo_break); if(NULL != (p_page_hefo_break_list_info = al_array_extend_by(p_array_handle, PAGE_HEFO_BREAK_LIST_INFO, 1, &aib, &status))) { @@ -2064,7 +2064,7 @@ OBJECT_PROTO(extern, object_hefo) if(NULL != (p_markers = al_array_extend_by(&p_docu->mark_info_hefo.h_markers, MARKERS, 1, &array_init_block, &status))) { - IGNOREPARM(p_markers); + UNREFERENCED_PARAMETER(p_markers); al_array_auto_compact_set(&p_docu->mark_info_hefo.h_markers); @@ -2899,7 +2899,7 @@ PROC_EVENT_PROTO(static, proc_event_hefo_common) p_docu->anchor_mark.docu_area.br.object_position = object_position_find.object_data.object_position_start; status_consume(object_call_HEFO_with_hb(p_docu, - (t5_message == T5_EVENT_CLICK_DRAG_FINISHED) ? T5_MSG_ANCHOR_FINISHED : T5_MSG_ANCHOR_UPDATE, + (T5_EVENT_CLICK_DRAG_FINISHED == t5_message) ? T5_MSG_ANCHOR_FINISHED : T5_MSG_ANCHOR_UPDATE, p_hefo_block)); status_consume(object_call_HEFO_with_hb(p_docu, T5_MSG_SELECTION_SHOW, p_hefo_block)); @@ -2915,7 +2915,7 @@ PROC_EVENT_PROTO(static, proc_event_hefo_common) if(object_data_from_hefo_block_and_object_position(&object_position_set.object_data, p_hefo_block, P_OBJECT_POSITION_NONE)) { - if(t5_message == T5_EVENT_CLICK_LEFT_DOUBLE) + if(T5_EVENT_CLICK_LEFT_DOUBLE == t5_message) { P_SKELEVENT_CLICK p_skelevent_click = P_DATA_FROM_HEFO_BLOCK(SKELEVENT_CLICK, p_hefo_block); p_skelevent_click->processed = 1; @@ -2948,7 +2948,7 @@ PROC_EVENT_PROTO(static, proc_event_hefo_common) { P_HEFO_BLOCK p_hefo_block = (P_HEFO_BLOCK) p_data; - if(t5_message == T5_EVENT_CLICK_LEFT_TRIPLE) + if(T5_EVENT_CLICK_LEFT_TRIPLE == t5_message) { P_SKELEVENT_CLICK p_skelevent_click = P_DATA_FROM_HEFO_BLOCK(SKELEVENT_CLICK, p_hefo_block); p_skelevent_click->processed = 1; @@ -3024,7 +3024,7 @@ PROC_EVENT_PROTO(static, proc_event_hefo_common) status_consume(object_call_HEFO_with_hb(p_docu, T5_MSG_ANCHOR_UPDATE, p_hefo_block)); /* either start drag or finish altogether */ - if(t5_message == T5_EVENT_CLICK_RIGHT_SINGLE) + if(T5_EVENT_CLICK_RIGHT_SINGLE == t5_message) status_consume(object_call_HEFO_with_hb(p_docu, T5_MSG_ANCHOR_FINISHED, p_hefo_block)); else host_drag_start(NULL); @@ -3153,22 +3153,24 @@ PROC_EVENT_PROTO(static, proc_event_hefo_common) { if(array_elements(p_hefo_block->p_h_data)) status = object_call_HEFO_with_hb(p_docu, t5_message, p_hefo_block); - else if(object_redraw.flags.show_selection) - { - BOOL do_invert = FALSE; - - if(!object_redraw.flags.show_content) + else + { /* NULL object - nothing to paint, but invert if necessary */ + if(object_redraw.flags.show_selection) { - if(object_redraw.flags.marked_now != object_redraw.flags.marked_screen) - do_invert = TRUE; - } - else do_invert = object_redraw.flags.marked_now; + BOOL do_invert; - if(do_invert) - host_invert_rectangle_filled(&object_redraw.redraw_context, - &object_redraw.pixit_rect_object, - &object_redraw.rgb_fore, - &object_redraw.rgb_back); + if(object_redraw.flags.show_content) + + do_invert = object_redraw.flags.marked_now; + else + do_invert = (object_redraw.flags.marked_now != object_redraw.flags.marked_screen); + + if(do_invert) + host_invert_rectangle_filled(&object_redraw.redraw_context, + &object_redraw.pixit_rect_object, + &object_redraw.rgb_fore, + &object_redraw.rgb_back); + } } } diff --git a/t5/ob_hefo/ob_hefo.h b/t5/ob_hefo/ob_hefo.h index f79e704..8a1fa63 100644 --- a/t5/ob_hefo/ob_hefo.h +++ b/t5/ob_hefo/ob_hefo.h @@ -68,7 +68,7 @@ _p_data_from_hefo_block( CODE_ANALYSIS_ONLY_ARG(_InVal_ U32 bytesof_elem)) { assert(HEFO_BLOCK_MAGIC == p_hefo_block->magic); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_elem)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_elem)); return((P_BYTE) p_hefo_block->p_data); } diff --git a/t5/ob_hefo/ui_hefo.c b/t5/ob_hefo/ui_hefo.c index 7514c8c..982e312 100644 --- a/t5/ob_hefo/ui_hefo.c +++ b/t5/ob_hefo/ui_hefo.c @@ -1144,7 +1144,7 @@ dialog_page_hefo_break_values_ctl_state_change( PROC_DIALOG_EVENT_PROTO(static, dialog_event_page_hefo_break_values) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1373,7 +1373,7 @@ T5_CMD_PROTO(extern, t5_cmd_page_hefo_break_values_interactive) PAGE_HEFO_SELECTOR selector; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); page_hefo_break_values_callback.row = row; diff --git a/t5/ob_mails/ob_mails.c b/t5/ob_mails/ob_mails.c index 4be6578..2f7ba73 100644 --- a/t5/ob_mails/ob_mails.c +++ b/t5/ob_mails/ob_mails.c @@ -205,7 +205,7 @@ dialog_insert_mailshot_field_intro_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_insert_mailshot_field_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -632,7 +632,7 @@ dialog_mailshot_select_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_mailshot_select) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -906,7 +906,7 @@ T5_MSG_PROTO(static, mailshot_msg_read_mail_text, _InoutRef_ P_READ_MAIL_TEXT p_ P_MAILSHOT_INSTANCE_DATA p_mailshot_instance_data = p_object_instance_data_MAILSHOT_maybenone(p_docu); STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if((P_DATA_NONE != p_mailshot_instance_data) && array_elements(&p_mailshot_instance_data->field_data_handle)) { @@ -945,7 +945,7 @@ mailshot_msg_close1( P_DOCU p_docu_dependent = p_docu_from_docno(dependent_docno); P_MAILSHOT_INSTANCE_DATA p_mailshot_instance_data = p_object_instance_data_MAILSHOT_valid(p_docu_dependent); - IGNOREPARM_InVal_(source_docno); + UNREFERENCED_PARAMETER_InVal_(source_docno); /*reportf(TEXT("mailshot_msg_close1(source_docno=%d): dependent_docno=%d (maeve_handle was %d)"), source_docno, dependent_docno, p_mailshot_instance_data->maeve_handle);*/ p_mailshot_instance_data->source_docno = DOCNO_NONE; @@ -966,7 +966,7 @@ maeve_mailshot_msg_initclose( _InRef_ PC_MSG_INITCLOSE p_msg_initclose, _InRef_ PC_MAEVE_BLOCK p_maeve_block) { - IGNOREPARM_InVal_(t5_message_dummy); /* dummy for APCS */ + UNREFERENCED_PARAMETER_InVal_(t5_message_dummy); /* dummy for APCS */ switch(p_msg_initclose->t5_msg_initclose_message) { @@ -985,7 +985,7 @@ maeve_mailshot_msg_initclose( MAEVE_EVENT_PROTO(static, maeve_event_ob_mails) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1005,7 +1005,7 @@ MAEVE_EVENT_PROTO(static, maeve_event_ob_mails) T5_MSG_PROTO(static, mailshot_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_mlec/ob_mlec.c b/t5/ob_mlec/ob_mlec.c index c96e971..0c74564 100644 --- a/t5/ob_mlec/ob_mlec.c +++ b/t5/ob_mlec/ob_mlec.c @@ -31,8 +31,8 @@ extern PC_U8 rb_mlec_msg_weak; T5_MSG_PROTO(static, mlec_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_note/ob_note.c b/t5/ob_note/ob_note.c index 957ff90..1675022 100644 --- a/t5/ob_note/ob_note.c +++ b/t5/ob_note/ob_note.c @@ -84,7 +84,7 @@ NOTE_OBJECT_BOUNDS, * P_NOTE_OBJECT_BOUNDS, ** P_P_NOTE_OBJECT_BOUNDS; (click_point.y >= obj_rect.tl.y) && \ (click_point.y < obj_rect.br.y) ) -#define VISIBLE(clip_skel_rect, obj_rect) ( \ +#define RECTANGLE_IS_VISIBLE(clip_skel_rect, obj_rect) ( \ (clip_skel_rect.br.pixit_point.x > obj_rect.tl.x) && \ (clip_skel_rect.br.pixit_point.y > obj_rect.tl.y) && \ (clip_skel_rect.tl.pixit_point.x < obj_rect.br.x) && \ @@ -420,7 +420,7 @@ notelayer_get_selection_info( T5_MSG_PROTO(static, note_msg_notelayer_selection_info, P_NOTELAYER_SELECTION_INFO p_notelayer_selection_info) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(notelayer_get_selection_info(p_docu, &p_notelayer_selection_info->object_id, &p_notelayer_selection_info->object_data_ref)); } @@ -438,7 +438,7 @@ T5_MSG_PROTO(static, note_msg_menu_other_info, _InoutRef_ P_MENU_OTHER_INFO p_me S32 selection_count = 0; ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); while(--note_index >= 0) { @@ -482,7 +482,7 @@ notelayer_menu_query( { const PC_NOTE_INFO p_note_info = array_ptrc(&p_docu->h_note_list, NOTE_INFO, note_index); - if(NOTE_SELECTION_EDITED != p_note_info->note_selection) + if(NOTE_SELECTION_IN_EDIT != p_note_info->note_selection) continue; if(OBJECT_ID_CHART == p_note_info->object_id) @@ -498,7 +498,7 @@ notelayer_menu_query( T5_MSG_PROTO(static, note_msg_note_menu_query, P_NOTE_MENU_QUERY p_note_menu_query) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_note_menu_query->menu_root_id = notelayer_menu_query(p_docu); @@ -568,7 +568,7 @@ T5_MSG_PROTO(static, note_msg_note_update_object, P_NOTE_UPDATE_OBJECT p_note_up P_ANY object_data_ref = p_note_update_object->object_data_ref; ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); while(--note_index >= 0) { @@ -589,7 +589,7 @@ T5_MSG_PROTO(static, note_msg_note_update_object_info, _InRef_ P_NOTE_UPDATE_OBJ OBJECT_ID object_id = p_note_update_object_info->object_id; P_ANY object_data_ref = p_note_update_object_info->object_data_ref; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_note_info->object_id != object_id) status_consume(object_call_id(p_note_info->object_id, p_docu, T5_MSG_NOTE_DELETE, p_note_info->object_data_ref)); @@ -613,7 +613,7 @@ note_msg_caret_show_claim( T5_MSG_PROTO(static, note_msg_mark_info_read, P_MARK_INFO p_mark_info) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_mark_info->h_markers = notelayer_count_selection(p_docu); @@ -914,8 +914,8 @@ notelayer_click_find_note( note_position = PIXIT_RECT_EAR_CENTRE; break; - case NOTE_SELECTION_EDITED: case NOTE_SELECTION_SELECTED: + case NOTE_SELECTION_IN_EDIT: { NOTE_OBJECT_BOUNDS note_object_bounds; @@ -968,7 +968,7 @@ notelayer_click_ear_start_drag( const T5_MESSAGE t5_message_right = T5_EVENT_CLICK_RIGHT_DRAG; const T5_MESSAGE t5_message_effective = right_message_if_ctrl(t5_message, t5_message_right, p_skelevent_click); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_note_info->flags.scale_to_fit) return(create_error(ERR_CANT_EDIT_SCALED_TO_FIT_NOTE)); @@ -1015,7 +1015,7 @@ notelayer_click_ear_TL( if(p_note_info->flags.scale_to_fit) return(create_error(ERR_CANT_EDIT_SCALED_TO_FIT_NOTE)); - note_pin_change(p_docu, p_note_info, (p_note_info->note_pinning == NOTE_UNPINNED) ? NOTE_PIN_CELLS_SINGLE : NOTE_UNPINNED); + note_pin_change(p_docu, p_note_info, (NOTE_UNPINNED == p_note_info->note_pinning) ? NOTE_PIN_CELLS_SINGLE : NOTE_UNPINNED); return(STATUS_OK); } @@ -1044,7 +1044,7 @@ notelayer_click_ear_BR( if(p_note_info->flags.scale_to_fit) return(create_error(ERR_CANT_EDIT_SCALED_TO_FIT_NOTE)); - note_pin_change(p_docu, p_note_info, (p_note_info->note_pinning == NOTE_PIN_CELLS_SINGLE) ? NOTE_PIN_CELLS_TWIN : NOTE_PIN_CELLS_SINGLE); + note_pin_change(p_docu, p_note_info, (NOTE_PIN_CELLS_SINGLE == p_note_info->note_pinning) ? NOTE_PIN_CELLS_TWIN : NOTE_PIN_CELLS_SINGLE); return(STATUS_OK); } @@ -1075,227 +1075,265 @@ notelayer_click_ear_other( _Check_return_ static STATUS -notelayer_click_ear_CENTRE( +notelayer_click_ear_CENTRE_IN_EDIT( _DocuRef_ P_DOCU p_docu, _InVal_ T5_MESSAGE t5_message, P_SKELEVENT_CLICK p_skelevent_click, _InoutRef_ P_NOTE_INFO p_note_info) { - STATUS status = STATUS_OK; - - switch(p_note_info->note_selection) + NOTE_OBJECT_CLICK note_object_click; + note_object_click.object_data_ref = p_note_info->object_data_ref; + note_object_click.t5_message = t5_message; + note_object_click.pixit_point.x = p_skelevent_click->skel_point.pixit_point.x - p_note_info->skel_rect.tl.pixit_point.x; + note_object_click.pixit_point.y = p_skelevent_click->skel_point.pixit_point.y - p_note_info->skel_rect.tl.pixit_point.y; + note_object_click.pixit_point.x = gr_coord_scale_inverse(note_object_click.pixit_point.x, p_note_info->gr_scale_pair.x); + note_object_click.pixit_point.y = gr_coord_scale_inverse(note_object_click.pixit_point.y, p_note_info->gr_scale_pair.y); + note_object_click.p_note_info = p_note_info; + note_object_click.p_skelevent_click = p_skelevent_click; + note_object_click.processed = 0; + status_consume(object_call_id(p_note_info->object_id, p_docu, T5_MSG_NOTE_OBJECT_CLICK, ¬e_object_click)); + if(1 == note_object_click.processed) + return(STATUS_DONE); + if(CB_CODE_NOTELAYER_NOTE_TRANSLATE_FOR_CLIENT == note_object_click.processed) { - case NOTE_SELECTION_EDITED: - { - NOTE_OBJECT_CLICK note_object_click; - note_object_click.object_data_ref = p_note_info->object_data_ref; - note_object_click.t5_message = t5_message; - note_object_click.pixit_point.x = p_skelevent_click->skel_point.pixit_point.x - p_note_info->skel_rect.tl.pixit_point.x; - note_object_click.pixit_point.y = p_skelevent_click->skel_point.pixit_point.y - p_note_info->skel_rect.tl.pixit_point.y; - note_object_click.pixit_point.x = gr_coord_scale_inverse(note_object_click.pixit_point.x, p_note_info->gr_scale_pair.x); - note_object_click.pixit_point.y = gr_coord_scale_inverse(note_object_click.pixit_point.y, p_note_info->gr_scale_pair.y); - note_object_click.p_note_info = p_note_info; - note_object_click.p_skelevent_click = p_skelevent_click; - note_object_click.processed = 0; - status_consume(object_call_id(p_note_info->object_id, p_docu, T5_MSG_NOTE_OBJECT_CLICK, ¬e_object_click)); - if(1 == note_object_click.processed) - break; - if(CB_CODE_NOTELAYER_NOTE_TRANSLATE_FOR_CLIENT == note_object_click.processed) - { - notelayer_note_translate_for_client(p_docu, ¬e_object_click); - break; - } - } /*block*/ - - /*FALLTHRU*/ + notelayer_note_translate_for_client(p_docu, ¬e_object_click); + return(STATUS_DONE); + } + return(STATUS_OK); +} - default: -#if CHECKING - assert(p_note_info->note_selection == NOTE_SELECTION_EDITED); +_Check_return_ +static STATUS +notelayer_click_ear_CENTRE_single( + _DocuRef_ P_DOCU p_docu, + _InVal_ T5_MESSAGE t5_message, + P_SKELEVENT_CLICK p_skelevent_click, + _InoutRef_ P_NOTE_INFO p_note_info) +{ + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER(p_skelevent_click); - /*FALLTHRU*/ + if(NOTE_SELECTION_SELECTED == p_note_info->note_selection) + { + /* 'select' a selected item - leave selection intact */ /*EMPTY*/ + } + else + { + /* 'select' an unselected item - clear selection (either in note layer or elsewhere) and select this item */ + status_assert(maeve_event(p_docu, T5_MSG_SELECTION_CLEAR, P_DATA_NONE)); - case NOTE_SELECTION_NONE: - case NOTE_SELECTION_SELECTED: -#endif - { - switch(t5_message) - { - case T5_EVENT_CLICK_LEFT_SINGLE: - case T5_EVENT_CLICK_RIGHT_SINGLE: - if(p_note_info->note_selection == NOTE_SELECTION_SELECTED) - { - /* 'select' a selected item - leave selection intact */ /*EMPTY*/ - } - else - { - /* 'select' an unselected item - clear selection (either in note layer or elsewhere) and select this item */ - status_assert(maeve_event(p_docu, T5_MSG_SELECTION_CLEAR, P_DATA_NONE)); + note_select(p_docu, p_note_info); + } - note_select(p_docu, p_note_info); - } - break; + return(STATUS_OK); +} -#if 0 - /* goodbye multiple selection */ - case T5_EVENT_CLICK_RIGHT_SINGLE: - if(p_note_info->note_selection == NOTE_SELECTION_SELECTED) - { - /* 'adjust' a selected item - remove it from the selection */ - note_update_later(p_docu, p_note_info, NOTE_UPDATE_SELECTION_MARKS); +#if 0 /* goodbye multiple selection */ - p_note_info->note_selection = NOTE_SELECTION_NONE; +_Check_return_ +static STATUS +notelayer_click_ear_CENTRE_right_single( + _DocuRef_ P_DOCU p_docu, + _InVal_ T5_MESSAGE t5_message, + P_SKELEVENT_CLICK p_skelevent_click, + _InoutRef_ P_NOTE_INFO p_note_info) +{ + if(NOTE_SELECTION_SELECTED == p_note_info->note_selection) + { + /* 'adjust' a selected item - remove it from the selection */ + note_update_later(p_docu, p_note_info, NOTE_UPDATE_SELECTION_MARKS); - /* tell everyone that selection has changed */ - status_assert(maeve_event(p_docu, T5_MSG_SELECTION_NEW, P_DATA_NONE)); + p_note_info->note_selection = NOTE_SELECTION_NONE; - if(!notelayer_selection_first(p_docu)) - caret_show_claim(p_docu, p_docu->focus_owner_old, FALSE); /* ensure focus is not in notelayer */ - } - else - { - /* 'adjust' an unselected item - add it to the selection */ - P_NOTE_INFO sel_p_note_info = notelayer_selection_first(p_docu); + /* tell everyone that selection has changed */ + status_assert(maeve_event(p_docu, T5_MSG_SELECTION_NEW, P_DATA_NONE)); - /* however, if the current selection is an edited note, drop that first */ - if(sel_p_note_info->note_selection == NOTE_SELECTION_EDITED) - status_assert(maeve_event(p_docu, T5_MSG_SELECTION_CLEAR, P_DATA_NONE)); + if(!notelayer_selection_first(p_docu)) + caret_show_claim(p_docu, p_docu->focus_owner_old, FALSE); /* ensure focus is not in notelayer */ + } + else + { + /* 'adjust' an unselected item - add it to the selection */ + P_NOTE_INFO sel_p_note_info = notelayer_selection_first(p_docu); - note_select(p_docu, p_note_info); - } - break; -#endif + /* however, if the current selection is an edited note, drop that first */ + if(NOTE_SELECTION_IN_EDIT == sel_p_note_info->note_selection) + status_assert(maeve_event(p_docu, T5_MSG_SELECTION_CLEAR, P_DATA_NONE)); - case T5_EVENT_CLICK_LEFT_DOUBLE: - { - { /* if the current selection contains any other, drop them first */ - STATUS clear_sel = 0; - STATUS sel_changed = 0; - ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); + note_select(p_docu, p_note_info); + } +} - while(--note_index >= 0) - { - const P_NOTE_INFO this_p_note_info = array_ptr(&p_docu->h_note_list, NOTE_INFO, note_index); +#endif - switch(this_p_note_info->note_selection) - { - default: - break; +_Check_return_ +static STATUS +notelayer_click_ear_CENTRE_left_double( + _DocuRef_ P_DOCU p_docu, + _InVal_ T5_MESSAGE t5_message, + P_SKELEVENT_CLICK p_skelevent_click, + _InoutRef_ P_NOTE_INFO p_note_info) +{ + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER(p_skelevent_click); - case NOTE_SELECTION_SELECTED: - if(this_p_note_info != p_note_info) - sel_changed = 1; - break; + { /* if the current selection contains any other, drop them first */ + STATUS clear_sel = 0; + STATUS sel_changed = 0; + ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); - case NOTE_SELECTION_EDITED: - clear_sel = 1; - break; - } - } + while(--note_index >= 0) + { + const P_NOTE_INFO this_p_note_info = array_ptr(&p_docu->h_note_list, NOTE_INFO, note_index); - if(clear_sel || sel_changed) - status_assert(maeve_event(p_docu, clear_sel ? T5_MSG_SELECTION_CLEAR : T5_MSG_SELECTION_NEW, P_DATA_NONE)); - } /*block*/ - - { /* start an edit for the object */ - NOTE_OBJECT_EDIT_START note_object_edit_start; - note_object_edit_start.processed = 0; - note_object_edit_start.object_data_ref = p_note_info->object_data_ref; - note_object_edit_start.p_note_info = p_note_info; - status_consume(object_call_id(p_note_info->object_id, p_docu, T5_MSG_NOTE_OBJECT_EDIT_START, ¬e_object_edit_start)); - if(!note_object_edit_start.processed) - break; - } /*block*/ + switch(this_p_note_info->note_selection) + { + default: default_unhandled(); + case NOTE_SELECTION_NONE: + break; - p_note_info->note_selection = NOTE_SELECTION_EDITED; + case NOTE_SELECTION_SELECTED: + if(this_p_note_info != p_note_info) + sel_changed = 1; + break; - note_update_later(p_docu, p_note_info, NOTE_UPDATE_SELECTION_MARKS); + case NOTE_SELECTION_IN_EDIT: + clear_sel = 1; + break; + } + } - p_docu->focus_owner_old = p_docu->focus_owner; + if(clear_sel || sel_changed) + status_assert(maeve_event(p_docu, clear_sel ? T5_MSG_SELECTION_CLEAR : T5_MSG_SELECTION_NEW, P_DATA_NONE)); + } /*block*/ - /* give the bugger the input focus too */ - caret_show_claim(p_docu, p_note_info->object_id, FALSE); + { /* start an edit for the object */ + NOTE_OBJECT_EDIT_START note_object_edit_start; + note_object_edit_start.processed = 0; + note_object_edit_start.object_data_ref = p_note_info->object_data_ref; + note_object_edit_start.p_note_info = p_note_info; + status_consume(object_call_id(p_note_info->object_id, p_docu, T5_MSG_NOTE_OBJECT_EDIT_START, ¬e_object_edit_start)); + if(!note_object_edit_start.processed) + return(STATUS_OK); + } /*block*/ - break; - } + p_note_info->note_selection = NOTE_SELECTION_IN_EDIT; - case T5_EVENT_CLICK_LEFT_DRAG: - case T5_EVENT_CLICK_RIGHT_DRAG: - { - /* T5_EVENT_CLICK_RIGHT_DRAG, select note incase earlier T5_EVENT_CLICK_RIGHT_SINGLE deselected it */ - /* T5_EVENT_CLICK_LEFT_DRAG, note should (on RISCOS maybe?) already be selected, but making sure won't hurt */ - if(NOTE_SELECTION_NONE == p_note_info->note_selection) - note_select(p_docu, p_note_info); + note_update_later(p_docu, p_note_info, NOTE_UPDATE_SELECTION_MARKS); - notelayer_drag_data.reason_code = CB_CODE_NOTELAYER_NOTE_TRANSLATE; + p_docu->focus_owner_old = p_docu->focus_owner; - { /* work out the offset to the tl and br points of the box to be dragged from the point where we clicked */ - SKEL_RECT skel_rect = p_note_info->skel_rect; + /* give the bugger the input focus too */ + caret_show_claim(p_docu, p_note_info->object_id, FALSE); - skel_rect.tl.pixit_point.x -= p_skelevent_click->skel_point.pixit_point.x; - skel_rect.tl.pixit_point.y -= p_skelevent_click->skel_point.pixit_point.y; - skel_rect.br.pixit_point.x -= p_skelevent_click->skel_point.pixit_point.x; - skel_rect.br.pixit_point.y -= p_skelevent_click->skel_point.pixit_point.y; + return(STATUS_OK); +} - if(!p_note_info->flags.all_pages) - { - REDRAW_TAG redraw_tag = redraw_tag_from_layer(p_note_info->layer); +_Check_return_ +static STATUS +notelayer_click_ear_CENTRE_drag( + _DocuRef_ P_DOCU p_docu, + _InVal_ T5_MESSAGE t5_message, + P_SKELEVENT_CLICK p_skelevent_click, + _InoutRef_ P_NOTE_INFO p_note_info) +{ + UNREFERENCED_PARAMETER_InVal_(t5_message); - assert(skel_rect.tl.page_num.x <= p_skelevent_click->skel_point.page_num.x); - while(skel_rect.tl.page_num.x < p_skelevent_click->skel_point.page_num.x) - { - PIXIT_POINT work_area; - page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.tl.page_num); - skel_rect.tl.pixit_point.x -= work_area.x; - skel_rect.tl.page_num.x += 1; - } + /* T5_EVENT_CLICK_RIGHT_DRAG, select note incase earlier T5_EVENT_CLICK_RIGHT_SINGLE deselected it */ + /* T5_EVENT_CLICK_LEFT_DRAG, note should (on RISCOS maybe?) already be selected, but making sure won't hurt */ + if(NOTE_SELECTION_NONE == p_note_info->note_selection) + note_select(p_docu, p_note_info); - assert(skel_rect.tl.page_num.y <= p_skelevent_click->skel_point.page_num.y); - while(skel_rect.tl.page_num.y < p_skelevent_click->skel_point.page_num.y) - { - PIXIT_POINT work_area; - page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.tl.page_num); - skel_rect.tl.pixit_point.y -= work_area.y; - skel_rect.tl.page_num.y += 1; - } + notelayer_drag_data.reason_code = CB_CODE_NOTELAYER_NOTE_TRANSLATE; - assert(skel_rect.br.page_num.x >= p_skelevent_click->skel_point.page_num.x); - while(skel_rect.br.page_num.x > p_skelevent_click->skel_point.page_num.x) - { - PIXIT_POINT work_area; - skel_rect.br.page_num.x -= 1; - page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.br.page_num); - skel_rect.br.pixit_point.x += work_area.x; - } + { /* work out the offset to the tl and br points of the box to be dragged from the point where we clicked */ + SKEL_RECT skel_rect = p_note_info->skel_rect; - assert(skel_rect.br.page_num.y >= p_skelevent_click->skel_point.page_num.y); - while(skel_rect.br.page_num.y > p_skelevent_click->skel_point.page_num.y) - { - PIXIT_POINT work_area; - skel_rect.br.page_num.y -= 1; - page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.br.page_num); - skel_rect.br.pixit_point.y += work_area.y; - } - } + skel_rect.tl.pixit_point.x -= p_skelevent_click->skel_point.pixit_point.x; + skel_rect.tl.pixit_point.y -= p_skelevent_click->skel_point.pixit_point.y; + skel_rect.br.pixit_point.x -= p_skelevent_click->skel_point.pixit_point.x; + skel_rect.br.pixit_point.y -= p_skelevent_click->skel_point.pixit_point.y; - notelayer_drag_data.translate_box_pixit_rect_offset.tl = skel_rect.tl.pixit_point; - notelayer_drag_data.translate_box_pixit_rect_offset.br = skel_rect.br.pixit_point; - } /*block*/ + if(!p_note_info->flags.all_pages) + { + REDRAW_TAG redraw_tag = redraw_tag_from_layer(p_note_info->layer); - host_drag_start(¬elayer_drag_data); + assert(skel_rect.tl.page_num.x <= p_skelevent_click->skel_point.page_num.x); + while(skel_rect.tl.page_num.x < p_skelevent_click->skel_point.page_num.x) + { + PIXIT_POINT work_area; + page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.tl.page_num); + skel_rect.tl.pixit_point.x -= work_area.x; + skel_rect.tl.page_num.x += 1; + } - break; - } + assert(skel_rect.tl.page_num.y <= p_skelevent_click->skel_point.page_num.y); + while(skel_rect.tl.page_num.y < p_skelevent_click->skel_point.page_num.y) + { + PIXIT_POINT work_area; + page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.tl.page_num); + skel_rect.tl.pixit_point.y -= work_area.y; + skel_rect.tl.page_num.y += 1; + } - default: - break; + assert(skel_rect.br.page_num.x >= p_skelevent_click->skel_point.page_num.x); + while(skel_rect.br.page_num.x > p_skelevent_click->skel_point.page_num.x) + { + PIXIT_POINT work_area; + skel_rect.br.page_num.x -= 1; + page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.br.page_num); + skel_rect.br.pixit_point.x += work_area.x; } - break; + assert(skel_rect.br.page_num.y >= p_skelevent_click->skel_point.page_num.y); + while(skel_rect.br.page_num.y > p_skelevent_click->skel_point.page_num.y) + { + PIXIT_POINT work_area; + skel_rect.br.page_num.y -= 1; + page_limits_from_page(p_docu, &work_area, redraw_tag, &skel_rect.br.page_num); + skel_rect.br.pixit_point.y += work_area.y; } } - return(status); + notelayer_drag_data.translate_box_pixit_rect_offset.tl = skel_rect.tl.pixit_point; + notelayer_drag_data.translate_box_pixit_rect_offset.br = skel_rect.br.pixit_point; + } /*block*/ + + host_drag_start(¬elayer_drag_data); + + return(STATUS_OK); +} + +_Check_return_ +static STATUS +notelayer_click_ear_CENTRE( + _DocuRef_ P_DOCU p_docu, + _InVal_ T5_MESSAGE t5_message, + P_SKELEVENT_CLICK p_skelevent_click, + _InoutRef_ P_NOTE_INFO p_note_info) +{ + if(NOTE_SELECTION_IN_EDIT == p_note_info->note_selection) + { + if(status_done(notelayer_click_ear_CENTRE_IN_EDIT(p_docu, t5_message, p_skelevent_click, p_note_info))) + return(STATUS_OK); + } + + switch(t5_message) + { + case T5_EVENT_CLICK_LEFT_SINGLE: + case T5_EVENT_CLICK_RIGHT_SINGLE: + return(notelayer_click_ear_CENTRE_single(p_docu, t5_message, p_skelevent_click, p_note_info)); + + case T5_EVENT_CLICK_LEFT_DOUBLE: + return(notelayer_click_ear_CENTRE_left_double(p_docu, t5_message, p_skelevent_click, p_note_info)); + + case T5_EVENT_CLICK_LEFT_DRAG: + case T5_EVENT_CLICK_RIGHT_DRAG: + return(notelayer_click_ear_CENTRE_drag(p_docu, t5_message, p_skelevent_click, p_note_info)); + + default: + return(STATUS_OK); + } } _Check_return_ @@ -1434,7 +1472,7 @@ notelayer_drag_started_or_movement( trace_0(TRACE_APP_CLICK, TEXT("proc_event_note T5_EVENT_CLICK_DRAG_MOVEMENT")); - if(t5_message == T5_EVENT_CLICK_DRAG_STARTED) + if(T5_EVENT_CLICK_DRAG_STARTED == t5_message) notelayer_drag_start_setup(p_docu, p_skelevent_click, p_notelayer_drag_data, p_note_info); if( (p_notelayer_drag_data->skel_point.page_num.x != p_skelevent_click->skel_point.page_num.x) || @@ -1616,11 +1654,11 @@ notelayer_drag_started_or_movement( moved = FALSE; - if(t5_message == T5_EVENT_CLICK_DRAG_STARTED) + if(T5_EVENT_CLICK_DRAG_STARTED == t5_message) { moved = TRUE; } - else /*(t5_message == T5_EVENT_CLICK_DRAG_MOVEMENT)*/ + else /*(T5_EVENT_CLICK_DRAG_MOVEMENT == t5_message)*/ { if(0 != memcmp32(&skel_rect, &p_notelayer_drag_data->skel_rect_current, sizeof32(skel_rect))) { @@ -1665,7 +1703,7 @@ notelayer_drag_finished_or_aborted( status_line_clear(p_docu, STATUS_LINE_LEVEL_DRAGGING); - if(t5_message == T5_EVENT_CLICK_DRAG_FINISHED) + if(T5_EVENT_CLICK_DRAG_FINISHED == t5_message) { switch(p_notelayer_drag_data->reason_code) { @@ -1944,7 +1982,7 @@ notelayer_rect_redraw_drag( pixit_rect.tl = skel_rect.tl.pixit_point; pixit_rect.br = skel_rect.br.pixit_point; - if(VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) + if(RECTANGLE_IS_VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) host_invert_rectangle_outline(&p_skelevent_redraw->redraw_context, &pixit_rect, &rgb_stash[2 /*grey*/], &rgb_stash[0 /*white*/]); break; @@ -1972,7 +2010,7 @@ notelayer_rect_redraw_drag( pixit_rect.tl = skel_rect.tl.pixit_point; pixit_rect.br = skel_rect.br.pixit_point; - if(VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) + if(RECTANGLE_IS_VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) host_invert_rectangle_outline(&p_skelevent_redraw->redraw_context, &pixit_rect, &rgb_stash[2 /*grey*/], &rgb_stash[0 /*white*/]); break; @@ -2009,6 +2047,9 @@ notelayer_rect_redraw( display_picture = 1; } + if(!p_note_info->flags.skel_rect_valid) + notelayer_mount_note(p_docu, p_note_info); + switch(p_note_info->note_pinning) { case NOTE_UNPINNED: @@ -2042,16 +2083,13 @@ notelayer_rect_redraw( } } - if(!p_note_info->flags.skel_rect_valid) - notelayer_mount_note(p_docu, p_note_info); - { PIXIT_RECT pixit_rect; /* render note iff note is displayed on page being rendered and the clip rectangle and note bbox (on that page) overlap */ relative_pixit_rect_from_note(p_docu, p_note_info, &p_skelevent_redraw->clip_skel_rect.tl.page_num, &pixit_rect); - if(VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) + if(RECTANGLE_IS_VISIBLE(p_skelevent_redraw->clip_skel_rect, pixit_rect)) { /* set up object redraw information */ NOTE_OBJECT_REDRAW note_object_redraw; @@ -2113,19 +2151,19 @@ notelayer_rect_redraw( { switch(p_note_info->note_selection) { - case NOTE_SELECTION_EDITED: case NOTE_SELECTION_SELECTED: + case NOTE_SELECTION_IN_EDIT: { NOTE_OBJECT_BOUNDS note_object_bounds; notelayer_object_bounds(¬e_object_bounds, p_note_info->note_pinning, &pixit_rect, &p_skelevent_redraw->redraw_context.one_program_pixel); /* render border iff clip rectangle and border bbox overlap */ - if(VISIBLE(p_skelevent_redraw->clip_skel_rect, note_object_bounds.ears.outer_bound)) + if(RECTANGLE_IS_VISIBLE(p_skelevent_redraw->clip_skel_rect, note_object_bounds.ears.outer_bound)) { NOTE_POSITION note_position = PIXIT_RECT_EAR_CENTRE; - if(NOTE_SELECTION_EDITED == p_note_info->note_selection) + if(NOTE_SELECTION_IN_EDIT == p_note_info->note_selection) host_paint_rectangle_outline(&p_skelevent_redraw->redraw_context, ¬e_object_bounds.ears.outer_bound, rgb_frame); host_paint_rectangle_outline(&p_skelevent_redraw->redraw_context, ¬e_object_bounds.ears.ear[note_position], rgb_frame); @@ -2185,11 +2223,11 @@ where_in_notelayer( { #if 1 - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_skel_point); - IGNOREPARM(p_one_program_pixel); - IGNOREPARM(p_note_position); - IGNOREPARM_InVal_(set_pointer_shape); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_skel_point); + UNREFERENCED_PARAMETER(p_one_program_pixel); + UNREFERENCED_PARAMETER(p_note_position); + UNREFERENCED_PARAMETER_InVal_(set_pointer_shape); return(NULL); /* <<< watch me !!! */ @@ -2214,8 +2252,8 @@ where_in_notelayer( switch(p_note_info->flags.selection) { - case NOTE_SELECTION_EDITED: case NOTE_SELECTION_SELECTED: + case NOTE_SELECTION_IN_EDIT: { NOTE_OBJECT_BOUNDS note_object_bounds; @@ -2333,7 +2371,7 @@ T5_MSG_PROTO(static, note_msg_note_update_now, P_NOTE_UPDATE_NOW p_note_update_n SKEL_RECT skel_rect; RECT_FLAGS rect_flags; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); skel_rect.tl.page_num.x = skel_rect.tl.page_num.y = 0; skel_rect.tl.pixit_point.x = skel_rect.tl.pixit_point.y = 0; @@ -2364,8 +2402,8 @@ notelayer_object_bounds( pixit_rect_get_ears(&p_note_object_bounds->ears, p_pixit_rect, p_one_program_pixel); p_note_object_bounds->pinned[PIXIT_RECT_EAR_CENTRE] = FALSE; - p_note_object_bounds->pinned[PIXIT_RECT_EAR_TL] = (note_pinning == NOTE_PIN_CELLS_SINGLE) || (note_pinning == NOTE_PIN_CELLS_TWIN); - p_note_object_bounds->pinned[PIXIT_RECT_EAR_BR] = (note_pinning == NOTE_PIN_CELLS_TWIN); + p_note_object_bounds->pinned[PIXIT_RECT_EAR_TL] = (NOTE_PIN_CELLS_TWIN == note_pinning) || (NOTE_PIN_CELLS_SINGLE == note_pinning); + p_note_object_bounds->pinned[PIXIT_RECT_EAR_BR] = (NOTE_PIN_CELLS_TWIN == note_pinning); p_note_object_bounds->pinned[PIXIT_RECT_EAR_BL] = FALSE; p_note_object_bounds->pinned[PIXIT_RECT_EAR_TR] = FALSE; p_note_object_bounds->pinned[PIXIT_RECT_EAR_LC] = FALSE; @@ -2414,7 +2452,7 @@ note_msg_close1( T5_MSG_PROTO(static, note_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -2439,7 +2477,7 @@ T5_MSG_PROTO(static, note_msg_note_new, _InRef_ PC_NOTE_INFO p_note_info) { STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); consume_ptr(notelayer_new_note(p_docu, p_note_info, &status)); @@ -2472,7 +2510,7 @@ note_msg_choice_changed_display_pictures( T5_MSG_PROTO(static, note_msg_choice_changed, _InRef_ PC_MSG_CHOICE_CHANGED p_msg_choice_changed) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_choice_changed->t5_message) { @@ -2486,7 +2524,7 @@ T5_MSG_PROTO(static, note_msg_choice_changed, _InRef_ PC_MSG_CHOICE_CHANGED p_ms T5_MSG_PROTO(static, note_event_pointer_movement, _InRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_4(TRACE_APP_CLICK, TEXT("proc_event_note T5_EVENT_POINTER_MOVEMENT at page(") S32_TFMT TEXT(",") S32_TFMT TEXT(") pixit(") PIXIT_TFMT TEXT(",") PIXIT_TFMT TEXT(")"), p_skelevent_click->skel_point.page_num.x, p_skelevent_click->skel_point.page_num.y, diff --git a/t5/ob_note/ob_note2.c b/t5/ob_note/ob_note2.c index a5d2c68..d994db7 100644 --- a/t5/ob_note/ob_note2.c +++ b/t5/ob_note/ob_note2.c @@ -97,10 +97,12 @@ note_drop_object_selection( { switch(p_note_info->note_selection) { - default: + default: default_unhandled(); + case NOTE_SELECTION_NONE: + case NOTE_SELECTION_SELECTED: break; - case NOTE_SELECTION_EDITED: + case NOTE_SELECTION_IN_EDIT: { /* tell the object that his selection has better go too */ NOTE_OBJECT_SELECTION_CLEAR note_object_selection_clear; note_object_selection_clear.object_data_ref = p_note_info->object_data_ref; @@ -168,24 +170,25 @@ note_save( switch(p_note_info->note_pinning) { - case NOTE_PIN_CELLS_SINGLE: - t5_message = T5_CMD_NOTE; - break; - - case NOTE_PIN_CELLS_TWIN: - t5_message = T5_CMD_NOTE_TWIN; - break; - default:default_unhandled(); #if CHECKING case NOTE_UNPINNED: #endif - if(p_note_info->layer == LAYER_PAPER_BELOW) + if(LAYER_PAPER_BELOW == p_note_info->layer) t5_message = T5_CMD_NOTE_BACKDROP; else t5_message = T5_CMD_NOTE; break; + + case NOTE_PIN_CELLS_SINGLE: + t5_message = T5_CMD_NOTE; + break; + + case NOTE_PIN_CELLS_TWIN: + t5_message = T5_CMD_NOTE_TWIN; + break; } + status_return(arglist_prepare_with_construct(&arglist_handle, object_id, t5_message, &p_construct_table)); p_args = p_arglist_args(&arglist_handle, ARG_CMD_NOTE_N_ARGS); @@ -200,44 +203,6 @@ note_save( switch(p_note_info->note_pinning) { - case NOTE_PIN_CELLS_SINGLE: - { /* 1, x,y,c,r, w,h */ - ext_mount_type = EXT_ID_NOTE_PIN_CELLS_SINGLE; - - p_args[6].type = ARG_TYPE_COL; - p_args[6].val.col = p_note_info->region.tl.col; - p_args[7].type = ARG_TYPE_ROW; - p_args[7].val.row = p_note_info->region.tl.row; - - p_args[8].val.pixit = p_note_info->pixit_size.cx; - p_args[9].val.pixit = p_note_info->pixit_size.cy; - - arg_dispose(&arglist_handle, 10); - arg_dispose(&arglist_handle, 11); - - break; - } - - case NOTE_PIN_CELLS_TWIN: - { /* 2, x,y,c,r, x,y,c,r */ - ext_mount_type = EXT_ID_NOTE_PIN_CELLS_TWIN; - - p_args[6].type = ARG_TYPE_COL; - p_args[6].val.col = p_note_info->region.tl.col; - p_args[7].type = ARG_TYPE_ROW; - p_args[7].val.row = p_note_info->region.tl.row; - - p_args[8].val.pixit = p_note_info->offset_br.x; - p_args[9].val.pixit = p_note_info->offset_br.y; - - p_args[10].type = ARG_TYPE_COL; - p_args[10].val.col = p_note_info->region.br.col - 1; /* e,e -> i,i in file */ - p_args[11].type = ARG_TYPE_ROW; - p_args[11].val.row = p_note_info->region.br.row - 1; - - break; - } - default: default_unhandled(); #if CHECKING case NOTE_UNPINNED: @@ -273,6 +238,44 @@ note_save( p_args[10].val.s32 = p_note_info->skel_rect.tl.page_num.x; /* SKS after 1.05 24oct93 save the page number! (previously unused args) */ p_args[11].val.s32 = p_note_info->skel_rect.tl.page_num.y; + break; + } + + case NOTE_PIN_CELLS_SINGLE: + { /* 1, x,y,c,r, w,h */ + ext_mount_type = EXT_ID_NOTE_PIN_CELLS_SINGLE; + + p_args[6].type = ARG_TYPE_COL; + p_args[6].val.col = p_note_info->region.tl.col; + p_args[7].type = ARG_TYPE_ROW; + p_args[7].val.row = p_note_info->region.tl.row; + + p_args[8].val.pixit = p_note_info->pixit_size.cx; + p_args[9].val.pixit = p_note_info->pixit_size.cy; + + arg_dispose(&arglist_handle, 10); + arg_dispose(&arglist_handle, 11); + + break; + } + + case NOTE_PIN_CELLS_TWIN: + { /* 2, x,y,c,r, x,y,c,r */ + ext_mount_type = EXT_ID_NOTE_PIN_CELLS_TWIN; + + p_args[6].type = ARG_TYPE_COL; + p_args[6].val.col = p_note_info->region.tl.col; + p_args[7].type = ARG_TYPE_ROW; + p_args[7].val.row = p_note_info->region.tl.row; + + p_args[8].val.pixit = p_note_info->offset_br.x; + p_args[9].val.pixit = p_note_info->offset_br.y; + + p_args[10].type = ARG_TYPE_COL; + p_args[10].val.col = p_note_info->region.br.col - 1; /* e,e -> i,i in file */ + p_args[11].type = ARG_TYPE_ROW; + p_args[11].val.row = p_note_info->region.br.row - 1; + break; } } @@ -587,7 +590,7 @@ sk_note_msg_focus_changed( T5_MSG_PROTO(static, sk_note_msg_reformat, _InRef_ PC_DOCU_REFORMAT p_docu_reformat) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_docu_reformat->action) { @@ -704,7 +707,7 @@ sk_note_msg_data_save_3( T5_MSG_PROTO(static, sk_note_msg_save, _InRef_ PC_MSG_SAVE p_msg_save) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_save->t5_msg_save_message) { @@ -718,7 +721,7 @@ T5_MSG_PROTO(static, sk_note_msg_save, _InRef_ PC_MSG_SAVE p_msg_save) MAEVE_EVENT_PROTO(extern, maeve_event_ob_note) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -837,7 +840,7 @@ T5_CMD_PROTO(extern, t5_cmd_note) NOTE_INFO note_info; zero_struct(note_info); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); note_info.object_id = OBJECT_ID_NONE; @@ -984,7 +987,7 @@ T5_CMD_PROTO(extern, t5_cmd_note) scale_args_invalid = ((gr_scale_pair.x <= 0) || (gr_scale_pair.y <= 0)); /* SKS after 1.19/11 28jan95 add validation 'cos some 1.07 files are real shite */ - if(scale_args_invalid || !scale_args_present || (note_info.note_pinning == NOTE_PIN_CELLS_TWIN)) + if(scale_args_invalid || !scale_args_present || (NOTE_PIN_CELLS_TWIN == note_info.note_pinning)) { NOTE_OBJECT_SIZE note_object_size; note_object_size.pixit_size.cx = note_object_size.pixit_size.cy = PIXITS_PER_INCH; @@ -993,7 +996,7 @@ T5_CMD_PROTO(extern, t5_cmd_note) status_consume(object_call_id(note_info.object_id, p_docu, T5_MSG_NOTE_OBJECT_SIZE_QUERY, ¬e_object_size)); if(note_object_size.processed) { - if((note_info.note_pinning == NOTE_PIN_CELLS_SINGLE) || (note_info.note_pinning == NOTE_UNPINNED)) + if((NOTE_PIN_CELLS_SINGLE == note_info.note_pinning) || (NOTE_UNPINNED == note_info.note_pinning)) { gr_scale_pair.x = muldiv64(GR_SCALE_ONE, note_info.pixit_size.cx, note_object_size.pixit_size.cx); gr_scale_pair.y = muldiv64(GR_SCALE_ONE, note_info.pixit_size.cy, note_object_size.pixit_size.cy); @@ -1091,8 +1094,8 @@ T5_CMD_PROTO(extern, t5_cmd_note_back) S32 selection_changed = 0; ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); while(--note_index >= 0) { @@ -1141,8 +1144,8 @@ T5_CMD_PROTO(extern, t5_cmd_note_embed) { ARRAY_INDEX note_index; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); for(note_index = 0; note_index < array_elements(&p_docu->h_note_list); ++note_index) { @@ -1219,8 +1222,8 @@ T5_CMD_PROTO(extern, t5_cmd_note_swap) S32 selection_changed = 0; ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); while(--note_index >= 0) { @@ -1496,7 +1499,7 @@ dialog_backdrop_ctl_create_state( PROC_DIALOG_EVENT_PROTO(static, dialog_event_backdrop) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1515,8 +1518,8 @@ T5_CMD_PROTO(extern, t5_cmd_backdrop_intro) S32 n_behind = 0; BACKDROP_CALLBACK backdrop_callback; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); { /* operate on selected note or backdrop */ ARRAY_INDEX i = array_elements(&p_docu->h_note_list); @@ -1561,14 +1564,6 @@ T5_CMD_PROTO(extern, t5_cmd_backdrop_intro) switch(p_note_info->note_pinning) { - default: default_unhandled(); -#if CHECKING - case NOTE_PIN_CELLS_SINGLE: - case NOTE_PIN_CELLS_TWIN: -#endif - backdrop_callback.selected_mount = EXT_ID_NOTE_PIN_CELLS_AREA; - break; - case NOTE_UNPINNED: { switch(p_note_info->layer) @@ -1594,6 +1589,14 @@ T5_CMD_PROTO(extern, t5_cmd_backdrop_intro) break; } + + default: default_unhandled(); +#if CHECKING + case NOTE_PIN_CELLS_SINGLE: + case NOTE_PIN_CELLS_TWIN: +#endif + backdrop_callback.selected_mount = EXT_ID_NOTE_PIN_CELLS_AREA; + break; } backdrop_callback.all_pages = p_note_info->flags.all_pages; @@ -1623,7 +1626,7 @@ T5_CMD_PROTO(extern, t5_cmd_backdrop) S32 n_selected = 0; S32 n_behind = 0; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { /* operate on selected note or backdrop */ ARRAY_INDEX note_index = array_elements(&p_docu->h_note_list); @@ -1647,7 +1650,7 @@ T5_CMD_PROTO(extern, t5_cmd_backdrop) case LAYER_PAPER_BELOW: case LAYER_PRINT_AREA_BELOW: case LAYER_CELLS_AREA_BELOW: - if(this_p_note_info->note_pinning == NOTE_UNPINNED) + if(NOTE_UNPINNED == this_p_note_info->note_pinning) { ++n_behind; @@ -2000,13 +2003,6 @@ relative_pixit_rect_from_note( { switch(p_note_info->note_pinning) { - default: default_unhandled(); -#if CHECKING - case NOTE_PIN_CELLS_SINGLE: - case NOTE_PIN_CELLS_TWIN: -#endif - break; - case NOTE_UNPINNED: if(p_note_info->flags.all_pages) { @@ -2016,6 +2012,13 @@ relative_pixit_rect_from_note( } break; + + default: default_unhandled(); +#if CHECKING + case NOTE_PIN_CELLS_SINGLE: + case NOTE_PIN_CELLS_TWIN: +#endif + break; } relative_pixit_point_from_skel_point_in_layer(p_docu, p_page_num, &p_note_info->skel_rect.tl, &p_pixit_rect->tl, p_note_info->layer); diff --git a/t5/ob_note/xp_note.h b/t5/ob_note/xp_note.h index 1f00237..9179882 100644 --- a/t5/ob_note/xp_note.h +++ b/t5/ob_note/xp_note.h @@ -43,7 +43,7 @@ typedef enum NOTE_SELECTION { NOTE_SELECTION_NONE = 0, NOTE_SELECTION_SELECTED, - NOTE_SELECTION_EDITED + NOTE_SELECTION_IN_EDIT } NOTE_SELECTION; diff --git a/t5/ob_recn/ob_recn.c b/t5/ob_recn/ob_recn.c index 2a6ba56..647987d 100644 --- a/t5/ob_recn/ob_recn.c +++ b/t5/ob_recn/ob_recn.c @@ -42,8 +42,8 @@ Flow:39 (OBJECT_ID_REC_FLOW) is handled OK by skeleton when ob_recb is not prese T5_MSG_PROTO(static, recn_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -62,9 +62,9 @@ T5_MSG_PROTO(static, recn_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclos T5_CMD_PROTO(static, recn_cmd_recordz_io_table) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); reperr_null(RECN_ERR_NO_DATABASE_MODULE); diff --git a/t5/ob_ruler/ob_ruler.c b/t5/ob_ruler/ob_ruler.c index bafb3c6..a79a013 100644 --- a/t5/ob_ruler/ob_ruler.c +++ b/t5/ob_ruler/ob_ruler.c @@ -425,7 +425,7 @@ T5_MSG_PROTO(static, ruler_horz_event_click_left_single, _InoutRef_ P_SKELEVENT_ RULER_MARKER ruler_marker; ARRAY_INDEX tab_number; /* valid iff ruler_marker is TAB_xxx */ - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_skelevent_click->processed = 1; @@ -456,9 +456,9 @@ T5_MSG_PROTO(static, ruler_horz_event_click_left_single, _InoutRef_ P_SKELEVENT_ T5_MSG_PROTO(static, ruler_horz_event_click_right_single, _InoutRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InoutRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InoutRef_(p_skelevent_click); return(STATUS_OK); } @@ -541,7 +541,7 @@ T5_MSG_PROTO(static, ruler_horz_event_click_left_double, _InoutRef_ P_SKELEVENT_ RULER_MARKER ruler_marker; ARRAY_INDEX tab_number; /* valid iff ruler_marker is TAB_xxx */ - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_skelevent_click->processed = 1; @@ -637,7 +637,7 @@ T5_MSG_PROTO(static, ruler_horz_event_click_right_double, _InoutRef_ P_SKELEVENT RULER_MARKER ruler_marker; ARRAY_INDEX tab_number; /* valid iff ruler_marker is TAB_xxx */ - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_skelevent_click->processed = 1; @@ -833,10 +833,10 @@ T5_MSG_PROTO(static, ruler_horz_event_click_drag_finished, _InRef_ P_SKELEVENT_C T5_MSG_PROTO(static, ruler_horz_event_click_pointer_movement, _InRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_v0(TRACE_APP_CLICK, - (t5_message == T5_EVENT_POINTER_ENTERS_WINDOW) + (T5_EVENT_POINTER_ENTERS_WINDOW == t5_message) ? TEXT("edge_window_event_ruler_horz T5_EVENT_POINTER_ENTERS_WINDOW") : TEXT("edge_window_event_ruler_horz T5_EVENT_POINTER_MOVEMENT")); @@ -847,8 +847,8 @@ T5_MSG_PROTO(static, ruler_horz_event_click_pointer_movement, _InRef_ P_SKELEVEN T5_MSG_PROTO(static, ruler_horz_event_click_pointer_leaves_window, _InRef_ PC_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_skelevent_click); trace_0(TRACE_APP_CLICK, TEXT("edge_window_event_ruler_horz T5_EVENT_POINTER_LEAVES_WINDOW")); @@ -1016,7 +1016,7 @@ T5_MSG_PROTO(static, ruler_horz_event_redraw, _InoutRef_ P_SKELEVENT_REDRAW p_sk PIXIT_LINE base_line; HORZ_MARGINS_INFO margins_info; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert((p_skelevent_redraw->clip_skel_rect.tl.page_num.x == p_skelevent_redraw->clip_skel_rect.br.page_num.x) && (p_skelevent_redraw->clip_skel_rect.tl.page_num.y == p_skelevent_redraw->clip_skel_rect.br.page_num.y)); @@ -1414,7 +1414,7 @@ ruler_horz_drag_limits( tracker = col_edge_left + column_width - p_col_info->margin_right; p_horz_blk->tracking.ruler_marker = RULER_MARKER_MARGIN_RIGHT; - p_horz_blk->dragging_single = (t5_message == T5_EVENT_CLICK_LEFT_DRAG); + p_horz_blk->dragging_single = (T5_EVENT_CLICK_LEFT_DRAG == t5_message); if(!p_horz_blk->dragging_single) { @@ -1463,7 +1463,7 @@ ruler_horz_drag_limits( p_horz_blk->min_limit = col_edge_left + p_col_info->margin_left + MIN(p_col_info->margin_para, 0); p_horz_blk->max_limit = col_edge_left + column_width - p_col_info->margin_right; - p_horz_blk->dragging_single = (t5_message == T5_EVENT_CLICK_RIGHT_DRAG); + p_horz_blk->dragging_single = (T5_EVENT_CLICK_RIGHT_DRAG == t5_message); if(!p_horz_blk->dragging_single) p_horz_blk->update_rect_flags.extend_right_window = TRUE; /* drags other tabs around with it */ @@ -2171,7 +2171,7 @@ T5_MSG_PROTO(static, ruler_vert_event_click_left_double, _InoutRef_ P_SKELEVENT_ { RULER_MARKER ruler_marker; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_skelevent_click->processed = 1; @@ -2191,9 +2191,9 @@ T5_MSG_PROTO(static, ruler_vert_event_click_left_double, _InoutRef_ P_SKELEVENT_ T5_MSG_PROTO(static, ruler_vert_event_click_right_double, _InoutRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InoutRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InoutRef_(p_skelevent_click); return(STATUS_OK); } @@ -2213,7 +2213,7 @@ T5_MSG_PROTO(static, ruler_vert_event_click_left_drag, _InoutRef_ P_SKELEVENT_CL { RULER_MARKER ruler_marker; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_skelevent_click->processed = 1; @@ -2241,9 +2241,9 @@ T5_MSG_PROTO(static, ruler_vert_event_click_left_drag, _InoutRef_ P_SKELEVENT_CL T5_MSG_PROTO(static, ruler_vert_event_click_right_drag, _InoutRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InoutRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InoutRef_(p_skelevent_click); return(STATUS_OK); } @@ -2264,7 +2264,7 @@ T5_MSG_PROTO(static, ruler_vert_event_click_drag_movement_adjust_marker_position const P_CB_DATA_RULER_VERT_ADJUST_MARKER_POSITION p_vert_blk = (P_CB_DATA_RULER_VERT_ADJUST_MARKER_POSITION) p_skelevent_click->data.drag.p_reason_data; BOOL show = 1; - if(t5_message == T5_EVENT_CLICK_DRAG_MOVEMENT) + if(T5_EVENT_CLICK_DRAG_MOVEMENT == t5_message) { PIXIT value = click_stop_limited(p_vert_blk->init_value + p_skelevent_click->data.drag.pixit_delta.y, p_vert_blk->min_limit, p_vert_blk->max_limit, p_vert_blk->click_stop_origin, &p_vert_blk->click_stop_step); @@ -2331,7 +2331,7 @@ T5_MSG_PROTO(static, ruler_vert_event_click_drag_finished_adjust_marker_position const P_CB_DATA_RULER_VERT_ADJUST_MARKER_POSITION p_vert_blk = (P_CB_DATA_RULER_VERT_ADJUST_MARKER_POSITION) p_skelevent_click->data.drag.p_reason_data; STATUS status = STATUS_OK; - if(t5_message == T5_EVENT_CLICK_DRAG_FINISHED) + if(T5_EVENT_CLICK_DRAG_FINISHED == t5_message) { PIXIT value = click_stop_limited(p_vert_blk->init_value + p_skelevent_click->data.drag.pixit_delta.y, p_vert_blk->min_limit, p_vert_blk->max_limit, p_vert_blk->click_stop_origin, &p_vert_blk->click_stop_step); @@ -2341,7 +2341,7 @@ T5_MSG_PROTO(static, ruler_vert_event_click_drag_finished_adjust_marker_position else status = ruler_vert_drag_apply(p_docu, p_vert_blk->ruler_marker, p_vert_blk->pag, value - p_vert_blk->init_value); } - else /* T5_EVENT_CLICK_DRAG_ABORTED */ + else /* (T5_EVENT_CLICK_DRAG_ABORTED == t5_message) */ { SKEL_RECT skel_rect; RECT_FLAGS rect_flags; @@ -2383,10 +2383,10 @@ T5_MSG_PROTO(static, ruler_vert_event_click_drag_finished, _InRef_ P_SKELEVENT_C T5_MSG_PROTO(static, ruler_vert_event_click_pointer_movement, _InRef_ P_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_v0(TRACE_APP_CLICK, - (t5_message == T5_EVENT_POINTER_ENTERS_WINDOW) + (T5_EVENT_POINTER_ENTERS_WINDOW == t5_message) ? TEXT("edge_window_event_ruler_vert T5_EVENT_POINTER_ENTERS_WINDOW") : TEXT("edge_window_event_ruler_vert T5_EVENT_POINTER_MOVEMENT")); @@ -2398,8 +2398,8 @@ T5_MSG_PROTO(static, ruler_vert_event_click_pointer_movement, _InRef_ P_SKELEVEN T5_MSG_PROTO(static, ruler_vert_event_click_pointer_leaves_window, _InRef_ PC_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_skelevent_click); trace_0(TRACE_APP_CLICK, TEXT("edge_window_event_ruler_vert T5_EVENT_POINTER_LEAVES_WINDOW")); @@ -2746,7 +2746,7 @@ T5_MSG_PROTO(static, ruler_vert_event_redraw, _InoutRef_ P_SKELEVENT_REDRAW p_sk PIXIT_LINE base_line; VERT_MARGINS_INFO margins_info; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert((p_skelevent_redraw->clip_skel_rect.tl.page_num.x == p_skelevent_redraw->clip_skel_rect.br.page_num.x) && (p_skelevent_redraw->clip_skel_rect.tl.page_num.y == p_skelevent_redraw->clip_skel_rect.br.page_num.y)); @@ -3062,7 +3062,7 @@ MAEVE_EVENT_PROTO(static, maeve_event_ob_ruler) { const STATUS status = STATUS_OK; - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -3346,7 +3346,7 @@ ruler_msg_close1( T5_MSG_PROTO(static, ruler_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_skel/ff_load.c b/t5/ob_skel/ff_load.c index 893786c..2610526 100644 --- a/t5/ob_skel/ff_load.c +++ b/t5/ob_skel/ff_load.c @@ -644,8 +644,8 @@ T5_CMD_PROTO(extern, t5_cmd_bind_file_type) SC_ARRAY_INIT_BLOCK type_binding_init_block = aib_init(1, sizeof32(*p_bound_filetype), TRUE); STATUS status; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL != (p_bound_filetype = al_array_extend_by(&g_bound_filetype_handle, BOUND_FILETYPE, 1, &type_binding_init_block, &status))) { @@ -674,7 +674,7 @@ T5_CMD_PROTO(extern, t5_cmd_bind_file_type) status = quick_ublock_ustr_add(&p_bound_filetype->description_quick_ublock, ustr_file_extension_desc); } #else - IGNOREPARM(ustr_file_extension_desc); + UNREFERENCED_PARAMETER(ustr_file_extension_desc); #endif if(status_ok(status)) @@ -684,7 +684,7 @@ T5_CMD_PROTO(extern, t5_cmd_bind_file_type) if(status_ok(status) && (NULL != ustr_file_extension_srch)) status = quick_ublock_ustr_add_n(&p_bound_filetype->extension_srch_quick_ublock, ustr_file_extension_srch, strlen_with_NULLCH); #else - IGNOREPARM(ustr_file_extension_srch); + UNREFERENCED_PARAMETER(ustr_file_extension_srch); #endif if(status_fail(status)) @@ -790,8 +790,8 @@ T5_CMD_PROTO(extern, t5_cmd_object_bind_loader) INSTALLED_LOAD_OBJECT installed_load_object; SC_ARRAY_INIT_BLOCK array_init_block = aib_init(1, sizeof32(installed_load_object), 0); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); installed_load_object.object_id = p_args[0].val.object_id; installed_load_object.t5_filetype = p_args[1].val.t5_filetype; @@ -1121,7 +1121,7 @@ T5_CMD_PROTO(extern, t5_cmd_load_foreign) QUICK_TBLOCK_WITH_BUFFER(quick_tblock, 100); quick_tblock_with_buffer_setup(quick_tblock); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(OBJECT_ID_NONE == object_id) return(create_error(ERR_UNKNOWN_FILETYPE)); diff --git a/t5/ob_skel/flags.h b/t5/ob_skel/flags.h index bb607e8..23db10e 100644 --- a/t5/ob_skel/flags.h +++ b/t5/ob_skel/flags.h @@ -129,6 +129,11 @@ skeleton_save_style_handle( _InVal_ STYLE_HANDLE style_handle, _InVal_ BOOL part_save); +_Check_return_ +extern STATUS +skel_save_version( + _InoutRef_ P_OF_OP_FORMAT p_of_op_format); + /* sk_table.c */ diff --git a/t5/ob_skel/fonty.c b/t5/ob_skel/fonty.c index 5daf9f9..add9670 100644 --- a/t5/ob_skel/fonty.c +++ b/t5/ob_skel/fonty.c @@ -279,7 +279,7 @@ fonty_scanstring_old( return(p_kernel_oserror); } -#endif +#endif /* UNUSED */ #endif /* RISCOS */ @@ -1478,7 +1478,7 @@ fontmap_default_font( FONTMAP_BITS try_fontmap_bits; #if RISCOS - IGNOREPARM_InVal_(use_host_riscos); + UNREFERENCED_PARAMETER_InVal_(use_host_riscos); assert(!use_host_riscos); #else if(use_host_riscos) @@ -1705,7 +1705,7 @@ fontmap_host_font_spec_from_font_spec( FONTMAP_BITS fontmap_bits, try_fontmap_bits; #if WINDOWS - IGNOREPARM_InVal_(for_riscos_utf8); + UNREFERENCED_PARAMETER_InVal_(for_riscos_utf8); #endif /* Keep same attributes where applicable */ @@ -1908,7 +1908,7 @@ fontmap_enum_fonts_callback( return(fontmap_enum_fonts_add_font(lpelf, p)); } - IGNOREPARM(lpntme); + UNREFERENCED_PARAMETER(lpntme); return(1); } @@ -1931,7 +1931,7 @@ fontmap_enum_faces_callback( return(EnumFontFamiliesEx(p->hdc, &logfont, fontmap_enum_fonts_callback, lParam, 0)); } - IGNOREPARM(lpntm); + UNREFERENCED_PARAMETER(lpntm); return(1); } @@ -2451,7 +2451,7 @@ fontmap_remap_using_rtf_class( FONTMAP_BITS try_fontmap_bits; #if RISCOS - IGNOREPARM_InVal_(use_host_riscos); + UNREFERENCED_PARAMETER_InVal_(use_host_riscos); assert(!use_host_riscos); #else if(use_host_riscos) @@ -2720,8 +2720,8 @@ T5_CMD_PROTO(extern, t5_cmd_fontmap) ARRAY_INDEX insert_before; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_1(TRACE_APP_FONTS, TEXT("config Fireworkz font name '%s'"), tstr_app_font_name); @@ -2804,9 +2804,9 @@ T5_CMD_PROTO(extern, t5_cmd_fontmap) T5_CMD_PROTO(extern, t5_cmd_fontmap_end) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(fontmap_table_host_create()); } @@ -2843,8 +2843,8 @@ T5_CMD_PROTO(extern, t5_cmd_fontmap_remap) ARRAY_INDEX insert_before; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_2(TRACE_APP_FONTS, TEXT("config FontmapRemap Fireworkz font name '%s' from '%s'"), tstr_app_font_name, tstr_app_font_name_old); @@ -2883,8 +2883,8 @@ fonty_msg_exit2(void) T5_MSG_PROTO(static, maeve_services_fonty_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -2898,7 +2898,7 @@ T5_MSG_PROTO(static, maeve_services_fonty_msg_initclose, _InRef_ PC_MSG_INITCLOS MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_fonty) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/ob_imps.c b/t5/ob_skel/ob_imps.c index 1c8f46a..dace13c 100644 --- a/t5/ob_skel/ob_imps.c +++ b/t5/ob_skel/ob_imps.c @@ -28,7 +28,7 @@ T5_MSG_PROTO(static, implied_style_ext_style_cell_type, P_IMPLIED_STYLE_QUERY p_ const PC_STYLE_DOCU_AREA p_style_docu_area = p_implied_style_query->p_style_docu_area; const P_CELL p_cell = p_cell_from_slr(p_docu, &p_implied_style_query->position.slr); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if((NULL != p_cell) && (object_id_from_cell(p_cell) == p_implied_style_query->arg)) { @@ -45,7 +45,7 @@ T5_MSG_PROTO(static, implied_style_ext_style_cell_current, P_IMPLIED_STYLE_QUERY { const PC_STYLE_DOCU_AREA p_style_docu_area = p_implied_style_query->p_style_docu_area; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(slr_equal(&p_implied_style_query->position.slr, &p_docu->cur.slr)) { @@ -66,7 +66,7 @@ T5_MSG_PROTO(static, implied_style_ext_style_stripe_cols, P_IMPLIED_STYLE_QUERY const int repeat = (int) ((arg & 0xFF000000) >> 24) + 2; const COL col = p_style_docu_area->docu_area.whole_row ? 0 : p_style_docu_area->docu_area.tl.slr.col; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* I had this idea that it should be docu_area tl relative to preserve appearance as it was moved around */ if(0 == ((int) (p_implied_style_query->position.slr.col - col) - offset) % repeat) @@ -88,7 +88,7 @@ T5_MSG_PROTO(static, implied_style_ext_style_stripe_rows, P_IMPLIED_STYLE_QUERY const int repeat = (int) ((arg & 0xFF000000) >> 24) + 2; const ROW row = p_style_docu_area->docu_area.whole_col ? 0 : p_style_docu_area->docu_area.tl.slr.row; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* I had this idea that it should be docu_area tl relative to preserve appearance as it was moved around */ if(0 == ((int) (p_implied_style_query->position.slr.row - row) - offset) % repeat) diff --git a/t5/ob_skel/object.c b/t5/ob_skel/object.c index f49ca61..8550e79 100644 --- a/t5/ob_skel/object.c +++ b/t5/ob_skel/object.c @@ -857,9 +857,9 @@ object_load_internal_install( OBJECT_PROTO(static, object_load_fail_sink) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER(p_data); return(STATUS_OK); } @@ -1222,7 +1222,7 @@ _p_object_instance_data( P_BYTE p_data; DOCU_ASSERT(p_docu); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(bytesof_data)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(bytesof_data)); if(!IS_OBJECT_ID_VALID(object_id)) { @@ -1246,7 +1246,7 @@ MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_object); T5_MSG_PROTO(static, maeve_services_object_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1282,7 +1282,7 @@ T5_MSG_PROTO(static, maeve_services_object_msg_initclose, _InRef_ PC_MSG_INITCLO MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_object) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/of_load.c b/t5/ob_skel/of_load.c index 4357192..65b6c71 100644 --- a/t5/ob_skel/of_load.c +++ b/t5/ob_skel/of_load.c @@ -1946,7 +1946,7 @@ dialog_select_template_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_select_template) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -2264,8 +2264,8 @@ MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_of_load); T5_MSG_PROTO(static, maeve_services_of_load_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -2280,7 +2280,7 @@ T5_MSG_PROTO(static, maeve_services_of_load_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_of_load) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -2299,8 +2299,8 @@ T5_CMD_PROTO(extern, t5_cmd_object_bind_construct) const U8 construct_id = p_args[1].val.u8c; P_REGISTERED_CONSTRUCT_TABLE p = &of_load_statics.registered_construct_table[object_id]; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); p->construct_id = construct_id; return(STATUS_OK); @@ -2767,8 +2767,8 @@ T5_CMD_PROTO(extern, t5_cmd_load) BOOL fReadOnly = FALSE; STATUS status; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_present(&p_t5_cmd->arglist_handle, 1, &p_arg)) fReadOnly = p_arg->val.fBool; @@ -2988,7 +2988,7 @@ load_and_print_this_file_core( #if WINDOWS if(NULL != printername) status = host_printer_set(printername); /* set up for specific printer, not default */ #else - IGNOREPARM(printername); + UNREFERENCED_PARAMETER(printername); #endif if(status_ok(status)) @@ -3042,7 +3042,7 @@ T5_CMD_PROTO(extern, t5_cmd_load_template) QUICK_TBLOCK_WITH_BUFFER(quick_tblock, 100); quick_tblock_with_buffer_setup(quick_tblock); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, 0)) { diff --git a/t5/ob_skel/resource/uk-msg b/t5/ob_skel/resource/uk-msg index be67021..7d2a912 100644 --- a/t5/ob_skel/resource/uk-msg +++ b/t5/ob_skel/resource/uk-msg @@ -13,14 +13,12 @@ # NB Use Title Caps on Windows for: # Title Bar / Action Buttons # -# when changing version number for release, remember other files: -# definitive list of files is in common.mf_mid +# When changing version number for release, remember other files +# The definitive list of files is in common.mf_mid #1:2.xx.yy #1:2.xx -1:2.10 -2:(24 Jun 2016) -# -# update date and version in the corresponding RelNotes HTML files too +1:2.10.02 +2:(07 Jul 2016) # 1033:© 1992-2016 Colton Software r1034:Portions © 1994-2016 R-Comp diff --git a/t5/ob_skel/riscos/colourpick.c b/t5/ob_skel/riscos/colourpick.c index 866c4e4..e73666d 100644 --- a/t5/ob_skel/riscos/colourpick.c +++ b/t5/ob_skel/riscos/colourpick.c @@ -122,7 +122,7 @@ colourpicker_event_close_window( P_COLOURPICKER_CALLBACK p_colourpicker_callback, _In_ const WimpCloseWindowRequestEvent * const p_close_window_request) { - IGNOREPARM_CONST(p_close_window_request); + UNREFERENCED_PARAMETER_InRef_(p_close_window_request); colourpicker_close_dialogue(p_colourpicker_callback); @@ -138,7 +138,7 @@ colourpicker_event_handler( { reportf(/*trace_3(TRACE_RISCOS_HOST,*/ TEXT("%s: %s handle=") PTR_XTFMT, __Tfunc__, report_wimp_event(event_code, p_event_data), handle); - IGNOREPARM_CONST(p_event_data); + UNREFERENCED_PARAMETER_InRef_(p_event_data); switch(event_code) { @@ -181,7 +181,7 @@ colourpicker_message_ColourPickerCloseDialogueRequest( _In_ const WimpMessage * const p_wimp_message, P_COLOURPICKER_CALLBACK p_colourpicker_callback) { - IGNOREPARM_CONST(p_wimp_message); + UNREFERENCED_PARAMETER_InRef_(p_wimp_message); assert(p_colourpicker_callback->dialogue_handle == p_wimp_message->data.words[0]); @@ -195,7 +195,7 @@ colourpicker_message_ColourPickerResetColourRequest( _In_ const WimpMessage * const p_wimp_message, P_COLOURPICKER_CALLBACK p_colourpicker_callback) { - IGNOREPARM_CONST(p_wimp_message); + UNREFERENCED_PARAMETER_InRef_(p_wimp_message); assert(p_colourpicker_callback->dialogue_handle == p_wimp_message->data.words[0]); diff --git a/t5/ob_skel/riscos/cs-flex.c b/t5/ob_skel/riscos/cs-flex.c index 76ba01e..6dc19f1 100644 --- a/t5/ob_skel/riscos/cs-flex.c +++ b/t5/ob_skel/riscos/cs-flex.c @@ -278,7 +278,7 @@ flex_set_budge(int newstate) if(flex_.area_num) return(-1); - IGNOREPARM(newstate); + UNREFERENCED_PARAMETER_InVal_(newstate); assert(0 == newstate); return(0); } @@ -330,7 +330,7 @@ flex_msgs_lookup( static void flex__fail(int i) { - IGNOREPARM(i); + UNREFERENCED_PARAMETER_InVal_(i); flex_werr(FALSE, flex_msgs_lookup(MSGS_flex1)); /* don't abort */ } @@ -568,7 +568,7 @@ flex_init( int *error_fd, int dynamic_size) { - IGNOREPARM(error_fd); + UNREFERENCED_PARAMETER(error_fd); { _kernel_swi_regs rs; @@ -617,7 +617,7 @@ flex_set_budge(int newstate) if(flex_.area_num) return(-1); - IGNOREPARM(newstate); + UNREFERENCED_PARAMETER_InVal_(newstate); assert(0 == newstate); return(0); } diff --git a/t5/ob_skel/riscos/cs-winx.c b/t5/ob_skel/riscos/cs-winx.c index 9ed31d2..65829d0 100644 --- a/t5/ob_skel/riscos/cs-winx.c +++ b/t5/ob_skel/riscos/cs-winx.c @@ -108,14 +108,21 @@ winx_changedtitle( if(WimpWindow_Open & window_state.flags) { - const int dy = host_modevar_cache_current.dy; - BBox bbox; - bbox.xmin = window_state.visible_area.xmin; - bbox.ymin = window_state.visible_area.ymax + dy; /* title bar contents starts one raster up */ - bbox.xmax = window_state.visible_area.xmax; - bbox.ymax = bbox.ymin + wimp_win_title_height(dy) - 2*dy; - trace_1(TRACE_RISCOS_HOST, TEXT("%s: forcing global redraw of inside of title bar area"), __Tfunc__); - void_WrapOsErrorReporting(wimp_force_redraw_BBox(-1 /* entire screen */, &bbox)); + if(g_current_wm_version >= 380) + { /* use more efficient method */ + void_WrapOsErrorReporting(wimp_force_redraw(window_handle, 0x4B534154 /*TASK*/, 3 /*Title Bar*/, 0, 0)); + } + else + { + const int dy = host_modevar_cache_current.dy; + BBox bbox; + bbox.xmin = window_state.visible_area.xmin; + bbox.ymin = window_state.visible_area.ymax + dy; /* title bar contents starts one raster up */ + bbox.xmax = window_state.visible_area.xmax; + bbox.ymax = bbox.ymin + wimp_win_title_height(dy) - 2*dy; + trace_1(TRACE_RISCOS_HOST, TEXT("%s: forcing global redraw of inside of title bar area"), __Tfunc__); + void_WrapOsErrorReporting(wimp_force_redraw_BBox(-1 /* entire screen */, &bbox)); + } } } diff --git a/t5/ob_skel/riscos/event.c b/t5/ob_skel/riscos/event.c index 6a98ecb..5e4bc12 100644 --- a/t5/ob_skel/riscos/event.c +++ b/t5/ob_skel/riscos/event.c @@ -163,8 +163,6 @@ event__createmenu( event_.menu_click.mce.mouse_y += m->item_height + m->gap; } while(!((mi++)->flags & WimpMenuItem_Last)); - - IGNOREPARM(mi); } (void) event_create_menu(m, event_.menu_click.mce.mouse_x - 64, event_.menu_click.mce.mouse_y); diff --git a/t5/ob_skel/riscos/ho_event.c b/t5/ob_skel/riscos/ho_event.c index a8a6a32..3ca38ca 100644 --- a/t5/ob_skel/riscos/ho_event.c +++ b/t5/ob_skel/riscos/ho_event.c @@ -456,7 +456,7 @@ static void general_message_Shutdown( _In_ const WimpMessage * const p_wimp_message) { - IGNOREPARM_InRef_(p_wimp_message); + UNREFERENCED_PARAMETER_InRef_(p_wimp_message); g_silent_shutdown = TRUE; /* suppress error reporting for uninterrupted processing */ @@ -882,7 +882,7 @@ general_event_handler( _In_ const WimpPollBlock * const p_event_data, P_ANY handle) { - IGNOREPARM(handle); + UNREFERENCED_PARAMETER(handle); trace_2(TRACE_RISCOS_HOST, TEXT("%s: %s"), __Tfunc__, report_wimp_event(event_code, p_event_data)); @@ -1135,7 +1135,7 @@ iconbar_event_handler( _In_ const WimpPollBlock * const p_event_data, P_ANY handle) { - IGNOREPARM(handle); + UNREFERENCED_PARAMETER(handle); trace_2(TRACE_RISCOS_HOST, TEXT("%s: %s"), __Tfunc__, report_wimp_event(event_code, p_event_data)); @@ -1418,8 +1418,8 @@ ho_event_msg_exit2(void) T5_MSG_PROTO(static, maeve_services_ho_event_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1436,7 +1436,7 @@ T5_MSG_PROTO(static, maeve_services_ho_event_msg_initclose, _InRef_ PC_MSG_INITC MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_event) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/riscos/ho_paint.c b/t5/ob_skel/riscos/ho_paint.c index 32cf3fe..6f4ff7f 100644 --- a/t5/ob_skel/riscos/ho_paint.c +++ b/t5/ob_skel/riscos/ho_paint.c @@ -191,7 +191,7 @@ extern void host_paint_start( _InRef_ PC_REDRAW_CONTEXT p_redraw_context) { - IGNOREPARM_InRef_(p_redraw_context); + UNREFERENCED_PARAMETER_InRef_(p_redraw_context); } extern void @@ -1080,7 +1080,7 @@ host_paint_drawfile_render_path( int fill = DMFT_PLOT_Bint | DMFT_PLOT_NonBint; _kernel_swi_regs rs; - IGNOREPARM(gcol_out); + UNREFERENCED_PARAMETER(gcol_out); /* two bit winding rule field, either 10 (even-odd) or 00 (non-zero) from Draw path object */ if(path.pathstyle.flags & DRAW_PS_WINDRULE_PACK_MASK) @@ -1344,7 +1344,7 @@ host_font_dispose( { *p_host_font = HOST_FONT_NONE; - IGNOREPARM_InRef_(p_redraw_context); + UNREFERENCED_PARAMETER_InRef_(p_redraw_context); WrapOsErrorReporting(font_LoseFont(host_font)); } } @@ -3862,7 +3862,7 @@ generate_table( status = STATUS_FAIL; } - IGNOREPARM(status); + UNREFERENCED_PARAMETER(status); spx = (P_U8) NULL;/*-1;*/ @@ -4006,10 +4006,10 @@ host_modevar_cache_entry_compare_equals( for(p_s32 = &p_mode_selector->terminator; *p_s32 != -1; p_s32 += 2) sizeof_mode_selector += 2 * sizeof32(S32); - if(sizeof_mode_selector != array_elements32(&p_host_modevar_cache_entry->h_selector)) + if(sizeof_mode_selector != array_elements32(&p_host_modevar_cache_entry->h_mode_selector)) return(FALSE); - return(0 == short_memcmp32(p_mode_selector, array_base(&p_host_modevar_cache_entry->h_selector, U8), sizeof_mode_selector)); + return(0 == short_memcmp32(p_mode_selector, array_base(&p_host_modevar_cache_entry->h_mode_selector, U8), sizeof_mode_selector)); } /* if(1 == ms_bit_zero) */ @@ -4021,7 +4021,7 @@ static void host_modevar_cache_entry_dispose( _InoutRef_ P_HOST_MODEVAR_CACHE_ENTRY p_host_modevar_cache_entry) { - al_array_dispose(&p_host_modevar_cache_entry->h_selector); + al_array_dispose(&p_host_modevar_cache_entry->h_mode_selector); } static void @@ -4091,6 +4091,8 @@ host_modevar_cache_obtain_data( trace_2(0, "obtain_mode %d (%x)", mode_specifier, mode_specifier); report_mode_specifier(mode_specifier); #endif + zero_struct_ptr(p_host_modevar_cache_entry); + p_host_modevar_cache_entry->mode_specifier = mode_specifier; if(mode_specifier < 256U) @@ -4105,7 +4107,7 @@ host_modevar_cache_obtain_data( for(p_s32 = &p_mode_selector->terminator; *p_s32 != -1; p_s32 += 2) sizeof_mode_selector += 2 * sizeof32(S32); - status_assert(al_array_add(&p_host_modevar_cache_entry->h_selector, BYTE, sizeof_mode_selector, &array_init_block_u8, p_mode_selector)); + status_assert(al_array_add(&p_host_modevar_cache_entry->h_mode_selector, BYTE, sizeof_mode_selector, &array_init_block_u8, p_mode_selector)); } else { /* Sprite Mode Word */ diff --git a/t5/ob_skel/riscos/host.c b/t5/ob_skel/riscos/host.c index 4d89638..3562967 100644 --- a/t5/ob_skel/riscos/host.c +++ b/t5/ob_skel/riscos/host.c @@ -601,7 +601,7 @@ host_view_destroy( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(NULL == p_view) return; @@ -647,7 +647,7 @@ host_view_query_posn( { WimpGetWindowStateBlock window_state; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* Get the state of the back window */ window_state.window_handle = p_view->main[WIN_BACK].hwnd; @@ -670,7 +670,7 @@ host_view_show( { union wimp_window_state_open_window_u window_u; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* Get the state of the window */ window_u.window_state.window_handle = p_view->main[WIN_BACK].hwnd; @@ -689,7 +689,7 @@ host_view_reopen( { union wimp_window_state_open_window_u window_u; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* Get the state of the window */ window_u.window_state.window_handle = p_view->main[WIN_BACK].hwnd; @@ -713,7 +713,7 @@ host_view_maximize( { union wimp_window_state_open_window_u window_u; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_view->flags.maximized) return; @@ -741,7 +741,7 @@ host_view_minimize( WimpMessage msg; WimpIconizeMessage * const p_wimp_message_iconize = (WimpIconizeMessage *) &msg.data; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_view->flags.minimized) return; @@ -1246,7 +1246,7 @@ back_window_open( #if defined(UNUSED) /* currently there are no such windows (e.g. list boxes) */ /* open any windows maintained by win layer, modifying who to open this stack behind */ winx_open_child_windows(p_view->main[WIN_BACK].hwnd, p_open_window, &behind); -#endif +#endif /* UNUSED */ /* If wimp asked back window to open in place (i.e. behind itself) * then first window opened must be opened behind itself. @@ -1594,8 +1594,8 @@ pane_window_create( break; } - wind_defn.min_width = 128; - wind_defn.min_height = 128; + wind_defn.min_width = 40; + wind_defn.min_height = 40; wind_defn.extent = * (const BBox *) &p_view->scaled_paneextent; @@ -1793,7 +1793,7 @@ edge_window_create( case WIN_BORDER_HORZ: wind_defn.extent.ymin = -1024; wind_defn.extent.xmax = p_view->scaled_paneextent.x1; - wind_defn.min_width = 128; + wind_defn.min_width = 40; p_proc_host_event = horzborder_event_handler; break; @@ -1801,7 +1801,7 @@ edge_window_create( case WIN_BORDER_VERT: wind_defn.extent.ymin = p_view->scaled_paneextent.y0; wind_defn.extent.xmax = 1280; - wind_defn.min_height = 128; + wind_defn.min_height = 40; p_proc_host_event = vertborder_event_handler; break; @@ -1809,7 +1809,7 @@ edge_window_create( case WIN_RULER_HORZ: wind_defn.extent.ymin = -1024; wind_defn.extent.xmax = p_view->scaled_paneextent.x1; - wind_defn.min_width = 128; + wind_defn.min_width = 40; p_proc_host_event = horzruler_event_handler; break; @@ -1817,7 +1817,7 @@ edge_window_create( case WIN_RULER_VERT: wind_defn.extent.ymin = p_view->scaled_paneextent.y0; wind_defn.extent.xmax = 1280; - wind_defn.min_height = 128; + wind_defn.min_height = 40; p_proc_host_event = vertruler_event_handler; break; } @@ -1868,7 +1868,7 @@ set_cur_pane( case WINTYPE_PANE: pane_id = find_pane(p_view, hwnd); - IGNOREPARM_InVal_(window_id); + UNREFERENCED_PARAMETER_InVal_(window_id); break; default: @@ -1930,7 +1930,7 @@ update_common_pre_loop( { const P_REDRAW_CONTEXT p_redraw_context = &p_viewevent_redraw->redraw_context; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); zero_struct_ptr(p_viewevent_redraw); @@ -1966,7 +1966,7 @@ update_common_in_loop( { const P_REDRAW_CONTEXT p_redraw_context = &p_viewevent_redraw->redraw_context; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* invalidate cache foreground and background entries cos wimp may have drawn scroll bars/borders/icons etc. */ host_invalidate_cache(HIC_REDRAW_LOOP_START); @@ -2241,7 +2241,7 @@ send_click_event_to_view( view_point_from_screen_point_and_context(&viewevent_click.view_point, (PC_GDI_POINT) &p_mouse_click_event->mouse_x, &viewevent_click.click_context); - dragging_.allowed = ((t5_message == T5_EVENT_CLICK_LEFT_DRAG) || (t5_message == T5_EVENT_CLICK_RIGHT_DRAG)); + dragging_.allowed = ((T5_EVENT_CLICK_LEFT_DRAG == t5_message) || (T5_EVENT_CLICK_RIGHT_DRAG == t5_message)); if(dragging_.allowed) { @@ -2368,14 +2368,14 @@ send_release_event_to_view( assert(dragging_.active); /* If aborted (rather than on receipt of Wimp_EUserDrag) then we need to cancel the current drag box */ - if(t5_message == T5_EVENT_CLICK_DRAG_ABORTED) + if(T5_EVENT_CLICK_DRAG_ABORTED == t5_message) void_WrapOsErrorReporting(winx_drag_box(NULL)); /* NB winx_drag_box() NOT wimp_drag_box() */ /* Send dragging event to view only if mouse has moved. Scroll the window if the pointer is outside it. */ callback(T5_EVENT_CLICK_DRAG_MOVEMENT, &dragging_.callback, TRUE, TRUE); /* Send drag finished event to view (even if mouse hasn't moved). Don't scroll the window if the pointer is outside it. */ - assert((t5_message == T5_EVENT_CLICK_DRAG_ABORTED) || (t5_message == T5_EVENT_CLICK_DRAG_FINISHED)); + assert((T5_EVENT_CLICK_DRAG_ABORTED == t5_message) || (T5_EVENT_CLICK_DRAG_FINISHED == t5_message)); callback(t5_message, &dragging_.callback, FALSE, FALSE); dragging_.active = FALSE; @@ -2429,7 +2429,7 @@ send_key_event_to_docu( if(preprocess_key_event_ESCAPE()) return(1 /*processed*/); - fn_key = (t5_message != T5_EVENT_NONE); + fn_key = (T5_EVENT_NONE != t5_message); if(!fn_key) { @@ -2445,7 +2445,7 @@ send_key_event_to_docu( } else { - IGNOREPARM(h_commands); + UNREFERENCED_PARAMETER(h_commands); fn_key = 1; } @@ -2538,8 +2538,8 @@ host_drag_in_progress( PROC_EVENT_PROTO(static, null_event_host_drag) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); #if CHECKING switch(t5_message) @@ -2549,7 +2549,7 @@ PROC_EVENT_PROTO(static, null_event_host_drag) case T5_EVENT_NULL: #else - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { #endif if(dragging_.active) @@ -2570,7 +2570,7 @@ host_settitle( _ViewRef_ P_VIEW p_view, _In_z_ PCTSTR title) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(0 != tstrcmp(p_view->window_title, title)) { @@ -2592,7 +2592,7 @@ host_show_caret( WimpCaret caret_cur; WimpCaret caret_new; - IGNOREPARM(width); + UNREFERENCED_PARAMETER(width); void_WrapOsErrorReporting(wimp_get_caret_position(&caret_cur)); @@ -2754,8 +2754,8 @@ host_main_hide_caret( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_ViewRef_(p_view); #if FALSE myassert2(TEXT("why is host_main_hide_caret(") PTR_XTFMT TEXT(", ") PTR_XTFMT TEXT(") being called"), p_docu, p_view); @@ -2823,7 +2823,7 @@ host_update_all( int index[2], i; WimpRedrawWindowBlock redraw_window; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(threaded_through_redraw) return; @@ -3044,7 +3044,7 @@ host_update( WimpRedrawWindowBlock redraw_window; int wimp_more = 0; - IGNOREPARM_InVal_(redraw_flags); + UNREFERENCED_PARAMETER_InVal_(redraw_flags); if(threaded_through_redraw) return; @@ -3190,7 +3190,7 @@ host_update_fast_start( WimpRedrawWindowBlock redraw_window; BOOL more; - IGNOREPARM_InVal_(redraw_tag); + UNREFERENCED_PARAMETER_InVal_(redraw_tag); if(threaded_through_redraw) return(FALSE); /* Don't be mean to the wimp, it bites back! */ @@ -3322,7 +3322,7 @@ calc_window_positions( int excess_x = (con_x_9 - con_x_8) - (p_view->scaled_paneextent.x1 - p_view->scaled_paneextent.x0); int excess_y = (con_y_8 - con_y_9) - (p_view->scaled_paneextent.y1 - p_view->scaled_paneextent.y0); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_view->flags.horz_split_on && (excess_x > 0)) { @@ -3341,14 +3341,14 @@ calc_window_positions( * Enlarging WIN_PANE and the back window may give us values that hang off the edge of the * screen, but lets not worry about that for now! */ - excess_x = (116 + 4+8) - (con_x_9 - con_x_8); + excess_x = (40) - (con_x_9 - con_x_8); if(excess_x > 0) { con_x_9 += excess_x; p_bbox->xmax += excess_x; } - excess_y = (116 + 4+8) - (con_y_8 - con_y_9); + excess_y = (40) - (con_y_8 - con_y_9); if(excess_y > 0) { con_y_9 -= excess_y; @@ -3434,7 +3434,7 @@ host_set_extent_this_view( BBox pane_box, edge_box, back_box; VIEW_RECT view_rect; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); view_rect.p_view = p_view; view_rect.rect.tl.x = view_rect.rect.tl.y = 0; @@ -3451,7 +3451,7 @@ host_set_extent_this_view( window_rect_from_view_rect(&gdi_rect, P_DOCU_NONE, &view_rect, NULL, &screen_host_xform); sx = gdi_rect.br.x; sy = gdi_rect.br.y; - IGNOREPARM(sy); + UNREFERENCED_PARAMETER(sy); x = MAX(x, sx); /* never let x pane extent fall below 100% worth*/ @@ -3733,7 +3733,7 @@ T5_CMD_PROTO(extern, t5_cmd_help) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(t5_message) { diff --git a/t5/ob_skel/riscos/main.c b/t5/ob_skel/riscos/main.c index 923fbca..6c99505 100644 --- a/t5/ob_skel/riscos/main.c +++ b/t5/ob_skel/riscos/main.c @@ -343,7 +343,7 @@ t5_signal_handler(int sig) static void t5_stack_overflow_handler(int sig) { - IGNOREPARM(sig); + UNREFERENCED_PARAMETER(sig); report_output("*** Stack overflow ***"); @@ -455,6 +455,8 @@ t5_wimp_messages[] = 0 /* terminate list */ }; +int g_current_wm_version = 310; + extern int main( int argc, @@ -517,18 +519,15 @@ main( decode_run_options(); - { /* Startup Window Manager interface */ - int current_wm_version; - + /* Startup Window Manager interface */ (void) wimp_initialise( 310 /*wm_version*/, de_const_cast(char *, product_ui_id()), de_const_cast(int *, t5_wimp_messages), - ¤t_wm_version, + &g_current_wm_version, &g_host_task_handle); - atexit(window_manager_atexit); /* will need to close our task correctly */ - } /*block*/ + atexit(window_manager_atexit); /* will now need to close our task correctly */ #ifdef PROFILING /* Task ID may now have changed, so re-register */ diff --git a/t5/ob_skel/sk_alpha.c b/t5/ob_skel/sk_alpha.c index 2a44e93..590a817 100644 --- a/t5/ob_skel/sk_alpha.c +++ b/t5/ob_skel/sk_alpha.c @@ -1399,8 +1399,8 @@ T5_CMD_PROTO(extern, t5_cmd_ctypetable) U32 bic_mask = 0; U32 value; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, 1)) { diff --git a/t5/ob_skel/sk_area.c b/t5/ob_skel/sk_area.c index 52f5135..9986210 100644 --- a/t5/ob_skel/sk_area.c +++ b/t5/ob_skel/sk_area.c @@ -84,7 +84,7 @@ field_or_title_data_ref_in_region( { DATA_REF_AND_SLR data_ref_and_slr; - IGNOREPARM_InVal_(data_space); + UNREFERENCED_PARAMETER_InVal_(data_space); data_ref_and_slr.data_ref = *p_data_ref; diff --git a/t5/ob_skel/sk_bord.c b/t5/ob_skel/sk_bord.c index b6dff90..bbf01d7 100644 --- a/t5/ob_skel/sk_bord.c +++ b/t5/ob_skel/sk_bord.c @@ -317,7 +317,7 @@ sk_bord_docu_colrow( MAEVE_EVENT_PROTO(static, maeve_event_sk_bord) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -337,7 +337,7 @@ Event handler for a column border rendered within a page c.f. edge_window_event_ T5_MSG_PROTO(static, margin_col_event_redraw, P_SKELEVENT_REDRAW p_skelevent_redraw) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(border_horz_redraw(p_docu, FALSE, p_skelevent_redraw, p_style_for_margin_col())); /* drag operations in window are NOT shown */ } @@ -617,7 +617,7 @@ border_horz_event_click_drag_column_width_adjustor( { const T5_MESSAGE t5_message_right = T5_EVENT_CLICK_RIGHT_DRAG; const T5_MESSAGE t5_message_effective = right_message_if_ctrl(t5_message, t5_message_right, p_skelevent_click); - BOOL split = (t5_message_effective == T5_EVENT_CLICK_RIGHT_DRAG) && ((col_number+1) < n_cols_logical(p_docu)); + BOOL split = (T5_EVENT_CLICK_RIGHT_DRAG == t5_message_effective) && ((col_number+1) < n_cols_logical(p_docu)); /* 'goto' the new column, cos resizes apply to current column */ if(p_docu->cur.slr.col != col_number) @@ -789,7 +789,7 @@ T5_MSG_PROTO(static, border_horz_event_click_drag_finished, _InoutRef_ P_SKELEVE trace_0(TRACE_APP_CLICK, TEXT("edge_window_event_border_horz T5_EVENT_CLICK_DRAG_FINISHED")); - if(t5_message == T5_EVENT_CLICK_DRAG_FINISHED) + if(T5_EVENT_CLICK_DRAG_FINISHED == t5_message) { redraw_border = 0; @@ -869,10 +869,10 @@ T5_MSG_PROTO(static, border_horz_event_click_drag_finished, _InoutRef_ P_SKELEVE T5_MSG_PROTO(static, border_horz_event_pointer_movement, _InRef_ PC_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_v0(TRACE_APP_CLICK, - (t5_message == T5_EVENT_POINTER_ENTERS_WINDOW) + (T5_EVENT_POINTER_ENTERS_WINDOW == t5_message) ? TEXT("edge_window_event_border_horz T5_EVENT_POINTER_ENTERS_WINDOW") : TEXT("edge_window_event_border_horz T5_EVENT_POINTER_MOVEMENT")); @@ -883,8 +883,8 @@ T5_MSG_PROTO(static, border_horz_event_pointer_movement, _InRef_ PC_SKELEVENT_CL T5_MSG_PROTO(static, border_horz_event_pointer_leaves_window, _InRef_ PC_SKELEVENT_CLICK p_skelevent_click) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InVal_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(p_skelevent_click); trace_0(TRACE_APP_CLICK, TEXT("edge_window_event_border_horz T5_EVENT_POINTER_LEAVES_WINDOW")); @@ -898,7 +898,7 @@ T5_MSG_PROTO(static, border_horz_event_pointer_leaves_window, _InRef_ PC_SKELEVE T5_MSG_PROTO(static, border_horz_event_redraw, P_SKELEVENT_REDRAW p_skelevent_redraw) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* Fix the bottom right to define the height of the border region */ p_skelevent_redraw->work_skel_rect.br.pixit_point.y = view_border_pixit_size(p_skelevent_redraw->redraw_context.p_view, TRUE); @@ -1160,7 +1160,7 @@ border_horz_redraw( host_fonty_text_paint_uchars_in_framed_box(&p_skelevent_redraw->redraw_context, &col_rect, ustr_numform_res, ustrlen32(ustr_numform_res), border_style, fill_wimpcolour, text_wimpcolour, host_font_redraw); else -#endif +#endif /* UNUSED */ host_fonty_text_paint_uchars_in_rectangle( p_redraw_context, &col_rect, ustr_numform_res, ustrlen32(ustr_numform_res), &border_flags, &rgb_fill, p_rgb_line, p_rgb_text, host_font_redraw); } @@ -1199,7 +1199,7 @@ Event handler for a row border rendered within a page c.f. edge_window_event_bor T5_MSG_PROTO(static, margin_row_event_redraw, P_SKELEVENT_REDRAW p_skelevent_redraw) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(border_vert_redraw(p_docu, FALSE, p_skelevent_redraw, p_style_for_margin_row())); /* drag operations in window are NOT shown */ } @@ -1358,10 +1358,10 @@ border_vert_event_click_right_double_row_centre( _InRef_ P_SKELEVENT_CLICK p_skelevent_click, _InVal_ ROW row_number) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_skelevent_click); - IGNOREPARM_InVal_(row_number); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(row_number); return(STATUS_OK); } @@ -1374,10 +1374,10 @@ border_vert_event_click_right_drag_row_centre( _InRef_ P_SKELEVENT_CLICK p_skelevent_click, _InVal_ ROW row_number) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_skelevent_click); - IGNOREPARM_InVal_(row_number); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(row_number); return(STATUS_OK); } @@ -1525,8 +1525,8 @@ border_vert_event_click_right_double_height_adjustor( _DocuRef_ P_DOCU p_docu, _InVal_ ROW row_number) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(row_number); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(row_number); return(STATUS_OK); } @@ -1538,9 +1538,9 @@ border_vert_event_click_right_drag_height_adjustor( _InRef_ P_SKELEVENT_CLICK p_skelevent_click, _InVal_ ROW row_number) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InRef_(p_skelevent_click); - IGNOREPARM_InVal_(row_number); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InRef_(p_skelevent_click); + UNREFERENCED_PARAMETER_InVal_(row_number); return(STATUS_OK); } @@ -1739,7 +1739,7 @@ border_vert_event_drag_movement( T5_MSG_PROTO(static, border_vert_event_redraw, P_SKELEVENT_REDRAW p_skelevent_redraw) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* Fix the width of the vertical ruler to the pixit width */ p_skelevent_redraw->work_skel_rect.br.pixit_point.x = view_border_pixit_size(p_skelevent_redraw->redraw_context.p_view, FALSE); @@ -1779,7 +1779,7 @@ PROC_EVENT_PROTO(extern, edge_window_event_border_vert) trace_0(TRACE_APP_CLICK, TEXT("edge_window_event_border_vert T5_EVENT_CLICK_DRAG_FINISHED")); - if(t5_message == T5_EVENT_CLICK_DRAG_FINISHED) + if(T5_EVENT_CLICK_DRAG_FINISHED == t5_message) { redraw_border = 0; @@ -2035,7 +2035,7 @@ border_vert_redraw( host_fonty_text_paint_uchars_in_framed_box(&p_skelevent_redraw->redraw_context, &row_rect, ustr_numform, ustrlen32(ustr_numform), border_style, fill_wimpcolour, text_wimpcolour, host_font_redraw); else -#endif +#endif /* UNUSED */ host_fonty_text_paint_uchars_in_rectangle( &p_skelevent_redraw->redraw_context, &row_rect, ustr_numform, ustrlen32(ustr_numform), &border_flags, &rgb_fill, p_rgb_line, p_rgb_text, host_font_redraw); } @@ -2733,7 +2733,7 @@ skel_visible_row_range( { ROW_ENTRY row_entry_top, row_entry_bot; - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); row_entry_from_skel_point(p_docu, &row_entry_top, &p_skel_rect->tl, FALSE); row_entry_from_skel_point(p_docu, &row_entry_bot, &p_skel_rect->br, FALSE); @@ -2837,7 +2837,7 @@ MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_bord); T5_MSG_PROTO(static, maeve_services_sk_bord_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -2855,7 +2855,7 @@ T5_MSG_PROTO(static, maeve_services_sk_bord_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_bord) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_choic.c b/t5/ob_skel/sk_choic.c index 6e3fbec..ed12421 100644 --- a/t5/ob_skel/sk_choic.c +++ b/t5/ob_skel/sk_choic.c @@ -85,8 +85,8 @@ do_auto_save_all(void) PROC_EVENT_PROTO(static, scheduled_event_auto_save_all) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); switch(t5_message) { @@ -137,7 +137,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_display_pictures) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.dont_display_pictures != !p_args[0].val.fBool) @@ -153,7 +153,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_embed_inserted_files) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.embed_inserted_files != p_args[0].val.fBool) @@ -169,7 +169,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_kerning) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.disable_kerning != !p_args[0].val.fBool) @@ -189,7 +189,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_dithering) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.disable_dithering != !p_args[0].val.fBool) @@ -209,7 +209,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_status_line) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.disable_status_line != !p_args[0].val.fBool) @@ -225,7 +225,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_toolbar) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.disable_toolbar != !p_args[0].val.fBool) @@ -241,7 +241,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_update_styles_from_choices) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.update_styles_from_choices != p_args[0].val.fBool) @@ -257,7 +257,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_ascii_load_as_delimited) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.ascii_load_as_delimited != p_args[0].val.fBool) @@ -273,7 +273,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_ascii_load_delimiter) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.ascii_load_delimiter != (UCS4) p_args[0].val.s32) @@ -289,7 +289,7 @@ T5_CMD_PROTO(extern, t5_cmd_choices_ascii_load_as_paragraphs) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(p_docu == p_docu_from_config()); if(global_preferences.ascii_load_as_paragraphs != p_args[0].val.fBool) @@ -576,6 +576,7 @@ choices_save_object_id( STATUS status; OF_OP_FORMAT of_op_format = OF_OP_FORMAT_INIT; ARRAY_HANDLE array_handle = 0; + U32 initial_elements = 0; /* choices files should not be loadable directly */ status_return(ownform_initialise_save(p_docu_config, &of_op_format, &array_handle, NULL, FILETYPE_ASCII, NULL)); @@ -583,14 +584,23 @@ choices_save_object_id( /* firstly save any options that might also get saved in a normal document */ zero_struct(of_op_format.of_template); - if(OBJECT_ID_SKEL == object_id) /* saves handling another case in the big switch */ - status = skel_msg_choices_save(&of_op_format); - else - status = object_call_id(object_id, p_docu_config, T5_MSG_CHOICES_SAVE, &of_op_format); + of_op_format.of_template.version = 1; + status = skel_save_version(&of_op_format); + + if(status_ok(status)) + { + initial_elements = array_elements32(&array_handle); + + if(OBJECT_ID_SKEL == object_id) /* saves handling another case in the big switch */ + status = skel_msg_choices_save(&of_op_format); + else + status = object_call_id(object_id, p_docu_config, T5_MSG_CHOICES_SAVE, &of_op_format); + } status = ownform_finalise_save(&p_docu_config, &of_op_format, status); - if((status_ok(status)) && (array_elements32(&array_handle) != 0)) + /* try saving object's choices iff object added to the file data */ + if((status_ok(status)) && (initial_elements != array_elements32(&array_handle))) { TCHARZ filename[BUF_MAX_PATHSTRING]; @@ -1179,7 +1189,7 @@ dialog_choices_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_choices) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1205,8 +1215,8 @@ T5_CMD_PROTO(extern, t5_cmd_choices) CHOICES_MAIN_CALLBACK choices_main_callback; STATUS status; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); choices_query_block.ctl_create = 0; diff --git a/t5/ob_skel/sk_cmd.c b/t5/ob_skel/sk_cmd.c index 0a1a013..7e5de91 100644 --- a/t5/ob_skel/sk_cmd.c +++ b/t5/ob_skel/sk_cmd.c @@ -576,9 +576,9 @@ command_record( return(status); } #else - IGNOREPARM_InVal_(arglist_handle); - IGNOREPARM_InVal_(object_id); - IGNOREPARM_InRef_(p_construct_table); + UNREFERENCED_PARAMETER_InVal_(arglist_handle); + UNREFERENCED_PARAMETER_InVal_(object_id); + UNREFERENCED_PARAMETER_InRef_(p_construct_table); #endif return(STATUS_OK); @@ -1612,14 +1612,14 @@ T5_CMD_PROTO(extern, t5_cmd_current_document) { /*DOCU_NAME docu_name;*/ - IGNOREPARM(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /*docu_name.leaf_name = p_args[0].val.tstr;*/ /*docu_name.path_name = NULL;*/ - /* IGNOREPARM(docu_name); <<< */ + /* UNREFERENCED_PARAMETER(docu_name); <<< */ return(STATUS_OK); } @@ -1628,7 +1628,7 @@ T5_CMD_PROTO(extern, t5_cmd_current_position) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 4); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_docu->cur.slr.col = p_args[0].val.col; p_docu->cur.slr.row = p_args[1].val.row; @@ -1736,7 +1736,7 @@ t5_cmd_set_interactive(void) T5_CMD_PROTO(extern, t5_cmd_undefine_key) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_t5_cmd->interactive) { diff --git a/t5/ob_skel/sk_cont.c b/t5/ob_skel/sk_cont.c index 53203d9..99780da 100644 --- a/t5/ob_skel/sk_cont.c +++ b/t5/ob_skel/sk_cont.c @@ -312,7 +312,7 @@ sk_cont_msg_docu__title( MAEVE_EVENT_PROTO(static, maeve_event_sk_cont) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -410,7 +410,7 @@ skel_controls_msg_init2( T5_MSG_PROTO(static, maeve_services_sk_cont_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -434,7 +434,7 @@ T5_MSG_PROTO(static, maeve_services_sk_cont_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_cont) { - IGNOREPARM_InVal_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InVal_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_docno.c b/t5/ob_skel/sk_docno.c index 669791e..c0987e0 100644 --- a/t5/ob_skel/sk_docno.c +++ b/t5/ob_skel/sk_docno.c @@ -811,7 +811,7 @@ sk_docno_msg_docu_rename( MAEVE_EVENT_PROTO(static, maeve_event_sk_docno) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -851,7 +851,7 @@ sk_docno_msg_init1( T5_MSG_PROTO(static, maeve_services_sk_docno_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -872,7 +872,7 @@ T5_MSG_PROTO(static, maeve_services_sk_docno_msg_initclose, _InRef_ PC_MSG_INITC MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_docno) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_draft.c b/t5/ob_skel/sk_draft.c index 4d588a8..8594a95 100644 --- a/t5/ob_skel/sk_draft.c +++ b/t5/ob_skel/sk_draft.c @@ -523,7 +523,7 @@ print_document_draft_to_file( T5_MSG_PROTO(extern, t5_msg_draft_print_to_file, P_DRAFT_PRINT_TO_FILE p_draft_print_to_file) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(print_document_draft_to_file(p_docu, p_draft_print_to_file->p_print_ctrl, p_draft_print_to_file->filename)); } @@ -683,7 +683,7 @@ T5_MSG_PROTO(extern, t5_msg_draft_print, P_PRINT_CTRL p_print_ctrl) WimpMessage msg; PRINTING printing; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); printing.p_docu = p_docu; printing.p_print_ctrl = p_print_ctrl; @@ -737,7 +737,7 @@ T5_MSG_PROTO(extern, t5_msg_draft_print, P_PRINT_CTRL p_print_ctrl) { PCTSTR temp_filename = TEXT("c:\\temp\\draftout.txt"); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { DRAFT_PRINT_TO_FILE draft_print_to_file; diff --git a/t5/ob_skel/sk_find.c b/t5/ob_skel/sk_find.c index 512b437..06753c6 100644 --- a/t5/ob_skel/sk_find.c +++ b/t5/ob_skel/sk_find.c @@ -48,7 +48,7 @@ sk_find_msg_close1( T5_MSG_PROTO(static, maeve_services_sk_find_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -65,7 +65,7 @@ T5_MSG_PROTO(static, maeve_services_sk_find_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_find) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -485,7 +485,7 @@ T5_CMD_PROTO(extern, t5_cmd_search_do) S32 n_replaced = 0; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 == n_arglist_args(&h_arglist)) { /* next match (no arguments given) */ @@ -745,8 +745,8 @@ T5_CMD_PROTO(extern, t5_cmd_search_intro) QUICK_UBLOCK_WITH_BUFFER(quick_ublock, 100); quick_ublock_with_buffer_setup(quick_ublock); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* encode initial state of control(s) */ search_intro_from_top_data.push_xx.def_pushbutton = 0; diff --git a/t5/ob_skel/sk_hefod.c b/t5/ob_skel/sk_hefod.c index b007a43..f242e2b 100644 --- a/t5/ob_skel/sk_hefod.c +++ b/t5/ob_skel/sk_hefod.c @@ -821,8 +821,8 @@ T5_CMD_PROTO(extern, t5_cmd_insert_page_break) P_PAGE_HEFO_BREAK p_page_hefo_break; STATUS status; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* ensure thing at this exact row */ if(NULL == (p_page_hefo_break = p_page_hefo_break_from_row_exact(p_docu, row))) @@ -867,7 +867,7 @@ sk_hefod_msg_init1( T5_MSG_PROTO(static, maeve_services_sk_hefod_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -886,7 +886,7 @@ T5_MSG_PROTO(static, maeve_services_sk_hefod_msg_initclose, _InRef_ PC_MSG_INITC MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_hefod); MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_hefod) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_load.c b/t5/ob_skel/sk_load.c index 068027e..3a1c7fd 100644 --- a/t5/ob_skel/sk_load.c +++ b/t5/ob_skel/sk_load.c @@ -306,7 +306,7 @@ t5_cmd_version( const PC_ARGLIST_HANDLE p_arglist_handle = &p_construct_convert->arglist_handle; PC_ARGLIST_ARG p_arg; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); /* ignore most of the supplied information */ @@ -518,7 +518,7 @@ skeleton_load_inline( STATUS status = STATUS_OK; const IL_CODE il_code = (IL_CODE) p_construct_convert->p_construct->t5_message; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); p_construct_convert->object_array_handle_uchars_inline = 0; @@ -1436,7 +1436,7 @@ t5_cmd_of_rowtable( /* SKS 03feb96 defer execution to end of data */ const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_construct_convert->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); p_construct_convert->p_of_ip_format->flags.virtual_row_table = p_args[0].val.fBool; @@ -1451,7 +1451,7 @@ t5_cmd_of_base_single_col( { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_construct_convert->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_args[0].val.fBool) p_construct_convert->p_of_ip_format->flags.incoming_base_single_col = 1; diff --git a/t5/ob_skel/sk_mark.c b/t5/ob_skel/sk_mark.c index 1aad6ce..f738976 100644 --- a/t5/ob_skel/sk_mark.c +++ b/t5/ob_skel/sk_mark.c @@ -54,8 +54,8 @@ sk_mark_msg_selection_clear( MAEVE_EVENT_PROTO(static, maeve_event_sk_mark) { - IGNOREPARM(p_data); - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER(p_data); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -99,7 +99,7 @@ sk_mark_msg_close1( T5_MSG_PROTO(static, maeve_services_sk_mark_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -116,7 +116,7 @@ T5_MSG_PROTO(static, maeve_services_sk_mark_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_mark) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -355,10 +355,11 @@ markers_show( RECT_FLAGS rect_flags; REDRAW_FLAGS redraw_flags; + RECT_FLAGS_CLEAR(rect_flags); + REDRAW_FLAGS_CLEAR(redraw_flags); redraw_flags.show_selection = TRUE; - RECT_FLAGS_CLEAR(rect_flags); view_update_now(p_docu, UPDATE_PANE_CELLS_AREA, &skel_rect_all, rect_flags, redraw_flags, LAYER_CELLS); trace_4(TRACE_APP_SKEL_DRAW, diff --git a/t5/ob_skel/sk_menu.c b/t5/ob_skel/sk_menu.c index 115cd32..d2249f0 100644 --- a/t5/ob_skel/sk_menu.c +++ b/t5/ob_skel/sk_menu.c @@ -366,7 +366,7 @@ sk_menu_msg_init1( #if defined(MENU_SAVE_ENABLED) return(maeve_event_handler_add(p_docu, maeve_event_sk_menu, (CLIENT_HANDLE) 0)); #else - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); return(STATUS_OK); #endif /* MENU_SAVE_ENABLED */ } @@ -427,8 +427,8 @@ maeve_services_sk_menu_msg_initclose( MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_menu); MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_menu) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -649,7 +649,7 @@ T5_CMD_PROTO(extern, t5_cmd_menu_delete) PCTSTR tstr_entry_text; P_MENU_ROOT p_menu_root; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, ARG_MENU_DELETE_ENTRY)) tstr_entry_text = p_args[ARG_MENU_DELETE_ENTRY].val.tstr; @@ -726,7 +726,7 @@ T5_CMD_PROTO(extern, t5_cmd_menu_name) PCTSTR tstr_entry_text = p_args[ARG_MENU_NAME_ENTRY].val.tstr; P_MENU_ROOT p_menu_root; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(search_for_root(p_docu, tstr_menu_name, &p_menu_root)) tstr_xstrkpy(p_menu_root->name, elemof32(p_menu_root->name), tstr_entry_text); diff --git a/t5/ob_skel/sk_null.c b/t5/ob_skel/sk_null.c index 839e7b4..b08ca7c 100644 --- a/t5/ob_skel/sk_null.c +++ b/t5/ob_skel/sk_null.c @@ -559,8 +559,8 @@ sk_null_msg_exit2(void) T5_MSG_PROTO(static, maeve_services_sk_null_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -577,7 +577,7 @@ T5_MSG_PROTO(static, maeve_services_sk_null_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_null) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_print.c b/t5/ob_skel/sk_print.c index 6aa7570..dd6c271 100644 --- a/t5/ob_skel/sk_print.c +++ b/t5/ob_skel/sk_print.c @@ -759,7 +759,7 @@ PROC_DIALOG_EVENT_PROTO(static, dialog_event_print_intro) return(dialog_print_intro_ctl_pushbutton((P_DIALOG_MSG_CTL_PUSHBUTTON) p_data)); default: - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); break; } @@ -1201,7 +1201,7 @@ sk_print_msg_save( MAEVE_EVENT_PROTO(static, maeve_event_sk_print) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1272,7 +1272,7 @@ maeve_services_sk_print_msg_initclose( MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_print) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -1299,7 +1299,7 @@ T5_CMD_PROTO(extern, t5_cmd_print_intro) PRINT_CALLBACK print_callback; S32 completion_code; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); print_callback.extra = extra; @@ -1399,7 +1399,7 @@ T5_CMD_PROTO(extern, t5_cmd_print) print_ctrl.flags.landscape = 0; print_ctrl.flags.two_up = 0; - IGNOREPARM_InVal_(t5_message); /* we use arglist to decide on print action */ + UNREFERENCED_PARAMETER_InVal_(t5_message); /* we use arglist to decide on print action */ if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { @@ -1581,7 +1581,7 @@ T5_CMD_PROTO(extern, t5_cmd_paper) const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, ARG_PAPER_N_ARGS); P_PHYS_PAGE_DEF p_phys_page_def = &p_docu->phys_page_def; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, ARG_PAPER_LOADED_ID) && (p_args[ARG_PAPER_LOADED_ID].val.s32 > 0)) { @@ -1652,7 +1652,7 @@ T5_CMD_PROTO(extern, t5_cmd_paper_scale) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, ARG_PAPER_SCALE_VALUE)) p_docu->paper_scale = p_args[ARG_PAPER_SCALE_VALUE].val.s32; @@ -1698,7 +1698,7 @@ print_quality_save( T5_CMD_PROTO(extern, t5_cmd_print_quality) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_docu->flags.draft_mode = 0; diff --git a/t5/ob_skel/sk_prost.c b/t5/ob_skel/sk_prost.c index 21ad4fc..2d4c65e 100644 --- a/t5/ob_skel/sk_prost.c +++ b/t5/ob_skel/sk_prost.c @@ -279,7 +279,7 @@ dialog_process_status_reflect( PROC_DIALOG_EVENT_PROTO(static, dialog_event_process_status_reflect); PROC_DIALOG_EVENT_PROTO(static, dialog_event_process_status_reflect) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(t5_message) { @@ -829,7 +829,7 @@ sk_prost_msg_close1( T5_MSG_PROTO(static, maeve_services_sk_prost_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -843,7 +843,7 @@ T5_MSG_PROTO(static, maeve_services_sk_prost_msg_initclose, _InRef_ PC_MSG_INITC MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_prost) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_root.c b/t5/ob_skel/sk_root.c index ee1ef4e..a3d812a 100644 --- a/t5/ob_skel/sk_root.c +++ b/t5/ob_skel/sk_root.c @@ -29,11 +29,11 @@ internal functions #if defined(UNUSED) || 0 T5_CMD_PROTO(static, t5_cmd_test); -#endif +#endif /* UNUSED */ T5_MSG_PROTO(static, skel_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -97,7 +97,7 @@ T5_CMD_PROTO(static, t5_cmd_auto_save) { S32 auto_save_period_minutes = 0; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { @@ -114,8 +114,8 @@ T5_CMD_PROTO(static, t5_cmd_trace) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); #if TRACE_ALLOWED if(p_args[0].val.s32) @@ -123,7 +123,7 @@ T5_CMD_PROTO(static, t5_cmd_trace) else trace_off(); #else - IGNOREPARM_CONST(p_args); + UNREFERENCED_PARAMETER_CONST(p_args); #endif return(STATUS_OK); @@ -147,7 +147,7 @@ T5_MSG_PROTO(static, t5_msg_skelcmd_view_destroy, P_SKELCMD_CLOSE_VIEW p_skelcmd { DOCNO docno = docno_from_p_docu(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); view_destroy(p_docu, p_skelcmd_close_view->p_view); @@ -172,8 +172,8 @@ create_error_from_tstr( T5_MSG_PROTO(static, skel_error_get, _InoutRef_ P_MSG_ERROR_RQ p_msg_error_rq) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(CH_NULL == error_from_tstr_buffer[0]) { /* no error to be returned */ @@ -204,7 +204,7 @@ T5_CMD_PROTO(static, t5_cmd_numform_data) P_NUMFORM_CONTEXT p_numform_context = p_docu->p_numform_context; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_numform_context) { @@ -310,7 +310,7 @@ T5_CMD_PROTO(static, t5_cmd_numform_load) P_USTR ustr_numform_arg_opt = NULL; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, 1)) status = alloc_block_ustr_set(&ustr_numform_arg, p_args[1].val.ustr, &p_docu->general_string_alloc_block); @@ -339,8 +339,8 @@ T5_CMD_PROTO(static, t5_cmd_ss_context) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 10); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); g_ss_recog_context_alt.thousands_char = PtrGetByte(p_args[0].val.ustr); g_ss_recog_context_alt.decimal_point_char = PtrGetByte(p_args[1].val.ustr); @@ -363,7 +363,7 @@ T5_MSG_PROTO(static, t5_msg_insert_ownform, P_MSG_INSERT_OWNFORM p_msg_insert_ow OF_IP_FORMAT of_ip_format = OF_IP_FORMAT_INIT; STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_insert_ownform->t5_filetype) { @@ -409,8 +409,8 @@ T5_MSG_PROTO(static, t5_msg_load_ended, P_OF_IP_FORMAT p_of_ip_format) { ARRAY_INDEX i; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* throw away renamed style info */ for(i = 0; i < array_elements(&p_of_ip_format->renamed_styles); ++i) @@ -431,8 +431,8 @@ T5_CMD_PROTO(static, t5_cmd_object_ensure) const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); const OBJECT_ID object_id = p_args[0].val.object_id; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(object_load(object_id)); } @@ -442,7 +442,7 @@ T5_CMD_PROTO(static, t5_cmd_selection_make) const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, ARG_DOCU_AREA_N_ARGS); DOCU_AREA docu_area; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); docu_area_init(&docu_area); @@ -474,9 +474,9 @@ T5_CMD_PROTO(static, t5_cmd_selection_make) T5_CMD_PROTO(static, t5_cmd_nyi) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(create_error(ERR_NYI)); } @@ -961,7 +961,7 @@ OBJECT_PROTO(extern, object_skel) #if defined(UNUSED) || 0 case T5_CMD_TEST: return(t5_cmd_test(p_docu, t5_message, (PC_T5_CMD) p_data)); -#endif +#endif /* UNUSED */ } } @@ -1240,9 +1240,9 @@ status_check(void) T5_CMD_PROTO(static, t5_cmd_test) { STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(status); } diff --git a/t5/ob_skel/sk_save.c b/t5/ob_skel/sk_save.c index 7e94d2f..b53fa54 100644 --- a/t5/ob_skel/sk_save.c +++ b/t5/ob_skel/sk_save.c @@ -53,11 +53,6 @@ save_rowtable( _DocuRef_ P_DOCU p_docu, _InoutRef_ P_OF_OP_FORMAT p_of_op_format); -_Check_return_ -static STATUS -save_version( - _InoutRef_ P_OF_OP_FORMAT p_of_op_format); - PROC_EVENT_PROTO(static, scheduled_event_auto_save); _Check_return_ @@ -117,7 +112,7 @@ do_auto_save( PROC_EVENT_PROTO(static, scheduled_event_auto_save) { - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER(p_data); switch(t5_message) { @@ -167,6 +162,7 @@ save_base_single_col( { STATUS status = STATUS_OK; + if(p_docu->flags.base_single_col) /* only bother saving non-default value (i.e. non-zero) */ /*if(p_of_op_format->of_template.data_class >= DATA_SAVE_CHARACTER)*/ { const OBJECT_ID object_id = OBJECT_ID_SKEL; @@ -790,7 +786,7 @@ save_pre_save_1( _DocuRef_ P_DOCU p_docu, _InoutRef_ P_OF_OP_FORMAT p_of_op_format) { - status_return(save_version(p_of_op_format)); + status_return(skel_save_version(p_of_op_format)); status_return(save_base_single_col(p_docu, p_of_op_format)); @@ -902,8 +898,8 @@ save_cell( } _Check_return_ -static STATUS -save_version( +extern STATUS +skel_save_version( _InoutRef_ P_OF_OP_FORMAT p_of_op_format) { STATUS status = STATUS_OK; @@ -1377,8 +1373,8 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_clipboard) PCTSTR filename = p_args[0].val.tstr; ARRAY_HANDLE h_local_clip_data = local_clip_data_query(); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(clip_data_save(filename, &h_local_clip_data)); } @@ -1412,7 +1408,7 @@ sk_save_msg_save( MAEVE_EVENT_PROTO(static, maeve_event_sk_save) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1430,7 +1426,7 @@ exported services hook T5_MSG_PROTO(static, sk_save_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1448,7 +1444,7 @@ T5_MSG_PROTO(static, sk_save_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initc MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_save) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_styl.c b/t5/ob_skel/sk_styl.c index f0d0e57..06fcffc 100644 --- a/t5/ob_skel/sk_styl.c +++ b/t5/ob_skel/sk_styl.c @@ -1355,8 +1355,8 @@ style_docu_area_add_internal( style.para_style.rgb_grid_left = style.para_style.rgb_grid_top = style.para_style.rgb_grid_right = - style.para_style.rgb_grid_bottom = rgb_stash[15]; /* pale blue */ - style.para_style.grid_left = SF_BORDER_STANDARD; + style.para_style.rgb_grid_bottom = rgb_stash[1]; /* light grey */ + style.para_style.grid_left = SF_BORDER_NONE; style.para_style.grid_top = style.para_style.grid_right = style.para_style.grid_bottom = style.para_style.grid_left; /* add this as base region */ @@ -1901,7 +1901,7 @@ style_docu_area_uref_hold( P_STYLE_DOCU_AREA p_style_docu_area = array_range(p_h_style_docu_area, STYLE_DOCU_AREA, 0, n_regions); REGION region_slr; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); region_from_two_slrs(®ion_slr, p_slr, p_slr, TRUE); @@ -3075,7 +3075,7 @@ style_handle_use_find( { ARRAY_INDEX style_docu_area_ix, style_docu_area_ix_out = -1; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); profile_ensure_frame(); @@ -3276,7 +3276,7 @@ style_docu_colrow( ARRAY_INDEX array_index = -1; T5_MESSAGE t5_message = T5_EXT_STYLE_CELL_CURRENT; - IGNOREPARM_InRef_(p_slr_old); + UNREFERENCED_PARAMETER_InRef_(p_slr_old); if(NULL != (p_style_docu_area = style_docu_area_enum_implied(p_docu, &array_index, OBJECT_ID_IMPLIED_STYLE, &t5_message, NULL))) docu_area_from_slr(&p_style_docu_area->docu_area, &p_docu->cur.slr); @@ -3374,7 +3374,7 @@ MAEVE_EVENT_PROTO(static, maeve_event_style) { const STATUS status = STATUS_OK; - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -3983,7 +3983,7 @@ sk_styl_msg_close1( T5_MSG_PROTO(static, maeve_services_sk_styl_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -4003,7 +4003,7 @@ T5_MSG_PROTO(static, maeve_services_sk_styl_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_sk_styl) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/sk_stylc.c b/t5/ob_skel/sk_stylc.c index e6c8403..6abf74f 100644 --- a/t5/ob_skel/sk_stylc.c +++ b/t5/ob_skel/sk_stylc.c @@ -424,8 +424,8 @@ PROC_STYLE_DATA_FROM_INLINE_PROTO(proc_style_ps_tab_list_data_from_inline) SC_ARRAY_INIT_BLOCK tab_init_block = aib_init(1, sizeof32(TAB_INFO), TRUE); P_TAB_INFO p_tab_info; - IGNOREPARM_CONST(p_docu); - IGNOREPARM_CONST(p_style_encoding); + UNREFERENCED_PARAMETER_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_style_encoding); if(NULL != (p_tab_info = al_array_alloc(&p_style->para_style.h_tab_list, TAB_INFO, list_elements, &tab_init_block, &status))) { @@ -443,7 +443,7 @@ PROC_STYLE_INLINE_FROM_DATA_PROTO(proc_style_ps_tab_list_inline_from_data) { STATUS status; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); status = inline_quick_ublock_from_data(p_quick_ublock, p_style_encoding->inline_id, @@ -459,7 +459,7 @@ PROC_STYLE_DATA_FROM_INLINE_PROTO(proc_style_numform_data_from_inline) STATUS status; P_ARRAY_HANDLE_USTR p_array_handle_ustr = PtrAddBytes(P_ARRAY_HANDLE_USTR, p_style, p_style_encoding->member_offset); - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); status = al_ustr_set(p_array_handle_ustr, inline_data_ptr(PC_USTR, ustr_inline)); @@ -471,7 +471,7 @@ PROC_STYLE_INLINE_FROM_DATA_PROTO(proc_style_numform_inline_from_data) STATUS status; PC_ARRAY_HANDLE_USTR p_array_handle_ustr = PtrAddBytes(PC_ARRAY_HANDLE_USTR, p_style, p_style_encoding->member_offset); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(IL_TYPE_USTR == p_style_encoding->inline_data_type); @@ -489,7 +489,7 @@ PROC_STYLE_DATA_FROM_INLINE_PROTO(proc_style_app_font_name_data_from_inline) PC_USTR ustr = inline_data_ptr(PC_USTR, ustr_inline); PCTSTR tstr = _tstr_from_ustr(ustr); - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); *p_array_handle_tstr = 0; @@ -506,7 +506,7 @@ PROC_STYLE_DATA_FROM_INLINE_PROTO(proc_style_tstr_data_from_inline) PC_USTR ustr = inline_data_ptr(PC_USTR, ustr_inline); PCTSTR tstr = _tstr_from_ustr(ustr); - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); *p_array_handle_tstr = 0; @@ -522,7 +522,7 @@ PROC_STYLE_INLINE_FROM_DATA_PROTO(proc_style_tstr_inline_from_data) PC_ARRAY_HANDLE_TSTR p_array_handle_tstr = PtrAddBytes(PC_ARRAY_HANDLE_TSTR, p_style, p_style_encoding->member_offset); PC_USTR ustr = array_elements(p_array_handle_tstr) ? _ustr_from_tstr(array_tstr(p_array_handle_tstr)) : ustr_empty_string; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); assert(IL_TYPE_USTR == p_style_encoding->inline_data_type); @@ -541,7 +541,7 @@ PROC_STYLE_INLINE_FROM_DATA_PROTO(proc_style_tstr_inline_from_data) PROC_STYLE_COMPARE_NEQ_PROTO(proc_style_ps_tab_list_compare_neq) { - IGNOREPARM_InRef_(p_style_encoding); + UNREFERENCED_PARAMETER_InRef_(p_style_encoding); if(p_style_1->para_style.h_tab_list == p_style_2->para_style.h_tab_list) return(FALSE); @@ -576,7 +576,7 @@ PROC_STYLE_COMPARE_NEQ_PROTO(proc_style_colour_compare_neq) PROC_STYLE_COMPARE_NEQ_PROTO(proc_style_line_space_compare_neq) { - IGNOREPARM_InRef_(p_style_encoding); + UNREFERENCED_PARAMETER_InRef_(p_style_encoding); return(!(p_style_1->para_style.line_space.type == p_style_2->para_style.line_space.type && p_style_1->para_style.line_space.leading == p_style_2->para_style.line_space.leading)); @@ -1034,7 +1034,7 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_font_name) PC_ARRAY_HANDLE p_array_handle = (PC_ARRAY_HANDLE) p_member; STATUS status = STATUS_OK; - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); if(status_ok(status = quick_ublock_a7char_add(p_quick_ublock, CH_SPACE))) { @@ -1059,7 +1059,7 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_justify) PC_U8 p_arg = (PC_U8) p_member; STATUS message_no; - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); switch(p_arg[0]) { @@ -1098,7 +1098,7 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_justify_v) PC_U8 p_arg = (P_U8) p_member; STATUS message_no; - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); switch(p_arg[0]) { @@ -1128,9 +1128,9 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_justify_v) PROC_STYLE_TEXT_PROTO(proc_style_text_none) { - IGNOREPARM_CONST(p_docu); - IGNOREPARM_InoutRef_(p_quick_ublock); - IGNOREPARM_InRef_(p_member); + UNREFERENCED_PARAMETER_CONST(p_docu); + UNREFERENCED_PARAMETER_InoutRef_(p_quick_ublock); + UNREFERENCED_PARAMETER_InRef_(p_member); return(STATUS_OK); } @@ -1145,7 +1145,7 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_on_off) { PC_U8 p_arg = (PC_U8) p_member; - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); /* read text */ return(resource_lookup_quick_ublock(p_quick_ublock, *p_arg ? MSG_STYLE_TEXT_ON : MSG_STYLE_TEXT_OFF)); @@ -1161,7 +1161,7 @@ PROC_STYLE_TEXT_PROTO(proc_style_text_points) { PC_PIXIT p_pixit = (PC_PIXIT) p_member; - IGNOREPARM_CONST(p_docu); + UNREFERENCED_PARAMETER_CONST(p_docu); return(quick_ublock_printf(p_quick_ublock, USTR_TEXT(" " S32_FMT), (S32) *p_pixit / PIXITS_PER_POINT)); } diff --git a/t5/ob_skel/sk_stylg.c b/t5/ob_skel/sk_stylg.c index ba1a12f..9c76da6 100644 --- a/t5/ob_skel/sk_stylg.c +++ b/t5/ob_skel/sk_stylg.c @@ -297,28 +297,31 @@ style_grid_from_grid_slot_h( if(p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].rgb_level < p_grid_slot_mm->grid_element[IX_GRID_TOP].rgb_level) p_grid_line_style->rgb = p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].rgb; - if(grid_flags.faint_grid && p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE) + if(grid_flags.faint_grid && (p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE)) { p_grid_line_style->border_line_flags.border_style = SF_BORDER_THIN; assert(p_grid_line_style->border_line_flags.border_style < SF_BORDER_COUNT); - p_grid_line_style->rgb = rgb_stash[COLOUR_OF_FAINT_GRID]; level = S32_MAX; } else + { p_grid_line_style->border_line_flags.add_lw_to_r = 1; + } - if((p_grid_slot_lt->grid_element[IX_GRID_RIGHT].level < level && - p_grid_slot_lt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE) + if( ((p_grid_slot_lt->grid_element[IX_GRID_RIGHT].level < level) && + (p_grid_slot_lt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE)) || - (p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].level < level && - p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE) + ((p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].level < level) && + (p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE)) || - (p_grid_slot_mt->grid_element[IX_GRID_LEFT].level < level && - p_grid_slot_mt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE) + ((p_grid_slot_mt->grid_element[IX_GRID_LEFT].level < level) && + (p_grid_slot_mt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE)) || - (p_grid_slot_lm->grid_element[IX_GRID_TOP].level < level && - p_grid_slot_lm->grid_element[IX_GRID_TOP].type != SF_BORDER_NONE)) + ((p_grid_slot_lm->grid_element[IX_GRID_TOP].level < level) && + (p_grid_slot_lm->grid_element[IX_GRID_TOP].type != SF_BORDER_NONE)) ) + { p_grid_line_style->border_line_flags.add_lw_to_l = 1; + } } else { @@ -342,22 +345,25 @@ style_grid_from_grid_slot_h( if(p_grid_slot_mb->grid_element[IX_GRID_TOP].rgb_level < p_grid_slot_mm->grid_element[IX_GRID_BOTTOM].rgb_level) p_grid_line_style->rgb = p_grid_slot_mb->grid_element[IX_GRID_TOP].rgb; - if(grid_flags.faint_grid && p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE) + if(grid_flags.faint_grid && (p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE)) { p_grid_line_style->border_line_flags.border_style = SF_BORDER_THIN; assert(p_grid_line_style->border_line_flags.border_style < SF_BORDER_COUNT); - p_grid_line_style->rgb = rgb_stash[COLOUR_OF_FAINT_GRID]; level = S32_MAX; } else + { p_grid_line_style->border_line_flags.add_lw_to_r = 1; + } - if((p_grid_slot_lm->grid_element[IX_GRID_RIGHT].level < level && - p_grid_slot_lm->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE) + if( ((p_grid_slot_lm->grid_element[IX_GRID_RIGHT].level < level) && + (p_grid_slot_lm->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE)) || - (p_grid_slot_lm->grid_element[IX_GRID_BOTTOM].level < level && - p_grid_slot_lm->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE)) + ((p_grid_slot_lm->grid_element[IX_GRID_BOTTOM].level < level) && + (p_grid_slot_lm->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE)) ) + { p_grid_line_style->border_line_flags.add_lw_to_l = 1; + } } } @@ -396,28 +402,31 @@ style_grid_from_grid_slot_v( if(p_grid_slot_lm->grid_element[IX_GRID_RIGHT].rgb_level < p_grid_slot_mm->grid_element[IX_GRID_LEFT].rgb_level) p_grid_line_style->rgb = p_grid_slot_lm->grid_element[IX_GRID_RIGHT].rgb; - if(grid_flags.faint_grid && p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE) + if(grid_flags.faint_grid && (p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE)) { p_grid_line_style->border_line_flags.border_style = SF_BORDER_THIN; - p_grid_line_style->rgb = rgb_stash[COLOUR_OF_FAINT_GRID]; level = S32_MAX; } else + { p_grid_line_style->border_line_flags.add_lw_to_b = 1; + } /* check if any of the grid lines that meet at this point have higher priority */ - if((p_grid_slot_lt->grid_element[IX_GRID_RIGHT].level < level && - p_grid_slot_lt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE) + if( ((p_grid_slot_lt->grid_element[IX_GRID_RIGHT].level < level) && + (p_grid_slot_lt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE)) || - (p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].level < level && - p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE) + ((p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].level < level) && + (p_grid_slot_lt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE)) || - (p_grid_slot_mt->grid_element[IX_GRID_LEFT].level < level && - p_grid_slot_mt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE) + ((p_grid_slot_mt->grid_element[IX_GRID_LEFT].level < level) && + (p_grid_slot_mt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE)) || - (p_grid_slot_lm->grid_element[IX_GRID_TOP].level < level && - p_grid_slot_lm->grid_element[IX_GRID_TOP].type != SF_BORDER_NONE)) + ((p_grid_slot_lm->grid_element[IX_GRID_TOP].level < level) && + (p_grid_slot_lm->grid_element[IX_GRID_TOP].type != SF_BORDER_NONE)) ) + { p_grid_line_style->border_line_flags.add_lw_to_t = 1; + } } else { @@ -439,24 +448,27 @@ style_grid_from_grid_slot_v( if(p_grid_slot_rm->grid_element[IX_GRID_LEFT].rgb_level < p_grid_slot_mm->grid_element[IX_GRID_RIGHT].rgb_level) p_grid_line_style->rgb = p_grid_slot_rm->grid_element[IX_GRID_LEFT].rgb; - if(grid_flags.faint_grid && p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE) + if(grid_flags.faint_grid && (p_grid_line_style->border_line_flags.border_style == SF_BORDER_NONE)) { p_grid_line_style->border_line_flags.border_style = SF_BORDER_THIN; - p_grid_line_style->rgb = rgb_stash[COLOUR_OF_FAINT_GRID]; level = S32_MAX; } else + { p_grid_line_style->border_line_flags.add_lw_to_b = 1; + } - if((p_grid_slot_mt->grid_element[IX_GRID_RIGHT].level < level && - p_grid_slot_mt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE) + if( ((p_grid_slot_mt->grid_element[IX_GRID_RIGHT].level < level) && + (p_grid_slot_mt->grid_element[IX_GRID_RIGHT].type != SF_BORDER_NONE)) || - (p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].level < level && - p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE) + ((p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].level < level) && + (p_grid_slot_mt->grid_element[IX_GRID_BOTTOM].type != SF_BORDER_NONE)) || - (p_grid_slot_rt->grid_element[IX_GRID_LEFT].level < level && - p_grid_slot_rt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE)) + ((p_grid_slot_rt->grid_element[IX_GRID_LEFT].level < level) && + (p_grid_slot_rt->grid_element[IX_GRID_LEFT].type != SF_BORDER_NONE)) ) + { p_grid_line_style->border_line_flags.add_lw_to_t = 1; + } } } diff --git a/t5/ob_skel/sk_table.c b/t5/ob_skel/sk_table.c index 8c9a6ae..34f44c2 100644 --- a/t5/ob_skel/sk_table.c +++ b/t5/ob_skel/sk_table.c @@ -710,7 +710,7 @@ object_construct_table[] = { "RowHeight", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_RS_HEIGHT, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "RowHeightFix", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_RS_HEIGHT_FIXED, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "RowUnbreakable", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_RS_UNBREAKABLE, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, - { "RowName", args_ustr_mandorblk, (T5_MESSAGE) IL_STYLE_RS_ROW_NAME, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "RowName", args_ustr_mandorblk, (T5_MESSAGE) IL_STYLE_RS_ROW_NAME, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "MarginLeft", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_PS_MARGIN_LEFT, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "MarginRight", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_PS_MARGIN_RIGHT, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, @@ -718,7 +718,7 @@ object_construct_table[] = { "Tablist", args_ustr_mandorblk, (T5_MESSAGE) IL_STYLE_PS_TAB_LIST, { 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0 } }, { "Background", args_rgb, (T5_MESSAGE) IL_STYLE_PS_RGB_BACK, { 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0 } }, { "ParaStart", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_PS_PARA_START, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, - { "ParaEnd", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_PS_PARA_END, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "ParaEnd", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_PS_PARA_END, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "LineSpace", args_s32_s32, (T5_MESSAGE) IL_STYLE_PS_LINE_SPACE, { 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0 } }, { "Justify", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_JUSTIFY, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "JustifyV", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_JUSTIFY_V, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, @@ -739,7 +739,7 @@ object_construct_table[] = { "GridRight", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_GRID_RIGHT, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "GridBottom", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_GRID_BOTTOM, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, - { "Protect", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_PROTECT, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } }, + { "Protect", args_u8n_mandatory, (T5_MESSAGE) IL_STYLE_PS_PROTECT, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "Typeface", args_ustr_mandorblk, (T5_MESSAGE) IL_STYLE_FS_NAME, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, { "Fontx", args_s32_mandatory, (T5_MESSAGE) IL_STYLE_FS_SIZE_X, { 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0 } }, diff --git a/t5/ob_skel/sk_uref.c b/t5/ob_skel/sk_uref.c index 5dab68b..954393c 100644 --- a/t5/ob_skel/sk_uref.c +++ b/t5/ob_skel/sk_uref.c @@ -367,7 +367,7 @@ uref_event_after_msg_close2( /* for all loaded thunks, garbage collect and free uref tables if possible */ DOCNO docno = DOCNO_NONE; - IGNOREPARM_DocuRef_(closing_p_docu); + UNREFERENCED_PARAMETER_DocuRef_(closing_p_docu); while(DOCNO_NONE != (docno = docno_enum_thunks(docno))) { diff --git a/t5/ob_skel/t5_glue.c b/t5/ob_skel/t5_glue.c index d596329..f8e0120 100644 --- a/t5/ob_skel/t5_glue.c +++ b/t5/ob_skel/t5_glue.c @@ -219,7 +219,7 @@ extern P_PROC_OBJECT t5_glued_object( _InVal_ OBJECT_ID object_id) { - IGNOREPARM_InVal_(object_id); /* there are times when this is really never used */ + UNREFERENCED_PARAMETER_InVal_(object_id); /* there are times when this is really never used */ switch(object_id) { diff --git a/t5/ob_skel/ui_data.c b/t5/ob_skel/ui_data.c index 273845f..92d0353 100644 --- a/t5/ob_skel/ui_data.c +++ b/t5/ob_skel/ui_data.c @@ -354,7 +354,7 @@ ui_bytes_per_item( { P_UI_DATA dummy = NULL; /* keep compilers happy */ - IGNOREPARM(dummy); /* keep dataflower happy */ + UNREFERENCED_PARAMETER(dummy); /* keep dataflower happy */ switch(ui_data_type) { @@ -595,7 +595,7 @@ ui_data_n_items_query( _InVal_ UI_DATA_TYPE ui_data_type, _InRef_ PC_UI_SOURCE p_ui_source) { - IGNOREPARM_InVal_(ui_data_type); + UNREFERENCED_PARAMETER_InVal_(ui_data_type); switch(p_ui_source->type) { diff --git a/t5/ob_skel/ui_field.c b/t5/ob_skel/ui_field.c index 9a5d84b..0f72021 100644 --- a/t5/ob_skel/ui_field.c +++ b/t5/ob_skel/ui_field.c @@ -193,7 +193,7 @@ insert_field_intro_setup_entry_date( NUMFORM_PARMS numform_parms; STATUS status; - IGNOREPARM(p_setup_data); + UNREFERENCED_PARAMETER(p_setup_data); zero_struct(ev_data); zero_struct(numform_parms); @@ -385,7 +385,7 @@ _InRef_ PC_DIALOG_MSG_PROCESS_END p_dialog_msg_process_end) PROC_DIALOG_EVENT_PROTO(static, dialog_event_insert_field_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -511,7 +511,7 @@ T5_CMD_PROTO(extern, t5_cmd_insert_field_intro_date) insert_field_intro_callback.dead_only = FALSE; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* strictly speaking we should enquire as to whether this is possible */ if(OBJECT_ID_REC_FLOW == p_docu->object_id_flow) @@ -678,7 +678,7 @@ T5_CMD_PROTO(extern, t5_cmd_insert_field_intro_page) insert_field_intro_callback.dead_only = FALSE; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* strictly speaking we should enquire as to whether this is possible */ if(OBJECT_ID_REC_FLOW == p_docu->object_id_flow) diff --git a/t5/ob_skel/ui_misc.c b/t5/ob_skel/ui_misc.c index d899e7e..c701677 100644 --- a/t5/ob_skel/ui_misc.c +++ b/t5/ob_skel/ui_misc.c @@ -284,7 +284,7 @@ dialog_info_preprocess_command( PROC_DIALOG_EVENT_PROTO(static, dialog_event_info) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_skel/ui_page.c b/t5/ob_skel/ui_page.c index 87b316d..413cf4d 100644 --- a/t5/ob_skel/ui_page.c +++ b/t5/ob_skel/ui_page.c @@ -271,8 +271,8 @@ PROC_DIALOG_EVENT_PROTO(static, dialog_event_paper_scale) T5_CMD_PROTO(extern, t5_cmd_paper_scale_intro) { DIALOG_CMD_PROCESS_DBOX dialog_cmd_process_dbox; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); dialog_cmd_process_dbox_setup(&dialog_cmd_process_dbox, paper_scale_ctl_create, elemof32(paper_scale_ctl_create), MSG_DIALOG_PAPER_SCALE_HELP_TOPIC); /*dialog_cmd_process_dbox.caption.type = UI_TEXT_TYPE_RESID;*/ dialog_cmd_process_dbox.caption.text.resource_id = MSG_DIALOG_PAPER_SCALE_CAPTION; @@ -1109,7 +1109,7 @@ paper_precreate( { static UCHARZ paper_units_numform_ustr_buf[7]; /* must fit "0.,###" higher precision */ - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); resource_lookup_ustr_buffer(ustr_bptr(paper_grid_size_numform_ustr_buf), elemof32(paper_grid_size_numform_ustr_buf), MSG_NUMFORM_2_DP); @@ -1597,7 +1597,7 @@ dialog_paper_intro_ctl_pushbutton( PROC_DIALOG_EVENT_PROTO(static, dialog_event_paper_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1626,8 +1626,8 @@ PROC_DIALOG_EVENT_PROTO(static, dialog_event_paper_intro) T5_CMD_PROTO(extern, t5_cmd_paper_intro) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); paper_name_data.state.type = UI_TEXT_TYPE_USTR_TEMP; paper_name_data.state.text.ustr = ustr_bptr(p_docu->phys_page_def.ustr_name); diff --git a/t5/ob_skel/ui_save.c b/t5/ob_skel/ui_save.c index 37a066e..62d8990 100644 --- a/t5/ob_skel/ui_save.c +++ b/t5/ob_skel/ui_save.c @@ -212,8 +212,8 @@ ui_save_msg_exit2(void) T5_MSG_PROTO(static, maeve_services_ui_save_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -230,7 +230,7 @@ T5_MSG_PROTO(static, maeve_services_ui_save_msg_initclose, _InRef_ PC_MSG_INITCL MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ui_save) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -248,8 +248,8 @@ T5_CMD_PROTO(extern, t5_cmd_object_bind_saver) INSTALLED_SAVE_OBJECT installed_save_object; SC_ARRAY_INIT_BLOCK array_init_block = aib_init(1, sizeof32(installed_save_object), FALSE); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); zero_struct(installed_save_object); installed_save_object.object_id = p_args[0].val.object_id; @@ -545,7 +545,7 @@ dialog_save_common_ctl_fill_source( { const P_SAVE_CALLBACK p_save_callback = (P_SAVE_CALLBACK) p_dialog_msg_ctl_fill_source->client_handle; - IGNOREPARM_CONST(p_save_callback); + UNREFERENCED_PARAMETER_CONST(p_save_callback); switch(p_dialog_msg_ctl_fill_source->dialog_control_id) { @@ -1025,8 +1025,8 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_ownform) QUICK_TBLOCK_WITH_BUFFER(quick_tblock, 64); quick_tblock_with_buffer_setup(quick_tblock); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(status_ok(status = name_make_wholename(&p_docu->docu_name, &quick_tblock, TRUE))) { @@ -1181,7 +1181,7 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_ownform_as) SAVE_CALLBACK save_callback; PCTSTR filename; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); t5_cmd_save_as_common_init(p_docu, &save_callback); @@ -1523,7 +1523,7 @@ t5_cmd_save_foreign_common_init( p_ui_source = &save_foreign_statics.ui_source; } #else - IGNOREPARM_InVal_(intro); + UNREFERENCED_PARAMETER_InVal_(intro); #endif return(save_foreign_create_filemap(p_save_callback, p_ui_text, p_ui_source)); @@ -1535,8 +1535,8 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_foreign_intro) STATUS status; BOOL name_set = FALSE; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* create a list of filetypes and textual representations thereof from the loaded objects */ status_return(t5_cmd_save_foreign_common_init(p_docu, &save_callback, TRUE)); @@ -1615,7 +1615,7 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_foreign) STATUS status; PCTSTR filename; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(t5_cmd_save_foreign_common_init(p_docu, &save_callback, FALSE)); @@ -1683,8 +1683,8 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_picture_intro) STATUS status; BOOL name_set; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); zero_struct(save_callback); @@ -1872,8 +1872,8 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_template_intro) ARRAY_HANDLE save_template_style_list_handle; PIXIT max_width; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); t5_cmd_save_template_common_init(p_docu, &save_callback); @@ -1932,7 +1932,7 @@ T5_CMD_PROTO(static, ccba_wrapped_t5_cmd_save_template) SAVE_CALLBACK save_callback; PCTSTR filename; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); t5_cmd_save_template_common_init(p_docu, &save_callback); @@ -1961,7 +1961,7 @@ static T5_FILETYPE which_t5_filetype( _DocuRef_ P_DOCU p_docu) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(g_product_id) { @@ -2103,7 +2103,7 @@ SaveFileHook( { const HWND hwnd = GetParent(hdlg); /* *This* is the 'Save As' window handle */ - IGNOREPARM(wParam); + UNREFERENCED_PARAMETER(wParam); switch(uiMsg) { @@ -2414,12 +2414,12 @@ save_template_locate( if(NULL != (e = WrapOsErrorChecking(_kernel_swi(OS_FSControl, &rs, &rs)))) return(file_error_set(e->errmess)); #else - IGNOREPARM(p_save_callback); + UNREFERENCED_PARAMETER(p_save_callback); #endif tstr_xstrkpy(g_dirname_buffer, g_elemof_dirname_buffer, filename); - IGNOREPARM(cur_p_docu); + UNREFERENCED_PARAMETER(cur_p_docu); return(status); } diff --git a/t5/ob_skel/vi_cmd.c b/t5/ob_skel/vi_cmd.c index a4f12ad..83e96da 100644 --- a/t5/ob_skel/vi_cmd.c +++ b/t5/ob_skel/vi_cmd.c @@ -116,7 +116,7 @@ T5_CMD_PROTO(extern, t5_cmd_current_pane) const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); const P_VIEW p_view = p_view_from_viewno_caret(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!IS_VIEW_NONE(p_view)) p_view->cur_pane = ENUM_PACK(PANE_ID, p_args[0].val.s32); @@ -136,7 +136,7 @@ T5_CMD_PROTO(extern, t5_cmd_current_view) VIEWNO viewno = (VIEWNO) p_args[0].val.s32; P_VIEW p_view = p_view_from_viewno(p_docu, viewno); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(!IS_VIEW_NONE(p_view)) p_view = p_view_from_viewno_caret(p_docu); @@ -315,7 +315,7 @@ view_return_extid( _DocuRef_ PC_DOCU p_docu, _ViewRef_ PC_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); return((S32) viewno_from_p_view_fn(p_view)); } @@ -896,8 +896,8 @@ T5_CMD_PROTO(extern, t5_cmd_view_control_intro) const P_VIEW p_view = p_view_from_viewno_caret(p_docu); VIEW_CONTROL_CALLBACK view_control_callback; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* encode initial state of control(s) */ view_control_callback.zoom_bump_state = muldiv64_ceil(100, p_view->scalet, p_view->scaleb); @@ -928,8 +928,8 @@ T5_CMD_PROTO(extern, t5_cmd_view_control) BOOL set_extent = 0; BOOL redisplay = 0; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); #if 0 /* SKS 20may97 try this out on people... */ if(1/*invent a first time thru on a view*/) @@ -1180,7 +1180,7 @@ T5_CMD_PROTO(extern, t5_cmd_view_create) VIEW_CREATE view_create; P_VIEW p_view; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); view_create.docno = docno_from_p_docu(p_docu); view_create.tl.x = p_args[0].val.s32; @@ -1217,8 +1217,8 @@ T5_CMD_PROTO(extern, t5_cmd_view_new) VIEW_CREATE view_create; P_VIEW p_view; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); view_create.docno = docno_from_p_docu(p_docu); @@ -1295,24 +1295,24 @@ T5_CMD_PROTO(extern, t5_cmd_view_new) T5_CMD_PROTO(extern, t5_cmd_view_size) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(STATUS_OK); } T5_CMD_PROTO(extern, t5_cmd_view_posn) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(STATUS_OK); } T5_CMD_PROTO(extern, t5_cmd_view_maximize) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); host_view_maximize(p_docu, p_view_from_viewno_caret(p_docu)); @@ -1321,8 +1321,8 @@ T5_CMD_PROTO(extern, t5_cmd_view_maximize) T5_CMD_PROTO(extern, t5_cmd_view_minimize) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); host_view_minimize(p_docu, p_view_from_viewno_caret(p_docu)); @@ -1331,16 +1331,16 @@ T5_CMD_PROTO(extern, t5_cmd_view_minimize) T5_CMD_PROTO(extern, t5_cmd_view_scroll) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); return(STATUS_OK); } T5_CMD_PROTO(extern, t5_cmd_view_close_req) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); status_return(maeve_event(p_docu, T5_MSG_CELL_MERGE, P_DATA_NONE)); @@ -1591,7 +1591,7 @@ vi_cmd_msg_save( MAEVE_EVENT_PROTO(static, maeve_event_vi_cmd) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1669,7 +1669,7 @@ vi_cmd_msg_close1( T5_MSG_PROTO(static, maeve_services_vi_cmd_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1686,7 +1686,7 @@ T5_MSG_PROTO(static, maeve_services_vi_cmd_msg_initclose, _InRef_ PC_MSG_INITCLO MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_vi_cmd) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/vi_edge.c b/t5/ob_skel/vi_edge.c index 2af2e7e..6022075 100644 --- a/t5/ob_skel/vi_edge.c +++ b/t5/ob_skel/vi_edge.c @@ -1131,8 +1131,8 @@ vi_edge_msg_startup(void) T5_MSG_PROTO(static, maeve_services_vi_edge_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -1184,7 +1184,7 @@ vi_edge_msg_choice_changed_ui_styles( T5_MSG_PROTO(static, maeve_services_vi_edge_msg_choice_changed, _InRef_ PC_MSG_CHOICE_CHANGED p_msg_choice_changed) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_choice_changed->t5_message) { @@ -1198,7 +1198,7 @@ T5_MSG_PROTO(static, maeve_services_vi_edge_msg_choice_changed, _InRef_ PC_MSG_C MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_vi_edge) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/view.c b/t5/ob_skel/view.c index 512e821..542bd1d 100644 --- a/t5/ob_skel/view.c +++ b/t5/ob_skel/view.c @@ -999,20 +999,20 @@ view_default_event( skelevent_click.click_context = p_viewevent_click->click_context; - if(t5_message == T5_EVENT_FILEINSERT_DOINSERT) + if(T5_EVENT_FILEINSERT_DOINSERT == t5_message) { skelevent_click.data.fileinsert.filename = p_viewevent_click->data.fileinsert.filename; skelevent_click.data.fileinsert.t5_filetype = p_viewevent_click->data.fileinsert.t5_filetype; skelevent_click.data.fileinsert.safesource = p_viewevent_click->data.fileinsert.safesource; } #if WINDOWS && 1 - else if(t5_message == T5_EVENT_POINTER_MOVEMENT) + else if(T5_EVENT_POINTER_MOVEMENT == t5_message) { /* why did I have this as a special case ? */ host_set_pointer_shape(POINTER_DEFAULT); } #endif - else if(t5_message == T5_EVENT_POINTER_ENTERS_WINDOW) + else if(T5_EVENT_POINTER_ENTERS_WINDOW == t5_message) { host_set_pointer_shape(POINTER_DEFAULT); } @@ -1086,7 +1086,7 @@ view_default_event( P_VIEWEVENT_CLICK p_viewevent_click = (P_VIEWEVENT_CLICK) p_data; SKELEVENT_CLICK skelevent_click; - IGNOREPARM_InRef_(p_ctrl_view_skel); + UNREFERENCED_PARAMETER_InRef_(p_ctrl_view_skel); skelevent_click.click_context = p_viewevent_click->click_context; @@ -1630,7 +1630,7 @@ try_calling( _InRef_ PC_REDRAW_TAG_AND_EVENT p_redraw_tag_and_event CHECKING_ONLY_ARG(PCTSTR area)) { - CHECKING_ONLY(IGNOREPARM(area)); + CHECKING_ONLY(UNREFERENCED_PARAMETER(area)); if(p_redraw_tag_and_event->p_proc_event) { @@ -2123,7 +2123,7 @@ view_update_now( #if defined(NOTE_LAYER) && 0 update_now_caller_layer = layer; #else - IGNOREPARM_InVal_(layer); + UNREFERENCED_PARAMETER_InVal_(layer); #endif while(P_VIEW_NONE != (p_view = docu_enum_views(p_docu, &viewno))) @@ -2146,7 +2146,7 @@ view_update_now_single( #if defined(NOTE_LAYER) && 0 update_now_caller_layer = layer; #else - IGNOREPARM_InVal_(layer); + UNREFERENCED_PARAMETER_InVal_(layer); #endif /* do a reverse bacon slicer on skel_rect, to turn pages into view space */ @@ -2177,7 +2177,7 @@ fast_update_common( { SKELEVENT_REDRAW skelevent_redraw; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); skelevent_redraw.flags = p_viewevent_redraw->flags; @@ -2251,7 +2251,7 @@ view_update_fast_start( REDRAW_FLAGS_CLEAR(redraw_flags); - IGNOREPARM_InVal_(layer); + UNREFERENCED_PARAMETER_InVal_(layer); DOCU_ASSERT(p_docu); PTR_ASSERT(p_skel_rect); diff --git a/t5/ob_skel/windows/ho_color.c b/t5/ob_skel/windows/ho_color.c index 1e8d87f..8eaeec6 100644 --- a/t5/ob_skel/windows/ho_color.c +++ b/t5/ob_skel/windows/ho_color.c @@ -243,7 +243,7 @@ host_select_old_palette( _HdcRef_ HDC hdc, _Inout_ HPALETTE * const p_h_palette) { - IGNOREPARM_CONST(hdc); + UNREFERENCED_PARAMETER_CONST(hdc); if(NULL != *p_h_palette) { /*EMPTY*/ } /*SelectPalette(hdc, *p_h_palette, FALSE)*/ *p_h_palette = NULL; diff --git a/t5/ob_skel/windows/ho_dde.c b/t5/ob_skel/windows/ho_dde.c index b15eaac..f2db9ba 100644 --- a/t5/ob_skel/windows/ho_dde.c +++ b/t5/ob_skel/windows/ho_dde.c @@ -236,7 +236,7 @@ host_wm_dde_initiate( ATOM aApplication = LOWORD(lParam); ATOM aTopic = HIWORD(lParam); - IGNOREPARM_InVal_(uiMsg); + UNREFERENCED_PARAMETER_InVal_(uiMsg); if(aApplication == atom_Application || !aApplication) if(aTopic == atom_Topic_System || !aTopic) @@ -262,8 +262,8 @@ host_wm_dde_terminate( { HWND hwnd_sender = (HWND) wParam; - IGNOREPARM_InVal_(uiMsg); - IGNOREPARM_InVal_(lParam); + UNREFERENCED_PARAMETER_InVal_(uiMsg); + UNREFERENCED_PARAMETER_InVal_(lParam); trace_1(TRACE__DDE, TEXT("DDE_TERMINATE (sender=") U32_XTFMT TEXT(")"), (UINT) (UINT_PTR) hwnd_sender); @@ -285,7 +285,7 @@ host_wm_dde_execute( DDEACK ddeack; WORD wStatus; - IGNOREPARM_InVal_(uiMsg); + UNREFERENCED_PARAMETER_InVal_(uiMsg); ddeack.bAppReturnCode = 0; ddeack.reserved = 0; diff --git a/t5/ob_skel/windows/ho_dll.c b/t5/ob_skel/windows/ho_dll.c index 3b51a44..04da334 100644 --- a/t5/ob_skel/windows/ho_dll.c +++ b/t5/ob_skel/windows/ho_dll.c @@ -66,8 +66,8 @@ maeve_services_ho_dll_msg_initclose( MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_dll) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/windows/ho_event.c b/t5/ob_skel/windows/ho_event.c index df67b6a..24a1218 100644 --- a/t5/ob_skel/windows/ho_event.c +++ b/t5/ob_skel/windows/ho_event.c @@ -138,7 +138,7 @@ pause_for_thought( FALSE /*bWaitAll*/, dwMilliseconds, QS_ALLINPUT /*dwWakeMask*/); - IGNOREPARM(dword); + UNREFERENCED_PARAMETER(dword); /*reportf(TEXT("MsgWaitForMultipleObjects returns %u"), dword);*/ } diff --git a/t5/ob_skel/windows/ho_menu.c b/t5/ob_skel/windows/ho_menu.c index 9a8ef82..7932659 100644 --- a/t5/ob_skel/windows/ho_menu.c +++ b/t5/ob_skel/windows/ho_menu.c @@ -105,7 +105,7 @@ ho_create_docu_menus( SC_ARRAY_INIT_BLOCK array_init_block = aib_init(1, sizeof32(*p_ho_menu_desc), 1); const P_DOCU p_docu_config = p_docu_from_config_wr(); /* SKS 21jan95 */ - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(p_docu_config->ho_menu_data) return(status); @@ -162,7 +162,7 @@ ho_menu_popup( STATUS status = STATUS_FAIL; const PC_DOCU p_docu_config = p_docu_from_config(); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(array_index_is_valid(&p_docu_config->ho_menu_data, menu_root)) { @@ -202,8 +202,8 @@ ho_get_menu_bar( _ViewRef_ P_VIEW p_view) { const PC_DOCU p_docu_config = p_docu_from_config(); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_ViewRef_(p_view); return(array_ptr(&p_docu_config->ho_menu_data, HO_MENU_DESC, MENU_ROOT_DOCU)->hmenu); } @@ -353,7 +353,7 @@ ho_execute_menu_command( } } - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); return(FALSE); } @@ -510,7 +510,7 @@ host_onInitMenu( const MENU_ROOT_ID i_max = (MENU_ROOT_ID) array_elements(&p_docu_config->ho_menu_data); MENU_ROOT_ID i; - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); zero_array(disable); diff --git a/t5/ob_skel/windows/ho_paint.c b/t5/ob_skel/windows/ho_paint.c index 72a072e..a9432c2 100644 --- a/t5/ob_skel/windows/ho_paint.c +++ b/t5/ob_skel/windows/ho_paint.c @@ -1273,8 +1273,8 @@ host_invert_rectangle_filled( const HDC hdc = p_redraw_context->windows.paintstruct.hdc; RECT rect; - IGNOREPARM_InRef_(p_fore); - IGNOREPARM_InRef_(p_back); + UNREFERENCED_PARAMETER_InRef_(p_fore); + UNREFERENCED_PARAMETER_InRef_(p_back); if(!status_done(RECT_limited_from_pixit_rect_and_context(&rect, p_pixit_rect, p_redraw_context))) return; @@ -1293,8 +1293,8 @@ host_invert_rectangle_outline( RECT rect; RECT r; - IGNOREPARM_InRef_(p_fore); - IGNOREPARM_InRef_(p_back); + UNREFERENCED_PARAMETER_InRef_(p_fore); + UNREFERENCED_PARAMETER_InRef_(p_back); if(!status_done(RECT_limited_from_pixit_rect_and_context(&rect, p_pixit_rect, p_redraw_context))) return; @@ -2038,7 +2038,7 @@ host_paint_drawfile( Draw_SetColourMapping(host_dithering ? DRAW_COLOURDITHER : DRAW_COLOURNEAREST, (COLORREF) 0); assert(!eor_paths); /* XOR no longer works with GDI+ */ - IGNOREPARM_InVal_(eor_paths); + UNREFERENCED_PARAMETER_InVal_(eor_paths); if(!p_redraw_context->flags.metafile) { @@ -2443,7 +2443,7 @@ fonty_text_paint_simple_wchars( if(p_redraw_context->flags.drawfile) { pixit_point.y += drawfile_fonty_paint_calc_shift_y(p_font_context); - IGNOREPARM_InRef_(p_rgb_back); + UNREFERENCED_PARAMETER_InRef_(p_rgb_back); // <<< drawfile_paint_uchars(p_redraw_context, &pixit_point, uchars, uchars_n, p_rgb_back, p_font_context); return; } diff --git a/t5/ob_skel/windows/ho_print.c b/t5/ob_skel/windows/ho_print.c index 7b79c7c..22b7ac6 100644 --- a/t5/ob_skel/windows/ho_print.c +++ b/t5/ob_skel/windows/ho_print.c @@ -170,8 +170,8 @@ AbortProc( _HdcRef_ HDC hPr, _In_ int Code) { - IGNOREPARM_InRef_(hPr); - IGNOREPARM(Code); + UNREFERENCED_PARAMETER_InRef_(hPr); + UNREFERENCED_PARAMETER(Code); if(hAbortDlgWnd) /* abort dialog up yet? */ { @@ -197,8 +197,8 @@ AbortDlg( _In_ WPARAM wParam, _In_ LPARAM lParam) { - IGNOREPARM(wParam); - IGNOREPARM(lParam); + UNREFERENCED_PARAMETER(wParam); + UNREFERENCED_PARAMETER(lParam); switch(uiMsg) { @@ -693,9 +693,9 @@ T5_CMD_PROTO(extern, t5_cmd_print_setup) PRINTDLG pd = { sizeof32(PRINTDLG) }; BOOL ok; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); zero_struct(pd); @@ -950,8 +950,8 @@ maeve_services_ho_print_msg_from_windows( MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_print) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_skel/windows/ho_win.c b/t5/ob_skel/windows/ho_win.c index b9a3aad..c373b9a 100644 --- a/t5/ob_skel/windows/ho_win.c +++ b/t5/ob_skel/windows/ho_win.c @@ -505,7 +505,7 @@ extern void host_clear_tracking_for_window( _HwndRef_ HWND hwnd) { - IGNOREPARM_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); g_current_track_window = NULL; } @@ -853,7 +853,7 @@ maeve_services_ho_win_msg_initclose( MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_win) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -869,8 +869,8 @@ MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_ho_win) PROC_EVENT_PROTO(static, null_event_ho_win) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); switch(t5_message) { @@ -1016,7 +1016,7 @@ host_view_destroy( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); trace_2(TRACE_WINDOWS_HOST, TEXT("host_view_destroy: called to remove windows from p_view ") PTR_XTFMT TEXT(" from p_docu ") PTR_XTFMT, p_view, p_docu); @@ -1101,7 +1101,7 @@ host_view_query_posn( GDI_RECT gdi_rect; PIXIT_RECT pixit_rect; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); GetWindowRect(p_view->main[WIN_BACK].hwnd, &window_rect); gdi_rect.tl.x = window_rect.left; @@ -1128,7 +1128,7 @@ host_set_extent_this_view( { GDI_POINT pane_extent; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); window_point_from_pixit_point(&pane_extent, &p_view->paneextent, &p_view->host_xform[XFORM_PANE]); @@ -1183,7 +1183,7 @@ host_settitle( _ViewRef_ P_VIEW p_view, _In_z_ PCTSTR p_new_title) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); trace_1(TRACE_WINDOWS_HOST, TEXT("host_settitle: set title string for window: '%s'"), p_new_title); SetWindowText(p_view->main[WIN_BACK].hwnd, p_new_title); } @@ -2532,7 +2532,7 @@ host_open_global_clipboard( HWND hwndClipOwner = NULL; BOOL res; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); trace_2(TRACE_WINDOWS_HOST, TEXT("host_open_global_clipboard(docno=%d, viewno=%d)"), docno_from_p_docu(p_docu), viewno_from_p_view_fn(p_view)); if(!IS_VIEW_NONE(p_view)) @@ -2797,11 +2797,11 @@ host_onButtonUp_dragging( GDI_POINT point; assert(ho_win_state.drag.hwnd == hwnd); - IGNOREPARM_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); GetMessagePosAsClient(ho_win_state.drag.hwnd, &point.x, &point.y); - IGNOREPARM_InVal_(x); - IGNOREPARM_InVal_(y); + UNREFERENCED_PARAMETER_InVal_(x); + UNREFERENCED_PARAMETER_InVal_(y); assert(point.x == x); assert(point.y == y); @@ -3011,7 +3011,7 @@ host_onCommand( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_InVal_(codeNotify); + UNREFERENCED_PARAMETER_InVal_(codeNotify); switch(id) { @@ -3516,7 +3516,7 @@ wndproc_host_onMouseHWheel( } } /*block*/ - IGNOREPARM_HwndRef_(hwnd_in); + UNREFERENCED_PARAMETER_HwndRef_(hwnd_in); return(FALSE); /* allow OS to do emulation */ } @@ -4330,7 +4330,7 @@ static BOOL preprocess_key_event_ESCAPE( _DocuRef_ P_DOCU p_docu_for_key) { - IGNOREPARM_DocuRef_(p_docu_for_key); + UNREFERENCED_PARAMETER_DocuRef_(p_docu_for_key); host_key_buffer_flush(); @@ -4379,7 +4379,7 @@ send_key_to_docu( if(preprocess_key_event_ESCAPE(p_docu)) return(1 /*processed*/); - fn_key = (t5_message != T5_EVENT_NONE); + fn_key = (T5_EVENT_NONE != t5_message); if(!fn_key) { @@ -4528,7 +4528,7 @@ send_mouse_event( VIEWEVENT_CLICK viewevent_click; zero_struct(viewevent_click); - if((t5_message == T5_EVENT_NONE) || (NULL == p_host_event_desc->p_proc_event)) + if((T5_EVENT_NONE == t5_message) || (NULL == p_host_event_desc->p_proc_event)) return; gdi_point.x = x; @@ -4564,13 +4564,13 @@ send_mouse_event( hard_assert(FALSE); /* start a triple click timer if double just broadcast */ - if((t5_message == T5_EVENT_CLICK_LEFT_DOUBLE) || (t5_message == T5_EVENT_CLICK_RIGHT_DOUBLE)) + if((T5_EVENT_CLICK_LEFT_DOUBLE == t5_message) || (T5_EVENT_CLICK_RIGHT_DOUBLE == t5_message)) enable_triple_click(hwnd, x, y); - else if(t5_message != T5_EVENT_POINTER_MOVEMENT) + else if(T5_EVENT_POINTER_MOVEMENT != t5_message) disable_triple_click(); /* if its a drag starting then tell the client about it */ - if(((t5_message == T5_EVENT_CLICK_LEFT_DRAG) || (t5_message == T5_EVENT_CLICK_RIGHT_DRAG)) && (ho_win_state.drag.enabled)) + if(((T5_EVENT_CLICK_LEFT_DRAG == t5_message) || (T5_EVENT_CLICK_RIGHT_DRAG == t5_message)) && (ho_win_state.drag.enabled)) { ho_win_state.drag.start_pixit_point = viewevent_click.view_point.pixit_point; send_mouse_event(p_docu, p_view, T5_EVENT_CLICK_DRAG_STARTED, hwnd, x, y, ctrl_pressed, shift_pressed, event_handler); @@ -4874,7 +4874,7 @@ host_update_all( int index[2], i; HWND hwnd; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(redraw_tag) { @@ -5102,7 +5102,7 @@ host_update_fast_continue( const P_REDRAW_CONTEXT p_redraw_context = &p_viewevent_redraw->redraw_context; const P_VIEW p_view = p_redraw_context->p_view; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); trace_0(TRACE_WINDOWS_HOST, TEXT("host_update_fast_continue: **** EXITING FAST UPDATE ****")); @@ -5135,7 +5135,7 @@ host_update_fast_start( { const P_VIEW p_view = p_view_rect->p_view; - IGNOREPARM_InVal_(redraw_tag); + UNREFERENCED_PARAMETER_InVal_(redraw_tag); zero_struct_ptr(p_viewevent_redraw); @@ -5252,7 +5252,7 @@ host_view_minimize( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); ShowWindow(p_view->main[WIN_BACK].hwnd, SW_MINIMIZE); } @@ -5263,7 +5263,7 @@ host_view_maximize( _DocuRef_ P_DOCU p_docu, _ViewRef_ P_VIEW p_view) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); ShowWindow(p_view->main[WIN_BACK].hwnd, SW_SHOWMAXIMIZED); } diff --git a/t5/ob_skel/windows/splash.c b/t5/ob_skel/windows/splash.c index 9b820f7..e439934 100644 --- a/t5/ob_skel/windows/splash.c +++ b/t5/ob_skel/windows/splash.c @@ -267,10 +267,10 @@ wndproc_splash_onLButtonUp( _InVal_ int y, _InVal_ UINT keyFlags) { - IGNOREPARM_HwndRef_(hwnd); - IGNOREPARM_InVal_(x); - IGNOREPARM_InVal_(y); - IGNOREPARM_InVal_(keyFlags); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_InVal_(x); + UNREFERENCED_PARAMETER_InVal_(y); + UNREFERENCED_PARAMETER_InVal_(keyFlags); splash_window_remove(); } diff --git a/t5/ob_skel/xp_skel.h b/t5/ob_skel/xp_skel.h index 03915ec..5c77108 100644 --- a/t5/ob_skel/xp_skel.h +++ b/t5/ob_skel/xp_skel.h @@ -15,11 +15,11 @@ typedef struct DOCU DOCU, * P_DOCU, ** P_P_DOCU; typedef const DOCU * PC_DOCU; / #if 0 #define _DocuRef_ _InoutRef_ #define _DocuRef_maybenone_ _InoutRef_ -#define IGNOREPARM_DocuRef_(p_docu) IGNOREPARM_InoutRef_(p_docu) +#define UNREFERENCED_PARAMETER_DocuRef_(p_docu) UNREFERENCED_PARAMETER_InoutRef_(p_docu) #else #define _DocuRef_ _Inout_ /*const*/ #define _DocuRef_maybenone_ _Inout_maybenone_ /*const*/ -#define IGNOREPARM_DocuRef_(p_docu) IGNOREPARM_CONST(p_docu) +#define UNREFERENCED_PARAMETER_DocuRef_(p_docu) UNREFERENCED_PARAMETER_CONST(p_docu) #endif typedef U8 DOCNO; @@ -38,11 +38,11 @@ typedef struct VIEW VIEW, * P_VIEW, ** P_P_VIEW; typedef const VIEW * PC_VIEW; / #if 1 #define _ViewRef_ _InoutRef_ #define _ViewRef_maybenone_ _InoutRef_maybenone_ -#define IGNOREPARM_ViewRef_(p_view) IGNOREPARM_InoutRef_(p_view) +#define UNREFERENCED_PARAMETER_ViewRef_(p_view) UNREFERENCED_PARAMETER_InoutRef_(p_view) #else #define _ViewRef_ const #define _ViewRef_maybenone_ const -#define IGNOREPARM_ViewRef_(p_view) IGNOREPARM_CONST(p_view) +#define UNREFERENCED_PARAMETER_ViewRef_(p_view) UNREFERENCED_PARAMETER_CONST(p_view) #endif typedef U32 VIEWNO; /* full version for argument passing without masking */ @@ -2997,7 +2997,6 @@ host_rgb_stash(void); #define COLOUR_OF_BUTTON_IN 2 #define COLOUR_OF_BUTTON_OUT 1 #define COLOUR_OF_DESKTOP 3 -#define COLOUR_OF_FAINT_GRID 1 #define COLOUR_OF_HEFO_LINE 1 #define COLOUR_OF_MARGIN 1 #define COLOUR_OF_PAPER 0 @@ -4791,7 +4790,7 @@ p_arglist_args( _InVal_ U32 n_args) { assert(n_args <= array_elements32(pc_arglist_handle)); /* NB NOT array_index_is_valid(pc_arglist_handle, n_args) */ - IGNOREPARM_InVal_(n_args); + UNREFERENCED_PARAMETER_InVal_(n_args); return(array_range(pc_arglist_handle, ARGLIST_ARG, 0, n_args)); } @@ -4803,7 +4802,7 @@ pc_arglist_args( _InVal_ U32 n_args) { assert(n_args <= array_elements32(pc_arglist_handle)); /* NB NOT array_index_is_valid(pc_arglist_handle, n_args) */ - IGNOREPARM_InVal_(n_args); + UNREFERENCED_PARAMETER_InVal_(n_args); return(array_rangec(pc_arglist_handle, ARGLIST_ARG, 0, n_args)); } @@ -8893,6 +8892,7 @@ p_docu_from_docno_valid( _InVal_ DOCNO docno) { const P_DOCU p_docu = p_docu_from_docno(docno); + CHECKING_ONLY(if(IS_PTR_NULL_OR_NONE(p_docu)) myDebugBreak()); __analysis_assume(p_docu); return(p_docu); } diff --git a/t5/ob_skel/xp_skelr.h b/t5/ob_skel/xp_skelr.h index ee932e7..0318ee2 100644 --- a/t5/ob_skel/xp_skelr.h +++ b/t5/ob_skel/xp_skelr.h @@ -405,6 +405,8 @@ typedef struct WimpWindowInfoMessage } WimpWindowInfoMessage; +extern int g_current_wm_version; + _Check_return_ _Ret_maybenull_ static inline _kernel_oserror * @@ -985,15 +987,14 @@ typedef struct HOST_MODEVAR_CACHE_ENTRY GDI_SIZE gdi_size; /* raw values */ - U8 XEig; - U8 YEig; - U8 Log2BPP; - U8 _spare; + U32 XEig; + U32 YEig; + U32 Log2BPP; U32 XWindLimit; U32 YWindLimit; - ARRAY_HANDLE h_selector; /*RISCOS_MODE_SELECTOR*/ + ARRAY_HANDLE h_mode_selector; /*RISCOS_MODE_SELECTOR*/ } HOST_MODEVAR_CACHE_ENTRY, * P_HOST_MODEVAR_CACHE_ENTRY; typedef const HOST_MODEVAR_CACHE_ENTRY * PC_HOST_MODEVAR_CACHE_ENTRY; diff --git a/t5/ob_skspt/ob_skspt.c b/t5/ob_skspt/ob_skspt.c index 8036fef..2cb081e 100644 --- a/t5/ob_skspt/ob_skspt.c +++ b/t5/ob_skspt/ob_skspt.c @@ -157,7 +157,7 @@ T5_CMD_PROTO(static, t5_cmd_add_cr_intro) { const BOOL add_cols = (t5_message == T5_CMD_ADD_COLS_INTRO); DIALOG_CMD_PROCESS_DBOX dialog_cmd_process_dbox; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(add_cols) dialog_cmd_process_dbox_setup(&dialog_cmd_process_dbox, add_cols_ctl_create, elemof32(add_cols_ctl_create), MSG_DIALOG_ADD_CR_HELP_TOPIC); else @@ -270,8 +270,8 @@ insert_table_ctl_create[] = T5_CMD_PROTO(static, t5_cmd_insert_table_intro) { DIALOG_CMD_PROCESS_DBOX dialog_cmd_process_dbox; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); dialog_cmd_process_dbox_setup(&dialog_cmd_process_dbox, insert_table_ctl_create, elemof32(insert_table_ctl_create), MSG_DIALOG_INSERT_TABLE_HELP_TOPIC); /*dialog_cmd_process_dbox.caption.type = UI_TEXT_TYPE_RESID;*/ dialog_cmd_process_dbox.caption.text.resource_id = MSG_DIALOG_INSERT_TABLE_CAPTION; @@ -442,7 +442,7 @@ table_style_add( T5_MSG_PROTO(static, t5_msg_table_style_add, P_DOCU_AREA p_docu_area) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(table_style_add(p_docu, p_docu_area, 1)); } @@ -454,7 +454,7 @@ T5_CMD_PROTO(static, t5_cmd_insert_table) ROW n_rows_add = 1; COL col_extra = 0; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->flags.base_single_col) col_extra = 1; @@ -763,7 +763,7 @@ dialog_sort_intro_preprocess_command( PROC_DIALOG_EVENT_PROTO(static, dialog_event_sort_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -865,7 +865,7 @@ T5_CMD_PROTO(static, t5_cmd_sort) { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_docu->mark_info_cells.h_markers) { @@ -892,7 +892,7 @@ T5_CMD_PROTO(static, t5_cmd_sort) T5_CMD_PROTO(static, t5_cmd_sort_intro) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(object_present(OBJECT_ID_REC)) { @@ -918,8 +918,8 @@ T5_CMD_PROTO(static, t5_cmd_word_count) SCAN_BLOCK scan_block; OBJECT_WORD_COUNT object_word_count; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(status_done(cells_scan_init(p_docu, &scan_block, SCAN_DOWN, p_docu->mark_info_cells.h_markers ? SCAN_MARKERS : SCAN_WHOLE, NULL, OBJECT_ID_NONE))) { @@ -940,7 +940,7 @@ T5_CMD_PROTO(static, t5_cmd_style_for_config) { STATUS status; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); { const P_DOCU p_docu = p_docu_from_config_wr(); @@ -955,8 +955,8 @@ T5_CMD_PROTO(static, t5_cmd_style_for_config) T5_MSG_PROTO(static, skel_split_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_skspt/ui_remov.c b/t5/ob_skspt/ui_remov.c index 8ece4e6..5c64e60 100644 --- a/t5/ob_skspt/ui_remov.c +++ b/t5/ob_skspt/ui_remov.c @@ -144,7 +144,7 @@ dialog_ui_remove_process_start( PROC_DIALOG_EVENT_PROTO(static, dialog_event_ui_remove) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -167,8 +167,8 @@ T5_CMD_PROTO(extern, t5_cmd_style_region_edit) DOCU_AREA docu_area; P_STYLE_DOCU_AREA p_style_docu_area = NULL; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); /* select starting point */ if(p_docu->mark_info_cells.h_markers) @@ -875,8 +875,8 @@ T5_CMD_PROTO(extern, t5_cmd_box_intro) { RGB rgb = g_box_persistent_state.rgb; DIALOG_CMD_PROCESS_DBOX dialog_cmd_process_dbox; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); dialog_cmd_process_dbox_setup(&dialog_cmd_process_dbox, box_ctl_create, elemof32(box_ctl_create), MSG_DIALOG_BOX_HELP_TOPIC); /*dialog_cmd_process_dbox.caption.type = UI_TEXT_TYPE_RESID;*/ dialog_cmd_process_dbox.caption.text.resource_id = MSG_DIALOG_BOX_CAPTION; @@ -944,7 +944,7 @@ T5_MSG_PROTO(extern, t5_msg_box_apply, P_BOX_APPLY p_box_apply) STYLE_DOCU_AREA_ADD_PARM style_docu_area_add_parm; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); style_init(&style); diff --git a/t5/ob_skspt/ui_styl3.c b/t5/ob_skspt/ui_styl3.c index ef6bb56..53116fe 100644 --- a/t5/ob_skspt/ui_styl3.c +++ b/t5/ob_skspt/ui_styl3.c @@ -543,7 +543,7 @@ tweak_style_ctl_user_redraw( PROC_DIALOG_EVENT_PROTO(extern, dialog_event_tweak_style) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1364,7 +1364,7 @@ fill_using_es_wibble( P_ES_WIBBLE p_es_wibble, P_ES_CALLBACK p_es_callback) { - IGNOREPARM(p_es_callback); + UNREFERENCED_PARAMETER(p_es_callback); switch(p_es_wibble->packed_dialog_control_id) { @@ -2212,7 +2212,7 @@ ui_list_create_style_key( SC_ARRAY_INIT_BLOCK array_init_block = aib_init(8, sizeof32(*p_ui_list_entry_style_key), TRUE); STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); *p_array_handle = 0; diff --git a/t5/ob_skspt/ui_style.c b/t5/ob_skspt/ui_style.c index 116068f..cbeb80f 100644 --- a/t5/ob_skspt/ui_style.c +++ b/t5/ob_skspt/ui_style.c @@ -341,7 +341,7 @@ dialog_style_intro_ctl_state_change( PROC_DIALOG_EVENT_PROTO(static, dialog_event_style_intro) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -365,8 +365,8 @@ T5_CMD_PROTO(extern, t5_cmd_style_intro) BOOL looping_outer; STYLE_INTRO_CALLBACK style_intro_callback; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); assert((style_intro_interlock == MUTEX_AVAILABLE) || (style_intro_interlock == MUTEX_UNAVAILABLE)); @@ -667,7 +667,7 @@ T5_CMD_PROTO(extern, t5_cmd_effects_button) STATUS status; BOOL looping; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { /* specified subdialog? */ @@ -1040,7 +1040,7 @@ dialog_new_style_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_new_style) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1297,8 +1297,8 @@ T5_MSG_PROTO(extern, t5_msg_uistyle_colour_picker, P_MSG_UISTYLE_COLOUR_PICKER p RGB rgb; BOOL res; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); { DIALOG_CMD_CTL_STATE_QUERY dialog_cmd_ctl_state_query; @@ -1341,7 +1341,7 @@ T5_MSG_PROTO(extern, t5_msg_uistyle_style_edit, P_MSG_UISTYLE_STYLE_EDIT p_msg_u { STATUS status; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); es_process_interlock = MUTEX_UNAVAILABLE; diff --git a/t5/ob_spelb/ob_spelb.c b/t5/ob_spelb/ob_spelb.c index 56c2798..91fa314 100644 --- a/t5/ob_spelb/ob_spelb.c +++ b/t5/ob_spelb/ob_spelb.c @@ -162,8 +162,8 @@ choices_spell_ctl_create[] = T5_MSG_PROTO(static, spelb_choices_query, _InoutRef_ P_CHOICES_QUERY_BLOCK p_choices_query_block) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); choices_spell_auto_check_data.init_state = (U8) global_preferences.spell_auto_check; #if 0 @@ -186,7 +186,7 @@ T5_MSG_PROTO(static, spelb_choices_set, P_CHOICES_SET_BLOCK p_choices_set_block) STATUS status; ARGLIST_HANDLE arglist_handle; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = arglist_prepare(&arglist_handle, spelb_args_bool))) { @@ -211,8 +211,8 @@ T5_MSG_PROTO(static, spelb_choices_save, _InoutRef_ P_OF_OP_FORMAT p_of_op_forma PC_CONSTRUCT_TABLE p_construct_table; ARGLIST_HANDLE arglist_handle; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = arglist_prepare_with_construct(&arglist_handle, object_id, T5_CMD_CHOICES_SPELL_AUTO_CHECK, &p_construct_table))) { @@ -239,7 +239,7 @@ T5_CMD_PROTO(static, spelb_choices_spell_auto_check) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.spell_auto_check != p_args[0].val.fBool) { @@ -255,7 +255,7 @@ T5_CMD_PROTO(static, spelb_choices_spell_write_user) STATUS status = STATUS_OK; const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.spell_write_user != p_args[0].val.fBool) { @@ -272,8 +272,8 @@ T5_CMD_PROTO(static, spelb_choices_spell_write_user) T5_MSG_PROTO(static, spelb_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { diff --git a/t5/ob_spell/ob_spell.c b/t5/ob_spell/ob_spell.c index dfa09a8..759f291 100644 --- a/t5/ob_spell/ob_spell.c +++ b/t5/ob_spell/ob_spell.c @@ -170,7 +170,7 @@ spell_msg_close1( T5_MSG_PROTO(static, spell_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -198,8 +198,8 @@ T5_MSG_PROTO(static, spell_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclo T5_MSG_PROTO(static, spell_msg_spell_isupper, _InRef_ PC_S32 p_s32) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_fail(ob_spell_.dictionary[DICTIONARY_USER].status)) return(STATUS_FAIL); @@ -209,8 +209,8 @@ T5_MSG_PROTO(static, spell_msg_spell_isupper, _InRef_ PC_S32 p_s32) T5_MSG_PROTO(static, spell_msg_spell_iswordc, _InRef_ PC_S32 p_s32) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_fail(ob_spell_.dictionary[DICTIONARY_USER].status)) return(STATUS_FAIL); @@ -220,8 +220,8 @@ T5_MSG_PROTO(static, spell_msg_spell_iswordc, _InRef_ PC_S32 p_s32) T5_MSG_PROTO(static, spell_msg_spell_tolower, _InRef_ PC_S32 p_s32) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_fail(ob_spell_.dictionary[DICTIONARY_USER].status)) return(STATUS_FAIL); @@ -231,8 +231,8 @@ T5_MSG_PROTO(static, spell_msg_spell_tolower, _InRef_ PC_S32 p_s32) T5_MSG_PROTO(static, spell_msg_spell_toupper, _InRef_ PC_S32 p_s32) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_fail(ob_spell_.dictionary[DICTIONARY_USER].status)) return(STATUS_FAIL); @@ -242,8 +242,8 @@ T5_MSG_PROTO(static, spell_msg_spell_toupper, _InRef_ PC_S32 p_s32) T5_MSG_PROTO(static, spell_msg_spell_valid1, _InRef_ PC_S32 p_s32) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_fail(ob_spell_.dictionary[DICTIONARY_USER].status)) return(STATUS_FAIL); @@ -307,7 +307,7 @@ T5_MSG_PROTO(static, t5_msg_spell_word_check, _InoutRef_ P_WORD_CHECK p_word_che { STATUS result = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); PTR_ASSERT(p_word_check); @@ -489,8 +489,8 @@ T5_CMD_PROTO(static, t5_cmd_spell_dictionary_add_word) const PC_USTR ustr_word = p_args[0].val.ustr; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if((NULL != ustr_word) && (ustrlen32(ustr_word) >= 2)) { @@ -537,8 +537,8 @@ T5_CMD_PROTO(static, t5_cmd_spell_dictionary_delete_word) const PC_USTR ustr_word = p_args[0].val.ustr; STATUS status = STATUS_OK; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if((NULL != ustr_word) && (ustrlen32(ustr_word) >= 3)) { diff --git a/t5/ob_spell/resource/Dicts/process.sh b/t5/ob_spell/resource/Dicts/process.sh index 938e900..0b8911e 100755 --- a/t5/ob_spell/resource/Dicts/process.sh +++ b/t5/ob_spell/resource/Dicts/process.sh @@ -18,7 +18,7 @@ grep -v "z$" ../CwC_src.txt | cut -f1 > CwCs grep -v "s$" ../CwA_src.txt | cut -f1 > CwAz grep -v "s$" ../CwC_src.txt | cut -f1 > CwCz -SCOWL=/cygdrive/N/coltsoft/trunk/cs-free/SCOWL +SCOWL=/cygdrive/N/coltsoft/$FIREWORKZ_TBT/cs-free/SCOWL # Split the header off awk '{print >out}; /---/{out="wl-GBs"}' out=/dev/null \ $SCOWL/wordlist-strip-70-0-GBs.txt diff --git a/t5/ob_spell/ui_check.c b/t5/ob_spell/ui_check.c index ddb83ea..04cea85 100644 --- a/t5/ob_spell/ui_check.c +++ b/t5/ob_spell/ui_check.c @@ -346,7 +346,7 @@ dialog_check_ctl_state_change( PROC_DIALOG_EVENT_PROTO(static, dialog_event_check) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { diff --git a/t5/ob_ss/link_ev.c b/t5/ob_ss/link_ev.c index 91abea5..bb753ac 100644 --- a/t5/ob_ss/link_ev.c +++ b/t5/ob_ss/link_ev.c @@ -660,8 +660,8 @@ BOOL g_ev_recalc_started = FALSE; PROC_EVENT_PROTO(static, null_event_recalc) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); #if CHECKING switch(t5_message) @@ -671,7 +671,7 @@ PROC_EVENT_PROTO(static, null_event_recalc) case T5_EVENT_NULL: /* null events for recalc come here */ #else - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); { #endif ev_recalc(); diff --git a/t5/ob_ss/ob_ss.c b/t5/ob_ss/ob_ss.c index fda77cf..36d5b66 100644 --- a/t5/ob_ss/ob_ss.c +++ b/t5/ob_ss/ob_ss.c @@ -806,7 +806,7 @@ ob_ss_msg_save( MAEVE_EVENT_PROTO(static, maeve_event_ob_ss) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -1126,7 +1126,7 @@ T5_CMD_PROTO(static, t5_cmd_ss_functions) P_FUNCTION_LIST_ENTRY p_function_list_entry; PIXIT max_width = 0; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); zero_struct(function_list_state); @@ -1746,8 +1746,8 @@ T5_MSG_PROTO(static, ss_function_get_argument_help, _InRef_ P_SS_FUNCTION_ARGUME { PC_USTR message_string = resource_lookup_ustr_no_default(p_ss_function_argument_help->help_id + SS_MSG_BASE); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == message_string) return(STATUS_OK); @@ -1969,7 +1969,7 @@ dialog_alert_ctl_pushbutton(P_DIALOG_MSG_CTL_PUSHBUTTON p_dialog_msg_ctl_pushbut PROC_DIALOG_EVENT_PROTO(static, dialog_event_alert) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -1989,8 +1989,8 @@ T5_MSG_PROTO(static, ss_msg_ss_alert_exec, _InoutRef_ P_SS_INPUT_EXEC p_ss_input { STATUS status; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); alert_result = 0; @@ -2091,7 +2091,7 @@ dialog_event_input_ctl_pushbutton( PROC_DIALOG_EVENT_PROTO(static, dialog_event_input) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -2110,8 +2110,8 @@ PROC_DIALOG_EVENT_PROTO(static, dialog_event_input) T5_MSG_PROTO(static, ss_msg_ss_input_exec, _InoutRef_ P_SS_INPUT_EXEC p_ss_input_exec) { STATUS status; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); input_result = 0; @@ -2144,7 +2144,7 @@ T5_MSG_PROTO(static, ss_msg_ss_input_exec, _InoutRef_ P_SS_INPUT_EXEC p_ss_input T5_MSG_PROTO(static, ss_msg_docu_supporters, _InoutRef_ P_DOCU_DEP_SUP p_docu_dep_sup) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); tree_get_supporting_docs(ev_docno_from_p_docu(p_docu), p_docu_dep_sup); @@ -2153,7 +2153,7 @@ T5_MSG_PROTO(static, ss_msg_docu_supporters, _InoutRef_ P_DOCU_DEP_SUP p_docu_de T5_MSG_PROTO(static, ss_msg_docu_dependents, _InoutRef_ P_DOCU_DEP_SUP p_docu_dep_sup) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); tree_get_dependent_docs(ev_docno_from_p_docu(p_docu), p_docu_dep_sup); @@ -2162,8 +2162,8 @@ T5_MSG_PROTO(static, ss_msg_docu_dependents, _InoutRef_ P_DOCU_DEP_SUP p_docu_de T5_MSG_PROTO(static, ss_msg_object_in_cell_allowed, P_OBJECT_IN_CELL_ALLOWED p_object_in_cell_allowed) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_object_in_cell_allowed->in_cell_allowed = global_preferences.ss_edit_in_cell; @@ -2234,7 +2234,7 @@ ss_text_paste_to_editing_line( T5_CMD_PROTO(static, ss_cmd_insert_operator) { - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); switch(t5_message) { @@ -2287,7 +2287,7 @@ T5_CMD_PROTO(static, ss_cmd_force_recalc) { BOOL all = FALSE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { @@ -2828,8 +2828,8 @@ T5_MSG_PROTO(static, split_ev_call, _InRef_ P_EV_SPLIT_EXEC_DATA p_ev_split_exec { P_PROC_EXEC p_proc_exec = ss_func_table[p_ev_split_exec_data->object_table_index].p_proc_exec; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); (*p_proc_exec) (p_ev_split_exec_data->args, p_ev_split_exec_data->n_args, p_ev_split_exec_data->p_ev_data_res, p_ev_split_exec_data->p_cur_slr); @@ -3028,8 +3028,8 @@ T5_MSG_PROTO(static, ss_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) T5_MSG_PROTO(static, ss_msg_ss_linest, _InoutRef_ P_SS_LINEST p_ss_linest) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(linest(p_ss_linest->p_proc_get, p_ss_linest->p_proc_put, p_ss_linest->client_handle, p_ss_linest->m, p_ss_linest->n)); } @@ -3038,7 +3038,7 @@ T5_MSG_PROTO(static, ss_msg_click_left_double, _InoutRef_ P_OBJECT_DOUBLE_CLICK { const P_EV_SLR p_ev_slr = &p_object_instance_data_SS(p_docu)->ev_slr_double_click; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_object_double_click->data_ref.data_space == DATA_SLOT); @@ -3054,7 +3054,7 @@ T5_MSG_PROTO(static, ss_msg_object_how_big, _InoutRef_ P_OBJECT_HOW_BIG p_object { PIXIT_POINT pixit_point; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_object_how_big->object_data.data_ref.data_space == DATA_SLOT); @@ -3071,7 +3071,7 @@ T5_MSG_PROTO(static, ss_msg_object_how_wide, _InoutRef_ P_OBJECT_HOW_WIDE p_obje { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_object_how_wide->object_data.u.p_object) { @@ -3158,30 +3158,25 @@ ss_event_redraw_show_selection( _DocuRef_ P_DOCU p_docu, _InoutRef_ P_OBJECT_REDRAW p_object_redraw) { - BOOL do_invert = FALSE; + BOOL do_invert; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); - if(!p_object_redraw->flags.show_content) - { - if(p_object_redraw->flags.marked_now != p_object_redraw->flags.marked_screen) - do_invert = TRUE; - } - else + if(p_object_redraw->flags.show_content) do_invert = p_object_redraw->flags.marked_now; + else + do_invert = (p_object_redraw->flags.marked_now != p_object_redraw->flags.marked_screen); if(do_invert) - { host_invert_rectangle_filled(&p_object_redraw->redraw_context, &p_object_redraw->pixit_rect_object, &p_object_redraw->rgb_fore, &p_object_redraw->rgb_back); - } } T5_MSG_PROTO(static, ss_event_redraw, _InoutRef_ P_OBJECT_REDRAW p_object_redraw) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_object_redraw->flags.show_content && (P_DATA_NONE != p_object_redraw->object_data.u.p_object)) ss_event_redraw_show_content(p_docu, p_object_redraw); @@ -3194,8 +3189,8 @@ T5_MSG_PROTO(static, ss_event_redraw, _InoutRef_ P_OBJECT_REDRAW p_object_redraw T5_MSG_PROTO(static, ss_msg_object_compare, _InoutRef_ P_OBJECT_COMPARE p_object_compare) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(p_object_compare->p_object_1 && p_object_compare->p_object_2) { @@ -3215,7 +3210,7 @@ T5_MSG_PROTO(static, ss_msg_object_copy, _InoutRef_ P_OBJECT_COPY p_object_copy) STATUS status = STATUS_OK; P_EV_CELL p_ev_cell_from = p_ev_cell_object_from_slr(p_docu, &p_object_copy->slr_from); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_ev_cell_from) { @@ -3253,8 +3248,8 @@ T5_MSG_PROTO(static, ss_msg_object_copy, _InoutRef_ P_OBJECT_COPY p_object_copy) T5_MSG_PROTO(static, ss_msg_object_data_read, _InoutRef_ P_OBJECT_DATA_READ p_object_data_read) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_object_data_read->object_data.u.p_object) { @@ -3278,7 +3273,7 @@ T5_MSG_PROTO(static, ss_msg_object_read_text, _InoutRef_ P_OBJECT_READ_TEXT p_ob { P_EV_CELL p_ev_cell = p_object_read_text->object_data.u.p_ev_cell; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_ev_cell) { @@ -3456,7 +3451,7 @@ T5_MSG_PROTO(static, ss_msg_load_cell_ownform, _InoutRef_ P_LOAD_CELL_OWNFORM p_ QUICK_UBLOCK_WITH_BUFFER(quick_ublock_formula, 256); quick_ublock_with_buffer_setup(quick_ublock_formula); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* check the data type */ switch(p_load_cell_ownform->data_type) @@ -3547,7 +3542,7 @@ T5_MSG_PROTO(static, ss_msg_save_cell_ownform, _InoutRef_ P_SAVE_CELL_OWNFORM p_ STATUS status = STATUS_OK; const PC_EV_CELL p_ev_cell = p_save_cell_ownform->object_data.u.p_ev_cell; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_ev_cell) { @@ -3619,7 +3614,7 @@ T5_MSG_PROTO(static, ss_msg_load_cell_foreign, _InoutRef_ P_LOAD_CELL_FOREIGN p_ PC_USTR ustr_formula = NULL; BOOL do_mrofmun = TRUE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* check the data type */ switch(p_load_cell_foreign->data_type) @@ -3694,7 +3689,7 @@ T5_MSG_PROTO(static, ss_msg_object_read_text_draft, _InoutRef_ P_OBJECT_READ_TEX { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_object_read_text_draft->object_data.u.p_object) { @@ -3763,7 +3758,7 @@ T5_MSG_PROTO(static, ss_msg_new_object_from_text, _InoutRef_ P_NEW_OBJECT_FROM_T { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_new_object_from_text->data_ref.data_space == DATA_SLOT); @@ -3821,7 +3816,7 @@ T5_MSG_PROTO(static, t5_ext_style_mrofmun, _InoutRef_ P_IMPLIED_STYLE_QUERY p_im { const P_EV_CELL p_ev_cell = p_ev_cell_object_from_slr(p_docu, &p_implied_style_query->position.slr); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_ev_cell) { @@ -3845,7 +3840,7 @@ T5_CMD_PROTO(static, t5_cmd_ss_make_tn) const OBJECT_ID object_id = (t5_message == T5_CMD_SS_MAKE_NUMBER) ? OBJECT_ID_SS : OBJECT_ID_TEXT; ARGLIST_HANDLE arglist_handle; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(status_ok(status = arglist_prepare(&arglist_handle, ss_args_s32))) { @@ -3866,7 +3861,7 @@ T5_CMD_PROTO(static, t5_cmd_replicate) const BOOL up = (T5_CMD_REPLICATE_UP == t5_message); /*const BOOL left = (T5_CMD_REPLICATE_LEFT == t5_message);*/ - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(p_docu->mark_info_cells.h_markers) { @@ -3985,8 +3980,8 @@ T5_CMD_PROTO(static, t5_cmd_auto_sum) { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); if(p_docu->mark_info_cells.h_markers) { @@ -4111,7 +4106,7 @@ T5_CMD_PROTO(static, t5_cmd_new_expression) NEW_OBJECT_FROM_TEXT new_object_from_text; QUICK_UBLOCK quick_ublock; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(0 != n_arglist_args(&p_t5_cmd->arglist_handle)) { @@ -4157,7 +4152,7 @@ T5_MSG_PROTO(static, ss_msg_object_snapshot, _InRef_ P_OBJECT_SNAPSHOT p_object_ STATUS status = STATUS_OK; const P_EV_CELL p_ev_cell = p_object_snapshot->object_data.u.p_ev_cell; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_ev_cell) { @@ -4201,7 +4196,7 @@ T5_CMD_PROTO(static, t5_cmd_ss_name) PC_USTR ustr_description = p_args[2].val.ustr; const EV_DOCNO ev_docno = ev_docno_from_p_docu(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); PTR_ASSERT(p_of_ip_format); @@ -4225,7 +4220,7 @@ T5_MSG_PROTO(static, ss_msg_ss_name_make, _InRef_ P_SS_NAME_MAKE p_ss_name_make) PC_USTR ustr_description = p_ss_name_make->ustr_description; DOCNO docno; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = docno_from_id(p_docu, &docno, ustr_name_id, FALSE /* ensure */))) { @@ -4247,7 +4242,7 @@ T5_MSG_PROTO(static, ss_msg_ss_name_ensure, _InoutRef_ P_SS_NAME_ENSURE p_ss_nam PC_USTR ustr_name_id = p_ss_name_ensure->ustr_name_id; DOCNO docno; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = docno_from_id(p_docu, &docno, ustr_name_id, TRUE /* ensure */))) { @@ -4276,8 +4271,8 @@ T5_MSG_PROTO(static, ss_msg_ss_name_id_from_handle, _InRef_ P_SS_NAME_ID_FROM_HA STATUS status = STATUS_OK; const ARRAY_INDEX name_num = name_def_find(p_ss_name_id_from_handle->ev_handle); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(name_num >= 0) { @@ -4304,8 +4299,8 @@ T5_MSG_PROTO(static, ss_msg_ss_name_read, _InoutRef_ P_SS_NAME_READ p_ss_name_re STATUS status = STATUS_OK; const ARRAY_INDEX name_num = name_def_find(p_ss_name_read->ev_handle); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); ev_data_set_blank(&p_ss_name_read->ev_data); @@ -4347,8 +4342,8 @@ T5_MSG_PROTO(static, ss_msg_ss_name_read, _InoutRef_ P_SS_NAME_READ p_ss_name_re T5_MSG_PROTO(static, ss_msg_choices_query, _InoutRef_ P_CHOICES_QUERY_BLOCK p_choices_query_block) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); choices_ss_calc_auto_data.init_state = (U8) !global_preferences.ss_calc_manual; choices_ss_calc_background_data.init_state = (U8) !global_preferences.ss_calc_foreground; @@ -4373,7 +4368,7 @@ T5_MSG_PROTO(static, ss_msg_choices_set, _InRef_ P_CHOICES_SET_BLOCK p_choices_s { const H_DIALOG h_dialog = p_choices_set_block->h_dialog; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); ss_choice_process(p_docu, h_dialog, CHOICES_SS_ID_CALC_AUTO, T5_CMD_CHOICES_SS_CALC_AUTO); ss_choice_process(p_docu, h_dialog, CHOICES_SS_ID_CALC_BACKGROUND, T5_CMD_CHOICES_SS_CALC_BACKGROUND); @@ -4390,8 +4385,8 @@ T5_MSG_PROTO(static, ss_msg_choices_set, _InRef_ P_CHOICES_SET_BLOCK p_choices_s T5_MSG_PROTO(static, ss_msg_choices_save, _InoutRef_ P_OF_OP_FORMAT p_of_op_format) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(ss_choice_save(T5_CMD_CHOICES_SS_CALC_AUTO, !global_preferences.ss_calc_manual, p_of_op_format)); status_return(ss_choice_save(T5_CMD_CHOICES_SS_CALC_BACKGROUND, !global_preferences.ss_calc_foreground, p_of_op_format)); @@ -4408,7 +4403,7 @@ T5_CMD_PROTO(static, ss_choices_ss_calc_auto) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_calc_manual != !(p_args[0].val.fBool)) { @@ -4425,7 +4420,7 @@ T5_CMD_PROTO(static, ss_choices_ss_calc_background) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_calc_foreground != !(p_args[0].val.fBool)) { @@ -4440,7 +4435,7 @@ T5_CMD_PROTO(static, ss_choices_ss_calc_on_load) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_calc_on_load != p_args[0].val.fBool) { @@ -4455,7 +4450,7 @@ T5_CMD_PROTO(static, ss_choices_ss_calc_additional_rounding) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_calc_additional_rounding != p_args[0].val.fBool) { @@ -4470,7 +4465,7 @@ T5_CMD_PROTO(static, ss_choices_ss_edit_in_cell) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_edit_in_cell != p_args[0].val.fBool) { @@ -4485,7 +4480,7 @@ T5_CMD_PROTO(static, ss_choices_ss_alternate_formula_style) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.ss_alternate_formula_style != p_args[0].val.fBool) { @@ -4500,7 +4495,7 @@ T5_CMD_PROTO(static, ss_choices_chart_update_auto) { const PC_ARGLIST_ARG p_args = pc_arglist_args(&p_t5_cmd->arglist_handle, 1); - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(global_preferences.chart_update_manual != !(p_args[0].val.fBool)) { diff --git a/t5/ob_ss/sle_ss.c b/t5/ob_ss/sle_ss.c index 7ca8be6..b57e480 100644 --- a/t5/ob_ss/sle_ss.c +++ b/t5/ob_ss/sle_ss.c @@ -385,7 +385,7 @@ ob_sle_event_click_filter( MAEVE_SERVICES_EVENT_PROTO(static, maeve_services_ob_sle_click_filter) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -587,7 +587,7 @@ ss_formula_eval_then_msg( T5_CMD_PROTO(static, ss_formula_eval_then_msg_for_message) { - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); switch(t5_message) { @@ -678,7 +678,7 @@ T5_CMD_PROTO(static, sle_key_command) STATUS status = STATUS_OK; BOOL auto_highlight = TRUE; - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); switch(t5_message) { @@ -890,8 +890,8 @@ main events MAEVE_EVENT_PROTO(static, maeve_event_ob_sle) { - IGNOREPARM(p_data); - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER(p_data); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -938,8 +938,8 @@ sle_view_create( #if RISCOS /* we create icon when given a POSN_SET */ - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_ViewRef_(p_view); hwnd = HOST_WND_NONE; #elif WINDOWS U32 packed_id = viewid_pack(p_docu, p_view, EVENT_HANDLER_SLE); @@ -961,7 +961,7 @@ sle_view_destroy( _ViewRef_ P_VIEW p_view) { #if RISCOS && !defined(RISCOS_SLE_ICON) - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); #elif RISCOS && defined(RISCOS_SLE_ICON) if(* (wimp_i *) &p_view->main[WIN_SLE].hwnd != BAD_WIMP_I) void_WrapOsErrorReporting(wimp_dispose_icon(p_view->main[WIN_TOOLBAR].hwnd, (wimp_i *) &p_view->main[WIN_SLE].hwnd)); @@ -1200,7 +1200,7 @@ sle_onDestroy( _ViewRef_ P_VIEW p_view) { assert(p_view->main[WIN_SLE].hwnd == hwnd); - IGNOREPARM_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); p_view->main[WIN_SLE].hwnd = NULL; } @@ -1801,7 +1801,7 @@ sle_search_string( SIZE size; assert(0 == stt); - IGNOREPARM_InVal_(stt); + UNREFERENCED_PARAMETER_InVal_(stt); if(WrapOsBoolChecking(GetTextExtentExPoint(hdc, tstr, end, nMaxExtent, &nFit, NULL /*pDx*/, &size))) { @@ -2136,7 +2136,7 @@ sle_index_compile( vis_selection_stt_index = MIN(len, vis_selection_stt_index); vis_selection_end_index = MIN(len, vis_selection_end_index); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); p_sle_info_block->display.caret_pixits = vis_caret_index * CHAR_WIDTH_PIXITS; @@ -2546,8 +2546,8 @@ sle_drag_editline( p_sle_info_block->left_offset = (control_query.inner_posn.x - p_sle_info_block->display.scroll_offset) /PIXITS_PER_RISCOS; #endif - IGNOREPARM(p_sle_info_block); - IGNOREPARM_InVal_(right); + UNREFERENCED_PARAMETER(p_sle_info_block); + UNREFERENCED_PARAMETER_InVal_(right); return(STATUS_OK); } @@ -2724,8 +2724,8 @@ sle_tool_user_mouse( return(sle_index_compile(p_sle_info_block, TRUE, refresh, FALSE)); #else - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); return(STATUS_OK); #endif } @@ -2744,6 +2744,31 @@ colour_of_sle_back( #if RISCOS && defined(RISCOS_FONTY_SLE) +_Check_return_ +static HOST_FONT +sle_find_font( + const char * name, + U32 x16_size_x, + U32 x16_size_y) +{ + HOST_FONT host_font = HOST_FONT_NONE; + + /* c.f. host_font_find() in Fireworkz */ + _kernel_swi_regs rs; + _kernel_oserror * p_kernel_oserror; + + rs.r[1] = (int) name; + rs.r[2] = x16_size_x; + rs.r[3] = x16_size_y; + rs.r[4] = 0; + rs.r[5] = 0; + + if(NULL == (p_kernel_oserror = (_kernel_swi(/*Font_FindFont*/ 0x040081, &rs, &rs)))) + host_font = (HOST_FONT) rs.r[0]; + + return(host_font); +} + static int riscos_fonty_sle( _InoutRef_ P_FONT_SPEC p_font_spec) @@ -2753,6 +2778,8 @@ riscos_fonty_sle( if(yes_or_no < 0) { + HOST_FONT host_font; + /*U32 size_x = 0;*/ U32 size_y = 12; @@ -2760,30 +2787,28 @@ riscos_fonty_sle( /*U32 x16_size_x = 16 * 0;*/ U32 x16_size_y = 16 * size_y; - /* c.f. host_font_find() in Fireworkz */ - _kernel_swi_regs rs; - _kernel_oserror * p_kernel_oserror; - - rs.r[1] = (int) /*"\\E" "Latin1"*/ "\\F" "DejaVuSans.Mono"; - rs.r[2] = /*x16_size_x ? x16_size_x :*/ x16_size_y; - rs.r[3] = x16_size_y; - rs.r[4] = 0; - rs.r[5] = 0; - yes_or_no = 0; - if(NULL == (p_kernel_oserror = (_kernel_swi(/*Font_FindFont*/ 0x040081, &rs, &rs)))) + /* Only use DejaVuSans.Mono if we have a Unicode Font Manager */ + host_font = sle_find_font("\\F" "DejaVuSans.Mono" "\\E" "UTF8", x16_size_y, x16_size_y); + + if(HOST_FONT_NONE != host_font) { - HOST_FONT host_font = (HOST_FONT) rs.r[0]; + host_font_dispose(&host_font, P_REDRAW_CONTEXT_NONE); - if(status_ok(font_spec_name_alloc(&font_spec, "DejaVuSans.Mono"))) + host_font = sle_find_font( /*"\\E" "Latin1"*/ "\\F" "DejaVuSans.Mono", /*x16_size_x ? x16_size_x :*/ x16_size_y, x16_size_y); + + if(HOST_FONT_NONE != host_font) { - font_spec.size_y = size_y * PIXITS_PER_POINT; + if(status_ok(fontmap_font_spec_from_host_base_name(&font_spec, "DejaVuSans.Mono"))) + { + font_spec.size_y = size_y * PIXITS_PER_POINT; - yes_or_no = 1; - } + yes_or_no = 1; + } - host_font_dispose(&host_font, P_REDRAW_CONTEXT_NONE); + host_font_dispose(&host_font, P_REDRAW_CONTEXT_NONE); + } } } @@ -2833,7 +2858,7 @@ sle_tool_user_redraw( STATUS status = STATUS_OK; PIXIT base_line = 0; - if(0 != p_sle_style->font_spec.h_app_name_tstr) + /*if(0 != p_sle_style->font_spec.h_app_name_tstr)*/ { FONT_SPEC font_spec = p_sle_style->font_spec; @@ -2853,7 +2878,7 @@ sle_tool_user_redraw( pixit_width_of_zero = fonty_chunk.width; ascent = fonty_chunk.ascent; - reportf(TEXT("width of zero=") PIXIT_TFMT TEXT(" in %s ") S32_TFMT, pixit_width_of_zero, array_tstr(&p_sle_style->font_spec.h_app_name_tstr), p_sle_style->font_spec.size_y); + reportf(TEXT("width of zero=") PIXIT_TFMT TEXT(" in %s ") S32_TFMT, pixit_width_of_zero, array_tstr(&font_spec.h_app_name_tstr), font_spec.size_y); reportf(TEXT("ascent=") PIXIT_TFMT, ascent); #if 0 @@ -2862,7 +2887,7 @@ sle_tool_user_redraw( const PIXIT pixits_per_riscos_d_y = PIXITS_PER_RISCOS * p_redraw_context->host_xform.riscos.d_y; pixit_width_of_zero = pixits_per_riscos_d_x * muldiv64_round_floor(pixit_width_of_zero, 1, pixits_per_riscos_d_x); ascent = pixits_per_riscos_d_y * muldiv64_round_floor(ascent, 1, pixits_per_riscos_d_y); - reportf(TEXT("width of zero=") PIXIT_TFMT TEXT(" in %s ") S32_TFMT, pixit_width_of_zero, array_tstr(&p_sle_style->font_spec.h_app_name_tstr), p_sle_style->font_spec.size_y); + reportf(TEXT("width of zero=") PIXIT_TFMT TEXT(" in %s ") S32_TFMT, pixit_width_of_zero, array_tstr(&font_spec.h_app_name_tstr), font_spec.size_y); reportf(TEXT("ascent=") PIXIT_TFMT, ascent); #endif @@ -3075,8 +3100,8 @@ sle_tool_user_redraw( host_invert_rectangle_filled(p_redraw_context, ®ion_box, p_sle_info_block->pseudo_selection ? &rgb_pseudo_invert : &rgb_invert, &rgb_fill); } #else - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM(p_data); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER(p_data); #endif return(STATUS_OK); } @@ -3086,7 +3111,7 @@ T5_MSG_PROTO(static, sle_event_keys, _InRef_ P_SKELEVENT_KEYS p_skelevent_keys) const P_SLE_INSTANCE_DATA p_sle_instance = p_object_instance_data_SLE(p_docu); const P_SLE_INFO_BLOCK p_sle_info_block = &p_sle_instance->ss_editor; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(sle_skip_selection(p_sle_info_block)); @@ -3136,7 +3161,7 @@ sle_msg_close_thunk( T5_MSG_PROTO(static, sle_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -3180,7 +3205,7 @@ sle_msg_choice_changed_ui_styles( T5_MSG_PROTO(static, sle_msg_choice_changed, _InRef_ PC_MSG_CHOICE_CHANGED p_msg_choice_changed) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_choice_changed->t5_message) { @@ -3197,8 +3222,8 @@ T5_MSG_PROTO(static, sle_msg_caret_show_claim, _InRef_ P_CARET_SHOW_CLAIM p_care const P_SLE_INSTANCE_DATA p_sle_instance = p_object_instance_data_SLE(p_docu); const P_SLE_INFO_BLOCK p_sle_info_block = &p_sle_instance->ss_editor; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_caret_show_claim); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_caret_show_claim); sle_display_caret(p_sle_info_block); @@ -3207,8 +3232,8 @@ T5_MSG_PROTO(static, sle_msg_caret_show_claim, _InRef_ P_CARET_SHOW_CLAIM p_care T5_MSG_PROTO(static, sle_msg_docu_focus_query, _InoutRef_ P_DOCU_FOCUS_QUERY p_docu_focus_query) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(docno_ss_edit != DOCNO_NONE) { @@ -3248,7 +3273,7 @@ T5_MSG_PROTO(static, sle_msg_object_keys, _InoutRef_ P_OBJECT_KEYS p_object_keys { T5_PASTE_EDITLINE t5_paste_editline; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_object_keys->p_skelevent_keys->processed = 1; @@ -3265,8 +3290,8 @@ T5_CMD_PROTO(static, sle_cmd_ss_edit_formula) { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); { /* SKS after 1.07 15jul94 check for already editing */ const P_SLE_INSTANCE_DATA p_sle_instance = p_object_instance_data_SLE(p_docu); @@ -3356,8 +3381,8 @@ T5_CMD_PROTO(static, sle_cmd_selection_clear) const P_SLE_INSTANCE_DATA p_sle_instance = p_object_instance_data_SLE(p_docu); const P_SLE_INFO_BLOCK p_sle_info_block = &p_sle_instance->ss_editor; - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); status_return(sle_skip_selection(p_sle_info_block)); diff --git a/t5/ob_ss/ui_name.c b/t5/ob_ss/ui_name.c index 1894e44..146bbac 100644 --- a/t5/ob_ss/ui_name.c +++ b/t5/ob_ss/ui_name.c @@ -611,7 +611,7 @@ T5_CMD_PROTO(extern, t5_cmd_ss_name_intro) SS_NAME_INTRO_CALLBACK ss_name_intro_callback; STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* 0 -> insert name as inline into text */ /* 1 -> Fireworkz variables box */ @@ -885,7 +885,7 @@ dialog_ss_name_edit_process_end( PROC_DIALOG_EVENT_PROTO(static, dialog_event_ss_name_edit) { - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); switch(dialog_message) { @@ -946,8 +946,8 @@ ss_name_add( STATUS status; #if RISCOS - IGNOREPARM_InVal_(h_dialog); - IGNOREPARM_InVal_(dialog_control_id); + UNREFERENCED_PARAMETER_InVal_(h_dialog); + UNREFERENCED_PARAMETER_InVal_(dialog_control_id); #endif ss_name_edit_callback.ui_text_name.type = UI_TEXT_TYPE_NONE; @@ -1044,8 +1044,8 @@ ss_name_edit( STATUS status; #if RISCOS - IGNOREPARM_InVal_(h_dialog); - IGNOREPARM_InVal_(dialog_control_id); + UNREFERENCED_PARAMETER_InVal_(h_dialog); + UNREFERENCED_PARAMETER_InVal_(dialog_control_id); #endif ss_name_edit_callback.ui_text_name.type = UI_TEXT_TYPE_USTR_TEMP; diff --git a/t5/ob_story/ob_story.c b/t5/ob_story/ob_story.c index 8ff3774..18e9f55 100644 --- a/t5/ob_story/ob_story.c +++ b/t5/ob_story/ob_story.c @@ -95,8 +95,8 @@ text_redisplay_from_info( T5_MSG_PROTO(static, story_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -212,7 +212,7 @@ T5_MSG_PROTO(static, story_msg_object_how_big, /**/ P_TEXT_MESSAGE_BLOCK p_text_ const P_OBJECT_HOW_BIG p_object_how_big = (P_OBJECT_HOW_BIG) p_text_message_block->p_data; const P_OBJECT_DATA p_object_data = &p_text_message_block->inline_object.object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_object_data->u.p_object) { @@ -245,7 +245,7 @@ T5_MSG_PROTO(static, story_msg_object_how_wide, /**/ P_TEXT_MESSAGE_BLOCK p_text const P_OBJECT_HOW_WIDE p_object_how_wide = (P_OBJECT_HOW_WIDE) p_text_message_block->p_data; const P_OBJECT_DATA p_object_data = &p_text_message_block->inline_object.object_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_object_data->u.p_object) { @@ -265,7 +265,7 @@ T5_MSG_PROTO(static, story_msg_insert_inline_redisplay, /**/ P_TEXT_MESSAGE_BLOC const P_OBJECT_DATA p_object_data = &p_text_message_block->inline_object.object_data; TEXT_REDISPLAY_INFO text_redisplay_info; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); text_redisplay_info_save(p_docu, &text_redisplay_info, @@ -330,7 +330,7 @@ T5_MSG_PROTO(static, story_msg_delete_inline_redisplay, /**/ P_TEXT_MESSAGE_BLOC TEXT_REDISPLAY_INFO text_redisplay_info; S32 start, end; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); offsets_from_object_data(&start, &end, &p_text_message_block->inline_object.object_data, p_text_message_block->inline_object.inline_len); diff --git a/t5/ob_story/tx_cache.c b/t5/ob_story/tx_cache.c index 77ca6ec..4a36654 100644 --- a/t5/ob_story/tx_cache.c +++ b/t5/ob_story/tx_cache.c @@ -442,7 +442,7 @@ text_cache_msg_style_docu_area_changed( MAEVE_EVENT_PROTO(static, maeve_event_text_cache) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -499,7 +499,7 @@ text_cache_msg_close1( T5_MSG_PROTO(static, maeve_services_tx_cache_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -516,7 +516,7 @@ T5_MSG_PROTO(static, maeve_services_tx_cache_msg_initclose, _InRef_ PC_MSG_INITC MAEVE_SERVICES_EVENT_PROTO(extern, maeve_services_event_tx_cache) { - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { diff --git a/t5/ob_story/tx_form.c b/t5/ob_story/tx_form.c index 86340d9..bf5ba80 100644 --- a/t5/ob_story/tx_form.c +++ b/t5/ob_story/tx_form.c @@ -1009,7 +1009,7 @@ text_from_field_uchars( const U32 len_before = quick_ublock_bytes(p_quick_ublock); const IL_CODE il_code = inline_code(uchars_inline); - CODE_ANALYSIS_ONLY(IGNOREPARM_InVal_(uchars_n)); + CODE_ANALYSIS_ONLY(UNREFERENCED_PARAMETER_InVal_(uchars_n)); CODE_ANALYSIS_ONLY(assert(uchars_n >= inline_bytecount(uchars_inline))); switch(il_code) diff --git a/t5/ob_story/tx_main.c b/t5/ob_story/tx_main.c index 27d98bf..ef3ab57 100644 --- a/t5/ob_story/tx_main.c +++ b/t5/ob_story/tx_main.c @@ -132,7 +132,7 @@ T5_MSG_PROTO(static, text_main_redraw, /**/ P_TEXT_MESSAGE_BLOCK p_text_message_ P_TEXT_CACHE p_text_cache; S32 slot_mark_start_now, slot_mark_end_now, slot_mark_start_screen, slot_mark_end_screen; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /******* set marking flags and start and end indexes *******/ slot_mark_start_now = slot_mark_end_now = slot_mark_start_screen = slot_mark_end_screen = 0; @@ -274,8 +274,8 @@ T5_MSG_PROTO(static, text_main_msg_tab_wanted, /**/ P_TEXT_MESSAGE_BLOCK p_text_ { const P_TAB_WANTED p_tab_wanted = (P_TAB_WANTED) p_text_message_block->p_data; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(array_elements(&p_text_message_block->text_format_info.style_text_global.para_style.h_tab_list)) p_tab_wanted->want_inline_insert = 1; @@ -289,7 +289,7 @@ T5_MSG_PROTO(static, text_main_msg_object_position_from_skel_point, /**/ P_TEXT_ { const P_OBJECT_POSITION_FIND p_object_position_find = (P_OBJECT_POSITION_FIND) p_text_message_block->p_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* must cope with NULL objects */ if( (P_DATA_NONE != p_text_message_block->inline_object.object_data.u.p_object) @@ -326,7 +326,7 @@ T5_MSG_PROTO(static, text_main_msg_skel_point_from_object_position, /**/ P_TEXT_ { const P_OBJECT_POSITION_FIND p_object_position_find = (P_OBJECT_POSITION_FIND) p_text_message_block->p_data; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* must cope with NULL objects */ if( (P_DATA_NONE != p_text_message_block->inline_object.object_data.u.p_object) @@ -443,7 +443,7 @@ T5_MSG_PROTO(static, text_main_msg_object_logical_move, /**/ P_TEXT_MESSAGE_BLOC P_SEGMENT p_segment; SKEL_RECT skel_rect; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE == p_object_logical_move->object_data.u.p_object) return(STATUS_FAIL); @@ -515,7 +515,7 @@ T5_MSG_PROTO(static, text_main_msg_object_read_text_draft, /**/ P_TEXT_MESSAGE_B const P_OBJECT_READ_TEXT_DRAFT p_object_read_text_draft = (P_OBJECT_READ_TEXT_DRAFT) p_text_message_block->p_data; const P_TEXT_CACHE p_text_cache = p_text_cache_from_data_ref(p_docu, &p_text_message_block->text_format_info, &p_text_message_block->inline_object); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_text_cache) return(STATUS_FAIL); @@ -542,8 +542,8 @@ T5_MSG_PROTO(static, text_main_msg_object_position_set, _InoutRef_ P_OBJECT_POSI STATUS status = STATUS_DONE; S32 start, end; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); offsets_from_object_data(&start, &end, p_object_data, !IS_PTR_NONE(p_object_data->u.ustr_inline) ? ustr_inline_strlen(p_object_data->u.ustr_inline) : 0); @@ -645,7 +645,7 @@ T5_MSG_PROTO(static, text_main_msg_object_position_set, _InoutRef_ P_OBJECT_POSI T5_MSG_PROTO(static, text_main_msg_object_word_check, P_OBJECT_DATA p_object_data) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE == p_object_data->u.p_object) return(STATUS_OK); @@ -665,7 +665,7 @@ T5_MSG_PROTO(static, text_main_msg_object_check, P_OBJECT_CHECK p_object_check) S32 start, end; S32 now; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); offsets_from_object_data(&start, &end, &p_object_check->object_data, len); @@ -704,8 +704,8 @@ T5_MSG_PROTO(static, text_main_msg_object_string_search, P_OBJECT_STRING_SEARCH const PC_USTR_INLINE ustr_inline = p_object_string_search->object_data.u.ustr_inline; S32 start, end; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); object_position_init(&p_object_string_search->object_position_found_start); object_position_init(&p_object_string_search->object_position_found_end); @@ -737,7 +737,7 @@ T5_MSG_PROTO(static, text_main_msg_object_read_text, P_OBJECT_READ_TEXT p_object const PC_USTR_INLINE ustr_inline = p_object_read_text->object_data.u.ustr_inline; S32 start, end; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE == ustr_inline) return(STATUS_OK); @@ -768,8 +768,8 @@ T5_MSG_PROTO(static, text_main_cmd_word_count, P_OBJECT_WORD_COUNT p_object_word S32 len = (P_DATA_NONE != p_object_word_count->object_data.u.p_object) ? ustr_inline_strlen(p_object_word_count->object_data.u.ustr_inline) : 0; S32 start, end, offset; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); offsets_from_object_data(&start, &end, &p_object_word_count->object_data, len); @@ -2044,7 +2044,7 @@ T5_CMD_PROTO(static, text_main_cmd_insert_field_none) QUICK_UBLOCK_WITH_BUFFER(quick_ublock, INLINE_OVH + 1); quick_ublock_with_buffer_setup(quick_ublock); - IGNOREPARM_InRef_(p_t5_cmd); + UNREFERENCED_PARAMETER_InRef_(p_t5_cmd); switch(t5_message) { @@ -2129,7 +2129,7 @@ T5_CMD_PROTO(static, text_main_cmd_insert_field_ss_name) QUICK_UBLOCK_WITH_BUFFER(quick_ublock, INLINE_OVH + 32); quick_ublock_with_buffer_setup(quick_ublock); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = inline_quick_ublock_from_data(&quick_ublock, IL_SS_NAME, IL_TYPE_S32, &s32, 0))) status = skelevent_keys_from_quick_block(p_docu, &quick_ublock); @@ -2147,7 +2147,7 @@ T5_CMD_PROTO(static, text_main_cmd_insert_field_ms_field) QUICK_UBLOCK_WITH_BUFFER(quick_ublock, INLINE_OVH + 32); quick_ublock_with_buffer_setup(quick_ublock); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(status_ok(status = inline_quick_ublock_from_data(&quick_ublock, IL_MS_FIELD, IL_TYPE_S32, &field_idx, 0))) status = skelevent_keys_from_quick_block(p_docu, &quick_ublock); diff --git a/t5/ob_text/ob_text.c b/t5/ob_text/ob_text.c index e414e67..db831a7 100644 --- a/t5/ob_text/ob_text.c +++ b/t5/ob_text/ob_text.c @@ -562,25 +562,22 @@ T5_MSG_PROTO(static, text_event_redraw, P_OBJECT_REDRAW p_object_redraw) if(P_DATA_NONE == p_object_redraw->object_data.u.p_object) { /* NULL object - nothing to paint, but invert if necessary */ - BOOL do_invert = FALSE; - if(p_object_redraw->flags.show_selection) { - if(!p_object_redraw->flags.show_content) - { - if(p_object_redraw->flags.marked_now != p_object_redraw->flags.marked_screen) - do_invert = TRUE; - } - else if(p_object_redraw->flags.marked_now) - do_invert = TRUE; + BOOL do_invert; + + if(p_object_redraw->flags.show_content) + do_invert = p_object_redraw->flags.marked_now; + else + do_invert = (p_object_redraw->flags.marked_now != p_object_redraw->flags.marked_screen); + + if(do_invert) + host_invert_rectangle_filled(&p_object_redraw->redraw_context, + &p_object_redraw->pixit_rect_object, + &p_object_redraw->rgb_fore, + &p_object_redraw->rgb_back); } - if(do_invert) - host_invert_rectangle_filled(&p_object_redraw->redraw_context, - &p_object_redraw->pixit_rect_object, - &p_object_redraw->rgb_fore, - &p_object_redraw->rgb_back); - return(STATUS_OK); } @@ -746,7 +743,7 @@ ob_text_msg_docu_colrow( MAEVE_EVENT_PROTO(static, maeve_event_ob_text) { - IGNOREPARM_InRef_(p_maeve_block); + UNREFERENCED_PARAMETER_InRef_(p_maeve_block); switch(t5_message) { @@ -793,8 +790,8 @@ ob_text_maeve_services_ss_name_change( MAEVE_SERVICES_EVENT_PROTO(static, maeve_services_event_ob_text) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InRef_(p_maeve_services_block); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InRef_(p_maeve_services_block); switch(t5_message) { @@ -849,7 +846,7 @@ ob_text_msg_close1( T5_MSG_PROTO(static, text_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -889,7 +886,7 @@ T5_MSG_PROTO(static, text_msg_object_keys, _InoutRef_ P_OBJECT_KEYS p_object_key p_object_keys->p_skelevent_keys->p_quick_ublock, TRUE, TRUE); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_object_keys->p_skelevent_keys->processed = 1; @@ -898,7 +895,7 @@ T5_MSG_PROTO(static, text_msg_object_keys, _InoutRef_ P_OBJECT_KEYS p_object_key T5_MSG_PROTO(static, text_msg_object_delete_sub, P_OBJECT_DELETE_SUB p_object_delete_sub) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return( text_delete_sub_redisplay(p_docu, @@ -912,7 +909,7 @@ T5_MSG_PROTO(static, text_msg_object_string_replace, P_OBJECT_STRING_REPLACE p_o STATUS status = STATUS_OK; P_USTR_INLINE ustr_inline = p_object_string_replace->object_data.u.ustr_inline; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != ustr_inline) { @@ -975,7 +972,7 @@ T5_MSG_PROTO(static, text_msg_object_copy, P_OBJECT_COPY p_object_copy) STATUS status = STATUS_OK; PC_USTR_INLINE p_from = (PC_USTR_INLINE) p_object_from_slr(p_docu, &p_object_copy->slr_from, OBJECT_ID_TEXT); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != p_from) /* SKS after 1.20/50 14mar95 this is now a valid case since caller no longer checks. Stops Taiwanese fill down */ { @@ -998,8 +995,8 @@ T5_MSG_PROTO(static, text_msg_object_compare, _InoutRef_ P_OBJECT_COMPARE p_obje const PC_USTR_INLINE ustr_inline_1 = (PC_USTR_INLINE) p_object_compare->p_object_1; const PC_USTR_INLINE ustr_inline_2 = (PC_USTR_INLINE) p_object_compare->p_object_2; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(ustr_inline_1 && ustr_inline_2) { @@ -1015,7 +1012,7 @@ T5_MSG_PROTO(static, text_msg_object_data_read, _InoutRef_ P_OBJECT_DATA_READ p_ { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE == p_object_data_read->object_data.u.p_object) { @@ -1047,7 +1044,7 @@ T5_MSG_PROTO(static, text_msg_load_construct_ownform, _InoutRef_ P_CONSTRUCT_CON STATUS status = STATUS_OK; const IL_CODE il_code = (IL_CODE) p_construct_convert->p_construct->t5_message; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(t5_message_is_inline(p_construct_convert->p_construct->t5_message)); @@ -1120,7 +1117,7 @@ T5_MSG_PROTO(static, text_msg_save_construct_ownform, P_SAVE_CONSTRUCT_OWNFORM p const IL_CODE il_code = inline_code(p_save_inline_ownform->ustr_inline); PC_CONSTRUCT_TABLE p_construct_table; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(arglist_prepare_with_construct(&p_save_inline_ownform->arglist_handle, OBJECT_ID_TEXT, @@ -1192,7 +1189,7 @@ T5_MSG_PROTO(static, text_msg_load_cell_ownform, _InoutRef_ P_LOAD_CELL_OWNFORM STATUS status = STATUS_OK; PC_USTR_INLINE ustr_inline; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* check the data type */ switch(p_load_cell_ownform->data_type) @@ -1240,8 +1237,8 @@ T5_MSG_PROTO(static, text_msg_save_cell_ownform, _InoutRef_ P_SAVE_CELL_OWNFORM const P_USTR_INLINE ustr_inline = p_save_cell_ownform->object_data.u.ustr_inline; S32 start, end; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(P_DATA_NONE != ustr_inline) { @@ -1260,7 +1257,7 @@ T5_MSG_PROTO(static, text_msg_load_cell_foreign, _InoutRef_ P_LOAD_CELL_FOREIGN STATUS status = STATUS_OK; PC_USTR_INLINE ustr_inline; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); /* check the data type */ switch(p_load_cell_foreign->data_type) @@ -1308,7 +1305,7 @@ T5_MSG_PROTO(static, text_msg_new_object_from_text, _InRef_ P_NEW_OBJECT_FROM_TE OBJECT_DATA object_data; OBJECT_POSITION object_position_after; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_new_object_from_text->data_ref.data_space == DATA_SLOT); @@ -1348,7 +1345,7 @@ T5_MSG_PROTO(static, text_msg_spell_auto_check, P_SPELL_AUTO_CHECK p_spell_auto_ { STATUS status = STATUS_OK; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if( (OBJECT_ID_NONE != p_spell_auto_check->position_now.object_position.object_id) && (OBJECT_ID_NONE != p_spell_auto_check->position_was.object_position.object_id) && diff --git a/t5/ob_toolb/ob_toolb.c b/t5/ob_toolb/ob_toolb.c index 4806254..77fb1f2 100644 --- a/t5/ob_toolb/ob_toolb.c +++ b/t5/ob_toolb/ob_toolb.c @@ -167,7 +167,7 @@ T5_MSG_PROTO(static, toolbar_msg_view_destroy, _InRef_ P_T5_MSG_VIEW_DESTROY_BLO { const P_VIEW p_view = p_t5_msg_view_destroy_block->p_view; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_line_view_dispose(p_view); @@ -180,7 +180,7 @@ T5_MSG_PROTO(static, toolbar_msg_view_new, _InRef_ P_T5_MSG_VIEW_NEW_BLOCK p_t5_ { const P_VIEW p_view = p_t5_msg_view_new_block->p_view; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); status_return(status_line_view_new(p_docu, p_view)); @@ -402,7 +402,7 @@ T5_MSG_PROTO(static, msg_toolbar_tool_disable, _InRef_ PC_T5_TOOLBAR_TOOL_DISABL { const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, p_t5_toolbar_tool_disable->name); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_t5_toolbar_docu_tool_desc) return(create_error(TOOLB_ERR_UNKNOWN_CONTROL)); @@ -448,7 +448,7 @@ _tool_enable( T5_MSG_PROTO(static, msg_toolbar_tool_enable, _InRef_ PC_T5_TOOLBAR_TOOL_ENABLE p_t5_toolbar_tool_enable) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); return(_tool_enable(p_docu, p_t5_toolbar_tool_enable)); } @@ -457,7 +457,7 @@ T5_MSG_PROTO(static, msg_toolbar_tool_enable_query, _InoutRef_ P_T5_TOOLBAR_TOOL { const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, p_t5_toolbar_tool_enable_query->name); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_t5_toolbar_docu_tool_desc) { @@ -626,7 +626,7 @@ T5_MSG_PROTO(static, msg_toolbar_tool_nobble, _InRef_ PC_T5_TOOLBAR_TOOL_NOBBLE const PC_USTR name = p_t5_toolbar_tool_nobble->name; const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, name); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_t5_toolbar_docu_tool_desc) return(/*create_error*/(TOOLB_ERR_UNKNOWN_CONTROL)); @@ -659,7 +659,7 @@ T5_MSG_PROTO(static, msg_toolbar_tool_query, _InoutRef_ P_T5_TOOLBAR_TOOL_QUERY { const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, p_t5_toolbar_tool_query->name); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_t5_toolbar_docu_tool_desc) return(create_error(TOOLB_ERR_UNKNOWN_CONTROL)); @@ -990,7 +990,7 @@ do_paint_tool( RECT rect; UINT uState; - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); (void) RECT_limited_from_pixit_rect_and_context(&rect, &tool_rect, p_redraw_context); @@ -1135,13 +1135,13 @@ redraw_tool( skel_rect.br.page_num.x = 0; skel_rect.br.page_num.y = 0; - REDRAW_FLAGS_CLEAR(redraw_flags); RECT_FLAGS_CLEAR(rect_flags); + REDRAW_FLAGS_CLEAR(redraw_flags); view_update_now_single(p_docu, p_view, UPDATE_BACK_WINDOW, &skel_rect, rect_flags, redraw_flags, LAYER_TOOLBAR); #elif WINDOWS - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(HOST_WND_NONE != p_view->main[WIN_TOOLBAR].hwnd) { @@ -1379,7 +1379,7 @@ T5_MSG_PROTO(static, paint_toolbar_riscos, _InoutRef_ P_SKELEVENT_REDRAW p_skele BOOL paint_status_line = !global_preferences.disable_status_line; BOOL first_time = TRUE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); redraw_clip_pixit_rect.tl = p_skelevent_redraw->clip_skel_rect.tl.pixit_point; redraw_clip_pixit_rect.br = p_skelevent_redraw->clip_skel_rect.br.pixit_point; @@ -1859,10 +1859,10 @@ T5_MSG_PROTO(static, scheduled_toolbar_redraw, P_SCHEDULED_EVENT_BLOCK p_schedul P_VIEW p_view; const PC_DOCU p_docu_for_unpack = viewid_unpack((U32) p_scheduled_event_block->client_handle, &p_view, &u16_row); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); assert(p_docu_for_unpack == p_docu); - IGNOREPARM_CONST(p_docu_for_unpack); + UNREFERENCED_PARAMETER_CONST(p_docu_for_unpack); /* check for this on any of the toolbar events - it's of much greater priority */ if(p_view->toolbar.nobble_scheduled_event_id) @@ -1915,7 +1915,7 @@ T5_MSG_PROTO(static, msg_toolbar_tool_set, _InRef_ PC_T5_TOOLBAR_TOOL_SET p_t5_t const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, p_t5_toolbar_tool_set->name); BOOL same = TRUE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(NULL == p_t5_toolbar_docu_tool_desc) return(create_error(TOOLB_ERR_UNKNOWN_CONTROL)); @@ -1960,8 +1960,8 @@ status_line_view_update( skel_rect.tl.pixit_point.y += (PIXITS_PER_RISCOS) << host_modevar_cache_current.YEig; skel_rect.br.pixit_point.y -= (PIXITS_PER_RISCOS) << host_modevar_cache_current.YEig; - REDRAW_FLAGS_CLEAR(redraw_flags); RECT_FLAGS_CLEAR(rect_flags); + REDRAW_FLAGS_CLEAR(redraw_flags); view_update_now_single(p_docu, p_view, UPDATE_BACK_WINDOW, &skel_rect, rect_flags, redraw_flags, LAYER_TOOLBAR); } @@ -2004,7 +2004,7 @@ status_line_view_update( T5_MSG_PROTO(static, t5_msg_status_line_set, _InRef_ PC_UI_TEXT p_ui_text) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); ui_text_dispose(&p_docu->status_line_ui_text); @@ -2039,7 +2039,7 @@ status_line_view_dispose( _ViewRef_ P_VIEW p_view) { #if RISCOS - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_view); #elif WINDOWS if(HOST_WND_NONE != p_view->main[WIN_UPPER_STATUS_LINE].hwnd) { @@ -2065,8 +2065,8 @@ status_line_view_new( #if RISCOS - IGNOREPARM_ViewRef_(p_docu); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_ViewRef_(p_docu); + UNREFERENCED_PARAMETER_ViewRef_(p_view); status_line_font_height_pixits = 0; @@ -2726,7 +2726,7 @@ frame_windows_set_margins( BOOL first_time = TRUE; PIXIT height = 0; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); if(has_toolbar) { @@ -2796,7 +2796,7 @@ T5_CMD_PROTO(static, t5_cmd_button) const P_T5_TOOLBAR_DOCU_TOOL_DESC p_t5_toolbar_docu_tool_desc = find_docu_tool(p_docu, name); BOOL alternate = FALSE; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(arg_is_present(p_args, 1)) alternate = p_args[1].val.fBool; @@ -2817,8 +2817,8 @@ T5_CMD_PROTO(static, t5_cmd_toolbar_tool) T5_TOOLBAR_REQUESTED_TOOL_DESC t5_toolbar_requested_tool_desc; SC_ARRAY_INIT_BLOCK array_init_block = aib_init(4, sizeof32(t5_toolbar_requested_tool_desc), 0); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); t5_toolbar_requested_tool_desc.row = p_args[0].val.u8n; ustr_xstrkpy(ustr_bptr(t5_toolbar_requested_tool_desc.name), elemof32(t5_toolbar_requested_tool_desc.name), name); @@ -2836,7 +2836,7 @@ T5_CMD_PROTO(static, t5_cmd_toolbar_tool_disallow) SC_ARRAY_INIT_BLOCK array_init_block = ain_init(4, sizeof32(t5_toolbar_disallowed_tool_desc), 0); P_ARRAY_HANDLE p_array_handle = &toolbar_disallowed_array_handle; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); ustr_xstrkpy(t5_toolbar_disallowed_tool_desc.name, elemof32(t5_toolbar_disallowed_tool_desc.name), name); @@ -2884,7 +2884,7 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_click, _InoutRef_ P_BACK_WINDOW_EV default: { - const BOOL alternate = (t5_message == T5_EVENT_CLICK_RIGHT_SINGLE) || (t5_message == T5_EVENT_CLICK_RIGHT_DOUBLE); + const BOOL alternate = (T5_EVENT_CLICK_RIGHT_SINGLE == t5_message) || (T5_EVENT_CLICK_RIGHT_DOUBLE == t5_message); execute_tool(p_docu, p_view, p_t5_toolbar_docu_tool_desc, alternate); break; } @@ -2916,7 +2916,7 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_click_drag, _InoutRef_ P_BACK_WIND if(p_t5_toolbar_tool_desc->bits.auto_repeat) { - const BOOL alternate = (t5_message == T5_EVENT_CLICK_RIGHT_DRAG); + const BOOL alternate = (T5_EVENT_CLICK_RIGHT_DRAG == t5_message); execute_tool(p_docu, p_view, p_t5_toolbar_docu_tool_desc, alternate); } } @@ -2928,8 +2928,8 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_click_drag, _InoutRef_ P_BACK_WIND T5_MSG_PROTO(static, t5_msg_back_window_event_click_consume, _InoutRef_ P_BACK_WINDOW_EVENT p_back_window_event) { - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); p_back_window_event->processed = TRUE; @@ -2942,10 +2942,10 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_pointer_movement, _InoutRef_ P_BAC const P_VIEW p_view = p_skelevent_click->click_context.p_view; P_T5_TOOLBAR_VIEW_TOOL_DESC p_t5_toolbar_view_tool_desc; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); trace_v0(TRACE_APP_CLICK, - (t5_message == T5_EVENT_POINTER_ENTERS_WINDOW) + (T5_EVENT_POINTER_ENTERS_WINDOW == t5_message) ? "t5_msg_back_window_event T5_EVENT_POINTER_ENTERS_WINDOW" : "t5_msg_back_window_event T5_EVENT_POINTER_MOVEMENT"); @@ -2969,8 +2969,8 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_pointer_movement, _InoutRef_ P_BAC T5_MSG_PROTO(static, t5_msg_back_window_event_pointer_leaves_window, _InoutRef_ P_BACK_WINDOW_EVENT p_back_window_event) { - IGNOREPARM_InVal_(t5_message); - IGNOREPARM_InoutRef_(p_back_window_event); + UNREFERENCED_PARAMETER_InVal_(t5_message); + UNREFERENCED_PARAMETER_InoutRef_(p_back_window_event); trace_0(TRACE_APP_CLICK, TEXT("t5_msg_back_window_event T5_EVENT_POINTER_LEAVES_WINDOW")); @@ -2981,7 +2981,7 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_pointer_leaves_window, _InoutRef_ T5_MSG_PROTO(static, t5_msg_back_window_event, _InoutRef_ P_BACK_WINDOW_EVENT p_back_window_event) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_back_window_event->t5_message) { @@ -3024,7 +3024,7 @@ T5_MSG_PROTO(static, t5_msg_back_window_event_resized, P_VIEWEVENT_VISIBLEAREA_C ARRAY_INDEX view_row_idx; P_T5_TOOLBAR_VIEW_ROW_DESC p_t5_toolbar_view_row_desc = array_range(&p_view->toolbar.h_toolbar_view_row_desc, T5_TOOLBAR_VIEW_ROW_DESC, 0, view_rows); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); for(view_row_idx = 0; view_row_idx < view_rows; ++view_row_idx, ++p_t5_toolbar_view_row_desc) { @@ -3072,8 +3072,8 @@ T5_MSG_PROTO(static, t5_msg_toolbar_tools, _InRef_ PC_T5_TOOLBAR_TOOLS p_t5_tool ARRAY_INDEX i; const ARRAY_INDEX n = array_elements(&toolbar_candidates_array_handle); - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); for(i = 0; i < p_t5_toolbar_tools->n_tool_desc; ++i) { @@ -3164,7 +3164,7 @@ toolbar_msg_exit1(void) T5_MSG_PROTO(static, toolbar_msg_initclose, _InRef_ PC_MSG_INITCLOSE p_msg_initclose) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_initclose->t5_msg_initclose_message) { @@ -3222,7 +3222,7 @@ toolbar_msg_choice_changed_ui_styles( T5_MSG_PROTO(static, toolbar_msg_choice_changed, _InRef_ PC_MSG_CHOICE_CHANGED p_msg_choice_changed) { - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); switch(p_msg_choice_changed->t5_message) { diff --git a/t5/ob_toolb/wi_toolb.c b/t5/ob_toolb/wi_toolb.c index 7f9dca1..e092f5c 100644 --- a/t5/ob_toolb/wi_toolb.c +++ b/t5/ob_toolb/wi_toolb.c @@ -68,8 +68,8 @@ T5_MSG_PROTO(extern, t5_msg_frame_windows_describe, _InoutRef_ P_MSG_FRAME_WINDO { const P_VIEW p_view = p_msg_frame_window->p_view; - IGNOREPARM_DocuRef_(p_docu); - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_InVal_(t5_message); t5_msg_frame_windows_describe_toolbar(p_view, p_msg_frame_window); @@ -174,7 +174,7 @@ t5_msg_frame_windows_posn_upper_status_line( RECT client_rect; SIZE size; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); GetClientRect(hwnd, &client_rect); @@ -199,7 +199,7 @@ t5_msg_frame_windows_posn_lower_status_line( RECT client_rect; SIZE size; - IGNOREPARM_DocuRef_(p_docu); + UNREFERENCED_PARAMETER_DocuRef_(p_docu); GetClientRect(hwnd, &client_rect); @@ -218,7 +218,7 @@ T5_MSG_PROTO(extern, t5_msg_frame_windows_posn, _InoutRef_ P_MSG_FRAME_WINDOW p_ { const P_VIEW p_view = p_msg_frame_window->p_view; - IGNOREPARM_InVal_(t5_message); + UNREFERENCED_PARAMETER_InVal_(t5_message); if(HOST_WND_NONE != p_view->main[WIN_TOOLBAR].hwnd) t5_msg_frame_windows_posn_toolbar(p_docu, p_view, p_msg_frame_window); @@ -462,8 +462,8 @@ toolbar_set_tooltip_text( _ViewRef_ P_VIEW p_view, _InRef_ PC_UI_TEXT p_ui_text) { - IGNOREPARM_ViewRef_(p_view); - IGNOREPARM_InRef_(p_ui_text); + UNREFERENCED_PARAMETER_ViewRef_(p_view); + UNREFERENCED_PARAMETER_InRef_(p_ui_text); } #endif /* TOOLBAR_TOOLTIPS */ @@ -476,8 +476,8 @@ toolbar_onCreate( #if defined(TOOLBAR_TOOLTIPS) p_view->toolbar.hwndTT = CreateToolTip(hwnd); #else - IGNOREPARM_HwndRef_(hwnd); - IGNOREPARM_ViewRef_(p_view); + UNREFERENCED_PARAMETER_HwndRef_(hwnd); + UNREFERENCED_PARAMETER_ViewRef_(p_view); #endif } @@ -979,7 +979,7 @@ wndproc_toolbar_onNotify( _InVal_ int idFrom, _In_ NMHDR * pnm) { - IGNOREPARM_InVal_(idFrom); + UNREFERENCED_PARAMETER_InVal_(idFrom); switch(pnm->code) { diff --git a/t5/resource/template/draft_rz,c1d b/t5/resource/template/draft_rz,c1d index 43b3089..5217e83 100644 --- a/t5/resource/template/draft_rz,c1d +++ b/t5/resource/template/draft_rz,c1d @@ -1,15 +1,13 @@ -{Version:2.10;24 Jun 2016;Resultz (UK);Colton Software} +{Version:2.10.02;07 Jul 2016;Resultz (UK);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:0} {Flow:10} {Block:0;0;;32;7;33;;32;7;33} -{Style:BaseSheet;{ColWidth:1474}{ColName:x#}{RowHeight:240}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#}{MarginLeft:114} -{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:0}{ParaEnd:0}{LineSpace:3;240}{Justify:0}{JustifyV:0} -{NewObject:1}{Numform:#,##0.#######\\\;-#,##0.#######[negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error} -{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0} -{Typeface:Courier}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{Style:BaseSheet;{ColWidth:1474}{ColName:x#}{RowHeight:240}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#}{MarginLeft:114}{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:0}{ParaEnd:0}{LineSpace:3;240}{Justify:0}{JustifyV:0}{NewObject:1}{Numform:#,##0.#######\\\;-#,##0.#######[negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error}{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0}{Typeface:Courier}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{StyleBase:BaseSheet} {Style:Header;{ColWidth:11164}{MarginLeft:114}{MarginRight:114}{Tablist:C5385 R10771}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} {Style:Footer;{ColWidth:11164}{MarginLeft:114}{MarginRight:114}{Tablist:C5385 R10771}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} {Style:Current cell;{Background:221;221;221}{BorderColour:0;0;0}{Border:0}} +{StyleCurrent:Current cell} {Style:Text;{RowHeightFix:0}{NewObject:3}} {Style:Number;{Justify:2}{NewObject:1}} {Style:General;{StyleSearch:50}{Numform:#,##0.#######\\\;-#,##0.#######[Negative]}} @@ -21,9 +19,9 @@ {Style:Date_ISO_8601;{StyleSearch:0}{NumformDT:yyyy-mm-dd}} {Style:Time;{StyleSearch:30}{NumformDT:hh:mm}} {Style:Time_s;{StyleSearch:40}{NumformDT:hh:mm:ss}} -{StyleBase:BaseSheet} -{PrintQuality:1} {Paper:Default A4;0;16840;11906;442;1134;346;346;0;0;0;0;0;;0} +{PaperScale:100} +{PrintQuality:1} {StartOfData} {BR:;;;;;;;;1;1;{StyleHandle:BaseSheet}} {Imp:;;;;;;;;1;1;36;1000;3;20;{StyleHandle:Text}} diff --git a/t5/resource/template/draft_wz,c1d b/t5/resource/template/draft_wz,c1d index 76b398a..fba6969 100644 --- a/t5/resource/template/draft_wz,c1d +++ b/t5/resource/template/draft_wz,c1d @@ -1,13 +1,10 @@ -{Version:2.10;24 Jun 2016;Wordz;Colton Software} +{Version:2.10.02;07 Jul 2016;Wordz (UK);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} +{BaseSingleCol:1} {RowTable:0} {Flow:10} {Block:0;0;;32;1;1;;32;1;1} -{Style:BaseLetter;{ColWidth:11520}{ColName:#}{RowHeight:0}{RowHeightFix:0}{RowUnbreakable:0}{RowName:#} -{MarginLeft:0}{MarginRight:0}{MarginPara:0}{Tablist:L1440 L2880 L4320 L5760 L7200 L8640 L10080} -{Numform:#,##0.#######\\\;-#,##0.#######[negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error} -{Background:255;255;255}{ParaStart:0}{ParaEnd:0}{LineSpace:3;240}{Justify:0}{NewObject:3} -{BorderColour:0;187;255}{Border:0}{GridLeftColour:0;187;255}{GridTopColour:0;187;255}{GridRightColour:0;187;255}{GridBottomColour:0;187;255}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0} -{Typeface:Courier}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{Style:BaseLetter;{ColWidth:11520}{ColName:#}{RowHeight:0}{RowHeightFix:0}{RowUnbreakable:0}{RowName:#}{MarginLeft:0}{MarginRight:0}{MarginPara:0}{Tablist:L1440 L2880 L4320 L5760 L7200 L8640 L10080}{Numform:#,##0.#######\\\;-#,##0.#######[negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error}{Background:255;255;255}{ParaStart:0}{ParaEnd:0}{LineSpace:3;240}{Justify:0}{NewObject:3} +{BorderColour:0;187;255}{Border:0}{GridLeftColour:0;187;255}{GridTopColour:0;187;255}{GridRightColour:0;187;255}{GridBottomColour:0;187;255}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Typeface:Courier}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} {StyleBase:BaseLetter} {Style:Header} {Style:Footer} @@ -23,6 +20,7 @@ {Style:Time;{StyleSearch:30}{NumformDT:hh:mm}} {Style:Time_s;{StyleSearch:40}{NumformDT:hh:mm:ss}} {Paper:Draft A4;0;16840;11906;0;0;0;0;0;0;0;0;0} +{PaperScale:100} {PrintQuality:1} {StartOfData} {BR:;;;;;;;;1;1;{StyleHandle:BaseLetter}} diff --git a/t5/resource/template/letter,c1d b/t5/resource/template/letter,c1d index 87fd35c..de2f0f6 100644 --- a/t5/resource/template/letter,c1d +++ b/t5/resource/template/letter,c1d @@ -1,12 +1,9 @@ -{Version:2.10;24 Jun 2016;Wordz;Colton Software} +{Version:2.10.02;07 Jul 2016;Wordz (UK);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} +{BaseSingleCol:1} {RowTable:0} {Flow:10} {Block:0;0;;32;1;1;;32;1;1} -{Style:BaseLetter;{ColWidth:11055}{ColName:#}{RowHeight:0}{RowHeightFix:0}{RowUnbreakable:0}{RowName:#} -{MarginLeft:283}{MarginRight:283}{MarginPara:0}{Tablist:L1134 L2268 L3402 L4536 L5670 L6804 L7938 L9072 L10206}{Background:255;255;255}{ParaStart:68}{ParaEnd:45} -{LineSpace:0;72}{Justify:0}{NewObject:3}{Numform:#,##0.#######\\\;-#,##0.#######[Negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error} -{BorderColour:0;187;255}{Border:0}{GridLeftColour:0;187;255}{GridTopColour:0;187;255}{GridRightColour:0;187;255}{GridBottomColour:0;187;255}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0} -{Typeface:Times}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{Style:BaseLetter;{ColWidth:11055}{ColName:#}{RowHeight:0}{RowHeightFix:0}{RowUnbreakable:0}{RowName:#}{MarginLeft:283}{MarginRight:283}{MarginPara:0}{Tablist:L1134 L2268 L3402 L4536 L5670 L6804 L7938 L9072 L10206}{Background:255;255;255}{ParaStart:68}{ParaEnd:45}{LineSpace:0;72}{Justify:0}{NewObject:3}{Numform:#,##0.#######\\\;-#,##0.#######[Negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error}{BorderColour:0;187;255}{Border:0}{GridLeftColour:0;187;255}{GridTopColour:0;187;255}{GridRightColour:0;187;255}{GridBottomColour:0;187;255}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0}{Typeface:Times}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} {StyleBase:BaseLetter} {Style:Header;{ColWidth:11055}{MarginLeft:283}{MarginRight:283}{MarginPara:0}{Tablist:C5244 R10488}} {Style:Footer;{ColWidth:11055}{MarginLeft:283}{MarginRight:283}{MarginPara:0}{Tablist:C5244 R10488}} @@ -21,9 +18,9 @@ {Style:Date_ISO_8601;{StyleSearch:0}{NumformDT:yyyy-mm-dd}} {Style:Time;{StyleSearch:30}{NumformDT:hh:mm}} {Style:Time_s;{StyleSearch:40}{NumformDT:hh:mm:ss}} -{PrintQuality:0} {Paper:A4;0;16840;11906;460;460;397;397;0;0;0;0;32} {PaperScale:100} +{PrintQuality:0} {StartOfData} {BR:;;;;;;;;1;1;{StyleHandle:BaseLetter}} {BR:;;;;;;;;1;1;{ColWidth:0}} diff --git a/t5/resource/template/sheetDE,c1d b/t5/resource/template/sheetDE,c1d index 4e6b517..0c68574 100644 --- a/t5/resource/template/sheetDE,c1d +++ b/t5/resource/template/sheetDE,c1d @@ -1,16 +1,13 @@ -{Version:2.10;24 Jun 2016;Resultz (DE);Colton Software} +{Version:2.10.02;07 Jul 2016;Resultz (DE);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:0} {Flow:10} {Block:0;0;;32;7;41;;32;7;41} -{Style:BasisSheet;{ColWidth:1474}{ColName:x#}{RowHeight:336}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#} -{MarginLeft:114}{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:32}{ParaEnd:16} -{LineSpace:0;72}{Justify:0}{JustifyV:0}{NewObject:1}{Numform:#,.##0.,#######\\\;-#,.##0.,#######[Negativ]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error} -{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0} -{Typeface:Helvetica}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{Style:BasisSheet;{ColWidth:1474}{ColName:x#}{RowHeight:336}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#}{MarginLeft:114}{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:32}{ParaEnd:16}{LineSpace:0;72}{Justify:0}{JustifyV:0}{NewObject:1}{Numform:#,.##0.,#######\\\;-#,.##0.,#######[Negativ]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error}{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0}{Typeface:Helvetica}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} {StyleBase:BasisSheet} {Style:Kopf;{ColWidth:11055}{MarginLeft:114}{MarginRight:114}{Tablist:C5414 R10828}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} {Style:Fuß;{ColWidth:11055}{MarginLeft:114}{MarginRight:114}{Tablist:C5414 R10828}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} {Style:Aktuellen Zelle;{Background:238;238;238}{Background:221;221;221}{GridLeftColour:85;85;85}{GridTopColour:85;85;85}{GridRightColour:85;85;85}{GridBottomColour:85;85;85}{GridLeft:2}{GridTop:2}{GridRight:2}{GridBottom:2}} +{StyleCurrent:Aktuellen Zelle} {Style:Text;{NewObject:3}} {Style:Zahl;{Justify:2}{NewObject:1}} {Style:Allgemein;{StyleSearch:50}{Numform:#,.##0.,#######\\\;-#,.##0.,#######[Negativ]}} @@ -22,9 +19,9 @@ {Style:Zeit;{StyleSearch:30}{NumformDT:hh:mm}} {Style:Zeit_s;{StyleSearch:40}{NumformDT:hh:mm:ss}} {Style:Negativ;{Foreground:221;0;0}} -{PrintQuality:0} {Paper:A4;0;16840;11906;460;460;397;397;0;0;0;0;32;;1} {PaperScale:100} +{PrintQuality:0} {StartOfData} {BR:;;;;;;;;1;1;{StyleHandle:BasisSheet}} {Imp:;;;;;;;;1;1;36;1000;3;20;{StyleHandle:Text}} diff --git a/t5/resource/template/sheetUK,c1d b/t5/resource/template/sheetUK,c1d index ae115c7..9d35615 100644 --- a/t5/resource/template/sheetUK,c1d +++ b/t5/resource/template/sheetUK,c1d @@ -1,12 +1,8 @@ -{Version:2.10;24 Jun 2016;Resultz (UK);Colton Software} +{Version:2.10.02;07 Jul 2016;Resultz (UK);Colton Software;0000 0000 0000 0000;Alphabet-Latin1} {RowTable:0} {Flow:10} {Block:0;0;;32;7;41;;32;7;41} -{Style:BaseSheet;{ColWidth:1474}{ColName:x#}{RowHeight:336}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#} -{MarginLeft:114}{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:32}{ParaEnd:16} -{LineSpace:0;72}{Justify:0}{JustifyV:0}{NewObject:1}{Numform:#,##0.#######\\\;-#,##0.#######[Negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error} -{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0} -{Typeface:Helvetica}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} +{Style:BaseSheet;{ColWidth:1474}{ColName:x#}{RowHeight:336}{RowHeightFix:1}{RowUnbreakable:0}{RowName:#}{MarginLeft:114}{MarginRight:114}{MarginPara:0}{Tablist}{Background:255;255;255}{ParaStart:32}{ParaEnd:16}{LineSpace:0;72}{Justify:0}{JustifyV:0}{NewObject:1}{Numform:#,##0.#######\\\;-#,##0.#######[Negative]}{NumformDT:dd.mm.yyyy hh:mm:ss\\\;dd.mm.yyyy\\\;hh:mm:ss}{NumformSE:@\\\;Error}{BorderColour:0;0;0}{Border:0}{GridLeftColour:221;221;221}{GridTopColour:221;221;221}{GridRightColour:221;221;221}{GridBottomColour:221;221;221}{GridLeft:0}{GridTop:0}{GridRight:0}{GridBottom:0}{Protect:0}{Typeface:Helvetica}{Fontx:0}{Fonty:240}{Underline:0}{Bold:0}{Italic:0}{Superscript:0}{Subscript:0}{Foreground:0;0;0}} {StyleBase:BaseSheet} {Style:Header;{ColWidth:11055}{MarginLeft:114}{MarginRight:114}{Tablist:C5414 R10828}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} {Style:Footer;{ColWidth:11055}{MarginLeft:114}{MarginRight:114}{Tablist:C5414 R10828}{ParaStart:68}{ParaEnd:68}{LineSpace:0;72}{Justify:0}} @@ -23,9 +19,9 @@ {Style:Date_ISO_8601;{StyleSearch:0}{NumformDT:yyyy-mm-dd}} {Style:Time;{StyleSearch:30}{NumformDT:hh:mm}} {Style:Time_s;{StyleSearch:40}{NumformDT:hh:mm:ss}} -{PrintQuality:0} {Paper:A4;0;16840;11906;460;460;397;397;0;0;0;0;32;;1} {PaperScale:100} +{PrintQuality:0} {StartOfData} {BR:;;;;;;;;1;1;{StyleHandle:BaseSheet}} {Imp:;;;;;;;;1;1;36;1000;3;20;{StyleHandle:Text}}