Ros-diffs March 2019

ros-diffs@reactos.org

36 participants
217 discussions

[reactos] 12/13: [CALC] Added "Minute of arc" and "Second of arc" to the "Angles" units. CORE-5939

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e5c8047e3d6597cfe280d… commit e5c8047e3d6597cfe280d540d7d45cc4bcd491ee Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Sun Nov 4 11:08:44 2018 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:06 2019 +0100 [CALC] Added "Minute of arc" and "Second of arc" to the "Angles" units. CORE-5939 --- base/applications/calc/convert.c | 14 +++++++++----- base/applications/calc/lang/bg-BG.rc | 2 ++ base/applications/calc/lang/cs-CZ.rc | 2 ++ base/applications/calc/lang/de-DE.rc | 2 ++ base/applications/calc/lang/el-GR.rc | 2 ++ base/applications/calc/lang/en-US.rc | 2 ++ base/applications/calc/lang/es-ES.rc | 2 ++ base/applications/calc/lang/fr-FR.rc | 2 ++ base/applications/calc/lang/he-IL.rc | 2 ++ base/applications/calc/lang/hu-HU.rc | 2 ++ base/applications/calc/lang/it-IT.rc | 2 ++ base/applications/calc/lang/ja-JP.rc | 2 ++ base/applications/calc/lang/ko-KR.rc | 2 ++ base/applications/calc/lang/nl-NL.rc | 2 ++ base/applications/calc/lang/no-NO.rc | 2 ++ base/applications/calc/lang/pl-PL.rc | 2 ++ base/applications/calc/lang/pt-BR.rc | 2 ++ base/applications/calc/lang/ro-RO.rc | 2 ++ base/applications/calc/lang/ru-RU.rc | 2 ++ base/applications/calc/lang/sk-SK.rc | 2 ++ base/applications/calc/lang/sq-AL.rc | 2 ++ base/applications/calc/lang/sv-SE.rc | 2 ++ base/applications/calc/lang/th-TH.rc | 2 ++ base/applications/calc/lang/tr-TR.rc | 2 ++ base/applications/calc/lang/uk-UA.rc | 2 ++ base/applications/calc/lang/zh-CN.rc | 2 ++ base/applications/calc/resource.h | 8 +++++--- 27 files changed, 64 insertions(+), 8 deletions(-) diff --git a/base/applications/calc/convert.c b/base/applications/calc/convert.c index c96f83d869..79ee4471fa 100644 --- a/base/applications/calc/convert.c +++ b/base/applications/calc/convert.c @@ -64,13 +64,17 @@ typedef struct { { 0, NULL, NULL }, /* - 1 gradian = 0.9 deg - 1 radian = 57.29577951308233 deg + 1 arcminute ....... = 1/60 deg + 1 arcsecond ....... = 1/3600 deg + 1 gradian ......... = 0.9 deg + 1 radian .......... = 57.29577951308233 deg */ static const conv_t conv_ANGLE[] = { - DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") - DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") - DECLARE_CONV_UNIT(ANGLE, RADIANS, "$/P*180", "$*P/180") + DECLARE_CONV_UNIT(ANGLE, ARCMINUTES, "$/60", "$*60") + DECLARE_CONV_UNIT(ANGLE, ARCSECONDS, "$/3600", "$*3600") + DECLARE_CONV_UNIT(ANGLE, DEGREES, "$", "$") + DECLARE_CONV_UNIT(ANGLE, GRADIANS, "$*0.9", "$/0.9") + DECLARE_CONV_UNIT(ANGLE, RADIANS, "$/P*180", "$*P/180") DECLARE_CONV_END }; diff --git a/base/applications/calc/lang/bg-BG.rc b/base/applications/calc/lang/bg-BG.rc index 4fc9302f2f..f1a66438f2 100644 --- a/base/applications/calc/lang/bg-BG.rc +++ b/base/applications/calc/lang/bg-BG.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Градуси" IDS_ANGLE_GRADIANS "Гради" IDS_ANGLE_RADIANS "Радиани" diff --git a/base/applications/calc/lang/cs-CZ.rc b/base/applications/calc/lang/cs-CZ.rc index a695785b57..9b95130c2a 100644 --- a/base/applications/calc/lang/cs-CZ.rc +++ b/base/applications/calc/lang/cs-CZ.rc @@ -434,6 +434,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stupně" IDS_ANGLE_GRADIANS "Grady" IDS_ANGLE_RADIANS "Radiány" diff --git a/base/applications/calc/lang/de-DE.rc b/base/applications/calc/lang/de-DE.rc index 8361c2dcf9..a8abec1fcf 100644 --- a/base/applications/calc/lang/de-DE.rc +++ b/base/applications/calc/lang/de-DE.rc @@ -429,6 +429,8 @@ END /* Winkeltypen */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grad" IDS_ANGLE_GRADIANS "Gon" IDS_ANGLE_RADIANS "Radiant" diff --git a/base/applications/calc/lang/el-GR.rc b/base/applications/calc/lang/el-GR.rc index 5e4f9ffcd8..7049495cf1 100644 --- a/base/applications/calc/lang/el-GR.rc +++ b/base/applications/calc/lang/el-GR.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Βαθμοί" IDS_ANGLE_GRADIANS "Ακτίνια" IDS_ANGLE_RADIANS "Μοίρες" diff --git a/base/applications/calc/lang/en-US.rc b/base/applications/calc/lang/en-US.rc index 4dfb564524..a4ba8c9aa5 100644 --- a/base/applications/calc/lang/en-US.rc +++ b/base/applications/calc/lang/en-US.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/es-ES.rc b/base/applications/calc/lang/es-ES.rc index 7bc2ffec76..e53328d2bc 100644 --- a/base/applications/calc/lang/es-ES.rc +++ b/base/applications/calc/lang/es-ES.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grados" IDS_ANGLE_GRADIANS "Gradianes" IDS_ANGLE_RADIANS "Radianes" diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index d7a73f78d4..edf5d67230 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrés" IDS_ANGLE_GRADIANS "Grades" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/he-IL.rc b/base/applications/calc/lang/he-IL.rc index 0db39f4f8c..56cccdca65 100644 --- a/base/applications/calc/lang/he-IL.rc +++ b/base/applications/calc/lang/he-IL.rc @@ -435,6 +435,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "מעלות" IDS_ANGLE_GRADIANS "גרדיאנים" IDS_ANGLE_RADIANS "רדיאנים" diff --git a/base/applications/calc/lang/hu-HU.rc b/base/applications/calc/lang/hu-HU.rc index ffc9c98919..be8e0706d7 100644 --- a/base/applications/calc/lang/hu-HU.rc +++ b/base/applications/calc/lang/hu-HU.rc @@ -437,6 +437,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Fok" IDS_ANGLE_GRADIANS "Gradián" IDS_ANGLE_RADIANS "Radián" diff --git a/base/applications/calc/lang/it-IT.rc b/base/applications/calc/lang/it-IT.rc index 6a235ac41d..756b678a82 100644 --- a/base/applications/calc/lang/it-IT.rc +++ b/base/applications/calc/lang/it-IT.rc @@ -429,6 +429,8 @@ END /* Tipi di angoli */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minuti d'arco" + IDS_ANGLE_ARCSECONDS "Secondi d'arco" IDS_ANGLE_DEGREES "Sessagesimali" IDS_ANGLE_GRADIANS "Centesimali (Gradienti)" IDS_ANGLE_RADIANS "Radianti" diff --git a/base/applications/calc/lang/ja-JP.rc b/base/applications/calc/lang/ja-JP.rc index d233cd1743..10d367d25a 100644 --- a/base/applications/calc/lang/ja-JP.rc +++ b/base/applications/calc/lang/ja-JP.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/ko-KR.rc b/base/applications/calc/lang/ko-KR.rc index 6f89a52f3b..76fb37a132 100644 --- a/base/applications/calc/lang/ko-KR.rc +++ b/base/applications/calc/lang/ko-KR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Degrees" IDS_ANGLE_GRADIANS "Gradians" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/nl-NL.rc b/base/applications/calc/lang/nl-NL.rc index 3fbc36f0e7..07e504780f 100644 --- a/base/applications/calc/lang/nl-NL.rc +++ b/base/applications/calc/lang/nl-NL.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Graden" IDS_ANGLE_GRADIANS "Gradiënten" IDS_ANGLE_RADIANS "Radialen" diff --git a/base/applications/calc/lang/no-NO.rc b/base/applications/calc/lang/no-NO.rc index 9330e67c9a..94e0be3954 100644 --- a/base/applications/calc/lang/no-NO.rc +++ b/base/applications/calc/lang/no-NO.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grader" IDS_ANGLE_GRADIANS "Gradianer" IDS_ANGLE_RADIANS "Radianer" diff --git a/base/applications/calc/lang/pl-PL.rc b/base/applications/calc/lang/pl-PL.rc index e5eb69e7fe..24de8f13c5 100644 --- a/base/applications/calc/lang/pl-PL.rc +++ b/base/applications/calc/lang/pl-PL.rc @@ -438,6 +438,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stopnie" IDS_ANGLE_GRADIANS "Gradiany" IDS_ANGLE_RADIANS "Radiany" diff --git a/base/applications/calc/lang/pt-BR.rc b/base/applications/calc/lang/pt-BR.rc index 58bfd7d248..e33b2ba467 100644 --- a/base/applications/calc/lang/pt-BR.rc +++ b/base/applications/calc/lang/pt-BR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Graus" IDS_ANGLE_GRADIANS "Grados" IDS_ANGLE_RADIANS "Radianos" diff --git a/base/applications/calc/lang/ro-RO.rc b/base/applications/calc/lang/ro-RO.rc index 2a86965ec2..1b1f3b847a 100644 --- a/base/applications/calc/lang/ro-RO.rc +++ b/base/applications/calc/lang/ro-RO.rc @@ -434,6 +434,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grade" IDS_ANGLE_GRADIANS "Gradiani" IDS_ANGLE_RADIANS "Radiani" diff --git a/base/applications/calc/lang/ru-RU.rc b/base/applications/calc/lang/ru-RU.rc index 626d645f68..bd6c06b83b 100644 --- a/base/applications/calc/lang/ru-RU.rc +++ b/base/applications/calc/lang/ru-RU.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "градус" IDS_ANGLE_GRADIANS "град" IDS_ANGLE_RADIANS "радиан" diff --git a/base/applications/calc/lang/sk-SK.rc b/base/applications/calc/lang/sk-SK.rc index 175504dea6..8e323e4926 100644 --- a/base/applications/calc/lang/sk-SK.rc +++ b/base/applications/calc/lang/sk-SK.rc @@ -436,6 +436,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Stupne" IDS_ANGLE_GRADIANS "Grady" IDS_ANGLE_RADIANS "Radiány" diff --git a/base/applications/calc/lang/sq-AL.rc b/base/applications/calc/lang/sq-AL.rc index f7f896c468..a508299a57 100644 --- a/base/applications/calc/lang/sq-AL.rc +++ b/base/applications/calc/lang/sq-AL.rc @@ -433,6 +433,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Gradë" IDS_ANGLE_GRADIANS "Gradian" IDS_ANGLE_RADIANS "Radians" diff --git a/base/applications/calc/lang/sv-SE.rc b/base/applications/calc/lang/sv-SE.rc index f9363a3843..3a4de3cd8b 100644 --- a/base/applications/calc/lang/sv-SE.rc +++ b/base/applications/calc/lang/sv-SE.rc @@ -436,6 +436,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Grader" IDS_ANGLE_GRADIANS "Gradianer" IDS_ANGLE_RADIANS "Radianer" diff --git a/base/applications/calc/lang/th-TH.rc b/base/applications/calc/lang/th-TH.rc index 72901fd88e..ff97aabb99 100644 --- a/base/applications/calc/lang/th-TH.rc +++ b/base/applications/calc/lang/th-TH.rc @@ -429,6 +429,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "องศา" IDS_ANGLE_GRADIANS "เกรเดียน" IDS_ANGLE_RADIANS "เรเดียน" diff --git a/base/applications/calc/lang/tr-TR.rc b/base/applications/calc/lang/tr-TR.rc index 8e3dd25a7d..9342751438 100644 --- a/base/applications/calc/lang/tr-TR.rc +++ b/base/applications/calc/lang/tr-TR.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Derece" IDS_ANGLE_GRADIANS "Gradyan" IDS_ANGLE_RADIANS "Radyan" diff --git a/base/applications/calc/lang/uk-UA.rc b/base/applications/calc/lang/uk-UA.rc index 238a418816..bf5447b755 100644 --- a/base/applications/calc/lang/uk-UA.rc +++ b/base/applications/calc/lang/uk-UA.rc @@ -437,6 +437,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "Градус" IDS_ANGLE_GRADIANS "Град" IDS_ANGLE_RADIANS "Радіан" diff --git a/base/applications/calc/lang/zh-CN.rc b/base/applications/calc/lang/zh-CN.rc index b98d84f625..f3d60132ba 100644 --- a/base/applications/calc/lang/zh-CN.rc +++ b/base/applications/calc/lang/zh-CN.rc @@ -431,6 +431,8 @@ END /* Angles */ STRINGTABLE BEGIN + IDS_ANGLE_ARCMINUTES "Minute of arc" + IDS_ANGLE_ARCSECONDS "Second of arc" IDS_ANGLE_DEGREES "角度" IDS_ANGLE_GRADIANS "梯度" IDS_ANGLE_RADIANS "弧度" diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index d822f21596..7fb2c41aac 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -126,9 +126,11 @@ #define IDS_CONV_WEIGHT 2012 /* TYPES OF ANGLES */ -#define IDS_ANGLE_DEGREES 2100 -#define IDS_ANGLE_GRADIANS 2101 -#define IDS_ANGLE_RADIANS 2102 +#define IDS_ANGLE_ARCMINUTES 2100 +#define IDS_ANGLE_ARCSECONDS 2101 +#define IDS_ANGLE_DEGREES 2102 +#define IDS_ANGLE_GRADIANS 2103 +#define IDS_ANGLE_RADIANS 2104 /* TYPES OF AREAS */ #define IDS_AREA_ACRES 2200

5 years, 9 months

[reactos] 11/13: [CALC] Add new, and fix existing units conversions. CORE-5939

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=dcea9e73c6e15f20a9d49… commit dcea9e73c6e15f20a9d4909a7c2c11a106f8110f Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Fri Aug 24 20:08:54 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:06 2019 +0100 [CALC] Add new, and fix existing units conversions. CORE-5939 - Add support for new conversion units: * AREA: 'mu', 'rai'. * LENGTH: 'chi', 'cun'. 'sun' optimized. * TIME: 'nanoseconds'. * WEIGHT: 'Kan', 'Kin'. - Add support for thailand measure system; invaluable help from this page: http://www.eppo.go.th/ref/UNIT-ALL.html - Add ZHANG (Chinese), and DANBO, JEONGBO (Korean) units. See details here: https://en.wikipedia.org/wiki/Chinese_units_of_measurement https://en.wikipedia.org/wiki/Korean_units_of_measurement - Rewritten some units formula by using scientific notation. - Improved precision of parsec unit coversion formula. --- base/applications/calc/convert.c | 121 ++++++++++++++++++++++++--------------- 1 file changed, 76 insertions(+), 45 deletions(-) diff --git a/base/applications/calc/convert.c b/base/applications/calc/convert.c index e563b0dccf..c96f83d869 100644 --- a/base/applications/calc/convert.c +++ b/base/applications/calc/convert.c @@ -1,3 +1,23 @@ +/* + * ReactOS Calc (Unit conversion engine) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + #include "calc.h" /* @@ -62,13 +82,13 @@ static const conv_t conv_ANGLE[] = { 1 acre us ............. = 4840*(36/39.37)^2 m = 6272640/1549.9969 m 1 are ................. = 100 mq 1 chou ................ = 108000*(10/33)^2 mq - 1 danbo ............... = + 1 danbo ............... = 991.74 mq 1 ha .................. = 10000 mq - 1 jeongbo ............. = - 1 morgen hungary ...... = + 1 jeongbo ............. = 9917.4 mq + 1 morgen hungary ...... = 5754.642 mq 1 mu .................. = 2000/3 mq 1 ping ................ = - 1 pyeong .............. = + 1 pyeong .............. = 400/121 mq 1 pyeongbangja ........ = 1 rai ................. = 1600 mq 1 se .................. = 1080*(10/33)^2 mq @@ -84,7 +104,7 @@ static const conv_t conv_ANGLE[] = { 1 square mm ........... = 0,000001 mq 1 square shaku ........ = (10/33)^2 mq 1 square tsuen ........ = - 1 square va ........... = + 1 square va ........... = 4 mq 1 square yard ......... = 0,83612736 mq 1 tan ................. = 10800*(10/33)^2 mq 1 tsubo ............... = 36*(10/33)^2 mq @@ -97,15 +117,15 @@ static const conv_t conv_AREA[] = { DECLARE_CONV_UNIT(AREA, ACRES_SCOTS, "$*5000", "$/5000") DECLARE_CONV_UNIT(AREA, ARES, "$*100", "$/100") DECLARE_CONV_UNIT(AREA, CHOU, "$*10800000/1089", "$*1089/10800000") -// DECLARE_CONV_UNIT(AREA, DANBO, "$", "$") + DECLARE_CONV_UNIT(AREA, DANBO, "$*991.74", "$/991.74") DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000") -// DECLARE_CONV_UNIT(AREA, JEONGBO, "$", "$") + DECLARE_CONV_UNIT(AREA, JEONGBO, "$*9917.4", "$/9917.4") // DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY, "$", "$") - DECLARE_CONV_UNIT(AREA, MU, "$*(2000/3)", "$/(2000/3)") + DECLARE_CONV_UNIT(AREA, MU, "$*(2000/3)", "$/(2000/3)") // DECLARE_CONV_UNIT(AREA, PING, "$", "$") -// DECLARE_CONV_UNIT(AREA, PYEONG, "$", "$") + DECLARE_CONV_UNIT(AREA, PYEONG, "$*400/121", "$*121/400") // DECLARE_CONV_UNIT(AREA, PYEONGBANGJA, "$", "$") - DECLARE_CONV_UNIT(AREA, RAI, "$*1600", "$/1600") + DECLARE_CONV_UNIT(AREA, RAI, "$*1600", "$/1600") DECLARE_CONV_UNIT(AREA, SE, "$*108000/1089", "$*1089/108000") DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS, "$*0,0001", "$/0,0001") // DECLARE_CONV_UNIT(AREA, SQUARE_CHR, "$", "$") @@ -120,7 +140,7 @@ static const conv_t conv_AREA[] = { DECLARE_CONV_UNIT(AREA, SQUARE_MILLIMETERS, "$*1000000", "$/1000000") DECLARE_CONV_UNIT(AREA, SQUARE_SHAKU, "$*100/1089", "$/1089*100") // DECLARE_CONV_UNIT(AREA, SQUARE_TSUEN, "$", "$") -// DECLARE_CONV_UNIT(AREA, SQUARE_VA, "$", "$") + DECLARE_CONV_UNIT(AREA, SQUARE_VA, "$*4", "$/4") DECLARE_CONV_UNIT(AREA, SQUARE_YARD, "$*0,83612736", "$/0,83612736") DECLARE_CONV_UNIT(AREA, TAN, "$*1080000/1089", "$*1089/1080000") DECLARE_CONV_UNIT(AREA, TSUBO, "$*1188/1089", "$*1089/1188") @@ -168,7 +188,7 @@ static const conv_t conv_CURRENCY[] = { 1 cal15 .... = 4.1855 J 1 BTU ...... = 1055.056 J 1 ERG ...... = 0.0000001 J - 1 EV ....... = 0.000000000000000000160217653 J + 1 eV ....... = 0.000000000000000000160217653 J 1 Foot-Pound = 1.3558179483314004 J 1 IT calorie = 4.1868 J 1 KCa ...... = 4186.8 J @@ -181,7 +201,7 @@ static const conv_t conv_ENERGY[] = { DECLARE_CONV_UNIT(ENERGY, 15_C_CALORIES, "$*4.1855", "$/4.1855") DECLARE_CONV_UNIT(ENERGY, BTUS, "$*1055.056", "$/1055.056") DECLARE_CONV_UNIT(ENERGY, ERGS, "$*.0000001", "$/.0000001") - DECLARE_CONV_UNIT(ENERGY, EVS, "$*.000000000000000000160217653", "$/.000000000000000000160217653") + DECLARE_CONV_UNIT(ENERGY, EVS, "$*1.60217653/1X19", "$/1.60217653*1X19") DECLARE_CONV_UNIT(ENERGY, FOOT_POUNDS, "$*1.3558179483314004", "$/1.3558179483314004") DECLARE_CONV_UNIT(ENERGY, IT_CALORIES, "$*4.1868", "$/4.1868") DECLARE_CONV_UNIT(ENERGY, IT_KILOCALORIES, "$*4186.8", "$/4186.8") @@ -209,13 +229,13 @@ static const conv_t conv_ENERGY[] = { 1 furlong ........ = 10 chains = 220*0.9144 m 1 gan ............ = 1 hand ........... = 4 inches = 0.9144/9 m - 1 hunh ........... = + 1 hunh ........... = 1/8 nieu = 9.144/3456 m 1 inch ........... = yard/36 = 0.9144/36 m 1 ja ............. = 1 jeong .......... = - 1 kabiet ......... = + 1 kabiet ......... = 1/4 nieu = 9.144/1728 m 1 ken ............ = 60/33 m - 1 keub ........... = + 1 keub ........... = 12 nieu = 10 inch = 9.144/36 m 1 km ............. = 1000 m 1 lar ............ = 1 light year ..... = 9460730472580800 m @@ -224,25 +244,25 @@ static const conv_t conv_ENERGY[] = { 1 mile ........... = 1760 yards = 1609.344 m 1 millimeter ..... = 1/1000 m 1 nautical mile .. = 1852 m - 1 nieu ........... = + 1 nieu ........... = 10/12 inch = 9.144/432 m 1 parsec ......... = 30856800000000000 m 1 pica ........... = yard/216 = 0.9144/216 m - 1 ri japan ....... = - 1 ri korea ....... = + 1 ri japan ....... = 129600/33 m + 1 ri korea ....... = 12960/33 m 1 rod ............ = 5.0292 m - 1 sawk ........... = - 1 sen ............ = + 1 sawk ........... = 2 keub = 20 inch = 9.144/18 m + 1 sen ............ = 20 va = 40.64 m 1 shaku .......... = 10/33 m 1 span ........... = 9 inches = 0.9144/4 m 1 sun ............ = 1/33 m 1 tsuen .......... = - 1 va ............. = + 1 va ............. = 4 sawk = 80 inch = 2.032 m 1 yard ........... = 0.9144 m - 1 yote ........... = - 1 zhang .......... = + 1 yote ........... = 400 sen = 16256 m + 1 zhang .......... = 3+1/3 m = 10/3 m */ static const conv_t conv_LENGTH[] = { - DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$*0.0000000001", "$/0.0000000001") + DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$/1X10", "$*1X10") DECLARE_CONV_UNIT(LENGTH, ASTRONOMICAL_UNITS, "$*149598000000", "$/149598000000") DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS, "$*0.9144/108", "$/0.9144*108") DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100") @@ -257,13 +277,13 @@ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, FURLONGS, "$*201.168", "$/201.168") // DECLARE_CONV_UNIT(LENGTH, GAN, "$", "$") DECLARE_CONV_UNIT(LENGTH, HANDS, "$*0,1016", "$/0,1016") -// DECLARE_CONV_UNIT(LENGTH, HUNH, "$", "$") + DECLARE_CONV_UNIT(LENGTH, HUNH, "$*9.144/3456", "$/9.144*3456") DECLARE_CONV_UNIT(LENGTH, INCHES, "$*0.0254", "$/0.0254") // DECLARE_CONV_UNIT(LENGTH, JA, "$", "$") // DECLARE_CONV_UNIT(LENGTH, JEONG, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, KABIET, "$", "$") + DECLARE_CONV_UNIT(LENGTH, KABIET, "$*9.144/1728", "$/9.144*1728") DECLARE_CONV_UNIT(LENGTH, KEN, "$*60/33", "$*33/60") -// DECLARE_CONV_UNIT(LENGTH, KEUB, "$", "$") + DECLARE_CONV_UNIT(LENGTH, KEUB, "$*9.144/36", "$/9.144*36") DECLARE_CONV_UNIT(LENGTH, KILOMETERS, "$*1000", "$/1000") // DECLARE_CONV_UNIT(LENGTH, LAR, "$", "$") DECLARE_CONV_UNIT(LENGTH, LIGHT_YEARS, "$*9460730472580800", "$/9460730472580800") @@ -273,22 +293,22 @@ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, MILES, "$*1609.344", "$/1609.344") DECLARE_CONV_UNIT(LENGTH, MILLIMETERS, "$/1000", "$*1000") DECLARE_CONV_UNIT(LENGTH, NAUTICAL_MILES, "$*1852", "$/1852") -// DECLARE_CONV_UNIT(LENGTH, NIEU, "$", "$") - DECLARE_CONV_UNIT(LENGTH, PARSECS, "$*30856800000000000", "$/30856800000000000") + DECLARE_CONV_UNIT(LENGTH, NIEU, "$*9.144/432", "$/9.144*432") + DECLARE_CONV_UNIT(LENGTH, PARSECS, "$*3.085678X16", "$/3.085678X16") DECLARE_CONV_UNIT(LENGTH, PICAS, "$*0.9144/216", "$/0.9144*216") DECLARE_CONV_UNIT(LENGTH, RODS, "$*5.0292", "$/5.0292") -// DECLARE_CONV_UNIT(LENGTH, RI_JAPAN, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, RI_KOREA, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, SAWK, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, SEN, "$", "$") + DECLARE_CONV_UNIT(LENGTH, RI_JAPAN, "$*129600/33", "$*33/129600") + DECLARE_CONV_UNIT(LENGTH, RI_KOREA, "$*12960/33", "$*33/12960") + DECLARE_CONV_UNIT(LENGTH, SAWK, "$*9.144/18", "$/9.144*18") + DECLARE_CONV_UNIT(LENGTH, SEN, "$*40.64", "$/40.64") DECLARE_CONV_UNIT(LENGTH, SHAKU, "$*10/33", "$*33/10") DECLARE_CONV_UNIT(LENGTH, SPAN, "$*0.9144/4", "$*4/0.9144") DECLARE_CONV_UNIT(LENGTH, SUN, "$*1/33", "$*33") // DECLARE_CONV_UNIT(LENGTH, TSUEN, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, VA, "$", "$") + DECLARE_CONV_UNIT(LENGTH, VA, "$*2.032", "$/2.032") DECLARE_CONV_UNIT(LENGTH, YARDS, "$*0.9144", "$/0.9144") -// DECLARE_CONV_UNIT(LENGTH, YOTE, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, ZHANG, "$", "$") + DECLARE_CONV_UNIT(LENGTH, YOTE, "$*16256", "$/16256") + DECLARE_CONV_UNIT(LENGTH, ZHANG, "$/0.3", "$*0.3") DECLARE_CONV_END }; @@ -387,7 +407,7 @@ static const conv_t conv_VELOCITY[] = { /* 1 barrel uk ...... = 163.65924 l 1 barrel oil ..... = 158.987295 l - 1 bun ............ = + 1 bun ............ = 1000 l 1 bushel uk ...... = 36.36872 l 1 bushel us ...... = 35.23907017 l 1 cubic cm ...... = 0.001 l @@ -404,7 +424,7 @@ static const conv_t conv_VELOCITY[] = { 1 gou ............ = 0.1809 l 1 hop ............ = 1 icce ........... = - 1 kwian .......... = + 1 kwian .......... = 2000 l 1 mal ............ = 1 milliliter ..... = 0.001 l 1 pint uk ........ = 0.56826125 l @@ -415,14 +435,14 @@ static const conv_t conv_VELOCITY[] = { 1 quart liquid us = 0.946352946 l 1 seki ........... = 1 syou ........... = - 1 tananloung ..... = - 1 tang ........... = + 1 tananloung ..... = 1 l + 1 tang ........... = 20 l 1 to ............. = 18040 l */ static const conv_t conv_VOLUME[] = { DECLARE_CONV_UNIT(VOLUME, BARRELS_UK, "$*163.65924", "$/163.65924") DECLARE_CONV_UNIT(VOLUME, BARRELS_OIL, "$*158.987295", "$/158.987295") -// DECLARE_CONV_UNIT(VOLUME, BUN, "$", "$") + DECLARE_CONV_UNIT(VOLUME, BUN, "$*1000", "$/1000") DECLARE_CONV_UNIT(VOLUME, BUSHELS_UK, "$*36.36872", "$/36.36872") DECLARE_CONV_UNIT(VOLUME, BUSHELS_US, "$*35.23907017", "$/35.23907017") DECLARE_CONV_UNIT(VOLUME, CUBIC_CENTIMETERS, "$*0.001", "$/0.001") @@ -439,7 +459,7 @@ static const conv_t conv_VOLUME[] = { DECLARE_CONV_UNIT(VOLUME, GOU, "$*0.1809", "$/0.1809") // DECLARE_CONV_UNIT(VOLUME, HOP, "$", "$") // DECLARE_CONV_UNIT(VOLUME, ICCE, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, KWIAN, "$", "$") + DECLARE_CONV_UNIT(VOLUME, KWIAN, "$*2000", "$/2000") DECLARE_CONV_UNIT(VOLUME, LITERS, "$", "$") // DECLARE_CONV_UNIT(VOLUME, MAL, "$", "$") DECLARE_CONV_UNIT(VOLUME, MILLILITERS, "$*0.001", "$/0.001") @@ -451,8 +471,8 @@ static const conv_t conv_VOLUME[] = { DECLARE_CONV_UNIT(VOLUME, QUARTS_LIQUID_US, "$*0.946352946", "$/0.946352946") // DECLARE_CONV_UNIT(VOLUME, SEKI, "$", "$") // DECLARE_CONV_UNIT(VOLUME, SYOU, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, TANANLOUNG, "$", "$") -// DECLARE_CONV_UNIT(VOLUME, TANG, "$", "$") + DECLARE_CONV_UNIT(VOLUME, TANANLOUNG, "$", "$") + DECLARE_CONV_UNIT(VOLUME, TANG, "$*20", "$/20") DECLARE_CONV_UNIT(VOLUME, TO, "$*18040", "$/18040") DECLARE_CONV_END }; @@ -484,6 +504,17 @@ static const conv_t conv_VOLUME[] = { 1 ton uk .......... = 1016046.9088 g // long ton 1 ton us .......... = 907184.74 g // short ton */ +/* +1 chang = 20 tamlung +1 tamlung = 4 baht +1 baht = 4 saloung +1 saloung = + +1 chang = 6/5 kg = 1200 g +1 tamlung = 1/20 chang = 60 g +1 baht = 1/4 tamlung = 15 g +1 saloung = 1/4 bath = 15/4 g +*/ static const conv_t conv_WEIGHT[] = { DECLARE_CONV_UNIT(WEIGHT, BAHT, "$*12.244", "$/12.244") DECLARE_CONV_UNIT(WEIGHT, CARATS, "$*0.2", "$/0.2")

5 years, 9 months

