mirror of
https://github.com/reactos/reactos.git
synced 2025-08-04 06:26:35 +00:00
Sync trunk.
svn path=/branches/header-work/; revision=47661
This commit is contained in:
Amine Khaldi
commit
6bc4e97d08
1080 changed files with 59417 additions and 36746 deletions
|
|
@ -56,35 +56,35 @@ static const conv_t conv_ANGLE[] = {
|
|||
|
||||
/*
|
||||
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 @@ static const conv_t conv_AREA[] = {
|
|||
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 @@ static const conv_t conv_ENERGY[] = {
|
|||
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 @@ static const conv_t conv_LENGTH[] = {
|
|||
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 @@ static const conv_t conv_LENGTH[] = {
|
|||
// 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 @@ static const conv_t conv_POWER[] = {
|
|||
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 @@ static const conv_t conv_PRESSURE[] = {
|
|||
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 @@ static const conv_t conv_VELOCITY[] = {
|
|||
/*
|
||||
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 @@ static const conv_t conv_VELOCITY[] = {
|
|||
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 @@ static const conv_t conv_VELOCITY[] = {
|
|||
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 @@ static const conv_t conv_VOLUME[] = {
|
|||
/*
|
||||
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 @@ static const conv_t conv_VOLUME[] = {
|
|||
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 @@ static const conv_t conv_WEIGHT[] = {
|
|||
// 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 @@ void ConvExecute(HWND hWnd)
|
|||
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);
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "Äíè"
|
||||
IDS_TIME_HOURS "×àñè"
|
||||
IDS_TIME_NANOSECONDS "Nanoseconds"
|
||||
IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè"
|
||||
IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè"
|
||||
IDS_TIME_MINUTES "Ìèíóòè"
|
||||
|
|
|
|||
|
|
@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "ÌÝñåò"
|
||||
IDS_TIME_HOURS "¿ñåò"
|
||||
IDS_TIME_NANOSECONDS "Nanoseconds"
|
||||
IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá"
|
||||
IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá"
|
||||
IDS_TIME_MINUTES "ËåðôÜ"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "Giorni"
|
||||
IDS_TIME_HOURS "Ore"
|
||||
IDS_TIME_NANOSECONDS "Nanosecondi"
|
||||
IDS_TIME_MICROSECONDS "Microsecondi"
|
||||
IDS_TIME_MILLISECONDS "Millisecondi"
|
||||
IDS_TIME_MINUTES "Minuti"
|
||||
|
|
|
|||
|
|
@ -643,6 +643,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "**"
|
||||
IDS_TIME_HOURS "**"
|
||||
IDS_TIME_NANOSECONDS "Nanoseconds"
|
||||
IDS_TIME_MICROSECONDS "**"
|
||||
IDS_TIME_MILLISECONDS "**"
|
||||
IDS_TIME_MINUTES "**"
|
||||
|
|
|
|||
|
|
@ -464,9 +464,9 @@ END
|
|||
// TYPES OF ANGLES
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_ANGLE_DEGREES "Stopni"
|
||||
IDS_ANGLE_GRADIANS "Gradianów"
|
||||
IDS_ANGLE_RADIANS "Radianów"
|
||||
IDS_ANGLE_DEGREES "Stopnie"
|
||||
IDS_ANGLE_GRADIANS "Gradiany"
|
||||
IDS_ANGLE_RADIANS "Radiany"
|
||||
END
|
||||
|
||||
// TYPES OF AREAS
|
||||
|
|
@ -489,21 +489,21 @@ BEGIN
|
|||
IDS_AREA_PYEONGBANGJA "Pyeongbangja"
|
||||
IDS_AREA_RAI "Rai"
|
||||
IDS_AREA_SE "Se"
|
||||
IDS_AREA_SQUARE_CENTIMETERS "Centymetrów kwadratowych"
|
||||
IDS_AREA_SQUARE_CHR "Chr kwadratowych"
|
||||
IDS_AREA_SQUARE_FATHOMS "S¹¿ni kwadratowych"
|
||||
IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿ni kwadratowych (Wêgry)"
|
||||
IDS_AREA_SQUARE_FEET "Stóp kwadratowych"
|
||||
IDS_AREA_SQUARE_INCHES "Cali kwadratowych"
|
||||
IDS_AREA_SQUARE_KILOMETERS "Kilometrów kwadratowych"
|
||||
IDS_AREA_SQUARE_LAR "Lar kwadratowych"
|
||||
IDS_AREA_SQUARE_METER "Metrów kwadratowych"
|
||||
IDS_AREA_SQUARE_MILES "Mil kwadratowych"
|
||||
IDS_AREA_SQUARE_MILLIMETERS "Milimetrów kwadratowych"
|
||||
IDS_AREA_SQUARE_SHAKU "Shaku kwadratowych"
|
||||
IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowych"
|
||||
IDS_AREA_SQUARE_VA "Va kwadratowych"
|
||||
IDS_AREA_SQUARE_YARD "Jardów kwadratowych"
|
||||
IDS_AREA_SQUARE_CENTIMETERS "Centymetry kwadratowe"
|
||||
IDS_AREA_SQUARE_CHR "Chr kwadratowe"
|
||||
IDS_AREA_SQUARE_FATHOMS "S¹¿nie kwadratowe"
|
||||
IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿nie kwadratowe (Wêgry)"
|
||||
IDS_AREA_SQUARE_FEET "Stopy kwadratowe"
|
||||
IDS_AREA_SQUARE_INCHES "Cale kwadratowe"
|
||||
IDS_AREA_SQUARE_KILOMETERS "Kilometry kwadratowe"
|
||||
IDS_AREA_SQUARE_LAR "Lar kwadratowe"
|
||||
IDS_AREA_SQUARE_METER "Metry kwadratowe"
|
||||
IDS_AREA_SQUARE_MILES "Mile kwadratowe"
|
||||
IDS_AREA_SQUARE_MILLIMETERS "Milimetry kwadratowe"
|
||||
IDS_AREA_SQUARE_SHAKU "Shaku kwadratowe"
|
||||
IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowe"
|
||||
IDS_AREA_SQUARE_VA "Va kwadratowe"
|
||||
IDS_AREA_SQUARE_YARD "Jardy kwadratowe"
|
||||
IDS_AREA_TAN "Tan"
|
||||
IDS_AREA_TSUBO "Tsubo"
|
||||
END
|
||||
|
|
@ -511,10 +511,10 @@ END
|
|||
// TYPES OF COMSUMPTIONS
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_CONSUMPTION_KM_PER_L "Kilometrów/litr"
|
||||
IDS_CONSUMPTION_L_PER_100_KM "Litrów/100 kilometróws"
|
||||
IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)"
|
||||
IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)"
|
||||
IDS_CONSUMPTION_KM_PER_L "Kilometry/litr"
|
||||
IDS_CONSUMPTION_L_PER_100_KM "Litry/100 kilometrów"
|
||||
IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (UK)"
|
||||
IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (USA)"
|
||||
END
|
||||
|
||||
// TYPES OF CURRENCIES
|
||||
|
|
@ -543,56 +543,56 @@ END
|
|||
// TYPES OF ENERGIES
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_ENERGY_15_C_CALORIES "15 °C kalorii"
|
||||
IDS_ENERGY_15_C_CALORIES "15 °C kalorie"
|
||||
IDS_ENERGY_BTUS "British Thermal Unit"
|
||||
IDS_ENERGY_ERGS "Ergów"
|
||||
IDS_ENERGY_EVS "Elektronowolt"
|
||||
IDS_ENERGY_FOOT_POUNDS "Foot-pound"
|
||||
IDS_ENERGY_ERGS "Ergi"
|
||||
IDS_ENERGY_EVS "Elektronowolty"
|
||||
IDS_ENERGY_FOOT_POUNDS "Stopo-funty"
|
||||
IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii"
|
||||
IDS_ENERGY_IT_KILOCALORIES "Miêdzynarodowa Tablica kilokalorii"
|
||||
IDS_ENERGY_JOULES "D¿uli"
|
||||
IDS_ENERGY_KILOJOULES "Kilod¿uli"
|
||||
IDS_ENERGY_KILOWATT_HOURS "Kilowatogodzin"
|
||||
IDS_ENERGY_NUTRITION_CALORIES "Kalorii spo¿ywczych"
|
||||
IDS_ENERGY_TH_CALORIES "Kalorii termochemicznych"
|
||||
IDS_ENERGY_JOULES "D¿ule"
|
||||
IDS_ENERGY_KILOJOULES "Kilod¿ule"
|
||||
IDS_ENERGY_KILOWATT_HOURS "Kilowatogodziny"
|
||||
IDS_ENERGY_NUTRITION_CALORIES "Kalorie spo¿ywcze"
|
||||
IDS_ENERGY_TH_CALORIES "Kalorie termochemiczne"
|
||||
END
|
||||
|
||||
// TYPES OF LENGTHS
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_LENGTH_ANGSTROMS "Angsztremów"
|
||||
IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostek Astronomicznych"
|
||||
IDS_LENGTH_BARLEYCORNS "Palców"
|
||||
IDS_LENGTH_CENTIMETERS "Centimetrów"
|
||||
IDS_LENGTH_ANGSTROMS "Angsztremy"
|
||||
IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostki Astronomiczne"
|
||||
IDS_LENGTH_BARLEYCORNS "Palce"
|
||||
IDS_LENGTH_CENTIMETERS "Centymetry"
|
||||
IDS_LENGTH_CHAINS_UK "Chains (UK)"
|
||||
IDS_LENGTH_CHI "Chi"
|
||||
IDS_LENGTH_CHOU "Chou"
|
||||
IDS_LENGTH_CHR "Chr"
|
||||
IDS_LENGTH_CUN "Cun"
|
||||
IDS_LENGTH_FATHOMS "S¹¿ni"
|
||||
IDS_LENGTH_FATHOMS_HUNGARY "S¹¿ni (Wêgry)"
|
||||
IDS_LENGTH_FEET "Stóp"
|
||||
IDS_LENGTH_FATHOMS "S¹¿nie"
|
||||
IDS_LENGTH_FATHOMS_HUNGARY "S¹¿nie (Wêgry)"
|
||||
IDS_LENGTH_FEET "Stopy"
|
||||
IDS_LENGTH_FURLONGS "Furlongs"
|
||||
IDS_LENGTH_GAN "Gan"
|
||||
IDS_LENGTH_HANDS "D³oni"
|
||||
IDS_LENGTH_HANDS "D³onie"
|
||||
IDS_LENGTH_HUNH "Hunh"
|
||||
IDS_LENGTH_INCHES "Cali"
|
||||
IDS_LENGTH_INCHES "Cale"
|
||||
IDS_LENGTH_JA "Ja"
|
||||
IDS_LENGTH_JEONG "Jeong"
|
||||
IDS_LENGTH_KABIET "Kabiet"
|
||||
IDS_LENGTH_KEN "Ken"
|
||||
IDS_LENGTH_KEUB "Keub"
|
||||
IDS_LENGTH_KILOMETERS "Kilometerów"
|
||||
IDS_LENGTH_KILOMETERS "Kilometry"
|
||||
IDS_LENGTH_LAR "Lar"
|
||||
IDS_LENGTH_LIGHT_YEARS "Lat œwietlnych"
|
||||
IDS_LENGTH_LIGHT_YEARS "Lata œwietlne"
|
||||
IDS_LENGTH_LINKS_UK "Links (UK)"
|
||||
IDS_LENGTH_METERS "Metrów"
|
||||
IDS_LENGTH_MICRONS "Mikrometrów"
|
||||
IDS_LENGTH_MILES "Mil"
|
||||
IDS_LENGTH_MILLIMETERS "Millimetrów"
|
||||
IDS_LENGTH_NAUTICAL_MILES "Mil morskich"
|
||||
IDS_LENGTH_METERS "Metry"
|
||||
IDS_LENGTH_MICRONS "Mikrometry"
|
||||
IDS_LENGTH_MILES "Mile"
|
||||
IDS_LENGTH_MILLIMETERS "Milimetry"
|
||||
IDS_LENGTH_NAUTICAL_MILES "Mile morskie"
|
||||
IDS_LENGTH_NIEU "Nieu"
|
||||
IDS_LENGTH_PARSECS "Parseków"
|
||||
IDS_LENGTH_PARSECS "Parseki"
|
||||
IDS_LENGTH_PICAS "Picas"
|
||||
IDS_LENGTH_RI_JAPAN "Ri (Japan)"
|
||||
IDS_LENGTH_RI_KOREA "Ri (Korea)"
|
||||
|
|
@ -604,7 +604,7 @@ BEGIN
|
|||
IDS_LENGTH_SUN "Sun"
|
||||
IDS_LENGTH_TSUEN "Tsuen"
|
||||
IDS_LENGTH_VA "Va"
|
||||
IDS_LENGTH_YARDS "Jardów"
|
||||
IDS_LENGTH_YARDS "Jardy"
|
||||
IDS_LENGTH_YOTE "Yote"
|
||||
IDS_LENGTH_ZHANG "Zhang"
|
||||
END
|
||||
|
|
@ -613,23 +613,23 @@ END
|
|||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_POWER_BTUS_PER_MINUTE "BTU na minutê"
|
||||
IDS_POWER_FPS_PER_MINUTE "Foot-pound na minutê"
|
||||
IDS_POWER_HORSEPOWER "Koni mechanicznych"
|
||||
IDS_POWER_KILOWATTS "Kilowatów"
|
||||
IDS_POWER_MEGAWATTS "Megawatów"
|
||||
IDS_POWER_WATTS "Watów"
|
||||
IDS_POWER_FPS_PER_MINUTE "Stopo-funty na minutê"
|
||||
IDS_POWER_HORSEPOWER "Konie mechaniczne"
|
||||
IDS_POWER_KILOWATTS "Kilowaty"
|
||||
IDS_POWER_MEGAWATTS "Megawaty"
|
||||
IDS_POWER_WATTS "Waty"
|
||||
END
|
||||
|
||||
// TYPE OF PRESSURES
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_PRESSURE_ATMOSPHERES "Atmosfer"
|
||||
IDS_PRESSURE_BARS "Barów"
|
||||
IDS_PRESSURE_HECTOPASCALS "Hektopaskali"
|
||||
IDS_PRESSURE_KILOPASCALS "Kilopaskali"
|
||||
IDS_PRESSURE_MM_OF_MERCURY "Millimetrów s³upka rtêci"
|
||||
IDS_PRESSURE_PASCALS "Paskali"
|
||||
IDS_PRESSURE_PSI "Funtów na cal kwadratowy"
|
||||
IDS_PRESSURE_ATMOSPHERES "Atmosfery"
|
||||
IDS_PRESSURE_BARS "Bary"
|
||||
IDS_PRESSURE_HECTOPASCALS "Hektopaskale"
|
||||
IDS_PRESSURE_KILOPASCALS "Kilopaskale"
|
||||
IDS_PRESSURE_MM_OF_MERCURY "Milimetry s³upka rtêci"
|
||||
IDS_PRESSURE_PASCALS "Paskale"
|
||||
IDS_PRESSURE_PSI "Funty na cal kwadratowy"
|
||||
END
|
||||
|
||||
// TYPES OF TEMPERATURES
|
||||
|
|
@ -645,60 +645,61 @@ END
|
|||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_TIME_DAYS "Dni"
|
||||
IDS_TIME_HOURS "Godzin"
|
||||
IDS_TIME_MICROSECONDS "Mikrosekund"
|
||||
IDS_TIME_MILLISECONDS "Milisekund"
|
||||
IDS_TIME_MINUTES "Minut"
|
||||
IDS_TIME_SECONDS "Sekund"
|
||||
IDS_TIME_WEEKS "Tygodni"
|
||||
IDS_TIME_YEARS "Lat"
|
||||
IDS_TIME_HOURS "Godziny"
|
||||
IDS_TIME_NANOSECONDS "Nanosekundy"
|
||||
IDS_TIME_MICROSECONDS "Mikrosekundy"
|
||||
IDS_TIME_MILLISECONDS "Milisekundy"
|
||||
IDS_TIME_MINUTES "Minuty"
|
||||
IDS_TIME_SECONDS "Sekundy"
|
||||
IDS_TIME_WEEKS "Tygodnie"
|
||||
IDS_TIME_YEARS "Lata"
|
||||
END
|
||||
|
||||
// TYPES OF VELOCITIES
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_VELOCITY_CMS_SECOND "Centimetrów/sekundê"
|
||||
IDS_VELOCITY_FEET_HOUR "Stóp/godzinê"
|
||||
IDS_VELOCITY_FEET_SECOND "Stóp/sekundê"
|
||||
IDS_VELOCITY_KILOMETERS_HOUR "Kilometrów/godzinê"
|
||||
IDS_VELOCITY_KNOTS "Wêz³ów"
|
||||
IDS_VELOCITY_MACH "Machów"
|
||||
IDS_VELOCITY_METERS_SECOND "Metrów/sekundê"
|
||||
IDS_VELOCITY_MILES_HOUR "Mil/godzinê"
|
||||
IDS_VELOCITY_CMS_SECOND "Centymetry/sekundê"
|
||||
IDS_VELOCITY_FEET_HOUR "Stopy/godzinê"
|
||||
IDS_VELOCITY_FEET_SECOND "Stopy/sekundê"
|
||||
IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/godzinê"
|
||||
IDS_VELOCITY_KNOTS "Wêz³y"
|
||||
IDS_VELOCITY_MACH "Machy"
|
||||
IDS_VELOCITY_METERS_SECOND "Metry/sekundê"
|
||||
IDS_VELOCITY_MILES_HOUR "Mile/godzinê"
|
||||
END
|
||||
|
||||
// TYPES OF VOLUMES
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_VOLUME_BARRELS_UK "Bary³ek (UK)"
|
||||
IDS_VOLUME_BARRELS_OIL "Bary³ek"
|
||||
IDS_VOLUME_BARRELS_UK "Bary³ki (UK)"
|
||||
IDS_VOLUME_BARRELS_OIL "Bary³ki"
|
||||
IDS_VOLUME_BUN "Bun"
|
||||
IDS_VOLUME_BUSHELS_UK "Buszli (UK)"
|
||||
IDS_VOLUME_BUSHELS_US "Buszli (US)"
|
||||
IDS_VOLUME_CUBIC_CENTIMETERS "Centymetrów szeœciennych"
|
||||
IDS_VOLUME_CUBIC_FEET "Stóp szeœciennych"
|
||||
IDS_VOLUME_CUBIC_INCHES "Cali szeœciennych"
|
||||
IDS_VOLUME_CUBIC_METERS "Metrów szeœciennych"
|
||||
IDS_VOLUME_CUBIC_YARDS "Jardów szeœciennych"
|
||||
IDS_VOLUME_BUSHELS_UK "Buszle (UK)"
|
||||
IDS_VOLUME_BUSHELS_US "Buszle (US)"
|
||||
IDS_VOLUME_CUBIC_CENTIMETERS "Centymetry szeœcienne"
|
||||
IDS_VOLUME_CUBIC_FEET "Stopy szeœcienne"
|
||||
IDS_VOLUME_CUBIC_INCHES "Cale szeœcienne"
|
||||
IDS_VOLUME_CUBIC_METERS "Metry szeœcienne"
|
||||
IDS_VOLUME_CUBIC_YARDS "Jardy szeœcienne"
|
||||
IDS_VOLUME_DOE "Doe"
|
||||
IDS_VOLUME_FLUID_OUNCES_UK "Uncji, p³yn (UK)"
|
||||
IDS_VOLUME_FLUID_OUNCES_US "Uncji, p³yn (US)"
|
||||
IDS_VOLUME_GALLONS_UK "Galonów (UK)"
|
||||
IDS_VOLUME_GALLONS_DRY_US "Galonów, sypkie (US)"
|
||||
IDS_VOLUME_GALLONS_LIQUID_US "Gallons, p³yn (US)"
|
||||
IDS_VOLUME_FLUID_OUNCES_UK "Uncje, p³yn (UK)"
|
||||
IDS_VOLUME_FLUID_OUNCES_US "Uncje, p³yn (US)"
|
||||
IDS_VOLUME_GALLONS_UK "Galony (UK)"
|
||||
IDS_VOLUME_GALLONS_DRY_US "Galony, sypkie (US)"
|
||||
IDS_VOLUME_GALLONS_LIQUID_US "Galony, p³yn (US)"
|
||||
IDS_VOLUME_GOU "Gou"
|
||||
IDS_VOLUME_HOP "Hop"
|
||||
IDS_VOLUME_ICCE "Icce"
|
||||
IDS_VOLUME_KWIAN "Kwian"
|
||||
IDS_VOLUME_LITERS "Litrów"
|
||||
IDS_VOLUME_LITERS "Litry"
|
||||
IDS_VOLUME_MAL "Mal"
|
||||
IDS_VOLUME_MILLILITERS "Milliliters"
|
||||
IDS_VOLUME_PINTS_UK "Pint (UK)"
|
||||
IDS_VOLUME_PINTS_DRY_US "Pint, sypkie (US)"
|
||||
IDS_VOLUME_PINTS_LIQUID_US "Pint, p³yn (US)"
|
||||
IDS_VOLUME_QUARTS_UK "Kwart (UK)"
|
||||
IDS_VOLUME_QUARTS_DRY_US "Kwart, sypkie (US)"
|
||||
IDS_VOLUME_QUARTS_LIQUID_US "Kwart, p³yn (US)"
|
||||
IDS_VOLUME_MILLILITERS "Mililitry"
|
||||
IDS_VOLUME_PINTS_UK "Pinty (UK)"
|
||||
IDS_VOLUME_PINTS_DRY_US "Pinty, sypkie (US)"
|
||||
IDS_VOLUME_PINTS_LIQUID_US "Pinty, p³yn (US)"
|
||||
IDS_VOLUME_QUARTS_UK "Kwarty (UK)"
|
||||
IDS_VOLUME_QUARTS_DRY_US "Kwarty, sypkie (US)"
|
||||
IDS_VOLUME_QUARTS_LIQUID_US "Kwarty, p³yn (US)"
|
||||
IDS_VOLUME_SEKI "Seki"
|
||||
IDS_VOLUME_SYOU "Syou"
|
||||
IDS_VOLUME_TANANLOUNG "Tananloung"
|
||||
|
|
@ -709,26 +710,26 @@ END
|
|||
// TYPES OF WEIGHTS
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_WEIGHT_BAHT "Bahtów"
|
||||
IDS_WEIGHT_CARATS "Karatów"
|
||||
IDS_WEIGHT_BAHT "Bahty"
|
||||
IDS_WEIGHT_CARATS "Karaty"
|
||||
IDS_WEIGHT_CHUNG "Chung"
|
||||
IDS_WEIGHT_DON "Don"
|
||||
IDS_WEIGHT_GEUN "Geun"
|
||||
IDS_WEIGHT_GRAMS "Gramów"
|
||||
IDS_WEIGHT_GRAMS "Gramy"
|
||||
IDS_WEIGHT_GWAN "Gwan"
|
||||
IDS_WEIGHT_HARB "Harb"
|
||||
IDS_WEIGHT_JIN_CHINA "Jin (China)"
|
||||
IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)"
|
||||
IDS_WEIGHT_KAN "Kan"
|
||||
IDS_WEIGHT_KILOGRAMS "Kilogramów"
|
||||
IDS_WEIGHT_KILOGRAMS "Kilogramy"
|
||||
IDS_WEIGHT_KIN "Kin"
|
||||
IDS_WEIGHT_LIANG_CHINA "Liang (China)"
|
||||
IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
|
||||
IDS_WEIGHT_MONME "Monme"
|
||||
IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncji, avoirdupois"
|
||||
IDS_WEIGHT_OUNCES_TROY "Uncji, aptekarskie"
|
||||
IDS_WEIGHT_POUNDS "Funtów"
|
||||
IDS_WEIGHT_QUINTAL_METRIC "Kwintali"
|
||||
IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncje, avoirdupois"
|
||||
IDS_WEIGHT_OUNCES_TROY "Uncje, aptekarskie"
|
||||
IDS_WEIGHT_POUNDS "Funty"
|
||||
IDS_WEIGHT_QUINTAL_METRIC "Kwintale"
|
||||
IDS_WEIGHT_SALOUNG "Saloung"
|
||||
IDS_WEIGHT_STONES "Kamieni"
|
||||
IDS_WEIGHT_TAMLUNG "Tamlung"
|
||||
|
|
|
|||
|
|
@ -641,6 +641,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "äåíü"
|
||||
IDS_TIME_HOURS "÷àñ"
|
||||
IDS_TIME_NANOSECONDS "Nanoseconds"
|
||||
IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà"
|
||||
IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà"
|
||||
IDS_TIME_MINUTES "ìèíóòà"
|
||||
|
|
|
|||
|
|
@ -647,6 +647,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
|
|||
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"
|
||||
|
|
|
|||
|
|
@ -647,6 +647,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_TIME_DAYS "Äîáà"
|
||||
IDS_TIME_HOURS "Ãîäèíà"
|
||||
IDS_TIME_NANOSECONDS "Nanoseconds"
|
||||
IDS_TIME_MICROSECONDS "̳êðîñåêóíäà"
|
||||
IDS_TIME_MILLISECONDS "̳ë³ñåêóíäà"
|
||||
IDS_TIME_MINUTES "Õâèëèíà"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
|
||||
{
|
||||
TCHAR *ptr, *dst;
|
||||
calc_number_t tmp;
|
||||
int width;
|
||||
|
||||
|
|
@ -21,9 +20,12 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
|
|||
/* calculate the width of integer number */
|
||||
width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
|
||||
if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH)
|
||||
ptr = buffer + _stprintf(buffer, TEXT("%#e"), rpn->f);
|
||||
_stprintf(buffer, TEXT("%#e"), rpn->f);
|
||||
else {
|
||||
TCHAR *ptr, *dst;
|
||||
|
||||
ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
|
||||
/* format sring ensures there is a '.': */
|
||||
dst = _tcschr(buffer, TEXT('.'));
|
||||
while (--ptr > dst)
|
||||
if (*ptr != TEXT('0'))
|
||||
|
|
|
|||
|
|
@ -861,18 +861,18 @@ static INT_PTR CALLBACK DlgStatProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
|
|||
n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
|
||||
if (n == (DWORD)-1)
|
||||
return TRUE;
|
||||
PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
|
||||
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)
|
||||
return TRUE;
|
||||
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
|
||||
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_DELETESTRING, (WPARAM)n, 0);
|
||||
update_n_stats_items(hWnd, buffer);
|
||||
delete_stat_item(n);
|
||||
return TRUE;
|
||||
case IDC_BUTTON_CAD:
|
||||
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
|
||||
SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_RESETCONTENT, 0, 0);
|
||||
clean_stat_list();
|
||||
update_n_stats_items(hWnd, buffer);
|
||||
return TRUE;
|
||||
|
|
@ -910,20 +910,20 @@ static WPARAM idm_2_idc(int idm)
|
|||
static void CopyMemToClipboard(void *ptr)
|
||||
{
|
||||
if(OpenClipboard(NULL)) {
|
||||
HGLOBAL clipbuffer;
|
||||
TCHAR *buffer;
|
||||
HGLOBAL clipbuffer;
|
||||
TCHAR *buffer;
|
||||
|
||||
EmptyClipboard();
|
||||
clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
|
||||
buffer = (TCHAR *)GlobalLock(clipbuffer);
|
||||
_tcscpy(buffer, ptr);
|
||||
GlobalUnlock(clipbuffer);
|
||||
EmptyClipboard();
|
||||
clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
|
||||
buffer = (TCHAR *)GlobalLock(clipbuffer);
|
||||
_tcscpy(buffer, ptr);
|
||||
GlobalUnlock(clipbuffer);
|
||||
#ifdef UNICODE
|
||||
SetClipboardData(CF_UNICODETEXT,clipbuffer);
|
||||
SetClipboardData(CF_UNICODETEXT,clipbuffer);
|
||||
#else
|
||||
SetClipboardData(CF_TEXT,clipbuffer);
|
||||
SetClipboardData(CF_TEXT,clipbuffer);
|
||||
#endif
|
||||
CloseClipboard();
|
||||
CloseClipboard();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -942,16 +942,16 @@ static char *ReadClipboard(void)
|
|||
char *buffer = NULL;
|
||||
|
||||
if (OpenClipboard(NULL)) {
|
||||
HANDLE hData = GetClipboardData(CF_TEXT);
|
||||
HANDLE hData = GetClipboardData(CF_TEXT);
|
||||
char *fromClipboard;
|
||||
|
||||
if (hData != NULL) {
|
||||
fromClipboard = (char *)GlobalLock(hData);
|
||||
if (strlen(fromClipboard))
|
||||
buffer = _strupr(_strdup(fromClipboard));
|
||||
GlobalUnlock( hData );
|
||||
buffer = _strupr(_strdup(fromClipboard));
|
||||
GlobalUnlock( hData );
|
||||
}
|
||||
CloseClipboard();
|
||||
CloseClipboard();
|
||||
}
|
||||
return buffer;
|
||||
}
|
||||
|
|
@ -1110,20 +1110,20 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
|
|||
{
|
||||
TCHAR text[64];
|
||||
HMENU hMenu = CreatePopupMenu();
|
||||
DWORD idm;
|
||||
BOOL idm;
|
||||
|
||||
LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
|
||||
AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
|
||||
idm = (DWORD)TrackPopupMenu(hMenu,
|
||||
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
|
||||
LOWORD(lp),
|
||||
HIWORD(lp),
|
||||
0,
|
||||
hWnd,
|
||||
NULL);
|
||||
idm = TrackPopupMenu( hMenu,
|
||||
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
|
||||
LOWORD(lp),
|
||||
HIWORD(lp),
|
||||
0,
|
||||
hWnd,
|
||||
NULL);
|
||||
DestroyMenu(hMenu);
|
||||
#ifndef DISABLE_HTMLHELP_SUPPORT
|
||||
if (idm != 0) {
|
||||
if (idm) {
|
||||
HH_POPUP popup;
|
||||
|
||||
memset(&popup, 0, sizeof(popup));
|
||||
|
|
@ -1139,6 +1139,8 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
|
|||
popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
|
||||
HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
|
||||
}
|
||||
#else
|
||||
(void)idm;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ BOOL DDPrimarySurfaceTest(HWND hWnd){
|
|||
{
|
||||
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE))
|
||||
{
|
||||
if (msg.message == WM_TIMER && TimerID == msg.wParam)
|
||||
if (msg.message == WM_TIMER && TimerID == msg.wParam)
|
||||
break;
|
||||
TranslateMessage(&msg);
|
||||
DispatchMessage(&msg);
|
||||
|
|
@ -200,7 +200,7 @@ VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface)
|
|||
|
||||
|
||||
BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
|
||||
UINT TimerID, TimerIDUpdate;
|
||||
UINT_PTR TimerID, TimerIDUpdate;
|
||||
LPDIRECTDRAW lpDD;
|
||||
LPDIRECTDRAWSURFACE lpDDPrimarySurface;
|
||||
LPDIRECTDRAWSURFACE lpDDBackBuffer;
|
||||
|
|
@ -288,6 +288,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
|
|||
/* set our timers, TimerID - for test timeout, TimerIDUpdate - for frame updating */
|
||||
TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL);
|
||||
TimerIDUpdate = SetTimer(hWnd, 2, (UINT)10, NULL);
|
||||
(void)TimerIDUpdate;
|
||||
|
||||
while (TRUE)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -129,13 +129,13 @@ BOOL CALLBACK DirectInputEnumDevCb(
|
|||
ZeroMemory(&GuidPath, sizeof(DIPROPGUIDANDPATH));
|
||||
GuidPath.diph.dwSize = sizeof(DIPROPGUIDANDPATH);
|
||||
GuidPath.diph.dwHeaderSize = sizeof(DIPROPHEADER);
|
||||
GuidPath.diph.dwHow = DIPH_DEVICE;
|
||||
GuidPath.diph.dwHow = DIPH_DEVICE;
|
||||
hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GUIDANDPATH, (LPDIPROPHEADER)&GuidPath);
|
||||
|
||||
ZeroMemory(&TypeName, sizeof(TypeName));
|
||||
TypeName.diph.dwSize = sizeof(TypeName);
|
||||
TypeName.diph.dwHeaderSize = sizeof(DIPROPHEADER);
|
||||
TypeName.diph.dwHow = DIPH_DEVICE;
|
||||
TypeName.diph.dwHow = DIPH_DEVICE;
|
||||
hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GETPORTDISPLAYNAME, (LPDIPROPHEADER)&TypeName);
|
||||
|
||||
|
||||
|
|
@ -191,7 +191,7 @@ InitializeDirectInputDialog(HWND hwndDlg)
|
|||
Context.pObj = pObj;
|
||||
Context.hwndDlg = hwndDlg;
|
||||
InitListViewColumns(&Context);
|
||||
hResult = pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES);
|
||||
pObj->lpVtbl->EnumDevices(pObj, DI8DEVCLASS_ALL, DirectInputEnumDevCb, (PVOID)&Context, DIEDFL_ALLDEVICES);
|
||||
|
||||
pObj->lpVtbl->Release(pObj);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -178,10 +178,10 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
|
|||
{
|
||||
DWORD dwIndex = 0;
|
||||
LONG result;
|
||||
WCHAR szName[50];
|
||||
WCHAR szName[50];
|
||||
WCHAR szGUID[40];
|
||||
WCHAR szTemp[63];
|
||||
WCHAR szResult[MAX_PATH+20] = {0};
|
||||
WCHAR szResult[MAX_PATH+20] = {0};
|
||||
DWORD RegProviders = 0;
|
||||
DWORD ProviderIndex;
|
||||
DWORD dwName;
|
||||
|
|
@ -203,13 +203,12 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
|
|||
szResult[0] = L'\0';
|
||||
LoadStringW(hInst, PreDefProviders[dwIndex].ResourceID, szResult, sizeof(szResult)/sizeof(WCHAR));
|
||||
szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0';
|
||||
lResult = SendMessageW(hDlgCtrl, LVM_INSERTITEM, 0, (LPARAM)&Item);
|
||||
Item.iItem = SendMessageW(hDlgCtrl, LVM_INSERTITEM, 0, (LPARAM)&Item);
|
||||
Item.iSubItem = 1;
|
||||
szResult[0] = L'\0';
|
||||
LoadStringW(hInst, IDS_REG_FAIL, szResult, sizeof(szResult)/sizeof(WCHAR));
|
||||
szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0';
|
||||
Item.iItem = lResult;
|
||||
Item.iSubItem = 1;
|
||||
lResult = SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
|
||||
SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
|
||||
}
|
||||
|
||||
dwIndex = 0;
|
||||
|
|
@ -228,8 +227,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
|
|||
if (ProviderIndex == UINT_MAX)
|
||||
{
|
||||
/* a custom service provider was found */
|
||||
lResult = ListView_GetItemCount(hDlgCtrl);
|
||||
Item.iItem = lResult;
|
||||
Item.iItem = ListView_GetItemCount(hDlgCtrl);
|
||||
|
||||
/* FIXME
|
||||
* on Windows Vista we need to use RegLoadMUIString which is not available for older systems
|
||||
|
|
@ -291,7 +289,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
|
|||
}
|
||||
}
|
||||
dwIndex++;
|
||||
}while(result != ERROR_NO_MORE_ITEMS);
|
||||
}while(result != ERROR_NO_MORE_ITEMS);
|
||||
|
||||
/* check if all providers have been registered */
|
||||
// if (RegProviders == 15)
|
||||
|
|
@ -330,7 +328,7 @@ InitializeDirectPlayDialog(HWND hwndDlg)
|
|||
return;
|
||||
|
||||
/* enumerate providers */
|
||||
result = EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP);
|
||||
EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP);
|
||||
RegCloseKey(hKey);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -275,6 +275,7 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext)
|
|||
|
||||
/* release the DSound object */
|
||||
// pObj->lpVtbl->Release(pObj);
|
||||
(void)hResult;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -103,7 +103,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
|
|||
/* TODO: Output font info */
|
||||
|
||||
/* Output Character set */
|
||||
hOldFont = SelectObject(hDC, pData->hCharSetFont);
|
||||
SelectObject(hDC, pData->hCharSetFont);
|
||||
GetTextMetrics(hDC, &tm);
|
||||
swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz");
|
||||
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));
|
||||
|
|
|
|||
|
|
@ -60,13 +60,10 @@ FormatString(
|
|||
static void
|
||||
ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...)
|
||||
{
|
||||
HMODULE hModule;
|
||||
HLOCAL hMemCaption = NULL;
|
||||
HLOCAL hMemText = NULL;
|
||||
va_list args;
|
||||
|
||||
hModule = GetModuleHandle(NULL);
|
||||
|
||||
va_start(args, dwMessageId);
|
||||
FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,
|
||||
NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args);
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
/* FILE: applications/games/winemine/lang/cs-CZ.rc
|
||||
* PURPOSE: Czech Language File
|
||||
* TRANSLATOR: Stepan Gabriel - SGABA (sgaba@centrum.cz)
|
||||
* TRANSLATORS: Stepan Gabriel - SGABA (sgaba@centrum.cz); Radek Liska aka Black_Fox (radekliska at gmail dot com)
|
||||
* TRANSLATED FROM: Slovak translation by Kario (kario@szm.sk)
|
||||
* UPDATED: 2008-07-06
|
||||
* UPDATED: 2010-05-25
|
||||
*
|
||||
* Czech translation
|
||||
* Copyleft 2007 Kario (kario@szm.sk),2008 SGABA (sgaba@centrum.cz)
|
||||
|
|
@ -15,7 +15,7 @@ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
|
|||
STRINGTABLE
|
||||
BEGIN
|
||||
IDS_SECONDS, "sek."
|
||||
IDS_NOBODY, "Nikdo" //windows = Anonym
|
||||
IDS_NOBODY, "Bezejmenný" //windows = Anonym
|
||||
IDS_ABOUT, "od Joshua Thielena a vývojáøù systému ReactOS"
|
||||
END
|
||||
|
||||
|
|
@ -36,15 +36,15 @@ BEGIN
|
|||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Konec", IDM_EXIT
|
||||
END
|
||||
POPUP "&Info" //windows = &Pomocník
|
||||
POPUP "&Nápovìda" //windows = &Pomocník
|
||||
BEGIN
|
||||
MENUITEM "C&o je hra Miny...", IDM_ABOUT
|
||||
MENUITEM "&O programu...", IDM_ABOUT
|
||||
END
|
||||
END
|
||||
|
||||
IDD_TIMES DIALOGEX DISCARDABLE 0, 0, 200, 75
|
||||
STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHELLFONT
|
||||
CAPTION "Nejrychlejší htedaèi min"
|
||||
CAPTION "Nejrychlejší hledaèi min"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
GROUPBOX "Nejlepší èasy", IDNONE, 10, 10, 182, 45
|
||||
|
|
@ -66,7 +66,7 @@ STYLE DS_MODALFRAME | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_POPUP | DS_SHEL
|
|||
CAPTION "Blahopøeji!"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
LTEXT "Zadejte prosím svoje jméno.", IDIGNORE, 25, 10, 150, 10
|
||||
LTEXT "Zadejte prosím svoje jméno", IDIGNORE, 25, 10, 150, 10
|
||||
EDITTEXT IDC_EDITNAME, 25, 20, 110, 12
|
||||
DEFPUSHBUTTON "OK", IDOK, 60, 40, 40, 15
|
||||
END
|
||||
|
|
@ -83,5 +83,5 @@ BEGIN
|
|||
EDITTEXT IDC_EDITCOLS, 49, 35, 30, 12, ES_NUMBER
|
||||
EDITTEXT IDC_EDITMINES, 49, 55, 30, 12, ES_NUMBER
|
||||
DEFPUSHBUTTON "OK", IDOK, 86, 32, 45, 15
|
||||
PUSHBUTTON "Zrušit", IDCANCEL, 86, 52, 45, 15
|
||||
PUSHBUTTON "Storno", IDCANCEL, 86, 52, 45, 15
|
||||
END
|
||||
|
|
|
|||
|
|
@ -33,7 +33,6 @@ CreateTrayIcon(LPTSTR szLCID)
|
|||
HDC hdc, hdcsrc;
|
||||
HBITMAP hBitmap, hBmpNew, hBmpOld;
|
||||
RECT rect;
|
||||
DWORD bkColor, bkText;
|
||||
HFONT hFontOld, hFont = NULL;
|
||||
ICONINFO IconInfo;
|
||||
HICON hIcon = NULL;
|
||||
|
|
@ -63,8 +62,8 @@ CreateTrayIcon(LPTSTR szLCID)
|
|||
rect.bottom = 16;
|
||||
rect.top = 0;
|
||||
|
||||
bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
||||
bkText = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
|
||||
SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
|
||||
SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
|
||||
|
||||
ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL);
|
||||
|
||||
|
|
|
|||
|
|
@ -295,7 +295,7 @@ void Draw(HDC aDc)
|
|||
//
|
||||
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
||||
{
|
||||
int wmId, wmEvent;
|
||||
int wmId;
|
||||
|
||||
switch (message)
|
||||
{
|
||||
|
|
@ -354,7 +354,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
break;
|
||||
case WM_COMMAND:
|
||||
wmId = LOWORD(wParam);
|
||||
wmEvent = HIWORD(wParam);
|
||||
// Parse the menu selections:
|
||||
switch (wmId)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -407,7 +407,7 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
|
|||
MCI_PLAY_PARMS mciPlay;
|
||||
TCHAR szLocalFileName[MAX_PATH];
|
||||
UINT FileType;
|
||||
DWORD dwError;
|
||||
MCIERROR mciError;
|
||||
|
||||
if (lpFileName == NULL)
|
||||
{
|
||||
|
|
@ -449,14 +449,14 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
|
|||
|
||||
SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc);
|
||||
|
||||
dwError = mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
|
||||
mciSendCommand(wDeviceId, MCI_SEEK, MCI_WAIT | MCI_SEEK_TO_START, 0);
|
||||
|
||||
mciPlay.dwCallback = (DWORD_PTR)hwnd;
|
||||
mciPlay.dwFrom = 0;
|
||||
mciPlay.dwTo = MaxFilePos;
|
||||
|
||||
dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
|
||||
if (dwError != 0)
|
||||
mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
|
||||
if (mciError != 0)
|
||||
{
|
||||
MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);
|
||||
}
|
||||
|
|
@ -641,12 +641,12 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
|
|||
break;
|
||||
|
||||
case IDM_ABOUT:
|
||||
{
|
||||
{
|
||||
HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
|
||||
ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
|
||||
DeleteObject(mplayIcon);
|
||||
DeleteObject(mplayIcon);
|
||||
break;
|
||||
}
|
||||
}
|
||||
case IDM_EXIT:
|
||||
PostMessage(hwnd, WM_CLOSE, 0, 0);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
#ifndef _FREELDRPAGE_H_
|
||||
#define _FREELDRPAGE_H_
|
||||
|
||||
extern HWND hFreeLdrPage;
|
||||
|
||||
INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
#ifndef _GENERALPAGE_H_
|
||||
#define _GENERALPAGE_H_
|
||||
|
||||
extern HWND hGeneralPage;
|
||||
|
||||
INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
#ifndef _SVRPAGE_H_
|
||||
#define _SVRPAGE_H_
|
||||
|
||||
extern HWND hServicesPage;
|
||||
extern HWND hServicesListCtrl;
|
||||
|
||||
INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,9 @@
|
|||
#ifndef _STARTUPPAGE_H_
|
||||
#define _STARTUPPAGE_H_
|
||||
|
||||
extern HWND hStartupPage;
|
||||
extern HWND hStartupPageListCtrl;
|
||||
|
||||
INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,3 +1,8 @@
|
|||
#ifndef _SYSTEMPAGE_H_
|
||||
#define _SYSTEMPAGE_H_
|
||||
|
||||
extern HWND hSystemPage;
|
||||
|
||||
INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,5 +1,9 @@
|
|||
#ifndef _TOOLSPAGE_H_
|
||||
#define _TOOLSPAGE_H_
|
||||
|
||||
extern HWND hToolsPage;
|
||||
extern HWND hToolsListCtrl;
|
||||
|
||||
INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -506,7 +506,6 @@ QueryEventMessages(LPWSTR lpMachineName,
|
|||
DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags;
|
||||
LPWSTR lpSourceName;
|
||||
LPWSTR lpComputerName;
|
||||
LPWSTR lpEventStr;
|
||||
LPWSTR lpData;
|
||||
BOOL bResult = TRUE; /* Read succeeded. */
|
||||
|
||||
|
|
@ -609,9 +608,6 @@ QueryEventMessages(LPWSTR lpMachineName,
|
|||
// This ist the data section of the current event
|
||||
lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset);
|
||||
|
||||
// This is the text of the current event
|
||||
lpEventStr = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset);
|
||||
|
||||
// Compute the event type
|
||||
EventTimeToSystemTime(pevlr->TimeWritten, &time);
|
||||
|
||||
|
|
|
|||
|
|
@ -170,9 +170,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
|
||||
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
|
||||
|
||||
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
|
||||
|
||||
if (iRet != NO_ERROR)
|
||||
if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
|
||||
{
|
||||
_tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
|
||||
DoFormatMessage();
|
||||
|
|
@ -201,9 +199,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
|
||||
ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
|
||||
|
||||
iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE);
|
||||
|
||||
if (iRet != NO_ERROR)
|
||||
if ((iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE)) != NO_ERROR)
|
||||
{
|
||||
_tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
|
||||
DoFormatMessage();
|
||||
|
|
@ -272,7 +268,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
|
|||
PMIB_IPNETTABLE pIpNetTable = NULL;
|
||||
DWORD dwIpAddr = 0;
|
||||
ULONG Size = 0;
|
||||
INT iRet, i, val, c;
|
||||
INT i, val, c;
|
||||
|
||||
/* error checking */
|
||||
|
||||
|
|
@ -320,9 +316,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
|
|||
|
||||
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
|
||||
|
||||
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
|
||||
|
||||
if (iRet != NO_ERROR)
|
||||
if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
|
||||
{
|
||||
_tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
|
||||
DoFormatMessage();
|
||||
|
|
@ -382,7 +376,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
|
|||
|
||||
|
||||
/* Add the ARP entry */
|
||||
if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR)
|
||||
if (SetIpNetEntry(pAddHost) != NO_ERROR)
|
||||
{
|
||||
DoFormatMessage();
|
||||
goto cleanup;
|
||||
|
|
@ -415,7 +409,6 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
PMIB_IPNETTABLE pIpNetTable = NULL;
|
||||
ULONG Size = 0;
|
||||
DWORD dwIpAddr = 0;
|
||||
INT iRet;
|
||||
BOOL bFlushTable = FALSE;
|
||||
|
||||
/* error checking */
|
||||
|
|
@ -449,9 +442,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
|
||||
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
|
||||
|
||||
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE);
|
||||
|
||||
if (iRet != NO_ERROR)
|
||||
if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
|
||||
{
|
||||
_tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
|
||||
DoFormatMessage();
|
||||
|
|
@ -485,7 +476,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
if (bFlushTable == TRUE)
|
||||
{
|
||||
/* delete arp cache */
|
||||
if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR)
|
||||
if (FlushIpNetTable(pDelHost->dwIndex) != NO_ERROR)
|
||||
{
|
||||
DoFormatMessage();
|
||||
goto cleanup;
|
||||
|
|
@ -501,7 +492,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
|
|||
pDelHost->dwAddr = dwIpAddr;
|
||||
|
||||
/* Add the ARP entry */
|
||||
if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR)
|
||||
if (DeleteIpNetEntry(pDelHost) != NO_ERROR)
|
||||
{
|
||||
DoFormatMessage();
|
||||
goto cleanup;
|
||||
|
|
|
|||
|
|
@ -29,10 +29,10 @@ int checkRecv(SOCKET s)
|
|||
|
||||
void blkfree(char **av0)
|
||||
{
|
||||
register char **av = av0;
|
||||
register char **av = av0;
|
||||
|
||||
while (*av)
|
||||
free(*av++);
|
||||
while (*av)
|
||||
free(*av++);
|
||||
}
|
||||
|
||||
char **glob(register char *v)
|
||||
|
|
@ -52,16 +52,16 @@ int herror(char *string)
|
|||
|
||||
#if 0
|
||||
int gettimeofday(struct timeval *timenow,
|
||||
struct timezone *zone)
|
||||
struct timezone *zone)
|
||||
{
|
||||
time_t t;
|
||||
time_t t;
|
||||
|
||||
t = clock();
|
||||
t = clock();
|
||||
|
||||
timenow->tv_usec = t;
|
||||
timenow->tv_sec = t / CLK_TCK;
|
||||
timenow->tv_usec = t;
|
||||
timenow->tv_sec = t / CLK_TCK;
|
||||
|
||||
return 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int fgetcSocket(int s)
|
||||
|
|
@ -100,13 +100,13 @@ int fgetcSocket(int s)
|
|||
total = recv(s, buffer, sizeof(buffer), 0);
|
||||
|
||||
if (total == SOCKET_ERROR)
|
||||
{
|
||||
total = 0;
|
||||
return ERROR;
|
||||
}
|
||||
{
|
||||
total = 0;
|
||||
return ERROR;
|
||||
}
|
||||
|
||||
if (total == 0)
|
||||
return EOF;
|
||||
return EOF;
|
||||
}
|
||||
return buffer[index++];
|
||||
}
|
||||
|
|
@ -142,29 +142,29 @@ int fputcSocket(int s, char putChar)
|
|||
buffer[1] = '\0';
|
||||
|
||||
if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
|
||||
int iret=WSAGetLastError ();
|
||||
fprintf(stdout,"fputcSocket: %d\n",iret);
|
||||
return 0;
|
||||
int iret=WSAGetLastError ();
|
||||
fprintf(stdout,"fputcSocket: %d\n",iret);
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
return putChar;
|
||||
return putChar;
|
||||
}
|
||||
}
|
||||
int fputSocket(int s, char *buffer, int len)
|
||||
{
|
||||
int iret;
|
||||
while(len) {
|
||||
if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
|
||||
{
|
||||
iret=WSAGetLastError ();
|
||||
fprintf(stdout,"fputcSocket: %d\n",iret);
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
return len-=iret;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
int iret;
|
||||
while(len) {
|
||||
if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
|
||||
{
|
||||
iret=WSAGetLastError ();
|
||||
fprintf(stdout,"fputcSocket: %d\n",iret);
|
||||
return 0;
|
||||
}
|
||||
else {
|
||||
return len-=iret;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
char *fgetsSocket(int s, char *string)
|
||||
|
|
@ -180,31 +180,31 @@ char *fgetsSocket(int s, char *string)
|
|||
|
||||
if (count == SOCKET_ERROR)
|
||||
{
|
||||
printf("Error in fgetssocket");
|
||||
return NULL;
|
||||
printf("Error in fgetssocket");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
if (count == 1)
|
||||
{
|
||||
string[i] = buffer[0];
|
||||
string[i] = buffer[0];
|
||||
|
||||
if (i == MAX_ASCII - 3)
|
||||
{
|
||||
count = 0;
|
||||
string[++i] = '\n';
|
||||
string[++i] = '\0';
|
||||
}
|
||||
if (i == MAX_ASCII - 3)
|
||||
{
|
||||
count = 0;
|
||||
string[++i] = '\n';
|
||||
string[++i] = '\0';
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (i == 0)
|
||||
return NULL;
|
||||
else
|
||||
{
|
||||
string[i] = '\n';
|
||||
string[i + 1] = '\0'; // This is risky
|
||||
return string;
|
||||
}
|
||||
if (i == 0)
|
||||
return NULL;
|
||||
else
|
||||
{
|
||||
string[i] = '\n';
|
||||
string[i + 1] = '\0'; // This is risky
|
||||
return string;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -250,44 +250,44 @@ char *getpass (const char * prompt)
|
|||
int rc;
|
||||
|
||||
if (istty)
|
||||
{
|
||||
if (GetConsoleMode (in, &old_flags))
|
||||
SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
|
||||
else
|
||||
istty = 0;
|
||||
}
|
||||
{
|
||||
if (GetConsoleMode (in, &old_flags))
|
||||
SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
|
||||
else
|
||||
istty = 0;
|
||||
}
|
||||
/* Need to read line one byte at time to avoid blocking, if not a
|
||||
tty, so always do it this way. */
|
||||
count = 0;
|
||||
while (1)
|
||||
{
|
||||
DWORD dummy;
|
||||
char one_char;
|
||||
{
|
||||
DWORD dummy;
|
||||
char one_char;
|
||||
|
||||
rc = ReadFile (in, &one_char, 1, &dummy, NULL);
|
||||
if (rc == 0)
|
||||
break;
|
||||
if (one_char == '\r')
|
||||
{
|
||||
/* CR is always followed by LF if reading from tty. */
|
||||
if (istty)
|
||||
continue;
|
||||
else
|
||||
break;
|
||||
}
|
||||
if (one_char == '\n')
|
||||
break;
|
||||
/* Silently truncate password string if overly long. */
|
||||
if (count < sizeof (input) - 1)
|
||||
input[count++] = one_char;
|
||||
}
|
||||
rc = ReadFile (in, &one_char, 1, &dummy, NULL);
|
||||
if (rc == 0)
|
||||
break;
|
||||
if (one_char == '\r')
|
||||
{
|
||||
/* CR is always followed by LF if reading from tty. */
|
||||
if (istty)
|
||||
continue;
|
||||
else
|
||||
break;
|
||||
}
|
||||
if (one_char == '\n')
|
||||
break;
|
||||
/* Silently truncate password string if overly long. */
|
||||
if (count < sizeof (input) - 1)
|
||||
input[count++] = one_char;
|
||||
}
|
||||
input[count] = '\0';
|
||||
|
||||
WriteFile (err, "\r\n", 2, &count, NULL);
|
||||
if (istty)
|
||||
SetConsoleMode (in, old_flags);
|
||||
SetConsoleMode (in, old_flags);
|
||||
if (rc)
|
||||
return input;
|
||||
return input;
|
||||
}
|
||||
|
||||
return NULL;
|
||||
|
|
|
|||
|
|
@ -345,7 +345,7 @@ getreply(expecteof)
|
|||
cp = reply_string;
|
||||
while ((c = fgetcSocket(cin)) != '\n') {
|
||||
if (c == IAC) { /* handle telnet commands */
|
||||
switch (c = fgetcSocket(cin)) {
|
||||
switch (fgetcSocket(cin)) {
|
||||
case WILL:
|
||||
case WONT:
|
||||
c = fgetcSocket(cin);
|
||||
|
|
@ -745,7 +745,7 @@ void recvrequest(const char *cmd, const char *local, const char *remote, const c
|
|||
long bytes = 0, hashbytes = HASHBYTES;
|
||||
// struct
|
||||
fd_set mask;
|
||||
register int c, d;
|
||||
register int c;
|
||||
struct timeval start, stop;
|
||||
// struct stat st;
|
||||
|
||||
|
|
@ -781,6 +781,7 @@ null();// (void) signal(SIGINT, oldintr);
|
|||
null();// oldintr = signal(SIGINT, abortrecv);
|
||||
if (strcmp(local, "-") && *local != '|') {
|
||||
#ifndef _WIN32
|
||||
register int d;
|
||||
// This whole thing is a problem... access Won't work on non-existent files
|
||||
if (access(local, 2) < 0) {
|
||||
char *dir = rindex(local, '/');
|
||||
|
|
@ -919,7 +920,7 @@ null();// oldintp = signal(SIGPIPE, SIG_IGN);
|
|||
(*closefunc)(fout);
|
||||
return;
|
||||
}
|
||||
errno = d = 0;
|
||||
errno = 0;
|
||||
// while ((c = recv(din, buf, bufsize, 1)) > 0) {
|
||||
// if ((d = write(fileno(fout), buf, c)) != c)
|
||||
// if ((d = write(fileno(fout), buf, c)) != c)
|
||||
|
|
@ -1106,10 +1107,10 @@ null();// (void) signal(SIGINT,oldintr);
|
|||
lostpeer();
|
||||
}
|
||||
if (din && FD_ISSET(din, &mask)) {
|
||||
while ((c = recv(din, buf, bufsize, 0)) > 0)
|
||||
while (recv(din, buf, bufsize, 0) > 0)
|
||||
;
|
||||
}
|
||||
if ((c = getreply(0)) == ERROR && code == 552) { /* needed for nic style abort */
|
||||
if (getreply(0) == ERROR && code == 552) { /* needed for nic style abort */
|
||||
if (data >= 0) {
|
||||
(void) close(data);
|
||||
data = -1;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,17 @@
|
|||
<include base="ftp">.</include>
|
||||
<define name="lint" />
|
||||
|
||||
<!-- FIXME: workarounds until we have a proper oldnames library -->
|
||||
<define name="chdir">_chdir</define>
|
||||
<define name="getcwd">_getcwd</define>
|
||||
<define name="mktemp">_mktemp</define>
|
||||
<define name="unlink">_unlink</define>
|
||||
<define name="close">_close</define>
|
||||
<define name="fileno">_fileno</define>
|
||||
<define name="read">_read</define>
|
||||
<define name="write">_write</define>
|
||||
<define name="lseek">_lseek</define>
|
||||
|
||||
<library>ws2_32</library>
|
||||
<library>iphlpapi</library>
|
||||
<library>oldnames</library>
|
||||
|
|
|
|||
|
|
@ -90,11 +90,7 @@ BOOL PerformInternalLookup( PCHAR pAddr, PCHAR pResult )
|
|||
BOOL bOk = FALSE;
|
||||
|
||||
/* Makes things easier when parsing the response packet. */
|
||||
UCHAR Header1, Header2;
|
||||
USHORT NumQuestions;
|
||||
USHORT NumAnswers;
|
||||
USHORT NumAuthority;
|
||||
USHORT NumAdditional;
|
||||
USHORT Type;
|
||||
|
||||
if( (strlen( pAddr ) + 1) > 255 ) return FALSE;
|
||||
|
|
@ -198,12 +194,7 @@ BOOL PerformInternalLookup( PCHAR pAddr, PCHAR pResult )
|
|||
if( !bOk ) goto cleanup;
|
||||
|
||||
/* Start parsing the received packet. */
|
||||
Header1 = RecBuffer[2];
|
||||
Header2 = RecBuffer[3];
|
||||
NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] );
|
||||
NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] );
|
||||
NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] );
|
||||
NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] );
|
||||
|
||||
k = 12;
|
||||
|
||||
|
|
@ -257,11 +248,10 @@ void PerformLookup( PCHAR pAddr )
|
|||
BOOL bOk = FALSE;
|
||||
|
||||
/* Makes things easier when parsing the response packet. */
|
||||
UCHAR Header1, Header2;
|
||||
UCHAR Header2;
|
||||
USHORT NumQuestions;
|
||||
USHORT NumAnswers;
|
||||
USHORT NumAuthority;
|
||||
USHORT NumAdditional;
|
||||
USHORT Type;
|
||||
|
||||
if( (strlen( pAddr ) + 1) > 255 ) return;
|
||||
|
|
@ -368,19 +358,17 @@ void PerformLookup( PCHAR pAddr )
|
|||
((PSHORT)&Buffer[i])[0] = htons( ClassNametoClassID( State.Class ) );
|
||||
|
||||
/* Ship off the request to the DNS server. */
|
||||
bOk = SendRequest( Buffer,
|
||||
bOk = SendRequest( Buffer,
|
||||
BufferLength,
|
||||
RecBuffer,
|
||||
&RecBufferLength );
|
||||
if( !bOk ) goto cleanup;
|
||||
|
||||
/* Start parsing the received packet. */
|
||||
Header1 = RecBuffer[2];
|
||||
Header2 = RecBuffer[3];
|
||||
NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] );
|
||||
NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] );
|
||||
NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] );
|
||||
NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] );
|
||||
Type = 0;
|
||||
|
||||
/* Check the RCODE for failure. */
|
||||
|
|
|
|||
|
|
@ -400,7 +400,6 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
|
|||
{
|
||||
TCHAR szText[128];
|
||||
HWND hCombo;
|
||||
OFNOTIFY *pNotify;
|
||||
|
||||
UNREFERENCED_PARAMETER(wParam);
|
||||
|
||||
|
|
@ -440,15 +439,13 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
|
|||
case WM_NOTIFY:
|
||||
if (((NMHDR *) lParam)->code == CDN_FILEOK)
|
||||
{
|
||||
pNotify = (OFNOTIFY *) lParam;
|
||||
|
||||
hCombo = GetDlgItem(hDlg, ID_ENCODING);
|
||||
if (hCombo)
|
||||
Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
|
||||
if (hCombo)
|
||||
Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
|
||||
|
||||
hCombo = GetDlgItem(hDlg, ID_EOLN);
|
||||
if (hCombo)
|
||||
Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
|
||||
if (hCombo)
|
||||
Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -808,11 +805,11 @@ static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARA
|
|||
TCHAR szText[32];
|
||||
|
||||
switch(uMsg) {
|
||||
case WM_INITDIALOG:
|
||||
case WM_INITDIALOG:
|
||||
hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
|
||||
_sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
|
||||
_sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
|
||||
SetWindowText(hTextBox, szText);
|
||||
break;
|
||||
break;
|
||||
case WM_COMMAND:
|
||||
if (HIWORD(wParam) == BN_CLICKED)
|
||||
{
|
||||
|
|
@ -823,11 +820,11 @@ static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARA
|
|||
EndDialog(hwndDialog, _ttoi(szText));
|
||||
bResult = TRUE;
|
||||
}
|
||||
else if (LOWORD(wParam) == IDCANCEL)
|
||||
{
|
||||
else if (LOWORD(wParam) == IDCANCEL)
|
||||
{
|
||||
EndDialog(hwndDialog, 0);
|
||||
bResult = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
|
@ -862,7 +859,7 @@ VOID DIALOG_GoTo(VOID)
|
|||
Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine);
|
||||
|
||||
if (nLine >= 1)
|
||||
{
|
||||
{
|
||||
for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++)
|
||||
{
|
||||
if (pszText[i] == '\n')
|
||||
|
|
@ -870,8 +867,8 @@ VOID DIALOG_GoTo(VOID)
|
|||
}
|
||||
SendMessage(Globals.hEdit, EM_SETSEL, i, i);
|
||||
SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0);
|
||||
}
|
||||
HeapFree(GetProcessHeap(), 0, pszText);
|
||||
}
|
||||
HeapFree(GetProcessHeap(), 0, pszText);
|
||||
}
|
||||
|
||||
VOID DIALOG_StatusBarUpdateCaretPos(VOID)
|
||||
|
|
|
|||
|
|
@ -85,12 +85,12 @@ BEGIN
|
|||
END
|
||||
POPUP "&Nápovìda"
|
||||
BEGIN
|
||||
MENUITEM "&Obsah", CMD_HELP_CONTENTS
|
||||
MENUITEM "O&bsah", CMD_HELP_CONTENTS
|
||||
MENUITEM "&Najít...", CMD_HELP_SEARCH
|
||||
MENUITEM "&Pomoc k nápovìdì", CMD_HELP_ON_HELP
|
||||
MENUITEM "Pomoc k ná&povìdì", CMD_HELP_ON_HELP
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&O programu" CMD_ABOUT
|
||||
MENUITEM "Inf&o...", CMD_ABOUT_WINE
|
||||
MENUITEM "&O programu..." CMD_ABOUT
|
||||
MENUITEM "In&fo...", CMD_ABOUT_WINE
|
||||
END
|
||||
END
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,24 @@
|
|||
#define ID_ELLIPSE 614
|
||||
#define ID_RRECT 615
|
||||
|
||||
//the following 16 numbers need to be in order, increasing by 1
|
||||
#define TOOL_FREESEL 1
|
||||
#define TOOL_RECTSEL 2
|
||||
#define TOOL_RUBBER 3
|
||||
#define TOOL_FILL 4
|
||||
#define TOOL_COLOR 5
|
||||
#define TOOL_ZOOM 6
|
||||
#define TOOL_PEN 7
|
||||
#define TOOL_BRUSH 8
|
||||
#define TOOL_AIRBRUSH 9
|
||||
#define TOOL_TEXT 10
|
||||
#define TOOL_LINE 11
|
||||
#define TOOL_BEZIER 12
|
||||
#define TOOL_RECT 13
|
||||
#define TOOL_SHAPE 14
|
||||
#define TOOL_ELLIPSE 15
|
||||
#define TOOL_RRECT 16
|
||||
|
||||
#define ID_ACCELERATORS 800
|
||||
|
||||
#define IDD_MIRRORROTATE 700
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ BEGIN
|
|||
MENUITEM SEPARATOR
|
||||
POPUP "Lupa"
|
||||
BEGIN
|
||||
POPUP "User defined"
|
||||
POPUP "Vlastní nastavení"
|
||||
BEGIN
|
||||
MENUITEM "12,5%", IDM_VIEWZOOM125
|
||||
MENUITEM "25%", IDM_VIEWZOOM25
|
||||
|
|
@ -60,8 +60,8 @@ BEGIN
|
|||
MENUITEM "800%", IDM_VIEWZOOM800
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Show grid", IDM_VIEWSHOWGRID
|
||||
MENUITEM "Show miniature", IDM_VIEWSHOWMINIATURE
|
||||
MENUITEM "Zobrazit mřížku", IDM_VIEWSHOWGRID
|
||||
MENUITEM "Zobrazit miniaturu", IDM_VIEWSHOWMINIATURE
|
||||
END
|
||||
MENUITEM "Celá obrazovka\tCtrl+F", IDM_VIEWFULLSCREEN
|
||||
END
|
||||
|
|
@ -86,7 +86,7 @@ BEGIN
|
|||
BEGIN
|
||||
MENUITEM "Témata nápovìdy", IDM_HELPHELPTOPICS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "O programu...", IDM_HELPINFO
|
||||
MENUITEM "&O programu...", IDM_HELPINFO
|
||||
END
|
||||
END
|
||||
|
||||
|
|
@ -104,6 +104,7 @@ BEGIN
|
|||
"^A", IDM_EDITSELECTALL
|
||||
"^T", IDM_VIEWTOOLBOX
|
||||
"^L", IDM_VIEWCOLORPALETTE
|
||||
"^G", IDM_VIEWSHOWGRID
|
||||
"^F", IDM_VIEWFULLSCREEN
|
||||
"^R", IDM_IMAGEROTATEMIRROR
|
||||
"^W", IDM_IMAGECHANGESIZE
|
||||
|
|
@ -140,9 +141,9 @@ BEGIN
|
|||
LTEXT "Datum zmìny:", IDD_ATTRIBUTESTEXT3, 10, 5, 60, 10
|
||||
LTEXT "Velikost souboru:", IDD_ATTRIBUTESTEXT4, 10, 15, 60, 10
|
||||
LTEXT "Rozlišení:", IDD_ATTRIBUTESTEXT5, 10, 25, 60, 10
|
||||
LTEXT "Not available", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
|
||||
LTEXT "Not available", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
|
||||
LTEXT "Not available", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
|
||||
LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT6, 60, 5, 90, 10
|
||||
LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT7, 60, 15, 90, 10
|
||||
LTEXT "Nedostupné", IDD_ATTRIBUTESTEXT8, 60, 25, 90, 10
|
||||
GROUPBOX "Jednotka", IDD_ATTRIBUTESGROUP1, 6, 57, 139, 27
|
||||
AUTORADIOBUTTON "Palce", IDD_ATTRIBUTESRB1, 12, 69, 35, 10, WS_GROUP
|
||||
AUTORADIOBUTTON "Centimetry", IDD_ATTRIBUTESRB2, 52, 69, 35, 10
|
||||
|
|
@ -181,7 +182,7 @@ BEGIN
|
|||
IDS_INFOTEXT, "ReactOS Malování je dostupné pod licencí GNU Lesser General Public License (LGPL) verze 3 (viz. www.gnu.org)"
|
||||
IDS_SAVEPROMPTTEXT, "Chcete uložit provedené zmìny v %s?"
|
||||
IDS_DEFAULTFILENAME, "Bez názvu.bmp"
|
||||
IDS_MINIATURETITLE, "Miniature"
|
||||
IDS_MINIATURETITLE, "Miniatura"
|
||||
IDS_TOOLTIP1, "Volný výbìr"
|
||||
IDS_TOOLTIP2, "Výbìr"
|
||||
IDS_TOOLTIP3, "Guma"
|
||||
|
|
@ -200,6 +201,6 @@ BEGIN
|
|||
IDS_TOOLTIP16, "Zaoblený obdélník"
|
||||
IDS_OPENFILTER, "Soubory bitmap (*.bmp;*.dib)\1*.bmp;*.dib\1Všechny soubory (*.*)\1*.*\1"
|
||||
IDS_SAVEFILTER, "24bitová bitmapa (*.bmp;*.dib)\1*.bmp;*.dib\1"
|
||||
IDS_FILESIZE, "%d bytes"
|
||||
IDS_PRINTRES, "%d x %d pixels per meter"
|
||||
IDS_FILESIZE, "%d bajtů"
|
||||
IDS_PRINTRES, "%d x %d pixelů na metr"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ short lastY;
|
|||
int lineWidth = 1;
|
||||
int shapeStyle = 0;
|
||||
int brushStyle = 0;
|
||||
int activeTool = 7;
|
||||
int activeTool = TOOL_PEN;
|
||||
int airBrushWidth = 5;
|
||||
int rubberRadius = 4;
|
||||
int transpBg = 0;
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ startPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
lastY = y;
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case TOOL_FREESEL:
|
||||
ShowWindow(hSelection, SW_HIDE);
|
||||
if (ptStack != NULL)
|
||||
HeapFree(GetProcessHeap(), 0, ptStack);
|
||||
|
|
@ -76,39 +76,39 @@ startPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
ptStack[0].x = x;
|
||||
ptStack[0].y = y;
|
||||
break;
|
||||
case 10:
|
||||
case 11:
|
||||
case 13:
|
||||
case 15:
|
||||
case 16:
|
||||
case TOOL_TEXT:
|
||||
case TOOL_LINE:
|
||||
case TOOL_RECT:
|
||||
case TOOL_ELLIPSE:
|
||||
case TOOL_RRECT:
|
||||
newReversible();
|
||||
break;
|
||||
case 2:
|
||||
case TOOL_RECTSEL:
|
||||
newReversible();
|
||||
ShowWindow(hSelection, SW_HIDE);
|
||||
rectSel_src[2] = rectSel_src[3] = 0;
|
||||
break;
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
newReversible();
|
||||
Erase(hdc, x, y, x, y, bg, rubberRadius);
|
||||
break;
|
||||
case 4:
|
||||
case TOOL_FILL:
|
||||
newReversible();
|
||||
Fill(hdc, x, y, fg);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
newReversible();
|
||||
SetPixel(hdc, x, y, fg);
|
||||
break;
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
newReversible();
|
||||
Brush(hdc, x, y, x, y, fg, brushStyle);
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
newReversible();
|
||||
Airbrush(hdc, x, y, fg, airBrushWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
if (pointSP == 0)
|
||||
|
|
@ -117,7 +117,7 @@ startPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
pointSP++;
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
if (pointSP + 1 >= 2)
|
||||
|
|
@ -136,7 +136,7 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case TOOL_FREESEL:
|
||||
if (ptSP == 0)
|
||||
newReversible();
|
||||
ptSP++;
|
||||
|
|
@ -147,7 +147,7 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
resetToU1();
|
||||
Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE);
|
||||
break;
|
||||
case 2:
|
||||
case TOOL_RECTSEL:
|
||||
{
|
||||
short tempX;
|
||||
short tempY;
|
||||
|
|
@ -161,25 +161,25 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
RectSel(hdc, startX, startY, tempX, tempY);
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
Erase(hdc, lastX, lastY, x, y, bg, rubberRadius);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
Line(hdc, lastX, lastY, x, y, fg, 1);
|
||||
break;
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
Brush(hdc, lastX, lastY, x, y, fg, brushStyle);
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
Airbrush(hdc, x, y, fg, airBrushWidth);
|
||||
break;
|
||||
case 11:
|
||||
case TOOL_LINE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
roundTo8Directions(startX, startY, &x, &y);
|
||||
Line(hdc, startX, startY, x, y, fg, lineWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -197,13 +197,13 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
break;
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
case TOOL_RECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -213,13 +213,13 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
if (pointSP + 1 >= 2)
|
||||
Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE);
|
||||
break;
|
||||
case 15:
|
||||
case TOOL_ELLIPSE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 16:
|
||||
case TOOL_RRECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
|
|
@ -236,7 +236,7 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case TOOL_FREESEL:
|
||||
{
|
||||
POINT *ptStackCopy;
|
||||
int i;
|
||||
|
|
@ -279,6 +279,9 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE);
|
||||
newReversible();
|
||||
|
||||
MaskBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0,
|
||||
0, hSelMask, 0, 0, MAKEROP4(SRCCOPY, SRCAND));
|
||||
|
||||
placeSelWin();
|
||||
ShowWindow(hSelection, SW_SHOW);
|
||||
}
|
||||
|
|
@ -286,7 +289,7 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
ptStack = NULL;
|
||||
break;
|
||||
}
|
||||
case 2:
|
||||
case TOOL_RECTSEL:
|
||||
resetToU1();
|
||||
if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0))
|
||||
{
|
||||
|
|
@ -302,35 +305,38 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE);
|
||||
newReversible();
|
||||
|
||||
BitBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0,
|
||||
0, SRCCOPY);
|
||||
|
||||
placeSelWin();
|
||||
ShowWindow(hSelection, SW_SHOW);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
Erase(hdc, lastX, lastY, x, y, bg, rubberRadius);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
Line(hdc, lastX, lastY, x, y, fg, 1);
|
||||
SetPixel(hdc, x, y, fg);
|
||||
break;
|
||||
case 11:
|
||||
case TOOL_LINE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
roundTo8Directions(startX, startY, &x, &y);
|
||||
Line(hdc, startX, startY, x, y, fg, lineWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
pointSP++;
|
||||
if (pointSP == 4)
|
||||
pointSP = 0;
|
||||
break;
|
||||
case 13:
|
||||
case TOOL_RECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -354,13 +360,13 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
|
|||
if (pointSP == 255)
|
||||
pointSP--;
|
||||
break;
|
||||
case 15:
|
||||
case TOOL_ELLIPSE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 16:
|
||||
case TOOL_RRECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
|
|
@ -378,35 +384,35 @@ startPaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
lastY = y;
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case 10:
|
||||
case 11:
|
||||
case 13:
|
||||
case 15:
|
||||
case 16:
|
||||
case TOOL_FREESEL:
|
||||
case TOOL_TEXT:
|
||||
case TOOL_LINE:
|
||||
case TOOL_RECT:
|
||||
case TOOL_ELLIPSE:
|
||||
case TOOL_RRECT:
|
||||
newReversible();
|
||||
break;
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
newReversible();
|
||||
Replace(hdc, x, y, x, y, fg, bg, rubberRadius);
|
||||
break;
|
||||
case 4:
|
||||
case TOOL_FILL:
|
||||
newReversible();
|
||||
Fill(hdc, x, y, bg);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
newReversible();
|
||||
SetPixel(hdc, x, y, bg);
|
||||
break;
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
newReversible();
|
||||
Brush(hdc, x, y, x, y, bg, brushStyle);
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
newReversible();
|
||||
Airbrush(hdc, x, y, bg, airBrushWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
if (pointSP == 0)
|
||||
|
|
@ -415,7 +421,7 @@ startPaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
pointSP++;
|
||||
}
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
if (pointSP + 1 >= 2)
|
||||
|
|
@ -434,25 +440,25 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
Line(hdc, lastX, lastY, x, y, bg, 1);
|
||||
break;
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
Brush(hdc, lastX, lastY, x, y, bg, brushStyle);
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
Airbrush(hdc, x, y, bg, airBrushWidth);
|
||||
break;
|
||||
case 11:
|
||||
case TOOL_LINE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
roundTo8Directions(startX, startY, &x, &y);
|
||||
Line(hdc, startX, startY, x, y, bg, lineWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -470,13 +476,13 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
break;
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
case TOOL_RECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -486,13 +492,13 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
if (pointSP + 1 >= 2)
|
||||
Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE);
|
||||
break;
|
||||
case 15:
|
||||
case TOOL_ELLIPSE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 16:
|
||||
case TOOL_RRECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
|
|
@ -509,31 +515,31 @@ endPaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
Line(hdc, lastX, lastY, x, y, bg, 1);
|
||||
SetPixel(hdc, x, y, bg);
|
||||
break;
|
||||
case 11:
|
||||
case TOOL_LINE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
roundTo8Directions(startX, startY, &x, &y);
|
||||
Line(hdc, startX, startY, x, y, bg, lineWidth);
|
||||
break;
|
||||
case 12:
|
||||
case TOOL_BEZIER:
|
||||
pointSP++;
|
||||
if (pointSP == 4)
|
||||
pointSP = 0;
|
||||
break;
|
||||
case 13:
|
||||
case TOOL_RECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 14:
|
||||
case TOOL_SHAPE:
|
||||
resetToU1();
|
||||
pointStack[pointSP].x = x;
|
||||
pointStack[pointSP].y = y;
|
||||
|
|
@ -557,13 +563,13 @@ endPaintingR(HDC hdc, short x, short y, int fg, int bg)
|
|||
if (pointSP == 255)
|
||||
pointSP--;
|
||||
break;
|
||||
case 15:
|
||||
case TOOL_ELLIPSE:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
|
||||
break;
|
||||
case 16:
|
||||
case TOOL_RRECT:
|
||||
resetToU1();
|
||||
if (GetAsyncKeyState(VK_SHIFT) < 0)
|
||||
regularize(startX, startY, &x, &y);
|
||||
|
|
|
|||
|
|
@ -34,13 +34,13 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
|
||||
DefWindowProc(hwnd, message, wParam, lParam);
|
||||
|
||||
DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == 6) ? BF_RECT : BF_RECT | BF_MIDDLE);
|
||||
DrawEdge(hdc, &rect2, (activeTool >= 13) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE);
|
||||
DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE);
|
||||
DrawEdge(hdc, &rect2, (activeTool >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE);
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case 2:
|
||||
case 10:
|
||||
case TOOL_FREESEL:
|
||||
case TOOL_RECTSEL:
|
||||
case TOOL_TEXT:
|
||||
{
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
|
||||
|
|
@ -50,7 +50,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
DrawIconEx(hdc, 1, 33, hTranspIcon, 40, 30, 0, NULL, DI_NORMAL);
|
||||
break;
|
||||
}
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
{
|
||||
int i;
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
|
|
@ -69,7 +69,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
DeleteObject(SelectObject(hdc, oldPen));
|
||||
break;
|
||||
}
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
{
|
||||
int i;
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
|
|
@ -82,7 +82,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
GetSysColor((i == brushStyle) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), i);
|
||||
break;
|
||||
}
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
{
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
|
||||
|
|
@ -112,8 +112,8 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
DeleteObject(SelectObject(hdc, oldPen));
|
||||
break;
|
||||
}
|
||||
case 11:
|
||||
case 12:
|
||||
case TOOL_LINE:
|
||||
case TOOL_BEZIER:
|
||||
{
|
||||
int i;
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
|
|
@ -132,10 +132,10 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
DeleteObject(SelectObject(hdc, oldPen));
|
||||
break;
|
||||
}
|
||||
case 13:
|
||||
case 14:
|
||||
case 15:
|
||||
case 16:
|
||||
case TOOL_RECT:
|
||||
case TOOL_SHAPE:
|
||||
case TOOL_ELLIPSE:
|
||||
case TOOL_RRECT:
|
||||
{
|
||||
int i;
|
||||
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
|
||||
|
|
@ -178,23 +178,23 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 1:
|
||||
case 2:
|
||||
case 10:
|
||||
case TOOL_FREESEL:
|
||||
case TOOL_RECTSEL:
|
||||
case TOOL_TEXT:
|
||||
if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 64))
|
||||
{
|
||||
transpBg = (HIWORD(lParam) - 2) / 31;
|
||||
SendMessage(hwnd, WM_PAINT, 0, 0);
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
case TOOL_RUBBER:
|
||||
if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 62))
|
||||
{
|
||||
rubberRadius = (HIWORD(lParam) - 2) / 15 + 2;
|
||||
SendMessage(hwnd, WM_PAINT, 0, 0);
|
||||
}
|
||||
break;
|
||||
case 8:
|
||||
case TOOL_BRUSH:
|
||||
if ((LOWORD(lParam) > 1) && (LOWORD(lParam) < 40) && (HIWORD(lParam) > 1)
|
||||
&& (HIWORD(lParam) < 62))
|
||||
{
|
||||
|
|
@ -202,7 +202,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
SendMessage(hwnd, WM_PAINT, 0, 0);
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
if (HIWORD(lParam) < 62)
|
||||
{
|
||||
if (HIWORD(lParam) < 30)
|
||||
|
|
@ -222,18 +222,18 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
SendMessage(hwnd, WM_PAINT, 0, 0);
|
||||
}
|
||||
break;
|
||||
case 11:
|
||||
case 12:
|
||||
case TOOL_LINE:
|
||||
case TOOL_BEZIER:
|
||||
if (HIWORD(lParam) <= 62)
|
||||
{
|
||||
lineWidth = (HIWORD(lParam) - 2) / 12 + 1;
|
||||
SendMessage(hwnd, WM_PAINT, 0, 0);
|
||||
}
|
||||
break;
|
||||
case 13:
|
||||
case 14:
|
||||
case 15:
|
||||
case 16:
|
||||
case TOOL_RECT:
|
||||
case TOOL_SHAPE:
|
||||
case TOOL_ELLIPSE:
|
||||
case TOOL_RRECT:
|
||||
if (HIWORD(lParam) <= 60)
|
||||
{
|
||||
shapeStyle = (HIWORD(lParam) - 2) / 20;
|
||||
|
|
|
|||
|
|
@ -460,19 +460,19 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
{
|
||||
switch (activeTool)
|
||||
{
|
||||
case 4:
|
||||
case TOOL_FILL:
|
||||
SetCursor(hCurFill);
|
||||
break;
|
||||
case 5:
|
||||
case TOOL_COLOR:
|
||||
SetCursor(hCurColor);
|
||||
break;
|
||||
case 6:
|
||||
case TOOL_ZOOM:
|
||||
SetCursor(hCurZoom);
|
||||
break;
|
||||
case 7:
|
||||
case TOOL_PEN:
|
||||
SetCursor(hCurPen);
|
||||
break;
|
||||
case 9:
|
||||
case TOOL_AIRBRUSH:
|
||||
SetCursor(hCurAirbrush);
|
||||
break;
|
||||
default:
|
||||
|
|
@ -486,7 +486,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
case WM_LBUTTONDOWN:
|
||||
if (hwnd == hImageArea)
|
||||
{
|
||||
if ((!drawing) || (activeTool == 5))
|
||||
if ((!drawing) || (activeTool == TOOL_COLOR))
|
||||
{
|
||||
SetCapture(hImageArea);
|
||||
drawing = TRUE;
|
||||
|
|
@ -499,7 +499,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
undo();
|
||||
}
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if ((activeTool == 6) && (zoom < 8000))
|
||||
if ((activeTool == TOOL_ZOOM) && (zoom < 8000))
|
||||
zoomTo(zoom * 2, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||
}
|
||||
break;
|
||||
|
|
@ -507,7 +507,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
case WM_RBUTTONDOWN:
|
||||
if (hwnd == hImageArea)
|
||||
{
|
||||
if ((!drawing) || (activeTool == 5))
|
||||
if ((!drawing) || (activeTool == TOOL_COLOR))
|
||||
{
|
||||
SetCapture(hImageArea);
|
||||
drawing = TRUE;
|
||||
|
|
@ -520,7 +520,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
undo();
|
||||
}
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if ((activeTool == 6) && (zoom > 125))
|
||||
if ((activeTool == TOOL_ZOOM) && (zoom > 125))
|
||||
zoomTo(zoom / 2, (short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||
}
|
||||
break;
|
||||
|
|
@ -533,7 +533,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
endPaintingL(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor,
|
||||
bgColor);
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if (activeTool == 5)
|
||||
if (activeTool == TOOL_COLOR)
|
||||
{
|
||||
int tempColor =
|
||||
GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom);
|
||||
|
|
@ -553,7 +553,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
endPaintingR(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor,
|
||||
bgColor);
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if (activeTool == 5)
|
||||
if (activeTool == TOOL_COLOR)
|
||||
{
|
||||
int tempColor =
|
||||
GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom);
|
||||
|
|
@ -568,16 +568,13 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
case WM_MOUSEMOVE:
|
||||
if (hwnd == hImageArea)
|
||||
{
|
||||
if ((!drawing) || (activeTool <= 9))
|
||||
short xNow = (short)LOWORD(lParam) * 1000 / zoom;
|
||||
short yNow = (short)HIWORD(lParam) * 1000 / zoom;
|
||||
if ((!drawing) || (activeTool <= TOOL_AIRBRUSH))
|
||||
{
|
||||
TRACKMOUSEEVENT tme;
|
||||
|
||||
TCHAR coordStr[100];
|
||||
_stprintf(coordStr, _T("%d, %d"), (short)LOWORD(lParam) * 1000 / zoom,
|
||||
(short)HIWORD(lParam) * 1000 / zoom);
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr);
|
||||
|
||||
if (activeTool == 6)
|
||||
if (activeTool == TOOL_ZOOM)
|
||||
{
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
drawZoomFrame((short)LOWORD(lParam), (short)HIWORD(lParam));
|
||||
|
|
@ -588,32 +585,73 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
tme.hwndTrack = hImageArea;
|
||||
tme.dwHoverTime = 0;
|
||||
TrackMouseEvent(&tme);
|
||||
|
||||
if (!drawing)
|
||||
{
|
||||
TCHAR coordStr[100];
|
||||
_stprintf(coordStr, _T("%d, %d"), xNow, yNow);
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr);
|
||||
}
|
||||
}
|
||||
if (drawing)
|
||||
{
|
||||
/* values displayed in statusbar */
|
||||
short xRel = xNow - startX;
|
||||
short yRel = yNow - startY;
|
||||
/* freesel, rectsel and text tools always show numbers limited to fit into image area */
|
||||
if ((activeTool == TOOL_FREESEL) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_TEXT))
|
||||
{
|
||||
if (xRel < 0)
|
||||
xRel = (xNow < 0) ? -startX : xRel;
|
||||
else if (xNow > imgXRes)
|
||||
xRel = imgXRes-startX;
|
||||
if (yRel < 0)
|
||||
yRel = (yNow < 0) ? -startY : yRel;
|
||||
else if (yNow > imgYRes)
|
||||
yRel = imgYRes-startY;
|
||||
}
|
||||
/* rectsel and shape tools always show non-negative numbers when drawing */
|
||||
if ((activeTool == TOOL_RECTSEL) || (activeTool == TOOL_SHAPE))
|
||||
{
|
||||
if (xRel < 0)
|
||||
xRel = -xRel;
|
||||
if (yRel < 0)
|
||||
yRel = -yRel;
|
||||
}
|
||||
/* while drawing, update cursor coordinates only for tools 3, 7, 8, 9, 14 */
|
||||
switch(activeTool)
|
||||
{
|
||||
case TOOL_RUBBER:
|
||||
case TOOL_PEN:
|
||||
case TOOL_BRUSH:
|
||||
case TOOL_AIRBRUSH:
|
||||
case TOOL_SHAPE:
|
||||
{
|
||||
TCHAR coordStr[100];
|
||||
_stprintf(coordStr, _T("%d, %d"), xNow, yNow);
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr);
|
||||
break;
|
||||
}
|
||||
}
|
||||
if ((wParam & MK_LBUTTON) != 0)
|
||||
{
|
||||
whilePaintingL(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom,
|
||||
(short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor);
|
||||
whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor);
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if ((activeTool >= 10) || (activeTool == 2))
|
||||
if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL))
|
||||
{
|
||||
TCHAR sizeStr[100];
|
||||
_stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX,
|
||||
(short)HIWORD(lParam) * 1000 / zoom - startY);
|
||||
_stprintf(sizeStr, _T("%d x %d"), xRel, yRel);
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr);
|
||||
}
|
||||
}
|
||||
if ((wParam & MK_RBUTTON) != 0)
|
||||
{
|
||||
whilePaintingR(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom,
|
||||
(short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor);
|
||||
whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor);
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
if (activeTool >= 10)
|
||||
if (activeTool >= TOOL_TEXT)
|
||||
{
|
||||
TCHAR sizeStr[100];
|
||||
_stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX,
|
||||
(short)HIWORD(lParam) * 1000 / zoom - startY);
|
||||
_stprintf(sizeStr, _T("%d x %d"), xRel, yRel);
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr);
|
||||
}
|
||||
}
|
||||
|
|
@ -623,7 +661,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
|
||||
case WM_MOUSELEAVE:
|
||||
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T(""));
|
||||
if (activeTool == 6)
|
||||
if (activeTool == TOOL_ZOOM)
|
||||
SendMessage(hImageArea, WM_PAINT, 0, 0);
|
||||
break;
|
||||
|
||||
|
|
@ -747,7 +785,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
/* remove selection window and already painted content using undo(),
|
||||
paint Rect for rectangular selections and nothing for freeform selections */
|
||||
undo();
|
||||
if (activeTool == 2)
|
||||
if (activeTool == TOOL_RECTSEL)
|
||||
{
|
||||
newReversible();
|
||||
Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0],
|
||||
|
|
@ -756,7 +794,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
|
|||
break;
|
||||
}
|
||||
case IDM_EDITSELECTALL:
|
||||
if (activeTool == 2)
|
||||
if (activeTool == TOOL_RECTSEL)
|
||||
{
|
||||
startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor);
|
||||
whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor);
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ BEGIN
|
|||
IDS_UPDATES "Aktualisierungen"
|
||||
IDS_APPLICATIONS "Anwendungen"
|
||||
IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:"
|
||||
IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existentes Verzeichnis angegeben!"
|
||||
IDS_CHOOSE_FOLDER_ERROR "Sie haben ein nicht existierendes Verzeichnis angegeben! Neu anlegen?"
|
||||
IDS_USER_NOT_ADMIN "Sie müssen als Administrator angemeldet sein, um den Anwendungsmanager zu starten!"
|
||||
IDS_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?"
|
||||
IDS_INFORMATION "Informationen"
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ BEGIN
|
|||
IDS_UPDATES "Updates"
|
||||
IDS_APPLICATIONS "Applications"
|
||||
IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:"
|
||||
IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist."
|
||||
IDS_CHOOSE_FOLDER_ERROR "The folder you have specified does not exist. Create it?"
|
||||
IDS_USER_NOT_ADMIN "You must be an administrator to start ""ReactOS Applications Manager""!"
|
||||
IDS_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
|
||||
IDS_INFORMATION "Information"
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ BEGIN
|
|||
IDS_CAT_DEVEL "Sviluppo"
|
||||
IDS_CAT_DRIVERS "Drivers"
|
||||
IDS_CAT_EDU "Edutainment"
|
||||
IDS_CAT_ENGINEER "Engineering"
|
||||
IDS_CAT_ENGINEER "Scienze"
|
||||
IDS_CAT_FINANCE "Finanza"
|
||||
IDS_CAT_GAMES "Giochi e divertimento"
|
||||
IDS_CAT_GRAPHICS "Graphica"
|
||||
|
|
@ -174,18 +174,18 @@ BEGIN
|
|||
IDS_APPTITLE "ReactOS Applications Manager"
|
||||
IDS_SEARCH_TEXT "Cerca..."
|
||||
IDS_INSTALL "Installa"
|
||||
IDS_UNINSTALL "Disinstall"
|
||||
IDS_UNINSTALL "Disinstalla"
|
||||
IDS_MODIFY "Modifica"
|
||||
IDS_APPS_COUNT "Numero applicazioni: %d"
|
||||
IDS_WELCOME_TITLE "Benvenuto!\n\n"
|
||||
IDS_WELCOME_TEXT "Scegliere una categoria a sinistra, poi scegliere una applicazione da installare o disinstallare.\nReactOS Web Site: "
|
||||
IDS_WELCOME_URL "http://www.reactos.org"
|
||||
IDS_INSTALLED "Installato"
|
||||
IDS_AVAILABLEFORINST "Disponibile"
|
||||
IDS_AVAILABLEFORINST "Disponibile per l'installazione"
|
||||
IDS_UPDATES "Aggiornamenti"
|
||||
IDS_APPLICATIONS "Applicazioni"
|
||||
IDS_CHOOSE_FOLDER_TEXT "Scegliere una cartella dove scaricare le applicazioni:"
|
||||
IDS_CHOOSE_FOLDER_ERROR "La cartella indicata non esiste."
|
||||
IDS_CHOOSE_FOLDER_ERROR "La cartella indicata non esiste. Vuoi crearla?"
|
||||
IDS_USER_NOT_ADMIN "Dovete essere Amministratore per avviare ""ReactOS Applications Manager""!"
|
||||
IDS_APP_REG_REMOVE "Sicuro di voler cancellare dal registry i dati sui programmi installati?"
|
||||
IDS_INFORMATION "Informazioni"
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ BEGIN
|
|||
IDS_UPDATES "Uaktualnienia"
|
||||
IDS_APPLICATIONS "Aplikacje"
|
||||
IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym bêda zapisywane pobrane programy:"
|
||||
IDS_CHOOSE_FOLDER_ERROR "Wybra³eœ nieistniej¹cy katalog!"
|
||||
IDS_CHOOSE_FOLDER_ERROR "Wybrałeś nieistniejący katalog! Czy chcesz utworzyć nowy?"
|
||||
IDS_USER_NOT_ADMIN "Musisz mieæ uprawnienia administratora aby uruchomiæ ""ReactOS Applications Manager""!"
|
||||
IDS_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?"
|
||||
IDS_INFORMATION "Informacja"
|
||||
|
|
|
|||
21
base/applications/rapps/rapps/abiword28x.txt
Normal file
21
base/applications/rapps/rapps/abiword28x.txt
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
; UTF-8
|
||||
|
||||
[Section]
|
||||
Name = AbiWord
|
||||
Version = 2.8.5
|
||||
Licence = GPL
|
||||
Description = Word processor.
|
||||
Size = 7.9MB
|
||||
Category = 6
|
||||
URLSite = http://www.abisource.com/
|
||||
URLDownload = http://www.abisource.com/downloads/abiword/2.8.5/Windows/abiword-setup-2.8.5.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
Description = Textverarbeitung.
|
||||
|
||||
[Section.040a]
|
||||
Description = Procesador de textos.
|
||||
|
||||
[Section.0415]
|
||||
Description = Edytor tekstu.
|
||||
|
|
@ -8,35 +8,20 @@ Description = The most popular and one of the best free Web Browsers out there.
|
|||
Size = 5.8M
|
||||
Category = 5
|
||||
URLSite = http://www.mozilla.com/en-US/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe
|
||||
URLDownload = http://svn.reactos.org/packages/Firefox%20Setup%202.0.0.20.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
Description = Der populärste und einer der besten freien Webbrowser.
|
||||
Size = 5.5M
|
||||
URLSite = http://www.mozilla-europe.org/de/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/de/Firefox%20Setup%202.0.0.20.exe
|
||||
|
||||
[Section.040a]
|
||||
Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
|
||||
Size = 5.6M
|
||||
URLSite = http://www.mozilla-europe.org/es/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/es-ES/Firefox%20Setup%202.0.0.20.exe
|
||||
|
||||
[Section.0414]
|
||||
Description = Mest populære og best også gratis nettleserene der ute.
|
||||
Size = 5.6M
|
||||
URLSite = http://www.mozilla-europe.org/no/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/nb-NO/Firefox%20Setup%202.0.0.20.exe
|
||||
|
||||
[Section.0415]
|
||||
Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
|
||||
Size = 6.3M
|
||||
URLSite = http://www.mozilla-europe.org/pl/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/pl/Firefox%20Setup%202.0.0.20.exe
|
||||
|
||||
[Section.0419]
|
||||
Description = Один из самых популярных и лучших бесплатных браузеров.
|
||||
Size = 6.4M
|
||||
URLSite = http://www.mozilla-europe.org/ru/
|
||||
URLDownload = http://194.71.11.70/pub/www/clients/mozilla.org/firefox/releases/2.0.0.20/win32/ru/Firefox%20Setup%202.0.0.20.exe
|
||||
|
|
|
|||
42
base/applications/rapps/rapps/firefox36.txt
Normal file
42
base/applications/rapps/rapps/firefox36.txt
Normal file
|
|
@ -0,0 +1,42 @@
|
|||
; UTF-8
|
||||
|
||||
[Section]
|
||||
Name = Mozilla Firefox 3.6
|
||||
Version = 3.6.3
|
||||
Licence = MPL/GPL/LGPL
|
||||
Description = The most popular and one of the best free Web Browsers out there.
|
||||
Size = 8.0M
|
||||
Category = 5
|
||||
URLSite = http://www.mozilla.com/en-US/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/en-US/Firefox%20Setup%203.6.3.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
Description = Der populärste und einer der besten freien Webbrowser.
|
||||
Size = 7.8M
|
||||
URLSite = http://www.mozilla-europe.org/de/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/de/Firefox%20Setup%203.6.3.exe
|
||||
|
||||
[Section.040a]
|
||||
Description = El más popular y uno de los mejores navegadores web gratuitos que hay.
|
||||
Size = 7.8M
|
||||
URLSite = http://www.mozilla-europe.org/es/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/es-ES/Firefox%20Setup%203.6.3.exe
|
||||
|
||||
[Section.0414]
|
||||
Description = Mest populære og best også gratis nettleserene der ute.
|
||||
Size = 7.8M
|
||||
URLSite = http://www.mozilla-europe.org/no/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/nb-NO/Firefox%20Setup%203.6.3.exe
|
||||
|
||||
[Section.0415]
|
||||
Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych.
|
||||
Size = 8.6M
|
||||
URLSite = http://www.mozilla-europe.org/pl/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/pl/Firefox%20Setup%203.6.3.exe
|
||||
|
||||
[Section.0419]
|
||||
Description = Один из самых популярных и лучших бесплатных браузеров.
|
||||
Size = 8.2M
|
||||
URLSite = http://www.mozilla-europe.org/ru/
|
||||
URLDownload = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.3/win32/ru/Firefox%20Setup%203.6.3.exe
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
[Section]
|
||||
Name = Miranda IM
|
||||
Version = 0.8.22
|
||||
Version = 0.8.24
|
||||
Licence = GPL
|
||||
Description = Open source multiprotocol instant messaging application - May not work completely.
|
||||
Size = 1.6MB
|
||||
Size = 1.7MB
|
||||
Category = 5
|
||||
URLSite = http://www.miranda-im.org/
|
||||
URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.22-unicode.exe
|
||||
URLDownload = http://miranda.googlecode.com/files/miranda-im-v0.8.24-unicode.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
|
|
|
|||
|
|
@ -2,30 +2,29 @@
|
|||
|
||||
[Section]
|
||||
Name = OpenOffice 3.0
|
||||
Version = 3.2.0
|
||||
Version = 3.2.1
|
||||
Licence = LGPL
|
||||
Description = THE Open Source Office Suite.
|
||||
Size = 135.4MB
|
||||
Size = 134.0MB
|
||||
Category = 6
|
||||
URLSite = http://www.openoffice.org/
|
||||
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/stable/3.2.0/OOo_3.2.0_Win32Intel_install_en-US.exe
|
||||
URLDownload = http://ftp3.gwdg.de/pub/openoffice/stable/3.2.1/OOo_3.2.1_Win_x86_install_en-US.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
Description = DIE Open Source Office Suite.
|
||||
URLSite = http://de.openoffice.org/
|
||||
Size = 145.8MB
|
||||
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.2.0/OOo_3.2.0_Win32Intel_install_de.exe
|
||||
Size = 144.0MB
|
||||
URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.2.1/OOo_3.2.1_Win_x86_install_de.exe
|
||||
|
||||
[Section.040a]
|
||||
Description = La suite de ofimática de código abierto.
|
||||
URLSite = http://es.openoffice.org/
|
||||
Version = 3.1.0
|
||||
Size = 119.4MB
|
||||
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.2.0/OOo_3.2.0_Win32Intel_install_es.exe
|
||||
Size = 144.0MB
|
||||
URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/es/3.2.1/OOo_3.2.1_Win_x86_install-wJRE_es.exe
|
||||
|
||||
[Section.0415]
|
||||
Description = Otwarty pakiet biurowy.
|
||||
URLSite = http://pl.openoffice.org/
|
||||
Size = 133.2MB
|
||||
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.2.0/OOo_3.2.0_Win32Intel_install_pl.exe
|
||||
Size = 130.0MB
|
||||
URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_install_pl.exe
|
||||
|
|
|
|||
24
base/applications/rapps/rapps/opera9.txt
Normal file
24
base/applications/rapps/rapps/opera9.txt
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
; UTF-8
|
||||
|
||||
[Section]
|
||||
Name = Opera
|
||||
Version = 9.64
|
||||
Licence = Freeware
|
||||
Description = The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.
|
||||
Size = 7.2M
|
||||
Category = 5
|
||||
URLSite = http://www.opera.com/
|
||||
URLDownload = http://get4.opera.com/pub/opera/win/964/int/Opera_964_int_Setup.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
Description = Der populäre Opera Browser mit vielen fortschrittlichen Eigenschaften, enthält einen Mail und BitTorrent Client.
|
||||
|
||||
[Section.040a]
|
||||
Description = Popular navegador web con muchas características avanzadas e incluye un cliente de correo y BitTorrent.
|
||||
|
||||
[Section.0415]
|
||||
Description = Popularna przeglądarka internetowa z wieloma zaawansowanymi funkcjami, zawierająca klientów: poczty oraz BitTorrent.
|
||||
|
||||
[Section.0419]
|
||||
Description = Популярный браузер со многими дополнительными возможностями, включающий клиентов почты и BitTorrent.
|
||||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
[Section]
|
||||
Name = ReactOS Build Environment
|
||||
Version = 1.5.1
|
||||
Version = 1.5.1.1
|
||||
Licence = GPL
|
||||
Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.
|
||||
Size = 13.5MB
|
||||
Size = 13.8MB
|
||||
Category = 7
|
||||
URLSite = http://reactos.org/wiki/Build_Environment/
|
||||
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.exe
|
||||
URLSite = http://reactos.org/wiki/Build_Environment
|
||||
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.1.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
|
|
|
|||
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
[Section]
|
||||
Name = SciTE
|
||||
Version = 2.11
|
||||
Version = 2.12
|
||||
Licence = Freeware
|
||||
Description = SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.
|
||||
Size = 0.6M
|
||||
Category = 7
|
||||
URLSite = http://www.scintilla.org/
|
||||
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scintilla/Sc211.exe
|
||||
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/scintilla/Sc212.exe
|
||||
CDPath = none
|
||||
|
||||
[Section.0407]
|
||||
|
|
|
|||
|
|
@ -115,7 +115,14 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
|
|||
IDS_CHOOSE_FOLDER_ERROR,
|
||||
szMsgText, sizeof(szMsgText) / sizeof(WCHAR));
|
||||
|
||||
MessageBoxW(hDlg, szMsgText, NULL, MB_OK | MB_ICONERROR);
|
||||
if (MessageBoxW(hDlg, szMsgText, NULL, MB_YESNO) == IDYES)
|
||||
{
|
||||
if (CreateDirectoryW(szDir, NULL))
|
||||
{
|
||||
EndDialog(hDlg, LOWORD(wParam));
|
||||
}
|
||||
}
|
||||
|
||||
SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -276,7 +276,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
|
|||
{
|
||||
WNDPROC oldproc;
|
||||
HWND hwndValue;
|
||||
int len;
|
||||
TCHAR ValueString[32];
|
||||
LPTSTR Remainder;
|
||||
DWORD Base;
|
||||
|
|
@ -319,7 +318,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
|
|||
dwordEditMode = EDIT_MODE_HEX;
|
||||
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
|
||||
{
|
||||
if ((len = GetWindowTextLength(hwndValue)))
|
||||
if (GetWindowTextLength(hwndValue))
|
||||
{
|
||||
if (GetWindowText(hwndValue, ValueString, 32))
|
||||
{
|
||||
|
|
@ -339,7 +338,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
|
|||
dwordEditMode = EDIT_MODE_DEC;
|
||||
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
|
||||
{
|
||||
if ((len = GetWindowTextLength(hwndValue)))
|
||||
if (GetWindowTextLength(hwndValue))
|
||||
{
|
||||
if (GetWindowText(hwndValue, ValueString, 32))
|
||||
{
|
||||
|
|
@ -356,7 +355,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
|
|||
case IDOK:
|
||||
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
|
||||
{
|
||||
if ((len = GetWindowTextLength(hwndValue)))
|
||||
if (GetWindowTextLength(hwndValue))
|
||||
{
|
||||
if (!GetWindowText(hwndValue, ValueString, 32))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -684,7 +684,7 @@ BOOL FindNext(HWND hWnd)
|
|||
free(pszFoundValueName);
|
||||
SetFocus(g_pChildWnd->hListWnd);
|
||||
}
|
||||
return fSuccess;
|
||||
return fSuccess || s_bAbort;
|
||||
}
|
||||
|
||||
static INT_PTR CALLBACK FindDialogProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
|
||||
|
|
@ -807,7 +807,7 @@ void FindDialog(HWND hWnd)
|
|||
if (DialogBoxParam(GetModuleHandle(NULL), MAKEINTRESOURCE(IDD_FIND),
|
||||
hWnd, FindDialogProc, 0) != 0)
|
||||
{
|
||||
if (FindNext(hWnd) == FALSE)
|
||||
if (!FindNext(hWnd))
|
||||
{
|
||||
TCHAR msg[128], caption[128];
|
||||
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ BEGIN
|
|||
MENUITEM "&Exportovat do souboru registru...", ID_REGISTRY_EXPORTREGISTRYFILE
|
||||
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Load Hive...", ID_REGISTRY_LOADHIVE, GRAYED
|
||||
MENUITEM "Unload Hive...", ID_REGISTRY_UNLOADHIVE, GRAYED
|
||||
MENUITEM "Naèíst strom registru...", ID_REGISTRY_LOADHIVE, GRAYED
|
||||
MENUITEM "Uvolnit strom registru...", ID_REGISTRY_UNLOADHIVE, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Pøipojit sí<73>ový registr...",
|
||||
ID_REGISTRY_CONNECTNETWORKREGISTRY
|
||||
|
|
@ -79,19 +79,19 @@ BEGIN
|
|||
MENUITEM "&Øetìzec", ID_EDIT_NEW_STRINGVALUE
|
||||
MENUITEM "&Binární hodnota", ID_EDIT_NEW_BINARYVALUE
|
||||
MENUITEM "&Hodnota DWORD", ID_EDIT_NEW_DWORDVALUE
|
||||
MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
MENUITEM "&Víceøetìzcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Rozšiøitelná øetìzcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
END
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Oprávnìní...", ID_EDIT_PERMISSIONS
|
||||
MENUITEM "Oprá&vnìní...", ID_EDIT_PERMISSIONS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Odstranit\tDel", ID_EDIT_DELETE
|
||||
MENUITEM "&Pøejmenovat", ID_EDIT_RENAME
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "Z&kopírovat název klíèe", ID_EDIT_COPYKEYNAME
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Hledat\tCtrl+F", ID_EDIT_FIND
|
||||
MENUITEM "Hledat &další\tF3", ID_EDIT_FINDNEXT
|
||||
MENUITEM "&Najít\tCtrl+F", ID_EDIT_FIND
|
||||
MENUITEM "Najít &další\tF3", ID_EDIT_FINDNEXT
|
||||
END
|
||||
POPUP "&Zobrazit"
|
||||
BEGIN
|
||||
|
|
@ -103,10 +103,8 @@ BEGIN
|
|||
END
|
||||
POPUP "&Oblíbené"
|
||||
BEGIN
|
||||
MENUITEM "&Pøidat k oblíbeným", ID_FAVOURITES_ADDTOFAVOURITES
|
||||
, GRAYED
|
||||
MENUITEM "&Odebrat z oblíbených", ID_FAVOURITES_REMOVEFAVOURITE
|
||||
, GRAYED
|
||||
MENUITEM "&Pøidat k oblíbeným", ID_FAVOURITES_ADDTOFAVOURITES, GRAYED
|
||||
MENUITEM "&Odebrat z oblíbených", ID_FAVOURITES_REMOVEFAVOURITE, GRAYED
|
||||
END
|
||||
POPUP "&Nápovìda"
|
||||
BEGIN
|
||||
|
|
@ -135,32 +133,32 @@ BEGIN
|
|||
MENUITEM "&Øetìzec", ID_EDIT_NEW_STRINGVALUE
|
||||
MENUITEM "&Binární hodnota", ID_EDIT_NEW_BINARYVALUE
|
||||
MENUITEM "&Hodnota DWORD", ID_EDIT_NEW_DWORDVALUE
|
||||
MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
MENUITEM "&Víceøetìzcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Rozšiøitelná øetìzcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
END
|
||||
END
|
||||
POPUP ""
|
||||
BEGIN
|
||||
MENUITEM "Expand/Collapse", ID_TREE_EXPANDBRANCH
|
||||
POPUP "&New"
|
||||
MENUITEM "Rozbalit/Sbalit", ID_TREE_EXPANDBRANCH
|
||||
POPUP "&Nový"
|
||||
BEGIN
|
||||
MENUITEM "&Key", ID_EDIT_NEW_KEY
|
||||
MENUITEM "&Klíè", ID_EDIT_NEW_KEY
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&String Value", ID_EDIT_NEW_STRINGVALUE
|
||||
MENUITEM "&Binary Value", ID_EDIT_NEW_BINARYVALUE
|
||||
MENUITEM "&DWORD Value", ID_EDIT_NEW_DWORDVALUE
|
||||
MENUITEM "&Multi-String Value", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Expandable String Value", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
MENUITEM "&Øetìzec", ID_EDIT_NEW_STRINGVALUE
|
||||
MENUITEM "&Binární hodnota", ID_EDIT_NEW_BINARYVALUE
|
||||
MENUITEM "&Hodnota DWORD", ID_EDIT_NEW_DWORDVALUE
|
||||
MENUITEM "&Víceøetìzcová hodnota", ID_EDIT_NEW_MULTISTRINGVALUE
|
||||
MENUITEM "&Rozšiøitelná øetìzcová hodnota", ID_EDIT_NEW_EXPANDABLESTRINGVALUE
|
||||
END
|
||||
MENUITEM "&Find", ID_EDIT_FIND
|
||||
MENUITEM "&Najít", ID_EDIT_FIND
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Delete", ID_TREE_DELETE
|
||||
MENUITEM "&Rename", ID_TREE_RENAME
|
||||
MENUITEM "&Odstranit", ID_TREE_DELETE
|
||||
MENUITEM "&Pøejmenovat", ID_TREE_RENAME
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Export", ID_TREE_EXPORT
|
||||
MENUITEM "&Permissions...", ID_TREE_PERMISSIONS, GRAYED
|
||||
MENUITEM "&Exportovat", ID_TREE_EXPORT
|
||||
MENUITEM "Oprá&vnìní...", ID_TREE_PERMISSIONS, GRAYED
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Copy Key Name", ID_EDIT_COPYKEYNAME
|
||||
MENUITEM "Z&kopírovat název klíèe", ID_EDIT_COPYKEYNAME
|
||||
END
|
||||
END
|
||||
|
||||
|
|
@ -287,22 +285,22 @@ BEGIN
|
|||
ID_EDIT_DELETE "Smaže výbìr"
|
||||
ID_EDIT_RENAME "Pøejmenuje výbìr"
|
||||
ID_EDIT_COPYKEYNAME "Zkopíruje název klíèe do schránky"
|
||||
ID_EDIT_FIND "Hledá textový øetìzec v klíèi, položkách, nebo datech"
|
||||
ID_EDIT_FINDNEXT "Hledá další výskyt textu zadaného v pøedchozím hledání"
|
||||
ID_EDIT_FIND "Vyhledá textový øetìzec v klíèi, položkách, nebo datech"
|
||||
ID_EDIT_FINDNEXT "Vyhledá další výskyt textu zadaného v pøedchozím hledání"
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_ERROR "Chyba"
|
||||
IDS_WARNING "Upozornìní"
|
||||
IDS_BAD_KEY "Can't query key '%s'"
|
||||
IDS_ERROR "Chyba"
|
||||
IDS_WARNING "Upozornìní"
|
||||
IDS_BAD_KEY "Nelze se dotázat klíèe '%s'"
|
||||
IDS_BAD_VALUE "Nelze se dotázat položky '%s'"
|
||||
IDS_UNSUPPORTED_TYPE "Nelze upravovat klíèe tohoto typu (%ld)"
|
||||
IDS_TOO_BIG_VALUE "Položka je pøíliš velká (%ld)"
|
||||
IDS_MULTI_SZ_EMPTY_STRING "Položky typu REG_MULTI_SZ nemohou obsahovat prázdné øetezce.\nPrázdné øetìzce byly odebrány ze seznamu."
|
||||
IDS_QUERY_DELETE_KEY_ONE "Are you sure you want to delete this key?"
|
||||
IDS_QUERY_DELETE_KEY_MORE "Are you sure you want to delete these keys?"
|
||||
IDS_QUERY_DELETE_KEY_CONFIRM "Confirm Key Delete"
|
||||
IDS_QUERY_DELETE_KEY_ONE "Opravdu chcete odstranit tento klíè?"
|
||||
IDS_QUERY_DELETE_KEY_MORE "Opravdu chcete odstranit tyto klíèe?"
|
||||
IDS_QUERY_DELETE_KEY_CONFIRM "Potvrzení smazání klíèe"
|
||||
IDS_QUERY_DELETE_ONE "Opravdu chcete odstranit tuto položku?"
|
||||
IDS_QUERY_DELETE_MORE "Opravdu chcete odstranit tyto položky?"
|
||||
IDS_QUERY_DELETE_CONFIRM "Potvrzení odstranìní položky"
|
||||
|
|
@ -310,8 +308,8 @@ BEGIN
|
|||
IDS_ERR_DELETEVALUE "Nelze odstranit všechny vybrané položky!"
|
||||
IDS_ERR_RENVAL_CAPTION "Chyba pøi pøejmenování položky"
|
||||
IDS_ERR_RENVAL_TOEMPTY "Nelze pøejmenovat %s. Vybraná položka je prázdná. Vyzkoušejte jiný název."
|
||||
IDS_NEW_KEY "New Key #%d"
|
||||
IDS_NEW_VALUE "New Value #%d"
|
||||
IDS_NEW_KEY "Nový klíè #%d"
|
||||
IDS_NEW_VALUE "Nová hodnota #%d"
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
@ -328,7 +326,7 @@ END
|
|||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_FLT_REGFILE "Registration File"
|
||||
IDS_FLT_REGFILE "Soubor registru"
|
||||
IDS_FLT_REGFILES "Soubory registru"
|
||||
IDS_FLT_REGFILES_FLT "*.reg"
|
||||
IDS_FLT_REGEDIT4 "Soubory registru Win9x/NT4 (REGEDIT4)"
|
||||
|
|
@ -362,10 +360,10 @@ END
|
|||
|
||||
STRINGTABLE DISCARDABLE
|
||||
BEGIN
|
||||
IDS_EXPAND "&Expand"
|
||||
IDS_COLLAPSE "&Collapse"
|
||||
IDS_GOTO_SUGGESTED_KEY "&Go to '%s'"
|
||||
IDS_FINISHEDFIND "Finished searching through the registry."
|
||||
IDS_EXPAND "&Rozbalit"
|
||||
IDS_COLLAPSE "&Sbalit"
|
||||
IDS_GOTO_SUGGESTED_KEY "&Jít na '%s'"
|
||||
IDS_FINISHEDFIND "Prohledávání registru bylo dokonèeno."
|
||||
END
|
||||
|
||||
/*****************************************************************/
|
||||
|
|
@ -376,70 +374,69 @@ END
|
|||
*/
|
||||
|
||||
IDD_EXPORTRANGE DIALOGEX DISCARDABLE 50, 50, 370, 50
|
||||
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS |
|
||||
WS_BORDER
|
||||
STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_BORDER
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
GROUPBOX "Export Range",IDC_STATIC,2,0,366,48
|
||||
CONTROL "&All",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
|
||||
CONTROL "S&elected Branch",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11
|
||||
GROUPBOX "Rozsah exportu",IDC_STATIC,2,0,366,48
|
||||
CONTROL "&Vše",IDC_EXPORT_ALL,"Button",BS_AUTORADIOBUTTON,10,10, 29,11
|
||||
CONTROL "V&ybraná vìtev",IDC_EXPORT_BRANCH,"Button",BS_AUTORADIOBUTTON,10,22, 100,11
|
||||
EDITTEXT IDC_EXPORT_BRANCH_TEXT,30,34,335,12
|
||||
END
|
||||
|
||||
IDD_ADDFAVORITES DIALOGEX DISCARDABLE 0, 0, 186, 46
|
||||
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Add to Favorites"
|
||||
CAPTION "Pøidat do Oblíbených"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,129,7,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,129,24,50,14
|
||||
LTEXT "&Favorite Name:",IDC_STATIC,7,7,70,10
|
||||
PUSHBUTTON "Storno",IDCANCEL,129,24,50,14
|
||||
LTEXT "&Název oblíbené položky:",IDC_STATIC,7,7,70,10
|
||||
EDITTEXT IDC_FAVORITENAME,7,26,110,13,ES_AUTOHSCROLL
|
||||
END
|
||||
|
||||
IDD_REMOVEFAVORITES DIALOGEX DISCARDABLE 0, 0, 164, 135
|
||||
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Remove Favorites"
|
||||
CAPTION "Odebrat z Oblíbených"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,107,114,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,7,114,50,14
|
||||
PUSHBUTTON "Storno",IDCANCEL,7,114,50,14
|
||||
CONTROL "List1",IDC_FAVORITESLIST,"SysListView32",LVS_LIST |
|
||||
WS_BORDER | WS_TABSTOP,7,20,150,90
|
||||
LTEXT "Select Favorite(s):",IDC_STATIC,7,7,99,12
|
||||
LTEXT "Vyberte Oblíbené:",IDC_STATIC,7,7,99,12
|
||||
END
|
||||
|
||||
IDD_FIND DIALOGEX DISCARDABLE 0, 0, 254, 82
|
||||
STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Find"
|
||||
CAPTION "Najít"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "&Find Next",IDOK,197,7,50,14
|
||||
PUSHBUTTON "Cancel",IDCANCEL,197,24,50,14
|
||||
DEFPUSHBUTTON "Najít &další",IDOK,197,7,50,14
|
||||
PUSHBUTTON "Storno",IDCANCEL,197,24,50,14
|
||||
GROUPBOX "Look at",IDC_STATIC,7,25,63,51
|
||||
LTEXT "Fi&nd what:",IDC_STATIC,7,8,37,10
|
||||
LTEXT "&Najít:",IDC_STATIC,7,8,37,10
|
||||
EDITTEXT IDC_FINDWHAT,47,7,142,13,ES_AUTOHSCROLL
|
||||
CONTROL "&Keys",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX |
|
||||
CONTROL "&Klíèe",IDC_LOOKAT_KEYS,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,14,36,35,8
|
||||
CONTROL "&Values",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX |
|
||||
CONTROL "&Hodnoty",IDC_LOOKAT_VALUES,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,14,48,36,8
|
||||
CONTROL "&Data",IDC_LOOKAT_DATA,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,14,60,42,8
|
||||
CONTROL "Match &whole string only",IDC_MATCHSTRING,"Button",
|
||||
CONTROL "Hledat pouze &celý øetìzec",IDC_MATCHSTRING,"Button",
|
||||
BS_AUTOCHECKBOX | WS_TABSTOP,83,32,94,13
|
||||
CONTROL "Match &case",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX |
|
||||
CONTROL "Rozlišovat &velikost písmen",IDC_MATCHCASE,"Button",BS_AUTOCHECKBOX |
|
||||
WS_TABSTOP,83,48,90,12
|
||||
END
|
||||
|
||||
IDD_FINDING DIALOGEX 0, 0, 145, 50
|
||||
STYLE DS_SHELLFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP |
|
||||
WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "Find"
|
||||
CAPTION "Najít"
|
||||
FONT 8, "MS Shell Dlg", 400, 0, 0x1
|
||||
BEGIN
|
||||
ICON IDI_REGEDIT,IDC_STATIC,7,7,20,20
|
||||
DEFPUSHBUTTON "&Cancel",IDCANCEL,93,29,45,14
|
||||
LTEXT "Searching the registry...",IDC_STATIC,33,12,83,8
|
||||
DEFPUSHBUTTON "Storno",IDCANCEL,93,29,45,14
|
||||
LTEXT "Probíhá prohledávání registru...",IDC_STATIC,33,12,83,8
|
||||
END
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -192,7 +192,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
|
|||
CAPTION "Modifica Multi-Stringa"
|
||||
FONT 8, "MS Shell Dlg"
|
||||
BEGIN
|
||||
LTEXT "&Name:",IDC_STATIC,6,6,134,8
|
||||
LTEXT "&Nome:",IDC_STATIC,6,6,134,8
|
||||
EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
|
||||
LTEXT "&Dati:",IDC_STATIC,6,35,161,8
|
||||
EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_MULTILINE |
|
||||
|
|
|
|||
|
|
@ -380,7 +380,7 @@ static int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSor
|
|||
if (g_columnToSort == 2) {
|
||||
/* FIXME: Sort on value */
|
||||
}
|
||||
return g_invertSort ? _tcscmp(r->name, l->name) : _tcscmp(l->name, r->name);
|
||||
return g_invertSort ? _tcsicmp(r->name, l->name) : _tcsicmp(l->name, r->name);
|
||||
}
|
||||
|
||||
BOOL ListWndNotifyProc(HWND hWnd, WPARAM wParam, LPARAM lParam, BOOL *Result)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,9 @@
|
|||
/* FILE: applications/sndvol32/lang/cs-CZ.rc
|
||||
* TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
|
||||
* THANKS TO: Denzil, who translated major part of this file
|
||||
* UPDATED: 2010-05-25
|
||||
*/
|
||||
|
||||
LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
|
||||
|
||||
IDM_MAINMENU MENU DISCARDABLE
|
||||
|
|
@ -5,7 +11,7 @@ BEGIN
|
|||
POPUP "&Nastavení"
|
||||
BEGIN
|
||||
MENUITEM "&Možnosti", IDC_PROPERTIES
|
||||
MENUITEM "&Rozšíøené nastevení", IDC_ADVANCED_CONTROLS
|
||||
MENUITEM "&Rozšíøené nastavení", IDC_ADVANCED_CONTROLS
|
||||
MENUITEM SEPARATOR
|
||||
MENUITEM "&Konec", IDC_EXIT
|
||||
END
|
||||
|
|
@ -35,9 +41,9 @@ BEGIN
|
|||
PUSHBUTTON "&Záznam", IDC_RECORDING, 13,61,47,8, BS_AUTORADIOBUTTON
|
||||
PUSHBUTTON "&Jiné:", IDC_OTHER, 13,80,42,8, BS_AUTORADIOBUTTON | WS_DISABLED
|
||||
COMBOBOX IDC_LINE, 55,80,155,50, CBS_DROPDOWNLIST | WS_TABSTOP | WS_DISABLED
|
||||
LTEXT "Show the following volume controls:", IDC_LABELCONTROLS, 7, 109, 162, 8
|
||||
LTEXT "Zobrazit tyto ovladaèe hlasitosti:", IDC_LABELCONTROLS, 7, 109, 162, 8
|
||||
CONTROL "", IDC_CONTROLS, "SysListView32", LVS_REPORT | LVS_NOCOLUMNHEADER | WS_TABSTOP | WS_BORDER, 7, 122, 211, 96
|
||||
|
||||
PUSHBUTTON "OK", IDOK, 114,226,50,14
|
||||
PUSHBUTTON "Zrušit", IDCANCEL, 168,226,50,14
|
||||
PUSHBUTTON "Storno", IDCANCEL, 168,226,50,14
|
||||
END
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ typedef enum
|
|||
ERROR_UPDATE_LOCALESETTINGS,
|
||||
ERROR_ADDING_KBLAYOUTS,
|
||||
ERROR_UPDATE_GEOID,
|
||||
ERROR_INSUFFICIENT_DISKSPACE,
|
||||
|
||||
ERROR_LAST_ERROR_CODE
|
||||
}ERROR_NUMBER;
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#define NDEBUG
|
||||
#include <debug.h>
|
||||
|
||||
|
||||
/* GLOBALS ******************************************************************/
|
||||
|
||||
HANDLE ProcessHeap;
|
||||
|
|
@ -81,6 +82,8 @@ static PGENERIC_LIST LanguageList = NULL;
|
|||
|
||||
static LANGID LanguageId = 0;
|
||||
|
||||
static ULONG RequiredPartitionDiskSpace = ~0;
|
||||
|
||||
/* FUNCTIONS ****************************************************************/
|
||||
|
||||
static VOID
|
||||
|
|
@ -720,6 +723,7 @@ SetupStartPage(PINPUT_RECORD Ir)
|
|||
UINT ErrorLine;
|
||||
ULONG ReturnSize;
|
||||
PGENERIC_LIST_ENTRY ListEntry;
|
||||
INT IntValue;
|
||||
|
||||
CONSOLE_SetStatusText(MUIGetString(STRING_PLEASEWAIT));
|
||||
|
||||
|
|
@ -800,6 +804,22 @@ SetupStartPage(PINPUT_RECORD Ir)
|
|||
return QUIT_PAGE;
|
||||
}
|
||||
|
||||
/* Open 'DiskSpaceRequirements' section */
|
||||
if (!SetupFindFirstLineW(SetupInf, L"DiskSpaceRequirements", L"FreeSysPartDiskSpace", &Context))
|
||||
{
|
||||
MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER);
|
||||
return QUIT_PAGE;
|
||||
}
|
||||
|
||||
/* Get the 'FreeSysPartDiskSpace' value */
|
||||
if (!SetupGetIntField(&Context, 1, &IntValue))
|
||||
{
|
||||
MUIDisplayError(ERROR_CORRUPT_TXTSETUPSIF, Ir, POPUP_WAIT_ENTER);
|
||||
return QUIT_PAGE;
|
||||
}
|
||||
|
||||
RequiredPartitionDiskSpace = (ULONG)IntValue;
|
||||
|
||||
/* Start PnP thread */
|
||||
if (hPnpThread != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
|
|
@ -829,7 +849,7 @@ SetupStartPage(PINPUT_RECORD Ir)
|
|||
|
||||
while (ListEntry != NULL)
|
||||
{
|
||||
if (!wcscmp(LocaleID, GetListEntryUserData(ListEntry)))
|
||||
if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry)))
|
||||
{
|
||||
DPRINT("found %S in LanguageList\n",GetListEntryUserData(ListEntry));
|
||||
SetCurrentListEntry(LanguageList, ListEntry);
|
||||
|
|
@ -843,7 +863,7 @@ SetupStartPage(PINPUT_RECORD Ir)
|
|||
|
||||
while (ListEntry != NULL)
|
||||
{
|
||||
if (!wcscmp(LocaleID, GetListEntryUserData(ListEntry)))
|
||||
if (!wcsicmp(LocaleID, GetListEntryUserData(ListEntry)))
|
||||
{
|
||||
DPRINT("found %S in LayoutList\n",GetListEntryUserData(ListEntry));
|
||||
SetCurrentListEntry(LayoutList, ListEntry);
|
||||
|
|
@ -1381,6 +1401,31 @@ LayoutSettingsPage(PINPUT_RECORD Ir)
|
|||
return DISPLAY_SETTINGS_PAGE;
|
||||
}
|
||||
|
||||
static BOOL IsDiskSizeValid(PPARTENTRY PartEntry)
|
||||
{
|
||||
ULONGLONG m;
|
||||
/* check for unpartitioned space */
|
||||
m = PartEntry->UnpartitionedLength;
|
||||
m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */
|
||||
if( m > RequiredPartitionDiskSpace)
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// check for partitioned space
|
||||
m = PartEntry->PartInfo[0].PartitionLength.QuadPart;
|
||||
m = (m + (1 << 19)) >> 20; /* in MBytes (rounded) */
|
||||
if( m < RequiredPartitionDiskSpace)
|
||||
{
|
||||
/* partition is too small so ask for another partion */
|
||||
DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace);
|
||||
return FALSE;
|
||||
}
|
||||
else
|
||||
{
|
||||
return TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
static PAGE_NUMBER
|
||||
SelectPartitionPage(PINPUT_RECORD Ir)
|
||||
|
|
@ -1434,9 +1479,13 @@ SelectPartitionPage(PINPUT_RECORD Ir)
|
|||
{
|
||||
if (AutoPartition)
|
||||
{
|
||||
PPARTENTRY PartEntry = PartEntry = PartitionList->CurrentPartition;
|
||||
PPARTENTRY PartEntry = PartitionList->CurrentPartition;
|
||||
ULONG MaxSize = (PartEntry->UnpartitionedLength + (1 << 19)) >> 20; /* in MBytes (rounded) */
|
||||
|
||||
if(!IsDiskSizeValid(PartitionList->CurrentPartition))
|
||||
{
|
||||
MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY);
|
||||
return SELECT_PARTITION_PAGE; /* let the user select another partition */
|
||||
}
|
||||
CreateNewPartition(PartitionList,
|
||||
MaxSize,
|
||||
TRUE);
|
||||
|
|
@ -1446,6 +1495,11 @@ SelectPartitionPage(PINPUT_RECORD Ir)
|
|||
}
|
||||
else
|
||||
{
|
||||
if(!IsDiskSizeValid(PartitionList->CurrentPartition))
|
||||
{
|
||||
MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY);
|
||||
return SELECT_PARTITION_PAGE; /* let the user select another partition */
|
||||
}
|
||||
return(SELECT_FILE_SYSTEM_PAGE);
|
||||
}
|
||||
}
|
||||
|
|
@ -1489,6 +1543,11 @@ SelectPartitionPage(PINPUT_RECORD Ir)
|
|||
}
|
||||
else if (Ir->Event.KeyEvent.wVirtualKeyCode == VK_RETURN) /* ENTER */
|
||||
{
|
||||
if(!IsDiskSizeValid(PartitionList->CurrentPartition))
|
||||
{
|
||||
MUIDisplayError(ERROR_INSUFFICIENT_DISKSPACE, Ir, POPUP_WAIT_ANY_KEY);
|
||||
return SELECT_PARTITION_PAGE; /* let the user select another partition */
|
||||
}
|
||||
if (PartitionList->CurrentPartition == NULL ||
|
||||
PartitionList->CurrentPartition->Unpartitioned == TRUE)
|
||||
{
|
||||
|
|
@ -3121,7 +3180,7 @@ FileCopyCallback(PVOID Context,
|
|||
|
||||
case SPFILENOTIFY_STARTCOPY:
|
||||
/* Display copy message */
|
||||
CONSOLE_SetStatusTextAutoFitX (45 , MUIGetString(STRING_COPYING), (PWSTR)Param1);
|
||||
CONSOLE_SetStatusText(MUIGetString(STRING_COPYING), (PWSTR)Param1);
|
||||
SetupUpdateMemoryInfo(CopyContext, FALSE);
|
||||
break;
|
||||
|
||||
|
|
|
|||
|
|
@ -1488,6 +1488,12 @@ MUI_ERROR bgBGErrorEntries[] =
|
|||
"<EFBFBD> áâனª â ¥ ¬®¦ ¤ ãáâ ®¢¨ ®§ ç¨â¥«ï £¥®£à ä᪮⮠¯®«®¦¥¨¥.\n"
|
||||
"ENTER = <20>१ ¯ã᪠¥ ª®¬¯îâêà "
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * <20> â¨á¥â¥ ª« ¢¨è, § ¤ ¯à®¤ê«¦¨â¥.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1626,7 +1632,7 @@ MUI_STRING bgBGStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"<EFBFBD>¥ ¡¥ ¬¥à¥ à §¤¥« '%S'\n¢ TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 ‡ ¯¨ב ה ©«: %S"},
|
||||
" ‡ ¯¨á ä ©«: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"’¥ç¥ § ¯¨á¢ ¥ ä ©«®¢¥â¥..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
/* FILE: setup/usetup/lang/cs-CZ.rc
|
||||
* TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com)
|
||||
* THANKS TO: preston
|
||||
* UPDATED: 2008-06-05
|
||||
* UPDATED: 2010-05-25
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
|
@ -1481,8 +1481,14 @@ MUI_ERROR csCZErrorEntries[] =
|
|||
},
|
||||
{
|
||||
//ERROR_UPDATE_GEOID,
|
||||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
"Nepodaýilo se nastavit geo id.\n"
|
||||
"ENTER = Restartovat poźˇtaź"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Na zvolen‚m oddˇlu nenˇ dost voln‚ho mˇsta.\n"
|
||||
" * Pokraźujte stisknutˇm libovoln‚ kl vesy.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
|
|
@ -1622,7 +1628,7 @@ MUI_STRING csCZStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Nepodaýilo se naj¡t sekci '%S' v souboru\n TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kop¡ruji soubor: %S"},
|
||||
" Kopˇruji soubor: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Instalace kop¡ruje soubory..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
@ -1662,7 +1668,7 @@ MUI_STRING csCZStrings[] =
|
|||
{STRING_HDDINFOUNK1,
|
||||
"%I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu)."},
|
||||
{STRING_HDDINFOUNK2,
|
||||
" %c%c Type %lu %I64u %s"},
|
||||
" %c%c Typ %lu %I64u %s"},
|
||||
{STRING_HDINFOPARTDELETE,
|
||||
"na %I64u %s Harddisk %lu (Port=%hu, Bus=%hu, Id=%hu) na %wZ."},
|
||||
{STRING_HDDINFOUNK3,
|
||||
|
|
|
|||
|
|
@ -1477,7 +1477,13 @@ MUI_ERROR deDEErrorEntries[] =
|
|||
"Setup konnte den geografischen Standort nicht einstellen.\n"
|
||||
"ENTER = Computer neu starten"
|
||||
},
|
||||
{
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Nicht genug Speicherplatz auf der gew„hlten Partition vorhanden.\n"
|
||||
" * Eine beliebige Taste zum Fortsetzen dr<64>cken.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
}
|
||||
|
|
@ -1615,7 +1621,7 @@ MUI_STRING deDEStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup konnte die '%S'-Sektion\nin TXTSETUP.SIF nicht finden.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kopiere Datei: %S"},
|
||||
" Kopiere Datei: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup kopiert Dateien..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1644,7 +1644,7 @@ MUI_STRING elGRStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 €¤« š¨áœ«˜ «¦ ˜¨®œå¦: %S"},
|
||||
" €¤« š¨áœ«˜ «¦ ˜¨®œå¦: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"† œš¡˜«á©«˜©ž ˜¤« š¨áœ ˜¨®œå˜..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ static MUI_ENTRY enUSWelcomePageEntries[] =
|
|||
{
|
||||
8,
|
||||
19,
|
||||
"\x07 Press L to view the ReactOS Licensing Terms and Conditions",
|
||||
"\x07 Press L to view the ReactOS Licensing Terms and Conditions.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -1476,6 +1476,12 @@ MUI_ERROR enUSErrorEntries[] =
|
|||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1613,7 +1619,7 @@ MUI_STRING enUSStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copying file: %S"},
|
||||
" Copying file: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup is copying files..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ static MUI_ENTRY esESLanguagePageEntries[] =
|
|||
{
|
||||
6,
|
||||
8,
|
||||
"Selecci¢n de idioma",
|
||||
"Selecci¢n del idioma",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -94,7 +94,7 @@ static MUI_ENTRY esESWelcomePageEntries[] =
|
|||
{
|
||||
8,
|
||||
19,
|
||||
"\x07 Presione L para ver las condiciones y t‚rminos de licencia",
|
||||
"\x07 Presione L para ver las condiciones y t‚rminos de licencia.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -194,18 +194,24 @@ static MUI_ENTRY esESIntroPageEntries[] =
|
|||
{
|
||||
8,
|
||||
19,
|
||||
"- El comprobador de integridad del sistema de archivos no est a£n implementado.",
|
||||
"- El comprobador de integridad del sistema de archivos no est a£n",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
8,
|
||||
23,
|
||||
"\x07 Presione ENTER para instalar ReactOS.",
|
||||
20,
|
||||
" implementado.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
8,
|
||||
25,
|
||||
"\x07 Presione ENTER para instalar ReactOS.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
8,
|
||||
27,
|
||||
"\x07 Presione F3 para salir sin instalar ReactOS.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
|
|
@ -358,7 +364,7 @@ static MUI_ENTRY esESDevicePageEntries[] =
|
|||
{
|
||||
6,
|
||||
8,
|
||||
"La lista inferior muestra la configuraci¢n del dispositivo actual.",
|
||||
"La lista inferior muestra la configuraci¢n actual de dispositivos.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -1469,15 +1475,21 @@ MUI_ERROR esESErrorEntries[] =
|
|||
},
|
||||
{
|
||||
//ERROR_ADDING_KBLAYOUTS,
|
||||
"Setup failed to add keyboard layouts to registry.\n"
|
||||
"ENTER = Reboot computer"
|
||||
"El instalador no ha podido agregar los layouts de teclado al registro.\n"
|
||||
"ENTER = Reiniciar el equipo"
|
||||
},
|
||||
{
|
||||
//ERROR_UPDATE_GEOID,
|
||||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
"El instalador no ha podido configurar el ID geogr fico.\n"
|
||||
"ENTER = Reiniciar el equipo"
|
||||
},
|
||||
{
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"No hay suficiente espacio disponible en la partici¢n seleccionada.\n"
|
||||
" * Presione una tecla para continuar.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
}
|
||||
|
|
@ -1592,7 +1604,7 @@ MUI_STRING esESStrings[] =
|
|||
{STRING_INSTALLDELETEPARTITION,
|
||||
" ENTER = Instalar D = Borrar Partici¢n F3 = Salir"},
|
||||
{STRING_PARTITIONSIZE,
|
||||
"Tamaño de la nueva partici¢n:"},
|
||||
"Tama¤o de la nueva partici¢n:"},
|
||||
{STRING_CHOOSENEWPARTITION,
|
||||
"Ha elegido crear una nueva partici¢n en"},
|
||||
{STRING_HDDSIZE,
|
||||
|
|
@ -1614,7 +1626,7 @@ MUI_STRING esESStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"El instalador fall¢ al buscar la secci¢n\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copiando archivo: %S"},
|
||||
" Copiando archivo: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"El instalador est copiando archivos..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
@ -1690,6 +1702,6 @@ MUI_STRING esESStrings[] =
|
|||
{STRING_GB,
|
||||
"GB"},
|
||||
{STRING_ADDKBLAYOUTS,
|
||||
"Adding keyboard layouts"},
|
||||
"A¤adiendo disposici¢n de teclado"},
|
||||
{0, 0}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1473,6 +1473,12 @@ MUI_ERROR etEEErrorEntries[] =
|
|||
"Geograafilist asukohta ei ännestunud seadistada.\n"
|
||||
"ENTER = Taask„ivita arvuti"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Valitud partitsioonil pole piisavalt ruumi.\n"
|
||||
" * Vajuta suvalist klahvi, et j„tkata.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1609,9 +1615,9 @@ MUI_STRING etEEStrings[] =
|
|||
{STRING_REBOOTCOMPUTER,
|
||||
"ENTER = Taask„ivita arvuti"},
|
||||
{STRING_TXTSETUPFAILED,
|
||||
"TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"},
|
||||
"TXTSETUP.SIF failist ei leitud '%S' sektsiooni\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kopeerimine: %S"},
|
||||
" Kopeerimine: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Failide kopeerimine..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1489,6 +1489,12 @@ MUI_ERROR frFRErrorEntries[] =
|
|||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1627,7 +1633,7 @@ MUI_STRING frFRStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup n'a pu trouver la section '%S'\ndans TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copie du fichier: %S"},
|
||||
" Copie du fichier: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup copie les fichiers..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -94,7 +94,7 @@ static MUI_ENTRY itITWelcomePageEntries[] =
|
|||
{
|
||||
8,
|
||||
19,
|
||||
"\x07 Premere L per vedere i termini e condizioni della licenza",
|
||||
"\x07 Premere L per vedere i termini e condizioni della licenza.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -158,7 +158,7 @@ static MUI_ENTRY itITIntroPageEntries[] =
|
|||
{
|
||||
6,
|
||||
12,
|
||||
"Ci sono delle limitazioni:",
|
||||
"Si applicano le seguenti limitazioni:",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -358,7 +358,7 @@ static MUI_ENTRY itITDevicePageEntries[] =
|
|||
{
|
||||
6,
|
||||
8,
|
||||
"La lista inferiore mostra la configurazione della periferica corrente.",
|
||||
"L'elenco che segue mostra le impostazioni correnti delle periferiche.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -382,7 +382,7 @@ static MUI_ENTRY itITDevicePageEntries[] =
|
|||
{
|
||||
3,
|
||||
14,
|
||||
"Nazionalit… tastiera:",
|
||||
"Layout di tastiera:",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -393,7 +393,7 @@ static MUI_ENTRY itITDevicePageEntries[] =
|
|||
},
|
||||
{
|
||||
25,
|
||||
16, "Procedere con questa configurazione",
|
||||
16, "Accettare queste impostazioni",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -423,7 +423,7 @@ static MUI_ENTRY itITDevicePageEntries[] =
|
|||
{
|
||||
6,
|
||||
24,
|
||||
"\"Procedere con questa configurazione\" e premere INVIO.",
|
||||
"\"Accettare queste impostazioni\" e premere INVIO.",
|
||||
TEXT_STYLE_NORMAL
|
||||
},
|
||||
{
|
||||
|
|
@ -1474,8 +1474,14 @@ MUI_ERROR itITErrorEntries[] =
|
|||
},
|
||||
{
|
||||
//ERROR_UPDATE_GEOID,
|
||||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
"Setup non ha potuto impostare l'id geografico.\n"
|
||||
"INVIO = Riavviare il computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Lo spazio disponibile nella partizione selezionata Š insufficiente.\n"
|
||||
" * Premere un tasto qualsiasi per continuare.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
|
|
@ -1615,7 +1621,7 @@ MUI_STRING itITStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup non ha trovato la sezione '%S' \nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copia di: %S"},
|
||||
" Copia di: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Copia dei file in corso..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1477,6 +1477,12 @@ MUI_ERROR jaJPErrorEntries[] =
|
|||
"¾¯Ä±¯ÌßÊ geo id ¦ ¾¯Ã² ÃÞ·Ï¾Ý ÃÞ¼À¡\n"
|
||||
"ENTER = ºÝËß°ÀÉ »²·ÄÞ³"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1614,7 +1620,7 @@ MUI_STRING jaJPStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"¾¯Ä±¯ÌßÊ TXTSETUP.SIF É '%S' ¾¸¼®ÝÉ ¹Ý¼ÂÆ\n¼¯Êß² ¼Ï¼À¡\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 核甙 镰成 抬操: %S"},
|
||||
" 核甙 镰成 抬操: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"¾¯Ä±¯ÌßÊ Ì§²Ù¦ ºËß° ¼Ã ²Ï½..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1486,6 +1486,12 @@ MUI_ERROR ltLTErrorEntries[] =
|
|||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1624,7 +1630,7 @@ MUI_STRING ltLTStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copying file: %S"},
|
||||
" Copying file: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup is copying files..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1504,6 +1504,12 @@ MUI_ERROR nlNLErrorEntries[] =
|
|||
"Setup kan de geografische positie niet instellen.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1642,7 +1648,7 @@ MUI_STRING nlNLStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup kan de '%S' sectie niet vinden\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kopieeren bestand: %S"},
|
||||
" Kopieeren bestand: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup is bestand aan het kopieeren..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1485,6 +1485,12 @@ MUI_ERROR plPLErrorEntries[] =
|
|||
"Instalator nie m¢gˆ ustawi† lokalizacji geograficznej.\n"
|
||||
"ENTER = Restart komputera"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Brak wystarczajĄcej wolnej przestrzeni w wybranej partycji.\n"
|
||||
" * Naci<63>nij dowolny klawisz aby kontynuowa†.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1623,7 +1629,7 @@ MUI_STRING plPLStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Instalator nie byˆ w stanie odnale«† sekji '%S'\nw pliku TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kopiowanie plik˘w: %S"},
|
||||
" Kopiowanie plik˘w: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Instalator kopiuje pliki..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1477,6 +1477,12 @@ MUI_ERROR ruRUErrorEntries[] =
|
|||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1615,7 +1621,7 @@ MUI_STRING ruRUStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"<EFBFBD>à®£à ¬¬ ãáâ ®¢ª¨ ¥ ᬮ£« ©â¨ ᥪæ¨î '%S'\n¢ ä ©«¥ TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Š®¯¨à®¢ ¨¥: %S"},
|
||||
" Š®¯¨à®¢ ¨¥: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"<EFBFBD>à®£à ¬¬ ãáâ ®¢ª¨ ª®¯¨àã¥â ä ©«ë..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1487,6 +1487,12 @@ MUI_ERROR skSKErrorEntries[] =
|
|||
"Inçtal tor nemohol nastaviœ geo id.\n"
|
||||
"ENTER = Reçtart poŸ¡taŸa"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1625,7 +1631,7 @@ MUI_STRING skSKStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Inçtal tor zlyhal pri h–adan¡ sekcie '%S'\nv s£bore TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Kop¡ruje sa s£bor: %S"},
|
||||
" Kop¡ruje sa s£bor: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Inçtal tor kop¡ruje s£bory..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1477,6 +1477,12 @@ MUI_ERROR svSEErrorEntries[] =
|
|||
"Setup could not set the geo id.\n"
|
||||
"ENTER = Reboot computer"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1614,7 +1620,7 @@ MUI_STRING svSEStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"Setup failed to find the '%S' section\nin TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 Copying file: %S"},
|
||||
" Copying file: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"Setup is copying files..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -1483,6 +1483,12 @@ MUI_ERROR ukUAErrorEntries[] =
|
|||
"<EFBFBD>¥ ¢¤ «®áì ¢áâ ®¢¨â¨ geo id.\n"
|
||||
"ENTER = <20>¥à¥§ ¢ â ¦¨â¨ ª®¬¯'îâ¥à"
|
||||
},
|
||||
{
|
||||
//ERROR_INSUFFICIENT_DISKSPACE,
|
||||
"Not enough free space in the selected partition.\n"
|
||||
" * Press any key to continue.",
|
||||
NULL
|
||||
},
|
||||
{
|
||||
NULL,
|
||||
NULL
|
||||
|
|
@ -1620,7 +1626,7 @@ MUI_STRING ukUAStrings[] =
|
|||
{STRING_TXTSETUPFAILED,
|
||||
"‚áâ ®¢«î¢ ç ¥ §¬i£ § ©â¨ ᥪæiî '%S' \n¢ ä ©«i TXTSETUP.SIF.\n"},
|
||||
{STRING_COPYING,
|
||||
"\xB3 <20>®―iξΆ ο: %S"},
|
||||
" Š®¯iî¢ ï: %S"},
|
||||
{STRING_SETUPCOPYINGFILES,
|
||||
"‚áâ ®¢«î¢ ç ª®¯iîó ä ©«¨..."},
|
||||
{STRING_REGHIVEUPDATE,
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ STRINGTABLE DISCARDABLE
|
|||
BEGIN
|
||||
IDS_APPTITLE "ReactOS - Bienvenido"
|
||||
IDS_DEFAULTTOPICTITLE "ReactOS"
|
||||
IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opcion a la izquierda."
|
||||
IDS_DEFAULTTOPICDESC "Bienvenido al Sistema Operativo React.\n\nHaz Click en una opción a la izquierda."
|
||||
// IDS_CHECKTEXT "Mostrar este dialogo otra vez"
|
||||
// IDS_CLOSETEXT "Salir"
|
||||
END
|
||||
|
|
|
|||
|
|
@ -156,7 +156,7 @@ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */
|
|||
BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */
|
||||
BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */
|
||||
INT nErrorLevel = 0; /* Errorlevel of last launched external program */
|
||||
BOOL bChildProcessRunning = FALSE;
|
||||
CRITICAL_SECTION ChildProcessRunningLock;
|
||||
BOOL bUnicodeOutput = FALSE;
|
||||
BOOL bDisableBatchEcho = FALSE;
|
||||
BOOL bDelayedExpansion = FALSE;
|
||||
|
|
@ -436,14 +436,12 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
|
|||
{
|
||||
if (IsConsoleProcess(prci.hProcess))
|
||||
{
|
||||
/* FIXME: Protect this with critical section */
|
||||
bChildProcessRunning = TRUE;
|
||||
EnterCriticalSection(&ChildProcessRunningLock);
|
||||
dwChildProcessId = prci.dwProcessId;
|
||||
|
||||
WaitForSingleObject (prci.hProcess, INFINITE);
|
||||
|
||||
/* FIXME: Protect this with critical section */
|
||||
bChildProcessRunning = FALSE;
|
||||
LeaveCriticalSection(&ChildProcessRunningLock);
|
||||
|
||||
GetExitCodeProcess (prci.hProcess, &dwExitCode);
|
||||
nErrorLevel = (INT)dwExitCode;
|
||||
|
|
@ -665,9 +663,9 @@ ExecutePipeline(PARSED_COMMAND *Cmd)
|
|||
SetStdHandle(STD_INPUT_HANDLE, hOldConIn);
|
||||
|
||||
/* Wait for all processes to complete */
|
||||
bChildProcessRunning = TRUE;
|
||||
EnterCriticalSection(&ChildProcessRunningLock);
|
||||
WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE);
|
||||
bChildProcessRunning = FALSE;
|
||||
LeaveCriticalSection(&ChildProcessRunningLock);
|
||||
|
||||
/* Use the exit code of the last process in the pipeline */
|
||||
GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode);
|
||||
|
|
@ -1439,13 +1437,16 @@ BOOL WINAPI BreakHandler (DWORD dwCtrlType)
|
|||
}
|
||||
}
|
||||
|
||||
if (bChildProcessRunning == TRUE)
|
||||
if (!TryEnterCriticalSection(&ChildProcessRunningLock))
|
||||
{
|
||||
SelfGenerated = TRUE;
|
||||
GenerateConsoleCtrlEvent (dwCtrlType, 0);
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
LeaveCriticalSection(&ChildProcessRunningLock);
|
||||
}
|
||||
|
||||
rec.EventType = KEY_EVENT;
|
||||
rec.Event.KeyEvent.bKeyDown = TRUE;
|
||||
|
|
@ -1797,6 +1798,7 @@ static VOID Cleanup()
|
|||
RemoveBreakHandler ();
|
||||
SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
|
||||
ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT );
|
||||
DeleteCriticalSection(&ChildProcessRunningLock);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -1808,6 +1810,7 @@ int cmd_main (int argc, const TCHAR *argv[])
|
|||
TCHAR startPath[MAX_PATH];
|
||||
CONSOLE_SCREEN_BUFFER_INFO Info;
|
||||
|
||||
InitializeCriticalSection(&ChildProcessRunningLock);
|
||||
lpOriginalEnvironment = DuplicateEnvironment();
|
||||
|
||||
GetCurrentDirectory(MAX_PATH,startPath);
|
||||
|
|
|
|||
|
|
@ -604,28 +604,30 @@ INT cmd_copy (LPTSTR param)
|
|||
bTouch = TRUE;
|
||||
bDone = TRUE;
|
||||
}
|
||||
|
||||
if(_tcslen(tmpName) == 2)
|
||||
{
|
||||
if(tmpName[1] == _T(':'))
|
||||
{
|
||||
GetRootPath(tmpName,szSrcPath,MAX_PATH);
|
||||
}
|
||||
}
|
||||
else
|
||||
/* Get the full path to first file in the string of file names */
|
||||
GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL);
|
||||
}
|
||||
else
|
||||
{
|
||||
bDone = TRUE;
|
||||
if(_tcslen(arg[nSrc]) == 2 && arg[nSrc][1] == _T(':'))
|
||||
_tcscpy(tmpName, arg[nSrc]);
|
||||
}
|
||||
|
||||
/* Get full path or root names */
|
||||
if(_tcslen(tmpName) == 2 && tmpName[1] == _T(':'))
|
||||
{
|
||||
GetRootPath(tmpName,szSrcPath,MAX_PATH);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* Get the full path to first file in the string of file names */
|
||||
GetFullPathName (tmpName, MAX_PATH, szSrcPath, NULL);
|
||||
|
||||
/* We got a device path of form \\.\x */
|
||||
/* FindFirstFile cannot handle this, therefore use the short path */
|
||||
if (szSrcPath[0] == _T('\\') && szSrcPath[1] == _T('\\') &&
|
||||
szSrcPath[2] == _T('.') && szSrcPath[3] == _T('\\'))
|
||||
{
|
||||
GetRootPath(arg[nSrc],szSrcPath,MAX_PATH);
|
||||
_tcscpy(szSrcPath, tmpName);
|
||||
}
|
||||
else
|
||||
/* Get the full path of the source file */
|
||||
GetFullPathName (arg[nSrc], MAX_PATH, szSrcPath, NULL);
|
||||
}
|
||||
|
||||
/* From this point on, we can assume that the shortest path is 3 letters long
|
||||
|
|
|
|||
|
|
@ -590,10 +590,20 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
|
|||
|
||||
/* Start the search for all the files */
|
||||
GetFullPathName(szBaseWord, MAX_PATH, szSearchPath, NULL);
|
||||
|
||||
/* Got a device path? Fallback to the the current dir plus the short path */
|
||||
if (szSearchPath[0] == _T('\\') && szSearchPath[1] == _T('\\') &&
|
||||
szSearchPath[2] == _T('.') && szSearchPath[3] == _T('\\'))
|
||||
{
|
||||
GetCurrentDirectory(MAX_PATH, szSearchPath);
|
||||
_tcscat(szSearchPath, _T("\\"));
|
||||
_tcscat(szSearchPath, szBaseWord);
|
||||
}
|
||||
|
||||
if(StartLength > 0)
|
||||
{
|
||||
{
|
||||
_tcscat(szSearchPath,_T("*"));
|
||||
}
|
||||
}
|
||||
_tcscpy(LastSearch,szSearchPath);
|
||||
_tcscpy(LastPrefix,szPrefix);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -284,7 +284,9 @@ _tWinMain(IN HINSTANCE hInstance,
|
|||
TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"),
|
||||
&hkExplorer) != ERROR_SUCCESS)
|
||||
{
|
||||
/* FIXME - display error */
|
||||
TCHAR Message[256];
|
||||
LoadString(hInstance, IDS_STARTUP_ERROR, Message, 256);
|
||||
MessageBox(NULL, Message, NULL, MB_ICONERROR);
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -121,6 +121,7 @@ BEGIN
|
|||
IDS_PROPERTIES "&Свойства"
|
||||
IDS_OPEN_ALL_USERS "&Отваряне на всички потребители"
|
||||
IDS_EXPLORE_ALL_USERS "&Разлистване на всички потребители"
|
||||
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
|
|
@ -126,6 +126,7 @@ BEGIN
|
|||
IDS_PROPERTIES "Vl&astnosti"
|
||||
IDS_OPEN_ALL_USERS "Ote&vøít složku All Users"
|
||||
IDS_EXPLORE_ALL_USERS "Pro&cházet složku All Users"
|
||||
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ BEGIN
|
|||
IDS_PROPERTIES "E&igenschaften"
|
||||
IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)"
|
||||
IDS_EXPLORE_ALL_USERS "Explorer (A&lle Benutzer)"
|
||||
IDS_STARTUP_ERROR "Das System kann den Explorer nicht starten, weil die Registrierung nicht verfügbar bzw. fehlerhaft ist."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ BEGIN
|
|||
IDS_PROPERTIES "P&roperties"
|
||||
IDS_OPEN_ALL_USERS "O&pen All Users"
|
||||
IDS_EXPLORE_ALL_USERS "E&xplore All Users"
|
||||
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
|
|
@ -129,6 +129,7 @@ BEGIN
|
|||
IDS_PROPERTIES "P&ropiedades"
|
||||
IDS_OPEN_ALL_USERS "A&brir todos los usuarios"
|
||||
IDS_EXPLORE_ALL_USERS "E&xplorar todos los usuarios"
|
||||
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ BEGIN
|
|||
IDS_PROPERTIES "P&ropriétés"
|
||||
IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs"
|
||||
IDS_EXPLORE_ALL_USERS "E&xplorer tous les utilisateurs"
|
||||
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
|
||||
END
|
||||
|
||||
STRINGTABLE DISCARDABLE
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue