Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:12:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Sync to trunk head (r47736)

Browse source 
svn path=/branches/reactos-yarotows/; revision=47746
This commit is contained in:
Timo Kreuzer 2010-06-10 20:57:03 +00:00
commit 5f2d67cb35
862 changed files with 85731 additions and 54875 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -46,6 +46,10 @@
# This is faster than the depends target which does a complete dependency # This is faster than the depends target which does a complete dependency
# check of the ReactOS codebase. # check of the ReactOS codebase.
# #
# bootcdregtest
# This target builds an ISO (ReactOS-RegTest.ISO) which is used for unattended
# regression testing.
#
# #
# Accepted environment variables: # Accepted environment variables:
# #

25
ReactOS-amd64.rbuild
View file

@ -34,8 +34,8 @@
<!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag --> <!-- compilerflag compiler="cc,cxx">-gstabs+</compilerflag -->
<!-- compilerflag compiler="as">-gstabs+</compilerflag --> <!-- compilerflag compiler="as">-gstabs+</compilerflag -->
<compilerflag>-U_X86_</compilerflag> <compilerflag>-U_X86_</compilerflag>
<compilerflag>-UWIN32</compilerflag>
<compilerflag>-Wno-format</compilerflag> <compilerflag>-Wno-format</compilerflag>
<compilerflag>-fno-leading-underscore</compilerflag>
</group> </group>
<group linkerset="ld"> <group linkerset="ld">
@ -44,14 +44,31 @@
<linkerflag>-section-alignment=0x1000</linkerflag> <linkerflag>-section-alignment=0x1000</linkerflag>
<linkerflag>--unique=.eh_frame</linkerflag> <linkerflag>--unique=.eh_frame</linkerflag>
<linkerflag>-static</linkerflag> <linkerflag>-static</linkerflag>
<linkerflag>-fno-leading-underscore</linkerflag>
<linkerflag>-shared</linkerflag>
<linkerflag>--exclude-all-symbols</linkerflag> <linkerflag>--exclude-all-symbols</linkerflag>
</group> </group>
<if property="USERMODE" value="1"> <if property="USERMODE" value="1">
<directory name="base"> <directory name="base">
<xi:include href="base/base.rbuild" /> <directory name="applications">
<xi:include href="base/applications/applications.rbuild" />
</directory>
<directory name="services">
<xi:include href="base/services/services.rbuild" />
</directory>
<directory name="setup">
<xi:include href="base/setup/setup.rbuild" />
</directory>
<directory name="shell">
<directory name="cmd">
<xi:include href="base/shell/cmd/cmd.rbuild" />
</directory>
<directory name="explorer-new">
<xi:include href="base/shell/explorer-new/explorer.rbuild" />
</directory>
</directory>
<directory name="system">
<xi:include href="base/system/system.rbuild" />
</directory>
</directory> </directory>
<directory name="dll"> <directory name="dll">
<xi:include href="dll/dll.rbuild" /> <xi:include href="dll/dll.rbuild" />

45
base/applications/calc/convert.c
View file

