Ros-diffs May 2010

ros-diffs@reactos.org

21 participants
438 discussions

[cwittich] 47455: [KMTEST] cast the unused 0 in the ok macro to void to make clang happy as done for wine test.h

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 30 21:37:27 2010 New Revision: 47455 URL: http://svn.reactos.org/svn/reactos?rev=47455&view=rev Log: [KMTEST] cast the unused 0 in the ok macro to void to make clang happy as done for wine test.h Modified: trunk/rostests/drivers/kmtest/kmtest.h Modified: trunk/rostests/drivers/kmtest/kmtest.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/drivers/kmtest/kmtest.h?r… ============================================================================== --- trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] (original) +++ trunk/rostests/drivers/kmtest/kmtest.h [iso-8859-1] Sun May 30 21:37:27 2010 @@ -44,7 +44,7 @@ #endif /* __GNUC__ */ -#define ok_(file, line) (kmtest_set_location(file, line), 0) ? 0 : kmtest_ok +#define ok_(file, line) (kmtest_set_location(file, line), 0) ? (void)0 : kmtest_ok #define ok ok_(__FILE__, __LINE__) PDEVICE_OBJECT AttachDeviceObject;

14 years, 3 months

[gschneider] 47454: [CALC] Add units and conversion factors, patch by Andrea Maiani; nanoseconds entry added to resource files See issue #5340 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun May 30 20:55:28 2010 New Revision: 47454 URL: http://svn.reactos.org/svn/reactos?rev=47454&view=rev Log: [CALC] Add units and conversion factors, patch by Andrea Maiani; nanoseconds entry added to resource files See issue #5340 for more details. Modified: trunk/reactos/base/applications/calc/convert.c trunk/reactos/base/applications/calc/lang/bg-BG.rc trunk/reactos/base/applications/calc/lang/cs-CZ.rc trunk/reactos/base/applications/calc/lang/de-DE.rc trunk/reactos/base/applications/calc/lang/el-GR.rc trunk/reactos/base/applications/calc/lang/en-US.rc trunk/reactos/base/applications/calc/lang/es-ES.rc trunk/reactos/base/applications/calc/lang/fr-FR.rc trunk/reactos/base/applications/calc/lang/it-IT.rc trunk/reactos/base/applications/calc/lang/ko-KR.rc trunk/reactos/base/applications/calc/lang/nl-NL.rc trunk/reactos/base/applications/calc/lang/no-NO.rc trunk/reactos/base/applications/calc/lang/pl-PL.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ru-RU.rc trunk/reactos/base/applications/calc/lang/sk-SK.rc trunk/reactos/base/applications/calc/lang/th-TH.rc trunk/reactos/base/applications/calc/lang/uk-UA.rc trunk/reactos/base/applications/calc/resource.h Modified: trunk/reactos/base/applications/calc/convert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/con… ============================================================================== --- trunk/reactos/base/applications/calc/convert.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/convert.c [iso-8859-1] Sun May 30 20:55:28 2010 @@ -56,35 +56,35 @@ /* 1 acre ................ = 4840 square yd = 4046,8564224 mq - 1 acre brazil ......... = - 1 acre france ......... = + 1 acre brazil ......... = + 1 acre france ......... = 1 acre scots .......... = 5000 mq 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 ............... = 1 ha .................. = 10000 mq - 1 jeongbo ............. = - 1 morgen hungary ...... = - 1 mu .................. = - 1 ping ................ = - 1 pyeong .............. = - 1 pyeongbangja ........ = - 1 rai ................. = + 1 jeongbo ............. = + 1 morgen hungary ...... = + 1 mu .................. = 2000/3 mq + 1 ping ................ = + 1 pyeong .............. = + 1 pyeongbangja ........ = + 1 rai ................. = 1600 mq 1 se .................. = 1080*(10/33)^2 mq 1 square cm ........... = 0.0001 mq - 1 square chr .......... = + 1 square chr .......... = 1 square fathom ....... = 1.8288^2 = 3.34450944 mq 1 square fathom hungary = 1.8964838^2 = 3.59665080366244 mq 1 square ft ........... = 0,09290304 mq 1 square in ........... = 0,00064516 mq 1 square km ........... = 1000000 mq - 1 square lar .......... = + 1 square lar .......... = 1 square mile ......... = 1609.344^2 = 2589988.110336 mq 1 square mm ........... = 0,000001 mq 1 square shaku ........ = (10/33)^2 mq - 1 square tsuen ........ = - 1 square va ........... = + 1 square tsuen ........ = + 1 square va ........... = 1 square yard ......... = 0,83612736 mq 1 tan ................. = 10800*(10/33)^2 mq 1 tsubo ............... = 36*(10/33)^2 mq @@ -101,11 +101,11 @@ DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000") // DECLARE_CONV_UNIT(AREA, JEONGBO, "$", "$") // DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY, "$", "$") -// DECLARE_CONV_UNIT(AREA, MU, "$", "$") + DECLARE_CONV_UNIT(AREA, MU, "$*(2000/3)", "$/(2000/3)") // DECLARE_CONV_UNIT(AREA, PING, "$", "$") // DECLARE_CONV_UNIT(AREA, PYEONG, "$", "$") // DECLARE_CONV_UNIT(AREA, PYEONGBANGJA, "$", "$") -// DECLARE_CONV_UNIT(AREA, RAI, "$", "$") + 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, "$", "$") @@ -197,46 +197,47 @@ 1 barleycorn ..... = 1/3 inch = 0.9144/108 m 1 cm ............. = 1/100 m 1 chain uk ....... = 22 yards = 22*0.9144 m - 1 chi ............ = + 1 chi ............ = 1/3 m 1 chou ........... = 3600/33 m - 1 chr ............ = + 1 chr ............ = + 1 cun ............ = 1/10 chi = 1/30 m 1 fathom ......... = 2 yard = 2*0.9144 m 1 fathom ungary .. = 1.8964838 m (fixed) 1 feet ........... = 12 inch = 0.9144/3 m 1 furlong ........ = 10 chains = 220*0.9144 m - 1 gan ............ = + 1 gan ............ = 1 hand ........... = 4 inches = 0.9144/9 m - 1 hunh ........... = + 1 hunh ........... = 1 inch ........... = yard/36 = 0.9144/36 m - 1 ja ............. = - 1 jeong .......... = - 1 kabiet ......... = + 1 ja ............. = + 1 jeong .......... = + 1 kabiet ......... = 1 ken ............ = 60/33 m - 1 keub ........... = + 1 keub ........... = 1 km ............. = 1000 m - 1 lar ............ = + 1 lar ............ = 1 light year ..... = 9460730472580800 m 1 link uk ........ = 0.01 chains = 0.22*0.9144 m 1 micron ......... = 0.000001 m 1 mile ........... = 1760 yards = 1609.344 m 1 millimeter ..... = 1/1000 m 1 nautical mile .. = 1852 m - 1 nieu ........... = + 1 nieu ........... = 1 parsec ......... = 30856800000000000 m 1 pica ........... = yard/216 = 0.9144/216 m - 1 ri japan ....... = - 1 ri korea ....... = + 1 ri japan ....... = + 1 ri korea ....... = 1 rod ............ = 5.0292 m - 1 sawk ........... = - 1 sen ............ = + 1 sawk ........... = + 1 sen ............ = 1 shaku .......... = 10/33 m 1 span ........... = 9 inches = 0.9144/4 m - 1 sun ............ = 10/330 m - 1 tsuen .......... = - 1 va ............. = + 1 sun ............ = 1/33 m + 1 tsuen .......... = + 1 va ............. = 1 yard ........... = 0.9144 m - 1 yote ........... = - 1 zhang .......... = + 1 yote ........... = + 1 zhang .......... = */ static const conv_t conv_LENGTH[] = { DECLARE_CONV_UNIT(LENGTH, ANGSTROMS, "$*0.0000000001", "$/0.0000000001") @@ -244,10 +245,10 @@ DECLARE_CONV_UNIT(LENGTH, BARLEYCORNS, "$*0.9144/108", "$/0.9144*108") DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100") DECLARE_CONV_UNIT(LENGTH, CHAINS_UK, "$*20.1168", "$/20.1168") -// DECLARE_CONV_UNIT(LENGTH, CHI, "$", "$") + DECLARE_CONV_UNIT(LENGTH, CHI, "$/3", "$*3") DECLARE_CONV_UNIT(LENGTH, CHOU, "$*3600/33", "$*33/3600") // DECLARE_CONV_UNIT(LENGTH, CHR, "$", "$") -// DECLARE_CONV_UNIT(LENGTH, CUN, "$", "$") + DECLARE_CONV_UNIT(LENGTH, CUN, "$/30", "$*30") DECLARE_CONV_UNIT(LENGTH, FATHOMS, "$*1.8288", "$/1.8288") DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY, "$*1.8964838", "$/1.8964838") DECLARE_CONV_UNIT(LENGTH, FEET, "$*0.3048", "$/0.3048") @@ -280,7 +281,7 @@ // DECLARE_CONV_UNIT(LENGTH, SEN, "$", "$") 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, "$*10/330", "$*330/10") + DECLARE_CONV_UNIT(LENGTH, SUN, "$*1/33", "$*33") // DECLARE_CONV_UNIT(LENGTH, TSUEN, "$", "$") // DECLARE_CONV_UNIT(LENGTH, VA, "$", "$") DECLARE_CONV_UNIT(LENGTH, YARDS, "$*0.9144", "$/0.9144") @@ -312,7 +313,7 @@ 1 hPa = 100 Pa 1 kPa = 1000 Pa 1 mm HG = 133.322 Pa - 1 psi = 6894.757 Pa + 1 psi = 6894.757 Pa */ static const conv_t conv_PRESSURE[] = { DECLARE_CONV_UNIT(PRESSURE, ATMOSPHERES, "$*101325", "$/101325") @@ -330,18 +331,20 @@ 1 hour ...... = 3600 s 1 microsecond = 0.000001 s 1 millisecond = 0.001 s + 1 nanosecond. = 0.000000001 s 1 minute .... = 60 s 1 week ...... = 669600 s */ static const conv_t conv_TIME[] = { - DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") - DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400") - DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600") - DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001", "$/0.001") - DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001") - DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$") - DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800") - DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952") + DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") + DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400") + DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600") + DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001", "$/0.001") + DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001") + DECLARE_CONV_UNIT(TIME, NANOSECONDS, "$*0.000000001", "$/0.000000001") + DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$") + DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800") + DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952") DECLARE_CONV_END }; @@ -382,7 +385,7 @@ /* 1 barrel uk ...... = 163.65924 l 1 barrel oil ..... = 158.987295 l - 1 bun ............ = + 1 bun ............ = 1 bushel uk ...... = 36.36872 l 1 bushel us ...... = 35.23907017 l 1 cubic cm ...... = 0.001 l @@ -390,17 +393,17 @@ 1 cubic inch ..... = 0.016387064 l 1 cubic meter .... = 1000 l 1 cubic yard ..... = 764.554857 l - 1 doe ............ = + 1 doe ............ = 1 fluid ounce uk = 0.0284130625 l 1 fluid ounce us = 0.0295735295625 l 1 gallon uk ...... = 4.54609 l 1 gallon dry us .. = 4.40488377086 l 1 gallon liquid us = 3.785411784 l 1 gou ............ = 0.1809 l - 1 hop ............ = - 1 icce ........... = - 1 kwian .......... = - 1 mal ............ = + 1 hop ............ = + 1 icce ........... = + 1 kwian .......... = + 1 mal ............ = 1 milliliter ..... = 0.001 l 1 pint uk ........ = 0.56826125 l 1 pint dry us .... = 0.5506104713575 l @@ -408,10 +411,10 @@ 1 quart uk ....... = 1.1365225 l 1 quart dry us ... = 1.101220942715 l 1 quart liquid us = 0.946352946 l - 1 seki ........... = - 1 syou ........... = - 1 tananloung ..... = - 1 tang ........... = + 1 seki ........... = + 1 syou ........... = + 1 tananloung ..... = + 1 tang ........... = 1 to ............. = 18040 l */ static const conv_t conv_VOLUME[] = { @@ -455,16 +458,16 @@ /* 1 baht ............ = 12.244 g 1 carat ........... = 0.2 g - 1 chung ........... = - 1 don ............. = - 1 geun ............ = - 1 gwan ............ = - 1 harb ............ = - 1 jin china ....... = - 1 jin taiwan ...... = - 1 Kan ............. = + 1 chung ........... = + 1 don ............. = + 1 geun ............ = + 1 gwan ............ = + 1 harb ............ = + 1 jin china ....... = + 1 jin taiwan ...... = + 1 Kan ............. = 3750 g 1 Kilograms ....... = 1000 g - 1 Kin ............. = + 1 Kin ............. = 600 g 1 Liang China ..... = 1 Liang Taiwan .... = 1 monme ........... = 3.75 g @@ -472,9 +475,9 @@ 1 ounce troy ...... = 31.1034768 g 1 pound ........... = 453.59237 g 1 quintal metric .. = 100000 g - 1 saloung ......... = + 1 saloung ......... = 1 stone ........... = 6350.29318 g - 1 tamlung ......... = + 1 tamlung ......... = 1 ton ............. = 1000000 g 1 ton uk .......... = 1016046.9088 g // long ton 1 ton us .......... = 907184.74 g // short ton @@ -490,9 +493,9 @@ // DECLARE_CONV_UNIT(WEIGHT, HARB, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN, "$", "$") -// DECLARE_CONV_UNIT(WEIGHT, KAN, "$", "$") + DECLARE_CONV_UNIT(WEIGHT, KAN, "$*3750", "$/3750") DECLARE_CONV_UNIT(WEIGHT, KILOGRAMS, "$*1000", "$/1000") -// DECLARE_CONV_UNIT(WEIGHT, KIN, "$", "$") + DECLARE_CONV_UNIT(WEIGHT, KIN, "$*600", "$/600") // DECLARE_CONV_UNIT(WEIGHT, LIANG_CHINA, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN, "$", "$") DECLARE_CONV_UNIT(WEIGHT, MONME, "$*3.75", "$/3.75") @@ -548,7 +551,7 @@ break; } } - + /* The units can be sorted, so I must search the exact match */ item = items; SendDlgItemMessage(hWnd, IDC_COMBO_FROM, CB_GETLBTEXT, from, (LPARAM)txt_cb); Modified: trunk/reactos/base/applications/calc/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/bg-BG.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Äíè" IDS_TIME_HOURS "×àñè" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè" IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè" IDS_TIME_MINUTES "Ìèíóòè" Modified: trunk/reactos/base/applications/calc/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/cs-CZ.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -644,6 +644,7 @@ BEGIN IDS_TIME_DAYS "Dny" IDS_TIME_HOURS "Hodiny" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MINUTES "Minuty" Modified: trunk/reactos/base/applications/calc/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/de-DE.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Tagen" IDS_TIME_HOURS "Stunden" + IDS_TIME_NANOSECONDS "Nanosekunden" IDS_TIME_MICROSECONDS "Mikrosekunden" IDS_TIME_MILLISECONDS "Millisekunden" IDS_TIME_MINUTES "Minuten" Modified: trunk/reactos/base/applications/calc/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/el-GR.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "ÌÝñåò" IDS_TIME_HOURS "¿ñåò" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá" IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá" IDS_TIME_MINUTES "ËåðôÜ" Modified: trunk/reactos/base/applications/calc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/en-US.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Days" IDS_TIME_HOURS "Hours" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MINUTES "Minutes" Modified: trunk/reactos/base/applications/calc/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/es-ES.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -644,6 +644,7 @@ BEGIN IDS_TIME_DAYS "Días" IDS_TIME_HOURS "Horas" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microsegundos" IDS_TIME_MILLISECONDS "Milisegundos" IDS_TIME_MINUTES "Minutos" Modified: trunk/reactos/base/applications/calc/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/fr-FR.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Jours" IDS_TIME_HOURS "Heures" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microsecondes" IDS_TIME_MILLISECONDS "Millisecondes" IDS_TIME_MINUTES "Minutes" Modified: trunk/reactos/base/applications/calc/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/it-IT.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Giorni" IDS_TIME_HOURS "Ore" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microsecondi" IDS_TIME_MILLISECONDS "Millisecondi" IDS_TIME_MINUTES "Minuti" Modified: trunk/reactos/base/applications/calc/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ko-KR.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -643,6 +643,7 @@ BEGIN IDS_TIME_DAYS "Days" IDS_TIME_HOURS "Hours" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MINUTES "Minutes" Modified: trunk/reactos/base/applications/calc/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/nl-NL.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "Dagen" IDS_TIME_HOURS "Uren" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microseconden" IDS_TIME_MILLISECONDS "Milliseconden" IDS_TIME_MINUTES "Minuten" Modified: trunk/reactos/base/applications/calc/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/no-NO.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "**" IDS_TIME_HOURS "**" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "**" IDS_TIME_MILLISECONDS "**" IDS_TIME_MINUTES "**" Modified: trunk/reactos/base/applications/calc/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/pl-PL.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -646,6 +646,7 @@ BEGIN IDS_TIME_DAYS "Dni" IDS_TIME_HOURS "Godzin" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Mikrosekund" IDS_TIME_MILLISECONDS "Milisekund" IDS_TIME_MINUTES "Minut" Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ro-RO.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -641,6 +641,7 @@ BEGIN IDS_TIME_DAYS "Zile" IDS_TIME_HOURS "Ore" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microsecunde" IDS_TIME_MILLISECONDS "Milisecunde" IDS_TIME_MINUTES "Minute" Modified: trunk/reactos/base/applications/calc/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/ru-RU.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -639,6 +639,7 @@ BEGIN IDS_TIME_DAYS "äåíü" IDS_TIME_HOURS "÷àñ" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà" IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà" IDS_TIME_MINUTES "ìèíóòà" Modified: trunk/reactos/base/applications/calc/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/sk-SK.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -647,6 +647,7 @@ BEGIN IDS_TIME_DAYS "Dni" IDS_TIME_HOURS "Hodiny" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MINUTES "Minúty" Modified: trunk/reactos/base/applications/calc/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/th-TH.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -644,6 +644,7 @@ BEGIN IDS_TIME_DAYS "Days" IDS_TIME_HOURS "Hours" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MINUTES "Minutes" Modified: trunk/reactos/base/applications/calc/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… ============================================================================== --- trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/lang/uk-UA.rc [iso-8859-1] Sun May 30 20:55:28 2010 @@ -647,6 +647,7 @@ BEGIN IDS_TIME_DAYS "Äîáà" IDS_TIME_HOURS "Ãîäèíà" + IDS_TIME_NANOSECONDS "Nanoseconds" IDS_TIME_MICROSECONDS "Ì³êðîñåêóíäà" IDS_TIME_MILLISECONDS "Ì³ë³ñåêóíäà" IDS_TIME_MINUTES "Õâèëèíà" Modified: trunk/reactos/base/applications/calc/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/res… ============================================================================== --- trunk/reactos/base/applications/calc/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/calc/resource.h [iso-8859-1] Sun May 30 20:55:28 2010 @@ -276,10 +276,11 @@ #define IDS_TIME_HOURS 3002 #define IDS_TIME_MICROSECONDS 3003 #define IDS_TIME_MILLISECONDS 3004 -#define IDS_TIME_MINUTES 3005 -#define IDS_TIME_SECONDS 3006 -#define IDS_TIME_WEEKS 3007 -#define IDS_TIME_YEARS 3008 +#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