[reactos] 10/13: [CALC] Fix wrong button size in french. CORE-12359

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=18b4718d54b0051c938a9… commit 18b4718d54b0051c938a9d30207ed311d4dde10a Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Sun Aug 12 11:35:17 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:05 2019 +0100 [CALC] Fix wrong button size in french. CORE-12359 --- base/applications/calc/lang/fr-FR.rc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/base/applications/calc/lang/fr-FR.rc b/base/applications/calc/lang/fr-FR.rc index cfb910ba27..d7a73f78d4 100644 --- a/base/applications/calc/lang/fr-FR.rc +++ b/base/applications/calc/lang/fr-FR.rc @@ -144,7 +144,7 @@ BEGIN BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP PUSHBUTTON "CE", IDC_BUTTON_CE, 222, 38, 43, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 177, 38, 43, 18, BS_CENTER | + PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 166, 38, 54, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 305, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE DEFPUSHBUTTON "", IDC_BUTTON_FOCUS, 0, 0, 5, 5, NOT WS_VISIBLE @@ -156,11 +156,11 @@ CAPTION "Calculatrice ReactOS" MENU IDR_MENU_STANDARD FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - PUSHBUTTON "C", IDC_BUTTON_CANC, 123, 23, 41, 18, BS_CENTER | BS_VCENTER | + PUSHBUTTON "C", IDC_BUTTON_CANC, 128, 23, 36, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "CE", IDC_BUTTON_CE, 80, 23, 41, 18, BS_CENTER | BS_VCENTER | + PUSHBUTTON "CE", IDC_BUTTON_CE, 90, 23, 36, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP - PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 36, 23, 42, 18, BS_CENTER | BS_VCENTER | + PUSHBUTTON "Retour arrière", IDC_BUTTON_BACK, 36, 23, 52, 18, BS_CENTER | BS_VCENTER | BS_NOTIFY | BS_OWNERDRAW | WS_TABSTOP RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 159, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE PUSHBUTTON "7", IDC_BUTTON_7, 36, 45, 24, 18, BS_CENTER | BS_VCENTER | @@ -232,11 +232,11 @@ BEGIN WS_TABSTOP | CBS_SORT LTEXT "Convertir en :", IDC_STATIC, 5, 76, 56, 8 CONTROL "C", IDC_BUTTON_CANC, "Button", BS_OWNERDRAW | BS_CENTER | - BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 276, 24, 40, 17 + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 280, 24, 36, 17 CONTROL "CE", IDC_BUTTON_CE, "Button", BS_OWNERDRAW | BS_CENTER | - BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 232, 24, 40, 17 + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 242, 24, 36, 17 CONTROL "Retour arrière", IDC_BUTTON_BACK, "Button", BS_OWNERDRAW | BS_CENTER | - BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 40,17 + BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 24, 52, 17 RTEXT "", IDC_TEXT_OUTPUT, 5, 1, 312, 14, SS_CENTERIMAGE, WS_EX_CLIENTEDGE CONTROL "7", IDC_BUTTON_7, "Button", BS_OWNERDRAW | BS_CENTER | BS_VCENTER | BS_NOTIFY | WS_TABSTOP, 188, 48, 24, 18

5 years, 9 months

[reactos] 09/13: [CALC] Fix buttons transitions. Improve UI code readability. CORE-8526

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=248acaba9a8b4193844ae… commit 248acaba9a8b4193844ae7ed4919c7c2e4f3d0f2 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Tue Aug 7 20:47:28 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:05 2019 +0100 [CALC] Fix buttons transitions. Improve UI code readability. CORE-8526 - Improve code readability by using suitable UI function names. --- base/applications/calc/winmain.c | 147 +++++++++++---------------------------- 1 file changed, 41 insertions(+), 106 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index db6e7b3d29..4d9376bdf9 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -562,7 +562,7 @@ static void update_lcd_display(HWND hwnd) memcpy(p, calc.sDecimal, calc.sDecimal_len*sizeof(TCHAR)); } } - SendDlgItemMessage(hwnd, IDC_TEXT_OUTPUT, WM_SETTEXT, (WPARAM)0, (LPARAM)tmp); + SetDlgItemText(hwnd, IDC_TEXT_OUTPUT, tmp); } static void update_parent_display(HWND hWnd) @@ -574,7 +574,7 @@ static void update_parent_display(HWND hWnd) str[0] = _T('\0'); else _stprintf(str,_T("(=%d"), n); - SendDlgItemMessage(hWnd, IDC_TEXT_PARENT, WM_SETTEXT, 0, (LPARAM)str); + SetDlgItemText(hWnd, IDC_TEXT_PARENT, str); } static void build_operand(HWND hwnd, DWORD idc) @@ -666,13 +666,13 @@ static void display_rpn_result(HWND hwnd, calc_number_t *rpn) calc.ptr = calc.buffer; } -static int get_modifiers(HWND hwnd) +static int get_modifiers(HWND hWnd) { int modifiers = 0; - if (SendDlgItemMessage(hwnd, IDC_CHECK_INV, BM_GETCHECK, 0, 0)) + if (IsDlgButtonChecked(hWnd, IDC_CHECK_INV) == BST_CHECKED) modifiers |= MODIFIER_INV; - if (SendDlgItemMessage(hwnd, IDC_CHECK_HYP, BM_GETCHECK, 0, 0)) + if (IsDlgButtonChecked(hWnd, IDC_CHECK_HYP) == BST_CHECKED) modifiers |= MODIFIER_HYP; return modifiers; @@ -721,44 +721,18 @@ static const struct _update_check_menus { { &calc.size, IDM_VIEW_BYTE, IDC_RADIO_BYTE, }, }; -static void update_menu(HWND hwnd) +static void update_menu(HWND hWnd) { - HMENU hMenu = GetSubMenu(GetMenu(hwnd), 1); + HMENU hMenu = GetSubMenu(GetMenu(hWnd), 1); unsigned int x; - /* Sets the state of the layout in the menu based on the configuration file */ - if (calc.layout == CALC_LAYOUT_SCIENTIFIC) - { - CheckMenuRadioItem(GetMenu(hwnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_SCIENTIFIC, - MF_BYCOMMAND); - } - else if (calc.layout == CALC_LAYOUT_CONVERSION) - { - CheckMenuRadioItem(GetMenu(hwnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_CONVERSION, - MF_BYCOMMAND); - } - else - { - CheckMenuRadioItem(GetMenu(hwnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_STANDARD, - MF_BYCOMMAND); - } - - for (x=3; x<SIZEOF(upd); x++) { + for (x=0; x<SIZEOF(upd); x++) { if (*(upd[x].sel) != upd[x].idc) { CheckMenuItem(hMenu, upd[x].idm, MF_BYCOMMAND|MF_UNCHECKED); - SendMessage((HWND)GetDlgItem(hwnd,upd[x].idc),BM_SETCHECK,FALSE,0L); + CheckDlgButton(hWnd, upd[x].idc, BST_UNCHECKED); } else { CheckMenuItem(hMenu, upd[x].idm, MF_BYCOMMAND|MF_CHECKED); - SendMessage((HWND)GetDlgItem(hwnd,upd[x].idc),BM_SETCHECK,TRUE,0L); + CheckDlgButton(hWnd, upd[x].idc, BST_CHECKED); } } CheckMenuItem(hMenu, IDM_VIEW_GROUP, MF_BYCOMMAND|(calc.usesep ? MF_CHECKED : MF_UNCHECKED)); @@ -862,17 +836,18 @@ static void update_radio(HWND hwnd, unsigned int base) enable_allowed_controls(hwnd, base); } - SendDlgItemMessage(hwnd, calc.base, BM_SETCHECK, BST_CHECKED, 0); + CheckRadioButton(hwnd, IDC_RADIO_HEX, IDC_RADIO_BIN, calc.base); + if (base == IDC_RADIO_DEC) - SendDlgItemMessage(hwnd, calc.degr, BM_SETCHECK, BST_CHECKED, 0); + CheckRadioButton(hwnd, IDC_RADIO_DEG, IDC_RADIO_GRAD, calc.degr); else - SendDlgItemMessage(hwnd, calc.size, BM_SETCHECK, BST_CHECKED, 0); + CheckRadioButton(hwnd, IDC_RADIO_QWORD, IDC_RADIO_BYTE, calc.size); } static void update_memory_flag(HWND hWnd, BOOL mem_flag) { calc.is_memory = mem_flag; - SendDlgItemMessage(hWnd, IDC_TEXT_MEMORY, WM_SETTEXT, 0, (LPARAM)(mem_flag ? TEXT("M") : TEXT(""))); + SetDlgItemText(hWnd, IDC_TEXT_MEMORY, mem_flag ? _T("M") : _T("")); } static void update_n_stats_items(HWND hWnd, TCHAR *buffer) @@ -880,7 +855,7 @@ static void update_n_stats_items(HWND hWnd, TCHAR *buffer) unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); _stprintf(buffer, _T("n=%u"), n); - SendDlgItemMessage(hWnd, IDC_TEXT_NITEMS, WM_SETTEXT, 0, (LPARAM)buffer); + SetDlgItemText(hWnd, IDC_TEXT_NITEMS, buffer); } static void clean_stat_list(void) @@ -958,13 +933,13 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) return TRUE; case IDC_BUTTON_LOAD: n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0); - if (n == (DWORD)-1) + if (n == LB_ERR) return TRUE; PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0); return TRUE; case IDC_BUTTON_CD: n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0); - if (n == (DWORD)-1) + if (n == LB_ERR) return TRUE; SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0); update_n_stats_items(hWnd, buffer); @@ -995,18 +970,15 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) return FALSE; } -static BOOL idm_2_idc(int idm, WPARAM *pIdc) +static WPARAM idm_2_idc(int idm) { int x; for (x=0; x<SIZEOF(upd); x++) { if (upd[x].idm == idm) - { - *pIdc = (WPARAM)(upd[x].idc); - return TRUE; - } + break; } - return FALSE; + return (WPARAM)(upd[x].idc); } static void CopyMemToClipboard(void *ptr) @@ -1245,12 +1217,14 @@ static void run_canc(calc_number_t *c) { flush_postfix(); rpn_zero(c); + /* clear also scientific display modes */ calc.sci_out = FALSE; calc.sci_in = FALSE; + /* clear state of inv and hyp flags */ - SendDlgItemMessage(calc.hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); - SendDlgItemMessage(calc.hWnd, IDC_CHECK_HYP, BM_SETCHECK, 0, 0); + CheckDlgButton(calc.hWnd, IDC_CHECK_INV, BST_UNCHECKED); + CheckDlgButton(calc.hWnd, IDC_CHECK_HYP, BST_UNCHECKED); } static void run_rpar(calc_number_t *c) @@ -1439,7 +1413,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; RECT rc; - HMENU hMenu; switch (msg) { case WM_DRAWITEM: @@ -1479,13 +1452,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) /* set our calc icon */ SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)calc.hBgIcon); SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)calc.hSmIcon); - - /* Sets the state of the option to group digits */ - hMenu = GetSubMenu(GetMenu(hWnd), 1); - CheckMenuItem(hMenu, IDM_VIEW_GROUP, (calc.usesep ? MF_CHECKED : MF_UNCHECKED)); - /* update text for decimal button */ - SendDlgItemMessage(hWnd, IDC_BUTTON_DOT, WM_SETTEXT, (WPARAM)0, (LPARAM)calc.sDecimal); + SetDlgItemText(hWnd, IDC_BUTTON_DOT, calc.sDecimal); /* Fill combo box for conversion */ if (calc.layout == CALC_LAYOUT_CONVERSION) ConvInit(hWnd); @@ -1540,46 +1508,19 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) #endif return TRUE; case IDM_VIEW_STANDARD: - if (calc.layout != CALC_LAYOUT_STANDARD) - { - calc.layout = CALC_LAYOUT_STANDARD; - calc.action = IDM_VIEW_STANDARD; - DestroyWindow(hWnd); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_STANDARD, - MF_BYCOMMAND); - } + calc.layout = CALC_LAYOUT_STANDARD; + calc.action = IDM_VIEW_STANDARD; + DestroyWindow(hWnd); return TRUE; case IDM_VIEW_SCIENTIFIC: - if (calc.layout != CALC_LAYOUT_SCIENTIFIC) - { - calc.layout = CALC_LAYOUT_SCIENTIFIC; - calc.action = IDM_VIEW_SCIENTIFIC; - DestroyWindow(hWnd); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_SCIENTIFIC, - MF_BYCOMMAND); - } + calc.layout = CALC_LAYOUT_SCIENTIFIC; + calc.action = IDM_VIEW_SCIENTIFIC; + DestroyWindow(hWnd); return TRUE; case IDM_VIEW_CONVERSION: - if (calc.layout != CALC_LAYOUT_CONVERSION) - { - calc.layout = CALC_LAYOUT_CONVERSION; - calc.action = IDM_VIEW_CONVERSION; - DestroyWindow(hWnd); - - CheckMenuRadioItem(GetMenu(hWnd), - IDM_VIEW_STANDARD, - IDM_VIEW_CONVERSION, - IDM_VIEW_CONVERSION, - MF_BYCOMMAND); - } + calc.layout = CALC_LAYOUT_CONVERSION; + calc.action = IDM_VIEW_CONVERSION; + DestroyWindow(hWnd); return TRUE; case IDM_VIEW_HEX: case IDM_VIEW_DEC: @@ -1592,15 +1533,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case IDM_VIEW_DWORD: case IDM_VIEW_WORD: case IDM_VIEW_BYTE: - { - WPARAM idc; - if(idm_2_idc(LOWORD(wp), &idc)) - { - SendMessage(hWnd, WM_COMMAND, idc, 0); - return TRUE; - } - return FALSE; - } + SendMessage(hWnd, WM_COMMAND, idm_2_idc(LOWORD(wp)), 0); + return TRUE; case IDM_EDIT_COPY: handle_copy_command(hWnd); return TRUE; @@ -1894,9 +1828,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) // if (!(function_table[x].range & NO_CHAIN)) // exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); if (function_table[x].range & MODIFIER_INV) - SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); + CheckDlgButton(hWnd, IDC_CHECK_INV, BST_UNCHECKED); if (function_table[x].range & MODIFIER_HYP) - SendDlgItemMessage(hWnd, IDC_CHECK_HYP, BM_SETCHECK, 0, 0); + CheckDlgButton(hWnd, IDC_CHECK_HYP, BST_UNCHECKED); } break; } @@ -2027,7 +1961,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) dwLayout = IDD_DIALOG_SCIENTIFIC; - else if (calc.layout == CALC_LAYOUT_CONVERSION) + else + if (calc.layout == CALC_LAYOUT_CONVERSION) dwLayout = IDD_DIALOG_CONVERSION; else dwLayout = IDD_DIALOG_STANDARD;

5 years, 9 months