@ -66,11 +66,11 @@ static const conv_t conv_ANGLE[] = {
1 ha .................. = 10000 mq 1 ha .................. = 10000 mq
1 jeongbo ............. = 1 jeongbo ............. =
1 morgen hungary ...... = 1 morgen hungary ...... =
1 mu .................. = 1 mu .................. = 2000/3 mq
1 ping ................ = 1 ping ................ =
1 pyeong .............. = 1 pyeong .............. =
1 pyeongbangja ........ = 1 pyeongbangja ........ =
1 rai ................. = 1 rai ................. = 1600 mq
1 se .................. = 1080*(10/33)^2 mq 1 se .................. = 1080*(10/33)^2 mq
1 square cm ........... = 0.0001 mq 1 square cm ........... = 0.0001 mq
1 square chr .......... = 1 square chr .......... =
@ -101,11 +101,11 @@ static const conv_t conv_AREA[] = {
DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000") DECLARE_CONV_UNIT(AREA, HECTARES, "$*10000", "$/10000")
// DECLARE_CONV_UNIT(AREA, JEONGBO, "$", "$") // DECLARE_CONV_UNIT(AREA, JEONGBO, "$", "$")
// DECLARE_CONV_UNIT(AREA, MORGEN_HUNGARY, "$", "$") // 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, PING, "$", "$")
// DECLARE_CONV_UNIT(AREA, PYEONG, "$", "$") // DECLARE_CONV_UNIT(AREA, PYEONG, "$", "$")
// DECLARE_CONV_UNIT(AREA, PYEONGBANGJA, "$", "$") // 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, SE, "$*108000/1089", "$*1089/108000")
DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS, "$*0,0001", "$/0,0001") DECLARE_CONV_UNIT(AREA, SQUARE_CENTIMETERS, "$*0,0001", "$/0,0001")
// DECLARE_CONV_UNIT(AREA, SQUARE_CHR, "$", "$") // DECLARE_CONV_UNIT(AREA, SQUARE_CHR, "$", "$")
@ -197,9 +197,10 @@ static const conv_t conv_ENERGY[] = {
1 barleycorn ..... = 1/3 inch = 0.9144/108 m 1 barleycorn ..... = 1/3 inch = 0.9144/108 m
1 cm ............. = 1/100 m 1 cm ............. = 1/100 m
1 chain uk ....... = 22 yards = 22*0.9144 m 1 chain uk ....... = 22 yards = 22*0.9144 m
1 chi ............ = 1 chi ............ = 1/3 m
1 chou ........... = 3600/33 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 ......... = 2 yard = 2*0.9144 m
1 fathom ungary .. = 1.8964838 m (fixed) 1 fathom ungary .. = 1.8964838 m (fixed)
1 feet ........... = 12 inch = 0.9144/3 m 1 feet ........... = 12 inch = 0.9144/3 m
@ -231,7 +232,7 @@ static const conv_t conv_ENERGY[] = {
1 sen ............ = 1 sen ............ =
1 shaku .......... = 10/33 m 1 shaku .......... = 10/33 m
1 span ........... = 9 inches = 0.9144/4 m 1 span ........... = 9 inches = 0.9144/4 m
1 sun ............ = 10/330 m 1 sun ............ = 1/33 m
1 tsuen .......... = 1 tsuen .......... =
1 va ............. = 1 va ............. =
1 yard ........... = 0.9144 m 1 yard ........... = 0.9144 m
@ -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, BARLEYCORNS, "$*0.9144/108", "$/0.9144*108")
DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100") DECLARE_CONV_UNIT(LENGTH, CENTIMETERS, "$/100", "$*100")
DECLARE_CONV_UNIT(LENGTH, CHAINS_UK, "$*20.1168", "$/20.1168") 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, CHOU, "$*3600/33", "$*33/3600")
// DECLARE_CONV_UNIT(LENGTH, CHR, "$", "$") // 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, "$*1.8288", "$/1.8288")
DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY, "$*1.8964838", "$/1.8964838") DECLARE_CONV_UNIT(LENGTH, FATHOMS_HUNGARY, "$*1.8964838", "$/1.8964838")
DECLARE_CONV_UNIT(LENGTH, FEET, "$*0.3048", "$/0.3048") 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, SEN, "$", "$")
DECLARE_CONV_UNIT(LENGTH, SHAKU, "$*10/33", "$*33/10") DECLARE_CONV_UNIT(LENGTH, SHAKU, "$*10/33", "$*33/10")
DECLARE_CONV_UNIT(LENGTH, SPAN, "$*0.9144/4", "$*4/0.9144") 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, TSUEN, "$", "$")
// DECLARE_CONV_UNIT(LENGTH, VA, "$", "$") // DECLARE_CONV_UNIT(LENGTH, VA, "$", "$")
DECLARE_CONV_UNIT(LENGTH, YARDS, "$*0.9144", "$/0.9144") DECLARE_CONV_UNIT(LENGTH, YARDS, "$*0.9144", "$/0.9144")
@ -330,18 +331,20 @@ static const conv_t conv_PRESSURE[] = {
1 hour ...... = 3600 s 1 hour ...... = 3600 s
1 microsecond = 0.000001 s 1 microsecond = 0.000001 s
1 millisecond = 0.001 s 1 millisecond = 0.001 s
1 nanosecond. = 0.000000001 s
1 minute .... = 60 s 1 minute .... = 60 s
1 week ...... = 669600 s 1 week ...... = 669600 s
*/ */
static const conv_t conv_TIME[] = { static const conv_t conv_TIME[] = {
DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60") DECLARE_CONV_UNIT(TIME, MINUTES, "$*60", "$/60")
DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400") DECLARE_CONV_UNIT(TIME, DAYS, "$*86400", "$/86400")
DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600") DECLARE_CONV_UNIT(TIME, HOURS, "$*3600", "$/3600")
DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001", "$/0.001") DECLARE_CONV_UNIT(TIME, MILLISECONDS, "$*0.001", "$/0.001")
DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001") DECLARE_CONV_UNIT(TIME, MICROSECONDS, "$*0.000001", "$/0.000001")
DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$") DECLARE_CONV_UNIT(TIME, NANOSECONDS, "$*0.000000001", "$/0.000000001")
DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800") DECLARE_CONV_UNIT(TIME, SECONDS, "$", "$")
DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952") DECLARE_CONV_UNIT(TIME, WEEKS, "$*604800", "$/604800")
DECLARE_CONV_UNIT(TIME, YEARS, "$*31556952", "$/31556952")
DECLARE_CONV_END DECLARE_CONV_END
}; };
@ -462,9 +465,9 @@ static const conv_t conv_VOLUME[] = {
1 harb ............ = 1 harb ............ =
1 jin china ....... = 1 jin china ....... =
1 jin taiwan ...... = 1 jin taiwan ...... =
1 Kan ............. = 1 Kan ............. = 3750 g
1 Kilograms ....... = 1000 g 1 Kilograms ....... = 1000 g
1 Kin ............. = 1 Kin ............. = 600 g
1 Liang China ..... = 1 Liang China ..... =
1 Liang Taiwan .... = 1 Liang Taiwan .... =
1 monme ........... = 3.75 g 1 monme ........... = 3.75 g
@ -490,9 +493,9 @@ static const conv_t conv_WEIGHT[] = {
// DECLARE_CONV_UNIT(WEIGHT, HARB, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, HARB, "$", "$")
// DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, JIN_CHINA, "$", "$")
// DECLARE_CONV_UNIT(WEIGHT, JIN_TAIWAN, "$", "$") // 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, 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_CHINA, "$", "$")
// DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN, "$", "$") // DECLARE_CONV_UNIT(WEIGHT, LIANG_TAIWAN, "$", "$")
DECLARE_CONV_UNIT(WEIGHT, MONME, "$*3.75", "$/3.75") DECLARE_CONV_UNIT(WEIGHT, MONME, "$*3.75", "$/3.75")

1
base/applications/calc/lang/bg-BG.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Äíè" IDS_TIME_DAYS "Äíè"
IDS_TIME_HOURS "×àñè" IDS_TIME_HOURS "×àñè"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè" IDS_TIME_MICROSECONDS "Ìèêðîñåêóíäè"
IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè" IDS_TIME_MILLISECONDS "Ìèëèñåêóíäè"
IDS_TIME_MINUTES "Ìèíóòè" IDS_TIME_MINUTES "Ìèíóòè"

1
base/applications/calc/lang/cs-CZ.rc
View file

@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Dny" IDS_TIME_DAYS "Dny"
IDS_TIME_HOURS "Hodiny" IDS_TIME_HOURS "Hodiny"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MICROSECONDS "Mikrosekundy"
IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MILLISECONDS "Milisekundy"
IDS_TIME_MINUTES "Minuty" IDS_TIME_MINUTES "Minuty"

1
base/applications/calc/lang/de-DE.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Tagen" IDS_TIME_DAYS "Tagen"
IDS_TIME_HOURS "Stunden" IDS_TIME_HOURS "Stunden"
IDS_TIME_NANOSECONDS "Nanosekunden"
IDS_TIME_MICROSECONDS "Mikrosekunden" IDS_TIME_MICROSECONDS "Mikrosekunden"
IDS_TIME_MILLISECONDS "Millisekunden" IDS_TIME_MILLISECONDS "Millisekunden"
IDS_TIME_MINUTES "Minuten" IDS_TIME_MINUTES "Minuten"

1
base/applications/calc/lang/el-GR.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "ÌÝñåò" IDS_TIME_DAYS "ÌÝñåò"
IDS_TIME_HOURS "¿ñåò" IDS_TIME_HOURS "¿ñåò"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá" IDS_TIME_MICROSECONDS "Ìéêñïäåõôåñüëåðôá"
IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá" IDS_TIME_MILLISECONDS "Ìéëéäåõôåñüëåðôá"
IDS_TIME_MINUTES "ËåðôÜ" IDS_TIME_MINUTES "ËåðôÜ"

1
base/applications/calc/lang/en-US.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Days" IDS_TIME_DAYS "Days"
IDS_TIME_HOURS "Hours" IDS_TIME_HOURS "Hours"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MICROSECONDS "Microseconds"
IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MILLISECONDS "Milliseconds"
IDS_TIME_MINUTES "Minutes" IDS_TIME_MINUTES "Minutes"

1
base/applications/calc/lang/es-ES.rc
View file

@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Días" IDS_TIME_DAYS "Días"
IDS_TIME_HOURS "Horas" IDS_TIME_HOURS "Horas"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microsegundos" IDS_TIME_MICROSECONDS "Microsegundos"
IDS_TIME_MILLISECONDS "Milisegundos" IDS_TIME_MILLISECONDS "Milisegundos"
IDS_TIME_MINUTES "Minutos" IDS_TIME_MINUTES "Minutos"

1
base/applications/calc/lang/fr-FR.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Jours" IDS_TIME_DAYS "Jours"
IDS_TIME_HOURS "Heures" IDS_TIME_HOURS "Heures"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microsecondes" IDS_TIME_MICROSECONDS "Microsecondes"
IDS_TIME_MILLISECONDS "Millisecondes" IDS_TIME_MILLISECONDS "Millisecondes"
IDS_TIME_MINUTES "Minutes" IDS_TIME_MINUTES "Minutes"

1
base/applications/calc/lang/it-IT.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Giorni" IDS_TIME_DAYS "Giorni"
IDS_TIME_HOURS "Ore" IDS_TIME_HOURS "Ore"
IDS_TIME_NANOSECONDS "Nanosecondi"
IDS_TIME_MICROSECONDS "Microsecondi" IDS_TIME_MICROSECONDS "Microsecondi"
IDS_TIME_MILLISECONDS "Millisecondi" IDS_TIME_MILLISECONDS "Millisecondi"
IDS_TIME_MINUTES "Minuti" IDS_TIME_MINUTES "Minuti"

1
base/applications/calc/lang/ko-KR.rc
View file

@ -643,6 +643,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Days" IDS_TIME_DAYS "Days"
IDS_TIME_HOURS "Hours" IDS_TIME_HOURS "Hours"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MICROSECONDS "Microseconds"
IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MILLISECONDS "Milliseconds"
IDS_TIME_MINUTES "Minutes" IDS_TIME_MINUTES "Minutes"

1
base/applications/calc/lang/nl-NL.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Dagen" IDS_TIME_DAYS "Dagen"
IDS_TIME_HOURS "Uren" IDS_TIME_HOURS "Uren"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microseconden" IDS_TIME_MICROSECONDS "Microseconden"
IDS_TIME_MILLISECONDS "Milliseconden" IDS_TIME_MILLISECONDS "Milliseconden"
IDS_TIME_MINUTES "Minuten" IDS_TIME_MINUTES "Minuten"

1
base/applications/calc/lang/no-NO.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "**" IDS_TIME_DAYS "**"
IDS_TIME_HOURS "**" IDS_TIME_HOURS "**"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "**" IDS_TIME_MICROSECONDS "**"
IDS_TIME_MILLISECONDS "**" IDS_TIME_MILLISECONDS "**"
IDS_TIME_MINUTES "**" IDS_TIME_MINUTES "**"

213
base/applications/calc/lang/pl-PL.rc
View file

@ -464,9 +464,9 @@ END
// TYPES OF ANGLES // TYPES OF ANGLES
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_ANGLE_DEGREES "Stopni" IDS_ANGLE_DEGREES "Stopnie"
IDS_ANGLE_GRADIANS "Gradianów" IDS_ANGLE_GRADIANS "Gradiany"
IDS_ANGLE_RADIANS "Radianów" IDS_ANGLE_RADIANS "Radiany"
END END
// TYPES OF AREAS // TYPES OF AREAS
@ -489,21 +489,21 @@ BEGIN
IDS_AREA_PYEONGBANGJA "Pyeongbangja" IDS_AREA_PYEONGBANGJA "Pyeongbangja"
IDS_AREA_RAI "Rai" IDS_AREA_RAI "Rai"
IDS_AREA_SE "Se" IDS_AREA_SE "Se"
IDS_AREA_SQUARE_CENTIMETERS "Centymetrów kwadratowych" IDS_AREA_SQUARE_CENTIMETERS "Centymetry kwadratowe"
IDS_AREA_SQUARE_CHR "Chr kwadratowych" IDS_AREA_SQUARE_CHR "Chr kwadratowe"
IDS_AREA_SQUARE_FATHOMS "S¹¿ni kwadratowych" IDS_AREA_SQUARE_FATHOMS "S¹¿nie kwadratowe"
IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿ni kwadratowych (Wêgry)" IDS_AREA_SQUARE_FATHOMS_HUNGARY "S¹¿nie kwadratowe (Wêgry)"
IDS_AREA_SQUARE_FEET "Stóp kwadratowych" IDS_AREA_SQUARE_FEET "Stopy kwadratowe"
IDS_AREA_SQUARE_INCHES "Cali kwadratowych" IDS_AREA_SQUARE_INCHES "Cale kwadratowe"
IDS_AREA_SQUARE_KILOMETERS "Kilometrów kwadratowych" IDS_AREA_SQUARE_KILOMETERS "Kilometry kwadratowe"
IDS_AREA_SQUARE_LAR "Lar kwadratowych" IDS_AREA_SQUARE_LAR "Lar kwadratowe"
IDS_AREA_SQUARE_METER "Metrów kwadratowych" IDS_AREA_SQUARE_METER "Metry kwadratowe"
IDS_AREA_SQUARE_MILES "Mil kwadratowych" IDS_AREA_SQUARE_MILES "Mile kwadratowe"
IDS_AREA_SQUARE_MILLIMETERS "Milimetrów kwadratowych" IDS_AREA_SQUARE_MILLIMETERS "Milimetry kwadratowe"
IDS_AREA_SQUARE_SHAKU "Shaku kwadratowych" IDS_AREA_SQUARE_SHAKU "Shaku kwadratowe"
IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowych" IDS_AREA_SQUARE_TSUEN "Tsuen kwadratowe"
IDS_AREA_SQUARE_VA "Va kwadratowych" IDS_AREA_SQUARE_VA "Va kwadratowe"
IDS_AREA_SQUARE_YARD "Jardów kwadratowych" IDS_AREA_SQUARE_YARD "Jardy kwadratowe"
IDS_AREA_TAN "Tan" IDS_AREA_TAN "Tan"
IDS_AREA_TSUBO "Tsubo" IDS_AREA_TSUBO "Tsubo"
END END
@ -511,10 +511,10 @@ END
// TYPES OF COMSUMPTIONS // TYPES OF COMSUMPTIONS
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_CONSUMPTION_KM_PER_L "Kilometrów/litr" IDS_CONSUMPTION_KM_PER_L "Kilometry/litr"
IDS_CONSUMPTION_L_PER_100_KM "Litrów/100 kilometróws" IDS_CONSUMPTION_L_PER_100_KM "Litry/100 kilometrów"
IDS_CONSUMPTION_MILES_GALLON_UK "Mil/galon (UK)" IDS_CONSUMPTION_MILES_GALLON_UK "Mile/galon (UK)"
IDS_CONSUMPTION_MILES_GALLON_US "Mil/galon (USA)" IDS_CONSUMPTION_MILES_GALLON_US "Mile/galon (USA)"
END END
// TYPES OF CURRENCIES // TYPES OF CURRENCIES
@ -543,56 +543,56 @@ END
// TYPES OF ENERGIES // TYPES OF ENERGIES
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN 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_BTUS "British Thermal Unit"
IDS_ENERGY_ERGS "Ergów" IDS_ENERGY_ERGS "Ergi"
IDS_ENERGY_EVS "Elektronowolt" IDS_ENERGY_EVS "Elektronowolty"
IDS_ENERGY_FOOT_POUNDS "Foot-pound" IDS_ENERGY_FOOT_POUNDS "Stopo-funty"
IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii" IDS_ENERGY_IT_CALORIES "Miêdzynarodowa Tablica kalorii"
IDS_ENERGY_IT_KILOCALORIES "Miêdzynarodowa Tablica kilokalorii" IDS_ENERGY_IT_KILOCALORIES "Miêdzynarodowa Tablica kilokalorii"
IDS_ENERGY_JOULES "D¿uli" IDS_ENERGY_JOULES "D¿ule"
IDS_ENERGY_KILOJOULES "Kilod¿uli" IDS_ENERGY_KILOJOULES "Kilod¿ule"
IDS_ENERGY_KILOWATT_HOURS "Kilowatogodzin" IDS_ENERGY_KILOWATT_HOURS "Kilowatogodziny"
IDS_ENERGY_NUTRITION_CALORIES "Kalorii spo¿ywczych" IDS_ENERGY_NUTRITION_CALORIES "Kalorie spo¿ywcze"
IDS_ENERGY_TH_CALORIES "Kalorii termochemicznych" IDS_ENERGY_TH_CALORIES "Kalorie termochemiczne"
END END
// TYPES OF LENGTHS // TYPES OF LENGTHS
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_LENGTH_ANGSTROMS "Angsztremów" IDS_LENGTH_ANGSTROMS "Angsztremy"
IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostek Astronomicznych" IDS_LENGTH_ASTRONOMICAL_UNITS "Jednostki Astronomiczne"
IDS_LENGTH_BARLEYCORNS "Palców" IDS_LENGTH_BARLEYCORNS "Palce"
IDS_LENGTH_CENTIMETERS "Centimetrów" IDS_LENGTH_CENTIMETERS "Centymetry"
IDS_LENGTH_CHAINS_UK "Chains (UK)" IDS_LENGTH_CHAINS_UK "Chains (UK)"
IDS_LENGTH_CHI "Chi" IDS_LENGTH_CHI "Chi"
IDS_LENGTH_CHOU "Chou" IDS_LENGTH_CHOU "Chou"
IDS_LENGTH_CHR "Chr" IDS_LENGTH_CHR "Chr"
IDS_LENGTH_CUN "Cun" IDS_LENGTH_CUN "Cun"
IDS_LENGTH_FATHOMS "S¹¿ni" IDS_LENGTH_FATHOMS "S¹¿nie"
IDS_LENGTH_FATHOMS_HUNGARY "S¹¿ni (Wêgry)" IDS_LENGTH_FATHOMS_HUNGARY "S¹¿nie (Wêgry)"
IDS_LENGTH_FEET "Stóp" IDS_LENGTH_FEET "Stopy"
IDS_LENGTH_FURLONGS "Furlongs" IDS_LENGTH_FURLONGS "Furlongs"
IDS_LENGTH_GAN "Gan" IDS_LENGTH_GAN "Gan"
IDS_LENGTH_HANDS "D³oni" IDS_LENGTH_HANDS "D³onie"
IDS_LENGTH_HUNH "Hunh" IDS_LENGTH_HUNH "Hunh"
IDS_LENGTH_INCHES "Cali" IDS_LENGTH_INCHES "Cale"
IDS_LENGTH_JA "Ja" IDS_LENGTH_JA "Ja"
IDS_LENGTH_JEONG "Jeong" IDS_LENGTH_JEONG "Jeong"
IDS_LENGTH_KABIET "Kabiet" IDS_LENGTH_KABIET "Kabiet"
IDS_LENGTH_KEN "Ken" IDS_LENGTH_KEN "Ken"
IDS_LENGTH_KEUB "Keub" IDS_LENGTH_KEUB "Keub"
IDS_LENGTH_KILOMETERS "Kilometerów" IDS_LENGTH_KILOMETERS "Kilometry"
IDS_LENGTH_LAR "Lar" IDS_LENGTH_LAR "Lar"
IDS_LENGTH_LIGHT_YEARS "Lat œwietlnych" IDS_LENGTH_LIGHT_YEARS "Lata œwietlne"
IDS_LENGTH_LINKS_UK "Links (UK)" IDS_LENGTH_LINKS_UK "Links (UK)"
IDS_LENGTH_METERS "Metrów" IDS_LENGTH_METERS "Metry"
IDS_LENGTH_MICRONS "Mikrometrów" IDS_LENGTH_MICRONS "Mikrometry"
IDS_LENGTH_MILES "Mil" IDS_LENGTH_MILES "Mile"
IDS_LENGTH_MILLIMETERS "Millimetrów" IDS_LENGTH_MILLIMETERS "Milimetry"
IDS_LENGTH_NAUTICAL_MILES "Mil morskich" IDS_LENGTH_NAUTICAL_MILES "Mile morskie"
IDS_LENGTH_NIEU "Nieu" IDS_LENGTH_NIEU "Nieu"
IDS_LENGTH_PARSECS "Parseków" IDS_LENGTH_PARSECS "Parseki"
IDS_LENGTH_PICAS "Picas" IDS_LENGTH_PICAS "Picas"
IDS_LENGTH_RI_JAPAN "Ri (Japan)" IDS_LENGTH_RI_JAPAN "Ri (Japan)"
IDS_LENGTH_RI_KOREA "Ri (Korea)" IDS_LENGTH_RI_KOREA "Ri (Korea)"
@ -604,7 +604,7 @@ BEGIN
IDS_LENGTH_SUN "Sun" IDS_LENGTH_SUN "Sun"
IDS_LENGTH_TSUEN "Tsuen" IDS_LENGTH_TSUEN "Tsuen"
IDS_LENGTH_VA "Va" IDS_LENGTH_VA "Va"
IDS_LENGTH_YARDS "Jardów" IDS_LENGTH_YARDS "Jardy"
IDS_LENGTH_YOTE "Yote" IDS_LENGTH_YOTE "Yote"
IDS_LENGTH_ZHANG "Zhang" IDS_LENGTH_ZHANG "Zhang"
END END
@ -613,23 +613,23 @@ END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_POWER_BTUS_PER_MINUTE "BTU na minutê" IDS_POWER_BTUS_PER_MINUTE "BTU na minutê"
IDS_POWER_FPS_PER_MINUTE "Foot-pound na minutê" IDS_POWER_FPS_PER_MINUTE "Stopo-funty na minutê"
IDS_POWER_HORSEPOWER "Koni mechanicznych" IDS_POWER_HORSEPOWER "Konie mechaniczne"
IDS_POWER_KILOWATTS "Kilowatów" IDS_POWER_KILOWATTS "Kilowaty"
IDS_POWER_MEGAWATTS "Megawatów" IDS_POWER_MEGAWATTS "Megawaty"
IDS_POWER_WATTS "Watów" IDS_POWER_WATTS "Waty"
END END
// TYPE OF PRESSURES // TYPE OF PRESSURES
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_PRESSURE_ATMOSPHERES "Atmosfer" IDS_PRESSURE_ATMOSPHERES "Atmosfery"
IDS_PRESSURE_BARS "Barów" IDS_PRESSURE_BARS "Bary"
IDS_PRESSURE_HECTOPASCALS "Hektopaskali" IDS_PRESSURE_HECTOPASCALS "Hektopaskale"
IDS_PRESSURE_KILOPASCALS "Kilopaskali" IDS_PRESSURE_KILOPASCALS "Kilopaskale"
IDS_PRESSURE_MM_OF_MERCURY "Millimetrów s³upka rtêci" IDS_PRESSURE_MM_OF_MERCURY "Milimetry s³upka rtêci"
IDS_PRESSURE_PASCALS "Paskali" IDS_PRESSURE_PASCALS "Paskale"
IDS_PRESSURE_PSI "Funtów na cal kwadratowy" IDS_PRESSURE_PSI "Funty na cal kwadratowy"
END END
// TYPES OF TEMPERATURES // TYPES OF TEMPERATURES
@ -645,60 +645,61 @@ END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Dni" IDS_TIME_DAYS "Dni"
IDS_TIME_HOURS "Godzin" IDS_TIME_HOURS "Godziny"
IDS_TIME_MICROSECONDS "Mikrosekund" IDS_TIME_NANOSECONDS "Nanosekundy"
IDS_TIME_MILLISECONDS "Milisekund" IDS_TIME_MICROSECONDS "Mikrosekundy"
IDS_TIME_MINUTES "Minut" IDS_TIME_MILLISECONDS "Milisekundy"
IDS_TIME_SECONDS "Sekund" IDS_TIME_MINUTES "Minuty"
IDS_TIME_WEEKS "Tygodni" IDS_TIME_SECONDS "Sekundy"
IDS_TIME_YEARS "Lat" IDS_TIME_WEEKS "Tygodnie"
IDS_TIME_YEARS "Lata"
END END
// TYPES OF VELOCITIES // TYPES OF VELOCITIES
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_VELOCITY_CMS_SECOND "Centimetrów/sekundê" IDS_VELOCITY_CMS_SECOND "Centymetry/sekundê"
IDS_VELOCITY_FEET_HOUR "Stóp/godzinê" IDS_VELOCITY_FEET_HOUR "Stopy/godzinê"
IDS_VELOCITY_FEET_SECOND "Stóp/sekundê" IDS_VELOCITY_FEET_SECOND "Stopy/sekundê"
IDS_VELOCITY_KILOMETERS_HOUR "Kilometrów/godzinê" IDS_VELOCITY_KILOMETERS_HOUR "Kilometry/godzinê"
IDS_VELOCITY_KNOTS "Wêz³ów" IDS_VELOCITY_KNOTS "Wêz³y"
IDS_VELOCITY_MACH "Machów" IDS_VELOCITY_MACH "Machy"
IDS_VELOCITY_METERS_SECOND "Metrów/sekundê" IDS_VELOCITY_METERS_SECOND "Metry/sekundê"
IDS_VELOCITY_MILES_HOUR "Mil/godzinê" IDS_VELOCITY_MILES_HOUR "Mile/godzinê"
END END
// TYPES OF VOLUMES // TYPES OF VOLUMES
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_VOLUME_BARRELS_UK "Bary³ek (UK)" IDS_VOLUME_BARRELS_UK "Bary³ki (UK)"
IDS_VOLUME_BARRELS_OIL "Bary³ek" IDS_VOLUME_BARRELS_OIL "Bary³ki"
IDS_VOLUME_BUN "Bun" IDS_VOLUME_BUN "Bun"
IDS_VOLUME_BUSHELS_UK "Buszli (UK)" IDS_VOLUME_BUSHELS_UK "Buszle (UK)"
IDS_VOLUME_BUSHELS_US "Buszli (US)" IDS_VOLUME_BUSHELS_US "Buszle (US)"
IDS_VOLUME_CUBIC_CENTIMETERS "Centymetrów szeœciennych" IDS_VOLUME_CUBIC_CENTIMETERS "Centymetry szeœcienne"
IDS_VOLUME_CUBIC_FEET "Stóp szeœciennych" IDS_VOLUME_CUBIC_FEET "Stopy szeœcienne"
IDS_VOLUME_CUBIC_INCHES "Cali szeœciennych" IDS_VOLUME_CUBIC_INCHES "Cale szeœcienne"
IDS_VOLUME_CUBIC_METERS "Metrów szeœciennych" IDS_VOLUME_CUBIC_METERS "Metry szeœcienne"
IDS_VOLUME_CUBIC_YARDS "Jardów szeœciennych" IDS_VOLUME_CUBIC_YARDS "Jardy szeœcienne"
IDS_VOLUME_DOE "Doe" IDS_VOLUME_DOE "Doe"
IDS_VOLUME_FLUID_OUNCES_UK "Uncji, p³yn (UK)" IDS_VOLUME_FLUID_OUNCES_UK "Uncje, p³yn (UK)"
IDS_VOLUME_FLUID_OUNCES_US "Uncji, p³yn (US)" IDS_VOLUME_FLUID_OUNCES_US "Uncje, p³yn (US)"
IDS_VOLUME_GALLONS_UK "Galonów (UK)" IDS_VOLUME_GALLONS_UK "Galony (UK)"
IDS_VOLUME_GALLONS_DRY_US "Galonów, sypkie (US)" IDS_VOLUME_GALLONS_DRY_US "Galony, sypkie (US)"
IDS_VOLUME_GALLONS_LIQUID_US "Gallons, p³yn (US)" IDS_VOLUME_GALLONS_LIQUID_US "Galony, p³yn (US)"
IDS_VOLUME_GOU "Gou" IDS_VOLUME_GOU "Gou"
IDS_VOLUME_HOP "Hop" IDS_VOLUME_HOP "Hop"
IDS_VOLUME_ICCE "Icce" IDS_VOLUME_ICCE "Icce"
IDS_VOLUME_KWIAN "Kwian" IDS_VOLUME_KWIAN "Kwian"
IDS_VOLUME_LITERS "Litrów" IDS_VOLUME_LITERS "Litry"
IDS_VOLUME_MAL "Mal" IDS_VOLUME_MAL "Mal"
IDS_VOLUME_MILLILITERS "Milliliters" IDS_VOLUME_MILLILITERS "Mililitry"
IDS_VOLUME_PINTS_UK "Pint (UK)" IDS_VOLUME_PINTS_UK "Pinty (UK)"
IDS_VOLUME_PINTS_DRY_US "Pint, sypkie (US)" IDS_VOLUME_PINTS_DRY_US "Pinty, sypkie (US)"
IDS_VOLUME_PINTS_LIQUID_US "Pint, p³yn (US)" IDS_VOLUME_PINTS_LIQUID_US "Pinty, p³yn (US)"
IDS_VOLUME_QUARTS_UK "Kwart (UK)" IDS_VOLUME_QUARTS_UK "Kwarty (UK)"
IDS_VOLUME_QUARTS_DRY_US "Kwart, sypkie (US)" IDS_VOLUME_QUARTS_DRY_US "Kwarty, sypkie (US)"
IDS_VOLUME_QUARTS_LIQUID_US "Kwart, p³yn (US)" IDS_VOLUME_QUARTS_LIQUID_US "Kwarty, p³yn (US)"
IDS_VOLUME_SEKI "Seki" IDS_VOLUME_SEKI "Seki"
IDS_VOLUME_SYOU "Syou" IDS_VOLUME_SYOU "Syou"
IDS_VOLUME_TANANLOUNG "Tananloung" IDS_VOLUME_TANANLOUNG "Tananloung"
@ -709,26 +710,26 @@ END
// TYPES OF WEIGHTS // TYPES OF WEIGHTS
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_WEIGHT_BAHT "Bahtów" IDS_WEIGHT_BAHT "Bahty"
IDS_WEIGHT_CARATS "Karatów" IDS_WEIGHT_CARATS "Karaty"
IDS_WEIGHT_CHUNG "Chung" IDS_WEIGHT_CHUNG "Chung"
IDS_WEIGHT_DON "Don" IDS_WEIGHT_DON "Don"
IDS_WEIGHT_GEUN "Geun" IDS_WEIGHT_GEUN "Geun"
IDS_WEIGHT_GRAMS "Gramów" IDS_WEIGHT_GRAMS "Gramy"
IDS_WEIGHT_GWAN "Gwan" IDS_WEIGHT_GWAN "Gwan"
IDS_WEIGHT_HARB "Harb" IDS_WEIGHT_HARB "Harb"
IDS_WEIGHT_JIN_CHINA "Jin (China)" IDS_WEIGHT_JIN_CHINA "Jin (China)"
IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)" IDS_WEIGHT_JIN_TAIWAN "Jin (Taiwan)"
IDS_WEIGHT_KAN "Kan" IDS_WEIGHT_KAN "Kan"
IDS_WEIGHT_KILOGRAMS "Kilogramów" IDS_WEIGHT_KILOGRAMS "Kilogramy"
IDS_WEIGHT_KIN "Kin" IDS_WEIGHT_KIN "Kin"
IDS_WEIGHT_LIANG_CHINA "Liang (China)" IDS_WEIGHT_LIANG_CHINA "Liang (China)"
IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)" IDS_WEIGHT_LIANG_TAIWAN "Liang (Taiwan)"
IDS_WEIGHT_MONME "Monme" IDS_WEIGHT_MONME "Monme"
IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncji, avoirdupois" IDS_WEIGHT_OUNCES_AVOIRDUPOIS "Uncje, avoirdupois"
IDS_WEIGHT_OUNCES_TROY "Uncji, aptekarskie" IDS_WEIGHT_OUNCES_TROY "Uncje, aptekarskie"
IDS_WEIGHT_POUNDS "Funtów" IDS_WEIGHT_POUNDS "Funty"
IDS_WEIGHT_QUINTAL_METRIC "Kwintali" IDS_WEIGHT_QUINTAL_METRIC "Kwintale"
IDS_WEIGHT_SALOUNG "Saloung" IDS_WEIGHT_SALOUNG "Saloung"
IDS_WEIGHT_STONES "Kamieni" IDS_WEIGHT_STONES "Kamieni"
IDS_WEIGHT_TAMLUNG "Tamlung" IDS_WEIGHT_TAMLUNG "Tamlung"

1
base/applications/calc/lang/ro-RO.rc
View file

@ -641,6 +641,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Zile" IDS_TIME_DAYS "Zile"
IDS_TIME_HOURS "Ore" IDS_TIME_HOURS "Ore"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microsecunde" IDS_TIME_MICROSECONDS "Microsecunde"
IDS_TIME_MILLISECONDS "Milisecunde" IDS_TIME_MILLISECONDS "Milisecunde"
IDS_TIME_MINUTES "Minute" IDS_TIME_MINUTES "Minute"

1
base/applications/calc/lang/ru-RU.rc
View file

@ -639,6 +639,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "äåíü" IDS_TIME_DAYS "äåíü"
IDS_TIME_HOURS "÷àñ" IDS_TIME_HOURS "÷àñ"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà" IDS_TIME_MICROSECONDS "ìèêðîñåêóíäà"
IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà" IDS_TIME_MILLISECONDS "ìèëëèñåêóíäà"
IDS_TIME_MINUTES "ìèíóòà" IDS_TIME_MINUTES "ìèíóòà"

1
base/applications/calc/lang/sk-SK.rc
View file

@ -647,6 +647,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Dni" IDS_TIME_DAYS "Dni"
IDS_TIME_HOURS "Hodiny" IDS_TIME_HOURS "Hodiny"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Mikrosekundy" IDS_TIME_MICROSECONDS "Mikrosekundy"
IDS_TIME_MILLISECONDS "Milisekundy" IDS_TIME_MILLISECONDS "Milisekundy"
IDS_TIME_MINUTES "Minúty" IDS_TIME_MINUTES "Minúty"

1
base/applications/calc/lang/th-TH.rc
View file

@ -644,6 +644,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Days" IDS_TIME_DAYS "Days"
IDS_TIME_HOURS "Hours" IDS_TIME_HOURS "Hours"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "Microseconds" IDS_TIME_MICROSECONDS "Microseconds"
IDS_TIME_MILLISECONDS "Milliseconds" IDS_TIME_MILLISECONDS "Milliseconds"
IDS_TIME_MINUTES "Minutes" IDS_TIME_MINUTES "Minutes"

1
base/applications/calc/lang/uk-UA.rc
View file

@ -647,6 +647,7 @@ STRINGTABLE DISCARDABLE
BEGIN BEGIN
IDS_TIME_DAYS "Äîáà" IDS_TIME_DAYS "Äîáà"
IDS_TIME_HOURS "Ãîäèíà" IDS_TIME_HOURS "Ãîäèíà"
IDS_TIME_NANOSECONDS "Nanoseconds"
IDS_TIME_MICROSECONDS "̳êðîñåêóíäà" IDS_TIME_MICROSECONDS "̳êðîñåêóíäà"
IDS_TIME_MILLISECONDS "̳ë³ñåêóíäà" IDS_TIME_MILLISECONDS "̳ë³ñåêóíäà"
IDS_TIME_MINUTES "Õâèëèíà" IDS_TIME_MINUTES "Õâèëèíà"

9
base/applications/calc/resource.h
View file

@ -276,10 +276,11 @@
#define IDS_TIME_HOURS 3002 #define IDS_TIME_HOURS 3002
#define IDS_TIME_MICROSECONDS 3003 #define IDS_TIME_MICROSECONDS 3003
#define IDS_TIME_MILLISECONDS 3004 #define IDS_TIME_MILLISECONDS 3004
#define IDS_TIME_MINUTES 3005 #define IDS_TIME_NANOSECONDS 3005
#define IDS_TIME_SECONDS 3006 #define IDS_TIME_MINUTES 3006
#define IDS_TIME_WEEKS 3007 #define IDS_TIME_SECONDS 3007
#define IDS_TIME_YEARS 3008 #define IDS_TIME_WEEKS 3008
#define IDS_TIME_YEARS 3009
/* TYPES OF VELOCITIES */ /* TYPES OF VELOCITIES */
#define IDS_VELOCITY_CMS_SECOND 3100 #define IDS_VELOCITY_CMS_SECOND 3100

6
base/applications/calc/utl.c
View file

@ -2,7 +2,6 @@
void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base) void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
{ {
TCHAR *ptr, *dst;
calc_number_t tmp; calc_number_t tmp;
int width; 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 */ /* calculate the width of integer number */
width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1; width = (rpn->f==0) ? 1 : (int)log10(fabs(rpn->f))+1;
if (calc.sci_out == TRUE || width > MAX_LD_WIDTH || width < -MAX_LD_WIDTH) 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 { 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); 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('.')); dst = _tcschr(buffer, TEXT('.'));
while (--ptr > dst) while (--ptr > dst)
if (*ptr != TEXT('0')) if (*ptr != TEXT('0'))

54
base/applications/calc/winmain.c
View file

@ -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); n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
if (n == (DWORD)-1) if (n == (DWORD)-1)
return TRUE; return TRUE;
PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0); PostMessage(GetParent(hWnd), WM_LOAD_STAT, (WPARAM)n, 0);
return TRUE; return TRUE;
case IDC_BUTTON_CD: case IDC_BUTTON_CD:
n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0); n = SendDlgItemMessage(hWnd, IDC_LIST_STAT, LB_GETCURSEL, 0, 0);
if (n == (DWORD)-1) if (n == (DWORD)-1)
return TRUE; 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); update_n_stats_items(hWnd, buffer);
delete_stat_item(n); delete_stat_item(n);
return TRUE; return TRUE;
case IDC_BUTTON_CAD: 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(); clean_stat_list();
update_n_stats_items(hWnd, buffer); update_n_stats_items(hWnd, buffer);
return TRUE; return TRUE;
@ -910,20 +910,20 @@ static WPARAM idm_2_idc(int idm)
static void CopyMemToClipboard(void *ptr) static void CopyMemToClipboard(void *ptr)
{ {
if(OpenClipboard(NULL)) { if(OpenClipboard(NULL)) {
HGLOBAL clipbuffer; HGLOBAL clipbuffer;
TCHAR *buffer; TCHAR *buffer;
EmptyClipboard(); EmptyClipboard();
clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR)); clipbuffer = GlobalAlloc(GMEM_DDESHARE, (_tcslen(ptr)+1)*sizeof(TCHAR));
buffer = (TCHAR *)GlobalLock(clipbuffer); buffer = (TCHAR *)GlobalLock(clipbuffer);
_tcscpy(buffer, ptr); _tcscpy(buffer, ptr);
GlobalUnlock(clipbuffer); GlobalUnlock(clipbuffer);
#ifdef UNICODE #ifdef UNICODE
SetClipboardData(CF_UNICODETEXT,clipbuffer); SetClipboardData(CF_UNICODETEXT,clipbuffer);
#else #else
SetClipboardData(CF_TEXT,clipbuffer); SetClipboardData(CF_TEXT,clipbuffer);
#endif #endif
CloseClipboard(); CloseClipboard();
} }
} }
@ -942,16 +942,16 @@ static char *ReadClipboard(void)
char *buffer = NULL; char *buffer = NULL;
if (OpenClipboard(NULL)) { if (OpenClipboard(NULL)) {
HANDLE hData = GetClipboardData(CF_TEXT); HANDLE hData = GetClipboardData(CF_TEXT);
char *fromClipboard; char *fromClipboard;
if (hData != NULL) { if (hData != NULL) {
fromClipboard = (char *)GlobalLock(hData); fromClipboard = (char *)GlobalLock(hData);
if (strlen(fromClipboard)) if (strlen(fromClipboard))
buffer = _strupr(_strdup(fromClipboard)); buffer = _strupr(_strdup(fromClipboard));
GlobalUnlock( hData ); GlobalUnlock( hData );
} }
CloseClipboard(); CloseClipboard();
} }
return buffer; return buffer;
} }
@ -1110,20 +1110,20 @@ static void handle_context_menu(HWND hWnd, WPARAM wp, LPARAM lp)
{ {
TCHAR text[64]; TCHAR text[64];
HMENU hMenu = CreatePopupMenu(); HMENU hMenu = CreatePopupMenu();
DWORD idm; BOOL idm;
LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text)); LoadString(calc.hInstance, IDS_QUICKHELP, text, SIZEOF(text));
AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text); AppendMenu(hMenu, MF_STRING | MF_ENABLED, IDM_HELP_HELP, text);
idm = (DWORD)TrackPopupMenu(hMenu, idm = TrackPopupMenu( hMenu,
TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON, TPM_LEFTALIGN | TPM_TOPALIGN | TPM_RETURNCMD | TPM_RIGHTBUTTON,
LOWORD(lp), LOWORD(lp),
HIWORD(lp), HIWORD(lp),
0, 0,
hWnd, hWnd,
NULL); NULL);
DestroyMenu(hMenu); DestroyMenu(hMenu);
#ifndef DISABLE_HTMLHELP_SUPPORT #ifndef DISABLE_HTMLHELP_SUPPORT
if (idm != 0) { if (idm) {
HH_POPUP popup; HH_POPUP popup;
memset(&popup, 0, sizeof(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); popup.idString = GetWindowLongPtr((HWND)wp, GWL_ID);
HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup); HtmlHelp((HWND)wp, HTMLHELP_PATH("/popups.txt"), HH_DISPLAY_TEXT_POPUP, (DWORD_PTR)&popup);
} }
#else
(void)idm;
#endif #endif
} }