14 years, 3 months

[tkreuzer] 47453: - partly revert r47442 and apply a working fix by guarding some prototypes of functions that exist as intrinsics in #ifdefs, so we don't use them for gcc/clang - remove duplicated prototypes, when an inline function exists already

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 30 20:46:02 2010 New Revision: 47453 URL: http://svn.reactos.org/svn/reactos?rev=47453&view=rev Log: - partly revert r47442 and apply a working fix by guarding some prototypes of functions that exist as intrinsics in #ifdefs, so we don't use them for gcc/clang - remove duplicated prototypes, when an inline function exists already Modified: trunk/reactos/include/crt/math.h trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/stdlib.h Modified: trunk/reactos/include/crt/math.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/math.h?rev=474… ============================================================================== --- trunk/reactos/include/crt/math.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/math.h [iso-8859-1] Sun May 30 20:46:02 2010 @@ -435,8 +435,6 @@ return res; } - extern long double __cdecl modfl (long double, long double*); - /* 7.12.6.13 */ extern double __cdecl scalbn (double, int); extern float __cdecl scalbnf (float, int); @@ -458,7 +456,6 @@ extern long double __cdecl expl(long double); extern long double expm1l(long double); extern long double __cdecl coshl(long double); - extern long double __cdecl fabsl (long double); extern long double __cdecl acosl(long double); extern long double __cdecl asinl(long double); extern long double __cdecl atanl(long double); Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Sun May 30 20:46:02 2010 @@ -879,14 +879,14 @@ return retval; } -__INTRIN_INLINE unsigned int __cdecl _rotl(unsigned int value, int shift) +__INTRIN_INLINE unsigned int _rotl(unsigned int value, int shift) { unsigned long retval; __asm__("roll %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); return retval; } -__INTRIN_INLINE unsigned int __cdecl _rotr(unsigned int value, int shift) +__INTRIN_INLINE unsigned int _rotr(unsigned int value, int shift) { unsigned long retval; __asm__("rorl %b[shift], %k[retval]" : [retval] "=rm" (retval) : "[retval]" (value), [shift] "Nc" (shift)); @@ -956,14 +956,14 @@ return retval; } -__INTRIN_INLINE unsigned short __cdecl _byteswap_ushort(unsigned short value) +__INTRIN_INLINE unsigned short _byteswap_ushort(unsigned short value) { unsigned short retval; __asm__("rorw $8, %w[retval]" : [retval] "=rm" (retval) : "[retval]" (value)); return retval; } -__INTRIN_INLINE unsigned long __cdecl _byteswap_ulong(unsigned long value) +__INTRIN_INLINE unsigned long _byteswap_ulong(unsigned long value) { unsigned long retval; __asm__("bswapl %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); @@ -971,7 +971,7 @@ } #ifdef _M_AMD64 -__INTRIN_INLINE unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 value) +__INTRIN_INLINE unsigned __int64 _byteswap_uint64(unsigned __int64 value) { unsigned __int64 retval; __asm__("bswapq %[retval]" : [retval] "=r" (retval) : "[retval]" (value)); Modified: trunk/reactos/include/crt/stdlib.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stdlib.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stdlib.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stdlib.h [iso-8859-1] Sun May 30 20:46:02 2010 @@ -345,11 +345,15 @@ void *__cdecl bsearch(const void *_Key,const void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); void __cdecl qsort(void *_Base,size_t _NumOfElements,size_t _SizeOfElements,int (__cdecl *_PtFuncCompare)(const void *,const void *)); #endif + +#if !defined(__GNUC__) && !defined(__clang) unsigned short __cdecl _byteswap_ushort(unsigned short _Short); - /*unsigned long __cdecl _byteswap_ulong (unsigned long _Long); */ + unsigned long __cdecl _byteswap_ulong (unsigned long _Long); #if _INTEGRAL_MAX_BITS >= 64 __MINGW_EXTENSION unsigned __int64 __cdecl _byteswap_uint64(unsigned __int64 _Int64); #endif +#endif + div_t __cdecl div(int _Numerator,int _Denominator); char *__cdecl getenv(const char *_VarName); _CRTIMP char *__cdecl _itoa(int _Value,char *_Dest,int _Radix); @@ -478,6 +482,7 @@ void __cdecl perror(const char *_ErrMsg); #endif _CRTIMP int __cdecl _putenv(const char *_EnvString); +#if !defined(__GNUC__) && !defined(__clang) unsigned int __cdecl _rotl(unsigned int _Val,int _Shift); #if _INTEGRAL_MAX_BITS >= 64 __MINGW_EXTENSION unsigned __int64 __cdecl _rotl64(unsigned __int64 _Val,int _Shift); @@ -485,6 +490,7 @@ unsigned int __cdecl _rotr(unsigned int _Val,int _Shift); #if _INTEGRAL_MAX_BITS >= 64 __MINGW_EXTENSION unsigned __int64 __cdecl _rotr64(unsigned __int64 _Val,int _Shift); +#endif #endif _CRTIMP void __cdecl _searchenv(const char *_Filename,const char *_EnvVar,char *_ResultPath); _CRTIMP void __cdecl _splitpath(const char *_FullPath,char *_Drive,char *_Dir,char *_Filename,char *_Ext);