[reactos] 08/13: [CALC] Improvements and fixes for the numeric text output. CORE-8486

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adbafe64380af9f316614… commit adbafe64380af9f31661450b7bc613f5a74f30a7 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Tue Aug 7 19:58:28 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:04 2019 +0100 [CALC] Improvements and fixes for the numeric text output. CORE-8486 - Fixed bug 12.37 13/06/2009 into multiprecision display (unicode only). - Fixed bug when calculator was closed with statistics dialog open. - Fixed bug in XrY operator. - Fixed error into conversion unit. - Do not append decimal separator if "ERROR" messages are printed. - Remove call to _tcslen() and use return value of GetDlgItemText() where possible. --- base/applications/calc/winmain.c | 131 +++++++++++++++++++++++---------------- 1 file changed, 76 insertions(+), 55 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 37e194dc09..db6e7b3d29 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -493,22 +493,25 @@ static void update_lcd_display(HWND hwnd) * happen that separator is used between each digit. * Also added little additional space for dot and '\0'. */ - TCHAR *tmp = (TCHAR *)alloca(sizeof(calc.buffer)*2+2*sizeof(TCHAR)); + TCHAR tmp[MAX_CALC_SIZE * 2 + 2]; - if (calc.buffer[0] == TEXT('\0')) - _tcscpy(tmp, TEXT("0")); + if (calc.buffer[0] == _T('\0')) + _tcscpy(tmp, _T("0")); else _tcscpy(tmp, calc.buffer); - /* add final '.' in decimal mode (if it's missing) */ - if (calc.base == IDC_RADIO_DEC) { - if (_tcschr(tmp, TEXT('.')) == NULL) - _tcscat(tmp, TEXT(".")); + + /* Add final '.' in decimal mode (if it's missing), but + * only if it's a result: no append if it prints "ERROR". + */ + if (calc.base == IDC_RADIO_DEC && !calc.is_nan) { + if (_tcschr(tmp, _T('.')) == NULL) + _tcscat(tmp, _T(".")); } /* if separator mode is on, let's add an additional space */ if (calc.usesep && !calc.sci_in && !calc.sci_out && !calc.is_nan) { /* go to the integer part of the string */ - TCHAR *p = _tcschr(tmp, TEXT('.')); - TCHAR *e = _tcschr(tmp, TEXT('\0')); + TCHAR *p = _tcschr(tmp, _T('.')); + TCHAR *e = _tcschr(tmp, _T('\0')); int n=0, t; if (p == NULL) p = e; @@ -525,21 +528,21 @@ static void update_lcd_display(HWND hwnd) break; } while (--p > tmp) { - if (++n == t && *(p-1) != TEXT('-')) { + if (++n == t && *(p-1) != _T('-')) { memmove(p+1, p, (e-p+1)*sizeof(TCHAR)); e++; - *p = TEXT(' '); + *p = _T(' '); n = 0; } } /* if decimal mode, apply regional settings */ if (calc.base == IDC_RADIO_DEC) { TCHAR *p = tmp; - TCHAR *e = _tcschr(tmp, TEXT('.')); + TCHAR *e = _tcschr(tmp, _T('.')); /* searching for thousands default separator */ while (p < e) { - if (*p == TEXT(' ')) { + if (*p == _T(' ')) { memmove(p+calc.sThousand_len, p+1, _tcslen(p)*sizeof(TCHAR)); memcpy(p, calc.sThousand, calc.sThousand_len*sizeof(TCHAR)); p += calc.sThousand_len; @@ -551,7 +554,7 @@ static void update_lcd_display(HWND hwnd) memcpy(p, calc.sDecimal, calc.sDecimal_len*sizeof(TCHAR)); } } else { - TCHAR *p = _tcschr(tmp, TEXT('.')); + TCHAR *p = _tcschr(tmp, _T('.')); /* update decimal point when usesep is false */ if (p != NULL) { @@ -568,9 +571,9 @@ static void update_parent_display(HWND hWnd) int n = eval_parent_count(); if (!n) - str[0] = TEXT('\0'); + str[0] = _T('\0'); else - _stprintf(str,TEXT("(=%d"), n); + _stprintf(str,_T("(=%d"), n); SendDlgItemMessage(hWnd, IDC_TEXT_PARENT, WM_SETTEXT, 0, (LPARAM)str); } @@ -581,14 +584,14 @@ static void build_operand(HWND hwnd, DWORD idc) if (idc == IDC_BUTTON_DOT) { /* if dot is the first char, it's added automatically */ if (calc.buffer == calc.ptr) { - *calc.ptr++ = TEXT('0'); - *calc.ptr++ = TEXT('.'); - *calc.ptr = TEXT('\0'); + *calc.ptr++ = _T('0'); + *calc.ptr++ = _T('.'); + *calc.ptr = _T('\0'); update_lcd_display(hwnd); return; } /* if pressed dot and it's already in the string, then return */ - if (_tcschr(calc.buffer, TEXT('.')) != NULL) + if (_tcschr(calc.buffer, _T('.')) != NULL) return; } if (idc != IDC_STATIC) { @@ -597,8 +600,8 @@ static void build_operand(HWND hwnd, DWORD idc) n = calc.ptr - calc.buffer; if (idc == IDC_BUTTON_0 && n == 0) { /* no need to put the dot because it's handled by update_lcd_display() */ - calc.buffer[0] = TEXT('0'); - calc.buffer[1] = TEXT('\0'); + calc.buffer[0] = _T('0'); + calc.buffer[1] = _T('\0'); update_lcd_display(hwnd); return; } @@ -614,12 +617,12 @@ static void build_operand(HWND hwnd, DWORD idc) if (idc != IDC_STATIC) calc.esp = (calc.esp * 10 + (key2code[i].key-'0')) % LOCAL_EXP_SIZE; if (calc.ptr == calc.buffer) - _stprintf(calc.ptr, TEXT("0.e%+d"), calc.esp); + _stprintf(calc.ptr, _T("0.e%+d"), calc.esp); else { /* adds the dot at the end if the number has no decimal part */ - if (!_tcschr(calc.buffer, TEXT('.'))) - *calc.ptr++ = TEXT('.'); - _stprintf(calc.ptr, TEXT("e%+d"), calc.esp); + if (!_tcschr(calc.buffer, _T('.'))) + *calc.ptr++ = _T('.'); + _stprintf(calc.ptr, _T("e%+d"), calc.esp); } update_lcd_display(hwnd); return; @@ -634,7 +637,7 @@ static void build_operand(HWND hwnd, DWORD idc) return; break; } - calc.ptr += _stprintf(calc.ptr, TEXT("%C"), key2code[i].key); + calc.ptr += _stprintf(calc.ptr, _T("%C"), key2code[i].key); update_lcd_display(hwnd); } @@ -648,16 +651,21 @@ static void prepare_rpn_result(calc_number_t *rpn, TCHAR *buffer, int size, int prepare_rpn_result_2(rpn, buffer, size, base); } -static void display_rpn_result(HWND hwnd, calc_number_t *rpn) +static void set_rpn_result(HWND hwnd, calc_number_t *rpn) { calc.sci_in = FALSE; prepare_rpn_result(rpn, calc.buffer, SIZEOF(calc.buffer), calc.base); calc.ptr = calc.buffer + _tcslen(calc.buffer); update_lcd_display(hwnd); - calc.ptr = calc.buffer; update_parent_display(hwnd); } +static void display_rpn_result(HWND hwnd, calc_number_t *rpn) +{ + set_rpn_result(hwnd, rpn); + calc.ptr = calc.buffer; +} + static int get_modifiers(HWND hwnd) { int modifiers = 0; @@ -676,8 +684,8 @@ static void convert_text2number(calc_number_t *a) /* the operand is taken from the last input */ if (calc.buffer == calc.ptr) { /* if pushed valued is ZERO then we should grab it */ - if (!_tcscmp(calc.buffer, TEXT("0.")) || - !_tcscmp(calc.buffer, TEXT("0"))) + if (!_tcscmp(calc.buffer, _T("0.")) || + !_tcscmp(calc.buffer, _T("0"))) /* this zero is good for both integer and decimal */ rpn_zero(a); else @@ -871,7 +879,7 @@ static void update_n_stats_items(HWND hWnd, TCHAR *buffer) { unsigned int n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCOUNT, 0, 0); - _stprintf(buffer, TEXT("n=%d"), n); + _stprintf(buffer, _T("n=%u"), n); SendDlgItemMessage(hWnd, IDC_TEXT_NITEMS, WM_SETTEXT, 0, (LPARAM)buffer); } @@ -926,7 +934,7 @@ static char *ReadConversion(const char *formula) /* clear display content before proceeding */ calc.ptr = calc.buffer; - calc.buffer[0] = TEXT('\0'); + calc.buffer[0] = _T('\0'); return str; } @@ -970,10 +978,10 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } break; case WM_CLOSE: - clean_stat_list(); DestroyWindow(hWnd); return TRUE; case WM_DESTROY: + clean_stat_list(); PostMessage(GetParent(hWnd), WM_CLOSE_STATS, 0, 0); return TRUE; case WM_INSERT_STAT: @@ -1023,11 +1031,14 @@ static void CopyMemToClipboard(void *ptr) static void handle_copy_command(HWND hWnd) { - TCHAR display[sizeof(calc.buffer)]; + TCHAR display[MAX_CALC_SIZE]; + UINT n; + + n = GetDlgItemText(hWnd, IDC_TEXT_OUTPUT, display, SIZEOF(display)); - SendDlgItemMessage(hWnd, IDC_TEXT_OUTPUT, WM_GETTEXT, (WPARAM)SIZEOF(display), (LPARAM)display); if (calc.base == IDC_RADIO_DEC && _tcschr(calc.buffer, _T('.')) == NULL) - display[_tcslen(display)-calc.sDecimal_len] = TEXT('\0'); + display[n - calc.sDecimal_len] = _T('\0'); + CopyMemToClipboard(display); } @@ -1041,7 +1052,7 @@ static char *ReadClipboard(void) if (hData != NULL) { fromClipboard = (char *)GlobalLock(hData); - if (strlen(fromClipboard)) + if (fromClipboard[0]) buffer = _strupr(_strdup(fromClipboard)); GlobalUnlock( hData ); } @@ -1087,10 +1098,12 @@ static char *handle_sequence_input(HWND hwnd, sequence_t *seq) } } } - seq->ptr = ptr; + if (*ptr != '\0') + { + seq->ptr = ptr; PostMessage(hwnd, seq->wm_msg, 0, 0); - else { + } else { free(seq->data); seq->data = seq->ptr = ptr = NULL; } @@ -1715,6 +1728,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { PostMessage(hWnd, WM_COMMAND, IdcSim, 0); CheckDlgButton(hWnd, IDC_CHECK_INV, BST_UNCHECKED); + break; } } @@ -1750,9 +1764,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) TCHAR *ptr; calc.sci_in = FALSE; - ptr = _tcschr(calc.ptr, TEXT('e')); + ptr = _tcschr(calc.ptr, _T('e')); if (ptr) - *ptr = TEXT('\0'); + *ptr = _T('\0'); update_lcd_display(hWnd); } else { calc.esp /= 10; @@ -1760,12 +1774,12 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } } else if (calc.ptr != calc.buffer) { - *--calc.ptr = TEXT('\0'); - if (!_tcscmp(calc.buffer, TEXT("-")) || - !_tcscmp(calc.buffer, TEXT("-0")) || - !_tcscmp(calc.buffer, TEXT("0"))) { + *--calc.ptr = _T('\0'); + if (!_tcscmp(calc.buffer, _T("-")) || + !_tcscmp(calc.buffer, _T("-0")) || + !_tcscmp(calc.buffer, _T("0"))) { calc.ptr = calc.buffer; - calc.buffer[0] = TEXT('\0'); + calc.buffer[0] = _T('\0'); } update_lcd_display(hWnd); } @@ -1793,22 +1807,22 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.esp = 0-calc.esp; build_operand(hWnd, IDC_STATIC); } else { - if (calc.is_nan || calc.buffer[0] == TEXT('\0')) + if (calc.is_nan || calc.buffer[0] == _T('\0')) break; - if (calc.buffer[0] == TEXT('-')) { + if (calc.buffer[0] == _T('-')) { /* make the number positive */ memmove(calc.buffer, calc.buffer+1, sizeof(calc.buffer)-1); if (calc.buffer != calc.ptr) calc.ptr--; } else { /* if first char is '0' and no dot, it isn't valid */ - if (calc.buffer[0] == TEXT('0') && - calc.buffer[1] != TEXT('.')) + if (calc.buffer[0] == _T('0') && + calc.buffer[1] != _T('.')) break; /* make the number negative */ memmove(calc.buffer+1, calc.buffer, sizeof(calc.buffer)-1); - calc.buffer[0] = TEXT('-'); + calc.buffer[0] = _T('-'); if (calc.buffer != calc.ptr) calc.ptr++; } @@ -1871,14 +1885,20 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) if (cb != NULL) { convert_text2number(&calc.code); cb(&calc.code); - display_rpn_result(hWnd, &calc.code); -// if (!(function_table[x].range & NO_CHAIN)) -// exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); +// display_rpn_result(hWnd, &calc.code); + set_rpn_result(hWnd, &calc.code); + + if ((function_table[x].range & NO_CHAIN)) + calc.ptr = calc.buffer; + +// if (!(function_table[x].range & NO_CHAIN)) +// exec_infix2postfix(&calc.code, RPN_OPERATOR_NONE); if (function_table[x].range & MODIFIER_INV) SendDlgItemMessage(hWnd, IDC_CHECK_INV, BM_SETCHECK, 0, 0); if (function_table[x].range & MODIFIER_HYP) SendDlgItemMessage(hWnd, IDC_CHECK_HYP, BM_SETCHECK, 0, 0); } + break; } } return TRUE; @@ -1895,6 +1915,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } break; case WM_CLOSE_STATS: + calc.hStatWnd = NULL; enable_allowed_controls(hWnd, calc.base); return TRUE; case WM_LOAD_STAT:

5 years, 9 months

[reactos] 07/13: [CALC] Resource files formatting only.

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8db51e6058e6e96826cd1… commit 8db51e6058e6e96826cd1707fc02a0c5adf86549 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 21:11:59 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:04 2019 +0100 [CALC] Resource files formatting only. --- base/applications/calc/resource.h | 584 +++++++++++++++++++------------------ base/applications/calc/resource.rc | 21 +- 2 files changed, 311 insertions(+), 294 deletions(-) diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index 08e985cf73..d822f21596 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -1,130 +1,134 @@ #pragma once #ifndef IDC_STATIC -#define IDC_STATIC -1 +#define IDC_STATIC -1 #endif -#define IDS_CALC_NAME 1 -#define IDS_MATH_ERROR 2 -#define IDS_QUICKHELP 3 -#define IDS_AUTHOR 4 -#define IDD_DIALOG_SCIENTIFIC 101 -#define IDD_DIALOG_STANDARD 102 -#define IDD_DIALOG_STAT 104 -#define IDD_DIALOG_CONVERSION 105 -#define IDR_MENU_SCIENTIFIC_1 106 -#define IDR_MENU_SCIENTIFIC_2 107 -#define IDR_MENU_STANDARD 108 -#define IDI_CALC 110 -#define IDC_RADIO_HEX 1002 -#define IDC_RADIO_DEC 1003 -#define IDC_RADIO_OCT 1004 -#define IDC_RADIO_BIN 1005 -#define IDC_CHECK_INV 1006 -#define IDC_CHECK_HYP 1007 -#define IDC_BUTTON_STA 1009 -#define IDC_BUTTON_AVE 1010 -#define IDC_BUTTON_SUM 1011 -#define IDC_BUTTON_S 1012 -#define IDC_BUTTON_DAT 1013 -#define IDC_BUTTON_FE 1014 -#define IDC_BUTTON_DMS 1015 -#define IDC_BUTTON_SIN 1016 -#define IDC_BUTTON_COS 1017 -#define IDC_BUTTON_TAN 1018 -#define IDC_BUTTON_LEFTPAR 1019 -#define IDC_BUTTON_EXP 1020 -#define IDC_BUTTON_XeY 1021 -#define IDC_BUTTON_Xe2 1022 -#define IDC_BUTTON_Xe3 1023 -#define IDC_BUTTON_RIGHTPAR 1024 -#define IDC_BUTTON_LN 1025 -#define IDC_BUTTON_LOG 1026 -#define IDC_BUTTON_NF 1027 -#define IDC_BUTTON_RX 1028 -#define IDC_BUTTON_MC 1029 -#define IDC_BUTTON_MR 1030 -#define IDC_BUTTON_MS 1031 -#define IDC_BUTTON_MP 1032 -#define IDC_BUTTON_PI 1033 -#define IDC_BUTTON_7 1034 -#define IDC_BUTTON_4 1035 -#define IDC_BUTTON_1 1036 -#define IDC_BUTTON_0 1037 -#define IDC_BUTTON_A 1038 -#define IDC_BUTTON_8 1039 -#define IDC_BUTTON_5 1040 -#define IDC_BUTTON_2 1041 -#define IDC_BUTTON_SIGN 1042 -#define IDC_BUTTON_B 1043 -#define IDC_BUTTON_9 1044 -#define IDC_BUTTON_6 1045 -#define IDC_BUTTON_3 1046 -#define IDC_BUTTON_DOT 1047 -#define IDC_BUTTON_C 1048 -#define IDC_BUTTON_DIV 1049 -#define IDC_BUTTON_MULT 1050 -#define IDC_BUTTON_SUB 1051 -#define IDC_BUTTON_ADD 1052 -#define IDC_BUTTON_D 1053 -#define IDC_BUTTON_MOD 1054 -#define IDC_BUTTON_OR 1055 -#define IDC_BUTTON_LSH 1056 -#define IDC_BUTTON_EQU 1057 -#define IDC_BUTTON_E 1058 -#define IDC_BUTTON_AND 1059 -#define IDC_BUTTON_XOR 1060 -#define IDC_BUTTON_NOT 1061 -#define IDC_BUTTON_INT 1062 -#define IDC_BUTTON_F 1063 -#define IDC_RADIO_QWORD 1064 -#define IDC_RADIO_DWORD 1065 -#define IDC_RADIO_WORD 1066 -#define IDC_RADIO_BYTE 1067 -#define IDC_RADIO_DEG 1068 -#define IDC_RADIO_RAD 1069 -#define IDC_RADIO_GRAD 1070 -#define IDC_BUTTON_CANC 1071 -#define IDC_BUTTON_CE 1072 -#define IDC_BUTTON_BACK 1073 -#define IDC_TEXT_OUTPUT 1074 -#define IDC_TEXT_PARENT 1075 -#define IDC_TEXT_MEMORY 1076 -#define IDC_LIST_STAT 1079 -#define IDC_BUTTON_RET 1080 -#define IDC_BUTTON_LOAD 1081 -#define IDC_BUTTON_CD 1082 -#define IDC_BUTTON_CAD 1083 -#define IDC_TEXT_NITEMS 1084 -#define IDC_BUTTON_SQRT 1085 -#define IDC_BUTTON_PERCENT 1086 -#define IDC_BUTTON_CONVERT 1087 -#define IDC_BUTTON_FOCUS 1089 -#define IDC_COMBO_CATEGORY 1090 -#define IDC_COMBO_FROM 1091 -#define IDC_COMBO_TO 1092 -#define IDC_BUTTON_RSH 1093 -#define IDC_BUTTON_XrY 1094 +#define IDS_CALC_NAME 1 +#define IDS_MATH_ERROR 2 +#define IDS_QUICKHELP 3 +#define IDS_AUTHOR 4 +#define IDD_DIALOG_SCIENTIFIC 101 +#define IDD_DIALOG_STANDARD 102 +// #define IDD_DIALOG_ABOUT 103 +#define IDD_DIALOG_STAT 104 +#define IDD_DIALOG_CONVERSION 105 +#define IDR_MENU_SCIENTIFIC_1 106 +#define IDR_MENU_SCIENTIFIC_2 107 +#define IDR_MENU_STANDARD 108 +// #define IDB_BITMAP_ROS 109 +#define IDI_CALC 110 +#define IDC_RADIO_HEX 1002 +#define IDC_RADIO_DEC 1003 +#define IDC_RADIO_OCT 1004 +#define IDC_RADIO_BIN 1005 +#define IDC_CHECK_INV 1006 +#define IDC_CHECK_HYP 1007 +#define IDC_BUTTON_STA 1009 +#define IDC_BUTTON_AVE 1010 +#define IDC_BUTTON_SUM 1011 +#define IDC_BUTTON_S 1012 +#define IDC_BUTTON_DAT 1013 +#define IDC_BUTTON_FE 1014 +#define IDC_BUTTON_DMS 1015 +#define IDC_BUTTON_SIN 1016 +#define IDC_BUTTON_COS 1017 +#define IDC_BUTTON_TAN 1018 +#define IDC_BUTTON_LEFTPAR 1019 +#define IDC_BUTTON_EXP 1020 +#define IDC_BUTTON_XeY 1021 +#define IDC_BUTTON_Xe2 1022 +#define IDC_BUTTON_Xe3 1023 +#define IDC_BUTTON_RIGHTPAR 1024 +#define IDC_BUTTON_LN 1025 +#define IDC_BUTTON_LOG 1026 +#define IDC_BUTTON_NF 1027 +#define IDC_BUTTON_RX 1028 +#define IDC_BUTTON_MC 1029 +#define IDC_BUTTON_MR 1030 +#define IDC_BUTTON_MS 1031 +#define IDC_BUTTON_MP 1032 +#define IDC_BUTTON_PI 1033 +#define IDC_BUTTON_7 1034 +#define IDC_BUTTON_4 1035 +#define IDC_BUTTON_1 1036 +#define IDC_BUTTON_0 1037 +#define IDC_BUTTON_A 1038 +#define IDC_BUTTON_8 1039 +#define IDC_BUTTON_5 1040 +#define IDC_BUTTON_2 1041 +#define IDC_BUTTON_SIGN 1042 +#define IDC_BUTTON_B 1043 +#define IDC_BUTTON_9 1044 +#define IDC_BUTTON_6 1045 +#define IDC_BUTTON_3 1046 +#define IDC_BUTTON_DOT 1047 +#define IDC_BUTTON_C 1048 +#define IDC_BUTTON_DIV 1049 +#define IDC_BUTTON_MULT 1050 +#define IDC_BUTTON_SUB 1051 +#define IDC_BUTTON_ADD 1052 +#define IDC_BUTTON_D 1053 +#define IDC_BUTTON_MOD 1054 +#define IDC_BUTTON_OR 1055 +#define IDC_BUTTON_LSH 1056 +#define IDC_BUTTON_EQU 1057 +#define IDC_BUTTON_E 1058 +#define IDC_BUTTON_AND 1059 +#define IDC_BUTTON_XOR 1060 +#define IDC_BUTTON_NOT 1061 +#define IDC_BUTTON_INT 1062 +#define IDC_BUTTON_F 1063 +#define IDC_RADIO_QWORD 1064 +#define IDC_RADIO_DWORD 1065 +#define IDC_RADIO_WORD 1066 +#define IDC_RADIO_BYTE 1067 +#define IDC_RADIO_DEG 1068 +#define IDC_RADIO_RAD 1069 +#define IDC_RADIO_GRAD 1070 +#define IDC_BUTTON_CANC 1071 +#define IDC_BUTTON_CE 1072 +#define IDC_BUTTON_BACK 1073 +#define IDC_TEXT_OUTPUT 1074 +#define IDC_TEXT_PARENT 1075 +#define IDC_TEXT_MEMORY 1076 +// #define IDC_EDIT_LICENSE 1078 +#define IDC_LIST_STAT 1079 +#define IDC_BUTTON_RET 1080 +#define IDC_BUTTON_LOAD 1081 +#define IDC_BUTTON_CD 1082 +#define IDC_BUTTON_CAD 1083 +#define IDC_TEXT_NITEMS 1084 +#define IDC_BUTTON_SQRT 1085 +#define IDC_BUTTON_PERCENT 1086 +#define IDC_BUTTON_CONVERT 1087 +// #define IDC_TEXT_VERSION 1088 +#define IDC_BUTTON_FOCUS 1089 +#define IDC_COMBO_CATEGORY 1090 +#define IDC_COMBO_FROM 1091 +#define IDC_COMBO_TO 1092 +#define IDC_BUTTON_RSH 1093 +#define IDC_BUTTON_XrY 1094 /* TYPES OF CONVERSIONS */ -#define IDS_CONV_ANGLE 2000 -#define IDS_CONV_AREA 2001 -#define IDS_CONV_CONSUMPTION 2002 -#define IDS_CONV_CURRENCY 2003 -#define IDS_CONV_ENERGY 2004 -#define IDS_CONV_LENGTH 2005 -#define IDS_CONV_POWER 2006 -#define IDS_CONV_PRESSURE 2007 -#define IDS_CONV_TEMPERATURE 2008 -#define IDS_CONV_TIME 2009 -#define IDS_CONV_VELOCITY 2010 -#define IDS_CONV_VOLUME 2011 -#define IDS_CONV_WEIGHT 2012 +#define IDS_CONV_ANGLE 2000 +#define IDS_CONV_AREA 2001 +#define IDS_CONV_CONSUMPTION 2002 +#define IDS_CONV_CURRENCY 2003 +#define IDS_CONV_ENERGY 2004 +#define IDS_CONV_LENGTH 2005 +#define IDS_CONV_POWER 2006 +#define IDS_CONV_PRESSURE 2007 +#define IDS_CONV_TEMPERATURE 2008 +#define IDS_CONV_TIME 2009 +#define IDS_CONV_VELOCITY 2010 +#define IDS_CONV_VOLUME 2011 +#define IDS_CONV_WEIGHT 2012 /* TYPES OF ANGLES */ -#define IDS_ANGLE_DEGREES 2100 -#define IDS_ANGLE_GRADIANS 2101 -#define IDS_ANGLE_RADIANS 2102 +#define IDS_ANGLE_DEGREES 2100 +#define IDS_ANGLE_GRADIANS 2101 +#define IDS_ANGLE_RADIANS 2102 /* TYPES OF AREAS */ #define IDS_AREA_ACRES 2200 @@ -192,193 +196,193 @@ #define IDS_CURRENCY_SPANISH_PESETA 2420 /* TYPES OF ENERGIES */ -#define IDS_ENERGY_15_C_CALORIES 2500 -#define IDS_ENERGY_BTUS 2501 -#define IDS_ENERGY_ERGS 2502 -#define IDS_ENERGY_EVS 2503 -#define IDS_ENERGY_FOOT_POUNDS 2504 -#define IDS_ENERGY_IT_CALORIES 2505 -#define IDS_ENERGY_IT_KILOCALORIES 2506 -#define IDS_ENERGY_JOULES 2507 -#define IDS_ENERGY_KILOJOULES 2508 -#define IDS_ENERGY_KILOWATT_HOURS 2509 -#define IDS_ENERGY_NUTRITION_CALORIES 2510 -#define IDS_ENERGY_TH_CALORIES 2511 +#define IDS_ENERGY_15_C_CALORIES 2500 +#define IDS_ENERGY_BTUS 2501 +#define IDS_ENERGY_ERGS 2502 +#define IDS_ENERGY_EVS 2503 +#define IDS_ENERGY_FOOT_POUNDS 2504 +#define IDS_ENERGY_IT_CALORIES 2505 +#define IDS_ENERGY_IT_KILOCALORIES 2506 +#define IDS_ENERGY_JOULES 2507 +#define IDS_ENERGY_KILOJOULES 2508 +#define IDS_ENERGY_KILOWATT_HOURS 2509 +#define IDS_ENERGY_NUTRITION_CALORIES 2510 +#define IDS_ENERGY_TH_CALORIES 2511 /* TYPES OF LENGTHS */ -#define IDS_LENGTH_ANGSTROMS 2600 -#define IDS_LENGTH_ASTRONOMICAL_UNITS 2601 -#define IDS_LENGTH_BARLEYCORNS 2602 -#define IDS_LENGTH_CENTIMETERS 2603 -#define IDS_LENGTH_CHAINS_UK 2604 -#define IDS_LENGTH_CHI 2605 -#define IDS_LENGTH_CHOU 2606 -#define IDS_LENGTH_CHR 2607 -#define IDS_LENGTH_CUN 2608 -#define IDS_LENGTH_FATHOMS 2609 -#define IDS_LENGTH_FATHOMS_HUNGARY 2610 -#define IDS_LENGTH_FEET 2611 -#define IDS_LENGTH_FURLONGS 2612 -#define IDS_LENGTH_GAN 2613 -#define IDS_LENGTH_HANDS 2614 -#define IDS_LENGTH_HUNH 2615 -#define IDS_LENGTH_INCHES 2616 -#define IDS_LENGTH_JA 2617 -#define IDS_LENGTH_JEONG 2618 -#define IDS_LENGTH_KABIET 2619 -#define IDS_LENGTH_KEN 2620 -#define IDS_LENGTH_KEUB 2621 -#define IDS_LENGTH_KILOMETERS 2622 -#define IDS_LENGTH_LAR 2623 -#define IDS_LENGTH_LIGHT_YEARS 2624 -#define IDS_LENGTH_LINKS_UK 2625 -#define IDS_LENGTH_METERS 2626 -#define IDS_LENGTH_MICRONS 2627 -#define IDS_LENGTH_MILES 2628 -#define IDS_LENGTH_MILLIMETERS 2629 -#define IDS_LENGTH_NAUTICAL_MILES 2630 -#define IDS_LENGTH_NIEU 2631 -#define IDS_LENGTH_PARSECS 2632 -#define IDS_LENGTH_PICAS 2633 -#define IDS_LENGTH_RODS 2634 -#define IDS_LENGTH_RI_JAPAN 2635 -#define IDS_LENGTH_RI_KOREA 2636 -#define IDS_LENGTH_SAWK 2637 -#define IDS_LENGTH_SEN 2638 -#define IDS_LENGTH_SHAKU 2639 -#define IDS_LENGTH_SPAN 2640 -#define IDS_LENGTH_SUN 2641 -#define IDS_LENGTH_TSUEN 2642 -#define IDS_LENGTH_VA 2643 -#define IDS_LENGTH_YARDS 2644 -#define IDS_LENGTH_YOTE 2645 -#define IDS_LENGTH_ZHANG 2646 +#define IDS_LENGTH_ANGSTROMS 2600 +#define IDS_LENGTH_ASTRONOMICAL_UNITS 2601 +#define IDS_LENGTH_BARLEYCORNS 2602 +#define IDS_LENGTH_CENTIMETERS 2603 +#define IDS_LENGTH_CHAINS_UK 2604 +#define IDS_LENGTH_CHI 2605 +#define IDS_LENGTH_CHOU 2606 +#define IDS_LENGTH_CHR 2607 +#define IDS_LENGTH_CUN 2608 +#define IDS_LENGTH_FATHOMS 2609 +#define IDS_LENGTH_FATHOMS_HUNGARY 2610 +#define IDS_LENGTH_FEET 2611 +#define IDS_LENGTH_FURLONGS 2612 +#define IDS_LENGTH_GAN 2613 +#define IDS_LENGTH_HANDS 2614 +#define IDS_LENGTH_HUNH 2615 +#define IDS_LENGTH_INCHES 2616 +#define IDS_LENGTH_JA 2617 +#define IDS_LENGTH_JEONG 2618 +#define IDS_LENGTH_KABIET 2619 +#define IDS_LENGTH_KEN 2620 +#define IDS_LENGTH_KEUB 2621 +#define IDS_LENGTH_KILOMETERS 2622 +#define IDS_LENGTH_LAR 2623 +#define IDS_LENGTH_LIGHT_YEARS 2624 +#define IDS_LENGTH_LINKS_UK 2625 +#define IDS_LENGTH_METERS 2626 +#define IDS_LENGTH_MICRONS 2627 +#define IDS_LENGTH_MILES 2628 +#define IDS_LENGTH_MILLIMETERS 2629 +#define IDS_LENGTH_NAUTICAL_MILES 2630 +#define IDS_LENGTH_NIEU 2631 +#define IDS_LENGTH_PARSECS 2632 +#define IDS_LENGTH_PICAS 2633 +#define IDS_LENGTH_RODS 2634 +#define IDS_LENGTH_RI_JAPAN 2635 +#define IDS_LENGTH_RI_KOREA 2636 +#define IDS_LENGTH_SAWK 2637 +#define IDS_LENGTH_SEN 2638 +#define IDS_LENGTH_SHAKU 2639 +#define IDS_LENGTH_SPAN 2640 +#define IDS_LENGTH_SUN 2641 +#define IDS_LENGTH_TSUEN 2642 +#define IDS_LENGTH_VA 2643 +#define IDS_LENGTH_YARDS 2644 +#define IDS_LENGTH_YOTE 2645 +#define IDS_LENGTH_ZHANG 2646 /* TYPES OF POWERS */ -#define IDS_POWER_BTUS_PER_MINUTE 2700 -#define IDS_POWER_FPS_PER_MINUTE 2701 -#define IDS_POWER_HORSEPOWER 2702 -#define IDS_POWER_KILOWATTS 2703 -#define IDS_POWER_MEGAWATTS 2704 -#define IDS_POWER_WATTS 2705 +#define IDS_POWER_BTUS_PER_MINUTE 2700 +#define IDS_POWER_FPS_PER_MINUTE 2701 +#define IDS_POWER_HORSEPOWER 2702 +#define IDS_POWER_KILOWATTS 2703 +#define IDS_POWER_MEGAWATTS 2704 +#define IDS_POWER_WATTS 2705 /* TYPE OF PRESSURES */ -#define IDS_PRESSURE_ATMOSPHERES 2800 -#define IDS_PRESSURE_BARS 2801 -#define IDS_PRESSURE_HECTOPASCALS 2802 -#define IDS_PRESSURE_KILOPASCALS 2803 -#define IDS_PRESSURE_MM_OF_MERCURY 2804 -#define IDS_PRESSURE_PASCALS 2805 -#define IDS_PRESSURE_PSI 2806 +#define IDS_PRESSURE_ATMOSPHERES 2800 +#define IDS_PRESSURE_BARS 2801 +#define IDS_PRESSURE_HECTOPASCALS 2802 +#define IDS_PRESSURE_KILOPASCALS 2803 +#define IDS_PRESSURE_MM_OF_MERCURY 2804 +#define IDS_PRESSURE_PASCALS 2805 +#define IDS_PRESSURE_PSI 2806 /* TYPES OF TEMPERATURES */ -#define IDS_TEMPERATURE_CELSIUS 2900 -#define IDS_TEMPERATURE_FAHRENHEIT 2901 -#define IDS_TEMPERATURE_KELVIN 2902 -#define IDS_TEMPERATURE_RANKINE 2903 +#define IDS_TEMPERATURE_CELSIUS 2900 +#define IDS_TEMPERATURE_FAHRENHEIT 2901 +#define IDS_TEMPERATURE_KELVIN 2902 +#define IDS_TEMPERATURE_RANKINE 2903 /* TYPE OF TIME */ -#define IDS_TIME_DAYS 3001 -#define IDS_TIME_HOURS 3002 -#define IDS_TIME_MICROSECONDS 3003 -#define IDS_TIME_MILLISECONDS 3004 -#define IDS_TIME_NANOSECONDS 3005 -#define IDS_TIME_MINUTES 3006 -#define IDS_TIME_SECONDS 3007 -#define IDS_TIME_WEEKS 3008 -#define IDS_TIME_YEARS 3009 +#define IDS_TIME_DAYS 3001 +#define IDS_TIME_HOURS 3002 +#define IDS_TIME_MICROSECONDS 3003 +#define IDS_TIME_MILLISECONDS 3004 +#define IDS_TIME_NANOSECONDS 3005 +#define IDS_TIME_MINUTES 3006 +#define IDS_TIME_SECONDS 3007 +#define IDS_TIME_WEEKS 3008 +#define IDS_TIME_YEARS 3009 /* TYPES OF VELOCITIES */ -#define IDS_VELOCITY_CMS_SECOND 3100 -#define IDS_VELOCITY_FEET_SECOND 3101 -#define IDS_VELOCITY_FEET_HOUR 3102 -#define IDS_VELOCITY_KILOMETERS_HOUR 3103 -#define IDS_VELOCITY_KNOTS 3104 -#define IDS_VELOCITY_MACH 3105 -#define IDS_VELOCITY_METERS_SECOND 3106 -#define IDS_VELOCITY_MILES_HOUR 3107 +#define IDS_VELOCITY_CMS_SECOND 3100 +#define IDS_VELOCITY_FEET_SECOND 3101 +#define IDS_VELOCITY_FEET_HOUR 3102 +#define IDS_VELOCITY_KILOMETERS_HOUR 3103 +#define IDS_VELOCITY_KNOTS 3104 +#define IDS_VELOCITY_MACH 3105 +#define IDS_VELOCITY_METERS_SECOND 3106 +#define IDS_VELOCITY_MILES_HOUR 3107 /* TYPES OF VOLUMES */ -#define IDS_VOLUME_BARRELS_UK 3200 -#define IDS_VOLUME_BARRELS_OIL 3201 -#define IDS_VOLUME_BUN 3202 -#define IDS_VOLUME_BUSHELS_UK 3203 -#define IDS_VOLUME_BUSHELS_US 3204 -#define IDS_VOLUME_CUBIC_CENTIMETERS 3205 -#define IDS_VOLUME_CUBIC_FEET 3206 -#define IDS_VOLUME_CUBIC_INCHES 3207 -#define IDS_VOLUME_CUBIC_METERS 3208 -#define IDS_VOLUME_CUBIC_YARDS 3209 -#define IDS_VOLUME_DOE 3210 -#define IDS_VOLUME_FLUID_OUNCES_UK 3211 -#define IDS_VOLUME_FLUID_OUNCES_US 3212 -#define IDS_VOLUME_GALLONS_UK 3213 -#define IDS_VOLUME_GALLONS_DRY_US 3214 -#define IDS_VOLUME_GALLONS_LIQUID_US 3215 -#define IDS_VOLUME_GOU 3216 -#define IDS_VOLUME_HOP 3217 -#define IDS_VOLUME_ICCE 3218 -#define IDS_VOLUME_KWIAN 3219 -#define IDS_VOLUME_LITERS 3220 -#define IDS_VOLUME_MAL 3221 -#define IDS_VOLUME_MILLILITERS 3222 -#define IDS_VOLUME_PINTS_UK 3223 -#define IDS_VOLUME_PINTS_DRY_US 3224 -#define IDS_VOLUME_PINTS_LIQUID_US 3225 -#define IDS_VOLUME_QUARTS_UK 3226 -#define IDS_VOLUME_QUARTS_DRY_US 3227 -#define IDS_VOLUME_QUARTS_LIQUID_US 3228 -#define IDS_VOLUME_SEKI 3229 -#define IDS_VOLUME_SYOU 3230 -#define IDS_VOLUME_TANANLOUNG 3231 -#define IDS_VOLUME_TANG 3232 -#define IDS_VOLUME_TO 3233 +#define IDS_VOLUME_BARRELS_UK 3200 +#define IDS_VOLUME_BARRELS_OIL 3201 +#define IDS_VOLUME_BUN 3202 +#define IDS_VOLUME_BUSHELS_UK 3203 +#define IDS_VOLUME_BUSHELS_US 3204 +#define IDS_VOLUME_CUBIC_CENTIMETERS 3205 +#define IDS_VOLUME_CUBIC_FEET 3206 +#define IDS_VOLUME_CUBIC_INCHES 3207 +#define IDS_VOLUME_CUBIC_METERS 3208 +#define IDS_VOLUME_CUBIC_YARDS 3209 +#define IDS_VOLUME_DOE 3210 +#define IDS_VOLUME_FLUID_OUNCES_UK 3211 +#define IDS_VOLUME_FLUID_OUNCES_US 3212 +#define IDS_VOLUME_GALLONS_UK 3213 +#define IDS_VOLUME_GALLONS_DRY_US 3214 +#define IDS_VOLUME_GALLONS_LIQUID_US 3215 +#define IDS_VOLUME_GOU 3216 +#define IDS_VOLUME_HOP 3217 +#define IDS_VOLUME_ICCE 3218 +#define IDS_VOLUME_KWIAN 3219 +#define IDS_VOLUME_LITERS 3220 +#define IDS_VOLUME_MAL 3221 +#define IDS_VOLUME_MILLILITERS 3222 +#define IDS_VOLUME_PINTS_UK 3223 +#define IDS_VOLUME_PINTS_DRY_US 3224 +#define IDS_VOLUME_PINTS_LIQUID_US 3225 +#define IDS_VOLUME_QUARTS_UK 3226 +#define IDS_VOLUME_QUARTS_DRY_US 3227 +#define IDS_VOLUME_QUARTS_LIQUID_US 3228 +#define IDS_VOLUME_SEKI 3229 +#define IDS_VOLUME_SYOU 3230 +#define IDS_VOLUME_TANANLOUNG 3231 +#define IDS_VOLUME_TANG 3232 +#define IDS_VOLUME_TO 3233 /* TYPES OF WEIGHTS */ -#define IDS_WEIGHT_BAHT 3300 -#define IDS_WEIGHT_CARATS 3301 -#define IDS_WEIGHT_CHUNG 3302 -#define IDS_WEIGHT_DON 3303 -#define IDS_WEIGHT_GEUN 3304 -#define IDS_WEIGHT_GRAMS 3305 -#define IDS_WEIGHT_GWAN 3306 -#define IDS_WEIGHT_HARB 3307 -#define IDS_WEIGHT_JIN_CHINA 3308 -#define IDS_WEIGHT_JIN_TAIWAN 3309 -#define IDS_WEIGHT_KAN 3310 -#define IDS_WEIGHT_KILOGRAMS 3311 -#define IDS_WEIGHT_KIN 3312 -#define IDS_WEIGHT_LIANG_CHINA 3313 -#define IDS_WEIGHT_LIANG_TAIWAN 3314 -#define IDS_WEIGHT_MONME 3315 -#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3316 -#define IDS_WEIGHT_OUNCES_TROY 3317 -#define IDS_WEIGHT_POUNDS 3318 -#define IDS_WEIGHT_QUINTAL_METRIC 3319 -#define IDS_WEIGHT_SALOUNG 3320 -#define IDS_WEIGHT_STONES 3321 -#define IDS_WEIGHT_TAMLUNG 3322 -#define IDS_WEIGHT_TONNES 3323 -#define IDS_WEIGHT_TONS_UK 3324 -#define IDS_WEIGHT_TONS_US 3325 +#define IDS_WEIGHT_BAHT 3300 +#define IDS_WEIGHT_CARATS 3301 +#define IDS_WEIGHT_CHUNG 3302 +#define IDS_WEIGHT_DON 3303 +#define IDS_WEIGHT_GEUN 3304 +#define IDS_WEIGHT_GRAMS 3305 +#define IDS_WEIGHT_GWAN 3306 +#define IDS_WEIGHT_HARB 3307 +#define IDS_WEIGHT_JIN_CHINA 3308 +#define IDS_WEIGHT_JIN_TAIWAN 3309 +#define IDS_WEIGHT_KAN 3310 +#define IDS_WEIGHT_KILOGRAMS 3311 +#define IDS_WEIGHT_KIN 3312 +#define IDS_WEIGHT_LIANG_CHINA 3313 +#define IDS_WEIGHT_LIANG_TAIWAN 3314 +#define IDS_WEIGHT_MONME 3315 +#define IDS_WEIGHT_OUNCES_AVOIRDUPOIS 3316 +#define IDS_WEIGHT_OUNCES_TROY 3317 +#define IDS_WEIGHT_POUNDS 3318 +#define IDS_WEIGHT_QUINTAL_METRIC 3319 +#define IDS_WEIGHT_SALOUNG 3320 +#define IDS_WEIGHT_STONES 3321 +#define IDS_WEIGHT_TAMLUNG 3322 +#define IDS_WEIGHT_TONNES 3323 +#define IDS_WEIGHT_TONS_UK 3324 +#define IDS_WEIGHT_TONS_US 3325 /* MENU */ -#define IDM_EDIT_COPY 40002 -#define IDM_EDIT_PASTE 40003 -#define IDM_VIEW_STANDARD 40004 -#define IDM_VIEW_SCIENTIFIC 40005 -#define IDM_VIEW_HEX 40006 -#define IDM_VIEW_DEC 40007 -#define IDM_VIEW_OCT 40008 -#define IDM_VIEW_BIN 40009 -#define IDM_VIEW_DEG 40010 -#define IDM_VIEW_RAD 40011 -#define IDM_VIEW_GRAD 40012 -#define IDM_VIEW_GROUP 40013 -#define IDM_HELP_HELP 40014 -#define IDM_HELP_ABOUT 40015 -#define IDM_VIEW_QWORD 40016 -#define IDM_VIEW_WORD 40017 -#define IDM_VIEW_BYTE 40018 -#define IDM_VIEW_DWORD 40019 -#define IDM_VIEW_CONVERSION 40020 +#define IDM_EDIT_COPY 40002 +#define IDM_EDIT_PASTE 40003 +#define IDM_VIEW_STANDARD 40004 +#define IDM_VIEW_SCIENTIFIC 40005 +#define IDM_VIEW_HEX 40006 +#define IDM_VIEW_DEC 40007 +#define IDM_VIEW_OCT 40008 +#define IDM_VIEW_BIN 40009 +#define IDM_VIEW_DEG 40010 +#define IDM_VIEW_RAD 40011 +#define IDM_VIEW_GRAD 40012 +#define IDM_VIEW_GROUP 40013 +#define IDM_HELP_HELP 40014 +#define IDM_HELP_ABOUT 40015 +#define IDM_VIEW_QWORD 40016 +#define IDM_VIEW_WORD 40017 +#define IDM_VIEW_BYTE 40018 +#define IDM_VIEW_DWORD 40019 +#define IDM_VIEW_CONVERSION 40020 diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc index 9bb5620d8a..3d0ba86e82 100644 --- a/base/applications/calc/resource.rc +++ b/base/applications/calc/resource.rc @@ -1,8 +1,21 @@ /* - * PROJECT: ReactOS Calc - * LICENSE: LGPL - See COPYING.LIB in the top level directory - * FILE: base/applications/calc/resource.rc - * PURPOSE: Global resource file + * ReactOS Calc (global resource file) + * + * Copyright 2007, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include <windef.h>

5 years, 9 months

[reactos] 06/13: [CALC] Improve the handling of configuration settings. CORE-3085, CORE-8486

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=857a951f485e1a7043806… commit 857a951f485e1a704380681b314e13474d86ba40 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 21:00:43 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:03 2019 +0100 [CALC] Improve the handling of configuration settings. CORE-3085, CORE-8486 Configuration is read from WIN.INI under W32S/Win9x/Me and from the registry for all NT platforms. Although with INI file mapping the keys are still saved in the registry even on NT, I added handling of different platforms for writing directly the configuration in the right place. --- base/applications/calc/winmain.c | 160 ++++++++++++++++++++++++++------------- 1 file changed, 106 insertions(+), 54 deletions(-) diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index fceb41fc96..37e194dc09 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -250,80 +250,108 @@ calc_t calc; BTNINFO BtnInfo[255]; UINT BtnCount; -static void load_config(void) +static void UpdateNumberIntl(void) { + /* Get current user defaults */ + if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDECIMAL, calc.sDecimal, SIZEOF(calc.sDecimal))) + _tcscpy(calc.sDecimal, _T(".")); + + if (!GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STHOUSAND, calc.sThousand, SIZEOF(calc.sThousand))) + _tcscpy(calc.sThousand, _T(",")); + + /* get the string lengths */ + calc.sDecimal_len = _tcslen(calc.sDecimal); + calc.sThousand_len = _tcslen(calc.sThousand); +} + +static int LoadRegInt(LPCTSTR lpszApp, LPCTSTR lpszKey, int iDefault) +{ + HKEY hKey; + int iValue; DWORD tmp; - HKEY hKey; - - /* If no settings are found in the registry, then use the default options */ - calc.layout = CALC_LAYOUT_STANDARD; - calc.usesep = FALSE; - /* Get the configuration based on what version of Windows that's being used */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegOpenKeyEx(HKEY_CURRENT_USER, lpszApp, 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) { - /* Try to load last selected layout */ - tmp = sizeof(calc.layout); - if (RegQueryValueEx(hKey, TEXT("layout"), NULL, NULL, (LPBYTE)&calc.layout, &tmp) != ERROR_SUCCESS) - calc.layout = CALC_LAYOUT_STANDARD; + /* Try to load integer value */ + tmp = sizeof(int); - /* Try to load last selected formatting option */ - tmp = sizeof(calc.usesep); - if (RegQueryValueEx(hKey, TEXT("UseSep"), NULL, NULL, (LPBYTE)&calc.usesep, &tmp) != ERROR_SUCCESS) - calc.usesep = FALSE; + if (RegQueryValueEx(hKey, lpszKey, NULL, NULL, (LPBYTE)&iValue, &tmp) == ERROR_SUCCESS) + iDefault = iValue; /* close the key */ RegCloseKey(hKey); } - /* memory is empty at startup */ - calc.is_memory = FALSE; + return iDefault; +} - /* empty these values */ - calc.sDecimal[0] = TEXT('\0'); - calc.sThousand[0] = TEXT('\0'); +static void SaveRegInt(LPCTSTR lpszApp, LPCTSTR lpszKey, int iValue) +{ + HKEY hKey; - /* try to open the registry */ - if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + if (RegCreateKeyEx(HKEY_CURRENT_USER, lpszApp, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) == ERROR_SUCCESS) { - /* get these values (ignore errors) */ - tmp = sizeof(calc.sDecimal); - RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp); - - tmp = sizeof(calc.sThousand); - RegQueryValueEx(hKey, TEXT("sThousand"), NULL, NULL, (LPBYTE)calc.sThousand, &tmp); + RegSetValueEx(hKey, lpszKey, 0, REG_DWORD, (const BYTE*)&iValue, sizeof(int)); /* close the key */ RegCloseKey(hKey); } - /* if something goes wrong, let's apply the defaults */ - if (calc.sDecimal[0] == TEXT('\0')) - _tcscpy(calc.sDecimal, TEXT(".")); +} - if (calc.sThousand[0] == TEXT('\0')) - _tcscpy(calc.sThousand, TEXT(",")); +static void load_config(void) +{ + OSVERSIONINFO osvi; - /* get the string lengths */ - calc.sDecimal_len = _tcslen(calc.sDecimal); - calc.sThousand_len = _tcslen(calc.sThousand); + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionEx(&osvi); + + switch (osvi.dwPlatformId) { + case VER_PLATFORM_WIN32s: + case VER_PLATFORM_WIN32_WINDOWS: + /* Try to load last selected layout */ + calc.layout = GetProfileInt(_T("SciCalc"), _T("layout"), CALC_LAYOUT_STANDARD); + + /* Try to load last selected formatting option */ + calc.usesep = (GetProfileInt(_T("SciCalc"), _T("UseSep"), FALSE)) ? TRUE : FALSE; + break; + + default: /* VER_PLATFORM_WIN32_NT */ + /* Try to load last selected layout */ + calc.layout = LoadRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("layout"), CALC_LAYOUT_STANDARD); + + /* Try to load last selected formatting option */ + calc.usesep = (LoadRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("UseSep"), FALSE)) ? TRUE : FALSE; + break; + } + + /* memory is empty at startup */ + calc.is_memory = FALSE; + + /* Get locale info for numbers */ + UpdateNumberIntl(); } static void save_config(void) { - HKEY hKey; - DWORD sepValue; + TCHAR buf[32]; + OSVERSIONINFO osvi; + + osvi.dwOSVersionInfoSize = sizeof(osvi); + GetVersionEx(&osvi); + + switch (osvi.dwPlatformId) { + case VER_PLATFORM_WIN32s: + case VER_PLATFORM_WIN32_WINDOWS: + _stprintf(buf, _T("%lu"), calc.layout); + WriteProfileString(_T("SciCalc"), _T("layout"), buf); + WriteProfileString(_T("SciCalc"), _T("UseSep"), (calc.usesep==TRUE) ? _T("1") : _T("0")); + break; - if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS) - { - return; + default: /* VER_PLATFORM_WIN32_NT */ + SaveRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("layout"), calc.layout); + SaveRegInt(_T("SOFTWARE\\Microsoft\\Calc"), _T("UseSep"), calc.usesep); + break; } - - sepValue = (calc.usesep) ? 1 : 0; - - RegSetValueEx(hKey, TEXT("layout"), 0, REG_DWORD, (const BYTE*)&calc.layout, sizeof(calc.layout)); - RegSetValueEx(hKey, TEXT("UseSep"), 0, REG_DWORD, (const BYTE*)&sepValue, sizeof(sepValue)); - - RegCloseKey(hKey); } static LRESULT post_key_press(LPARAM lParam, WORD idc) @@ -1371,6 +1399,29 @@ static BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam) return TRUE; } +static INT_PTR CALLBACK OnSettingChange(HWND hWnd, WPARAM wParam, LPARAM lParam) +{ + /* Check for user policy and area string valid */ + if (wParam == 0 && lParam != 0) + { + LPTSTR lpArea = (LPTSTR)lParam; + + /* Check if a parameter has been changed into the locale settings */ + if (!_tcsicmp(lpArea, _T("intl"))) + { + /* Re-load locale parameters */ + UpdateNumberIntl(); + + /* Update text for decimal button */ + SetDlgItemText(hWnd, IDC_BUTTON_DOT, calc.sDecimal); + + /* Update text into the output display */ + update_lcd_display(hWnd); + } + } + return 0; +} + static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; @@ -1449,7 +1500,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case WM_COMMAND: /* * if selection of category is changed, we must - * updatethe content of the "from/to" combo boxes. + * update the content of the "from/to" combo boxes. */ if (wp == MAKEWPARAM(IDC_COMBO_CATEGORY, CBN_SELCHANGE)) { ConvAdjust(hWnd, SendDlgItemMessage(hWnd, IDC_COMBO_CATEGORY, CB_GETCURSEL, 0, 0)); @@ -1481,7 +1532,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_STANDARD; calc.action = IDM_VIEW_STANDARD; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1496,7 +1546,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_SCIENTIFIC; calc.action = IDM_VIEW_SCIENTIFIC; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1511,7 +1560,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.layout = CALC_LAYOUT_CONVERSION; calc.action = IDM_VIEW_CONVERSION; DestroyWindow(hWnd); - save_config(); CheckMenuRadioItem(GetMenu(hWnd), IDM_VIEW_STANDARD, @@ -1559,7 +1607,6 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.usesep = (calc.usesep ? FALSE : TRUE); update_menu(hWnd); update_lcd_display(hWnd); - save_config(); return TRUE; case IDC_BUTTON_CONVERT: ConvExecute(hWnd); @@ -1905,6 +1952,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.is_menu_on = FALSE; break; + case WM_SETTINGCHANGE: + return OnSettingChange(hWnd, wp, lp); + case WM_THEMECHANGED: InvalidateRect(hWnd, NULL, FALSE); break; @@ -1975,6 +2025,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL TranslateMessage(&msg); DispatchMessage(&msg); } + + save_config(); } while (calc.action != IDC_STATIC); if (calc.hBgIcon != NULL)