5
base/applications/dxdiag/ddtest.c
View file

@ -151,7 +151,7 @@ BOOL DDPrimarySurfaceTest(HWND hWnd){
{ {
if (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) 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; break;
TranslateMessage(&msg); TranslateMessage(&msg);
DispatchMessage(&msg); DispatchMessage(&msg);
@ -200,7 +200,7 @@ VOID DDRedrawFrame(LPDIRECTDRAWSURFACE lpDDSurface)
BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
UINT TimerID, TimerIDUpdate; UINT_PTR TimerID, TimerIDUpdate;
LPDIRECTDRAW lpDD; LPDIRECTDRAW lpDD;
LPDIRECTDRAWSURFACE lpDDPrimarySurface; LPDIRECTDRAWSURFACE lpDDPrimarySurface;
LPDIRECTDRAWSURFACE lpDDBackBuffer; LPDIRECTDRAWSURFACE lpDDBackBuffer;
@ -288,6 +288,7 @@ BOOL DDOffscreenBufferTest(HWND hWnd, BOOL Fullscreen){
/* set our timers, TimerID - for test timeout, TimerIDUpdate - for frame updating */ /* set our timers, TimerID - for test timeout, TimerIDUpdate - for frame updating */
TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL); TimerID = SetTimer(hWnd, -1, (UINT)TEST_DURATION, NULL);
TimerIDUpdate = SetTimer(hWnd, 2, (UINT)10, NULL); TimerIDUpdate = SetTimer(hWnd, 2, (UINT)10, NULL);
(void)TimerIDUpdate;
while (TRUE) while (TRUE)
{ {

6
base/applications/dxdiag/input.c
View file

@ -129,13 +129,13 @@ BOOL CALLBACK DirectInputEnumDevCb(
ZeroMemory(&GuidPath, sizeof(DIPROPGUIDANDPATH)); ZeroMemory(&GuidPath, sizeof(DIPROPGUIDANDPATH));
GuidPath.diph.dwSize = sizeof(DIPROPGUIDANDPATH); GuidPath.diph.dwSize = sizeof(DIPROPGUIDANDPATH);
GuidPath.diph.dwHeaderSize = sizeof(DIPROPHEADER); GuidPath.diph.dwHeaderSize = sizeof(DIPROPHEADER);
GuidPath.diph.dwHow = DIPH_DEVICE; GuidPath.diph.dwHow = DIPH_DEVICE;
hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GUIDANDPATH, (LPDIPROPHEADER)&GuidPath); hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GUIDANDPATH, (LPDIPROPHEADER)&GuidPath);
ZeroMemory(&TypeName, sizeof(TypeName)); ZeroMemory(&TypeName, sizeof(TypeName));
TypeName.diph.dwSize = sizeof(TypeName); TypeName.diph.dwSize = sizeof(TypeName);
TypeName.diph.dwHeaderSize = sizeof(DIPROPHEADER); TypeName.diph.dwHeaderSize = sizeof(DIPROPHEADER);
TypeName.diph.dwHow = DIPH_DEVICE; TypeName.diph.dwHow = DIPH_DEVICE;
hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GETPORTDISPLAYNAME, (LPDIPROPHEADER)&TypeName); hResult = pDev->lpVtbl->GetProperty(pDev, DIPROP_GETPORTDISPLAYNAME, (LPDIPROPHEADER)&TypeName);
@ -191,7 +191,7 @@ InitializeDirectInputDialog(HWND hwndDlg)
Context.pObj = pObj; Context.pObj = pObj;
Context.hwndDlg = hwndDlg; Context.hwndDlg = hwndDlg;
InitListViewColumns(&Context); 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); pObj->lpVtbl->Release(pObj);
} }

18
base/applications/dxdiag/network.c
View file

@ -178,10 +178,10 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
{ {
DWORD dwIndex = 0; DWORD dwIndex = 0;
LONG result; LONG result;
WCHAR szName[50]; WCHAR szName[50];
WCHAR szGUID[40]; WCHAR szGUID[40];
WCHAR szTemp[63]; WCHAR szTemp[63];
WCHAR szResult[MAX_PATH+20] = {0}; WCHAR szResult[MAX_PATH+20] = {0};
DWORD RegProviders = 0; DWORD RegProviders = 0;
DWORD ProviderIndex; DWORD ProviderIndex;
DWORD dwName; DWORD dwName;
@ -203,13 +203,12 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
szResult[0] = L'\0'; szResult[0] = L'\0';
LoadStringW(hInst, PreDefProviders[dwIndex].ResourceID, szResult, sizeof(szResult)/sizeof(WCHAR)); LoadStringW(hInst, PreDefProviders[dwIndex].ResourceID, szResult, sizeof(szResult)/sizeof(WCHAR));
szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0'; 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'; szResult[0] = L'\0';
LoadStringW(hInst, IDS_REG_FAIL, szResult, sizeof(szResult)/sizeof(WCHAR)); LoadStringW(hInst, IDS_REG_FAIL, szResult, sizeof(szResult)/sizeof(WCHAR));
szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0'; szResult[(sizeof(szResult)/sizeof(WCHAR))-1] = L'\0';
Item.iItem = lResult; SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
Item.iSubItem = 1;
lResult = SendMessageW(hDlgCtrl, LVM_SETITEM, 0, (LPARAM)&Item);
} }
dwIndex = 0; dwIndex = 0;
@ -228,8 +227,7 @@ EnumerateServiceProviders(HKEY hKey, HWND hDlgCtrl, DIRECTPLAY_GUID * PreDefProv
if (ProviderIndex == UINT_MAX) if (ProviderIndex == UINT_MAX)
{ {
/* a custom service provider was found */ /* a custom service provider was found */
lResult = ListView_GetItemCount(hDlgCtrl); Item.iItem = ListView_GetItemCount(hDlgCtrl);
Item.iItem = lResult;
/* FIXME /* FIXME
* on Windows Vista we need to use RegLoadMUIString which is not available for older systems * 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++; dwIndex++;
}while(result != ERROR_NO_MORE_ITEMS); }while(result != ERROR_NO_MORE_ITEMS);
/* check if all providers have been registered */ /* check if all providers have been registered */
// if (RegProviders == 15) // if (RegProviders == 15)
@ -330,7 +328,7 @@ InitializeDirectPlayDialog(HWND hwndDlg)
return; return;
/* enumerate providers */ /* enumerate providers */
result = EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP); EnumerateServiceProviders(hKey, hDlgCtrl, DirectPlaySP);
RegCloseKey(hKey); RegCloseKey(hKey);
} }

1
base/applications/dxdiag/sound.c
View file

@ -275,6 +275,7 @@ void InitializeDirectSoundPage(PDXDIAG_CONTEXT pContext)
/* release the DSound object */ /* release the DSound object */
// pObj->lpVtbl->Release(pObj); // pObj->lpVtbl->Release(pObj);
(void)hResult;
} }

2
base/applications/fontview/display.c
View file