14 years, 3 months

[gschneider] 47452: [KBDLV] Latvian keyboard fixes by Arturs B., <mad_alchemist AT mail DOT ru> See issue #5385 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun May 30 20:34:29 2010 New Revision: 47452 URL: http://svn.reactos.org/svn/reactos?rev=47452&view=rev Log: [KBDLV] Latvian keyboard fixes by Arturs B., <mad_alchemist AT mail DOT ru> See issue #5385 for more details. Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.c Modified: trunk/reactos/dll/keyboard/kbdlv/kbdlv.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/keyboard/kbdlv/kbdlv.c… ============================================================================== --- trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] (original) +++ trunk/reactos/dll/keyboard/kbdlv/kbdlv.c [iso-8859-1] Sun May 30 20:34:29 2010 @@ -1,7 +1,7 @@ /* - * ReactOS Latvian Keyboard layout + * ReactOS latvian Keyboard layout * Copyright (C) 2008 ReactOS - * Author: Dmitry Chapyshev + * Author: Dmitry Chapyshev, Arthurs B. * License: LGPL, see: LGPL.txt * * Thanks to: http://www.barcodeman.com/altek/mule/scandoc.php @@ -32,8 +32,6 @@ #define KNUMP 0x800 /* Number-pad */ #define KNUMS 0xc00 /* Special + number pad */ #define KMEXT 0x300 /* Multi + ext */ - -#define SHFT_INVALID 0x0F ROSDATA USHORT scancode_to_vk[] = { /* Numbers Row */ @@ -60,10 +58,10 @@ /* Third letters row */ 'Z', 'X', 'C', 'V', 'B', 'N', 'M', VK_OEM_COMMA, - VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT | KEXT, + VK_OEM_PERIOD,VK_OEM_2, VK_RSHIFT, /* - 37 - */ /* Bottom Row */ - 0x26a, VK_LMENU, VK_SPACE, VK_CAPITAL, + VK_MULTIPLY, VK_LMENU, VK_SPACE, VK_CAPITAL, /* - 3b - */ /* F-Keys */ @@ -86,8 +84,8 @@ /* Oddities, and the remaining standard F-Keys */ VK_EMPTY, VK_OEM_102, VK_F11, VK_F12, /* - 59 - */ - VK_CLEAR, VK_OEM_WSCTRL,VK_OEM_FINISH,VK_OEM_JUMP, VK_EREOF, /* EREOF */ - VK_OEM_BACKTAB, VK_OEM_AUTO, VK_EMPTY, VK_ZOOM, /* ZOOM */ + VK_CLEAR, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* EREOF */ + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* ZOOM */ VK_HELP, /* - 64 - */ /* Even more F-Keys (for example, NCR keyboards from the early 90's) */ @@ -95,64 +93,25 @@ VK_F21, VK_F22, VK_F23, /* - 6f - */ /* Not sure who uses these codes */ - VK_OEM_PA3, VK_EMPTY, VK_OEM_RESET, + VK_EMPTY, VK_EMPTY, VK_EMPTY, /* - 72 - */ - VK_EMPTY, 0xc1, VK_EMPTY, VK_EMPTY, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* - 76 - */ /* One more f-key */ VK_F24, /* - 77 - */ VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, - VK_OEM_PA1, VK_TAB, 0xc2, 0, /* PA1 */ - 0, + VK_EMPTY, VK_EMPTY, VK_EMPTY, VK_EMPTY, /* PA1 */ + VK_EMPTY, /* - 80 - */ 0 }; ROSDATA VSC_VK extcode0_to_vk[] = { - { 0x10, VK_MEDIA_PREV_TRACK | KEXT }, - { 0x19, VK_MEDIA_NEXT_TRACK | KEXT }, - { 0x1D, VK_RCONTROL | KEXT }, - { 0x20, VK_VOLUME_MUTE | KEXT }, - { 0x21, VK_LAUNCH_APP2 | KEXT }, - { 0x22, VK_MEDIA_PLAY_PAUSE | KEXT }, - { 0x24, VK_MEDIA_STOP | KEXT }, - { 0x2E, VK_VOLUME_DOWN | KEXT }, - { 0x30, VK_VOLUME_UP | KEXT }, - { 0x32, VK_BROWSER_HOME | KEXT }, - { 0x35, VK_DIVIDE | KEXT }, - { 0x37, VK_SNAPSHOT | KEXT }, - { 0x38, VK_RMENU | KEXT }, - { 0x47, VK_HOME | KEXT }, - { 0x48, VK_UP | KEXT }, - { 0x49, VK_PRIOR | KEXT }, - { 0x4B, VK_LEFT | KEXT }, - { 0x4D, VK_RIGHT | KEXT }, - { 0x4F, VK_END | KEXT }, - { 0x50, VK_DOWN | KEXT }, - { 0x51, VK_NEXT | KEXT }, - { 0x52, VK_INSERT | KEXT }, - { 0x53, VK_DELETE | KEXT }, - { 0x5B, VK_LWIN | KEXT }, - { 0x5C, VK_RWIN | KEXT }, - { 0x5D, VK_APPS | KEXT }, - { 0x5F, VK_SLEEP | KEXT }, - { 0x65, VK_BROWSER_SEARCH | KEXT }, - { 0x66, VK_BROWSER_FAVORITES | KEXT }, - { 0x67, VK_BROWSER_REFRESH | KEXT }, - { 0x68, VK_BROWSER_STOP | KEXT }, - { 0x69, VK_BROWSER_FORWARD | KEXT }, - { 0x6A, VK_BROWSER_BACK | KEXT }, - { 0x6B, VK_LAUNCH_APP1 | KEXT }, - { 0x6C, VK_LAUNCH_MAIL | KEXT }, - { 0x6D, VK_LAUNCH_MEDIA_SELECT | KEXT }, - { 0x1C, VK_RETURN | KEXT }, - { 0x46, VK_CANCEL | KEXT }, { 0, 0 }, }; ROSDATA VSC_VK extcode1_to_vk[] = { - { 0x1d, VK_PAUSE}, { 0, 0 }, }; @@ -165,91 +124,93 @@ ROSDATA MODIFIERS modifier_bits = { modifier_keys, - 7, - { 0, 1, 4, 5, SHFT_INVALID, SHFT_INVALID, 2, 3 } + 3, + { 0, 1, 2, 3 } /* Modifier bit order, NONE, SHIFT, CTRL, ALT */ }; #define NOCAPS 0 #define CAPS KSHIFT /* Caps -> shift */ ROSDATA VK_TO_WCHARS2 key_to_chars_2mod[] = { - { VK_OEM_3, NOCAPS, {0x00ad, '?' } }, - { '9', NOCAPS, {'9', '(' } }, - { '0', NOCAPS, {'0', ')' } }, - { 'J', CAPS, {'j', 'J' } }, - { 'N', CAPS, {'n', 'N' } }, - { 'Z', CAPS, {'z', 'Z' } }, - { 'W', CAPS, {0x0113, 0x0112} }, - { 'X', CAPS, {0x010d, 0x010c} }, - { VK_OEM_1, CAPS, {0x0161, 0x0160} }, - { 'U', CAPS, {'u', 'U' } }, - { 'S', CAPS, {'s', 'S' } }, - { 'I', CAPS, {'i', 'I' } }, - { 'L', CAPS, {'l', 'L' } }, - { 'D', CAPS, {'d', 'D' } }, - { 'A', CAPS, {'a', 'A' } }, - { 'T', CAPS, {'t', 'T' } }, - { 'C', CAPS, {'c', 'C' } }, - { 'P', CAPS, {'p', 'P' } }, - { VK_OEM_8, CAPS, {0x0101, 0x0100} }, - { VK_OEM_2, CAPS, {0x013c, 0x013b} }, - { VK_DECIMAL, NOCAPS, {',', ',' } }, - { VK_TAB, NOCAPS, {'\t', '\t' } }, - { VK_ADD, NOCAPS, {'+', '+' } }, - { VK_DIVIDE, NOCAPS, {'/', '/' } }, - { VK_MULTIPLY, NOCAPS, {'*', '*' } }, - { VK_SUBTRACT, NOCAPS, {'-', '-' } }, + /* Normal vs Shifted */ + /* The numbers */ + { '1', NOCAPS, {'1', '!'} }, + /* Ctrl-2 generates NUL */ + { '3', NOCAPS, {'3', '#'} }, + { '4', NOCAPS, {'4', '$'} }, + { '5', NOCAPS, {'5', '%'} }, + /* Ctrl-6 generates RS */ + { '7', NOCAPS, {'7', '&'} }, + { '8', NOCAPS, {'8', '*'} }, + { '9', NOCAPS, {'9', '('} }, + { '0', NOCAPS, {'0', ')'} }, + + /* Specials */ + /* Ctrl-_ generates US */ + { VK_OEM_PLUS ,NOCAPS, {'=', '+'} }, + { VK_OEM_1 ,NOCAPS, {';', ':'} }, + { VK_OEM_7 ,NOCAPS, {'\'','\"'} }, + { VK_OEM_3 ,NOCAPS, {'`', '~'} }, + { VK_OEM_COMMA ,NOCAPS, {',', '<'} }, + { VK_OEM_PERIOD ,NOCAPS, {'.', '>'} }, + { VK_OEM_2 ,NOCAPS, {'/', '?'} }, + /* Keys that do not have shift states */ + { VK_TAB ,NOCAPS, {'\t','\t'} }, + { VK_ADD ,NOCAPS, {'+', '+'} }, + { VK_SUBTRACT,NOCAPS, {'-', '-'} }, + { VK_MULTIPLY,NOCAPS, {'*', '*'} }, + { VK_DIVIDE ,NOCAPS, {'/', '/'} }, + { VK_ESCAPE ,NOCAPS, {'\x1b','\x1b'} }, + { VK_SPACE ,NOCAPS, {' ', ' '} }, { 0, 0 } }; ROSDATA VK_TO_WCHARS3 key_to_chars_3mod[] = { - { '1', NOCAPS, {'1', '!', 0x00ab} }, - { '8', NOCAPS, {'8', 0x00d7, ':' } }, - { 'E', CAPS, {'e', 'E', 0x20ac} }, - { VK_OEM_COMMA, NOCAPS, {',', ';', '<' } }, - { VK_OEM_PERIOD, NOCAPS, {'.', ':', '>' } }, - { 0, 0 } + /* Normal, Shifted, Ctrl */ + /* Legacy (telnet-style) ascii escapes */ + { VK_OEM_4, 0, {'[', '{', 0x1b /* ESC */} }, + { VK_OEM_6, 0, {']', '}', 0x1d /* GS */} }, + { VK_OEM_5, 0, {'\\','|', 0x1c /* FS */} }, + { VK_OEM_102,0,{'\\','|', 0x1c /* FS */} }, + { VK_RETURN,0, {'\r', '\r', '\n'} }, + { 0,0 } }; ROSDATA VK_TO_WCHARS4 key_to_chars_4mod[] = { - { '2', NOCAPS, {'2', 0x00ab, WCH_NONE, '@' } }, - { '3', NOCAPS, {'3', 0x00bb, WCH_NONE, '#' } }, - { '4', NOCAPS, {'4', '$', 0x20ac, '$' } }, - { '5', NOCAPS, {'5', '%', '\"', WCH_DEAD} }, - { 0xff, NOCAPS, {WCH_NONE, WCH_NONE, WCH_NONE, '~' } }, - { '7', NOCAPS, {'7', '&', WCH_NONE, 0x00b1 } }, - { 'F', CAPS, {'f', 'F', '=', ';' } }, - { 'Q', CAPS, {0x016b, 0x016a, 'q', 'Q' } }, - { 'G', CAPS, {'g', 'G', 0x0123, 0x0122 } }, - { 'R', CAPS, {'r', 'R', 0x0157, 0x0156 } }, - { 'M', CAPS, {'m', 'M', 'w', 'W' } }, - { 'V', CAPS, {'v', 'V', 'y', 'Y' } }, - { 'Y', CAPS, {0x017e, 0x017d, '[', '{' } }, - { 'H', CAPS, {'h', 'H', ']', '}' } }, - { VK_OEM_7, NOCAPS, {WCH_DEAD, WCH_DEAD, WCH_DEAD, WCH_DEAD} }, - { 0xff, NOCAPS, {0x00b4, 0x00b0, 0x00b4, 0x00a8 } }, - { 'B', CAPS, {'b', 'B', 'x', 'X' } }, - { 'K', CAPS, {'k', 'K', 0x0137, 0x0136 } }, - { 'O', CAPS, {'o', 'O', 0x00f5, 0x00d5 } }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS5 key_to_chars_5mod[] = { - { VK_OEM_5, CAPS, {0x0137, 0x0136, WCH_NONE, WCH_NONE, 0x001c} }, - { VK_OEM_4, CAPS, {0x0146, 0x0145, WCH_NONE, WCH_NONE, 0x001b} }, - { VK_OEM_6, CAPS, {0x012b, 0x012a, WCH_NONE, WCH_NONE, 0x001d} }, - { VK_OEM_102, CAPS, {0x0123, 0x0122, '\\', '|', 0x001c} }, - { VK_BACK, NOCAPS, {'\b', '\b', WCH_NONE, WCH_NONE, 0x007f} }, - { VK_ESCAPE, NOCAPS, {0x001b, 0x001b, WCH_NONE, WCH_NONE, 0x001b} }, - { VK_RETURN, NOCAPS, {'\r', '\r', WCH_NONE, WCH_NONE, '\n' } }, - { VK_SPACE, NOCAPS, {' ', ' ', WCH_NONE, WCH_NONE, ' ' } }, - { VK_CANCEL, NOCAPS, {0x0003, 0x0003, WCH_NONE, WCH_NONE, 0x0003} }, - { 0, 0 } -}; - -ROSDATA VK_TO_WCHARS6 key_to_chars_6mod[] = { - { '6', NOCAPS, {'6', '/', 0x2019, '^', WCH_NONE, 0x001e} }, - { VK_OEM_MINUS, NOCAPS, {'-', '_', 0x2013, 0x2014, WCH_NONE, 0x001f} }, + /* Normal, Shifted, Ctrl, C-S-x */ + + /* The alphabet */ + { 'A', CAPS, {'a', 'A', 0x101, 0x100} }, + { 'B', CAPS, {'b', 'B', 0x02, 0x02} }, + { 'C', CAPS, {'c', 'C', 0x10d, 0x10c} }, + { 'D', CAPS, {'d', 'D', 0x04, 0x04} }, + { 'E', CAPS, {'e', 'E', 0x113, 0x112} }, + { 'F', CAPS, {'f', 'F', 0x06, 0x06} }, + { 'G', CAPS, {'g', 'G', 0x123, 0x122} }, + { 'H', CAPS, {'h', 'H', 0x08, 0x08} }, + { 'I', CAPS, {'i', 'I', 0x12b, 0x12a} }, + { 'J', CAPS, {'j', 'J', 0x0a, 0x0a} }, + { 'K', CAPS, {'k', 'K', 0x137, 0x136} }, + { 'L', CAPS, {'l', 'L', 0x13c, 0x13b} }, + { 'M', CAPS, {'m', 'M', 0x0d, 0x0d} }, + { 'N', CAPS, {'n', 'N', 0x146, 0x145} }, + { 'O', CAPS, {'o', 'O', 0x0f, 0x0f} }, + { 'P', CAPS, {'p', 'P', 0x10, 0x10} }, + { 'Q', CAPS, {'q', 'Q', 0x11, 0x11} }, + { 'R', CAPS, {'r', 'R', 0x12, 0x12} }, + { 'S', CAPS, {'s', 'S', 0x161, 0x160} }, + { 'T', CAPS, {'t', 'T', 0x14, 0x14} }, + { 'U', CAPS, {'u', 'U', 0x16b, 0x16a} }, + { 'V', CAPS, {'v', 'V', 0x16, 0x16} }, + { 'W', CAPS, {'w', 'W', 0x17, 0x17} }, + { 'X', CAPS, {'x', 'X', 0x18, 0x18} }, + { 'Y', CAPS, {'y', 'Y', 0x19, 0x19} }, + { 'Z', CAPS, {'z', 'Z', 0x17e, 0x17d} }, + + /* Legacy Ascii generators */ + { '2', NOCAPS, {'2', '@', WCH_NONE, 0} }, + { '6', NOCAPS, {'6', '^', WCH_NONE, 0x1e /* RS */} }, + { VK_OEM_MINUS, NOCAPS, {'-', '_', WCH_NONE, 0x1f /* US */} }, { 0, 0 } }; @@ -264,22 +225,23 @@ { VK_NUMPAD7, 0, {'7'} }, { VK_NUMPAD8, 0, {'8'} }, { VK_NUMPAD9, 0, {'9'} }, - { 0, 0 } + { VK_DECIMAL, 0, {'.'} }, + { VK_BACK, 0, {'\010'} }, + { 0,0 } }; #define vk_master(n,x) { (PVK_TO_WCHARS1)x, n, sizeof(x[0]) } ROSDATA VK_TO_WCHAR_TABLE vk_to_wchar_master_table[] = { + vk_master(1,keypad_numbers), + vk_master(2,key_to_chars_2mod), vk_master(3,key_to_chars_3mod), vk_master(4,key_to_chars_4mod), - vk_master(5,key_to_chars_5mod), - vk_master(6,key_to_chars_6mod), - vk_master(2,key_to_chars_2mod), - vk_master(1,keypad_numbers), { 0,0,0 } }; ROSDATA VSC_LPWSTR key_names[] = { + { 0x00, L"" }, { 0x01, L"Esc" }, { 0x0e, L"Backspace" }, { 0x0f, L"Tab" }, @@ -331,12 +293,12 @@ { 0x85, L"F22" }, { 0x86, L"F23" }, { 0x87, L"F24" }, - { 0, NULL } + { 0, NULL }, }; ROSDATA VSC_LPWSTR extended_key_names[] = { { 0x1c, L"Num Enter" }, - { 0x1d, L"Right Control" }, + { 0x1d, L"Right Ctrl" }, { 0x35, L"Num /" }, { 0x37, L"Prnt Scrn" }, { 0x38, L"Right Alt" }, @@ -345,7 +307,8 @@ { 0x47, L"Home" }, { 0x48, L"Up" }, { 0x49, L"Page Up" }, - { 0x4b, L"Left" }, + { 0x4a, L"Left" }, + { 0x4c, L"Center" }, { 0x4d, L"Right" }, { 0x4f, L"End" }, { 0x50, L"Down" }, @@ -353,60 +316,10 @@ { 0x52, L"Insert" }, { 0x53, L"Delete" }, { 0x54, L"<ReactOS>" }, - { 0x56, L"Help" }, - { 0x5b, L"Left <ReactOS>" }, - { 0x5c, L"Right <ReactOS>" }, - { 0x5d, L"Application" }, - { 0, NULL } -}; - -ROSDATA DEADKEY_LPWSTR dead_key_names[] = { - L"\x00b4" L"ACUTE", - L"\x00a8" L"DIAERESIS", - L"\x00b0" L"RING", - L"~" L"TILDE", - NULL -}; - -#define DEADTRANS(ch, accent, comp, flags) MAKELONG(ch, accent), comp, flags - -ROSDATA DEADKEY dead_key[] = { - { DEADTRANS(L'n', 0x00b4, 0x0144, 0x0000) }, - { DEADTRANS(L'c', 0x00b4, 0x0107, 0x0000) }, - { DEADTRANS(L'o', 0x00b4, 0x00f3, 0x0000) }, - { DEADTRANS(L'e', 0x00b4, 0x00e9, 0x0000) }, - { DEADTRANS(L's', 0x00b4, 0x015b, 0x0000) }, - { DEADTRANS(L'z', 0x00b4, 0x017a, 0x0000) }, - { DEADTRANS(L'N', 0x00b4, 0x0143, 0x0000) }, - { DEADTRANS(L'C', 0x00b4, 0x0106, 0x0000) }, - { DEADTRANS(L'O', 0x00b4, 0x00d3, 0x0000) }, - { DEADTRANS(L'E', 0x00b4, 0x00c9, 0x0000) }, - { DEADTRANS(L'S', 0x00b4, 0x015a, 0x0000) }, - { DEADTRANS(L'Z', 0x00b4, 0x0179, 0x0000) }, - { DEADTRANS(L' ', 0x00b4, 0x00b4, 0x0000) }, - - { DEADTRANS(L'a', 0x00a8, 0x00e4, 0x0000) }, - { DEADTRANS(L'u', 0x00a8, 0x00fc, 0x0000) }, - { DEADTRANS(L'o', 0x00a8, 0x00f6, 0x0000) }, - { DEADTRANS(L'A', 0x00a8, 0x00c4, 0x0000) }, - { DEADTRANS(L'U', 0x00a8, 0x00dc, 0x0000) }, - { DEADTRANS(L'O', 0x00a8, 0x00d6, 0x0000) }, - { DEADTRANS(L' ', 0x00a8, 0x00a8, 0x0000) }, - - { DEADTRANS(L'a', 0x00b0, 0x00e5, 0x0000) }, - { DEADTRANS(L'A', 0x00b0, 0x00c5, 0x0000) }, - { DEADTRANS(L'e', 0x00b0, 0x0117, 0x0000) }, - { DEADTRANS(L'E', 0x00b0, 0x0116, 0x0000) }, - { DEADTRANS(L'z', 0x00b0, 0x017c, 0x0000) }, - { DEADTRANS(L'Z', 0x00b0, 0x017b, 0x0000) }, - { DEADTRANS(L'g', 0x00b0, 0x0121, 0x0000) }, - { DEADTRANS(L' ', 0x00b0, 0x00b0, 0x0000) }, - - { DEADTRANS(L'o', L'~', 0x00f5, 0x0000) }, - { DEADTRANS(L'O', L'~', 0x00d5, 0x0000) }, - { DEADTRANS(L' ', L'~', L'~', 0x0000) }, - - {0, 0} + { 0x55, L"Help" }, + { 0x56, L"Left Windows" }, + { 0x5b, L"Right Windows" }, + { 0, NULL }, }; /* Finally, the master table */ @@ -417,13 +330,13 @@ /* character from vk tables */ vk_to_wchar_master_table, - /* diacritical marks */ - dead_key, + /* diacritical marks -- currently implemented by wine code */ + NULL, /* Key names */ (VSC_LPWSTR *)key_names, (VSC_LPWSTR *)extended_key_names, - dead_key_names, /* Dead key names */ + NULL, /* Dead key names */ /* scan code to virtual key maps */ scancode_to_vk, @@ -431,9 +344,9 @@ extcode0_to_vk, extcode1_to_vk, - MAKELONG(1,1), /* Version 1.0 */ - - /* Ligatures */ + MAKELONG(0,1), /* Version 1.0 */ + + /* Ligatures -- Latvian doesn't have any */ 0, 0, NULL @@ -443,12 +356,3 @@ return &keyboard_layout_table; } -INT WINAPI -DllMain( - PVOID hinstDll, - ULONG dwReason, - PVOID reserved) -{ - return 1; -} -