5 years, 9 months

[reactos] 05/13: [CALC] Add theming support, requires Windows XP or later. CORE-13343

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b107f2e309cac23a42dd… commit 0b107f2e309cac23a42dddb9f36ac413a3a571b6 Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 20:23:12 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:02 2019 +0100 [CALC] Add theming support, requires Windows XP or later. CORE-13343 - Fix errors if a theme api is missing. - Add callback to functions for drawing themed transparent background. - Fix drawing glitch when theming is applied. - Redraw on theme change: automatically redraw the window if the theme is changed while the application is active. - Colours are now declared though RGB() macro. - Removed safe DS_SHELLFONT declaration. --- base/applications/calc/CMakeLists.txt | 1 + base/applications/calc/calc.h | 39 +++++-- base/applications/calc/res/calc_sm.ico | Bin 2550 -> 0 bytes base/applications/calc/resource.h | 7 +- base/applications/calc/resource.rc | 8 +- base/applications/calc/theme.c | 127 +++++++++++++++++++++++ base/applications/calc/winmain.c | 181 +++++++++++++++++++++++++++++---- base/applications/calc/wmmsg.h | 0 8 files changed, 330 insertions(+), 33 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index ffe0ee3a5e..d273f10250 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -8,6 +8,7 @@ list(APPEND SOURCE utl_ieee.c winmain.c htmlhelp.c + theme.c calc.h) file(GLOB calc_rc_deps res/*.*) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index db984f0760..f6c2c7c863 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -17,6 +17,9 @@ #endif #include <limits.h> +/* RESOURCES */ +#include "resource.h" + /* Messages reserved for the main dialog */ #define WM_CLOSE_STATS (WM_APP+1) #define WM_HANDLE_CLIPBOARD (WM_APP+2) @@ -41,12 +44,6 @@ #endif -#include "resource.h" - -#ifndef IDC_STATIC -#define IDC_STATIC ((DWORD)-1) -#endif - #define CALC_VERSION _T("1.12") #define MAX_CALC_SIZE 256 @@ -67,6 +64,34 @@ extern type_HtmlHelpW calc_HtmlHelpW; void HtmlHelp_Start(HINSTANCE hInstance); void HtmlHelp_Stop(void); +/* THEMING SUPPORT */ +#if (_WIN32_WINNT >= 0x0600) +#include <vssym32.h> +#include <vsstyle.h> +#else +#include <tmschema.h> +#endif +#include <uxtheme.h> + +void Theme_Start(HINSTANCE hInstance); +void Theme_Stop(void); + +typedef HTHEME (WINAPI* type_OpenThemeData)(HWND,const WCHAR*); +typedef HRESULT (WINAPI* type_CloseThemeData)(HTHEME); +typedef HRESULT (WINAPI* type_DrawThemeBackground)(HTHEME,HDC,int,int,const RECT*,const RECT*); +typedef BOOL (WINAPI* type_IsAppThemed)(void); +typedef BOOL (WINAPI* type_IsThemeActive)(void); +typedef BOOL (WINAPI* type_IsThemeBackgroundPartiallyTransparent)(HTHEME, int, int); +typedef HRESULT (WINAPI* type_DrawThemeParentBackground)(HWND, HDC, RECT *); + +extern type_OpenThemeData calc_OpenThemeData; +extern type_CloseThemeData calc_CloseThemeData; +extern type_DrawThemeBackground calc_DrawThemeBackground; +extern type_IsAppThemed calc_IsAppThemed; +extern type_IsThemeActive calc_IsThemeActive; +extern type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent; +extern type_DrawThemeParentBackground calc_DrawThemeParentBackground; + /*#define USE_KEYBOARD_HOOK*/ #define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1])) @@ -144,6 +169,8 @@ typedef struct { HHOOK hKeyboardHook; #endif HWND hWnd; + HICON hBgIcon; + HICON hSmIcon; DWORD layout; TCHAR buffer[MAX_CALC_SIZE]; TCHAR source[MAX_CALC_SIZE]; diff --git a/base/applications/calc/res/calc_sm.ico b/base/applications/calc/res/calc_sm.ico deleted file mode 100644 index c6e151d1f0..0000000000 Binary files a/base/applications/calc/res/calc_sm.ico and /dev/null differ diff --git a/base/applications/calc/resource.h b/base/applications/calc/resource.h index c9a3ac0e21..08e985cf73 100644 --- a/base/applications/calc/resource.h +++ b/base/applications/calc/resource.h @@ -1,5 +1,9 @@ #pragma once +#ifndef IDC_STATIC +#define IDC_STATIC -1 +#endif + #define IDS_CALC_NAME 1 #define IDS_MATH_ERROR 2 #define IDS_QUICKHELP 3 @@ -11,8 +15,7 @@ #define IDR_MENU_SCIENTIFIC_1 106 #define IDR_MENU_SCIENTIFIC_2 107 #define IDR_MENU_STANDARD 108 -#define IDI_CALC_BIG 110 -#define IDI_CALC_SMALL 111 +#define IDI_CALC 110 #define IDC_RADIO_HEX 1002 #define IDC_RADIO_DEC 1003 #define IDC_RADIO_OCT 1004 diff --git a/base/applications/calc/resource.rc b/base/applications/calc/resource.rc index 7272276d59..9bb5620d8a 100644 --- a/base/applications/calc/resource.rc +++ b/base/applications/calc/resource.rc @@ -10,18 +10,14 @@ #include "resource.h" -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif - /* Common resources */ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL /* Icons */ -IDI_CALC_BIG ICON "res/calc.ico" -IDI_CALC_SMALL ICON "res/calc_sm.ico" +IDI_CALC ICON DISCARDABLE "res/calc.ico" +/* Manifest */ #include <reactos/manifest_exe.rc> /* UTF-8 */ diff --git a/base/applications/calc/theme.c b/base/applications/calc/theme.c new file mode 100644 index 0000000000..8055b36283 --- /dev/null +++ b/base/applications/calc/theme.c @@ -0,0 +1,127 @@ +/* + * ReactOS Calc (Theming support) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "calc.h" + +#define GET_CB(name) \ + calc_##name = (type_##name)GetProcAddress(hUxTheme, #name); \ + if (calc_##name == NULL) calc_##name = dummy_##name; + +static HTHEME WINAPI +dummy_OpenThemeData(HWND hwnd, const WCHAR *pszClassList); + +static HRESULT WINAPI +dummy_CloseThemeData(HTHEME hTheme); + +static HRESULT WINAPI +dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT *prc, const RECT *prcClip); + +static BOOL WINAPI +dummy_IsAppThemed(void); + +static BOOL WINAPI +dummy_IsThemeActive(void); + +static BOOL WINAPI +dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId); + +static HRESULT WINAPI +dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc); + + +type_OpenThemeData calc_OpenThemeData = dummy_OpenThemeData; +type_CloseThemeData calc_CloseThemeData = dummy_CloseThemeData; +type_DrawThemeBackground calc_DrawThemeBackground = dummy_DrawThemeBackground; +type_IsAppThemed calc_IsAppThemed = dummy_IsAppThemed; +type_IsThemeActive calc_IsThemeActive = dummy_IsThemeActive; +type_IsThemeBackgroundPartiallyTransparent calc_IsThemeBackgroundPartiallyTransparent = \ + dummy_IsThemeBackgroundPartiallyTransparent; +type_DrawThemeParentBackground calc_DrawThemeParentBackground = \ + dummy_DrawThemeParentBackground; + +static HMODULE hUxTheme; + +static HTHEME WINAPI +dummy_OpenThemeData(HWND hwnd, const WCHAR* pszClassList) +{ + return NULL; +} + +static HRESULT WINAPI +dummy_CloseThemeData(HTHEME hTheme) +{ + return E_NOTIMPL; +} + +static HRESULT WINAPI +dummy_DrawThemeBackground(HTHEME hTheme, HDC hdc, int iPartId, int iStateId, + const RECT* prc, const RECT* prcClip) +{ + return E_NOTIMPL; +} + +static BOOL WINAPI +dummy_IsAppThemed(void) +{ + return FALSE; +} + +static BOOL WINAPI +dummy_IsThemeActive(void) +{ + return FALSE; +} + +static BOOL WINAPI +dummy_IsThemeBackgroundPartiallyTransparent(HTHEME hTheme, int iPartId, int iStateId) +{ + return FALSE; +} + +static HRESULT WINAPI +dummy_DrawThemeParentBackground(HWND hWnd, HDC hdc, RECT *prc) +{ + return E_NOTIMPL; +} + +void Theme_Start(HINSTANCE hInstance) +{ + hUxTheme = LoadLibrary(_T("UXTHEME")); + if (hUxTheme == NULL) + return; + + GET_CB(OpenThemeData) + GET_CB(CloseThemeData) + GET_CB(DrawThemeBackground) + GET_CB(IsAppThemed) + GET_CB(IsThemeActive) + GET_CB(IsThemeBackgroundPartiallyTransparent) + GET_CB(DrawThemeParentBackground) +} + +void Theme_Stop(void) +{ + if(hUxTheme == NULL) + return; + + FreeLibrary(hUxTheme); + hUxTheme = NULL; +} diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index 696e3ee9df..fceb41fc96 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -48,9 +48,9 @@ #define BITMASK_OCT_MASK 0x02 #define BITMASK_BIN_MASK 0x01 -#define CALC_CLR_RED 0x000000FF -#define CALC_CLR_BLUE 0x00FF0000 -#define CALC_CLR_PURP 0x00FF00FF +#define CALC_CLR_RED RGB(0xFF, 0x00, 0x00) +#define CALC_CLR_BLUE RGB(0x00, 0x00, 0xFF) +#define CALC_CLR_PURP RGB(0xFF, 0x00, 0xFF) typedef struct { CHAR key; // Virtual key identifier @@ -233,10 +233,22 @@ static const function_table_t function_table[] = { { IDC_BUTTON_LEFTPAR, NO_CHAIN, 0, run_lpar, NULL, NULL, NULL, }, }; +/* Sub-classing information for theming support */ +typedef struct{ + BOOL bHover; + WNDPROC oldProc; +} BTNINFO,*LPBTNINFO; + + /* -*/ + * Global variable declaration + */ + +calc_t calc; -calc_t calc; +/* Hot-state info for theming support */ +BTNINFO BtnInfo[255]; +UINT BtnCount; static void load_config(void) { @@ -326,7 +338,7 @@ static LRESULT post_key_press(LPARAM lParam, WORD idc) if (!GetClassName(hCtlWnd, ClassName, SIZEOF(ClassName))) return 1; - if (!_tcscmp(ClassName, TEXT("Button"))) { + if (!_tcscmp(ClassName, WC_BUTTON)) { DWORD dwStyle = GetWindowLongPtr(hCtlWnd, GWL_STYLE) & 0xF; /* Set states for press/release, but only for push buttons */ @@ -1213,14 +1225,58 @@ static void run_lpar(calc_number_t *c) static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) { LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lp; - DWORD dwStyle; UINT dwText; TCHAR text[64]; int dx, dy, len; SIZE size; POINT pt; - if(dis->CtlType == ODT_BUTTON) { + if(dis->CtlType == ODT_BUTTON) + { + HTHEME hTheme = NULL; + LPBTNINFO lpBtnInfo; + + if (calc_IsAppThemed() && calc_IsThemeActive()) + hTheme = calc_OpenThemeData(hWnd, L"Button"); + + if (hTheme) + { + int iState = 0; + + if ((dis->itemState & ODS_DISABLED)) + iState |= PBS_DISABLED; + if ((dis->itemState & ODS_SELECTED)) + iState |= PBS_PRESSED; + + lpBtnInfo = (LPBTNINFO)GetWindowLongPtr(dis->hwndItem, GWLP_USERDATA); + if (lpBtnInfo != NULL) + { + if (lpBtnInfo->bHover) + iState |= PBS_HOT; + } + + if (calc_IsThemeBackgroundPartiallyTransparent(hTheme, BP_PUSHBUTTON, iState)) + { + calc_DrawThemeParentBackground(dis->hwndItem, dis->hDC, &dis->rcItem); + } + + // Draw the frame around the control + calc_DrawThemeBackground(hTheme, dis->hDC, BP_PUSHBUTTON, iState, &dis->rcItem, NULL); + + calc_CloseThemeData(hTheme); + } else { + /* default state: unpushed */ + DWORD dwStyle = 0; + + if ((dis->itemState & ODS_SELECTED)) + dwStyle = DFCS_PUSHED; + + DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, DFCS_BUTTONPUSH | dwStyle); + } + + /* button text to write */ + len = GetWindowText(dis->hwndItem, text, SIZEOF(text)); + /* * little exception: 1/x has different color * in standard and scientific modes @@ -1236,21 +1292,20 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) break; } } - /* button text to write */ - len = GetWindowText(dis->hwndItem, text, SIZEOF(text)); - /* default state: unpushed & enabled */ - dwStyle = 0; + + /* No background, to avoid corruption of the texture */ + SetBkMode(dis->hDC, TRANSPARENT); + + /* Default state: enabled */ dwText = 0; if ((dis->itemState & ODS_DISABLED)) dwText = DSS_DISABLED; - if ((dis->itemState & ODS_SELECTED)) - dwStyle = DFCS_PUSHED; - DrawFrameControl(dis->hDC, &dis->rcItem, DFC_BUTTON, DFCS_BUTTONPUSH | dwStyle); + /* Draw the text in the button */ GetTextExtentPoint32(dis->hDC, text, len, &size); dx = ((dis->rcItem.right-dis->rcItem.left) - size.cx) >> 1; dy = ((dis->rcItem.bottom-dis->rcItem.top) - size.cy) >> 1; - if ((dwStyle & DFCS_PUSHED)) { + if ((dis->itemState & ODS_SELECTED)) { dx++; dy++; } @@ -1261,6 +1316,61 @@ static LRESULT CALLBACK SubclassButtonProc(HWND hWnd, WPARAM wp, LPARAM lp) return 1L; } +static INT_PTR CALLBACK HotButtonProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) +{ + LPBTNINFO lpBtnInfo = (LPBTNINFO)GetWindowLongPtr(hWnd, GWLP_USERDATA); + TRACKMOUSEEVENT mouse_event; + + switch (msg) { + case WM_MOUSEMOVE: + mouse_event.cbSize = sizeof(TRACKMOUSEEVENT); + mouse_event.dwFlags = TME_QUERY; + if (!TrackMouseEvent(&mouse_event) || !(mouse_event.dwFlags & (TME_HOVER|TME_LEAVE))) + { + mouse_event.dwFlags = TME_HOVER|TME_LEAVE; + mouse_event.hwndTrack = hWnd; + mouse_event.dwHoverTime = 1; + TrackMouseEvent(&mouse_event); + } + break; + + case WM_MOUSEHOVER: + lpBtnInfo->bHover = TRUE; + InvalidateRect(hWnd, NULL, FALSE); + break; + + case WM_MOUSELEAVE: + lpBtnInfo->bHover = FALSE; + InvalidateRect(hWnd, NULL, FALSE); + break; + } + + return CallWindowProc(lpBtnInfo->oldProc, hWnd, msg, wp, lp); +} + +static BOOL CALLBACK EnumChildProc(HWND hWnd, LPARAM lParam) +{ + TCHAR szClass[64]; + + if (!GetClassName(hWnd, szClass, SIZEOF(szClass))) + return TRUE; + + if (!_tcscmp(szClass, WC_BUTTON)) + { + int *pnCtrls = (int *)lParam; + int nCtrls = *pnCtrls; + + BtnInfo[nCtrls].oldProc = (WNDPROC)GetWindowLongPtr(hWnd, GWLP_WNDPROC); + BtnInfo[nCtrls].bHover = FALSE; + + SetWindowLongPtr(hWnd, GWLP_USERDATA, (LONG_PTR)&BtnInfo[nCtrls]); + SetWindowLongPtr(hWnd, GWLP_WNDPROC, (LONG_PTR)HotButtonProc); + + *pnCtrls = ++nCtrls; + } + return TRUE; +} + static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) { unsigned int x; @@ -1276,6 +1386,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) EnableMenuItem(GetMenu(hWnd), IDM_HELP_HELP, MF_BYCOMMAND | MF_GRAYED); #endif calc.hWnd=hWnd; + /* Enumerate children and apply hover function */ + BtnCount = 0; + EnumChildWindows(hWnd, EnumChildProc, (LPARAM)&BtnCount); #ifdef USE_KEYBOARD_HOOK calc.hKeyboardHook=SetWindowsHookEx( @@ -1300,8 +1413,8 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) /* remove keyboard focus */ SetFocus(GetDlgItem(hWnd, IDC_BUTTON_FOCUS)); /* set our calc icon */ - SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); - SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_SMALL))); + SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)calc.hBgIcon); + SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)calc.hSmIcon); /* Sets the state of the option to group digits */ hMenu = GetSubMenu(GetMenu(hWnd), 1); @@ -1354,7 +1467,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) TCHAR infotext[200]; LoadString(calc.hInstance, IDS_CALC_NAME, infotitle, SIZEOF(infotitle)); LoadString(calc.hInstance, IDS_AUTHOR, infotext, SIZEOF(infotext)); - ShellAbout(hWnd, infotitle, infotext, (HICON)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG))); + ShellAbout(hWnd, infotitle, infotext, calc.hBgIcon); return TRUE; } case IDM_HELP_HELP: @@ -1791,6 +1904,10 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) case WM_EXITMENULOOP: calc.is_menu_on = FALSE; break; + + case WM_THEMECHANGED: + InvalidateRect(hWnd, NULL, FALSE); + break; } return FALSE; } @@ -1804,6 +1921,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL MSG msg; DWORD dwLayout; + /* Initialize controls for theming & manifest support */ InitCommonControls(); calc.hInstance = hInstance; @@ -1816,6 +1934,24 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL HtmlHelp_Start(hInstance); + Theme_Start(hInstance); + + calc.hBgIcon = LoadImage( + hInstance, + MAKEINTRESOURCE(IDI_CALC), + IMAGE_ICON, + GetSystemMetrics(SM_CXICON), + GetSystemMetrics(SM_CYICON), + 0); + + calc.hSmIcon = LoadImage( + hInstance, + MAKEINTRESOURCE(IDI_CALC), + IMAGE_ICON, + GetSystemMetrics(SM_CXSMICON), + GetSystemMetrics(SM_CYSMICON), + 0); + do { /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) @@ -1841,8 +1977,15 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL } } while (calc.action != IDC_STATIC); + if (calc.hBgIcon != NULL) + DestroyIcon(calc.hBgIcon); + + if (calc.hSmIcon != NULL) + DestroyIcon(calc.hSmIcon); + stop_rpn_engine(); + Theme_Stop(); HtmlHelp_Stop(); return 0; diff --git a/base/applications/calc/wmmsg.h b/base/applications/calc/wmmsg.h deleted file mode 100644 index e69de29bb2..0000000000

5 years, 9 months

[reactos] 04/13: [CALC] Add support for HTML-Help. CORE-15019

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6c565bc22e18eb308cc9… commit f6c565bc22e18eb308cc9c072530a6ffdf0b67db Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 20:22:36 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:01 2019 +0100 [CALC] Add support for HTML-Help. CORE-15019 --- base/applications/calc/CMakeLists.txt | 1 + base/applications/calc/calc.h | 16 +++++++++ base/applications/calc/htmlhelp.c | 67 +++++++++++++++++++++++++++++++++++ base/applications/calc/winmain.c | 14 +++++--- 4 files changed, 94 insertions(+), 4 deletions(-) diff --git a/base/applications/calc/CMakeLists.txt b/base/applications/calc/CMakeLists.txt index a92c7c3911..ffe0ee3a5e 100644 --- a/base/applications/calc/CMakeLists.txt +++ b/base/applications/calc/CMakeLists.txt @@ -7,6 +7,7 @@ list(APPEND SOURCE rpn_ieee.c utl_ieee.c winmain.c + htmlhelp.c calc.h) file(GLOB calc_rc_deps res/*.*) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index afbc813d83..db984f0760 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -51,6 +51,22 @@ #define MAX_CALC_SIZE 256 +/* HTMLHELP SUPPORT */ +typedef HWND (WINAPI* type_HtmlHelpA)(HWND, LPCSTR, UINT, DWORD); +typedef HWND (WINAPI* type_HtmlHelpW)(HWND, LPCWSTR, UINT, DWORD); + +extern type_HtmlHelpA calc_HtmlHelpA; +extern type_HtmlHelpW calc_HtmlHelpW; + +#ifndef UNICODE +#define calc_HtmlHelp calc_HtmlHelpA +#else +#define calc_HtmlHelp calc_HtmlHelpW +#endif + +void HtmlHelp_Start(HINSTANCE hInstance); +void HtmlHelp_Stop(void); + /*#define USE_KEYBOARD_HOOK*/ #define SIZEOF(_ar) (sizeof(_ar)/sizeof(_ar[1])) diff --git a/base/applications/calc/htmlhelp.c b/base/applications/calc/htmlhelp.c new file mode 100644 index 0000000000..a306ae441b --- /dev/null +++ b/base/applications/calc/htmlhelp.c @@ -0,0 +1,67 @@ +/* + * ReactOS Calc (HtmlHelp support) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "calc.h" + +#define GET_CB(name) \ + calc_##name = (type_##name)GetProcAddress(hHtmlHelp, #name); \ + if (calc_##name == NULL) calc_##name = dummy_##name; + +static HWND WINAPI +dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData); + +static HWND WINAPI +dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData); + +type_HtmlHelpA calc_HtmlHelpA = dummy_HtmlHelpA; +type_HtmlHelpW calc_HtmlHelpW = dummy_HtmlHelpW; + +static HMODULE hHtmlHelp; + +static HWND WINAPI +dummy_HtmlHelpA(HWND hWnd, LPCSTR pszFile, UINT uCommand, DWORD dwData) +{ + return NULL; +} + +static HWND WINAPI +dummy_HtmlHelpW(HWND hWnd, LPCWSTR pszFile, UINT uCommand, DWORD dwData) +{ + return NULL; +} + +void HtmlHelp_Start(HINSTANCE hInstance) +{ + hHtmlHelp = LoadLibrary(_T("HTMLHELP")); + if (hHtmlHelp == NULL) + return; + + GET_CB(HtmlHelpW) + GET_CB(HtmlHelpA) +} + +void HtmlHelp_Stop(void) +{ + if(hHtmlHelp == NULL) + return; + + FreeLibrary(hHtmlHelp); + hHtmlHelp = NULL; +} diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index ad9b5763b4..696e3ee9df 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -20,7 +20,7 @@ #include "calc.h" -#define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt) +#define HTMLHELP_PATH(_pt) _T("%systemroot%\\Help\\calc.chm::") _T(_pt) #define MAKE_BITMASK4(_show_b16, _show_b10, _show_b8, _show_b2) \ (((_show_b2) << 0) | \ @@ -1181,7 +1181,7 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp) popup.rcMargins.left = -1; popup.rcMargins.right = -1; popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID); - HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); + calc_HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); } #else (void)idm; @@ -1272,8 +1272,9 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) return SubclassButtonProc(hWnd, wp, lp); case WM_INITDIALOG: - // For now, the Help dialog is disabled because of lacking of HTML Help support +#ifdef DISABLE_HTMLHELP_SUPPORT EnableMenuItem(GetMenu(hWnd), IDM_HELP_HELP, MF_BYCOMMAND | MF_GRAYED); +#endif calc.hWnd=hWnd; #ifdef USE_KEYBOARD_HOOK @@ -1358,7 +1359,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) } case IDM_HELP_HELP: #ifndef DISABLE_HTMLHELP_SUPPORT - HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL); + calc_HtmlHelp(hWnd, HTMLHELP_PATH("/general_information.htm"), HH_DISPLAY_TOPIC, (DWORD_PTR)NULL); #endif return TRUE; case IDM_VIEW_STANDARD: @@ -1763,6 +1764,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp) calc.action = IDC_STATIC; DestroyWindow(hWnd); return TRUE; + case WM_DESTROY: /* Get (x,y) position of the calculator */ GetWindowRect(hWnd, &rc); @@ -1812,6 +1814,8 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL load_config(); start_rpn_engine(); + HtmlHelp_Start(hInstance); + do { /* ignore hwnd: dialogs are already visible! */ if (calc.layout == CALC_LAYOUT_SCIENTIFIC) @@ -1839,5 +1843,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL stop_rpn_engine(); + HtmlHelp_Stop(); + return 0; }

5 years, 9 months

[reactos] 03/13: [CALC] Improve headers inclusion.

by Carlo-Bramini

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ec1b499aac8e4db642add… commit ec1b499aac8e4db642add9fa46d55a5903077cab Author: Carlo-Bramini <carlo_bramini(a)users.sourceforge.net> AuthorDate: Mon Aug 6 19:58:23 2018 +0200 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Mar 18 01:34:01 2019 +0100 [CALC] Improve headers inclusion. --- base/applications/calc/calc.h | 20 ++++++++++++++------ base/applications/calc/winmain.c | 26 ++++++++++++++++++++------ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/base/applications/calc/calc.h b/base/applications/calc/calc.h index 702ad47e77..afbc813d83 100644 --- a/base/applications/calc/calc.h +++ b/base/applications/calc/calc.h @@ -1,10 +1,14 @@ -#ifndef _CALC_H -#define _CALC_H +#ifndef __CALC_H__ +#define __CALC_H__ -#include <stdarg.h> -#include <windef.h> -#include <winuser.h> +#define WIN32_LEAN_AND_MEAN +#include <windows.h> #include <tchar.h> +#include <commctrl.h> +#include <shellapi.h> + +#include <stdio.h> +#include <string.h> #include <math.h> #include <float.h> #include <malloc.h> @@ -43,6 +47,8 @@ #define IDC_STATIC ((DWORD)-1) #endif +#define CALC_VERSION _T("1.12") + #define MAX_CALC_SIZE 256 /*#define USE_KEYBOARD_HOOK*/ @@ -226,8 +232,10 @@ void convert_real_integer(unsigned int base); INT_PTR CALLBACK AboutDlgProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp); +// + void ConvExecute(HWND hWnd); void ConvAdjust(HWND hWnd, int n_cat); void ConvInit(HWND hWnd); -#endif /* _CALC_H */ +#endif /* __CALC_H__ */ diff --git a/base/applications/calc/winmain.c b/base/applications/calc/winmain.c index c6723bac18..ad9b5763b4 100644 --- a/base/applications/calc/winmain.c +++ b/base/applications/calc/winmain.c @@ -1,10 +1,24 @@ -#include "calc.h" +/* + * ReactOS Calc (main program) + * + * Copyright 2007-2017, Carlo Bramini + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ -#include <winbase.h> -#include <wingdi.h> -#include <winreg.h> -#include <shellapi.h> -#include <commctrl.h> +#include "calc.h" #define HTMLHELP_PATH(_pt) TEXT("%systemroot%\\Help\\calc.chm::") TEXT(_pt)

5 years, 9 months

← Newer
1
...
6
7
8
9
10
11
12
...
22
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2019