@ -103,7 +103,7 @@ Display_DrawText(HDC hDC, DISPLAYDATA* pData, int nYPos)
/* TODO: Output font info */ /* TODO: Output font info */
/* Output Character set */ /* Output Character set */
hOldFont = SelectObject(hDC, pData->hCharSetFont); SelectObject(hDC, pData->hCharSetFont);
GetTextMetrics(hDC, &tm); GetTextMetrics(hDC, &tm);
swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz"); swprintf(szCaption, L"abcdefghijklmnopqrstuvwxyz");
TextOutW(hDC, 0, y, szCaption, wcslen(szCaption)); TextOutW(hDC, 0, y, szCaption, wcslen(szCaption));

3
base/applications/fontview/fontview.c
View file

@ -60,13 +60,10 @@ FormatString(
static void static void
ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...) ErrorMsgBox(HWND hParent, DWORD dwCaptionID, DWORD dwMessageId, ...)
{ {
HMODULE hModule;
HLOCAL hMemCaption = NULL; HLOCAL hMemCaption = NULL;
HLOCAL hMemText = NULL; HLOCAL hMemText = NULL;
va_list args; va_list args;
hModule = GetModuleHandle(NULL);
va_start(args, dwMessageId); va_start(args, dwMessageId);
FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER, FormatString(FORMAT_MESSAGE_ALLOCATE_BUFFER,
NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args); NULL, dwMessageId, 0, (LPWSTR)&hMemText, 0, &args);

5
base/applications/kbswitch/kbswitch.c
View file

@ -33,7 +33,6 @@ CreateTrayIcon(LPTSTR szLCID)
HDC hdc, hdcsrc; HDC hdc, hdcsrc;
HBITMAP hBitmap, hBmpNew, hBmpOld; HBITMAP hBitmap, hBmpNew, hBmpOld;
RECT rect; RECT rect;
DWORD bkColor, bkText;
HFONT hFontOld, hFont = NULL; HFONT hFontOld, hFont = NULL;
ICONINFO IconInfo; ICONINFO IconInfo;
HICON hIcon = NULL; HICON hIcon = NULL;
@ -63,8 +62,8 @@ CreateTrayIcon(LPTSTR szLCID)
rect.bottom = 16; rect.bottom = 16;
rect.top = 0; rect.top = 0;
bkColor = SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT)); SetBkColor(hdc, GetSysColor(COLOR_HIGHLIGHT));
bkText = SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT)); SetTextColor(hdc, GetSysColor(COLOR_HIGHLIGHTTEXT));
ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL); ExtTextOut(hdc, rect.left, rect.top, ETO_OPAQUE, &rect, _T(""), 0, NULL);

3
base/applications/magnify/magnifier.c
View file

@ -295,7 +295,7 @@ void Draw(HDC aDc)
// //
LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
int wmId, wmEvent; int wmId;
switch (message) switch (message)
{ {
@ -354,7 +354,6 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
break; break;
case WM_COMMAND: case WM_COMMAND:
wmId = LOWORD(wParam); wmId = LOWORD(wParam);
wmEvent = HIWORD(wParam);
// Parse the menu selections: // Parse the menu selections:
switch (wmId) switch (wmId)
{ {

14
base/applications/mplay32/mplay32.c
View file

@ -407,7 +407,7 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
MCI_PLAY_PARMS mciPlay; MCI_PLAY_PARMS mciPlay;
TCHAR szLocalFileName[MAX_PATH]; TCHAR szLocalFileName[MAX_PATH];
UINT FileType; UINT FileType;
DWORD dwError; MCIERROR mciError;
if (lpFileName == NULL) if (lpFileName == NULL)
{ {
@ -449,14 +449,14 @@ PlayFile(HWND hwnd, LPTSTR lpFileName)
SetTimer(hwnd, IDT_PLAYTIMER, 100, (TIMERPROC) PlayTimerProc); 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.dwCallback = (DWORD_PTR)hwnd;
mciPlay.dwFrom = 0; mciPlay.dwFrom = 0;
mciPlay.dwTo = MaxFilePos; mciPlay.dwTo = MaxFilePos;
dwError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay); mciError = mciSendCommand(wDeviceId, MCI_PLAY, MCI_NOTIFY | MCI_FROM | MCI_TO, (DWORD_PTR)&mciPlay);
if (dwError != 0) if (mciError != 0)
{ {
MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK); MessageBox(hwnd, _T("Can't play!"), NULL, MB_OK);
} }
@ -641,12 +641,12 @@ MainWndProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam)
break; break;
case IDM_ABOUT: case IDM_ABOUT:
{ {
HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN)); HICON mplayIcon = LoadIcon(hInstance, MAKEINTRESOURCE(IDI_MAIN));
ShellAbout(hwnd, szAppTitle, 0, mplayIcon); ShellAbout(hwnd, szAppTitle, 0, mplayIcon);
DeleteObject(mplayIcon); DeleteObject(mplayIcon);
break; break;
} }
case IDM_EXIT: case IDM_EXIT:
PostMessage(hwnd, WM_CLOSE, 0, 0); PostMessage(hwnd, WM_CLOSE, 0, 0);
return 0; return 0;

5
base/applications/msconfig/freeldrpage.h
View file

@ -1,3 +1,8 @@
#ifndef _FREELDRPAGE_H_
#define _FREELDRPAGE_H_
extern HWND hFreeLdrPage; extern HWND hFreeLdrPage;
INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK FreeLdrPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

5
base/applications/msconfig/generalpage.h
View file

@ -1,3 +1,8 @@
#ifndef _GENERALPAGE_H_
#define _GENERALPAGE_H_
extern HWND hGeneralPage; extern HWND hGeneralPage;
INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK GeneralPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

5
base/applications/msconfig/srvpage.h
View file

@ -1,4 +1,9 @@
#ifndef _SVRPAGE_H_
#define _SVRPAGE_H_
extern HWND hServicesPage; extern HWND hServicesPage;
extern HWND hServicesListCtrl; extern HWND hServicesListCtrl;
INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ServicesPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

5
base/applications/msconfig/startuppage.h
View file

@ -1,4 +1,9 @@
#ifndef _STARTUPPAGE_H_
#define _STARTUPPAGE_H_
extern HWND hStartupPage; extern HWND hStartupPage;
extern HWND hStartupPageListCtrl; extern HWND hStartupPageListCtrl;
INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK StartupPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

5
base/applications/msconfig/systempage.h
View file

@ -1,3 +1,8 @@
#ifndef _SYSTEMPAGE_H_
#define _SYSTEMPAGE_H_
extern HWND hSystemPage; extern HWND hSystemPage;
INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK SystemPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

4
base/applications/msconfig/toolspage.h
View file

@ -1,5 +1,9 @@
#ifndef _TOOLSPAGE_H_
#define _TOOLSPAGE_H_
extern HWND hToolsPage; extern HWND hToolsPage;
extern HWND hToolsListCtrl; extern HWND hToolsListCtrl;
INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam); INT_PTR CALLBACK ToolsPageWndProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam);
#endif

4
base/applications/mscutils/eventvwr/eventvwr.c
View file

@ -506,7 +506,6 @@ QueryEventMessages(LPWSTR lpMachineName,
DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags; DWORD dwRead, dwNeeded, dwThisRecord, dwTotalRecords = 0, dwCurrentRecord = 1, dwRecordsToRead = 0, dwFlags;
LPWSTR lpSourceName; LPWSTR lpSourceName;
LPWSTR lpComputerName; LPWSTR lpComputerName;
LPWSTR lpEventStr;
LPWSTR lpData; LPWSTR lpData;
BOOL bResult = TRUE; /* Read succeeded. */ BOOL bResult = TRUE; /* Read succeeded. */
@ -609,9 +608,6 @@ QueryEventMessages(LPWSTR lpMachineName,
// This ist the data section of the current event // This ist the data section of the current event
lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset); lpData = (LPWSTR)((LPBYTE)pevlr + pevlr->DataOffset);
// This is the text of the current event
lpEventStr = (LPWSTR)((LPBYTE)pevlr + pevlr->StringOffset);
// Compute the event type // Compute the event type
EventTimeToSystemTime(pevlr->TimeWritten, &time); EventTimeToSystemTime(pevlr->TimeWritten, &time);

25
base/applications/network/arp/arp.c
View file

@ -170,9 +170,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
if (iRet != NO_ERROR)
{ {
_tprintf(_T("failed to allocate memory for GetIpNetTable\n")); _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
DoFormatMessage(); DoFormatMessage();
@ -201,9 +199,7 @@ INT DisplayArpEntries(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable)); ZeroMemory(pIpAddrTable, sizeof(*pIpAddrTable));
iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE); if ((iRet = GetIpAddrTable(pIpAddrTable, &Size, TRUE)) != NO_ERROR)
if (iRet != NO_ERROR)
{ {
_tprintf(_T("GetIpAddrTable failed: %d\n"), iRet); _tprintf(_T("GetIpAddrTable failed: %d\n"), iRet);
DoFormatMessage(); DoFormatMessage();
@ -272,7 +268,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPNETTABLE pIpNetTable = NULL;
DWORD dwIpAddr = 0; DWORD dwIpAddr = 0;
ULONG Size = 0; ULONG Size = 0;
INT iRet, i, val, c; INT i, val, c;
/* error checking */ /* error checking */
@ -320,9 +316,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
if (iRet != NO_ERROR)
{ {
_tprintf(_T("failed to allocate memory for GetIpNetTable\n")); _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
DoFormatMessage(); DoFormatMessage();
@ -382,7 +376,7 @@ INT Addhost(PTCHAR pszInetAddr, PTCHAR pszEthAddr, PTCHAR pszIfAddr)
/* Add the ARP entry */ /* Add the ARP entry */
if ((iRet = SetIpNetEntry(pAddHost)) != NO_ERROR) if (SetIpNetEntry(pAddHost) != NO_ERROR)
{ {
DoFormatMessage(); DoFormatMessage();
goto cleanup; goto cleanup;
@ -415,7 +409,6 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
PMIB_IPNETTABLE pIpNetTable = NULL; PMIB_IPNETTABLE pIpNetTable = NULL;
ULONG Size = 0; ULONG Size = 0;
DWORD dwIpAddr = 0; DWORD dwIpAddr = 0;
INT iRet;
BOOL bFlushTable = FALSE; BOOL bFlushTable = FALSE;
/* error checking */ /* error checking */
@ -449,9 +442,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
ZeroMemory(pIpNetTable, sizeof(*pIpNetTable)); ZeroMemory(pIpNetTable, sizeof(*pIpNetTable));
iRet = GetIpNetTable(pIpNetTable, &Size, TRUE); if (GetIpNetTable(pIpNetTable, &Size, TRUE) != NO_ERROR)
if (iRet != NO_ERROR)
{ {
_tprintf(_T("failed to allocate memory for GetIpNetTable\n")); _tprintf(_T("failed to allocate memory for GetIpNetTable\n"));
DoFormatMessage(); DoFormatMessage();
@ -485,7 +476,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
if (bFlushTable == TRUE) if (bFlushTable == TRUE)
{ {
/* delete arp cache */ /* delete arp cache */
if ((iRet = FlushIpNetTable(pDelHost->dwIndex)) != NO_ERROR) if (FlushIpNetTable(pDelHost->dwIndex) != NO_ERROR)
{ {
DoFormatMessage(); DoFormatMessage();
goto cleanup; goto cleanup;
@ -501,7 +492,7 @@ INT Deletehost(PTCHAR pszInetAddr, PTCHAR pszIfAddr)
pDelHost->dwAddr = dwIpAddr; pDelHost->dwAddr = dwIpAddr;
/* Add the ARP entry */ /* Add the ARP entry */
if ((iRet = DeleteIpNetEntry(pDelHost)) != NO_ERROR) if (DeleteIpNetEntry(pDelHost) != NO_ERROR)
{ {
DoFormatMessage(); DoFormatMessage();
goto cleanup; goto cleanup;

152
base/applications/network/ftp/fake.c
View file

@ -29,10 +29,10 @@ int checkRecv(SOCKET s)
void blkfree(char **av0) void blkfree(char **av0)
{ {
register char **av = av0; register char **av = av0;
while (*av) while (*av)
free(*av++); free(*av++);
} }
char **glob(register char *v) char **glob(register char *v)
@ -52,16 +52,16 @@ int herror(char *string)
#if 0 #if 0
int gettimeofday(struct timeval *timenow, 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_usec = t;
timenow->tv_sec = t / CLK_TCK; timenow->tv_sec = t / CLK_TCK;
return 0; return 0;
} }
int fgetcSocket(int s) int fgetcSocket(int s)
@ -100,13 +100,13 @@ int fgetcSocket(int s)
total = recv(s, buffer, sizeof(buffer), 0); total = recv(s, buffer, sizeof(buffer), 0);
if (total == SOCKET_ERROR) if (total == SOCKET_ERROR)
{ {
total = 0; total = 0;
return ERROR; return ERROR;
} }
if (total == 0) if (total == 0)
return EOF; return EOF;
} }
return buffer[index++]; return buffer[index++];
} }
@ -142,29 +142,29 @@ int fputcSocket(int s, char putChar)
buffer[1] = '\0'; buffer[1] = '\0';
if(SOCKET_ERROR==send(s, buffer, 1, 0)) { if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
int iret=WSAGetLastError (); int iret=WSAGetLastError ();
fprintf(stdout,"fputcSocket: %d\n",iret); fprintf(stdout,"fputcSocket: %d\n",iret);
return 0; return 0;
} }
else { else {
return putChar; return putChar;
} }
} }
int fputSocket(int s, char *buffer, int len) int fputSocket(int s, char *buffer, int len)
{ {
int iret; int iret;
while(len) { while(len) {
if(SOCKET_ERROR==(iret=send(s, buffer, len, 0))) if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
{ {
iret=WSAGetLastError (); iret=WSAGetLastError ();
fprintf(stdout,"fputcSocket: %d\n",iret); fprintf(stdout,"fputcSocket: %d\n",iret);
return 0; return 0;
} }
else { else {
return len-=iret; return len-=iret;
} }
} }
return 0; return 0;
} }
char *fgetsSocket(int s, char *string) char *fgetsSocket(int s, char *string)
@ -180,31 +180,31 @@ char *fgetsSocket(int s, char *string)
if (count == SOCKET_ERROR) if (count == SOCKET_ERROR)
{ {
printf("Error in fgetssocket"); printf("Error in fgetssocket");
return NULL; return NULL;
} }
if (count == 1) if (count == 1)
{ {
string[i] = buffer[0]; string[i] = buffer[0];
if (i == MAX_ASCII - 3) if (i == MAX_ASCII - 3)
{ {
count = 0; count = 0;
string[++i] = '\n'; string[++i] = '\n';
string[++i] = '\0'; string[++i] = '\0';
} }
} }
else else
{ {
if (i == 0) if (i == 0)
return NULL; return NULL;
else else
{ {
string[i] = '\n'; string[i] = '\n';
string[i + 1] = '\0'; // This is risky string[i + 1] = '\0'; // This is risky
return string; return string;
} }
} }
@ -250,44 +250,44 @@ char *getpass (const char * prompt)
int rc; int rc;
if (istty) if (istty)
{ {
if (GetConsoleMode (in, &old_flags)) if (GetConsoleMode (in, &old_flags))
SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT); SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
else else
istty = 0; istty = 0;
} }
/* Need to read line one byte at time to avoid blocking, if not a /* Need to read line one byte at time to avoid blocking, if not a
tty, so always do it this way. */ tty, so always do it this way. */
count = 0; count = 0;
while (1) while (1)
{ {
DWORD dummy; DWORD dummy;
char one_char; char one_char;
rc = ReadFile (in, &one_char, 1, &dummy, NULL); rc = ReadFile (in, &one_char, 1, &dummy, NULL);
if (rc == 0) if (rc == 0)
break; break;
if (one_char == '\r') if (one_char == '\r')
{ {
/* CR is always followed by LF if reading from tty. */ /* CR is always followed by LF if reading from tty. */
if (istty) if (istty)
continue; continue;
else else
break; break;
} }
if (one_char == '\n') if (one_char == '\n')
break; break;
/* Silently truncate password string if overly long. */ /* Silently truncate password string if overly long. */
if (count < sizeof (input) - 1) if (count < sizeof (input) - 1)
input[count++] = one_char; input[count++] = one_char;
} }
input[count] = '\0'; input[count] = '\0';
WriteFile (err, "\r\n", 2, &count, NULL); WriteFile (err, "\r\n", 2, &count, NULL);
if (istty) if (istty)
SetConsoleMode (in, old_flags); SetConsoleMode (in, old_flags);
if (rc) if (rc)
return input; return input;
} }
return NULL; return NULL;

11
base/applications/network/ftp/ftp.c
View file

@ -345,7 +345,7 @@ getreply(expecteof)
cp = reply_string; cp = reply_string;
while ((c = fgetcSocket(cin)) != '\n') { while ((c = fgetcSocket(cin)) != '\n') {
if (c == IAC) { /* handle telnet commands */ if (c == IAC) { /* handle telnet commands */
switch (c = fgetcSocket(cin)) { switch (fgetcSocket(cin)) {
case WILL: case WILL:
case WONT: case WONT:
c = fgetcSocket(cin); 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; long bytes = 0, hashbytes = HASHBYTES;
// struct // struct
fd_set mask; fd_set mask;
register int c, d; register int c;
struct timeval start, stop; struct timeval start, stop;
// struct stat st; // struct stat st;
@ -781,6 +781,7 @@ null();// (void) signal(SIGINT, oldintr);
null();// oldintr = signal(SIGINT, abortrecv); null();// oldintr = signal(SIGINT, abortrecv);
if (strcmp(local, "-") && *local != '|') { if (strcmp(local, "-") && *local != '|') {
#ifndef _WIN32 #ifndef _WIN32
register int d;
// This whole thing is a problem... access Won't work on non-existent files // This whole thing is a problem... access Won't work on non-existent files
if (access(local, 2) < 0) { if (access(local, 2) < 0) {
char *dir = rindex(local, '/'); char *dir = rindex(local, '/');
@ -919,7 +920,7 @@ null();// oldintp = signal(SIGPIPE, SIG_IGN);
(*closefunc)(fout); (*closefunc)(fout);
return; return;
} }
errno = d = 0; errno = 0;
// while ((c = recv(din, buf, bufsize, 1)) > 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)
// 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(); lostpeer();
} }
if (din && FD_ISSET(din, &mask)) { 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) { if (data >= 0) {
(void) close(data); (void) close(data);
data = -1; data = -1;

11
base/applications/network/ftp/ftp.rbuild
View file

@ -4,6 +4,17 @@
<include base="ftp">.</include> <include base="ftp">.</include>
<define name="lint" /> <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>ws2_32</library>
<library>iphlpapi</library> <library>iphlpapi</library>
<library>oldnames</library> <library>oldnames</library>

2
base/applications/network/netstat/netstat.c
View file

@ -14,7 +14,7 @@
*/ */
#include <windows.h> #include <windows.h>
#include <winsock.h> #include <winsock2.h>
#include <tchar.h> #include <tchar.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>

16
base/applications/network/nslookup/nslookup.c
View file

@ -90,11 +90,7 @@ BOOL PerformInternalLookup( PCHAR pAddr, PCHAR pResult )
BOOL bOk = FALSE; BOOL bOk = FALSE;
/* Makes things easier when parsing the response packet. */ /* Makes things easier when parsing the response packet. */
UCHAR Header1, Header2;
USHORT NumQuestions; USHORT NumQuestions;
USHORT NumAnswers;
USHORT NumAuthority;
USHORT NumAdditional;
USHORT Type; USHORT Type;
if( (strlen( pAddr ) + 1) > 255 ) return FALSE; if( (strlen( pAddr ) + 1) > 255 ) return FALSE;
@ -198,12 +194,7 @@ BOOL PerformInternalLookup( PCHAR pAddr, PCHAR pResult )
if( !bOk ) goto cleanup; if( !bOk ) goto cleanup;
/* Start parsing the received packet. */ /* Start parsing the received packet. */
Header1 = RecBuffer[2];
Header2 = RecBuffer[3];
NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] ); 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; k = 12;
@ -257,11 +248,10 @@ void PerformLookup( PCHAR pAddr )
BOOL bOk = FALSE; BOOL bOk = FALSE;
/* Makes things easier when parsing the response packet. */ /* Makes things easier when parsing the response packet. */
UCHAR Header1, Header2; UCHAR Header2;
USHORT NumQuestions; USHORT NumQuestions;
USHORT NumAnswers; USHORT NumAnswers;
USHORT NumAuthority; USHORT NumAuthority;
USHORT NumAdditional;
USHORT Type; USHORT Type;
if( (strlen( pAddr ) + 1) > 255 ) return; if( (strlen( pAddr ) + 1) > 255 ) return;
@ -368,19 +358,17 @@ void PerformLookup( PCHAR pAddr )
((PSHORT)&Buffer[i])[0] = htons( ClassNametoClassID( State.Class ) ); ((PSHORT)&Buffer[i])[0] = htons( ClassNametoClassID( State.Class ) );
/* Ship off the request to the DNS server. */ /* Ship off the request to the DNS server. */
bOk = SendRequest( Buffer, bOk = SendRequest( Buffer,
BufferLength, BufferLength,
RecBuffer, RecBuffer,
&RecBufferLength ); &RecBufferLength );
if( !bOk ) goto cleanup; if( !bOk ) goto cleanup;
/* Start parsing the received packet. */ /* Start parsing the received packet. */
Header1 = RecBuffer[2];
Header2 = RecBuffer[3]; Header2 = RecBuffer[3];
NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] ); NumQuestions = ntohs( ((PSHORT)&RecBuffer[4])[0] );
NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] ); NumAnswers = ntohs( ((PSHORT)&RecBuffer[6])[0] );
NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] ); NumAuthority = ntohs( ((PUSHORT)&RecBuffer[8])[0] );
NumAdditional = ntohs( ((PUSHORT)&RecBuffer[10])[0] );
Type = 0; Type = 0;
/* Check the RCODE for failure. */ /* Check the RCODE for failure. */

29
base/applications/notepad/dialog.c
View file

@ -400,7 +400,6 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
{ {
TCHAR szText[128]; TCHAR szText[128];
HWND hCombo; HWND hCombo;
OFNOTIFY *pNotify;
UNREFERENCED_PARAMETER(wParam); UNREFERENCED_PARAMETER(wParam);
@ -440,15 +439,13 @@ static UINT_PTR CALLBACK DIALOG_FileSaveAs_Hook(HWND hDlg, UINT msg, WPARAM wPar
case WM_NOTIFY: case WM_NOTIFY:
if (((NMHDR *) lParam)->code == CDN_FILEOK) if (((NMHDR *) lParam)->code == CDN_FILEOK)
{ {
pNotify = (OFNOTIFY *) lParam;
hCombo = GetDlgItem(hDlg, ID_ENCODING); hCombo = GetDlgItem(hDlg, ID_ENCODING);
if (hCombo) if (hCombo)
Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); Globals.iEncoding = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
hCombo = GetDlgItem(hDlg, ID_EOLN); hCombo = GetDlgItem(hDlg, ID_EOLN);
if (hCombo) if (hCombo)
Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0); Globals.iEoln = (int) SendMessage(hCombo, CB_GETCURSEL, 0, 0);
} }
break; break;
} }
@ -808,11 +805,11 @@ static INT_PTR CALLBACK DIALOG_GoTo_DialogProc(HWND hwndDialog, UINT uMsg, WPARA
TCHAR szText[32]; TCHAR szText[32];
switch(uMsg) { switch(uMsg) {
case WM_INITDIALOG: case WM_INITDIALOG:
hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER); hTextBox = GetDlgItem(hwndDialog, ID_LINENUMBER);
_sntprintf(szText, SIZEOF(szText), _T("%d"), lParam); _sntprintf(szText, SIZEOF(szText), _T("%d"), lParam);
SetWindowText(hTextBox, szText); SetWindowText(hTextBox, szText);
break; break;
case WM_COMMAND: case WM_COMMAND:
if (HIWORD(wParam) == BN_CLICKED) 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)); EndDialog(hwndDialog, _ttoi(szText));
bResult = TRUE; bResult = TRUE;
} }
else if (LOWORD(wParam) == IDCANCEL) else if (LOWORD(wParam) == IDCANCEL)
{ {
EndDialog(hwndDialog, 0); EndDialog(hwndDialog, 0);
bResult = TRUE; bResult = TRUE;
} }
} }
break; break;
} }
@ -862,7 +859,7 @@ VOID DIALOG_GoTo(VOID)
Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine); Globals.hMainWnd, DIALOG_GoTo_DialogProc, nLine);
if (nLine >= 1) if (nLine >= 1)
{ {
for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++) for (i = 0; pszText[i] && (nLine > 1) && (i < nLength - 1); i++)
{ {
if (pszText[i] == '\n') if (pszText[i] == '\n')
@ -870,8 +867,8 @@ VOID DIALOG_GoTo(VOID)
} }
SendMessage(Globals.hEdit, EM_SETSEL, i, i); SendMessage(Globals.hEdit, EM_SETSEL, i, i);
SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0); SendMessage(Globals.hEdit, EM_SCROLLCARET, 0, 0);
} }
HeapFree(GetProcessHeap(), 0, pszText); HeapFree(GetProcessHeap(), 0, pszText);
} }
VOID DIALOG_StatusBarUpdateCaretPos(VOID) VOID DIALOG_StatusBarUpdateCaretPos(VOID)

18
base/applications/paint/definitions.h
View file

@ -98,6 +98,24 @@
#define ID_ELLIPSE 614 #define ID_ELLIPSE 614
#define ID_RRECT 615 #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 ID_ACCELERATORS 800
#define IDD_MIRRORROTATE 700 #define IDD_MIRRORROTATE 700

2
base/applications/paint/main.c
View file

@ -50,7 +50,7 @@ short lastY;
int lineWidth = 1; int lineWidth = 1;
int shapeStyle = 0; int shapeStyle = 0;
int brushStyle = 0; int brushStyle = 0;
int activeTool = 7; int activeTool = TOOL_PEN;
int airBrushWidth = 5; int airBrushWidth = 5;
int rubberRadius = 4; int rubberRadius = 4;
int transpBg = 0; int transpBg = 0;

140
base/applications/paint/mouse.c
View file

@ -67,7 +67,7 @@ startPaintingL(HDC hdc, short x, short y, int fg, int bg)
lastY = y; lastY = y;
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
ShowWindow(hSelection, SW_HIDE); ShowWindow(hSelection, SW_HIDE);
if (ptStack != NULL) if (ptStack != NULL)
HeapFree(GetProcessHeap(), 0, ptStack); 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].x = x;
ptStack[0].y = y; ptStack[0].y = y;
break; break;
case 10: case TOOL_TEXT:
case 11: case TOOL_LINE:
case 13: case TOOL_RECT:
case 15: case TOOL_ELLIPSE:
case 16: case TOOL_RRECT:
newReversible(); newReversible();
break; break;
case 2: case TOOL_RECTSEL:
newReversible(); newReversible();
ShowWindow(hSelection, SW_HIDE); ShowWindow(hSelection, SW_HIDE);
rectSel_src[2] = rectSel_src[3] = 0; rectSel_src[2] = rectSel_src[3] = 0;
break; break;
case 3: case TOOL_RUBBER:
newReversible(); newReversible();
Erase(hdc, x, y, x, y, bg, rubberRadius); Erase(hdc, x, y, x, y, bg, rubberRadius);
break; break;
case 4: case TOOL_FILL:
newReversible(); newReversible();
Fill(hdc, x, y, fg); Fill(hdc, x, y, fg);
break; break;
case 7: case TOOL_PEN:
newReversible(); newReversible();
SetPixel(hdc, x, y, fg); SetPixel(hdc, x, y, fg);
break; break;
case 8: case TOOL_BRUSH:
newReversible(); newReversible();
Brush(hdc, x, y, x, y, fg, brushStyle); Brush(hdc, x, y, x, y, fg, brushStyle);
break; break;
case 9: case TOOL_AIRBRUSH:
newReversible(); newReversible();
Airbrush(hdc, x, y, fg, airBrushWidth); Airbrush(hdc, x, y, fg, airBrushWidth);
break; break;
case 12: case TOOL_BEZIER:
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
if (pointSP == 0) if (pointSP == 0)
@ -117,7 +117,7 @@ startPaintingL(HDC hdc, short x, short y, int fg, int bg)
pointSP++; pointSP++;
} }
break; break;
case 14: case TOOL_SHAPE:
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
if (pointSP + 1 >= 2) if (pointSP + 1 >= 2)
@ -136,7 +136,7 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
{ {
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
if (ptSP == 0) if (ptSP == 0)
newReversible(); newReversible();
ptSP++; ptSP++;
@ -147,7 +147,7 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
resetToU1(); resetToU1();
Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE); Poly(hdc, ptStack, ptSP + 1, 0, 0, 2, 0, FALSE);
break; break;
case 2: case TOOL_RECTSEL:
{ {
short tempX; short tempX;
short tempY; short tempY;
@ -161,25 +161,25 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
RectSel(hdc, startX, startY, tempX, tempY); RectSel(hdc, startX, startY, tempX, tempY);
break; break;
} }
case 3: case TOOL_RUBBER:
Erase(hdc, lastX, lastY, x, y, bg, rubberRadius); Erase(hdc, lastX, lastY, x, y, bg, rubberRadius);
break; break;
case 7: case TOOL_PEN:
Line(hdc, lastX, lastY, x, y, fg, 1); Line(hdc, lastX, lastY, x, y, fg, 1);
break; break;
case 8: case TOOL_BRUSH:
Brush(hdc, lastX, lastY, x, y, fg, brushStyle); Brush(hdc, lastX, lastY, x, y, fg, brushStyle);
break; break;
case 9: case TOOL_AIRBRUSH:
Airbrush(hdc, x, y, fg, airBrushWidth); Airbrush(hdc, x, y, fg, airBrushWidth);
break; break;
case 11: case TOOL_LINE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
roundTo8Directions(startX, startY, &x, &y); roundTo8Directions(startX, startY, &x, &y);
Line(hdc, startX, startY, x, y, fg, lineWidth); Line(hdc, startX, startY, x, y, fg, lineWidth);
break; break;
case 12: case TOOL_BEZIER:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -197,13 +197,13 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
break; break;
} }
break; break;
case 13: case TOOL_RECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
break; break;
case 14: case TOOL_SHAPE:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -213,13 +213,13 @@ whilePaintingL(HDC hdc, short x, short y, int fg, int bg)
if (pointSP + 1 >= 2) if (pointSP + 1 >= 2)
Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE); Poly(hdc, pointStack, pointSP + 1, fg, bg, lineWidth, shapeStyle, FALSE);
break; break;
case 15: case TOOL_ELLIPSE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
break; break;
case 16: case TOOL_RRECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
@ -236,7 +236,7 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
{ {
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
{ {
POINT *ptStackCopy; POINT *ptStackCopy;
int i; 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); Poly(hdc, ptStack, ptSP + 1, bg, bg, 1, 2, TRUE);
newReversible(); 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(); placeSelWin();
ShowWindow(hSelection, SW_SHOW); ShowWindow(hSelection, SW_SHOW);
} }
@ -286,7 +289,7 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
ptStack = NULL; ptStack = NULL;
break; break;
} }
case 2: case TOOL_RECTSEL:
resetToU1(); resetToU1();
if ((rectSel_src[2] != 0) && (rectSel_src[3] != 0)) 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); rectSel_src[1] + rectSel_src[3], bgColor, bgColor, 0, TRUE);
newReversible(); newReversible();
BitBlt(hDrawingDC, rectSel_src[0], rectSel_src[1], rectSel_src[2], rectSel_src[3], hSelDC, 0,
0, SRCCOPY);
placeSelWin(); placeSelWin();
ShowWindow(hSelection, SW_SHOW); ShowWindow(hSelection, SW_SHOW);
} }
break; break;
case 3: case TOOL_RUBBER:
Erase(hdc, lastX, lastY, x, y, bg, rubberRadius); Erase(hdc, lastX, lastY, x, y, bg, rubberRadius);
break; break;
case 7: case TOOL_PEN:
Line(hdc, lastX, lastY, x, y, fg, 1); Line(hdc, lastX, lastY, x, y, fg, 1);
SetPixel(hdc, x, y, fg); SetPixel(hdc, x, y, fg);
break; break;
case 11: case TOOL_LINE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
roundTo8Directions(startX, startY, &x, &y); roundTo8Directions(startX, startY, &x, &y);
Line(hdc, startX, startY, x, y, fg, lineWidth); Line(hdc, startX, startY, x, y, fg, lineWidth);
break; break;
case 12: case TOOL_BEZIER:
pointSP++; pointSP++;
if (pointSP == 4) if (pointSP == 4)
pointSP = 0; pointSP = 0;
break; break;
case 13: case TOOL_RECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); Rect(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
break; break;
case 14: case TOOL_SHAPE:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -354,13 +360,13 @@ endPaintingL(HDC hdc, short x, short y, int fg, int bg)
if (pointSP == 255) if (pointSP == 255)
pointSP--; pointSP--;
break; break;
case 15: case TOOL_ELLIPSE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle); Ellp(hdc, startX, startY, x, y, fg, bg, lineWidth, shapeStyle);
break; break;
case 16: case TOOL_RRECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
@ -378,35 +384,35 @@ startPaintingR(HDC hdc, short x, short y, int fg, int bg)
lastY = y; lastY = y;
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
case 10: case TOOL_TEXT:
case 11: case TOOL_LINE:
case 13: case TOOL_RECT:
case 15: case TOOL_ELLIPSE:
case 16: case TOOL_RRECT:
newReversible(); newReversible();
break; break;
case 3: case TOOL_RUBBER:
newReversible(); newReversible();
Replace(hdc, x, y, x, y, fg, bg, rubberRadius); Replace(hdc, x, y, x, y, fg, bg, rubberRadius);
break; break;
case 4: case TOOL_FILL:
newReversible(); newReversible();
Fill(hdc, x, y, bg); Fill(hdc, x, y, bg);
break; break;
case 7: case TOOL_PEN:
newReversible(); newReversible();
SetPixel(hdc, x, y, bg); SetPixel(hdc, x, y, bg);
break; break;
case 8: case TOOL_BRUSH:
newReversible(); newReversible();
Brush(hdc, x, y, x, y, bg, brushStyle); Brush(hdc, x, y, x, y, bg, brushStyle);
break; break;
case 9: case TOOL_AIRBRUSH:
newReversible(); newReversible();
Airbrush(hdc, x, y, bg, airBrushWidth); Airbrush(hdc, x, y, bg, airBrushWidth);
break; break;
case 12: case TOOL_BEZIER:
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
if (pointSP == 0) if (pointSP == 0)
@ -415,7 +421,7 @@ startPaintingR(HDC hdc, short x, short y, int fg, int bg)
pointSP++; pointSP++;
} }
break; break;
case 14: case TOOL_SHAPE:
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
if (pointSP + 1 >= 2) if (pointSP + 1 >= 2)
@ -434,25 +440,25 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
{ {
switch (activeTool) switch (activeTool)
{ {
case 3: case TOOL_RUBBER:
Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius);
break; break;
case 7: case TOOL_PEN:
Line(hdc, lastX, lastY, x, y, bg, 1); Line(hdc, lastX, lastY, x, y, bg, 1);
break; break;
case 8: case TOOL_BRUSH:
Brush(hdc, lastX, lastY, x, y, bg, brushStyle); Brush(hdc, lastX, lastY, x, y, bg, brushStyle);
break; break;
case 9: case TOOL_AIRBRUSH:
Airbrush(hdc, x, y, bg, airBrushWidth); Airbrush(hdc, x, y, bg, airBrushWidth);
break; break;
case 11: case TOOL_LINE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
roundTo8Directions(startX, startY, &x, &y); roundTo8Directions(startX, startY, &x, &y);
Line(hdc, startX, startY, x, y, bg, lineWidth); Line(hdc, startX, startY, x, y, bg, lineWidth);
break; break;
case 12: case TOOL_BEZIER:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -470,13 +476,13 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
break; break;
} }
break; break;
case 13: case TOOL_RECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
break; break;
case 14: case TOOL_SHAPE:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -486,13 +492,13 @@ whilePaintingR(HDC hdc, short x, short y, int fg, int bg)
if (pointSP + 1 >= 2) if (pointSP + 1 >= 2)
Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE); Poly(hdc, pointStack, pointSP + 1, bg, fg, lineWidth, shapeStyle, FALSE);
break; break;
case 15: case TOOL_ELLIPSE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
break; break;
case 16: case TOOL_RRECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
@ -509,31 +515,31 @@ endPaintingR(HDC hdc, short x, short y, int fg, int bg)
{ {
switch (activeTool) switch (activeTool)
{ {
case 3: case TOOL_RUBBER:
Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius); Replace(hdc, lastX, lastY, x, y, fg, bg, rubberRadius);
break; break;
case 7: case TOOL_PEN:
Line(hdc, lastX, lastY, x, y, bg, 1); Line(hdc, lastX, lastY, x, y, bg, 1);
SetPixel(hdc, x, y, bg); SetPixel(hdc, x, y, bg);
break; break;
case 11: case TOOL_LINE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
roundTo8Directions(startX, startY, &x, &y); roundTo8Directions(startX, startY, &x, &y);
Line(hdc, startX, startY, x, y, bg, lineWidth); Line(hdc, startX, startY, x, y, bg, lineWidth);
break; break;
case 12: case TOOL_BEZIER:
pointSP++; pointSP++;
if (pointSP == 4) if (pointSP == 4)
pointSP = 0; pointSP = 0;
break; break;
case 13: case TOOL_RECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); Rect(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
break; break;
case 14: case TOOL_SHAPE:
resetToU1(); resetToU1();
pointStack[pointSP].x = x; pointStack[pointSP].x = x;
pointStack[pointSP].y = y; pointStack[pointSP].y = y;
@ -557,13 +563,13 @@ endPaintingR(HDC hdc, short x, short y, int fg, int bg)
if (pointSP == 255) if (pointSP == 255)
pointSP--; pointSP--;
break; break;
case 15: case TOOL_ELLIPSE:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);
Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle); Ellp(hdc, startX, startY, x, y, bg, fg, lineWidth, shapeStyle);
break; break;
case 16: case TOOL_RRECT:
resetToU1(); resetToU1();
if (GetAsyncKeyState(VK_SHIFT) < 0) if (GetAsyncKeyState(VK_SHIFT) < 0)
regularize(startX, startY, &x, &y); regularize(startX, startY, &x, &y);

52
base/applications/paint/toolsettings.c
View file

@ -34,13 +34,13 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
DefWindowProc(hwnd, message, wParam, lParam); DefWindowProc(hwnd, message, wParam, lParam);
DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == 6) ? BF_RECT : BF_RECT | BF_MIDDLE); DrawEdge(hdc, &rect1, BDR_SUNKENOUTER, (activeTool == TOOL_ZOOM) ? BF_RECT : BF_RECT | BF_MIDDLE);
DrawEdge(hdc, &rect2, (activeTool >= 13) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE); DrawEdge(hdc, &rect2, (activeTool >= TOOL_RECT) ? BDR_SUNKENOUTER : 0, BF_RECT | BF_MIDDLE);
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
case 2: case TOOL_RECTSEL:
case 10: case TOOL_TEXT:
{ {
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); 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); DrawIconEx(hdc, 1, 33, hTranspIcon, 40, 30, 0, NULL, DI_NORMAL);
break; break;
} }
case 3: case TOOL_RUBBER:
{ {
int i; int i;
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); 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)); DeleteObject(SelectObject(hdc, oldPen));
break; break;
} }
case 8: case TOOL_BRUSH:
{ {
int i; int i;
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); 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); GetSysColor((i == brushStyle) ? COLOR_HIGHLIGHTTEXT : COLOR_WINDOWTEXT), i);
break; break;
} }
case 9: case TOOL_AIRBRUSH:
{ {
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT)); SelectObject(hdc, GetSysColorBrush(COLOR_HIGHLIGHT));
@ -112,8 +112,8 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
DeleteObject(SelectObject(hdc, oldPen)); DeleteObject(SelectObject(hdc, oldPen));
break; break;
} }
case 11: case TOOL_LINE:
case 12: case TOOL_BEZIER:
{ {
int i; int i;
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); 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)); DeleteObject(SelectObject(hdc, oldPen));
break; break;
} }
case 13: case TOOL_RECT:
case 14: case TOOL_SHAPE:
case 15: case TOOL_ELLIPSE:
case 16: case TOOL_RRECT:
{ {
int i; int i;
HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0)); HPEN oldPen = SelectObject(hdc, CreatePen(PS_NULL, 0, 0));
@ -178,23 +178,23 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (activeTool) switch (activeTool)
{ {
case 1: case TOOL_FREESEL:
case 2: case TOOL_RECTSEL:
case 10: case TOOL_TEXT:
if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 64)) if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 64))
{ {
transpBg = (HIWORD(lParam) - 2) / 31; transpBg = (HIWORD(lParam) - 2) / 31;
SendMessage(hwnd, WM_PAINT, 0, 0); SendMessage(hwnd, WM_PAINT, 0, 0);
} }
break; break;
case 3: case TOOL_RUBBER:
if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 62)) if ((HIWORD(lParam) > 1) && (HIWORD(lParam) < 62))
{ {
rubberRadius = (HIWORD(lParam) - 2) / 15 + 2; rubberRadius = (HIWORD(lParam) - 2) / 15 + 2;
SendMessage(hwnd, WM_PAINT, 0, 0); SendMessage(hwnd, WM_PAINT, 0, 0);
} }
break; break;
case 8: case TOOL_BRUSH:
if ((LOWORD(lParam) > 1) && (LOWORD(lParam) < 40) && (HIWORD(lParam) > 1) if ((LOWORD(lParam) > 1) && (LOWORD(lParam) < 40) && (HIWORD(lParam) > 1)
&& (HIWORD(lParam) < 62)) && (HIWORD(lParam) < 62))
{ {
@ -202,7 +202,7 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
SendMessage(hwnd, WM_PAINT, 0, 0); SendMessage(hwnd, WM_PAINT, 0, 0);
} }
break; break;
case 9: case TOOL_AIRBRUSH:
if (HIWORD(lParam) < 62) if (HIWORD(lParam) < 62)
{ {
if (HIWORD(lParam) < 30) if (HIWORD(lParam) < 30)
@ -222,18 +222,18 @@ SettingsWinProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
SendMessage(hwnd, WM_PAINT, 0, 0); SendMessage(hwnd, WM_PAINT, 0, 0);
} }
break; break;
case 11: case TOOL_LINE:
case 12: case TOOL_BEZIER:
if (HIWORD(lParam) <= 62) if (HIWORD(lParam) <= 62)
{ {
lineWidth = (HIWORD(lParam) - 2) / 12 + 1; lineWidth = (HIWORD(lParam) - 2) / 12 + 1;
SendMessage(hwnd, WM_PAINT, 0, 0); SendMessage(hwnd, WM_PAINT, 0, 0);
} }
break; break;
case 13: case TOOL_RECT:
case 14: case TOOL_SHAPE:
case 15: case TOOL_ELLIPSE:
case 16: case TOOL_RRECT:
if (HIWORD(lParam) <= 60) if (HIWORD(lParam) <= 60)
{ {
shapeStyle = (HIWORD(lParam) - 2) / 20; shapeStyle = (HIWORD(lParam) - 2) / 20;

100
base/applications/paint/winproc.c
View file

@ -460,19 +460,19 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
switch (activeTool) switch (activeTool)
{ {
case 4: case TOOL_FILL:
SetCursor(hCurFill); SetCursor(hCurFill);
break; break;
case 5: case TOOL_COLOR:
SetCursor(hCurColor); SetCursor(hCurColor);
break; break;
case 6: case TOOL_ZOOM:
SetCursor(hCurZoom); SetCursor(hCurZoom);
break; break;
case 7: case TOOL_PEN:
SetCursor(hCurPen); SetCursor(hCurPen);
break; break;
case 9: case TOOL_AIRBRUSH:
SetCursor(hCurAirbrush); SetCursor(hCurAirbrush);
break; break;
default: default:
@ -486,7 +486,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_LBUTTONDOWN: case WM_LBUTTONDOWN:
if (hwnd == hImageArea) if (hwnd == hImageArea)
{ {
if ((!drawing) || (activeTool == 5)) if ((!drawing) || (activeTool == TOOL_COLOR))
{ {
SetCapture(hImageArea); SetCapture(hImageArea);
drawing = TRUE; drawing = TRUE;
@ -499,7 +499,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
undo(); undo();
} }
SendMessage(hImageArea, WM_PAINT, 0, 0); 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)); zoomTo(zoom * 2, (short)LOWORD(lParam), (short)HIWORD(lParam));
} }
break; break;
@ -507,7 +507,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_RBUTTONDOWN: case WM_RBUTTONDOWN:
if (hwnd == hImageArea) if (hwnd == hImageArea)
{ {
if ((!drawing) || (activeTool == 5)) if ((!drawing) || (activeTool == TOOL_COLOR))
{ {
SetCapture(hImageArea); SetCapture(hImageArea);
drawing = TRUE; drawing = TRUE;
@ -520,7 +520,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
undo(); undo();
} }
SendMessage(hImageArea, WM_PAINT, 0, 0); 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)); zoomTo(zoom / 2, (short)LOWORD(lParam), (short)HIWORD(lParam));
} }
break; 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, endPaintingL(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor,
bgColor); bgColor);
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
if (activeTool == 5) if (activeTool == TOOL_COLOR)
{ {
int tempColor = int tempColor =
GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom); 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, endPaintingR(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom, fgColor,
bgColor); bgColor);
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
if (activeTool == 5) if (activeTool == TOOL_COLOR)
{ {
int tempColor = int tempColor =
GetPixel(hDrawingDC, LOWORD(lParam) * 1000 / zoom, HIWORD(lParam) * 1000 / zoom); 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: case WM_MOUSEMOVE:
if (hwnd == hImageArea) 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; TRACKMOUSEEVENT tme;
TCHAR coordStr[100]; if (activeTool == TOOL_ZOOM)
_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)
{ {
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
drawZoomFrame((short)LOWORD(lParam), (short)HIWORD(lParam)); drawZoomFrame((short)LOWORD(lParam), (short)HIWORD(lParam));
@ -588,32 +585,73 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
tme.hwndTrack = hImageArea; tme.hwndTrack = hImageArea;
tme.dwHoverTime = 0; tme.dwHoverTime = 0;
TrackMouseEvent(&tme); TrackMouseEvent(&tme);
if (!drawing)
{
TCHAR coordStr[100];
_stprintf(coordStr, _T("%d, %d"), xNow, yNow);
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) coordStr);
}
} }
if (drawing) 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) if ((wParam & MK_LBUTTON) != 0)
{ {
whilePaintingL(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom, whilePaintingL(hDrawingDC, xNow, yNow, fgColor, bgColor);
(short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor);
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
if ((activeTool >= 10) || (activeTool == 2)) if ((activeTool >= TOOL_TEXT) || (activeTool == TOOL_RECTSEL) || (activeTool == TOOL_FREESEL))
{ {
TCHAR sizeStr[100]; TCHAR sizeStr[100];
_stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX, _stprintf(sizeStr, _T("%d x %d"), xRel, yRel);
(short)HIWORD(lParam) * 1000 / zoom - startY);
SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr);
} }
} }
if ((wParam & MK_RBUTTON) != 0) if ((wParam & MK_RBUTTON) != 0)
{ {
whilePaintingR(hDrawingDC, (short)LOWORD(lParam) * 1000 / zoom, whilePaintingR(hDrawingDC, xNow, yNow, fgColor, bgColor);
(short)HIWORD(lParam) * 1000 / zoom, fgColor, bgColor);
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
if (activeTool >= 10) if (activeTool >= TOOL_TEXT)
{ {
TCHAR sizeStr[100]; TCHAR sizeStr[100];
_stprintf(sizeStr, _T("%d x %d"), (short)LOWORD(lParam) * 1000 / zoom - startX, _stprintf(sizeStr, _T("%d x %d"), xRel, yRel);
(short)HIWORD(lParam) * 1000 / zoom - startY);
SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr); SendMessage(hStatusBar, SB_SETTEXT, 2, (LPARAM) sizeStr);
} }
} }
@ -623,7 +661,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
case WM_MOUSELEAVE: case WM_MOUSELEAVE:
SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T("")); SendMessage(hStatusBar, SB_SETTEXT, 1, (LPARAM) _T(""));
if (activeTool == 6) if (activeTool == TOOL_ZOOM)
SendMessage(hImageArea, WM_PAINT, 0, 0); SendMessage(hImageArea, WM_PAINT, 0, 0);
break; break;
@ -747,7 +785,7 @@ WindowProcedure(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
/* remove selection window and already painted content using undo(), /* remove selection window and already painted content using undo(),
paint Rect for rectangular selections and nothing for freeform selections */ paint Rect for rectangular selections and nothing for freeform selections */
undo(); undo();
if (activeTool == 2) if (activeTool == TOOL_RECTSEL)
{ {
newReversible(); newReversible();
Rect(hDrawingDC, rectSel_dest[0], rectSel_dest[1], rectSel_dest[2] + rectSel_dest[0], 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; break;
} }
case IDM_EDITSELECTALL: case IDM_EDITSELECTALL:
if (activeTool == 2) if (activeTool == TOOL_RECTSEL)
{ {
startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor); startPaintingL(hDrawingDC, 0, 0, fgColor, bgColor);
whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor); whilePaintingL(hDrawingDC, imgXRes, imgYRes, fgColor, bgColor);

2
base/applications/rapps/lang/de-DE.rc
View file

@ -185,7 +185,7 @@ BEGIN
IDS_UPDATES "Aktualisierungen" IDS_UPDATES "Aktualisierungen"
IDS_APPLICATIONS "Anwendungen" IDS_APPLICATIONS "Anwendungen"
IDS_CHOOSE_FOLDER_TEXT "Wählen Sie ein Verzeichnis aus, das zum Herunterladen verwendet werden soll:" 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_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_APP_REG_REMOVE "Sind Sie sich sicher, dass Sie die Daten dieses Programms aus der Registry entfernen möchten?"
IDS_INFORMATION "Informationen" IDS_INFORMATION "Informationen"

2
base/applications/rapps/lang/en-US.rc
View file

@ -185,7 +185,7 @@ BEGIN
IDS_UPDATES "Updates" IDS_UPDATES "Updates"
IDS_APPLICATIONS "Applications" IDS_APPLICATIONS "Applications"
IDS_CHOOSE_FOLDER_TEXT "Choose a folder which will store Downloads:" 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_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_APP_REG_REMOVE "Are you sure you want to delete the data on the installed program from the registry?"
IDS_INFORMATION "Information" IDS_INFORMATION "Information"

8
base/applications/rapps/lang/it-IT.rc
View file

@ -156,7 +156,7 @@ BEGIN
IDS_CAT_DEVEL "Sviluppo" IDS_CAT_DEVEL "Sviluppo"
IDS_CAT_DRIVERS "Drivers" IDS_CAT_DRIVERS "Drivers"
IDS_CAT_EDU "Edutainment" IDS_CAT_EDU "Edutainment"
IDS_CAT_ENGINEER "Engineering" IDS_CAT_ENGINEER "Scienze"
IDS_CAT_FINANCE "Finanza" IDS_CAT_FINANCE "Finanza"
IDS_CAT_GAMES "Giochi e divertimento" IDS_CAT_GAMES "Giochi e divertimento"
IDS_CAT_GRAPHICS "Graphica" IDS_CAT_GRAPHICS "Graphica"
@ -174,18 +174,18 @@ BEGIN
IDS_APPTITLE "ReactOS Applications Manager" IDS_APPTITLE "ReactOS Applications Manager"
IDS_SEARCH_TEXT "Cerca..." IDS_SEARCH_TEXT "Cerca..."
IDS_INSTALL "Installa" IDS_INSTALL "Installa"
IDS_UNINSTALL "Disinstall" IDS_UNINSTALL "Disinstalla"
IDS_MODIFY "Modifica" IDS_MODIFY "Modifica"
IDS_APPS_COUNT "Numero applicazioni: %d" IDS_APPS_COUNT "Numero applicazioni: %d"
IDS_WELCOME_TITLE "Benvenuto!\n\n" 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_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_WELCOME_URL "http://www.reactos.org"
IDS_INSTALLED "Installato" IDS_INSTALLED "Installato"
IDS_AVAILABLEFORINST "Disponibile" IDS_AVAILABLEFORINST "Disponibile per l'installazione"
IDS_UPDATES "Aggiornamenti" IDS_UPDATES "Aggiornamenti"
IDS_APPLICATIONS "Applicazioni" IDS_APPLICATIONS "Applicazioni"
IDS_CHOOSE_FOLDER_TEXT "Scegliere una cartella dove scaricare le 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_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_APP_REG_REMOVE "Sicuro di voler cancellare dal registry i dati sui programmi installati?"
IDS_INFORMATION "Informazioni" IDS_INFORMATION "Informazioni"

2
base/applications/rapps/lang/pl-PL.rc
View file

@ -187,7 +187,7 @@ BEGIN
IDS_UPDATES "Uaktualnienia" IDS_UPDATES "Uaktualnienia"
IDS_APPLICATIONS "Aplikacje" IDS_APPLICATIONS "Aplikacje"
IDS_CHOOSE_FOLDER_TEXT "Wybierz katalog w którym bêda zapisywane pobrane programy:" 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_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_APP_REG_REMOVE "Czy na pewno chcesz usun¹æ wpis tego programu z rejestru?"
IDS_INFORMATION "Informacja" IDS_INFORMATION "Informacja"

17
base/applications/rapps/rapps/firefox2.txt
View file

@ -8,35 +8,20 @@ Description = The most popular and one of the best free Web Browsers out there.
Size = 5.8M Size = 5.8M
Category = 5 Category = 5
URLSite = http://www.mozilla.com/en-US/ 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 CDPath = none
[Section.0407] [Section.0407]
Description = Der populärste und einer der besten freien Webbrowser. 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] [Section.040a]
Description = El más popular y uno de los mejores navegadores web gratuitos que hay. 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] [Section.0414]
Description = Mest populære og best også gratis nettleserene der ute. 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] [Section.0415]
Description = Najpopularniejsza i jedna z najlepszych darmowych przeglądarek internetowych. 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] [Section.0419]
Description = Один из самых популярных и лучших бесплатных браузеров. 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