14 years, 3 months

[jgardou] 47451: [WIN32K] - Simplify UserDrawIconEx - NtUserCreateCursorIconHandle : Get Information from bitmaps even on indirect creation and fix calculation of icon height in case of monochrome icons. Fixes ~15 user32:cursoricon winetests.

by jgardou＠svn.reactos.org

Author: jgardou Date: Sun May 30 18:31:56 2010 New Revision: 47451 URL: http://svn.reactos.org/svn/reactos?rev=47451&view=rev Log: [WIN32K] - Simplify UserDrawIconEx - NtUserCreateCursorIconHandle : Get Information from bitmaps even on indirect creation and fix calculation of icon height in case of monochrome icons. Fixes ~15 user32:cursoricon winetests. Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c Modified: branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/branches/reactos-yarotows/subsystems/win… ============================================================================== --- branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] (original) +++ branches/reactos-yarotows/subsystems/win32/win32k/ntuser/cursoricon.c [iso-8859-1] Sun May 30 18:31:56 2010 @@ -556,7 +556,7 @@ /* Copy bitmaps and size info */ if (Indirect) { - // FIXME: WTF? + /* Convert bitmaps to unowned objects, so that they can be shared between processes */ CurIcon->IconInfo.hbmMask = BITMAP_CopyBitmap(CurIcon->IconInfo.hbmMask); GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); if(CurIcon->IconInfo.hbmColor) @@ -565,27 +565,24 @@ GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); } } - else + if (CurIcon->IconInfo.hbmColor && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) { - if (CurIcon->IconInfo.hbmColor && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmColor))) + CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + } + if (CurIcon->IconInfo.hbmMask && + (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) + { + if(!CurIcon->IconInfo.hbmColor) { CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy; - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmColor, NULL); + CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy/2; } - if (CurIcon->IconInfo.hbmMask && - (psurfBmp = SURFACE_LockSurface(CurIcon->IconInfo.hbmMask))) - { - if(!CurIcon->IconInfo.hbmColor) - { - CurIcon->Size.cx = psurfBmp->SurfObj.sizlBitmap.cx; - CurIcon->Size.cy = psurfBmp->SurfObj.sizlBitmap.cy*2; - } - SURFACE_UnlockSurface(psurfBmp); - GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); - } + SURFACE_UnlockSurface(psurfBmp); + GDIOBJ_SetOwnership(CurIcon->IconInfo.hbmMask, NULL); } /* Calculate icon hotspot */ @@ -1332,11 +1329,12 @@ SIZE IconSize; INT iOldBkColor = 0, iOldTxtColor = 0; - HDC hMemDC, hOffDC = NULL; + HDC hMemDC, hDestDC = hDc; HGDIOBJ hOldOffBrush = 0; HGDIOBJ hOldOffBmp = 0; HBITMAP hTmpBmp = 0, hOffBmp = 0; BOOL bAlpha = FALSE; + INT x=xLeft, y=yTop; hbmMask = pIcon->IconInfo.hbmMask; hbmColor = pIcon->IconInfo.hbmColor; @@ -1370,9 +1368,6 @@ IconSize.cx = bm.bmWidth; IconSize.cy = bm.bmHeight/2; } - - if (!diFlags) - diFlags = DI_NORMAL; /* NtGdiCreateCompatibleBitmap will create a monochrome bitmap when cxWidth or cyHeight is 0 */ @@ -1384,7 +1379,7 @@ { SURFACE *psurfOff = NULL; PFN_DIB_GetPixel fnSource_GetPixel = NULL; - INT x, y; + INT i, j; /* In order to correctly display 32 bit icons Windows first scans the image, because information about transparency is not stored in any image's headers */ @@ -1394,11 +1389,11 @@ fnSource_GetPixel = DibFunctionsForBitmapFormat[psurfOff->SurfObj.iBitmapFormat].DIB_GetPixel; if (fnSource_GetPixel) { - for (x = 0; x < psurfOff->SurfObj.sizlBitmap.cx; x++) + for (i = 0; i < psurfOff->SurfObj.sizlBitmap.cx; i++) { - for (y = 0; y < psurfOff->SurfObj.sizlBitmap.cy; y++) + for (j = 0; j < psurfOff->SurfObj.sizlBitmap.cy; j++) { - bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, x, y) >> 24) & 0xff); + bAlpha = ((BYTE)(fnSource_GetPixel(&psurfOff->SurfObj, i, j) >> 24) & 0xff); if (bAlpha) break; } @@ -1423,8 +1418,8 @@ if (DoFlickerFree) { - hOffDC = NtGdiCreateCompatibleDC(hDc); - if(!hOffDC) + hDestDC = NtGdiCreateCompatibleDC(hDc); + if(!hDestDC) { DPRINT1("NtGdiCreateCompatibleBitmap failed!\n"); Ret = FALSE; @@ -1436,25 +1431,23 @@ DPRINT1("NtGdiCreateCompatibleBitmap failed!\n"); goto Cleanup ; } - hOldOffBmp = NtGdiSelectBitmap(hOffDC, hOffBmp); - hOldOffBrush = NtGdiSelectBrush(hOffDC, hbrFlickerFreeDraw); - NtGdiPatBlt(hOffDC, 0, 0, cxWidth, cyHeight, PATCOPY); - NtGdiSelectBrush(hOffDC, hOldOffBrush); - } - else - { - /* Set Background/foreground colors */ - iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black - iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white - } - - - if (hbmMask && (diFlags & DI_MASK) && !bAlpha) + hOldOffBmp = NtGdiSelectBitmap(hDestDC, hOffBmp); + hOldOffBrush = NtGdiSelectBrush(hDestDC, hbrFlickerFreeDraw); + NtGdiPatBlt(hDestDC, 0, 0, cxWidth, cyHeight, PATCOPY); + NtGdiSelectBrush(hDestDC, hOldOffBrush); + x=y=0; + } + + /* Set Background/foreground colors */ + iOldTxtColor = IntGdiSetTextColor(hDc, 0); //black + iOldBkColor = IntGdiSetBkColor(hDc, 0x00FFFFFF); //white + + if ((diFlags & DI_MASK) && (!bAlpha || !(diFlags & DI_IMAGE))) { hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmMask); - NtGdiStretchBlt(hOffDC ? hOffDC : hDc, - hOffDC ? 0 : xLeft, - hOffDC ? 0 : yTop, + NtGdiStretchBlt(hDestDC, + x, + y, cxWidth, cyHeight, hMemDC, @@ -1534,9 +1527,9 @@ hTmpBmp = NtGdiSelectBitmap(hMemDC, hMemBmp); - NtGdiAlphaBlend(hOffDC ? hOffDC : hDc, - hOffDC ? 0 : xLeft, - hOffDC ? 0 : yTop, + NtGdiAlphaBlend(hDestDC, + x, + y, cxWidth, cyHeight, hMemDC, @@ -1555,9 +1548,9 @@ { DWORD rop = (diFlags & DI_MASK) ? SRCINVERT : SRCCOPY ; hTmpBmp = NtGdiSelectBitmap(hMemDC, hbmColor); - NtGdiStretchBlt(hOffDC ? hOffDC : hDc, - hOffDC ? 0 : xLeft, - hOffDC ? 0 : yTop, + NtGdiStretchBlt(hDestDC, + x, + y, cxWidth, cyHeight, hMemDC, @@ -1571,23 +1564,25 @@ } } - if(hOffDC) - { - NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hOffDC, 0, 0, SRCCOPY, 0, 0); - } - else - { - IntGdiSetBkColor(hDc, iOldBkColor); - IntGdiSetTextColor(hDc, iOldTxtColor); - } + if(hDestDC != hDc) + { + NtGdiBitBlt(hDc, xLeft, yTop, cxWidth, cyHeight, hDestDC, 0, 0, SRCCOPY, 0, 0); + } + + /* Restore foreground and background colors */ + IntGdiSetBkColor(hDc, iOldBkColor); + IntGdiSetTextColor(hDc, iOldTxtColor); Ret = TRUE ; Cleanup: NtGdiDeleteObjectApp(hMemDC); - if(hOldOffBmp) NtGdiSelectBitmap(hOffDC, hOldOffBmp); - if(hOffDC) NtGdiDeleteObjectApp(hOffDC); - if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp); + if(hDestDC != hDc) + { + if(hOldOffBmp) NtGdiSelectBitmap(hDestDC, hOldOffBmp); + NtGdiDeleteObjectApp(hDestDC); + if(hOffBmp) NtGdiDeleteObjectApp(hOffBmp); + } return Ret; }

14 years, 3 months

[tkreuzer] 47450: [WINE] Cast the unused 0 in the ok macro to void to make clang happy

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sun May 30 18:24:51 2010 New Revision: 47450 URL: http://svn.reactos.org/svn/reactos?rev=47450&view=rev Log: [WINE] Cast the unused 0 in the ok macro to void to make clang happy Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun May 30 18:24:51 2010 @@ -94,7 +94,7 @@ #endif /* __GNUC__ */ -#define ok_(file, line) (winetest_set_location(file, line), 0) ? 0 : winetest_ok +#define ok_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_ok #define skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_skip #define win_skip_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_win_skip #define trace_(file, line) (winetest_set_location(file, line), 0) ? (void)0 : winetest_trace

14 years, 3 months

[cwittich] 47449: [WINE] partial sync of test.h

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 30 17:37:32 2010 New Revision: 47449 URL: http://svn.reactos.org/svn/reactos?rev=47449&view=rev Log: [WINE] partial sync of test.h Modified: trunk/reactos/include/reactos/wine/test.h Modified: trunk/reactos/include/reactos/wine/test.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/wine/test.… ============================================================================== --- trunk/reactos/include/reactos/wine/test.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/wine/test.h [iso-8859-1] Sun May 30 17:37:32 2010 @@ -80,14 +80,14 @@ #ifdef __GNUC__ -extern int winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); +extern void winetest_ok( int condition, const char *msg, ... ) __attribute__((format (printf,2,3) )); extern void winetest_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_win_skip( const char *msg, ... ) __attribute__((format (printf,1,2))); extern void winetest_trace( const char *msg, ... ) __attribute__((format (printf,1,2))); #else /* __GNUC__ */ -extern int winetest_ok( int condition, const char *msg, ... ); +extern void winetest_ok( int condition, const char *msg, ... ); extern void winetest_skip( const char *msg, ... ); extern void winetest_win_skip( const char *msg, ... ); extern void winetest_trace( const char *msg, ... ); @@ -322,15 +322,13 @@ } } -int winetest_ok( int condition, const char *msg, ... ) +void winetest_ok( int condition, const char *msg, ... ) { va_list valist; - int rc; - + va_start(valist, msg); - rc=winetest_vok(condition, msg, valist); + winetest_vok(condition, msg, valist); va_end(valist); - return rc; } void winetest_trace( const char *msg, ... )

14 years, 3 months

[cwittich] 47448: [COMCTL32_WINETEST] sync to wine 1.2 RC2

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 30 17:19:09 2010 New Revision: 47448 URL: http://svn.reactos.org/svn/reactos?rev=47448&view=rev Log: [COMCTL32_WINETEST] sync to wine 1.2 RC2 Added: trunk/rostests/winetests/comctl32/v6util.h (with props) Removed: trunk/rostests/winetests/comctl32/comctl32_ros.diff trunk/rostests/winetests/comctl32/msg.c Modified: trunk/rostests/winetests/comctl32/comboex.c trunk/rostests/winetests/comctl32/comctl32.rbuild trunk/rostests/winetests/comctl32/datetime.c trunk/rostests/winetests/comctl32/dpa.c trunk/rostests/winetests/comctl32/header.c trunk/rostests/winetests/comctl32/imagelist.c trunk/rostests/winetests/comctl32/ipaddress.c trunk/rostests/winetests/comctl32/listview.c trunk/rostests/winetests/comctl32/misc.c trunk/rostests/winetests/comctl32/monthcal.c trunk/rostests/winetests/comctl32/mru.c trunk/rostests/winetests/comctl32/msg.h trunk/rostests/winetests/comctl32/progress.c trunk/rostests/winetests/comctl32/propsheet.c trunk/rostests/winetests/comctl32/rebar.c trunk/rostests/winetests/comctl32/resources.h trunk/rostests/winetests/comctl32/rsrc.rc trunk/rostests/winetests/comctl32/status.c trunk/rostests/winetests/comctl32/subclass.c trunk/rostests/winetests/comctl32/tab.c trunk/rostests/winetests/comctl32/testlist.c trunk/rostests/winetests/comctl32/toolbar.c trunk/rostests/winetests/comctl32/tooltips.c trunk/rostests/winetests/comctl32/trackbar.c trunk/rostests/winetests/comctl32/treeview.c trunk/rostests/winetests/comctl32/updown.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/rostests/winetests/comctl32/comboex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comboe… Modified: trunk/rostests/winetests/comctl32/comctl32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… Removed: trunk/rostests/winetests/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/comctl… Modified: trunk/rostests/winetests/comctl32/datetime.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dateti… Modified: trunk/rostests/winetests/comctl32/dpa.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/dpa.c?… Modified: trunk/rostests/winetests/comctl32/header.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/header… Modified: trunk/rostests/winetests/comctl32/imagelist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/imagel… Modified: trunk/rostests/winetests/comctl32/ipaddress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/ipaddr… Modified: trunk/rostests/winetests/comctl32/listview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/listvi… Modified: trunk/rostests/winetests/comctl32/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/misc.c… Modified: trunk/rostests/winetests/comctl32/monthcal.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/monthc… Modified: trunk/rostests/winetests/comctl32/mru.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/mru.c?… Removed: trunk/rostests/winetests/comctl32/msg.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.c?… Modified: trunk/rostests/winetests/comctl32/msg.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/msg.h?… Modified: trunk/rostests/winetests/comctl32/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/progre… Modified: trunk/rostests/winetests/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/propsh… Modified: trunk/rostests/winetests/comctl32/rebar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rebar.… Modified: trunk/rostests/winetests/comctl32/resources.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/resour… Modified: trunk/rostests/winetests/comctl32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/rsrc.r… Modified: trunk/rostests/winetests/comctl32/status.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/status… Modified: trunk/rostests/winetests/comctl32/subclass.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/subcla… Modified: trunk/rostests/winetests/comctl32/tab.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/tab.c?… Modified: trunk/rostests/winetests/comctl32/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/testli… Modified: trunk/rostests/winetests/comctl32/toolbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolba… Modified: trunk/rostests/winetests/comctl32/tooltips.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/toolti… Modified: trunk/rostests/winetests/comctl32/trackbar.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/trackb… Modified: trunk/rostests/winetests/comctl32/treeview.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/treevi… Modified: trunk/rostests/winetests/comctl32/updown.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/updown… Added: trunk/rostests/winetests/comctl32/v6util.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/comctl32/v6util…

14 years, 3 months

[cwittich] 47447: [PSDK] add missing definitions

by cwittich＠svn.reactos.org

Author: cwittich Date: Sun May 30 17:18:08 2010 New Revision: 47447 URL: http://svn.reactos.org/svn/reactos?rev=47447&view=rev Log: [PSDK] add missing definitions Modified: trunk/reactos/include/psdk/prsht.h Modified: trunk/reactos/include/psdk/prsht.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/prsht.h?rev=4… ============================================================================== --- trunk/reactos/include/psdk/prsht.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/prsht.h [iso-8859-1] Sun May 30 17:18:08 2010 @@ -82,7 +82,11 @@ #if (_WIN32_IE >= 0x0500) #define PSM_GETRESULT 1159 #define PropSheet_GetResult(hDlg) SNDMSG(hDlg, PSM_GETRESULT, 0, 0) + #define PSM_HWNDTOINDEX 1153 +#define PropSheet_HwndToIndex(hDlg, hwnd) \ + (int)SNDMSG(hDlg, PSM_HWNDTOINDEX, (WPARAM)(hwnd), 0) + #define PSM_IDTOINDEX 1157 #define PSM_INDEXTOHWND 1154 #define PSM_INDEXTOID 1158

14 years, 3 months

[gschneider] 47446: [MMSYS] Load the no sound item in the shared buffer before preparing the reactos/media path for loading individual files See issue #5436 for more details.