6
base/applications/rapps/rapps/mirandaim.txt
View file

@ -2,13 +2,13 @@
[Section] [Section]
Name = Miranda IM Name = Miranda IM
Version = 0.8.22 Version = 0.8.24
Licence = GPL Licence = GPL
Description = Open source multiprotocol instant messaging application - May not work completely. Description = Open source multiprotocol instant messaging application - May not work completely.
Size = 1.6MB Size = 1.7MB
Category = 5 Category = 5
URLSite = http://www.miranda-im.org/ 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 CDPath = none
[Section.0407] [Section.0407]

19
base/applications/rapps/rapps/openoffice3.0.txt
View file

@ -2,30 +2,29 @@
[Section] [Section]
Name = OpenOffice 3.0 Name = OpenOffice 3.0
Version = 3.2.0 Version = 3.2.1
Licence = LGPL Licence = LGPL
Description = THE Open Source Office Suite. Description = THE Open Source Office Suite.
Size = 135.4MB Size = 134.0MB
Category = 6 Category = 6
URLSite = http://www.openoffice.org/ 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 CDPath = none
[Section.0407] [Section.0407]
Description = DIE Open Source Office Suite. Description = DIE Open Source Office Suite.
URLSite = http://de.openoffice.org/ URLSite = http://de.openoffice.org/
Size = 145.8MB Size = 144.0MB
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/de/3.2.0/OOo_3.2.0_Win32Intel_install_de.exe URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/de/3.2.1/OOo_3.2.1_Win_x86_install_de.exe
[Section.040a] [Section.040a]
Description = La suite de ofimática de código abierto. Description = La suite de ofimática de código abierto.
URLSite = http://es.openoffice.org/ URLSite = http://es.openoffice.org/
Version = 3.1.0 Size = 144.0MB
Size = 119.4MB URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/es/3.2.1/OOo_3.2.1_Win_x86_install-wJRE_es.exe
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/es/3.2.0/OOo_3.2.0_Win32Intel_install_es.exe
[Section.0415] [Section.0415]
Description = Otwarty pakiet biurowy. Description = Otwarty pakiet biurowy.
URLSite = http://pl.openoffice.org/ URLSite = http://pl.openoffice.org/
Size = 133.2MB Size = 130.0MB
URLDownload = http://ftp.tu-chemnitz.de/pub/openoffice/localized/pl/3.2.0/OOo_3.2.0_Win32Intel_install_pl.exe URLDownload = http://ftp3.gwdg.de/pub/openoffice/localized/pl/3.2.1/OOo_3.2.1_Win_x86_install_pl.exe

8
base/applications/rapps/rapps/rosbe.txt
View file

@ -2,13 +2,13 @@
[Section] [Section]
Name = ReactOS Build Environment Name = ReactOS Build Environment
Version = 1.5.1 Version = 1.5.1.1
Licence = GPL Licence = GPL
Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki. Description = Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.
Size = 13.5MB Size = 13.8MB
Category = 7 Category = 7
URLSite = http://reactos.org/wiki/Build_Environment/ URLSite = http://reactos.org/wiki/Build_Environment
URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.exe URLDownload = http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.5.1.1.exe
CDPath = none CDPath = none
[Section.0407] [Section.0407]

4
base/applications/rapps/rapps/scite.txt
View file

@ -2,13 +2,13 @@
[Section] [Section]
Name = SciTE Name = SciTE
Version = 2.11 Version = 2.12
Licence = Freeware 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. 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 Size = 0.6M
Category = 7 Category = 7
URLSite = http://www.scintilla.org/ 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 CDPath = none
[Section.0407] [Section.0407]

9
base/applications/rapps/settingsdlg.c
View file

@ -115,7 +115,14 @@ SettingsDlgProc(HWND hDlg, UINT Msg, WPARAM wParam, LPARAM lParam)
IDS_CHOOSE_FOLDER_ERROR, IDS_CHOOSE_FOLDER_ERROR,
szMsgText, sizeof(szMsgText) / sizeof(WCHAR)); 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)); SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT));
break; break;
} }

7
base/applications/regedit/edit.c
View file

@ -276,7 +276,6 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
{ {
WNDPROC oldproc; WNDPROC oldproc;
HWND hwndValue; HWND hwndValue;
int len;
TCHAR ValueString[32]; TCHAR ValueString[32];
LPTSTR Remainder; LPTSTR Remainder;
DWORD Base; DWORD Base;
@ -319,7 +318,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
dwordEditMode = EDIT_MODE_HEX; dwordEditMode = EDIT_MODE_HEX;
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (GetWindowText(hwndValue, ValueString, 32)) 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; dwordEditMode = EDIT_MODE_DEC;
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (GetWindowText(hwndValue, ValueString, 32)) if (GetWindowText(hwndValue, ValueString, 32))
{ {
@ -356,7 +355,7 @@ INT_PTR CALLBACK modify_dword_dlgproc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LP
case IDOK: case IDOK:
if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA))) if ((hwndValue = GetDlgItem(hwndDlg, IDC_VALUE_DATA)))
{ {
if ((len = GetWindowTextLength(hwndValue))) if (GetWindowTextLength(hwndValue))
{ {
if (!GetWindowText(hwndValue, ValueString, 32)) if (!GetWindowText(hwndValue, ValueString, 32))
{ {

2
base/applications/regedit/lang/it-IT.rc
View file

@ -192,7 +192,7 @@ STYLE DS_SHELLFONT | DS_MODALFRAME | DS_NOIDLEMSG | DS_CONTEXTHELP |
CAPTION "Modifica Multi-Stringa" CAPTION "Modifica Multi-Stringa"
FONT 8, "MS Shell Dlg" FONT 8, "MS Shell Dlg"
BEGIN 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 EDITTEXT IDC_VALUE_NAME,6,17,240,12,ES_AUTOHSCROLL | ES_READONLY
LTEXT "&Dati:",IDC_STATIC,6,35,161,8 LTEXT "&Dati:",IDC_STATIC,6,35,161,8
EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_MULTILINE | EDITTEXT IDC_VALUE_DATA,6,46,240,102,ES_MULTILINE |

2
base/setup/usetup/interface/usetup.c
View file

@ -1418,7 +1418,7 @@ static BOOL IsDiskSizeValid(PPARTENTRY PartEntry)
if( m < RequiredPartitionDiskSpace) if( m < RequiredPartitionDiskSpace)
{ {
/* partition is too small so ask for another partion */ /* partition is too small so ask for another partion */
DPRINT1("Partition too small"); DPRINT1("Partition is too small, required disk space is %lu MB\n", RequiredPartitionDiskSpace);
return FALSE; return FALSE;
} }
else else

10
base/setup/usetup/lang/bg-BG.h
View file

@ -1483,17 +1483,17 @@ MUI_ERROR bgBGErrorEntries[] =
"<EFBFBD>¥ãᯥ譮 ¤®¡ ¢ï­¥ ­  ª« ¢¨ âã୨⥠¯®¤à¥¤¡¨ ¢ ॣ¨áâêà .\n" "<EFBFBD>¥ãᯥ譮 ¤®¡ ¢ï­¥ ­  ª« ¢¨ âã୨⥠¯®¤à¥¤¡¨ ¢ ॣ¨áâêà .\n"
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà " "ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
}, },
{
//ERROR_UPDATE_GEOID,
"<EFBFBD> áâனª â  ­¥ ¬®¦  ¤  ãáâ ­®¢¨ ®§­ ç¨â¥«ï ­  £¥®£à ä᪮⮠¯®«®¦¥­¨¥.\n"
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * <20> â¨á­¥â¥ ª« ¢¨è, §  ¤  ¯à®¤ê«¦¨â¥.", " * <20> â¨á­¥â¥ ª« ¢¨è, §  ¤  ¯à®¤ê«¦¨â¥.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"<EFBFBD> áâனª â  ­¥ ¬®¦  ¤  ãáâ ­®¢¨ ®§­ ç¨â¥«ï ­  £¥®£à ä᪮⮠¯®«®¦¥­¨¥.\n"
"ENTER = <20>१ ¯ã᪠­¥ ­  ª®¬¯îâêà "
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/es-ES.h
View file

@ -1478,6 +1478,11 @@ MUI_ERROR esESErrorEntries[] =
"El instalador no ha podido agregar los layouts de teclado al registro.\n" "El instalador no ha podido agregar los layouts de teclado al registro.\n"
"ENTER = Reiniciar el equipo" "ENTER = Reiniciar el equipo"
}, },
{
//ERROR_UPDATE_GEOID,
"El instalador no ha podido configurar el ID geogr fico.\n"
"ENTER = Reiniciar el equipo"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"No hay suficiente espacio disponible en la partici¢n seleccionada.\n" "No hay suficiente espacio disponible en la partici¢n seleccionada.\n"
@ -1485,11 +1490,6 @@ MUI_ERROR esESErrorEntries[] =
NULL NULL
}, },
{ {
//ERROR_UPDATE_GEOID,
"El instalador no ha podido configurar el ID geogr fico.\n"
"ENTER = Reiniciar el equipo"
},
{
NULL, NULL,
NULL NULL
} }

10
base/setup/usetup/lang/et-EE.h
View file

@ -1468,17 +1468,17 @@ MUI_ERROR etEEErrorEntries[] =
"Klaviatuuriasetusi ei ännestunud registrisse lisada.\n" "Klaviatuuriasetusi ei ännestunud registrisse lisada.\n"
"ENTER = Taask„ivita arvuti" "ENTER = Taask„ivita arvuti"
}, },
{
//ERROR_UPDATE_GEOID,
"Geograafilist asukohta ei ännestunud seadistada.\n"
"ENTER = Taask„ivita arvuti"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Valitud partitsioonil pole piisavalt ruumi.\n" "Valitud partitsioonil pole piisavalt ruumi.\n"
" * Vajuta suvalist klahvi, et j„tkata.", " * Vajuta suvalist klahvi, et j„tkata.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Geograafilist asukohta ei ännestunud seadistada.\n"
"ENTER = Taask„ivita arvuti"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/fr-FR.h
View file

@ -1484,17 +1484,17 @@ MUI_ERROR frFRErrorEntries[] =
"Setup failed to add keyboard layouts to registry.\n" "Setup failed to add keyboard layouts to registry.\n"
"ENTER = Reboot computer" "ENTER = Reboot computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/it-IT.h
View file

@ -1472,17 +1472,17 @@ MUI_ERROR itITErrorEntries[] =
"Impossibile aggiungere le nazionalit… di tastiera al registro.\n" "Impossibile aggiungere le nazionalit… di tastiera al registro.\n"
"INVIO = Riavviare il computer" "INVIO = Riavviare il computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup non ha potuto impostare l'id geografico.\n"
"INVIO = Riavviare il computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Lo spazio disponibile nella partizione selezionata Š insufficiente.\n" "Lo spazio disponibile nella partizione selezionata Š insufficiente.\n"
" * Premere un tasto qualsiasi per continuare.", " * Premere un tasto qualsiasi per continuare.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup non ha potuto impostare l'id geografico.\n"
"INVIO = Riavviare il computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/lt-LT.h
View file

@ -1481,17 +1481,17 @@ MUI_ERROR ltLTErrorEntries[] =
"Setup failed to add keyboard layouts to registry.\n" "Setup failed to add keyboard layouts to registry.\n"
"ENTER = Reboot computer" "ENTER = Reboot computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/nl-NL.h
View file

@ -1499,17 +1499,17 @@ MUI_ERROR nlNLErrorEntries[] =
"Setup kan de toetsenbord indelingen niet toevoegen aan de registry.\n" "Setup kan de toetsenbord indelingen niet toevoegen aan de registry.\n"
"ENTER = Reboot computer" "ENTER = Reboot computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup kan de geografische positie niet instellen.\n"
"ENTER = Reboot computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup kan de geografische positie niet instellen.\n"
"ENTER = Reboot computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/pl-PL.h
View file

@ -1480,17 +1480,17 @@ MUI_ERROR plPLErrorEntries[] =
"Instalator nie m˘g<CB98> doda† uk<75>ad˘w klawiatury do rejestru.\n" "Instalator nie m˘g<CB98> doda† uk<75>ad˘w klawiatury do rejestru.\n"
"ENTER = Restart komputera" "ENTER = Restart komputera"
}, },
{
//ERROR_UPDATE_GEOID,
"Instalator nie m¢gˆ ustawi† lokalizacji geograficznej.\n"
"ENTER = Restart komputera"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Brak wystarczajĄcej wolnej przestrzeni w wybranej partycji.\n" "Brak wystarczajĄcej wolnej przestrzeni w wybranej partycji.\n"
" * Naci<63>nij dowolny klawisz aby kontynuowa†.", " * Naci<63>nij dowolny klawisz aby kontynuowa†.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Instalator nie m¢gˆ ustawi† lokalizacji geograficznej.\n"
"ENTER = Restart komputera"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/ru-RU.h
View file

@ -1472,17 +1472,17 @@ MUI_ERROR ruRUErrorEntries[] =
"Setup failed to add keyboard layouts to registry.\n" "Setup failed to add keyboard layouts to registry.\n"
"ENTER = Reboot computer" "ENTER = Reboot computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/sk-SK.h
View file

@ -1482,17 +1482,17 @@ MUI_ERROR skSKErrorEntries[] =
"Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n" "Inçtal tor zlyhal pri prid van¡ rozlo§en¡ kl vesnice do registrov.\n"
"ENTER = Reçtart poŸ¡taŸa" "ENTER = Reçtart poŸ¡taŸa"
}, },
{
//ERROR_UPDATE_GEOID,
"Inçtal tor nemohol nastaviœ geo id.\n"
"ENTER = Reçtart poŸ¡taŸa"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Inçtal tor nemohol nastaviœ geo id.\n"
"ENTER = Reçtart poŸ¡taŸa"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/sv-SE.h
View file

@ -1472,17 +1472,17 @@ MUI_ERROR svSEErrorEntries[] =
"Setup failed to add keyboard layouts to registry.\n" "Setup failed to add keyboard layouts to registry.\n"
"ENTER = Reboot computer" "ENTER = Reboot computer"
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"Setup could not set the geo id.\n"
"ENTER = Reboot computer"
},
{ {
NULL, NULL,
NULL NULL

10
base/setup/usetup/lang/uk-UA.h
View file

@ -1478,17 +1478,17 @@ MUI_ERROR ukUAErrorEntries[] =
"<EFBFBD>¥ ¢¤ «®áì ¤®¤ â¨ ஧ª« ¤ª¨ ª« ¢i âãਠ¤® à¥óáâàã.\n" "<EFBFBD>¥ ¢¤ «®áì ¤®¤ â¨ ஧ª« ¤ª¨ ª« ¢i âãਠ¤® à¥óáâàã.\n"
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à" "ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
}, },
{
//ERROR_UPDATE_GEOID,
"<EFBFBD>¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ geo id.\n"
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
{ {
//ERROR_INSUFFICIENT_DISKSPACE, //ERROR_INSUFFICIENT_DISKSPACE,
"Not enough free space in the selected partition.\n" "Not enough free space in the selected partition.\n"
" * Press any key to continue.", " * Press any key to continue.",
NULL NULL
}, },
{
//ERROR_UPDATE_GEOID,
"<EFBFBD>¥ ¢¤ «®áì ¢áâ ­®¢¨â¨ geo id.\n"
"ENTER = <20>¥à¥§ ¢ ­â ¦¨â¨ ª®¬¯'îâ¥à"
},
{ {
NULL, NULL,
NULL NULL

14
base/setup/vmwinst/vmwinst.c
View file

@ -111,7 +111,7 @@ DetectVMware(int *Version)
/* try to open the file */ /* try to open the file */
static BOOL static BOOL
FileExists(WCHAR *Path, WCHAR *File) DoesFileExist(WCHAR *Path, WCHAR *File)
{ {
WCHAR FileName[MAX_PATH + 1]; WCHAR FileName[MAX_PATH + 1];
HANDLE FileHandle; HANDLE FileHandle;
@ -195,9 +195,9 @@ IsVMwareCDInDrive(WCHAR *Drv)
continue; continue;
} }
if(FileExists(SrcPath, vmx_fb) && if(DoesFileExist(SrcPath, vmx_fb) &&
(FileExists(SrcPath, vmx_mode) || FileExists(SrcPath, vmx_mode_v6)) && (DoesFileExist(SrcPath, vmx_mode) || DoesFileExist(SrcPath, vmx_mode_v6)) &&
FileExists(SrcPath, vmx_svga)) DoesFileExist(SrcPath, vmx_svga))
{ {
*Drv = Current; *Drv = Current;
return TRUE; return TRUE;
@ -1070,9 +1070,9 @@ wWinMain(HINSTANCE hInstance,
SetCurrentDirectory(DestinationPath); SetCurrentDirectory(DestinationPath);
DriverFilesFound = FileExists(DestinationPath, vmx_fb) && DriverFilesFound = DoesFileExist(DestinationPath, vmx_fb) &&
FileExists(DestinationPath, vmx_mode) && DoesFileExist(DestinationPath, vmx_mode) &&
FileExists(DestinationDriversPath, vmx_svga); DoesFileExist(DestinationDriversPath, vmx_svga);
StartVMwConfigWizard = DriverFilesFound && IsVmwSVGAEnabled(); StartVMwConfigWizard = DriverFilesFound && IsVmwSVGAEnabled();

21
base/shell/cmd/cmd.c
View file

@ -156,7 +156,7 @@ BOOL bCanExit = TRUE; /* indicates if this shell is exitable */
BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */ BOOL bCtrlBreak = FALSE; /* Ctrl-Break or Ctrl-C hit */
BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */ BOOL bIgnoreEcho = FALSE; /* Set this to TRUE to prevent a newline, when executing a command */
INT nErrorLevel = 0; /* Errorlevel of last launched external program */ INT nErrorLevel = 0; /* Errorlevel of last launched external program */
BOOL bChildProcessRunning = FALSE; CRITICAL_SECTION ChildProcessRunningLock;
BOOL bUnicodeOutput = FALSE; BOOL bUnicodeOutput = FALSE;
BOOL bDisableBatchEcho = FALSE; BOOL bDisableBatchEcho = FALSE;
BOOL bDelayedExpansion = FALSE; BOOL bDelayedExpansion = FALSE;
@ -436,14 +436,12 @@ Execute (LPTSTR Full, LPTSTR First, LPTSTR Rest, PARSED_COMMAND *Cmd)
{ {
if (IsConsoleProcess(prci.hProcess)) if (IsConsoleProcess(prci.hProcess))
{ {
/* FIXME: Protect this with critical section */ EnterCriticalSection(&ChildProcessRunningLock);
bChildProcessRunning = TRUE;
dwChildProcessId = prci.dwProcessId; dwChildProcessId = prci.dwProcessId;
WaitForSingleObject (prci.hProcess, INFINITE); WaitForSingleObject (prci.hProcess, INFINITE);
/* FIXME: Protect this with critical section */ LeaveCriticalSection(&ChildProcessRunningLock);
bChildProcessRunning = FALSE;
GetExitCodeProcess (prci.hProcess, &dwExitCode); GetExitCodeProcess (prci.hProcess, &dwExitCode);
nErrorLevel = (INT)dwExitCode; nErrorLevel = (INT)dwExitCode;
@ -665,9 +663,9 @@ ExecutePipeline(PARSED_COMMAND *Cmd)
SetStdHandle(STD_INPUT_HANDLE, hOldConIn); SetStdHandle(STD_INPUT_HANDLE, hOldConIn);
/* Wait for all processes to complete */ /* Wait for all processes to complete */
bChildProcessRunning = TRUE; EnterCriticalSection(&ChildProcessRunningLock);
WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE); WaitForMultipleObjects(nProcesses, hProcess, TRUE, INFINITE);
bChildProcessRunning = FALSE; LeaveCriticalSection(&ChildProcessRunningLock);
/* Use the exit code of the last process in the pipeline */ /* Use the exit code of the last process in the pipeline */
GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode); GetExitCodeProcess(hProcess[nProcesses - 1], &dwExitCode);
@ -1439,13 +1437,16 @@ BOOL WINAPI BreakHandler (DWORD dwCtrlType)
} }
} }
if (bChildProcessRunning == TRUE) if (!TryEnterCriticalSection(&ChildProcessRunningLock))
{ {
SelfGenerated = TRUE; SelfGenerated = TRUE;
GenerateConsoleCtrlEvent (dwCtrlType, 0); GenerateConsoleCtrlEvent (dwCtrlType, 0);
return TRUE; return TRUE;
} }
else
{
LeaveCriticalSection(&ChildProcessRunningLock);
}
rec.EventType = KEY_EVENT; rec.EventType = KEY_EVENT;
rec.Event.KeyEvent.bKeyDown = TRUE; rec.Event.KeyEvent.bKeyDown = TRUE;
@ -1797,6 +1798,7 @@ static VOID Cleanup()
RemoveBreakHandler (); RemoveBreakHandler ();
SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ), SetConsoleMode( GetStdHandle( STD_INPUT_HANDLE ),
ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT | ENABLE_ECHO_INPUT ); 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]; TCHAR startPath[MAX_PATH];
CONSOLE_SCREEN_BUFFER_INFO Info; CONSOLE_SCREEN_BUFFER_INFO Info;
InitializeCriticalSection(&ChildProcessRunningLock);
lpOriginalEnvironment = DuplicateEnvironment(); lpOriginalEnvironment = DuplicateEnvironment();
GetCurrentDirectory(MAX_PATH,startPath); GetCurrentDirectory(MAX_PATH,startPath);

34
base/shell/cmd/copy.c
View file

@ -604,28 +604,30 @@ INT cmd_copy (LPTSTR param)
bTouch = TRUE; bTouch = TRUE;
bDone = 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 else
{ {
bDone = TRUE; 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 /* From this point on, we can assume that the shortest path is 3 letters long

14
base/shell/cmd/filecomp.c
View file

@ -590,10 +590,20 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, UINT cusor)
/* Start the search for all the files */ /* Start the search for all the files */
GetFullPathName(szBaseWord, MAX_PATH, szSearchPath, NULL); 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) if(StartLength > 0)
{ {
_tcscat(szSearchPath,_T("*")); _tcscat(szSearchPath,_T("*"));
} }
_tcscpy(LastSearch,szSearchPath); _tcscpy(LastSearch,szSearchPath);
_tcscpy(LastPrefix,szPrefix); _tcscpy(LastPrefix,szPrefix);
} }

4
base/shell/explorer-new/explorer.c
View file

@ -284,7 +284,9 @@ _tWinMain(IN HINSTANCE hInstance,
TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"), TEXT("Software\\Microsoft\\Windows\\CurrentVersion\\Explorer"),
&hkExplorer) != ERROR_SUCCESS) &hkExplorer) != ERROR_SUCCESS)
{ {
/* FIXME - display error */ TCHAR Message[256];
LoadString(hInstance, IDS_STARTUP_ERROR, Message, 256);
MessageBox(NULL, Message, NULL, MB_ICONERROR);
return 1; return 1;
} }

1
base/shell/explorer-new/lang/bg-BG.rc
View file

@ -121,6 +121,7 @@ BEGIN
IDS_PROPERTIES "&Свойства" IDS_PROPERTIES "&Свойства"
IDS_OPEN_ALL_USERS "&Отваряне на всички потребители" IDS_OPEN_ALL_USERS "&Отваряне на всички потребители"
IDS_EXPLORE_ALL_USERS "&Разлистване на всички потребители" IDS_EXPLORE_ALL_USERS "&Разлистване на всички потребители"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/cs-CZ.rc
View file

@ -126,6 +126,7 @@ BEGIN
IDS_PROPERTIES "Vl&astnosti" IDS_PROPERTIES "Vl&astnosti"
IDS_OPEN_ALL_USERS "Ote&vøít složku All Users" IDS_OPEN_ALL_USERS "Ote&vøít složku All Users"
IDS_EXPLORE_ALL_USERS "Pro&cházet 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 END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/de-DE.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "E&igenschaften" IDS_PROPERTIES "E&igenschaften"
IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)" IDS_OPEN_ALL_USERS "Öffnen (&Alle Benutzer)"
IDS_EXPLORE_ALL_USERS "Explorer (A&lle 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 END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/en-US.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "P&roperties" IDS_PROPERTIES "P&roperties"
IDS_OPEN_ALL_USERS "O&pen All Users" IDS_OPEN_ALL_USERS "O&pen All Users"
IDS_EXPLORE_ALL_USERS "E&xplore 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 END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/es-ES.rc
View file

@ -129,6 +129,7 @@ BEGIN
IDS_PROPERTIES "P&ropiedades" IDS_PROPERTIES "P&ropiedades"
IDS_OPEN_ALL_USERS "A&brir todos los usuarios" IDS_OPEN_ALL_USERS "A&brir todos los usuarios"
IDS_EXPLORE_ALL_USERS "E&xplorar 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 END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/fr-FR.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "P&ropriétés" IDS_PROPERTIES "P&ropriétés"
IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs" IDS_OPEN_ALL_USERS "Ouvrir tous les utilisateurs"
IDS_EXPLORE_ALL_USERS "E&xplorer 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 END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

9
base/shell/explorer-new/lang/it-IT.rc
View file

@ -78,11 +78,11 @@ BEGIN
LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED LTEXT "This menu style gives you easy access to your folders, favorite programs, and search.", IDC_STATIC, 20,17,150,24, WS_DISABLED
PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED PUSHBUTTON "&Personalizzare...", IDC_TASKBARPROP_STARTMENUCUST, 192,4,53,14, WS_DISABLED
AUTORADIOBUTTON "Menù avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED AUTORADIOBUTTON "Menù avvio &classico", IDC_TASKBARPROP_STARTMENUCLASSIC, 7,47,105,10, WS_DISABLED
LTEXT "This menu style gives you the classic look and functionality",-1,20,57,150,24, WS_DISABLED LTEXT "Questo stile di menù ha funzionalità e aspetto classici",-1,20,57,150,24, WS_DISABLED
PUSHBUTTON "&Customize...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED PUSHBUTTON "&Personalizza...", IDC_TASKBARPROP_STARTMENUCLASSICCUST, 192,44,53,14, WS_DISABLED
GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42 GROUPBOX "Privacy",IDC_STATIC, 7,100,238,42
AUTOCHECKBOX "Store and display a list of recently opened &files", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED AUTOCHECKBOX "Memorizza e mostra un elenco di &file aperti di recente", IDC_TASKBARPROP_RECENTFILES, 14,114,224,10, WS_DISABLED
AUTOCHECKBOX "Store and display a list of recently opened &programs",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED AUTOCHECKBOX "Memorizza e mostra un elenco di &programmi aperti di recente",IDC_TASKBARPROP_RECENTFOLDERS, 14,128,224,10, WS_DISABLED
END END
IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218 IDD_TASKBARPROP_NOTIFICATION DIALOGEX 0, 0, 252, 218
@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "&Proprietà" IDS_PROPERTIES "&Proprietà"
IDS_OPEN_ALL_USERS "&Apri tutti gli utenti" IDS_OPEN_ALL_USERS "&Apri tutti gli utenti"
IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti" IDS_EXPLORE_ALL_USERS "&Esplora tutti gli utenti"
IDS_STARTUP_ERROR "Impossibile avviare explorer perché il registro è danneggiato o non disponibile."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/ja-JP.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "プロパティ(&R)" IDS_PROPERTIES "プロパティ(&R)"
IDS_OPEN_ALL_USERS "開く - All Users(&P)" IDS_OPEN_ALL_USERS "開く - All Users(&P)"
IDS_EXPLORE_ALL_USERS "エクスプローラ - All Users(&E)" IDS_EXPLORE_ALL_USERS "エクスプローラ - All Users(&E)"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/ko-KR.rc
View file

@ -125,6 +125,7 @@ BEGIN
IDS_PROPERTIES "속성(&R)" IDS_PROPERTIES "속성(&R)"
IDS_OPEN_ALL_USERS "열기 - All Users(&P)" IDS_OPEN_ALL_USERS "열기 - All Users(&P)"
IDS_EXPLORE_ALL_USERS "탐색 - All Users(&X)" IDS_EXPLORE_ALL_USERS "탐색 - All Users(&X)"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/lt-LT.rc
View file

@ -124,6 +124,7 @@ BEGIN
IDS_PROPERTIES "&Parametrai" IDS_PROPERTIES "&Parametrai"
IDS_OPEN_ALL_USERS "&Atverti visus vartotojus" IDS_OPEN_ALL_USERS "&Atverti visus vartotojus"
IDS_EXPLORE_ALL_USERS "&Narðyti visus vartotojus" IDS_EXPLORE_ALL_USERS "&Narðyti visus vartotojus"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/nl-NL.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "&Eigenschappen" IDS_PROPERTIES "&Eigenschappen"
IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven" IDS_OPEN_ALL_USERS "&Alle Gebruikers weergeven"
IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen" IDS_EXPLORE_ALL_USERS "Alle Gebruikers V&erkennen"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/no-NO.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "E&genskaper" IDS_PROPERTIES "E&genskaper"
IDS_OPEN_ALL_USERS "Å&pne alle brukere" IDS_OPEN_ALL_USERS "Å&pne alle brukere"
IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere" IDS_EXPLORE_ALL_USERS "U&tforsk alle brukere"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/pl-PL.rc
View file

@ -123,6 +123,7 @@ BEGIN
IDS_PROPERTIES "W³aœ&ciwoœci" IDS_PROPERTIES "W³aœ&ciwoœci"
IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy" IDS_OPEN_ALL_USERS "&Otwórz - wszyscy u¿ytkownicy"
IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy" IDS_EXPLORE_ALL_USERS "&Eksploruj - wszyscy u¿ytkownicy"
IDS_STARTUP_ERROR "System nie mo¿e uruchomiæ eksploratora poniewa¿ rejestr jest niedostêpny lub uszkodzony."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/ro-RO.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "P&roprietãþi" IDS_PROPERTIES "P&roprietãþi"
IDS_OPEN_ALL_USERS "Deschidere& Toþi Utilizatorii" IDS_OPEN_ALL_USERS "Deschidere& Toþi Utilizatorii"
IDS_EXPLORE_ALL_USERS "E&xplorare Toþi Utilizatorii" IDS_EXPLORE_ALL_USERS "E&xplorare Toþi Utilizatorii"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/ru-RU.rc
View file

@ -122,6 +122,7 @@ BEGIN
IDS_PROPERTIES "&Свойства" IDS_PROPERTIES "&Свойства"
IDS_OPEN_ALL_USERS "&Все пользователи" IDS_OPEN_ALL_USERS "&Все пользователи"
IDS_EXPLORE_ALL_USERS "&Обзор Всех пользователей" IDS_EXPLORE_ALL_USERS "&Обзор Всех пользователей"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/sk-SK.rc
View file

@ -120,6 +120,7 @@ BEGIN
IDS_PROPERTIES "Vl&astnosti" IDS_PROPERTIES "Vl&astnosti"
IDS_OPEN_ALL_USERS "&Otvori<72> profil All Users" IDS_OPEN_ALL_USERS "&Otvori<72> profil All Users"
IDS_EXPLORE_ALL_USERS "&Preskúma<6D> profil All Users" IDS_EXPLORE_ALL_USERS "&Preskúma<6D> profil All Users"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/lang/uk-UA.rc
View file

@ -128,6 +128,7 @@ BEGIN
IDS_PROPERTIES "Â&ëàñòèâîñò³" IDS_PROPERTIES "Â&ëàñòèâîñò³"
IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³" IDS_OPEN_ALL_USERS "&Âñ³ êîðèñòóâà÷³"
IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â" IDS_EXPLORE_ALL_USERS "&Îãëÿä âñ³õ êîðèñòóâà÷³â"
IDS_STARTUP_ERROR "The system cannot start explorer because the registry is corrupted or unavailable."
END END
STRINGTABLE DISCARDABLE STRINGTABLE DISCARDABLE

1
base/shell/explorer-new/resource.h
View file

@ -8,6 +8,7 @@
#define IDS_PROPERTIES 102 #define IDS_PROPERTIES 102
#define IDS_OPEN_ALL_USERS 103 #define IDS_OPEN_ALL_USERS 103
#define IDS_EXPLORE_ALL_USERS 104 #define IDS_EXPLORE_ALL_USERS 104
#define IDS_STARTUP_ERROR 105
#define IDC_STARTBTN 304 #define IDC_STARTBTN 304

16
base/system/format/format.c
View file

@ -185,7 +185,7 @@ FormatExCallback (
if( *status == FALSE ) { if( *status == FALSE ) {
LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_FORMAT_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
Error = TRUE; Error = TRUE;
} }
break; break;
@ -204,7 +204,7 @@ FormatExCallback (
case STRUCTUREPROGRESS: case STRUCTUREPROGRESS:
case CLUSTERSIZETOOSMALL: case CLUSTERSIZETOOSMALL:
LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_NO_SUPPORT, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
return FALSE; return FALSE;
} }
return TRUE; return TRUE;
@ -320,7 +320,7 @@ _tmain(int argc, TCHAR *argv[])
// //
if( !LoadFMIFSEntryPoints()) { if( !LoadFMIFSEntryPoints()) {
LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_FMIFS_FAIL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
return -1; return -1;
} }
@ -422,7 +422,7 @@ _tmain(int argc, TCHAR *argv[])
break; break;
} }
LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_ERROR_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
} }
} }
@ -471,7 +471,7 @@ _tmain(int argc, TCHAR *argv[])
((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0)); ((float)(LONGLONG)totalNumberOfBytes.QuadPart)/(float)(1024.0*1024.0));
} }
LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_CREATE_FSYS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
} }
// //
@ -489,7 +489,7 @@ _tmain(int argc, TCHAR *argv[])
#endif #endif
if( Error ) return -1; if( Error ) return -1;
LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_FMT_COMPLETE, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
// //
// Enable compression if desired // Enable compression if desired
@ -504,7 +504,7 @@ _tmain(int argc, TCHAR *argv[])
#endif #endif
LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_VOL_COMPRESS, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
} }
} }
@ -514,7 +514,7 @@ _tmain(int argc, TCHAR *argv[])
if( !GotALabel ) { if( !GotALabel ) {
LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE); LoadString( GetModuleHandle(NULL), STRING_ENTER_LABEL, (LPTSTR) szMsg,RC_STRING_MAX_SIZE);
_tprintf(szMsg); _tprintf("%s", szMsg);
_fgetts( input, sizeof(LabelString)/2, stdin ); _fgetts( input, sizeof(LabelString)/2, stdin );
input[ _tcslen(input)-1] = 0; input[ _tcslen(input)-1] = 0;

Some files were not shown because too many files have changed in this diff Show more