by gschneider＠svn.reactos.org

Author: gschneider Date: Sun May 30 17:13:04 2010 New Revision: 47446 URL: http://svn.reactos.org/svn/reactos?rev=47446&view=rev Log: [MMSYS] Load the no sound item in the shared buffer before preparing the reactos/media path for loading individual files See issue #5436 for more details. Modified: trunk/reactos/dll/cpl/mmsys/sounds.c Modified: trunk/reactos/dll/cpl/mmsys/sounds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/sounds.c?rev… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/sounds.c [iso-8859-1] Sun May 30 17:13:04 2010 @@ -718,6 +718,14 @@ LRESULT lResult; UINT length; + /* Add no sound listview item */ + if (LoadString(hApplet, IDS_NO_SOUND, szPath, MAX_PATH)) + { + szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; + SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szPath); + } + + /* Load sound files */ length = GetWindowsDirectoryW(szPath, MAX_PATH); if (length == 0 || length >= MAX_PATH - 9) { @@ -735,11 +743,6 @@ if (hFile == INVALID_HANDLE_VALUE) { return FALSE; - } - if (LoadString(hApplet, IDS_NO_SOUND, szPath, MAX_PATH)) - { - szPath[(sizeof(szPath)/sizeof(WCHAR))-1] = L'\0'; - SendDlgItemMessageW(hwndDlg, IDC_SOUND_LIST, CB_ADDSTRING, (WPARAM)0, (LPARAM)szPath); } do @@ -1054,6 +1057,7 @@ ZeroMemory(&item, sizeof(LVITEM)); item.mask = LVIF_PARAM; item.iItem = nm->iItem; + if (ListView_GetItem(GetDlgItem(hwndDlg, IDC_SCHEME_LIST), &item)) { LRESULT lCount, lIndex, lResult;

14 years, 3 months

← Newer
1
2
3
4
5
6
7
8
9
...
44
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 May 2010